(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/RouteModel.kt → core/navigation/src/main/java/com/droidknights/app/core/navigation/MainTabRoute.kt

@@ -1,13 +1,8 @@
 package com.droidknights.app.core.navigation
 
+import com.droidknights.app.core.router.api.model.Route
 import kotlinx.serialization.Serializable
 
-sealed interface Route {
-
-    @Serializable
-    data class SessionDetail(val sessionId: String) : Route
-}
-
 sealed interface MainTabRoute : Route {
 
     @Serializable

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, saveState: Boolean = false)
+    suspend fun navigate(route: Route, saveState: Boolean = false, launchSingleTop: Boolean = false)
 
     suspend fun navigateBack()
 }

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

@@ -37,12 +37,15 @@ private fun InternalLaunchedRouter(
 
                     is RouteSideEffect.Navigate -> {
                         navHostController.navigate(sideEffect.route) {
-                            navHostController.graph.findStartDestination().route?.let {
-                                popUpTo(it) {
-                                    saveState = sideEffect.saveState
+                            if (sideEffect.saveState) {
+                                navHostController.graph.findStartDestination().route?.let {
+                                    popUpTo(it) {
+                                        saveState = true
+                                    }
                                 }
+                                restoreState = true
                             }
-                            restoreState = sideEffect.saveState
+                            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, val saveState: Boolean) : InternalRoute
+    data class Navigate(
+        val route: Route,
+        val saveState: Boolean,
+        val launchSingleTop: Boolean,
+    ) : InternalRoute
 
     data object NavigateBack : 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, saveState: Boolean) {
-        channel.send(InternalRoute.Navigate(route = route, saveState = saveState))
+    override suspend fun navigate(route: Route, saveState: Boolean, launchSingleTop: Boolean) {
+        channel.send(
+            InternalRoute.Navigate(
+                route = route,
+                saveState = saveState,
+                launchSingleTop = launchSingleTop,
+            )
+        )
     }
 
     override suspend fun navigateBack() {

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

@@ -7,6 +7,7 @@ internal sealed interface RouteSideEffect {
     data class Navigate(
         val route: Route,
         val saveState: Boolean,
+        val launchSingleTop: Boolean,
     ) : RouteSideEffect
 
     data object NavigateBack : RouteSideEffect

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

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

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

@@ -1,16 +1,10 @@
 package com.droidknights.app.feature.bookmark.navigation
 
-import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
-import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
 import com.droidknights.app.core.navigation.MainTabRoute
 import com.droidknights.app.feature.bookmark.BookmarkRoute
 
-fun NavController.navigateBookmark(navOptions: NavOptions) {
-    navigate(MainTabRoute.Bookmark, navOptions)
-}
-
 fun NavGraphBuilder.bookmarkNavGraph(
     onShowErrorSnackBar: (throwable: Throwable?) -> Unit,
 ) {

feature/contributor/src/main/java/com/droidknights/app/feature/contributor/navigation/ContributorNavigation.kt

@@ -1,15 +1,10 @@
 package com.droidknights.app.feature.contributor.navigation
 
-import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import com.droidknights.app.feature.contributor.ContributorRoute
 import com.droidknights.app.feature.contributor.api.RouteContributor
 
-fun NavController.navigateContributor() {
-    this.navigate(RouteContributor)
-}
-
 fun NavGraphBuilder.contributorNavGraph(
     onShowErrorSnackBar: (throwable: Throwable?) -> Unit,
 ) {

feature/home/src/main/java/com/droidknights/app/feature/home/navigation/HomeNavigation.kt

@@ -1,17 +1,11 @@
 package com.droidknights.app.feature.home.navigation
 
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
-import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
 import com.droidknights.app.core.navigation.MainTabRoute
 import com.droidknights.app.feature.home.HomeRoute
 
-fun NavController.navigateHome(navOptions: NavOptions) {
-    navigate(MainTabRoute.Home, navOptions)
-}
-
 fun NavGraphBuilder.homeNavGraph(
     padding: PaddingValues,
     onShowErrorSnackBar: (throwable: Throwable?) -> Unit,

feature/main/build.gradle.kts

@@ -17,8 +17,9 @@ dependencies {
     implementation(projects.feature.home)
     implementation(projects.feature.setting)
     implementation(projects.feature.contributor)
-    implementation(projects.feature.session)
     implementation(projects.feature.bookmark)
+    implementation(projects.feature.session)
+    implementation(projects.feature.sessionApi)
     androidTestImplementation(projects.core.testing)
     debugImplementation(projects.core.uiTestHiltManifest)
 

feature/main/src/main/java/com/droidknights/app/feature/main/MainActivity.kt

@@ -35,16 +35,19 @@ class MainActivity : ComponentActivity() {
 
         setContent {
             val isDarkTheme by viewModel.isDarkTheme.collectAsStateWithLifecycle(false, this)
-
-            val navigator: MainNavigator = rememberMainNavigator()
             val sessionId = sessionIdFromWidget.collectAsStateWithLifecycle().value
+            val navigator: MainNavigator = rememberMainNavigator(
+                onTabClick = { tab: MainTab, saveState: Boolean, launchSingleTop: Boolean ->
+                    viewModel.navigateTab(tab.route, saveState, launchSingleTop)
+                }
+            )
 
             // 시작지점
             LaunchedRouter(navigator.navController)
 
             LaunchedEffect(sessionId) {
                 sessionId?.let {
-                    navigator.navigateSessionDetail(it)
+                    viewModel.navigateSessionDetail(it)
                 }
             }
 

feature/main/src/main/java/com/droidknights/app/feature/main/MainNavigator.kt

@@ -4,20 +4,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hasRoute
-import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import androidx.navigation.navOptions
-import com.droidknights.app.core.navigation.MainTabRoute
-import com.droidknights.app.core.navigation.Route
-import com.droidknights.app.feature.bookmark.navigation.navigateBookmark
-import com.droidknights.app.feature.home.navigation.navigateHome
-import com.droidknights.app.feature.session.navigation.navigateSessionDetail
-import com.droidknights.app.feature.setting.navigation.navigateSetting
 
 internal class MainNavigator(
     val navController: NavHostController,
+    private val onTabClick: (tab: MainTab, saveState: Boolean, launchSingleTop: Boolean) -> Unit,
 ) {
     private val currentDestination: NavDestination?
         @Composable get() = navController
@@ -30,49 +23,23 @@ internal class MainNavigator(
             currentDestination?.hasRoute(tab::class) == true
         }
 
-    fun navigate(tab: MainTab) {
-        val navOptions = navOptions {
-            popUpTo(navController.graph.findStartDestination().id) {
-                saveState = true
-            }
-            launchSingleTop = true
-            restoreState = true
-        }
-
-        when (tab) {
-            MainTab.SETTING -> navController.navigateSetting(navOptions)
-            MainTab.HOME -> navController.navigateHome(navOptions)
-            MainTab.BOOKMARK -> navController.navigateBookmark(navOptions)
-        }
-    }
-
-    fun navigateSessionDetail(sessionId: String) {
-        navController.navigateSessionDetail(sessionId)
-    }
-
-    private fun popBackStack() {
-        navController.popBackStack()
-    }
-
-    fun popBackStackIfNotHome() {
-        if (!isSameCurrentDestination<MainTabRoute.Home>()) {
-            popBackStack()
-        }
-    }
-
-    private inline fun <reified T : Route> isSameCurrentDestination(): Boolean {
-        return navController.currentDestination?.hasRoute<T>() == true
-    }
+    fun navigate(tab: MainTab) = onTabClick(tab, SAVE_STATE, LAUNCH_SINGLE_TOP)
 
     @Composable
     fun shouldShowBottomBar() = MainTab.contains {
         currentDestination?.hasRoute(it::class) == true
     }
+
+    companion object {
+        private const val SAVE_STATE = true
+        private const val LAUNCH_SINGLE_TOP = true
+    }
 }
 
 @Composable
 internal fun rememberMainNavigator(
+    onTabClick: (tab: MainTab, saveState: Boolean, launchSingleTop: Boolean) -> Unit,
     navController: NavHostController = rememberNavController(),
 ): MainNavigator = remember(navController) {
-    MainNavigator(navController)
+    MainNavigator(navController, onTabClick)
 }

feature/main/src/main/java/com/droidknights/app/feature/main/MainScreen.kt

@@ -19,7 +19,7 @@ import java.net.UnknownHostException
 
 @Composable
 internal fun MainScreen(
-    navigator: MainNavigator = rememberMainNavigator(),
+    navigator: MainNavigator,
     onChangeDarkTheme: (Boolean) -> Unit,
 ) {
     val snackBarHostState = remember { SnackbarHostState() }
@@ -71,7 +71,7 @@ private fun MainScreenContent(
                 visible = navigator.shouldShowBottomBar(),
                 tabs = MainTab.entries.toPersistentList(),
                 currentTab = navigator.currentTab,
-                onTabSelected = { navigator.navigate(it) }
+                onTabSelected = navigator::navigate,
             )
         },
         snackbarHost = { SnackbarHost(snackBarHostState) }

feature/main/src/main/java/com/droidknights/app/feature/main/MainTab.kt

@@ -2,7 +2,7 @@ package com.droidknights.app.feature.main
 
 import androidx.compose.runtime.Composable
 import com.droidknights.app.core.navigation.MainTabRoute
-import com.droidknights.app.core.navigation.Route
+import com.droidknights.app.core.router.api.model.Route
 
 internal enum class MainTab(
     val iconResId: Int,

feature/main/src/main/java/com/droidknights/app/feature/main/MainViewModel.kt

@@ -3,13 +3,17 @@ package com.droidknights.app.feature.main
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.droidknights.app.core.data.settings.api.SettingsRepository
+import com.droidknights.app.core.router.api.Navigator
+import com.droidknights.app.core.router.api.model.Route
+import com.droidknights.app.feature.session.api.RouteSessionDetail
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class MainViewModel @Inject constructor(
+internal class MainViewModel @Inject constructor(
     private val settingsRepository: SettingsRepository,
+    private val navigator: Navigator,
 ) : ViewModel() {
 
     val isDarkTheme = settingsRepository.flowIsDarkTheme()
@@ -18,4 +22,17 @@ class MainViewModel @Inject constructor(
         viewModelScope.launch {
             settingsRepository.updateIsDarkTheme(isDarkTheme)
         }
+
+    fun navigateSessionDetail(sessionId: String) = viewModelScope.launch {
+        navigator.navigate(RouteSessionDetail(sessionId))
+    }
+
+    fun navigateTab(route: Route, saveState: Boolean, launchSingleTop: Boolean) =
+        viewModelScope.launch {
+            navigator.navigate(
+                route = route,
+                saveState = saveState,
+                launchSingleTop = launchSingleTop,
+            )
+        }
 }

feature/main/src/main/java/com/droidknights/app/feature/main/component/MainNavHost.kt

@@ -50,8 +50,6 @@ internal fun MainNavHost(
             )
 
             sessionNavGraph(
-                onBackClick = navigator::popBackStackIfNotHome,
-                onSessionClick = { navigator.navigateSessionDetail(it.id) },
                 onShowErrorSnackBar = onShowErrorSnackBar
             )
         }