[feat] #23 feat : 네트워크 예외처리 구현

Nexters · Oct 4, 2024 · 32f07f5 · 32f07f5
1 parent 8b2317e
commit 32f07f5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/presentation/src/main/java/com/masshow/presentation/ui/intro/login/LoginViewModel.kt b/presentation/src/main/java/com/masshow/presentation/ui/intro/login/LoginViewModel.kt
@@ -61,6 +61,7 @@ class LoginViewModel @Inject constructor(
                             // 신규회원
                             _event.emit(LoginEvent.NavigateToSignup(token, provider))
                         } else {
+                            _event.emit(LoginEvent.ShowToastMessage("로그인 성공"))
                             _event.emit(LoginEvent.NavigateToMain)
                         }
                     }

diff --git a/presentation/src/main/java/com/masshow/presentation/ui/intro/signup/SignupViewModel.kt b/presentation/src/main/java/com/masshow/presentation/ui/intro/signup/SignupViewModel.kt
@@ -20,13 +20,13 @@ import javax.inject.Inject
 
 sealed class SignUpEvent {
     data object NavigateToMain : SignUpEvent()
-    data class ShowToastMessage(val msg: String): SignUpEvent()
-    data object ShowLoading: SignUpEvent()
-    data object DismissLoading: SignUpEvent()
+    data class ShowToastMessage(val msg: String) : SignUpEvent()
+    data object ShowLoading : SignUpEvent()
+    data object DismissLoading : SignUpEvent()
 }
 
 data class SignUpUiState(
-    val warningState : Boolean = false
+    val warningState: Boolean = false
 )
 
 @HiltViewModel
@@ -56,7 +56,7 @@ class SignupViewModel @Inject constructor(
     private fun observeNick() {
         nickname.onEach {
             // 닉네임 검증 등등
-            if(it.matches("^[a-z0-9ㄱ-ㅣ가-힣]*\$".toRegex())){
+            if (it.matches("^[a-z0-9ㄱ-ㅣ가-힣]*\$".toRegex())) {
                 _uiState.update { state ->
                     state.copy(
                         warningState = false
@@ -84,11 +84,12 @@ class SignupViewModel @Inject constructor(
             ).let {
                 when (it) {
                     is BaseState.Success -> {
-                        it.data?.let{ data ->
+                        it.data?.let { data ->
                             repository.putAccessToken(data.accessToken)
                             repository.putUserId(data.userId)
                             repository.putNick(data.nickname)
                         }
+                        _event.emit(SignUpEvent.ShowToastMessage("회원가입 성공"))
                         _event.emit(SignUpEvent.NavigateToMain)
                     }
 
@@ -101,7 +102,7 @@ class SignupViewModel @Inject constructor(
         }
     }
 
-    fun deleteNick(){
+    fun deleteNick() {
         nickname.value = ""
     }
 

diff --git a/presentation/src/main/java/com/masshow/presentation/ui/main/MainViewModel.kt b/presentation/src/main/java/com/masshow/presentation/ui/main/MainViewModel.kt
@@ -57,7 +57,7 @@ class MainViewModel @Inject constructor(
                     }
 
                     is BaseState.Error -> {
-
+                        finishRecord.emit("기록하기 실패")
                     }
                 }
 

diff --git a/presentation/src/main/java/com/masshow/presentation/ui/main/mypage/MyPageFragment.kt b/presentation/src/main/java/com/masshow/presentation/ui/main/mypage/MyPageFragment.kt
@@ -35,6 +35,9 @@ class MyPageFragment : BaseFragment<FragmentMypageBinding>(R.layout.fragment_myp
                     }
 
                     is MyPageEvent.ShowToastMessage -> showToastMessage(it.msg)
+
+                    is MyPageEvent.ShowLoading -> showLoading(requireContext())
+                    is MyPageEvent.DismissLoading -> dismissLoading()
                 }
             }
         }

diff --git a/presentation/src/main/java/com/masshow/presentation/ui/main/mypage/MyPageViewModel.kt b/presentation/src/main/java/com/masshow/presentation/ui/main/mypage/MyPageViewModel.kt
@@ -16,6 +16,8 @@ sealed class MyPageEvent {
     data object NavigateToBack : MyPageEvent()
     data object NavigateToLogin : MyPageEvent()
     data class ShowToastMessage(val msg: String) : MyPageEvent()
+    data object ShowLoading : MyPageEvent()
+    data object DismissLoading : MyPageEvent()
 }
 
 @HiltViewModel
@@ -38,6 +40,7 @@ class MyPageViewModel @Inject constructor(
         viewModelScope.launch {
             authRepository.getUserId()?.let { id ->
                 authRepository.getNick()?.let { nick ->
+                    _event.emit(MyPageEvent.ShowLoading)
                     authRepository.withdrawal(UserSimpleInfoQuery(id, nick)).let {
                         when (it) {
                             is BaseState.Success -> {
@@ -49,6 +52,7 @@ class MyPageViewModel @Inject constructor(
                                 _event.emit(MyPageEvent.ShowToastMessage(it.message))
                             }
                         }
+                        _event.emit(MyPageEvent.DismissLoading)
                     }
                 }
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,7 +57,7 @@ class MainViewModel @Inject constructor( @@
                         }
                         is BaseState.Error -> {
+                            finishRecord.emit("기록하기 실패")
                         }
                     }
@@ Expand Down @@