From ee227dd6d9eecb416c1ddfb95f25661c2d0743b3 Mon Sep 17 00:00:00 2001 From: leeeha Date: Sun, 10 Dec 2023 23:09:58 +0900 Subject: [PATCH] =?UTF-8?q?[DEL]=20#282=20=EC=B6=94=EC=B2=9C=20=EC=BD=94?= =?UTF-8?q?=EC=8A=A4=20=EB=AC=B4=ED=95=9C=20=EC=8A=A4=ED=81=AC=EB=A1=A4=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= =?UTF-8?q?=ED=95=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 나중에 로직 다시 설계할 예정 --- .../runnect/presentation/discover/DiscoverFragment.kt | 6 ------ .../runnect/presentation/discover/DiscoverViewModel.kt | 2 +- .../discover/adapter/DiscoverMultiViewAdapter.kt | 8 ++------ .../discover/adapter/DiscoverMultiViewHolder.kt | 8 +------- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/runnect/runnect/presentation/discover/DiscoverFragment.kt b/app/src/main/java/com/runnect/runnect/presentation/discover/DiscoverFragment.kt index 4d20ce133..6bc4a4915 100644 --- a/app/src/main/java/com/runnect/runnect/presentation/discover/DiscoverFragment.kt +++ b/app/src/main/java/com/runnect/runnect/presentation/discover/DiscoverFragment.kt @@ -289,12 +289,6 @@ class DiscoverFragment : BindingFragment(R.layout.fragm }, handleVisitorMode = { context?.let { showCourseScrapWarningToast(it) } - }, - currentPageNumber = viewModel.currentPageNumber, - onNextPageLoad = { pageNo -> - // todo: 다음 페이지 요청하고, 뷰 갱신하기 - viewModel.getRecommendCourse(pageNo = pageNo, ordering = "date") - viewModel.updateCurrentPageNumber(pageNo) } ) } diff --git a/app/src/main/java/com/runnect/runnect/presentation/discover/DiscoverViewModel.kt b/app/src/main/java/com/runnect/runnect/presentation/discover/DiscoverViewModel.kt index 8ef14b04b..dcaaf1bcf 100644 --- a/app/src/main/java/com/runnect/runnect/presentation/discover/DiscoverViewModel.kt +++ b/app/src/main/java/com/runnect/runnect/presentation/discover/DiscoverViewModel.kt @@ -71,7 +71,7 @@ class DiscoverViewModel @Inject constructor( fun refreshCurrentCourses() { getMarathonCourse() - getRecommendCourse(pageNo = currentPageNumber, ordering = "date") + getRecommendCourse(pageNo = 1, ordering = "date") } private fun getDiscoverBanners() { diff --git a/app/src/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverMultiViewAdapter.kt b/app/src/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverMultiViewAdapter.kt index e7a231bfd..618d12ac5 100644 --- a/app/src/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverMultiViewAdapter.kt +++ b/app/src/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverMultiViewAdapter.kt @@ -15,10 +15,7 @@ class DiscoverMultiViewAdapter( private val onHeartButtonClick: (Int, Boolean) -> Unit, private val onCourseItemClick: (Int) -> Unit, private val handleVisitorMode: () -> Unit, - private val currentPageNumber: Int, - private val onNextPageLoad: (Int) -> Unit, ) : RecyclerView.Adapter() { - enum class MultiViewType { MARATHON, RECOMMEND @@ -57,8 +54,7 @@ class DiscoverMultiViewAdapter( ), onHeartButtonClick = onHeartButtonClick, onCourseItemClick = onCourseItemClick, - handleVisitorMode = handleVisitorMode, - onNextPageLoad = onNextPageLoad + handleVisitorMode = handleVisitorMode ) } } @@ -74,7 +70,7 @@ class DiscoverMultiViewAdapter( is DiscoverMultiViewHolder.RecommendCourseViewHolder -> { (multiViewItems[position] as? List)?.let { - holder.bind(currentPageNumber, it) + holder.bind(it) } } } diff --git a/app/src/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverMultiViewHolder.kt b/app/src/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverMultiViewHolder.kt index fb8d9c40f..25a51387c 100644 --- a/app/src/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverMultiViewHolder.kt +++ b/app/src/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverMultiViewHolder.kt @@ -45,10 +45,8 @@ sealed class DiscoverMultiViewHolder(binding: ViewDataBinding) : private val onHeartButtonClick: (Int, Boolean) -> Unit, private val onCourseItemClick: (Int) -> Unit, private val handleVisitorMode: () -> Unit, - private val onNextPageLoad: (Int) -> Unit, - ) : DiscoverMultiViewHolder(binding) { - fun bind(currentPageNumber: Int, recommendCourses: List) { + fun bind(recommendCourses: List) { binding.rvDiscoverRecommend.apply { setHasFixedSize(true) layoutManager = GridLayoutManager(context, 2) @@ -69,8 +67,6 @@ sealed class DiscoverMultiViewHolder(binding: ViewDataBinding) : topSpaceSize = 20 ) ) - - initScrollListener(currentPageNumber, this) } } @@ -78,9 +74,7 @@ sealed class DiscoverMultiViewHolder(binding: ViewDataBinding) : recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() { override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { super.onScrolled(recyclerView, dx, dy) - // TODO: 스크롤이 최하단까지 내려간 경우, 다음 페이지 요청하기 (다음 페이지가 있는 경우에만) - //onNextPageLoad(currentPageNumber + 1) } }) }