Remove bottom nav bar when relaunching tutorial (#59)

This commit is contained in:
Patrick Honkonen
2024-04-26 11:17:47 -04:00
committed by GitHub
parent 2bd0df2910
commit 75fb200eaf
5 changed files with 13 additions and 2 deletions

View File

@@ -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() }
)
}
}

View File

@@ -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,
)
}
}

View File

@@ -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
)
}
}

View File

@@ -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,
)
}
}

View File

@@ -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,7 @@ fun NavGraphBuilder.settingsGraph(
route = SETTINGS_ROUTE
) {
SettingsScreen(
onNavigateToTutorial = { navController.navigateToSettingsTutorial() },
onNavigateToTutorial = onNavigateToTutorial,
onNavigateToExport = onNavigateToExport,
)
}