feat: changes according PR feedback

PavloNetrebchuk · PavloNetrebchuk · commit a80ed4d3f369 · 2025-09-23T14:45:38.000+03:00
diff --git a/app/schemas/org.openedx.app.room.AppDatabase/4.json b/app/schemas/org.openedx.app.room.AppDatabase/4.json
@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 4,
-    "identityHash": "488bd2b78e977fef626afb28014c80f2",
+    "identityHash": "7ea446decde04c9c16700cb3981703c2",
     "entities": [
       {
         "tableName": "course_discovery_table",
@@ -1008,7 +1008,7 @@
       },
       {
         "tableName": "video_progress_table",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`block_id` TEXT NOT NULL, `video_url` TEXT NOT NULL, `video_time` INTEGER NOT NULL, `duration` INTEGER NOT NULL, PRIMARY KEY(`block_id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`block_id` TEXT NOT NULL, `video_url` TEXT NOT NULL, `video_time` INTEGER, `duration` INTEGER, PRIMARY KEY(`block_id`))",
         "fields": [
           {
             "fieldPath": "blockId",
@@ -1026,13 +1026,13 @@
             "fieldPath": "videoTime",
             "columnName": "video_time",
             "affinity": "INTEGER",
-            "notNull": true
+            "notNull": false
           },
           {
             "fieldPath": "duration",
             "columnName": "duration",
             "affinity": "INTEGER",
-            "notNull": true
+            "notNull": false
           }
         ],
         "primaryKey": {
@@ -1230,7 +1230,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '488bd2b78e977fef626afb28014c80f2')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '7ea446decde04c9c16700cb3981703c2')"
     ]
   }
 }
diff --git a/core/src/main/java/org/openedx/core/data/model/room/VideoProgressEntity.kt b/core/src/main/java/org/openedx/core/data/model/room/VideoProgressEntity.kt
@@ -12,7 +12,7 @@ data class VideoProgressEntity(
     @ColumnInfo("video_url")
     val videoUrl: String,
     @ColumnInfo("video_time")
-    val videoTime: Long,
+    val videoTime: Long?,
     @ColumnInfo("duration")
-    val duration: Long,
+    val duration: Long?,
 )
diff --git a/core/src/main/java/org/openedx/core/domain/model/CourseProgress.kt b/core/src/main/java/org/openedx/core/domain/model/CourseProgress.kt
@@ -78,6 +78,17 @@ data class CourseProgress(
         }
     }
 
+    fun getCompletedAssignmentCount(
+        policy: GradingPolicy.AssignmentPolicy,
+        courseStructure: CourseStructure? = null
+    ): Int {
+        val assignments = getAssignmentSections(policy.type)
+        return courseStructure?.blockData
+            ?.filter { it.id in assignments.map { assignment -> assignment.blockKey } }
+            ?.filter { it.isCompleted() }
+            ?.size ?: 0
+    }
+
     data class CertificateData(
         val certStatus: String,
         val certWebViewUrl: String,
diff --git a/core/src/openedx/org/openedx/core/ui/theme/Colors.kt b/core/src/openedx/org/openedx/core/ui/theme/Colors.kt
@@ -75,7 +75,7 @@ val light_settings_title_content = Color.White
 val light_progress_bar_color = light_success_green
 val light_progress_bar_background_color = Color(0xFFCCD4E0)
 val light_grade_progress_bar_color = Color.Black
-val light_grade_progress_bar_background = light_background
+val light_grade_progress_bar_background = Color(0xFFCCD4E0)
 val light_assignment_card_border = Color(0xFFCCD4E0)
 
 val dark_primary = Color(0xFF3F68F8)
diff --git a/course/src/main/java/org/openedx/course/data/repository/CourseRepository.kt b/course/src/main/java/org/openedx/course/data/repository/CourseRepository.kt
@@ -254,7 +254,7 @@ class CourseRepository(
 
     suspend fun getVideoProgress(blockId: String): VideoProgressEntity {
         return courseDao.getVideoProgressByBlockId(blockId)
-            ?: VideoProgressEntity(blockId, "", 0L, 0L)
+            ?: VideoProgressEntity(blockId, "", null, null)
     }
 
     fun getCourseProgress(
diff --git a/course/src/main/java/org/openedx/course/presentation/home/AssignmentsHomePagerCardContent.kt b/course/src/main/java/org/openedx/course/presentation/home/AssignmentsHomePagerCardContent.kt
@@ -25,6 +25,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontWeight
@@ -128,7 +129,8 @@ fun AssignmentsHomePagerCardContent(
             AssignmentCard(
                 assignment = firstIncompleteAssignment,
                 sectionName = getBlockParent(firstIncompleteAssignment.id)?.displayName ?: "",
-                onAssignmentClick = onAssignmentClick
+                onAssignmentClick = onAssignmentClick,
+                background = MaterialTheme.appColors.background,
             )
         } else {
             CaughtUpMessage(
@@ -150,7 +152,8 @@ fun AssignmentsHomePagerCardContent(
 private fun AssignmentCard(
     assignment: Block,
     sectionName: String,
-    onAssignmentClick: (Block) -> Unit
+    onAssignmentClick: (Block) -> Unit,
+    background: Color = MaterialTheme.appColors.surface
 ) {
     val isDuePast = assignment.due != null && assignment.due!! < Date()
 
@@ -199,7 +202,7 @@ private fun AssignmentCard(
         modifier = Modifier
             .fillMaxWidth()
             .clickable { onAssignmentClick(assignment) },
-        backgroundColor = MaterialTheme.appColors.surface,
+        backgroundColor = background,
         border = BorderStroke(1.dp, MaterialTheme.appColors.cardViewBorder),
         shape = RoundedCornerShape(8.dp),
         elevation = 0.dp
diff --git a/course/src/main/java/org/openedx/course/presentation/home/CourseCompletionHomePagerCardContent.kt b/course/src/main/java/org/openedx/course/presentation/home/CourseCompletionHomePagerCardContent.kt
@@ -110,7 +110,8 @@ fun CourseCompletionHomePagerCardContent(
                 downloadedStateMap = uiState.downloadedState,
                 onSubSectionClick = onSubSectionClick,
                 onDownloadClick = onDownloadClick,
-                progress = progress
+                progress = progress,
+                background = MaterialTheme.appColors.background
             )
         }
 
diff --git a/course/src/main/java/org/openedx/course/presentation/home/CourseHomeScreen.kt b/course/src/main/java/org/openedx/course/presentation/home/CourseHomeScreen.kt
@@ -71,6 +71,7 @@ import org.openedx.foundation.presentation.UIMessage
 import org.openedx.foundation.presentation.WindowSize
 import org.openedx.foundation.presentation.WindowType
 import org.openedx.foundation.presentation.windowSizeValue
+import org.openedx.core.R as coreR
 
 @Composable
 fun CourseHomeScreen(
@@ -414,14 +415,25 @@ fun CaughtUpMessage(
     modifier: Modifier = Modifier,
     message: String,
 ) {
-    Text(
-        modifier = modifier
-            .fillMaxWidth(),
-        text = message,
-        color = MaterialTheme.appColors.textPrimary,
-        style = MaterialTheme.appTypography.bodyLarge,
-        textAlign = TextAlign.Center
-    )
+    Column(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Icon(
+            modifier = Modifier.size(48.dp),
+            painter = painterResource(coreR.drawable.core_ic_check),
+            contentDescription = null,
+            tint = MaterialTheme.appColors.successGreen
+        )
+        Text(
+            modifier = modifier
+                .fillMaxWidth(),
+            text = message,
+            color = MaterialTheme.appColors.textPrimary,
+            style = MaterialTheme.appTypography.bodyLarge,
+            textAlign = TextAlign.Center
+        )
+    }
 }
 
 @Preview(uiMode = UI_MODE_NIGHT_NO)
diff --git a/course/src/main/java/org/openedx/course/presentation/home/CourseHomeUIState.kt b/course/src/main/java/org/openedx/course/presentation/home/CourseHomeUIState.kt
@@ -22,7 +22,7 @@ sealed class CourseHomeUIState {
         val courseVideos: Map<String, List<Block>>,
         val courseAssignments: List<Block>,
         val videoPreview: VideoPreview?,
-        val videoProgress: Float,
+        val videoProgress: Float?,
     ) : CourseHomeUIState()
 
     data object Error : CourseHomeUIState()
diff --git a/course/src/main/java/org/openedx/course/presentation/home/CourseHomeViewModel.kt b/course/src/main/java/org/openedx/course/presentation/home/CourseHomeViewModel.kt
@@ -26,6 +26,7 @@ import org.openedx.core.domain.model.CourseStructure
 import org.openedx.core.extension.getChapterBlocks
 import org.openedx.core.extension.getSequentialBlocks
 import org.openedx.core.extension.getVerticalBlocks
+import org.openedx.core.extension.safeDivBy
 import org.openedx.core.module.DownloadWorkerController
 import org.openedx.core.module.db.DownloadDao
 import org.openedx.core.module.download.BaseDownloadViewModel
@@ -233,9 +234,14 @@ class CourseHomeViewModel(
         val videoProgress = if (firstIncompleteVideo != null) {
             try {
                 val videoProgressEntity = interactor.getVideoProgress(firstIncompleteVideo.id)
-                val progress =
-                    videoProgressEntity.videoTime.toFloat() / videoProgressEntity.duration.toFloat()
-                progress.coerceIn(0f, 1f)
+                val videoTime = videoProgressEntity.videoTime?.toFloat()
+                val videoDuration = videoProgressEntity.duration?.toFloat()
+                val progress = if (videoTime != null && videoDuration != null) {
+                    videoTime.safeDivBy(videoDuration)
+                } else {
+                    null
+                }
+                progress?.coerceIn(0f, 1f)
             } catch (_: Exception) {
                 0f
             }
diff --git a/course/src/main/java/org/openedx/course/presentation/home/GradesHomePagerCardContent.kt b/course/src/main/java/org/openedx/course/presentation/home/GradesHomePagerCardContent.kt
@@ -27,6 +27,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import org.openedx.core.domain.model.CourseProgress
+import org.openedx.core.domain.model.CourseStructure
 import org.openedx.core.ui.theme.appColors
 import org.openedx.core.ui.theme.appShapes
 import org.openedx.core.ui.theme.appTypography
@@ -89,9 +90,10 @@ fun GradesHomePagerCardContent(
         }
         Spacer(modifier = Modifier.height(20.dp))
         GradeCardsGrid(
-            assignmentPolicies = gradingPolicy.assignmentPolicies,
+            assignmentPolicies = assignmentPolicies,
             assignmentColors = gradingPolicy.assignmentColors,
-            progress = courseProgress
+            progress = courseProgress,
+            courseStructure = uiState.courseStructure
         )
         Spacer(modifier = Modifier.height(8.dp))
         ViewAllButton(
@@ -105,11 +107,13 @@ fun GradesHomePagerCardContent(
 private fun GradeCard(
     policy: CourseProgress.GradingPolicy.AssignmentPolicy,
     progress: CourseProgress,
+    courseStructure: CourseStructure?,
     color: Color,
     modifier: Modifier = Modifier
 ) {
-    val earned = progress.getEarnedAssignmentProblems(policy)
-    val possible = progress.getPossibleAssignmentProblems(policy)
+    val assignments = progress.getAssignmentSections(policy.type)
+    val earned = progress.getCompletedAssignmentCount(policy, courseStructure)
+    val possible = assignments.size
     val gradePercent = if (possible > 0) (earned.toFloat() / possible * 100).toInt() else 0
 
     Card(
@@ -156,7 +160,7 @@ private fun GradeCard(
                 Spacer(modifier = Modifier.width(8.dp))
                 Column {
                     Text(
-                        text = if (possible > 0) "$gradePercent%" else "--%",
+                        text = "$gradePercent%",
                         style = MaterialTheme.appTypography.bodyLarge,
                         color = MaterialTheme.appColors.textPrimary,
                         fontWeight = FontWeight.Bold
@@ -165,8 +169,8 @@ private fun GradeCard(
                     Text(
                         text = stringResource(
                             R.string.course_progress_earned_possible_assignment_problems,
-                            earned.toInt(),
-                            possible.toInt()
+                            earned,
+                            possible
                         ),
                         style = MaterialTheme.appTypography.labelSmall,
                         color = MaterialTheme.appColors.textPrimary,
@@ -181,7 +185,8 @@ private fun GradeCard(
 private fun GradeCardsGrid(
     assignmentPolicies: List<CourseProgress.GradingPolicy.AssignmentPolicy>,
     assignmentColors: List<Color>,
-    progress: CourseProgress
+    progress: CourseProgress,
+    courseStructure: CourseStructure?
 ) {
     Column(
         verticalArrangement = Arrangement.spacedBy(16.dp)
@@ -198,6 +203,7 @@ private fun GradeCardsGrid(
                         modifier = Modifier.weight(1f),
                         policy = policy,
                         progress = progress,
+                        courseStructure = courseStructure,
                         color = if (assignmentColors.isNotEmpty()) {
                             assignmentColors[policyIndex % assignmentColors.size]
                         } else {
diff --git a/course/src/main/java/org/openedx/course/presentation/home/VideosHomePagerCardContent.kt b/course/src/main/java/org/openedx/course/presentation/home/VideosHomePagerCardContent.kt
@@ -52,6 +52,11 @@ fun VideosHomePagerCardContent(
     val completedVideos = allVideos.count { it.isCompleted() }
     val totalVideos = allVideos.size
     val firstIncompleteVideo = allVideos.find { !it.isCompleted() }
+    val videoProgress = uiState.videoProgress ?: if (firstIncompleteVideo?.isCompleted() ?: false) {
+        1f
+    } else {
+        0f
+    }
 
     Column(
         modifier = Modifier
@@ -111,8 +116,13 @@ fun VideosHomePagerCardContent(
 
         // Continue Watching section
         if (firstIncompleteVideo != null) {
+            val title = if (videoProgress > 0) {
+                stringResource(R.string.course_continue_watching)
+            } else {
+                stringResource(R.string.course_next_video)
+            }
             Text(
-                text = stringResource(R.string.course_continue_watching),
+                text = title,
                 style = MaterialTheme.appTypography.titleMedium,
                 color = MaterialTheme.appColors.textPrimary,
                 fontWeight = FontWeight.SemiBold
@@ -139,7 +149,7 @@ fun VideosHomePagerCardContent(
                             .height(180.dp),
                         videoBlock = firstIncompleteVideo,
                         preview = uiState.videoPreview,
-                        progress = uiState.videoProgress,
+                        progress = videoProgress,
                         onClick = {
                             onVideoClick(firstIncompleteVideo)
                         },
diff --git a/course/src/main/java/org/openedx/course/presentation/progress/CourseProgressScreen.kt b/course/src/main/java/org/openedx/course/presentation/progress/CourseProgressScreen.kt
@@ -146,7 +146,7 @@ private fun CourseProgressContent(
                         }
                         itemsIndexed(assignmentPolicies) { index, policy ->
                             AssignmentTypeRow(
-                                progress = uiState.progress,
+                                uiState = uiState,
                                 policy = policy,
                                 color = if (gradingPolicy.assignmentColors.isNotEmpty()) {
                                     gradingPolicy.assignmentColors[index % gradingPolicy.assignmentColors.size]
@@ -351,12 +351,12 @@ private fun CourseCompletionView(
 
 @Composable
 private fun AssignmentTypeRow(
-    progress: CourseProgress,
+    uiState: CourseProgressUIState.Data,
     policy: CourseProgress.GradingPolicy.AssignmentPolicy,
     color: Color
 ) {
-    val assignments = progress.getAssignmentSections(policy.type)
-    val earned = assignments.filter { it.numPointsEarned > 0f }.size // Is it correct?
+    val assignments = uiState.progress.getAssignmentSections(policy.type)
+    val earned = uiState.progress.getCompletedAssignmentCount(policy, uiState.courseStructure)
     val possible = assignments.size
     Column(
         modifier = Modifier
@@ -412,7 +412,7 @@ private fun AssignmentTypeRow(
             Text(
                 stringResource(
                     R.string.course_progress_current_and_max_weighted_graded_percent,
-                    progress.getAssignmentWeightedGradedPercent(policy).toInt(),
+                    uiState.progress.getAssignmentWeightedGradedPercent(policy).toInt(),
                     (policy.weight * 100).toInt()
                 ),
                 style = MaterialTheme.appTypography.bodyLarge,
diff --git a/course/src/main/java/org/openedx/course/presentation/progress/CourseProgressUIState.kt b/course/src/main/java/org/openedx/course/presentation/progress/CourseProgressUIState.kt
@@ -1,9 +1,13 @@
 package org.openedx.course.presentation.progress
 
 import org.openedx.core.domain.model.CourseProgress
+import org.openedx.core.domain.model.CourseStructure
 
 sealed class CourseProgressUIState {
     data object Error : CourseProgressUIState()
     data object Loading : CourseProgressUIState()
-    data class Data(val progress: CourseProgress) : CourseProgressUIState()
+    data class Data(
+        val progress: CourseProgress,
+        val courseStructure: CourseStructure?,
+    ) : CourseProgressUIState()
 }
diff --git a/course/src/main/java/org/openedx/course/presentation/progress/CourseProgressViewModel.kt b/course/src/main/java/org/openedx/course/presentation/progress/CourseProgressViewModel.kt
diff --git a/course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt b/course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt
diff --git a/course/src/main/java/org/openedx/course/presentation/unit/video/EncodedVideoUnitViewModel.kt b/course/src/main/java/org/openedx/course/presentation/unit/video/EncodedVideoUnitViewModel.kt
diff --git a/course/src/main/java/org/openedx/course/presentation/videos/CourseContentVideoScreen.kt b/course/src/main/java/org/openedx/course/presentation/videos/CourseContentVideoScreen.kt
diff --git a/course/src/main/java/org/openedx/course/presentation/videos/CourseVideoUIState.kt b/course/src/main/java/org/openedx/course/presentation/videos/CourseVideoUIState.kt
diff --git a/course/src/main/java/org/openedx/course/presentation/videos/CourseVideoViewModel.kt b/course/src/main/java/org/openedx/course/presentation/videos/CourseVideoViewModel.kt
diff --git a/course/src/main/res/values/strings.xml b/course/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"formatVersion": 1,`
`3`	`3`	`"database": {`
`4`	`4`	`"version": 4,`
`5`		`- "identityHash": "488bd2b78e977fef626afb28014c80f2",`
	`5`	`+ "identityHash": "7ea446decde04c9c16700cb3981703c2",`
`6`	`6`	`"entities": [`
`7`	`7`	`{`
`8`	`8`	`"tableName": "course_discovery_table",`
`@@ -1008,7 +1008,7 @@`
`1008`	`1008`	`},`
`1009`	`1009`	`{`
`1010`	`1010`	`"tableName": "video_progress_table",`
`1011`		- "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`block_id` TEXT NOT NULL, `video_url` TEXT NOT NULL, `video_time` INTEGER NOT NULL, `duration` INTEGER NOT NULL, PRIMARY KEY(`block_id`))",
	`1011`	+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`block_id` TEXT NOT NULL, `video_url` TEXT NOT NULL, `video_time` INTEGER, `duration` INTEGER, PRIMARY KEY(`block_id`))",
`1012`	`1012`	`"fields": [`
`1013`	`1013`	`{`
`1014`	`1014`	`"fieldPath": "blockId",`
`@@ -1026,13 +1026,13 @@`
`1026`	`1026`	`"fieldPath": "videoTime",`
`1027`	`1027`	`"columnName": "video_time",`
`1028`	`1028`	`"affinity": "INTEGER",`
`1029`		`- "notNull": true`
	`1029`	`+ "notNull": false`
`1030`	`1030`	`},`
`1031`	`1031`	`{`
`1032`	`1032`	`"fieldPath": "duration",`
`1033`	`1033`	`"columnName": "duration",`
`1034`	`1034`	`"affinity": "INTEGER",`
`1035`		`- "notNull": true`
	`1035`	`+ "notNull": false`
`1036`	`1036`	`}`
`1037`	`1037`	`],`
`1038`	`1038`	`"primaryKey": {`
`@@ -1230,7 +1230,7 @@`
`1230`	`1230`	`"views": [],`
`1231`	`1231`	`"setupQueries": [`
`1232`	`1232`	`"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",`
`1233`		`- "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '488bd2b78e977fef626afb28014c80f2')"`
	`1233`	`+ "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '7ea446decde04c9c16700cb3981703c2')"`
`1234`	`1234`	`]`
`1235`	`1235`	`}`
`1236`	`1236`	`}`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ class CourseRepository(`
`254`	`254`
`255`	`255`	`suspend fun getVideoProgress(blockId: String): VideoProgressEntity {`
`256`	`256`	`return courseDao.getVideoProgressByBlockId(blockId)`
`257`		`- ?: VideoProgressEntity(blockId, "", 0L, 0L)`
	`257`	`+ ?: VideoProgressEntity(blockId, "", null, null)`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`fun getCourseProgress(`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,8 @@ fun CourseCompletionHomePagerCardContent(`
`110`	`110`	`downloadedStateMap = uiState.downloadedState,`
`111`	`111`	`onSubSectionClick = onSubSectionClick,`
`112`	`112`	`onDownloadClick = onDownloadClick,`
`113`		`- progress = progress`
	`113`	`+ progress = progress,`
	`114`	`+ background = MaterialTheme.appColors.background`
`114`	`115`	`)`
`115`	`116`	`}`
`116`	`117`