For mozilla-mobile#15324 - Show tab settings and recently closed item…

…s in menu when no tabs
fork-maintainers · Sep 29, 2020 · 01e802f · 01e802f
1 parent e49cd9c
commit 01e802f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
@@ -262,11 +262,11 @@ class TabbedBrowsingTest {
         }.openTabTray {
             verifyNoTabsOpened()
             verifyNewTabButton()
-            verifyTabTrayOverflowMenu(false)
+            verifyTabTrayOverflowMenu(true)
         }.toggleToPrivateTabs {
             verifyNoTabsOpened()
             verifyNewTabButton()
-            verifyTabTrayOverflowMenu(false)
+            verifyTabTrayOverflowMenu(true)
         }
     }
 

diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
@@ -89,7 +89,8 @@ class TabTrayView(
     private var tabsTouchHelper: TabsTouchHelper
     private val collectionsButtonAdapter = SaveToCollectionsButtonAdapter(interactor, isPrivate)
 
-    private val syncedTabsController = SyncedTabsController(lifecycleOwner, view, store, concatAdapter)
+    private val syncedTabsController =
+        SyncedTabsController(lifecycleOwner, view, store, concatAdapter)
     private val syncedTabsFeature = ViewBoundFeatureWrapper<SyncedTabsFeature>()
 
     private var hasLoaded = false
@@ -211,7 +212,10 @@ class TabTrayView(
         }
 
         tabTrayItemMenu =
-            TabTrayItemMenu(view.context, { view.tab_layout.selectedTabPosition == 0 }) {
+            TabTrayItemMenu(
+                view.context,
+                { tabs.isNotEmpty() && view.tab_layout.selectedTabPosition == 0 },
+                { tabs.isNotEmpty() }) {
                 when (it) {
                     is TabTrayItemMenu.Item.ShareAllTabs -> interactor.onShareTabsClicked(
                         isPrivateModeSelected
@@ -431,7 +435,6 @@ class TabTrayView(
         } else {
             View.VISIBLE
         }
-        view.tab_tray_overflow.isVisible = !hasNoTabs
 
         counter_text.text = updateTabCounter(browserState.normalTabs.size)
         updateTabCounterContentDescription(browserState.normalTabs.size)
@@ -592,9 +595,9 @@ class TabTrayView(
             // We add the offset, because the layoutManager is initialized with `reverseLayout`.
             // We also add 1 to display the tab item above the selected browser tab.
             val recyclerViewIndex = selectedBrowserTabIndex +
-                collectionsButtonAdapter.itemCount +
-                syncedTabsController.adapter.itemCount +
-                1
+                    collectionsButtonAdapter.itemCount +
+                    syncedTabsController.adapter.itemCount +
+                    1
 
             layoutManager?.scrollToPosition(recyclerViewIndex)
         }
@@ -614,6 +617,7 @@ class TabTrayView(
 class TabTrayItemMenu(
     private val context: Context,
     private val shouldShowSaveToCollection: () -> Boolean,
+    private val hasOpenTabs: () -> Boolean,
     private val onItemTapped: (Item) -> Unit = {}
 ) {
 
@@ -643,7 +647,7 @@ class TabTrayItemMenu(
             ) {
                 context.components.analytics.metrics.track(Event.TabsTrayShareAllTabsPressed)
                 onItemTapped.invoke(Item.ShareAllTabs)
-            },
+            }.apply { visible = hasOpenTabs },
 
             SimpleBrowserMenuItem(
                 context.getString(R.string.tab_tray_menu_tab_settings),
@@ -665,7 +669,7 @@ class TabTrayItemMenu(
             ) {
                 context.components.analytics.metrics.track(Event.TabsTrayCloseAllTabsPressed)
                 onItemTapped.invoke(Item.CloseAllTabs)
-            }
+            }.apply { visible = hasOpenTabs }
         )
     }
 }