Bug 1822268 - Part 2: Add juno onboarding navigation logic

Author: rahulsainani

fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt

@@ -266,20 +266,24 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
             it.start()
         }
 
-        // Unless the activity is recreated, navigate to home first (without rendering it)
-        // to add it to the back stack.
-        if (savedInstanceState == null) {
-            navigateToHome()
-        }
-
-        if (!shouldStartOnHome() && shouldNavigateToBrowserOnColdStart(savedInstanceState)) {
-            navigateToBrowserOnColdStart()
+        if (settings().shouldShowJunoOnboarding(intent.toSafeIntent().isLauncherIntent)) {
+            navHost.navController.navigate(NavGraphDirections.actionGlobalHomeJunoOnboarding())
         } else {
-            StartOnHome.enterHomeScreen.record(NoExtras())
-        }
+            // Unless the activity is recreated, navigate to home first (without rendering it)
+            // to add it to the back stack.
+            if (savedInstanceState == null) {
+                navigateToHome()
+            }
+            if (!shouldStartOnHome() && shouldNavigateToBrowserOnColdStart(savedInstanceState)) {
+                navigateToBrowserOnColdStart()
+            } else {
+                StartOnHome.enterHomeScreen.record(NoExtras())
+            }
 
-        if (settings().showHomeOnboardingDialog && onboarding.userHasBeenOnboarded()) {
-            navHost.navController.navigate(NavGraphDirections.actionGlobalHomeOnboardingDialog())
+            if (settings().showHomeOnboardingDialog && onboarding.userHasBeenOnboarded()) {
+                navHost.navController.navigate(NavGraphDirections.actionGlobalHomeOnboardingDialog())
+            }
+            showNotificationPermissionPromptIfRequired()
         }
 
         Performance.processIntentIfPerformanceTest(intent, this)
@@ -341,8 +345,6 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
             }
         }
 
-        showNotificationPermissionPromptIfRequired()
-
         components.backgroundServices.accountManagerAvailableQueue.runIfReadyOrQueue {
             lifecycleScope.launch(IO) {
                 // If we're authenticated, kick-off a sync and a device state refresh.
@@ -368,6 +370,10 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
      * Show the pre permission dialog to the user once if the notification are not enabled.
      */
     private fun showNotificationPermissionPromptIfRequired() {
+        if (settings().junoOnboardingEnabled) {
+            return
+        }
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
             !NotificationManagerCompat.from(applicationContext).areNotificationsEnabledSafe() &&
             settings().numberOfAppLaunches <= 1

fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt

@@ -1606,6 +1606,20 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         default = false,
     )
 
+    /**
+     * Returns whether juno onboarding should be shown to the user.
+     * @param isLauncherIntent Boolean to indicate whether the app was launched on tapping on the
+     * app icon.
+     */
+    fun shouldShowJunoOnboarding(isLauncherIntent: Boolean): Boolean {
+        return if (!isJunoOnboardingShown && isLauncherIntent) {
+            FxNimbus.features.junoOnboarding.recordExposure()
+            junoOnboardingEnabled
+        } else {
+            false
+        }
+    }
+
     /**
      * Get the current mode for how https-only is enabled.
      */

fenix/app/src/main/res/navigation/nav_graph.xml

@@ -29,6 +29,18 @@
         app:popUpTo="@id/homeFragment"
         app:popUpToInclusive="false" />
 
+    <action
+        android:id="@+id/action_global_home_juno_onboarding"
+        app:destination="@id/junoOnboardingFragment"
+        app:popUpTo="@id/startupFragment"
+        app:popUpToInclusive="true" />
+
+    <action
+        android:id="@+id/action_onboarding_home"
+        app:destination="@id/homeFragment"
+        app:popUpTo="@id/junoOnboardingFragment"
+        app:popUpToInclusive="true" />
+
     <action
         android:id="@+id/action_global_home_onboarding_dialog"
         app:destination="@id/homeOnboardingDialogFragment" />
@@ -183,6 +195,11 @@
         android:name="org.mozilla.fenix.StartupFragment">
     </fragment>
 
+    <fragment
+        android:id="@+id/junoOnboardingFragment"
+        android:name="org.mozilla.fenix.onboarding.JunoOnboardingFragment">
+    </fragment>
+
     <fragment
         android:id="@+id/homeFragment"
         android:name="org.mozilla.fenix.home.HomeFragment"

fenix/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt

@@ -825,6 +825,50 @@ class SettingsTest {
         assertTrue(settings.shouldShowInactiveTabsAutoCloseDialog(20))
     }
 
+    @Test
+    fun `GIVEN junoOnboarding is disabled THEN shouldShowJunoOnboarding returns false`() {
+        val settings = spyk(settings)
+        every { settings.junoOnboardingEnabled } returns false
+        every { settings.isJunoOnboardingShown } returns false
+
+        val actual = settings.shouldShowJunoOnboarding(true)
+
+        assertFalse(actual)
+    }
+
+    @Test
+    fun `GIVEN junoOnboarding is enabled, isOnboardingShown is false and isLauncherIntent is false THEN shouldShowJunoOnboarding returns false`() {
+        val settings = spyk(settings)
+        every { settings.junoOnboardingEnabled } returns true
+        every { settings.isJunoOnboardingShown } returns false
+
+        val actual = settings.shouldShowJunoOnboarding(false)
+
+        assertFalse(actual)
+    }
+
+    @Test
+    fun `GIVEN junoOnboarding is enabled and isOnboardingShown is true THEN shouldShowJunoOnboarding returns false`() {
+        val settings = spyk(settings)
+        every { settings.junoOnboardingEnabled } returns true
+        every { settings.isJunoOnboardingShown } returns true
+
+        val actual = settings.shouldShowJunoOnboarding(true)
+
+        assertFalse(actual)
+    }
+
+    @Test
+    fun `GIVEN junoOnboarding is enabled, isOnboardingShown is false and isLauncherIntent is true THEN shouldShowJunoOnboarding returns true`() {
+        val settings = spyk(settings)
+        every { settings.junoOnboardingEnabled } returns true
+        every { settings.isJunoOnboardingShown } returns false
+
+        val actual = settings.shouldShowJunoOnboarding(true)
+
+        assertTrue(actual)
+    }
+
     @Test
     fun `GIVEN Https-only mode is disabled THEN the engine mode is HttpsOnlyMode#DISABLED`() {
         settings.shouldUseHttpsOnly = false