From 25b1d23996cc223d29f9afb7d05d0f790e8a7317 Mon Sep 17 00:00:00 2001 From: Yasan Glass Date: Mon, 18 Dec 2023 10:13:19 +0100 Subject: [PATCH] Set default text color to content.minor --- .../src/main/kotlin/glass/yasan/stillbirth/component/Text.kt | 3 ++- .../main/kotlin/glass/yasan/stillbirth/component/TextMono.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stillbirth/src/main/kotlin/glass/yasan/stillbirth/component/Text.kt b/stillbirth/src/main/kotlin/glass/yasan/stillbirth/component/Text.kt index 5be5c2c..5137a74 100644 --- a/stillbirth/src/main/kotlin/glass/yasan/stillbirth/component/Text.kt +++ b/stillbirth/src/main/kotlin/glass/yasan/stillbirth/component/Text.kt @@ -11,13 +11,14 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.TextUnit import glass.yasan.spine.compose.type.rubikFamily +import glass.yasan.stillbirth.theme.StillbirthTheme import androidx.compose.material3.Text as Material3Text @Composable public fun Text( text: String, - color: Color, modifier: Modifier = Modifier, + color: Color = StillbirthTheme.colors.content.minor, fontSize: TextUnit = TextUnit.Unspecified, fontStyle: FontStyle? = null, fontWeight: FontWeight? = null, diff --git a/stillbirth/src/main/kotlin/glass/yasan/stillbirth/component/TextMono.kt b/stillbirth/src/main/kotlin/glass/yasan/stillbirth/component/TextMono.kt index 89a62e6..dcbd322 100644 --- a/stillbirth/src/main/kotlin/glass/yasan/stillbirth/component/TextMono.kt +++ b/stillbirth/src/main/kotlin/glass/yasan/stillbirth/component/TextMono.kt @@ -10,12 +10,13 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.TextUnit import glass.yasan.spine.compose.type.rubikMonoFamily +import glass.yasan.stillbirth.theme.StillbirthTheme @Composable public fun TextMono( text: String, - color: Color, modifier: Modifier = Modifier, + color: Color = StillbirthTheme.colors.content.minor, fontSize: TextUnit = TextUnit.Unspecified, fontStyle: FontStyle? = null, fontWeight: FontWeight? = null,