refactor: Update margins

Infomaniak · Oct 31, 2024 · 59f1a29 · 59f1a29
1 parent 008e702
commit 59f1a29
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileItemList.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileItemList.kt
@@ -18,6 +18,8 @@
 package com.infomaniak.swisstransfer.ui.components
 
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.lazy.grid.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -64,6 +66,11 @@ fun FileItemList(
                 onRemove = { onRemoveUid?.invoke(file.uid) },
             )
         }
+
+        item(
+            span = { GridItemSpan(maxLineSpan) },
+            content = { Spacer(modifier = Modifier.height(Margin.Mini)) },
+        )
     }
 }
 

diff --git a/...java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDetailsScreen.kt b/...java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDetailsScreen.kt
@@ -138,22 +138,22 @@ fun TransferDetailsScreen(
             FileItemList(
                 modifier = Modifier
                     .weight(1.0f)
-                    .padding(horizontal = Margin.Large),
+                    .padding(horizontal = Margin.Medium),
                 files = transferFiles, // TODO
                 isRemoveButtonVisible = false,
                 isCheckboxVisible = { isMultiselectOn },
                 isUidChecked = { fileUid -> false }, // TODO
                 setUidCheckStatus = { fileUid, isChecked -> /* TODO */ },
             ) {
                 Column {
+                    Spacer(modifier = Modifier.height(Margin.Large))
                     TransferInfos(transfer)
                     TransferMessage(transfer, transferSenderEmail)
-                    TransferContent()
+                    Spacer(modifier = Modifier.height(Margin.Large))
+                    TransferContentHeader()
                 }
             }
 
-            Spacer(modifier = Modifier.height(Margin.Large))
-
             BottomBar(
                 isMultiselectOn = { isMultiselectOn },
                 onClick = { item ->
@@ -280,13 +280,11 @@ private fun TransferMessage(transfer: TransferUi, transferSenderEmail: String?)
 }
 
 @Composable
-private fun TransferContent(
-) {
+private fun TransferContentHeader() {
     Text(
         text = stringResource(R.string.transferContentHeader),
         style = SwissTransferTheme.typography.bodySmallRegular,
         color = SwissTransferTheme.colors.secondaryTextColor,
-        modifier = Modifier.padding(top = Margin.Large),
     )
 }