Merge pull request #30 from kiwicom/badge_stroke

badge: lighter border for subtle version
kiwicom · Sep 17, 2021 · 3c917c0 · 3c917c0
2 parents d36ace5 + 68afa87
commit 3c917c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -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
@@ -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 -> {