feat: shift due date card

PavloNetrebchuk · PavloNetrebchuk · commit 239df3ec6cd3 · 2025-03-21T12:33:12.000+02:00
diff --git a/core/src/main/java/org/openedx/core/data/model/CourseDatesResponse.kt b/core/src/main/java/org/openedx/core/data/model/CourseDatesResponse.kt
@@ -16,6 +16,8 @@ data class CourseDate(
     val assignmentTitle: String?,
     @SerializedName("learner_has_access")
     val learnerHasAccess: Boolean?,
+    @SerializedName("relative")
+    val relative: Boolean?,
     @SerializedName("course_name")
     val courseName: String?
 ) {
@@ -27,7 +29,8 @@ data class CourseDate(
             dueDate = dueDate ?: return null,
             assignmentTitle = assignmentTitle ?: "",
             learnerHasAccess = learnerHasAccess ?: false,
-            courseName = courseName ?: ""
+            courseName = courseName ?: "",
+            relative = relative ?: false
         )
     }
 }
diff --git a/core/src/main/java/org/openedx/core/domain/model/CourseDatesResponse.kt b/core/src/main/java/org/openedx/core/domain/model/CourseDatesResponse.kt
@@ -15,5 +15,6 @@ data class CourseDate(
     val dueDate: Date,
     val assignmentTitle: String,
     val learnerHasAccess: Boolean,
+    val relative: Boolean,
     val courseName: String
 )
diff --git a/dates/src/main/java/org/openedx/dates/data/storage/CourseDateEntity.kt b/dates/src/main/java/org/openedx/dates/data/storage/CourseDateEntity.kt
@@ -20,6 +20,8 @@ data class CourseDateEntity(
     val assignmentTitle: String?,
     @ColumnInfo("learnerHasAccess")
     val learnerHasAccess: Boolean?,
+    @ColumnInfo("relative")
+    val relative: Boolean?,
     @ColumnInfo("courseName")
     val courseName: String?,
 ) {
@@ -32,6 +34,7 @@ data class CourseDateEntity(
             dueDate = dueDate ?: return null,
             assignmentTitle = assignmentTitle ?: "",
             learnerHasAccess = learnerHasAccess ?: false,
+            relative = relative ?: false,
             courseName = courseName ?: ""
         )
     }
@@ -45,6 +48,7 @@ data class CourseDateEntity(
                     dueDate = dueDate,
                     assignmentTitle = assignmentTitle,
                     learnerHasAccess = learnerHasAccess,
+                    relative = relative,
                     courseName = courseName
                 )
             }
diff --git a/dates/src/main/java/org/openedx/dates/presentation/dates/DatesFragment.kt b/dates/src/main/java/org/openedx/dates/presentation/dates/DatesFragment.kt
@@ -3,6 +3,7 @@ package org.openedx.dates.presentation.dates
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -17,6 +18,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.Card
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.Icon
@@ -48,15 +50,18 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.Fragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.openedx.core.domain.model.DatesSection
 import org.openedx.core.presentation.dates.CourseDateBlockSection
 import org.openedx.core.ui.HandleUIMessage
 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
+import org.openedx.core.ui.theme.appShapes
 import org.openedx.core.ui.theme.appTypography
 import org.openedx.dates.R
 import org.openedx.dates.presentation.dates.DatesFragment.Companion.LOAD_MORE_THRESHOLD
@@ -103,6 +108,10 @@ class DatesFragment : Fragment() {
                                 viewModel.fetchMore()
                             }
 
+                            DatesViewActions.ShiftDueDate -> {
+                                viewModel.shiftDueDate()
+                            }
+
                             is DatesViewActions.OpenEvent -> {
                                 viewModel.navigateToCourseOutline(
                                     requireActivity().supportFragmentManager,
@@ -197,11 +206,23 @@ private fun DatesScreen(
                         LazyColumn(
                             modifier = contentWidth.fillMaxSize(),
                             state = scrollState,
-                            contentPadding = PaddingValues(bottom = 20.dp)
+                            contentPadding = PaddingValues(bottom = 48.dp)
                         ) {
                             uiState.dates.keys.forEach { sectionKey ->
-                                val dates = uiState.dates[sectionKey] ?: emptyList()
+                                val dates = uiState.dates[sectionKey].orEmpty()
                                 dates.isNotEmptyThenLet { sectionDates ->
+                                    val isHavePastRelatedDates =
+                                        sectionKey == DatesSection.PAST_DUE && dates.any { it.relative }
+                                    if (isHavePastRelatedDates) {
+                                        item {
+                                            ShiftDueDatesCard(
+                                                modifier = Modifier.padding(top = 12.dp),
+                                                onClick = {
+                                                    onAction(DatesViewActions.ShiftDueDate)
+                                                }
+                                            )
+                                        }
+                                    }
                                     item {
                                         CourseDateBlockSection(
                                             sectionKey = sectionKey,
@@ -261,6 +282,44 @@ private fun DatesScreen(
     )
 }
 
+@Composable
+private fun ShiftDueDatesCard(
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit
+) {
+    Card(
+        modifier = modifier
+            .fillMaxWidth(),
+        backgroundColor = MaterialTheme.appColors.cardViewBackground,
+        shape = MaterialTheme.appShapes.cardShape,
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(12.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.spacedBy(12.dp)
+        ) {
+            Text(
+                modifier = Modifier.fillMaxWidth(),
+                text = stringResource(id = R.string.dates_shift_due_date_card_title),
+                color = MaterialTheme.appColors.textDark,
+                style = MaterialTheme.appTypography.titleMedium,
+            )
+            Text(
+                modifier = Modifier.fillMaxWidth(),
+                text = stringResource(id = R.string.dates_shift_due_date_card_description),
+                color = MaterialTheme.appColors.textDark,
+                style = MaterialTheme.appTypography.labelLarge,
+            )
+            OpenEdXButton(
+                text = stringResource(id = R.string.dates_shift_due_date),
+                onClick = onClick
+            )
+        }
+    }
+}
+
 @Composable
 private fun EmptyState(
     modifier: Modifier = Modifier
@@ -317,3 +376,13 @@ private fun DatesScreenPreview() {
         )
     }
 }
+
+@Preview
+@Composable
+private fun ShiftDueDatesCardPreview() {
+    OpenEdXTheme {
+        ShiftDueDatesCard(
+            onClick = {}
+        )
+    }
+}
diff --git a/dates/src/main/java/org/openedx/dates/presentation/dates/DatesViewModel.kt b/dates/src/main/java/org/openedx/dates/presentation/dates/DatesViewModel.kt
@@ -32,7 +32,7 @@ class DatesViewModel(
     private val networkConnection: NetworkConnection,
     private val resourceManager: ResourceManager,
     private val datesInteractor: DatesInteractor,
-    private val corePreferences: CorePreferences,
+    corePreferences: CorePreferences,
 ) : BaseViewModel() {
 
     private val _uiState = MutableStateFlow(DatesUIState())
@@ -115,6 +115,10 @@ class DatesViewModel(
         }
     }
 
+    fun shiftDueDate() {
+//TODO
+    }
+
     fun fetchMore() {
         if (!_uiState.value.isLoading && page != -1) {
             fetchDates(false)
@@ -174,4 +178,5 @@ interface DatesViewActions {
     class OpenEvent(val date: CourseDate) : DatesViewActions
     object LoadMore : DatesViewActions
     object SwipeRefresh : DatesViewActions
+    object ShiftDueDate : DatesViewActions
 }
diff --git a/dates/src/main/res/values/strings.xml b/dates/src/main/res/values/strings.xml
@@ -3,4 +3,7 @@
     <string name="dates">Dates</string>
     <string name="dates_empty_state_title">No Dates</string>
     <string name="dates_empty_state_description">You currently have no active courses with scheduled events. Enroll in a course to view important dates and deadlines.</string>
+    <string name="dates_shift_due_date_card_title">Missed Some Deadlines?</string>
+    <string name="dates_shift_due_date_card_description">Don’t worry - shift our suggested schedule to complete past due assignments without losing any progress.</string>
+    <string name="dates_shift_due_date">Shift Due Dates</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ data class CourseDate(`
`16`	`16`	`val assignmentTitle: String?,`
`17`	`17`	`@SerializedName("learner_has_access")`
`18`	`18`	`val learnerHasAccess: Boolean?,`
	`19`	`+ @SerializedName("relative")`
	`20`	`+ val relative: Boolean?,`
`19`	`21`	`@SerializedName("course_name")`
`20`	`22`	`val courseName: String?`
`21`	`23`	`) {`
`@@ -27,7 +29,8 @@ data class CourseDate(`
`27`	`29`	`dueDate = dueDate ?: return null,`
`28`	`30`	`assignmentTitle = assignmentTitle ?: "",`
`29`	`31`	`learnerHasAccess = learnerHasAccess ?: false,`
`30`		`- courseName = courseName ?: ""`
	`32`	`+ courseName = courseName ?: "",`
	`33`	`+ relative = relative ?: false`
`31`	`34`	`)`
`32`	`35`	`}`
`33`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,6 @@ data class CourseDate(`
`15`	`15`	`val dueDate: Date,`
`16`	`16`	`val assignmentTitle: String,`
`17`	`17`	`val learnerHasAccess: Boolean,`
	`18`	`+ val relative: Boolean,`
`18`	`19`	`val courseName: String`
`19`	`20`	`)`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ data class CourseDateEntity(`
`20`	`20`	`val assignmentTitle: String?,`
`21`	`21`	`@ColumnInfo("learnerHasAccess")`
`22`	`22`	`val learnerHasAccess: Boolean?,`
	`23`	`+ @ColumnInfo("relative")`
	`24`	`+ val relative: Boolean?,`
`23`	`25`	`@ColumnInfo("courseName")`
`24`	`26`	`val courseName: String?,`
`25`	`27`	`) {`
`@@ -32,6 +34,7 @@ data class CourseDateEntity(`
`32`	`34`	`dueDate = dueDate ?: return null,`
`33`	`35`	`assignmentTitle = assignmentTitle ?: "",`
`34`	`36`	`learnerHasAccess = learnerHasAccess ?: false,`
	`37`	`+ relative = relative ?: false,`
`35`	`38`	`courseName = courseName ?: ""`
`36`	`39`	`)`
`37`	`40`	`}`
`@@ -45,6 +48,7 @@ data class CourseDateEntity(`
`45`	`48`	`dueDate = dueDate,`
`46`	`49`	`assignmentTitle = assignmentTitle,`
`47`	`50`	`learnerHasAccess = learnerHasAccess,`
	`51`	`+ relative = relative,`
`48`	`52`	`courseName = courseName`
`49`	`53`	`)`
`50`	`54`	`}`