feat: Empty states and settings button

openedx · May 10, 2024 · 45aa988 · 45aa988
1 parent f9069a0
commit 45aa988
Show file tree

Hide file tree

Showing 13 changed files with 175 additions and 60 deletions.
diff --git a/app/src/main/java/org/openedx/app/MainViewModel.kt b/app/src/main/java/org/openedx/app/MainViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
@@ -31,13 +32,17 @@ class MainViewModel(
 
     val isDiscoveryTypeWebView get() = config.getDiscoveryConfig().isViewTypeWebView()
 
+    @OptIn(FlowPreview::class)
     override fun onCreate(owner: LifecycleOwner) {
         super.onCreate(owner)
-        notifier.notifier.onEach {
-            if (it is NavigationToDiscovery) {
-                _navigateToDiscovery.emit(true)
+        notifier.notifier
+            .onEach {
+                if (it is NavigationToDiscovery) {
+                    _navigateToDiscovery.emit(true)
+                }
             }
-        }.distinctUntilChanged().launchIn(viewModelScope)
+            .distinctUntilChanged()
+            .launchIn(viewModelScope)
     }
 
     fun enableBottomBar(enable: Boolean) {

diff --git a/...e/src/test/java/org/openedx/course/presentation/container/CourseContainerViewModelTest.kt b/...e/src/test/java/org/openedx/course/presentation/container/CourseContainerViewModelTest.kt
@@ -134,6 +134,7 @@ class CourseContainerViewModelTest {
             "",
             "",
             "",
+            "",
             config,
             interactor,
             calendarManager,
@@ -167,6 +168,7 @@ class CourseContainerViewModelTest {
             "",
             "",
             "",
+            "",
             config,
             interactor,
             calendarManager,
@@ -200,6 +202,7 @@ class CourseContainerViewModelTest {
             "",
             "",
             "",
+            "",
             config,
             interactor,
             calendarManager,
@@ -233,6 +236,7 @@ class CourseContainerViewModelTest {
             "",
             "",
             "",
+            "",
             config,
             interactor,
             calendarManager,
@@ -267,6 +271,7 @@ class CourseContainerViewModelTest {
             "",
             "",
             "",
+            "",
             config,
             interactor,
             calendarManager,
@@ -297,6 +302,7 @@ class CourseContainerViewModelTest {
             "",
             "",
             "",
+            "",
             config,
             interactor,
             calendarManager,
@@ -327,6 +333,7 @@ class CourseContainerViewModelTest {
             "",
             "",
             "",
+            "",
             config,
             interactor,
             calendarManager,

diff --git a/course/src/test/java/org/openedx/course/presentation/dates/CourseDatesViewModelTest.kt b/course/src/test/java/org/openedx/course/presentation/dates/CourseDatesViewModelTest.kt
@@ -44,6 +44,7 @@ import org.openedx.core.system.notifier.CourseLoading
 import org.openedx.core.system.notifier.CourseNotifier
 import org.openedx.course.domain.interactor.CourseInteractor
 import org.openedx.course.presentation.CourseAnalytics
+import org.openedx.course.presentation.CourseRouter
 import org.openedx.course.presentation.calendarsync.CalendarManager
 import java.net.UnknownHostException
 import java.util.Date
@@ -62,6 +63,7 @@ class CourseDatesViewModelTest {
     private val corePreferences = mockk<CorePreferences>()
     private val analytics = mockk<CourseAnalytics>()
     private val config = mockk<Config>()
+    private val courseRouter = mockk<CourseRouter>()
 
     private val openEdx = "OpenEdx"
     private val calendarTitle = "OpenEdx - Abc"
@@ -169,7 +171,8 @@ class CourseDatesViewModelTest {
             resourceManager,
             corePreferences,
             analytics,
-            config
+            config,
+            courseRouter
         )
         coEvery { interactor.getCourseDates(any()) } throws UnknownHostException()
         val message = async {
@@ -195,7 +198,8 @@ class CourseDatesViewModelTest {
             resourceManager,
             corePreferences,
             analytics,
-            config
+            config,
+            courseRouter
         )
         coEvery { interactor.getCourseDates(any()) } throws Exception()
         val message = async {
@@ -221,7 +225,8 @@ class CourseDatesViewModelTest {
             resourceManager,
             corePreferences,
             analytics,
-            config
+            config,
+            courseRouter
         )
         coEvery { interactor.getCourseDates(any()) } returns mockedCourseDatesResult
         val message = async {
@@ -247,7 +252,8 @@ class CourseDatesViewModelTest {
             resourceManager,
             corePreferences,
             analytics,
-            config
+            config,
+            courseRouter
         )
         coEvery { interactor.getCourseDates(any()) } returns CourseDatesResult(
             datesSection = linkedMapOf(),

diff --git a/course/src/test/java/org/openedx/course/presentation/outline/CourseOutlineViewModelTest.kt b/course/src/test/java/org/openedx/course/presentation/outline/CourseOutlineViewModelTest.kt
@@ -56,6 +56,7 @@ import org.openedx.core.system.notifier.CourseNotifier
 import org.openedx.core.system.notifier.CourseStructureUpdated
 import org.openedx.course.domain.interactor.CourseInteractor
 import org.openedx.course.presentation.CourseAnalytics
+import org.openedx.course.presentation.CourseRouter
 import java.net.UnknownHostException
 import java.util.Date
 
@@ -77,6 +78,7 @@ class CourseOutlineViewModelTest {
     private val workerController = mockk<DownloadWorkerController>()
     private val analytics = mockk<CourseAnalytics>()
     private val coreAnalytics = mockk<CoreAnalytics>()
+    private val courseRouter = mockk<CourseRouter>()
 
     private val noInternet = "Slow or no internet connection"
     private val somethingWrong = "Something went wrong"
@@ -233,6 +235,7 @@ class CourseOutlineViewModelTest {
             networkConnection,
             preferencesManager,
             analytics,
+            courseRouter,
             coreAnalytics,
             downloadDao,
             workerController,
@@ -267,6 +270,7 @@ class CourseOutlineViewModelTest {
             networkConnection,
             preferencesManager,
             analytics,
+            courseRouter,
             coreAnalytics,
             downloadDao,
             workerController
@@ -311,6 +315,7 @@ class CourseOutlineViewModelTest {
             networkConnection,
             preferencesManager,
             analytics,
+            courseRouter,
             coreAnalytics,
             downloadDao,
             workerController
@@ -357,6 +362,7 @@ class CourseOutlineViewModelTest {
             networkConnection,
             preferencesManager,
             analytics,
+            courseRouter,
             coreAnalytics,
             downloadDao,
             workerController
@@ -403,6 +409,7 @@ class CourseOutlineViewModelTest {
             networkConnection,
             preferencesManager,
             analytics,
+            courseRouter,
             coreAnalytics,
             downloadDao,
             workerController
@@ -437,6 +444,7 @@ class CourseOutlineViewModelTest {
             networkConnection,
             preferencesManager,
             analytics,
+            courseRouter,
             coreAnalytics,
             downloadDao,
             workerController
@@ -485,6 +493,7 @@ class CourseOutlineViewModelTest {
             networkConnection,
             preferencesManager,
             analytics,
+            courseRouter,
             coreAnalytics,
             downloadDao,
             workerController
@@ -528,6 +537,7 @@ class CourseOutlineViewModelTest {
             networkConnection,
             preferencesManager,
             analytics,
+            courseRouter,
             coreAnalytics,
             downloadDao,
             workerController
@@ -563,6 +573,7 @@ class CourseOutlineViewModelTest {
             networkConnection,
             preferencesManager,
             analytics,
+            courseRouter,
             coreAnalytics,
             downloadDao,
             workerController

diff --git a/course/src/test/java/org/openedx/course/presentation/videos/CourseVideoViewModelTest.kt b/course/src/test/java/org/openedx/course/presentation/videos/CourseVideoViewModelTest.kt
@@ -53,6 +53,7 @@ import org.openedx.core.system.notifier.VideoNotifier
 import org.openedx.course.R
 import org.openedx.course.domain.interactor.CourseInteractor
 import org.openedx.course.presentation.CourseAnalytics
+import org.openedx.course.presentation.CourseRouter
 import java.util.Date
 
 @OptIn(ExperimentalCoroutinesApi::class)
@@ -73,6 +74,7 @@ class CourseVideoViewModelTest {
     private val networkConnection = mockk<NetworkConnection>()
     private val downloadDao = mockk<DownloadDao>()
     private val workerController = mockk<DownloadWorkerController>()
+    private val courseRouter = mockk<CourseRouter>()
 
     private val cantDownload = "You can download content only from Wi-fi"
 
@@ -196,9 +198,10 @@ class CourseVideoViewModelTest {
             courseNotifier,
             videoNotifier,
             analytics,
+            courseRouter,
             coreAnalytics,
             downloadDao,
-            workerController
+            workerController,
         )
 
         viewModel.getVideos()
@@ -227,6 +230,7 @@ class CourseVideoViewModelTest {
             courseNotifier,
             videoNotifier,
             analytics,
+            courseRouter,
             coreAnalytics,
             downloadDao,
             workerController
@@ -267,6 +271,7 @@ class CourseVideoViewModelTest {
             courseNotifier,
             videoNotifier,
             analytics,
+            courseRouter,
             coreAnalytics,
             downloadDao,
             workerController
@@ -308,6 +313,7 @@ class CourseVideoViewModelTest {
             courseNotifier,
             videoNotifier,
             analytics,
+            courseRouter,
             coreAnalytics,
             downloadDao,
             workerController
@@ -344,6 +350,7 @@ class CourseVideoViewModelTest {
             courseNotifier,
             videoNotifier,
             analytics,
+            courseRouter,
             coreAnalytics,
             downloadDao,
             workerController
@@ -384,6 +391,7 @@ class CourseVideoViewModelTest {
             courseNotifier,
             videoNotifier,
             analytics,
+            courseRouter,
             coreAnalytics,
             downloadDao,
             workerController

diff --git a/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesFragment.kt b/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesFragment.kt
@@ -400,7 +400,9 @@ private fun AllEnrolledCoursesScreen(
                                                 .fillMaxHeight()
                                                 .then(emptyStatePaddings)
                                         ) {
-                                            EmptyState()
+                                            EmptyState(
+                                                currentCourseStatus = CourseStatusFilter.entries[tabPagerState.currentPage]
+                                            )
                                         }
                                     }
                                 }
@@ -560,28 +562,33 @@ private fun Header(
 }
 
 @Composable
-private fun EmptyState() {
+private fun EmptyState(
+    currentCourseStatus: CourseStatusFilter
+) {
     Box(
         modifier = Modifier.fillMaxSize(),
         contentAlignment = Alignment.Center
     ) {
         Column(
-            Modifier.width(185.dp),
+            Modifier.width(200.dp),
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             Icon(
-                painter = painterResource(id = R.drawable.dashboard_ic_empty),
-                contentDescription = null,
-                tint = MaterialTheme.appColors.textFieldBorder
+                painter = painterResource(id = R.drawable.dashboard_ic_book),
+                tint = MaterialTheme.appColors.textFieldBorder,
+                contentDescription = null
             )
-            Spacer(Modifier.height(16.dp))
+            Spacer(Modifier.height(4.dp))
             Text(
                 modifier = Modifier
-                    .testTag("txt_empty_state_description")
+                    .testTag("txt_empty_state_title")
                     .fillMaxWidth(),
-                text = stringResource(id = R.string.dashboard_you_are_not_enrolled),
-                color = MaterialTheme.appColors.textPrimaryVariant,
-                style = MaterialTheme.appTypography.bodySmall,
+                text = stringResource(
+                    id = R.string.dashboard_no_status_courses,
+                    stringResource(currentCourseStatus.labelResId)
+                ),
+                color = MaterialTheme.appColors.textDark,
+                style = MaterialTheme.appTypography.titleMedium,
                 textAlign = TextAlign.Center
             )
         }
@@ -616,6 +623,16 @@ private fun AllEnrolledCoursesPreview() {
     }
 }
 
+@Preview
+@Composable
+private fun EmptyStatePreview() {
+    OpenEdXTheme {
+        EmptyState(
+            currentCourseStatus = CourseStatusFilter.COMPLETE
+        )
+    }
+}
+
 private val mockCourseAssignments = CourseAssignments(null, emptyList())
 private val mockCourseEnrolled = EnrolledCourse(
     auditAccessExpires = Date(),

diff --git a/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesUIState.kt b/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesUIState.kt
@@ -4,6 +4,6 @@ import org.openedx.core.domain.model.EnrolledCourse
 
 sealed class AllEnrolledCoursesUIState {
     data class Courses(val courses: List<EnrolledCourse>) : AllEnrolledCoursesUIState()
-    object Empty : AllEnrolledCoursesUIState()
-    object Loading : AllEnrolledCoursesUIState()
+    data object Empty : AllEnrolledCoursesUIState()
+    data object Loading : AllEnrolledCoursesUIState()
 }