Merge pull request #79 from YAPP-Github/fix/#77-login-logic

wjdrjs00 · web-flow · commit 7656c49831ee · 2025-08-07T19:54:56.000+09:00
[Fix/#77] 로그인 관련 문제사항 수정
diff --git a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt
@@ -38,13 +38,7 @@ fun MainNavHost(
                         popUpTo<Route.Splash> { inclusive = true }
                     }
                 },
-                navigateToHome = {
-                    navigator.navController.navigate(Route.Home) {
-                        popUpTo(navigator.navController.graph.startDestinationId) {
-                            inclusive = true
-                        }
-                    }
-                },
+                navigateToHome = navigator::navigateToHomeAndClearStack,
             )
         }
 
@@ -56,13 +50,7 @@ fun MainNavHost(
 
         composable<Route.Login> {
             LoginScreenContainer(
-                navigateToHome = {
-                    navigator.navController.navigate(Route.Home) {
-                        popUpTo(navigator.navController.graph.startDestinationId) {
-                            inclusive = true
-                        }
-                    }
-                },
+                navigateToHome = navigator::navigateToHomeAndClearStack,
                 navigateToTermsAgreement = { navigator.navController.navigate(Route.TermsAgreement) },
             )
         }
@@ -192,13 +180,7 @@ fun MainNavHost(
 
             OnBoardingScreenContainer(
                 onBoardingViewModel = viewModel,
-                navigateToHome = {
-                    navigator.navController.navigate(Route.Home) {
-                        popUpTo(navigator.navController.graph.startDestinationId) {
-                            inclusive = true
-                        }
-                    }
-                },
+                navigateToHome = navigator::navigateToHomeAndClearStack,
                 navigateToBack = {
                     if (navigator.navController.previousBackStackEntry != null) {
                         navigator.navController.popBackStack()
diff --git a/app/src/main/java/com/threegap/bitnagil/MainNavigator.kt b/app/src/main/java/com/threegap/bitnagil/MainNavigator.kt
@@ -9,6 +9,13 @@ class MainNavigator(
     val navController: NavHostController,
 ) {
     val startDestination = Route.Splash
+
+    internal fun navigateToHomeAndClearStack() =
+        navController.navigate(Route.Home) {
+            popUpTo(0) {
+                inclusive = true
+            }
+        }
 }
 
 @Composable
diff --git a/data/src/main/java/com/threegap/bitnagil/data/auth/mapper/AuthMapper.kt b/data/src/main/java/com/threegap/bitnagil/data/auth/mapper/AuthMapper.kt
@@ -11,7 +11,7 @@ internal fun LoginResponseDto.toDomain() =
     AuthSession(
         accessToken = this.accessToken,
         refreshToken = this.refreshToken,
-        role = UserRole.from(this.role),
+        role = UserRole.fromString(this.role),
     )
 
 // toDto
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/auth/model/UserRole.kt b/domain/src/main/java/com/threegap/bitnagil/domain/auth/model/UserRole.kt
@@ -8,7 +8,7 @@ enum class UserRole {
     fun isGuest() = this == GUEST
 
     companion object {
-        fun from(value: String): UserRole =
+        fun fromString(value: String): UserRole =
             when (value) {
                 "USER" -> USER
                 "GUEST" -> GUEST
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/intro/IntroScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/intro/IntroScreen.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -56,6 +57,10 @@ private fun IntroScreen(
     val screenHeight = with(LocalDensity.current) {
         windowInfo.containerSize.height.toDp()
     }
+    val screenWidth = with(LocalDensity.current) {
+        windowInfo.containerSize.width.toDp()
+    }
+    val widthRatio = 260f / 360f
 
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
@@ -64,24 +69,26 @@ private fun IntroScreen(
             .statusBarsPadding()
             .background(BitnagilTheme.colors.white),
     ) {
-        Spacer(modifier = Modifier.height(screenHeight * 0.0748f))
+        Spacer(modifier = Modifier.height(screenHeight * 0.105f))
 
         Text(
             text = "당신의 하루 리듬을 이해하고,\n작은 변화를 함께 시작해볼게요.",
             color = BitnagilTheme.colors.navy500,
             style = BitnagilTheme.typography.title2Bold,
             textAlign = TextAlign.Center,
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(60.dp),
         )
 
-        Spacer(modifier = Modifier.height(screenHeight * 0.151f))
+        Spacer(modifier = Modifier.height(screenHeight * 0.136f))
 
         Image(
             painter = painterResource(R.drawable.intro_character),
             contentDescription = null,
             contentScale = ContentScale.Fit,
             modifier = Modifier
-                .padding(50.dp)
+                .width(screenWidth * widthRatio)
                 .aspectRatio(260f / 295f),
         )
 
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginScreen.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -44,12 +45,6 @@ fun LoginScreenContainer(
 
     viewModel.collectSideEffect { sideEffect ->
         when (sideEffect) {
-            is LoginSideEffect.RequestKakaoAccountLogin -> {
-                KakaoLoginHandlerImpl.accountLogin(context) { token, error ->
-                    viewModel.kakaoLogin(token, error)
-                }
-            }
-
             is LoginSideEffect.NavigateToHome -> {
                 navigateToHome()
             }
@@ -78,6 +73,10 @@ private fun LoginScreen(
     val screenHeight = with(LocalDensity.current) {
         windowInfo.containerSize.height.toDp()
     }
+    val screenWidth = with(LocalDensity.current) {
+        windowInfo.containerSize.width.toDp()
+    }
+    val widthRatio = 260f / 360f
 
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
@@ -86,24 +85,26 @@ private fun LoginScreen(
             .statusBarsPadding()
             .background(BitnagilTheme.colors.white),
     ) {
-        Spacer(modifier = Modifier.height(screenHeight * 0.0748f))
+        Spacer(modifier = Modifier.height(screenHeight * 0.105f))
 
         Text(
             text = "빛나길에 오신걸 환영해요!",
             color = BitnagilTheme.colors.navy500,
             style = BitnagilTheme.typography.title2Bold,
             textAlign = TextAlign.Center,
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(60.dp),
         )
 
-        Spacer(modifier = Modifier.height(screenHeight * 0.185f))
+        Spacer(modifier = Modifier.height(screenHeight * 0.136f))
 
         Image(
             painter = painterResource(R.drawable.intro_character),
             contentDescription = null,
             contentScale = ContentScale.Fit,
             modifier = Modifier
-                .padding(50.dp)
+                .width(screenWidth * widthRatio)
                 .aspectRatio(260f / 295f),
         )
 
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginViewModel.kt
@@ -4,10 +4,7 @@ import android.util.Log
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import com.kakao.sdk.auth.model.OAuthToken
-import com.kakao.sdk.common.model.ClientError
-import com.kakao.sdk.common.model.ClientErrorCause
 import com.threegap.bitnagil.domain.auth.usecase.LoginUseCase
-import com.threegap.bitnagil.domain.error.model.BitnagilError
 import com.threegap.bitnagil.presentation.common.mviviewmodel.MviViewModel
 import com.threegap.bitnagil.presentation.login.model.LoginIntent
 import com.threegap.bitnagil.presentation.login.model.LoginSideEffect
@@ -19,7 +16,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class LoginViewModel @Inject constructor(
-    private val savedStateHandle: SavedStateHandle,
+    savedStateHandle: SavedStateHandle,
     private val loginUseCase: LoginUseCase,
 ) : MviViewModel<LoginState, LoginSideEffect, LoginIntent>(
     initState = LoginState(),
@@ -49,7 +46,6 @@ class LoginViewModel @Inject constructor(
             }
 
             is LoginIntent.KakaoTalkLoginCancel -> {
-                sendSideEffect(LoginSideEffect.RequestKakaoAccountLogin)
                 state.copy(isLoading = false)
             }
 
@@ -66,11 +62,6 @@ class LoginViewModel @Inject constructor(
                     processKakaoLoginSuccess(token)
                 }
 
-                error is ClientError && error.reason == ClientErrorCause.Cancelled -> {
-                    Log.e("KakaoLogin", "카카오 로그인 취소", error)
-                    sendIntent(LoginIntent.KakaoTalkLoginCancel)
-                }
-
                 error != null -> {
                     Log.e("KakaoLogin", "카카오 로그인 실패", error)
                     sendIntent(LoginIntent.LoginFailure)
@@ -90,9 +81,6 @@ class LoginViewModel @Inject constructor(
             },
             onFailure = { e ->
                 sendIntent(LoginIntent.LoginFailure)
-                if (e is BitnagilError) {
-                    Log.e("Login", "${e.code} ${e.message}")
-                }
                 Log.e("Login", "${e.message}")
             },
         )
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/model/LoginSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/login/model/LoginSideEffect.kt
@@ -3,7 +3,6 @@ package com.threegap.bitnagil.presentation.login.model
 import com.threegap.bitnagil.presentation.common.mviviewmodel.MviSideEffect
 
 sealed interface LoginSideEffect : MviSideEffect {
-    data object RequestKakaoAccountLogin : LoginSideEffect
     data object NavigateToHome : LoginSideEffect
     data object NavigateToTermsAgreement : LoginSideEffect
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ internal fun LoginResponseDto.toDomain() =`
`11`	`11`	`AuthSession(`
`12`	`12`	`accessToken = this.accessToken,`
`13`	`13`	`refreshToken = this.refreshToken,`
`14`		`- role = UserRole.from(this.role),`
	`14`	`+ role = UserRole.fromString(this.role),`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`// toDto`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ package com.threegap.bitnagil.presentation.login.model`
`3`	`3`	`import com.threegap.bitnagil.presentation.common.mviviewmodel.MviSideEffect`
`4`	`4`
`5`	`5`	`sealed interface LoginSideEffect : MviSideEffect {`
`6`		`- data object RequestKakaoAccountLogin : LoginSideEffect`
`7`	`6`	`data object NavigateToHome : LoginSideEffect`
`8`	`7`	`data object NavigateToTermsAgreement : LoginSideEffect`
`9`	`8`	`}`