[Init/#4] 네비게이션 로직 수정

Author: jyvnee

app/src/main/java/com/poti/android/presentation/main/MainTab.kt

@@ -1,7 +1,6 @@
 package com.poti.android.presentation.main
 
 import androidx.annotation.StringRes
-import androidx.navigation.NavDestination
 import com.poti.android.R
 import com.poti.android.core.navigation.Route
 import com.poti.android.presentation.myparty.navigation.MyPartyRoute
@@ -24,15 +23,4 @@ enum class MainTab(
         label = R.string.bottom_nav_my_page,
         route = MyPageRoute.MyPage,
     ),
-    ;
-
-    companion object {
-        private val tabRouteNames: Set<String> =
-            entries.mapNotNull { it.route::class.qualifiedName }.toSet()
-
-        fun contains(destination: NavDestination?): Boolean {
-            val r = destination?.route ?: return false
-            return r in tabRouteNames
-        }
-    }
 }

app/src/main/java/com/poti/android/presentation/main/PotiNavHost.kt

@@ -8,6 +8,7 @@ import androidx.navigation.compose.NavHost
 import com.poti.android.presentation.auth.navigation.authNavGraph
 import com.poti.android.presentation.myparty.navigation.myPartyNavGraph
 import com.poti.android.presentation.onboarding.navigation.onboardingNavGraph
+import com.poti.android.presentation.party.goodsfilter.navigation.navigateToGoodsCategory
 import com.poti.android.presentation.party.partyNavGraph
 import com.poti.android.presentation.user.mypage.navigation.myPageNavGraph
 import com.poti.android.presentation.user.profile.navigation.profileNavGraph
@@ -31,6 +32,7 @@ fun PotiNavHost(
         )
         partyNavGraph(
             paddingValues = paddingValues,
+            onNavigateToGoodsCategory = navigator.navController::navigateToGoodsCategory,
         )
         myPartyNavGraph(
             paddingValues = paddingValues,

app/src/main/java/com/poti/android/presentation/main/PotiNavigator.kt

@@ -8,10 +8,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navOptions
-import com.poti.android.presentation.myparty.navigation.MyPartyRoute
 import com.poti.android.presentation.party.PartyGraph
-import com.poti.android.presentation.party.home.navigation.HomeRoute
-import com.poti.android.presentation.user.mypage.navigation.MyPageRoute
 
 class PotiNavigator(
     val navController: NavHostController,
@@ -24,9 +21,7 @@ class PotiNavigator(
 
     val currentTab: MainTab?
         @Composable get() = MainTab.entries.find { tab ->
-            when (tab.route) {
-                else -> currentDestination?.route == tab.route::class.qualifiedName
-            }
+            currentDestination?.route == tab.route::class.qualifiedName
         }
 
     fun navigate(tab: MainTab) {
@@ -38,17 +33,11 @@ class PotiNavigator(
             restoreState = true
         }
 
-        val route = when (tab) {
-            MainTab.HOME -> HomeRoute.Home
-            MainTab.MY_PARTY -> MyPartyRoute.MyPartyList
-            MainTab.MY_PAGE -> MyPageRoute.MyPage
-        }
-
-        navController.navigate(route, navOptions)
+        navController.navigate(tab.route, navOptions)
     }
 
     @Composable
-    fun shouldShowBottomBar() = MainTab.contains(currentDestination)
+    fun shouldShowBottomBar() = currentTab != null
 }
 
 @Composable

app/src/main/java/com/poti/android/presentation/party/PartyNavigation.kt

@@ -3,6 +3,7 @@ package com.poti.android.presentation.party
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.navigation
+import com.poti.android.core.navigation.Route
 import com.poti.android.presentation.party.create.navigation.partyCreateNavGraph
 import com.poti.android.presentation.party.detail.navigation.partyDetailNavGraph
 import com.poti.android.presentation.party.goodsfilter.navigation.goodsFilterNavGraph
@@ -11,16 +12,18 @@ import com.poti.android.presentation.party.home.navigation.homeNavGraph
 import kotlinx.serialization.Serializable
 
 @Serializable
-object PartyGraph
+object PartyGraph : Route
 
 fun NavGraphBuilder.partyNavGraph(
+    onNavigateToGoodsCategory: () -> Unit,
     paddingValues: PaddingValues,
 ) {
     navigation<PartyGraph>(
         startDestination = HomeRoute.Home,
     ) {
         homeNavGraph(
             paddingValues = paddingValues,
+            onNavigateToGoodsCategory = onNavigateToGoodsCategory,
         )
         goodsFilterNavGraph(
             paddingValues = paddingValues,

app/src/main/java/com/poti/android/presentation/party/goodsfilter/navigation/GoodsNavigation.kt

@@ -3,6 +3,7 @@ package com.poti.android.presentation.party.goodsfilter.navigation
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
 import androidx.compose.ui.Modifier
+import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import com.poti.android.core.navigation.Route
@@ -18,6 +19,10 @@ sealed interface GoodsRoute : Route {
     data object GoodsPartyList : GoodsRoute
 }
 
+fun NavController.navigateToGoodsCategory() {
+    navigate(GoodsRoute.GoodsList)
+}
+
 fun NavGraphBuilder.goodsFilterNavGraph(
     paddingValues: PaddingValues,
 ) {

app/src/main/java/com/poti/android/presentation/party/home/HomeScreen.kt

@@ -3,18 +3,26 @@ package com.poti.android.presentation.party.home
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import com.poti.android.core.common.extension.noRippleClickable
 
 @Composable
 fun HomeRoute(
+    onNavigateToGoodsCategory: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    HomeScreen(modifier = modifier)
+    HomeScreen(
+        onClick = onNavigateToGoodsCategory,
+        modifier = modifier,
+    )
 }
 
 @Composable
-private fun HomeScreen(modifier: Modifier = Modifier) {
+private fun HomeScreen(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
     Text(
         text = "홈",
-        modifier = modifier,
+        modifier = modifier.noRippleClickable(onClick),
     )
 }

app/src/main/java/com/poti/android/presentation/party/home/navigation/HomeNavigation.kt

@@ -16,9 +16,11 @@ sealed interface HomeRoute : Route {
 
 fun NavGraphBuilder.homeNavGraph(
     paddingValues: PaddingValues,
+    onNavigateToGoodsCategory: () -> Unit,
 ) {
     composable<HomeRoute.Home> {
         HomeRoute(
+            onNavigateToGoodsCategory = onNavigateToGoodsCategory,
             modifier = Modifier.padding(paddingValues),
         )
     }