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

refactor: remove content in Switch

Browse Source
This commit is contained in:
fankesyooni
2024-01-10 14:56:46 +08:00
parent f42c5e0c35
commit 33cd648c78
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,6 @@ import androidx.compose.foundation.interaction.collectIsHoveredAsState
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
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.Spacer
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
@@ -110,7 +109,6 @@ data class SwitchStyle(
* @param style the style of switch, default is [SwitchDefaults.style]. * @param style the style of switch, default is [SwitchDefaults.style].
* @param enabled the enabled state of switch, default is true. * @param enabled the enabled state of switch, default is true.
* @param interactionSource the interaction source of switch. * @param interactionSource the interaction source of switch.
* @param content the content of the [RowScope] to be applied to the [Switch], should typically be [Text].
*/ */
@Composable @Composable
fun Switch( fun Switch(
@@ -120,8 +118,7 @@ fun Switch(
colors: SwitchColors = SwitchDefaults.colors(), colors: SwitchColors = SwitchDefaults.colors(),
style: SwitchStyle = SwitchDefaults.style(), style: SwitchStyle = SwitchDefaults.style(),
enabled: Boolean = true, enabled: Boolean = true,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }
content: @Composable (RowScope.() -> Unit)? = null
) { ) {
val thumbDiameter = style.thumbRadius * 2 val thumbDiameter = style.thumbRadius * 2
val maxOffsetX = with(LocalDensity.current) { (style.trackWidth - thumbDiameter - style.padding.horizontal).toPx() } val maxOffsetX = with(LocalDensity.current) { (style.trackWidth - thumbDiameter - style.padding.horizontal).toPx() }
@@ -209,15 +206,7 @@ fun Switch(
) )
) )
} }
Row(modifier = Modifier.componentState(enabled).then(modifier)) { Box(modifier = Modifier.componentState(enabled).then(modifier)) { Track { Thumb() } }
content?.also { content ->
Row(modifier = Modifier.clickable(enabled = enabled) { onCheckedChange(!checked) }) {
content()
Spacer(modifier = Modifier.padding(start = style.contentSpacing))
}
}
Track { Thumb() }
}
} }
/** /**