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

refactor: specially function param names

Browse Source
This commit is contained in:
fankesyooni
2023-11-30 12:48:26 +08:00
parent 94a5eb53e0
commit 3ced4acbd3
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@ fun NavigationItem(
val currentContentShape = contentShape ?: LocalNavigationContentShape.current ?: Navigation.style.contentShape val currentContentShape = contentShape ?: LocalNavigationContentShape.current ?: Navigation.style.contentShape
val animatedIndicatorColor by animateColorAsState(if (selected) currentColors.indicatorColor else Color.Transparent) val animatedIndicatorColor by animateColorAsState(if (selected) currentColors.indicatorColor else Color.Transparent)
val animatedContentColor by animateColorAsState(if (selected) currentColors.selectedContentColor else currentColors.unselectedContentColor) val animatedContentColor by animateColorAsState(if (selected) currentColors.selectedContentColor else currentColors.unselectedContentColor)
val currentContentStyle = LocalTextStyle.current.copy(animatedContentColor) val currentContentStyle = LocalTextStyle.current.copy(color = animatedContentColor)
Box( Box(
modifier = Modifier.status(enabled) modifier = Modifier.status(enabled)
.clip(currentContentShape) .clip(currentContentShape)

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

@@ -210,7 +210,7 @@ fun Tab(
val currentContentPadding = contentPadding ?: LocalTabContentPadding.current ?: Tab.style.contentPadding val currentContentPadding = contentPadding ?: LocalTabContentPadding.current ?: Tab.style.contentPadding
val currentContentShape = contentShape ?: LocalTabContentShape.current ?: Tab.style.contentShape val currentContentShape = contentShape ?: LocalTabContentShape.current ?: Tab.style.contentShape
val contentColor by animateColorAsState(if (selected) currentSelectedContentColor else currentUnselectedContentColor) val contentColor by animateColorAsState(if (selected) currentSelectedContentColor else currentUnselectedContentColor)
val contentStyle = LocalTextStyle.current.copy(contentColor) val contentStyle = LocalTextStyle.current.copy(color = contentColor)
CompositionLocalProvider( CompositionLocalProvider(
LocalIconTint provides contentColor, LocalIconTint provides contentColor,
LocalTextStyle provides contentStyle LocalTextStyle provides contentStyle

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

@@ -683,7 +683,7 @@ 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(placeholderContentColor) LocalTextStyle provides LocalTextStyle.current.copy(color = placeholderContentColor)
) { placeholder() } ) { placeholder() }
} }
innerTextField() innerTextField()