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

refactor: make content color tint to icon

Browse Source
This commit is contained in:
fankesyooni
2023-11-30 13:00:52 +08:00
parent a92499e5ce
commit 90db05c28c
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Dropdown.kt
View File

@@ -354,9 +354,10 @@ fun DropdownMenuItem(
style = currentStyle, style = currentStyle,
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
CompositionLocalProvider(LocalTextStyle provides LocalTextStyle.current.copy(color = currentColor)) { CompositionLocalProvider(
content() LocalIconTint provides currentColor,
} LocalTextStyle provides LocalTextStyle.current.copy(color = currentColor)
) { content() }
} }
} }

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

@@ -683,8 +683,10 @@ private fun TextFieldDecorationBox(
val animatedAlpha by animateFloatAsState(if (value.isNotEmpty()) 0f else 1f) val animatedAlpha by animateFloatAsState(if (value.isNotEmpty()) 0f else 1f)
Box(modifier = Modifier.alpha(animatedAlpha)) { Box(modifier = Modifier.alpha(animatedAlpha)) {
CompositionLocalProvider( CompositionLocalProvider(
LocalTextStyle provides LocalTextStyle.current.copy(color = placeholderContentColor) LocalIconTint provides placeholderContentColor,
) { placeholder() } LocalTextStyle provides LocalTextStyle.current.copy(color = placeholderContentColor),
content = placeholder
)
} }
innerTextField() innerTextField()
} }