From 3e69b81d81fb3b9a1a11cf5c043f9cb831ee2d45 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Sat, 13 May 2023 12:46:57 -0400
Subject: [PATCH] Moves aspect ratio to the appropriate composable

---
 .../amethyst/ui/components/ZoomableContentView.kt    | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt
index 5c34d567f..bdecb38e2 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt
@@ -271,10 +271,6 @@ private fun UrlImageView(
         mutableStateOf<Boolean?>(null)
     }
 
-    val ratio = remember {
-        aspectRatio(content.dim)
-    }
-
     LaunchedEffect(key1 = content.url, key2 = imageState) {
         if (imageState is AsyncImagePainter.State.Success) {
             scope.launch(Dispatchers.IO) {
@@ -284,10 +280,10 @@ private fun UrlImageView(
     }
 
     BoxWithConstraints(contentAlignment = Alignment.Center) {
-        val myModifier = mainImageModifier.also {
-            if (ratio != null) {
-                it.aspectRatio(ratio, maxHeight.isFinite)
-            }
+        val myModifier = mainImageModifier.run {
+            aspectRatio(content.dim)?.let { ratio ->
+                this.aspectRatio(ratio, maxHeight.isFinite)
+            } ?: this
         }
         val contentScale = if (maxHeight.isFinite) ContentScale.Fit else ContentScale.FillWidth