[refactor] #204 Modify toast message in my tab

Scents-Note · Aug 28, 2022 · 2078576 · 2078576
1 parent 3f4188e
commit 2078576
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/app/src/main/java/com/scents/note/ui/setting/EditMyInfoActivity.kt b/app/src/main/java/com/scents/note/ui/setting/EditMyInfoActivity.kt
@@ -26,6 +26,7 @@ class EditMyInfoActivity : AppCompatActivity() {
 
         editViewModel.checkMyInfo()
         setCompleteBtn()
+        setUpdateMyInfoToastObserve("내 정보가 수정되었습니다.", "내 정보 수정 실패")
     }
 
     private fun setCompleteBtn(){
@@ -89,13 +90,11 @@ class EditMyInfoActivity : AppCompatActivity() {
                 finish()
             }
         })
-
-        setUpdateMyInfoToastObserve(editViewModel.isValidMyInfoUpdate, "내 정보가 수정되었습니다.", "내 정보 수정 실패")
     }
 
-    private fun setUpdateMyInfoToastObserve(settingNetworkState: LiveData<Boolean>, success: String, fail: String){
-        settingNetworkState.observe(this, Observer {
-            if(it){
+    private fun setUpdateMyInfoToastObserve(success: String, fail: String){
+        editViewModel.showMyInfoUpdateToast.observe(this, Observer{
+            if(editViewModel.isValidMyInfoUpdate.value!!){
                 this.toast(success)
             }else{
                 this.toast(fail)

diff --git a/app/src/main/java/com/scents/note/ui/setting/EditMyInfoViewModel.kt b/app/src/main/java/com/scents/note/ui/setting/EditMyInfoViewModel.kt
@@ -11,6 +11,7 @@ import com.scents.note.data.repository.EditMyInfoRepository
 import com.scents.note.data.repository.SignRepository
 import com.scents.note.data.vo.request.RequestEditMyInfo
 import com.scents.note.data.vo.request.RequestEditPassword
+import com.scents.note.util.SingleLiveEvent
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
 import java.util.regex.Pattern
@@ -178,6 +179,9 @@ class EditMyInfoViewModel : ViewModel() {
     val isValidMyInfoUpdate : LiveData<Boolean>
         get() = _isValidMyInfoUpdate
 
+    private val _showMyInfoUpdateToast = SingleLiveEvent<Void>()
+    val showMyInfoUpdateToast: LiveData<Void> = _showMyInfoUpdateToast
+
     // 내 정보 수정
     fun putMyInfo(){
         viewModelScope.launch {
@@ -197,10 +201,11 @@ class EditMyInfoViewModel : ViewModel() {
                     ScentsNoteApplication.prefManager.userNickname = nickTxt.value.toString()
                     ScentsNoteApplication.prefManager.userGender = genderTxt
                     ScentsNoteApplication.prefManager.userAge = ageTxt.value!!.toInt()
-                    _isValidMyInfoUpdate.postValue(true)
+                    _isValidMyInfoUpdate.value = true
+                    _showMyInfoUpdateToast.call()
                 }
             }catch (e : HttpException){
-                _isValidMyInfoUpdate.postValue(false)
+                _isValidMyInfoUpdate.value = false
                 when(e.response()?.code()){
                     401 -> { // userIdx 일치 X 또는 토근 유효 X
                         Log.d("내 정보 수정 실패", e.message())
@@ -407,6 +412,9 @@ class EditMyInfoViewModel : ViewModel() {
     val isValidEditPassword : LiveData<Boolean>
         get() = _isValidEditPassword
 
+    private val _showPasswordUpdateToast = SingleLiveEvent<Void>()
+    val showPasswordUpdateToast: LiveData<Void> = _showPasswordUpdateToast
+
     // 비밀번호 수정
     fun putPassword(){
         viewModelScope.launch {
@@ -422,10 +430,11 @@ class EditMyInfoViewModel : ViewModel() {
                     Log.d("비밀번호 수정 성공 : ", it)
                     ScentsNoteApplication.prefManager.userPassword = passwordInfo.newPassword
 
-                    _isValidEditPassword.postValue(true)
+                    _isValidEditPassword.value = true
+                    _showPasswordUpdateToast.call()
                 }
             }catch (e : HttpException){
-                _isValidEditPassword.postValue(false)
+                _isValidEditPassword.value = false
 
                 when(e.response()?.code()){
                     400 -> { // 동일한 비밀번호 입력

diff --git a/app/src/main/java/com/scents/note/ui/setting/EditPasswordActivity.kt b/app/src/main/java/com/scents/note/ui/setting/EditPasswordActivity.kt
@@ -27,6 +27,7 @@ class EditPasswordActivity : AppCompatActivity() {
         binding.edtEditPasswordCheck.requestFocus()
 
         observer()
+        setUpdatePasswordToastObserve("비밀번호가 변경되었습니다.", "비밀번호 변경 실패")
         passwordAnimation()
         checkNextBtn()
         setKeyboard()
@@ -77,17 +78,7 @@ class EditPasswordActivity : AppCompatActivity() {
     fun onClickCompleteBtn(view: View){
         editViewModel.putPassword()
 
-//        editViewModel.isValidEditPassword.observe(this, Observer{ isValidEditPassword ->
-//            isValidEditPassword?.let{
-//                if(isValidEditPassword){
-//                    finish()
-//                }
-//            }
-//        })
-
         finish()
-
-        setUpdatePasswordToastObserve(editViewModel.isValidMyInfoUpdate.value!!, "비밀번호가 변경되었습니다.", "비밀번호 변경 실패")
     }
 
     override fun onBackPressed() {
@@ -110,7 +101,6 @@ class EditPasswordActivity : AppCompatActivity() {
                         override fun onPositiveClicked() {
                             editViewModel.putPassword()
                             finish()
-                            setUpdatePasswordToastObserve(editViewModel.isValidMyInfoUpdate.value!!, "비밀번호가 변경되었습니다.", "비밀번호 변경 실패")
                         }
                         override fun onNegativeClicked() {
                             finish()
@@ -126,11 +116,13 @@ class EditPasswordActivity : AppCompatActivity() {
         })
     }
 
-    private fun setUpdatePasswordToastObserve(settingNetworkState: Boolean, success: String, fail: String){
-        if(settingNetworkState){
-            this.toast(success)
-        }else{
-            this.toast(fail)
-        }
+    private fun setUpdatePasswordToastObserve(success: String, fail: String){
+        editViewModel.showPasswordUpdateToast.observe(this, Observer{
+            if(editViewModel.isValidEditPassword.value!!){
+                this.toast(success)
+            }else{
+                this.toast(fail)
+            }
+        })
     }
 }