diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/Toolbar.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/Toolbar.kt
index a34c7c9e5..f416fa673 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/Toolbar.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/Toolbar.kt
@@ -7,9 +7,10 @@ package org.mozilla.fenix.components.toolbar
import android.content.Context
import mozilla.components.browser.domains.autocomplete.ShippedDomainsProvider
import mozilla.components.browser.menu.BrowserMenuBuilder
+import mozilla.components.browser.menu.item.BrowserMenuDivider
+import mozilla.components.browser.menu.item.BrowserMenuImageText
import mozilla.components.browser.menu.item.BrowserMenuItemToolbar
import mozilla.components.browser.menu.item.BrowserMenuSwitch
-import mozilla.components.browser.menu.item.SimpleBrowserMenuItem
import mozilla.components.browser.session.SessionManager
import mozilla.components.feature.session.SessionUseCases
import org.mozilla.fenix.R
@@ -65,19 +66,35 @@ class Toolbar(
private val menuItems by lazy {
listOf(
- menuToolbar,
- SimpleBrowserMenuItem(context.getString(R.string.browser_menu_help)) {
+ BrowserMenuImageText(
+ context.getString(R.string.browser_menu_help),
+ R.drawable.ic_help,
+ context.getString(R.string.browser_menu_help),
+ R.color.icons
+ ) {
// TODO Help
},
- SimpleBrowserMenuItem(context.getString(R.string.browser_menu_settings)) {
+ BrowserMenuImageText(
+ context.getString(R.string.browser_menu_settings),
+ R.drawable.ic_settings,
+ context.getString(R.string.browser_menu_settings),
+ R.color.icons
+ ) {
openSettingsActivity()
},
- SimpleBrowserMenuItem(context.getString(R.string.browser_menu_library)) {
+ BrowserMenuImageText(
+ context.getString(R.string.browser_menu_library),
+ R.drawable.ic_library,
+ context.getString(R.string.browser_menu_library),
+ R.color.icons
+ ) {
// TODO Your Library
},
+ BrowserMenuDivider(),
+
BrowserMenuSwitch(context.getString(R.string.browser_menu_desktop_site), {
sessionManager.selectedSessionOrThrow.desktopMode
}) { checked ->
@@ -86,17 +103,36 @@ class Toolbar(
visible = { sessionManager.selectedSession != null }
},
- SimpleBrowserMenuItem(context.getString(R.string.browser_menu_find_in_page)) {
+ BrowserMenuImageText(
+ context.getString(R.string.browser_menu_find_in_page),
+ R.drawable.mozac_ic_search,
+ context.getString(R.string.browser_menu_find_in_page),
+ R.color.icons
+ ) {
// TODO Find in Page
},
- SimpleBrowserMenuItem(context.getString(R.string.browser_menu_private_tab)) {
+ BrowserMenuImageText(
+ context.getString(R.string.browser_menu_private_tab),
+ R.drawable.ic_private_browsing,
+ context.getString(R.string.browser_menu_private_tab),
+ R.color.icons
+ ) {
// TODO Private Tab
},
- SimpleBrowserMenuItem(context.getString(R.string.browser_menu_new_tab)) {
+ BrowserMenuImageText(
+ context.getString(R.string.browser_menu_new_tab),
+ R.drawable.ic_new,
+ context.getString(R.string.browser_menu_new_tab),
+ R.color.icons
+ ) {
// TODO New Tab
- }
+ },
+
+ BrowserMenuDivider(),
+
+ menuToolbar
)
}
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
new file mode 100644
index 000000000..b18310c22
--- /dev/null
+++ b/app/src/main/res/drawable/ic_help.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_library.xml b/app/src/main/res/drawable/ic_library.xml
new file mode 100644
index 000000000..655957841
--- /dev/null
+++ b/app/src/main/res/drawable/ic_library.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_new.xml b/app/src/main/res/drawable/ic_new.xml
new file mode 100644
index 000000000..d22510087
--- /dev/null
+++ b/app/src/main/res/drawable/ic_new.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 000000000..010c5a92f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index d63b54263..8b710c363 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,4 +5,5 @@
48dp
48dp
+ 14dp
\ No newline at end of file