initializing the values differently.

Author: syslogic

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

@@ -1,6 +1,8 @@
 package io.syslogic.colorpicker.compose
 
 import android.content.Context
+import android.graphics.Color.HSVToColor
+import android.graphics.Color.RGBToHSV
 import android.graphics.RectF
 import android.widget.Toast
 
@@ -43,20 +45,20 @@ fun ColorPickerComponent(
     initialColor: Color = Color.Transparent,
     onColorChanged: OnColorChangedListener?,
     showAlpha: Boolean = true,
-    showARGB: Boolean = true,
     showHSV: Boolean = true,
+    showARGB: Boolean = true,
     showHex: Boolean = true
 ) {
 
     val context = LocalContext.current
     val rowPadding = dimensionResource(R.dimen.compose_row_padding)
     val listener: OnColorChangedListener? = onColorChanged
 
-    var currentColor: Int by remember { mutableStateOf(initialColor.hashCode()) }
-    var currentAlpha: Float by remember { mutableStateOf(.5F) }
-    var currentSat: Float by remember { mutableStateOf(.5F) }
-    var currentVal: Float by remember { mutableStateOf(.5F) }
-    var currentHue: Float by remember { mutableStateOf(180F) }
+    var currentColor: Int by remember { mutableStateOf( getColorValue(initialColor) ) }
+    var currentAlpha: Float by remember { mutableStateOf( getAlphaValue(initialColor) ) }
+    var currentSat: Float by remember { mutableStateOf( getSatValue(initialColor) ) }
+    var currentVal: Float by remember { mutableStateOf( getValValue(initialColor) ) }
+    var currentHue: Float by remember { mutableStateOf( getHueValue(initialColor) ) }
 
     var offsetSatVal by remember { mutableStateOf(Offset.Zero) }
     var sizeSatVal by remember { mutableStateOf(IntSize.Zero) }
@@ -224,9 +226,9 @@ fun ColorPickerComponent(
                 contentScale = ContentScale.FillBounds,
                 painter = SatValPainter(Size(900F, 900F)).also {
                     it.setAlpha(currentAlpha)
+                    it.setHue(currentHue)
                     it.setSat(currentSat)
                     it.setValue(currentVal)
-                    it.setHue(currentHue)
                 },
                 modifier = Modifier
                     .layoutId(SatVal)
@@ -433,7 +435,7 @@ fun onButtonClick(context: Context, layoutId: LayoutId, value: Int, listener: On
 
 fun toIntColor(alpha: Float, hue: Float, sat: Float, value: Float): Int {
     println("alpha: $alpha, hue: $hue, saturation: $sat, value: $value")
-    return android.graphics.Color.HSVToColor(
+    return HSVToColor(
         (alpha * 255).toInt(), floatArrayOf(hue, sat, value)
     )
 }
@@ -453,6 +455,32 @@ fun toARGB(color: Int): String {
     return String.format("#%s%s%s%s", alpha, red, green, blue)
 }
 
+fun getColorValue(value: Color): Int {
+    return value.hashCode()
+}
+
+fun getAlphaValue(value: Color): Float {
+    return value.alpha
+}
+
+fun getHSV(value: Color): FloatArray {
+    val hsv = FloatArray(3)
+    RGBToHSV(value.red.times(255).toInt(), value.green.times(255).toInt(), value.blue.times(255).toInt(), hsv)
+    return hsv
+}
+
+fun getHueValue(value: Color): Float {
+    return getHSV(value)[0]
+}
+
+fun getSatValue(value: Color): Float {
+    return getHSV(value)[1]
+}
+
+fun getValValue(value: Color): Float {
+    return getHSV(value)[2]
+}
+
 /**
  * @param color the color value to convert.
  * @return channel integer value as String.

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

@@ -73,33 +73,26 @@ class SatValPainter(intrinsicSize: Size) : BasePainter(intrinsicSize) {
     private fun getAlpha() : Float {
         return this.value[0]
     }
-
     private fun getHue() : Float {
         return this.value[1]
     }
-
     private fun getSat() : Float {
         return this.value[2]
     }
-
     private fun getValue() : Float {
         return this.value[3]
     }
 
     fun setAlpha(value: Float) {
         this.value[0] = value
     }
-
     fun setHue(value: Float) {
         this.value[1] = value
     }
-
     fun setSat(value: Float) {
         this.value[2] = value
     }
-
     fun setValue(value: Float) {
         this.value[3] = value
     }
-
 }

mobile/src/main/java/io/syslogic/demo/colorpicker/activity/ComposeActivity.kt

@@ -23,8 +23,8 @@ class ComposeActivity : ComponentActivity(), OnColorChangedListener {
     private lateinit var prefs: SharedPreferences
 
     override fun onCreate(savedInstanceState: Bundle?) {
-
         super.onCreate(savedInstanceState)
+
         this.prefs = PreferenceManager.getDefaultSharedPreferences(this)
         val initialColor = prefs.getInt("color_code_01", 0xFF444444.toInt())
 
@@ -34,8 +34,8 @@ class ComposeActivity : ComponentActivity(), OnColorChangedListener {
                     onColorChanged = this@ComposeActivity,
                     initialColor = Color(initialColor),
                     showAlpha = true,
-                    showARGB = true,
                     showHSV = true,
+                    showARGB = true,
                     showHex = true
                 )
             }