Update Confirmation to use the default confirmation vertical arrangem…

…ent, which is to vertically center the contents.
google · Jan 26, 2024 · 1c4c962 · 1c4c962
1 parent bbeab8c
commit 1c4c962
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 21 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,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