review: Create a modifier to factorize usage

Infomaniak · Dec 6, 2024 · c02f33f · c02f33f
1 parent f745b1f
commit c02f33f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 23 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
@@ -50,7 +50,7 @@ import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.GetSetCallbacks
 import com.infomaniak.swisstransfer.ui.utils.PreviewAllWindows
 
-private val HORIZONTAL_MARGIN = Margin.Medium
+private val HORIZONTAL_PADDING = Margin.Medium
 
 @Composable
 fun ImportFilesScreen(
@@ -158,21 +158,12 @@ private fun ImportFilesScreen(
         },
         content = {
             Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
-                FilesToImport(
-                    modifier = Modifier.padding(horizontal = HORIZONTAL_MARGIN),
-                    files = files,
-                    removeFileByUid = removeFileByUid,
-                    addFiles = addFiles,
-                    shouldStartByPromptingUserForFiles = shouldStartByPromptingUserForFiles,
-                )
+                val modifier = Modifier.padding(horizontal = HORIZONTAL_PADDING)
+                FilesToImport(modifier, files, removeFileByUid, addFiles, shouldStartByPromptingUserForFiles)
                 Spacer(Modifier.height(Margin.Medium))
-                ImportTextFields(
-                    modifier = Modifier.padding(horizontal = HORIZONTAL_MARGIN),
-                    transferMessage = transferMessage,
-                    selectedTransferType = selectedTransferType.get,
-                )
-                SendByOptions(selectedTransferType)
-                TransferOptions(Modifier.padding(horizontal = HORIZONTAL_MARGIN), transferOptionsCallbacks)
+                ImportTextFields(modifier, transferMessage, selectedTransferType.get)
+                SendByOptions(modifier, selectedTransferType)
+                TransferOptions(modifier, transferOptionsCallbacks)
             }
         }
     )
@@ -244,9 +235,9 @@ private fun ColumnScope.EmailAddressesTextFields(modifier: Modifier, selectedTra
 }
 
 @Composable
-private fun SendByOptions(selectedTransferType: GetSetCallbacks<TransferTypeUi>) {
-    ImportFilesTitle(Modifier.padding(horizontal = HORIZONTAL_MARGIN), R.string.transferTypeTitle)
-    TransferTypeButtons(selectedTransferType)
+private fun SendByOptions(modifier: Modifier, selectedTransferType: GetSetCallbacks<TransferTypeUi>) {
+    ImportFilesTitle(modifier, R.string.transferTypeTitle)
+    TransferTypeButtons(HORIZONTAL_PADDING, selectedTransferType)
 }
 
 @Composable

diff --git a/...omaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferTypeButtons.kt b/...omaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferTypeButtons.kt
@@ -20,13 +20,15 @@ package com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.component
 import androidx.annotation.PluralsRes
 import androidx.annotation.StringRes
 import androidx.compose.foundation.horizontalScroll
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.Dp
 import com.infomaniak.multiplatform_swisstransfer.common.models.TransferType
 import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons
@@ -40,11 +42,11 @@ import com.infomaniak.swisstransfer.ui.utils.GetSetCallbacks
 import com.infomaniak.swisstransfer.ui.utils.PreviewLightAndDark
 
 @Composable
-fun TransferTypeButtons(transferType: GetSetCallbacks<TransferTypeUi>) {
+fun TransferTypeButtons(horizontalPadding: Dp, transferType: GetSetCallbacks<TransferTypeUi>) {
     Row(
         modifier = Modifier
             .horizontalScroll(rememberScrollState())
-            .padding(horizontal = Margin.Medium),
+            .padding(horizontal = horizontalPadding),
         horizontalArrangement = Arrangement.spacedBy(Margin.Mini),
     ) {
         for (transferTypeEntry in TransferTypeUi.entries) {
@@ -108,7 +110,10 @@ enum class TransferTypeUi(
 private fun TransferTypeButtonsPreview() {
     SwissTransferTheme {
         Surface {
-            TransferTypeButtons(GetSetCallbacks(get = { TransferTypeUi.QR_CODE }, set = {}))
+            TransferTypeButtons(
+                horizontalPadding = Margin.Medium,
+                transferType = GetSetCallbacks(get = { TransferTypeUi.QR_CODE }, set = {}),
+            )
         }
     }
 }