Use NavBackStack instead of a custom BackStack class

Author: zsmb13

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

@@ -1,119 +1,105 @@
 package org.jetbrains.kotlinconf.navigation
 
+import androidx.navigation3.runtime.NavKey
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import org.jetbrains.kotlinconf.PartnerId
 import org.jetbrains.kotlinconf.SessionId
 import org.jetbrains.kotlinconf.SpeakerId
 
+@Serializable
+sealed interface AppRoute : NavKey
+
 @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: MainScreenMarker
+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
-
-sealed interface MainScreenMarker
-
-@Serializable
-@SerialName("Schedule")
-data object ScheduleScreen : MainScreenMarker
+data object MainScreen : AppRoute
 
 @Serializable
 @SerialName("Session")
 data class SessionScreen(
     val sessionId: SessionId,
     val openedForFeedback: Boolean = false,
-)
-
-@Serializable
-@SerialName("Speakers")
-data object SpeakersScreen: MainScreenMarker
+) : AppRoute
 
 @Serializable
 @SerialName("Speaker")
-data class SpeakerDetailScreen(val speakerId: SpeakerId)
-
-@Serializable
-@SerialName("Map")
-data object MapScreen: MainScreenMarker
+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("News")
-data object NewsListScreen
+@SerialName("NewsList")
+data object NewsListScreen : AppRoute
 
 @Serializable
-@SerialName("News")
-data class NewsDetailScreen(val newsId: String)
+@SerialName("NewsDetail")
+data class NewsDetailScreen(val newsId: String) : AppRoute
 
 @Serializable
 @SerialName("DeveloperMenu")
-data object DeveloperMenuScreen
+data object DeveloperMenuScreen : AppRoute

shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/navigation/BackStack.kt

@@ -1,29 +1,15 @@
 package org.jetbrains.kotlinconf.navigation
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSerializable
+import androidx.navigation3.runtime.NavBackStack
+import androidx.navigation3.runtime.NavKey
+import androidx.navigation3.runtime.serialization.NavBackStackSerializer
+import kotlinx.serialization.serializer
 
 @Composable
-fun <T : Any> rememberBackstack(initial: T): BackStack<T> = remember { BackStack(initial) }
-
-class BackStack<T>(initial: T) {
-    private val _backStack = mutableStateListOf(initial)
-    val backStack: List<T> get() = _backStack
-
-    fun edit(actions: MutableList<T>.() -> Unit) {
-        _backStack.actions()
-    }
-
-    fun add(element: T, clearOthers: Boolean = false) {
-        _backStack.add(element)
-
-        if (clearOthers) {
-            _backStack.removeRange(0, _backStack.lastIndex)
-        }
-    }
-
-    fun pop() {
-        _backStack.removeAt(_backStack.lastIndex)
+inline fun <reified T : NavKey> rememberNavBackStack(vararg elements: T): NavBackStack<T> {
+    return rememberSerializable(serializer = NavBackStackSerializer(serializer())) {
+        NavBackStack(*elements)
     }
 }