Skip to content

fix: Video Subtitles on Native and Youtube Player #349

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

Merged
volodymyr-chekyrta merged 2 commits into from
Jul 8, 2024
Merged

fix: Video Subtitles on Native and Youtube Player #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0df439
fix: Video Subtitles on Native and Youtube Player
HamzaIsrar12 Jun 22, 2024
fb68cff
chore: UI Changes
HamzaIsrar12 Jul 4, 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
9 changes: 8 additions & 1 deletion course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.text.style.TextOverflow
Expand Down Expand Up @@ -563,6 +564,11 @@ fun VideoSubtitles(
} else {
MaterialTheme.appColors.textFieldBorder
}
val fontWeight = if (currentIndex == index) {
FontWeight.SemiBold
} else {
FontWeight.Normal
}
Text(
modifier = Modifier
.fillMaxWidth()
Expand All @@ -571,7 +577,8 @@ fun VideoSubtitles(
},
text = Jsoup.parse(item.content).text(),
color = textColor,
style = MaterialTheme.appTypography.bodyMedium
style = MaterialTheme.appTypography.bodyMedium,
fontWeight = fontWeight,
)
Spacer(Modifier.height(16.dp))
}
Expand Down
1 change: 0 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 @@ -91,7 +91,6 @@ class VideoUnitFragment : Fragment(R.layout.fragment_video_unit) {
viewModel.isDownloaded = getBoolean(ARG_DOWNLOADED)
}
viewModel.downloadSubtitles()
handler.removeCallbacks(videoTimeRunnable)
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
Expand Down
2 changes: 1 addition & 1 deletion course/src/main/java/org/openedx/course/presentation/unit/video/VideoUnitViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ open class VideoUnitViewModel(


open fun markBlockCompleted(blockId: String, medium: String) {
logLoadedCompletedEvent(videoUrl, false, getCurrentVideoTime(), medium)
if (!isBlockAlreadyCompleted) {
logLoadedCompletedEvent(videoUrl, false, getCurrentVideoTime(), medium)
viewModelScope.launch {
try {
isBlockAlreadyCompleted = true
Expand Down
2 changes: 1 addition & 1 deletion course/src/main/java/org/openedx/course/presentation/unit/video/VideoViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ class VideoViewModel(
}

fun markBlockCompleted(blockId: String, medium: String) {
logLoadedCompletedEvent(videoUrl, false, currentVideoTime, medium)
if (!isBlockAlreadyCompleted) {
logLoadedCompletedEvent(videoUrl, false, currentVideoTime, medium)
viewModelScope.launch {
try {
isBlockAlreadyCompleted = true
Expand Down