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

fix: defaultIconButtonStyle -> rippleStyle use defaultIconButtonRippleStyle in Button

Browse Source
This commit is contained in:
fankesyooni
2023-12-02 12:09:04 +08:00
parent b8d57ad735
commit f9210fd4ef
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt
View File

@@ -241,22 +241,6 @@ private fun defaultButtonStyle() = ButtonStyle(
border = defaultButtonBorder() border = defaultButtonBorder()
) )
@Composable
@ReadOnlyComposable
private fun defaultIconButtonColors() = ButtonColors(
contentColor = LocalIconTint.current.orElse() ?: LocalColors.current.themePrimary,
backgroundColor = Color.Transparent
)
@Composable
@ReadOnlyComposable
private fun defaultIconButtonStyle() = ButtonStyle(
rippleStyle = defaultButtonRippleStyle(),
padding = PaddingValues(),
shape = LocalShapes.current.tertiary,
border = defaultButtonBorder()
)
@Composable @Composable
@ReadOnlyComposable @ReadOnlyComposable
private fun defaultButtonRippleStyle() = private fun defaultButtonRippleStyle() =
@@ -265,6 +249,26 @@ private fun defaultButtonRippleStyle() =
else -> LocalColors.current.foregroundSecondary else -> LocalColors.current.foregroundSecondary
}) })
@Composable
@ReadOnlyComposable
private fun defaultIconButtonColors() = ButtonColors(
contentColor = LocalIconTint.current.orElse() ?: LocalColors.current.themePrimary,
backgroundColor = Color.Transparent
)
@Composable
@ReadOnlyComposable
private fun defaultIconButtonStyle() = ButtonStyle(
rippleStyle = defaultIconButtonRippleStyle(),
padding = PaddingValues(),
shape = LocalShapes.current.tertiary,
border = defaultButtonBorder()
)
@Composable
@ReadOnlyComposable
private fun defaultIconButtonRippleStyle() = Interaction.rippleStyle.copy(bounded = false)
@Composable @Composable
@ReadOnlyComposable @ReadOnlyComposable
private fun defaultButtonBorder() = BorderStroke(LocalSizes.current.borderSizeTertiary, LocalColors.current.textPrimary) private fun defaultButtonBorder() = BorderStroke(LocalSizes.current.borderSizeTertiary, LocalColors.current.textPrimary)