Skip to content

Commit

Permalink
feat: Handle scroll in TransferDetails screen
Browse files Browse the repository at this point in the history
  • Loading branch information
@KevinBoulongne
KevinBoulongne committed Oct 31, 2024
1 parent 556d613 commit fcd3e9d
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 67 deletions.
13 changes: 10 additions & 3 deletions app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileItemList.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
package com.infomaniak.swisstransfer.ui.components

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.lazy.grid.items
import androidx.compose.foundation.lazy.grid.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.PreviewParameter
Expand All @@ -40,13 +38,22 @@ fun FileItemList(
isUidChecked: (String) -> Boolean,
setUidCheckStatus: (String, Boolean) -> Unit,
onRemoveUid: ((String) -> Unit)? = null,
header: (@Composable LazyGridItemScope.() -> Unit)? = null,
) {
LazyVerticalGrid(
modifier = modifier,
columns = GridCells.Adaptive(150.dp),
verticalArrangement = Arrangement.spacedBy(Margin.Medium),
horizontalArrangement = Arrangement.spacedBy(Margin.Medium),
) {

header?.let {
item(
span = { GridItemSpan(maxLineSpan) },
content = it,
)
}

items(files, key = { it.uid }) { file ->
FileItem(
file = file,
Expand Down
128 changes: 64 additions & 64 deletions ...java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDetailsScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fun TransferDetailsScreen(
navigateBack: (() -> Unit)?,
) {

val files = listOf(
val transferFiles = listOf(
FileUi(
uid = UUID.randomUUID().toString(),
fileName = "The 5-Step Guide to Not Breaking Your Code (1).txt",
Expand Down Expand Up @@ -104,6 +104,51 @@ fun TransferDetailsScreen(
),
)

val files = listOf(
com.infomaniak.swisstransfer.ui.components.FileUi(
uid = UUID.randomUUID().toString(),
fileName = "The 5-Step Guide to Not Breaking Your Code (1).txt",
fileSizeInBytes = 57_689_032L,
mimeType = null,
uri = "https://chk.me/83azQOl",
),
com.infomaniak.swisstransfer.ui.components.FileUi(
uid = UUID.randomUUID().toString(),
fileName = "Introduction to Turning It Off and On Again (1).pptx",
fileSizeInBytes = 89_723_143L,
mimeType = null,
uri = "https://chk.me/83azQOl",
),
com.infomaniak.swisstransfer.ui.components.FileUi(
uid = UUID.randomUUID().toString(),
fileName = "Learning to Copy and Paste: A Complete Guide (1).docx",
fileSizeInBytes = 237_866_728L,
mimeType = null,
uri = "https://chk.me/83azQOl",
),
com.infomaniak.swisstransfer.ui.components.FileUi(
uid = UUID.randomUUID().toString(),
fileName = "The 5-Step Guide to Not Breaking Your Code (2).txt",
fileSizeInBytes = 57_689_032L,
mimeType = null,
uri = "https://chk.me/83azQOl",
),
com.infomaniak.swisstransfer.ui.components.FileUi(
uid = UUID.randomUUID().toString(),
fileName = "Introduction to Turning It Off and On Again (2).pptx",
fileSizeInBytes = 89_723_143L,
mimeType = null,
uri = "https://chk.me/83azQOl",
),
com.infomaniak.swisstransfer.ui.components.FileUi(
uid = UUID.randomUUID().toString(),
fileName = "Learning to Copy and Paste: A Complete Guide (2).docx",
fileSizeInBytes = 237_866_728L,
mimeType = null,
uri = "https://chk.me/83azQOl",
),
)

val transfer = TransferUi(
uuid = UUID.randomUUID().toString(),
createdDateTimestamp = Date().time - 30L * 86_400_000L,
Expand All @@ -115,7 +160,7 @@ fun TransferDetailsScreen(
downloadLimit = 250,
downloadLeft = 42,
message = "Coucou c'est moi le message de description du transfert.",
files = files,
files = transferFiles,
)

val transferSenderEmail: String? = "[email protected]" // TODO
Expand All @@ -134,16 +179,26 @@ fun TransferDetailsScreen(
floatingActionButton = {},
) {
Column {
Spacer(modifier = Modifier.height(Margin.Large))
Column(

FileItemList(
modifier = Modifier
.weight(1.0f)
.padding(horizontal = Margin.Medium),
.padding(horizontal = Margin.Large),
files = files, // transfer.files, // TODO
isRemoveButtonVisible = false,
isCheckboxVisible = { isMultiselectOn },
isUidChecked = { fileUid -> false }, // TODO
setUidCheckStatus = { fileUid, isChecked -> /* TODO */ },
) {
TransferInfos(transfer)
TransferMessage(transfer, transferSenderEmail)
TransferContent(transfer, isMultiselectOn = { isMultiselectOn })
Column {
TransferInfos(transfer)
TransferMessage(transfer, transferSenderEmail)
TransferContent()
}
}

Spacer(modifier = Modifier.height(Margin.Large))

BottomBar(
isMultiselectOn = { isMultiselectOn },
onClick = { item ->
Expand Down Expand Up @@ -271,67 +326,12 @@ private fun TransferMessage(transfer: TransferUi, transferSenderEmail: String?)

@Composable
private fun TransferContent(
transfer: TransferUi,
isMultiselectOn: () -> Boolean,
) {

val files = listOf(
com.infomaniak.swisstransfer.ui.components.FileUi(
uid = UUID.randomUUID().toString(),
fileName = "The 5-Step Guide to Not Breaking Your Code (1).txt",
fileSizeInBytes = 57_689_032L,
mimeType = null,
uri = "https://chk.me/83azQOl",
),
com.infomaniak.swisstransfer.ui.components.FileUi(
uid = UUID.randomUUID().toString(),
fileName = "Introduction to Turning It Off and On Again (1).pptx",
fileSizeInBytes = 89_723_143L,
mimeType = null,
uri = "https://chk.me/83azQOl",
),
com.infomaniak.swisstransfer.ui.components.FileUi(
uid = UUID.randomUUID().toString(),
fileName = "Learning to Copy and Paste: A Complete Guide (1).docx",
fileSizeInBytes = 237_866_728L,
mimeType = null,
uri = "https://chk.me/83azQOl",
),
com.infomaniak.swisstransfer.ui.components.FileUi(
uid = UUID.randomUUID().toString(),
fileName = "The 5-Step Guide to Not Breaking Your Code (2).txt",
fileSizeInBytes = 57_689_032L,
mimeType = null,
uri = "https://chk.me/83azQOl",
),
com.infomaniak.swisstransfer.ui.components.FileUi(
uid = UUID.randomUUID().toString(),
fileName = "Introduction to Turning It Off and On Again (2).pptx",
fileSizeInBytes = 89_723_143L,
mimeType = null,
uri = "https://chk.me/83azQOl",
),
com.infomaniak.swisstransfer.ui.components.FileUi(
uid = UUID.randomUUID().toString(),
fileName = "Learning to Copy and Paste: A Complete Guide (2).docx",
fileSizeInBytes = 237_866_728L,
mimeType = null,
uri = "https://chk.me/83azQOl",
),
)

Text(
text = stringResource(R.string.transferContentHeader),
style = SwissTransferTheme.typography.bodySmallRegular,
color = SwissTransferTheme.colors.secondaryTextColor,
modifier = Modifier.padding(top = Margin.Large, bottom = Margin.Medium),
)
FileItemList(
files = files, // transfer.files, // TODO
isRemoveButtonVisible = false,
isCheckboxVisible = { isMultiselectOn() },
isUidChecked = { fileUid -> false }, // TODO
setUidCheckStatus = { fileUid, isChecked -> /* TODO */ },
modifier = Modifier.padding(top = Margin.Large),
)
}

Expand Down

0 comments on commit fcd3e9d

Please sign in to comment.