Use Navigation 3

androidApp/build.gradle.kts

@@ -15,6 +15,7 @@ kotlin {
             implementation(libs.compose.ui.tooling.preview)
             implementation(libs.androidx.activity.compose)
             implementation(libs.androidx.core.splashscreen)
+            implementation(libs.androidx.navigation3.ui)
         }
 
         androidUnitTest.dependencies {

androidApp/src/androidMain/kotlin/org/jetbrains/kotlinconf/android/MainActivity.kt

@@ -8,11 +8,6 @@ import androidx.activity.ComponentActivity
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.scaleIn
-import androidx.compose.animation.scaleOut
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.mmk.kmpnotifier.extensions.onCreateOrOnNewIntent
 import com.mmk.kmpnotifier.notification.NotifierManager
@@ -48,14 +43,6 @@ class MainActivity : ComponentActivity() {
                         window.isNavigationBarContrastEnforced = false
                     }
                 },
-                popEnterTransition = {
-                    scaleIn(initialScale = 1.05f) +
-                            fadeIn(animationSpec = tween(50))
-                },
-                popExitTransition = {
-                    scaleOut(targetScale = 0.9f, animationSpec = tween(50)) +
-                            fadeOut(animationSpec = tween(50, delayMillis = 50))
-                },
             )
         }
     }

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ androidx-activityCompose = "1.11.0"
 androidx-core-ktx = "1.17.0"
 androidx-core-splashscreen = "1.0.1"
 androidx-lifecycle = "2.10.0-alpha04"
-androidx-navigation = "2.9.1"
+androidx-navigation3 = "1.0.0-alpha04"
 androidx-preference = "1.2.1"
 coil = "3.3.0"
 compose-multiplatform = "1.10.0-beta01"
@@ -41,7 +41,8 @@ androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx
 androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidx-core-splashscreen" }
 androidx-lifecycle-runtime-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
-androidx-navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
+androidx-lifecycle-viewmodel-navigation3 = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "androidx-lifecycle" }
+androidx-navigation3-ui = { module = "org.jetbrains.androidx.navigation3:navigation3-ui", version.ref = "androidx-navigation3" }
 androidx-preference = { module = "androidx.preference:preference-ktx", version.ref = "androidx-preference" }
 coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
 coil-network-ktor3 = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" }
@@ -50,7 +51,6 @@ compose-components-resources = { module = "org.jetbrains.compose.components:comp
 compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "compose-multiplatform" }
 compose-material-ripple = { module = "org.jetbrains.compose.material:material-ripple", version.ref = "compose-multiplatform" }
 compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose-multiplatform" }
-compose-ui-backhandler = { module = "org.jetbrains.compose.ui:ui-backhandler", version.ref = "compose-multiplatform" }
 compose-ui-tooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "compose-multiplatform" }
 compose-ui-tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "compose-multiplatform" }
 doistx-normalize = { module = "com.doist.x:normalize", version.ref = "doistx-normalize" }

shared/build.gradle.kts

@@ -83,8 +83,8 @@ kotlin {
             implementation(libs.kotlinx.datetime)
 
             implementation(libs.androidx.lifecycle.runtime.compose)
-            implementation(libs.androidx.navigation.compose)
-            implementation(libs.compose.ui.backhandler)
+            implementation(libs.androidx.navigation3.ui)
+            implementation(libs.androidx.lifecycle.viewmodel.navigation3)
             implementation(libs.ktor.client.core)
 
             implementation(libs.aboutlibraries.core)

shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/App.kt

@@ -1,8 +1,5 @@
 package org.jetbrains.kotlinconf
 
-import androidx.compose.animation.AnimatedContentTransitionScope
-import androidx.compose.animation.EnterTransition
-import androidx.compose.animation.ExitTransition
 import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
@@ -13,17 +10,13 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.NavBackStackEntry
 import org.jetbrains.kotlinconf.navigation.KotlinConfNavHost
 import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme
 import org.koin.compose.koinInject
-import kotlin.jvm.JvmSuppressWildcards
 
 @Composable
 fun App(
     onThemeChange: ((isDarkTheme: Boolean) -> Unit)? = null,
-    popEnterTransition: (@JvmSuppressWildcards AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition)? = null,
-    popExitTransition: (@JvmSuppressWildcards AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition)? = null,
 ) {
     val service = koinInject<ConferenceService>()
     val currentTheme by service.getTheme().collectAsStateWithLifecycle(initialValue = Theme.SYSTEM)
@@ -53,7 +46,7 @@ fun App(
                     .background(KotlinConfTheme.colors.mainBackground)
             ) {
                 if (isOnboardingComplete != null) {
-                    KotlinConfNavHost(isOnboardingComplete, popEnterTransition, popExitTransition)
+                    KotlinConfNavHost(isOnboardingComplete)
                 }
             }
         }

shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/navigation/Routes.kt → shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/navigation/AppRoute.kt

@@ -6,109 +6,91 @@ import org.jetbrains.kotlinconf.PartnerId
 import org.jetbrains.kotlinconf.SessionId
 import org.jetbrains.kotlinconf.SpeakerId
 
+@Serializable
+sealed interface AppRoute
+
 @Serializable
 @SerialName("AboutConference")
-data object AboutConferenceScreen
+data object AboutConferenceScreen : AppRoute
 
 @Serializable
 @SerialName("CodeOfConduct")
-data object CodeOfConductScreen
+data object CodeOfConductScreen : AppRoute
 
 @Serializable
 @SerialName("AboutApp")
-data object AboutAppScreen
-
-@Serializable
-@SerialName("Info")
-data object InfoScreen
-
-@Serializable
-@SerialName("Welcome")
-data object StartScreens
+data object AboutAppScreen : AppRoute
 
 @Serializable
 @SerialName("WelcomePrivacyNotice")
-data object StartPrivacyNoticeScreen
+data object StartPrivacyNoticeScreen : AppRoute
 
 @Serializable
 @SerialName("WelcomeSetupNotifications")
-data object StartNotificationsScreen
+data object StartNotificationsScreen : AppRoute
 
 @Serializable
 @SerialName("AppPrivacyNoticePrompt")
-data object AppPrivacyNoticePrompt
+data object AppPrivacyNoticePrompt : AppRoute
 
 @Serializable
 @SerialName("Settings")
-data object SettingsScreen
+data object SettingsScreen : AppRoute
 
 @Serializable
 @SerialName("VisitorPrivacyNotice")
-data object VisitorPrivacyNoticeScreen
+data object VisitorPrivacyNoticeScreen : AppRoute
 
 @Serializable
 @SerialName("AppPrivacyNotice")
-data object AppPrivacyNoticeScreen
+data object AppPrivacyNoticeScreen : AppRoute
 
 @Serializable
 @SerialName("TermsOfUse")
-data object TermsOfUseScreen
+data object TermsOfUseScreen : AppRoute
 
 @Serializable
 @SerialName("AppTermsOfUse")
-data object AppTermsOfUseScreen
+data object AppTermsOfUseScreen : AppRoute
 
 @Serializable
 @SerialName("Licenses")
-data object LicensesScreen
+data object LicensesScreen : AppRoute
 
 @Serializable
 @SerialName("License")
 data class SingleLicenseScreen(
     val licenseName: String,
     val licenseText: String,
-)
+) : AppRoute
 
 @Serializable
 @SerialName("Partners")
-data object PartnersScreen
+data object PartnersScreen : AppRoute
 
 @Serializable
 @SerialName("Partner")
-data class PartnerDetailScreen(val partnerId: PartnerId)
+data class PartnerDetailScreen(val partnerId: PartnerId) : AppRoute
 
 @Serializable
 @SerialName("Main")
-data object MainScreen
-
-@Serializable
-@SerialName("Schedule")
-data object ScheduleScreen
+data object MainScreen : AppRoute
 
 @Serializable
 @SerialName("Session")
 data class SessionScreen(
     val sessionId: SessionId,
     val openedForFeedback: Boolean = false,
-)
-
-@Serializable
-@SerialName("Speakers")
-data object SpeakersScreen
+) : AppRoute
 
 @Serializable
 @SerialName("Speaker")
-data class SpeakerDetailScreen(val speakerId: SpeakerId)
-
-@Serializable
-@SerialName("Map")
-data object MapScreen
+data class SpeakerDetailScreen(val speakerId: SpeakerId) : AppRoute
 
 @Serializable
 @SerialName("MapDetail")
-data class NestedMapScreen(val roomName: String)
-
+data class NestedMapScreen(val roomName: String) : AppRoute
 
 @Serializable
 @SerialName("DeveloperMenu")
-data object DeveloperMenuScreen
+data object DeveloperMenuScreen : AppRoute