Remove file choice bottom sheet

Infomaniak · Nov 21, 2024 · 3ee5f2d · 3ee5f2d
1 parent 7f9c73c
commit 3ee5f2d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 107 deletions.
diff --git a/.../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt b/.../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt
@@ -114,7 +114,7 @@ fun ImportFilesScreen(
         addFiles = importFilesViewModel::importFiles,
         closeActivity = closeActivity,
         sendTransfer = importFilesViewModel::sendTransfer,
-        initialShowUploadSourceChoiceBottomSheet = true,
+        shouldStartByPromptingUserForFiles = true,
     )
 }
 
@@ -144,11 +144,11 @@ private fun ImportFilesScreen(
     removeFileByUid: (uid: String) -> Unit,
     addFiles: (List<Uri>) -> Unit,
     closeActivity: () -> Unit,
-    initialShowUploadSourceChoiceBottomSheet: Boolean,
+    shouldStartByPromptingUserForFiles: Boolean,
     sendTransfer: () -> Unit,
 ) {
     val context = LocalContext.current
-    var showUploadSourceChoiceBottomSheet by rememberSaveable { mutableStateOf(initialShowUploadSourceChoiceBottomSheet) }
+    var shouldShowInitialFilePick by rememberSaveable { mutableStateOf(shouldStartByPromptingUserForFiles) }
     var showTransferOption by rememberSaveable { mutableStateOf<TransferOptionType?>(null) }
 
     val importedFiles = files()
@@ -164,10 +164,17 @@ private fun ImportFilesScreen(
         addFiles(uris)
     }
 
+    fun pickFiles() {
+        shouldShowInitialFilePick = false
+        filePickerLauncher.launch(arrayOf("*/*"))
+    }
+
     fun closeTransferOption() {
         showTransferOption = null
     }
 
+    LaunchedEffect(Unit) { if (shouldShowInitialFilePick) pickFiles() }
+
     BottomStickyButtonScaffold(
         topBar = {
             SwissTransferTopAppBar(
@@ -190,7 +197,7 @@ private fun ImportFilesScreen(
                     modifier = Modifier.padding(vertical = Margin.Medium),
                     files = files,
                     humanReadableSize = { humanReadableSize },
-                    showUploadSourceChoiceBottomSheet = { showUploadSourceChoiceBottomSheet = true },
+                    pickFiles = ::pickFiles,
                     removeFileByUid = removeFileByUid,
                 )
                 ImportTextFields(transferMessage, selectedTransferType.get)
@@ -204,12 +211,6 @@ private fun ImportFilesScreen(
             }
 
             TransferOptions({ showTransferOption }, transferOptionsCallbacks, ::closeTransferOption)
-
-            UploadSourceChoiceBottomSheet(
-                isVisible = { showUploadSourceChoiceBottomSheet },
-                onFilePickerClicked = { filePickerLauncher.launch(arrayOf("*/*")) },
-                closeBottomSheet = { showUploadSourceChoiceBottomSheet = false },
-            )
         }
     )
 }
@@ -384,7 +385,7 @@ private fun Preview(@PreviewParameter(FileUiListPreviewParameter::class) files:
             removeFileByUid = {},
             addFiles = {},
             closeActivity = {},
-            initialShowUploadSourceChoiceBottomSheet = false,
+            shouldStartByPromptingUserForFiles = false,
             sendTransfer = {},
         )
     }

diff --git a/...fomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt b/...fomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt
diff --git a/...nfomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/ImportedFilesCard.kt b/...nfomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/ImportedFilesCard.kt
@@ -48,7 +48,7 @@ fun ImportedFilesCard(
     modifier: Modifier = Modifier,
     files: () -> List<FileUi>,
     humanReadableSize: () -> String,
-    showUploadSourceChoiceBottomSheet: () -> Unit,
+    pickFiles: () -> Unit,
     removeFileByUid: (uid: String) -> Unit,
 ) {
     SwissTransferCard(modifier) {
@@ -76,7 +76,7 @@ fun ImportedFilesCard(
             horizontalArrangement = Arrangement.spacedBy(Margin.Medium),
         ) {
             item(key = TransferLazyRowKey(TransferLazyRowKey.Type.ADD_BUTTON)) {
-                AddNewFileButton(Modifier.animateItem()) { showUploadSourceChoiceBottomSheet() }
+                AddNewFileButton(Modifier.animateItem()) { pickFiles() }
             }
 
             items(
@@ -131,7 +131,7 @@ private fun ImportedFilesCardPreview(@PreviewParameter(FileUiListPreviewParamete
             modifier = Modifier.padding(Margin.Medium),
             files = { files },
             humanReadableSize = { "20 GB" },
-            showUploadSourceChoiceBottomSheet = {},
+            pickFiles = {},
             removeFileByUid = {},
         )
     }