[0.6.x] Cherry pick ambient and padding fixes (#2483)

* Add lifecycle parameter to AmbientAware (#2481) --------- Co-authored-by: yschimke <[email protected]> (cherry picked from commit 4cceb8d) * Cherry pick #2476 Ceil padding to 1px * Update ScalingLazyColumnDefaults.kt * 🤖 Updates screenshots --------- Co-authored-by: yschimke <[email protected]>
google · Dec 10, 2024 · 73606b9 · 73606b9
1 parent d8a4110
commit 73606b9
Show file tree

Hide file tree

Showing 121 changed files with 163 additions and 152 deletions.
diff --git a/...google.android.horologist.composables_SectionedListHeaderFooterTest_test[4].png b/...google.android.horologist.composables_SectionedListHeaderFooterTest_test[4].png
diff --git a/...google.android.horologist.composables_SectionedListHeaderFooterTest_test[5].png b/...google.android.horologist.composables_SectionedListHeaderFooterTest_test[5].png
diff --git a/...google.android.horologist.composables_SectionedListHeaderFooterTest_test[6].png b/...google.android.horologist.composables_SectionedListHeaderFooterTest_test[6].png
diff --git a/...google.android.horologist.composables_SectionedListHeaderFooterTest_test[7].png b/...google.android.horologist.composables_SectionedListHeaderFooterTest_test[7].png
diff --git a/compose-layout/api/current.api b/compose-layout/api/current.api
@@ -2,7 +2,7 @@
 package com.google.android.horologist.compose.ambient {
 
   public final class AmbientAwareKt {
-    method @androidx.compose.runtime.Composable public static void AmbientAware(kotlin.jvm.functions.Function1<? super com.google.android.horologist.compose.ambient.AmbientState,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void AmbientAware(optional androidx.lifecycle.Lifecycle lifecycle, kotlin.jvm.functions.Function1<? super com.google.android.horologist.compose.ambient.AmbientState,kotlin.Unit> content);
     method public static androidx.compose.runtime.ProvidableCompositionLocal<com.google.android.horologist.compose.ambient.AmbientState> getLocalAmbientState();
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<com.google.android.horologist.compose.ambient.AmbientState> LocalAmbientState;
   }

diff --git a/compose-layout/src/main/java/com/google/android/horologist/compose/ambient/AmbientAware.kt b/compose-layout/src/main/java/com/google/android/horologist/compose/ambient/AmbientAware.kt
@@ -42,17 +42,18 @@ import androidx.wear.ambient.AmbientLifecycleObserver
  *
  * It should be used within each individual screen inside nav routes.
  *
+ * @param lifecycle The [Lifecycle] of the activity or current owner such as NavBackStackEntry.
  * @param content Lambda that will be used for building the UI, which is passed the current ambient
  * state.
  */
 @Composable
 fun AmbientAware(
+    lifecycle: Lifecycle = LocalLifecycleOwner.current.lifecycle,
     content: @Composable (AmbientState) -> Unit,
 ) {
     // Using AmbientAware correctly relies on there being an Activity context. If there isn't, then
     // gracefully allow the composition of [block], but no ambient-mode functionality is enabled.
     val activity = LocalContext.current.findActivityOrNull()
-    val lifecycle = LocalLifecycleOwner.current.lifecycle
 
     val ambientState = rememberAmbientState(activity, lifecycle)
 

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
 
 /**
@@ -308,7 +309,7 @@ public object ScalingLazyColumnDefaults {
 
         return {
             val height = screenHeightDp.dp
-            val horizontalPadding = screenWidthDp.dp * horizontalPercent
+            val horizontalPadding = (screenWidthDp.dp * horizontalPercent).ceilPx()
 
             val topPadding = if (first != ItemType.Unspecified) {
                 first.topPaddingDp * height + first.paddingCorrection
@@ -318,7 +319,7 @@ public object ScalingLazyColumnDefaults {
                 } else {
                     32.dp
                 }
-            }
+            }.ceilPx()
 
             val bottomPadding = if (last != ItemType.Unspecified) {
                 last.bottomPaddingDp * height + first.paddingCorrection
@@ -331,7 +332,7 @@ public object ScalingLazyColumnDefaults {
                 } else {
                     0.dp
                 }
-            }
+            }.ceilPx()
 
             PaddingValues(
                 top = topPadding,
@@ -345,3 +346,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/sample/src/test/audit/Cards_backgroundimage_device204.png b/sample/src/test/audit/Cards_backgroundimage_device204.png
diff --git a/sample/src/test/audit/Cards_backgroundimage_device240.png b/sample/src/test/audit/Cards_backgroundimage_device240.png
diff --git a/sample/src/test/audit/Cards_backgroundimage_pixel_watch.png b/sample/src/test/audit/Cards_backgroundimage_pixel_watch.png
diff --git a/sample/src/test/audit/Cards_backgroundimage_pixel_watch_large_font.png b/sample/src/test/audit/Cards_backgroundimage_pixel_watch_large_font.png
diff --git a/sample/src/test/audit/Lists_nobottombutton_device204.png b/sample/src/test/audit/Lists_nobottombutton_device204.png
diff --git a/sample/src/test/audit/Lists_nobottombutton_device228.png b/sample/src/test/audit/Lists_nobottombutton_device228.png
diff --git a/sample/src/test/audit/Lists_nobottombutton_device240.png b/sample/src/test/audit/Lists_nobottombutton_device240.png
diff --git a/sample/src/test/audit/Lists_nobottombutton_pixel_watch.png b/sample/src/test/audit/Lists_nobottombutton_pixel_watch.png
diff --git a/sample/src/test/audit/Lists_nobottombutton_pixel_watch_large_font.png b/sample/src/test/audit/Lists_nobottombutton_pixel_watch_large_font.png
diff --git a/sample/src/test/audit/Lists_onebottombutton_device204.png b/sample/src/test/audit/Lists_onebottombutton_device204.png
diff --git a/sample/src/test/audit/Lists_onebottombutton_galaxy_watch_6_small_font.png b/sample/src/test/audit/Lists_onebottombutton_galaxy_watch_6_small_font.png
diff --git a/sample/src/test/audit/Lists_onebottomchip_device204.png b/sample/src/test/audit/Lists_onebottomchip_device204.png
diff --git a/sample/src/test/audit/Lists_onebottomchip_device228.png b/sample/src/test/audit/Lists_onebottomchip_device228.png
diff --git a/sample/src/test/audit/Lists_onebottomchip_device240.png b/sample/src/test/audit/Lists_onebottomchip_device240.png
diff --git a/sample/src/test/audit/Lists_onebottomchip_pixel_watch.png b/sample/src/test/audit/Lists_onebottomchip_pixel_watch.png
diff --git a/sample/src/test/audit/Lists_onebottomchip_pixel_watch_large_font.png b/sample/src/test/audit/Lists_onebottomchip_pixel_watch_large_font.png
diff --git a/sample/src/test/audit/Lists_twobottomround_device204.png b/sample/src/test/audit/Lists_twobottomround_device204.png
diff --git a/sample/src/test/audit/Lists_twobottomround_galaxy_watch_6_small_font.png b/sample/src/test/audit/Lists_twobottomround_galaxy_watch_6_small_font.png
diff --git a/sample/src/test/audit/MainMenu_bottom_device228.png b/sample/src/test/audit/MainMenu_bottom_device228.png
diff --git a/sample/src/test/audit/MainMenu_bottom_device240.png b/sample/src/test/audit/MainMenu_bottom_device240.png
diff --git a/sample/src/test/audit/MainMenu_bottom_pixel_watch.png b/sample/src/test/audit/MainMenu_bottom_pixel_watch.png
diff --git a/sample/src/test/audit/MainMenu_bottom_pixel_watch_large_font.png b/sample/src/test/audit/MainMenu_bottom_pixel_watch_large_font.png
diff --git a/sample/src/test/audit/MainMenu_top_device204.png b/sample/src/test/audit/MainMenu_top_device204.png
diff --git a/sample/src/test/audit/MainMenu_top_galaxy_watch_6_small_font.png b/sample/src/test/audit/MainMenu_top_galaxy_watch_6_small_font.png
diff --git a/sample/src/test/audit/PositionIndicator_bottomlong_device204.png b/sample/src/test/audit/PositionIndicator_bottomlong_device204.png
diff --git a/sample/src/test/audit/PositionIndicator_bottomlong_device228.png b/sample/src/test/audit/PositionIndicator_bottomlong_device228.png
diff --git a/sample/src/test/audit/PositionIndicator_bottomlong_device240.png b/sample/src/test/audit/PositionIndicator_bottomlong_device240.png
diff --git a/sample/src/test/audit/PositionIndicator_bottomlong_pixel_watch.png b/sample/src/test/audit/PositionIndicator_bottomlong_pixel_watch.png
diff --git a/sample/src/test/audit/PositionIndicator_bottomlong_pixel_watch_large_font.png b/sample/src/test/audit/PositionIndicator_bottomlong_pixel_watch_large_font.png
diff --git a/sample/src/test/audit/PositionIndicator_bottomshort_device204.png b/sample/src/test/audit/PositionIndicator_bottomshort_device204.png
diff --git a/sample/src/test/audit/PositionIndicator_bottomshort_device228.png b/sample/src/test/audit/PositionIndicator_bottomshort_device228.png
diff --git a/sample/src/test/audit/PositionIndicator_bottomshort_device240.png b/sample/src/test/audit/PositionIndicator_bottomshort_device240.png
diff --git a/sample/src/test/audit/PositionIndicator_bottomshort_pixel_watch.png b/sample/src/test/audit/PositionIndicator_bottomshort_pixel_watch.png
diff --git a/sample/src/test/audit/PositionIndicator_bottomshort_pixel_watch_large_font.png b/sample/src/test/audit/PositionIndicator_bottomshort_pixel_watch_large_font.png
diff --git a/sample/src/test/audit/PositionIndicator_middlelong_device204.png b/sample/src/test/audit/PositionIndicator_middlelong_device204.png
diff --git a/sample/src/test/audit/PositionIndicator_middleshort_device204.png b/sample/src/test/audit/PositionIndicator_middleshort_device204.png
diff --git a/sample/src/test/audit/PositionIndicator_toplong_device204.png b/sample/src/test/audit/PositionIndicator_toplong_device204.png
diff --git a/sample/src/test/audit/PositionIndicator_toplong_device240.png b/sample/src/test/audit/PositionIndicator_toplong_device240.png
diff --git a/sample/src/test/audit/PositionIndicator_toplong_pixel_watch.png b/sample/src/test/audit/PositionIndicator_toplong_pixel_watch.png
diff --git a/sample/src/test/audit/PositionIndicator_toplong_pixel_watch_large_font.png b/sample/src/test/audit/PositionIndicator_toplong_pixel_watch_large_font.png
diff --git a/sample/src/test/audit/PositionIndicator_topshort_device204.png b/sample/src/test/audit/PositionIndicator_topshort_device204.png
diff --git a/sample/src/test/audit/PositionIndicator_topshort_device240.png b/sample/src/test/audit/PositionIndicator_topshort_device240.png
diff --git a/sample/src/test/audit/PositionIndicator_topshort_pixel_watch.png b/sample/src/test/audit/PositionIndicator_topshort_pixel_watch.png
diff --git a/sample/src/test/audit/PositionIndicator_topshort_pixel_watch_large_font.png b/sample/src/test/audit/PositionIndicator_topshort_pixel_watch_large_font.png
diff --git a/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_6.png b/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_6.png
diff --git a/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_6_small_font.png b/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_6_small_font.png
diff --git a/sample/src/test/screenshots/SelectAccountScreenTest_ticwatch_pro_5.png b/sample/src/test/screenshots/SelectAccountScreenTest_ticwatch_pro_5.png
diff --git a/...ologist.screensizes_MediaPlayerLibraryTest_screenshot[0]_mobvoiticwatchpro5.png b/...ologist.screensizes_MediaPlayerLibraryTest_screenshot[0]_mobvoiticwatchpro5.png
diff --git a/...gist.screensizes_MediaPlayerLibraryTest_screenshot[7]_largedevicesmallfonts.png b/...gist.screensizes_MediaPlayerLibraryTest_screenshot[7]_largedevicesmallfonts.png
diff --git a/...ogist.screensizes_SectionedListDefaultTest_screenshot[0]_mobvoiticwatchpro5.png b/...ogist.screensizes_SectionedListDefaultTest_screenshot[0]_mobvoiticwatchpro5.png
diff --git a/...st.screensizes_SectionedListDefaultTest_screenshot[7]_largedevicesmallfonts.png b/...st.screensizes_SectionedListDefaultTest_screenshot[7]_largedevicesmallfonts.png
diff --git a/...rologist.spec_ScalingLazyColumnExamplesTest_sideCards[0]_mobvoiticwatchpro5.png b/...rologist.spec_ScalingLazyColumnExamplesTest_sideCards[0]_mobvoiticwatchpro5.png
diff --git a/...st.spec_ScalingLazyColumnExamplesTest_sideCards[2]_samsunggalaxywatch6large.png b/...st.spec_ScalingLazyColumnExamplesTest_sideCards[2]_samsunggalaxywatch6large.png
diff --git a/...horologist.spec_ScalingLazyColumnExamplesTest_sideCards[3]_googlepixelwatch.png b/...horologist.spec_ScalingLazyColumnExamplesTest_sideCards[3]_googlepixelwatch.png
diff --git a/...orologist.spec_ScalingLazyColumnExamplesTest_sideCards[4]_genericsmallround.png b/...orologist.spec_ScalingLazyColumnExamplesTest_sideCards[4]_genericsmallround.png
diff --git a/...orologist.spec_ScalingLazyColumnExamplesTest_sideCards[5]_genericlargeround.png b/...orologist.spec_ScalingLazyColumnExamplesTest_sideCards[5]_genericlargeround.png
diff --git a/...ologist.spec_ScalingLazyColumnExamplesTest_sideCards[6]_smalldevicebigfonts.png b/...ologist.spec_ScalingLazyColumnExamplesTest_sideCards[6]_smalldevicebigfonts.png
diff --git a/...ogist.spec_ScalingLazyColumnExamplesTest_sideCards[7]_largedevicesmallfonts.png b/...ogist.spec_ScalingLazyColumnExamplesTest_sideCards[7]_largedevicesmallfonts.png
diff --git a/...rologist.spec_ScalingLazyColumnExamplesTest_sideChips[0]_mobvoiticwatchpro5.png b/...rologist.spec_ScalingLazyColumnExamplesTest_sideChips[0]_mobvoiticwatchpro5.png
diff --git a/...st.spec_ScalingLazyColumnExamplesTest_sideChips[2]_samsunggalaxywatch6large.png b/...st.spec_ScalingLazyColumnExamplesTest_sideChips[2]_samsunggalaxywatch6large.png
diff --git a/...horologist.spec_ScalingLazyColumnExamplesTest_sideChips[3]_googlepixelwatch.png b/...horologist.spec_ScalingLazyColumnExamplesTest_sideChips[3]_googlepixelwatch.png
diff --git a/...orologist.spec_ScalingLazyColumnExamplesTest_sideChips[4]_genericsmallround.png b/...orologist.spec_ScalingLazyColumnExamplesTest_sideChips[4]_genericsmallround.png
diff --git a/...orologist.spec_ScalingLazyColumnExamplesTest_sideChips[5]_genericlargeround.png b/...orologist.spec_ScalingLazyColumnExamplesTest_sideChips[5]_genericlargeround.png
diff --git a/...ologist.spec_ScalingLazyColumnExamplesTest_sideChips[6]_smalldevicebigfonts.png b/...ologist.spec_ScalingLazyColumnExamplesTest_sideChips[6]_smalldevicebigfonts.png
diff --git a/...ogist.spec_ScalingLazyColumnExamplesTest_sideChips[7]_largedevicesmallfonts.png b/...ogist.spec_ScalingLazyColumnExamplesTest_sideChips[7]_largedevicesmallfonts.png
diff --git a/...rologist.spec_ScalingLazyColumnExamplesTest_sideMixed[0]_mobvoiticwatchpro5.png b/...rologist.spec_ScalingLazyColumnExamplesTest_sideMixed[0]_mobvoiticwatchpro5.png
diff --git a/...st.spec_ScalingLazyColumnExamplesTest_sideMixed[2]_samsunggalaxywatch6large.png b/...st.spec_ScalingLazyColumnExamplesTest_sideMixed[2]_samsunggalaxywatch6large.png
diff --git a/...horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[3]_googlepixelwatch.png b/...horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[3]_googlepixelwatch.png
diff --git a/...orologist.spec_ScalingLazyColumnExamplesTest_sideMixed[4]_genericsmallround.png b/...orologist.spec_ScalingLazyColumnExamplesTest_sideMixed[4]_genericsmallround.png
diff --git a/...orologist.spec_ScalingLazyColumnExamplesTest_sideMixed[5]_genericlargeround.png b/...orologist.spec_ScalingLazyColumnExamplesTest_sideMixed[5]_genericlargeround.png
diff --git a/...ologist.spec_ScalingLazyColumnExamplesTest_sideMixed[6]_smalldevicebigfonts.png b/...ologist.spec_ScalingLazyColumnExamplesTest_sideMixed[6]_smalldevicebigfonts.png
diff --git a/...ogist.spec_ScalingLazyColumnExamplesTest_sideMixed[7]_largedevicesmallfonts.png b/...ogist.spec_ScalingLazyColumnExamplesTest_sideMixed[7]_largedevicesmallfonts.png
diff --git a/...orologist.spec_ScalingLazyColumnExamplesTest_sideText[0]_mobvoiticwatchpro5.png b/...orologist.spec_ScalingLazyColumnExamplesTest_sideText[0]_mobvoiticwatchpro5.png
diff --git a/...logist.spec_ScalingLazyColumnExamplesTest_sideText[7]_largedevicesmallfonts.png b/...logist.spec_ScalingLazyColumnExamplesTest_sideText[7]_largedevicesmallfonts.png
diff --git a/...ogist.spec_ScalingLazyColumnExamplesTest_title1Button[0]_mobvoiticwatchpro5.png b/...ogist.spec_ScalingLazyColumnExamplesTest_title1Button[0]_mobvoiticwatchpro5.png
diff --git a/...gist.spec_ScalingLazyColumnExamplesTest_title1Button[1]_samsunggalaxywatch5.png b/...gist.spec_ScalingLazyColumnExamplesTest_title1Button[1]_samsunggalaxywatch5.png
diff --git a/...st.spec_ScalingLazyColumnExamplesTest_title1Button[7]_largedevicesmallfonts.png b/...st.spec_ScalingLazyColumnExamplesTest_title1Button[7]_largedevicesmallfonts.png
diff --git a/....spec_ScalingLazyColumnExamplesTest_title1CompactChip[0]_mobvoiticwatchpro5.png b/....spec_ScalingLazyColumnExamplesTest_title1CompactChip[0]_mobvoiticwatchpro5.png
diff --git a/...spec_ScalingLazyColumnExamplesTest_title1CompactChip[1]_samsunggalaxywatch5.png b/...spec_ScalingLazyColumnExamplesTest_title1CompactChip[1]_samsunggalaxywatch5.png
diff --git a/...ec_ScalingLazyColumnExamplesTest_title1CompactChip[7]_largedevicesmallfonts.png b/...ec_ScalingLazyColumnExamplesTest_title1CompactChip[7]_largedevicesmallfonts.png
diff --git a/...ologist.spec_ScalingLazyColumnExamplesTest_title1Line[0]_mobvoiticwatchpro5.png b/...ologist.spec_ScalingLazyColumnExamplesTest_title1Line[0]_mobvoiticwatchpro5.png
diff --git a/...gist.spec_ScalingLazyColumnExamplesTest_title1Line[7]_largedevicesmallfonts.png b/...gist.spec_ScalingLazyColumnExamplesTest_title1Line[7]_largedevicesmallfonts.png
diff --git a/...ogist.spec_ScalingLazyColumnExamplesTest_title2Button[0]_mobvoiticwatchpro5.png b/...ogist.spec_ScalingLazyColumnExamplesTest_title2Button[0]_mobvoiticwatchpro5.png
diff --git a/...spec_ScalingLazyColumnExamplesTest_title2Button[2]_samsunggalaxywatch6large.png b/...spec_ScalingLazyColumnExamplesTest_title2Button[2]_samsunggalaxywatch6large.png
diff --git a/...ologist.spec_ScalingLazyColumnExamplesTest_title2Button[3]_googlepixelwatch.png b/...ologist.spec_ScalingLazyColumnExamplesTest_title2Button[3]_googlepixelwatch.png
diff --git a/...logist.spec_ScalingLazyColumnExamplesTest_title2Button[4]_genericsmallround.png b/...logist.spec_ScalingLazyColumnExamplesTest_title2Button[4]_genericsmallround.png
diff --git a/...logist.spec_ScalingLazyColumnExamplesTest_title2Button[5]_genericlargeround.png b/...logist.spec_ScalingLazyColumnExamplesTest_title2Button[5]_genericlargeround.png
diff --git a/...gist.spec_ScalingLazyColumnExamplesTest_title2Button[6]_smalldevicebigfonts.png b/...gist.spec_ScalingLazyColumnExamplesTest_title2Button[6]_smalldevicebigfonts.png
diff --git a/...st.spec_ScalingLazyColumnExamplesTest_title2Button[7]_largedevicesmallfonts.png b/...st.spec_ScalingLazyColumnExamplesTest_title2Button[7]_largedevicesmallfonts.png
diff --git a/...logist.spec_ScalingLazyColumnExamplesTest_title2Lines[0]_mobvoiticwatchpro5.png b/...logist.spec_ScalingLazyColumnExamplesTest_title2Lines[0]_mobvoiticwatchpro5.png
diff --git a/...ist.spec_ScalingLazyColumnExamplesTest_title2Lines[7]_largedevicesmallfonts.png b/...ist.spec_ScalingLazyColumnExamplesTest_title2Lines[7]_largedevicesmallfonts.png
diff --git a/...logist.spec_ScalingLazyColumnExamplesTest_title3Lines[0]_mobvoiticwatchpro5.png b/...logist.spec_ScalingLazyColumnExamplesTest_title3Lines[0]_mobvoiticwatchpro5.png
diff --git a/...ist.spec_ScalingLazyColumnExamplesTest_title3Lines[7]_largedevicesmallfonts.png b/...ist.spec_ScalingLazyColumnExamplesTest_title3Lines[7]_largedevicesmallfonts.png
diff --git a/...st.spec_ScalingLazyColumnExamplesTest_titleOtherCards[0]_mobvoiticwatchpro5.png b/...st.spec_ScalingLazyColumnExamplesTest_titleOtherCards[0]_mobvoiticwatchpro5.png