#15 [fix] livedata 업데이트 함수 분리

DO-SOPT-ANDROID · Dec 7, 2023 · 84b786f · 84b786f
1 parent 17c96bb
commit 84b786f
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/app/src/main/java/org/sopt/dosopttemplate/presentation/signUp/SignUpViewModel.kt b/app/src/main/java/org/sopt/dosopttemplate/presentation/signUp/SignUpViewModel.kt
@@ -44,8 +44,12 @@ class SignUpViewModel @Inject constructor(
         }
     }
 
+    fun updatePasswordMeetCriteria() {
+        _isPasswordMeetCriteria.value = isPasswordRegexMatch()
+    }
+
     fun updateIsMeetCriteria() {
-        _isMeetCriteria.value = (isIdRegexMatch() && isPasswordRegexMatch())
+        _isMeetCriteria.value = isSignUpAvailable()
     }
 
     fun isSignUpAvailable() =
@@ -61,10 +65,8 @@ class SignUpViewModel @Inject constructor(
         return id.value?.let { ID_REGEX.matcher(it).find() } ?: false
     }
 
-    fun isPasswordRegexMatch(): Boolean {
-        val pwRegexMatch = password.value?.let { PASSWORD_REGEX.matcher(it).find() } ?: false
-        _isPasswordMeetCriteria.value = pwRegexMatch
-        return pwRegexMatch
+    private fun isPasswordRegexMatch(): Boolean {
+        return password.value?.let { PASSWORD_REGEX.matcher(it).find() } ?: false
     }
 
     companion object {