Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-15 18:12:54 +00:00
Code Issues Releases Wiki Activity

For #22701 - Replace whats_new_notification_color with fx_mobile_icon_color_notice color token

Browse Source
This commit is contained in:
Gabriel Luong 2021-12-03 23:45:15 -05:00 committed by mergify[bot]
parent a4894256f9
commit 596072729d
6 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
View File

@ -124,7 +124,7 @@ class BrowserToolbarView(
trackingProtection = primaryTextColor, trackingProtection = primaryTextColor,
highlight = ContextCompat.getColor( highlight = ContextCompat.getColor(
context, context,
R.color.whats_new_notification_color R.color.fx_mobile_icon_color_notice
) )
) )

4
app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
View File

@ -181,7 +181,7 @@ open class DefaultToolbarMenu(
iconTintColorResource = primaryTextColor(), iconTintColorResource = primaryTextColor(),
highlight = BrowserMenuHighlight.LowPriority( highlight = BrowserMenuHighlight.LowPriority(
label = context.getString(R.string.browser_menu_install_on_homescreen), label = context.getString(R.string.browser_menu_install_on_homescreen),
notificationTint = getColor(context, R.color.whats_new_notification_color) notificationTint = getColor(context, R.color.fx_mobile_icon_color_notice)
), ),
isHighlighted = { isHighlighted = {
!context.settings().installPwaOpened !context.settings().installPwaOpened
@ -250,7 +250,7 @@ open class DefaultToolbarMenu(
iconTintColorResource = primaryTextColor(), iconTintColorResource = primaryTextColor(),
highlight = BrowserMenuHighlight.LowPriority( highlight = BrowserMenuHighlight.LowPriority(
label = context.getString(R.string.browser_menu_open_app_link), label = context.getString(R.string.browser_menu_open_app_link),
notificationTint = getColor(context, R.color.whats_new_notification_color) notificationTint = getColor(context, R.color.fx_mobile_icon_color_notice)
), ),
isHighlighted = { !context.settings().openInAppOpened } isHighlighted = { !context.settings().openInAppOpened }
) { ) {

2
app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
View File

@ -154,7 +154,7 @@ class CustomTabToolbarMenu(
iconTintColorResource = primaryTextColor(), iconTintColorResource = primaryTextColor(),
highlight = BrowserMenuHighlight.LowPriority( highlight = BrowserMenuHighlight.LowPriority(
label = context.getString(R.string.browser_menu_open_app_link), label = context.getString(R.string.browser_menu_open_app_link),
notificationTint = getColor(context, R.color.whats_new_notification_color) notificationTint = getColor(context, R.color.fx_mobile_icon_color_notice)
), ),
isHighlighted = { !context.settings().openInAppOpened } isHighlighted = { !context.settings().openInAppOpened }
) { ) {

2
app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
View File

@ -153,7 +153,7 @@ class HomeMenu(
R.drawable.ic_whats_new, R.drawable.ic_whats_new,
iconTintColorResource = primaryTextColor, iconTintColorResource = primaryTextColor,
highlight = BrowserMenuHighlight.LowPriority( highlight = BrowserMenuHighlight.LowPriority(
notificationTint = getColor(context, R.color.whats_new_notification_color) notificationTint = getColor(context, R.color.fx_mobile_icon_color_notice)
), ),
isHighlighted = { WhatsNew.shouldHighlightWhatsNew(context) } isHighlighted = { WhatsNew.shouldHighlightWhatsNew(context) }
) { ) {

2
app/src/main/res/values-night/colors.xml
View File

@ -66,7 +66,7 @@
<!-- Icon inverted (on color) --> <!-- Icon inverted (on color) -->
<color name="fx_mobile_icon_color_inverted" tools:ignore="UnusedResources">@color/photonWhite</color> <color name="fx_mobile_icon_color_inverted" tools:ignore="UnusedResources">@color/photonWhite</color>
<!-- New --> <!-- New -->
<color name="fx_mobile_icon_color_notice" tools:ignore="UnusedResources">@color/photonBlue30</color> <color name="fx_mobile_icon_color_notice">@color/photonBlue30</color>
<!-- Icon button --> <!-- Icon button -->
<color name="fx_mobile_icon_color_button" tools:ignore="UnusedResources">@color/photonLightGrey05</color> <color name="fx_mobile_icon_color_button" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<color name="fx_mobile_icon_color_warning" tools:ignore="UnusedResources">@color/photonRed40</color> <color name="fx_mobile_icon_color_warning" tools:ignore="UnusedResources">@color/photonRed40</color>

5
app/src/main/res/values/colors.xml
View File

@ -66,7 +66,7 @@
<!-- Icon inverted (on color) --> <!-- Icon inverted (on color) -->
<color name="fx_mobile_icon_color_inverted" tools:ignore="UnusedResources">@color/photonWhite</color> <color name="fx_mobile_icon_color_inverted" tools:ignore="UnusedResources">@color/photonWhite</color>
<!-- New --> <!-- New -->
<color name="fx_mobile_icon_color_notice" tools:ignore="UnusedResources">@color/photonBlue30</color> <color name="fx_mobile_icon_color_notice">@color/photonBlue30</color>
<!-- Icon button --> <!-- Icon button -->
<color name="fx_mobile_icon_color_button" tools:ignore="UnusedResources">@color/photonViolet90</color> <color name="fx_mobile_icon_color_button" tools:ignore="UnusedResources">@color/photonViolet90</color>
<color name="fx_mobile_icon_color_warning" tools:ignore="UnusedResources">@color/photonRed80</color> <color name="fx_mobile_icon_color_warning" tools:ignore="UnusedResources">@color/photonRed80</color>
@ -309,9 +309,6 @@
<!-- Private Browsing Mode Persistent Notification --> <!-- Private Browsing Mode Persistent Notification -->
<color name="pbm_notification_color">@color/photonViolet70</color> <color name="pbm_notification_color">@color/photonViolet70</color>
<!-- Notification Color -->
<color name="whats_new_notification_color">@color/photonBlue30</color>
<!-- Static Shortcut Background Color --> <!-- Static Shortcut Background Color -->
<color name="static_shortcut_background">#F5F5F5</color> <color name="static_shortcut_background">#F5F5F5</color>