From a01b8704153115b7406e673b14bbe6c519a9f71f Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Mon, 13 Nov 2023 02:55:15 +0800 Subject: [PATCH] refactor: replace size to diameter in RadioButton --- .../highcapable/flexiui/component/RadioButton.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/RadioButton.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/RadioButton.kt index 9020bfe..c8803ab 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/RadioButton.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/RadioButton.kt @@ -64,9 +64,9 @@ data class RadioButtonColors( @Immutable data class RadioButtonStyle( - val contentSize: Dp, + val contentDiameter: Dp, val contentShadowSize: Dp, - val strokeSize: Dp, + val strokeDiameter: Dp, val pressedGain: Float, val hoveredGain: Float, val shape: Shape, @@ -100,13 +100,13 @@ fun RadioButton( enabled = enabled, role = Role.RadioButton, onClick = onClick - ).size(style.strokeSize) + ).size(style.strokeDiameter) .scale(animatedStrokeScale) .background(animatedColor, style.shape), contentAlignment = Alignment.Center ) { Box( - modifier = Modifier.size(style.contentSize) + modifier = Modifier.size(style.contentDiameter) .scale(animatedContentScale) .shadow(animatedContentShadow, style.shape) .alpha(animatedContentAlpha) @@ -146,9 +146,9 @@ private fun defaultRadioButtonColors() = RadioButtonColors( @Composable @ReadOnlyComposable private fun defaultRadioButtonStyle() = RadioButtonStyle( - contentSize = DefaultContentSize, + contentDiameter = DefaultContentDiameter, contentShadowSize = DefaultContentShadowSize, - strokeSize = DefaultStrokeSize, + strokeDiameter = DefaultStrokeDiameter, pressedGain = DefaultPressedGain, hoveredGain = DefaultHoveredGain, shape = CircleShape, @@ -163,8 +163,8 @@ private fun defaultRadioButtonBorder() = BorderStroke(LocalSizes.current.borderS @ReadOnlyComposable private fun defaultRadioButtonContentSpacing() = LocalSizes.current.spacingSecondary -private val DefaultContentSize = 10.dp -private val DefaultStrokeSize = 20.dp +private val DefaultContentDiameter = 10.dp +private val DefaultStrokeDiameter = 20.dp private const val DefaultPressedGain = 0.9f private const val DefaultHoveredGain = 1.2f