✨ :: Connect the find password

Team-Ampersand · Feb 28, 2024 · d5a7257 · d5a7257
1 parent aa5cffb
commit d5a7257
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 9 deletions.
diff --git a/app/src/main/java/com/msg/dotori/DotoriNavHost.kt b/app/src/main/java/com/msg/dotori/DotoriNavHost.kt
@@ -5,6 +5,9 @@ import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import com.msg.presentation.view.find_password.navigation.findPasswordScreen
+import com.msg.presentation.view.find_password.navigation.navigateToFindPassword
+import com.msg.presentation.view.find_password.navigation.navigateToPasswordAuthentication
+import com.msg.presentation.view.find_password.navigation.passwordAuthenticationScreen
 import com.msg.presentation.view.home.navigation.mainScreen
 import com.msg.presentation.view.home.navigation.navigateToMain
 import com.msg.presentation.view.login.navigation.loginScreen
@@ -39,7 +42,8 @@ fun DotoriNavHost(
     ) {
         loginScreen(
             navigateToMain = { navController.navigateToMain() },
-            navigateToSignUp = { navController.navigateToSignUp() }
+            navigateToSignUp = { navController.navigateToSignUp() },
+            navigateToFindPassword = { navController.navigateToPasswordAuthentication() }
         )
         signUpScreen(
             viewModelStoreOwner = viewModelStoreOwner,
@@ -58,7 +62,15 @@ fun DotoriNavHost(
             navigateToBack = { navController.popBackStack() },
             navigateToLogin = { navController.navigateToLogin() }
         )
-        findPasswordScreen()
+        passwordAuthenticationScreen(
+            navigateToBack = { navController.popBackStack() },
+            navigateToLogin = { navController.navigateToLogin() },
+            navigateToFindPassword = { navController.navigateToFindPassword() }
+        )
+        findPasswordScreen(
+            navigateToBack = { navController.popBackStack() },
+            navigateToLogin = { navController.navigateToLogin() }
+        )
         massageChairScreen()
         selfStudyScreen()
         musicScreen()

diff --git a/...rc/main/java/com/msg/presentation/view/find_password/navigation/FindPasswordNavigation.kt b/...rc/main/java/com/msg/presentation/view/find_password/navigation/FindPasswordNavigation.kt
@@ -4,15 +4,41 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import com.msg.presentation.view.find_password.FindPasswordScreen
+import com.msg.presentation.view.find_password.PasswordAuthenticationScreen
 
+const val passwordAuthenticationRoute = "password_authentication_route"
 const val findPasswordRoute = "find_password_route"
 
+fun NavController.navigateToPasswordAuthentication() {
+    this.navigate(passwordAuthenticationRoute)
+}
+
+fun NavGraphBuilder.passwordAuthenticationScreen(
+    navigateToBack: () -> Unit,
+    navigateToLogin: () -> Unit,
+    navigateToFindPassword: () -> Unit
+) {
+    composable(passwordAuthenticationRoute) {
+        PasswordAuthenticationScreen(
+            navigateToBack = navigateToBack,
+            navigateToLogin = navigateToLogin,
+            navigateToFindPassword = navigateToFindPassword
+        )
+    }
+}
+
 fun NavController.navigateToFindPassword() {
     this.navigate(findPasswordRoute)
 }
 
-fun NavGraphBuilder.findPasswordScreen() {
+fun NavGraphBuilder.findPasswordScreen(
+    navigateToBack: () -> Unit,
+    navigateToLogin: () -> Unit
+) {
     composable(findPasswordRoute) {
-        FindPasswordScreen()
+        FindPasswordScreen(
+            navigateToBack = navigateToBack,
+            navigateToLogin = navigateToLogin
+        )
     }
 }
diff --git a/presentation/src/main/java/com/msg/presentation/view/login/LoginScreen.kt b/presentation/src/main/java/com/msg/presentation/view/login/LoginScreen.kt
@@ -49,7 +49,8 @@ fun LoginScreen(
     modifier: Modifier = Modifier,
     loginViewModel: LoginViewModel = hiltViewModel(),
     navigateToMain: () -> Unit,
-    navigateToSignUp: () -> Unit
+    navigateToSignUp: () -> Unit,
+    navigateToFindPassword: () -> Unit
 ) {
     val context = LocalContext.current
     var idText by remember { mutableStateOf("") }
@@ -138,7 +139,7 @@ fun LoginScreen(
                 .clickable(
                     interactionSource = remember { MutableInteractionSource() },
                     indication = null
-                ) {},
+                ) { navigateToFindPassword() },
             text = "비밀번호 찾기",
             style = DotoriTheme.typography.body2,
             color = DotoriTheme.colors.neutral20,
@@ -191,6 +192,7 @@ fun LoginScreen(
 @Composable
 fun LoginScreenPreview() {
     LoginScreen(
-        navigateToMain = {}
+        navigateToMain = {},
+        navigateToSignUp = {}
     ) {}
 }
diff --git a/presentation/src/main/java/com/msg/presentation/view/login/navigation/LoginNavigation.kt b/presentation/src/main/java/com/msg/presentation/view/login/navigation/LoginNavigation.kt
@@ -13,12 +13,14 @@ fun NavController.navigateToLogin() {
 
 fun NavGraphBuilder.loginScreen(
     navigateToMain: () -> Unit,
-    navigateToSignUp: () -> Unit
+    navigateToSignUp: () -> Unit,
+    navigateToFindPassword: () -> Unit
 ) {
     composable(loginRoute) {
         LoginScreen(
             navigateToMain = navigateToMain,
-            navigateToSignUp = navigateToSignUp
+            navigateToSignUp = navigateToSignUp,
+            navigateToFindPassword = navigateToFindPassword
         )
     }
 }