commit f05143e6fc6e61e2484a5432fc3d5cc139e0a312 parent e00c7523b56d675f68ebc5cf34c85efd13f530bb Author: Matthew Tighe <matthewdtighe@gmail.com> Date: Mon, 24 Nov 2025 21:52:12 +0000 Bug 2001941 - stop applying color filter to wordmark logo r=android-reviewers,boek Differential Revision: https://phabricator.services.mozilla.com/D273879 Diffstat:
4 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/store/HomepageState.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/store/HomepageState.kt @@ -186,7 +186,7 @@ internal sealed class HomepageState { Private( headerState = HeaderState( showHeader = settings.showHomepageHeader, - wordmarkColor = null, + wordmarkTextColor = null, privateBrowsingButtonColor = colorResource( getAttr( R.attr.mozac_ic_private_mode_circle_fill_icon_color, @@ -240,7 +240,7 @@ internal sealed class HomepageState { showCollections = settings.collections, headerState = HeaderState( showHeader = settings.showHomepageHeader, - wordmarkColor = wallpaperState.currentWallpaper.textColor?.let { Color(it) }, + wordmarkTextColor = wallpaperState.currentWallpaper.textColor?.let { Color(it) }, privateBrowsingButtonColor = wallpaperState.currentWallpaper.textColor ?.let { Color(it) } ?: colorResource( getAttr( @@ -273,12 +273,12 @@ internal sealed class HomepageState { * A simple wrapper around state required for the homepage header. * * @property showHeader whether the header should be shown - * @property wordmarkColor an optional color for the wordmark text and logo + * @property wordmarkTextColor an optional color for the wordmark text * @property privateBrowsingButtonColor the color to use for the private browsing button */ internal data class HeaderState( val showHeader: Boolean, - val wordmarkColor: Color?, + val wordmarkTextColor: Color?, val privateBrowsingButtonColor: Color, ) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/ui/Homepage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/ui/Homepage.kt @@ -119,7 +119,7 @@ internal fun Homepage( ) { if (state.headerState.showHeader) { HomepageHeader( - wordmarkColor = state.headerState.wordmarkColor, + wordmarkTextColor = state.headerState.wordmarkTextColor, privateBrowsingButtonColor = state.headerState.privateBrowsingButtonColor, browsingMode = state.browsingMode, browsingModeChanged = interactor::onPrivateModeButtonClicked, @@ -478,7 +478,7 @@ private fun HomepagePreview() { showCollections = true, headerState = HeaderState( showHeader = false, - wordmarkColor = null, + wordmarkTextColor = null, privateBrowsingButtonColor = colorResource( getAttr( iconsR.attr.mozac_ic_private_mode_circle_fill_icon_color, @@ -528,7 +528,7 @@ private fun HomepagePreviewCollections() { showCollections = true, headerState = HeaderState( showHeader = false, - wordmarkColor = null, + wordmarkTextColor = null, privateBrowsingButtonColor = colorResource( getAttr( iconsR.attr.mozac_ic_private_mode_circle_fill_icon_color, @@ -578,7 +578,7 @@ private fun MinimalHomepagePreview() { showCollections = false, HeaderState( showHeader = false, - wordmarkColor = null, + wordmarkTextColor = null, privateBrowsingButtonColor = colorResource( getAttr( iconsR.attr.mozac_ic_private_mode_circle_fill_icon_color, @@ -613,7 +613,7 @@ private fun PrivateHomepagePreview() { state = HomepageState.Private( headerState = HeaderState( showHeader = false, - wordmarkColor = null, + wordmarkTextColor = null, privateBrowsingButtonColor = colorResource( getAttr( iconsR.attr.mozac_ic_private_mode_circle_fill_icon_color, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/ui/HomepageHeader.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/ui/HomepageHeader.kt @@ -47,7 +47,7 @@ import mozilla.components.ui.icons.R as iconsR */ @Composable fun HomepageHeader( - wordmarkColor: Color?, + wordmarkTextColor: Color?, privateBrowsingButtonColor: Color, browsingMode: BrowsingMode, browsingModeChanged: (BrowsingMode) -> Unit, @@ -59,9 +59,9 @@ fun HomepageHeader( .padding(start = 16.dp, end = 16.dp, top = 18.dp, bottom = 32.dp), verticalAlignment = Alignment.CenterVertically, ) { - WordmarkLogo(wordmarkColor) + WordmarkLogo() - WordmarkText(wordmarkColor) + WordmarkText(wordmarkTextColor) Spacer(modifier = Modifier.weight(1f)) @@ -74,7 +74,7 @@ fun HomepageHeader( } @Composable -private fun WordmarkLogo(color: Color?) { +private fun WordmarkLogo() { Image( modifier = Modifier .height(40.dp) @@ -84,7 +84,6 @@ private fun WordmarkLogo(color: Color?) { } .padding(end = 10.dp), painter = painterResource(getAttr(R.attr.fenixWordmarkLogo)), - colorFilter = color?.let { ColorFilter.tint(it) }, contentDescription = null, ) } @@ -149,7 +148,7 @@ private fun HomepageHeaderPreview() { FirefoxTheme { Surface { HomepageHeader( - wordmarkColor = null, + wordmarkTextColor = null, privateBrowsingButtonColor = colorResource( getAttr( iconsR.attr.mozac_ic_private_mode_circle_fill_icon_color, @@ -168,7 +167,7 @@ private fun PrivateHomepageHeaderPreview() { FirefoxTheme(theme = Theme.Private) { Surface { HomepageHeader( - wordmarkColor = null, + wordmarkTextColor = null, privateBrowsingButtonColor = colorResource( getAttr( iconsR.attr.mozac_ic_private_mode_circle_fill_icon_color, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/ui/MiddleSearchHomepage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/ui/MiddleSearchHomepage.kt @@ -179,7 +179,7 @@ private fun MiddleSearchHomepagePreview() { showCollections = true, headerState = HeaderState( showHeader = false, - wordmarkColor = null, + wordmarkTextColor = null, privateBrowsingButtonColor = colorResource( getAttr( R.attr.mozac_ic_private_mode_circle_fill_icon_color,