From 68afa8719ea740a0bdcbc808af1d4f3cab1072f0 Mon Sep 17 00:00:00 2001 From: Jan Skrasek Date: Fri, 17 Sep 2021 12:06:36 +0200 Subject: [PATCH] badge: lighter border for subtle version --- ui/src/main/java/kiwi/orbit/compose/ui/controls/Badge.kt | 1 + .../main/java/kiwi/orbit/compose/ui/controls/ThemedSurface.kt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/src/main/java/kiwi/orbit/compose/ui/controls/Badge.kt b/ui/src/main/java/kiwi/orbit/compose/ui/controls/Badge.kt index 00445631a..039dc8ee6 100644 --- a/ui/src/main/java/kiwi/orbit/compose/ui/controls/Badge.kt +++ b/ui/src/main/java/kiwi/orbit/compose/ui/controls/Badge.kt @@ -191,6 +191,7 @@ private fun Badge( ThemedSurface( subtle = subtle, shape = RoundedCornerShape(percent = 50), + strokeWidth = 0.5.dp, modifier = modifier.requiredHeight(24.dp), verticalAlignment = Alignment.CenterVertically, contentPadding = PaddingValues(vertical = 2.dp, horizontal = 8.dp), diff --git a/ui/src/main/java/kiwi/orbit/compose/ui/controls/ThemedSurface.kt b/ui/src/main/java/kiwi/orbit/compose/ui/controls/ThemedSurface.kt index efcd54fba..ca75b6e2a 100644 --- a/ui/src/main/java/kiwi/orbit/compose/ui/controls/ThemedSurface.kt +++ b/ui/src/main/java/kiwi/orbit/compose/ui/controls/ThemedSurface.kt @@ -12,6 +12,7 @@ import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Shape +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import kiwi.orbit.compose.ui.OrbitTheme import kiwi.orbit.compose.ui.foundation.LocalContentColor @@ -23,6 +24,7 @@ public fun ThemedSurface( subtle: Boolean, modifier: Modifier = Modifier, shape: Shape = OrbitTheme.shapes.normal, + strokeWidth: Dp = 1.dp, horizontalArrangement: Arrangement.Horizontal = Arrangement.Start, verticalAlignment: Alignment.Vertical = Alignment.Top, contentPadding: PaddingValues = PaddingValues(), @@ -36,7 +38,7 @@ public fun ThemedSurface( val surfaceModifier = when (subtle) { true -> { Modifier - .border(1.dp, OrbitTheme.colors.surface.strong, shape) + .border(strokeWidth, OrbitTheme.colors.surface.strong, shape) .background(backgroundColor, shape) } false -> {