From c2d8b9079ae687fb94bed06207fbc055759ee5d1 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Fri, 20 Sep 2024 15:32:47 +0200 Subject: [PATCH 1/2] Clean code --- .../ui/components/NewTransferFab.kt | 1 + .../UploadSourceChoiceBottomSheet.kt | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/NewTransferFab.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/NewTransferFab.kt index 8cd721a80..d40dbbaf4 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/NewTransferFab.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/NewTransferFab.kt @@ -33,6 +33,7 @@ fun NewTransferFab( newTransferFabType: NewTransferFabType ) { val context = LocalContext.current + SwissTransferFab( modifier = modifier, fabType = newTransferFabType.fabType, diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt index 992f7ae97..97aeed509 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt @@ -46,14 +46,23 @@ fun UploadSourceChoiceBottomSheet( titleRes = R.string.transferUploadSourceChoiceTitle, content = { Column { - BottomSheetItem(AppImages.AppIcons.Camera, R.string.transferUploadSourceChoiceCamera) { /* TODO */ } + BottomSheetItem( + imageVector = AppImages.AppIcons.Camera, + titleRes = R.string.transferUploadSourceChoiceCamera, + onClick = { /* TODO */ }, + ) HorizontalDivider(Modifier.padding(horizontal = Margin.Medium)) BottomSheetItem( - AppImages.AppIcons.PolaroidLandscape, - R.string.transferUploadSourceChoiceGallery - ) { /* TODO */ } + imageVector = AppImages.AppIcons.PolaroidLandscape, + titleRes = R.string.transferUploadSourceChoiceGallery, + onClick = { /* TODO */ }, + ) HorizontalDivider(Modifier.padding(horizontal = Margin.Medium)) - BottomSheetItem(AppImages.AppIcons.Folder, R.string.transferUploadSourceChoiceFiles) { /* TODO */ } + BottomSheetItem( + imageVector = AppImages.AppIcons.Folder, + titleRes = R.string.transferUploadSourceChoiceFiles, + onClick = { /* TODO */ }, + ) } }, ) From ce5a37eef6e32d4e37dad14e14e4add7e3833402 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Fri, 20 Sep 2024 15:43:56 +0200 Subject: [PATCH 2/2] Update imports --- .../swisstransfer/ui/screen/main/sent/SentEmptyScreen.kt | 4 ++-- .../importfiles/UploadSourceChoiceBottomSheet.kt | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentEmptyScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentEmptyScreen.kt index 4ff212678..d6d783b54 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentEmptyScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentEmptyScreen.kt @@ -30,7 +30,7 @@ import androidx.constraintlayout.compose.ConstraintLayout import com.infomaniak.swisstransfer.R import com.infomaniak.swisstransfer.ui.components.NewTransferFab import com.infomaniak.swisstransfer.ui.components.NewTransferFabType -import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus import com.infomaniak.swisstransfer.ui.images.illus.ArrowDownRightCurved import com.infomaniak.swisstransfer.ui.theme.Dimens import com.infomaniak.swisstransfer.ui.theme.Margin @@ -69,7 +69,7 @@ fun SentEmptyScreen() { top.linkTo(parent.top) end.linkTo(fab.start, Margin.Small) }, - imageVector = AppImages.AppIllus.ArrowDownRightCurved, + imageVector = AppIllus.ArrowDownRightCurved, contentDescription = null, ) NewTransferFab( diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt index 97aeed509..5b8ec5e90 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt @@ -26,7 +26,7 @@ import androidx.compose.ui.Modifier import com.infomaniak.swisstransfer.R import com.infomaniak.swisstransfer.ui.components.BottomSheetItem import com.infomaniak.swisstransfer.ui.components.SwissTransferBottomSheet -import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons import com.infomaniak.swisstransfer.ui.images.icons.Camera import com.infomaniak.swisstransfer.ui.images.icons.Folder import com.infomaniak.swisstransfer.ui.images.icons.PolaroidLandscape @@ -47,19 +47,19 @@ fun UploadSourceChoiceBottomSheet( content = { Column { BottomSheetItem( - imageVector = AppImages.AppIcons.Camera, + imageVector = AppIcons.Camera, titleRes = R.string.transferUploadSourceChoiceCamera, onClick = { /* TODO */ }, ) HorizontalDivider(Modifier.padding(horizontal = Margin.Medium)) BottomSheetItem( - imageVector = AppImages.AppIcons.PolaroidLandscape, + imageVector = AppIcons.PolaroidLandscape, titleRes = R.string.transferUploadSourceChoiceGallery, onClick = { /* TODO */ }, ) HorizontalDivider(Modifier.padding(horizontal = Margin.Medium)) BottomSheetItem( - imageVector = AppImages.AppIcons.Folder, + imageVector = AppIcons.Folder, titleRes = R.string.transferUploadSourceChoiceFiles, onClick = { /* TODO */ }, )