From 536a24169c8f1603ea2dac0a82f231500610d77d Mon Sep 17 00:00:00 2001
From: Ax333l <main@axelen.xyz>
Date: Fri, 20 Dec 2024 17:51:44 +0100
Subject: [PATCH] fix merge issues

---
 .../revanced/manager/patcher/worker/PatcherWorker.kt |  6 ------
 .../revanced/manager/ui/component/patcher/Steps.kt   | 12 ++++--------
 .../app/revanced/manager/ui/model/PatcherStep.kt     |  2 +-
 .../manager/ui/viewmodel/PatcherViewModel.kt         |  2 +-
 4 files changed, 6 insertions(+), 16 deletions(-)

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 7989b3a4..0e63fbbd 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
@@ -223,12 +223,6 @@ class PatcherWorker(
                 args.selectedPatches,
                 args.options,
                 args.logger,
-                /*
-                onPatchCompleted = {
-                    args.patchesProgress.update { (completed, total) ->
-                        completed + 1 to total
-                    }
-                },*/
                 args.onPatchCompleted,
                 args.onProgress
             )
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 78d8309c..d6c78263 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
@@ -120,7 +120,10 @@ fun Steps(
                 steps.forEach { step ->
                     val (progress, progressText) = when (step.progressKey) {
                         null -> null
-                        ProgressKey.DOWNLOAD -> stepProgressProvider.downloadProgress?.let { (downloaded, total) -> downloaded / total to "$downloaded/$total MB" }
+                        ProgressKey.DOWNLOAD -> stepProgressProvider.downloadProgress?.let { (downloaded, total) ->
+                            if (total != null) downloaded.toFloat() / total.toFloat() to "${downloaded.megaBytes}/${total.megaBytes} MB"
+                            else null to "${downloaded.megaBytes} MB"
+                        }
                     } ?: (null to null)
 
                     SubStep(
@@ -239,13 +242,6 @@ fun StepIcon(state: State, progress: Float? = null, size: Dp) {
                             contentDescription = description
                         }
                 },
-                /*
-                progress = {
-                    progress?.let { (current, total) ->
-                        if (total == null) return@let null
-                        current / total
-                    }?.toFloat()
-                },*/
                 progress = { progress },
                 strokeWidth = strokeWidth
             )
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 e1662c14..3dbb390e 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
@@ -20,7 +20,7 @@ enum class ProgressKey {
 }
 
 interface StepProgressProvider {
-    val downloadProgress: Pair<Float, Float>?
+    val downloadProgress: Pair<Long, Long?>?
 }
 
 @Parcelize
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 03a3d985..d67f7c9a 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
@@ -147,7 +147,7 @@ class PatcherViewModel(
         key = "downloadProgress",
         stateSaver = autoSaver()
     ) {
-        mutableStateOf<Pair<Float, Float>?>(null)
+        mutableStateOf<Pair<Long, Long?>?>(null)
     }
         private set
     val steps by savedStateHandle.saveable(saver = snapshotStateListSaver()) {