some code cleanup.

Author: syslogic

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

@@ -87,10 +87,9 @@ abstract class BasePainter(override val intrinsicSize: Size) : Painter() {
      * @return the {@link Point} where AlphaPainter shall draw the tracker rectangle.
      */
     fun alphaToPoint(value: Float): Point {
-        return Point(
-            (value * rect.width()).toInt(),
-            rect.top.toInt()
-        )
+        val x: Int = (value * rect.width()).toInt()
+        val y: Int = rect.top.toInt()
+        return Point(x, y)
     }
 
     /**
@@ -99,10 +98,9 @@ abstract class BasePainter(override val intrinsicSize: Size) : Painter() {
      * @return the {@link Point} where HuePainter shall draw the tracker rectangle.
      */
     fun hueToPoint(value: Float): Point {
-        return Point(
-            rect.left.toInt(),
-            (rect.height() - value * rect.height() / 360f + rect.top).toInt()
-        )
+        val x: Int = rect.left.toInt()
+        val y: Int = (rect.height() - value * rect.height() / 360f + rect.top).toInt()
+        return Point(x, y)
     }
 
     /**
@@ -112,9 +110,8 @@ abstract class BasePainter(override val intrinsicSize: Size) : Painter() {
      * @return the Point where SatValPainter shall draw the tracker circle.
      */
     fun satValToPoint(saturation: Float, value: Float): Point {
-        return Point(
-            (saturation * rect.width() + rect.left).toInt(),
-            ((1f - value) * rect.height() + rect.top).toInt()
-        )
+        val x: Int = (saturation * rect.width() + rect.left).toInt()
+        val y: Int = ((1f - value) * rect.height() + rect.top).toInt()
+        return Point(x, y)
     }
 }

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

@@ -28,40 +28,34 @@ class SatValPainter(intrinsicSize: Size) : BasePainter(intrinsicSize) {
 
         setCanvas(drawContext, density)
 
-        /* Saturation Shader */
+        /* Saturation Shader with Alpha */
+        val alpha: Int = getAlpha().times(255).toInt()
+        val color: Int = HSVToColor(alpha, floatArrayOf(getHue(), 1.0F, 1.0F))
         val mSaturationShader = LinearGradientShader (
             from = Offset(rect.right, rect.top),
             to = Offset(rect.left,  rect.top),
             tileMode = TileMode.Clamp,
-            colors = listOf(
-                Color(color = HSVToColor(getAlpha().times(255).toInt(), floatArrayOf(getHue(), 1.0F, 1.0F))),
-                Color.White
-            )
+            colors = listOf(Color(color), Color.White)
         )
 
         /* Value Shader */
         val mContrastShader = LinearGradientShader(
             from = Offset(rect.left, rect.bottom),
             to = Offset(rect.left, rect.top),
             tileMode = TileMode.Clamp,
-            colors = listOf(
-                Color.Black,
-                Color.White
-            )
+            colors = listOf(Color.Black, Color.White)
         )
 
         /* Compose Shader */
-        val paint = Paint()
-        paint.shader = ComposeShader(mContrastShader, mSaturationShader, PorterDuff.Mode.MULTIPLY)
-        canvas.drawRect(rect, paint)
+        val compose = Paint()
+        compose.shader = ComposeShader(mContrastShader, mSaturationShader, PorterDuff.Mode.MULTIPLY)
+        canvas.drawRect(rect, compose)
 
-        /* Borderline Paint */
+        /* Borderline */
         val border = Paint()
         border.style = Paint.Style.STROKE
         border.strokeWidth = borderStrokeWidth
         border.color = borderStrokeColor
-
-        /* Borderline */
         canvas.drawRect(rect, border)
 
         /* Tracker Paint */
@@ -76,35 +70,36 @@ class SatValPainter(intrinsicSize: Size) : BasePainter(intrinsicSize) {
         canvas.drawCircle(p.x.toFloat(), p.y.toFloat(), satValTrackerRadius, tracker)
     }
 
-    private fun getHue() : Float {
+    private fun getAlpha() : Float {
         return this.value[0]
     }
 
-    private fun getSat() : Float {
+    private fun getHue() : Float {
         return this.value[1]
     }
 
-    private fun getValue() : Float {
+    private fun getSat() : Float {
         return this.value[2]
     }
 
-    private fun getAlpha() : Float {
+    private fun getValue() : Float {
         return this.value[3]
     }
 
-    fun setHue(value: Float) {
+    fun setAlpha(value: Float) {
         this.value[0] = value
     }
 
-    fun setSat(value: Float) {
+    fun setHue(value: Float) {
         this.value[1] = value
     }
 
-    fun setValue(value: Float) {
+    fun setSat(value: Float) {
         this.value[2] = value
     }
 
-    fun setAlpha(value: Float) {
+    fun setValue(value: Float) {
         this.value[3] = value
     }
+
 }