For #11132: Rearranges home menu items

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

@@ -263,7 +263,7 @@ class DefaultToolbarMenu(
 
     private val syncedTabs = BrowserMenuImageText(
         label = context.getString(R.string.synced_tabs),
-        imageResource = R.drawable.ic_tab_collection,
+        imageResource = R.drawable.ic_synced_tabs,
         iconTintColorResource = primaryTextColor()
     ) {
         onItemTapped.invoke(ToolbarMenu.Item.SyncedTabs)

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

@@ -99,7 +99,7 @@ class HomeMenu(
 
         val bookmarksItem = BrowserMenuImageText(
             context.getString(R.string.library_bookmarks),
-            R.drawable.ic_bookmark_outline,
+            R.drawable.ic_bookmark_filled,
             primaryTextColor
         ) {
             onItemTapped.invoke(Item.Bookmarks)
@@ -131,7 +131,7 @@ class HomeMenu(
 
         val syncedTabsItem = BrowserMenuImageText(
             context.getString(R.string.library_synced_tabs),
-            R.drawable.ic_tab_collection,
+            R.drawable.ic_synced_tabs,
             primaryTextColor
         ) {
             onItemTapped.invoke(Item.SyncedTabs)
@@ -156,32 +156,34 @@ class HomeMenu(
         if (shouldUseBottomToolbar) {
             listOfNotNull(
                 accountAuthItem,
+                helpItem,
                 whatsNewItem,
                 BrowserMenuDivider(),
-                bookmarksItem,
+                addons,
+                BrowserMenuDivider(),
                 historyItem,
+                bookmarksItem,
                 if (FeatureFlags.syncedTabs) syncedTabsItem else null,
                 BrowserMenuDivider(),
-                addons,
                 settingsItem,
-                helpItem,
                 if (Settings.getInstance(context).shouldDeleteBrowsingDataOnQuit) quitItem else null
             ).also { items ->
                 items.getHighlight()?.let { onHighlightPresent(it) }
             }
         } else {
             listOfNotNull(
                 if (Settings.getInstance(context).shouldDeleteBrowsingDataOnQuit) quitItem else null,
-                helpItem,
                 settingsItem,
-                addons,
-                accountAuthItem,
                 BrowserMenuDivider(),
+                if (FeatureFlags.syncedTabs) syncedTabsItem else null,
                 bookmarksItem,
                 historyItem,
-                if (FeatureFlags.syncedTabs) syncedTabsItem else null,
                 BrowserMenuDivider(),
-                whatsNewItem
+                addons,
+                BrowserMenuDivider(),
+                whatsNewItem,
+                helpItem,
+                accountAuthItem
             ).also { items ->
                 items.getHighlight()?.let { onHighlightPresent(it) }
             }

app/src/main/res/drawable/ic_synced_tabs.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m14.5,12.833v-7.5a0.836,0.836 0,0 0,-0.833 -0.833h-10.834a0.836,0.836 0,0 0,-0.833 0.833v7.5a0.836,0.836 0,0 0,0.833 0.834h10.834a0.836,0.836 0,0 0,0.833 -0.834zM12,12h-8.333v-5.833h8.333zM13.25,10.333a0.417,0.417 0,0 1,-0.417 -0.416v-1.667a0.417,0.417 0,0 1,0.834 0v1.667a0.417,0.417 0,0 1,-0.417 0.416z"
+      android:fillColor="?primaryText"/>
+  <path
+      android:pathData="m21.375,17.833h-1.042v-7.033a1.259,1.259 0,0 0,-1.217 -1.3h-3.783v1.667h3.334v5h-8.334v-1.667h-1.666v3.333h-1.042c-0.345,0 -0.625,0.373 -0.625,0.834s0.28,0.833 0.625,0.833h13.75c0.345,0 0.625,-0.372 0.625,-0.833s-0.28,-0.834 -0.625,-0.834zM17,18.667h-5v-0.834h5z"
+      android:fillColor="?primaryText"/>
+</vector>