6주차 필수,심화

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

@@ -2,42 +2,76 @@ package org.sopt.dosopttemplate.presentation.auth
 
 import android.content.Intent
 import android.os.Bundle
+import android.view.View.INVISIBLE
+import android.view.View.VISIBLE
 import androidx.activity.viewModels
+import androidx.core.content.ContextCompat
 import dagger.hilt.android.AndroidEntryPoint
 import org.sopt.dosopttemplate.R
 import org.sopt.dosopttemplate.data.datasource.local.DoSoptStorage
 import org.sopt.dosopttemplate.databinding.ActivitySignupBinding
 import org.sopt.dosopttemplate.util.UiState
 import org.sopt.dosopttemplate.util.binding.BindingActivity
 import org.sopt.dosopttemplate.util.extension.setOnSingleClickListener
+import org.sopt.dosopttemplate.util.extension.setVisible
 import org.sopt.dosopttemplate.util.extension.showSnackbar
-import java.util.regex.Pattern
 
 @AndroidEntryPoint
 class SignUpActivity : BindingActivity<ActivitySignupBinding>(R.layout.activity_signup) {
 
     private val signUpViewModel: SignUpViewModel by viewModels()
-    private lateinit var id: String
-    private lateinit var pw: String
-    private lateinit var name: String
     private lateinit var mbti: String
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
+        binding.signupViewModel = signUpViewModel
 
         clickSignUpEnd()
+        observeId()
+        observePw()
+        observeSignUpButton()
+    }
+
+    private fun observeSignUpButton() {
+        signUpViewModel.isEnabledLoginButton.observe(this) {
+            binding.btnSignupEnd.isEnabled = it
+        }
+    }
+
+    private fun observePw() {
+        signUpViewModel.pw.observe(this) {
+            if (signUpViewModel.isValidatePassWord(it)) {
+                binding.tvSignupPasswordErrorMessage.setVisible(INVISIBLE)
+                binding.etSignupPw.backgroundTintList =
+                    ContextCompat.getColorStateList(this, R.color.Gray_500)
+            } else {
+                binding.tvSignupPasswordErrorMessage.setVisible(VISIBLE)
+                binding.etSignupPw.backgroundTintList =
+                    ContextCompat.getColorStateList(this, R.color.Pink_500)
+            }
+        }
+    }
+
+    private fun observeId() {
+        signUpViewModel.id.observe(this) {
+            if (signUpViewModel.isValidateId(it)) {
+                binding.tvSignupIdErrorMessage.setVisible(INVISIBLE)
+                binding.etSignupId.backgroundTintList =
+                    ContextCompat.getColorStateList(this, R.color.Gray_500)
+            } else {
+                binding.tvSignupIdErrorMessage.setVisible(VISIBLE)
+                binding.etSignupId.backgroundTintList =
+                    ContextCompat.getColorStateList(this, R.color.Pink_500)
+            }
+        }
     }
 
     private fun clickSignUpEnd() {
         binding.btnSignupEnd.setOnSingleClickListener {
             getSignUpInfo()
-            if (isValidateForm()) {
-                signUpViewModel.signUp(id, pw, name)
-                observeSignUp()
-            } else {
-                showSnackbar(binding.root, getString(R.string.signup_error_message))
-            }
+            signUpViewModel.signUp()
+            observeSignUp()
         }
     }
 
@@ -62,40 +96,9 @@ class SignUpActivity : BindingActivity<ActivitySignupBinding>(R.layout.activity_
 
     private fun getSignUpInfo() {
         with(binding) {
-            id = etSignupId.text.toString()
-            pw = etSignupPw.text.toString()
-            name = etSignupName.text.toString()
             mbti = etSignupMbti.text.toString()
         }
     }
 
-    private fun isValidateForm(): Boolean {
-
-        return isValidateId(id) && isValidatePassWord(pw) && isValidateNickName(name) &&
-                isValidateMbti(mbti)
-    }
 
-    private fun isValidateId(id: String): Boolean {
-        return id.isNotBlank() && ID_REGEX.matcher(id).matches()
-    }
-
-    private fun isValidatePassWord(pw: String): Boolean {
-        return pw.isNotBlank() && PW_REGEX.matcher(pw).matches()
-    }
-
-    private fun isValidateNickName(name: String): Boolean {
-        return name.isNotBlank()
-    }
-
-    private fun isValidateMbti(mbti: String): Boolean {
-        return mbti.isNotBlank()
-    }
-
-    companion object {
-        private const val ID_PATTERN = "(?=.*[a-zA-Z])(?=.*[0-9])[a-zA-Z0-9]{6,10}"
-        private const val PW_PATTERN =
-            "(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[!@#%^&*()])[a-zA-Z0-9!@#%^&*()]{8,12}"
-        val ID_REGEX: Pattern = Pattern.compile(ID_PATTERN)
-        val PW_REGEX: Pattern = Pattern.compile(PW_PATTERN)
-    }
 }

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

@@ -1,13 +1,17 @@
 package org.sopt.dosopttemplate.presentation.auth
 
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.map
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import org.sopt.dosopttemplate.data.repository.auth.AuthRepository
 import org.sopt.dosopttemplate.util.UiState
+import org.sopt.dosopttemplate.util.extension.addSourceList
+import java.util.regex.Pattern
 import javax.inject.Inject
 
 @HiltViewModel
@@ -18,17 +22,57 @@ class SignUpViewModel @Inject constructor(
     private val _signUpResult = MutableLiveData<UiState<Boolean>>()
     val signUpResult: LiveData<UiState<Boolean>> = _signUpResult
 
-    fun signUp(username: String, password: String, nickname: String) {
+    val id = MutableLiveData("")
+    val pw = MutableLiveData("")
+    val nickname = MutableLiveData("")
+    val mbti = MutableLiveData("")
+
+    val isEnabledLoginButton = MediatorLiveData<Boolean>().apply {
+        addSourceList(id, pw, nickname, mbti) { isValidSignUpInfo() }
+    }
+
+    val nicknameLength = nickname.map {
+        it.length
+    }
+
+    fun signUp() {
         viewModelScope.launch {
             authRepository.postSignUpInfo(
-                username = username,
-                password = password,
-                nickname = nickname
+                username = id.value.toString(),
+                password = pw.value.toString(),
+                nickname = nickname.value.toString()
             ).onSuccess { _signUpResult.value = UiState.Success(true) }
 
                 .onFailure { throwable ->
                     _signUpResult.value = throwable.message?.let { UiState.Failure(it) }
                 }
         }
     }
+
+    private fun isValidSignUpInfo() = isValidateId(id.value) && isValidatePassWord(pw.value)
+            && isValidateNickName() && isValidateMbti()
+
+    fun isValidateId(id: String?): Boolean {
+        return id.isNullOrEmpty() || ID_REGEX.matcher(id).matches()
+    }
+
+    fun isValidatePassWord(pw: String?): Boolean {
+        return pw.isNullOrEmpty() || PW_REGEX.matcher(pw).matches()
+    }
+
+    private fun isValidateNickName(): Boolean {
+        return nickname.value?.isNotBlank() ?: false
+    }
+
+    private fun isValidateMbti(): Boolean {
+        return mbti.value?.isNotBlank() ?: false
+    }
+
+    companion object {
+        private const val ID_PATTERN = "(?=.*[a-zA-Z])(?=.*[0-9])[a-zA-Z0-9]{6,10}"
+        private const val PW_PATTERN =
+            "(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[!@#%^&*()])[a-zA-Z0-9!@#%^&*()]{6,12}"
+        val ID_REGEX: Pattern = Pattern.compile(ID_PATTERN)
+        val PW_REGEX: Pattern = Pattern.compile(PW_PATTERN)
+    }
 }

app/src/main/java/org/sopt/dosopttemplate/util/binding/BindingAdapter.kt

@@ -1,5 +1,18 @@
 package org.sopt.dosopttemplate.util.binding
 
+import android.view.View
+import android.widget.TextView
+import androidx.databinding.BindingAdapter
+
 object BindingAdapter {
+    @JvmStatic
+    @BindingAdapter("setSignupZeroErrorTextVisible")
+    fun setSignupZeroErrorTextVisible(view: TextView, length: Int) {
+        if (length == 0) {
+            view.visibility = View.VISIBLE
+        } else {
+            view.visibility = View.INVISIBLE
+        }
+    }
 
 }

app/src/main/java/org/sopt/dosopttemplate/util/extension/MediatorLiveDataExt.kt

@@ -0,0 +1,13 @@
+package org.sopt.dosopttemplate.util.extension
+
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+
+fun <T> MediatorLiveData<T>.addSourceList(
+    vararg liveDataArgument: MutableLiveData<*>,
+    onChanged: () -> T
+) {
+    liveDataArgument.forEach {
+        this.addSource(it) { value = onChanged() }
+    }
+}

app/src/main/java/org/sopt/dosopttemplate/util/extension/ViewExt.kt

@@ -12,6 +12,11 @@ fun showSnackbar(view: View, message: String, isShort: Boolean = true) {
     Snackbar.make(view, message, duration).show()
 }
 
+fun View.setVisible(visibility: Int) {
+    this.visibility = visibility
+}
+
+
 inline fun View.setOnSingleClickListener(
     delay: Long = 500L,
     crossinline block: (View) -> Unit,

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

@@ -5,6 +5,10 @@
 
     <data>
 
+        <variable
+            name="signupViewModel"
+            type="org.sopt.dosopttemplate.presentation.auth.SignUpViewModel" />
+
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -55,10 +59,23 @@
                     android:hint="@string/signup_nickname_hint"
                     android:imeOptions="actionNext"
                     android:inputType="text"
+                    android:text="@={signupViewModel.nickname}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tv_signup_name" />
 
+                <TextView
+                    android:id="@+id/tv_signup_nickname_error_message"
+                    style="@style/Caption2"
+                    setSignupZeroErrorTextVisible="@{signupViewModel.nicknameLength}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/signup_nickname_empty"
+                    android:textColor="@color/Pink_500"
+                    android:visibility="invisible"
+                    app:layout_constraintEnd_toEndOf="@+id/et_signup_name"
+                    app:layout_constraintTop_toBottomOf="@+id/et_signup_name" />
+
                 <TextView
                     android:id="@+id/tv_signup_id"
                     style="@style/Headline"
@@ -81,10 +98,22 @@
                     android:hint="@string/signup_id_hint"
                     android:imeOptions="actionNext"
                     android:inputType="text"
+                    android:text="@={signupViewModel.id}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tv_signup_id" />
 
+                <TextView
+                    android:id="@+id/tv_signup_id_error_message"
+                    style="@style/Caption2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/signup_id_error"
+                    android:textColor="@color/Pink_500"
+                    android:visibility="invisible"
+                    app:layout_constraintEnd_toEndOf="@+id/et_signup_id"
+                    app:layout_constraintTop_toBottomOf="@+id/et_signup_id" />
+
                 <TextView
                     android:id="@+id/tv_signup_pw"
                     style="@style/Headline"
@@ -106,10 +135,22 @@
                     android:hint="@string/signup_pw_hint"
                     android:imeOptions="actionNext"
                     android:inputType="textPassword"
+                    android:text="@={signupViewModel.pw}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tv_signup_pw" />
 
+                <TextView
+                    android:id="@+id/tv_signup_password_error_message"
+                    style="@style/Caption2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/signup_pw_error"
+                    android:textColor="@color/Pink_500"
+                    android:visibility="invisible"
+                    app:layout_constraintEnd_toEndOf="@+id/et_signup_pw"
+                    app:layout_constraintTop_toBottomOf="@+id/et_signup_pw" />
+
                 <TextView
                     android:id="@+id/tv_signup_mbti"
                     style="@style/Headline"
@@ -131,6 +172,7 @@
                     android:hint="@string/signup_mbti_hint"
                     android:imeOptions="actionDone"
                     android:inputType="text"
+                    android:text="@={signupViewModel.mbti}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tv_signup_mbti" />
@@ -145,6 +187,7 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="30dp"
             android:layout_marginBottom="40dp"
+            android:enabled="false"
             android:text="@string/signup_complete"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -29,6 +29,9 @@
     <string name="signup_complete_message">회원가입이 완료되었습니다</string>
     <string name="signup_error_message">올바른 정보를 입력해주세요</string>
     <string name="signup_fail_message">회원가입에 실패하였습니다.</string>
+    <string name="signup_id_error">숫자와 영문자 조합으로 6~10자를 사용해주세요</string>
+    <string name="signup_pw_error">영문,숫자, 특수문자를 포함한 6~12글자 이내를 사용해주세요</string>
+    <string name="signup_nickname_empty">닉네임이 입력되지 않았습니다</string>
 
     <!-- 메인 페이지 -->
     <string name="mainpage_id">ID</string>