From 92b2229de16a7e5c750eb8fc077d7387c41ee17a Mon Sep 17 00:00:00 2001 From: Fabian DEVEL Date: Mon, 27 Jan 2025 10:35:05 +0100 Subject: [PATCH] chore(MyKSuiteChip): Add dark preview and remove click listener --- .../myksuite/ui/components/MyKSuiteChips.kt | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/MykSuite/src/main/java/com/infomaniak/lib/myksuite/ui/components/MyKSuiteChips.kt b/MykSuite/src/main/java/com/infomaniak/lib/myksuite/ui/components/MyKSuiteChips.kt index 6c1f209f..0c6d8087 100644 --- a/MykSuite/src/main/java/com/infomaniak/lib/myksuite/ui/components/MyKSuiteChips.kt +++ b/MykSuite/src/main/java/com/infomaniak/lib/myksuite/ui/components/MyKSuiteChips.kt @@ -17,8 +17,11 @@ */ package com.infomaniak.lib.myksuite.ui.components +import android.content.res.Configuration import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.SuggestionChip import androidx.compose.material3.SuggestionChipDefaults import androidx.compose.material3.Surface @@ -27,48 +30,50 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp import com.infomaniak.lib.myksuite.R +import com.infomaniak.lib.myksuite.ui.theme.Margin import com.infomaniak.lib.myksuite.ui.theme.MyKSuiteTheme @Composable -fun MyKSuitePlusChip(modifier: Modifier = Modifier, onClick: () -> Unit) { +fun MyKSuitePlusChip(modifier: Modifier = Modifier) { Chip( modifier = modifier, - onClick = onClick, label = { Image(ImageVector.vectorResource(R.drawable.ic_logo_my_ksuite_plus), contentDescription = "My kSuite +") }, ) } @Composable -fun MyKSuiteChip(modifier: Modifier = Modifier, onClick: () -> Unit) { +fun MyKSuiteChip(modifier: Modifier = Modifier) { Chip( modifier = modifier, - onClick = onClick, label = { Image(ImageVector.vectorResource(R.drawable.ic_logo_my_ksuite), contentDescription = "My kSuite") }, ) } @Composable -private fun Chip(modifier: Modifier = Modifier, onClick: () -> Unit, label: @Composable () -> Unit) { +private fun Chip(modifier: Modifier = Modifier, label: @Composable () -> Unit, onClick: () -> Unit = {}) { SuggestionChip( modifier = modifier, onClick = onClick, label = label, border = null, + shape = RoundedCornerShape(Margin.Medium), colors = SuggestionChipDefaults.suggestionChipColors( containerColor = MyKSuiteTheme.colors.chipBackground, ), ) } -@Preview +@Preview(name = "(1) Light") +@Preview(name = "(2) Dark", uiMode = Configuration.UI_MODE_NIGHT_YES or Configuration.UI_MODE_TYPE_NORMAL) @Composable private fun Preview() { MyKSuiteTheme { Surface { Column { - MyKSuitePlusChip {} - MyKSuiteChip {} + MyKSuitePlusChip() + MyKSuiteChip() } } }