Merge pull request #162 from Late-Night-Restaurant/refactor/#148-ui-s…

…ignup Refactor: 회원가입 비밀번호 및 프로필 폼 수정
Late-Night-Restaurant · May 6, 2023 · 9c493fa · 9c493fa
2 parents 9010802 + bf12607
commit 9c493fa
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/...rc/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupProfileFragment.kt b/...rc/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupProfileFragment.kt
@@ -41,7 +41,6 @@ class SignupProfileFragment : BaseFragment<FragmentSignupProfileBinding>(
 ) {
     private lateinit var signupViewModel: SignupViewModel
 
-
     private lateinit var getResult: ActivityResultLauncher<Intent>
     private var getUri: Uri? = null
     private var getPath: String? = null
@@ -58,6 +57,10 @@ class SignupProfileFragment : BaseFragment<FragmentSignupProfileBinding>(
             checkEmpty()
         })
 
+        binding.btnSignupProfileNext.setOnClickListener{
+            Navigation.findNavController(view)
+                .navigate(R.id.action_signupProfileFragment_to_signupFinFragment)
+        }
         getResult =
             registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
                 if (result.resultCode == REQUEST_CODE_FOR_INTENT) {

diff --git a/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupPwFragment.kt b/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupPwFragment.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -35,10 +36,18 @@ class SignupPwFragment: BaseFragment<FragmentSignupPwBinding>(R.layout.fragment_
             pwEmpty()
         })
         binding.btnSignupNextPw.setOnClickListener {
-            Navigation.findNavController(view)
-                .navigate(R.id.action_signupPwFragment_to_signupProfileFragment)
+            if(checkEqualPassword()){
+                Navigation.findNavController(view)
+                    .navigate(R.id.action_signupPwFragment_to_signupProfileFragment)
+            }else{
+                binding.tilRePwSignupInput.error = "입력하신 비밀번호와 일치하지 않습니다."
+            }
         }
     }
+    private fun checkEqualPassword(): Boolean {
+        return signupViewModel.matchPwCheck()
+    }
+
     private fun pwEmpty(){
         binding.btnSignupNextPw.isEnabled = signupViewModel.pwEmptyCheck()
         binding.btnSignupNextPw.isClickable = signupViewModel.pwEmptyCheck()

diff --git a/app/src/main/java/com/example/simya/src/ui/viewmodel/login/signup/SignupViewModel.kt b/app/src/main/java/com/example/simya/src/ui/viewmodel/login/signup/SignupViewModel.kt
@@ -23,18 +23,18 @@ class SignupViewModel : ViewModel() {
     val agreeService = MutableLiveData<Boolean>()
 
     // 이메일
-    val email = MutableLiveData<String>()
+    val email = MutableLiveData<String>("")
 
     // 패스워드
-    val pw = MutableLiveData<String>()
+    val pw = MutableLiveData<String>("")
 
     // 재입력
-    val rePw = MutableLiveData<String>()
+    val rePw = MutableLiveData<String>("")
 
     // 닉네임
-    val nickname = MutableLiveData<String>()
+    val nickname = MutableLiveData<String>("")
     // 한줄 소개
-    val comment = MutableLiveData<String>()
+    val comment = MutableLiveData<String>("")
 
     init{
         agreeAll.value = false

diff --git a/app/src/main/res/layout/fragment_signup_profile.xml b/app/src/main/res/layout/fragment_signup_profile.xml
@@ -110,7 +110,7 @@
                     android:hint="@string/signup_profile_nick_hint"
                     android:inputType="text"
                     android:backgroundTint="@color/Gray_06"
-                    android:text="@{signupViewModel.nickname}"/>
+                    android:text="@={signupViewModel.nickname}"/>
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
@@ -142,7 +142,7 @@
                     android:hint="@string/signup_profile_intro_hint"
                     android:inputType="text"
                     android:backgroundTint="@color/Gray_06"
-                    android:text="@{signupViewModel.comment}"/>
+                    android:text="@={signupViewModel.comment}"/>
             </com.google.android.material.textfield.TextInputLayout>
 
         </LinearLayout>
@@ -167,5 +167,6 @@
             android:enabled="false"/>
 
 
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>