Close #19064: Focus on tab page with the BrowsingModeManager

app/src/main/java/org/mozilla/fenix/tabstray/TabLayoutMediator.kt

@@ -6,9 +6,9 @@ package org.mozilla.fenix.tabstray
 
 import androidx.annotation.VisibleForTesting
 import com.google.android.material.tabs.TabLayout
-import mozilla.components.browser.state.selector.selectedTab
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.support.base.feature.LifecycleAwareFeature
+import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.components.metrics.MetricController
 import org.mozilla.fenix.tabstray.TrayPagerAdapter.Companion.POSITION_NORMAL_TABS
@@ -22,9 +22,9 @@ import org.mozilla.fenix.utils.Do
 class TabLayoutMediator(
     private val tabLayout: TabLayout,
     interactor: TabsTrayInteractor,
-    private val browserStore: BrowserStore,
+    private val browsingModeManager: BrowsingModeManager,
     private val tabsTrayStore: TabsTrayStore,
-    private val metrics: MetricController
+    metrics: MetricController
 ) : LifecycleAwareFeature {
 
     private val observer = TabLayoutObserver(interactor, metrics)
@@ -44,10 +44,8 @@ class TabLayoutMediator(
 
     @VisibleForTesting
     internal fun selectActivePage() {
-        val selectedTab = browserStore.state.selectedTab ?: return
-
         val selectedPagerPosition =
-            when (selectedTab.content.private) {
+            when (browsingModeManager.mode.isPrivate) {
                 true -> POSITION_PRIVATE_TABS
                 false -> POSITION_NORMAL_TABS
             }

app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt

@@ -192,7 +192,7 @@ class TabsTrayFragment : AppCompatDialogFragment(), TabsTrayInteractor {
             feature = TabLayoutMediator(
                 tabLayout = tab_layout,
                 interactor = this,
-                browserStore = requireComponents.core.store,
+                browsingModeManager = activity.browsingModeManager,
                 tabsTrayStore = tabsTrayStore,
                 metrics = requireComponents.analytics.metrics
             ), owner = this,

app/src/test/java/org/mozilla/fenix/tabstray/TabLayoutMediatorTest.kt

@@ -8,12 +8,11 @@ import com.google.android.material.tabs.TabLayout
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
-import mozilla.components.browser.state.state.BrowserState
-import mozilla.components.browser.state.state.ContentState
-import mozilla.components.browser.state.state.TabSessionState
-import mozilla.components.browser.state.store.BrowserStore
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mozilla.fenix.browser.browsingmode.BrowsingMode
+import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager
+import org.mozilla.fenix.components.metrics.MetricController
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.tabstray.TrayPagerAdapter.Companion.POSITION_NORMAL_TABS
 import org.mozilla.fenix.tabstray.TrayPagerAdapter.Companion.POSITION_PRIVATE_TABS
@@ -21,15 +20,18 @@ import org.mozilla.fenix.tabstray.TrayPagerAdapter.Companion.POSITION_SYNCED_TAB
 
 @RunWith(FenixRobolectricTestRunner::class)
 class TabLayoutMediatorTest {
+    private val modeManager: BrowsingModeManager = mockk(relaxed = true)
+    private val tabsTrayStore: TabsTrayStore = mockk(relaxed = true)
+    private val interactor: TabsTrayInteractor = mockk(relaxed = true)
+    private val metrics: MetricController = mockk(relaxed = true)
+    private val tabLayout: TabLayout = mockk(relaxed = true)
+    private val tab: TabLayout.Tab = mockk(relaxed = true)
 
     @Test
-    fun `page to normal tab position when selected tab is also normal`() {
+    fun `page to normal tab position when mode is also normal`() {
-        val store = createStore("123")
+        val mediator = TabLayoutMediator(tabLayout, interactor, modeManager, tabsTrayStore, metrics)
-        val tabsTrayStore: TabsTrayStore = mockk(relaxed = true)
-        val tabLayout: TabLayout = mockk(relaxed = true)
-        val tab: TabLayout.Tab = mockk(relaxed = true)
-        val mediator = TabLayoutMediator(tabLayout, mockk(relaxed = true), store, tabsTrayStore, mockk())
 
+        every { modeManager.mode }.answers { BrowsingMode.Normal }
         every { tabLayout.getTabAt(POSITION_NORMAL_TABS) }.answers { tab }
 
         mediator.selectActivePage()
@@ -39,13 +41,10 @@ class TabLayoutMediatorTest {
     }
 
     @Test
-    fun `page to private tab position when selected tab is also private`() {
+    fun `page to private tab position when mode is also private`() {
-        val store = createStore("456")
+        val mediator = TabLayoutMediator(tabLayout, interactor, modeManager, tabsTrayStore, metrics)
-        val tabsTrayStore: TabsTrayStore = mockk(relaxed = true)
-        val tabLayout: TabLayout = mockk(relaxed = true)
-        val tab: TabLayout.Tab = mockk(relaxed = true)
-        val mediator = TabLayoutMediator(tabLayout, mockk(relaxed = true), store, tabsTrayStore, mockk())
 
+        every { modeManager.mode }.answers { BrowsingMode.Private }
         every { tabLayout.getTabAt(POSITION_PRIVATE_TABS) }.answers { tab }
 
         mediator.selectActivePage()
@@ -56,11 +55,7 @@ class TabLayoutMediatorTest {
 
     @Test
     fun `selectTabAtPosition will dispatch the correct TabsTrayStore action`() {
-        val store = createStore("456")
+        val mediator = TabLayoutMediator(tabLayout, interactor, modeManager, tabsTrayStore, metrics)
-        val tabsTrayStore: TabsTrayStore = mockk(relaxed = true)
-        val tabLayout: TabLayout = mockk(relaxed = true)
-        val tab: TabLayout.Tab = mockk(relaxed = true)
-        val mediator = TabLayoutMediator(tabLayout, mockk(relaxed = true), store, tabsTrayStore, mockk())
 
         every { tabLayout.getTabAt(POSITION_NORMAL_TABS) }.answers { tab }
         every { tabLayout.getTabAt(POSITION_PRIVATE_TABS) }.answers { tab }
@@ -81,10 +76,9 @@ class TabLayoutMediatorTest {
 
     @Test
     fun `lifecycle methods adds and removes observer`() {
-        val store = createStore("456")
+        val mediator = TabLayoutMediator(tabLayout, interactor, modeManager, tabsTrayStore, metrics)
-        val tabsTrayStore: TabsTrayStore = mockk(relaxed = true)
+
-        val tabLayout: TabLayout = mockk(relaxed = true)
+        every { modeManager.mode }.answers { BrowsingMode.Private }
-        val mediator = TabLayoutMediator(tabLayout, mockk(relaxed = true), store, tabsTrayStore, mockk())
 
         mediator.start()
 
@@ -95,26 +89,4 @@ class TabLayoutMediatorTest {
 
         verify { tabLayout.removeOnTabSelectedListener(any()) }
     }
-
-    private fun createStore(selectedId: String) = BrowserStore(
-        initialState = BrowserState(
-            tabs = listOf(
-                TabSessionState(
-                    id = "123",
-                    content = ContentState(
-                        private = false,
-                        url = "https://firefox.com"
-                    )
-                ),
-                TabSessionState(
-                    id = "456",
-                    content = ContentState(
-                        private = true,
-                        url = "https://mozilla.org"
-                    )
-                )
-            ),
-            selectedTabId = selectedId
-        )
-    )
 }