refactor: remove nested DestinationsNavHost

Author: saleniuk

app/src/main/kotlin/com/wire/android/navigation/MainNavHost.kt

@@ -43,6 +43,7 @@ import com.wire.android.ui.destinations.NewLoginPasswordScreenDestination
 import com.wire.android.ui.destinations.NewLoginVerificationCodeScreenDestination
 import com.wire.android.ui.home.conversations.ConversationScreen
 import com.wire.android.ui.home.newconversation.NewConversationViewModel
+import com.wire.android.ui.userprofile.teammigration.TeamMigrationViewModel
 
 @OptIn(ExperimentalMaterialNavigationApi::class, ExperimentalAnimationApi::class)
 @Composable
@@ -105,6 +106,14 @@ fun MainNavHost(
                 }
                 SSOUrlConfigHolderImpl(parentEntry.savedStateHandle)
             }
+
+            // 👇 To tie TeamMigrationViewModel to PersonalToTeamMigrationNavGraph, making it shared between all screens that belong to it
+            dependency(NavGraphs.personalToTeamMigration) {
+                val parentEntry = remember(navBackStackEntry) {
+                    navController.getBackStackEntry(NavGraphs.personalToTeamMigration.route)
+                }
+                hiltViewModel<TeamMigrationViewModel>(parentEntry)
+            }
         },
         manualComposableCallsBuilder = {
             /**

app/src/main/kotlin/com/wire/android/ui/home/newconversation/search/NewConversationSearchPeopleScreen.kt

@@ -26,9 +26,9 @@ import com.wire.android.navigation.NavigationCommand
 import com.wire.android.navigation.Navigator
 import com.wire.android.navigation.WireDestination
 import com.wire.android.navigation.style.PopUpNavigationAnimation
+import com.wire.android.ui.NavGraphs
 import com.wire.android.ui.destinations.NewGroupConversationSearchPeopleScreenDestination
 import com.wire.android.ui.destinations.OtherUserProfileScreenDestination
-import com.wire.android.ui.destinations.TeamMigrationScreenDestination
 import com.wire.android.ui.home.conversations.search.SearchPeopleScreenType
 import com.wire.android.ui.home.conversations.search.SearchUsersAndServicesScreen
 import com.wire.android.ui.home.newconversation.NewConversationViewModel
@@ -82,7 +82,7 @@ fun NewConversationSearchPeopleScreen(
             },
             onCreateTeam = {
                 showCreateTeamDialog.value = false
-                navigator.navigate(NavigationCommand(TeamMigrationScreenDestination))
+                navigator.navigate(NavigationCommand(NavGraphs.personalToTeamMigration))
             }
         )
     }

app/src/main/kotlin/com/wire/android/ui/userprofile/self/SelfUserProfileScreen.kt

@@ -64,6 +64,7 @@ import com.wire.android.navigation.NavigationCommand
 import com.wire.android.navigation.Navigator
 import com.wire.android.navigation.WireDestination
 import com.wire.android.navigation.style.PopUpNavigationAnimation
+import com.wire.android.ui.NavGraphs
 import com.wire.android.ui.common.VisibilityState
 import com.wire.android.ui.common.WireDropDown
 import com.wire.android.ui.common.avatar.UserStatusIndicator
@@ -83,7 +84,6 @@ import com.wire.android.ui.destinations.AvatarPickerScreenDestination
 import com.wire.android.ui.destinations.MyAccountScreenDestination
 import com.wire.android.ui.destinations.NewLoginScreenDestination
 import com.wire.android.ui.destinations.SelfQRCodeScreenDestination
-import com.wire.android.ui.destinations.TeamMigrationScreenDestination
 import com.wire.android.ui.destinations.WelcomeScreenDestination
 import com.wire.android.ui.home.conversationslist.common.FolderHeader
 import com.wire.android.ui.legalhold.banner.LegalHoldPendingBanner
@@ -168,7 +168,7 @@ fun SelfUserProfileScreen(
             )
         },
         onCreateAccount = {
-            navigator.navigate(NavigationCommand(TeamMigrationScreenDestination))
+            navigator.navigate(NavigationCommand(NavGraphs.personalToTeamMigration))
         },
         onAccountDetailsClick = { navigator.navigate(NavigationCommand(MyAccountScreenDestination)) },
         isUserInCall = viewModelSelf::isUserInCall,

app/src/main/kotlin/com/wire/android/ui/userprofile/teammigration/PersonalToTeamMigrationNavGraph.kt

@@ -18,7 +18,9 @@
 package com.wire.android.ui.userprofile.teammigration
 
 import com.ramcosta.composedestinations.annotation.NavGraph
+import com.ramcosta.composedestinations.annotation.RootNavGraph
 
+@RootNavGraph
 @NavGraph
 annotation class PersonalToTeamMigrationNavGraph(
     val start: Boolean = false

app/src/main/kotlin/com/wire/android/ui/userprofile/teammigration/TeamMigrationScreen.kt

@@ -22,9 +22,7 @@ import com.wire.kalium.logic.feature.user.migration.MigrateFromPersonalToTeamFai
 
 data class TeamMigrationState(
     val teamNameTextState: TextFieldState = TextFieldState(),
-    val shouldShowMigrationLeaveDialog: Boolean = false,
     val isMigrating: Boolean = false,
-    val currentStep: Int = 0,
     val username: String = "",
     val teamUrl: String = "",
     val migrationFailure: MigrateFromPersonalToTeamFailure? = null,

app/src/main/kotlin/com/wire/android/ui/userprofile/teammigration/TeamMigrationState.kt

@@ -52,16 +52,7 @@ class TeamMigrationViewModel @Inject constructor(
         observeMigrationDotActive()
     }
 
-    fun showMigrationLeaveDialog() {
-        teamMigrationState = teamMigrationState.copy(shouldShowMigrationLeaveDialog = true)
-    }
-
-    fun hideMigrationLeaveDialog() {
-        teamMigrationState = teamMigrationState.copy(shouldShowMigrationLeaveDialog = false)
-    }
-
     fun setCurrentStep(step: Int) {
-        teamMigrationState = teamMigrationState.copy(currentStep = step)
         sendPersonalTeamCreationFlowStepEvent(step)
     }
 

app/src/main/kotlin/com/wire/android/ui/userprofile/teammigration/TeamMigrationViewModel.kt

@@ -45,7 +45,9 @@ fun BottomLineButtons(
     isMigrating: Boolean = false,
     isBackButtonVisible: Boolean = true,
     backButtonContentDescription: String = stringResource(R.string.personal_to_team_migration_back_button_label),
+    backButtonText: String = stringResource(R.string.personal_to_team_migration_back_button_label),
     onBack: () -> Unit = { },
+    continueButtonText: String = stringResource(R.string.label_continue),
     onContinue: () -> Unit = { }
 ) {
     Column(
@@ -67,7 +69,7 @@ fun BottomLineButtons(
                 modifier = Modifier
                     .fillMaxWidth()
                     .semantics(true) { contentDescription = backButtonContentDescription },
-                text = stringResource(R.string.personal_to_team_migration_back_button_label),
+                text = backButtonText,
                 onClick = onBack,
                 state = if (isMigrating) {
                     WireButtonState.Disabled
@@ -81,7 +83,7 @@ fun BottomLineButtons(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(top = dimensions().spacing6x),
-            text = stringResource(R.string.label_continue),
+            text = continueButtonText,
             onClick = onContinue,
             loading = isMigrating,
             state = if (isContinueButtonEnabled && !isMigrating) {