Migrate to navigation3 (#45)

* Migrate to navigation3

* Use assisted injection

* Clean up

Author: skydoves

app/src/main/kotlin/com/skydoves/pokedex/compose/MainActivity.kt

@@ -20,32 +20,20 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import com.skydoves.pokedex.compose.core.navigation.AppComposeNavigator
-import com.skydoves.pokedex.compose.core.navigation.LocalComposeNavigator
-import com.skydoves.pokedex.compose.core.navigation.PokedexScreen
 import com.skydoves.pokedex.compose.ui.PokedexMain
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
 
-  @Inject
-  internal lateinit var composeNavigator: AppComposeNavigator<PokedexScreen>
-
   override fun onCreate(savedInstanceState: Bundle?) {
     installSplashScreen()
     enableEdgeToEdge()
     super.onCreate(savedInstanceState)
 
     setContent {
-      CompositionLocalProvider(
-        LocalComposeNavigator provides composeNavigator,
-      ) {
-        PokedexMain(composeNavigator = composeNavigator)
-      }
+      PokedexMain()
     }
   }
 }

app/src/main/kotlin/com/skydoves/pokedex/compose/navigation/PokedexNavHost.kt

@@ -16,22 +16,56 @@
 
 package com.skydoves.pokedex.compose.navigation
 
+import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.animation.SharedTransitionLayout
 import androidx.compose.runtime.Composable
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.NavHost
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.remember
+import androidx.navigation3.runtime.NavKey
+import androidx.navigation3.runtime.entryProvider
+import androidx.navigation3.runtime.rememberNavBackStack
+import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
+import androidx.navigation3.ui.LocalNavAnimatedContentScope
+import androidx.navigation3.ui.NavDisplay
 import com.skydoves.compose.stability.runtime.TraceRecomposition
+import com.skydoves.pokedex.compose.core.navigation.LocalComposeNavigator
+import com.skydoves.pokedex.compose.core.navigation.PokedexNavigatorImpl
 import com.skydoves.pokedex.compose.core.navigation.PokedexScreen
+import com.skydoves.pokedex.compose.feature.details.PokedexDetails
+import com.skydoves.pokedex.compose.feature.home.PokedexHome
 
+@OptIn(ExperimentalSharedTransitionApi::class)
 @Composable
 @TraceRecomposition
-fun PokedexNavHost(navHostController: NavHostController) {
-  SharedTransitionLayout {
-    NavHost(
-      navController = navHostController,
-      startDestination = PokedexScreen.Home,
-    ) {
-      pokedexNavigation()
+fun PokedexNavHost() {
+  val backStack = rememberNavBackStack(PokedexScreen.Home)
+  val navigator = remember(backStack) { PokedexNavigatorImpl(backStack) }
+
+  CompositionLocalProvider(
+    LocalComposeNavigator provides navigator,
+  ) {
+    SharedTransitionLayout {
+      NavDisplay(
+        backStack = backStack,
+        onBack = { backStack.removeLastOrNull() },
+        entryDecorators = listOf(rememberSaveableStateHolderNavEntryDecorator()),
+        entryProvider = entryProvider<NavKey> {
+          entry<PokedexScreen.Home> {
+            PokedexHome(
+              sharedTransitionScope = this@SharedTransitionLayout,
+              animatedContentScope = LocalNavAnimatedContentScope.current,
+            )
+          }
+
+          entry<PokedexScreen.Details> { screen ->
+            PokedexDetails(
+              sharedTransitionScope = this@SharedTransitionLayout,
+              animatedContentScope = LocalNavAnimatedContentScope.current,
+              pokemon = screen.pokemon,
+            )
+          }
+        },
+      )
     }
   }
 }

app/src/main/kotlin/com/skydoves/pokedex/compose/navigation/PokedexNavigation.kt

@@ -17,24 +17,14 @@
 package com.skydoves.pokedex.compose.ui
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.navigation.compose.rememberNavController
 import com.skydoves.compose.stability.runtime.TraceRecomposition
 import com.skydoves.pokedex.compose.core.designsystem.theme.PokedexTheme
-import com.skydoves.pokedex.compose.core.navigation.AppComposeNavigator
-import com.skydoves.pokedex.compose.core.navigation.PokedexScreen
 import com.skydoves.pokedex.compose.navigation.PokedexNavHost
 
 @Composable
 @TraceRecomposition
-fun PokedexMain(composeNavigator: AppComposeNavigator<PokedexScreen>) {
+fun PokedexMain() {
   PokedexTheme {
-    val navHostController = rememberNavController()
-
-    LaunchedEffect(Unit) {
-      composeNavigator.handleNavigationCommands(navHostController)
-    }
-
-    PokedexNavHost(navHostController = navHostController)
+    PokedexNavHost()
   }
 }

app/src/main/kotlin/com/skydoves/pokedex/compose/ui/PokedexMain.kt

@@ -16,7 +16,9 @@ dependencies {
   implementation(libs.androidx.core)
   implementation(libs.kotlinx.coroutines.android)
 
-  api(libs.androidx.navigation.compose)
+  // Navigation3
+  api(libs.androidx.navigation3.runtime)
+  api(libs.androidx.navigation3.ui)
 
   // json parsing
   implementation(libs.kotlinx.serialization.json)

core/designsystem/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/component/PokedexSharedElement.kt

@@ -21,18 +21,18 @@ import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.compositionLocalOf
 
-public val LocalComposeNavigator: ProvidableCompositionLocal<AppComposeNavigator<PokedexScreen>> =
+public val LocalComposeNavigator: ProvidableCompositionLocal<PokedexNavigator> =
   compositionLocalOf {
     error(
-      "No AppComposeNavigator provided! " +
+      "No PokedexNavigator provided! " +
         "Make sure to wrap all usages of Pokedex components in PokedexTheme.",
     )
   }
 
 /**
- * Retrieves the current [AppComposeNavigator] at the call site's position in the hierarchy.
+ * Retrieves the current [PokedexNavigator] at the call site's position in the hierarchy.
  */
-public val currentComposeNavigator: AppComposeNavigator<PokedexScreen>
+public val currentComposeNavigator: PokedexNavigator
   @Composable
   @ReadOnlyComposable
   get() = LocalComposeNavigator.current