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 d2a04cf85..0575a763a 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 @@ -520,7 +520,7 @@ open class DefaultToolbarMenu( }, primaryStateIconResource = R.drawable.ic_bookmark_outline, secondaryStateIconResource = R.drawable.ic_bookmark_filled, - tintColorResource = accentBrightTextColor(), + tintColorResource = menuItemButtonTintColor(), primaryLabel = context.getString(R.string.browser_menu_add), secondaryLabel = context.getString(R.string.browser_menu_edit), isInPrimaryState = { !isCurrentUrlBookmarked } @@ -571,7 +571,7 @@ open class DefaultToolbarMenu( @ColorRes @VisibleForTesting - internal fun accentBrightTextColor() = ThemeManager.resolveAttribute(R.attr.accentBright, context) + internal fun menuItemButtonTintColor() = ThemeManager.resolveAttribute(R.attr.menuItemButtonTintColor, context) @VisibleForTesting internal fun registerForIsBookmarkedUpdates() { diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 884490ca6..6e13b1221 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -53,6 +53,7 @@ @color/accent_high_contrast_dark_theme @color/preference_section_header_dark_theme @color/accent_high_contrast_dark_theme + @color/accent_high_contrast_dark_theme @color/mozac_widget_favicon_background_dark_theme @color/mozac_widget_favicon_border_dark_theme diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index e0866ffaf..1c8ce3c53 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -28,6 +28,9 @@ + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d3e97234b..7d9ada37c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -60,6 +60,7 @@ #008787 #0060df @color/accent_bright_light_theme + @color/accent_bright_light_theme @color/photonWhite @color/photonLightGrey30 @@ -257,6 +258,7 @@ @color/mozac_widget_favicon_background_light_theme @color/mozac_widget_favicon_border_light_theme @color/accent_bright_light_theme + @color/menu_item_button_light_theme @color/tab_tray_item_text_light_theme diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c0d2b4ad2..cf9514e28 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -82,6 +82,8 @@ @color/search_suggestion_indicator_icon_bookmark_color_normal_theme @color/select_login_header_normal_theme @color/preference_section_header_normal_theme + @color/menu_item_button_normal_theme + @color/primary_text_normal_theme @color/caption_text_normal_theme @@ -232,6 +234,7 @@ @color/search_suggestion_indicator_icon_bookmark_color_dark_theme @color/accent_high_contrast_private_theme @color/preference_section_header_dark_theme + @color/accent_high_contrast_private_theme @color/primary_text_private_theme