From da2acab4442e09f3af1d4503f12709b15d63d295 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Fri, 17 Jan 2025 05:57:42 +0900 Subject: [PATCH] =?UTF-8?q?[feature/#1011]=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/feature/authmain/AuthMainScreen.kt | 6 +++-- .../feature/authmain/AuthMainViewModel.kt | 6 ++--- .../certificate/CertificationViewModel.kt | 22 ++++++++----------- .../socialaccount/SocialAccountViewModel.kt | 8 +++---- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/org/sopt/official/feature/auth/feature/authmain/AuthMainScreen.kt b/app/src/main/java/org/sopt/official/feature/auth/feature/authmain/AuthMainScreen.kt index f88a3347a..8d0d3318a 100644 --- a/app/src/main/java/org/sopt/official/feature/auth/feature/authmain/AuthMainScreen.kt +++ b/app/src/main/java/org/sopt/official/feature/auth/feature/authmain/AuthMainScreen.kt @@ -237,9 +237,11 @@ private fun AuthBottom( } @Composable -private fun AuthDivider() { +private fun AuthDivider( + modifier: Modifier = Modifier +) { Row( - modifier = Modifier.padding(horizontal = 20.dp), + modifier = modifier.padding(horizontal = 20.dp), verticalAlignment = Alignment.CenterVertically, ) { HorizontalDivider( diff --git a/app/src/main/java/org/sopt/official/feature/auth/feature/authmain/AuthMainViewModel.kt b/app/src/main/java/org/sopt/official/feature/auth/feature/authmain/AuthMainViewModel.kt index 6d1305e12..5a5e5cad8 100644 --- a/app/src/main/java/org/sopt/official/feature/auth/feature/authmain/AuthMainViewModel.kt +++ b/app/src/main/java/org/sopt/official/feature/auth/feature/authmain/AuthMainViewModel.kt @@ -28,10 +28,10 @@ class AuthMainViewModel @Inject constructor( authPlatform = GOOGLE ) ).onSuccess { - //todo: 홈 화면으로 이동 - _sideEffect.emit(AuthMainSideEffect.ShowToast("성공!!")) + //TODO: 홈 화면으로 이동 + _sideEffect.emit(AuthMainSideEffect.ShowToast("성공")) }.onFailure { - _sideEffect.emit(AuthMainSideEffect.ShowToast("실패ㅠㅠ!!")) + _sideEffect.emit(AuthMainSideEffect.ShowToast("실패")) } } } diff --git a/app/src/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationViewModel.kt b/app/src/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationViewModel.kt index 932d3e5b5..a5bff479c 100644 --- a/app/src/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationViewModel.kt +++ b/app/src/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationViewModel.kt @@ -38,7 +38,8 @@ class CertificationViewModel @Inject constructor( private val repository: AuthRepository ) : ViewModel() { - private val _state: MutableStateFlow = MutableStateFlow(CertificationState()) + private val _state: MutableStateFlow = + MutableStateFlow(CertificationState()) val state: StateFlow = _state.asStateFlow() private val _sideEffect = MutableSharedFlow() @@ -75,16 +76,11 @@ class CertificationViewModel @Inject constructor( resetErrorCase() updateButtonText() }.onFailure { - // TODO: DELETE startTimer(), resetErrorCase(), updateButtonText() !! - startTimer() - resetErrorCase() - updateButtonText() - // TODO: 주석 해제 -// _state.update { currentState -> -// currentState.copy( -// errorMessage = ErrorCase.PHONE_ERROR.message -// ) -// } + _state.update { currentState -> + currentState.copy( + errorMessage = ErrorCase.PHONE_ERROR.message + ) + } } } } @@ -105,7 +101,7 @@ class CertificationViewModel @Inject constructor( _sideEffect.emit(CertificationSideEffect.NavigateToSocialAccount(response.name)) } }.onFailure { - _sideEffect.emit(CertificationSideEffect.ShowToast("실패ㅠㅠ")) + _sideEffect.emit(CertificationSideEffect.ShowToast("실패")) } } } @@ -119,7 +115,7 @@ class CertificationViewModel @Inject constructor( ).onSuccess { response -> _sideEffect.emit(CertificationSideEffect.NavigateToAuthMain(response.platform)) }.onFailure { - _sideEffect.emit(CertificationSideEffect.ShowToast("실패ㅠㅠ")) + _sideEffect.emit(CertificationSideEffect.ShowToast("실패")) } } } diff --git a/app/src/main/java/org/sopt/official/feature/auth/feature/socialaccount/SocialAccountViewModel.kt b/app/src/main/java/org/sopt/official/feature/auth/feature/socialaccount/SocialAccountViewModel.kt index 538861c99..cec75d06f 100644 --- a/app/src/main/java/org/sopt/official/feature/auth/feature/socialaccount/SocialAccountViewModel.kt +++ b/app/src/main/java/org/sopt/official/feature/auth/feature/socialaccount/SocialAccountViewModel.kt @@ -41,9 +41,9 @@ class SocialAccountViewModel @Inject constructor( authPlatform = GOOGLE ) ).onSuccess { - _sideEffect.emit(SocialAccountSideEffect.ShowToast("성공!!")) + _sideEffect.emit(SocialAccountSideEffect.ShowToast("성공")) }.onFailure { - _sideEffect.emit(SocialAccountSideEffect.ShowToast("실패ㅠㅠ")) + _sideEffect.emit(SocialAccountSideEffect.ShowToast("실패")) } } } @@ -57,9 +57,9 @@ class SocialAccountViewModel @Inject constructor( token = "codecodecodecodecode" ) ).onSuccess { - _sideEffect.emit(SocialAccountSideEffect.ShowToast("성공!!")) + _sideEffect.emit(SocialAccountSideEffect.ShowToast("성공")) }.onFailure { - _sideEffect.emit(SocialAccountSideEffect.ShowToast("실패ㅠㅠ")) + _sideEffect.emit(SocialAccountSideEffect.ShowToast("실패")) } } }