feat: resume video

Author: PavloNetrebchuk

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

@@ -342,19 +342,21 @@ val screenModule = module {
     }
     viewModel { (courseId: String) -> BaseVideoViewModel(courseId, get()) }
     viewModel { (courseId: String) -> VideoViewModel(courseId, get(), get(), get(), get()) }
-    viewModel { (courseId: String) ->
+    viewModel { (courseId: String, videoUrl: String) ->
         VideoUnitViewModel(
             courseId,
+            videoUrl,
             get(),
             get(),
             get(),
             get(),
             get()
         )
     }
-    viewModel { (courseId: String, blockId: String) ->
+    viewModel { (courseId: String, videoUrl: String, blockId: String) ->
         EncodedVideoUnitViewModel(
             courseId,
+            videoUrl,
             blockId,
             get(),
             get(),

course/src/main/java/org/openedx/course/presentation/unit/video/EncodedVideoUnitViewModel.kt

@@ -32,6 +32,7 @@ import java.util.concurrent.Executors
 @SuppressLint("StaticFieldLeak")
 class EncodedVideoUnitViewModel(
     courseId: String,
+    videoUrl: String,
     val blockId: String,
     private val context: Context,
     private val preferencesManager: CorePreferences,
@@ -42,6 +43,7 @@ class EncodedVideoUnitViewModel(
     courseAnalytics: CourseAnalytics,
 ) : VideoUnitViewModel(
     courseId,
+    videoUrl,
     courseRepository,
     notifier,
     networkConnection,

course/src/main/java/org/openedx/course/presentation/unit/video/VideoUnitFragment.kt

@@ -49,6 +49,7 @@ class VideoUnitFragment : Fragment(R.layout.fragment_video_unit) {
     private val viewModel by viewModel<EncodedVideoUnitViewModel> {
         parametersOf(
             requireArguments().getString(ARG_COURSE_ID, ""),
+            requireArguments().getString(ARG_VIDEO_URL, ""),
             requireArguments().getString(ARG_BLOCK_ID, ""),
         )
     }
@@ -79,7 +80,6 @@ class VideoUnitFragment : Fragment(R.layout.fragment_video_unit) {
         lifecycle.addObserver(viewModel)
         handler.post(videoTimeRunnable)
         requireArguments().apply {
-            viewModel.videoUrl = getString(ARG_VIDEO_URL, "")
             viewModel.transcripts = stringToObject<Map<String, String>>(
                 getString(ARG_TRANSCRIPT_URL, "")
             ) ?: emptyMap()

course/src/main/java/org/openedx/course/presentation/unit/video/VideoUnitViewModel.kt

@@ -21,14 +21,14 @@ import subtitleFile.TimedTextObject
 
 open class VideoUnitViewModel(
     val courseId: String,
+    val videoUrl: String,
     private val courseRepository: CourseRepository,
     private val notifier: CourseNotifier,
     private val networkConnection: NetworkConnection,
     private val transcriptManager: TranscriptManager,
     courseAnalytics: CourseAnalytics,
 ) : BaseVideoViewModel(courseId, courseAnalytics) {
 
-    var videoUrl = ""
     var transcripts = emptyMap<String, String>()
     var isPlaying = true
     var transcriptLanguage = AppDataConstants.defaultLocale.language ?: "en"
@@ -60,6 +60,10 @@ open class VideoUnitViewModel(
 
     private var isBlockAlreadyCompleted = false
 
+    init {
+        initVideoProgress()
+    }
+
     override fun onCreate(owner: LifecycleOwner) {
         super.onCreate(owner)
         viewModelScope.launch {
@@ -140,4 +144,15 @@ open class VideoUnitViewModel(
     }
 
     fun getCurrentVideoTime() = currentVideoTime.value ?: 0
+
+    private fun initVideoProgress() {
+        viewModelScope.launch {
+            try {
+                val videoProgress = courseRepository.getVideoProgress(videoUrl)
+                _currentVideoTime.value = videoProgress.videoTime
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+    }
 }

course/src/main/java/org/openedx/course/presentation/unit/video/YoutubeVideoUnitFragment.kt

@@ -39,7 +39,10 @@ import org.openedx.foundation.presentation.WindowSize
 class YoutubeVideoUnitFragment : Fragment(R.layout.fragment_youtube_video_unit) {
 
     private val viewModel by viewModel<VideoUnitViewModel> {
-        parametersOf(requireArguments().getString(ARG_COURSE_ID, ""))
+        parametersOf(
+            requireArguments().getString(ARG_COURSE_ID, ""),
+            requireArguments().getString(ARG_VIDEO_URL, "")
+        )
     }
     private val router by inject<CourseRouter>()
     private val appReviewManager by inject<AppReviewManager> { parametersOf(requireActivity()) }
@@ -61,7 +64,6 @@ class YoutubeVideoUnitFragment : Fragment(R.layout.fragment_youtube_video_unit)
         windowSize = computeWindowSizeClasses()
         lifecycle.addObserver(viewModel)
         requireArguments().apply {
-            viewModel.videoUrl = getString(ARG_VIDEO_URL, "")
             viewModel.transcripts = stringToObject<Map<String, String>>(
                 getString(ARG_TRANSCRIPT_URL, "")
             ) ?: emptyMap()