From 141e7fe416d85ef72088574acfa7616bdbf8c36a Mon Sep 17 00:00:00 2001 From: klaus Date: Tue, 15 Jul 2025 20:41:35 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=A9=94=EC=9D=B8=20=ED=99=88=20-=20?= =?UTF-8?q?=EB=8B=A4=EB=A5=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99=EC=8B=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EC=95=88=EB=90=98=EC=96=B4=20=EC=9E=88=EC=9C=BC=EB=A9=B4=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../vividnext/sodalive/home/HomeFragment.kt | 178 +++++++++++------- 2 files changed, 110 insertions(+), 70 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f958aa90..3eb0d39d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,7 +35,7 @@ android { applicationId "kr.co.vividnext.sodalive" minSdk 23 targetSdk 34 - versionCode 174 + versionCode 175 versionName "1.39.0" } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/home/HomeFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/home/HomeFragment.kt index 1701a341..040e832f 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/home/HomeFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/home/HomeFragment.kt @@ -403,11 +403,15 @@ class HomeFragment : BaseFragment(FragmentHomeBinding::infl } homeContentAdapter = HomeContentAdapter { - startActivity( - Intent(requireContext(), AudioContentDetailActivity::class.java).apply { - putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, it) - } - ) + if (SharedPreferenceManager.token.isNotBlank()) { + startActivity( + Intent(requireContext(), AudioContentDetailActivity::class.java).apply { + putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, it) + } + ) + } else { + (requireActivity() as MainActivity).showLoginActivity() + } } val rvContent = binding.rvNewContent @@ -470,34 +474,38 @@ class HomeFragment : BaseFragment(FragmentHomeBinding::infl pagerWidth.roundToInt(), pagerHeight ) { - when (it.type) { - AudioContentBannerType.EVENT -> { - startActivity( - Intent(requireContext(), EventDetailActivity::class.java).apply { - putExtra(Constants.EXTRA_EVENT, it.eventItem!!) - } - ) - } + if (SharedPreferenceManager.token.isNotBlank()) { + when (it.type) { + AudioContentBannerType.EVENT -> { + startActivity( + Intent(requireContext(), EventDetailActivity::class.java).apply { + putExtra(Constants.EXTRA_EVENT, it.eventItem!!) + } + ) + } - AudioContentBannerType.CREATOR -> { - startActivity( - Intent(requireContext(), UserProfileActivity::class.java).apply { - putExtra(Constants.EXTRA_USER_ID, it.creatorId!!) - } - ) - } + AudioContentBannerType.CREATOR -> { + startActivity( + Intent(requireContext(), UserProfileActivity::class.java).apply { + putExtra(Constants.EXTRA_USER_ID, it.creatorId!!) + } + ) + } - AudioContentBannerType.SERIES -> { - startActivity( - Intent(requireContext(), SeriesDetailActivity::class.java).apply { - putExtra(Constants.EXTRA_SERIES_ID, it.seriesId!!) - } - ) - } + AudioContentBannerType.SERIES -> { + startActivity( + Intent(requireContext(), SeriesDetailActivity::class.java).apply { + putExtra(Constants.EXTRA_SERIES_ID, it.seriesId!!) + } + ) + } - AudioContentBannerType.LINK -> { - startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(it.link!!))) + AudioContentBannerType.LINK -> { + startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(it.link!!))) + } } + } else { + (requireActivity() as MainActivity).showLoginActivity() } } @@ -555,11 +563,15 @@ class HomeFragment : BaseFragment(FragmentHomeBinding::infl binding.tvSeriesOriginal.text = spSectionTitle originalSeriesAdapter = HomeSeriesAdapter { - startActivity( - Intent(requireContext(), SeriesDetailActivity::class.java).apply { - putExtra(Constants.EXTRA_SERIES_ID, it) - } - ) + if (SharedPreferenceManager.token.isNotBlank()) { + startActivity( + Intent(requireContext(), SeriesDetailActivity::class.java).apply { + putExtra(Constants.EXTRA_SERIES_ID, it) + } + ) + } else { + (requireActivity() as MainActivity).showLoginActivity() + } } val recyclerView = binding.rvSeriesOriginal @@ -623,11 +635,15 @@ class HomeFragment : BaseFragment(FragmentHomeBinding::infl pagerWidth.roundToInt(), pagerHeight ) { - startActivity( - Intent(requireContext(), AuditionDetailActivity::class.java).apply { - putExtra(Constants.EXTRA_AUDITION_ID, it) - } - ) + if (SharedPreferenceManager.token.isNotBlank()) { + startActivity( + Intent(requireContext(), AuditionDetailActivity::class.java).apply { + putExtra(Constants.EXTRA_AUDITION_ID, it) + } + ) + } else { + (requireActivity() as MainActivity).showLoginActivity() + } } binding @@ -681,11 +697,15 @@ class HomeFragment : BaseFragment(FragmentHomeBinding::infl binding.tvSeriesDayOfWeek.text = spSectionTitle seriesDayOfWeekAdapter = HomeSeriesAdapter { - startActivity( - Intent(requireContext(), SeriesDetailActivity::class.java).apply { - putExtra(Constants.EXTRA_SERIES_ID, it) - } - ) + if (SharedPreferenceManager.token.isNotBlank()) { + startActivity( + Intent(requireContext(), SeriesDetailActivity::class.java).apply { + putExtra(Constants.EXTRA_SERIES_ID, it) + } + ) + } else { + (requireActivity() as MainActivity).showLoginActivity() + } } val recyclerView = binding.rvSeriesDayOfWeek @@ -794,11 +814,15 @@ class HomeFragment : BaseFragment(FragmentHomeBinding::infl weelyChartAdapter = HomeWeeklyChartAdapter( width = screenWidth, onClickItem = { - startActivity( - Intent(requireContext(), AudioContentDetailActivity::class.java).apply { - putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, it) - } - ) + if (SharedPreferenceManager.token.isNotBlank()) { + startActivity( + Intent(requireContext(), AudioContentDetailActivity::class.java).apply { + putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, it) + } + ) + } else { + (requireActivity() as MainActivity).showLoginActivity() + } } ) @@ -879,18 +903,26 @@ class HomeFragment : BaseFragment(FragmentHomeBinding::infl recommendChannelAdapter = HomeRecommendChannelAdapter( onClickCreatorProfile = { - startActivity( - Intent(requireContext(), UserProfileActivity::class.java).apply { - putExtra(Constants.EXTRA_USER_ID, it) - } - ) + if (SharedPreferenceManager.token.isNotBlank()) { + startActivity( + Intent(requireContext(), UserProfileActivity::class.java).apply { + putExtra(Constants.EXTRA_USER_ID, it) + } + ) + } else { + (requireActivity() as MainActivity).showLoginActivity() + } }, onClickContentItem = { - startActivity( - Intent(requireContext(), AudioContentDetailActivity::class.java).apply { - putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, it) - } - ) + if (SharedPreferenceManager.token.isNotBlank()) { + startActivity( + Intent(requireContext(), AudioContentDetailActivity::class.java).apply { + putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, it) + } + ) + } else { + (requireActivity() as MainActivity).showLoginActivity() + } } ) @@ -954,11 +986,15 @@ class HomeFragment : BaseFragment(FragmentHomeBinding::infl binding.tvFreeContent.text = spSectionTitle homeFreeContentAdapter = HomeContentAdapter { - startActivity( - Intent(requireContext(), AudioContentDetailActivity::class.java).apply { - putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, it) - } - ) + if (SharedPreferenceManager.token.isNotBlank()) { + startActivity( + Intent(requireContext(), AudioContentDetailActivity::class.java).apply { + putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, it) + } + ) + } else { + (requireActivity() as MainActivity).showLoginActivity() + } } val rvContent = binding.rvFreeContent @@ -1000,11 +1036,15 @@ class HomeFragment : BaseFragment(FragmentHomeBinding::infl private fun setupCuration() { curationAdapter = HomeCurationAdapter( onClickItem = { - startActivity( - Intent(requireContext(), AudioContentDetailActivity::class.java).apply { - putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, it) - } - ) + if (SharedPreferenceManager.token.isNotBlank()) { + startActivity( + Intent(requireContext(), AudioContentDetailActivity::class.java).apply { + putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, it) + } + ) + } else { + (requireActivity() as MainActivity).showLoginActivity() + } } )