kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-23 04:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merged the download state and ETA. Now, when the download is "In Progress", it shows the ETA. Otherwise, it displays the download status as before.

Browse Source
This commit is contained in:
MohitMaliFtechiz 2025-09-11 19:58:24 +05:30
parent 0539ff4780
commit 79b4448e41
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/online/DownloadBookItem.kt
View File

@ -18,6 +18,7 @@
package org.kiwix.kiwixmobile.nav.destination.library.online
import android.content.Context
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
@ -44,6 +45,7 @@ import androidx.compose.ui.semantics.testTag
import com.tonyodev.fetch2.Status
import org.kiwix.kiwixmobile.R
import org.kiwix.kiwixmobile.core.R.string
import org.kiwix.kiwixmobile.core.downloader.model.DownloadState
import org.kiwix.kiwixmobile.core.ui.components.ContentLoadingProgressBar
import org.kiwix.kiwixmobile.core.ui.components.ProgressBarStyle
import org.kiwix.kiwixmobile.core.ui.models.IconItem
@ -114,7 +116,6 @@ private fun DownloadBookContent(
BookTitle(item.title)
Spacer(modifier = Modifier.height(TWO_DP))
BookDescription(item.description.orEmpty())
DownloadStateText(item)
ContentLoadingProgressBar(
progressBarStyle = ProgressBarStyle.HORIZONTAL,
modifier = Modifier.padding(horizontal = ONE_DP, vertical = FIVE_DP),
@ -185,10 +186,12 @@ private fun DownloadStateRow(item: LibraryDownloadItem) {
verticalAlignment = Alignment.CenterVertically
) {
Text(
text = item.readableEta.toString(),
text = getDownloadStateText(item, LocalContext.current),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onTertiary,
modifier = Modifier.weight(1f)
modifier = Modifier
.weight(1f)
.testTag(DOWNLOADING_STATE_TEXT_TESTING_TAG)
)
Text(
text = getDownloadedSizeText(item.bytesDownloaded, item.totalSizeBytes),
@ -198,20 +201,23 @@ private fun DownloadStateRow(item: LibraryDownloadItem) {
}
}
/**
* Returns the current download state text.
* If the download is "In Progress", it returns the ETA. Otherwise, it returns the current
* download state (e.g., Pending, Paused, or Complete).
*/
private fun getDownloadStateText(item: LibraryDownloadItem, context: Context): String {
val currentDownloadState = item.downloadState
return if (currentDownloadState == DownloadState.Running) {
item.readableEta.toString()
} else {
currentDownloadState.toReadableState(context).toString()
}
}
private fun getDownloadedSizeText(downloadedBytes: Long, totalBytes: Long): String {
if (totalBytes <= 0 || downloadedBytes <= 0) return ""
val downloadedText = Byte(downloadedBytes.toString()).humanReadable
val totalText = Byte(totalBytes.toString()).humanReadable
return "$downloadedText/$totalText"
}
@Composable
private fun DownloadStateText(item: LibraryDownloadItem) {
Text(
text = item.downloadState.toReadableState(LocalContext.current).toString(),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onTertiary,
modifier = Modifier
.testTag(DOWNLOADING_STATE_TEXT_TESTING_TAG)
)
}