Merge pull request #46 from KovalevAndrey/fix-clipping-animation

Fix clipping animation and content scale
bumble-tech · Oct 25, 2023 · 5cda48b · 5cda48b
2 parents 23db6b6 + 09188d8
commit 5cda48b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/shared/src/commonMain/kotlin/com/bumble/livemosaic/composable/CallToActionScreen.kt b/shared/src/commonMain/kotlin/com/bumble/livemosaic/composable/CallToActionScreen.kt
@@ -12,7 +12,7 @@ fun CallToActionScreen(
 ) {
     EmbeddableResourceImage(
         path = "bumble_droidcon.jpg",
-        contentScale = ContentScale.FillBounds,
+        contentScale = ContentScale.Fit,
         modifier = modifier
             .fillMaxSize()
     )

diff --git a/shared/src/commonMain/kotlin/com/bumble/livemosaic/ui/DottedMeshShape.kt b/shared/src/commonMain/kotlin/com/bumble/livemosaic/ui/DottedMeshShape.kt
@@ -76,29 +76,14 @@ class DottedMeshShape(
                         destRangeMin = 0f,
                         destRangeMax = targetRadius
                     )
-
-                    // Clip with ovals when you see them, but stick with rectangles otherwise. This
-                    // helps make clipping faster and prevents dropping frames.
-                    if (radius < clampRadius) {
-                        addOval(
-                            Rect(
-                                left = center.x - radius,
-                                top = center.y - radius,
-                                right = center.x + radius,
-                                bottom = center.y + radius,
-                            ),
-                        )
-                    } else {
-                        addRect(
-                            Rect(
-                                left = center.x - halfMeshWidth,
-                                top = center.y - halfMeshHeight,
-                                right = center.x + halfMeshWidth,
-                                bottom = center.y + halfMeshHeight,
-                            ),
-                        )
-                    }
-
+                    addOval(
+                        Rect(
+                            left = center.x - radius,
+                            top = center.y - radius,
+                            right = center.x + radius,
+                            bottom = center.y + radius,
+                        ),
+                    )
                 }
             }
         }