BetterAndroid/FlexiUI
5
0
Fork 0
mirror of https://github.com/BetterAndroid/FlexiUI.git synced 2025-09-09 20:14:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: use default local text style color

Browse Source
This commit is contained in:
fankesyooni
2023-11-09 15:29:01 +08:00
parent 1ba8d5ed6e
commit 0e166f6f84
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Text.kt
View File

@@ -159,4 +159,8 @@ internal val DefaultTextStyle = DefaultTypography.primary
@Composable @Composable
@ReadOnlyComposable @ReadOnlyComposable
private fun defaultTextColor() = LocalTextStyle.current.color.orElse() ?: LocalColors.current.textPrimary internal fun TextStyle.default(color: Color) = copy(color = LocalTextStyle.current.color.orElse() ?: color)
@Composable
@ReadOnlyComposable
private fun defaultTextColor() = LocalTextStyle.current.default(LocalColors.current.textPrimary).color

2
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/TextField.kt
View File

@@ -321,7 +321,7 @@ object TextField {
val style: TextStyle val style: TextStyle
@Composable @Composable
@ReadOnlyComposable @ReadOnlyComposable
get() = LocalTextStyle.current.copy(color = LocalColors.current.textPrimary) get() = LocalTextStyle.current.default(LocalColors.current.textPrimary)
} }
@Composable @Composable