feat: pagination

Author: PavloNetrebchuk

core/src/main/java/org/openedx/core/data/model/CourseDatesResponse.kt

@@ -8,8 +8,8 @@ import org.openedx.core.domain.model.CourseDatesResponse as DomainCourseDatesRes
 data class CourseDate(
     @SerializedName("course_id")
     val courseId: String,
-    @SerializedName("assignment_block_id")
-    val assignmentBlockId: String,
+    @SerializedName("first_component_block_id")
+    val firstComponentBlockId: String?,
     @SerializedName("due_date")
     val dueDate: String?,
     @SerializedName("assignment_title")
@@ -25,7 +25,7 @@ data class CourseDate(
         val dueDate = TimeUtils.iso8601ToDate(dueDate ?: "")
         return DomainCourseDate(
             courseId = courseId,
-            assignmentBlockId = assignmentBlockId,
+            firstComponentBlockId = firstComponentBlockId ?: "",
             dueDate = dueDate ?: return null,
             assignmentTitle = assignmentTitle ?: "",
             learnerHasAccess = learnerHasAccess ?: false,
@@ -39,9 +39,9 @@ data class CourseDatesResponse(
     @SerializedName("count")
     val count: Int,
     @SerializedName("next")
-    val next: Int?,
+    val next: String?,
     @SerializedName("previous")
-    val previous: Int?,
+    val previous: String?,
     @SerializedName("results")
     val results: List<CourseDate>
 ) {

core/src/main/java/org/openedx/core/domain/model/CourseDatesResponse.kt

@@ -4,14 +4,14 @@ import java.util.Date
 
 data class CourseDatesResponse(
     val count: Int,
-    val next: Int?,
-    val previous: Int?,
+    val next: String?,
+    val previous: String?,
     val results: List<CourseDate>
 )
 
 data class CourseDate(
     val courseId: String,
-    val assignmentBlockId: String,
+    val firstComponentBlockId: String,
     val dueDate: Date,
     val assignmentTitle: String,
     val learnerHasAccess: Boolean,

core/src/main/java/org/openedx/core/presentation/dates/DatesUI.kt

@@ -273,7 +273,7 @@ private fun CourseDateItem(
                 .fillMaxWidth()
                 .padding(end = 4.dp)
                 .clickable(
-                    enabled = dateBlock.assignmentBlockId.isNotEmpty() && dateBlock.learnerHasAccess,
+                    enabled = dateBlock.firstComponentBlockId.isNotEmpty() && dateBlock.learnerHasAccess,
                     onClick = { onItemClick(dateBlock) }
                 )
         ) {
@@ -296,7 +296,7 @@ private fun CourseDateItem(
                 overflow = TextOverflow.Ellipsis,
             )
             Spacer(modifier = Modifier.width(7.dp))
-            if (dateBlock.assignmentBlockId.isNotEmpty() && dateBlock.learnerHasAccess) {
+            if (dateBlock.firstComponentBlockId.isNotEmpty() && dateBlock.learnerHasAccess) {
                 Icon(
                     imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
                     tint = MaterialTheme.appColors.textDark,

dates/src/main/java/org/openedx/dates/data/storage/CourseDateEntity.kt

@@ -9,28 +9,30 @@ import org.openedx.core.domain.model.CourseDate as DomainCourseDate
 
 @Entity(tableName = "course_date_table")
 data class CourseDateEntity(
-    @PrimaryKey
-    @ColumnInfo("assignmentBlockId")
-    val assignmentBlockId: String,
-    @ColumnInfo("courseId")
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo("course_date_id")
+    val id: Int,
+    @ColumnInfo("course_date_first_component_block_id")
+    val firstComponentBlockId: String?,
+    @ColumnInfo("course_date_courseId")
     val courseId: String,
-    @ColumnInfo("dueDate")
+    @ColumnInfo("course_date_dueDate")
     val dueDate: String?,
-    @ColumnInfo("assignmentTitle")
+    @ColumnInfo("course_date_assignmentTitle")
     val assignmentTitle: String?,
-    @ColumnInfo("learnerHasAccess")
+    @ColumnInfo("course_date_learnerHasAccess")
     val learnerHasAccess: Boolean?,
-    @ColumnInfo("relative")
+    @ColumnInfo("course_date_relative")
     val relative: Boolean?,
-    @ColumnInfo("courseName")
+    @ColumnInfo("course_date_courseName")
     val courseName: String?,
 ) {
 
     fun mapToDomain(): DomainCourseDate? {
         val dueDate = TimeUtils.iso8601ToDate(dueDate ?: "")
         return DomainCourseDate(
             courseId = courseId,
-            assignmentBlockId = assignmentBlockId,
+            firstComponentBlockId = firstComponentBlockId ?: "",
             dueDate = dueDate ?: return null,
             assignmentTitle = assignmentTitle ?: "",
             learnerHasAccess = learnerHasAccess ?: false,
@@ -43,8 +45,9 @@ data class CourseDateEntity(
         fun createFrom(courseDate: CourseDate): CourseDateEntity {
             with(courseDate) {
                 return CourseDateEntity(
+                    id = 0,
                     courseId = courseId,
-                    assignmentBlockId = assignmentBlockId,
+                    firstComponentBlockId = firstComponentBlockId,
                     dueDate = dueDate,
                     assignmentTitle = assignmentTitle,
                     learnerHasAccess = learnerHasAccess,

dates/src/main/java/org/openedx/dates/presentation/dates/DatesFragment.kt

@@ -31,8 +31,8 @@ import androidx.compose.material.pullrefresh.rememberPullRefreshState
 import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -57,7 +57,6 @@ import org.openedx.core.ui.MainScreenTitle
 import org.openedx.core.ui.OfflineModeDialog
 import org.openedx.core.ui.OpenEdXButton
 import org.openedx.core.ui.displayCutoutForLandscape
-import org.openedx.core.ui.shouldLoadMore
 import org.openedx.core.ui.statusBarsInset
 import org.openedx.core.ui.theme.OpenEdXTheme
 import org.openedx.core.ui.theme.appColors
@@ -126,7 +125,7 @@ class DatesFragment : Fragment() {
     }
 
     companion object {
-        const val LOAD_MORE_THRESHOLD = 4
+        const val LOAD_MORE_THRESHOLD = 0.8f
     }
 }
 
@@ -157,9 +156,7 @@ private fun DatesScreen(
         mutableStateOf(false)
     }
     val scrollState = rememberLazyListState()
-    val firstVisibleIndex = remember {
-        mutableIntStateOf(scrollState.firstVisibleItemIndex)
-    }
+    val layoutInfo by remember { derivedStateOf { scrollState.layoutInfo } }
 
     Scaffold(
         scaffoldState = scaffoldState,
@@ -249,7 +246,12 @@ private fun DatesScreen(
                                 }
                             }
                         }
-                        if (scrollState.shouldLoadMore(firstVisibleIndex, LOAD_MORE_THRESHOLD)) {
+                        val lastVisibleItemIndex =
+                            layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: 0
+                        val totalItemsCount = layoutInfo.totalItemsCount
+                        if (totalItemsCount > 0 &&
+                            lastVisibleItemIndex >= (totalItemsCount * LOAD_MORE_THRESHOLD).toInt()
+                        ) {
                             onAction(DatesViewActions.LoadMore)
                         }
                     }