Merge pull request #1163 from DimensionDev/bugfix/image_scale

fix media screen image initial scale

Author: Tlaster

app/src/main/java/dev/dimension/flare/ui/screen/media/StatusMediaScreen.kt

@@ -102,8 +102,8 @@ import kotlinx.coroutines.android.awaitFrame
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import me.saket.telephoto.ExperimentalTelephotoApi
+import me.saket.telephoto.zoomable.Viewport
 import me.saket.telephoto.zoomable.ZoomSpec
-import me.saket.telephoto.zoomable.ZoomableContent
 import me.saket.telephoto.zoomable.coil3.ZoomableAsyncImage
 import me.saket.telephoto.zoomable.rememberZoomableImageState
 import me.saket.telephoto.zoomable.rememberZoomableState
@@ -205,11 +205,13 @@ internal fun StatusMediaScreen(
                         }
                     }
                 }
-                Swiper(state = swiperState) {
+                Swiper(
+                    state = swiperState,
+                    modifier =
+                        Modifier
+                            .hazeSource(state = hazeState),
+                ) {
                     HorizontalPager(
-                        modifier =
-                            Modifier
-                                .hazeSource(state = hazeState),
                         state = pagerState,
                         userScrollEnabled = !state.lockPager,
                         key = {
@@ -604,9 +606,9 @@ private fun ImageItem(
         }
     }
     val aspectRatio =
-        remember(zoomableState.coordinateSystem) {
+        remember(zoomableState.coordinateSystem.unscaledContentBounds) {
             with(zoomableState.coordinateSystem) {
-                zoomableState.coordinateSystem.unscaledContentBounds.rectIn(CoordinateSpace.ZoomableContent)
+                unscaledContentBounds.rectIn(CoordinateSpace.Viewport)
             }.let {
                 it.height / it.width
             }