Skip to content

Commit 87d5fae

Browse files
Merge branch 'feat/dates_page' into chore/uimessage_refactoring
# Conflicts: # core/src/main/java/org/openedx/core/presentation/dates/DatesUI.kt # dates/src/main/java/org/openedx/dates/presentation/dates/DatesViewModel.kt # dates/src/test/java/org/openedx/dates/DatesViewModelTest.kt
2 parents b754a66 + 058b847 commit 87d5fae

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ private fun CourseDateItem(
263263
if (isMiddleChild) {
264264
Spacer(modifier = Modifier.height(20.dp))
265265
}
266-
if (!dateBlock.dueDate.isToday() || dateBlock.dueDate < Date()) {
266+
if (!dateBlock.dueDate.isToday()) {
267267
val timeTitle = formatToString(context, dateBlock.dueDate, useRelativeDates)
268268
Text(
269269
text = timeTitle,

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@ package org.openedx.dates.presentation.dates
33
import androidx.fragment.app.FragmentManager
44
import androidx.lifecycle.viewModelScope
55
import kotlinx.coroutines.Job
6+
import kotlinx.coroutines.flow.MutableSharedFlow
67
import kotlinx.coroutines.flow.MutableStateFlow
8+
import kotlinx.coroutines.flow.SharedFlow
79
import kotlinx.coroutines.flow.StateFlow
10+
import kotlinx.coroutines.flow.asSharedFlow
811
import kotlinx.coroutines.flow.asStateFlow
912
import kotlinx.coroutines.flow.update
1013
import kotlinx.coroutines.launch
14+
import org.openedx.core.R
1115
import org.openedx.core.data.storage.CorePreferences
1216
import org.openedx.core.domain.model.CourseDate
1317
import org.openedx.core.domain.model.CourseDatesResponse
@@ -22,7 +26,9 @@ import org.openedx.dates.presentation.DatesAnalytics
2226
import org.openedx.dates.presentation.DatesAnalyticsEvent
2327
import org.openedx.dates.presentation.DatesAnalyticsKey
2428
import org.openedx.dates.presentation.DatesRouter
29+
import org.openedx.foundation.extension.isInternetError
2530
import org.openedx.foundation.presentation.BaseViewModel
31+
import org.openedx.foundation.presentation.UIMessage
2632
import org.openedx.foundation.system.ResourceManager
2733
import java.util.Calendar
2834
import java.util.Date

dates/src/test/java/org/openedx/dates/DatesViewModelTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import org.junit.Assert.assertTrue
2525
import org.junit.Before
2626
import org.junit.Rule
2727
import org.junit.Test
28+
import org.openedx.core.R
2829
import org.openedx.core.data.storage.CorePreferences
2930
import org.openedx.core.domain.model.CourseDate
3031
import org.openedx.core.domain.model.CourseDatesResponse

0 commit comments

Comments
 (0)