commit 253fa52ce1e97d9790b16ea6946c52a133544d98
parent b80d5c5f9fc018dbb3b6bd4d652aaa7933dcd5c4
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date: Thu, 20 Nov 2025 08:12:38 +0000
Bug 1998092 - Part 12: Migrate DeleteAddressDialog to M3 Acorn specs r=android-reviewers,007
- Adding private preview.
- Removing unnecessary AlertDialog parameters for `text` and text `color`. These parameters are already provided by default.
- Dialog: https://www.figma.com/design/MjufE1X5fvkxZ0YneX4kRd/Android-Library--2025-?node-id=63942-43565&m=dev
Differential Revision: https://phabricator.services.mozilla.com/D272190
Diffstat:
1 file changed, 24 insertions(+), 5 deletions(-)
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
@@ -5,13 +5,15 @@
package org.mozilla.fenix.settings.address.ui.edit
import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
-import mozilla.components.compose.base.annotation.FlexibleWindowLightDarkPreview
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewLightDark
import mozilla.components.compose.base.button.TextButton
import mozilla.components.lib.state.ext.observeAsState
import org.mozilla.fenix.R
@@ -21,6 +23,7 @@ import org.mozilla.fenix.settings.address.store.DeleteDialogAction
import org.mozilla.fenix.settings.address.store.DialogState
import org.mozilla.fenix.settings.address.store.ViewAppeared
import org.mozilla.fenix.theme.FirefoxTheme
+import org.mozilla.fenix.theme.Theme
/**
* Dialog that is presented when deleting an address.
@@ -36,11 +39,9 @@ internal fun DeleteAddressDialog(store: AddressStore) {
title = {
Text(
text = stringResource(R.string.addressess_confirm_dialog_message_2),
- color = FirefoxTheme.colors.textPrimary,
style = FirefoxTheme.typography.headline5,
)
},
- text = null,
onDismissRequest = { store.dispatch(DeleteDialogAction.CancelTapped) },
confirmButton = {
TextButton(
@@ -60,14 +61,32 @@ internal fun DeleteAddressDialog(store: AddressStore) {
}
}
-@FlexibleWindowLightDarkPreview
+@PreviewLightDark
@Composable
private fun DeleteAddressDialogPreview() {
val store = AddressStore(
AddressState.initial().copy(deleteDialog = DialogState.Presenting),
listOf(),
).also { it.dispatch(ViewAppeared) }
+
FirefoxTheme {
- DeleteAddressDialog(store)
+ Surface {
+ DeleteAddressDialog(store)
+ }
+ }
+}
+
+@Preview
+@Composable
+private fun DeleteAddressDialogPrivatePreview() {
+ val store = AddressStore(
+ AddressState.initial().copy(deleteDialog = DialogState.Presenting),
+ listOf(),
+ ).also { it.dispatch(ViewAppeared) }
+
+ FirefoxTheme(theme = Theme.Private) {
+ Surface {
+ DeleteAddressDialog(store)
+ }
}
}