For #18829: Adjust bookmark item color to UX specs.

upstream-sync
mcarare 3 years ago committed by Mihai Adrian Carare
parent 85257dbb0a
commit c30d0f9240

@ -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() {

@ -53,6 +53,7 @@
<color name="select_login_header_normal_theme">@color/accent_high_contrast_dark_theme</color>
<color name="preference_section_header_normal_theme">@color/preference_section_header_dark_theme</color>
<color name="notification_accent_color_normal_theme">@color/accent_high_contrast_dark_theme</color>
<color name="menu_item_button_normal_theme">@color/accent_high_contrast_dark_theme</color>
<color name="mozac_widget_favicon_background_normal_theme">@color/mozac_widget_favicon_background_dark_theme</color>
<color name="mozac_widget_favicon_border_normal_theme">@color/mozac_widget_favicon_border_dark_theme</color>

@ -28,6 +28,9 @@
<attr name="menuCategoryText" format="reference"/>
<attr name="preferenceSectionHeader" format="reference"/>
<!-- Color used in DefaultToolbarMenu for buttons placed at the end of menu items -->
<attr name="menuItemButtonTintColor" format="reference"/>
<!-- Misc -->
<attr name="homeBackground" format="reference"/>
<attr name="bottomBarBackground" format="reference"/>

@ -60,6 +60,7 @@
<color name="search_suggestion_indicator_icon_color_light_theme">#008787</color>
<color name="search_suggestion_indicator_icon_bookmark_color_light_theme">#0060df</color>
<color name="preference_section_header_normal_theme">@color/accent_bright_light_theme</color>
<color name="menu_item_button_light_theme">@color/accent_bright_light_theme</color>
<color name="mozac_widget_favicon_background_light_theme">@color/photonWhite</color>
<color name="mozac_widget_favicon_border_light_theme">@color/photonLightGrey30</color>
@ -257,6 +258,7 @@
<color name="mozac_widget_favicon_background_normal_theme">@color/mozac_widget_favicon_background_light_theme</color>
<color name="mozac_widget_favicon_border_normal_theme">@color/mozac_widget_favicon_border_light_theme</color>
<color name="notification_accent_color_normal_theme">@color/accent_bright_light_theme</color>
<color name="menu_item_button_normal_theme">@color/menu_item_button_light_theme</color>
<!-- Tab tray -->
<color name="tab_tray_item_text_normal_theme">@color/tab_tray_item_text_light_theme</color>

@ -82,6 +82,8 @@
<item name="awesomeBarIndicatorBookmarkColor">@color/search_suggestion_indicator_icon_bookmark_color_normal_theme</item>
<item name="selectLoginHeaderTextColor">@color/select_login_header_normal_theme</item>
<item name="preferenceSectionHeader">@color/preference_section_header_normal_theme</item>
<item name="menuItemButtonTintColor">@color/menu_item_button_normal_theme</item>
<!-- Shared widget colors -->
<item name="mozac_primary_text_color">@color/primary_text_normal_theme</item>
<item name="mozac_caption_text_color">@color/caption_text_normal_theme</item>
@ -232,6 +234,7 @@
<item name="awesomeBarIndicatorBookmarkColor">@color/search_suggestion_indicator_icon_bookmark_color_dark_theme</item>
<item name="selectLoginHeaderTextColor">@color/accent_high_contrast_private_theme</item>
<item name="preferenceSectionHeader">@color/preference_section_header_dark_theme</item>
<item name="menuItemButtonTintColor">@color/accent_high_contrast_private_theme</item>
<!-- Shared widget colors -->
<item name="mozac_primary_text_color">@color/primary_text_private_theme</item>

Loading…
Cancel
Save