library: Rollback some Card changes

Author: YuKongA

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Card.kt

@@ -4,6 +4,7 @@
 package top.yukonga.miuix.kmp.basic
 
 import androidx.compose.foundation.LocalIndication
+import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.awaitEachGesture
 import androidx.compose.foundation.gestures.awaitFirstDown
 import androidx.compose.foundation.gestures.detectTapGestures
@@ -12,21 +13,28 @@ import androidx.compose.foundation.hoverable
 import androidx.compose.foundation.indication
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.PressInteraction
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.takeOrElse
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.semantics.isTraversalGroup
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import top.yukonga.miuix.kmp.theme.LocalContentColor
 import top.yukonga.miuix.kmp.theme.MiuixTheme
 import top.yukonga.miuix.kmp.utils.PressFeedbackType
 import top.yukonga.miuix.kmp.utils.SmoothRoundedCornerShape
@@ -158,14 +166,23 @@ private fun BasicCard(
     content: @Composable () -> Unit,
 ) {
     val shape = remember(cornerRadius) { SmoothRoundedCornerShape(cornerRadius) }
+    val clipShape = remember(cornerRadius) { RoundedCornerShape(cornerRadius) }
 
-    Surface(
-        modifier = modifier,
-        color = colors.color,
-        shape = shape,
-        contentColor = colors.contentColor,
-        content = content
-    )
+    CompositionLocalProvider(
+        LocalContentColor provides colors.contentColor,
+    ) {
+        Box(
+            modifier = modifier
+                .semantics(mergeDescendants = false) {
+                    isTraversalGroup = true
+                }
+                .background(color = colors.color, shape = shape)
+                .clip(clipShape), // For touch feedback, there is a problem when using SmoothRoundedCornerShape.
+            propagateMinConstraints = true,
+        ) {
+            content()
+        }
+    }
 }
 
 object CardDefaults {

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/utils/SmoothRoundedCornerShape.kt

@@ -3,6 +3,7 @@
 
 package top.yukonga.miuix.kmp.utils
 
+import androidx.annotation.FloatRange
 import androidx.compose.foundation.shape.CornerBasedShape
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.ui.geometry.Size
@@ -11,7 +12,9 @@ import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.graphics.shapes.CornerRounding
+import androidx.graphics.shapes.Cubic
 import androidx.graphics.shapes.RoundedPolygon
+import kotlin.jvm.JvmOverloads
 
 /**
  * Creates a [Path] for a rectangle with smoothly rounded corners.
@@ -24,15 +27,14 @@ import androidx.graphics.shapes.RoundedPolygon
  * @param bottomRight The radius of the bottom-right corner.
  */
 fun Path.Companion.smoothRoundedRectangle(
-    smoothing: Float,
+    @FloatRange(from = 0.0, 1.0) smoothing: Float,
     size: Size,
     topLeft: Float,
     topRight: Float,
     bottomLeft: Float,
     bottomRight: Float
 ): Path {
     if (size.width <= 0f || size.height <= 0f) return Path()
-    val clampedSmoothing = smoothing.coerceIn(0f, 1f)
 
     return RoundedPolygon(
         vertices = floatArrayOf(
@@ -42,12 +44,12 @@ fun Path.Companion.smoothRoundedRectangle(
             0f, size.height
         ),
         perVertexRounding = listOf(
-            CornerRounding(radius = topLeft, smoothing = clampedSmoothing),
-            CornerRounding(radius = topRight, smoothing = clampedSmoothing),
-            CornerRounding(radius = bottomRight, smoothing = clampedSmoothing),
-            CornerRounding(radius = bottomLeft, smoothing = clampedSmoothing),
+            CornerRounding(radius = topLeft, smoothing = smoothing),
+            CornerRounding(radius = topRight, smoothing = smoothing),
+            CornerRounding(radius = bottomRight, smoothing = smoothing),
+            CornerRounding(radius = bottomLeft, smoothing = smoothing),
         )
-    ).toComposePath()
+    ).toPath()
 }
 
 /**
@@ -58,7 +60,7 @@ fun Path.Companion.smoothRoundedRectangle(
  */
 fun SmoothRoundedCornerShape(
     corner: Dp,
-    smoothing: Float = DefaultSmoothing
+    @FloatRange(from = 0.0, 1.0) smoothing: Float = DefaultSmoothing
 ): SmoothRoundedCornerShape = SmoothRoundedCornerShape(
     smoothing = smoothing,
     topStart = corner,
@@ -100,7 +102,7 @@ class SmoothRoundedCornerShape(
      * @param bottomStart The Dp value for the bottom-start corner.
      */
     constructor(
-        smoothing: Float = DefaultSmoothing,
+        @FloatRange(from = 0.0, 1.0) smoothing: Float = DefaultSmoothing,
         topStart: Dp,
         topEnd: Dp,
         bottomEnd: Dp,
@@ -152,26 +154,40 @@ class SmoothRoundedCornerShape(
 }
 
 /**
- * Converts a [RoundedPolygon] from the AndroidX graphics shapes library to a Jetpack Compose [Path].
+ * Gets a [Path] representation for a [RoundedPolygon] shape. Note that there is some rounding
+ * happening (to the nearest thousandth), to work around rendering artifacts introduced by some
+ * points being just slightly off from each other (far less than a pixel). This also allows for a
+ * more optimal path, as redundant curves (usually a single point) can be detected and not added to
+ * the resulting path.
  *
- * @param path An optional existing [Path] to reuse. If provided, it will be rewound and populated.
- *   Otherwise, a new [Path] will be created.
+ * @param path an optional [Path] object which, if supplied, will avoid the function having to
+ *   create a new [Path] object
  */
-fun RoundedPolygon.toComposePath(path: Path = Path()): Path {
-    path.rewind()
+@JvmOverloads
+fun RoundedPolygon.toPath(path: Path = Path()): Path {
+    pathFromCubics(path, cubics)
+    return path
+}
 
-    if (cubics.isEmpty()) return path
-    path.moveTo(cubics[0].anchor0X, cubics[0].anchor0Y)
-    for (cubic in cubics) {
+private fun pathFromCubics(path: Path, cubics: List<Cubic>) {
+    var first = true
+    path.rewind()
+    for (i in 0 until cubics.size) {
+        val cubic = cubics[i]
+        if (first) {
+            path.moveTo(cubic.anchor0X, cubic.anchor0Y)
+            first = false
+        }
         path.cubicTo(
-            cubic.control0X, cubic.control0Y,
-            cubic.control1X, cubic.control1Y,
-            cubic.anchor1X, cubic.anchor1Y
+            cubic.control0X,
+            cubic.control0Y,
+            cubic.control1X,
+            cubic.control1Y,
+            cubic.anchor1X,
+            cubic.anchor1Y
         )
     }
-
     path.close()
-    return path
 }
 
 /**