Skip to content

Commit d3301de

Browse files
BowerStevestevebower
and
stevebower
authoredFeb 2, 2024
Updates to AlertDialog (#2018)
* Add further test cases for responsive dialogs, update AlertDialog variations to handle more cases. * Add AlertDialog overload for variation with stack of Chips and no Ok/Cancel buttons. * standardised onOk, onCancel parameter names * added content parameter to AlertDialog for additional scrollable content * Now automatically determines text alignment for AlertDialog message text using TextMeasurer. --------- Co-authored-by: stevebower <[email protected]> Co-authored-by: BowerSteve <[email protected]>
1 parent 4e139ff commit d3301de

File tree

62 files changed

+427
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+427
-189
lines changed
 

‎compose-material/api/current.api

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
package com.google.android.horologist.compose.material {
33

44
public final class AlertDialogKt {
5-
method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void AlertContent(kotlin.jvm.functions.Function0<kotlin.Unit>? onCancelButtonClick, kotlin.jvm.functions.Function0<kotlin.Unit>? onOKButtonClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? 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);
6-
method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onCancelButtonClick, kotlin.jvm.functions.Function0<kotlin.Unit> onOKButtonClick, boolean showDialog, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional String? title, optional String? message, optional String okButtonContentDescription, optional String cancelButtonContentDescription, optional com.google.android.horologist.compose.layout.ScalingLazyColumnState columnState);
5+
method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void AlertContent(optional kotlin.jvm.functions.Function0<kotlin.Unit>? onCancel, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onOk, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional String? title, optional String? message, optional String okButtonContentDescription, optional String cancelButtonContentDescription, optional com.google.android.horologist.compose.layout.ScalingLazyColumnState state, optional boolean showPositionIndicator, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.lazy.ScalingLazyListScope,kotlin.Unit>? content);
6+
method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void AlertDialog(boolean showDialog, kotlin.jvm.functions.Function0<kotlin.Unit> onDismiss, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional String? title, optional String? message, optional com.google.android.horologist.compose.layout.ScalingLazyColumnState state, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.lazy.ScalingLazyListScope,kotlin.Unit>? content);
7+
method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void AlertDialog(boolean showDialog, kotlin.jvm.functions.Function0<kotlin.Unit> onCancel, kotlin.jvm.functions.Function0<kotlin.Unit> onOk, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional String? title, optional String? message, optional String okButtonContentDescription, optional String cancelButtonContentDescription, optional com.google.android.horologist.compose.layout.ScalingLazyColumnState state, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.lazy.ScalingLazyListScope,kotlin.Unit>? content);
78
}
89

910
public final class ButtonKt {
@@ -88,7 +89,7 @@ package com.google.android.horologist.compose.material {
8889
}
8990

9091
public final class ResponsiveDialogKt {
91-
method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void ResponsiveDialogContent(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? message, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onOkButtonClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onCancelButtonClick, optional String okButtonContentDescription, optional String cancelButtonContentDescription, optional com.google.android.horologist.compose.layout.ScalingLazyColumnState state, optional boolean showPositionIndicator, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.lazy.ScalingLazyListScope,kotlin.Unit>? content);
92+
method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void ResponsiveDialogContent(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? message, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onOk, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onCancel, optional String okButtonContentDescription, optional String cancelButtonContentDescription, optional com.google.android.horologist.compose.layout.ScalingLazyColumnState state, optional boolean showPositionIndicator, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.lazy.ScalingLazyListScope,kotlin.Unit>? content);
9293
}
9394

9495
public final class SplitToggleChipKt {

‎compose-material/src/debug/java/com/google/android/horologist/compose/material/AlertDialogPreview.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ fun AlertDialogPreview() {
2525
AlertContent(
2626
title = "Title",
2727
message = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
28-
onCancelButtonClick = { },
29-
onOKButtonClick = { },
28+
onCancel = { },
29+
onOk = { },
3030
okButtonContentDescription = "Ok",
3131
cancelButtonContentDescription = "Cancel",
3232
)
@@ -43,8 +43,8 @@ fun AlertDialogWithLongBodyPreview() {
4343
"irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla " +
4444
"pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia " +
4545
"deserunt mollit anim id est laborum.",
46-
onCancelButtonClick = { },
47-
onOKButtonClick = { },
46+
onCancel = { },
47+
onOk = { },
4848
okButtonContentDescription = "Ok",
4949
cancelButtonContentDescription = "Cancel",
5050
)

0 commit comments

Comments
 (0)
Please sign in to comment.