commit f6931784dd467c2a34a6a98ece0cbcf1e2c6faa2 parent 2ca542d1243065f94529c1d8553b47ef80844e3b Author: Gabriel Luong <gabriel.luong@gmail.com> Date: Tue, 2 Dec 2025 07:24:56 +0000 Bug 1993368 - Part 28: Audit AlertDialog usages to align with M3 specs r=android-reviewers,007 - Audit all the AlertDialog usages to align with M3 specs. - AlertDialog that does not have both a title and text should only display using the `text` parameter. - Confirmed via Slack with Maggie in https://mozilla.slack.com/archives/C08MZ1Z840K/p1762270911406259 - This is also illustrated in Figma: https://www.figma.com/design/ctk1Pw1TBxUwVgTTOvjHb4/2025-Android-Fundamentals?node-id=969-23103&m=dev - Dialog: https://www.figma.com/design/MjufE1X5fvkxZ0YneX4kRd/Android-Library--2025-?node-id=63942-53808&m=dev Differential Revision: https://phabricator.services.mozilla.com/D274531 Diffstat:
4 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksScreen.kt @@ -880,9 +880,10 @@ private fun AlertDialogDeletionWarning( onDeleteTapped: () -> Unit, ) { AlertDialog( - title = { + text = { Text( text = stringResource(R.string.bookmark_delete_folders_confirmation_dialog), + style = FirefoxTheme.typography.body2, ) }, onDismissRequest = onCancelTapped, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/address/ui/edit/DeleteAddressDialog.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/address/ui/edit/DeleteAddressDialog.kt @@ -36,10 +36,10 @@ internal fun DeleteAddressDialog(store: AddressStore) { if (dialogState is DialogState.Presenting) { AlertDialog( - title = { + text = { Text( text = stringResource(R.string.addressess_confirm_dialog_message_2), - style = FirefoxTheme.typography.headline5, + style = FirefoxTheme.typography.body2, ) }, onDismissRequest = { store.dispatch(DeleteDialogAction.CancelTapped) }, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/creditcards/ui/DeleteCreditCardDialog.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/creditcards/ui/DeleteCreditCardDialog.kt @@ -33,14 +33,12 @@ internal fun DeleteCreditCardDialog( ) { AlertDialog( modifier = modifier, - title = { + text = { Text( text = stringResource(R.string.credit_cards_delete_dialog_confirmation_2), - color = FirefoxTheme.colors.textPrimary, - style = FirefoxTheme.typography.headline5, + style = FirefoxTheme.typography.body2, ) }, - text = null, onDismissRequest = onCancel, confirmButton = { TextButton( diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/fab/TabManagerFloatingToolbar.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/fab/TabManagerFloatingToolbar.kt @@ -8,7 +8,6 @@ import androidx.annotation.DrawableRes import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row @@ -23,6 +22,7 @@ import androidx.compose.material3.CardDefaults import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -300,7 +300,7 @@ private fun CloseAllTabsConfirmationDialog( title = { Text( text = stringResource(R.string.tab_manager_close_all_tabs_dialog_title), - style = FirefoxTheme.typography.headline6, + style = FirefoxTheme.typography.headline5, ) }, text = { @@ -450,21 +450,21 @@ private fun TabManagerFloatingToolbarPreview( previewDataModel: TabManagerFloatingToolbarPreviewModel, ) { FirefoxTheme { - TabManagerFloatingToolbar( - tabsTrayStore = remember { TabsTrayStore(initialState = previewDataModel.state) }, - expanded = previewDataModel.expanded, - isSignedIn = previewDataModel.isSignedIn, - pbmLocked = false, - modifier = Modifier - .background(color = MaterialTheme.colorScheme.surface) - .padding(all = 16.dp), - onOpenNewNormalTabClicked = {}, - onOpenNewPrivateTabClicked = {}, - onSyncedTabsFabClicked = {}, - onTabSettingsClick = {}, - onAccountSettingsClick = {}, - onDeleteAllTabsClick = {}, - onRecentlyClosedClick = {}, - ) + Surface { + TabManagerFloatingToolbar( + tabsTrayStore = remember { TabsTrayStore(initialState = previewDataModel.state) }, + expanded = previewDataModel.expanded, + isSignedIn = previewDataModel.isSignedIn, + pbmLocked = false, + modifier = Modifier.padding(all = 16.dp), + onOpenNewNormalTabClicked = {}, + onOpenNewPrivateTabClicked = {}, + onSyncedTabsFabClicked = {}, + onTabSettingsClick = {}, + onAccountSettingsClick = {}, + onDeleteAllTabsClick = {}, + onRecentlyClosedClick = {}, + ) + } } }