Fix: Use ceil(px) to Dp for padding calculations (#2476)

This change updates the padding calculations in `TransformingLazyColumnDefaults` and `ScalingLazyColumnDefaults` to use a new function, `ceilPx`, to ensure that padding values are rounded up to the nearest pixel. This ensures that padding is consistent across different screen densities. --------- Co-authored-by: yschimke <[email protected]>
google · Dec 9, 2024 · 1c590bc · 1c590bc
1 parent 4cceb8d
commit 1c590bc
Show file tree

Hide file tree

Showing 28 changed files with 86 additions and 72 deletions.
diff --git a/...t/src/main/java/com/google/android/horologist/compose/layout/ScalingLazyColumnDefaults.kt b/...t/src/main/java/com/google/android/horologist/compose/layout/ScalingLazyColumnDefaults.kt
@@ -38,6 +38,7 @@ import androidx.wear.compose.foundation.lazy.ScalingParams
 import androidx.wear.compose.material.ChipDefaults
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.compose.layout.ScalingLazyColumnState.RotaryMode
+import kotlin.math.ceil
 import kotlin.math.sqrt
 
 /**
@@ -253,34 +254,38 @@ public object ScalingLazyColumnDefaults {
             val screenWidthDp = configuration.screenWidthDp.dp
             val screenHeightDp = configuration.screenHeightDp.dp
 
-            return if (this != Unspecified) {
-                topPaddingPct * screenHeightDp + paddingCorrection
-            } else {
-                if (configuration.isScreenRound) {
-                    calculateVerticalOffsetForChip(screenWidthDp.value, horizontalPercent)
+            return (
+                if (this != Unspecified) {
+                    topPaddingPct * screenHeightDp + paddingCorrection
                 } else {
-                    32.dp
+                    if (configuration.isScreenRound) {
+                        calculateVerticalOffsetForChip(screenWidthDp.value, horizontalPercent)
+                    } else {
+                        32.dp
+                    }
                 }
-            }
+                ).ceilPx()
         }
 
         @Composable
         override fun bottomPadding(horizontalPercent: Float): Dp {
             val configuration = LocalConfiguration.current
             val screenWidthDp = configuration.screenWidthDp.dp
             val screenHeightDp = configuration.screenHeightDp.dp
-            return if (this != Unspecified) {
-                bottomPaddingPct * screenHeightDp + paddingCorrection
-            } else {
-                if (configuration.isScreenRound) {
-                    calculateVerticalOffsetForChip(
-                        screenWidthDp.value,
-                        horizontalPercent,
-                    ) + 10.dp
+            return (
+                if (this != Unspecified) {
+                    bottomPaddingPct * screenHeightDp + paddingCorrection
                 } else {
-                    0.dp
+                    if (configuration.isScreenRound) {
+                        calculateVerticalOffsetForChip(
+                            screenWidthDp.value,
+                            horizontalPercent,
+                        ) + 10.dp
+                    } else {
+                        0.dp
+                    }
                 }
-            }
+                ).ceilPx()
         }
     }
 
@@ -333,3 +338,12 @@ public object ScalingLazyColumnDefaults {
     @Composable
     fun Modifier.listTextPadding() = this.padding(horizontal = 0.052f * LocalConfiguration.current.screenWidthDp.dp)
 }
+
+@Composable
+internal fun Dp.ceilPx(): Dp {
+    val density = LocalDensity.current
+
+    return with(density) {
+        ceil(this@ceilPx.toPx()).toDp()
+    }
+}
diff --git a/.../main/java/com/google/android/horologist/compose/layout/TransformingLazyColumnDefaults.kt b/.../main/java/com/google/android/horologist/compose/layout/TransformingLazyColumnDefaults.kt
@@ -48,11 +48,11 @@ public fun rememberResponsiveColumnPadding(
     val configuration = LocalConfiguration.current
     val screenWidthDp = configuration.screenWidthDp.dp
 
-    val horizontalPadding = screenWidthDp * horizontalPercent
+    val horizontalPadding = (screenWidthDp * horizontalPercent).ceilPx()
 
     return PaddingValues(
-        top = first.topPadding(horizontalPercent),
-        bottom = last.bottomPadding(horizontalPercent),
+        top = first.topPadding(horizontalPercent).ceilPx(),
+        bottom = last.bottomPadding(horizontalPercent).ceilPx(),
         start = horizontalPadding,
         end = horizontalPadding,
     )

diff --git a/...ts/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[0]_ticwatch_pro_5.png b/...ts/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[0]_ticwatch_pro_5.png
diff --git a/...ransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[0]_ticwatch_pro_5_end.png b/...ransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[0]_ticwatch_pro_5_end.png
diff --git a/...ts/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[1]_galaxy_watch_5.png b/...ts/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[1]_galaxy_watch_5.png
diff --git a/...ts/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[2]_galaxy_watch_6.png b/...ts/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[2]_galaxy_watch_6.png
diff --git a/...mingLazyColumnDefaultsTest_ButtonAndEdgeButton[6]_galaxy_watch_6_small_font.png b/...mingLazyColumnDefaultsTest_ButtonAndEdgeButton[6]_galaxy_watch_6_small_font.png
diff --git a/...gLazyColumnDefaultsTest_IconButtonAndExtraSmallEdgeButton[0]_ticwatch_pro_5.png b/...gLazyColumnDefaultsTest_IconButtonAndExtraSmallEdgeButton[0]_ticwatch_pro_5.png
diff --git a/...yColumnDefaultsTest_IconButtonAndExtraSmallEdgeButton[0]_ticwatch_pro_5_end.png b/...yColumnDefaultsTest_IconButtonAndExtraSmallEdgeButton[0]_ticwatch_pro_5_end.png
diff --git a/...gLazyColumnDefaultsTest_IconButtonAndExtraSmallEdgeButton[1]_galaxy_watch_5.png b/...gLazyColumnDefaultsTest_IconButtonAndExtraSmallEdgeButton[1]_galaxy_watch_5.png
diff --git a/...gLazyColumnDefaultsTest_IconButtonAndExtraSmallEdgeButton[2]_galaxy_watch_6.png b/...gLazyColumnDefaultsTest_IconButtonAndExtraSmallEdgeButton[2]_galaxy_watch_6.png
diff --git a/...DefaultsTest_IconButtonAndExtraSmallEdgeButton[6]_galaxy_watch_6_small_font.png b/...DefaultsTest_IconButtonAndExtraSmallEdgeButton[6]_galaxy_watch_6_small_font.png
diff --git a/...reenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[0]_ticwatch_pro_5.png b/...reenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[0]_ticwatch_pro_5.png
diff --git a/...shots/TransformingLazyColumnDefaultsTest_TitleAndCard[0]_ticwatch_pro_5_end.png b/...shots/TransformingLazyColumnDefaultsTest_TitleAndCard[0]_ticwatch_pro_5_end.png
diff --git a/...reenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[2]_galaxy_watch_6.png b/...reenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[2]_galaxy_watch_6.png
diff --git a/...shots/TransformingLazyColumnDefaultsTest_TitleAndCard[2]_galaxy_watch_6_end.png b/...shots/TransformingLazyColumnDefaultsTest_TitleAndCard[2]_galaxy_watch_6_end.png
diff --git a/...ransformingLazyColumnDefaultsTest_TitleAndCard[6]_galaxy_watch_6_small_font.png b/...ransformingLazyColumnDefaultsTest_TitleAndCard[6]_galaxy_watch_6_small_font.png
diff --git a/...formingLazyColumnDefaultsTest_TitleAndCard[6]_galaxy_watch_6_small_font_end.png b/...formingLazyColumnDefaultsTest_TitleAndCard[6]_galaxy_watch_6_small_font_end.png
diff --git a/...nsizes_ScalingLazyColumnDefaultsTest_responsive_chips[0]_mobvoiticwatchpro5.png b/...nsizes_ScalingLazyColumnDefaultsTest_responsive_chips[0]_mobvoiticwatchpro5.png
diff --git a/...sizes_ScalingLazyColumnDefaultsTest_responsive_chips[1]_samsunggalaxywatch5.png b/...sizes_ScalingLazyColumnDefaultsTest_responsive_chips[1]_samsunggalaxywatch5.png
diff --git a/..._ScalingLazyColumnDefaultsTest_responsive_chips[2]_samsunggalaxywatch6large.png b/..._ScalingLazyColumnDefaultsTest_responsive_chips[2]_samsunggalaxywatch6large.png
diff --git a/...ensizes_ScalingLazyColumnDefaultsTest_responsive_chips[5]_genericlargeround.png b/...ensizes_ScalingLazyColumnDefaultsTest_responsive_chips[5]_genericlargeround.png
diff --git a/...zes_ScalingLazyColumnDefaultsTest_responsive_chips[7]_largedevicesmallfonts.png b/...zes_ScalingLazyColumnDefaultsTest_responsive_chips[7]_largedevicesmallfonts.png
diff --git a/...d.horologist.screensizes_SectionedListTest_screenshot[0]_mobvoiticwatchpro5.png b/...d.horologist.screensizes_SectionedListTest_screenshot[0]_mobvoiticwatchpro5.png
diff --git a/....horologist.screensizes_SectionedListTest_screenshot[1]_samsunggalaxywatch5.png b/....horologist.screensizes_SectionedListTest_screenshot[1]_samsunggalaxywatch5.png
diff --git a/...logist.screensizes_SectionedListTest_screenshot[2]_samsunggalaxywatch6large.png b/...logist.screensizes_SectionedListTest_screenshot[2]_samsunggalaxywatch6large.png
diff --git a/...id.horologist.screensizes_SectionedListTest_screenshot[5]_genericlargeround.png b/...id.horologist.screensizes_SectionedListTest_screenshot[5]_genericlargeround.png
diff --git a/...orologist.screensizes_SectionedListTest_screenshot[7]_largedevicesmallfonts.png b/...orologist.screensizes_SectionedListTest_screenshot[7]_largedevicesmallfonts.png