From 82e7028458ba5fee7666bca20405b1d20e3f1de7 Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Fri, 10 Nov 2023 23:09:42 +0800
Subject: [PATCH] fix: no need alpha in inner box

---
 .../com/highcapable/flexiui/component/CheckBox.kt      |  9 ++++-----
 .../kotlin/com/highcapable/flexiui/component/Switch.kt | 10 +++-------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/CheckBox.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/CheckBox.kt
index f47a156..cc45dff 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/CheckBox.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/CheckBox.kt
@@ -47,6 +47,7 @@ import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.highcapable.flexiui.LocalColors
@@ -94,14 +95,12 @@ fun CheckBox(
     val animatedContentLayer by animateFloatAsState(if (checked) 1f else 0f)
     val sModifier = if (enabled) modifier else modifier.alpha(0.5f)
     Row(modifier = sModifier, verticalAlignment = Alignment.CenterVertically) {
-        val cModifier = if (enabled)
-            Modifier.clickable(
+        Box(
+            modifier = Modifier.clickable(
                 enabled = enabled,
                 interactionSource = interactionSource
             ) { onCheckedChange(!checked) }
-        else Modifier.alpha(0.5f)
-        Box(
-            modifier = cModifier.size(style.strokeSize)
+                .size(style.strokeSize)
                 .scale(animatedStrokeScale)
                 .background(animatedColor, style.shape)
                 .borderOrNot(style.border, style.shape),
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Switch.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Switch.kt
index f3b807d..79bf019 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Switch.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Switch.kt
@@ -119,8 +119,8 @@ fun Switch(
 
     @Composable
     fun Track(content: @Composable RowScope.() -> Unit) {
-        val cModifier = if (enabled)
-            Modifier.clickable(
+        Row(
+            modifier = Modifier.clickable(
                 interactionSource = interactionSource,
                 enabled = enabled,
                 role = Role.Switch
@@ -128,11 +128,7 @@ fun Switch(
                 distance = maxOffset
                 offsetX = if (checked) 0f else maxOffset
                 onCheckedChange(!checked)
-            }
-        else Modifier.alpha(0.5f)
-        Row(
-            modifier = cModifier
-                .background(if (efficientDragging) trackColor else animatedTrackColor, style.trackShape)
+            }.background(if (efficientDragging) trackColor else animatedTrackColor, style.trackShape)
                 .borderOrNot(style.trackBorder, style.trackShape)
                 .size(style.trackWidth, style.trackHeight)
                 .padding(start = padding, end = padding),