fix: Make transfer lists stop only at the very edge of the lazy column

Infomaniak · Dec 18, 2024 · c76e099 · c76e099
1 parent 63f87c3
commit c76e099
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/transfer/TransferItemList.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/transfer/TransferItemList.kt
@@ -19,6 +19,8 @@ package com.infomaniak.swisstransfer.ui.components.transfer
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -44,6 +46,7 @@ fun TransferItemList(
     getTransfers: () -> List<TransferUi>,
     onSwiped: (String) -> Unit,
     onClick: (TransferUi) -> Unit,
+    contentPadding: PaddingValues = PaddingValues(),
 ) {
 
     val selectedTransferUuid = getSelectedTransferUuid()
@@ -56,10 +59,12 @@ fun TransferItemList(
     LazyColumn(
         modifier = modifier,
         verticalArrangement = Arrangement.spacedBy(Margin.Medium),
-        contentPadding = PaddingValues(top = Margin.Mini),
+        contentPadding = contentPadding,
     ) {
-
-        item { Text(text = stringResource(titleRes), style = SwissTransferTheme.typography.h1) }
+        item {
+            Spacer(Modifier.height(Margin.Mini))
+            Text(text = stringResource(titleRes), style = SwissTransferTheme.typography.h1)
+        }
 
         items(
             count = getTransfers().count(),

diff --git a/...om/infomaniak/swisstransfer/ui/components/transfer/TransfersListWithExpiredBottomSheet.kt b/...om/infomaniak/swisstransfer/ui/components/transfer/TransfersListWithExpiredBottomSheet.kt
@@ -17,6 +17,7 @@
  */
 package com.infomaniak.swisstransfer.ui.components.transfer
 
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
@@ -46,7 +47,6 @@ fun TransfersListWithExpiredBottomSheet(
     var expiredTransfer: TransferUi? by rememberSaveable { mutableStateOf(null) }
 
     TransferItemList(
-        modifier = Modifier.padding(Margin.Medium),
         direction = direction,
         getSelectedTransferUuid = getSelectedTransferUuid,
         getTransfers = getTransfers,
@@ -57,7 +57,8 @@ fun TransfersListWithExpiredBottomSheet(
             } else {
                 navigateToDetails(transfer.uuid)
             }
-        }
+        },
+        contentPadding = PaddingValues(Margin.Medium),
     )
 
     TransferExpiredBottomSheet(