From ce8f1b04f3c6e263a5bfe434dc1b0b2c8b080e5d Mon Sep 17 00:00:00 2001 From: tgyuu-An Date: Mon, 21 Aug 2023 12:21:09 +0900 Subject: [PATCH] =?UTF-8?q?#210=20=EB=82=B4=20=EC=9D=B4=EB=AF=B8=EC=A7=80?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20=EB=B0=94=ED=85=80=EC=8B=9C=ED=8A=B8=20?= =?UTF-8?q?=ED=83=80=EC=9E=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/mypage/MyPageFragment.kt | 23 ++++++++----------- .../MyPageMoreBottomSheetFragment.kt | 6 ++++- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/feature/mypage/src/main/java/com/android/mediproject/feature/mypage/MyPageFragment.kt b/feature/mypage/src/main/java/com/android/mediproject/feature/mypage/MyPageFragment.kt index 1ed97e408..5493e1b28 100644 --- a/feature/mypage/src/main/java/com/android/mediproject/feature/mypage/MyPageFragment.kt +++ b/feature/mypage/src/main/java/com/android/mediproject/feature/mypage/MyPageFragment.kt @@ -69,24 +69,21 @@ class MyPageFragment : is MyPageViewModel.MyPageEvent.Login -> navigateWithUri("medilens://main/intro_nav/login") is MyPageViewModel.MyPageEvent.SignUp -> navigateWithUri("medilens://main/intro_nav/signUp") is MyPageViewModel.MyPageEvent.NavigateToMyCommentList -> navigateWithUri("medilens://main/comments_nav/myCommentsListFragment") - is MyPageViewModel.MyPageEvent.NavigateToMyPageMore -> showMyPageBottomSheet() + is MyPageViewModel.MyPageEvent.NavigateToMyPageMore -> showMyPageBottomSheet(MyPageMoreBottomSheetFragment.BottomSheetType.DEFAULT) + is MyPageViewModel.MyPageEvent.ClickMyImage -> showMyPageBottomSheet(MyPageMoreBottomSheetFragment.BottomSheetType.IMAGE) } - private fun showMyPageBottomSheet() { + private fun showMyPageBottomSheet(bottomSheetType: MyPageMoreBottomSheetFragment.BottomSheetType) { if (myPageMoreBottomSheet == null) { - showMyPageMoreBottomSheet() - } - } + myPageMoreBottomSheet = MyPageMoreBottomSheetFragment(bottomSheetType) { + myPageMoreBottomSheet = null + } - private fun showMyPageMoreBottomSheet() { - myPageMoreBottomSheet = MyPageMoreBottomSheetFragment { - myPageMoreBottomSheet = null + myPageMoreBottomSheet!!.show( + parentFragmentManager, + MyPageMoreBottomSheetFragment.TAG, + ) } - - myPageMoreBottomSheet!!.show( - parentFragmentManager, - MyPageMoreBottomSheetFragment.TAG, - ) } private fun guestModeScreen() = binding.apply { diff --git a/feature/mypage/src/main/java/com/android/mediproject/feature/mypage/mypagemore/MyPageMoreBottomSheetFragment.kt b/feature/mypage/src/main/java/com/android/mediproject/feature/mypage/mypagemore/MyPageMoreBottomSheetFragment.kt index e0d1e5e03..78b6272d6 100644 --- a/feature/mypage/src/main/java/com/android/mediproject/feature/mypage/mypagemore/MyPageMoreBottomSheetFragment.kt +++ b/feature/mypage/src/main/java/com/android/mediproject/feature/mypage/mypagemore/MyPageMoreBottomSheetFragment.kt @@ -20,7 +20,7 @@ import dagger.hilt.android.AndroidEntryPoint import com.android.mediproject.core.common.viewmodel.repeatOnStarted @AndroidEntryPoint -class MyPageMoreBottomSheetFragment(private val backCallback: () -> Unit) : +class MyPageMoreBottomSheetFragment(private val bottomSheetType: BottomSheetType, private val backCallback: () -> Unit) : BottomSheetDialogFragment() { companion object { @@ -34,6 +34,10 @@ class MyPageMoreBottomSheetFragment(private val backCallback: () -> Unit) : LOGOUT(304) } + enum class BottomSheetType { + DEFAULT, IMAGE + } + private var _binding: FragmentMyPageMoreBottomSheetBinding? = null val binding get() = _binding!! private val fragmentViewModel: MyPageMoreBottomSheetViewModel by viewModels()