Add loading animation during import

Author: zacharee

app/src/main/java/dev/zwander/installwithoptions/MainActivity.kt

@@ -61,6 +61,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -85,8 +86,12 @@ import dev.zwander.installwithoptions.util.ElevatedPermissionHandler
 import dev.zwander.installwithoptions.util.handleIncomingUris
 import dev.zwander.installwithoptions.util.plus
 import dev.zwander.installwithoptions.util.rememberPackageInstaller
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
     private val permissionHandler by lazy {
         ElevatedPermissionHandler(
             context = this,
@@ -132,24 +137,31 @@ class MainActivity : AppCompatActivity() {
 
     private fun checkIntentForPackage(intent: Intent) {
         intent.data?.let {
-            handleIncomingUris(listOf(it))
+            launch(Dispatchers.IO) {
+                handleIncomingUris(listOf(it))
+            }
         }
     }
 }
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun MainContent(modifier: Modifier = Modifier) {
+    val scope = rememberCoroutineScope()
+
     var selectedFiles by DataModel.selectedFiles.collectAsMutableState()
     var showingSelectedFiles by remember {
         mutableStateOf(false)
     }
     var selectedOptions by DataModel.selectedOptions.collectAsMutableState()
+    val isImporting by DataModel.isImporting.collectAsState()
 
     val context = LocalContext.current
     val fileSelector =
         rememberLauncherForActivityResult(contract = ActivityResultContracts.OpenMultipleDocuments()) { uris ->
-            context.handleIncomingUris(uris)
+            scope.launch(Dispatchers.IO) {
+                context.handleIncomingUris(uris)
+            }
         }
     val options = (rememberInstallOptions() + rememberMutableOptions()).sortedBy {
         context.resources.getString(it.labelResource)
@@ -324,6 +336,32 @@ fun MainContent(modifier: Modifier = Modifier) {
                 }
             }
         }
+
+        AnimatedVisibility(
+            visible = isImporting,
+            modifier = Modifier.fillMaxSize(),
+            enter = fadeIn(),
+            exit = fadeOut(),
+        ) {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(Color.Black.copy(alpha = 0.5f))
+                    .clickable(
+                        interactionSource = remember {
+                            MutableInteractionSource()
+                        },
+                        indication = null,
+                        enabled = true,
+                        onClick = {},
+                    ),
+                contentAlignment = Alignment.Center,
+            ) {
+                CircularProgressIndicator(
+                    color = Color.White,
+                )
+            }
+        }
     }
 
     if (showingSelectedFiles) {
@@ -344,7 +382,8 @@ fun MainContent(modifier: Modifier = Modifier) {
                     selectedFiles.forEach { (pkg, files) ->
                         stickyHeader {
                             Row(
-                                modifier = Modifier.fillMaxWidth()
+                                modifier = Modifier
+                                    .fillMaxWidth()
                                     .background(color = MaterialTheme.colorScheme.surfaceContainerHigh),
                                 horizontalArrangement = Arrangement.SpaceBetween,
                                 verticalAlignment = Alignment.CenterVertically,
@@ -370,7 +409,8 @@ fun MainContent(modifier: Modifier = Modifier) {
 
                         items(items = files) {
                             Row(
-                                modifier = Modifier.fillMaxWidth()
+                                modifier = Modifier
+                                    .fillMaxWidth()
                                     .background(color = MaterialTheme.colorScheme.surfaceContainerHigh),
                                 horizontalArrangement = Arrangement.SpaceBetween,
                                 verticalAlignment = Alignment.CenterVertically,

app/src/main/java/dev/zwander/installwithoptions/data/DataModel.kt

@@ -8,4 +8,5 @@ object DataModel {
     val rootGranted = MutableStateFlow(false)
     val selectedOptions = Settings.Keys.selectedOptions.asMutableStateFlow()
     val selectedFiles = MutableStateFlow(mapOf<String, List<DocumentFile>>())
+    val isImporting = MutableStateFlow(false)
 }

app/src/main/java/dev/zwander/installwithoptions/util/IncomingPackageUtils.kt

@@ -11,6 +11,7 @@ import net.lingala.zip4j.ZipFile
 import java.io.File
 
 fun Context.handleIncomingUris(uris: List<Uri>) {
+    DataModel.isImporting.value = true
     val currentSelection = DataModel.selectedFiles.value.toMutableMap()
 
     fun addApkFile(file: DocumentFile) {
@@ -36,6 +37,7 @@ fun Context.handleIncomingUris(uris: List<Uri>) {
     }
 
     DataModel.selectedFiles.value = currentSelection
+    DataModel.isImporting.value = false
 }
 
 private fun Context.copyZipToCacheAndExtract(zip: DocumentFile): List<DocumentFile> {