From c61e075fc1ad33a29049d52e2c2bf8cd786aeef6 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sat, 28 May 2022 14:37:48 +0200 Subject: [PATCH] Change chip style --- .../java/de/mm20/launcher2/ui/component/Chip.kt | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt index d6046f71..cb255c5a 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt @@ -1,5 +1,6 @@ package de.mm20.launcher2.ui.component +import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.Image import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* @@ -9,11 +10,13 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp +@OptIn(ExperimentalMaterial3Api::class) @Composable fun Chip( modifier: Modifier = Modifier, @@ -21,9 +24,12 @@ fun Chip( content: @Composable RowScope.() -> Unit ) { Surface( - shape = RoundedCornerShape(4.dp), - modifier = modifier.clickable(onClick = onClick), - color = MaterialTheme.colorScheme.surfaceVariant + shape = RoundedCornerShape(8.dp), + modifier = modifier, + color = Color.Transparent, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline), + contentColor = MaterialTheme.colorScheme.onSurface, + onClick = onClick ) { Row( modifier = Modifier @@ -31,8 +37,8 @@ fun Chip( verticalAlignment = Alignment.CenterVertically ) { CompositionLocalProvider( - LocalTextStyle provides MaterialTheme.typography.labelMedium, - LocalContentColor provides MaterialTheme.colorScheme.onSurfaceVariant + LocalTextStyle provides MaterialTheme.typography.labelLarge, + LocalContentColor provides MaterialTheme.colorScheme.onSurface ) { content() }