fix Intrinsic measuring in autoscaled icon

kiwicom · Jun 14, 2023 · 3489160 · 3489160
1 parent b26c995
commit 3489160
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/ui/src/main/java/kiwi/orbit/compose/ui/controls/Icon.kt b/ui/src/main/java/kiwi/orbit/compose/ui/controls/Icon.kt
@@ -16,6 +16,8 @@ import androidx.compose.ui.graphics.toolingGraphicsLayer
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.IntrinsicMeasurable
+import androidx.compose.ui.layout.IntrinsicMeasureScope
 import androidx.compose.ui.layout.LayoutModifier
 import androidx.compose.ui.layout.Measurable
 import androidx.compose.ui.layout.MeasureResult
@@ -139,6 +141,18 @@ private data class DefaultSizeModifier(
             placeable.placeRelative(0, 0)
         }
     }
+
+    override fun IntrinsicMeasureScope.maxIntrinsicHeight(measurable: IntrinsicMeasurable, width: Int): Int =
+        defaultSize.roundToPx()
+
+    override fun IntrinsicMeasureScope.maxIntrinsicWidth(measurable: IntrinsicMeasurable, height: Int): Int =
+        defaultSize.roundToPx()
+
+    override fun IntrinsicMeasureScope.minIntrinsicHeight(measurable: IntrinsicMeasurable, width: Int): Int =
+        defaultSize.roundToPx()
+
+    override fun IntrinsicMeasureScope.minIntrinsicWidth(measurable: IntrinsicMeasurable, height: Int): Int =
+        defaultSize.roundToPx()
 }
 
 @OrbitPreviews

diff --git a/...napshots/images/kiwi.orbit.compose.ui_ScreenshotTest_choiceTileCentered_big.png b/...napshots/images/kiwi.orbit.compose.ui_ScreenshotTest_choiceTileCentered_big.png
diff --git a/...rc/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_tileGroup_big.png b/...rc/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_tileGroup_big.png
diff --git a/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_tile_big.png b/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_tile_big.png