fix: changes according review

Author: PavloNetrebchuk

core/src/main/java/org/openedx/core/ui/ComposeCommon.kt

@@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.sizeIn
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
@@ -1142,7 +1143,11 @@ fun NoContentScreen(message: String, icon: Painter) {
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Icon(
-            modifier = Modifier.size(80.dp),
+            modifier = Modifier
+                .sizeIn(
+                    maxWidth = 80.dp,
+                    maxHeight = 80.dp
+                ),
             painter = icon,
             contentDescription = null,
             tint = MaterialTheme.appColors.progressBarBackgroundColor,

core/src/main/res/values/strings.xml

@@ -174,7 +174,7 @@
     <string name="core_no_course_content">No course content is currently available.</string>
     <string name="core_no_videos">No videos available for this course.</string>
     <string name="core_no_dates">Course dates are currently not available.</string>
-    <string name="core_no_assignments">Course assignment are currently not available.</string>
+    <string name="core_no_assignments">No assignments available for this course.</string>
     <string name="core_no_discussion">Unable to load discussions.\n Please try again later.</string>
     <string name="core_no_handouts">There are currently no handouts for this course.</string>
     <string name="core_no_announcements">There are currently no announcements for this course.</string>

course/src/main/java/org/openedx/course/presentation/assignments/CourseAssignmentViewModel.kt

@@ -39,19 +39,18 @@ class CourseAssignmentViewModel(
 
     private fun collectData() {
         viewModelScope.launch {
-            val courseProgressFlow = interactor.getCourseProgress(courseId, true)
+            val courseProgressFlow = interactor.getCourseProgress(courseId, false)
             val courseStructureFlow = interactor.getCourseStructureFlow(courseId)
-                .catch {
-                    _uiState.value = CourseAssignmentUIState.Empty
-                }
 
             combine(
                 courseProgressFlow,
                 courseStructureFlow
             ) { courseProgress, courseStructure ->
                 courseProgress to courseStructure
             }.catch {
-                _uiState.value = CourseAssignmentUIState.Empty
+                if (_uiState.value !is CourseAssignmentUIState.CourseData) {
+                    _uiState.value = CourseAssignmentUIState.Empty
+                }
             }.collect { (courseProgress, courseStructure) ->
                 if (courseStructure != null) {
                     updateAssignments(courseStructure, courseProgress)

course/src/main/java/org/openedx/course/presentation/assignments/CourseContentAssignmentScreen.kt

@@ -80,6 +80,7 @@ private const val ASSIGNMENT_BUTTON_CARD_BACKGROUND_ALPHA = 0.5f
 private const val COMPLETED_ASSIGNMENTS_COUNT = 1
 private const val COMPLETED_ASSIGNMENTS_COUNT_TABLET = 2
 private const val TOTAL_ASSIGNMENTS_COUNT = 3
+private const val SHORT_LABEL_PREFIX_SIZE = 3
 
 @Composable
 fun CourseContentAssignmentScreen(
@@ -119,7 +120,10 @@ private fun CourseContentAssignmentScreen(
 
     when (uiState) {
         is CourseAssignmentUIState.Loading -> {
-            Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+            Box(
+                modifier = Modifier.fillMaxSize(),
+                contentAlignment = Alignment.Center
+            ) {
                 CircularProgressIndicator()
             }
         }
@@ -301,9 +305,9 @@ private fun AssignmentGroupSection(
 @Composable
 private fun AssignmentButton(assignment: Block, isSelected: Boolean, onClick: () -> Unit) {
     val label = assignment.assignmentProgress?.label?.split(" ").let {
-        it?.first()?.take(3) + it?.last()
+        it?.first()?.take(SHORT_LABEL_PREFIX_SIZE) + it?.last()
     }
-    val isDuePast = assignment.due != null && assignment.due!! > Date()
+    val isDuePast = assignment.due != null && assignment.due!! < Date()
     val cardBorderColor = when {
         isSelected -> MaterialTheme.appColors.primary
         assignment.isCompleted() -> MaterialTheme.appColors.successGreen

course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt

@@ -286,27 +286,46 @@ fun CourseDashboard(
             scaffoldState = scaffoldState,
             backgroundColor = MaterialTheme.appColors.background,
             bottomBar = {
-                if (CourseContainerTab.entries[pagerState.currentPage] == CourseContainerTab.CONTENT &&
-                    selectedContentTab == CourseContentTab.ASSIGNMENTS
-                ) {
-                    Column(
-                        modifier = Modifier.background(MaterialTheme.appColors.background),
-                        horizontalAlignment = Alignment.CenterHorizontally
+                Box {
+                    if (CourseContainerTab.entries[pagerState.currentPage] == CourseContainerTab.CONTENT &&
+                        selectedContentTab == CourseContentTab.ASSIGNMENTS
                     ) {
-                        Divider(modifier = Modifier.fillMaxWidth())
-                        TextButton(
-                            onClick = {
-                                scrollToProgress(scope, pagerState)
-                            }
+                        Column(
+                            modifier = Modifier.background(MaterialTheme.appColors.background),
+                            horizontalAlignment = Alignment.CenterHorizontally
                         ) {
-                            IconText(
-                                text = stringResource(R.string.course_review_grading_policy),
-                                painter = painterResource(id = coreR.drawable.core_ic_assignment),
-                                color = MaterialTheme.appColors.primary,
-                                textStyle = MaterialTheme.appTypography.labelLarge
-                            )
+                            Divider(modifier = Modifier.fillMaxWidth())
+                            TextButton(
+                                onClick = {
+                                    scrollToProgress(scope, pagerState)
+                                }
+                            ) {
+                                IconText(
+                                    text = stringResource(R.string.course_review_grading_policy),
+                                    painter = painterResource(id = coreR.drawable.core_ic_assignment),
+                                    color = MaterialTheme.appColors.primary,
+                                    textStyle = MaterialTheme.appTypography.labelLarge
+                                )
+                            }
                         }
                     }
+                    var isInternetConnectionShown by rememberSaveable {
+                        mutableStateOf(false)
+                    }
+                    if (!isInternetConnectionShown && !viewModel.hasInternetConnection) {
+                        OfflineModeDialog(
+                            Modifier
+                                .fillMaxWidth()
+                                .align(Alignment.BottomCenter),
+                            onDismissCLick = {
+                                isInternetConnectionShown = true
+                            },
+                            onReloadClick = {
+                                isInternetConnectionShown = viewModel.hasInternetConnection
+                                onRefresh(pagerState.currentPage)
+                            }
+                        )
+                    }
                 }
             }
         ) { paddingValues ->
@@ -403,24 +422,6 @@ fun CourseDashboard(
                         Modifier.align(Alignment.TopCenter)
                     )
 
-                    var isInternetConnectionShown by rememberSaveable {
-                        mutableStateOf(false)
-                    }
-                    if (!isInternetConnectionShown && !viewModel.hasInternetConnection) {
-                        OfflineModeDialog(
-                            Modifier
-                                .fillMaxWidth()
-                                .align(Alignment.BottomCenter),
-                            onDismissCLick = {
-                                isInternetConnectionShown = true
-                            },
-                            onReloadClick = {
-                                isInternetConnectionShown = viewModel.hasInternetConnection
-                                onRefresh(pagerState.currentPage)
-                            }
-                        )
-                    }
-
                     SnackbarHost(
                         modifier = Modifier.align(Alignment.BottomStart),
                         hostState = snackState

course/src/test/java/org/openedx/course/presentation/unit/video/VideoUnitViewModelTest.kt

@@ -57,6 +57,7 @@ class VideoUnitViewModelTest {
     @Test
     fun `markBlockCompleted exception`() = runTest {
         val viewModel = VideoUnitViewModel(
+            "",
             "",
             courseRepository,
             notifier,
@@ -96,6 +97,7 @@ class VideoUnitViewModelTest {
     @Test
     fun `markBlockCompleted success`() = runTest {
         val viewModel = VideoUnitViewModel(
+            "",
             "",
             courseRepository,
             notifier,
@@ -135,6 +137,7 @@ class VideoUnitViewModelTest {
     @Test
     fun `CourseVideoPositionChanged notifier test`() = runTest {
         val viewModel = VideoUnitViewModel(
+            "",
             "",
             courseRepository,
             notifier,

course/src/test/java/org/openedx/course/presentation/videos/CourseVideoViewModelTest.kt

@@ -252,9 +252,13 @@ class CourseVideoViewModelTest {
     fun `getVideos success`() = runTest {
         every { config.getCourseUIConfig().isCourseDropdownNavigationEnabled } returns false
         coEvery { interactor.getCourseStructureForVideos(any()) } returns courseStructure
-        every { downloadDao.getAllDataFlow() } returns flow { emit(emptyList()) }
+        every { downloadDao.getAllDataFlow() } returns flow {
+            repeat(5) {
+                delay(10000)
+                emit(emptyList())
+            }
+        }
         every { preferencesManager.videoSettings } returns VideoSettings.default
-
         val viewModel = CourseVideoViewModel(
             "",
             config,
@@ -272,10 +276,14 @@ class CourseVideoViewModelTest {
             downloadHelper,
         )
 
-        viewModel.getVideos()
+        val mockLifeCycleOwner: LifecycleOwner = mockk()
+        val lifecycleRegistry = LifecycleRegistry(mockLifeCycleOwner)
+        lifecycleRegistry.addObserver(viewModel)
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+
         advanceUntilIdle()
 
-        coVerify(exactly = 2) { interactor.getCourseStructureForVideos(any()) }
+        coVerify(exactly = 1) { interactor.getCourseStructureForVideos(any()) }
 
         assert(viewModel.uiState.value is CourseVideoUIState.CourseData)
     }