From 554b5968de6ccd13ece519428e0ba2421577b19f Mon Sep 17 00:00:00 2001 From: stevebower Date: Fri, 26 Jan 2024 13:53:17 +0000 Subject: [PATCH 1/4] Add further test cases for responsive dialogs, update AlertDialog variations to handle more cases. --- compose-material/api/current.api | 6 +- .../compose/material/AlertDialog.kt | 28 ++-- .../compose/material/Confirmation.kt | 90 +++++++++++++ .../compose/material/ResponsiveDialog.kt | 3 +- .../SampleConfirmationScreen.kt | 43 ++++++ .../android/horologist/sample/MenuScreen.kt | 9 +- .../horologist/sample/SampleWearApp.kt | 8 ++ .../android/horologist/sample/Screen.kt | 1 + sample/src/main/res/values/strings.xml | 3 +- .../horologist/screensizes/DialogTest.kt | 125 ++++++++++++++++++ ...nfirmationScreen[0]_mobvoiticwatchpro5.png | 3 + ...firmationScreen[1]_samsunggalaxywatch5.png | 3 + ...tionScreen[2]_samsunggalaxywatch6large.png | 3 + ...ConfirmationScreen[3]_googlepixelwatch.png | 3 + ...onfirmationScreen[4]_genericsmallround.png | 3 + ...onfirmationScreen[5]_genericlargeround.png | 3 + ...firmationScreen[6]_smalldevicebigfonts.png | 3 + ...rmationScreen[7]_largedevicesmallfonts.png | 3 + ...tterySaverScreen[0]_mobvoiticwatchpro5.png | 3 + ...erySaverScreen[0]_mobvoiticwatchpro5_2.png | 3 + ...terySaverScreen[1]_samsunggalaxywatch5.png | 3 + ...rySaverScreen[1]_samsunggalaxywatch5_2.png | 3 + ...averScreen[2]_samsunggalaxywatch6large.png | 3 + ...erScreen[2]_samsunggalaxywatch6large_2.png | 3 + ...batterySaverScreen[3]_googlepixelwatch.png | 3 + ...tterySaverScreen[3]_googlepixelwatch_2.png | 3 + ...atterySaverScreen[4]_genericsmallround.png | 3 + ...terySaverScreen[4]_genericsmallround_2.png | 3 + ...atterySaverScreen[5]_genericlargeround.png | 3 + ...terySaverScreen[5]_genericlargeround_2.png | 3 + ...terySaverScreen[6]_smalldevicebigfonts.png | 3 + ...rySaverScreen[6]_smalldevicebigfonts_2.png | 3 + ...rySaverScreen[7]_largedevicesmallfonts.png | 3 + ...SaverScreen[7]_largedevicesmallfonts_2.png | 3 + ...dTextAlertScreen[0]_mobvoiticwatchpro5.png | 3 + ...TextAlertScreen[1]_samsunggalaxywatch5.png | 3 + ...lertScreen[2]_samsunggalaxywatch6large.png | 3 + ...AndTextAlertScreen[3]_googlepixelwatch.png | 3 + ...ndTextAlertScreen[4]_genericsmallround.png | 3 + ...ndTextAlertScreen[5]_genericlargeround.png | 3 + ...TextAlertScreen[6]_smalldevicebigfonts.png | 3 + ...xtAlertScreen[7]_largedevicesmallfonts.png | 3 + ...ongDialogScreen1[0]_mobvoiticwatchpro5.png | 4 +- ...gDialogScreen1[0]_mobvoiticwatchpro5_2.png | 4 +- ...ngDialogScreen1[1]_samsunggalaxywatch5.png | 4 +- ...DialogScreen1[1]_samsunggalaxywatch5_2.png | 4 +- ...logScreen1[2]_samsunggalaxywatch6large.png | 4 +- ...gScreen1[2]_samsunggalaxywatch6large_2.png | 4 +- ..._longDialogScreen1[3]_googlepixelwatch.png | 4 +- ...ongDialogScreen1[3]_googlepixelwatch_2.png | 4 +- ...longDialogScreen1[4]_genericsmallround.png | 4 +- ...ngDialogScreen1[4]_genericsmallround_2.png | 4 +- ...longDialogScreen1[5]_genericlargeround.png | 4 +- ...ngDialogScreen1[5]_genericlargeround_2.png | 4 +- ...ngDialogScreen1[6]_smalldevicebigfonts.png | 4 +- ...DialogScreen1[6]_smalldevicebigfonts_2.png | 4 +- ...DialogScreen1[7]_largedevicesmallfonts.png | 4 +- ...alogScreen1[7]_largedevicesmallfonts_2.png | 4 +- ...gTest_screenshot[0]_mobvoiticwatchpro5.png | 4 +- ...Test_screenshot[1]_samsunggalaxywatch5.png | 4 +- ...screenshot[2]_samsunggalaxywatch6large.png | 4 +- ...logTest_screenshot[3]_googlepixelwatch.png | 4 +- ...ogTest_screenshot[4]_genericsmallround.png | 4 +- ...ogTest_screenshot[5]_genericlargeround.png | 4 +- ...Test_screenshot[6]_smalldevicebigfonts.png | 4 +- ...st_screenshot[7]_largedevicesmallfonts.png | 4 +- ..._textAlertScreen[0]_mobvoiticwatchpro5.png | 3 + ...textAlertScreen[1]_samsunggalaxywatch5.png | 3 + ...lertScreen[2]_samsunggalaxywatch6large.png | 3 + ...st_textAlertScreen[3]_googlepixelwatch.png | 3 + ...t_textAlertScreen[4]_genericsmallround.png | 3 + ...t_textAlertScreen[5]_genericlargeround.png | 3 + ...textAlertScreen[6]_smalldevicebigfonts.png | 3 + ...xtAlertScreen[7]_largedevicesmallfonts.png | 3 + ...est_wearMaterial[0]_mobvoiticwatchpro5.png | 4 +- ...st_wearMaterial[1]_samsunggalaxywatch5.png | 4 +- ...arMaterial[2]_samsunggalaxywatch6large.png | 4 +- ...gTest_wearMaterial[3]_googlepixelwatch.png | 4 +- ...Test_wearMaterial[4]_genericsmallround.png | 4 +- ...Test_wearMaterial[5]_genericlargeround.png | 4 +- ...st_wearMaterial[6]_smalldevicebigfonts.png | 4 +- ..._wearMaterial[7]_largedevicesmallfonts.png | 4 +- 82 files changed, 485 insertions(+), 79 deletions(-) create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5_2.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5_2.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large_2.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch_2.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround_2.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround_2.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts_2.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts_2.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[0]_mobvoiticwatchpro5.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[1]_samsunggalaxywatch5.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[2]_samsunggalaxywatch6large.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[3]_googlepixelwatch.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[4]_genericsmallround.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[5]_genericlargeround.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[6]_smalldevicebigfonts.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[7]_largedevicesmallfonts.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[0]_mobvoiticwatchpro5.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[1]_samsunggalaxywatch5.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[2]_samsunggalaxywatch6large.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[3]_googlepixelwatch.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[4]_genericsmallround.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[5]_genericlargeround.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[6]_smalldevicebigfonts.png create mode 100644 sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[7]_largedevicesmallfonts.png diff --git a/compose-material/api/current.api b/compose-material/api/current.api index 299f23c2eb..7729ab6e70 100644 --- a/compose-material/api/current.api +++ b/compose-material/api/current.api @@ -2,8 +2,8 @@ package com.google.android.horologist.compose.material { public final class AlertDialogKt { - method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void AlertContent(String message, kotlin.jvm.functions.Function0? onCancelButtonClick, kotlin.jvm.functions.Function0? onOKButtonClick, optional String? title, optional String okButtonContentDescription, optional String cancelButtonContentDescription, optional com.google.android.horologist.compose.layout.ScalingLazyColumnState columnState, optional boolean showPositionIndicator); - method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void AlertDialog(String message, kotlin.jvm.functions.Function0 onCancelButtonClick, kotlin.jvm.functions.Function0 onOKButtonClick, boolean showDialog, optional androidx.compose.ui.Modifier modifier, optional String? title, optional String okButtonContentDescription, optional String cancelButtonContentDescription, optional com.google.android.horologist.compose.layout.ScalingLazyColumnState columnState); + method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void AlertContent(kotlin.jvm.functions.Function0? onCancelButtonClick, kotlin.jvm.functions.Function0? onOKButtonClick, optional kotlin.jvm.functions.Function0? icon, optional String? title, optional String? message, optional String okButtonContentDescription, optional String cancelButtonContentDescription, optional com.google.android.horologist.compose.layout.ScalingLazyColumnState columnState, optional boolean showPositionIndicator); + method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void AlertDialog(kotlin.jvm.functions.Function0 onCancelButtonClick, kotlin.jvm.functions.Function0 onOKButtonClick, boolean showDialog, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional String? title, optional String? message, optional String okButtonContentDescription, optional String cancelButtonContentDescription, optional com.google.android.horologist.compose.layout.ScalingLazyColumnState columnState); } public final class ButtonKt { @@ -59,7 +59,9 @@ package com.google.android.horologist.compose.material { } public final class ConfirmationKt { + method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void Confirmation(boolean showDialog, kotlin.jvm.functions.Function0 onTimeout, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional String? title, optional long durationMillis, optional com.google.android.horologist.compose.layout.ScalingLazyColumnState columnState); method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void Confirmation(kotlin.jvm.functions.Function0 onTimeout, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1? icon, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState scrollState, optional long durationMillis, optional long backgroundColor, optional long contentColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1 content); + method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void ConfirmationContent(optional kotlin.jvm.functions.Function0? icon, optional String? title, optional com.google.android.horologist.compose.layout.ScalingLazyColumnState columnState, optional boolean showPositionIndicator); } public final class IconKt { diff --git a/compose-material/src/main/java/com/google/android/horologist/compose/material/AlertDialog.kt b/compose-material/src/main/java/com/google/android/horologist/compose/material/AlertDialog.kt index 9dacf04576..03d1441964 100644 --- a/compose-material/src/main/java/com/google/android/horologist/compose/material/AlertDialog.kt +++ b/compose-material/src/main/java/com/google/android/horologist/compose/material/AlertDialog.kt @@ -20,6 +20,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow import androidx.wear.compose.material.MaterialTheme import androidx.wear.compose.material.Text import androidx.wear.compose.material.dialog.Dialog @@ -37,12 +38,13 @@ import com.google.android.horologist.compose.layout.rememberColumnState @ExperimentalHorologistApi @Composable public fun AlertDialog( - message: String, onCancelButtonClick: () -> Unit, onOKButtonClick: () -> Unit, showDialog: Boolean, modifier: Modifier = Modifier, + icon: @Composable (() -> Unit)? = null, title: String? = null, + message: String? = null, okButtonContentDescription: String = stringResource(android.R.string.ok), cancelButtonContentDescription: String = stringResource(android.R.string.cancel), columnState: ScalingLazyColumnState = rememberColumnState( @@ -56,6 +58,7 @@ public fun AlertDialog( scrollState = columnState.state, ) { AlertContent( + icon = icon, title = title, message = message, onCancelButtonClick = onCancelButtonClick, @@ -71,10 +74,11 @@ public fun AlertDialog( @ExperimentalHorologistApi @Composable public fun AlertContent( - message: String, onCancelButtonClick: (() -> Unit)?, onOKButtonClick: (() -> Unit)?, + icon: @Composable (() -> Unit)? = null, title: String? = null, + message: String? = null, okButtonContentDescription: String = stringResource(android.R.string.ok), cancelButtonContentDescription: String = stringResource(android.R.string.cancel), columnState: ScalingLazyColumnState = rememberColumnState( @@ -83,23 +87,27 @@ public fun AlertContent( showPositionIndicator: Boolean = true, ) { ResponsiveDialogContent( + icon = icon, title = title?.let { { Text( text = it, color = MaterialTheme.colors.onBackground, textAlign = TextAlign.Center, - maxLines = 3, + maxLines = if (icon == null) 3 else 2, + overflow = TextOverflow.Ellipsis, ) } }, - message = { - Text( - text = message, - color = MaterialTheme.colors.onBackground, - textAlign = TextAlign.Center, - maxLines = 3, - ) + message = message?.let { + { + Text( + text = it, + color = MaterialTheme.colors.onBackground, + textAlign = TextAlign.Center, + maxLines = 3, + ) + } }, onOkButtonClick = onOKButtonClick, onCancelButtonClick = onCancelButtonClick, diff --git a/compose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt b/compose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt index bc3611f640..36b3a61e85 100644 --- a/compose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt +++ b/compose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt @@ -20,16 +20,106 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalAccessibilityManager +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow import androidx.wear.compose.foundation.lazy.ScalingLazyListState import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState import androidx.wear.compose.material.MaterialTheme +import androidx.wear.compose.material.Text import androidx.wear.compose.material.contentColorFor import androidx.wear.compose.material.dialog.Confirmation +import androidx.wear.compose.material.dialog.Dialog import androidx.wear.compose.material.dialog.DialogDefaults import com.google.android.horologist.annotations.ExperimentalHorologistApi +import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults +import com.google.android.horologist.compose.layout.ScalingLazyColumnState +import com.google.android.horologist.compose.layout.rememberColumnState +import kotlinx.coroutines.delay + +/** + * This component is an alternative to [ConfirmationContent], providing the following: + * - a convenient way of passing a title and an icon; + * - duration; + * - wrapped in a [Dialog]; + */ +@ExperimentalHorologistApi +@Composable +public fun Confirmation( + showDialog: Boolean, + onTimeout: () -> Unit, + modifier: Modifier = Modifier, + icon: @Composable (() -> Unit)? = null, + title: String? = null, + durationMillis: Long = DialogDefaults.ShortDurationMillis, + columnState: ScalingLazyColumnState = rememberColumnState( + ScalingLazyColumnDefaults.responsive(), + ), +) { + // Always refer to the latest inputs with which Confirmation was recomposed. + val currentOnDismissed by rememberUpdatedState(onTimeout) + + val a11yDurationMillis = LocalAccessibilityManager.current?.calculateRecommendedTimeoutMillis( + originalTimeoutMillis = durationMillis, + containsIcons = icon != null, + containsText = title != null, + containsControls = false, + ) ?: durationMillis + + LaunchedEffect(showDialog, a11yDurationMillis) { + if (showDialog == true) { + delay(a11yDurationMillis) + currentOnDismissed() + } + } + + Dialog( + showDialog = showDialog, + onDismissRequest = currentOnDismissed, + modifier = modifier, + scrollState = columnState.state, + ) { + ConfirmationContent( + icon = icon, + title = title, + columnState = columnState, + showPositionIndicator = false, + ) + } +} + +@ExperimentalHorologistApi +@Composable +public fun ConfirmationContent( + icon: @Composable (() -> Unit)? = null, + title: String? = null, + columnState: ScalingLazyColumnState = rememberColumnState( + ScalingLazyColumnDefaults.responsive(), + ), + showPositionIndicator: Boolean = true, +) { + ResponsiveDialogContent( + icon = icon, + title = title?.let { + { + Text( + text = it, + color = MaterialTheme.colors.onBackground, + textAlign = TextAlign.Center, + maxLines = if (icon == null) 3 else 2, + overflow = TextOverflow.Ellipsis, + ) + } + }, + state = columnState, + showPositionIndicator = showPositionIndicator, + ) +} /** * A wrapper for [Confirmation] component, that calculates the value passed to [durationMillis] for diff --git a/compose-material/src/main/java/com/google/android/horologist/compose/material/ResponsiveDialog.kt b/compose-material/src/main/java/com/google/android/horologist/compose/material/ResponsiveDialog.kt index 93a1ca8ec0..c93f9ad918 100644 --- a/compose-material/src/main/java/com/google/android/horologist/compose/material/ResponsiveDialog.kt +++ b/compose-material/src/main/java/com/google/android/horologist/compose/material/ResponsiveDialog.kt @@ -57,7 +57,8 @@ public fun ResponsiveDialogContent( onCancelButtonClick: (() -> Unit)? = null, okButtonContentDescription: String = stringResource(R.string.ok), cancelButtonContentDescription: String = stringResource(R.string.cancel), - state: ScalingLazyColumnState = rememberColumnState(responsive(firstItemIsFullWidth = icon == null)), + state: ScalingLazyColumnState = + rememberColumnState(responsive(firstItemIsFullWidth = icon == null)), showPositionIndicator: Boolean = true, content: (ScalingLazyListScope.() -> Unit)? = null, ) { diff --git a/sample/src/main/java/com/google/android/horologist/materialcomponents/SampleConfirmationScreen.kt b/sample/src/main/java/com/google/android/horologist/materialcomponents/SampleConfirmationScreen.kt index e6caf777d3..05d5737be5 100644 --- a/sample/src/main/java/com/google/android/horologist/materialcomponents/SampleConfirmationScreen.kt +++ b/sample/src/main/java/com/google/android/horologist/materialcomponents/SampleConfirmationScreen.kt @@ -16,9 +16,24 @@ package com.google.android.horologist.materialcomponents +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Check import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import androidx.wear.compose.material.Chip +import androidx.wear.compose.material.ChipDefaults +import androidx.wear.compose.material.Icon import androidx.wear.compose.material.Text import com.google.android.horologist.compose.material.Confirmation @@ -34,6 +49,34 @@ internal fun SampleConfirmationScreen( } } +@Composable +internal fun SampleConfirmationLauncher() { + var showDialog by remember { mutableStateOf(false) } + Column( + modifier = Modifier.fillMaxSize().padding(horizontal = 20.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Chip( + onClick = { showDialog = true }, + label = { Text("Show dialog") }, + colors = ChipDefaults.secondaryChipColors(), + ) + } + Confirmation( + showDialog = showDialog, + onTimeout = { showDialog = false }, + icon = { + Icon( + imageVector = Icons.Filled.Check, + contentDescription = "Completed", + tint = Color.Green, + ) + }, + title = "Alarm in 23 hr 59 min", + ) +} + @Composable private fun ConfirmationContent() { Text(text = "Confirmation Content") diff --git a/sample/src/main/java/com/google/android/horologist/sample/MenuScreen.kt b/sample/src/main/java/com/google/android/horologist/sample/MenuScreen.kt index ac71035648..86d08b7ed1 100644 --- a/sample/src/main/java/com/google/android/horologist/sample/MenuScreen.kt +++ b/sample/src/main/java/com/google/android/horologist/sample/MenuScreen.kt @@ -135,11 +135,18 @@ fun MenuScreen( } item { Chip( - label = stringResource(id = R.string.sample_material_confirmation_dialog), + label = stringResource(id = R.string.sample_material_confirmation_screen), modifier = modifier.fillMaxWidth(), onClick = { navigateToRoute(Screen.MaterialConfirmationScreen.route) }, ) } + item { + Chip( + label = stringResource(id = R.string.sample_material_confirmation_launcher), + modifier = modifier.fillMaxWidth(), + onClick = { navigateToRoute(Screen.MaterialConfirmationLauncher.route) }, + ) + } item { Chip( label = stringResource(id = R.string.sample_material_icon), diff --git a/sample/src/main/java/com/google/android/horologist/sample/SampleWearApp.kt b/sample/src/main/java/com/google/android/horologist/sample/SampleWearApp.kt index 2a528a2a52..a4a090e9a9 100644 --- a/sample/src/main/java/com/google/android/horologist/sample/SampleWearApp.kt +++ b/sample/src/main/java/com/google/android/horologist/sample/SampleWearApp.kt @@ -45,6 +45,7 @@ import com.google.android.horologist.materialcomponents.SampleButtonScreen import com.google.android.horologist.materialcomponents.SampleChipIconWithProgressScreen import com.google.android.horologist.materialcomponents.SampleChipScreen import com.google.android.horologist.materialcomponents.SampleCompactChipScreen +import com.google.android.horologist.materialcomponents.SampleConfirmationLauncher import com.google.android.horologist.materialcomponents.SampleConfirmationScreen import com.google.android.horologist.materialcomponents.SampleIconScreen import com.google.android.horologist.materialcomponents.SampleOutlinedChipScreen @@ -222,6 +223,13 @@ fun SampleWearApp() { SampleConfirmationScreen() } } + composable( + route = Screen.MaterialConfirmationLauncher.route, + ) { + ScreenScaffold(timeText = {}) { + SampleConfirmationLauncher() + } + } composable( route = Screen.MaterialIconScreen.route, ) { diff --git a/sample/src/main/java/com/google/android/horologist/sample/Screen.kt b/sample/src/main/java/com/google/android/horologist/sample/Screen.kt index 859d0301d6..a44ff426dd 100644 --- a/sample/src/main/java/com/google/android/horologist/sample/Screen.kt +++ b/sample/src/main/java/com/google/android/horologist/sample/Screen.kt @@ -36,6 +36,7 @@ sealed class Screen( object MaterialChipIconWithProgressScreen : Screen("materialChipIconWithProgressScreen") object MaterialCompactChipsScreen : Screen("materialCompactChips") object MaterialConfirmationScreen : Screen("materialConfirmationScreen") + object MaterialConfirmationLauncher : Screen("materialConfirmationLauncher") object MaterialIconScreen : Screen("materialIconScreen") object MaterialOutlinedChipScreen : Screen("materialOutlinedChipScreen") object MaterialOutlinedCompactChipScreen : Screen("materialOutlinedCompactChipScreen") diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml index 9b926566d8..18803086d4 100644 --- a/sample/src/main/res/values/strings.xml +++ b/sample/src/main/res/values/strings.xml @@ -28,7 +28,8 @@ Material Chips Sample Material Chip Icon With Progress Material Compact Chips - Material Confirmation Dialog + Material Confirmation Screen + Material Confirmation Launcher Material Icon Material Outlined Chips Material Outlined Compact Chips 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 index 0f39ed1d43..4f5b4f832a 100644 --- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/DialogTest.kt +++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/DialogTest.kt @@ -20,9 +20,17 @@ import android.R import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.outlined.Battery1Bar +import androidx.compose.material.icons.outlined.Info import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign +import androidx.wear.compose.material.Chip +import androidx.wear.compose.material.ChipDefaults +import androidx.wear.compose.material.Icon +import androidx.wear.compose.material.LocalTextStyle import androidx.wear.compose.material.MaterialTheme import androidx.wear.compose.material.Text import androidx.wear.compose.material.dialog.Alert @@ -30,16 +38,19 @@ import com.google.android.horologist.compose.layout.ScalingLazyColumnState import com.google.android.horologist.compose.layout.rememberColumnState import com.google.android.horologist.compose.material.AlertContent import com.google.android.horologist.compose.material.Button +import com.google.android.horologist.compose.material.ConfirmationContent 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 @@ -130,4 +141,118 @@ class DialogTest(device: Device) : ScreenSizeTest( } } } + + @Test + fun batterySaverScreen() { + lateinit var columnState: ScalingLazyColumnState + + runTest(testFn = { + screenshotTestRule.interact { + runBlocking { + columnState.state.scrollToItem(999, 0) + } + } + + screenshotTestRule.takeScreenshot() + }) { + columnState = rememberColumnState() + + ResponsiveDialogContent( + icon = { + Icon( + imageVector = Icons.Outlined.Info, + contentDescription = "Info", + ) + }, + title = { + Text( + text = "Enable Battery Saver Mode?", + color = MaterialTheme.colors.onBackground, + textAlign = TextAlign.Center, + maxLines = 3, + ) + }, + message = { + Text( + text = "Your battery is low." + + "turn on battery saver.", + textAlign = TextAlign.Center, + ) + }, + onOkButtonClick = {}, + onCancelButtonClick = {}, + okButtonContentDescription = stringResource(R.string.ok), + cancelButtonContentDescription = stringResource(R.string.cancel), + state = columnState, + ) { + item { + Chip( + label = { Text(text = "Primary Label") }, + onClick = {}, + icon = { + Icon( + Icons.Outlined.Battery1Bar, + contentDescription = "Battery low", + ) + }, + colors = ChipDefaults.secondaryChipColors(), + ) + } + item { + CompositionLocalProvider( + LocalTextStyle provides MaterialTheme.typography.caption3, + ) { + Text( + text = "Body enim ad minim veniam, quis nostrud", + textAlign = TextAlign.Start, + ) + } + } + } + } + } + + @Test + fun textAlertScreen() { + runTest { + AlertContent( + title = "Text only dialogs can use up to 3 lines of text in this layout", + onCancelButtonClick = {}, + onOKButtonClick = {}, + ) + } + } + + @Test + fun iconAndTextAlertScreen() { + runTest { + AlertContent( + icon = { + Icon( + imageVector = Icons.Outlined.Info, + contentDescription = "Info", + ) + }, + title = "Icon dialogs can use up to 2 lines of text", + onCancelButtonClick = {}, + onOKButtonClick = {}, + ) + } + } + + @Test + fun alarmConfirmationScreen() { + runTest { + ConfirmationContent( + icon = { + Icon( + imageVector = Icons.Filled.Check, + contentDescription = "Completed", + tint = Color.Green, + ) + }, + title = "Alarm in 23 hr 59 min", + ) + } + } } diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png new file mode 100644 index 0000000000..e24cc71fea --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33a251d21714a9d9c11b7bb4dd60c3a014b238b9831fdf1dcb51c92df14548ef +size 17055 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png new file mode 100644 index 0000000000..bcccf22ba2 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abf33f0b2830e24e06020a891185f19815c8873a15c8eac5938b2ca86b5915b8 +size 14902 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png new file mode 100644 index 0000000000..a292c9d821 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1baf8e35c386d4c57adbb9275fa1cbf0286889de4f3278ca82fe91dff6e921d +size 18500 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png new file mode 100644 index 0000000000..583aed46a3 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:455b07bde40681f288bd27a50eefdb177b63a28416a9ee0c8e17b679bbf641fc +size 14824 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png new file mode 100644 index 0000000000..583aed46a3 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:455b07bde40681f288bd27a50eefdb177b63a28416a9ee0c8e17b679bbf641fc +size 14824 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png new file mode 100644 index 0000000000..95c6f6ffae --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2091d7191b8386c724aa1766e7d785d63788a8ed675fd5962b2da677b93a97bb +size 16570 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png new file mode 100644 index 0000000000..5c6c50e60b --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6b94f3eae1dbe2640c2f2f545d820f87d00b86243a274c844fa53e3808d1e62 +size 16000 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png new file mode 100644 index 0000000000..6d9080f4a3 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40e60366848ab55d27255d8bca7194285ae3131924719e37bc68893eb9ff3e52 +size 17050 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5.png new file mode 100644 index 0000000000..07a9203d64 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f28da6e995352cf44785feddd0d9f04d0441644cd65f289ddbeaa0f8d071e26 +size 37242 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5_2.png new file mode 100644 index 0000000000..f3646ce68d --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbf030f2ec546a4868d3d28b681c85c9206625cdcdb833722ba6187017edbe30 +size 35156 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5.png new file mode 100644 index 0000000000..24aef15a46 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4373c357118e1ddcabe9a6e38d817d841940ba68deaffe73ef35a702ff082010 +size 32244 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5_2.png new file mode 100644 index 0000000000..d6e71fb8d6 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d0cd3495b5a66b878d7c18fc66e4b00f9318b428d822661c964ac10dd44146d +size 27488 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large.png new file mode 100644 index 0000000000..db6a9e5572 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57cc491e854e3cacc9011fbd2bf5de76087964b0400ca36b243911e6b095473c +size 38349 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large_2.png new file mode 100644 index 0000000000..624d1d960b --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38fda052fbd090ef2536fd2f036b55e5399b0d72c18c8534609db8e9b59c40bd +size 36124 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch.png new file mode 100644 index 0000000000..f14ecc68d8 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b69340026f7a56b6833ea3286d57a1fc104f671e5a6d0f9964c3936bc2a87e5 +size 31409 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch_2.png new file mode 100644 index 0000000000..f12d3dfeb5 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57deefcd44031510d453e9c9acd1e8de7ed8e2e125a2ec88da698700a903e73e +size 26146 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround.png new file mode 100644 index 0000000000..f14ecc68d8 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b69340026f7a56b6833ea3286d57a1fc104f671e5a6d0f9964c3936bc2a87e5 +size 31409 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround_2.png new file mode 100644 index 0000000000..f12d3dfeb5 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57deefcd44031510d453e9c9acd1e8de7ed8e2e125a2ec88da698700a903e73e +size 26146 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround.png new file mode 100644 index 0000000000..b2be1959fc --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e88f439a22e03829b4db474c28c59a2d31627969af09e62c6485836e28e824c6 +size 35626 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround_2.png new file mode 100644 index 0000000000..b2f70645e7 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:818e3176292f159ce09ac42588aeba1584c0cf983d1995176263065986ba9843 +size 33550 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts.png new file mode 100644 index 0000000000..5599016270 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4f6542ed3eaf8adfc294b29b132fbd70fb4a67367e78403b38c21e93e03f5ee +size 31937 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts_2.png new file mode 100644 index 0000000000..f9a624c0f2 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5948a476ce282cb4cc8e40fb426484df91edef211c70978acebf2b3fdbfdf4e6 +size 26813 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts.png new file mode 100644 index 0000000000..5039c73d2a --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8421aee7b0b9671d780ba00971488320965fca5ad3ccdb5b5cdda09144b82da7 +size 36581 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts_2.png new file mode 100644 index 0000000000..7ee0fed3d6 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:301f1bcf2567acdb7521c54db0f374cc64fb7146e1719341a75ac027d625891f +size 35102 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[0]_mobvoiticwatchpro5.png new file mode 100644 index 0000000000..0eb92495ae --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[0]_mobvoiticwatchpro5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eaf2f4d4b3a0fc3cd36a5c87d19f142c26ade58ccf37f509470c8cc2dcc526cf +size 27880 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[1]_samsunggalaxywatch5.png new file mode 100644 index 0000000000..9d113e29fa --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[1]_samsunggalaxywatch5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d1711936215b4e8735556266cf882fdbd57ad3ebf0ebd33bb5ae0d8434473d9 +size 24244 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[2]_samsunggalaxywatch6large.png new file mode 100644 index 0000000000..51a93aaa6b --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[2]_samsunggalaxywatch6large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55b1754def8650f23414ee3ba8a57c6287dce71172088afbde2b3a712c3a46e4 +size 29783 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[3]_googlepixelwatch.png new file mode 100644 index 0000000000..fb588eee16 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[3]_googlepixelwatch.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ae1aa66f0dd243f020d2e26c1b47e017c568aa755f7dab553199b96112406ef +size 24230 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[4]_genericsmallround.png new file mode 100644 index 0000000000..fb588eee16 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[4]_genericsmallround.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ae1aa66f0dd243f020d2e26c1b47e017c568aa755f7dab553199b96112406ef +size 24230 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[5]_genericlargeround.png new file mode 100644 index 0000000000..1ae2db8287 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[5]_genericlargeround.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb69d48484ec5c029f9100b096b81560a623fb4584d441d5a52d4275be13d692 +size 27410 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[6]_smalldevicebigfonts.png new file mode 100644 index 0000000000..f256fc55fd --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[6]_smalldevicebigfonts.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21895273db2ba7f27a47f450c26ba9bc82a850694ffc73cad6a004256b4dc4d3 +size 26957 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[7]_largedevicesmallfonts.png new file mode 100644 index 0000000000..fb8a8c6df5 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[7]_largedevicesmallfonts.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afa3a0c2868d4da3eab0cfbe502cc382f7e183ee5288b7605e544ec98565f8d2 +size 27515 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5.png index 6f4c462f6e..94aeaf16a9 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e667301e3a13f55f631ebcf44878a63904b82d592fa16b7264891014fbf2b0e2 -size 45867 +oid sha256:ac644079d3832199d7bd030fd882b013d3c4c03ffeaf1d805d41bc18a4a5e848 +size 45811 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png index aaa1aa69c9..540b06a4c7 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0ec894bcf66251f0d76c59530547e26d7f984df5d4c33145e2a29cd7c753378 -size 36676 +oid sha256:c10e97e8c6dc4f5126631a36f8820bb85af996dd7fe5ed2a3b89ad4b86046951 +size 36439 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5.png index 37c612544e..8633bef600 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31955eb9de24445d77a4ed4d0c34a858021e816e577699b6439717e403c40661 -size 37885 +oid sha256:9cf26047c2dfeeff319a7bbb12f1e23ada2ecbcf35cf2c016a2f5b382a4571e2 +size 37820 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png index 7b25395085..c32bc0450f 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:149d58154688141c1f6e9efce7355d549de6917935dc4bd5fe2efec747102456 -size 29900 +oid sha256:96d964fbaa22c231bec5e76f2fb84a560fb84155ea4f8301d54095857b62a611 +size 29752 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large.png index 9018541677..2ea65b14e7 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16494a40f8da3bbbd2f467f2325bef2ba88757cbc68784ec237e56ad36856cf6 -size 47280 +oid sha256:a6d897c5ade6e7ca0667c0d7869f139b90d6512c5d4cdcd78ffcda8bd1633550 +size 47348 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png index 8751bf0b52..1de6bab454 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb47f191195885b6d10ed4f8c7bee3b01dd371ea959a5a55e61cde0ddf1c1b9c -size 37796 +oid sha256:19cabbce423ed286bab8634de95fb59c02b26f93da5ed3789204680e16b94f8c +size 37603 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch.png index 954401ce7b..54a1efdf0a 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9dc3c851fff78ca46b3d9a2481d27e857123d963d172315dd709077be4d9bb68 -size 37899 +oid sha256:132158588beed9056c4b44593cd9b06cdb87a50a94a22253ecb359a9916cbffb +size 37834 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png index 8f88eb4b64..d430615a3c 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf81d6120bb949ed0e913f34949ee52cde061c51550756fb8dd975784bb6b816 -size 28665 +oid sha256:c0b8ea4277cf03756ddae86867d98b68f74559122475c100761c2f41687ec407 +size 28640 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround.png index 954401ce7b..54a1efdf0a 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9dc3c851fff78ca46b3d9a2481d27e857123d963d172315dd709077be4d9bb68 -size 37899 +oid sha256:132158588beed9056c4b44593cd9b06cdb87a50a94a22253ecb359a9916cbffb +size 37834 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png index 8f88eb4b64..d430615a3c 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf81d6120bb949ed0e913f34949ee52cde061c51550756fb8dd975784bb6b816 -size 28665 +oid sha256:c0b8ea4277cf03756ddae86867d98b68f74559122475c100761c2f41687ec407 +size 28640 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround.png index 76cabeb9fe..1bd8f9c6cb 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52c3f72a0d30660084c879a75b802d2a13247643b814c9a21905e1ac05b58e96 -size 44492 +oid sha256:754d0a590b99353e99d2f986ac73e29cabcbbf180fe189fc62d137a838a22457 +size 44692 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png index 8a9ecc61f9..e894047f22 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:749f954073efef3ab040e949f93a743497674c91cb22d599cb1ac49d4db2c025 -size 35519 +oid sha256:9ddde8392e66219c3bf4893cb030d358a258ce8afa41a2c2d0a4ccb7bc33cf36 +size 35309 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts.png index 75b69bd2a1..9a34128149 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:419c50033584a2cb21f7b0295ec2beb0759dc1d208458206deec2772c7b915bd -size 31589 +oid sha256:2b7ca0bf09b4a0ce403f14f41b67bc4d63a324a38c357e6efafa274151b624cb +size 31536 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png index e045477e86..172ef99abf 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f691321327dd17abab12557345fb2613d47d0a42b2d2b634456efa667b6cf3d -size 24820 +oid sha256:84c7bc8b3af8f202388bb5d0ad64108647d07096f42c8b82bc11b036b905131e +size 24805 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts.png index 940576dbc7..7fec9a95cc 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36d89f74be48c0fceb2a1e30924440bea3665e6e7dd35d00584f04074d7c59ff -size 45824 +oid sha256:ed6f1802aa2e3fb93f31895857966a9c5e9c0a67446809b5a7af649137a5224d +size 45677 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png index 66ec63672e..c01f7ac71b 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c8e15b33e57417abd00b4d0bea4ac8e2626268da9de5e49724dfff92c852631 -size 40255 +oid sha256:550f793ff9b3298bac8b0ce4af864c83a406872733f77648d44b377c1da62f43 +size 40245 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[0]_mobvoiticwatchpro5.png index 60cb6cfc17..2a98f909f2 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[0]_mobvoiticwatchpro5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[0]_mobvoiticwatchpro5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e779533a70080d58f61e54c02efb9c21a229496b86d768c2466cca9ad6e57981 -size 29475 +oid sha256:9cfabc4b2aa8d41687ab84c6caa5d306fa191096f39dd319ab2964016532692a +size 29385 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[1]_samsunggalaxywatch5.png index 882cdc681a..d7231c39a0 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[1]_samsunggalaxywatch5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[1]_samsunggalaxywatch5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e57036253f3ce8fa4c3efb412fe47812e406d02e8c33ce54cc076610d9d7d08 -size 29233 +oid sha256:2db8e09dd69a03826bfcc9be18cf790f0728c2c6fac16b413823e3066a197b5d +size 29163 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[2]_samsunggalaxywatch6large.png index c06e8e96c4..f35b992f70 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[2]_samsunggalaxywatch6large.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[2]_samsunggalaxywatch6large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed9e96314a8828cea62f62d2a74c743b8b761b69dd287b1e511f3df2e960a2ed -size 31329 +oid sha256:f2fd1f8ad911f39540b12fee4da506af73157cb04894c2e35fdfa9b0df688c60 +size 31179 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[3]_googlepixelwatch.png index eebee7fcde..f2a62dee79 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[3]_googlepixelwatch.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[3]_googlepixelwatch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92b8e16acdb00f1749fc030b11013a5831117dd0981363662daf854ccd41d833 -size 29368 +oid sha256:78747b6bd1e0160db34e2355f4e7ce2fbd2c6768a6f2014dec15d30a0ec8eb65 +size 29261 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[4]_genericsmallround.png index eebee7fcde..f2a62dee79 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[4]_genericsmallround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[4]_genericsmallround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92b8e16acdb00f1749fc030b11013a5831117dd0981363662daf854ccd41d833 -size 29368 +oid sha256:78747b6bd1e0160db34e2355f4e7ce2fbd2c6768a6f2014dec15d30a0ec8eb65 +size 29261 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[5]_genericlargeround.png index 3eea67a016..ef134f3fb7 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[5]_genericlargeround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[5]_genericlargeround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0882c441595494a4adf2bcf5d68695ed79cd99a1cf122ebf140df2a9b1056dd7 -size 28947 +oid sha256:fa03ff646b64662dc1b1748f52617827d5bfae46fe8f8231922acae014e3aa6d +size 28857 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[6]_smalldevicebigfonts.png index d7efac10ac..192a2786f8 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[6]_smalldevicebigfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[6]_smalldevicebigfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:097ae3ceabee31d8bcf237ca1a3e8fa335510719b0cbf07b5d56ceb37afddc78 -size 27784 +oid sha256:d1385e4f366c653558a6ba8444a9d6cf3f58d8bdbc9774ee1857e4dbe67e3e45 +size 27733 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[7]_largedevicesmallfonts.png index 1e46d5d9d5..5e7c73f0e1 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[7]_largedevicesmallfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[7]_largedevicesmallfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:618b6e9a916325c1f9a4128a3dde301a76233266115e762b0a73a089cb5e18c8 -size 28680 +oid sha256:8a051f696e80bbb7bab9fee39531cd27f692134f17bed2b9cbf3579463b57806 +size 28587 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[0]_mobvoiticwatchpro5.png new file mode 100644 index 0000000000..ebc9595194 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[0]_mobvoiticwatchpro5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c927b18f31c62be96bab5df0c29acf529b0a8cb00f963e90a75cd91429a03b2 +size 29635 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[1]_samsunggalaxywatch5.png new file mode 100644 index 0000000000..fee72c1e7f --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[1]_samsunggalaxywatch5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49d3ccb38df67db82b1acd56fce6e11fb76710a11966ba91459450c0bcf6f875 +size 26089 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[2]_samsunggalaxywatch6large.png new file mode 100644 index 0000000000..ef0ab234ab --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[2]_samsunggalaxywatch6large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35957b953b0446289eb30e63ddee0cd18963473a760fef710c817f7d8a597a26 +size 31742 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[3]_googlepixelwatch.png new file mode 100644 index 0000000000..b708fc4a85 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[3]_googlepixelwatch.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b91c94bee7e76d53e2cada2dcc9faa2dd522cae536ff444b15d3071a40d69854 +size 26116 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[4]_genericsmallround.png new file mode 100644 index 0000000000..b708fc4a85 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[4]_genericsmallround.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b91c94bee7e76d53e2cada2dcc9faa2dd522cae536ff444b15d3071a40d69854 +size 26116 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[5]_genericlargeround.png new file mode 100644 index 0000000000..9730c4b7e1 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[5]_genericlargeround.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77748cabb85b0e8d6b9c0da3f47c9c45daa28464a7a53451537a928b6a9f306d +size 29159 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[6]_smalldevicebigfonts.png new file mode 100644 index 0000000000..13c4947928 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[6]_smalldevicebigfonts.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1261579be11f890309a7a5a88213fad41ea7a8a7f19aa119c5c3ad5fc137f6cc +size 26522 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[7]_largedevicesmallfonts.png new file mode 100644 index 0000000000..5750baf4a6 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[7]_largedevicesmallfonts.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c42891999cb43d44373adcf812410c972adb38e3d2cb7fecfd01cf1a30fffb52 +size 28848 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[0]_mobvoiticwatchpro5.png index 443c531fa6..5650d2b28c 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[0]_mobvoiticwatchpro5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[0]_mobvoiticwatchpro5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4641fd59754c1601549e548d486c88564504f866f807e54e408dbda4ad52b5c -size 28264 +oid sha256:95004b1af15c2f1b9e7cf4821330778c220ce1142f838bdc81568b147d1f13ea +size 28183 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[1]_samsunggalaxywatch5.png index ccbc61fd12..94efe5d761 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[1]_samsunggalaxywatch5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[1]_samsunggalaxywatch5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bec9ff404682f9d367f7934c58c9e633e1756d801f8e3abab21fc9b8f8bf8d0d -size 28814 +oid sha256:e17b4fd8a1990b12563f22383291fd10f9ee225f601fe9d2666e9daed4e7afe1 +size 28738 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[2]_samsunggalaxywatch6large.png index 2aee750370..b55d2a8bb2 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[2]_samsunggalaxywatch6large.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[2]_samsunggalaxywatch6large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a4886859d4726c10bad7b1d486ff29817b299743b53571aa9139e71a6dfd263 -size 30281 +oid sha256:0db087e8535ad198fde43798e019b9cfefa00bda2fe51b0f08a201c574fe6de1 +size 30137 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[3]_googlepixelwatch.png index f32590290d..ef3c4eaaeb 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[3]_googlepixelwatch.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[3]_googlepixelwatch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cf81ed6f5bd713d3c8a2dc67fe5b63b14c2c5c0b5c194091f5d0d0ad2af25cf -size 29168 +oid sha256:e4e51138495052a84e4a5296f97c80e6e38b5c9c15519ed048416d19429b3d72 +size 28997 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[4]_genericsmallround.png index f32590290d..ef3c4eaaeb 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[4]_genericsmallround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[4]_genericsmallround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cf81ed6f5bd713d3c8a2dc67fe5b63b14c2c5c0b5c194091f5d0d0ad2af25cf -size 29168 +oid sha256:e4e51138495052a84e4a5296f97c80e6e38b5c9c15519ed048416d19429b3d72 +size 28997 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[5]_genericlargeround.png index 4c7364c8fd..bee966a0e5 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[5]_genericlargeround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[5]_genericlargeround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8be1e2003b47f7092c394d774b8291a7235db755f278944d15b75d720c2840b -size 28484 +oid sha256:debf6bbe9b4c4a9a6a69699bed32c5d05fb09cafa5630969ae1e918401c6290a +size 28429 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[6]_smalldevicebigfonts.png index 6b02ae9e1e..28835889f3 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[6]_smalldevicebigfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[6]_smalldevicebigfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:324c402c6b0166ecee1f0ff75523a362eb4a99f3f7acbf56b98676d8ca32a9a2 -size 32686 +oid sha256:6ad32d5fd292b4c920964fb6d69847a7c5ac54dee374cdea7a17da11992f08e6 +size 32457 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[7]_largedevicesmallfonts.png index 6e8c3d8885..90c5724841 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[7]_largedevicesmallfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[7]_largedevicesmallfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7242c7093f0d1e70a81d89846f59aebe5da9692c8d86557e46a03da132e3602 -size 27356 +oid sha256:ef380ae38447e89b0e2eeffec70c5a91336a444c0343da1ee526ff68d34afc90 +size 27277 From d4901a74f11571aeeb1bdb42b2cc98f859388fd1 Mon Sep 17 00:00:00 2001 From: stevebower Date: Fri, 26 Jan 2024 16:28:57 +0000 Subject: [PATCH 2/4] Update Confirmation to use the default confirmation vertical arrangement, which is to vertically center the contents. --- .../horologist/compose/material/Confirmation.kt | 10 +++++++--- .../android/horologist/screensizes/DialogTest.kt | 2 -- ...t_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png | 4 ++-- ..._alarmConfirmationScreen[1]_samsunggalaxywatch5.png | 4 ++-- ...mConfirmationScreen[2]_samsunggalaxywatch6large.png | 4 ++-- ...est_alarmConfirmationScreen[3]_googlepixelwatch.png | 4 ++-- ...st_alarmConfirmationScreen[4]_genericsmallround.png | 4 ++-- ...st_alarmConfirmationScreen[5]_genericlargeround.png | 4 ++-- ..._alarmConfirmationScreen[6]_smalldevicebigfonts.png | 4 ++-- ...larmConfirmationScreen[7]_largedevicesmallfonts.png | 4 ++-- 10 files changed, 23 insertions(+), 21 deletions(-) diff --git a/compose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt b/compose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt index 36b3a61e85..6951f15c92 100644 --- a/compose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt +++ b/compose-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 index 4f5b4f832a..3780f37283 100644 --- 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/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png index e24cc71fea..78190506a8 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33a251d21714a9d9c11b7bb4dd60c3a014b238b9831fdf1dcb51c92df14548ef -size 17055 +oid sha256:c10f74a1af18c454bfc8f77b201ccc3fd53ab923e675e34f38e2005bb3806b5e +size 16905 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png index bcccf22ba2..2ed763d020 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abf33f0b2830e24e06020a891185f19815c8873a15c8eac5938b2ca86b5915b8 -size 14902 +oid sha256:14de2e5dea8d5dc6c85074cbda353e1c4edfd081b8899432c842ce0368d5582e +size 14885 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png index a292c9d821..0d61fda4c9 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1baf8e35c386d4c57adbb9275fa1cbf0286889de4f3278ca82fe91dff6e921d -size 18500 +oid sha256:59cfdd012a2424709aea43d8ca4255cc8bc0a97dd6bb68c9687a8becca490631 +size 18250 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png index 583aed46a3..999f227112 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:455b07bde40681f288bd27a50eefdb177b63a28416a9ee0c8e17b679bbf641fc -size 14824 +oid sha256:226fc808c7691036453cc989ac6489539a57f6654c9dc851a3213876aaba9b9a +size 14756 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png index 583aed46a3..999f227112 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:455b07bde40681f288bd27a50eefdb177b63a28416a9ee0c8e17b679bbf641fc -size 14824 +oid sha256:226fc808c7691036453cc989ac6489539a57f6654c9dc851a3213876aaba9b9a +size 14756 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png index 95c6f6ffae..16457afede 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2091d7191b8386c724aa1766e7d785d63788a8ed675fd5962b2da677b93a97bb -size 16570 +oid sha256:e4a20a12da347082cc3b7dd12959bc0cd6c7d0f48b355a6af3be20e82eca9fd6 +size 16403 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png index 5c6c50e60b..e061663dc8 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6b94f3eae1dbe2640c2f2f545d820f87d00b86243a274c844fa53e3808d1e62 -size 16000 +oid sha256:db3b058155fe1fc322d5cff35cd191bbdf8758ccd909432716ee0307d110e1d6 +size 15894 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png index 6d9080f4a3..6d2fc50ba5 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40e60366848ab55d27255d8bca7194285ae3131924719e37bc68893eb9ff3e52 -size 17050 +oid sha256:2dac86bb42e527bc8efffc7abce8115830bfc4b3d4cd84a5e7994aecbae5e4ec +size 16807 From 1c4c9621a8dde2d48db9987a6a8253d216fc2b22 Mon Sep 17 00:00:00 2001 From: stevebower Date: Fri, 26 Jan 2024 16:58:26 +0000 Subject: [PATCH 3/4] Update Confirmation to use the default confirmation vertical arrangement, which is to vertically center the contents. --- .../horologist/compose/material/Confirmation.kt | 10 +++++++--- .../android/horologist/screensizes/DialogTest.kt | 2 -- ...t_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png | 4 ++-- ..._alarmConfirmationScreen[1]_samsunggalaxywatch5.png | 4 ++-- ...mConfirmationScreen[2]_samsunggalaxywatch6large.png | 4 ++-- ...est_alarmConfirmationScreen[3]_googlepixelwatch.png | 4 ++-- ...st_alarmConfirmationScreen[4]_genericsmallround.png | 4 ++-- ...st_alarmConfirmationScreen[5]_genericlargeround.png | 4 ++-- ..._alarmConfirmationScreen[6]_smalldevicebigfonts.png | 4 ++-- ...larmConfirmationScreen[7]_largedevicesmallfonts.png | 4 ++-- 10 files changed, 23 insertions(+), 21 deletions(-) diff --git a/compose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt b/compose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt index 36b3a61e85..6951f15c92 100644 --- a/compose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt +++ b/compose-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 index 4f5b4f832a..3780f37283 100644 --- 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/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png index 2a01e2438e..78190506a8 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e10629d39a220a9ab66c0db3165be10607bda87984fb7ecf8b4b910107f5370d -size 17150 +oid sha256:c10f74a1af18c454bfc8f77b201ccc3fd53ab923e675e34f38e2005bb3806b5e +size 16905 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png index e1ae770359..2ed763d020 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:982992ab69b59b9fd987d9da2f93d146b78d568feb7244d522e73c6f93eca2e5 -size 14933 +oid sha256:14de2e5dea8d5dc6c85074cbda353e1c4edfd081b8899432c842ce0368d5582e +size 14885 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png index bcc3508ccf..0d61fda4c9 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a0d76a2b86879b258554feb57d40a64a1c35d3ace07e4acceb97585e61abf1c -size 18601 +oid sha256:59cfdd012a2424709aea43d8ca4255cc8bc0a97dd6bb68c9687a8becca490631 +size 18250 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png index 62f8251092..999f227112 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f505162b8f21c65c86eb7bdf1642af157ba0b714095d45f672a88f9b2f2abfa -size 14880 +oid sha256:226fc808c7691036453cc989ac6489539a57f6654c9dc851a3213876aaba9b9a +size 14756 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png index 62f8251092..999f227112 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f505162b8f21c65c86eb7bdf1642af157ba0b714095d45f672a88f9b2f2abfa -size 14880 +oid sha256:226fc808c7691036453cc989ac6489539a57f6654c9dc851a3213876aaba9b9a +size 14756 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png index 2cd3c961b8..16457afede 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb49c2b33b865c1a4961adb62f1dcd793208086937ecb186fe1f62ae678718fa -size 16629 +oid sha256:e4a20a12da347082cc3b7dd12959bc0cd6c7d0f48b355a6af3be20e82eca9fd6 +size 16403 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png index e468c61442..e061663dc8 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e9c39b4ee99c5100955cc362b2cbee1b1cb3b7b51a0c157aa284c45d4107acc -size 16090 +oid sha256:db3b058155fe1fc322d5cff35cd191bbdf8758ccd909432716ee0307d110e1d6 +size 15894 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png index c311a663bb..6d2fc50ba5 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af595ced1acc8921c561bf11305f87ef667e8bf3b6cad227d6df1a49d30322a9 -size 17157 +oid sha256:2dac86bb42e527bc8efffc7abce8115830bfc4b3d4cd84a5e7994aecbae5e4ec +size 16807 From 2482eca7ad38c1f9dce55f5e65186f5e4aed6e3e Mon Sep 17 00:00:00 2001 From: BowerSteve Date: Fri, 26 Jan 2024 17:10:18 +0000 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=A4=96=20Updates=20screenshots?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...zes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5.png | 4 ++-- ...s_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png | 4 ++-- ..._DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png | 4 ++-- ...alogTest_longDialogScreen1[2]_samsunggalaxywatch6large.png | 4 ++-- ...ogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png | 4 ++-- ...sizes_DialogTest_longDialogScreen1[3]_googlepixelwatch.png | 4 ++-- ...zes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png | 4 ++-- ...izes_DialogTest_longDialogScreen1[4]_genericsmallround.png | 4 ++-- ...es_DialogTest_longDialogScreen1[4]_genericsmallround_2.png | 4 ++-- ...izes_DialogTest_longDialogScreen1[5]_genericlargeround.png | 4 ++-- ...es_DialogTest_longDialogScreen1[5]_genericlargeround_2.png | 4 ++-- ..._DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png | 4 ++-- ..._DialogTest_longDialogScreen1[7]_largedevicesmallfonts.png | 4 ++-- ...ialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5.png index 94aeaf16a9..6f4c462f6e 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac644079d3832199d7bd030fd882b013d3c4c03ffeaf1d805d41bc18a4a5e848 -size 45811 +oid sha256:e667301e3a13f55f631ebcf44878a63904b82d592fa16b7264891014fbf2b0e2 +size 45867 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png index 540b06a4c7..aaa1aa69c9 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c10e97e8c6dc4f5126631a36f8820bb85af996dd7fe5ed2a3b89ad4b86046951 -size 36439 +oid sha256:d0ec894bcf66251f0d76c59530547e26d7f984df5d4c33145e2a29cd7c753378 +size 36676 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png index c32bc0450f..7b25395085 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96d964fbaa22c231bec5e76f2fb84a560fb84155ea4f8301d54095857b62a611 -size 29752 +oid sha256:149d58154688141c1f6e9efce7355d549de6917935dc4bd5fe2efec747102456 +size 29900 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large.png index 2ea65b14e7..9018541677 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6d897c5ade6e7ca0667c0d7869f139b90d6512c5d4cdcd78ffcda8bd1633550 -size 47348 +oid sha256:16494a40f8da3bbbd2f467f2325bef2ba88757cbc68784ec237e56ad36856cf6 +size 47280 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png index 1de6bab454..8751bf0b52 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19cabbce423ed286bab8634de95fb59c02b26f93da5ed3789204680e16b94f8c -size 37603 +oid sha256:fb47f191195885b6d10ed4f8c7bee3b01dd371ea959a5a55e61cde0ddf1c1b9c +size 37796 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch.png index 54a1efdf0a..954401ce7b 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:132158588beed9056c4b44593cd9b06cdb87a50a94a22253ecb359a9916cbffb -size 37834 +oid sha256:9dc3c851fff78ca46b3d9a2481d27e857123d963d172315dd709077be4d9bb68 +size 37899 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png index d430615a3c..8f88eb4b64 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0b8ea4277cf03756ddae86867d98b68f74559122475c100761c2f41687ec407 -size 28640 +oid sha256:cf81d6120bb949ed0e913f34949ee52cde061c51550756fb8dd975784bb6b816 +size 28665 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround.png index 54a1efdf0a..954401ce7b 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:132158588beed9056c4b44593cd9b06cdb87a50a94a22253ecb359a9916cbffb -size 37834 +oid sha256:9dc3c851fff78ca46b3d9a2481d27e857123d963d172315dd709077be4d9bb68 +size 37899 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png index d430615a3c..8f88eb4b64 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0b8ea4277cf03756ddae86867d98b68f74559122475c100761c2f41687ec407 -size 28640 +oid sha256:cf81d6120bb949ed0e913f34949ee52cde061c51550756fb8dd975784bb6b816 +size 28665 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround.png index 1bd8f9c6cb..76cabeb9fe 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:754d0a590b99353e99d2f986ac73e29cabcbbf180fe189fc62d137a838a22457 -size 44692 +oid sha256:52c3f72a0d30660084c879a75b802d2a13247643b814c9a21905e1ac05b58e96 +size 44492 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png index e894047f22..8a9ecc61f9 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ddde8392e66219c3bf4893cb030d358a258ce8afa41a2c2d0a4ccb7bc33cf36 -size 35309 +oid sha256:749f954073efef3ab040e949f93a743497674c91cb22d599cb1ac49d4db2c025 +size 35519 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png index 172ef99abf..e045477e86 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84c7bc8b3af8f202388bb5d0ad64108647d07096f42c8b82bc11b036b905131e -size 24805 +oid sha256:9f691321327dd17abab12557345fb2613d47d0a42b2d2b634456efa667b6cf3d +size 24820 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts.png index 7fec9a95cc..940576dbc7 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed6f1802aa2e3fb93f31895857966a9c5e9c0a67446809b5a7af649137a5224d -size 45677 +oid sha256:36d89f74be48c0fceb2a1e30924440bea3665e6e7dd35d00584f04074d7c59ff +size 45824 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png index c01f7ac71b..66ec63672e 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:550f793ff9b3298bac8b0ce4af864c83a406872733f77648d44b377c1da62f43 -size 40245 +oid sha256:3c8e15b33e57417abd00b4d0bea4ac8e2626268da9de5e49724dfff92c852631 +size 40255