Skip to content

Commit 63a83e3

Browse files
PavloNetrebchukPavloNetrebchuk
committed
feat: changes according PR feedback
1 parent 19ce672 commit 63a83e3

File tree

20 files changed

+234
-92
lines changed

20 files changed

+234
-92
lines changed

‎app/src/main/java/org/openedx/app/di/ScreenModule.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,14 +336,16 @@ val screenModule = module {
336336
get(),
337337
get(),
338338
get(),
339+
get(),
339340
)
340341
}
341342
viewModel { (courseId: String) -> BaseVideoViewModel(courseId, get()) }
342343
viewModel { (courseId: String) -> VideoViewModel(courseId, get(), get(), get(), get()) }
343-
viewModel { (courseId: String, videoUrl: String) ->
344+
viewModel { (courseId: String, videoUrl: String, blockId: String) ->
344345
VideoUnitViewModel(
345346
courseId,
346347
videoUrl,
348+
blockId,
347349
get(),
348350
get(),
349351
get(),
@@ -529,14 +531,12 @@ val screenModule = module {
529531
router = get()
530532
)
531533
}
532-
viewModel { (courseId: String, courseName: String) ->
534+
viewModel { (courseId: String) ->
533535
CourseAssignmentViewModel(
534536
courseId = courseId,
535-
courseName = courseName,
536537
interactor = get(),
537538
courseRouter = get(),
538539
courseNotifier = get(),
539-
analytics = get()
540540
)
541541
}
542542
}

‎core/src/main/java/org/openedx/core/data/model/room/VideoProgressEntity.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import androidx.room.PrimaryKey
77
@Entity(tableName = "video_progress_table")
88
data class VideoProgressEntity(
99
@PrimaryKey
10+
@ColumnInfo("block_id")
11+
val blockId: String,
1012
@ColumnInfo("video_url")
1113
val videoUrl: String,
1214
@ColumnInfo("video_time")

‎core/src/main/java/org/openedx/core/data/storage/CourseDao.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ interface CourseDao {
3636
@Insert(onConflict = OnConflictStrategy.REPLACE)
3737
suspend fun insertVideoProgressEntity(vararg videoProgressEntity: VideoProgressEntity)
3838

39-
@Query("SELECT * FROM video_progress_table WHERE video_url=:videoUrl")
40-
suspend fun getVideoProgressByVideoUrl(videoUrl: String): VideoProgressEntity?
39+
@Query("SELECT * FROM video_progress_table WHERE block_id=:blockId")
40+
suspend fun getVideoProgressByBlockId(blockId: String): VideoProgressEntity?
4141

4242
@Insert(onConflict = OnConflictStrategy.REPLACE)
4343
suspend fun insertCourseProgressEntity(vararg courseProgressEntity: CourseProgressEntity)

‎core/src/main/java/org/openedx/core/domain/model/Block.kt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.openedx.core.domain.model
22

3+
import android.content.Context
34
import android.os.Parcelable
45
import android.webkit.URLUtil
56
import kotlinx.parcelize.Parcelize
@@ -9,6 +10,7 @@ import org.openedx.core.BlockType
910
import org.openedx.core.module.db.DownloadModel
1011
import org.openedx.core.module.db.FileType
1112
import org.openedx.core.utils.PreviewHelper
13+
import org.openedx.core.utils.VideoPreview
1214
import org.openedx.core.utils.VideoUtil
1315
import java.util.Date
1416

@@ -82,21 +84,24 @@ data class Block(
8284
}
8385
}
8486

85-
fun getVideoPreview(isOnline: Boolean, offlineUrl: String?): Any? {
87+
fun getVideoPreview(context: Context, isOnline: Boolean, offlineUrl: String?): VideoPreview? {
8688
return if (studentViewData?.encodedVideos?.hasYoutubeUrl == true) {
87-
PreviewHelper.getYouTubeThumbnailUrl(
88-
studentViewData.encodedVideos.youtube?.url ?: ""
89+
val youtubeUrl = studentViewData.encodedVideos.youtube?.url ?: ""
90+
VideoPreview.createYoutubePreview(
91+
PreviewHelper.getYouTubeThumbnailUrl(youtubeUrl)
8992
)
9093
} else if (studentViewData?.encodedVideos?.hasVideoUrl == true) {
9194
val videoUrl = if (studentViewData.encodedVideos.videoUrl.isNotEmpty() && isOnline) {
9295
studentViewData.encodedVideos.videoUrl
9396
} else {
9497
offlineUrl ?: ""
9598
}
96-
PreviewHelper.getVideoFrameBitmap(
99+
val bitmap = PreviewHelper.getVideoFrameBitmap(
100+
context = context,
97101
isOnline = isOnline,
98102
videoUrl = videoUrl
99103
)
104+
bitmap?.let { VideoPreview.createEncodedVideoPreview(it) }
100105
} else {
101106
null
102107
}

‎core/src/main/java/org/openedx/core/utils/PreviewHelper.kt‎

Lines changed: 100 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,27 @@
11
package org.openedx.core.utils
22

3+
import android.content.Context
34
import android.graphics.Bitmap
5+
import android.graphics.BitmapFactory
46
import android.media.MediaMetadataRetriever
7+
import java.io.File
8+
import java.io.FileOutputStream
9+
import java.security.MessageDigest
10+
11+
data class VideoPreview(
12+
val link: String? = null,
13+
val bitmap: Bitmap? = null
14+
) {
15+
companion object {
16+
fun createYoutubePreview(link: String): VideoPreview {
17+
return VideoPreview(link = link)
18+
}
19+
20+
fun createEncodedVideoPreview(bitmap: Bitmap): VideoPreview {
21+
return VideoPreview(bitmap = bitmap)
22+
}
23+
}
24+
}
525

626
object PreviewHelper {
727

@@ -20,23 +40,44 @@ object PreviewHelper {
2040
return matchResult?.groups?.get(1)?.value ?: ""
2141
}
2242

23-
fun getVideoFrameBitmap(isOnline: Boolean, videoUrl: String): Bitmap? {
24-
if (!isOnline && !isLocalFile(videoUrl)) {
25-
return null
43+
fun getVideoFrameBitmap(context: Context, isOnline: Boolean, videoUrl: String): Bitmap? {
44+
var result: Bitmap? = null
45+
if (isOnline || isLocalFile(videoUrl)) {
46+
// Check cache first
47+
val cacheFile = getCacheFile(context, videoUrl)
48+
if (cacheFile.exists()) {
49+
try {
50+
result = BitmapFactory.decodeFile(cacheFile.absolutePath)
51+
} catch (e: Exception) {
52+
e.printStackTrace()
53+
}
54+
} else {
55+
result = extractBitmapFromVideo(videoUrl, context)
56+
}
2657
}
58+
return result
59+
}
2760

61+
private fun extractBitmapFromVideo(videoUrl: String, context: Context): Bitmap? {
2862
val retriever = MediaMetadataRetriever()
29-
return try {
63+
try {
3064
if (isLocalFile(videoUrl)) {
3165
retriever.setDataSource(videoUrl)
3266
} else {
3367
retriever.setDataSource(videoUrl, HashMap())
3468
}
35-
retriever.getFrameAtTime(0)
69+
val bitmap = retriever.getFrameAtTime(0)
70+
71+
// Save bitmap to cache if it was successfully retrieved
72+
bitmap?.let {
73+
saveBitmapToCache(context, videoUrl, it)
74+
}
75+
76+
return bitmap
3677
} catch (e: Exception) {
3778
// Log the exception for debugging but don't crash
3879
e.printStackTrace()
39-
null
80+
return null
4081
} finally {
4182
try {
4283
retriever.release()
@@ -50,4 +91,57 @@ object PreviewHelper {
5091
private fun isLocalFile(url: String): Boolean {
5192
return url.startsWith("/") || url.startsWith("file://")
5293
}
94+
95+
private fun getCacheFile(context: Context, videoUrl: String): File {
96+
val cacheDir = context.cacheDir
97+
val fileName = generateFileName(videoUrl)
98+
return File(cacheDir, "video_thumbnails/$fileName")
99+
}
100+
101+
private fun generateFileName(videoUrl: String): String {
102+
val md = MessageDigest.getInstance("MD5")
103+
val digest = md.digest(videoUrl.toByteArray())
104+
return digest.joinToString("") { "%02x".format(it) } + ".jpg"
105+
}
106+
107+
private fun saveBitmapToCache(context: Context, videoUrl: String, bitmap: Bitmap) {
108+
try {
109+
val cacheFile = getCacheFile(context, videoUrl)
110+
cacheFile.parentFile?.mkdirs() // Create directories if they don't exist
111+
112+
FileOutputStream(cacheFile).use { out ->
113+
bitmap.compress(Bitmap.CompressFormat.JPEG, 90, out)
114+
}
115+
} catch (e: Exception) {
116+
e.printStackTrace()
117+
}
118+
}
119+
120+
/**
121+
* Clear the bitmap cache to free storage
122+
*/
123+
fun clearCache(context: Context) {
124+
try {
125+
val cacheDir = File(context.cacheDir, "video_thumbnails")
126+
if (cacheDir.exists()) {
127+
cacheDir.deleteRecursively()
128+
}
129+
} catch (e: Exception) {
130+
e.printStackTrace()
131+
}
132+
}
133+
134+
/**
135+
* Remove a specific bitmap from cache
136+
*/
137+
fun removeFromCache(context: Context, videoUrl: String) {
138+
try {
139+
val cacheFile = getCacheFile(context, videoUrl)
140+
if (cacheFile.exists()) {
141+
cacheFile.delete()
142+
}
143+
} catch (e: Exception) {
144+
e.printStackTrace()
145+
}
146+
}
53147
}

‎course/src/main/java/org/openedx/course/data/repository/CourseRepository.kt‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,14 +241,19 @@ class CourseRepository(
241241
}
242242
}
243243

244-
suspend fun saveVideoProgress(videoUrl: String, videoTime: Long, duration: Long) {
245-
val videoProgressEntity = VideoProgressEntity(videoUrl, videoTime, duration)
244+
suspend fun saveVideoProgress(
245+
blockId: String,
246+
videoUrl: String,
247+
videoTime: Long,
248+
duration: Long
249+
) {
250+
val videoProgressEntity = VideoProgressEntity(blockId, videoUrl, videoTime, duration)
246251
courseDao.insertVideoProgressEntity(videoProgressEntity)
247252
}
248253

249-
suspend fun getVideoProgress(videoUrl: String): VideoProgressEntity {
250-
return courseDao.getVideoProgressByVideoUrl(videoUrl)
251-
?: VideoProgressEntity(videoUrl, 0L, 0L)
254+
suspend fun getVideoProgress(blockId: String): VideoProgressEntity {
255+
return courseDao.getVideoProgressByBlockId(blockId)
256+
?: VideoProgressEntity(blockId, "", 0L, 0L)
252257
}
253258

254259
fun getCourseProgress(courseId: String, isRefresh: Boolean): Flow<CourseProgress> =

‎course/src/main/java/org/openedx/course/domain/interactor/CourseInteractor.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class CourseInteractor(
115115
suspend fun submitOfflineXBlockProgress(blockId: String, courseId: String) =
116116
repository.submitOfflineXBlockProgress(blockId, courseId)
117117

118-
suspend fun getVideoProgress(videoUrl: String) = repository.getVideoProgress(videoUrl)
118+
suspend fun getVideoProgress(blockId: String) = repository.getVideoProgress(blockId)
119119

120120
fun getCourseProgress(courseId: String, isRefresh: Boolean) =
121121
repository.getCourseProgress(courseId, isRefresh)

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,13 @@ import org.openedx.core.domain.model.Progress
1414
import org.openedx.core.system.notifier.CourseNotifier
1515
import org.openedx.core.system.notifier.CourseStructureUpdated
1616
import org.openedx.course.domain.interactor.CourseInteractor
17-
import org.openedx.course.presentation.CourseAnalytics
18-
import org.openedx.course.presentation.CourseAnalyticsEvent
19-
import org.openedx.course.presentation.CourseAnalyticsKey
2017
import org.openedx.course.presentation.CourseRouter
21-
import org.openedx.course.presentation.outline.CourseContentAllUIState
2218

2319
class CourseAssignmentViewModel(
2420
val courseId: String,
2521
val courseRouter: CourseRouter,
26-
private val courseName: String,
2722
private val interactor: CourseInteractor,
2823
private val courseNotifier: CourseNotifier,
29-
private val analytics: CourseAnalytics,
3024
) : ViewModel() {
3125
private val _uiState =
3226
MutableStateFlow<CourseAssignmentUIState>(CourseAssignmentUIState.Loading)
@@ -96,22 +90,4 @@ class CourseAssignmentViewModel(
9690
}
9791
}
9892
}
99-
100-
fun navigateToSequentialEvent(blockId: String) {
101-
val currentState = uiState.value
102-
if (currentState is CourseContentAllUIState.CourseData) {
103-
analytics.logEvent(
104-
CourseAnalyticsEvent.ASSIGNMENT_CLICKED.eventName,
105-
buildMap {
106-
put(
107-
CourseAnalyticsKey.NAME.key,
108-
CourseAnalyticsEvent.ASSIGNMENT_CLICKED.biValue
109-
)
110-
put(CourseAnalyticsKey.COURSE_ID.key, courseId)
111-
put(CourseAnalyticsKey.COURSE_NAME.key, courseName)
112-
put(CourseAnalyticsKey.BLOCK_ID.key, blockId)
113-
}
114-
)
115-
}
116-
}
11793
}

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ import org.openedx.core.utils.TimeUtils
8686
import org.openedx.course.DatesShiftedSnackBar
8787
import org.openedx.course.R
8888
import org.openedx.course.databinding.FragmentCourseContainerBinding
89-
import org.openedx.course.presentation.contenttab.ContentScreen
89+
import org.openedx.course.presentation.contenttab.ContentTabScreen
9090
import org.openedx.course.presentation.dates.CourseDatesScreen
9191
import org.openedx.course.presentation.handouts.HandoutsScreen
9292
import org.openedx.course.presentation.handouts.HandoutsType
@@ -266,6 +266,10 @@ fun CourseDashboard(
266266
initialPage = CourseContainerTab.entries.indexOf(requiredTab),
267267
pageCount = { CourseContainerTab.entries.size }
268268
)
269+
val contentTabPagerState = rememberPagerState(
270+
initialPage = 0,
271+
pageCount = { CourseContentTab.entries.size }
272+
)
269273
val accessStatus = viewModel.courseAccessStatus.observeAsState()
270274
val tabState = rememberLazyListState()
271275
val snackState = remember { SnackbarHostState() }
@@ -404,6 +408,7 @@ fun CourseDashboard(
404408
windowSize = windowSize,
405409
viewModel = viewModel,
406410
pagerState = pagerState,
411+
contentTabPagerState = contentTabPagerState,
407412
isResumed = isResumed,
408413
fragmentManager = fragmentManager,
409414
onContentTabSelected = { tab ->
@@ -448,6 +453,7 @@ private fun DashboardPager(
448453
windowSize: WindowSize,
449454
viewModel: CourseContainerViewModel,
450455
pagerState: PagerState,
456+
contentTabPagerState: PagerState,
451457
isResumed: Boolean,
452458
fragmentManager: FragmentManager,
453459
onContentTabSelected: (CourseContentTab) -> Unit,
@@ -523,11 +529,12 @@ private fun DashboardPager(
523529
}
524530

525531
CourseContainerTab.CONTENT -> {
526-
ContentScreen(
532+
ContentTabScreen(
527533
windowSize = windowSize,
528534
fragmentManager = fragmentManager,
529535
courseId = viewModel.courseId,
530536
courseName = viewModel.courseName,
537+
pagerState = contentTabPagerState,
531538
onTabSelected = onContentTabSelected
532539
)
533540
}

0 commit comments

Comments
 (0)