refactor/#16 : Navigation Route 수정

- 에피소드 생성 화면에서 바텀 네비게이션 가리기 - 에피소드 루트 수정 및 적용
boostcampwm-2024 · Feb 17, 2025 · 57e32f9 · 57e32f9
1 parent 697341d
commit 57e32f9
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/core/navigation/src/main/java/com/boostcamp/mapisode/navigation/NewEpisodeRoute.kt b/core/navigation/src/main/java/com/boostcamp/mapisode/navigation/NewEpisodeRoute.kt
@@ -4,13 +4,7 @@ import kotlinx.serialization.Serializable
 
 sealed interface NewEpisodeRoute : Route {
 	@Serializable
-	data object PickPhoto : NewEpisodeRoute
-
-	@Serializable
-	data object WriteInfo : NewEpisodeRoute
-
-	@Serializable
-	data object PickLocation : NewEpisodeRoute
+	data object PickInfo : NewEpisodeRoute
 
 	@Serializable
 	data object WriteContent : NewEpisodeRoute

diff --git a/feature/episode/src/main/java/com/boostcamp/mapisode/episode/navigation/EpisodeNavigation.kt b/feature/episode/src/main/java/com/boostcamp/mapisode/episode/navigation/EpisodeNavigation.kt
@@ -4,21 +4,35 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
-import com.boostcamp.mapisode.episode.aiEpisode.AiEpisodeRoute
 import com.boostcamp.mapisode.navigation.MainRoute
+import com.boostcamp.mapisode.navigation.NewEpisodeRoute
 
 fun NavController.navigateToEpisode(
 	navOptions: NavOptions? = null,
 ) {
 	navigate(MainRoute.AiEpisode, navOptions)
 }
 
+fun NavController.navigateToPickInfo(
+	navOptions: NavOptions? = null,
+) {
+	navigate(NewEpisodeRoute.PickInfo, navOptions)
+}
+
+fun NavController.navigateToWriteContent(
+	navOptions: NavOptions? = null,
+) {
+	navigate(NewEpisodeRoute.WriteContent, navOptions)
+}
+
 fun NavGraphBuilder.addEpisodeNavGraph(
 	onPopBackToMain: () -> Unit,
+	onBack: () -> Unit,
 ) {
 	composable<MainRoute.AiEpisode> { _ ->
-		AiEpisodeRoute(
-			navigateToMain = onPopBackToMain,
-		)
+	}
+	composable<NewEpisodeRoute.PickInfo> {
+	}
+	composable<NewEpisodeRoute.WriteContent> {
 	}
 }
diff --git a/feature/main/src/main/java/com/boostcamp/mapisode/main/MainNavigator.kt b/feature/main/src/main/java/com/boostcamp/mapisode/main/MainNavigator.kt
@@ -122,7 +122,11 @@ internal class MainNavigator(
 
 	@Composable
 	fun shouldShowBottomBar() = MainNavTab.contains {
-		currentDestination?.hasRoute(it::class) == true
+		if (it == MainRoute.AiEpisode) {
+			false
+		} else {
+			currentDestination?.hasRoute(it::class) == true
+		}
 	}
 }
 

diff --git a/feature/main/src/main/java/com/boostcamp/mapisode/main/component/MainNavHost.kt b/feature/main/src/main/java/com/boostcamp/mapisode/main/component/MainNavHost.kt
@@ -41,6 +41,7 @@ internal fun MainNavHost(
 			)
 			addEpisodeNavGraph(
 				onPopBackToMain = navigator::popBackEpisodeToMain,
+				onBack = navigator::popBackStackIfNotHome,
 			)
 			addGroupNavGraph(
 				onBackClick = navigator::popBackStackIfNotHome,