diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileItem.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileItem.kt index d8345287a..f36ce4b38 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileItem.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileItem.kt @@ -133,7 +133,7 @@ private fun FileItemContent( .align(Alignment.TopEnd), contentPadding = PaddingValues(0.dp), shape = CircleShape, - colors = ButtonDefaults.buttonColors(containerColor = SwissTransferTheme.colors.fileTileRemoveButtonBackground), + colors = ButtonDefaults.buttonColors(containerColor = SwissTransferTheme.colors.fileItemRemoveButtonBackground), onClick = onRemove ?: {}, ) { Icon( diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileTileList.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileItemList.kt similarity index 97% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileTileList.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileItemList.kt index 3833e7ccb..8a7dbbbfd 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileTileList.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileItemList.kt @@ -30,7 +30,7 @@ import com.infomaniak.swisstransfer.ui.utils.PreviewLargeWindow import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow @Composable -fun FileTileList( +fun FileItemList( modifier: Modifier = Modifier, files: List, isRemoveButtonVisible: Boolean, @@ -61,7 +61,7 @@ fun FileTileList( @PreviewSmallWindow @PreviewLargeWindow @Composable -private fun FileTileListPreview() { +private fun FileItemListPreview() { val files = listOf(object : FileUiItem { override val fileName: String = "The 5-Step Guide to Not Breaking Your Code.txt" override val uid: String = fileName @@ -83,7 +83,7 @@ private fun FileTileListPreview() { }) SwissTransferTheme { - FileTileList( + FileItemList( files = files, isRemoveButtonVisible = false, isCheckboxVisible = true, diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/ReceivedScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/ReceivedScreen.kt index 4f052446b..be1b27453 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/ReceivedScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/ReceivedScreen.kt @@ -29,7 +29,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.infomaniak.swisstransfer.R import com.infomaniak.swisstransfer.ui.components.EmptyState import com.infomaniak.swisstransfer.ui.components.FileUiItem -import com.infomaniak.swisstransfer.ui.components.FileTileList +import com.infomaniak.swisstransfer.ui.components.FileItemList import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus import com.infomaniak.swisstransfer.ui.images.illus.MascotSearching import com.infomaniak.swisstransfer.ui.screen.main.components.BrandTopAppBarScaffold @@ -91,7 +91,7 @@ private fun ReceivedScreen( override val mimeType: String? = null override val uri: String = "" }) - FileTileList( + FileItemList( modifier = Modifier.padding(Margin.Medium), files = files, isRemoveButtonVisible = false, diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentListScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentListScreen.kt index 51df8eb26..d5f44b572 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentListScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentListScreen.kt @@ -22,8 +22,7 @@ import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import com.infomaniak.swisstransfer.ui.components.FileUiItem -import com.infomaniak.swisstransfer.ui.components.FileTileList -import com.infomaniak.swisstransfer.ui.components.FileItem +import com.infomaniak.swisstransfer.ui.components.FileItemList import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.PreviewLargeWindow @@ -50,7 +49,7 @@ fun SentListScreen(transfers: List) { override val mimeType: String? = null override val uri: String = "" }) - FileTileList( + FileItemList( modifier = Modifier.padding(Margin.Medium), files = transfers, isRemoveButtonVisible = true, diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/ColorDark.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/ColorDark.kt index 67a87f4c9..915997981 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/ColorDark.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/ColorDark.kt @@ -75,7 +75,7 @@ val CustomDarkColorScheme = CustomColorScheme( navigationItemBackground = Color(dark2), tertiaryButtonBackground = Color(dark2), selectedSettingItem = Color(dark2), - fileTileRemoveButtonBackground = Color(black_translucent), + fileItemRemoveButtonBackground = Color(black_translucent), transferTypeLinkContainer = Color(specific1), transferTypeLinkOnContainer = Color(green_main), transferTypeEmailContainer = Color(green_dark), diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/ColorLight.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/ColorLight.kt index 1a888a5a3..0834bb1cd 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/ColorLight.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/ColorLight.kt @@ -76,7 +76,7 @@ val CustomLightColorScheme = CustomColorScheme( navigationItemBackground = LightColorScheme.background, tertiaryButtonBackground = Color(rabbit), selectedSettingItem = Color(rabbit), - fileTileRemoveButtonBackground = Color(black_translucent), + fileItemRemoveButtonBackground = Color(black_translucent), transferTypeLinkContainer = Color(specific1), transferTypeLinkOnContainer = Color(green_main), transferTypeEmailContainer = Color(specific2), diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/Theme.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/Theme.kt index 27fce6db1..6e252c599 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/Theme.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/Theme.kt @@ -75,7 +75,7 @@ data class CustomColorScheme( val navigationItemBackground: Color = Color.Unspecified, val tertiaryButtonBackground: Color = Color.Unspecified, val selectedSettingItem: Color = Color.Unspecified, - val fileTileRemoveButtonBackground: Color = Color.Unspecified, + val fileItemRemoveButtonBackground: Color = Color.Unspecified, val transferTypeLinkContainer: Color = Color.Unspecified, val transferTypeLinkOnContainer: Color = Color.Unspecified, val transferTypeEmailContainer: Color = Color.Unspecified,