Feature/template 194 navigation3

app/build.gradle

@@ -90,7 +90,6 @@ dependencies {
     implementation(project(":domain:main"))  // needed for di
     implementation(project(":data:main"))  // needed for di
     implementation(project(":core:network")) // needed for di
-    implementation(libs.composeNavigation)
 
     api platform(libs.firebaseBoM)
     implementation(libs.firebaseCrashlytics)

app/src/main/kotlin/nl/q42/template/MainActivity.kt

@@ -15,13 +15,19 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.rememberNavController
+import androidx.navigation3.runtime.NavEntry
+import androidx.navigation3.runtime.NavKey
+import androidx.navigation3.runtime.entryProvider
+import androidx.navigation3.scene.DialogSceneStrategy
+import androidx.navigation3.ui.NavDisplay
 import co.touchlab.kermit.Logger
-import nl.q42.template.core.utils.config.AppScheme
 import nl.q42.template.navigation.Destination
-import nl.q42.template.navigation.homeGraph
-import nl.q42.template.navigation.onboardingDestinations
+import nl.q42.template.navigation.deeplink.DeeplinkParser
+import nl.q42.template.navigation.homeEntry
+import nl.q42.template.navigation.onboardingEntry
+import nl.q42.template.navigation.viewmodel.Navigator
+import nl.q42.template.navigation.viewmodel.rememberNavigationState
+import nl.q42.template.navigation.viewmodel.toEntries
 import nl.q42.template.ui.compose.composables.widgets.AppSurface
 import nl.q42.template.ui.compose.composables.window.LocalSnackbarHostState
 import nl.q42.template.ui.compose.composables.window.toSnackBarVisuals
@@ -31,19 +37,37 @@ import org.koin.android.ext.android.inject
 
 class MainActivity : ComponentActivity() {
 
-    private val appDeepLinkScheme: AppScheme by inject()
-
     private val snackbarPresenter: SnackbarPresenter by inject()
 
+    private val deeplinkParser: DeeplinkParser by inject()
+
     @OptIn(ExperimentalAnimationApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge() // must be called before super.onCreate
         super.onCreate(savedInstanceState)
 
         Logger.d { "onCreate received, ${intent.data}" }
 
+        val startDestination: Destination = deeplinkParser.parseIntent(intent) ?: Destination.Home
+        Logger.i { "Start destination: $startDestination" }
+
         setContent {
 
+            val navigationState = rememberNavigationState(
+                startRoute = startDestination,
+                topLevelRoutes = setOf<NavKey>(
+                    // the destinations that can be used to enter the app, typically the tabs in the bottom navigation bar.
+                    Destination.Home,
+                    Destination.Onboarding
+                )
+            )
+
+            val navigator = remember { Navigator(navigationState) }
+            val entryProvider: (NavKey) -> NavEntry<NavKey> = entryProvider {
+                homeEntry(navigator = navigator)
+                onboardingEntry(navigator = navigator)
+            }
+
             val snackbarHostState = remember { SnackbarHostState() }
             SnackbarChangedEffect(snackbarHostState)
 
@@ -52,22 +76,16 @@ class MainActivity : ComponentActivity() {
             ) {
                 AppTheme {
 
-                    val navController = rememberNavController()
-
                     AppSurface(
                         modifier = Modifier.fillMaxSize(),
                     ) {
 
-                        NavHost(
-                            navController = navController,
-                            startDestination = Destination.HomeGraph
-                        ) {
-                            homeGraph(
-                                navController = navController,
-                                appDeepLinkScheme = appDeepLinkScheme
-                            )
-                            onboardingDestinations(navController)
-                        }
+                        NavDisplay(
+                            entries = navigationState.toEntries(entryProvider),
+                            onBack = { navigator.goBack() },
+                            sceneStrategy = remember { DialogSceneStrategy() }
+                        )
+
                     }
                 }
             }

app/src/main/kotlin/nl/q42/template/di/AppModule.kt

@@ -5,6 +5,7 @@ import nl.q42.template.core.network.di.networkModule
 import nl.q42.template.data.main.di.dataModule
 import nl.q42.template.domain.main.di.domainModule
 import nl.q42.template.home.di.homeModule
+import nl.q42.template.navigation.deeplink.DeeplinkParser
 import nl.q42.template.navigation.di.navigationModule
 import nl.q42.template.onboarding.di.onboardingModule
 import nl.q42.template.ui.di.presentationModule
@@ -27,6 +28,8 @@ fun initDependencyInjection(application: MainApplication) {
 }
 
 val appModule = module {
+    single { DeeplinkParser() }
+
     includes(
         configModule,
 
@@ -45,4 +48,4 @@ val appModule = module {
         // domain
         domainModule
     )
-}
+}

app/src/main/kotlin/nl/q42/template/navigation/HomeEntry.kt

@@ -0,0 +1,25 @@
+package nl.q42.template.navigation
+
+import androidx.navigation3.runtime.EntryProviderScope
+import androidx.navigation3.runtime.NavKey
+import nl.q42.template.home.main.presentation.HomeViewModel
+import nl.q42.template.home.main.ui.HomeScreen
+import nl.q42.template.home.second.presentation.HomeSecondViewModel
+import nl.q42.template.home.second.ui.HomeSecondScreen
+import nl.q42.template.navigation.viewmodel.InitNavigator
+import nl.q42.template.navigation.viewmodel.Navigator
+import org.koin.androidx.compose.koinViewModel
+import org.koin.core.parameter.parametersOf
+
+internal fun EntryProviderScope<NavKey>.homeEntry(navigator: Navigator) {
+    entry<Destination.Home> { key ->
+        val viewModel: HomeViewModel = koinViewModel { parametersOf(key) }
+        InitNavigator(navigator = navigator, routeNavigator = viewModel)
+        HomeScreen(viewModel = viewModel)
+    }
+    entry<Destination.HomeSecond> { key ->
+        val viewModel: HomeSecondViewModel = koinViewModel { parametersOf(key) }
+        InitNavigator(navigator = navigator, routeNavigator = viewModel)
+        HomeSecondScreen(viewModel = viewModel)
+    }
+}

app/src/main/kotlin/nl/q42/template/navigation/OnboardingDestinations.kt

@@ -1,18 +1,18 @@
 package nl.q42.template.navigation
 
-import androidx.navigation.NavGraphBuilder
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.composable
+import androidx.navigation3.runtime.EntryProviderScope
+import androidx.navigation3.runtime.NavKey
 import nl.q42.template.navigation.viewmodel.InitNavigator
+import nl.q42.template.navigation.viewmodel.Navigator
 import nl.q42.template.onboarding.start.presentation.OnboardingStartViewModel
 import nl.q42.template.onboarding.start.ui.OnboardingStartScreen
 import org.koin.androidx.compose.koinViewModel
+import org.koin.core.parameter.parametersOf
 
-internal fun NavGraphBuilder.onboardingDestinations(navController: NavHostController) {
-    composable<Destination.Onboarding> {
-
-        val viewModel: OnboardingStartViewModel = koinViewModel()
-        InitNavigator(navController = navController, viewModel)
+internal fun EntryProviderScope<NavKey>.onboardingEntry(navigator: Navigator) {
+    entry<Destination.Onboarding> { key ->
+        val viewModel: OnboardingStartViewModel = koinViewModel { parametersOf(key) }
+        InitNavigator(navigator = navigator, viewModel)
 
         OnboardingStartScreen(viewModel = viewModel)
     }