From f6a2f90b42d47ffdc8abddbfdab218b1ea4913f3 Mon Sep 17 00:00:00 2001 From: CHOI <32347874+CHOI97@users.noreply.github.com> Date: Fri, 5 May 2023 15:01:16 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Refactor:=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=20BackHandler=20->=20=20popUpTo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/simya/config/BaseActivity.kt | 3 --- .../com/example/simya/config/BaseFragment.kt | 16 ++++++++++------ .../simya/src/ui/view/gallery/GalleryActivity.kt | 2 ++ .../login/signup/fragment/SignupAgreeFragment.kt | 1 + .../login/signup/fragment/SignupEmailFragment.kt | 1 - app/src/main/res/navigation/nav_sign_graph.xml | 14 ++++++++++---- 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/example/simya/config/BaseActivity.kt b/app/src/main/java/com/example/simya/config/BaseActivity.kt index 6be9305..de59d96 100644 --- a/app/src/main/java/com/example/simya/config/BaseActivity.kt +++ b/app/src/main/java/com/example/simya/config/BaseActivity.kt @@ -45,9 +45,6 @@ abstract class BaseActivity(@LayoutRes val layoutRes: Int) mLoadingDialog.dismiss() } } - override fun onBackPressed() { - finish() - } fun backApplicationExit(context: Context){ ExitDialog("앱을 종료하시겠어요?",context).show() } diff --git a/app/src/main/java/com/example/simya/config/BaseFragment.kt b/app/src/main/java/com/example/simya/config/BaseFragment.kt index df9274d..e0ab747 100644 --- a/app/src/main/java/com/example/simya/config/BaseFragment.kt +++ b/app/src/main/java/com/example/simya/config/BaseFragment.kt @@ -2,8 +2,6 @@ package com.example.simya.config import android.content.Context import android.os.Bundle -import android.os.Handler -import android.os.Looper import android.util.Log import android.view.LayoutInflater import android.view.View @@ -14,6 +12,7 @@ import androidx.databinding.DataBindingUtil import androidx.databinding.ViewDataBinding import androidx.fragment.app.Fragment import androidx.viewbinding.ViewBinding +import com.example.simya.src.ui.view.login.signup.fragment.SignupEmailFragment import com.example.simya.util.dialog.ExitDialog import com.example.simya.util.dialog.LoadingDialog @@ -23,6 +22,11 @@ abstract class BaseFragment( private var _binding: B? = null protected val binding get() = _binding!! +// val callback = object: OnBackPressedCallback(true){ +// override fun handleOnBackPressed() { +// +// } +// } lateinit var mLoadingDialog: LoadingDialog override fun onCreateView( @@ -39,8 +43,8 @@ abstract class BaseFragment( } override fun onDestroyView() { - _binding = null super.onDestroyView() + _binding = null } fun showLoadingDialog(context: Context) { @@ -54,8 +58,8 @@ abstract class BaseFragment( } } - fun backApplicationExit(context: Context){ - ExitDialog("앱을 종료하시겠어요?",context).show() - } +// fun backApplicationExit(context: Context){ +// ExitDialog("앱을 종료하시겠어요?",context).show() +// } } \ No newline at end of file diff --git a/app/src/main/java/com/example/simya/src/ui/view/gallery/GalleryActivity.kt b/app/src/main/java/com/example/simya/src/ui/view/gallery/GalleryActivity.kt index abe58c8..3be3081 100644 --- a/app/src/main/java/com/example/simya/src/ui/view/gallery/GalleryActivity.kt +++ b/app/src/main/java/com/example/simya/src/ui/view/gallery/GalleryActivity.kt @@ -33,11 +33,13 @@ class GalleryActivity: BaseActivity(R.layout.activity_ // private val adapter = GalleryAdapter() private lateinit var cropLayout: CropLayout private val PERMISSIONS_REQUEST_CODE = 100 + private var REQUIRED_PERMISSIONS =if(Build.VERSION.SDK_INT <33){ arrayOf(android.Manifest.permission.READ_EXTERNAL_STORAGE) }else{ arrayOf(android.Manifest.permission.READ_MEDIA_IMAGES) } + override fun init() { cropLayout = binding.clCropper binding.ibCropAble.onThrottleClick { diff --git a/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupAgreeFragment.kt b/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupAgreeFragment.kt index 2b739cb..f72d24e 100644 --- a/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupAgreeFragment.kt +++ b/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupAgreeFragment.kt @@ -1,5 +1,6 @@ package com.example.simya.src.ui.view.login.signup.fragment +import android.content.Context import android.content.Intent import android.os.Bundle import android.util.Log diff --git a/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupEmailFragment.kt b/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupEmailFragment.kt index 01f81ed..838b913 100644 --- a/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupEmailFragment.kt +++ b/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupEmailFragment.kt @@ -2,7 +2,6 @@ package com.example.simya.src.ui.view.login.signup.fragment import android.os.Bundle -import android.util.Log import android.view.View import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider diff --git a/app/src/main/res/navigation/nav_sign_graph.xml b/app/src/main/res/navigation/nav_sign_graph.xml index abe6678..727e663 100644 --- a/app/src/main/res/navigation/nav_sign_graph.xml +++ b/app/src/main/res/navigation/nav_sign_graph.xml @@ -11,7 +11,9 @@ android:label="SignupAgreeFragment" > + app:destination="@id/signupEmailFragment" + app:popUpTo="@id/signupAgreeFragment" + app:popUpToInclusive="false" /> @@ -21,7 +23,8 @@ android:label="SignupEmailFragment" > + app:destination="@id/signupPwFragment" + app:popUpTo="@id/signupEmailFragment" /> @@ -31,7 +34,9 @@ android:label="SignupPwFragment" > + app:destination="@id/signupProfileFragment" + app:popUpTo="@id/signupPwFragment" + app:popUpToInclusive="false" /> @@ -41,7 +46,8 @@ android:label="SignupProfileFragment" > + app:destination="@id/signupFinFragment" + app:popUpTo="@id/signupProfileFragment" /> From b4e9ba3f52b4d062cbd8298b96d73a8e214af43a Mon Sep 17 00:00:00 2001 From: CHOI <32347874+CHOI97@users.noreply.github.com> Date: Fri, 5 May 2023 15:06:01 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Fix:=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85?= =?UTF-8?q?=20=EC=A7=84=ED=96=89=EB=B0=94=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/login/signup/fragment/SignupAgreeFragment.kt | 3 +-- .../view/login/signup/fragment/SignupEmailFragment.kt | 3 +-- .../login/signup/fragment/SignupProfileFragment.kt | 2 +- .../ui/view/login/signup/fragment/SignupPwFragment.kt | 3 +-- .../src/ui/viewmodel/login/signup/SignupViewModel.kt | 11 ++--------- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupAgreeFragment.kt b/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupAgreeFragment.kt index f72d24e..a10249d 100644 --- a/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupAgreeFragment.kt +++ b/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupAgreeFragment.kt @@ -29,11 +29,10 @@ class SignupAgreeFragment : // signupViewModel = ViewModelProvider(requireActivity())[SignupViewModel::class.java] signupViewModel = ViewModelProvider(activity as SignupActivity)[SignupViewModel::class.java] binding.signupAgreeViewModel = signupViewModel - + signupViewModel.setSignupProgress(25) binding.btnSignupAgreeNext.setOnClickListener { Navigation.findNavController(view) .navigate(R.id.action_signupAgreeFragment_to_signupEmailFragment) - signupViewModel.increaseProgress() } // 동의 체크 버튼 viewModel diff --git a/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupEmailFragment.kt b/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupEmailFragment.kt index 838b913..dc7ec75 100644 --- a/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupEmailFragment.kt +++ b/app/src/main/java/com/example/simya/src/ui/view/login/signup/fragment/SignupEmailFragment.kt @@ -22,7 +22,7 @@ class SignupEmailFragment : // signupViewModel = ViewModelProvider(requireActivity())[SignupViewModel::class.java] signupViewModel = ViewModelProvider(activity as SignupActivity)[SignupViewModel::class.java] binding.signupViewModel = signupViewModel - + signupViewModel.setSignupProgress(50) signupViewModel.email.observe(viewLifecycleOwner, Observer { emailEmpty() }) @@ -30,7 +30,6 @@ class SignupEmailFragment : binding.btnSignupNextEmail.setOnClickListener { Navigation.findNavController(view) .navigate(R.id.action_signupEmailFragment_to_signupPWFragment) - signupViewModel.increaseProgress() } } private fun emailEmpty(){ 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 7adc072..843fa7c 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 @@ -50,7 +50,7 @@ class SignupProfileFragment : BaseFragment( super.onViewCreated(view, savedInstanceState) signupViewModel = ViewModelProvider(activity as SignupActivity)[SignupViewModel::class.java] binding.signupViewModel = signupViewModel - + signupViewModel.setSignupProgress(100) signupViewModel.nickname.observe(viewLifecycleOwner, Observer { checkEmpty() }) 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 993e97b..50be8ff 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 @@ -27,7 +27,7 @@ class SignupPwFragment: BaseFragment(R.layout.fragment_ super.onViewCreated(view, savedInstanceState) signupViewModel = ViewModelProvider(activity as SignupActivity)[SignupViewModel::class.java] binding.signupViewModel = signupViewModel - + signupViewModel.setSignupProgress(75) signupViewModel.pw.observe(viewLifecycleOwner,Observer{ pwEmpty() }) @@ -37,7 +37,6 @@ class SignupPwFragment: BaseFragment(R.layout.fragment_ binding.btnSignupNextPw.setOnClickListener { Navigation.findNavController(view) .navigate(R.id.action_signupPwFragment_to_signupProfileFragment) - signupViewModel.increaseProgress() } } private fun pwEmpty(){ 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 63569ed..7c32958 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 @@ -59,15 +59,8 @@ class SignupViewModel : ViewModel() { } // 진행바 증가 - fun increaseProgress() { - _progressStatus.value = _progressStatus.value?.plus(25) - Log.d("increaseProgress","Progressbar is + 25") - Log.d("progress value",progressStatus.value.toString()) - } - - // 진행바 감소 - fun decreaseProgress() { - _progressStatus.value = _progressStatus.value?.minus(25) + fun setSignupProgress(statusValue: Int) { + _progressStatus.value = statusValue } // 동의화면 "모두 동의합니다" 클릭시 From de9fdec425e621d607f5d07f183b8b5aea946c10 Mon Sep 17 00:00:00 2001 From: CHOI <32347874+CHOI97@users.noreply.github.com> Date: Fri, 5 May 2023 15:11:25 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Feat:=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=20=ED=99=94=EB=A9=B4=EC=A0=84=ED=99=98=EB=B3=84=20?= =?UTF-8?q?=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4=EC=85=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/navigation/nav_sign_graph.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/src/main/res/navigation/nav_sign_graph.xml b/app/src/main/res/navigation/nav_sign_graph.xml index 727e663..13a6184 100644 --- a/app/src/main/res/navigation/nav_sign_graph.xml +++ b/app/src/main/res/navigation/nav_sign_graph.xml @@ -12,6 +12,10 @@ @@ -24,6 +28,10 @@ @@ -35,6 +43,10 @@ @@ -47,6 +59,10 @@