From e380e1361fbee10cd603cdbf3dd082251c9880c7 Mon Sep 17 00:00:00 2001 From: jooyyoo Date: Fri, 16 Feb 2024 13:00:43 +0900 Subject: [PATCH] =?UTF-8?q?[chore]=20#219=20=ED=95=A8=EC=88=98=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/common/LoginNeededDialog.kt | 8 ++-- .../presentation/detail/DetailActivity.kt | 42 +++++++++---------- .../presentation/home/HomeFragment.kt | 18 ++++---- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/com/sopt/geonppang/presentation/common/LoginNeededDialog.kt b/app/src/main/java/com/sopt/geonppang/presentation/common/LoginNeededDialog.kt index 620b50f2..6332e009 100644 --- a/app/src/main/java/com/sopt/geonppang/presentation/common/LoginNeededDialog.kt +++ b/app/src/main/java/com/sopt/geonppang/presentation/common/LoginNeededDialog.kt @@ -50,6 +50,10 @@ class LoginNeededDialog( collectData() } + private fun initLayout() { + binding.loginNeedType = loginNeededType + } + private fun addListener() { binding.ivDismiss.setOnClickListener { dismiss() } @@ -66,10 +70,6 @@ class LoginNeededDialog( } } - private fun initLayout() { - binding.loginNeedType = loginNeededType - } - private fun collectData() { gpDataSource = GPDataSource(requireContext()) // 카카오 회원 가입, 로그인 diff --git a/app/src/main/java/com/sopt/geonppang/presentation/detail/DetailActivity.kt b/app/src/main/java/com/sopt/geonppang/presentation/detail/DetailActivity.kt index 9fd281ca..3370bc87 100644 --- a/app/src/main/java/com/sopt/geonppang/presentation/detail/DetailActivity.kt +++ b/app/src/main/java/com/sopt/geonppang/presentation/detail/DetailActivity.kt @@ -116,27 +116,6 @@ class DetailActivity : BindingActivity(R.layout.activity_ } } - private fun showLoginNeedDialogBookmark() { - LoginNeededDialog(LoginNeededType.LOGIN_NEEDED_BOOKMARK).show( - supportFragmentManager, - "loginNeededDialog" - ) - } - - private fun showLoginNeedDialogWriteReview() { - LoginNeededDialog(LoginNeededType.LOGIN_NEEDED_WRITE_REVIEW).show( - supportFragmentManager, - "loginNeededDialog" - ) - } - - private fun showLoginNeedDialogReportReview() { - LoginNeededDialog(LoginNeededType.LOGIN_NEEDED_REPORT_REVIEW).show( - supportFragmentManager, - "loginNeededDialog" - ) - } - private fun collectData() { viewModel.bakeryInfo.flowWithLifecycle(lifecycle).onEach { it?.let { bakeryInfo -> @@ -226,6 +205,27 @@ class DetailActivity : BindingActivity(R.layout.activity_ finish() } + private fun showLoginNeedDialogBookmark() { + LoginNeededDialog(LoginNeededType.LOGIN_NEEDED_BOOKMARK).show( + supportFragmentManager, + "loginNeededDialog" + ) + } + + private fun showLoginNeedDialogWriteReview() { + LoginNeededDialog(LoginNeededType.LOGIN_NEEDED_WRITE_REVIEW).show( + supportFragmentManager, + "loginNeededDialog" + ) + } + + private fun showLoginNeedDialogReportReview() { + LoginNeededDialog(LoginNeededType.LOGIN_NEEDED_REPORT_REVIEW).show( + supportFragmentManager, + "loginNeededDialog" + ) + } + companion object { const val BAKERY_ID = "bakeryId" const val BAKERY_INFO = "bakeryInfo" diff --git a/app/src/main/java/com/sopt/geonppang/presentation/home/HomeFragment.kt b/app/src/main/java/com/sopt/geonppang/presentation/home/HomeFragment.kt index 789ffa46..4b6a8979 100644 --- a/app/src/main/java/com/sopt/geonppang/presentation/home/HomeFragment.kt +++ b/app/src/main/java/com/sopt/geonppang/presentation/home/HomeFragment.kt @@ -61,9 +61,9 @@ class HomeFragment : BindingFragment(R.layout.fragment_home binding.ivHomeFilter.setOnClickListener { AmplitudeUtils.trackEvent(START_FILTER_HOME) gpDataSource = GPDataSource(it.context) - if (gpDataSource.userRoleType == UserRoleType.NONE_MEMBER.name) { + if (gpDataSource.userRoleType == UserRoleType.NONE_MEMBER.name) showLoginNeedDialog() - } else + else moveToFilter() } @@ -72,13 +72,6 @@ class HomeFragment : BindingFragment(R.layout.fragment_home } } - private fun showLoginNeedDialog() { - LoginNeededDialog(LoginNeededType.LOGIN_NEEDED_FILTER).show( - parentFragmentManager, - "loginNeededDialog" - ) - } - private fun collectData() { viewModel.bestBakeryListState.flowWithLifecycle(lifecycle).onEach { when (it) { @@ -141,6 +134,13 @@ class HomeFragment : BindingFragment(R.layout.fragment_home startActivity(intent) } + private fun showLoginNeedDialog() { + LoginNeededDialog(LoginNeededType.LOGIN_NEEDED_FILTER).show( + parentFragmentManager, + "loginNeededDialog" + ) + } + companion object { const val BAKERY_ID = "bakeryId" const val FILTER_INFO = "filterInfo"