Feature/week6 essential

app/src/main/java/org/sopt/dosopttemplate/presentation/signUp/SignUpActivity.kt

@@ -19,6 +19,7 @@ class SignUpActivity : BindingActivity<ActivitySignUpBinding>(R.layout.activity_
 
         initOnClickListener()
         initSignUpStateObserver()
+        initSignUpFormsObserver()
     }
 
     private fun initOnClickListener() {
@@ -39,6 +40,16 @@ class SignUpActivity : BindingActivity<ActivitySignUpBinding>(R.layout.activity_
         }
     }
 
+    private fun initSignUpFormsObserver() {
+        viewModel.id.observe(this) { _ ->
+            viewModel.updateIsMeetCriteria()
+        }
+        viewModel.password.observe(this) { _ ->
+            viewModel.updateIsMeetCriteria()
+            viewModel.updatePasswordMeetCriteria()
+        }
+    }
+
     private fun signUp() {
         toast(SIGN_UP_SUCCEED)
         finish()

app/src/main/java/org/sopt/dosopttemplate/presentation/signUp/SignUpViewModel.kt

@@ -20,6 +20,10 @@ class SignUpViewModel @Inject constructor(
     val password: MutableLiveData<String> = MutableLiveData()
     val nickname: MutableLiveData<String> = MutableLiveData()
     val mbti: MutableLiveData<String> = MutableLiveData()
+    private val _isPasswordMeetCriteria: MutableLiveData<Boolean> = MutableLiveData()
+    val isPasswordMeetCriteria: LiveData<Boolean> = _isPasswordMeetCriteria
+    private val _isMeetCriteria: MutableLiveData<Boolean> = MutableLiveData(false)
+    val isMeetCriteria: LiveData<Boolean> = _isMeetCriteria
     private val _signUpState = MutableLiveData<Boolean>()
     val signUpState: LiveData<Boolean> = _signUpState
 
@@ -40,33 +44,36 @@ class SignUpViewModel @Inject constructor(
         }
     }
 
-    fun isSignUpAvailable(): Boolean {
-        if (isSignUpFormsBlank()) return false
-        return isSignUpFormsMatch()
+    fun updatePasswordMeetCriteria() {
+        _isPasswordMeetCriteria.value = isPasswordRegexMatch()
     }
 
-    private fun isSignUpFormsMatch() =
-        (isIdLengthSuitable() && isPassWordLengthSuitable() && isNickNameRegexMatch() && isMBTIRegexMatch() && isMbtiInEnum())
+    fun updateIsMeetCriteria() {
+        _isMeetCriteria.value = isSignUpAvailable()
+    }
+
+    fun isSignUpAvailable() =
+        (isIdRegexMatch() && isPasswordRegexMatch() && isSignUpFormsBlank() && isMbtiInEnum())
 
     private fun isMbtiInEnum(): Boolean {
         return Mbti.values().any { it.name == mbti.value }
     }
 
-    private fun isSignUpFormsBlank() =
-        listOf(id.value, password.value, nickname.value, mbti.value).any { it.isNullOrBlank() }
+    private fun isSignUpFormsBlank() = !(listOf(id.value, password.value, nickname.value, mbti.value).any { it.isNullOrBlank() })
 
-    private fun isIdLengthSuitable() = id.value?.length in 6..10
-    private fun isPassWordLengthSuitable() = password.value?.length in 8..12
-    private fun isNickNameRegexMatch(): Boolean {
-        return nickname.value?.let { SIGNUP_REGEX.matcher(it).find() } ?: false
+    private fun isIdRegexMatch(): Boolean {
+        return id.value?.let { ID_REGEX.matcher(it).find() } ?: false
     }
 
-    private fun isMBTIRegexMatch(): Boolean {
-        return mbti.value?.let { SIGNUP_REGEX.matcher(it).find() } ?: false
+    private fun isPasswordRegexMatch(): Boolean {
+        return password.value?.let { PASSWORD_REGEX.matcher(it).find() } ?: false
     }
 
     companion object {
-        private const val SIGNUP_PATTERN = """^\S+$"""
-        val SIGNUP_REGEX: Pattern = Pattern.compile(SIGNUP_PATTERN)
+        private const val ID_PATTERN = """^[a-zA-Z0-9]{6,10}${'$'}"""
+        private const val PASSWORD_PATTERN =
+            """^(?=.*[a-zA-Z])(?=.*\d)(?=.*[!@#${'$'}%^&*(),.?":{}|<>]).{6,12}${'$'}"""
+        val ID_REGEX: Pattern = Pattern.compile(ID_PATTERN)
+        val PASSWORD_REGEX: Pattern = Pattern.compile(PASSWORD_PATTERN)
     }
 }

app/src/main/res/layout/activity_sign_up.xml

@@ -64,13 +64,26 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
+            android:backgroundTint="@{vm.isPasswordMeetCriteria != null && vm.isPasswordMeetCriteria == false ? @color/red : @color/black}"
             android:hint="@string/password_hint"
             android:inputType="textPassword"
             android:text="@={vm.password}"
             android:textSize="20sp"
             app:layout_constraintStart_toStartOf="@id/tv_sign_up_id"
             app:layout_constraintTop_toBottomOf="@id/tv_sign_up_password" />
 
+        <TextView
+            android:id="@+id/tv_sign_up_password_error"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:text="@string/sign_up_password_error"
+            android:textColor="@color/red"
+            android:textSize="13sp"
+            android:visibility="@{vm.isPasswordMeetCriteria != null &amp;&amp; vm.isPasswordMeetCriteria == false ? View.VISIBLE : View.INVISIBLE}"
+            app:layout_constraintStart_toStartOf="@id/tv_sign_up_id"
+            app:layout_constraintTop_toBottomOf="@id/et_sign_up_password" />
+
         <TextView
             android:id="@+id/tv_sign_up_nickname"
             android:layout_width="wrap_content"
@@ -120,7 +133,10 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginBottom="30dp"
+            android:backgroundTint="@{vm.isMeetCriteria == true ? @color/baby_blue : @color/gray}"
+            android:clickable="@{vm.isMeetCriteria == true ? true : false}"
             android:text="@string/sign_up_btn"
+            android:textColor="@color/white"
             android:textSize="20sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/values/colors.xml

@@ -2,4 +2,7 @@
 <resources>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="red">#FFD1180B</color>
+    <color name="gray">#FFD3D3D3</color>
+    <color name="baby_blue">#FFA1CAF1</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -15,6 +15,7 @@
     <!-- sign up-->
     <string name="sign_up_nickname_hint">닉네임을 입력해주세요</string>
     <string name="sign_up_mbti_hint">MBTI를 입력해주세요</string>
+    <string name="sign_up_password_error">비밀번호는 영문,숫자,특수문자를 모두 포함한 6~12글자 이내입니다.</string>
 
     <!-- search -->
     <string name="search_content">Search 화면입니다</string>