remove gradient picker and dialog from regular pickers

Author: SmartToolFactory

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

@@ -32,7 +32,7 @@ fun ColorPickerDemo() {
             )
         }
         var color by remember {
-            mutableStateOf(Color.hsl(0f, 0.5f, 0.5f))
+            mutableStateOf(previousColor.copy())
         }
 
         Spacer(modifier = Modifier.height(30.dp))
@@ -58,17 +58,6 @@ fun ColorPickerDemo() {
             }
         )
 
-        DialogRingGradientHSL(
-            modifier = buttonModifier,
-            color = color,
-            onPreviousColorChange = {
-                previousColor = it
-            },
-            onCurrentColorChange = {
-                color = it
-            }
-        )
-
         // Ring Hue, Rect Saturation-Value selector HSV Picker
         DialogRingHSV(
             modifier = buttonModifier,
@@ -193,37 +182,6 @@ private fun DialogRingHSL(
     }
 }
 
-@Composable
-private fun DialogRingGradientHSL(
-    modifier: Modifier,
-    color: Color,
-    onPreviousColorChange: (Color) -> Unit,
-    onCurrentColorChange: (Color) -> Unit,
-
-    ) {
-    var showDialog by remember { mutableStateOf(false) }
-
-    OutlinedButton(
-        modifier = modifier,
-        onClick = { showDialog = !showDialog },
-        colors = ButtonDefaults.outlinedButtonColors(
-            backgroundColor = Color.Transparent
-        )
-
-    ) {
-        Text(text = "Hue Ring-Diamond HSL Dialog")
-    }
-
-    if (showDialog) {
-        onPreviousColorChange(color.copy())
-
-        ColorPickerRingDiamondGradientHSLDialog(color) {
-            showDialog = !showDialog
-//            onCurrentColorChange(it)
-        }
-    }
-}
-
 @Composable
 private fun DialogRingHSV(
     modifier: Modifier,

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

@@ -18,61 +18,9 @@ import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
-import com.smarttoolfactory.colorpicker.model.BrushColor
 import com.smarttoolfactory.colorpicker.picker.*
 import com.smarttoolfactory.colorpicker.ui.Blue400
 
-@Composable
-fun ColorPickerRingDiamondGradientHSLDialog(
-    initialColor: Color,
-    ringOuterRadiusFraction: Float = .9f,
-    ringInnerRadiusFraction: Float = .6f,
-    ringBackgroundColor: Color = Color.Transparent,
-    ringBorderStrokeColor: Color = Color.Black,
-    ringBorderStrokeWidth: Dp = 4.dp,
-    selectionRadius: Dp = 8.dp,
-    onDismiss: (BrushColor) -> Unit
-) {
-
-    var color by remember { mutableStateOf(BrushColor(color = initialColor.copy())) }
-    Dialog(
-        onDismissRequest = {
-            onDismiss(color)
-        }
-    ) {
-        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 = initialColor,
-                ringOuterRadiusFraction = ringOuterRadiusFraction,
-                ringInnerRadiusFraction = ringInnerRadiusFraction,
-                ringBackgroundColor = ringBackgroundColor,
-                ringBorderStrokeColor = ringBorderStrokeColor,
-                ringBorderStrokeWidth = ringBorderStrokeWidth,
-                selectionRadius = selectionRadius
-            ) {
-                color = it
-            }
-
-            FloatingActionButton(
-                onClick = { onDismiss(color) },
-                backgroundColor = Color.Black
-            ) {
-                Icon(
-                    imageVector = Icons.Filled.Close,
-                    contentDescription = null,
-                    tint = Blue400
-                )
-            }
-        }
-    }
-}
-
 @Composable
 fun ColorPickerRingDiamondHSLDialog(
     initialColor: Color,