clean up:

adrielcafe · Oct 21, 2023 · f9029ea · f9029ea
1 parent 6fcb5eb
commit f9029ea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/model/ScreenModelStore.kt b/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/model/ScreenModelStore.kt
@@ -30,9 +30,7 @@ public object ScreenModelStore : ScreenDisposable {
     internal inline fun <reified T : ScreenModel> getKey(screen: Screen, tag: String?): ScreenModelKey =
         getKey<T>(screen.key, tag)
 
-    /**
-     * Public: used in Navigator Scoped ScreenModels
-     */
+    // Public: used in Navigator Scoped ScreenModels
     @InternalVoyagerApi
     public inline fun <reified T : ScreenModel> getKey(holderKey: String, tag: String?): ScreenModelKey =
         "${holderKey}:${T::class.multiplatformName}:${tag ?: "default"}"
@@ -58,9 +56,7 @@ public object ScreenModelStore : ScreenDisposable {
         factory: @DisallowComposableCalls () -> T
     ): T = getOrPut(screen.key, tag, factory)
 
-    /**
-     * Public: used in Navigator Scoped ScreenModels
-     */
+    // Public: used in Navigator Scoped ScreenModels
     @InternalVoyagerApi
     public inline fun <reified T : ScreenModel> getOrPut(
         holderKey: String,
@@ -89,9 +85,7 @@ public object ScreenModelStore : ScreenDisposable {
         disposeHolder(screen.key)
     }
 
-    /**
-     * Public: used in Navigator Scoped ScreenModels
-     */
+    // Public: used in Navigator Scoped ScreenModels
     @InternalVoyagerApi
     public fun onDisposeNavigator(navigatorKey: String) {
         disposeHolder(navigatorKey)

diff --git a/...r/src/commonMain/kotlin/cafe/adriel/voyager/navigator/screenModel/NavigatorScreenModel.kt b/...r/src/commonMain/kotlin/cafe/adriel/voyager/navigator/screenModel/NavigatorScreenModel.kt
@@ -3,17 +3,16 @@ package cafe.adriel.voyager.navigator.screenModel
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisallowComposableCalls
 import androidx.compose.runtime.remember
+import cafe.adriel.voyager.core.annotation.ExperimentalVoyagerApi
 import cafe.adriel.voyager.core.annotation.InternalVoyagerApi
 import cafe.adriel.voyager.core.model.ScreenModel
 import cafe.adriel.voyager.core.model.ScreenModelStore
-import cafe.adriel.voyager.core.screen.Screen
-import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.Navigator
-import cafe.adriel.voyager.navigator.currentOrThrow
 import cafe.adriel.voyager.navigator.lifecycle.NavigatorDisposable
 import cafe.adriel.voyager.navigator.lifecycle.NavigatorLifecycleStore
 
 @Composable
+@ExperimentalVoyagerApi
 public inline fun <reified T : ScreenModel> Navigator.rememberNavigatorScreenModel(
     tag: String? = null,
     crossinline factory: @DisallowComposableCalls () -> T