update color conversion from color to hex to have alpha

SmartToolFactory · SmartToolFactory · commit d71ccdc0ce5c · 2022-04-14T13:32:08.000+03:00
diff --git a/app/src/main/java/com/smarttoolfactory/composecolorpicker/demo/ColorPickerDemo.kt b/app/src/main/java/com/smarttoolfactory/composecolorpicker/demo/ColorPickerDemo.kt
@@ -17,7 +17,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.smarttoolfactory.colorpicker.dialog.*
-import com.smarttoolfactory.colorpicker.util.colorToHex
+import com.smarttoolfactory.colorpicker.util.colorToHexAlpha
 import com.smarttoolfactory.colorpicker.widget.ColorDisplayRoundedRect
 import com.smarttoolfactory.composecolorpicker.ui.theme.backgroundColor
 
@@ -40,7 +40,7 @@ fun ColorPickerDemo() {
             mutableStateOf(previousColor.copy())
         }
 
-        var hexString by remember { mutableStateOf(colorToHex(color)) }
+        var hexString by remember { mutableStateOf(colorToHexAlpha(color)) }
 
         Spacer(modifier = Modifier.height(30.dp))
         ColorDisplayRoundedRect(
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/dialog/ColorPickerDialog.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/dialog/ColorPickerDialog.kt
@@ -20,7 +20,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import com.smarttoolfactory.colorpicker.picker.*
 import com.smarttoolfactory.colorpicker.ui.Blue400
-import com.smarttoolfactory.colorpicker.util.colorToHex
+import com.smarttoolfactory.colorpicker.util.colorToHexAlpha
 
 @Composable
 fun ColorPickerRingDiamondHSLDialog(
@@ -35,7 +35,7 @@ fun ColorPickerRingDiamondHSLDialog(
 ) {
 
     var color by remember { mutableStateOf(initialColor.copy()) }
-    var hexString by remember { mutableStateOf(colorToHex(color)) }
+    var hexString by remember { mutableStateOf(colorToHexAlpha(color)) }
 
     Dialog(
         onDismissRequest = {
@@ -91,7 +91,7 @@ fun ColorPickerRingDiamondHEXDialog(
 ) {
 
     var color by remember { mutableStateOf(initialColor.copy()) }
-    var hexString by remember { mutableStateOf(colorToHex(color)) }
+    var hexString by remember { mutableStateOf(colorToHexAlpha(color)) }
 
     Dialog(
         onDismissRequest = {
@@ -147,7 +147,7 @@ fun ColorPickerRingRectHSLDialog(
 ) {
 
     var color by remember { mutableStateOf(initialColor.copy()) }
-    var hexString by remember { mutableStateOf(colorToHex(color)) }
+    var hexString by remember { mutableStateOf(colorToHexAlpha(color)) }
 
     Dialog(
         onDismissRequest = {
@@ -202,7 +202,7 @@ fun ColorPickerRingRectHSVDialog(
 ) {
 
     var color by remember { mutableStateOf(initialColor.copy()) }
-    var hexString by remember { mutableStateOf(colorToHex(color)) }
+    var hexString by remember { mutableStateOf(colorToHexAlpha(color)) }
 
     Dialog(
         onDismissRequest = {
@@ -255,7 +255,7 @@ fun ColorPickerRingHexHSVDialog(
 ) {
 
     var color by remember { mutableStateOf(initialColor.copy()) }
-    var hexString by remember { mutableStateOf(colorToHex(color)) }
+    var hexString by remember { mutableStateOf(colorToHexAlpha(color)) }
 
     Dialog(
         onDismissRequest = {
@@ -293,7 +293,7 @@ fun ColorPickerCircleHSVDialog(
 ) {
 
     var color by remember { mutableStateOf(initialColor.copy()) }
-    var hexString by remember { mutableStateOf(colorToHex(color)) }
+    var hexString by remember { mutableStateOf(colorToHexAlpha(color)) }
 
     Dialog(
         onDismissRequest = {
@@ -331,7 +331,7 @@ fun ColorPickerSVRectHSVDialog(
 ) {
 
     var color by remember { mutableStateOf(initialColor.copy()) }
-    var hexString by remember { mutableStateOf(colorToHex(color)) }
+    var hexString by remember { mutableStateOf(colorToHexAlpha(color)) }
 
     Dialog(
         onDismissRequest = {
@@ -367,7 +367,7 @@ fun ColorPickerSLRectHSLDialog(
 ) {
 
     var color by remember { mutableStateOf(initialColor.copy()) }
-    var hexString by remember { mutableStateOf(colorToHex(color)) }
+    var hexString by remember { mutableStateOf(colorToHexAlpha(color)) }
 
     Dialog(
         onDismissRequest = {
@@ -403,7 +403,7 @@ fun ColorPickerHSRectHSVDialog(
 ) {
 
     var color by remember { mutableStateOf(initialColor.copy()) }
-    var hexString by remember { mutableStateOf(colorToHex(color)) }
+    var hexString by remember { mutableStateOf(colorToHexAlpha(color)) }
 
     Dialog(
         onDismissRequest = {
@@ -439,7 +439,7 @@ fun ColorPickerHVRectHSVDialog(
 ) {
 
     var color by remember { mutableStateOf(initialColor.copy()) }
-    var hexString by remember { mutableStateOf(colorToHex(color)) }
+    var hexString by remember { mutableStateOf(colorToHexAlpha(color)) }
 
     Dialog(
         onDismissRequest = {
@@ -475,7 +475,7 @@ fun ColorPickerHSRectHSLDialog(
 ) {
 
     var color by remember { mutableStateOf(initialColor.copy()) }
-    var hexString by remember { mutableStateOf(colorToHex(color)) }
+    var hexString by remember { mutableStateOf(colorToHexAlpha(color)) }
 
     Dialog(
         onDismissRequest = {
@@ -511,7 +511,7 @@ fun ColorPickerHLRectHSLDialog(
 ) {
 
     var color by remember { mutableStateOf(initialColor.copy()) }
-    var hexString by remember { mutableStateOf(colorToHex(color)) }
+    var hexString by remember { mutableStateOf(colorToHexAlpha(color)) }
 
     Dialog(
         onDismissRequest = {
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerCircleValueHSV.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerCircleValueHSV.kt
@@ -12,7 +12,7 @@ import com.smarttoolfactory.colorpicker.model.ColorModel
 import com.smarttoolfactory.colorpicker.selector.SelectorCircleHueSaturationHSV
 import com.smarttoolfactory.colorpicker.slider.SliderCircleColorDisplayValueHSV
 import com.smarttoolfactory.colorpicker.util.colorToHSV
-import com.smarttoolfactory.colorpicker.util.colorToHex
+import com.smarttoolfactory.colorpicker.util.colorToHexAlpha
 import com.smarttoolfactory.colorpicker.widget.ColorDisplayExposedSelectionMenu
 
 /**
@@ -23,7 +23,7 @@ fun ColorPickerCircleValueHSV(
     modifier: Modifier = Modifier,
     selectionRadius: Dp = 8.dp,
     initialColor: Color,
-    onColorChange: (Color,String) -> Unit
+    onColorChange: (Color, String) -> Unit
 ) {
 
     val hsvArray = colorToHSV(initialColor)
@@ -38,7 +38,7 @@ fun ColorPickerCircleValueHSV(
 
     var colorModel by remember { mutableStateOf(ColorModel.HSV) }
 
-    onColorChange(currentColor, colorToHex(currentColor))
+    onColorChange(currentColor, colorToHexAlpha(currentColor))
 
     Column(
         modifier = modifier,
@@ -55,7 +55,7 @@ fun ColorPickerCircleValueHSV(
 
         }
 
-        Column(modifier=Modifier.padding(8.dp)) {
+        Column(modifier = Modifier.padding(8.dp)) {
             SliderCircleColorDisplayValueHSV(
                 hue = hue,
                 saturation = saturation,
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRectHueLightnessHSL.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRectHueLightnessHSL.kt
@@ -14,7 +14,7 @@ import com.smarttoolfactory.colorpicker.model.ColorModel
 import com.smarttoolfactory.colorpicker.selector.SelectorRectHueLightnessHSL
 import com.smarttoolfactory.colorpicker.slider.SliderCircleColorDisplaySaturationHSL
 import com.smarttoolfactory.colorpicker.util.colorToHSL
-import com.smarttoolfactory.colorpicker.util.colorToHex
+import com.smarttoolfactory.colorpicker.util.colorToHexAlpha
 import com.smarttoolfactory.colorpicker.widget.ColorDisplayExposedSelectionMenu
 
 @Composable
@@ -38,7 +38,7 @@ fun ColorPickerRectHueLightnessHSL(
     val currentColor =
         Color.hsl(hue = hue, saturation = saturation, lightness = lightness, alpha = alpha)
 
-    onColorChange(currentColor, colorToHex(currentColor))
+    onColorChange(currentColor, colorToHexAlpha(currentColor))
 
     Column(
         modifier = modifier,
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRectHueSaturationHSL.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRectHueSaturationHSL.kt
@@ -14,7 +14,7 @@ import com.smarttoolfactory.colorpicker.model.ColorModel
 import com.smarttoolfactory.colorpicker.selector.SelectorRectHueSaturationHSL
 import com.smarttoolfactory.colorpicker.slider.SliderCircleColorDisplayLightnessHSL
 import com.smarttoolfactory.colorpicker.util.colorToHSL
-import com.smarttoolfactory.colorpicker.util.colorToHex
+import com.smarttoolfactory.colorpicker.util.colorToHexAlpha
 import com.smarttoolfactory.colorpicker.widget.ColorDisplayExposedSelectionMenu
 
 @Composable
@@ -37,7 +37,7 @@ fun ColorPickerRectHueSaturationHSL(
     val currentColor =
         Color.hsl(hue = hue, saturation = saturation, lightness = lightness, alpha = alpha)
 
-    onColorChange(currentColor, colorToHex(currentColor))
+    onColorChange(currentColor, colorToHexAlpha(currentColor))
 
     Column(
         modifier = modifier,
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRectHueSaturationHSV.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRectHueSaturationHSV.kt
@@ -14,7 +14,7 @@ import com.smarttoolfactory.colorpicker.model.ColorModel
 import com.smarttoolfactory.colorpicker.selector.SelectorRectHueSaturationHSV
 import com.smarttoolfactory.colorpicker.slider.SliderCircleColorDisplayValueHSV
 import com.smarttoolfactory.colorpicker.util.colorToHSV
-import com.smarttoolfactory.colorpicker.util.colorToHex
+import com.smarttoolfactory.colorpicker.util.colorToHexAlpha
 import com.smarttoolfactory.colorpicker.widget.ColorDisplayExposedSelectionMenu
 
 @Composable
@@ -37,7 +37,7 @@ fun ColorPickerRectHueSaturationHSV(
 
     var colorModel by remember { mutableStateOf(ColorModel.HSV) }
 
-    onColorChange(currentColor, colorToHex(currentColor))
+    onColorChange(currentColor, colorToHexAlpha(currentColor))
 
     Column(
         modifier = modifier,
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRectHueValueHSV.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRectHueValueHSV.kt
@@ -14,7 +14,7 @@ import com.smarttoolfactory.colorpicker.model.ColorModel
 import com.smarttoolfactory.colorpicker.selector.SelectorRectHueValueHSV
 import com.smarttoolfactory.colorpicker.slider.SliderCircleColorDisplaySaturationHSV
 import com.smarttoolfactory.colorpicker.util.colorToHSV
-import com.smarttoolfactory.colorpicker.util.colorToHex
+import com.smarttoolfactory.colorpicker.util.colorToHexAlpha
 import com.smarttoolfactory.colorpicker.widget.ColorDisplayExposedSelectionMenu
 
 @Composable
@@ -37,7 +37,7 @@ fun ColorPickerRectHueValueHSV(
 
     var colorModel by remember { mutableStateOf(ColorModel.HSV) }
 
-    onColorChange(currentColor, colorToHex(currentColor))
+    onColorChange(currentColor, colorToHexAlpha(currentColor))
 
     Column(
         modifier = modifier,
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRectSaturationLightnessHSL.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRectSaturationLightnessHSL.kt
@@ -14,7 +14,7 @@ import com.smarttoolfactory.colorpicker.model.ColorModel
 import com.smarttoolfactory.colorpicker.selector.SelectorRectSaturationLightnessHSL
 import com.smarttoolfactory.colorpicker.slider.SliderCircleColorDisplayHueHSL
 import com.smarttoolfactory.colorpicker.util.colorToHSL
-import com.smarttoolfactory.colorpicker.util.colorToHex
+import com.smarttoolfactory.colorpicker.util.colorToHexAlpha
 import com.smarttoolfactory.colorpicker.widget.ColorDisplayExposedSelectionMenu
 
 @Composable
@@ -37,7 +37,7 @@ fun ColorPickerRectSaturationLightnessHSL(
     val currentColor =
         Color.hsl(hue = hue, saturation = saturation, lightness = lightness, alpha = alpha)
 
-    onColorChange(currentColor, colorToHex(currentColor))
+    onColorChange(currentColor, colorToHexAlpha(currentColor))
 
     Column(
         modifier = modifier,
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRectSaturationValueHSV.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRectSaturationValueHSV.kt
@@ -14,7 +14,7 @@ import com.smarttoolfactory.colorpicker.model.ColorModel
 import com.smarttoolfactory.colorpicker.selector.SelectorRectSaturationValueHSV
 import com.smarttoolfactory.colorpicker.slider.SliderCircleColorDisplayHueHSV
 import com.smarttoolfactory.colorpicker.util.colorToHSV
-import com.smarttoolfactory.colorpicker.util.colorToHex
+import com.smarttoolfactory.colorpicker.util.colorToHexAlpha
 import com.smarttoolfactory.colorpicker.widget.ColorDisplayExposedSelectionMenu
 
 @Composable
@@ -37,7 +37,7 @@ fun ColorPickerRectSaturationValueHSV(
 
     var colorModel by remember { mutableStateOf(ColorModel.HSV) }
 
-    onColorChange(currentColor, colorToHex(currentColor))
+    onColorChange(currentColor, colorToHexAlpha(currentColor))
 
     Column(
         modifier = modifier,
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRingDiamondHEX.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRingDiamondHEX.kt
@@ -16,7 +16,6 @@ import com.smarttoolfactory.colorpicker.slider.CompositeSliderPanel
 import com.smarttoolfactory.colorpicker.ui.Grey400
 import com.smarttoolfactory.colorpicker.ui.Grey600
 import com.smarttoolfactory.colorpicker.util.colorToHSL
-import com.smarttoolfactory.colorpicker.util.colorToHex
 import com.smarttoolfactory.colorpicker.util.colorToHexAlpha
 import com.smarttoolfactory.colorpicker.widget.ColorDisplayRoundedRect
 import com.smarttoolfactory.colorpicker.widget.ColorModelChangeTabRow
@@ -74,7 +73,7 @@ fun ColorPickerRingDiamondHEX(
         )
     }
 
-    onColorChange(currentColor, colorToHex(currentColor))
+    onColorChange(currentColor, colorToHexAlpha(currentColor))
 
     Column(
         modifier = modifier,
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRingDiamondHSL.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRingDiamondHSL.kt
@@ -13,7 +13,7 @@ import com.smarttoolfactory.colorpicker.selector.SelectorDiamondSaturationLightn
 import com.smarttoolfactory.colorpicker.selector.SelectorRingHue
 import com.smarttoolfactory.colorpicker.slider.CompositeSliderPanel
 import com.smarttoolfactory.colorpicker.util.colorToHSL
-import com.smarttoolfactory.colorpicker.util.colorToHex
+import com.smarttoolfactory.colorpicker.util.colorToHexAlpha
 import com.smarttoolfactory.colorpicker.widget.ColorDisplayRoundedRect
 import com.smarttoolfactory.colorpicker.widget.ColorModelChangeTabRow
 
@@ -61,7 +61,7 @@ fun ColorPickerRingDiamondHSL(
     val currentColor =
         Color.hsl(hue = hue, saturation = saturation, lightness = lightness, alpha = alpha)
 
-    onColorChange(currentColor, colorToHex(currentColor))
+    onColorChange(currentColor, colorToHexAlpha(currentColor))
 
     Column(
         modifier = modifier,
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRingHEX.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRingHEX.kt
@@ -11,7 +11,7 @@ import com.smarttoolfactory.colorpicker.selector.SelectorRectSaturationValueHSV
 import com.smarttoolfactory.colorpicker.selector.SelectorRingHue
 import com.smarttoolfactory.colorpicker.slider.CompositeSliderPanel
 import com.smarttoolfactory.colorpicker.util.colorToHSV
-import com.smarttoolfactory.colorpicker.util.colorToHex
+import com.smarttoolfactory.colorpicker.util.colorToHexAlpha
 import com.smarttoolfactory.colorpicker.widget.HexTextFieldWithCircleDisplay
 
 
@@ -47,7 +47,7 @@ fun ColorPickerRingRectHex(
         value = value
     )
 
-    onColorChange(currentColor, colorToHex(currentColor))
+    onColorChange(currentColor, colorToHexAlpha(currentColor))
 
     Column(
         modifier = modifier,
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRingRectHSL.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRingRectHSL.kt
@@ -14,7 +14,7 @@ import com.smarttoolfactory.colorpicker.selector.SelectorRectSaturationLightness
 import com.smarttoolfactory.colorpicker.selector.SelectorRingHue
 import com.smarttoolfactory.colorpicker.slider.CompositeSliderPanel
 import com.smarttoolfactory.colorpicker.util.colorToHSL
-import com.smarttoolfactory.colorpicker.util.colorToHex
+import com.smarttoolfactory.colorpicker.util.colorToHexAlpha
 import com.smarttoolfactory.colorpicker.widget.ColorDisplayRoundedRect
 import com.smarttoolfactory.colorpicker.widget.ColorModelChangeTabRow
 
@@ -61,7 +61,7 @@ fun ColorPickerRingRectHSL(
     val currentColor =
         Color.hsl(hue = hue, saturation = saturation, lightness = lightness, alpha = alpha)
 
-    onColorChange(currentColor, colorToHex(currentColor))
+    onColorChange(currentColor, colorToHexAlpha(currentColor))
 
     Column(
         modifier = modifier,
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRingRectHSV.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRingRectHSV.kt
@@ -13,7 +13,7 @@ import com.smarttoolfactory.colorpicker.selector.SelectorRectSaturationValueHSV
 import com.smarttoolfactory.colorpicker.selector.SelectorRingHue
 import com.smarttoolfactory.colorpicker.slider.CompositeSliderPanel
 import com.smarttoolfactory.colorpicker.util.colorToHSV
-import com.smarttoolfactory.colorpicker.util.colorToHex
+import com.smarttoolfactory.colorpicker.util.colorToHexAlpha
 import com.smarttoolfactory.colorpicker.widget.ColorDisplayRoundedRect
 import com.smarttoolfactory.colorpicker.widget.ColorModelChangeTabRow
 
@@ -60,7 +60,7 @@ fun ColorPickerRingRectHSV(
     val currentColor =
         Color.hsv(hue = hue, saturation = saturation, value = value, alpha = alpha)
 
-    onColorChange(currentColor, colorToHex(currentColor))
+    onColorChange(currentColor, colorToHexAlpha(currentColor))
 
     Column(
         modifier = modifier,
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/widget/HexTextFieldWithCircleDisplay.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/widget/HexTextFieldWithCircleDisplay.kt

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ import com.smarttoolfactory.colorpicker.slider.CompositeSliderPanel`
`16`	`16`	`import com.smarttoolfactory.colorpicker.ui.Grey400`
`17`	`17`	`import com.smarttoolfactory.colorpicker.ui.Grey600`
`18`	`18`	`import com.smarttoolfactory.colorpicker.util.colorToHSL`
`19`		`-import com.smarttoolfactory.colorpicker.util.colorToHex`
`20`	`19`	`import com.smarttoolfactory.colorpicker.util.colorToHexAlpha`
`21`	`20`	`import com.smarttoolfactory.colorpicker.widget.ColorDisplayRoundedRect`
`22`	`21`	`import com.smarttoolfactory.colorpicker.widget.ColorModelChangeTabRow`
`@@ -74,7 +73,7 @@ fun ColorPickerRingDiamondHEX(`
`74`	`73`	`)`
`75`	`74`	`}`
`76`	`75`
`77`		`- onColorChange(currentColor, colorToHex(currentColor))`
	`76`	`+ onColorChange(currentColor, colorToHexAlpha(currentColor))`
`78`	`77`
`79`	`78`	`Column(`
`80`	`79`	`modifier = modifier,`