fix merge issues

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
             )

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
             )

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

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()) {