google · yschimke · Jan 26, 2024 · Jan 26, 2024 · Jan 26, 2024 · Jan 26, 2024
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,7 +58,9 @@ public fun Confirmation(
     title: String? = null,
     durationMillis: Long = DialogDefaults.ShortDurationMillis,
     columnState: ScalingLazyColumnState = rememberColumnState(
-        ScalingLazyColumnDefaults.responsive(),
+        ScalingLazyColumnDefaults.responsive(
+            verticalArrangement = DialogDefaults.ConfirmationVerticalArrangement,
+        ),
     ),
 ) {
     // Always refer to the latest inputs with which Confirmation was recomposed.
@@ -72,7 +74,7 @@ public fun Confirmation(
     ) ?: durationMillis
 
     LaunchedEffect(showDialog, a11yDurationMillis) {
-        if (showDialog == true) {
+        if (showDialog) {
             delay(a11yDurationMillis)
             currentOnDismissed()
         }
@@ -99,7 +101,9 @@ public fun ConfirmationContent(
     icon: @Composable (() -> Unit)? = null,
     title: String? = null,
     columnState: ScalingLazyColumnState = rememberColumnState(
-        ScalingLazyColumnDefaults.responsive(),
+        ScalingLazyColumnDefaults.responsive(
+            verticalArrangement = DialogDefaults.ConfirmationVerticalArrangement,
+        ),
     ),
     showPositionIndicator: Boolean = true,
 ) {

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,14 +43,12 @@ 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/...d.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5.png b/...d.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5.png
diff --git a/...horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png b/...horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png
diff --git a/....horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5.png b/....horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5.png
diff --git a/...orologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png b/...orologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png
diff --git a/...logist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large.png b/...logist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large.png
diff --git a/...gist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png b/...gist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png
diff --git a/...oid.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch.png b/...oid.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch.png
diff --git a/...d.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png b/...d.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png
diff --git a/...id.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround.png b/...id.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround.png
diff --git a/....horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png b/....horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png
diff --git a/...id.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround.png b/...id.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround.png
diff --git a/....horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png b/....horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png
diff --git a/....horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts.png b/....horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts.png
diff --git a/...orologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png b/...orologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png
diff --git a/...orologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts.png b/...orologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts.png
diff --git a/...ologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png b/...ologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png
diff --git a/....android.horologist.screensizes_DialogTest_screenshot[0]_mobvoiticwatchpro5.png b/....android.horologist.screensizes_DialogTest_screenshot[0]_mobvoiticwatchpro5.png
diff --git a/...android.horologist.screensizes_DialogTest_screenshot[1]_samsunggalaxywatch5.png b/...android.horologist.screensizes_DialogTest_screenshot[1]_samsunggalaxywatch5.png
diff --git a/...id.horologist.screensizes_DialogTest_screenshot[2]_samsunggalaxywatch6large.png b/...id.horologist.screensizes_DialogTest_screenshot[2]_samsunggalaxywatch6large.png
diff --git a/...le.android.horologist.screensizes_DialogTest_screenshot[3]_googlepixelwatch.png b/...le.android.horologist.screensizes_DialogTest_screenshot[3]_googlepixelwatch.png
diff --git a/...e.android.horologist.screensizes_DialogTest_screenshot[4]_genericsmallround.png b/...e.android.horologist.screensizes_DialogTest_screenshot[4]_genericsmallround.png
diff --git a/...e.android.horologist.screensizes_DialogTest_screenshot[5]_genericlargeround.png b/...e.android.horologist.screensizes_DialogTest_screenshot[5]_genericlargeround.png
diff --git a/...android.horologist.screensizes_DialogTest_screenshot[6]_smalldevicebigfonts.png b/...android.horologist.screensizes_DialogTest_screenshot[6]_smalldevicebigfonts.png
diff --git a/...droid.horologist.screensizes_DialogTest_screenshot[7]_largedevicesmallfonts.png b/...droid.horologist.screensizes_DialogTest_screenshot[7]_largedevicesmallfonts.png
diff --git a/...ndroid.horologist.screensizes_DialogTest_wearMaterial[0]_mobvoiticwatchpro5.png b/...ndroid.horologist.screensizes_DialogTest_wearMaterial[0]_mobvoiticwatchpro5.png
diff --git a/...droid.horologist.screensizes_DialogTest_wearMaterial[1]_samsunggalaxywatch5.png b/...droid.horologist.screensizes_DialogTest_wearMaterial[1]_samsunggalaxywatch5.png
diff --git a/....horologist.screensizes_DialogTest_wearMaterial[2]_samsunggalaxywatch6large.png b/....horologist.screensizes_DialogTest_wearMaterial[2]_samsunggalaxywatch6large.png
diff --git a/....android.horologist.screensizes_DialogTest_wearMaterial[3]_googlepixelwatch.png b/....android.horologist.screensizes_DialogTest_wearMaterial[3]_googlepixelwatch.png
diff --git a/...android.horologist.screensizes_DialogTest_wearMaterial[4]_genericsmallround.png b/...android.horologist.screensizes_DialogTest_wearMaterial[4]_genericsmallround.png
diff --git a/...android.horologist.screensizes_DialogTest_wearMaterial[5]_genericlargeround.png b/...android.horologist.screensizes_DialogTest_wearMaterial[5]_genericlargeround.png
diff --git a/...droid.horologist.screensizes_DialogTest_wearMaterial[6]_smalldevicebigfonts.png b/...droid.horologist.screensizes_DialogTest_wearMaterial[6]_smalldevicebigfonts.png
diff --git a/...oid.horologist.screensizes_DialogTest_wearMaterial[7]_largedevicesmallfonts.png b/...oid.horologist.screensizes_DialogTest_wearMaterial[7]_largedevicesmallfonts.png