Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Auto Playing Videos and Discovery's External Browser Pop-Up #383

Merged
merged 4 commits into from
Oct 7, 2024
Merged

fix: Auto Playing Videos and Discovery's External Browser Pop-Up #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75ac68d
Merge pull request #1 from openedx/develop
dixidroid Oct 4, 2024
ea45dd8
fix: Open in External Browser Pop-Up for Bachelor's Degrees
HamzaIsrar12 Aug 1, 2024
6d4cb3a
fix: Multiple videos playing simultaneously
HamzaIsrar12 Aug 1, 2024
4a7292a
fix: Retain Video Seek Time when Exiting Fullscreen in Native Videos
HamzaIsrar12 Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion course/src/main/java/org/openedx/course/presentation/unit/video/VideoUnitFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,10 @@ class VideoUnitFragment : Fragment(R.layout.fragment_video_unit) {
if (!viewModel.isPlayerSetUp) {
setPlayerMedia(mediaItem)
viewModel.getActivePlayer()?.prepare()
viewModel.getActivePlayer()?.playWhenReady = viewModel.isPlaying
viewModel.getActivePlayer()?.playWhenReady = viewModel.isPlaying && isResumed
viewModel.isPlayerSetUp = true
}
viewModel.getActivePlayer()?.seekTo(viewModel.getCurrentVideoTime())

viewModel.castPlayer?.setSessionAvailabilityListener(
object : SessionAvailabilityListener {
Expand Down
9 changes: 8 additions & 1 deletion course/src/main/java/org/openedx/course/presentation/unit/video/YoutubeVideoUnitFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,13 @@ class YoutubeVideoUnitFragment : Fragment(R.layout.fragment_youtube_video_unit)
return binding.root
}

override fun onResume() {
super.onResume()
if (viewModel.isPlaying) {
_youTubePlayer?.play()
}
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

Expand Down Expand Up @@ -202,7 +209,7 @@ class YoutubeVideoUnitFragment : Fragment(R.layout.fragment_youtube_video_unit)
}

viewModel.videoUrl.split("watch?v=").getOrNull(1)?.let { videoId ->
if (viewModel.isPlaying) {
if (viewModel.isPlaying && isResumed) {
youTubePlayer.loadVideo(
videoId, viewModel.getCurrentVideoTime().toFloat() / 1000
)
Expand Down
3 changes: 0 additions & 3 deletions discovery/src/main/java/org/openedx/discovery/presentation/info/CourseInfoFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,9 +347,6 @@ private fun CourseInfoWebView(
factory = {
webView
},
update = {
webView.loadUrl(contentUrl)
}
)
}

Expand Down
Loading