[feature/#1011] 화면 간 연결

sopt-makers · Jan 2, 2025 · bdb0e67 · bdb0e67
1 parent fc04b47
commit bdb0e67
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 13 deletions.
diff --git a/app/src/main/java/org/sopt/official/feature/auth/AuthScreen.kt b/app/src/main/java/org/sopt/official/feature/auth/AuthScreen.kt
@@ -23,6 +23,8 @@ import org.sopt.official.feature.auth.feature.authmain.navigation.AuthMainNaviga
 import org.sopt.official.feature.auth.feature.authmain.navigation.authMainNavGraph
 import org.sopt.official.feature.auth.feature.certificate.navigation.certificationNavGraph
 import org.sopt.official.feature.auth.feature.certificate.navigation.navigateCertification
+import org.sopt.official.feature.auth.feature.socialaccount.navigation.navigateSocialAccount
+import org.sopt.official.feature.auth.feature.socialaccount.navigation.socialAccountNavGraph
 
 @Composable
 internal fun AuthScreen(
@@ -69,20 +71,18 @@ internal fun AuthScreen(
                     startDestination = AuthMainNavigation
                 ) {
                     authMainNavGraph(
-                        navigateToUnAuthenticatedHome = {
-                            navigateToUnAuthenticatedHome()
-                        },
-                        onGoogleLoginCLick = {
-                            onGoogleLoginCLick()
-                        },
-                        navigateToCertification = {
-                            navController.navigateCertification()
-                        },
+                        navigateToUnAuthenticatedHome = navigateToUnAuthenticatedHome,
+                        onGoogleLoginCLick = onGoogleLoginCLick,
+                        navigateToCertification = navController::navigateCertification,
                         navigateToChannel = navigateToChannel
                     )
                     certificationNavGraph(
                         onBackClick = navController::navigateUp,
-                        onShowSnackBar = onShowSnackBar
+                        onShowSnackBar = onShowSnackBar,
+                        navigateToSocialAccount = navController::navigateSocialAccount
+                    )
+                    socialAccountNavGraph(
+                        onGoogleLoginCLick = {}
                     )
                 }
             }

diff --git a/app/src/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationScreen.kt b/app/src/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationScreen.kt
@@ -71,6 +71,7 @@ import org.sopt.official.feature.auth.component.PhoneCertification
 internal fun CertificationRoute(
     onBackClick: () -> Unit,
     onShowSnackBar: () -> Unit,
+    navigateToSocialAccount:()-> Unit,
     viewModel: CertificationViewModel = hiltViewModel()
 ) {
     val lifecycleOwner = LocalLifecycleOwner.current
@@ -83,6 +84,7 @@ internal fun CertificationRoute(
                     is CertificationSideEffect.ShowToast -> {
                         context.toast(sideEffect.message)
                     }
+                    is CertificationSideEffect.NavigateToSocialAccount -> navigateToSocialAccount()
                 }
             }
     }

diff --git a/...c/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationSideEffect.kt b/...c/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationSideEffect.kt
@@ -2,4 +2,5 @@ package org.sopt.official.feature.auth.feature.certificate
 
 sealed class CertificationSideEffect {
     data class ShowToast(val message: String): CertificationSideEffect()
+    data object NavigateToSocialAccount: CertificationSideEffect()
 }
diff --git a/...rc/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationViewModel.kt b/...rc/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationViewModel.kt
@@ -46,7 +46,7 @@ class CertificationViewModel @Inject constructor(
                     type = AuthStatus.REGISTER.type
                 )
             ).onSuccess {
-                _sideEffect.emit(CertificationSideEffect.ShowToast("성공!!!"))
+                _sideEffect.emit(CertificationSideEffect.NavigateToSocialAccount)
             }.onFailure {
                 _sideEffect.emit(CertificationSideEffect.ShowToast("실패ㅠㅠ"))
             }

diff --git a/.../org/sopt/official/feature/auth/feature/certificate/navigation/CertificationNavigation.kt b/.../org/sopt/official/feature/auth/feature/certificate/navigation/CertificationNavigation.kt
@@ -18,12 +18,14 @@ fun NavController.navigateCertification(
 
 fun NavGraphBuilder.certificationNavGraph(
     onBackClick: () -> Unit,
-    onShowSnackBar: () -> Unit
+    onShowSnackBar: () -> Unit,
+    navigateToSocialAccount: () -> Unit
 ) {
     composable<CertificationNavigation> {
         CertificationRoute(
             onBackClick = onBackClick,
-            onShowSnackBar = onShowSnackBar
+            onShowSnackBar = onShowSnackBar,
+            navigateToSocialAccount = navigateToSocialAccount
         )
     }
 }

diff --git a/...rg/sopt/official/feature/auth/feature/socialaccount/navigation/SocialAccountNavigation.kt b/...rg/sopt/official/feature/auth/feature/socialaccount/navigation/SocialAccountNavigation.kt
@@ -0,0 +1,31 @@
+package org.sopt.official.feature.auth.feature.socialaccount.navigation
+
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavOptions
+import androidx.navigation.compose.composable
+import kotlinx.serialization.Serializable
+import org.sopt.official.feature.auth.feature.socialaccount.SocialAccountRoute
+
+fun NavController.navigateSocialAccount(
+    navOptions: NavOptions? = null
+) {
+    navigate(
+        route = SocialAccount,
+        navOptions = navOptions
+    )
+}
+
+fun NavGraphBuilder.socialAccountNavGraph(
+    onGoogleLoginCLick: () -> Unit
+) {
+    composable<SocialAccount>(
+    ) {
+        SocialAccountRoute(
+            onGoogleLoginCLick = onGoogleLoginCLick
+        )
+    }
+}
+
+@Serializable
+data object SocialAccount