From 5f9de1e261f8aa0d80e29bcbee0968d23edd697e Mon Sep 17 00:00:00 2001
From: Bryan Kok <bryan.wyern1@gmail.com>
Date: Sat, 14 Nov 2020 22:37:56 +0800
Subject: [PATCH] Replace @string/tab_tray_menu_item_save with
 @string/tab_tray_menu_select, Remove "Share all tabs" option from tab tray's
 private browsing menu

---
 app/src/main/java/org/mozilla/fenix/tabtray/TabTrayItemMenu.kt | 3 ++-
 app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt     | 1 +
 app/src/main/res/menu/tab_tray_menu.xml                        | 2 +-
 app/src/main/res/values/strings.xml                            | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayItemMenu.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayItemMenu.kt
index f7469337b..15acc46a1 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayItemMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayItemMenu.kt
@@ -13,6 +13,7 @@ import org.mozilla.fenix.ext.components
 
 class TabTrayItemMenu(
     private val context: Context,
+    private val shouldShowShareAllTabs: () -> Boolean,
     private val shouldShowSelectTabs: () -> Boolean,
     private val hasOpenTabs: () -> Boolean,
     private val onItemTapped: (Item) -> Unit = {}
@@ -43,7 +44,7 @@ class TabTrayItemMenu(
             ) {
                 context.components.analytics.metrics.track(Event.TabsTrayShareAllTabsPressed)
                 onItemTapped.invoke(Item.ShareAllTabs)
-            }.apply { visible = hasOpenTabs },
+            }.apply { visible = { shouldShowShareAllTabs() && hasOpenTabs() } },
 
             SimpleBrowserMenuItem(
                 context.getString(R.string.tab_tray_menu_tab_settings),
diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
index 0dff1c3a4..422fefb89 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
@@ -226,6 +226,7 @@ class TabTrayView(
         tabTrayItemMenu =
             TabTrayItemMenu(
                 context = view.context,
+                shouldShowShareAllTabs = { checkOpenTabs.invoke() && view.tab_layout.selectedTabPosition == 0 },
                 shouldShowSelectTabs = { checkOpenTabs.invoke() && view.tab_layout.selectedTabPosition == 0 },
                 hasOpenTabs = checkOpenTabs
             ) {
diff --git a/app/src/main/res/menu/tab_tray_menu.xml b/app/src/main/res/menu/tab_tray_menu.xml
index 8eda6eea4..35c8e87ff 100644
--- a/app/src/main/res/menu/tab_tray_menu.xml
+++ b/app/src/main/res/menu/tab_tray_menu.xml
@@ -8,7 +8,7 @@
     <!-- Save to collection -->
     <item
         android:id="@+id/tab_tray_select_to_save_menu_item"
-        android:title="@string/tab_tray_menu_item_save"
+        android:title="@string/tab_tray_menu_select"
         app:showAsAction="never" />
 
     <!-- Share-->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2a3a12748..d4dcd07ec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -581,6 +581,8 @@
     <string name="tab_tray_title">Open Tabs</string>
     <!-- Text shown in the menu for saving tabs to a collection -->
     <string name="tab_tray_menu_item_save">Save to collection</string>
+    <!-- Text shown in the menu for the collection selector -->
+    <string name="tab_tray_menu_select">Select</string>
     <!-- Text shown in the menu for sharing all tabs -->
     <string name="tab_tray_menu_item_share">Share all tabs</string>
     <!-- Text shown in the menu to view recently closed tabs -->