fix gradient color picker update bug

Author: SmartToolFactory

app/src/main/java/com/smarttoolfactory/composecolorpicker/demo/ColorAndGradientPickerDemo.kt

@@ -3,6 +3,7 @@ package com.smarttoolfactory.composecolorpicker.demo
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.OutlinedButton
@@ -17,6 +18,7 @@ import com.smarttoolfactory.colorpicker.dialog.ColorPickerRingDiamondGradientHSL
 import com.smarttoolfactory.colorpicker.model.BrushColor
 import com.smarttoolfactory.colorpicker.model.GradientColorState
 import com.smarttoolfactory.colorpicker.model.rememberGradientColorState
+import com.smarttoolfactory.colorpicker.widget.drawChecker
 import com.smarttoolfactory.composecolorpicker.ui.theme.backgroundColor
 
 @Composable
@@ -44,17 +46,25 @@ fun ColorAndGradientPickerDemo() {
             mutableStateOf(previousBrushColor.copy())
         }
 
-
         Row {
             Box(
                 modifier = Modifier
                     .size(size)
-                    .background(previousBrushColor.activeBrush)
+                    .fillMaxHeight()
+                    .drawChecker(RoundedCornerShape(topStart = 8.dp, bottomStart = 8.dp))
+                    .background(
+                        previousBrushColor.activeBrush,
+                        shape = RoundedCornerShape(topStart = 8.dp, bottomStart = 8.dp)
+                    )
             )
             Box(
                 modifier = Modifier
                     .size(size)
-                    .background(currentBrushColor.activeBrush)
+                    .drawChecker(RoundedCornerShape(topEnd = 8.dp, bottomEnd = 8.dp))
+                    .background(
+                        currentBrushColor.activeBrush,
+                        shape = RoundedCornerShape(topEnd = 8.dp, bottomEnd = 8.dp)
+                    )
             )
         }
 

colorpicker/src/main/java/com/smarttoolfactory/colorpicker/dialog/GradientColorPickerDialog.kt

@@ -25,7 +25,7 @@ import com.smarttoolfactory.colorpicker.ui.Blue400
 @Composable
 fun ColorPickerRingDiamondGradientHSLDialog(
     initialBrushColor: BrushColor,
-    gradientColorState: GradientColorState= rememberGradientColorState(),
+    gradientColorState: GradientColorState = rememberGradientColorState(),
     ringOuterRadiusFraction: Float = .9f,
     ringInnerRadiusFraction: Float = .6f,
     ringBackgroundColor: Color = Color.Transparent,
@@ -35,34 +35,35 @@ fun ColorPickerRingDiamondGradientHSLDialog(
     onDismiss: (BrushColor) -> Unit
 ) {
 
-    var brushColor by remember(initialBrushColor) {
-        mutableStateOf(BrushColor(color = initialBrushColor.color.copy()))
-    }
+    var brushColor: BrushColor by remember { mutableStateOf(initialBrushColor.copy()) }
 
     Dialog(
         onDismissRequest = {
             onDismiss(brushColor)
         }
     ) {
         Column(horizontalAlignment = Alignment.CenterHorizontally) {
-
             ColorPickerRingDiamondGradientHSL(
                 modifier = Modifier
                     .fillMaxWidth()
                     .weight(1f)
                     .background(Color(0xcc212121), shape = RoundedCornerShape(5.dp))
                     .padding(horizontal = 10.dp, vertical = 2.dp),
-                initialColor = brushColor.color,
+                initialColor = initialBrushColor.color,
                 gradientColorState = gradientColorState,
                 ringOuterRadiusFraction = ringOuterRadiusFraction,
                 ringInnerRadiusFraction = ringInnerRadiusFraction,
                 ringBackgroundColor = ringBackgroundColor,
                 ringBorderStrokeColor = ringBorderStrokeColor,
                 ringBorderStrokeWidth = ringBorderStrokeWidth,
-                selectionRadius = selectionRadius
-            ) {
-                brushColor = it
-            }
+                selectionRadius = selectionRadius,
+                onColorChange = {
+                    brushColor = BrushColor(color = it)
+                },
+                onBrushColorChange = {
+                    brushColor = BrushColor(brush = it)
+                }
+            )
 
             FloatingActionButton(
                 onClick = { onDismiss(brushColor) },

colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/gradient/ColorPickerRingDimondGradientHSL.kt

@@ -6,6 +6,7 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -49,7 +50,8 @@ fun ColorPickerRingDiamondGradientHSL(
     ringBorderStrokeColor: Color = Color.Black,
     ringBorderStrokeWidth: Dp = 4.dp,
     selectionRadius: Dp = 8.dp,
-    onBrushColorChange: (BrushColor) -> Unit
+    onColorChange: (Color) -> Unit,
+    onBrushColorChange: (Brush) -> Unit
 ) {
 
     var inputColorModel by remember { mutableStateOf(ColorModel.HSL) }
@@ -64,6 +66,8 @@ fun ColorPickerRingDiamondGradientHSL(
 
     val currentColor =
         Color.hsl(hue = hue, saturation = saturation, lightness = lightness, alpha = alpha)
+    gradientColorState.color = currentColor
+    onColorChange(currentColor)
 
     Column(
         modifier = modifier,
@@ -152,9 +156,7 @@ fun ColorPickerRingDiamondGradientHSL(
                         color = currentColor,
                         gradientColorState = gradientColorState
                     ) {
-                        onBrushColorChange(
-                            BrushColor(brush = it)
-                        )
+                        onBrushColorChange(it)
                     }
                 }
             }
@@ -172,18 +174,6 @@ fun ColorPickerRingDiamondGradientHSL(
                             saturation = color.saturation
                             lightness = color.lightness
                             alpha = color.alpha
-
-                            gradientColorState.color = Color.hsl(
-                                hue = hue,
-                                saturation = saturation,
-                                lightness = lightness,
-                                alpha = alpha
-                            )
-
-                            onBrushColorChange(
-                                BrushColor(color = gradientColorState.color)
-                            )
-
                         }
                     },
                     showAlphaSlider = true,