From 0ae272cff296110780bc900591e20c6844fc4c70 Mon Sep 17 00:00:00 2001 From: CHOI <32347874+CHOI97@users.noreply.github.com> Date: Sat, 6 May 2023 15:51:07 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Fix:=20=ED=94=84=EB=A1=9C=ED=95=84=20?= =?UTF-8?q?=EB=8B=89=EB=84=A4=EC=9E=84,=20=EC=BD=94=EB=A9=98=ED=8A=B8=20Ob?= =?UTF-8?q?serve=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../login/signup/fragment/SignupProfileFragment.kt | 6 +++++- .../ui/view/login/signup/fragment/SignupPwFragment.kt | 3 +++ .../src/ui/viewmodel/login/signup/SignupViewModel.kt | 10 +++++----- app/src/main/res/layout/fragment_signup_profile.xml | 5 +++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupProfileFragment.kt b/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupProfileFragment.kt index 843fa7c..6ffcee5 100644 --- a/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupProfileFragment.kt +++ b/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupProfileFragment.kt @@ -41,7 +41,6 @@ class SignupProfileFragment : BaseFragment( ) { private lateinit var signupViewModel: SignupViewModel - private lateinit var getResult: ActivityResultLauncher private var getUri: Uri? = null private var getPath: String? = null @@ -53,9 +52,11 @@ class SignupProfileFragment : BaseFragment( signupViewModel.setSignupProgress(100) signupViewModel.nickname.observe(viewLifecycleOwner, Observer { checkEmpty() + Log.d("nick","Observe") }) signupViewModel.comment.observe(viewLifecycleOwner, Observer { checkEmpty() + Log.d("comment","Observe") }) getResult = @@ -73,5 +74,8 @@ class SignupProfileFragment : BaseFragment( private fun checkEmpty(){ binding.btnSignupProfileNext.isEnabled = signupViewModel.profileEmptyCheck() binding.btnSignupProfileNext.isClickable = signupViewModel.profileEmptyCheck() + + Log.d("next Enabled", binding.btnSignupProfileNext.isEnabled.toString()) + Log.d("next Enabled", binding.btnSignupProfileNext.isClickable.toString()) } } \ No newline at end of file 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 index 50be8ff..985127a 100644 --- 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 @@ -29,10 +30,12 @@ class SignupPwFragment: BaseFragment(R.layout.fragment_ binding.signupViewModel = signupViewModel signupViewModel.setSignupProgress(75) signupViewModel.pw.observe(viewLifecycleOwner,Observer{ + Log.d("pw","Observe") pwEmpty() }) signupViewModel.rePw.observe(viewLifecycleOwner,Observer{ pwEmpty() + Log.d("repw","Observe") }) binding.btnSignupNextPw.setOnClickListener { Navigation.findNavController(view) 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 index 7c32958..c5d632e 100644 --- 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() // 이메일 - val email = MutableLiveData() + val email = MutableLiveData("") // 패스워드 - val pw = MutableLiveData() + val pw = MutableLiveData("") // 재입력 - val rePw = MutableLiveData() + val rePw = MutableLiveData("") // 닉네임 - val nickname = MutableLiveData() + val nickname = MutableLiveData("") // 한줄 소개 - val comment = MutableLiveData() + val comment = MutableLiveData("") 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 index da5a7cc..3cff0aa 100644 --- 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}"/> + android:text="@={signupViewModel.comment}"/> @@ -167,5 +167,6 @@ android:enabled="false"/> + From bf1260730a0108bb01bf47b0d136ca6acfddad12 Mon Sep 17 00:00:00 2001 From: CHOI <32347874+CHOI97@users.noreply.github.com> Date: Sat, 6 May 2023 15:58:20 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Refactor:=20=EB=B9=84=EB=B0=80=EB=B2=88?= =?UTF-8?q?=ED=98=B8,=20=EC=9E=AC=EC=9E=85=EB=A0=A5=20=ED=99=95=EC=9D=B8?= =?UTF-8?q?=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95=20/=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EA=B0=80=EC=9E=85=20=EC=A7=84=ED=96=89=ED=8F=BC=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../login/signup/fragment/SignupProfileFragment.kt | 9 ++++----- .../view/login/signup/fragment/SignupPwFragment.kt | 14 ++++++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupProfileFragment.kt b/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupProfileFragment.kt index 6ffcee5..86666a8 100644 --- a/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupProfileFragment.kt +++ b/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupProfileFragment.kt @@ -52,13 +52,15 @@ class SignupProfileFragment : BaseFragment( signupViewModel.setSignupProgress(100) signupViewModel.nickname.observe(viewLifecycleOwner, Observer { checkEmpty() - Log.d("nick","Observe") }) signupViewModel.comment.observe(viewLifecycleOwner, Observer { checkEmpty() - Log.d("comment","Observe") }) + 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) { @@ -74,8 +76,5 @@ class SignupProfileFragment : BaseFragment( private fun checkEmpty(){ binding.btnSignupProfileNext.isEnabled = signupViewModel.profileEmptyCheck() binding.btnSignupProfileNext.isClickable = signupViewModel.profileEmptyCheck() - - Log.d("next Enabled", binding.btnSignupProfileNext.isEnabled.toString()) - Log.d("next Enabled", binding.btnSignupProfileNext.isClickable.toString()) } } \ No newline at end of file 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 index 985127a..d145b43 100644 --- 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 @@ -30,18 +30,24 @@ class SignupPwFragment: BaseFragment(R.layout.fragment_ binding.signupViewModel = signupViewModel signupViewModel.setSignupProgress(75) signupViewModel.pw.observe(viewLifecycleOwner,Observer{ - Log.d("pw","Observe") pwEmpty() }) signupViewModel.rePw.observe(viewLifecycleOwner,Observer{ pwEmpty() - Log.d("repw","Observe") }) 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()