[fix] #91 Root 화면 전환 시 이전 Root 스택의 ViewModel 제거 로직 추가

Author: Ojongseok

core/navigation/src/main/java/com/neki/android/core/navigation/HiltSharedViewModelStoreNavEntryDecorator.kt

@@ -51,7 +51,7 @@ fun <T : Any> rememberHiltSharedViewModelStoreNavEntryDecorator(
  * hiltViewModel()과 함께 사용 가능.
  */
 class HiltSharedViewModelStoreNavEntryDecorator<T : Any>(
-    viewModelStore: ViewModelStore,
+    private val viewModelStore: ViewModelStore,
     removeViewModelStoreOnPop: () -> Boolean,
 ) : NavEntryDecorator<T>(
     onPop = { key ->
@@ -95,6 +95,10 @@ class HiltSharedViewModelStoreNavEntryDecorator<T : Any>(
         }
     },
 ) {
+    fun clearAll() {
+        viewModelStore.getHiltEntryViewModel().clearAll()
+    }
+
     companion object {
         private const val PARENT_CONTENT_KEY = "hilt_shared_decorator_parent_content_key"
 
@@ -116,6 +120,11 @@ private class HiltEntryViewModel : ViewModel() {
         owners.remove(key)?.clear()
     }
 
+    fun clearAll() {
+        owners.forEach { (_, store) -> store.clear() }
+        owners.clear()
+    }
+
     override fun onCleared() {
         owners.forEach { (_, store) -> store.clear() }
     }

core/navigation/src/main/java/com/neki/android/core/navigation/NavigationState.kt

@@ -1,6 +1,7 @@
 package com.neki.android.core.navigation
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateListOf
@@ -32,11 +33,12 @@ class NavigationState @Inject constructor(
 fun NavigationState.toEntries(
     entryProvider: (NavKey) -> NavEntry<NavKey>,
 ): SnapshotStateList<NavEntry<NavKey>> {
+    val hvmd = rememberHiltSharedViewModelStoreNavEntryDecorator<NavKey>()
     val decoratedEntries = subStacks.mapValues { (_, stack) ->
         val decorators = listOf(
             rememberSaveableStateHolderNavEntryDecorator<NavKey>(),
             rememberViewModelStoreNavEntryDecorator<NavKey>(),
-            rememberHiltSharedViewModelStoreNavEntryDecorator(),
+            hvmd,
         )
         rememberDecoratedNavEntries(
             backStack = stack,
@@ -45,6 +47,12 @@ fun NavigationState.toEntries(
         )
     }
 
+    DisposableEffect(Unit) {
+        onDispose {
+            hvmd.clearAll()
+        }
+    }
+
     return topLevelStack
         .flatMap { decoratedEntries[it] ?: emptyList() }
         .toMutableStateList()

core/navigation/src/main/java/com/neki/android/core/navigation/auth/AuthNavigationState.kt

@@ -1,6 +1,7 @@
 package com.neki.android.core.navigation.auth
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateListOf
@@ -25,11 +26,19 @@ class AuthNavigationState @Inject constructor(
 fun AuthNavigationState.toEntries(
     entryProvider: (NavKey) -> NavEntry<NavKey>,
 ): SnapshotStateList<NavEntry<NavKey>> {
+    val hvmd = rememberHiltSharedViewModelStoreNavEntryDecorator<NavKey>()
     val decorators = listOf(
         rememberSaveableStateHolderNavEntryDecorator<NavKey>(),
         rememberViewModelStoreNavEntryDecorator<NavKey>(),
-        rememberHiltSharedViewModelStoreNavEntryDecorator(),
+        hvmd,
     )
+
+    DisposableEffect(Unit) {
+        onDispose {
+            hvmd.clearAll()
+        }
+    }
+
     return rememberDecoratedNavEntries(
         backStack = stack,
         entryDecorators = decorators,