[feat] #43 온보딩 네비게이션 연결

SOPT-all · Jan 19, 2025 · 85d2b49 · 85d2b49
1 parent 9e793a6
commit 85d2b49
Show file tree

Hide file tree

Showing 5 changed files with 114 additions and 2 deletions.
diff --git a/app/src/main/java/org/android/bbangzip/presentation/ui/navigator/MainNavHost.kt b/app/src/main/java/org/android/bbangzip/presentation/ui/navigator/MainNavHost.kt
@@ -12,6 +12,12 @@ import androidx.navigation.compose.NavHost
 import org.android.bbangzip.presentation.ui.friend.friendNavGraph
 import org.android.bbangzip.presentation.ui.login.loginNavGraph
 import org.android.bbangzip.presentation.ui.my.myNavGraph
+import org.android.bbangzip.presentation.ui.onboarding.navigation.navigateOnboarding
+import org.android.bbangzip.presentation.ui.onboarding.navigation.navigateOnboardingEnd
+import org.android.bbangzip.presentation.ui.onboarding.navigation.navigateOnboardingStart
+import org.android.bbangzip.presentation.ui.onboarding.navigation.onboardingEndNavGraph
+import org.android.bbangzip.presentation.ui.onboarding.navigation.onboardingNavGraph
+import org.android.bbangzip.presentation.ui.onboarding.navigation.onboardingStartNavGraph
 import org.android.bbangzip.presentation.ui.subject.navigateSubject
 import org.android.bbangzip.presentation.ui.subject.subjectNavGraph
 import org.android.bbangzip.presentation.ui.todo.todoNavGraph
@@ -38,11 +44,23 @@ fun MainNavHost(
             loginNavGraph(
                 navigateToSubject = { navigator.navHostController.navigateSubject() },
                 navigateToOnboarding = {
-                    navigator.navHostController.navigateSubject()
-                    // TODO onboarding 만들어서 넣기
+                    navigator.navHostController.navigateOnboardingStart()
                 },
             )
 
+            onboardingStartNavGraph(
+                navigateToOnboarding = { navigator.navHostController.navigateOnboarding() }
+            )
+
+            onboardingNavGraph(
+                navigateToOnboardingEnd = { navigator.navHostController.navigateOnboardingEnd() }
+            )
+
+            onboardingEndNavGraph(
+                navigateToSubject = { navigator.navHostController.navigateSubject() }
+
+            )
+
             friendNavGraph()
 
             myNavGraph()

diff --git a/app/src/main/java/org/android/bbangzip/presentation/ui/navigator/MainNavigator.kt b/app/src/main/java/org/android/bbangzip/presentation/ui/navigator/MainNavigator.kt
@@ -9,12 +9,16 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navOptions
 import org.android.bbangzip.presentation.model.BottomNavigationRoute
+import org.android.bbangzip.presentation.model.OnboardingInfo
 import org.android.bbangzip.presentation.model.Route
 import org.android.bbangzip.presentation.type.BottomNavigationType
 import org.android.bbangzip.presentation.ui.friend.navigateFriend
 import org.android.bbangzip.presentation.ui.login.LoginRoute
 import org.android.bbangzip.presentation.ui.login.navigateLogin
 import org.android.bbangzip.presentation.ui.my.navigateMy
+import org.android.bbangzip.presentation.ui.onboarding.navigation.navigateOnboarding
+import org.android.bbangzip.presentation.ui.onboarding.navigation.navigateOnboardingEnd
+import org.android.bbangzip.presentation.ui.onboarding.navigation.navigateOnboardingStart
 import org.android.bbangzip.presentation.ui.subject.navigateSubject
 import org.android.bbangzip.presentation.ui.todo.navigateTodo
 import timber.log.Timber
@@ -62,6 +66,18 @@ class MainNavigator(
         navHostController.navigateLogin()
     }
 
+    fun navigateToOnboardingStart() {
+        navHostController.navigateOnboardingStart()
+    }
+
+    fun navigateToOnboarding() {
+        navHostController.navigateOnboarding()
+    }
+
+    fun navigateToOnboardingEnd() {
+        navHostController.navigateOnboardingEnd()
+    }
+
     private fun popBackStack() {
         navHostController.popBackStack()
     }

diff --git a/...ava/org/android/bbangzip/presentation/ui/onboarding/navigation/OnboardingEndNavigation.kt b/...ava/org/android/bbangzip/presentation/ui/onboarding/navigation/OnboardingEndNavigation.kt
@@ -0,0 +1,26 @@
+package org.android.bbangzip.presentation.ui.onboarding.navigation
+
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
+import kotlinx.serialization.Serializable
+import org.android.bbangzip.presentation.ui.onboarding.onboardingend.OnboardingEndRoute
+
+fun NavController.navigateOnboardingEnd() {
+    navigate(
+        route = OnboardingEndRoute
+    )
+}
+
+fun NavGraphBuilder.onboardingEndNavGraph(
+    navigateToSubject: () -> Unit
+) {
+    composable<OnboardingEndRoute> {
+        OnboardingEndRoute(
+            navigateToSubject = navigateToSubject
+        )
+    }
+}
+
+@Serializable
+object OnboardingEndRoute
diff --git a/...n/java/org/android/bbangzip/presentation/ui/onboarding/navigation/OnboardingNavigation.kt b/...n/java/org/android/bbangzip/presentation/ui/onboarding/navigation/OnboardingNavigation.kt
@@ -0,0 +1,26 @@
+package org.android.bbangzip.presentation.ui.onboarding.navigation
+
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
+import kotlinx.serialization.Serializable
+import org.android.bbangzip.presentation.ui.onboarding.onboarding.OnboardingRoute
+
+fun NavController.navigateOnboarding() {
+    navigate(
+        route = OnboardingRoute
+    )
+}
+
+fun NavGraphBuilder.onboardingNavGraph(
+    navigateToOnboardingEnd: () -> Unit
+) {
+    composable<OnboardingRoute> {
+        OnboardingRoute(
+            navigateToOnboardingEnd = navigateToOnboardingEnd
+        )
+    }
+}
+
+@Serializable
+object OnboardingRoute
diff --git a/...a/org/android/bbangzip/presentation/ui/onboarding/navigation/OnboardingStartNavigation.kt b/...a/org/android/bbangzip/presentation/ui/onboarding/navigation/OnboardingStartNavigation.kt
@@ -0,0 +1,26 @@
+package org.android.bbangzip.presentation.ui.onboarding.navigation
+
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
+import kotlinx.serialization.Serializable
+import org.android.bbangzip.presentation.ui.onboarding.onboardingstart.OnboardingStartRoute
+
+fun NavController.navigateOnboardingStart() {
+    navigate(
+        route = OnboardingStartRoute
+    )
+}
+
+fun NavGraphBuilder.onboardingStartNavGraph(
+    navigateToOnboarding: () -> Unit,
+) {
+    composable<OnboardingStartRoute> {
+        OnboardingStartRoute(
+            navigateToOnboarding = navigateToOnboarding
+        )
+    }
+}
+
+@Serializable
+object OnboardingStartRoute