Dialog 2: Dialog Harder (#2343)

* Update dialogs following validation. Top & bottom padding to be percent based (14.56% and 20.83% respectively). Add 4.dp extra below the Title if there is no message. Bug: http://b/352552040 * 🤖 reformat * 🤖 metalava * 🤖 Updates screenshots --------- Co-authored-by: ssancho14 <ssancho14@users.noreply.github.com> Co-authored-by: Yuri Schimke <yuri@schimke.ee>
google · Aug 13, 2024 · 6c92d68 · 6c92d68
1 parent 901934a
commit 6c92d68
Show file tree

Hide file tree

Showing 144 changed files with 241 additions and 238 deletions.
diff --git a/compose-layout/api/current.api b/compose-layout/api/current.api
@@ -81,6 +81,7 @@ package com.google.android.horologist.compose.layout {
     enum_constant public static final com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults.ItemType Card;
     enum_constant public static final com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults.ItemType Chip;
     enum_constant public static final com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults.ItemType CompactChip;
+    enum_constant public static final com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults.ItemType Dialog;
     enum_constant public static final com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults.ItemType Icon;
     enum_constant public static final com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults.ItemType MultiButton;
     enum_constant public static final com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults.ItemType SingleButton;

diff --git a/...t/src/main/java/com/google/android/horologist/compose/layout/ScalingLazyColumnDefaults.kt b/...t/src/main/java/com/google/android/horologist/compose/layout/ScalingLazyColumnDefaults.kt
@@ -220,6 +220,7 @@ public object ScalingLazyColumnDefaults {
     }
 
     internal val Padding12Pct = 0.1248f
+    internal val Padding14Pct = 0.1456f
     internal val Padding16Pct = 0.1664f
     internal val Padding20Pct = 0.2083f
     internal val Padding21Pct = 0.2188f
@@ -242,6 +243,7 @@ public object ScalingLazyColumnDefaults {
         SingleButton(Padding12Pct, Padding20Pct),
         Text(Padding16Pct, Padding31Pct),
         BodyText(Padding21Pct, Padding31Pct),
+        Dialog(Padding14Pct, Padding20Pct),
         Unspecified(0f, 0f),
     }
 

diff --git a/...material/src/main/java/com/google/android/horologist/compose/material/ResponsiveDialog.kt b/...material/src/main/java/com/google/android/horologist/compose/material/ResponsiveDialog.kt
@@ -51,10 +51,10 @@ import androidx.wear.compose.material.MaterialTheme
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.compose.layout.ScalingLazyColumn
 import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults
-import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults.responsive
 import com.google.android.horologist.compose.layout.ScalingLazyColumnState
 import com.google.android.horologist.compose.layout.ScreenScaffold
 import com.google.android.horologist.compose.layout.rememberColumnState
+import com.google.android.horologist.compose.layout.rememberResponsiveColumnState
 import com.google.android.horologist.images.base.paintable.ImageVectorPaintable
 
 @ExperimentalHorologistApi
@@ -68,11 +68,11 @@ public fun ResponsiveDialogContent(
     onCancel: (() -> Unit)? = null,
     okButtonContentDescription: String = stringResource(android.R.string.ok),
     cancelButtonContentDescription: String = stringResource(android.R.string.cancel),
-    @Suppress("DEPRECATION") state: ScalingLazyColumnState =
-        rememberColumnState(
-            responsive(
-                firstItemIsFullWidth = icon == null,
-                additionalPaddingAtBottom = 0.dp,
+    state: ScalingLazyColumnState =
+        rememberResponsiveColumnState(
+            contentPadding = ScalingLazyColumnDefaults.padding(
+                first = ScalingLazyColumnDefaults.ItemType.Dialog,
+                last = ScalingLazyColumnDefaults.ItemType.Dialog,
             ),
         ),
     showPositionIndicator: Boolean = true,
@@ -113,7 +113,7 @@ public fun ResponsiveDialogContent(
                             Box(
                                 Modifier
                                     .fillMaxWidth(titleMaxWidthFraction)
-                                    .padding(bottom = 8.dp), // 12.dp below icon
+                                    .padding(bottom = if (message == null) 12.dp else 8.dp), // 16.dp or 12.dp below title
                             ) { it() }
                         }
                     }

diff --git a/sample/src/test/audit/Confirmations_iconand1line_pixel_watch.png b/sample/src/test/audit/Confirmations_iconand1line_pixel_watch.png
diff --git a/sample/src/test/audit/Confirmations_iconand1line_pixel_watch_large_font.png b/sample/src/test/audit/Confirmations_iconand1line_pixel_watch_large_font.png
diff --git a/sample/src/test/audit/Confirmations_iconand3line_device204.png b/sample/src/test/audit/Confirmations_iconand3line_device204.png
diff --git a/sample/src/test/audit/Confirmations_iconand3line_device228.png b/sample/src/test/audit/Confirmations_iconand3line_device228.png
diff --git a/sample/src/test/audit/Confirmations_iconand3line_device240.png b/sample/src/test/audit/Confirmations_iconand3line_device240.png
diff --git a/sample/src/test/audit/Confirmations_iconand3line_galaxy_watch_6_small_font.png b/sample/src/test/audit/Confirmations_iconand3line_galaxy_watch_6_small_font.png
diff --git a/sample/src/test/audit/Confirmations_iconand3line_pixel_watch.png b/sample/src/test/audit/Confirmations_iconand3line_pixel_watch.png
diff --git a/sample/src/test/audit/Dialogs_onebottombutton_device204.png b/sample/src/test/audit/Dialogs_onebottombutton_device204.png
diff --git a/sample/src/test/audit/Dialogs_onebottombutton_pixel_watch.png b/sample/src/test/audit/Dialogs_onebottombutton_pixel_watch.png
diff --git a/sample/src/test/audit/Dialogs_onebuttonchip_device204.png b/sample/src/test/audit/Dialogs_onebuttonchip_device204.png
diff --git a/sample/src/test/audit/Dialogs_onebuttonchip_device228.png b/sample/src/test/audit/Dialogs_onebuttonchip_device228.png
diff --git a/sample/src/test/audit/Dialogs_onebuttonchip_device240.png b/sample/src/test/audit/Dialogs_onebuttonchip_device240.png
diff --git a/sample/src/test/audit/Dialogs_onebuttonchip_galaxy_watch_6_small_font.png b/sample/src/test/audit/Dialogs_onebuttonchip_galaxy_watch_6_small_font.png
diff --git a/sample/src/test/audit/Dialogs_onebuttonchip_pixel_watch.png b/sample/src/test/audit/Dialogs_onebuttonchip_pixel_watch.png
diff --git a/sample/src/test/audit/Dialogs_onebuttonchip_pixel_watch_large_font.png b/sample/src/test/audit/Dialogs_onebuttonchip_pixel_watch_large_font.png
diff --git a/sample/src/test/audit/Dialogs_twobottombuttons_device204.png b/sample/src/test/audit/Dialogs_twobottombuttons_device204.png
diff --git a/sample/src/test/audit/Dialogs_twobottombuttons_device228.png b/sample/src/test/audit/Dialogs_twobottombuttons_device228.png
diff --git a/sample/src/test/audit/Dialogs_twobottombuttons_device240.png b/sample/src/test/audit/Dialogs_twobottombuttons_device240.png
diff --git a/sample/src/test/audit/Dialogs_twobottombuttons_galaxy_watch_6_small_font.png b/sample/src/test/audit/Dialogs_twobottombuttons_galaxy_watch_6_small_font.png
diff --git a/sample/src/test/audit/Dialogs_twobottombuttons_pixel_watch.png b/sample/src/test/audit/Dialogs_twobottombuttons_pixel_watch.png
diff --git a/sample/src/test/audit/Dialogs_twobottombuttons_pixel_watch_large_font.png b/sample/src/test/audit/Dialogs_twobottombuttons_pixel_watch_large_font.png
diff --git a/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputEn_galaxy_watch_5.png b/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputEn_galaxy_watch_5.png
diff --git a/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputEn_galaxy_watch_6.png b/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputEn_galaxy_watch_6.png
diff --git a/.../NonScrollableAlertDialogTest_changeAudioOutputEn_galaxy_watch_6_small_font.png b/.../NonScrollableAlertDialogTest_changeAudioOutputEn_galaxy_watch_6_small_font.png
diff --git a/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputEn_large_round.png b/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputEn_large_round.png
diff --git a/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputEn_pixel_watch.png b/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputEn_pixel_watch.png
diff --git a/...ots/NonScrollableAlertDialogTest_changeAudioOutputEn_pixel_watch_large_font.png b/...ots/NonScrollableAlertDialogTest_changeAudioOutputEn_pixel_watch_large_font.png
diff --git a/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputEn_small_round.png b/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputEn_small_round.png
diff --git a/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputEn_ticwatch_pro_5.png b/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputEn_ticwatch_pro_5.png
diff --git a/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputKa_galaxy_watch_5.png b/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputKa_galaxy_watch_5.png
diff --git a/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputKa_galaxy_watch_6.png b/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputKa_galaxy_watch_6.png
diff --git a/.../NonScrollableAlertDialogTest_changeAudioOutputKa_galaxy_watch_6_small_font.png b/.../NonScrollableAlertDialogTest_changeAudioOutputKa_galaxy_watch_6_small_font.png
diff --git a/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputKa_large_round.png b/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputKa_large_round.png
diff --git a/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputKa_pixel_watch.png b/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputKa_pixel_watch.png
diff --git a/...ots/NonScrollableAlertDialogTest_changeAudioOutputKa_pixel_watch_large_font.png b/...ots/NonScrollableAlertDialogTest_changeAudioOutputKa_pixel_watch_large_font.png
diff --git a/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputKa_small_round.png b/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputKa_small_round.png
diff --git a/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputKa_ticwatch_pro_5.png b/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputKa_ticwatch_pro_5.png
diff --git a/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputRu_galaxy_watch_5.png b/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputRu_galaxy_watch_5.png
diff --git a/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputRu_galaxy_watch_6.png b/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputRu_galaxy_watch_6.png
diff --git a/.../NonScrollableAlertDialogTest_changeAudioOutputRu_galaxy_watch_6_small_font.png b/.../NonScrollableAlertDialogTest_changeAudioOutputRu_galaxy_watch_6_small_font.png
diff --git a/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputRu_large_round.png b/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputRu_large_round.png
diff --git a/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputRu_pixel_watch.png b/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputRu_pixel_watch.png
diff --git a/...ots/NonScrollableAlertDialogTest_changeAudioOutputRu_pixel_watch_large_font.png b/...ots/NonScrollableAlertDialogTest_changeAudioOutputRu_pixel_watch_large_font.png
diff --git a/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputRu_small_round.png b/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputRu_small_round.png
diff --git a/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputRu_ticwatch_pro_5.png b/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputRu_ticwatch_pro_5.png
diff --git a/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputTa_galaxy_watch_5.png b/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputTa_galaxy_watch_5.png
diff --git a/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputTa_galaxy_watch_6.png b/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputTa_galaxy_watch_6.png
diff --git a/.../NonScrollableAlertDialogTest_changeAudioOutputTa_galaxy_watch_6_small_font.png b/.../NonScrollableAlertDialogTest_changeAudioOutputTa_galaxy_watch_6_small_font.png
diff --git a/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputTa_large_round.png b/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputTa_large_round.png
diff --git a/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputTa_pixel_watch.png b/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputTa_pixel_watch.png
diff --git a/...ots/NonScrollableAlertDialogTest_changeAudioOutputTa_pixel_watch_large_font.png b/...ots/NonScrollableAlertDialogTest_changeAudioOutputTa_pixel_watch_large_font.png
diff --git a/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputTa_small_round.png b/...st/screenshots/NonScrollableAlertDialogTest_changeAudioOutputTa_small_round.png
diff --git a/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputTa_ticwatch_pro_5.png b/...screenshots/NonScrollableAlertDialogTest_changeAudioOutputTa_ticwatch_pro_5.png
diff --git a/...shots/NonScrollableAlertDialogTest_turnOnBluetoothScrollable_galaxy_watch_5.png b/...shots/NonScrollableAlertDialogTest_turnOnBluetoothScrollable_galaxy_watch_5.png
diff --git a/...shots/NonScrollableAlertDialogTest_turnOnBluetoothScrollable_galaxy_watch_6.png b/...shots/NonScrollableAlertDialogTest_turnOnBluetoothScrollable_galaxy_watch_6.png
diff --git a/...rollableAlertDialogTest_turnOnBluetoothScrollable_galaxy_watch_6_small_font.png b/...rollableAlertDialogTest_turnOnBluetoothScrollable_galaxy_watch_6_small_font.png
diff --git a/...eenshots/NonScrollableAlertDialogTest_turnOnBluetoothScrollable_large_round.png b/...eenshots/NonScrollableAlertDialogTest_turnOnBluetoothScrollable_large_round.png
diff --git a/...eenshots/NonScrollableAlertDialogTest_turnOnBluetoothScrollable_pixel_watch.png b/...eenshots/NonScrollableAlertDialogTest_turnOnBluetoothScrollable_pixel_watch.png
diff --git a/...nScrollableAlertDialogTest_turnOnBluetoothScrollable_pixel_watch_large_font.png b/...nScrollableAlertDialogTest_turnOnBluetoothScrollable_pixel_watch_large_font.png
diff --git a/...eenshots/NonScrollableAlertDialogTest_turnOnBluetoothScrollable_small_round.png b/...eenshots/NonScrollableAlertDialogTest_turnOnBluetoothScrollable_small_round.png
diff --git a/...shots/NonScrollableAlertDialogTest_turnOnBluetoothScrollable_ticwatch_pro_5.png b/...shots/NonScrollableAlertDialogTest_turnOnBluetoothScrollable_ticwatch_pro_5.png
diff --git a/...est/screenshots/NonScrollableAlertDialogTest_turnOnBluetooth_galaxy_watch_5.png b/...est/screenshots/NonScrollableAlertDialogTest_turnOnBluetooth_galaxy_watch_5.png
diff --git a/...est/screenshots/NonScrollableAlertDialogTest_turnOnBluetooth_galaxy_watch_6.png b/...est/screenshots/NonScrollableAlertDialogTest_turnOnBluetooth_galaxy_watch_6.png
diff --git a/...hots/NonScrollableAlertDialogTest_turnOnBluetooth_galaxy_watch_6_small_font.png b/...hots/NonScrollableAlertDialogTest_turnOnBluetooth_galaxy_watch_6_small_font.png
diff --git a/...c/test/screenshots/NonScrollableAlertDialogTest_turnOnBluetooth_large_round.png b/...c/test/screenshots/NonScrollableAlertDialogTest_turnOnBluetooth_large_round.png
diff --git a/...c/test/screenshots/NonScrollableAlertDialogTest_turnOnBluetooth_pixel_watch.png b/...c/test/screenshots/NonScrollableAlertDialogTest_turnOnBluetooth_pixel_watch.png
diff --git a/...enshots/NonScrollableAlertDialogTest_turnOnBluetooth_pixel_watch_large_font.png b/...enshots/NonScrollableAlertDialogTest_turnOnBluetooth_pixel_watch_large_font.png
diff --git a/...c/test/screenshots/NonScrollableAlertDialogTest_turnOnBluetooth_small_round.png b/...c/test/screenshots/NonScrollableAlertDialogTest_turnOnBluetooth_small_round.png
diff --git a/...est/screenshots/NonScrollableAlertDialogTest_turnOnBluetooth_ticwatch_pro_5.png b/...est/screenshots/NonScrollableAlertDialogTest_turnOnBluetooth_ticwatch_pro_5.png
diff --git a/...eenshots/NonScrollableConfirmationTest_confirmationContentEn_galaxy_watch_5.png b/...eenshots/NonScrollableConfirmationTest_confirmationContentEn_galaxy_watch_5.png
diff --git a/...eenshots/NonScrollableConfirmationTest_confirmationContentEn_galaxy_watch_6.png b/...eenshots/NonScrollableConfirmationTest_confirmationContentEn_galaxy_watch_6.png
diff --git a/...nScrollableConfirmationTest_confirmationContentEn_galaxy_watch_6_small_font.png b/...nScrollableConfirmationTest_confirmationContentEn_galaxy_watch_6_small_font.png
diff --git a/...screenshots/NonScrollableConfirmationTest_confirmationContentEn_large_round.png b/...screenshots/NonScrollableConfirmationTest_confirmationContentEn_large_round.png
diff --git a/...screenshots/NonScrollableConfirmationTest_confirmationContentEn_pixel_watch.png b/...screenshots/NonScrollableConfirmationTest_confirmationContentEn_pixel_watch.png
diff --git a/.../NonScrollableConfirmationTest_confirmationContentEn_pixel_watch_large_font.png b/.../NonScrollableConfirmationTest_confirmationContentEn_pixel_watch_large_font.png
diff --git a/...screenshots/NonScrollableConfirmationTest_confirmationContentEn_small_round.png b/...screenshots/NonScrollableConfirmationTest_confirmationContentEn_small_round.png
diff --git a/...eenshots/NonScrollableConfirmationTest_confirmationContentEn_ticwatch_pro_5.png b/...eenshots/NonScrollableConfirmationTest_confirmationContentEn_ticwatch_pro_5.png