Improve download size handling

Droid-ify · Oct 18, 2023 · c23fbc9 · c23fbc9
1 parent d6ee1ab
commit c23fbc9
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 21 deletions.
diff --git a/app/src/main/kotlin/com/looker/droidify/index/RepositoryUpdater.kt b/app/src/main/kotlin/com/looker/droidify/index/RepositoryUpdater.kt
@@ -174,7 +174,7 @@ object RepositoryUpdater {
 				authentication(repository.authentication)
 			}
 		) { read, total ->
-			callback(Stage.DOWNLOAD, read, total)
+			callback(Stage.DOWNLOAD, read.value, total.value)
 		}
 
 		when (result) {

diff --git a/app/src/main/kotlin/com/looker/droidify/service/DownloadService.kt b/app/src/main/kotlin/com/looker/droidify/service/DownloadService.kt
@@ -55,7 +55,7 @@ class DownloadService : ConnectionService<DownloadService.Binder>() {
 	sealed class State(val packageName: String) {
 		data object Idle : State("")
 		data class Connecting(val name: String) : State(name)
-		data class Downloading(val name: String, val read: Long, val total: Long?) : State(name)
+		data class Downloading(val name: String, val read: DataSize, val total: DataSize?) : State(name)
 		data class Error(val name: String) : State(name)
 		data class Cancel(val name: String) : State(name)
 		data class Success(val name: String, val release: Release) : State(name)
@@ -337,10 +337,10 @@ class DownloadService : ConnectionService<DownloadService.Binder>() {
 			is State.Downloading -> {
 				setContentTitle(getString(stringRes.downloading_FORMAT, currentTask!!.task.name))
 				if (state.total != null) {
-					setContentText("${state.read.formatSize()} / ${state.total.formatSize()}")
-					setProgress(100, state.read percentBy state.total, false)
+					setContentText("${state.read} / ${state.total}")
+					setProgress(100, state.read.value percentBy state.total.value, false)
 				} else {
-					setContentText(state.read.formatSize())
+					setContentText(state.read.toString())
 					setProgress(0, 0, true)
 				}
 			}

diff --git a/app/src/main/kotlin/com/looker/droidify/ui/app_detail/AppDetailAdapter.kt b/app/src/main/kotlin/com/looker/droidify/ui/app_detail/AppDetailAdapter.kt
@@ -32,6 +32,7 @@ import com.google.android.material.imageview.ShapeableImageView
 import com.google.android.material.materialswitch.MaterialSwitch
 import com.google.android.material.progressindicator.LinearProgressIndicator
 import com.google.android.material.snackbar.Snackbar
+import com.looker.core.common.DataSize
 import com.looker.core.common.extension.*
 import com.looker.core.common.file.KParcelable
 import com.looker.core.common.formatSize
@@ -92,7 +93,7 @@ class AppDetailAdapter(private val callbacks: Callbacks) :
 		data object Idle : Status
 		data object Pending : Status
 		data object Connecting : Status
-		data class Downloading(val read: Long, val total: Long?) : Status
+		data class Downloading(val read: DataSize, val total: DataSize?) : Status
 		data object PendingInstall : Status
 		data object Installing : Status
 	}
@@ -1251,13 +1252,13 @@ class AppDetailAdapter(private val callbacks: Callbacks) :
 						is Status.Downloading -> {
 							holder.statusText.text = context.getString(
 								stringRes.downloading_FORMAT, if (status.total == null)
-									status.read.formatSize() else "${status.read.formatSize()} / ${status.total.formatSize()}"
+									status.read.toString() else "${status.read} / ${status.total}"
 							)
 							holder.progress.isIndeterminate = status.total == null
 							if (status.total != null) {
 								holder.progress.progress =
-									(holder.progress.max.toFloat() * status.read / status.total).roundToInt()
-							} else Unit
+									(holder.progress.max.toFloat() * status.read.value / status.total.value).roundToInt()
+							}
 						}
 
 						Status.Installing -> {
@@ -1271,7 +1272,7 @@ class AppDetailAdapter(private val callbacks: Callbacks) :
 						}
 
 						Status.Idle -> {}
-					}::class
+					}
 				}
 				Unit
 			}
@@ -1283,7 +1284,7 @@ class AppDetailAdapter(private val callbacks: Callbacks) :
 				holder.button.apply {
 					isEnabled = action != null
 					if (action != null) {
-						icon = context.getDrawable(action.iconResId)
+						icon = context.getDrawableCompat(action.iconResId)
 						setText(action.titleResId)
 						setTextColor(
 							if (action == Action.CANCEL) holder.actionTintOnCancel
@@ -1294,14 +1295,13 @@ class AppDetailAdapter(private val callbacks: Callbacks) :
 						iconTint = if (action == Action.CANCEL) holder.actionTintOnCancel
 						else holder.actionTintOnNormal
 					} else {
-						icon = context.getDrawable(drawableRes.ic_cancel)
+						icon = context.getDrawableCompat(drawableRes.ic_cancel)
 						setText(stringRes.cancel)
 						setTextColor(holder.actionTintOnDisabled)
 						backgroundTintList = holder.actionTintDisabled
 						iconTint = holder.actionTintOnDisabled
 					}
 				}
-				Unit
 			}
 
 			ViewType.SCREENSHOT -> {
@@ -1572,11 +1572,9 @@ class AppDetailAdapter(private val callbacks: Callbacks) :
 				if (item.repoAddress != null) {
 					holder.repoTitle.setText(stringRes.repository_not_found)
 					holder.repoAddress.text = item.repoAddress
-				} else {
-
 				}
 			}
-		}::class
+		}
 	}
 
 	private fun formatHtml(text: String): SpannableStringBuilder {

diff --git a/core/common/src/main/java/com/looker/core/common/DataSize.kt b/core/common/src/main/java/com/looker/core/common/DataSize.kt
@@ -0,0 +1,19 @@
+package com.looker.core.common
+
+import java.util.Locale
+
+@JvmInline
+value class DataSize(val value: Long) {
+
+	companion object {
+		private val sizeFormats = listOf("%.0f B", "%.0f kB", "%.1f MB", "%.2f GB")
+	}
+
+	override fun toString(): String {
+		val (size, index) = generateSequence(Pair(value.toFloat(), 0)) { (size, index) ->
+			if (size >= 1024f)
+				Pair(size / 1024f, index + 1) else null
+		}.take(sizeFormats.size).last()
+		return sizeFormats[index].format(Locale.US, size)
+	}
+}
diff --git a/core/common/src/main/java/com/looker/core/common/extension/Context.kt b/core/common/src/main/java/com/looker/core/common/extension/Context.kt
@@ -11,9 +11,9 @@ import android.net.ConnectivityManager
 import android.view.inputmethod.InputMethodManager
 import androidx.annotation.AttrRes
 import androidx.annotation.DrawableRes
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
-import androidx.core.content.res.ResourcesCompat
 import com.looker.core.common.R
 
 inline val Context.clipboardManager: ClipboardManager?
@@ -68,8 +68,8 @@ private fun Context.getDrawableFromAttr(attrResId: Int): Drawable {
 	return getDrawableCompat(resId)
 }
 
-private fun Context.getDrawableCompat(@DrawableRes resId: Int = R.drawable.background_border): Drawable =
-	ResourcesCompat.getDrawable(resources, resId, theme) ?: ContextCompat.getDrawable(this, resId)!!
+fun Context.getDrawableCompat(@DrawableRes resId: Int = R.drawable.background_border): Drawable =
+	AppCompatResources.getDrawable(this, resId) ?: throw IllegalStateException("Cannot find drawable, ID: $resId")
 
 fun Context.getColorFromAttr(@AttrRes attrResId: Int): ColorStateList {
 	val typedArray = obtainStyledAttributes(intArrayOf(attrResId))

diff --git a/core/network/src/main/java/com/looker/network/Downloader.kt b/core/network/src/main/java/com/looker/network/Downloader.kt
@@ -1,5 +1,6 @@
 package com.looker.network
 
+import com.looker.core.common.DataSize
 import com.looker.core.common.signature.FileValidator
 import com.looker.network.header.HeadersBuilder
 import java.io.File
@@ -24,4 +25,4 @@ interface Downloader {
 
 }
 
-typealias ProgressListener = suspend (bytesReceived: Long, contentLength: Long) -> Unit
+typealias ProgressListener = suspend (bytesReceived: DataSize, contentLength: DataSize) -> Unit
diff --git a/core/network/src/main/java/com/looker/network/KtorDownloader.kt b/core/network/src/main/java/com/looker/network/KtorDownloader.kt
@@ -1,5 +1,6 @@
 package com.looker.network
 
+import com.looker.core.common.DataSize
 import com.looker.core.common.extension.exceptCancellation
 import com.looker.core.common.extension.size
 import com.looker.core.common.signature.FileValidator
@@ -111,7 +112,7 @@ internal class KtorDownloader : Downloader {
 			}
 			onDownload { read, total ->
 				if (block != null) {
-					block(read + (fileSize ?: 0L), total + (fileSize ?: 0L))
+					block(DataSize(read + (fileSize ?: 0L)), DataSize(total + (fileSize ?: 0L)))
 				}
 			}
 		}