From 543f2000af4d5d17b9bf06cdd18dbb105395ffe1 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Fri, 10 Dec 2021 13:15:30 -0500 Subject: [PATCH] For #22793 - Rename fx_mobile_icon_color_notice color token to fx_mobile_icon_color_information --- .../mozilla/fenix/components/toolbar/BrowserToolbarView.kt | 2 +- .../mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt | 4 ++-- .../java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt | 2 +- app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt | 2 +- app/src/main/res/values-night/colors.xml | 4 ++-- app/src/main/res/values/colors.xml | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt index a31fbc9d8d..154e71739e 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt @@ -124,7 +124,7 @@ class BrowserToolbarView( trackingProtection = primaryTextColor, highlight = ContextCompat.getColor( context, - R.color.fx_mobile_icon_color_notice + R.color.fx_mobile_icon_color_information ) ) diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt index 94afc6d4ca..d54871e221 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt @@ -181,7 +181,7 @@ open class DefaultToolbarMenu( iconTintColorResource = primaryTextColor(), highlight = BrowserMenuHighlight.LowPriority( label = context.getString(R.string.browser_menu_install_on_homescreen), - notificationTint = getColor(context, R.color.fx_mobile_icon_color_notice) + notificationTint = getColor(context, R.color.fx_mobile_icon_color_information) ), isHighlighted = { !context.settings().installPwaOpened @@ -250,7 +250,7 @@ open class DefaultToolbarMenu( iconTintColorResource = primaryTextColor(), highlight = BrowserMenuHighlight.LowPriority( label = context.getString(R.string.browser_menu_open_app_link), - notificationTint = getColor(context, R.color.fx_mobile_icon_color_notice) + notificationTint = getColor(context, R.color.fx_mobile_icon_color_information) ), isHighlighted = { !context.settings().openInAppOpened } ) { diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt index d68c3ec2a0..fdf978ec16 100644 --- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt @@ -154,7 +154,7 @@ class CustomTabToolbarMenu( iconTintColorResource = primaryTextColor(), highlight = BrowserMenuHighlight.LowPriority( label = context.getString(R.string.browser_menu_open_app_link), - notificationTint = getColor(context, R.color.fx_mobile_icon_color_notice) + notificationTint = getColor(context, R.color.fx_mobile_icon_color_information) ), isHighlighted = { !context.settings().openInAppOpened } ) { diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt index 3ee2ff9f60..a49d4a9223 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt @@ -153,7 +153,7 @@ class HomeMenu( R.drawable.ic_whats_new, iconTintColorResource = primaryTextColor, highlight = BrowserMenuHighlight.LowPriority( - notificationTint = getColor(context, R.color.fx_mobile_icon_color_notice) + notificationTint = getColor(context, R.color.fx_mobile_icon_color_information) ), isHighlighted = { WhatsNew.shouldHighlightWhatsNew(context) } ) { diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 9b0c09ae46..9ac035de44 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -65,8 +65,8 @@ @color/photonLightGrey70 @color/photonWhite - - @color/photonBlue30 + + @color/photonBlue30 @color/photonLightGrey05 @color/photonRed40 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 217a8ead4d..6155f46c61 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -65,8 +65,8 @@ @color/photonLightGrey70 @color/photonWhite - - @color/photonBlue30 + + @color/photonBlue30 @color/photonViolet90 @color/photonRed80