Fixes issue causing placeholders to sometimes take up full screen.

saket · Apr 24, 2024 · f999d00 · f999d00
1 parent da5325b
commit f999d00
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/...image/coil/src/androidTest/kotlin/me/saket/telephoto/zoomable/coil/CoilImageSourceTest.kt b/...image/coil/src/androidTest/kotlin/me/saket/telephoto/zoomable/coil/CoilImageSourceTest.kt
@@ -98,7 +98,6 @@ class CoilImageSourceTest {
   @get:Rule val serverRule = MockWebServerRule()
   @get:Rule val testName = TestName()
   @get:Rule val dropshots = Dropshots(
-    recordScreenshots = true,
     filenameFunc = { it },
     resultValidator = CiScreenshotValidator(
       context = { rule.activity },
@@ -443,14 +442,15 @@ class CoilImageSourceTest {
     }
 
     rule.waitUntil(5.seconds) { placeholderLoaded }
+    rule.waitForIdle()
     rule.runOnIdle {
-      dropshots.assertSnapshot(rule.activity, name = "placeholder_placeholder")
+      dropshots.assertSnapshot(rule.activity, name = "${testName.methodName}_placeholder")
     }
     displayImage = true
     rule.waitForIdle()
     rule.waitUntil(5.seconds) { state.isImageDisplayed }
     rule.runOnIdle {
-      dropshots.assertSnapshot(rule.activity, name = "placeholder_image")
+      dropshots.assertSnapshot(rule.activity, name = "${testName.methodName}_full_image")
     }
   }
 

diff --git a/...oidTest/screenshots/placeholder_image.png → ...older_for_subsampled_image_full_image.png b/...oidTest/screenshots/placeholder_image.png → ...older_for_subsampled_image_full_image.png
diff --git a/.../androidTest/screenshots/loads_placeholder_for_subsampled_image_placeholder.png b/.../androidTest/screenshots/loads_placeholder_for_subsampled_image_placeholder.png
diff --git a/zoomable-image/coil/src/androidTest/screenshots/placeholder_placeholder.png b/zoomable-image/coil/src/androidTest/screenshots/placeholder_placeholder.png
diff --git a/zoomable-image/core/src/main/kotlin/me/saket/telephoto/zoomable/internal/FixedSizePainter.kt b/zoomable-image/core/src/main/kotlin/me/saket/telephoto/zoomable/internal/FixedSizePainter.kt
@@ -14,7 +14,7 @@ import androidx.compose.ui.graphics.painter.Painter
 @Stable
 @Composable
 internal fun Painter.scaledToMatch(size: Size): Painter {
-  return remember(this, size) {
+  return remember(this, intrinsicSize, size) {
     FixedSizePainter(
       painter = this,
       overriddenSize = if (size.isSpecified && !size.isEmpty() && intrinsicSize.isSpecified) {