From f9210fd4effc53f5eb6a1d9dc5e1e09dbbbf4f36 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sat, 2 Dec 2023 12:09:04 +0800 Subject: [PATCH] fix: defaultIconButtonStyle -> rippleStyle use defaultIconButtonRippleStyle in Button --- .../highcapable/flexiui/component/Button.kt | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt index 6dc3c75..080a47e 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt @@ -241,22 +241,6 @@ private fun defaultButtonStyle() = ButtonStyle( 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 @ReadOnlyComposable private fun defaultButtonRippleStyle() = @@ -265,6 +249,26 @@ private fun defaultButtonRippleStyle() = 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 @ReadOnlyComposable private fun defaultButtonBorder() = BorderStroke(LocalSizes.current.borderSizeTertiary, LocalColors.current.textPrimary) \ No newline at end of file