Merge pull request #7368 from thunderbird/fix_onboarding_navigation

Fix onboarding navigation
thunderbird · Nov 21, 2023 · f2f6124 · f2f6124
2 parents 1b937d6 + 54608d7
commit f2f6124
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 13 deletions.
diff --git a/app-feature-preview/src/main/java/app/k9mail/feature/preview/navigation/FeatureNavHost.kt b/app-feature-preview/src/main/java/app/k9mail/feature/preview/navigation/FeatureNavHost.kt
@@ -24,11 +24,9 @@ fun FeatureNavHost(
     ) {
         onboardingRoute(
             onImport = { /* TODO */ },
-            onBack = navController::popBackStack,
-            onFinish = { accountUuid ->
-                navController.navigateToAccountEditIncomingServerSettings(accountUuid)
-            },
-        )
+        ) { accountUuid ->
+            navController.navigateToAccountEditIncomingServerSettings(accountUuid)
+        }
         accountSetupRoute(
             onBack = navController::popBackStack,
             onFinish = { accountUuid ->

diff --git a/...setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/options/AccountOptionsScreen.kt b/...setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/options/AccountOptionsScreen.kt
@@ -48,7 +48,6 @@ internal fun AccountOptionsScreen(
         },
         bottomBar = {
             WizardNavigationBar(
-                nextButtonText = stringResource(id = string.account_setup_button_finish),
                 onNextClick = { dispatch(Event.OnNextClicked) },
                 onBackClick = { dispatch(Event.OnBackClicked) },
             )

diff --git a/...launcher/src/main/kotlin/app/k9mail/feature/launcher/navigation/FeatureLauncherNavHost.kt b/...launcher/src/main/kotlin/app/k9mail/feature/launcher/navigation/FeatureLauncherNavHost.kt
@@ -30,9 +30,7 @@ fun FeatureLauncherNavHost(
     ) {
         onboardingRoute(
             onImport = { importSettingsLauncher.launch() },
-            onBack = onBack,
-            onFinish = { accountUuid -> accountSetupFinishedLauncher.launch(accountUuid) },
-        )
+        ) { accountUuid -> accountSetupFinishedLauncher.launch(accountUuid) }
         accountSetupRoute(
             onBack = onBack,
             onFinish = { accountSetupFinishedLauncher.launch(it) },

diff --git a/...g/main/src/main/kotlin/app/k9mail/feature/onboarding/main/navigation/OnboardingNavHost.kt b/...g/main/src/main/kotlin/app/k9mail/feature/onboarding/main/navigation/OnboardingNavHost.kt
@@ -30,7 +30,6 @@ private fun NavController.navigateToPermissions() {
 @Composable
 fun OnboardingNavHost(
     onImport: () -> Unit,
-    onBack: () -> Unit,
     onFinish: (String) -> Unit,
     hasRuntimePermissions: HasRuntimePermissions = koinInject(),
 ) {
@@ -50,7 +49,7 @@ fun OnboardingNavHost(
 
         composable(route = NESTED_NAVIGATION_ROUTE_ACCOUNT_SETUP) {
             AccountSetupNavHost(
-                onBack = onBack,
+                onBack = { navController.popBackStack() },
                 onFinish = { createdAccountUuid: String ->
                     accountUuid = createdAccountUuid
                     if (hasRuntimePermissions()) {

diff --git a/...ain/src/main/kotlin/app/k9mail/feature/onboarding/main/navigation/OnboardingNavigation.kt b/...ain/src/main/kotlin/app/k9mail/feature/onboarding/main/navigation/OnboardingNavigation.kt
@@ -15,13 +15,11 @@ fun NavController.navigateToOnboarding(
 
 fun NavGraphBuilder.onboardingRoute(
     onImport: () -> Unit,
-    onBack: () -> Unit,
     onFinish: (String) -> Unit,
 ) {
     deepLinkComposable(route = NAVIGATION_ROUTE_ONBOARDING) {
         OnboardingNavHost(
             onImport = onImport,
-            onBack = onBack,
             onFinish = onFinish,
         )
     }