Renamed NavStackDuplicateContentStrategy to StackDuplicateContentStra…

…tegy
chRyNaN · Feb 27, 2022 · adf27c2 · adf27c2
1 parent d77e032
commit adf27c2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/navigation-compose/src/commonMain/kotlin/com.chrynan.navigation.compose/ComposeNavigator.kt b/navigation-compose/src/commonMain/kotlin/com.chrynan.navigation.compose/ComposeNavigator.kt
@@ -4,7 +4,7 @@ package com.chrynan.navigation.compose
 
 import androidx.compose.runtime.Composable
 import kotlinx.coroutines.flow.Flow
-import com.chrynan.navigation.NavStackDuplicateContentStrategy
+import com.chrynan.navigation.StackDuplicateContentStrategy
 import com.chrynan.navigation.Navigator
 
 @ExperimentalNavigationApi
@@ -29,7 +29,7 @@ interface ComposeNavigatorByContent<Key> : ComposeNavigator<Key> {
     @Composable
     fun goTo(
         key: Key,
-        strategy: NavStackDuplicateContentStrategy,
+        strategy: StackDuplicateContentStrategy,
         content: @Composable ComposeNavigationContentScope<Key>.() -> Unit
     )
 
@@ -41,14 +41,14 @@ interface ComposeNavigatorByContent<Key> : ComposeNavigator<Key> {
 @ExperimentalNavigationApi
 @Composable
 fun <Key> ComposeNavigatorByContent<Key>.goTo(key: Key, content: @Composable ComposeNavigationContentScope<Key>.() -> Unit) =
-    goTo(key = key, strategy = NavStackDuplicateContentStrategy.CLEAR_STACK, content = content)
+    goTo(key = key, strategy = StackDuplicateContentStrategy.CLEAR_STACK, content = content)
 
 @ExperimentalNavigationApi
 interface ComposeNavigatorByKey<Key> : ComposeNavigator<Key> {
 
     fun goTo(
         key: Key,
-        strategy: NavStackDuplicateContentStrategy
+        strategy: StackDuplicateContentStrategy
     )
 
     companion object
@@ -58,7 +58,7 @@ interface ComposeNavigatorByKey<Key> : ComposeNavigator<Key> {
 @Suppress("unused")
 @ExperimentalNavigationApi
 fun <Key> ComposeNavigatorByKey<Key>.goTo(key: Key) =
-    goTo(key = key, strategy = NavStackDuplicateContentStrategy.CLEAR_STACK)
+    goTo(key = key, strategy = StackDuplicateContentStrategy.CLEAR_STACK)
 
 @ExperimentalNavigationApi
 interface ComposeStackNavigator<Key> : ComposeNavigator<Key> {

diff --git a/...rc/commonMain/kotlin/com.chrynan.navigation.compose/ComposeNavigatorByContentViewModel.kt b/...rc/commonMain/kotlin/com.chrynan.navigation.compose/ComposeNavigatorByContentViewModel.kt
@@ -2,7 +2,7 @@ package com.chrynan.navigation.compose
 
 import androidx.compose.runtime.Composable
 import com.chrynan.presentation.ViewModel
-import com.chrynan.navigation.NavStackDuplicateContentStrategy
+import com.chrynan.navigation.StackDuplicateContentStrategy
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.filterNotNull
@@ -58,7 +58,7 @@ class ComposeNavigatorByContentViewModel<Context, Key> internal constructor(
     @Composable
     override fun goTo(
         key: Key,
-        strategy: NavStackDuplicateContentStrategy,
+        strategy: StackDuplicateContentStrategy,
         content: @Composable ComposeNavigationContentScope<Key>.() -> Unit
     ) {
         val currentScope = this.currentContext
@@ -67,7 +67,7 @@ class ComposeNavigatorByContentViewModel<Context, Key> internal constructor(
         // If we are already displaying this key on the current scoped stack, then return.
         if (key == currentKeyStack.lastOrNull()) return
 
-        if (strategy == NavStackDuplicateContentStrategy.CLEAR_STACK && contents.containsKey(key)) {
+        if (strategy == StackDuplicateContentStrategy.CLEAR_STACK && contents.containsKey(key)) {
             // Go Back to the content with the provided key using the updated content
             var lastKey = currentKeyStack.lastOrNull()
 

diff --git a/...se/src/commonMain/kotlin/com.chrynan.navigation.compose/ComposeNavigatorByKeyViewModel.kt b/...se/src/commonMain/kotlin/com.chrynan.navigation.compose/ComposeNavigatorByKeyViewModel.kt
@@ -2,7 +2,7 @@ package com.chrynan.navigation.compose
 
 import androidx.compose.runtime.Composable
 import com.chrynan.presentation.ViewModel
-import com.chrynan.navigation.NavStackDuplicateContentStrategy
+import com.chrynan.navigation.StackDuplicateContentStrategy
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.filterNotNull
@@ -43,14 +43,14 @@ abstract class BaseComposeNavigatorByKeyViewModel<Context, Key, NavigationScope
 
     private val scopedKeyStack = mutableMapOf(initialContext to mutableListOf(initialKey))
 
-    override fun goTo(key: Key, strategy: NavStackDuplicateContentStrategy) {
+    override fun goTo(key: Key, strategy: StackDuplicateContentStrategy) {
         val currentScope = this.currentContext
         val currentKeyStack = scopedKeyStack[currentScope] ?: mutableListOf()
 
         // If we are already displaying this key on the current scoped stack, then return.
         if (key == currentKeyStack.lastOrNull()) return
 
-        if (strategy == NavStackDuplicateContentStrategy.CLEAR_STACK && currentKeyStack.contains(key)) {
+        if (strategy == StackDuplicateContentStrategy.CLEAR_STACK && currentKeyStack.contains(key)) {
             // Go Back to the content with the provided key using the updated content
             var lastKey = currentKeyStack.lastOrNull()
 

diff --git a/...ation/NavStackDuplicateContentStrategy.kt → ...vigation/StackDuplicateContentStrategy.kt b/...ation/NavStackDuplicateContentStrategy.kt → ...vigation/StackDuplicateContentStrategy.kt
@@ -1,7 +1,7 @@
 package com.chrynan.navigation
 
 @Suppress("unused")
-enum class NavStackDuplicateContentStrategy {
+enum class StackDuplicateContentStrategy {
 
     CLEAR_STACK,
     ADD_TO_STACK;