feat: changes according PR feedback

PavloNetrebchuk · PavloNetrebchuk · commit a6a85e2f65e5 · 2025-09-22T15:19:08.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/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/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/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
@@ -139,7 +144,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/ui/CourseUI.kt b/course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt
@@ -618,7 +618,7 @@ fun CourseVideoSection(
     block: Block,
     videoBlocks: List<Block>,
     preview: Map<String, VideoPreview?>,
-    progress: Map<String, Float>,
+    progress: Map<String, Float?>,
     downloadedStateMap: Map<String, DownloadedState>,
     onVideoClick: (Block) -> Unit,
     onDownloadClick: (blocksIds: List<String>) -> Unit,
@@ -632,6 +632,8 @@ fun CourseVideoSection(
         filteredStatuses.any { it.isWaitingOrDownloading } -> DownloadedState.DOWNLOADING
         else -> DownloadedState.NOT_DOWNLOADED
     }
+    val videoCardWidth = 192.dp
+    val rowHorizontalArrangement = 8.dp
 
     LaunchedEffect(Unit) {
         try {
@@ -655,23 +657,29 @@ fun CourseVideoSection(
         )
         LazyRow(
             state = state,
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            horizontalArrangement = Arrangement.spacedBy(rowHorizontalArrangement),
             contentPadding = PaddingValues(
                 top = 8.dp,
                 bottom = 16.dp,
                 start = 16.dp,
-                end = 16.dp,
+                end = videoCardWidth + rowHorizontalArrangement,
             )
         ) {
             items(videoBlocks) { block ->
+                val localProgress = progress[block.id]
+                val progress = localProgress ?: if (block.isCompleted()) {
+                    1f
+                } else {
+                    0f
+                }
                 CourseVideoItem(
                     modifier = Modifier
-                        .width(192.dp)
+                        .width(videoCardWidth)
                         .height(108.dp)
                         .clip(MaterialTheme.appShapes.videoPreviewShape),
                     videoBlock = block,
                     preview = preview[block.id],
-                    progress = progress[block.id] ?: 0f,
+                    progress = progress,
                     onClick = {
                         onVideoClick(block)
                     }
@@ -758,12 +766,13 @@ fun CourseVideoItem(
             )
 
             // Progress bar (bottom)
-            if (progress > 0.0f) {
-                Box(
-                    modifier = Modifier
-                        .align(Alignment.BottomCenter),
-                    contentAlignment = Alignment.Center
-                ) {
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .align(Alignment.BottomCenter),
+                contentAlignment = Alignment.Center
+            ) {
+                if (progress > 0.0f) {
                     LinearProgressIndicator(
                         modifier = progressModifier
                             .fillMaxWidth()
@@ -776,23 +785,23 @@ fun CourseVideoItem(
                         },
                         backgroundColor = MaterialTheme.appColors.progressBarBackgroundColor
                     )
-                    if (videoBlock.isCompleted()) {
-                        Image(
-                            modifier = Modifier
-                                .align(Alignment.BottomEnd)
-                                .size(16.dp)
-                                .offset(x = 1.dp),
-                            painter = painterResource(id = coreR.drawable.ic_core_check),
-                            contentDescription = stringResource(R.string.course_accessibility_video_watched),
-                        )
-                    } else {
-                        Box(
-                            modifier = Modifier
-                                .align(Alignment.BottomEnd)
-                                .size(16.dp)
-                                .offset(x = 1.dp),
-                        )
-                    }
+                }
+                if (videoBlock.isCompleted()) {
+                    Image(
+                        modifier = Modifier
+                            .align(Alignment.BottomEnd)
+                            .size(16.dp)
+                            .offset(x = 1.dp),
+                        painter = painterResource(id = coreR.drawable.ic_core_check),
+                        contentDescription = stringResource(R.string.course_accessibility_video_watched),
+                    )
+                } else {
+                    Box(
+                        modifier = Modifier
+                            .align(Alignment.BottomEnd)
+                            .size(16.dp)
+                            .offset(x = 1.dp),
+                    )
                 }
             }
         }
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
@@ -182,7 +182,7 @@ private fun CourseVideosUI(
                                                 null
                                             },
                                             description = stringResource(
-                                                R.string.course_completed,
+                                                R.string.course_completed_of,
                                                 progress.completed,
                                                 progress.total
                                             )
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
@@ -15,7 +15,7 @@ sealed class CourseVideoUIState {
         val downloadModelsSize: DownloadModelsSize,
         val isCompletedSectionsShown: Boolean,
         val videoPreview: Map<String, VideoPreview?>,
-        val videoProgress: Map<String, Float>,
+        val videoProgress: Map<String, Float?>,
     ) : CourseVideoUIState()
 
     data object Empty : CourseVideoUIState()
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
@@ -149,8 +149,13 @@ class CourseVideoViewModel(
                     initDownloadModelsStatus()
                     val videoProgress = courseVideos.values.flatten().associate { block ->
                         val videoProgressEntity = interactor.getVideoProgress(block.id)
-                        val progress = videoProgressEntity.videoTime.toFloat()
-                            .safeDivBy(videoProgressEntity.duration.toFloat())
+                        val videoTime = videoProgressEntity.videoTime?.toFloat()
+                        val videoDuration = videoProgressEntity.duration?.toFloat()
+                        val progress = if (videoTime != null && videoDuration != null) {
+                            videoTime.safeDivBy(videoDuration)
+                        } else {
+                            null
+                        }
                         block.id to progress
                     }
                     val isCompletedSectionsShown =

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
`@@ -182,7 +182,7 @@ private fun CourseVideosUI(`
`182`	`182`	`null`
`183`	`183`	`},`
`184`	`184`	`description = stringResource(`
`185`		`- R.string.course_completed,`
	`185`	`+ R.string.course_completed_of,`
`186`	`186`	`progress.completed,`
`187`	`187`	`progress.total`
`188`	`188`	`)`