Fixes

google · Oct 31, 2023 · 8849f1c · 8849f1c
1 parent c26c2b6
commit 8849f1c
Show file tree

Hide file tree

Showing 17 changed files with 75 additions and 39 deletions.
diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/SectionedListTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/SectionedListTest.kt
@@ -21,7 +21,6 @@
 package com.google.android.horologist.composables
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -195,7 +194,9 @@ class SectionedListTest : ScreenshotBaseTest(
             content: @Composable () -> Unit,
         ) {
             Scaffold(
-                modifier = Modifier.fillMaxSize(),
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(Color.Black),
                 positionIndicator = {
                     PositionIndicator(columnState.state)
                 },
@@ -206,9 +207,7 @@ class SectionedListTest : ScreenshotBaseTest(
                     )
                 },
             ) {
-                Box(modifier = Modifier.background(Color.Black)) {
-                    content()
-                }
+                content()
             }
         }
 

diff --git a/...google.android.horologist.composables_SectionedListHeaderFooterTest_test[1].png b/...google.android.horologist.composables_SectionedListHeaderFooterTest_test[1].png
diff --git a/...google.android.horologist.composables_SectionedListHeaderFooterTest_test[2].png b/...google.android.horologist.composables_SectionedListHeaderFooterTest_test[2].png
diff --git a/...google.android.horologist.composables_SectionedListHeaderFooterTest_test[3].png b/...google.android.horologist.composables_SectionedListHeaderFooterTest_test[3].png
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/...ogle.android.horologist.composables_SectionedListTest_emptyContentForStates.png b/...ogle.android.horologist.composables_SectionedListTest_emptyContentForStates.png
diff --git a/...s/com.google.android.horologist.composables_SectionedListTest_loadedSection.png b/...s/com.google.android.horologist.composables_SectionedListTest_loadedSection.png
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/SectionedListTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/SectionedListTest.kt
@@ -16,18 +16,55 @@
 
 package com.google.android.horologist.screensizes
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.wear.compose.material.PositionIndicator
+import androidx.wear.compose.material.Scaffold
+import androidx.wear.compose.material.TimeText
 import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults
+import com.google.android.horologist.compose.layout.ScalingLazyColumnState
+import com.google.android.horologist.compose.layout.scrollAway
 import com.google.android.horologist.compose.tools.Device
+import com.google.android.horologist.screenshots.FixedTimeSource
 import com.google.android.horologist.sectionedlist.SectionedListMenuScreen
 
 class SectionedListTest(device: Device) : ScreenSizeTest(device = device, showTimeText = false) {
 
     @Composable
     override fun Content() {
-        SectionedListMenuScreen(
-            navigateToRoute = {},
-            columnState = ScalingLazyColumnDefaults.responsive().create(),
-        )
+        val columnState = ScalingLazyColumnDefaults.responsive().create()
+
+        SectionedListPreview(columnState) {
+            SectionedListMenuScreen(
+                navigateToRoute = {},
+                columnState = columnState,
+            )
+        }
+    }
+
+    @Composable
+    fun SectionedListPreview(
+        columnState: ScalingLazyColumnState,
+        content: @Composable () -> Unit,
+    ) {
+        Scaffold(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(Color.Black),
+            positionIndicator = {
+                PositionIndicator(columnState.state)
+            },
+            timeText = {
+                TimeText(
+                    modifier = Modifier.scrollAway(columnState),
+                    timeSource = FixedTimeSource,
+                )
+            },
+        ) {
+            content()
+        }
     }
 }
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/...oid.horologist.screensizes_SectionedListTest_screenshot[3]_googlepixelwatch.png b/...oid.horologist.screensizes_SectionedListTest_screenshot[3]_googlepixelwatch.png
diff --git a/...id.horologist.screensizes_SectionedListTest_screenshot[4]_genericsmallround.png b/...id.horologist.screensizes_SectionedListTest_screenshot[4]_genericsmallround.png
diff --git a/...id.horologist.screensizes_SectionedListTest_screenshot[5]_genericlargeround.png b/...id.horologist.screensizes_SectionedListTest_screenshot[5]_genericlargeround.png
diff --git a/....horologist.screensizes_SectionedListTest_screenshot[6]_smalldevicebigfonts.png b/....horologist.screensizes_SectionedListTest_screenshot[6]_smalldevicebigfonts.png
diff --git a/...orologist.screensizes_SectionedListTest_screenshot[7]_largedevicesmallfonts.png b/...orologist.screensizes_SectionedListTest_screenshot[7]_largedevicesmallfonts.png