code cleanup

Author: SmartToolFactory

colorpicker/src/main/java/com/smarttoolfactory/colorpicker/selector/SelectorRingHue.kt

@@ -16,6 +16,7 @@ import androidx.compose.ui.layout.*
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import com.smarttoolfactory.colorpicker.ui.gradientColorScaleHSV
 import com.smarttoolfactory.colorpicker.util.calculateAngleFomLocalCoordinates
 import com.smarttoolfactory.colorpicker.util.calculateDistanceFromCenter
 import com.smarttoolfactory.colorpicker.ui.gradientColorScaleRGB
@@ -148,7 +149,7 @@ private fun HueSelectorRingImpl(
 
         // Draw hue selection circle with sweep gradient
         drawCircle(
-            brush = Brush.sweepGradient(colors = gradientColorScaleRGB, center = center),
+            brush = Brush.sweepGradient(colors = gradientColorScaleHSV, center = center),
             radius = radiusInner + strokeWidth / 2,
             style = Stroke(
                 width = strokeWidth

colorpicker/src/main/java/com/smarttoolfactory/colorpicker/slider/SliderDisplay.kt

@@ -13,9 +13,9 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.smarttoolfactory.colorpicker.ui.Grey400
 import com.smarttoolfactory.colorpicker.util.fractionToPercent
 import com.smarttoolfactory.colorpicker.util.fractionToRGBString
-import com.smarttoolfactory.colorpicker.ui.Grey400
 
 /*
     HSV Slider Displays

colorpicker/src/main/java/com/smarttoolfactory/colorpicker/ui/Color.kt

@@ -14,6 +14,8 @@ val BlueGrey400 = Color(0xff78909C)
 val Grey400 = Color(0xffBDBDBD)
 
 val Grey600 = Color(0xff757575)
+val Grey800 = Color(0xff424242)
+val Grey900 = Color(0xff212121)
 
 val Gray = Color(0xff808080)
 val WhiteTransparent = Color(0x00ffffff)

colorpicker/src/main/java/com/smarttoolfactory/colorpicker/widget/ExposedSelectionMenu.kt

@@ -0,0 +1,77 @@
+package com.smarttoolfactory.colorpicker.widget
+
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+fun ExposedSelectionMenu(
+    modifier: Modifier = Modifier,
+    index: Int,
+    title: String? = null,
+    options: List<String>,
+    onSelected: (Int) -> Unit
+) {
+
+    var expanded by remember { mutableStateOf(false) }
+    var selectedOptionText by remember { mutableStateOf(options[index]) }
+
+    ExposedDropdownMenuBox(
+        modifier = modifier,
+        expanded = expanded,
+        onExpandedChange = {
+            expanded = !expanded
+        }
+    ) {
+        TextField(
+            modifier =modifier,
+            readOnly = true,
+            value = selectedOptionText,
+            onValueChange = { },
+            label = {
+                title?.let {
+                    Text(it)
+                }
+            },
+            trailingIcon = {
+                ExposedDropdownMenuDefaults.TrailingIcon(
+                    expanded = expanded
+                )
+            },
+            colors = ExposedDropdownMenuDefaults.textFieldColors(
+                backgroundColor = Color.White,
+                focusedIndicatorColor = Color.Transparent,
+                unfocusedIndicatorColor = Color.Transparent,
+                disabledIndicatorColor = Color.Transparent,
+            ),
+            textStyle = TextStyle(
+                fontWeight = FontWeight.W600,
+                fontSize = 14.sp
+            )
+        )
+        ExposedDropdownMenu(
+            expanded = expanded,
+            onDismissRequest = {
+                expanded = false
+
+            }
+        ) {
+            options.forEachIndexed { index: Int, selectionOption: String ->
+                DropdownMenuItem(
+                    onClick = {
+                        selectedOptionText = selectionOption
+                        expanded = false
+                        onSelected(index)
+                    }
+                ) {
+                    Text(text = selectionOption)
+                }
+            }
+        }
+    }
+}

colorpicker/src/main/java/com/smarttoolfactory/colorpicker/widget/HexDisplay.kt

@@ -153,66 +153,4 @@ private fun ColorText(modifier: Modifier = Modifier, title: String, value: Strin
         Spacer(modifier = Modifier.height(4.dp))
         Text(text = value, fontSize = 14.sp)
     }
-}
-
-@OptIn(ExperimentalMaterialApi::class)
-@Composable
-private fun ExposedSelectionMenu(
-    modifier: Modifier = Modifier,
-    index: Int,
-    options: List<String>,
-    onSelected: (Int) -> Unit
-) {
-
-    var expanded by remember { mutableStateOf(false) }
-    var selectedOptionText by remember { mutableStateOf(options[index]) }
-
-    ExposedDropdownMenuBox(
-        modifier = modifier,
-        expanded = expanded,
-        onExpandedChange = {
-            expanded = !expanded
-        }
-    ) {
-        TextField(
-            modifier = Modifier.wrapContentWidth(),
-            readOnly = true,
-            value = selectedOptionText,
-            onValueChange = { },
-            trailingIcon = {
-                ExposedDropdownMenuDefaults.TrailingIcon(
-                    expanded = expanded
-                )
-            },
-            colors = ExposedDropdownMenuDefaults.textFieldColors(
-                backgroundColor = Color.White,
-                focusedIndicatorColor = Color.Transparent,
-                unfocusedIndicatorColor = Color.Transparent,
-                disabledIndicatorColor = Color.Transparent,
-            ),
-            textStyle = TextStyle(
-                fontWeight = FontWeight.W600,
-                fontSize = 14.sp
-            )
-        )
-        ExposedDropdownMenu(
-            expanded = expanded,
-            onDismissRequest = {
-                expanded = false
-
-            }
-        ) {
-            options.forEachIndexed { index: Int, selectionOption: String ->
-                DropdownMenuItem(
-                    onClick = {
-                        selectedOptionText = selectionOption
-                        expanded = false
-                        onSelected(index)
-                    }
-                ) {
-                    Text(text = selectionOption)
-                }
-            }
-        }
-    }
-}
+}

slider/src/main/java/com/smarttoolfactory/slider/ui/Color.kt

@@ -5,23 +5,3 @@ import androidx.compose.ui.graphics.Color
 val ThumbColor = Color(0xfff0f0f0)
 val ActiveTrackColor = Color(0xff489cef)
 val InactiveTrackColor = Color(0xffcccccc)
-
-val gradientColors = listOf(
-    Color.Red,
-    Color.Magenta,
-    Color.Blue,
-    Color.Cyan,
-    Color.Green,
-    Color.Yellow,
-    Color.Red
-)
-
-val gradientColorsReversed = listOf(
-    Color.Red,
-    Color.Yellow,
-    Color.Green,
-    Color.Cyan,
-    Color.Blue,
-    Color.Magenta,
-    Color.Red
-)