From 4c61e0facb9fc511eb7e00f97a537b3b41b4b4b8 Mon Sep 17 00:00:00 2001
From: gaeun <geun5744@gmail.com>
Date: Thu, 29 Jun 2023 15:34:38 +0900
Subject: [PATCH] =?UTF-8?q?[Feature/#9]=20=EC=96=91=EB=B0=A9=ED=96=A5=20da?=
 =?UTF-8?q?taBinding=EC=9D=84=20=EC=9D=B4=EC=9A=A9=ED=95=9C=20=EC=A0=95?=
 =?UTF-8?q?=EA=B7=9C=EC=8B=9D=20=EA=B2=80=EC=82=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sopt/present/loginPage/SignUpActivity.kt  |  93 ++++--
 .../present/viewModel/LoginPageViewModel.kt   |   3 +
 app/src/main/res/layout/activity_signup.xml   | 305 +++++++++---------
 3 files changed, 220 insertions(+), 181 deletions(-)

diff --git a/app/src/main/java/org/android/go/sopt/present/loginPage/SignUpActivity.kt b/app/src/main/java/org/android/go/sopt/present/loginPage/SignUpActivity.kt
index ca8e13b..ac420c5 100644
--- a/app/src/main/java/org/android/go/sopt/present/loginPage/SignUpActivity.kt
+++ b/app/src/main/java/org/android/go/sopt/present/loginPage/SignUpActivity.kt
@@ -1,20 +1,22 @@
 package org.android.go.sopt.present.loginPage
 
 import android.content.Intent
+import android.content.res.ColorStateList
 import android.os.Bundle
-import android.text.Editable
 import android.view.MotionEvent
+import android.view.View
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.viewModels
-import org.android.go.sopt.MainActivity
+import org.android.go.sopt.R
 import org.android.go.sopt.RequestSignUpDto
 import org.android.go.sopt.databinding.ActivitySignupBinding
 import org.android.go.sopt.present.viewModel.LoginPageViewModel
 import org.android.go.sopt.util.ViewModelFactory
 import org.android.go.sopt.util.hideKeyboard
 import org.android.go.sopt.util.makeToastMessage
-import android.text.TextWatcher as TextWatcher
+import java.util.regex.Pattern
 
 class SignUpActivity : AppCompatActivity() {
 
@@ -26,6 +28,13 @@ class SignUpActivity : AppCompatActivity() {
         binding = ActivitySignupBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        with(binding) {
+            vmSignUp = viewModel
+            lifecycleOwner = this@SignUpActivity
+            etId.doAfterTextChanged { checkValidSignUpId() }
+            etPassword.doAfterTextChanged { checkValidSignUpPwd() }
+        }
+
         signUp()
         observeIsSignUpSuccess()
     }
@@ -42,21 +51,16 @@ class SignUpActivity : AppCompatActivity() {
     }
 
     private fun signUp() {
-        canClickButton()
         binding.btnSignup.setOnClickListener {
-            if (binding.etId.text.length in 6..10 && binding.etPassword.text.length in 8..12) {
-                with(binding) {
-                    viewModel.signUp(
-                        RequestSignUpDto(
-                            etId.text.toString(),
-                            etPassword.text.toString(),
-                            etName.text.toString(),
-                            etSpeciality.text.toString(),
-                        ),
-                    )
-                }
-            } else {
-                makeToastMessage("회원가입 조건 미충족")
+            with(binding) {
+                viewModel.signUp(
+                    RequestSignUpDto(
+                        etId.text.toString(),
+                        etPassword.text.toString(),
+                        etName.text.toString(),
+                        etSpeciality.text.toString(),
+                    ),
+                )
             }
         }
     }
@@ -75,28 +79,47 @@ class SignUpActivity : AppCompatActivity() {
         }
     }
 
-    private fun canClickButton() {
-        with(binding) {
-            btnSignup.isEnabled = false
-
-            val textWatcher: TextWatcher = object : TextWatcher {
-                override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
-                }
+    private fun checkValidSignUpId(): Boolean {
+        var correctId = false
 
-                override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
-                    if (etId.text.length in 6..10 && etPassword.text.length in 8..12) {
-                        btnSignup.isEnabled = true
-                    }
-                }
+        val idPattern = "^(?=.*\\d)(?=.*[a-zA-Z]).{6,10}\$"
 
-                override fun afterTextChanged(p0: Editable?) {
-                }
+        viewModel.signUpId.observe(this) { id ->
+            correctId = Pattern.matches(idPattern, id)
+            if (!correctId) {
+                binding.tvIdWarn.visibility = View.VISIBLE
+                correctId = false
+                binding.etId.backgroundTintList = ColorStateList.valueOf(getColor(R.color.red_500))
+            } else {
+                binding.tvIdWarn.visibility = View.GONE
+                correctId = true
+                binding.etId.backgroundTintList = ColorStateList.valueOf(getColor(R.color.black))
             }
+        }
 
-            etId.addTextChangedListener(textWatcher)
-            etPassword.addTextChangedListener(textWatcher)
-            etName.addTextChangedListener(textWatcher)
-            etSpeciality.addTextChangedListener(textWatcher)
+        return correctId
+    }
+
+    private fun checkValidSignUpPwd(): Boolean {
+        var correctPw = false
+
+        val pwPattern = "^(?=.*[A-Za-z])(?=.*[0-9])(?=.*[\$@\$!%*#?&]).{6,12}\$"
+
+        viewModel.signUpPwd.observe(this) { pwd ->
+            correctPw = Pattern.matches(pwPattern, pwd)
+            if (!correctPw) {
+                binding.tvPwWarn.visibility = View.VISIBLE
+                correctPw = false
+                binding.etPassword.backgroundTintList =
+                    ColorStateList.valueOf(getColor(R.color.red_500))
+            } else {
+                binding.tvPwWarn.visibility = View.GONE
+                correctPw = true
+                binding.etPassword.backgroundTintList =
+                    ColorStateList.valueOf(getColor(R.color.black))
+            }
         }
+
+        return correctPw
     }
 }
diff --git a/app/src/main/java/org/android/go/sopt/present/viewModel/LoginPageViewModel.kt b/app/src/main/java/org/android/go/sopt/present/viewModel/LoginPageViewModel.kt
index 94051f4..c935ef8 100644
--- a/app/src/main/java/org/android/go/sopt/present/viewModel/LoginPageViewModel.kt
+++ b/app/src/main/java/org/android/go/sopt/present/viewModel/LoginPageViewModel.kt
@@ -23,6 +23,9 @@ class LoginPageViewModel(private val loginPageRepoImpl: LoginPageRepoImpl) : Vie
     private val _getMyProfile = MutableLiveData<MyProfileDto>()
     val getMyProfile: LiveData<MyProfileDto> get() = _getMyProfile
 
+    val signUpId: MutableLiveData<String> = MutableLiveData("")
+    val signUpPwd: MutableLiveData<String> = MutableLiveData("")
+
     fun login(request: RequestLogInDto) = viewModelScope.launch {
         kotlin.runCatching {
             loginPageRepoImpl.login(request)
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
index b3768e1..75ae5e4 100644
--- a/app/src/main/res/layout/activity_signup.xml
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -1,148 +1,161 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/tv_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="SIGNUP"
-        android:textSize="32sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.1" />
-
-    <TextView
-        android:id="@+id/tv_id"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        android:text="ID"
-        android:textSize="20sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@id/et_id"
-        app:layout_constraintStart_toStartOf="@id/et_id"
-        app:layout_constraintTop_toBottomOf="@id/tv_title" />
-
-    <EditText
-        android:id="@+id/et_id"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="30dp"
-        android:hint="아이디를 입력하세요"
-        android:inputType="text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_id" />
-
-    <TextView
-        android:id="@+id/tv_id_warn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="ID 조건: 영문, 숫자가 포함되어야 하고 6~10글자 이내"
-        app:layout_constraintTop_toBottomOf="@id/et_id"
-        app:layout_constraintStart_toStartOf="@id/et_id"
-        android:textSize="8sp"
-        android:visibility="invisible"
-        android:textColor="@color/red_500"/>
-
-
-
-    <TextView
-        android:id="@+id/tv_password"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        android:text="비밀번호"
-        android:textSize="20sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@id/et_password"
-        app:layout_constraintStart_toStartOf="@id/et_id"
-        app:layout_constraintTop_toBottomOf="@id/et_id" />
-
-
-    <EditText
-        android:id="@+id/et_password"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:hint="비밀번호를 입력하세요"
-        android:inputType="textPassword"
-        app:layout_constraintEnd_toEndOf="@id/et_id"
-        app:layout_constraintStart_toStartOf="@id/et_id"
-        app:layout_constraintTop_toBottomOf="@id/tv_password" />
-
-    <TextView
-        android:id="@+id/tv_pw_warn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Password 조건: 영문, 숫자, 특수문자가 포함되어야 하고 6~12글자 이내"
-        app:layout_constraintTop_toBottomOf="@id/et_password"
-        app:layout_constraintStart_toStartOf="@id/et_password"
-        android:textSize="8sp"
-        android:visibility="invisible"
-        android:textColor="@color/red_500"/>
-
-    <TextView
-        android:id="@+id/tv_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        android:text="이름"
-        android:textSize="20sp"
-
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="@id/et_id"
-        app:layout_constraintTop_toBottomOf="@id/et_password" />
-
-    <EditText
-        android:id="@+id/et_name"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:hint="이름 입력하세요"
-        android:inputType="text"
-        app:layout_constraintEnd_toEndOf="@id/et_id"
-        app:layout_constraintStart_toStartOf="@id/et_id"
-        app:layout_constraintTop_toBottomOf="@id/tv_name" />
-
-    <TextView
-        android:id="@+id/tv_speciality"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        android:text="특기"
-        android:textSize="20sp"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="@id/et_id"
-        app:layout_constraintTop_toBottomOf="@id/et_name" />
-
-    <EditText
-        android:id="@+id/et_speciality"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:hint="MBTI를 입력하세요"
-        android:inputType="text"
-        app:layout_constraintEnd_toEndOf="@id/et_id"
-        app:layout_constraintStart_toStartOf="@id/et_id"
-        app:layout_constraintTop_toBottomOf="@id/tv_speciality" />
-
-
-    <Button
-        android:id="@+id/btn_signup"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:padding="10dp"
-        android:text="회원가입 완료"
-        app:layout_constraintEnd_toEndOf="@id/et_id"
-        app:layout_constraintStart_toStartOf="@id/et_id"
-        app:layout_constraintTop_toBottomOf="@id/et_speciality" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="vmSignUp"
+            type="org.android.go.sopt.present.viewModel.LoginPageViewModel" />
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="SIGNUP"
+            android:textSize="32sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.1" />
+
+        <TextView
+            android:id="@+id/tv_id"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:text="ID"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@id/et_id"
+            app:layout_constraintStart_toStartOf="@id/et_id"
+            app:layout_constraintTop_toBottomOf="@id/tv_title" />
+
+        <EditText
+            android:id="@+id/et_id"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="30dp"
+            android:hint="아이디를 입력하세요"
+            android:inputType="text"
+            android:text="@={vmSignUp.signUpId}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_id" />
+
+        <TextView
+            android:id="@+id/tv_id_warn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="ID 조건: 영문, 숫자가 포함되어야 하고 6~10글자 이내"
+            android:textColor="@color/red_500"
+            android:textSize="8sp"
+            android:visibility="invisible"
+            app:layout_constraintStart_toStartOf="@id/et_id"
+            app:layout_constraintTop_toBottomOf="@id/et_id" />
+
+
+        <TextView
+            android:id="@+id/tv_password"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:text="비밀번호"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@id/et_password"
+            app:layout_constraintStart_toStartOf="@id/et_id"
+            app:layout_constraintTop_toBottomOf="@id/et_id" />
+
+
+        <EditText
+            android:id="@+id/et_password"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:hint="비밀번호를 입력하세요"
+            android:inputType="textPassword"
+            android:text="@={vmSignUp.signUpPwd}"
+            app:layout_constraintEnd_toEndOf="@id/et_id"
+            app:layout_constraintStart_toStartOf="@id/et_id"
+            app:layout_constraintTop_toBottomOf="@id/tv_password" />
+
+        <TextView
+            android:id="@+id/tv_pw_warn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Password 조건: 영문, 숫자, 특수문자가 포함되어야 하고 6~12글자 이내"
+            android:textColor="@color/red_500"
+            android:textSize="8sp"
+            android:visibility="invisible"
+            app:layout_constraintStart_toStartOf="@id/et_password"
+            app:layout_constraintTop_toBottomOf="@id/et_password" />
+
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:text="이름"
+            android:textSize="20sp"
+
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="@id/et_id"
+            app:layout_constraintTop_toBottomOf="@id/et_password" />
+
+        <EditText
+            android:id="@+id/et_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:hint="이름 입력하세요"
+            android:inputType="text"
+            app:layout_constraintEnd_toEndOf="@id/et_id"
+            app:layout_constraintStart_toStartOf="@id/et_id"
+            app:layout_constraintTop_toBottomOf="@id/tv_name" />
+
+        <TextView
+            android:id="@+id/tv_speciality"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:text="특기"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="@id/et_id"
+            app:layout_constraintTop_toBottomOf="@id/et_name" />
+
+        <EditText
+            android:id="@+id/et_speciality"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:hint="MBTI를 입력하세요"
+            android:inputType="text"
+            app:layout_constraintEnd_toEndOf="@id/et_id"
+            app:layout_constraintStart_toStartOf="@id/et_id"
+            app:layout_constraintTop_toBottomOf="@id/tv_speciality" />
+
+
+        <Button
+            android:id="@+id/btn_signup"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="50dp"
+            android:padding="10dp"
+            android:text="회원가입 완료"
+            app:layout_constraintEnd_toEndOf="@id/et_id"
+            app:layout_constraintStart_toStartOf="@id/et_id"
+            app:layout_constraintTop_toBottomOf="@id/et_speciality" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file