diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/Robohash.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/Robohash.kt index 298fa68b1..aa6a5ede9 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/Robohash.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/Robohash.kt @@ -11,7 +11,6 @@ import coil.fetch.Fetcher import coil.fetch.SourceResult import coil.request.ImageRequest import coil.request.Options -import coil.size.Size import com.vitorpamplona.amethyst.service.checkNotInMainThread import okio.Buffer import java.security.MessageDigest @@ -61,7 +60,6 @@ private fun svgString(msg: String): String { class HashImageFetcher( private val context: Context, - private val size: Size, private val data: Uri ) : Fetcher { @@ -81,17 +79,16 @@ class HashImageFetcher( object Factory : Fetcher.Factory { override fun create(data: Uri, options: Options, imageLoader: ImageLoader): Fetcher { - return HashImageFetcher(options.context, options.size, data) + return HashImageFetcher(options.context, data) } } } object Robohash { - fun imageRequest(context: Context, message: String, robotSize: Size): ImageRequest { + fun imageRequest(context: Context, message: String): ImageRequest { return ImageRequest .Builder(context) .data("robohash:$message") .fetcherFactory(HashImageFetcher.Factory) - .size(robotSize) .build() } } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RobohashAsyncImage.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RobohashAsyncImage.kt index fdf9c3099..148a3087b 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RobohashAsyncImage.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RobohashAsyncImage.kt @@ -10,12 +10,10 @@ import androidx.compose.ui.graphics.FilterQuality import androidx.compose.ui.graphics.drawscope.DrawScope import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.Dp import coil.compose.AsyncImage import coil.compose.AsyncImagePainter import coil.compose.rememberAsyncImagePainter -import coil.size.Size import java.util.Date @Composable @@ -33,18 +31,9 @@ fun RobohashAsyncImage( filterQuality: FilterQuality = DrawScope.DefaultFilterQuality ) { val context = LocalContext.current - val size = with(LocalDensity.current) { - remember { - robotSize.roundToPx() - } - } - val imageRequest = remember(robotSize, robot) { - Robohash.imageRequest( - context, - robot, - Size(size, size) - ) + val imageRequest = remember(robot) { + Robohash.imageRequest(context, robot) } AsyncImage( @@ -92,15 +81,9 @@ fun RobohashFallbackAsyncImage( ) } else { val context = LocalContext.current - val painter = with(LocalDensity.current) { - rememberAsyncImagePainter( - model = Robohash.imageRequest( - context, - robot, - Size(robotSize.roundToPx(), robotSize.roundToPx()) - ) - ) - } + val painter = rememberAsyncImagePainter( + model = Robohash.imageRequest(context, robot) + ) AsyncImage( model = model, diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt index eca41fb34..9f625d15b 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt @@ -70,6 +70,8 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel import com.vitorpamplona.amethyst.ui.theme.ChatBubbleShapeMe import com.vitorpamplona.amethyst.ui.theme.ChatBubbleShapeThem import com.vitorpamplona.amethyst.ui.theme.RelayIconFilter +import com.vitorpamplona.amethyst.ui.theme.Size13dp +import com.vitorpamplona.amethyst.ui.theme.Size15Modifier import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink import com.vitorpamplona.amethyst.ui.theme.placeholderText @@ -359,13 +361,7 @@ private fun StatusRow( fun ChatTimeAgo(time: Long) { val context = LocalContext.current - var timeStr by remember { mutableStateOf("") } - - LaunchedEffect(key1 = time) { - launch(Dispatchers.IO) { - timeStr = timeAgoShort(time, context = context) - } - } + val timeStr = remember { timeAgoShort(time, context = context) } Text( timeStr, @@ -553,13 +549,13 @@ private fun RelayBadges(baseNote: Note) { if (state.shouldDisplayExpandButton && !expanded) { IconButton( - modifier = Modifier.then(Modifier.size(15.dp)), + modifier = Size15Modifier, onClick = { expanded = true } ) { Icon( imageVector = Icons.Default.ChevronRight, null, - modifier = Modifier.size(15.dp), + modifier = Size15Modifier, tint = MaterialTheme.colors.placeholderText ) } @@ -599,7 +595,7 @@ fun RenderRelay(dirtyUrl: String) { ) { RobohashFallbackAsyncImage( robot = iconUrl, - robotSize = remember { 13.dp }, + robotSize = Size13dp, model = iconUrl, contentDescription = stringResource(id = R.string.relay_icon), colorFilter = RelayIconFilter, diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt index 99ad63f23..750f05aba 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt @@ -26,5 +26,8 @@ val StdHorzSpacer = Modifier.width(5.dp) val DoubleHorzSpacer = Modifier.width(10.dp) val Size35dp = 35.dp +val Size13dp = 13.dp val StdPadding = Modifier.padding(10.dp) + +val Size15Modifier = Modifier.size(15.dp)