From 64196eee92311ade35cb752fb5f342169906377f Mon Sep 17 00:00:00 2001 From: asheon12 <55980680+ashwon12@users.noreply.github.com> Date: Wed, 19 Feb 2025 17:41:59 +0900 Subject: [PATCH] =?UTF-8?q?refactor/#78=20:=20=EC=96=BC=EB=A6=AC=20?= =?UTF-8?q?=EB=A6=AC=ED=84=B4=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yapp/app/official/ui/Navigator.kt | 4 +- .../com/yapp/feature/login/LoginViewModel.kt | 46 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/yapp/app/official/ui/Navigator.kt b/app/src/main/java/com/yapp/app/official/ui/Navigator.kt index c2192d6..1b5697e 100644 --- a/app/src/main/java/com/yapp/app/official/ui/Navigator.kt +++ b/app/src/main/java/com/yapp/app/official/ui/Navigator.kt @@ -6,9 +6,9 @@ import androidx.navigation.NavDestination import androidx.navigation.NavHostController import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController -import com.yapp.feature.home.navigation.HomeRoute import com.yapp.feature.home.navigation.navigateToHome import com.yapp.feature.home.navigation.navigateToSetting +import com.yapp.feature.login.navigation.LoginRoute import com.yapp.feature.login.navigation.navigateToLogin import com.yapp.feature.notice.navigation.navigateToNotice import com.yapp.feature.signup.navigation.navigateToSignUp @@ -31,7 +31,7 @@ class NavigatorState( @Composable get() = navController .currentBackStackEntryAsState().value?.destination - val startDestination = HomeRoute + val startDestination = LoginRoute fun navigateLoginScreen() { navController.navigateToLogin() diff --git a/feature/login/src/main/java/com/yapp/feature/login/LoginViewModel.kt b/feature/login/src/main/java/com/yapp/feature/login/LoginViewModel.kt index c8271f3..fae8a1a 100644 --- a/feature/login/src/main/java/com/yapp/feature/login/LoginViewModel.kt +++ b/feature/login/src/main/java/com/yapp/feature/login/LoginViewModel.kt @@ -84,7 +84,7 @@ class LoginViewModel @Inject constructor( reduce: (LoginState.() -> LoginState) -> Unit, postSideEffect: (LoginSideEffect) -> Unit, ) { - if (!email.matches(Regex.email)){ + if (!email.matches(Regex.email)) { reduce { copy( isLoginEnabled = false, @@ -92,31 +92,31 @@ class LoginViewModel @Inject constructor( passwordErrorDescription = null ) } - }else{ - viewModelScope.launch { - loginUseCase(email, password) - .onSuccess { - postSideEffect(LoginSideEffect.NavigateToHome) - } - .onFailure { - val errorMessage = it.message ?: "" - reduce{copy(isLoginEnabled = false)} - when (it) { - is InvalidRequestArgument -> { - reduce { - copy( - emailErrorDescription = null, - passwordErrorDescription = "비밀번호가 달라요. 입력하신 비밀번호를 확인해주세요." - ) - } - } - else -> { - postSideEffect(LoginSideEffect.ShowToast(errorMessage)) + return + } + viewModelScope.launch { + loginUseCase(email, password) + .onSuccess { + postSideEffect(LoginSideEffect.NavigateToHome) + } + .onFailure { + val errorMessage = it.message ?: "" + reduce { copy(isLoginEnabled = false) } + when (it) { + is InvalidRequestArgument -> { + reduce { + copy( + emailErrorDescription = null, + passwordErrorDescription = "비밀번호가 달라요. 입력하신 비밀번호를 확인해주세요." + ) } } - } - } + else -> { + postSideEffect(LoginSideEffect.ShowToast(errorMessage)) + } + } + } } } }