From ad2033de7249768e6c5c8ce981c8429365ff3529 Mon Sep 17 00:00:00 2001 From: nazeroo Date: Tue, 23 Jan 2024 09:29:49 +0900 Subject: [PATCH] #130 welcomfragement bug fix --- .idea/appInsightsSettings.xml | 6 +++++ .idea/migrations.xml | 10 ++++++++ .../jjbaksa/ui/signup/WelcomeFragment.kt | 25 +++++++++++++------ 3 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 .idea/appInsightsSettings.xml create mode 100644 .idea/migrations.xml diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml new file mode 100644 index 00000000..6bbe2aee --- /dev/null +++ b/.idea/appInsightsSettings.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 00000000..f8051a6f --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/jjbaksa/jjbaksa/ui/signup/WelcomeFragment.kt b/app/src/main/java/com/jjbaksa/jjbaksa/ui/signup/WelcomeFragment.kt index bf0efeef..3fad8558 100644 --- a/app/src/main/java/com/jjbaksa/jjbaksa/ui/signup/WelcomeFragment.kt +++ b/app/src/main/java/com/jjbaksa/jjbaksa/ui/signup/WelcomeFragment.kt @@ -1,7 +1,9 @@ package com.jjbaksa.jjbaksa.ui.signup import android.annotation.SuppressLint +import android.os.Bundle import android.text.Editable +import android.view.View import androidx.activity.OnBackPressedCallback import androidx.fragment.app.activityViewModels import com.google.android.material.internal.TextWatcherAdapter @@ -15,18 +17,26 @@ import dagger.hilt.android.AndroidEntryPoint class WelcomeFragment : BaseFragment() { private val signUpViewModel: SignUpViewModel by activityViewModels() + protected override var onBackPressedCallBack: OnBackPressedCallback? = object : + OnBackPressedCallback(true) { + override fun handleOnBackPressed() { + activity?.finish() + } + } override val layoutId: Int get() = R.layout.fragment_welcome override fun initView() {} - override fun initEvent() { + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) - requireActivity().onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) { - override fun handleOnBackPressed() { - activity?.finish() - } - } - ) + onBackPressedCallBack?.let { requireActivity().onBackPressedDispatcher.addCallback(it) } + } + + override fun onDetach() { + super.onDetach() + } + override fun initEvent() { with(binding) { @@ -44,7 +54,6 @@ class WelcomeFragment : BaseFragment() { ) buttonWelcomeComplete.setOnClickListener { - signUpViewModel.signUpRequest() signUpViewModel.isSignUpSuccess.observe(viewLifecycleOwner) { if (it) {