From 2d0e8099509a2c3de7cd26d218e2879b83c48a84 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Mon, 18 Nov 2024 17:07:26 +0100 Subject: [PATCH] fix: Use `Dimens` instead of `Margin` for icons size --- .../infomaniak/swisstransfer/ui/components/BottomSheetItem.kt | 3 ++- .../java/com/infomaniak/swisstransfer/ui/components/Buttons.kt | 2 +- .../swisstransfer/ui/components/transfer/TransferItem.kt | 2 +- .../ui/screen/main/transferdetails/components/TransferInfo.kt | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt index 6dc922ed2..50066a809 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt @@ -31,6 +31,7 @@ import androidx.compose.ui.unit.dp import com.infomaniak.swisstransfer.R import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons import com.infomaniak.swisstransfer.ui.images.icons.Camera +import com.infomaniak.swisstransfer.ui.theme.Dimens import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.PreviewLightAndDark @@ -53,7 +54,7 @@ fun BottomSheetItem(imageVector: ImageVector, @StringRes titleRes: Int, onClick: verticalAlignment = Alignment.CenterVertically, ) { Icon( - modifier = Modifier.size(Margin.Large), + modifier = Modifier.size(Dimens.IconSize), imageVector = imageVector, contentDescription = null, tint = SwissTransferTheme.materialColors.primary, diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/Buttons.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/Buttons.kt index 928137abf..1e9424f93 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/Buttons.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/Buttons.kt @@ -151,7 +151,7 @@ fun KeepButtonSize(imageVector: ImageVector?, titleRes: Int, content: @Composabl @Composable private fun ButtonTextContent(imageVector: ImageVector?, titleRes: Int) { imageVector?.let { - Icon(modifier = Modifier.size(Margin.Medium), imageVector = it, contentDescription = null) + Icon(modifier = Modifier.size(Dimens.SmallIconSize), imageVector = it, contentDescription = null) Spacer(modifier = Modifier.width(Margin.Mini)) } Text(text = stringResource(id = titleRes), style = SwissTransferTheme.typography.bodyMedium) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/transfer/TransferItem.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/transfer/TransferItem.kt index 7b081dd4c..b565f6139 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/transfer/TransferItem.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/transfer/TransferItem.kt @@ -109,7 +109,7 @@ fun TransferItem( Icon( imageVector = AppIcons.ChevronRightThick, contentDescription = null, - modifier = Modifier.size(Margin.Medium), + modifier = Modifier.size(Dimens.SmallIconSize), tint = SwissTransferTheme.colors.iconColor, ) } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/components/TransferInfo.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/components/TransferInfo.kt index 838002d61..2ed11bca1 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/components/TransferInfo.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/components/TransferInfo.kt @@ -42,6 +42,7 @@ import com.infomaniak.swisstransfer.ui.images.icons.ArrowDownFile import com.infomaniak.swisstransfer.ui.images.icons.Clock import com.infomaniak.swisstransfer.ui.images.icons.FileZip import com.infomaniak.swisstransfer.ui.previewparameter.TransferUiListPreviewParameter +import com.infomaniak.swisstransfer.ui.theme.Dimens import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.PreviewLightAndDark @@ -85,7 +86,7 @@ fun TransferInfo(transfer: TransferUi) { private fun IconText(icon: ImageVector, text: String) { Row(verticalAlignment = Alignment.CenterVertically) { Icon( - modifier = Modifier.size(Margin.Medium), + modifier = Modifier.size(Dimens.SmallIconSize), imageVector = icon, tint = SwissTransferTheme.materialColors.primary, contentDescription = null,