Skip to content

fix: Hide download size for videos reporting size 0 #467

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 1 commit into from
Nov 25, 2025
Merged

fix: Hide download size for videos reporting size 0 #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 33 additions & 24 deletions course/src/main/java/org/openedx/course/presentation/offline/CourseOfflineScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,17 @@ private fun CourseOfflineUI(
} else {
NoDownloadableBlocksProgress()
}
if (uiState.progressBarValue != 1f && !uiState.isDownloading && hasInternetConnection) {
if (
uiState.progressBarValue != 1f &&
!uiState.isDownloading &&
hasInternetConnection &&
!uiState.isAllDownloaded
) {
Spacer(modifier = Modifier.height(20.dp))
OpenEdXButton(
text = stringResource(R.string.core_download_all),
backgroundColor = MaterialTheme.appColors.secondaryButtonBackground,
onClick = onDownloadAllClick,
enabled = uiState.isHaveDownloadableBlocks,
content = {
val textColor = if (uiState.isHaveDownloadableBlocks) {
MaterialTheme.appColors.primaryButtonText
Expand Down Expand Up @@ -365,15 +369,17 @@ private fun DownloadProgress(
horizontalArrangement = Arrangement.SpaceBetween
) {
Text(
text = uiState.downloadedSize,
text = uiState.downloadedSize.toFileSize(1, false),
style = MaterialTheme.appTypography.titleLarge,
color = MaterialTheme.appColors.successGreen
)
Text(
text = uiState.readyToDownloadSize,
style = MaterialTheme.appTypography.titleLarge,
color = MaterialTheme.appColors.textDark
)
if (uiState.readyToDownloadSize > 0) {
Text(
text = uiState.readyToDownloadSize.toFileSize(1, false),
style = MaterialTheme.appTypography.titleLarge,
color = MaterialTheme.appColors.textDark
)
}
}
Spacer(modifier = Modifier.height(4.dp))
Row(
Expand All @@ -388,20 +394,22 @@ private fun DownloadProgress(
color = MaterialTheme.appColors.successGreen,
textStyle = MaterialTheme.appTypography.labelLarge
)
if (!uiState.isDownloading) {
IconText(
text = stringResource(R.string.core_ready_to_download),
icon = Icons.Outlined.CloudDownload,
color = MaterialTheme.appColors.textDark,
textStyle = MaterialTheme.appTypography.labelLarge
)
} else {
IconText(
text = stringResource(R.string.core_downloading),
icon = Icons.Outlined.CloudDownload,
color = MaterialTheme.appColors.textDark,
textStyle = MaterialTheme.appTypography.labelLarge
)
if (uiState.readyToDownloadSize > 0) {
if (!uiState.isDownloading) {
IconText(
text = stringResource(R.string.core_ready_to_download),
icon = Icons.Outlined.CloudDownload,
color = MaterialTheme.appColors.textDark,
textStyle = MaterialTheme.appTypography.labelLarge
)
} else {
IconText(
text = stringResource(R.string.core_downloading),
icon = Icons.Outlined.CloudDownload,
color = MaterialTheme.appColors.textDark,
textStyle = MaterialTheme.appTypography.labelLarge
)
}
}
}
if (uiState.progressBarValue != 0f) {
Expand Down Expand Up @@ -462,10 +470,11 @@ private fun CourseOfflineUIPreview() {
hasInternetConnection = true,
uiState = CourseOfflineUIState(
isHaveDownloadableBlocks = true,
readyToDownloadSize = "159MB",
downloadedSize = "0MB",
readyToDownloadSize = 100000L,
downloadedSize = 0L,
progressBarValue = 0f,
isDownloading = true,
isAllDownloaded = true,
largestDownloads = listOf(
DownloadModel(
"",
Expand Down
5 changes: 3 additions & 2 deletions course/src/main/java/org/openedx/course/presentation/offline/CourseOfflineUIState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import org.openedx.core.module.db.DownloadModel

data class CourseOfflineUIState(
val isHaveDownloadableBlocks: Boolean,
val isAllDownloaded: Boolean,
val largestDownloads: List<DownloadModel>,
val isDownloading: Boolean,
val readyToDownloadSize: String,
val downloadedSize: String,
val readyToDownloadSize: Long,
val downloadedSize: Long,
val progressBarValue: Float,
)
38 changes: 23 additions & 15 deletions course/src/main/java/org/openedx/course/presentation/offline/CourseOfflineViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import org.openedx.core.extension.safeDivBy
import org.openedx.core.module.DownloadWorkerController
import org.openedx.core.module.db.DownloadDao
import org.openedx.core.module.db.DownloadModel
import org.openedx.core.module.db.DownloadedState
import org.openedx.core.module.db.FileType
import org.openedx.core.module.download.BaseDownloadViewModel
import org.openedx.core.module.download.DownloadHelper
Expand All @@ -28,7 +29,6 @@ import org.openedx.core.system.connection.NetworkConnection
import org.openedx.core.system.notifier.CourseNotifier
import org.openedx.core.system.notifier.CourseStructureGot
import org.openedx.course.domain.interactor.CourseInteractor
import org.openedx.foundation.extension.toFileSize
import org.openedx.foundation.utils.FileUtil

class CourseOfflineViewModel(
Expand Down Expand Up @@ -56,8 +56,9 @@ class CourseOfflineViewModel(
isHaveDownloadableBlocks = false,
largestDownloads = emptyList(),
isDownloading = false,
readyToDownloadSize = "",
downloadedSize = "",
isAllDownloaded = false,
readyToDownloadSize = 0L,
downloadedSize = 0L,
progressBarValue = 0f,
)
)
Expand Down Expand Up @@ -163,20 +164,24 @@ class CourseOfflineViewModel(
viewModelScope.launch {
val courseStructure = courseInteractor.getCourseStructureFromCache(courseId)
val totalDownloadableSize = getFilesSize(courseStructure.blockData)

if (totalDownloadableSize == 0L) return@launch

courseInteractor.getDownloadModels().collect { downloadModels ->
val courseDownloadModels = downloadModels.filter { it.courseId == courseId }
val completedDownloads =
downloadModels.filter { it.downloadedState.isDownloaded && it.courseId == courseId }
val completedDownloadIds = completedDownloads.map { it.id }
val downloadedBlocks =
courseStructure.blockData.filter { it.id in completedDownloadIds }
courseDownloadModels.filter { it.downloadedState.isDownloaded }
val downloadedBlocks = courseStructure.blockData.filter {
it.id in completedDownloads.map { it.id }
}
val isAllDownloaded =
courseDownloadModels.all { it.downloadedState == DownloadedState.DOWNLOADED } &&
courseDownloadModels.isNotEmpty()
val isHaveDownloadableBlocks = courseStructure.blockData.any { it.isDownloadable }

updateUIState(
totalDownloadableSize,
completedDownloads,
downloadedBlocks
downloadedBlocks,
isAllDownloaded,
isHaveDownloadableBlocks
)
}
}
Expand All @@ -185,7 +190,9 @@ class CourseOfflineViewModel(
private fun updateUIState(
totalDownloadableSize: Long,
completedDownloads: List<DownloadModel>,
downloadedBlocks: List<Block>
downloadedBlocks: List<Block>,
isAllDownloaded: Boolean,
isHaveDownloadableBlocks: Boolean,
) {
val downloadedSize = getFilesSize(downloadedBlocks).toFloat()
val realDownloadedSize = completedDownloads.sumOf { it.size }
Expand All @@ -200,10 +207,11 @@ class CourseOfflineViewModel(
}
_uiState.update {
it.copy(
isHaveDownloadableBlocks = true,
isHaveDownloadableBlocks = isHaveDownloadableBlocks,
isAllDownloaded = isAllDownloaded,
largestDownloads = largestDownloads,
readyToDownloadSize = readyToDownloadSize.toFileSize(1, false),
downloadedSize = realDownloadedSize.toFileSize(1, false),
readyToDownloadSize = readyToDownloadSize,
downloadedSize = realDownloadedSize,
progressBarValue = progressBarValue
)
}
Expand Down
Loading