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

refactor: use standardization LocalShapes instead CircleShape

Browse Source
This commit is contained in:
fankesyooni
2023-11-27 05:39:11 +08:00
parent a9eed67f80
commit e784705750
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,6 @@ import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable
@@ -261,7 +260,7 @@ private fun defaultButtonStyle() = ButtonStyle(
@ReadOnlyComposable @ReadOnlyComposable
private fun defaultIconButtonStyle() = ButtonStyle( private fun defaultIconButtonStyle() = ButtonStyle(
padding = PaddingValues(), padding = PaddingValues(),
shape = CircleShape, shape = LocalShapes.current.tertiary,
border = defaultButtonBorder() border = defaultButtonBorder()
) )

4
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/RadioButton.kt
View File

@@ -35,7 +35,6 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable
import androidx.compose.runtime.ReadOnlyComposable import androidx.compose.runtime.ReadOnlyComposable
@@ -52,6 +51,7 @@ import androidx.compose.ui.semantics.Role
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalColors
import com.highcapable.flexiui.LocalShapes
import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.LocalSizes
import com.highcapable.flexiui.extension.status import com.highcapable.flexiui.extension.status
import com.highcapable.flexiui.interaction.clickable import com.highcapable.flexiui.interaction.clickable
@@ -153,7 +153,7 @@ private fun defaultRadioButtonStyle() = RadioButtonStyle(
strokeRadius = DefaultStrokeRadius, strokeRadius = DefaultStrokeRadius,
pressedGain = DefaultPressedGain, pressedGain = DefaultPressedGain,
hoveredGain = DefaultHoveredGain, hoveredGain = DefaultHoveredGain,
shape = CircleShape, shape = LocalShapes.current.tertiary,
border = defaultRadioButtonBorder() border = defaultRadioButtonBorder()
) )

5
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Slider.kt
View File

@@ -39,7 +39,6 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.CornerBasedShape import androidx.compose.foundation.shape.CornerBasedShape
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable
@@ -258,8 +257,8 @@ private fun defaultSliderStyle() = SliderStyle(
thumbRadius = DefaultThumbRadius, thumbRadius = DefaultThumbRadius,
thumbGain = DefaultThumbGain, thumbGain = DefaultThumbGain,
thumbShadowSize = DefaultThumbShadowSize, thumbShadowSize = DefaultThumbShadowSize,
thumbShape = CircleShape, thumbShape = LocalShapes.current.tertiary,
stepShape = CircleShape, stepShape = LocalShapes.current.tertiary,
trackShape = LocalShapes.current.primary, trackShape = LocalShapes.current.primary,
thumbBorder = defaultSliderBorder(), thumbBorder = defaultSliderBorder(),
stepBorder = defaultSliderBorder(), stepBorder = defaultSliderBorder(),

3
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Switch.kt
View File

@@ -38,7 +38,6 @@ import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable
import androidx.compose.runtime.ReadOnlyComposable import androidx.compose.runtime.ReadOnlyComposable
@@ -220,7 +219,7 @@ private fun defaultSwitchStyle() = SwitchStyle(
thumbRadius = DefaultThumbRadius, thumbRadius = DefaultThumbRadius,
thumbGain = DefaultThumbGain, thumbGain = DefaultThumbGain,
thumbShadowSize = DefaultThumbShadowSize, thumbShadowSize = DefaultThumbShadowSize,
thumbShape = CircleShape, thumbShape = LocalShapes.current.tertiary,
trackShape = LocalShapes.current.tertiary, trackShape = LocalShapes.current.tertiary,
thumbBorder = defaultSwitchBorder(), thumbBorder = defaultSwitchBorder(),
trackBorder = defaultSwitchBorder(), trackBorder = defaultSwitchBorder(),