diff options
author | Chiara Chiappini <cchiappini@google.com> | 2024-04-12 15:24:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-12 15:24:56 +0100 |
commit | 19e6c1d5df08273c4fab9a03d198f648f34f9319 (patch) | |
tree | c05d57106095419fbca9fe2ebc1f5a980416a529 | |
parent | eefac51369cd766a831e57c34db8ee1b3835af6c (diff) | |
download | horologist-19e6c1d5df08273c4fab9a03d198f648f34f9319.tar.gz |
Update UAMPEntity screen to use AlertDialog (#2191)
* Uses Horologit button
* Uses Horologist AlertDialog, removes button
-rw-r--r-- | media/sample/src/main/java/com/google/android/horologist/mediasample/ui/entity/UampEntityScreen.kt | 55 |
1 files changed, 4 insertions, 51 deletions
diff --git a/media/sample/src/main/java/com/google/android/horologist/mediasample/ui/entity/UampEntityScreen.kt b/media/sample/src/main/java/com/google/android/horologist/mediasample/ui/entity/UampEntityScreen.kt index c9db8485..1c666fdd 100644 --- a/media/sample/src/main/java/com/google/android/horologist/mediasample/ui/entity/UampEntityScreen.kt +++ b/media/sample/src/main/java/com/google/android/horologist/mediasample/ui/entity/UampEntityScreen.kt @@ -16,30 +16,13 @@ package com.google.android.horologist.mediasample.ui.entity -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.wrapContentSize -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Close import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState -import androidx.wear.compose.material.Button -import androidx.wear.compose.material.ButtonDefaults -import androidx.wear.compose.material.Icon -import androidx.wear.compose.material.MaterialTheme -import androidx.wear.compose.material.Text -import androidx.wear.compose.material.dialog.Alert -import androidx.wear.compose.material.dialog.Dialog import com.google.android.horologist.compose.layout.ScalingLazyColumnState import com.google.android.horologist.compose.layout.rememberResponsiveColumnState import com.google.android.horologist.compose.material.AlertDialog @@ -103,41 +86,11 @@ fun UampEntityScreen( // b/243381431 - it should stop listening to uiState emissions while dialog is presented if (uiState == PlaylistDownloadScreenState.Failed) { - Dialog( + AlertDialog( + message = stringResource(R.string.entity_no_playlists), + onDismiss = onErrorDialogCancelClick, showDialog = true, - onDismissRequest = onErrorDialogCancelClick, - scrollState = rememberScalingLazyListState(), - ) { - Alert( - title = { - Text( - text = stringResource(R.string.entity_no_playlists), - color = MaterialTheme.colors.onBackground, - textAlign = TextAlign.Center, - style = MaterialTheme.typography.title3, - ) - }, - ) { - item { - Row( - verticalAlignment = Alignment.CenterVertically, - ) { - Button( - onClick = onErrorDialogCancelClick, - colors = ButtonDefaults.secondaryButtonColors(), - ) { - Icon( - imageVector = Icons.Default.Close, - contentDescription = stringResource(id = R.string.entity_failed_dialog_cancel_button_content_description), - modifier = Modifier - .size(24.dp) - .wrapContentSize(align = Alignment.Center), - ) - } - } - } - } - } + ) } AlertDialog( |