commit aa08ba558fdd8bf219d1692ef5425f1441bd6101 parent 94fbad9098b394949382e03f36405bae7a38f242 Author: Gabriel Luong <gabriel.luong@gmail.com> Date: Wed, 17 Dec 2025 07:03:03 +0000 Bug 2005850 - Part 2: Migrate iconPrimary and iconSecondary to their respective M3 color tokens r=android-reviewers,007 - Removes iconPrimary and iconSecondary in AcornColors Differential Revision: https://phabricator.services.mozilla.com/D276385 Diffstat:
4 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/theme/AcornColors.kt b/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/theme/AcornColors.kt @@ -40,9 +40,7 @@ class AcornColors( formDefault: Color, textOnColorPrimary: Color, textActionSecondary: Color, - iconPrimary: Color, iconPrimaryInactive: Color, - iconSecondary: Color, iconActive: Color, iconOnColor: Color, iconOnColorDisabled: Color, @@ -134,18 +132,10 @@ class AcornColors( // Icon - // Primary icon - var iconPrimary by mutableStateOf(iconPrimary) - private set - // Inactive tab var iconPrimaryInactive by mutableStateOf(iconPrimaryInactive) private set - // Secondary icon - var iconSecondary by mutableStateOf(iconSecondary) - private set - // Active tab var iconActive by mutableStateOf(iconActive) private set @@ -221,9 +211,7 @@ class AcornColors( formDefault = other.formDefault textOnColorPrimary = other.textOnColorPrimary textActionSecondary = other.textActionSecondary - iconPrimary = other.iconPrimary iconPrimaryInactive = other.iconPrimaryInactive - iconSecondary = other.iconSecondary iconActive = other.iconActive iconOnColor = other.iconOnColor iconOnColorDisabled = other.iconOnColorDisabled @@ -259,9 +247,7 @@ class AcornColors( formDefault: Color = this.formDefault, textOnColorPrimary: Color = this.textOnColorPrimary, textActionSecondary: Color = this.textActionSecondary, - iconPrimary: Color = this.iconPrimary, iconPrimaryInactive: Color = this.iconPrimaryInactive, - iconSecondary: Color = this.iconSecondary, iconActive: Color = this.iconActive, iconOnColor: Color = this.iconOnColor, iconOnColorDisabled: Color = this.iconOnColorDisabled, @@ -291,9 +277,7 @@ class AcornColors( formDefault = formDefault, textOnColorPrimary = textOnColorPrimary, textActionSecondary = textActionSecondary, - iconPrimary = iconPrimary, iconPrimaryInactive = iconPrimaryInactive, - iconSecondary = iconSecondary, iconActive = iconActive, iconOnColor = iconOnColor, iconOnColorDisabled = iconOnColorDisabled, @@ -326,9 +310,7 @@ val darkColorPalette = AcornColors( formDefault = PhotonColors.LightGrey05, textOnColorPrimary = PhotonColors.LightGrey05, textActionSecondary = PhotonColors.LightGrey05, - iconPrimary = PhotonColors.LightGrey05, iconPrimaryInactive = PhotonColors.LightGrey05A60, - iconSecondary = PhotonColors.LightGrey40, iconActive = PhotonColors.Violet40, iconOnColor = PhotonColors.LightGrey05, iconOnColorDisabled = PhotonColors.LightGrey05A40, @@ -360,9 +342,7 @@ val lightColorPalette = AcornColors( formDefault = PhotonColors.DarkGrey90, textOnColorPrimary = PhotonColors.LightGrey05, textActionSecondary = PhotonColors.DarkGrey90, - iconPrimary = PhotonColors.DarkGrey90, iconPrimaryInactive = PhotonColors.DarkGrey90A60, - iconSecondary = PhotonColors.DarkGrey05, iconActive = PhotonColors.Ink20, iconOnColor = PhotonColors.LightGrey05, iconOnColorDisabled = PhotonColors.LightGrey05A40, diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/java/mozilla/components/service/fxrelay/view/RelayPrompt.kt b/mobile/android/android-components/components/service/firefox-relay/src/main/java/mozilla/components/service/fxrelay/view/RelayPrompt.kt @@ -4,7 +4,6 @@ package mozilla.components.service.fxrelay.view -import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -37,15 +36,16 @@ fun RelayPromptBar( onMaskEmailClicked: () -> Unit, modifier: Modifier = Modifier, ) { - Row( - modifier = modifier - .fillMaxWidth() - .background(color = MaterialTheme.colorScheme.surface) - .padding(horizontal = 16.dp), - ) { - MaskEmailChip( - onClick = onMaskEmailClicked, - ) + Surface { + Row( + modifier = modifier + .fillMaxWidth() + .padding(horizontal = 16.dp), + ) { + MaskEmailChip( + onClick = onMaskEmailClicked, + ) + } } } @@ -69,7 +69,6 @@ private fun MaskEmailChip( painter = painterResource(R.drawable.mozac_ic_mask_email_24), contentDescription = null, // talkback should focus on the whole element modifier = Modifier.size(16.dp), - tint = AcornTheme.colors.iconPrimary, ) Spacer(modifier = Modifier.size(8.dp)) @@ -77,7 +76,6 @@ private fun MaskEmailChip( Text( text = stringResource(mozilla.components.service.fxrelay.R.string.mozac_feature_relay_chip_text), style = AcornTheme.typography.headline8, - color = MaterialTheme.colorScheme.onSurface, ) } } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/tabstrip/TabStrip.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/tabstrip/TabStrip.kt @@ -202,7 +202,7 @@ private fun TabStripContent( IconButton(onClick = onAddTabClick) { Icon( painter = painterResource(iconsR.drawable.mozac_ic_plus_24), - tint = FirefoxTheme.colors.iconPrimary, + tint = MaterialTheme.colorScheme.onSurface, contentDescription = stringResource(R.string.add_tab), ) } @@ -411,9 +411,9 @@ private fun TabItem( Icon( painter = painterResource(iconsR.drawable.mozac_ic_cross_20), tint = if (state.isSelected) { - FirefoxTheme.colors.iconPrimary + MaterialTheme.colorScheme.onSurface } else { - FirefoxTheme.colors.iconSecondary + MaterialTheme.colorScheme.onSurfaceVariant }, contentDescription = stringResource( id = R.string.close_tab_title, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -171,9 +172,11 @@ class BrowserToolbarCFRPresenter( Icon( painter = painterResource(id = R.drawable.ic_cookies_disabled), contentDescription = null, - tint = FirefoxTheme.colors.iconPrimary, + tint = MaterialTheme.colorScheme.onSurface, ) + Spacer(modifier = Modifier.width(8.dp)) + Text( text = context.getString( R.string.cookie_banner_cfr_title,