Merge remote-tracking branch 'origin/main' into DialogUpdates3

# Conflicts: # compose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5_2.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5_2.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large_2.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch_2.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround_2.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround_2.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts_2.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts_2.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[0]_mobvoiticwatchpro5.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[1]_samsunggalaxywatch5.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[2]_samsunggalaxywatch6large.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[3]_googlepixelwatch.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[4]_genericsmallround.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[5]_genericlargeround.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[6]_smalldevicebigfonts.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[7]_largedevicesmallfonts.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[0]_mobvoiticwatchpro5.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[1]_samsunggalaxywatch5.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[2]_samsunggalaxywatch6large.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[3]_googlepixelwatch.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[4]_genericsmallround.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[5]_genericlargeround.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[6]_smalldevicebigfonts.png # sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[7]_largedevicesmallfonts.png
google · Jan 26, 2024 · bbeab8c · bbeab8c
2 parents d4901a7 + a060669
commit bbeab8c
Show file tree

Hide file tree

Showing 43 changed files with 90 additions and 87 deletions.
diff --git a/...ose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt b/...ose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt
@@ -58,9 +58,7 @@ public fun Confirmation(
     title: String? = null,
     durationMillis: Long = DialogDefaults.ShortDurationMillis,
     columnState: ScalingLazyColumnState = rememberColumnState(
-        ScalingLazyColumnDefaults.responsive(
-            verticalArrangement = DialogDefaults.ConfirmationVerticalArrangement,
-        ),
+        ScalingLazyColumnDefaults.responsive(),
     ),
 ) {
     // Always refer to the latest inputs with which Confirmation was recomposed.
@@ -74,7 +72,7 @@ public fun Confirmation(
     ) ?: durationMillis
 
     LaunchedEffect(showDialog, a11yDurationMillis) {
-        if (showDialog) {
+        if (showDialog == true) {
             delay(a11yDurationMillis)
             currentOnDismissed()
         }
@@ -101,9 +99,7 @@ public fun ConfirmationContent(
     icon: @Composable (() -> Unit)? = null,
     title: String? = null,
     columnState: ScalingLazyColumnState = rememberColumnState(
-        ScalingLazyColumnDefaults.responsive(
-            verticalArrangement = DialogDefaults.ConfirmationVerticalArrangement,
-        ),
+        ScalingLazyColumnDefaults.responsive(),
     ),
     showPositionIndicator: Boolean = true,
 ) {

diff --git a/docs/compose-layout.md b/docs/compose-layout.md
@@ -1,5 +1,10 @@
 # Compose Layout library
 
+> [!IMPORTANT]
+> All the examples on this page make use of imports from Horologist's `compose-layout` and `compose-material`.
+> Add these dependencies and imports to ensure you are using the Horologist version of components with the same
+> name in Wear Compose, for example `Chip`.
+
 ## ScalingLazyColumn responsive() layout.
 
 The `responsive()` layout factory will ensure that your ScalingLazyColumn is positioned correctly

diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/DialogTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/DialogTest.kt
@@ -43,12 +43,14 @@ import com.google.android.horologist.compose.material.ResponsiveDialogContent
 import com.google.android.horologist.compose.material.ToggleChip
 import com.google.android.horologist.compose.material.ToggleChipToggleControl
 import com.google.android.horologist.compose.tools.Device
+import com.google.android.horologist.screenshots.ScreenshotTestRule
 import kotlinx.coroutines.runBlocking
 import org.junit.Test
 
 class DialogTest(device: Device) : ScreenSizeTest(
     device = device,
     showTimeText = false,
+    recordMode = ScreenshotTestRule.RecordMode.Record,
 ) {
 
     @Composable

diff --git a/...logist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png b/...logist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png
diff --git a/...ogist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png b/...ogist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png
diff --git a/....screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png b/....screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png
diff --git a/...rologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png b/...rologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png
diff --git a/...ologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png b/...ologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png
diff --git a/...ologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png b/...ologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png
diff --git a/...ogist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png b/...ogist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png
diff --git a/...ist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png b/...ist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png
diff --git a/....horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5.png b/....horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5.png
diff --git a/...orologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5_2.png b/...orologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5_2.png
diff --git a/...horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5.png b/...horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5.png
diff --git a/...rologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5_2.png b/...rologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5_2.png
diff --git a/...ogist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large.png b/...ogist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large.png
diff --git a/...ist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large_2.png b/...ist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large_2.png
diff --git a/...id.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch.png b/...id.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch.png
diff --git a/....horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch_2.png b/....horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch_2.png
diff --git a/...d.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround.png b/...d.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround.png
diff --git a/...horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround_2.png b/...horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround_2.png
diff --git a/...d.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround.png b/...d.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround.png
diff --git a/...horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround_2.png b/...horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround_2.png
diff --git a/...horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts.png b/...horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts.png
diff --git a/...rologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts_2.png b/...rologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts_2.png
diff --git a/...rologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts.png b/...rologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts.png
diff --git a/...logist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts_2.png b/...logist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts_2.png
diff --git a/...ologist.screensizes_DialogTest_iconAndTextAlertScreen[0]_mobvoiticwatchpro5.png b/...ologist.screensizes_DialogTest_iconAndTextAlertScreen[0]_mobvoiticwatchpro5.png
diff --git a/...logist.screensizes_DialogTest_iconAndTextAlertScreen[1]_samsunggalaxywatch5.png b/...logist.screensizes_DialogTest_iconAndTextAlertScreen[1]_samsunggalaxywatch5.png
diff --git a/...t.screensizes_DialogTest_iconAndTextAlertScreen[2]_samsunggalaxywatch6large.png b/...t.screensizes_DialogTest_iconAndTextAlertScreen[2]_samsunggalaxywatch6large.png
diff --git a/...orologist.screensizes_DialogTest_iconAndTextAlertScreen[3]_googlepixelwatch.png b/...orologist.screensizes_DialogTest_iconAndTextAlertScreen[3]_googlepixelwatch.png
diff --git a/...rologist.screensizes_DialogTest_iconAndTextAlertScreen[4]_genericsmallround.png b/...rologist.screensizes_DialogTest_iconAndTextAlertScreen[4]_genericsmallround.png
diff --git a/...rologist.screensizes_DialogTest_iconAndTextAlertScreen[5]_genericlargeround.png b/...rologist.screensizes_DialogTest_iconAndTextAlertScreen[5]_genericlargeround.png
diff --git a/...logist.screensizes_DialogTest_iconAndTextAlertScreen[6]_smalldevicebigfonts.png b/...logist.screensizes_DialogTest_iconAndTextAlertScreen[6]_smalldevicebigfonts.png
diff --git a/...gist.screensizes_DialogTest_iconAndTextAlertScreen[7]_largedevicesmallfonts.png b/...gist.screensizes_DialogTest_iconAndTextAlertScreen[7]_largedevicesmallfonts.png
diff --git a/...oid.horologist.screensizes_DialogTest_textAlertScreen[0]_mobvoiticwatchpro5.png b/...oid.horologist.screensizes_DialogTest_textAlertScreen[0]_mobvoiticwatchpro5.png
diff --git a/...id.horologist.screensizes_DialogTest_textAlertScreen[1]_samsunggalaxywatch5.png b/...id.horologist.screensizes_DialogTest_textAlertScreen[1]_samsunggalaxywatch5.png
diff --git a/...rologist.screensizes_DialogTest_textAlertScreen[2]_samsunggalaxywatch6large.png b/...rologist.screensizes_DialogTest_textAlertScreen[2]_samsunggalaxywatch6large.png
diff --git a/...droid.horologist.screensizes_DialogTest_textAlertScreen[3]_googlepixelwatch.png b/...droid.horologist.screensizes_DialogTest_textAlertScreen[3]_googlepixelwatch.png
diff --git a/...roid.horologist.screensizes_DialogTest_textAlertScreen[4]_genericsmallround.png b/...roid.horologist.screensizes_DialogTest_textAlertScreen[4]_genericsmallround.png
diff --git a/...roid.horologist.screensizes_DialogTest_textAlertScreen[5]_genericlargeround.png b/...roid.horologist.screensizes_DialogTest_textAlertScreen[5]_genericlargeround.png
diff --git a/...id.horologist.screensizes_DialogTest_textAlertScreen[6]_smalldevicebigfonts.png b/...id.horologist.screensizes_DialogTest_textAlertScreen[6]_smalldevicebigfonts.png
diff --git a/....horologist.screensizes_DialogTest_textAlertScreen[7]_largedevicesmallfonts.png b/....horologist.screensizes_DialogTest_textAlertScreen[7]_largedevicesmallfonts.png