Migrate from Navigation 2 to Navigation 3 (#334)

* Migrate from Navigation 2 to Navigation 3

* fix errors

* Fix viewmodel input

* Spread NavEntry into each modules

* refactor: update navigation keys and dependencies for modularization and consistency

* integrate compose material3 adaptive navigation and update scene strategies for modularization

* Multiple Stacks with NavigationSuiteScaffold

* Make poster to dialog scene

* Fix errors

Author: fornewid

app/build.gradle

@@ -73,6 +73,7 @@ dependencies {
     implementation projects.core.kotlin
     implementation projects.core.designsystem
     implementation projects.core.logger
+    implementation projects.core.resources
     implementation projects.data.repository.api
     implementation projects.data.model
     implementation projects.feature.home.api
@@ -108,13 +109,20 @@ dependencies {
     implementation libs.androidx.lifecycle.runtime
     implementation libs.androidx.lifecycle.compiler
 
-    implementation libs.androidx.navigation.compose
+    implementation libs.androidx.navigation3.runtime
+    implementation libs.androidx.navigation3.ui
+    implementation libs.androidx.lifecycle.viewmodel.navigation3
 
     implementation libs.androidx.activity.compose
-    implementation libs.androidx.hilt.navigation.compose
+    implementation libs.androidx.hilt.lifecycle.viewmodel.compose
     implementation libs.compose.foundation
-    implementation libs.compose.material3
     implementation libs.compose.ui
+    implementation libs.compose.material3
+    implementation libs.compose.material3.adaptivenavigation
+    implementation libs.compose.material3.adaptive.navigation3
+    implementation libs.compose.animation.graphics
+
+    implementation libs.materialmotion.compose.core
 
     implementation libs.androidx.profileinstaller
 

app/dependencies/releaseRuntimeClasspath.txt

@@ -1,30 +1,36 @@
-androidx.activity:activity-compose:1.10.1
-androidx.activity:activity-ktx:1.10.1
-androidx.activity:activity:1.10.1
-androidx.annotation:annotation-experimental:1.4.1
+androidx.activity:activity-compose:1.12.1
+androidx.activity:activity-ktx:1.12.1
+androidx.activity:activity:1.12.1
+androidx.annotation:annotation-experimental:1.5.1
 androidx.annotation:annotation-jvm:1.9.1
 androidx.annotation:annotation:1.9.1
-androidx.appcompat:appcompat-resources:1.7.0
-androidx.appcompat:appcompat:1.7.0
+androidx.appcompat:appcompat-resources:1.7.1
+androidx.appcompat:appcompat:1.7.1
 androidx.arch.core:core-common:2.2.0
 androidx.arch.core:core-runtime:2.2.0
 androidx.autofill:autofill:1.0.0
 androidx.browser:browser:1.8.0
 androidx.collection:collection-jvm:1.5.0
 androidx.collection:collection-ktx:1.5.0
 androidx.collection:collection:1.5.0
-androidx.compose.animation:animation-android:1.7.8
-androidx.compose.animation:animation-core-android:1.7.8
-androidx.compose.animation:animation-core:1.7.8
-androidx.compose.animation:animation-graphics-android:1.7.8
-androidx.compose.animation:animation-graphics:1.7.8
-androidx.compose.animation:animation:1.7.8
-androidx.compose.foundation:foundation-android:1.7.8
-androidx.compose.foundation:foundation-layout-android:1.7.8
-androidx.compose.foundation:foundation-layout:1.7.8
-androidx.compose.foundation:foundation:1.7.8
-androidx.compose.material3.adaptive:adaptive-android:1.0.0
-androidx.compose.material3.adaptive:adaptive:1.0.0
+androidx.compose.animation:animation-android:1.10.0-beta02
+androidx.compose.animation:animation-core-android:1.10.0-beta02
+androidx.compose.animation:animation-core:1.10.0-beta02
+androidx.compose.animation:animation-graphics-android:1.10.0-beta02
+androidx.compose.animation:animation-graphics:1.10.0-beta02
+androidx.compose.animation:animation:1.10.0-beta02
+androidx.compose.foundation:foundation-android:1.10.0-beta02
+androidx.compose.foundation:foundation-layout-android:1.10.0-beta02
+androidx.compose.foundation:foundation-layout:1.10.0-beta02
+androidx.compose.foundation:foundation:1.10.0-beta02
+androidx.compose.material3.adaptive:adaptive-android:1.3.0-alpha05
+androidx.compose.material3.adaptive:adaptive-layout-android:1.3.0-alpha05
+androidx.compose.material3.adaptive:adaptive-layout:1.3.0-alpha05
+androidx.compose.material3.adaptive:adaptive-navigation-android:1.3.0-alpha05
+androidx.compose.material3.adaptive:adaptive-navigation3-android:1.3.0-alpha05
+androidx.compose.material3.adaptive:adaptive-navigation3:1.3.0-alpha05
+androidx.compose.material3.adaptive:adaptive-navigation:1.3.0-alpha05
+androidx.compose.material3.adaptive:adaptive:1.3.0-alpha05
 androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.1
 androidx.compose.material3:material3-adaptive-navigation-suite:1.3.1
 androidx.compose.material3:material3-android:1.3.1
@@ -37,30 +43,34 @@ androidx.compose.material:material-icons-extended:1.7.8
 androidx.compose.material:material-ripple-android:1.7.8
 androidx.compose.material:material-ripple:1.7.8
 androidx.compose.material:material:1.7.8
-androidx.compose.runtime:runtime-android:1.8.2
-androidx.compose.runtime:runtime-saveable-android:1.8.2
-androidx.compose.runtime:runtime-saveable:1.8.2
-androidx.compose.runtime:runtime:1.8.2
-androidx.compose.ui:ui-android:1.8.2
-androidx.compose.ui:ui-geometry-android:1.8.2
-androidx.compose.ui:ui-geometry:1.8.2
-androidx.compose.ui:ui-graphics-android:1.8.2
-androidx.compose.ui:ui-graphics:1.8.2
-androidx.compose.ui:ui-text-android:1.8.2
-androidx.compose.ui:ui-text:1.8.2
-androidx.compose.ui:ui-tooling-preview-android:1.8.2
-androidx.compose.ui:ui-tooling-preview:1.8.2
-androidx.compose.ui:ui-unit-android:1.8.2
-androidx.compose.ui:ui-unit:1.8.2
-androidx.compose.ui:ui-util-android:1.8.2
-androidx.compose.ui:ui-util:1.8.2
-androidx.compose.ui:ui:1.8.2
+androidx.compose.runtime:runtime-android:1.10.0-beta02
+androidx.compose.runtime:runtime-annotation-android:1.10.0-beta02
+androidx.compose.runtime:runtime-annotation:1.10.0-beta02
+androidx.compose.runtime:runtime-retain-android:1.10.0-beta02
+androidx.compose.runtime:runtime-retain:1.10.0-beta02
+androidx.compose.runtime:runtime-saveable-android:1.10.0-beta02
+androidx.compose.runtime:runtime-saveable:1.10.0-beta02
+androidx.compose.runtime:runtime:1.10.0-beta02
+androidx.compose.ui:ui-android:1.10.0-beta02
+androidx.compose.ui:ui-geometry-android:1.10.0-beta02
+androidx.compose.ui:ui-geometry:1.10.0-beta02
+androidx.compose.ui:ui-graphics-android:1.10.0-beta02
+androidx.compose.ui:ui-graphics:1.10.0-beta02
+androidx.compose.ui:ui-text-android:1.10.0-beta02
+androidx.compose.ui:ui-text:1.10.0-beta02
+androidx.compose.ui:ui-tooling-preview-android:1.10.0-beta02
+androidx.compose.ui:ui-tooling-preview:1.10.0-beta02
+androidx.compose.ui:ui-unit-android:1.10.0-beta02
+androidx.compose.ui:ui-unit:1.10.0-beta02
+androidx.compose.ui:ui-util-android:1.10.0-beta02
+androidx.compose.ui:ui-util:1.10.0-beta02
+androidx.compose.ui:ui:1.10.0-beta02
 androidx.compose:compose-bom:2025.02.00
 androidx.concurrent:concurrent-futures-ktx:1.1.0
 androidx.concurrent:concurrent-futures:1.1.0
-androidx.core:core-ktx:1.16.0-alpha02
+androidx.core:core-ktx:1.17.0
 androidx.core:core-viewtree:1.0.0
-androidx.core:core:1.16.0-alpha02
+androidx.core:core:1.17.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview-poolingcontainer:1.0.0
 androidx.customview:customview:1.0.0
@@ -76,7 +86,9 @@ androidx.datastore:datastore-preferences-external-protobuf:1.1.3
 androidx.datastore:datastore-preferences-proto:1.1.3
 androidx.datastore:datastore-preferences:1.1.3
 androidx.datastore:datastore:1.1.3
+androidx.documentfile:documentfile:1.0.0
 androidx.drawerlayout:drawerlayout:1.0.0
+androidx.dynamicanimation:dynamicanimation:1.0.0
 androidx.emoji2:emoji2-views-helper:1.4.0
 androidx.emoji2:emoji2:1.4.0
 androidx.exifinterface:exifinterface:1.3.7
@@ -85,63 +97,70 @@ androidx.graphics:graphics-path:1.0.1
 androidx.hilt:hilt-common:1.3.0
 androidx.hilt:hilt-lifecycle-viewmodel-compose:1.3.0
 androidx.hilt:hilt-lifecycle-viewmodel:1.3.0
-androidx.hilt:hilt-navigation-compose:1.3.0
 androidx.hilt:hilt-work:1.3.0
 androidx.interpolator:interpolator:1.0.0
-androidx.lifecycle:lifecycle-common-java8:2.9.1
-androidx.lifecycle:lifecycle-common-jvm:2.9.1
-androidx.lifecycle:lifecycle-common:2.9.1
-androidx.lifecycle:lifecycle-livedata-core-ktx:2.9.1
-androidx.lifecycle:lifecycle-livedata-core:2.9.1
-androidx.lifecycle:lifecycle-livedata:2.9.1
-androidx.lifecycle:lifecycle-process:2.9.1
-androidx.lifecycle:lifecycle-runtime-android:2.9.1
-androidx.lifecycle:lifecycle-runtime-compose-android:2.9.1
-androidx.lifecycle:lifecycle-runtime-compose:2.9.1
-androidx.lifecycle:lifecycle-runtime-ktx-android:2.9.1
-androidx.lifecycle:lifecycle-runtime-ktx:2.9.1
-androidx.lifecycle:lifecycle-runtime:2.9.1
-androidx.lifecycle:lifecycle-service:2.9.1
-androidx.lifecycle:lifecycle-viewmodel-android:2.9.1
-androidx.lifecycle:lifecycle-viewmodel-compose-android:2.9.1
-androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1
-androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1
-androidx.lifecycle:lifecycle-viewmodel-savedstate-android:2.9.1
-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1
-androidx.lifecycle:lifecycle-viewmodel:2.9.1
+androidx.legacy:legacy-support-core-utils:1.0.0
+androidx.lifecycle:lifecycle-common-java8:2.10.0
+androidx.lifecycle:lifecycle-common-jvm:2.10.0
+androidx.lifecycle:lifecycle-common:2.10.0
+androidx.lifecycle:lifecycle-livedata-core-ktx:2.10.0
+androidx.lifecycle:lifecycle-livedata-core:2.10.0
+androidx.lifecycle:lifecycle-livedata:2.10.0
+androidx.lifecycle:lifecycle-process:2.10.0
+androidx.lifecycle:lifecycle-runtime-android:2.10.0
+androidx.lifecycle:lifecycle-runtime-compose-android:2.10.0
+androidx.lifecycle:lifecycle-runtime-compose:2.10.0
+androidx.lifecycle:lifecycle-runtime-ktx-android:2.10.0
+androidx.lifecycle:lifecycle-runtime-ktx:2.10.0
+androidx.lifecycle:lifecycle-runtime:2.10.0
+androidx.lifecycle:lifecycle-service:2.10.0
+androidx.lifecycle:lifecycle-viewmodel-android:2.10.0
+androidx.lifecycle:lifecycle-viewmodel-compose-android:2.10.0
+androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0
+androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0
+androidx.lifecycle:lifecycle-viewmodel-navigation3-android:2.10.0
+androidx.lifecycle:lifecycle-viewmodel-navigation3:2.10.0
+androidx.lifecycle:lifecycle-viewmodel-savedstate-android:2.10.0
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0
+androidx.lifecycle:lifecycle-viewmodel:2.10.0
 androidx.loader:loader:1.0.0
-androidx.navigation:navigation-common-android:2.9.6
-androidx.navigation:navigation-common:2.9.6
-androidx.navigation:navigation-compose-android:2.9.6
-androidx.navigation:navigation-compose:2.9.6
-androidx.navigation:navigation-runtime-android:2.9.6
-androidx.navigation:navigation-runtime:2.9.6
+androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
+androidx.navigation3:navigation3-runtime-android:1.0.0
+androidx.navigation3:navigation3-runtime:1.0.0
+androidx.navigation3:navigation3-ui-android:1.0.0
+androidx.navigation3:navigation3-ui:1.0.0
+androidx.navigationevent:navigationevent-android:1.0.1
+androidx.navigationevent:navigationevent-compose-android:1.0.1
+androidx.navigationevent:navigationevent-compose:1.0.1
+androidx.navigationevent:navigationevent:1.0.1
+androidx.print:print:1.0.0
 androidx.profileinstaller:profileinstaller:1.4.1
 androidx.resourceinspection:resourceinspection-annotation:1.0.1
 androidx.room:room-common-jvm:2.7.0-rc01
 androidx.room:room-common:2.7.0-rc01
 androidx.room:room-ktx:2.7.0-rc01
 androidx.room:room-runtime-android:2.7.0-rc01
 androidx.room:room-runtime:2.7.0-rc01
-androidx.savedstate:savedstate-android:1.3.0
-androidx.savedstate:savedstate-compose-android:1.3.0
-androidx.savedstate:savedstate-compose:1.3.0
-androidx.savedstate:savedstate-ktx:1.3.0
-androidx.savedstate:savedstate:1.3.0
+androidx.savedstate:savedstate-android:1.4.0
+androidx.savedstate:savedstate-compose-android:1.4.0
+androidx.savedstate:savedstate-compose:1.4.0
+androidx.savedstate:savedstate-ktx:1.4.0
+androidx.savedstate:savedstate:1.4.0
 androidx.sqlite:sqlite-android:2.5.0-rc01
 androidx.sqlite:sqlite-framework-android:2.5.0-rc01
 androidx.sqlite:sqlite-framework:2.5.0-rc01
 androidx.sqlite:sqlite:2.5.0-rc01
 androidx.startup:startup-runtime:1.2.0
 androidx.tracing:tracing-ktx:1.2.0
 androidx.tracing:tracing:1.2.0
+androidx.transition:transition:1.6.0
 androidx.vectordrawable:vectordrawable-animated:1.1.0
 androidx.vectordrawable:vectordrawable:1.1.0
 androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager:viewpager:1.0.0
-androidx.window:window-core-android:1.4.0-beta02
-androidx.window:window-core:1.4.0-beta02
-androidx.window:window:1.4.0-beta02
+androidx.window:window-core-android:1.5.0
+androidx.window:window-core:1.5.0
+androidx.window:window:1.5.0
 androidx.work:work-runtime:2.10.0
 com.google.accompanist:accompanist-drawablepainter:0.36.0
 com.google.code.findbugs:jsr305:3.0.2
@@ -174,18 +193,20 @@ io.github.fornewid:material-motion-compose-core:1.1.3
 io.github.fornewid:photo-compose:1.0.1
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
-org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4
-org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.5
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.5
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.5
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.5
+org.jetbrains.androidx.savedstate:savedstate-compose:1.3.5
+org.jetbrains.androidx.savedstate:savedstate:1.3.5
 org.jetbrains.compose.animation:animation-core:1.7.3
 org.jetbrains.compose.animation:animation:1.7.3
 org.jetbrains.compose.annotation-internal:annotation:1.7.3
 org.jetbrains.compose.collection-internal:collection:1.7.3
 org.jetbrains.compose.foundation:foundation-layout:1.7.3
 org.jetbrains.compose.foundation:foundation:1.7.3
-org.jetbrains.compose.runtime:runtime-saveable:1.7.3
-org.jetbrains.compose.runtime:runtime:1.7.3
+org.jetbrains.compose.runtime:runtime-saveable:1.9.2
+org.jetbrains.compose.runtime:runtime:1.9.2
 org.jetbrains.compose.ui:ui-geometry:1.7.3
 org.jetbrains.compose.ui:ui-graphics:1.7.3
 org.jetbrains.compose.ui:ui-text:1.7.3

app/src/main/java/soup/movie/di/AppModule.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2025 SOUP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package soup.movie.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityRetainedComponent
+import soup.movie.feature.navigator.Navigator
+import soup.movie.ui.main.NavigatorImpl
+
+@Module
+@InstallIn(ActivityRetainedComponent::class)
+interface AppModule {
+
+    @Binds
+    fun bindsNavigator(
+        impl: NavigatorImpl,
+    ): Navigator
+}

app/src/main/java/soup/movie/di/ApplicationModule.kt

@@ -26,7 +26,7 @@ import soup.movie.feature.navigator.MainNavigator
 interface ApplicationModule {
 
     @Binds
-    fun provideMainNavigator(
+    fun bindsMainNavigator(
         impl: MainNavigatorImpl,
     ): MainNavigator
 }