rename ColorGradient to GradientColorState

Author: SmartToolFactory

…ctory/colorpicker/model/GradientColor.kt …/colorpicker/model/GradientColorState.ktcolorpicker/src/main/java/com/smarttoolfactory/colorpicker/model/GradientColor.kt renamed to colorpicker/src/main/java/com/smarttoolfactory/colorpicker/model/GradientColorState.kt colorpicker/src/main/java/com/smarttoolfactory/colorpicker/model/GradientColor.kt renamed to colorpicker/src/main/java/com/smarttoolfactory/colorpicker/model/GradientColorState.kt

@@ -14,30 +14,37 @@ import com.smarttoolfactory.colorpicker.ui.GradientAngle
 import com.smarttoolfactory.colorpicker.ui.GradientOffset
 
 @Composable
-fun rememberGradientColor(dpSize: DpSize = DpSize.Zero): GradientColor {
+fun rememberGradientColorState(
+    color: Color = Color.Unspecified,
+    size: DpSize = DpSize.Zero
+): GradientColorState {
 
     val density = LocalDensity.current
 
     return remember {
 
-        val size = if (dpSize == DpSize.Zero) {
+        val sizePx = if (size == DpSize.Zero) {
             Size.Zero
         } else {
             with(density) {
                 Size(
-                    dpSize.width.toPx(),
-                    dpSize.height.toPx()
+                    size.width.toPx(),
+                    size.height.toPx()
                 )
             }
         }
-        GradientColor(size)
+        GradientColorState(color, sizePx)
     }
 }
 
-class GradientColor(size: Size) {
+class GradientColorState internal constructor(initialColor: Color, size: Size) {
 
     var size by mutableStateOf(size)
-    val brushColor: BrushColor
+
+    var color: Color = initialColor
+        internal set
+
+    val brush: Brush
         get() {
 
             val colorStops = if (colorStops.size == 1) {
@@ -71,8 +78,14 @@ class GradientColor(size: Size) {
                     ),
                 )
             }
-            return BrushColor(brush = brush)
+            return brush
+        }
+
+    val brushColor: BrushColor
+        get() {
+            return BrushColor(color = color, brush = brush)
         }
+
     var gradientType: GradientType by mutableStateOf(GradientType.Linear)
     var colorStops = mutableStateListOf(
         0.0f to Color.Red,

…cker/ColorPickerRingDimondGradientHSL.kt …ient/ColorPickerRingDimondGradientHSL.ktcolorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRingDimondGradientHSL.kt renamed to colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/gradient/ColorPickerRingDimondGradientHSL.kt colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/ColorPickerRingDimondGradientHSL.kt renamed to colorpicker/src/main/java/com/smarttoolfactory/colorpicker/picker/gradient/ColorPickerRingDimondGradientHSL.kt

@@ -1,6 +1,5 @@
-package com.smarttoolfactory.colorpicker.picker
+package com.smarttoolfactory.colorpicker.picker.gradient
 
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -10,19 +9,15 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.smarttoolfactory.colorpicker.model.BrushColor
-import com.smarttoolfactory.colorpicker.model.ColorHSL
-import com.smarttoolfactory.colorpicker.model.ColorModel
-import com.smarttoolfactory.colorpicker.model.rememberGradientColor
+import com.smarttoolfactory.colorpicker.model.*
 import com.smarttoolfactory.colorpicker.selector.SelectorDiamondSaturationLightnessHSL
 import com.smarttoolfactory.colorpicker.selector.SelectorRingHue
 import com.smarttoolfactory.colorpicker.selector.gradient.BrushDisplay
 import com.smarttoolfactory.colorpicker.selector.gradient.GradientSelector
 import com.smarttoolfactory.colorpicker.slider.CompositeSliderPanel
 import com.smarttoolfactory.colorpicker.util.colorToHSL
 import com.smarttoolfactory.colorpicker.widget.ColorDisplayRoundedRect
-import com.smarttoolfactory.colorpicker.widget.ColorModelChangeTabRow
-import com.smarttoolfactory.colorpicker.widget.ColorWheel
+import com.smarttoolfactory.colorpicker.widget.ColorGradientModeChangeTabRow
 
 /**
  * ColorPicker with [SelectorRingHue] hue selector and [SelectorDiamondSaturationLightnessHSL]
@@ -40,26 +35,25 @@ import com.smarttoolfactory.colorpicker.widget.ColorWheel
  * @param ringBorderStrokeColor stroke color for drawing borders around inner or outer radius.
  * @param ringBorderStrokeWidth stroke width of borders.
  * @param selectionRadius radius of white and black circle selector.
- * @param onColorChange callback that is triggered when [Color] is changed using [SelectorRingHue],
+ * @param onBrushColorChange callback that is triggered when [Color] is changed using [SelectorRingHue],
  * [SelectorDiamondSaturationLightnessHSL] or [CompositeSliderPanel]
  */
 @Composable
 fun ColorPickerRingDiamondGradientHSL(
     modifier: Modifier = Modifier,
     initialColor: Color,
+    gradientColorState: GradientColorState = rememberGradientColorState(),
     ringOuterRadiusFraction: Float = .9f,
     ringInnerRadiusFraction: Float = .6f,
     ringBackgroundColor: Color = Color.Black,
     ringBorderStrokeColor: Color = Color.Black,
     ringBorderStrokeWidth: Dp = 4.dp,
     selectionRadius: Dp = 8.dp,
-    onColorChange: (BrushColor) -> Unit
+    onBrushColorChange: (BrushColor) -> Unit
 ) {
 
-    val gradientColor = rememberGradientColor()
-    var isGradientMode by remember { mutableStateOf(false) }
-
     var inputColorModel by remember { mutableStateOf(ColorModel.HSL) }
+    var colorMode by remember { mutableStateOf(ColorMode.HSL) }
 
     val hslArray = colorToHSL(initialColor)
 
@@ -71,22 +65,18 @@ fun ColorPickerRingDiamondGradientHSL(
     val currentColor =
         Color.hsl(hue = hue, saturation = saturation, lightness = lightness, alpha = alpha)
 
-    gradientColor.brushColor.color = currentColor
-    onColorChange(gradientColor.brushColor)
-
     Column(
         modifier = modifier,
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
 
         Spacer(modifier = Modifier.height(10.dp))
 
-        // Initial and Current Colors
-        Box(modifier=Modifier.height(80.dp), contentAlignment = Alignment.Center) {
-            if (isGradientMode) {
-                BrushDisplay(gradientColor = gradientColor)
-            } else {
-                ColorDisplayRoundedRect(
+        // Initial-Current Colors/Gradient Color
+        Box(modifier = Modifier.height(80.dp), contentAlignment = Alignment.Center) {
+            when (colorMode) {
+                ColorMode.Gradient -> BrushDisplay(gradientColorState = gradientColorState)
+                else -> ColorDisplayRoundedRect(
                     modifier = Modifier
                         .fillMaxWidth()
                         .padding(horizontal = 50.dp, vertical = 10.dp),
@@ -125,59 +115,83 @@ fun ColorPickerRingDiamondGradientHSL(
             }
         }
 
-        // HSL-HSV-RGB Color Model Change Tabs
+        // HSL-HSV-RGB-Gradient Color Model Change Tabs
         Row(
             modifier = Modifier.fillMaxWidth(),
             verticalAlignment = Alignment.CenterVertically
         ) {
-            ColorModelChangeTabRow(
-                modifier = Modifier.weight(3f),
-                colorModel = inputColorModel,
-                onColorModelChange = {
-                    isGradientMode = false
-                    inputColorModel = it
+            ColorGradientModeChangeTabRow(
+                colorMode = colorMode,
+                onColorModeChange = {
+                    colorMode = it
+                    when (colorMode) {
+                        ColorMode.HSL -> {
+                            inputColorModel = ColorModel.HSL
+                        }
+                        ColorMode.HSV -> {
+                            inputColorModel = ColorModel.HSL
+                        }
+                        ColorMode.RGB -> {
+                            inputColorModel = ColorModel.RGB
+                        }
+                        else -> Unit
+                    }
                 }
             )
-
-            Column(modifier = Modifier.weight(1f)) {
-                ColorWheel(modifier = Modifier
-                    .size(16.dp)
-                    .clickable {
-                        isGradientMode = true
-                    })
-            }
         }
 
         // HSL-HSV-RGB Sliders
-        if (!isGradientMode) {
-            CompositeSliderPanel(
-                compositeColor = ColorHSL(
-                    hue = hue,
-                    saturation = saturation,
-                    lightness = lightness,
-                    alpha = alpha
-                ),
-                onColorChange = {
-                    (it as? ColorHSL)?.let { color ->
-                        hue = color.hue
-                        saturation = color.saturation
-                        lightness = color.lightness
-                        alpha = color.alpha
+        when (colorMode) {
+            ColorMode.Gradient -> {
+                Column(
+                    modifier = Modifier
+                        .fillMaxHeight()
+                        .verticalScroll(rememberScrollState())
+                ) {
+                    GradientSelector(
+                        color = currentColor,
+                        gradientColorState = gradientColorState
+                    ) {
+                        onBrushColorChange(
+                            BrushColor(brush = it)
+                        )
                     }
-                },
-                showAlphaSlider = true,
-                inputColorModel = inputColorModel,
-                outputColorModel = ColorModel.HSL
-            )
-
-        } else {
-            Column(
-                modifier = Modifier
-                    .fillMaxHeight()
-                    .verticalScroll(rememberScrollState())
-            ) {
-                GradientSelector(color = currentColor, gradientColor = gradientColor)
+                }
+            }
+            else -> {
+                CompositeSliderPanel(
+                    compositeColor = ColorHSL(
+                        hue = hue,
+                        saturation = saturation,
+                        lightness = lightness,
+                        alpha = alpha
+                    ),
+                    onColorChange = {
+                        (it as? ColorHSL)?.let { color ->
+                            hue = color.hue
+                            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,
+                    inputColorModel = inputColorModel,
+                    outputColorModel = ColorModel.HSL
+                )
             }
         }
+
     }
 }