commit 0a91e602e37f59e81347d5c6d94e20acdfaa57bf parent 3daed90399329bc4b3bb362ff5fdca7995444041 Author: Gabriel Luong <gabriel.luong@gmail.com> Date: Wed, 10 Dec 2025 15:33:06 +0000 Bug 2004511 - Part 5: Replace AcornTheme usage with FirefoxTheme in Fenix r=android-reviewers,007 Differential Revision: https://phabricator.services.mozilla.com/D275382 Diffstat:
6 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/theme/layout/AcornLayout.kt b/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/theme/layout/AcornLayout.kt @@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/setup/ui/ChecklistView.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/setup/ui/ChecklistView.kt @@ -27,7 +27,6 @@ import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.dp import mozilla.components.compose.base.annotation.FlexibleWindowLightDarkPreview -import mozilla.components.compose.base.theme.AcornTheme import org.mozilla.fenix.R import org.mozilla.fenix.components.appstate.setup.checklist.ChecklistItem import org.mozilla.fenix.home.sessioncontrol.SetupChecklistInteractor @@ -83,7 +82,6 @@ private fun Task( painter = painterResource(id = iconsR.drawable.mozac_ic_checkmark_24), contentDescription = stringResource(R.string.a11y_completed_task_description), modifier = Modifier.padding(16.dp), - tint = AcornTheme.colors.iconPrimary, ) } else { Spacer(Modifier.size(56.dp)) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/logins/ui/EditLoginScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/logins/ui/EditLoginScreen.kt @@ -40,7 +40,6 @@ import mozilla.components.compose.base.annotation.FlexibleWindowLightDarkPreview import mozilla.components.compose.base.button.IconButton import mozilla.components.compose.base.text.Text import mozilla.components.compose.base.textfield.TextField -import mozilla.components.compose.base.theme.AcornTheme import mozilla.components.lib.state.ext.observeAsState import org.mozilla.fenix.R import org.mozilla.fenix.theme.FirefoxTheme @@ -137,8 +136,7 @@ internal fun EditLoginTopBar(store: LoginsStore, loginItem: LoginItem) { private fun EditLoginUrl(url: String) { Text( text = stringResource(R.string.preferences_passwords_saved_logins_site), - style = AcornTheme.typography.caption, - color = AcornTheme.colors.textPrimary, + style = FirefoxTheme.typography.caption, modifier = Modifier .padding(horizontal = FirefoxTheme.layout.space.static200) .width(FirefoxTheme.layout.size.containerMaxWidth), @@ -146,7 +144,7 @@ private fun EditLoginUrl(url: String) { Text( text = url, - style = AcornTheme.typography.subtitle1, + style = FirefoxTheme.typography.subtitle1, color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f), modifier = Modifier .padding( diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/settingssearch/SettingsSearchBar.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/settingssearch/SettingsSearchBar.kt @@ -32,9 +32,9 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.Lifecycle import androidx.lifecycle.compose.LocalLifecycleOwner import mozilla.components.compose.base.button.IconButton -import mozilla.components.compose.base.theme.AcornTheme import mozilla.components.lib.state.ext.observeAsComposableState import org.mozilla.fenix.R +import org.mozilla.fenix.theme.FirefoxTheme import mozilla.components.ui.icons.R as iconsR /** @@ -99,7 +99,7 @@ private fun SettingsSearchField( searchQuery = value store.dispatch(SettingsSearchAction.SearchQueryUpdated(value.text)) }, - textStyle = AcornTheme.typography.body1, + textStyle = FirefoxTheme.typography.body1, modifier = Modifier .fillMaxWidth() .focusRequester(focusRequester) @@ -111,7 +111,7 @@ private fun SettingsSearchField( placeholder = @Composable { Text( text = stringResource(R.string.settings_search_title), - style = AcornTheme.typography.body1, + style = FirefoxTheme.typography.body1, ) }, singleLine = true, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/settingssearch/SettingsSearchScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/settingssearch/SettingsSearchScreen.kt @@ -36,7 +36,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp -import mozilla.components.compose.base.theme.AcornTheme import mozilla.components.lib.state.ext.observeAsComposableState import org.mozilla.fenix.GleanMetrics.SettingsSearch import org.mozilla.fenix.R @@ -230,7 +229,7 @@ private fun RecentSearchesContent( Text( text = stringResource(R.string.settings_search_clear_recent_searches_message), color = colorResource(RECENT_SEARCHES_CLEAR_RECENTS_TEXT_COLOR), - style = AcornTheme.typography.button, + style = FirefoxTheme.typography.button, maxLines = 1, ) } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/webcompat/ui/WebCompatReporter.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/webcompat/ui/WebCompatReporter.kt @@ -58,7 +58,6 @@ import mozilla.components.compose.base.menu.MenuItem import mozilla.components.compose.base.modifier.thenConditional import mozilla.components.compose.base.text.Text.Resource import mozilla.components.compose.base.textfield.TextField -import mozilla.components.compose.base.theme.AcornTheme import mozilla.components.lib.state.ext.observeAsState import org.mozilla.fenix.Config import org.mozilla.fenix.R @@ -232,13 +231,13 @@ fun WebCompatReporter( Text( text = stringResource(id = R.string.webcompat_reporter_etp_checkbox_text), color = MaterialTheme.colorScheme.onSurface, - style = AcornTheme.typography.body1, + style = FirefoxTheme.typography.body1, ) Text( text = stringResource(id = R.string.webcompat_reporter_etp_checkbox_description), color = MaterialTheme.colorScheme.onSurfaceVariant, - style = AcornTheme.typography.body2, + style = FirefoxTheme.typography.body2, ) } }