change ColorBrush to SliderColorBrush

Author: SmartToolFactory

colorpicker/src/main/java/com/smarttoolfactory/colorpicker/selector/gradient/SliderWithPercent.kt

@@ -2,7 +2,6 @@ package com.smarttoolfactory.colorpicker.selector.gradient
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -13,7 +12,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.smarttoolfactory.colorpicker.ui.Grey400
 import com.smarttoolfactory.colorpicker.util.fractionToIntPercent
-import com.smarttoolfactory.slider.ColorBrush
+import com.smarttoolfactory.slider.SliderBrushColor
 import com.smarttoolfactory.slider.ColorfulSlider
 import com.smarttoolfactory.slider.MaterialSliderDefaults
 import com.smarttoolfactory.slider.ui.InactiveTrackColor
@@ -47,7 +46,7 @@ internal fun SliderWithPercent(
             thumbRadius = 10.dp,
             trackHeight = 8.dp,
             colors = MaterialSliderDefaults.materialColors(
-                inactiveTrackColor = ColorBrush(InactiveTrackColor)
+                inactiveTrackColor = SliderBrushColor(InactiveTrackColor)
             )
         )
         Spacer(modifier = Modifier.width(10.dp))

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

@@ -14,7 +14,7 @@ import androidx.compose.ui.unit.dp
 import com.smarttoolfactory.colorpicker.ui.brush.*
 import com.smarttoolfactory.colorpicker.util.roundToTwoDigits
 import com.smarttoolfactory.colorpicker.widget.drawChecker
-import com.smarttoolfactory.slider.ColorBrush
+import com.smarttoolfactory.slider.SliderBrushColor
 import com.smarttoolfactory.slider.ColorfulSlider
 import com.smarttoolfactory.slider.MaterialSliderDefaults
 
@@ -379,7 +379,7 @@ fun CheckeredColorfulSlider(
             valueRange = valueRange,
             coerceThumbInTrack = true,
             colors = MaterialSliderDefaults.materialColors(
-                activeTrackColor = ColorBrush(brush = brush),
+                activeTrackColor = SliderBrushColor(brush = brush),
             ),
             drawInactiveTrack = false
         )

slider/src/main/java/com/smarttoolfactory/slider/ColorfulSlider.kt

@@ -69,8 +69,8 @@ fun ColorfulSlider(
  * of steps between min and max values:
  *
  * Material Slider allows to choose height for track and thumb radius and selection between
- * [Color] or [Brush] using [ColorBrush]. If brush of [ColorBrush.brush] is not null gradient
- * provided in this [Brush] is used for drawing otherwise solid color [ColorBrush.solidColor] is used.
+ * [Color] or [Brush] using [SliderBrushColor]. If brush of [SliderBrushColor.brush] is not null gradient
+ * provided in this [Brush] is used for drawing otherwise solid color [SliderBrushColor.solidColor] is used.
  *
  * @param value current value of the Slider. If outside of [valueRange] provided, value will be
  * coerced to this range.
@@ -273,8 +273,8 @@ private fun SliderImpl(
  * If inactive track is to be drawn it's drawn between start and end of canvas. Active track
  * is drawn between start and current value.
  *
- * Drawing both tracks use [ColorBrush] to draw a nullable [Brush] first. If it's not then
- * [ColorBrush.solidColor] is used to draw with solid colors provided by [MaterialSliderColors]
+ * Drawing both tracks use [SliderBrushColor] to draw a nullable [Brush] first. If it's not then
+ * [SliderBrushColor.solidColor] is used to draw with solid colors provided by [MaterialSliderColors]
  */
 @Composable
 private fun Track(

slider/src/main/java/com/smarttoolfactory/slider/SliderColors.kt

@@ -17,7 +17,7 @@ import com.smarttoolfactory.slider.ui.ThumbColor
  * Data class that contains color or/and brush property for drawing track section of
  * [ColorfulSlider]
  */
-data class ColorBrush(
+data class SliderBrushColor(
     val color: Color = Color.Unspecified,
     val brush: Brush? = null
 ) {
@@ -92,68 +92,68 @@ object MaterialSliderDefaults {
         InActive Track
      */
     @Composable
-    private fun inactiveTrackSolidColor(color: ColorBrush) =
+    private fun inactiveTrackSolidColor(color: SliderBrushColor) =
         color.color.copy(alpha = InactiveTrackAlpha)
 
     @Composable
-    private fun disabledInactiveTrackSolidColor(color: ColorBrush) =
+    private fun disabledInactiveTrackSolidColor(color: SliderBrushColor) =
         color.color.copy(alpha = InactiveTrackAlpha)
 
 
     /*
         Tick
      */
     @Composable
-    private fun activeTickSolidColor(color: ColorBrush) =
+    private fun activeTickSolidColor(color: SliderBrushColor) =
         contentColorFor(color.color).copy(alpha = SliderDefaults.TickAlpha)
 
     @Composable
-    private fun inActiveTickSolidColor(color: ColorBrush) =
+    private fun inActiveTickSolidColor(color: SliderBrushColor) =
         color.color.copy(alpha = SliderDefaults.TickAlpha)
 
     @Composable
-    private fun disabledActiveTickSolidColor(color: ColorBrush) =
+    private fun disabledActiveTickSolidColor(color: SliderBrushColor) =
         color.color.copy(alpha = SliderDefaults.DisabledTickAlpha)
 
 
     @Composable
-    private fun disabledInactiveTickSolidColor(color: ColorBrush) =
+    private fun disabledInactiveTickSolidColor(color: SliderBrushColor) =
         color.color.copy(alpha = SliderDefaults.DisabledTickAlpha)
 
 
     /**
-     * [ColorfulSlider] [ColorBrush] with [MaterialTheme]'s default [Color]s.
+     * [ColorfulSlider] [SliderBrushColor] with [MaterialTheme]'s default [Color]s.
      */
     @Composable
     fun defaultColors(
-        thumbColor: ColorBrush = ColorBrush(
+        thumbColor: SliderBrushColor = SliderBrushColor(
             color = activeThumbSolidColor()
         ),
-        disabledThumbColor: ColorBrush = ColorBrush(
+        disabledThumbColor: SliderBrushColor = SliderBrushColor(
             color = disabledThumbSolidColor()
         ),
-        activeTrackColor: ColorBrush = ColorBrush(
+        activeTrackColor: SliderBrushColor = SliderBrushColor(
             color = activeTrackSolidColor()
         ),
-        disabledActiveTrackColor: ColorBrush = ColorBrush(
+        disabledActiveTrackColor: SliderBrushColor = SliderBrushColor(
             color = disabledActiveTrackSolidColor()
         ),
-        inactiveTrackColor: ColorBrush = ColorBrush(
+        inactiveTrackColor: SliderBrushColor = SliderBrushColor(
             color = inactiveTrackSolidColor(activeTrackColor)
         ),
-        disabledInactiveTrackColor: ColorBrush = ColorBrush(
+        disabledInactiveTrackColor: SliderBrushColor = SliderBrushColor(
             color = disabledInactiveTrackSolidColor(disabledActiveTrackColor)
         ),
-        activeTickColor: ColorBrush = ColorBrush(
+        activeTickColor: SliderBrushColor = SliderBrushColor(
             color = activeTickSolidColor(activeTrackColor)
         ),
-        inactiveTickColor: ColorBrush = ColorBrush(
+        inactiveTickColor: SliderBrushColor = SliderBrushColor(
             color = inActiveTickSolidColor(activeTrackColor)
         ),
-        disabledActiveTickColor: ColorBrush = ColorBrush(
+        disabledActiveTickColor: SliderBrushColor = SliderBrushColor(
             color = disabledActiveTickSolidColor(color = activeTickColor)
         ),
-        disabledInactiveTickColor: ColorBrush = ColorBrush(
+        disabledInactiveTickColor: SliderBrushColor = SliderBrushColor(
             color = disabledInactiveTickSolidColor(
                 color = disabledInactiveTrackColor
             )
@@ -175,39 +175,39 @@ object MaterialSliderDefaults {
     }
 
     /**
-     * [ColorfulSlider] [ColorBrush] set with blue, white and gray [Color] theme.
+     * [ColorfulSlider] [SliderBrushColor] set with blue, white and gray [Color] theme.
      */
     @Composable
     fun materialColors(
-        thumbColor: ColorBrush = ColorBrush(
+        thumbColor: SliderBrushColor = SliderBrushColor(
             color = ThumbColor
         ),
-        disabledThumbColor: ColorBrush = ColorBrush(
+        disabledThumbColor: SliderBrushColor = SliderBrushColor(
             color = disabledThumbSolidColor()
         ),
-        activeTrackColor: ColorBrush = ColorBrush(
+        activeTrackColor: SliderBrushColor = SliderBrushColor(
             color = ActiveTrackColor
         ),
-        disabledActiveTrackColor: ColorBrush = ColorBrush(
+        disabledActiveTrackColor: SliderBrushColor = SliderBrushColor(
             color = disabledActiveTrackSolidColor()
         ),
-        inactiveTrackColor: ColorBrush = ColorBrush(
+        inactiveTrackColor: SliderBrushColor = SliderBrushColor(
             color = inactiveTrackSolidColor(activeTrackColor)
         ),
-        disabledInactiveTrackColor: ColorBrush = ColorBrush(
+        disabledInactiveTrackColor: SliderBrushColor = SliderBrushColor(
             color = disabledActiveTrackColor.color.copy(alpha = DisabledInactiveTrackAlpha)
 
         ),
-        activeTickColor: ColorBrush = ColorBrush(
+        activeTickColor: SliderBrushColor = SliderBrushColor(
             color = activeTickSolidColor(activeTrackColor)
         ),
-        inactiveTickColor: ColorBrush = ColorBrush(
+        inactiveTickColor: SliderBrushColor = SliderBrushColor(
             color = inActiveTickSolidColor(activeTrackColor)
         ),
-        disabledActiveTickColor: ColorBrush = ColorBrush(
+        disabledActiveTickColor: SliderBrushColor = SliderBrushColor(
             color = disabledActiveTickSolidColor(activeTickColor)
         ),
-        disabledInactiveTickColor: ColorBrush = ColorBrush(
+        disabledInactiveTickColor: SliderBrushColor = SliderBrushColor(
             color = disabledInactiveTickSolidColor(disabledInactiveTrackColor)
         )
     ): MaterialSliderColors {
@@ -227,20 +227,20 @@ object MaterialSliderDefaults {
     }
 
     /**
-     * [ColorfulSlider] [ColorBrush] set with no predefined [Color]s.
+     * [ColorfulSlider] [SliderBrushColor] set with no predefined [Color]s.
      */
     @Composable
     fun customColors(
-        thumbColor: ColorBrush,
-        disabledThumbColor: ColorBrush,
-        activeTrackColor: ColorBrush,
-        disabledActiveTrackColor: ColorBrush,
-        inactiveTrackColor: ColorBrush,
-        disabledInactiveTrackColor: ColorBrush,
-        activeTickColor: ColorBrush,
-        inactiveTickColor: ColorBrush,
-        disabledActiveTickColor: ColorBrush,
-        disabledInactiveTickColor: ColorBrush
+        thumbColor: SliderBrushColor,
+        disabledThumbColor: SliderBrushColor,
+        activeTrackColor: SliderBrushColor,
+        disabledActiveTrackColor: SliderBrushColor,
+        inactiveTrackColor: SliderBrushColor,
+        disabledInactiveTrackColor: SliderBrushColor,
+        activeTickColor: SliderBrushColor,
+        inactiveTickColor: SliderBrushColor,
+        disabledActiveTickColor: SliderBrushColor,
+        disabledInactiveTickColor: SliderBrushColor
 
     ): MaterialSliderColors {
 
@@ -259,16 +259,16 @@ object MaterialSliderDefaults {
     }
 
     class DefaultMaterialSliderColors(
-        private val thumbColor: ColorBrush,
-        private val disabledThumbColor: ColorBrush,
-        private val activeTrackColor: ColorBrush,
-        private val disabledActiveTrackColor: ColorBrush,
-        private val inactiveTrackColor: ColorBrush,
-        private val disabledInactiveTrackColor: ColorBrush,
-        private val activeTickColor: ColorBrush = ColorBrush(),
-        private val inactiveTickColor: ColorBrush = ColorBrush(),
-        private val disabledActiveTickColor: ColorBrush = ColorBrush(),
-        private val disabledInactiveTickColor: ColorBrush = ColorBrush(),
+        private val thumbColor: SliderBrushColor,
+        private val disabledThumbColor: SliderBrushColor,
+        private val activeTrackColor: SliderBrushColor,
+        private val disabledActiveTrackColor: SliderBrushColor,
+        private val inactiveTrackColor: SliderBrushColor,
+        private val disabledInactiveTrackColor: SliderBrushColor,
+        private val activeTickColor: SliderBrushColor = SliderBrushColor(),
+        private val inactiveTickColor: SliderBrushColor = SliderBrushColor(),
+        private val disabledActiveTickColor: SliderBrushColor = SliderBrushColor(),
+        private val disabledInactiveTickColor: SliderBrushColor = SliderBrushColor(),
     ) : MaterialSliderColors {
 
         @Composable
@@ -361,14 +361,14 @@ object MaterialSliderDefaults {
 
 /**
  * Interface for providing thumb, track, and tick colors using [Brush]. When providing
- * a [Brush] initially a null check is done whether [ColorBrush.brush] is not null,
+ * a [Brush] initially a null check is done whether [SliderBrushColor.brush] is not null,
  * if it's not null gradient is drawn but when tis non-nullable color is used.
  */
 @Stable
 interface MaterialSliderColors {
 
     /**
-     * Represents the [ColorBrush] used for the sliders's thumb, depending on [enabled].
+     * Represents the [SliderBrushColor] used for the sliders's thumb, depending on [enabled].
      *
      * @param enabled whether the [Slider] is enabled or not
      */