Merge pull request #204 from Infomaniak/remove-file-choice-bottom-sheet

Remove file choice bottom sheet
Infomaniak · Nov 21, 2024 · f0ba965 · f0ba965
2 parents 7f9c73c + 27714e1
commit f0ba965
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 382 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt
@@ -30,14 +30,16 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons
-import com.infomaniak.swisstransfer.ui.images.icons.Camera
+import com.infomaniak.swisstransfer.ui.images.icons.Add
 import com.infomaniak.swisstransfer.ui.theme.Dimens
 import com.infomaniak.swisstransfer.ui.theme.Margin
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.PreviewLightAndDark
 
 private val BOTTOM_SHEET_ITEM_HEIGHT = 56.dp
 
+// Unused for now, but this is still the official component with the appropriate style of a bottom sheet item so this needs to be
+// used if we ever create a new bottom sheet
 @Composable
 fun BottomSheetItem(imageVector: ImageVector, @StringRes titleRes: Int, onClick: () -> Unit) {
     SharpRippleButton(
@@ -73,7 +75,7 @@ fun BottomSheetItem(imageVector: ImageVector, @StringRes titleRes: Int, onClick:
 private fun ChoiceItemPreview() {
     SwissTransferTheme {
         Surface {
-            BottomSheetItem(AppIcons.Camera, R.string.transferUploadSourceChoiceCamera) {}
+            BottomSheetItem(AppIcons.Add, R.string.appName) {}
         }
     }
 }
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Camera.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Camera.kt
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/PolaroidLandscape.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/PolaroidLandscape.kt
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 = {},
         )
     }