commit 48c74bd83a3155bbaaa3f5940855ff1b7b456e5c parent a60f561c44935ade190bcc03c2d50e316d6f61c4 Author: Gabriel Luong <gabriel.luong@gmail.com> Date: Thu, 20 Nov 2025 01:11:16 +0000 Bug 1983833 - Part 1: Migrate the AwesomeBar colors to use M3 Acorn color tokens r=android-reviewers,petru Reference: https://www.figma.com/design/ctk1Pw1TBxUwVgTTOvjHb4/2025-Android-Fundamentals?node-id=972-25475&m=dev Differential Revision: https://phabricator.services.mozilla.com/D270334 Diffstat:
5 files changed, 5 insertions(+), 36 deletions(-)
diff --git a/mobile/android/android-components/components/compose/awesomebar/src/main/java/mozilla/components/compose/browser/awesomebar/AwesomeBarDefaults.kt b/mobile/android/android-components/components/compose/awesomebar/src/main/java/mozilla/components/compose/browser/awesomebar/AwesomeBarDefaults.kt @@ -18,14 +18,16 @@ object AwesomeBarDefaults { * @param background The background of the AwesomeBar. * @param title The text color for the title of a suggestion. * @param description The text color for the description of a suggestion. + * @param autocompleteIcon The color for the autocomplete icon. + * @param groupTitle The text color for the group title. */ @Composable fun colors( background: Color = MaterialTheme.colorScheme.background, title: Color = MaterialTheme.colorScheme.onBackground, description: Color = MaterialTheme.colorScheme.onSurfaceVariant, - autocompleteIcon: Color = MaterialTheme.colorScheme.onSurface, - groupTitle: Color = MaterialTheme.colorScheme.onBackground, + autocompleteIcon: Color = MaterialTheme.colorScheme.onSurfaceVariant, + groupTitle: Color = MaterialTheme.colorScheme.onSurfaceVariant, ) = AwesomeBarColors( background, title, 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 @@ -248,7 +248,7 @@ private fun BookmarksList( ) { val state by store.observeAsState(store.state) { it } val searchState = searchStore.observeAsComposableState { it }.value - val awesomebarBackground = MaterialTheme.colorScheme.surface + val awesomebarBackground = AwesomeBarDefaults.colors().background val awesomebarScrim by remember(searchState.query) { derivedStateOf { when (searchState.query.isNotEmpty()) { @@ -555,13 +555,6 @@ private fun BookmarksList( text = searchState.query, providers = searchState.searchSuggestionsProviders, orientation = AwesomeBarOrientation.TOP, - colors = AwesomeBarDefaults.colors( - background = Color.Transparent, - title = FirefoxTheme.colors.textPrimary, - description = FirefoxTheme.colors.textSecondary, - autocompleteIcon = FirefoxTheme.colors.textSecondary, - groupTitle = FirefoxTheme.colors.textSecondary, - ), onSuggestionClicked = { suggestion -> searchStore.dispatch(SuggestionClicked(suggestion)) }, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt @@ -76,7 +76,6 @@ import mozilla.components.browser.storage.sync.PlacesHistoryStorage import mozilla.components.compose.base.theme.AcornTheme import mozilla.components.compose.base.utils.BackInvokedHandler import mozilla.components.compose.browser.awesomebar.AwesomeBar -import mozilla.components.compose.browser.awesomebar.AwesomeBarDefaults import mozilla.components.compose.browser.awesomebar.AwesomeBarOrientation import mozilla.components.compose.browser.toolbar.BrowserToolbar import mozilla.components.compose.browser.toolbar.store.BrowserEditToolbarAction @@ -503,13 +502,6 @@ class HistoryFragment : LibraryPageFragment<History>(), UserInteractionHandler, text = searchState.query, providers = searchState.searchSuggestionsProviders, orientation = AwesomeBarOrientation.TOP, - colors = AwesomeBarDefaults.colors( - background = Color.Transparent, - title = FirefoxTheme.colors.textPrimary, - description = FirefoxTheme.colors.textSecondary, - autocompleteIcon = FirefoxTheme.colors.textSecondary, - groupTitle = FirefoxTheme.colors.textSecondary, - ), onSuggestionClicked = { suggestion -> searchStore.dispatch(SuggestionClicked(suggestion)) }, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarComposable.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarComposable.kt @@ -32,7 +32,6 @@ import mozilla.components.browser.state.action.AwesomeBarAction import mozilla.components.browser.state.store.BrowserStore import mozilla.components.compose.base.theme.AcornTheme import mozilla.components.compose.browser.awesomebar.AwesomeBar -import mozilla.components.compose.browser.awesomebar.AwesomeBarDefaults import mozilla.components.compose.browser.awesomebar.AwesomeBarOrientation import mozilla.components.compose.browser.toolbar.store.BrowserEditToolbarAction.SearchQueryUpdated import mozilla.components.compose.browser.toolbar.store.BrowserToolbarStore @@ -56,7 +55,6 @@ import org.mozilla.fenix.search.SearchFragmentAction.SuggestionSelected import org.mozilla.fenix.search.SearchFragmentStore import org.mozilla.fenix.search.createInitialSearchFragmentState import org.mozilla.fenix.settings.SupportUtils -import org.mozilla.fenix.theme.FirefoxTheme private const val MATERIAL_DESIGN_SCRIM = "#52000000" @@ -200,13 +198,6 @@ class AwesomeBarComposable( text = state.query, providers = state.searchSuggestionsProviders, orientation = orientation, - colors = AwesomeBarDefaults.colors( - background = Color.Transparent, - title = FirefoxTheme.colors.textPrimary, - description = FirefoxTheme.colors.textSecondary, - autocompleteIcon = FirefoxTheme.colors.textSecondary, - groupTitle = FirefoxTheme.colors.textSecondary, - ), onSuggestionClicked = { suggestion -> searchStore.dispatch(SuggestionClicked(suggestion)) }, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt @@ -8,11 +8,9 @@ import android.content.Context import android.util.AttributeSet import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableStateOf -import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.AbstractComposeView import mozilla.components.browser.state.action.AwesomeBarAction import mozilla.components.compose.browser.awesomebar.AwesomeBar -import mozilla.components.compose.browser.awesomebar.AwesomeBarDefaults import mozilla.components.compose.browser.awesomebar.AwesomeBarOrientation import mozilla.components.concept.awesomebar.AwesomeBar import mozilla.components.support.ktx.android.view.hideKeyboard @@ -55,13 +53,6 @@ class AwesomeBarWrapper @JvmOverloads constructor( text = text.value, providers = providers.value, orientation = orientation, - colors = AwesomeBarDefaults.colors( - background = Color.Transparent, - title = FirefoxTheme.colors.textPrimary, - description = FirefoxTheme.colors.textSecondary, - autocompleteIcon = FirefoxTheme.colors.textSecondary, - groupTitle = FirefoxTheme.colors.textSecondary, - ), onSuggestionClicked = { suggestion -> context.components.core.store.dispatch(AwesomeBarAction.SuggestionClicked(suggestion)) suggestion.onSuggestionClicked?.invoke()