Remove bottom nav bar when relaunching tutorial

bitwarden · Apr 26, 2024 · e559964 · e559964
1 parent f39669e
commit e559964
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/...bitwarden/authenticator/ui/authenticator/feature/authenticator/AuthenticatorNavigation.kt b/...bitwarden/authenticator/ui/authenticator/feature/authenticator/AuthenticatorNavigation.kt
@@ -12,6 +12,7 @@ import com.bitwarden.authenticator.ui.authenticator.feature.navbar.authenticator
 import com.bitwarden.authenticator.ui.authenticator.feature.qrcodescan.navigateToQrCodeScanScreen
 import com.bitwarden.authenticator.ui.authenticator.feature.search.navigateToSearch
 import com.bitwarden.authenticator.ui.platform.feature.settings.export.navigateToExport
+import com.bitwarden.authenticator.ui.platform.feature.tutorial.navigateToSettingsTutorial
 
 const val AUTHENTICATOR_GRAPH_ROUTE = "authenticator_graph"
 
@@ -40,6 +41,7 @@ fun NavGraphBuilder.authenticatorGraph(
             onNavigateToManualKeyEntry = { navController.navigateToManualCodeEntryScreen() },
             onNavigateToEditItem = { navController.navigateToEditItem(itemId = it) },
             onNavigateToExport = { navController.navigateToExport() },
+            onNavigateToTutorial = { navController.navigateToSettingsTutorial() }
         )
         itemListingGraph(
             navController = navController,
@@ -57,6 +59,7 @@ fun NavGraphBuilder.authenticatorGraph(
                 navController.navigateToEditItem(itemId = it)
             },
             navigateToExport = { navController.navigateToExport() },
+            navigateToTutorial = { navController.navigateToSettingsTutorial() }
         )
     }
 }
diff --git a/...itwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingGraphNavigation.kt b/...itwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingGraphNavigation.kt
@@ -25,6 +25,7 @@ fun NavGraphBuilder.itemListingGraph(
     navigateToManualKeyEntry: () -> Unit,
     navigateToEditItem: (String) -> Unit,
     navigateToExport: () -> Unit,
+    navigateToTutorial: () -> Unit,
 ) {
     navigation(
         route = ITEM_LISTING_GRAPH_ROUTE,
@@ -60,6 +61,7 @@ fun NavGraphBuilder.itemListingGraph(
         settingsGraph(
             navController = navController,
             onNavigateToExport = navigateToExport,
+            onNavigateToTutorial = navigateToTutorial,
         )
     }
 }

diff --git a/.../bitwarden/authenticator/ui/authenticator/feature/navbar/AuthenticatorNavBarNavigation.kt b/.../bitwarden/authenticator/ui/authenticator/feature/navbar/AuthenticatorNavBarNavigation.kt
@@ -15,6 +15,7 @@ fun NavGraphBuilder.authenticatorNavBarDestination(
     onNavigateToManualKeyEntry: () -> Unit,
     onNavigateToEditItem: (itemId: String) -> Unit,
     onNavigateToExport: () -> Unit,
+    onNavigateToTutorial: () -> Unit,
 ) {
     composableWithStayTransitions(
         route = AUTHENTICATOR_NAV_BAR_ROUTE,
@@ -26,6 +27,7 @@ fun NavGraphBuilder.authenticatorNavBarDestination(
             onNavigateToManualKeyEntry = onNavigateToManualKeyEntry,
             onNavigateToEditItem = onNavigateToEditItem,
             onNavigateToExport = onNavigateToExport,
+            onNavigateToTutorial = onNavigateToTutorial
         )
     }
 }
diff --git a/.../com/bitwarden/authenticator/ui/authenticator/feature/navbar/AuthenticatorNavBarScreen.kt b/.../com/bitwarden/authenticator/ui/authenticator/feature/navbar/AuthenticatorNavBarScreen.kt
@@ -72,6 +72,7 @@ fun AuthenticatorNavBarScreen(
     onNavigateToManualKeyEntry: () -> Unit,
     onNavigateToEditItem: (itemId: String) -> Unit,
     onNavigateToExport: () -> Unit,
+    onNavigateToTutorial: () -> Unit,
 ) {
     EventsEffect(viewModel = viewModel) { event ->
         navController.apply {
@@ -111,6 +112,7 @@ fun AuthenticatorNavBarScreen(
         navigateToManualKeyEntry = onNavigateToManualKeyEntry,
         navigateToEditItem = onNavigateToEditItem,
         navigateToExport = onNavigateToExport,
+        navigateToTutorial = onNavigateToTutorial,
     )
 }
 
@@ -126,6 +128,7 @@ private fun AuthenticatorNavBarScaffold(
     navigateToManualKeyEntry: () -> Unit,
     navigateToEditItem: (itemId: String) -> Unit,
     navigateToExport: () -> Unit,
+    navigateToTutorial: () -> Unit,
 ) {
     BitwardenScaffold(
         contentWindowInsets = ScaffoldDefaults.contentWindowInsets.exclude(WindowInsets.statusBars),
@@ -173,6 +176,7 @@ private fun AuthenticatorNavBarScaffold(
                 navigateToManualKeyEntry = navigateToManualKeyEntry,
                 navigateToEditItem = navigateToEditItem,
                 navigateToExport = navigateToExport,
+                navigateToTutorial = navigateToTutorial,
             )
         }
     }

diff --git a/...ain/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/SettingsNavigation.kt b/...ain/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/SettingsNavigation.kt
@@ -6,7 +6,6 @@ import androidx.navigation.NavOptions
 import androidx.navigation.navigation
 import com.bitwarden.authenticator.ui.platform.base.util.composableWithRootPushTransitions
 import com.bitwarden.authenticator.ui.platform.feature.settings.export.exportDestination
-import com.bitwarden.authenticator.ui.platform.feature.tutorial.navigateToSettingsTutorial
 import com.bitwarden.authenticator.ui.platform.feature.tutorial.tutorialSettingsDestination
 
 const val SETTINGS_GRAPH_ROUTE = "settings_graph"
@@ -18,6 +17,7 @@ private const val SETTINGS_ROUTE = "settings"
 fun NavGraphBuilder.settingsGraph(
     navController: NavController,
     onNavigateToExport: () -> Unit,
+    onNavigateToTutorial: () -> Unit,
 ) {
     navigation(
         startDestination = SETTINGS_ROUTE,
@@ -27,7 +27,8 @@ fun NavGraphBuilder.settingsGraph(
             route = SETTINGS_ROUTE
         ) {
             SettingsScreen(
-                onNavigateToTutorial = { navController.navigateToSettingsTutorial() },
+                onNavigateToTutorial = onNavigateToTutorial,
+                //{ navController.navigateToSettingsTutorial() },
                 onNavigateToExport = onNavigateToExport,
             )
         }