From 543f9fe7e4f7e327fc3cf97450e68ea696bfc9f7 Mon Sep 17 00:00:00 2001 From: Ax333l Date: Thu, 19 Dec 2024 20:52:49 +0100 Subject: [PATCH] switch type to long --- .../manager/domain/repository/DownloadedAppRepository.kt | 8 ++------ .../app/revanced/manager/patcher/worker/PatcherWorker.kt | 2 +- .../app/revanced/manager/ui/component/patcher/Steps.kt | 8 ++++---- .../java/app/revanced/manager/ui/model/PatcherStep.kt | 2 +- .../app/revanced/manager/ui/viewmodel/PatcherViewModel.kt | 4 ++-- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/app/revanced/manager/domain/repository/DownloadedAppRepository.kt b/app/src/main/java/app/revanced/manager/domain/repository/DownloadedAppRepository.kt index 74d157f0..b4598fb9 100644 --- a/app/src/main/java/app/revanced/manager/domain/repository/DownloadedAppRepository.kt +++ b/app/src/main/java/app/revanced/manager/domain/repository/DownloadedAppRepository.kt @@ -40,7 +40,7 @@ class DownloadedAppRepository( data: Parcelable, expectedPackageName: String, expectedVersion: String?, - onDownload: suspend (downloadProgress: Pair) -> Unit, + onDownload: suspend (downloadProgress: Pair) -> Unit, ): File { // Converted integers cannot contain / or .. unlike the package name or version, so they are safer to use here. val relativePath = File(generateUid().toString()) @@ -90,7 +90,7 @@ class DownloadedAppRepository( } .conflate() .flowOn(Dispatchers.IO) - .collect { (downloaded, size) -> onDownload(downloaded.megaBytes to size.megaBytes) } + .collect { (downloaded, size) -> onDownload(downloaded to size) } if (downloadedBytes.get() < 1) error("Downloader did not download anything.") val pkgInfo = @@ -130,8 +130,4 @@ class DownloadedAppRepository( dao.delete(downloadedApps) } - - private companion object { - val Long.megaBytes get() = toDouble() / 1_000_000 - } } \ No newline at end of file diff --git a/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt b/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt index f7e6f815..d2b5babb 100644 --- a/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt +++ b/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt @@ -74,7 +74,7 @@ class PatcherWorker( val selectedPatches: PatchSelection, val options: Options, val logger: Logger, - val downloadProgress: MutableStateFlow?>, + val downloadProgress: MutableStateFlow?>, val patchesProgress: MutableStateFlow>, val handleStartActivityRequest: suspend (LoadedDownloaderPlugin, Intent) -> ActivityResult, val setInputFile: (File) -> Unit, diff --git a/app/src/main/java/app/revanced/manager/ui/component/patcher/Steps.kt b/app/src/main/java/app/revanced/manager/ui/component/patcher/Steps.kt index ae039357..280635ce 100644 --- a/app/src/main/java/app/revanced/manager/ui/component/patcher/Steps.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/patcher/Steps.kt @@ -135,7 +135,7 @@ fun SubStep( name: String, state: State, message: String? = null, - downloadProgress: Pair? = null + downloadProgress: Pair? = null ) { var messageExpanded by rememberSaveable { mutableStateOf(true) } @@ -181,7 +181,7 @@ fun SubStep( } else { downloadProgress?.let { (current, total) -> Text( - if (total != null) "${current.formatted}/${total.formatted} MB" else "${current.formatted} MB", + if (total != null) "${current.megaBytes}/${total.megaBytes} MB" else "${current.megaBytes} MB", style = MaterialTheme.typography.labelSmall ) } @@ -200,7 +200,7 @@ fun SubStep( } @Composable -fun StepIcon(state: State, progress: Pair? = null, size: Dp) { +fun StepIcon(state: State, progress: Pair? = null, size: Dp) { val strokeWidth = Dp(floor(size.value / 10) + 1) when (state) { @@ -245,4 +245,4 @@ fun StepIcon(state: State, progress: Pair? = null, size: Dp) { } } -private val Double.formatted get() = "%.1f".format(locale = Locale.ROOT, this) \ No newline at end of file +private val Long.megaBytes get() = "%.1f".format(locale = Locale.ROOT, toDouble() / 1_000_000) \ No newline at end of file diff --git a/app/src/main/java/app/revanced/manager/ui/model/PatcherStep.kt b/app/src/main/java/app/revanced/manager/ui/model/PatcherStep.kt index cfd8d78b..c08c823e 100644 --- a/app/src/main/java/app/revanced/manager/ui/model/PatcherStep.kt +++ b/app/src/main/java/app/revanced/manager/ui/model/PatcherStep.kt @@ -19,5 +19,5 @@ data class Step( val category: StepCategory, val state: State = State.WAITING, val message: String? = null, - val downloadProgress: StateFlow?>? = null + val downloadProgress: StateFlow?>? = null ) \ No newline at end of file diff --git a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt index 93c2d481..5ab42a89 100644 --- a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt +++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt @@ -125,7 +125,7 @@ class PatcherViewModel( } val patchesProgress = MutableStateFlow(Pair(0, input.selectedPatches.values.sumOf { it.size })) - private val downloadProgress = MutableStateFlow?>(null) + private val downloadProgress = MutableStateFlow?>(null) val steps = generateSteps( app, input.selectedApp, @@ -447,7 +447,7 @@ class PatcherViewModel( fun generateSteps( context: Context, selectedApp: SelectedApp, - downloadProgress: StateFlow?>? = null + downloadProgress: StateFlow?>? = null ): List { val needsDownload = selectedApp is SelectedApp.Download || selectedApp is SelectedApp.Search