Merge pull request #26 from gdaegeun539/feature/login-signup-routing

gdaegeun539 · web-flow · commit d0af08e7cbc2 · 2026-01-16T19:23:30.000+09:00
SCRUM-256 SCRUM-257 feature: configure signup flow
diff --git a/.agent/rules/compose-guidelines.md b/.agent/rules/compose-guidelines.md
@@ -1,7 +1,7 @@
 ---
+trigger: manual
 description: Jetpack Compose 개발 가이드라인과 모범 사례
 globs: ["**/presentation/**/*.kt", "**/ui/**/*.kt", "**/*Composable*.kt"]
-alwaysApply: false
 ---
 
 # Jetpack Compose 개발 가이드라인
diff --git a/app/src/main/java/com/lyrics/feelin/navigation/FeelinDestination.kt b/app/src/main/java/com/lyrics/feelin/navigation/FeelinDestination.kt
@@ -10,4 +10,8 @@ sealed class FeelinDestination(
     object MyPage : FeelinDestination(route = "my_page")
 
     object Login : FeelinDestination(route = "login")
+
+    object OnboardingTerms : FeelinDestination(route = "onboarding_terms")
+
+    object OnboardingGenderAge : FeelinDestination(route = "onboarding_gender_age")
 }
diff --git a/app/src/main/java/com/lyrics/feelin/navigation/FeelinNavHost.kt b/app/src/main/java/com/lyrics/feelin/navigation/FeelinNavHost.kt
@@ -33,6 +33,8 @@ import com.lyrics.feelin.presentation.view.community.CommunityMainScreen
 import com.lyrics.feelin.presentation.view.login.LoginScreen
 import com.lyrics.feelin.presentation.view.mypage.MyPageScreen
 import com.lyrics.feelin.presentation.view.note.NoteSearchScreen
+import com.lyrics.feelin.presentation.view.onboarding.genderage.OnboardingGenderAgeScreen
+import com.lyrics.feelin.presentation.view.onboarding.terms.OnboardingTermsScreen
 
 @Composable
 fun FeelinNavHost(
@@ -130,7 +132,43 @@ fun FeelinNavHost(
 
             composable(FeelinDestination.Login.route) {
                 selectedBottomBarIndex = -1
-                LoginScreen()
+                LoginScreen(
+                    onSocialLoginClick = {
+                        navController.navigate(FeelinDestination.OnboardingTerms.route)
+                    },
+                    onContinueWithoutLogin = {
+                        navController.navigate(FeelinDestination.Home.route) {
+                            popUpTo(FeelinDestination.Login.route) { inclusive = true }
+                        }
+                    }
+                )
+            }
+
+            composable(FeelinDestination.OnboardingTerms.route) {
+                selectedBottomBarIndex = -1
+                OnboardingTermsScreen(
+                    onBackClick = { navController.popBackStack() },
+                    onStartClick = {
+                        navController.navigate(FeelinDestination.OnboardingGenderAge.route)
+                    }
+                )
+            }
+
+            composable(FeelinDestination.OnboardingGenderAge.route) {
+                selectedBottomBarIndex = -1
+                OnboardingGenderAgeScreen(
+                    onBackClick = { navController.popBackStack() },
+                    onSkipClick = {
+                        navController.navigate(FeelinDestination.Home.route) {
+                            popUpTo(FeelinDestination.Login.route) { inclusive = true }
+                        }
+                    },
+                    onNextClick = {
+                        navController.navigate(FeelinDestination.Home.route) {
+                            popUpTo(FeelinDestination.Login.route) { inclusive = true }
+                        }
+                    }
+                )
             }
         }
     }
diff --git a/app/src/main/java/com/lyrics/feelin/presentation/view/login/LoginScreen.kt b/app/src/main/java/com/lyrics/feelin/presentation/view/login/LoginScreen.kt
@@ -37,7 +37,12 @@ import com.lyrics.feelin.presentation.designsystem.theme.LightGray05
 // 로그인 화면은 테마 미 적용입니다. @이대근 2025.09.15.
 
 @Composable
-fun LoginScreen(modifier: Modifier = Modifier, loginViewModel: LoginViewModel = viewModel()) {
+fun LoginScreen(
+    onSocialLoginClick: () -> Unit,
+    onContinueWithoutLogin: () -> Unit,
+    modifier: Modifier = Modifier,
+    loginViewModel: LoginViewModel = viewModel(),
+) {
     val loginErrorCode by loginViewModel.loginErrorCode.collectAsState(initial = null)
     val lastOAuthProvider by loginViewModel.lastOauthProvider.collectAsState()
 
@@ -91,17 +96,17 @@ fun LoginScreen(modifier: Modifier = Modifier, loginViewModel: LoginViewModel =
         SocialLoginButton(
             config = SocialLoginButtonConfigs.Kakao,
             isLastLogin = (lastOAuthProvider == OAuthProvider.KAKAO),
-            onClick = { loginViewModel.kakaoLogin() }
+            onClick = onSocialLoginClick
         )
         Spacer(modifier = Modifier.height(12.dp))
         SocialLoginButton(
             config = SocialLoginButtonConfigs.Google,
             isLastLogin = (lastOAuthProvider == OAuthProvider.GOOGLE),
-            onClick = { loginViewModel.googleLogin() }
+            onClick = onSocialLoginClick
         )
         Spacer(modifier = Modifier.height(12.dp))
         SignUpLaterTextButton(
-            onClick = { loginViewModel.continueWithoutLogin() },
+            onClick = onContinueWithoutLogin,
         )
     }
 }
@@ -122,7 +127,7 @@ private fun SignUpLaterTextButton(
         Text(
             text = "회원가입은 나중에! 둘러볼게요",
             style = FeelinTypography.active.copy(fontSize = 14.sp, color = LightGray04),
-            modifier = Modifier.clickable(enabled = false, onClick = onClick),
+            modifier = Modifier.clickable(onClick = onClick),
         )
     }
 }
@@ -131,6 +136,9 @@ private fun SignUpLaterTextButton(
 @Composable
 private fun LoginScreenPreview() {
     FeelinTheme {
-        LoginScreen()
+        LoginScreen(
+            onSocialLoginClick = {},
+            onContinueWithoutLogin = {}
+        )
     }
 }
diff --git a/app/src/main/java/com/lyrics/feelin/presentation/view/onboarding/genderage/OnboardingGenderAgeScreen.kt b/app/src/main/java/com/lyrics/feelin/presentation/view/onboarding/genderage/OnboardingGenderAgeScreen.kt
@@ -2,6 +2,7 @@ package com.lyrics.feelin.presentation.view.onboarding.genderage
 
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -31,7 +32,12 @@ import com.lyrics.feelin.presentation.designsystem.theme.FeelinTypography
 import com.lyrics.feelin.presentation.designsystem.theme.LocalFeelinColors
 
 @Composable
-fun OnboardingGenderAgeScreen(modifier: Modifier = Modifier) {
+fun OnboardingGenderAgeScreen(
+    onBackClick: () -> Unit,
+    onSkipClick: () -> Unit,
+    onNextClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
     FeelinTheme(darkTheme = false) {
         val feelinColors = LocalFeelinColors.current
 
@@ -48,13 +54,14 @@ fun OnboardingGenderAgeScreen(modifier: Modifier = Modifier) {
         ) {
             FeelinTopAppBarWithBack(
                 title = "",
-                onBackClick = {},
+                onBackClick = onBackClick,
                 showDivider = false,
                 actions = {
                     Text(
                         text = "건너뛰기",
                         style = FeelinTypography.body1,
-                        color = feelinColors.gray05
+                        color = feelinColors.gray05,
+                        modifier = Modifier.clickable { onSkipClick() }
                     )
                 }
             )
@@ -138,7 +145,7 @@ fun OnboardingGenderAgeScreen(modifier: Modifier = Modifier) {
                 Spacer(modifier = Modifier.weight(1f))
 
                 Button(
-                    onClick = { /* 다음 */ },
+                    onClick = onNextClick,
                     enabled = isButtonEnabled,
                     modifier = Modifier
                         .fillMaxWidth()
@@ -173,7 +180,11 @@ fun OnboardingGenderAgeScreen(modifier: Modifier = Modifier) {
 @Composable
 private fun OnboardingGenderAgeScreenPreview() {
     FeelinTheme {
-        OnboardingGenderAgeScreen()
+        OnboardingGenderAgeScreen(
+            onBackClick = {},
+            onSkipClick = {},
+            onNextClick = {}
+        )
     }
 }
 
diff --git a/app/src/main/java/com/lyrics/feelin/presentation/view/onboarding/terms/OnboardingTermsScreen.kt b/app/src/main/java/com/lyrics/feelin/presentation/view/onboarding/terms/OnboardingTermsScreen.kt
@@ -28,7 +28,11 @@ import com.lyrics.feelin.presentation.designsystem.theme.FeelinTypography
 import com.lyrics.feelin.presentation.designsystem.theme.LocalFeelinColors
 
 @Composable
-fun OnboardingTermsScreen(modifier: Modifier = Modifier) {
+fun OnboardingTermsScreen(
+    onBackClick: () -> Unit,
+    onStartClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
     FeelinTheme(darkTheme = false) {
         val feelinColors = LocalFeelinColors.current
 
@@ -61,7 +65,7 @@ fun OnboardingTermsScreen(modifier: Modifier = Modifier) {
         ) {
             FeelinTopAppBarWithBack(
                 title = "",
-                onBackClick = {},
+                onBackClick = onBackClick,
                 showDivider = false
             )
 
@@ -128,7 +132,7 @@ fun OnboardingTermsScreen(modifier: Modifier = Modifier) {
                 Spacer(modifier = Modifier.weight(1f))
 
                 Button(
-                    onClick = { /* 시작하기 */ },
+                    onClick = onStartClick,
                     enabled = isButtonEnabled,
                     modifier = Modifier
                         .fillMaxWidth()
@@ -163,6 +167,9 @@ fun OnboardingTermsScreen(modifier: Modifier = Modifier) {
 @Composable
 private fun OnboardingTermsScreenPreview() {
     FeelinTheme {
-        OnboardingTermsScreen()
+        OnboardingTermsScreen(
+            onBackClick = {},
+            onStartClick = {}
+        )
     }
 }
diff --git a/specdocument/DEVICE_IDENTIFIER_GUIDE.md b/specdocument/DEVICE_IDENTIFIER_GUIDE.md
diff --git a/specdocument/로그인-회원가입-온보딩.md b/specdocument/로그인-회원가입-온보딩.md

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,8 @@ sealed class FeelinDestination(`
`10`	`10`	`object MyPage : FeelinDestination(route = "my_page")`
`11`	`11`
`12`	`12`	`object Login : FeelinDestination(route = "login")`
	`13`	`+`
	`14`	`+ object OnboardingTerms : FeelinDestination(route = "onboarding_terms")`
	`15`	`+`
	`16`	`+ object OnboardingGenderAge : FeelinDestination(route = "onboarding_gender_age")`
`13`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,12 @@ import com.lyrics.feelin.presentation.designsystem.theme.LightGray05`
`37`	`37`	`// 로그인 화면은 테마 미 적용입니다. @이대근 2025.09.15.`
`38`	`38`
`39`	`39`	`@Composable`
`40`		`-fun LoginScreen(modifier: Modifier = Modifier, loginViewModel: LoginViewModel = viewModel()) {`
	`40`	`+fun LoginScreen(`
	`41`	`+ onSocialLoginClick: () -> Unit,`
	`42`	`+ onContinueWithoutLogin: () -> Unit,`
	`43`	`+ modifier: Modifier = Modifier,`
	`44`	`+ loginViewModel: LoginViewModel = viewModel(),`
	`45`	`+) {`
`41`	`46`	`val loginErrorCode by loginViewModel.loginErrorCode.collectAsState(initial = null)`
`42`	`47`	`val lastOAuthProvider by loginViewModel.lastOauthProvider.collectAsState()`
`43`	`48`
`@@ -91,17 +96,17 @@ fun LoginScreen(modifier: Modifier = Modifier, loginViewModel: LoginViewModel =`
`91`	`96`	`SocialLoginButton(`
`92`	`97`	`config = SocialLoginButtonConfigs.Kakao,`
`93`	`98`	`isLastLogin = (lastOAuthProvider == OAuthProvider.KAKAO),`
`94`		`- onClick = { loginViewModel.kakaoLogin() }`
	`99`	`+ onClick = onSocialLoginClick`
`95`	`100`	`)`
`96`	`101`	`Spacer(modifier = Modifier.height(12.dp))`
`97`	`102`	`SocialLoginButton(`
`98`	`103`	`config = SocialLoginButtonConfigs.Google,`
`99`	`104`	`isLastLogin = (lastOAuthProvider == OAuthProvider.GOOGLE),`
`100`		`- onClick = { loginViewModel.googleLogin() }`
	`105`	`+ onClick = onSocialLoginClick`
`101`	`106`	`)`
`102`	`107`	`Spacer(modifier = Modifier.height(12.dp))`
`103`	`108`	`SignUpLaterTextButton(`
`104`		`- onClick = { loginViewModel.continueWithoutLogin() },`
	`109`	`+ onClick = onContinueWithoutLogin,`
`105`	`110`	`)`
`106`	`111`	`}`
`107`	`112`	`}`
`@@ -122,7 +127,7 @@ private fun SignUpLaterTextButton(`
`122`	`127`	`Text(`
`123`	`128`	`text = "회원가입은 나중에! 둘러볼게요",`
`124`	`129`	`style = FeelinTypography.active.copy(fontSize = 14.sp, color = LightGray04),`
`125`		`- modifier = Modifier.clickable(enabled = false, onClick = onClick),`
	`130`	`+ modifier = Modifier.clickable(onClick = onClick),`
`126`	`131`	`)`
`127`	`132`	`}`
`128`	`133`	`}`
`@@ -131,6 +136,9 @@ private fun SignUpLaterTextButton(`
`131`	`136`	`@Composable`
`132`	`137`	`private fun LoginScreenPreview() {`
`133`	`138`	`FeelinTheme {`
`134`		`- LoginScreen()`
	`139`	`+ LoginScreen(`
	`140`	`+ onSocialLoginClick = {},`
	`141`	`+ onContinueWithoutLogin = {}`
	`142`	`+ )`
`135`	`143`	`}`
`136`	`144`	`}`