[FEAT] 코스 발견 / 중첩 리사이클러뷰에서 추천 코스 무한 스크롤

app/src/main/java/com/runnect/runnect/data/dto/response/ResponseGetDiscoverRecommend.kt

@@ -8,6 +8,10 @@ import kotlinx.serialization.Serializable
 data class ResponseGetDiscoverRecommend(
     @SerialName("ordering")
     val ordering: String,
+    @SerialName("totalPageSize")
+    val totalPageSize: Int,
+    @SerialName("isEnd")
+    val isEnd: Boolean,
     @SerialName("publicCourses")
     val publicCourses: List<PublicCourse>
 ) {

app/src/main/java/com/runnect/runnect/data/repository/CourseRepositoryImpl.kt

@@ -16,6 +16,7 @@ import com.runnect.runnect.data.source.remote.RemoteCourseDataSource
 import com.runnect.runnect.domain.entity.DiscoverSearchCourse
 import com.runnect.runnect.domain.entity.DiscoverMultiViewItem.*
 import com.runnect.runnect.domain.entity.EditableCourseDetail
+import com.runnect.runnect.domain.entity.RecommendCoursePagingData
 import com.runnect.runnect.domain.repository.CourseRepository
 import com.runnect.runnect.util.extension.toData
 import okhttp3.MultipartBody
@@ -32,11 +33,13 @@ class CourseRepositoryImpl @Inject constructor(private val remoteCourseDataSourc
     override suspend fun getRecommendCourse(
         pageNo: String,
         ordering: String
-    ): Result<List<RecommendCourse>?> = runCatching {
-        remoteCourseDataSource.getRecommendCourse(
+    ): Result<RecommendCoursePagingData> = runCatching {
+        val response = remoteCourseDataSource.getRecommendCourse(
             pageNo = pageNo,
             ordering = ordering
-        ).data?.toRecommendCourses()
+        ).data
+
+        RecommendCoursePagingData(response?.isEnd, response?.toRecommendCourses())
     }
 
     override suspend fun getCourseSearch(keyword: String): Result<List<DiscoverSearchCourse>?> =

app/src/main/java/com/runnect/runnect/domain/entity/DiscoverMultiViewItem.kt

@@ -1,21 +1,23 @@
 package com.runnect.runnect.domain.entity
 
-sealed class DiscoverMultiViewItem {
+sealed class DiscoverMultiViewItem(
+    open val id: Int
+) {
     data class MarathonCourse(
-        val id: Int,
+        override val id: Int,
         val courseId: Int,
         var title: String,
         val image: String,
         var scrap: Boolean,
         val departure: String,
-    ) : DiscoverMultiViewItem()
+    ) : DiscoverMultiViewItem(id)
 
     data class RecommendCourse(
-        val id: Int,
+        override val id: Int,
         val courseId: Int,
         var title: String,
         val image: String,
         var scrap: Boolean,
         val departure: String,
-    ) : DiscoverMultiViewItem()
+    ) : DiscoverMultiViewItem(id)
 }

app/src/main/java/com/runnect/runnect/domain/entity/RecommendCoursePagingData.kt

@@ -0,0 +1,6 @@
+package com.runnect.runnect.domain.entity
+
+data class RecommendCoursePagingData(
+    val isEnd: Boolean?,
+    val recommendCourses: List<DiscoverMultiViewItem.RecommendCourse>?
+)

app/src/main/java/com/runnect/runnect/domain/repository/CourseRepository.kt

@@ -14,6 +14,7 @@ import com.runnect.runnect.data.dto.response.ResponsePutMyDrawCourse
 import com.runnect.runnect.domain.entity.CourseDetail
 import com.runnect.runnect.domain.entity.DiscoverSearchCourse
 import com.runnect.runnect.domain.entity.DiscoverMultiViewItem.*
+import com.runnect.runnect.domain.entity.RecommendCoursePagingData
 import com.runnect.runnect.domain.entity.EditableCourseDetail
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
@@ -22,7 +23,7 @@ import retrofit2.Response
 interface CourseRepository {
     suspend fun getMarathonCourse(): Result<List<MarathonCourse>?>
 
-    suspend fun getRecommendCourse(pageNo: String, ordering: String): Result<List<RecommendCourse>?>
+    suspend fun getRecommendCourse(pageNo: String, ordering: String): Result<RecommendCoursePagingData>
 
     suspend fun getCourseSearch(keyword: String): Result<List<DiscoverSearchCourse>?>
 

app/src/main/java/com/runnect/runnect/presentation/detail/CourseDetailActivity.kt

@@ -287,24 +287,33 @@ class CourseDetailActivity :
                 return@setOnClickListener
             }
 
-            Intent(
-                this@CourseDetailActivity,
-                CountDownActivity::class.java
-            ).apply {
-                putExtra(
-                    EXTRA_COURSE_DATA, CourseData(
-                        courseId = courseDetail.courseId,
-                        publicCourseId = courseDetail.id,
-                        touchList = connectedSpots,
-                        startLatLng = departureLatLng,
-                        departure = courseDetail.departure,
-                        distance = courseDetail.distance.toFloat(),
-                        image = courseDetail.image,
-                        dataFrom = "detail"
-                    )
-                )
-                startActivity(this)
+            if (!::departureLatLng.isInitialized || connectedSpots.isEmpty()) {
+                showSnackbar(binding.root, getString(R.string.course_detail_list_empty_error_msg))
+                return@setOnClickListener
             }
+
+            navigateToCountDownActivity()
+        }
+    }
+
+    private fun navigateToCountDownActivity() {
+        Intent(
+            this@CourseDetailActivity,
+            CountDownActivity::class.java
+        ).apply {
+            putExtra(
+                EXTRA_COURSE_DATA, CourseData(
+                    courseId = courseDetail.courseId,
+                    publicCourseId = courseDetail.id,
+                    touchList = connectedSpots,
+                    startLatLng = departureLatLng,
+                    departure = courseDetail.departure,
+                    distance = courseDetail.distance.toFloat(),
+                    image = courseDetail.image,
+                    dataFrom = "detail"
+                )
+            )
+            startActivity(this)
         }
     }
 
@@ -334,7 +343,7 @@ class CourseDetailActivity :
             onNegativeButtonClicked = {},
             onPositiveButtonClicked = {
                 // 편집 모드 -> 뒤로가기 버튼 -> 편집 중단 확인 -> 뷰에 원래 제목으로 보여줌.
-                viewModel.restoreOriginalContents()
+                viewModel.restoreOriginalCourseDetail()
                 enterReadMode()
             }
         )
@@ -396,7 +405,7 @@ class CourseDetailActivity :
     private fun enterEditMode() {
         viewModel.apply {
             updateCurrentScreenMode(EditMode)
-            saveCurrentContents()
+            saveCurrentCourseDetail()
         }
         updateLayoutForEditMode()
     }
@@ -448,7 +457,10 @@ class CourseDetailActivity :
                     courseDetail = state.data ?: return@observe
                     binding.courseDetail = courseDetail
 
-                    viewModel.updateCourseDetailContents(courseDetail.toCourseDetailContents())
+                    val editableCourseDetail =
+                        EditableCourseDetail(courseDetail.title, courseDetail.description)
+                    viewModel.updateCourseDetailEditText(editableCourseDetail)
+
                     updateUserProfileStamp()
                     updateUserLevel()
                     updateScrapState()
@@ -466,16 +478,10 @@ class CourseDetailActivity :
         }
     }
 
-    private fun <T : Any> T.toCourseDetailContents(): EditableCourseDetail? {
-        return when (this) {
-            is CourseDetail -> EditableCourseDetail(title, description)
-            is EditableCourseDetail -> EditableCourseDetail(title, description)
-            else -> null
-        }
-    }
-
     private fun initDepartureLatLng() {
-        departureLatLng = LatLng(courseDetail.path[0][0], courseDetail.path[0][1])
+        if (courseDetail.path.isNotEmpty()) {
+            departureLatLng = LatLng(courseDetail.path[0][0], courseDetail.path[0][1])
+        }
     }
 
     private fun initConnectedSpots() {
@@ -494,8 +500,8 @@ class CourseDetailActivity :
                     binding.indeterminateBar.isVisible = false
 
                     state.data?.let { response ->
-                        viewModel.updateCourseDetailContents(response.toCourseDetailContents())
-                        updateTextView(response)
+                        viewModel.updateCourseDetailEditText(response)
+                        updateCourseDetailTextView(response)
                     }
 
                     enterReadMode()
@@ -512,7 +518,7 @@ class CourseDetailActivity :
         }
     }
 
-    private fun updateTextView(courseDetail: EditableCourseDetail) {
+    private fun updateCourseDetailTextView(courseDetail: EditableCourseDetail) {
         binding.apply {
             tvCourseDetailTitle.text = courseDetail.title
             tvCourseDetailDesc.text = courseDetail.description

app/src/main/java/com/runnect/runnect/presentation/detail/CourseDetailViewModel.kt

@@ -58,21 +58,19 @@ class CourseDetailViewModel @Inject constructor(
     private var _currentScreenMode: ScreenMode = ScreenMode.ReadOnlyMode
     val currentScreenMode get() = _currentScreenMode
 
-    private var savedCourseDetailContents = EditableCourseDetail("", "")
+    private var savedCourseDetail = EditableCourseDetail("", "")
 
-    fun updateCourseDetailContents(courseDetail: EditableCourseDetail?) {
-        courseDetail?.let {
-            _title.value = courseDetail.title
-            _description.value = courseDetail.description
-        }
+    fun updateCourseDetailEditText(course: EditableCourseDetail) {
+        _title.value = course.title
+        _description.value = course.description
     }
 
-    fun saveCurrentContents() {
-        savedCourseDetailContents = EditableCourseDetail(title, description)
+    fun saveCurrentCourseDetail() {
+        savedCourseDetail = EditableCourseDetail(title, description)
     }
 
-    fun restoreOriginalContents() {
-        updateCourseDetailContents(savedCourseDetailContents)
+    fun restoreOriginalCourseDetail() {
+        updateCourseDetailEditText(savedCourseDetail)
     }
 
     fun updateCurrentScreenMode(mode: ScreenMode) {

app/src/main/java/com/runnect/runnect/presentation/discover/DiscoverFragment.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.Gravity
 import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.contract.ActivityResultContracts
@@ -22,7 +23,7 @@ import com.runnect.runnect.presentation.MainActivity.Companion.isVisitorMode
 import com.runnect.runnect.presentation.detail.CourseDetailActivity
 import com.runnect.runnect.presentation.detail.CourseDetailRootScreen
 import com.runnect.runnect.presentation.discover.adapter.BannerAdapter
-import com.runnect.runnect.presentation.discover.adapter.DiscoverMultiViewAdapter
+import com.runnect.runnect.presentation.discover.adapter.multiview.DiscoverMultiViewAdapter
 import com.runnect.runnect.presentation.discover.pick.DiscoverPickActivity
 import com.runnect.runnect.presentation.discover.search.DiscoverSearchActivity
 import com.runnect.runnect.presentation.state.UiStateV2
@@ -55,11 +56,10 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
     private val resultLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
             if (result.resultCode == Activity.RESULT_OK) {
+                // 상세페이지 갔다가 이전으로 돌아오면 아이템 변경사항이 바로 반영되도록 (제목, 스크랩)
                 val updatedCourse: EditableDiscoverCourse =
                     result.data?.getCompatibleParcelableExtra(EXTRA_EDITABLE_DISCOVER_COURSE)
                         ?: return@registerForActivityResult
-
-                // todo: 상세페이지 갔다가 이전으로 돌아오면 제목, 스크랩 변경사항이 바로 표시되도록
                 multiViewAdapter.updateCourseItem(
                     publicCourseId = viewModel.clickedCourseId,
                     updatedCourse = updatedCourse
@@ -145,12 +145,28 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
         binding.rvDiscoverMultiView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
             override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                 super.onScrolled(recyclerView, dx, dy)
+
                 val isScrollDown = dy > 0
                 if (isScrollDown) showCircleUploadButton()
+
+                checkNextPageLoadingCondition(recyclerView)
             }
         })
     }
 
+    private fun checkNextPageLoadingCondition(recyclerView: RecyclerView) {
+        if (!recyclerView.canScrollVertically(SCROLL_DIRECTION)) {
+            Timber.e("스크롤이 끝에 도달했어요!")
+
+            if (viewModel.isNextPageLoading()) {
+                Timber.e("다음 페이지 로딩 중입니다.")
+                return
+            }
+
+            viewModel.getRecommendCourseNextPage()
+        }
+    }
+
     private fun showCircleUploadButton() {
         binding.fabDiscoverUploadText.isVisible = false
         binding.fabDiscoverUpload.isVisible = true
@@ -215,6 +231,7 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
         setupBannerGetStateObserver()
         setupMarathonCourseGetStateObserver()
         setupRecommendCourseGetStateObserver()
+        setupRecommendCourseNextPageStateObserver()
         setupCourseScrapStateObserver()
     }
 
@@ -227,7 +244,7 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
                 }
 
                 is UiStateV2.Failure -> {
-                    context?.showSnackbar(binding.root, state.msg)
+                    context?.showSnackbar(binding.root, state.msg, Gravity.TOP)
                 }
 
                 else -> {}
@@ -277,7 +294,7 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
 
                 is UiStateV2.Failure -> {
                     dismissLoadingProgressBar()
-                    context?.showSnackbar(binding.root, state.msg)
+                    context?.showSnackbar(binding.root, state.msg, Gravity.TOP)
                 }
 
                 else -> {}
@@ -300,7 +317,7 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
 
                 is UiStateV2.Failure -> {
                     dismissLoadingProgressBar()
-                    context?.showSnackbar(binding.root, state.msg)
+                    context?.showSnackbar(binding.root, state.msg, Gravity.TOP)
                 }
 
                 else -> {}
@@ -343,11 +360,11 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
 
     private fun navigateToDetailScreen(publicCourseId: Int) {
         val context = context ?: return
-        val intent = Intent(context, CourseDetailActivity::class.java).apply {
+        Intent(context, CourseDetailActivity::class.java).apply {
             putExtra(EXTRA_PUBLIC_COURSE_ID, publicCourseId)
             putExtra(EXTRA_ROOT_SCREEN, CourseDetailRootScreen.COURSE_DISCOVER)
+            resultLauncher.launch(this)
         }
-        resultLauncher.launch(intent)
         activity?.applyScreenEnterAnimation()
     }
 
@@ -358,10 +375,27 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
         ).show()
     }
 
+    private fun setupRecommendCourseNextPageStateObserver() {
+        viewModel.nextPageState.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                is UiStateV2.Success -> {
+                    val nextPageCourses = state.data
+                    multiViewAdapter.addRecommendCourseNextPage(nextPageCourses)
+                }
+
+                is UiStateV2.Failure -> {
+                    context?.showSnackbar(binding.root, state.msg, Gravity.TOP)
+                }
+
+                else -> {}
+            }
+        }
+    }
+
     private fun setupCourseScrapStateObserver() {
         viewModel.courseScrapState.observe(viewLifecycleOwner) { state ->
             if (state is UiStateV2.Failure) {
-                context?.showSnackbar(binding.root, state.msg)
+                context?.showSnackbar(binding.root, state.msg, Gravity.TOP)
             }
         }
     }
@@ -414,6 +448,7 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
     companion object {
         private const val BANNER_SCROLL_DELAY_TIME = 5000L
         private const val CENTER_POS_OF_INFINITE_BANNERS = Int.MAX_VALUE / 2
+        private const val SCROLL_DIRECTION = 1
         private const val EXTRA_PUBLIC_COURSE_ID = "publicCourseId"
         private const val EXTRA_ROOT_SCREEN = "rootScreen"
         const val EXTRA_EDITABLE_DISCOVER_COURSE = "editable_discover_course"