chore: Clean code

Infomaniak · Jan 9, 2025 · cd676f1 · cd676f1
1 parent 660653a
commit cd676f1
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 34 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainNavHost.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainNavHost.kt
@@ -45,15 +45,10 @@ fun MainNavHost(
         enterTransition = { if (currentDestination.enableTransition) fadeIn() else EnterTransition.None },
         exitTransition = { if (currentDestination.enableTransition) fadeOut() else ExitTransition.None },
     ) {
-        composable<SentDestination> {
-            TransfersScreenWrapper(direction = TransferDirection.SENT)
-        }
+        composable<SentDestination> { TransfersScreenWrapper(TransferDirection.SENT) }
         receivedDestination {
             val args = it.toRoute<ReceivedDestination>()
-            TransfersScreenWrapper(
-                direction = TransferDirection.RECEIVED,
-                transferUuid = args.transferUuid,
-            )
+            TransfersScreenWrapper(TransferDirection.RECEIVED, transferUuid = args.transferUuid)
         }
         composable<SettingsDestination> { SettingsScreenWrapper() }
     }

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScreen.kt
@@ -17,7 +17,6 @@
  */
 package com.infomaniak.swisstransfer.ui.screen.main
 
-import android.annotation.SuppressLint
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -30,7 +29,6 @@ import com.infomaniak.swisstransfer.ui.screen.main.components.MainScaffold
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.PreviewAllWindows
 
-@SuppressLint("RestrictedApi")
 @Composable
 fun MainScreen(isTransferDeeplink: Boolean = false) {
     val navController = rememberNavController()

diff --git a/...java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDetailsScreen.kt b/...java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDetailsScreen.kt
@@ -89,9 +89,7 @@ fun TransferDetailsScreen(
             setFileCheckStatus = { fileUid, isChecked ->
                 transferDetailsViewModel.checkedFiles[fileUid] = isChecked
             },
-            navigateToFilesDetails = {
-                navigateToFolder?.invoke(it)
-            },
+            navigateToFolder = { navigateToFolder?.invoke(it) },
         )
         TransferDetailsViewModel.TransferDetailsUiState.Loading -> Unit
     }
@@ -107,7 +105,7 @@ private fun TransferDetailsScreen(
     getCheckedFiles: () -> SnapshotStateMap<String, Boolean>,
     clearCheckedFiles: () -> Unit, // TODO: Unused for now, to be implemented or deleted someday
     setFileCheckStatus: (String, Boolean) -> Unit,
-    navigateToFilesDetails: ((folderUuid: String) -> Unit)? = null,
+    navigateToFolder: ((folderUuid: String) -> Unit)? = null,
 ) {
 
     val context = LocalContext.current
@@ -136,7 +134,7 @@ private fun TransferDetailsScreen(
                 isMultiselectOn,
                 getCheckedFiles,
                 setFileCheckStatus,
-                navigateToFilesDetails,
+                navigateToFolder,
             )
 
             BottomBar {
@@ -206,7 +204,7 @@ private fun ColumnScope.FilesList(
     isMultiselectOn: Boolean,
     getCheckedFiles: () -> SnapshotStateMap<String, Boolean>,
     setFileCheckStatus: (String, Boolean) -> Unit,
-    navigateToFilesDetails: ((folderUuid: String) -> Unit)? = null,
+    navigateToFolder: ((folderUuid: String) -> Unit)? = null,
 ) {
 
     val shouldDisplayRecipients = transferRecipients.isNotEmpty()
@@ -224,7 +222,7 @@ private fun ColumnScope.FilesList(
             setFileCheckStatus(fileUid, isChecked)
         },
         onClick = { fileUuid ->
-            navigateToFilesDetails?.invoke(fileUuid)
+            navigateToFolder?.invoke(fileUuid)
         },
         header = {
             Column {
@@ -333,7 +331,7 @@ private fun Preview(@PreviewParameter(TransferUiListPreviewParameter::class) tra
                 downloadFiles = {},
                 clearCheckedFiles = {},
                 setFileCheckStatus = { _, _ -> },
-                navigateToFilesDetails = { _ -> },
+                navigateToFolder = { _ -> },
             )
         }
     }

diff --git a/.../infomaniak/swisstransfer/ui/screen/main/transferdetails/components/FilesDetailsScreen.kt b/.../infomaniak/swisstransfer/ui/screen/main/transferdetails/components/FilesDetailsScreen.kt
@@ -18,7 +18,6 @@ import com.infomaniak.swisstransfer.ui.previewparameter.FileUiListPreviewParamet
 import com.infomaniak.swisstransfer.ui.screen.main.components.SwissTransferScaffold
 import com.infomaniak.swisstransfer.ui.screen.main.transferdetails.TransferDetailsViewModel
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.FilesSize
-import com.infomaniak.swisstransfer.ui.screen.newtransfer.ImportFilesViewModel
 import com.infomaniak.swisstransfer.ui.theme.Margin
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.PreviewAllWindows
@@ -34,7 +33,6 @@ fun FilesDetailsScreen(
     navigateBack: () -> Unit,
     close: (() -> Unit),
 ) {
-    // If we don't have a folderUuid, it means we have to load files from importedFiles in ImportFilesViewModel
     val files by transferDetailsViewModel.filesInFolder.collectAsStateWithLifecycle()
 
     if (files?.isEmpty() == true) navigateBack()
@@ -89,15 +87,6 @@ fun FilesDetailsScreen(
     }
 }
 
-fun getOnFileRemoveCallback(
-    importFilesViewModel: ImportFilesViewModel,
-    withFileDelete: Boolean,
-): ((String) -> Unit)? {
-    return if (withFileDelete) {
-        { importFilesViewModel.removeFileByUid(it) }
-    } else null
-}
-
 @PreviewAllWindows
 @Composable
 private fun Preview(@PreviewParameter(FileUiListPreviewParameter::class) files: List<FileUi>) {

diff --git a/...main/java/com/infomaniak/swisstransfer/ui/screen/main/transfers/TransfersScreenWrapper.kt b/...main/java/com/infomaniak/swisstransfer/ui/screen/main/transfers/TransfersScreenWrapper.kt
@@ -50,10 +50,7 @@ import kotlinx.parcelize.Parcelize
 
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
 @Composable
-fun TransfersScreenWrapper(
-    direction: TransferDirection,
-    transferUuid: String? = null,
-) {
+fun TransfersScreenWrapper(direction: TransferDirection, transferUuid: String? = null) {
     var hasTransfer: Boolean by rememberSaveable { mutableStateOf(false) }
 
     TwoPaneScaffold<DestinationContent>(

diff --git a/...fomaniak/swisstransfer/ui/screen/newtransfer/importfiles/NewTransferFilesDetailsScreen.kt b/...fomaniak/swisstransfer/ui/screen/newtransfer/importfiles/NewTransferFilesDetailsScreen.kt
@@ -32,7 +32,6 @@ import com.infomaniak.swisstransfer.ui.previewparameter.FileUiListPreviewParamet
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.ImportFilesViewModel
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.PreviewAllWindows
-import getOnFileRemoveCallback
 
 @Composable
 fun NewTransferFilesDetailsScreen(
@@ -42,7 +41,6 @@ fun NewTransferFilesDetailsScreen(
     withFileDelete: Boolean,
     navigateBack: (() -> Unit),
 ) {
-    // If we don't have a folderUuid, it means we have to load files from importedFiles in ImportFilesViewModel
     val files by importFilesViewModel.importedFilesDebounced.collectAsStateWithLifecycle()
 
     if (files.isEmpty()) navigateBack()
@@ -56,6 +54,15 @@ fun NewTransferFilesDetailsScreen(
     )
 }
 
+private fun getOnFileRemoveCallback(
+    importFilesViewModel: ImportFilesViewModel,
+    withFileDelete: Boolean,
+): ((String) -> Unit)? {
+    return if (withFileDelete) {
+        { importFilesViewModel.removeFileByUid(it) }
+    } else null
+}
+
 @Composable
 private fun NewTransferFilesDetailsScreen(
     files: List<FileUi>,