border fixed; second circle added for contrast.

Author: syslogic

build.gradle

@@ -11,8 +11,8 @@ buildscript {
         kotlin_version = '1.7.0'
         compose_compiler_version = '1.2.0'
         compose_version = '1.2.0-rc01'
-        version_name = '1.0.9'
-        version_code = 9
+        version_name = '1.1.0'
+        version_code = 10
     }
 }
 

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

@@ -21,8 +21,8 @@ class AlphaPainter(intrinsicSize: Size) : BasePainter(intrinsicSize) {
     private var value: Float = 1.0F
 
     /**
-     * Implementation of drawing logic for instances of [Painter]. This is invoked
-     * internally within [draw] after the positioning and configuring the [Painter]
+     * Implementation of drawing logic for instances of [Painter].
+     * This is invoked internally within [draw] after the positioning and configuring the [Painter].
      */
     override fun DrawScope.onDraw() {
 
@@ -39,7 +39,7 @@ class AlphaPainter(intrinsicSize: Size) : BasePainter(intrinsicSize) {
             drawRect(
                 size = size,
                 color = Color(borderStrokeColor),
-                topLeft = Offset(rect.left, rect.top),
+                topLeft = Offset(outline.left, outline.top),
                 style = Stroke(width = borderStrokeWidth,
                     pathEffect = PathEffect.cornerPathEffect(borderCornerRadius)
                 )

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

@@ -5,6 +5,7 @@ import android.graphics.Rect
 import android.graphics.RectF
 
 import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.NativeCanvas
 import androidx.compose.ui.graphics.drawscope.DrawContext
 import androidx.compose.ui.graphics.nativeCanvas
@@ -29,7 +30,8 @@ abstract class BasePainter(override val intrinsicSize: Size) : Painter() {
     var borderStrokeColor by Delegates.notNull<Int>()
 
     /** Tracker Dimension: Sat/Val Tracker Radius */
-    var satValTrackerRadius by Delegates.notNull<Float>()
+    var satValTrackerRadius1 by Delegates.notNull<Float>()
+    var satValTrackerRadius2 by Delegates.notNull<Float>()
 
     /** Tracker Dimension: Alpha Tracker Width */
     var alphaTrackerWidth by Delegates.notNull<Float>()
@@ -50,35 +52,43 @@ abstract class BasePainter(override val intrinsicSize: Size) : Painter() {
     protected lateinit var canvas: NativeCanvas
 
     /** Boundaries */
+    protected lateinit var outline: RectF
     protected lateinit var rect: RectF
 
     /** Being called by all implementations onDraw. */
     fun setCanvas(drawContext: DrawContext, density: Float) {
 
         /* Tracker Dimensions */
-        satValTrackerRadius = 8F * density
+        satValTrackerRadius1 = 9F * density
+        satValTrackerRadius2 = 8F * density
         alphaTrackerWidth = 4F * density
         hueTrackerHeight = 4F * density
 
         /* Tracker Styles */
         trackerCornerRadius = 2F * density
         trackerStrokeWidth = 1F * density
-        trackerStrokeColor = -0xe3e3e4
+        trackerStrokeColor = Color.Black.hashCode()
 
         /* Border Styles */
-        borderCornerRadius = 2F * density
-        borderStrokeWidth = 2F * density
-        borderStrokeColor = -0x919192
+        borderCornerRadius = 2F
+        borderStrokeWidth = 2F
+        borderStrokeColor = Color.DarkGray.hashCode()
 
         /* Native Canvas */
         canvas = drawContext.canvas.nativeCanvas
         val bounds: Rect = canvas.clipBounds
-        rect = RectF(
+        outline = RectF(
             bounds.left.toFloat(),
             bounds.top.toFloat(),
             bounds.right.toFloat(),
             bounds.bottom.toFloat()
         )
+        rect = RectF(
+            bounds.left.toFloat() + borderStrokeWidth,
+            bounds.top.toFloat() + borderStrokeWidth,
+            bounds.right.toFloat() - borderStrokeWidth,
+            bounds.bottom.toFloat() - borderStrokeWidth
+        )
     }
 
     /**

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

@@ -18,8 +18,8 @@ class ColorPainter(intrinsicSize: Size) : BasePainter(intrinsicSize) {
     private var value: Color = Color.Transparent
 
     /**
-     * Implementation of drawing logic for instances of [Painter]. This is invoked
-     * internally within [draw] after the positioning and configuring the [Painter]
+     * Implementation of drawing logic for instances of [Painter].
+     * This is invoked internally within [draw] after the positioning and configuring the [Painter].
      */
     override fun DrawScope.onDraw() {
         setCanvas(drawContext, density)
@@ -32,7 +32,7 @@ class ColorPainter(intrinsicSize: Size) : BasePainter(intrinsicSize) {
             drawRect(
                 size = size,
                 color = Color(borderStrokeColor),
-                topLeft = Offset(rect.left, rect.top),
+                topLeft = Offset(outline.left, outline.top),
                 style = Stroke(width = borderStrokeWidth,
                     pathEffect = PathEffect.cornerPathEffect(borderCornerRadius)
                 )

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

@@ -21,8 +21,8 @@ class HuePainter(intrinsicSize: Size) : BasePainter(intrinsicSize) {
     private var value: Float = 360f
 
     /**
-     * Implementation of drawing logic for instances of [Painter]. This is invoked
-     * internally within [draw] after the positioning and configuring the [Painter]
+     * Implementation of drawing logic for instances of [Painter].
+     * This is invoked internally within [draw] after the positioning and configuring the [Painter].
      */
     override fun DrawScope.onDraw() {
         setCanvas(drawContext, density)
@@ -37,7 +37,7 @@ class HuePainter(intrinsicSize: Size) : BasePainter(intrinsicSize) {
             drawRect(
                 size = size,
                 color = Color(borderStrokeColor),
-                topLeft = Offset(rect.left, rect.top),
+                topLeft = Offset(outline.left, outline.top),
                 style = Stroke(width = borderStrokeWidth,
                     pathEffect = PathEffect.cornerPathEffect(borderCornerRadius)
                 )
@@ -62,7 +62,7 @@ class HuePainter(intrinsicSize: Size) : BasePainter(intrinsicSize) {
         val list: MutableList<Color> = MutableList(360) { Color.Black }
         while (i < list.size) {
             val value = (list.size - i).toFloat()
-            list[i] = Color(android.graphics.Color.HSVToColor(255, floatArrayOf(value, 1f, 1f)))
+            list[i] = Color(android.graphics.Color.HSVToColor(255, floatArrayOf(value, 1F, 1F)))
             i++
         }
         return list

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

@@ -30,7 +30,7 @@ class SatValPainter(intrinsicSize: Size) : BasePainter(intrinsicSize) {
 
         /* Saturation Shader with Alpha */
         val alpha: Int = getAlpha().times(255).toInt()
-        val color: Int = HSVToColor(alpha, floatArrayOf(getHue(), 1.0F, 1.0F))
+        val color: Int = HSVToColor(alpha, floatArrayOf(getHue(), 1F, 1F))
         val mSaturationShader = LinearGradientShader (
             from = Offset(rect.right, rect.top),
             to = Offset(rect.left,  rect.top),
@@ -47,27 +47,31 @@ class SatValPainter(intrinsicSize: Size) : BasePainter(intrinsicSize) {
         )
 
         /* Compose Shader */
-        val compose = Paint()
-        compose.shader = ComposeShader(mContrastShader, mSaturationShader, PorterDuff.Mode.MULTIPLY)
-        canvas.drawRect(rect, compose)
+        val composition = Paint()
+        composition.shader = ComposeShader(mContrastShader, mSaturationShader, PorterDuff.Mode.MULTIPLY)
+        canvas.drawRect(rect, composition)
 
         /* Borderline */
         val border = Paint()
         border.style = Paint.Style.STROKE
         border.strokeWidth = borderStrokeWidth
         border.color = borderStrokeColor
-        canvas.drawRect(rect, border)
+        canvas.drawRect(outline, border)
 
-        /* Tracker Paint */
+        /* Tracker */
+        val p: Point = satValToPoint(getSat(), getValue())
         val tracker = Paint()
         tracker.style = Paint.Style.STROKE
         tracker.strokeWidth = trackerStrokeWidth
-        tracker.color = trackerStrokeColor
         tracker.isAntiAlias = true
 
-        /* Circular Tracker */
-        val p: Point = satValToPoint(getSat(), getValue())
-        canvas.drawCircle(p.x.toFloat(), p.y.toFloat(), satValTrackerRadius, tracker)
+        /* Outer circle */
+        tracker.color = trackerStrokeColor
+        canvas.drawCircle(p.x.toFloat(), p.y.toFloat(), satValTrackerRadius1, tracker)
+
+        /* Inner circle */
+        tracker.color = Color.White.hashCode()
+        canvas.drawCircle(p.x.toFloat(), p.y.toFloat(), satValTrackerRadius2, tracker)
     }
 
     private fun getAlpha() : Float {