Don't show PositionIndicator for non scrollable dialog content (#2265)

google · Jun 12, 2024 · fb2b45c · fb2b45c
1 parent d1d540a
commit fb2b45c
Show file tree

Hide file tree

Showing 50 changed files with 111 additions and 107 deletions.
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
@@ -81,6 +81,11 @@ public fun ResponsiveDialogContent(
     ScreenScaffold(
         modifier = modifier.fillMaxSize(),
         scrollState = if (showPositionIndicator) state else null,
+        positionIndicator = if (showPositionIndicator) {
+            null
+        } else {
+            {}
+        },
         timeText = {},
     ) {
         // This will be applied only to the content.

diff --git a/sample/src/test/kotlin/com/google/android/horologist/dialog/NonScrollableAlertContent.kt b/sample/src/test/kotlin/com/google/android/horologist/dialog/NonScrollableAlertContent.kt
@@ -33,21 +33,20 @@ public fun NonScrollableAlertContent(
     message: String? = null,
     okButtonContentDescription: String = stringResource(android.R.string.ok),
     cancelButtonContentDescription: String = stringResource(android.R.string.cancel),
-    showPositionIndicator: Boolean = true,
     content: (ScalingLazyListScope.() -> Unit)? = null,
 ) {
     val columnState = centeredDialogColumnState()
 
     AlertContent(
-        onCancel,
-        onOk,
-        icon,
-        title,
-        message,
-        okButtonContentDescription,
-        cancelButtonContentDescription,
-        columnState,
-        showPositionIndicator,
-        content,
+        onCancel = onCancel,
+        onOk = onOk,
+        icon = icon,
+        title = title,
+        message = message,
+        okButtonContentDescription = okButtonContentDescription,
+        cancelButtonContentDescription = cancelButtonContentDescription,
+        state = columnState,
+        showPositionIndicator = false,
+        content = content,
     )
 }
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/...le/src/test/screenshots/NonScrollableAlertDialogTest_tooLong_galaxy_watch_5.png b/...le/src/test/screenshots/NonScrollableAlertDialogTest_tooLong_galaxy_watch_5.png
diff --git a/...le/src/test/screenshots/NonScrollableAlertDialogTest_tooLong_galaxy_watch_6.png b/...le/src/test/screenshots/NonScrollableAlertDialogTest_tooLong_galaxy_watch_6.png
diff --git a/.../screenshots/NonScrollableAlertDialogTest_tooLong_galaxy_watch_6_small_font.png b/.../screenshots/NonScrollableAlertDialogTest_tooLong_galaxy_watch_6_small_font.png
diff --git a/sample/src/test/screenshots/NonScrollableAlertDialogTest_tooLong_large_round.png b/sample/src/test/screenshots/NonScrollableAlertDialogTest_tooLong_large_round.png
diff --git a/sample/src/test/screenshots/NonScrollableAlertDialogTest_tooLong_pixel_watch.png b/sample/src/test/screenshots/NonScrollableAlertDialogTest_tooLong_pixel_watch.png
diff --git a/...est/screenshots/NonScrollableAlertDialogTest_tooLong_pixel_watch_large_font.png b/...est/screenshots/NonScrollableAlertDialogTest_tooLong_pixel_watch_large_font.png
diff --git a/sample/src/test/screenshots/NonScrollableAlertDialogTest_tooLong_small_round.png b/sample/src/test/screenshots/NonScrollableAlertDialogTest_tooLong_small_round.png
diff --git a/...le/src/test/screenshots/NonScrollableAlertDialogTest_tooLong_ticwatch_pro_5.png b/...le/src/test/screenshots/NonScrollableAlertDialogTest_tooLong_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