alpha-slider tracker: contrast fixed.

Author: syslogic

library/src/main/java/io/syslogic/colorpicker/compose/AlphaPainter.kt

@@ -45,14 +45,26 @@ class AlphaPainter(intrinsicSize: Size) : BasePainter(intrinsicSize) {
 
             /* Horizontal Tracker */
             val p: Point = alphaToPoint(value)
+
+            /* Outer rectangle (dark) */
             drawRoundRect(
-                color = Color(trackerStrokeColor),
+                color = Color(trackerStrokeColorOuter),
                 size = Size(alphaTrackerWidth, rect.height()),
                 topLeft = Offset(p.x - (alphaTrackerWidth / 2), rect.top),
                 style = Stroke(width = trackerStrokeWidth,
                     pathEffect = PathEffect.cornerPathEffect(trackerCornerRadius)
                 )
             )
+
+            /* Inner rectangle (light) */
+            drawRoundRect(
+                color = Color(trackerStrokeColorInner),
+                size = Size(alphaTrackerWidth - 2, rect.height() - 2),
+                topLeft = Offset(p.x - (alphaTrackerWidth / 2) + 1, rect.top + 1),
+                style = Stroke(width = trackerStrokeWidth,
+                    pathEffect = PathEffect.cornerPathEffect(trackerCornerRadius)
+                )
+            )
         }
     }
 

library/src/main/java/io/syslogic/colorpicker/compose/BasePainter.kt

@@ -45,8 +45,11 @@ abstract class BasePainter(override val intrinsicSize: Size) : Painter() {
     /** Tracker Style: Stroke Width */
     var trackerStrokeWidth by Delegates.notNull<Float>()
 
-    /** Tracker Style: Stroke Color */
-    var trackerStrokeColor by Delegates.notNull<Int>()
+    /** Tracker Style: Outer Stroke Color */
+    var trackerStrokeColorOuter by Delegates.notNull<Int>()
+
+    /** Tracker Style: Inner Stroke Color */
+    var trackerStrokeColorInner by Delegates.notNull<Int>()
 
     /** Native Canvas */
     protected lateinit var canvas: NativeCanvas
@@ -67,7 +70,8 @@ abstract class BasePainter(override val intrinsicSize: Size) : Painter() {
         /* Tracker Styles */
         trackerCornerRadius = 2F * density
         trackerStrokeWidth = 1F * density
-        trackerStrokeColor = Color.Black.hashCode()
+        trackerStrokeColorOuter = Color.Black.hashCode()
+        trackerStrokeColorInner = Color.White.hashCode()
 
         /* Border Styles */
         borderCornerRadius = 2F

library/src/main/java/io/syslogic/colorpicker/compose/HuePainter.kt

@@ -47,7 +47,7 @@ class HuePainter(intrinsicSize: Size) : BasePainter(intrinsicSize) {
             val p: Point = hueToPoint(value)
             val offset = Offset(rect.left, p.y - (hueTrackerHeight / 2))
             drawRoundRect(
-                color = Color(trackerStrokeColor),
+                color = Color(trackerStrokeColorOuter),
                 size = Size(rect.width(), hueTrackerHeight),
                 topLeft = offset,
                 style = Stroke(width = trackerStrokeWidth,

library/src/main/java/io/syslogic/colorpicker/compose/SatValPainter.kt

@@ -67,11 +67,11 @@ class SatValPainter(intrinsicSize: Size) : BasePainter(intrinsicSize) {
         tracker.isAntiAlias = true
 
         /* Outer circle (dark) */
-        tracker.color = trackerStrokeColor
+        tracker.color = trackerStrokeColorOuter
         canvas.drawCircle(p.x.toFloat(), p.y.toFloat(), satValTrackerRadius1, tracker)
 
         /* Inner circle (light) */
-        tracker.color = Color.White.hashCode()
+        tracker.color = trackerStrokeColorInner
         canvas.drawCircle(p.x.toFloat(), p.y.toFloat(), satValTrackerRadius2, tracker)
     }