Bug 1973366 - Part 3: Refactoring opening URLs from the Homepage Menu to use FenixBrowserUseCases.loadUrlOrSearch r=android-reviewers,pollymce

- Refactors the existing usage of `HomeActivity.openToBrowserAndLoad` in `HomeMenuView` to use `FenixBrowserUseCases.loadUrlOrSearch`.

Differential Revision: https://phabricator.services.mozilla.com/D254757

Author: gabrielluong

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenuView.kt

@@ -23,6 +23,7 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.components.accounts.AccountState
 import org.mozilla.fenix.components.accounts.FenixFxAEntryPoint
 import org.mozilla.fenix.components.menu.MenuAccessPoint
+import org.mozilla.fenix.components.usecases.FenixBrowserUseCases
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.settings.SupportUtils
@@ -37,8 +38,9 @@ import org.mozilla.fenix.GleanMetrics.HomeMenu as HomeMenuMetrics
  *
  * @param context An Android [Context].
  * @param lifecycleOwner [LifecycleOwner] for the view.
- * @param homeActivity [HomeActivity] used to open URLs in a new tab.
+ * @param homeActivity [HomeActivity] used for accessing various app components.
  * @param navController [NavController] used for navigation.
+ * @param fenixBrowserUseCases [FenixBrowserUseCases] used to open URLs when clicked.
  * @param menuButton The [MenuButton] that will be used to create a menu when the button is
  * clicked.
  * @param fxaEntrypoint The source entry point to FxA.
@@ -49,6 +51,7 @@ class HomeMenuView(
     private val lifecycleOwner: LifecycleOwner,
     private val homeActivity: HomeActivity,
     private val navController: NavController,
+    private val fenixBrowserUseCases: FenixBrowserUseCases,
     private val menuButton: WeakReference<MenuButton>,
     private val fxaEntrypoint: FxAEntryPoint = FenixFxAEntryPoint.HomeMenu,
 ) {
@@ -170,23 +173,32 @@ class HomeMenuView(
             }
             HomeMenu.Item.Help -> {
                 HomeMenuMetrics.helpTapped.record(NoExtras())
-                homeActivity.openToBrowserAndLoad(
+
+                navController.nav(
+                    R.id.homeFragment,
+                    HomeFragmentDirections.actionGlobalBrowser(),
+                )
+                fenixBrowserUseCases.loadUrlOrSearch(
                     searchTermOrURL = SupportUtils.getSumoURLForTopic(
                         context = context,
                         topic = SupportUtils.SumoTopic.HELP,
                     ),
                     newTab = true,
-                    from = BrowserDirection.FromHome,
+                    private = homeActivity.browsingModeManager.mode.isPrivate,
                 )
             }
             HomeMenu.Item.WhatsNew -> {
                 WhatsNew.userViewedWhatsNew(context)
                 Events.whatsNewTapped.record(Events.WhatsNewTappedExtra(source = "HOME"))
 
-                homeActivity.openToBrowserAndLoad(
+                navController.nav(
+                    R.id.homeFragment,
+                    HomeFragmentDirections.actionGlobalBrowser(),
+                )
+                fenixBrowserUseCases.loadUrlOrSearch(
                     searchTermOrURL = SupportUtils.WHATS_NEW_URL,
                     newTab = true,
-                    from = BrowserDirection.FromHome,
+                    private = homeActivity.browsingModeManager.mode.isPrivate,
                 )
             }
             HomeMenu.Item.Quit -> {

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/toolbar/HomeToolbarView.kt

@@ -25,6 +25,7 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.components.toolbar.ToolbarPosition
 import org.mozilla.fenix.databinding.FragmentHomeBinding
 import org.mozilla.fenix.databinding.FragmentHomeToolbarViewLayoutBinding
+import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.increaseTapAreaVertically
 import org.mozilla.fenix.ext.isLargeWindow
 import org.mozilla.fenix.ext.settings
@@ -157,6 +158,7 @@ internal class HomeToolbarView(
         lifecycleOwner = homeFragment.viewLifecycleOwner,
         homeActivity = homeActivity,
         navController = homeFragment.findNavController(),
+        fenixBrowserUseCases = context.components.useCases.fenixBrowserUseCases,
         menuButton = WeakReference(toolbarBinding.menuButton),
     ).also { it.build() }
 

mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/HomeMenuViewTest.kt

@@ -25,13 +25,13 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.GleanMetrics.Events
 import org.mozilla.fenix.GleanMetrics.HomeScreen
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.accounts.AccountState
 import org.mozilla.fenix.components.accounts.FenixFxAEntryPoint
+import org.mozilla.fenix.components.usecases.FenixBrowserUseCases
 import org.mozilla.fenix.helpers.FenixGleanTestRule
 import org.mozilla.fenix.settings.SupportUtils
 import org.mozilla.fenix.whatsnew.WhatsNew
@@ -50,6 +50,7 @@ class HomeMenuViewTest {
     private lateinit var homeActivity: HomeActivity
     private lateinit var navController: NavController
     private lateinit var menuButton: MenuButton
+    private lateinit var fenixBrowserUseCases: FenixBrowserUseCases
     private lateinit var homeMenuView: HomeMenuView
 
     @Before
@@ -61,6 +62,7 @@ class HomeMenuViewTest {
             every { navigate(any<NavDirections>(), any<NavOptions>()) } just runs
             every { currentDestination?.id } returns R.id.homeFragment
         }
+        fenixBrowserUseCases = mockk(relaxed = true)
 
         menuButton = spyk(MenuButton(testContext))
 
@@ -69,6 +71,7 @@ class HomeMenuViewTest {
             lifecycleOwner = lifecycleOwner,
             homeActivity = homeActivity,
             navController = navController,
+            fenixBrowserUseCases = fenixBrowserUseCases,
             menuButton = WeakReference(menuButton),
         )
     }
@@ -191,13 +194,17 @@ class HomeMenuViewTest {
         assertNotNull(HomeMenuMetrics.helpTapped.testGetValue())
 
         verify {
-            homeActivity.openToBrowserAndLoad(
+            navController.navigate(
+                HomeFragmentDirections.actionGlobalBrowser(),
+                null,
+            )
+            fenixBrowserUseCases.loadUrlOrSearch(
                 searchTermOrURL = SupportUtils.getSumoURLForTopic(
                     context = testContext,
                     topic = SupportUtils.SumoTopic.HELP,
                 ),
                 newTab = true,
-                from = BrowserDirection.FromHome,
+                private = false,
             )
         }
     }
@@ -218,10 +225,14 @@ class HomeMenuViewTest {
         verify {
             WhatsNew.userViewedWhatsNew(testContext)
 
-            homeActivity.openToBrowserAndLoad(
+            navController.navigate(
+                HomeFragmentDirections.actionGlobalBrowser(),
+                null,
+            )
+            fenixBrowserUseCases.loadUrlOrSearch(
                 searchTermOrURL = SupportUtils.WHATS_NEW_URL,
                 newTab = true,
-                from = BrowserDirection.FromHome,
+                private = false,
             )
         }
     }