feat: Add progress tracking to update download

Author: Ushie

app/src/main/java/app/revenge/manager/domain/manager/DownloadManager.kt

@@ -29,9 +29,9 @@ class DownloadManager(
             onProgressUpdate
         )
 
-    suspend fun downloadUpdate(url: String, out: File) {
-        download(url, out) { 
-             /* TODO: Update a progress bar in the update dialog */
+    suspend fun downloadUpdate(url: String, out: File, onProgressUpdate: (Float?) -> Unit) {
+        download(url, out) { progress ->
+            onProgressUpdate(progress)
         }
     }
 

app/src/main/java/app/revenge/manager/ui/screen/home/HomeScreen.kt

@@ -1,7 +1,6 @@
 package app.revenge.manager.ui.screen.home
 
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.basicMarquee
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -28,7 +27,10 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -37,10 +39,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.paging.compose.collectAsLazyPagingItems
 import app.revenge.manager.BuildConfig
-import cafe.adriel.voyager.core.screen.Screen
-import cafe.adriel.voyager.koin.getScreenModel
-import cafe.adriel.voyager.navigator.LocalNavigator
-import cafe.adriel.voyager.navigator.currentOrThrow
 import app.revenge.manager.R
 import app.revenge.manager.domain.manager.PreferenceManager
 import app.revenge.manager.ui.components.SegmentedButton
@@ -54,6 +52,10 @@ import app.revenge.manager.ui.widgets.updater.UpdateDialog
 import app.revenge.manager.utils.Constants
 import app.revenge.manager.utils.DiscordVersion
 import app.revenge.manager.utils.navigate
+import cafe.adriel.voyager.core.screen.Screen
+import cafe.adriel.voyager.koin.getScreenModel
+import cafe.adriel.voyager.navigator.LocalNavigator
+import cafe.adriel.voyager.navigator.currentOrThrow
 import org.koin.androidx.compose.get
 
 class HomeScreen : Screen {
@@ -86,12 +88,15 @@ class HomeScreen : Screen {
             viewModel.release != null &&
             !BuildConfig.DEBUG
         ) {
+            var progress by remember { mutableStateOf<Float?>(null) }
+
             UpdateDialog(
                 release = viewModel.release!!,
                 isUpdating = viewModel.isUpdating,
+                progress = progress,
                 onDismiss = { viewModel.showUpdateDialog = false },
                 onConfirm = {
-                    viewModel.downloadAndInstallUpdate()
+                    viewModel.downloadAndInstallUpdate { newProgress -> progress = newProgress }
                 }
             )
         }

app/src/main/java/app/revenge/manager/ui/viewmodel/home/HomeViewModel.kt

@@ -128,12 +128,12 @@ class HomeViewModel(
         }
     }
 
-    fun downloadAndInstallUpdate() {
+    fun downloadAndInstallUpdate(onProgressUpdate: (Float?) -> Unit) {
         screenModelScope.launch {
             val update = File(cacheDir, "update.apk")
             if (update.exists()) update.delete()
             isUpdating = true
-            downloadManager.downloadUpdate(updateDownloadUrl!!, update)
+            downloadManager.downloadUpdate(updateDownloadUrl!!, update, onProgressUpdate)
             isUpdating = false
 
             val installMethod = if (prefs.installMethod == InstallMethod.SHIZUKU && !ShizukuPermissions.waitShizukuPermissions()) {

app/src/main/java/app/revenge/manager/ui/widgets/updater/UpdateDialog.kt

@@ -25,6 +25,7 @@ import app.revenge.manager.network.dto.Release
 fun UpdateDialog(
     release: Release,
     isUpdating: Boolean,
+    progress: Float?,
     onDismiss: () -> Unit,
     onConfirm: () -> Unit
 ) {
@@ -47,12 +48,22 @@ fun UpdateDialog(
                         color = if (isUpdating) Color.Transparent else LocalContentColor.current
                     )
                     if (isUpdating) {
-                        CircularProgressIndicator(
-                            strokeWidth = 3.dp,
-                            modifier = Modifier
-                                .size(24.dp)
-                                .align(Alignment.Center)
-                        )
+                        if (progress != null) {
+                            CircularProgressIndicator(
+                                progress = { progress },
+                                modifier = Modifier
+                                    .size(24.dp)
+                                    .align(Alignment.Center),
+                                strokeWidth = 3.dp
+                            )
+                        } else {
+                            CircularProgressIndicator(
+                                modifier = Modifier
+                                    .size(24.dp)
+                                    .align(Alignment.Center),
+                                strokeWidth = 3.dp
+                            )
+                        }
                     }
                 }