nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Moves aspect ratio to the appropriate composable

Browse Source
This commit is contained in:
Vitor Pamplona
2023-05-13 12:46:57 -04:00
parent ea4e3e75d6
commit 3e69b81d81
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt
+4 -8
View File
@@ -271,10 +271,6 @@ private fun UrlImageView(
mutableStateOf<Boolean?>(null) mutableStateOf<Boolean?>(null)
} }
val ratio = remember {
aspectRatio(content.dim)
}
LaunchedEffect(key1 = content.url, key2 = imageState) { LaunchedEffect(key1 = content.url, key2 = imageState) {
if (imageState is AsyncImagePainter.State.Success) { if (imageState is AsyncImagePainter.State.Success) {
scope.launch(Dispatchers.IO) { scope.launch(Dispatchers.IO) {
@@ -284,10 +280,10 @@ private fun UrlImageView(
} }
BoxWithConstraints(contentAlignment = Alignment.Center) { BoxWithConstraints(contentAlignment = Alignment.Center) {
val myModifier = mainImageModifier.also { val myModifier = mainImageModifier.run {
if (ratio != null) { aspectRatio(content.dim)?.let { ratio ->
it.aspectRatio(ratio, maxHeight.isFinite) this.aspectRatio(ratio, maxHeight.isFinite)
} } ?: this
} }
val contentScale = if (maxHeight.isFinite) ContentScale.Fit else ContentScale.FillWidth val contentScale = if (maxHeight.isFinite) ContentScale.Fit else ContentScale.FillWidth