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

…ignup Refactor: 회원가입 popUpTo, Aim 추가
Late-Night-Restaurant · May 5, 2023 · 9010802 · 9010802
2 parents 61a4e3a + de9fdec
commit 9010802
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 30 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
@@ -45,9 +45,6 @@ abstract class BaseActivity<B : ViewDataBinding>(@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
@@ -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<B : ViewDataBinding>(
     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<B : ViewDataBinding>(
     }
 
     override fun onDestroyView() {
-        _binding = null
         super.onDestroyView()
+        _binding = null
     }
 
     fun showLoadingDialog(context: Context) {
@@ -54,8 +58,8 @@ abstract class BaseFragment<B : ViewDataBinding>(
         }
     }
 
-    fun backApplicationExit(context: Context){
-        ExitDialog("앱을 종료하시겠어요?",context).show()
-    }
+//    fun backApplicationExit(context: Context){
+//        ExitDialog("앱을 종료하시겠어요?",context).show()
+//    }
 
 }
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
@@ -33,11 +33,13 @@ class GalleryActivity: BaseActivity<ActivityCropImageBinding>(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<String>(android.Manifest.permission.READ_EXTERNAL_STORAGE)
     }else{
         arrayOf<String>(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
@@ -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
@@ -28,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
@@ -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
@@ -23,15 +22,14 @@ 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()
         })
 
         binding.btnSignupNextEmail.setOnClickListener {
             Navigation.findNavController(view)
                 .navigate(R.id.action_signupEmailFragment_to_signupPWFragment)
-            signupViewModel.increaseProgress()
         }
     }
     private fun emailEmpty(){

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
@@ -50,7 +50,7 @@ class SignupProfileFragment : BaseFragment<FragmentSignupProfileBinding>(
         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
@@ -27,7 +27,7 @@ class SignupPwFragment: BaseFragment<FragmentSignupPwBinding>(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<FragmentSignupPwBinding>(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
@@ -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
     }
 
     // 동의화면 "모두 동의합니다" 클릭시

diff --git a/app/src/main/res/navigation/nav_sign_graph.xml b/app/src/main/res/navigation/nav_sign_graph.xml
@@ -11,7 +11,13 @@
         android:label="SignupAgreeFragment" >
         <action
             android:id="@+id/action_signupAgreeFragment_to_signupEmailFragment"
-            app:destination="@id/signupEmailFragment" />
+            app:destination="@id/signupEmailFragment"
+            app:enterAnim="@anim/nav_default_enter_anim"
+            app:exitAnim="@anim/nav_default_exit_anim"
+            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
+            app:popExitAnim="@anim/nav_default_pop_exit_anim"
+            app:popUpTo="@id/signupAgreeFragment"
+            app:popUpToInclusive="false" />
     </fragment>
 
 <!--    아이디 입력 Fragment-->
@@ -21,7 +27,12 @@
         android:label="SignupEmailFragment" >
         <action
             android:id="@+id/action_signupEmailFragment_to_signupPWFragment"
-            app:destination="@id/signupPwFragment" />
+            app:destination="@id/signupPwFragment"
+            app:enterAnim="@anim/nav_default_enter_anim"
+            app:exitAnim="@anim/nav_default_exit_anim"
+            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
+            app:popExitAnim="@anim/nav_default_pop_exit_anim"
+            app:popUpTo="@id/signupEmailFragment" />
     </fragment>
 
 <!--    비밀번호 입력 Fragment-->
@@ -31,7 +42,13 @@
         android:label="SignupPwFragment" >
         <action
             android:id="@+id/action_signupPwFragment_to_signupProfileFragment"
-            app:destination="@id/signupProfileFragment" />
+            app:destination="@id/signupProfileFragment"
+            app:enterAnim="@anim/nav_default_enter_anim"
+            app:exitAnim="@anim/nav_default_exit_anim"
+            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
+            app:popExitAnim="@anim/nav_default_pop_exit_anim"
+            app:popUpTo="@id/signupPwFragment"
+            app:popUpToInclusive="false" />
     </fragment>
 
 <!--    프로필 정보 입력 Fragment-->
@@ -41,7 +58,12 @@
         android:label="SignupProfileFragment" >
         <action
             android:id="@+id/action_signupProfileFragment_to_signupFinFragment"
-            app:destination="@id/signupFinFragment" />
+            app:destination="@id/signupFinFragment"
+            app:enterAnim="@anim/nav_default_enter_anim"
+            app:exitAnim="@anim/nav_default_exit_anim"
+            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
+            app:popExitAnim="@anim/nav_default_pop_exit_anim"
+            app:popUpTo="@id/signupProfileFragment" />
     </fragment>
 
 <!--    최종 확인 Fragment-->