diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt
index 960644ff..0a562f73 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt
@@ -130,9 +130,9 @@ class DownloadAdapter(
downloadButton.setProgress(card.currentBytes, card.totalBytes)
downloadButton.applyMetaData(card.child.id, card.currentBytes, card.totalBytes)
// We will let the view model handle this
- downloadButton.setProgressText = false
+ downloadButton.doSetProgress = false
downloadHeaderInfo.text = formatShortFileSize(downloadHeaderInfo.context, card.totalBytes)
- } else downloadButton.setProgressText = true
+ } else downloadButton.doSetProgress = true
downloadButton.setDefaultClickListener(card.child, downloadHeaderInfo, mediaClickCallback)
downloadButton.isVisible = true
@@ -192,9 +192,9 @@ class DownloadAdapter(
downloadButton.setProgress(card.currentBytes, card.totalBytes)
downloadButton.applyMetaData(d.id, card.currentBytes, card.totalBytes)
// We will let the view model handle this
- downloadButton.setProgressText = false
+ downloadButton.doSetProgress = false
downloadChildEpisodeTextExtra.text = formatShortFileSize(downloadChildEpisodeTextExtra.context, card.totalBytes)
- } else downloadButton.setProgressText = true
+ } else downloadButton.doSetProgress = true
downloadButton.setDefaultClickListener(d, downloadChildEpisodeTextExtra, mediaClickCallback)
downloadButton.isVisible = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt
index 7d038b3f..76a40384 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt
@@ -57,23 +57,23 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
resetViewData()
}
+ var doSetProgress = true
+
open fun resetViewData() {
// lastRequest = null
isZeroBytes = true
+ doSetProgress = true
persistentId = null
}
var currentMetaData: DownloadMetadata =
DownloadMetadata(0, 0, 0, null)
- private var progressSet = false
- var setProgressText = true
-
fun setPersistentId(id: Int) {
persistentId = id
currentMetaData.id = id
- if (progressSet) return
+ if (!doSetProgress) return
ioSafe {
val savedData = VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(context, id)
@@ -112,7 +112,6 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
}
open fun setProgress(downloadedBytes: Long, totalBytes: Long) {
- progressSet = true
isZeroBytes = downloadedBytes == 0L
progressBar.post {
val steps = 10000L
@@ -137,7 +136,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
if (isZeroBytes) {
progressText?.isVisible = false
} else {
- if (setProgressText) {
+ if (doSetProgress) {
progressText?.apply {
val currentMbString =
Formatter.formatShortFileSize(context, downloadedBytes)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt
index df5c5bb5..a6dc5c56 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt
@@ -301,6 +301,7 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
setStatus(null)
currentMetaData = DownloadMetadata(0, 0, 0, null)
isZeroBytes = true
+ doSetProgress = true
progressBar.progress = 0
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f5f8d40a..f7934d96 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -339,9 +339,9 @@
Livestreams
NSFW
Others
-
- - Episode
- - Episodes
+
+ - @string/episode
+ - @string/episodes
Movie