(FEAT)[#422] Router - 추가 적용

core/navigation/build.gradle.kts

@@ -11,5 +11,6 @@ android {
 }
 
 dependencies {
+    implementation(projects.core.router.routerApi)
     implementation(libs.kotlinx.serialization.json)
 }

core/navigation/src/main/java/com/droidknights/app/core/navigation/MainTabRoute.kt

@@ -0,0 +1,27 @@
+package com.droidknights.app.core.navigation
+
+import com.droidknights.app.core.router.api.model.Route
+import kotlinx.serialization.Serializable
+
+sealed interface MainTabRoute : Route {
+    val saveState: Boolean
+    val launchSingleTop: Boolean
+
+    @Serializable
+    data object Home : MainTabRoute {
+        override val saveState: Boolean = true
+        override val launchSingleTop: Boolean = true
+    }
+
+    @Serializable
+    data object Setting : MainTabRoute {
+        override val saveState: Boolean = true
+        override val launchSingleTop: Boolean = true
+    }
+
+    @Serializable
+    data object Bookmark : MainTabRoute {
+        override val saveState: Boolean = true
+        override val launchSingleTop: Boolean = true
+    }
+}

core/router/router-api/src/main/java/com/droidknights/app/core/router/api/Navigator.kt

@@ -4,7 +4,7 @@ import com.droidknights.app.core.router.api.model.Route
 
 interface Navigator {
 
-    suspend fun navigate(route: Route)
+    suspend fun navigate(route: Route, saveState: Boolean = false, launchSingleTop: Boolean = false)
 
     suspend fun navigateWeb(url: String)
 

core/router/router/src/main/java/com/droidknights/app/core/router/LaunchedRouter.kt

@@ -8,6 +8,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.repeatOnLifecycle
+import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
 import com.droidknights.app.core.router.internal.viewmodel.RouteSideEffect
 import com.droidknights.app.core.router.internal.viewmodel.RouterViewModel
@@ -44,7 +45,17 @@ private fun InternalLaunchedRouter(
                     }
 
                     is RouteSideEffect.Navigate -> {
-                        navHostController.navigate(sideEffect.route)
+                        navHostController.navigate(sideEffect.route) {
+                            if (sideEffect.saveState) {
+                                navHostController.graph.findStartDestination().route?.let {
+                                    popUpTo(it) {
+                                        saveState = true
+                                    }
+                                }
+                                restoreState = true
+                            }
+                            launchSingleTop = sideEffect.launchSingleTop
+                        }
                     }
                 }
             }

core/router/router/src/main/java/com/droidknights/app/core/router/internal/navigator/InternalRoute.kt

@@ -4,7 +4,11 @@ import com.droidknights.app.core.router.api.model.Route
 
 internal sealed interface InternalRoute {
 
-    data class Navigate(val route: Route) : InternalRoute
+    data class Navigate(
+        val route: Route,
+        val saveState: Boolean,
+        val launchSingleTop: Boolean,
+    ) : InternalRoute
 
     data class NavigateWeb(val url: String) : InternalRoute
 

core/router/router/src/main/java/com/droidknights/app/core/router/internal/navigator/NavigatorImpl.kt

@@ -11,8 +11,14 @@ internal class NavigatorImpl @Inject constructor() : Navigator, InternalNavigato
 
     override val channel = Channel<InternalRoute>(Channel.BUFFERED)
 
-    override suspend fun navigate(route: Route) {
-        channel.send(InternalRoute.Navigate(route = route))
+    override suspend fun navigate(route: Route, saveState: Boolean, launchSingleTop: Boolean) {
+        channel.send(
+            InternalRoute.Navigate(
+                route = route,
+                saveState = saveState,
+                launchSingleTop = launchSingleTop,
+            )
+        )
     }
 
     override suspend fun navigateWeb(url: String) {

core/router/router/src/main/java/com/droidknights/app/core/router/internal/viewmodel/RouteSideEffect.kt

@@ -6,6 +6,8 @@ internal sealed interface RouteSideEffect {
 
     data class Navigate(
         val route: Route,
+        val saveState: Boolean,
+        val launchSingleTop: Boolean,
     ) : RouteSideEffect
 
     data class NavigateWeb(val url: String) : RouteSideEffect

core/router/router/src/main/java/com/droidknights/app/core/router/internal/viewmodel/RouterViewModel.kt

@@ -17,8 +17,14 @@ internal class RouterViewModel @Inject constructor(
         navigator.channel.receiveAsFlow()
             .map { router ->
                 when (router) {
-                    is InternalRoute.Navigate -> RouteSideEffect.Navigate(router.route)
+                    is InternalRoute.Navigate -> RouteSideEffect.Navigate(
+                        router.route,
+                        router.saveState,
+                        router.launchSingleTop,
+                    )
+
                     is InternalRoute.NavigateWeb -> RouteSideEffect.NavigateWeb(router.url)
+
                     is InternalRoute.NavigateBack -> RouteSideEffect.NavigateBack
                 }
             }

core/router/router/src/test/java/com/droidknights/app/core/router/internal/navigator/NavigatorImplTest.kt

@@ -16,7 +16,14 @@ internal class NavigatorImplTest {
         navigator.channel.consumeAsFlow().test {
             // fake route 테스트
             navigator.navigate(FakeRoute)
-            Assertions.assertEquals(InternalRoute.Navigate(FakeRoute), awaitItem())
+            Assertions.assertEquals(
+                InternalRoute.Navigate(
+                    route = FakeRoute,
+                    saveState = false,
+                    launchSingleTop = false,
+                ),
+                awaitItem(),
+            )
 
             // Back 테스트
             navigator.navigateBack()

core/router/router/src/test/java/com/droidknights/app/core/router/internal/viewmodel/RouterViewModelTest.kt

@@ -24,8 +24,21 @@ internal class RouterViewModelTest {
 
         viewModel.sideEffect.test {
             // move 테스트
-            mockChannel.send(InternalRoute.Navigate(route = FakeRoute))
-            Assertions.assertEquals(RouteSideEffect.Navigate(route = FakeRoute), awaitItem())
+            mockChannel.send(
+                InternalRoute.Navigate(
+                    route = FakeRoute,
+                    saveState = true,
+                    launchSingleTop = false,
+                ),
+            )
+            Assertions.assertEquals(
+                RouteSideEffect.Navigate(
+                    route = FakeRoute,
+                    saveState = true,
+                    launchSingleTop = false,
+                ),
+                awaitItem(),
+            )
 
             // Back 테스트
             mockChannel.send(InternalRoute.NavigateBack)

feature/bookmark/src/main/java/com/droidknights/app/feature/bookmark/BookmarkScreen.kt

@@ -22,7 +22,10 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -34,6 +37,10 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.droidknights.app.core.designsystem.theme.KnightsTheme
 import com.droidknights.app.core.model.session.Session
+import com.droidknights.app.core.navigation.MainTabRoute.Bookmark
+import com.droidknights.app.core.navigation.MainTabRoute.Home
+import com.droidknights.app.core.navigation.MainTabRoute.Setting
+import com.droidknights.app.core.router.api.model.Route
 import com.droidknights.app.feature.bookmark.component.BookmarkCard
 import com.droidknights.app.feature.bookmark.component.BookmarkItem
 import com.droidknights.app.feature.bookmark.component.BookmarkTimelineItem
@@ -51,13 +58,22 @@ import kotlinx.coroutines.flow.collectLatest
 internal fun BookmarkRoute(
     onShowErrorSnackBar: (throwable: Throwable?) -> Unit,
     viewModel: BookmarkViewModel = hiltViewModel(),
+    selectedTabRoute: State<Route> = remember { mutableStateOf(Bookmark) },
 ) {
     val bookmarkUiState by viewModel.bookmarkUiState.collectAsStateWithLifecycle()
 
     LaunchedEffect(true) {
         viewModel.errorFlow.collectLatest { onShowErrorSnackBar(it) }
     }
 
+    LaunchedEffect(selectedTabRoute.value) {
+        when (selectedTabRoute.value) {
+            Home -> viewModel.navigateHome()
+            Setting -> viewModel.navigateSetting()
+            Bookmark -> Unit
+        }
+    }
+
     Box(
         modifier = Modifier
             .fillMaxSize()

feature/bookmark/src/main/java/com/droidknights/app/feature/bookmark/BookmarkViewModel.kt

@@ -5,6 +5,8 @@ import androidx.lifecycle.viewModelScope
 import com.droidknights.app.core.domain.session.usecase.api.DeleteBookmarkedSessionUseCase
 import com.droidknights.app.core.domain.session.usecase.api.GetBookmarkedSessionsUseCase
 import com.droidknights.app.core.model.session.Session
+import com.droidknights.app.core.navigation.MainTabRoute.Home
+import com.droidknights.app.core.navigation.MainTabRoute.Setting
 import com.droidknights.app.core.router.api.Navigator
 import com.droidknights.app.feature.bookmark.model.BookmarkItemUiState
 import com.droidknights.app.feature.bookmark.model.BookmarkUiState
@@ -127,6 +129,22 @@ class BookmarkViewModel @Inject constructor(
         }.launchIn(viewModelScope)
     }
 
+    fun navigateSetting() = viewModelScope.launch {
+        navigator.navigate(
+            route = Setting,
+            saveState = Setting.saveState,
+            launchSingleTop = Setting.launchSingleTop,
+        )
+    }
+
+    fun navigateHome() = viewModelScope.launch {
+        navigator.navigate(
+            route = Home,
+            saveState = Home.saveState,
+            launchSingleTop = Home.launchSingleTop,
+        )
+    }
+
     fun redirectToSessionScreen(session: Session) {
         val state = _bookmarkUiState.value
         if (state !is BookmarkUiState.Success || state.isEditMode) {

feature/bookmark/src/main/java/com/droidknights/app/feature/bookmark/navigation/BookmarkNavigation.kt

@@ -1,21 +1,19 @@
 package com.droidknights.app.feature.bookmark.navigation
 
-import androidx.navigation.NavController
+import androidx.compose.runtime.State
 import androidx.navigation.NavGraphBuilder
-import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
-import com.droidknights.app.core.navigation.MainTabRoute
+import com.droidknights.app.core.navigation.MainTabRoute.Bookmark
+import com.droidknights.app.core.router.api.model.Route
 import com.droidknights.app.feature.bookmark.BookmarkRoute
 
-fun NavController.navigateBookmark(navOptions: NavOptions) {
-    navigate(MainTabRoute.Bookmark, navOptions)
-}
-
 fun NavGraphBuilder.bookmarkNavGraph(
+    selectedTabRoute: State<Route>,
     onShowErrorSnackBar: (throwable: Throwable?) -> Unit,
 ) {
-    composable<MainTabRoute.Bookmark> {
+    composable<Bookmark> {
         BookmarkRoute(
+            selectedTabRoute = selectedTabRoute,
             onShowErrorSnackBar = onShowErrorSnackBar,
         )
     }