blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Closes #476: Adds browserToolbarMenuIcon theming

master
Sawyer Blatz 2019-02-13 10:21:36 -08:00 committed by Colin Lee
parent a3e09068be
commit 7531bc56f2
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt
View File

@ -38,7 +38,7 @@ class ToolbarMenu(
val menuToolbar by lazy {
val back = BrowserMenuItemToolbar.Button(
mozilla.components.ui.icons.R.drawable.mozac_ic_back,
iconTintColorResource = DefaultThemeManager.resolveAttribute(R.attr.browserToolbarIcons, context),
iconTintColorResource = DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context),
contentDescription = context.getString(R.string.browser_menu_back)
) {
onItemTapped.invoke(Item.Back)
@ -46,7 +46,7 @@ class ToolbarMenu(
val forward = BrowserMenuItemToolbar.Button(
mozilla.components.ui.icons.R.drawable.mozac_ic_forward,
iconTintColorResource = DefaultThemeManager.resolveAttribute(R.attr.browserToolbarIcons, context),
iconTintColorResource = DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context),
contentDescription = context.getString(R.string.browser_menu_forward)
) {
onItemTapped.invoke(Item.Forward)
@ -54,7 +54,7 @@ class ToolbarMenu(
val refresh = BrowserMenuItemToolbar.Button(
mozilla.components.ui.icons.R.drawable.mozac_ic_refresh,
iconTintColorResource = DefaultThemeManager.resolveAttribute(R.attr.browserToolbarIcons, context),
iconTintColorResource = DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context),
contentDescription = context.getString(R.string.browser_menu_refresh)
) {
onItemTapped.invoke(Item.Reload)
@ -69,7 +69,7 @@ class ToolbarMenu(
context.getString(R.string.browser_menu_help),
R.drawable.ic_help,
context.getString(R.string.browser_menu_help),
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
) {
onItemTapped.invoke(Item.Help)
},
@ -78,7 +78,7 @@ class ToolbarMenu(
context.getString(R.string.browser_menu_settings),
R.drawable.ic_settings,
context.getString(R.string.browser_menu_settings),
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
) {
onItemTapped.invoke(Item.Settings)
},
@ -87,7 +87,7 @@ class ToolbarMenu(
context.getString(R.string.browser_menu_library),
R.drawable.ic_library,
context.getString(R.string.browser_menu_library),
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
) {
onItemTapped.invoke(Item.Library)
},
@ -103,7 +103,7 @@ class ToolbarMenu(
context.getString(R.string.browser_menu_find_in_page),
R.drawable.mozac_ic_search,
context.getString(R.string.browser_menu_find_in_page),
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
) {
onItemTapped.invoke(Item.FindInPage)
},
@ -112,7 +112,7 @@ class ToolbarMenu(
context.getString(R.string.browser_menu_private_tab),
R.drawable.ic_private_browsing,
context.getString(R.string.browser_menu_private_tab),
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
) {
onItemTapped.invoke(Item.NewPrivateTab)
},
@ -121,7 +121,7 @@ class ToolbarMenu(
context.getString(R.string.browser_menu_new_tab),
R.drawable.ic_new,
context.getString(R.string.browser_menu_new_tab),
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
) {
onItemTapped.invoke(Item.NewTab)
},
@ -130,7 +130,7 @@ class ToolbarMenu(
context.getString(R.string.browser_menu_share),
R.drawable.mozac_ic_share,
context.getString(R.string.browser_menu_share),
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
) {
onItemTapped.invoke(Item.Share)
},
@ -139,7 +139,7 @@ class ToolbarMenu(
context.getString(R.string.browser_menu_report_issue),
R.drawable.ic_report_issues,
context.getString(R.string.browser_menu_report_issue),
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
) {
onItemTapped.invoke(Item.ReportIssue)
},

1
app/src/main/res/values/attrs.xml
View File

@ -33,6 +33,7 @@
<attr name="browserUrlBarBackground" format="reference"/>
<attr name="browserToolbarBackground" format="reference"/>
<attr name="browserToolbarIcons" format="reference"/>
<attr name="browserToolbarMenuIcons" format="reference"/>
<attr name="browserToolbarHomeIcon" format="reference"/>
<attr name="navigationBarColorBrowser" format="reference"/>
</resources>

2
app/src/main/res/values/styles.xml
View File

@ -36,6 +36,7 @@
<item name="browserUrlBarBackground">@drawable/home_search_background_dark</item>
<item name="browserToolbarBackground">@color/off_white</item>
<item name="browserToolbarIcons">@color/icons</item>
<item name="browserToolbarMenuIcons">@color/icons</item>
<item name="browserToolbarHomeIcon">@drawable/ic_home</item>
</style>
@ -76,6 +77,7 @@
<item name="browserUrlBarBackground">@drawable/home_search_background_private_dark</item>
<item name="browserToolbarBackground">@color/private_browsing_top_gradient</item>
<item name="browserToolbarIcons">@color/off_white</item>
<item name="browserToolbarMenuIcons">@color/icons</item>
<item name="browserToolbarHomeIcon">@drawable/ic_home_white</item>
</style>