refactor

Author: SmartToolFactory

README.md

@@ -4,9 +4,9 @@ Colorful sliders that can have Solid or Gradient colors for thumb or track which
 track with varying sizes, borders with solid or gradient colors. And Sliders with emojis, or custom
 Composables like **Icon**.
 
-|Dimensions |  Properties | Slider with Icon | Slider with Label | Gradient |
+|Properties | Dimensions  | Slider with Icon | Slider with Label | Gradient |
 | ----------|-----------| -----------| -----------| -----------|
-| <img src="./screenshots/slider_dimensions.png"/> | <img src="./screenshots/slider_properties.png"/> | <img src="./screenshots/slider_icons.png"/> |  <img src="./screenshots/slider_labels.png"/> | <img src="./screenshots/slider_gradient.png"/> |
+| <img src="./screenshots/slider_properties.png"/> | <img src="./screenshots/slider_dimensions.png"/> | <img src="./screenshots/slider_icons.png"/> |  <img src="./screenshots/slider_labels.png"/> | <img src="./screenshots/slider_gradient.png"/> |
 
 ### ColorfulSlider
 
@@ -198,6 +198,7 @@ fun ColorfulIconSlider(
 
 Usage
 
+Emojis are transparent by default in Compose, you might want to set non-transparent color for `Text`
 ```
 ColorfulIconSlider(
     value = progress,

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

@@ -144,7 +144,8 @@ fun ColorfulIconSlider(
                 minWidth = ThumbRadius * 2,
                 minHeight = ThumbRadius * 2,
             ),
-        thumb = { thumb() }) { thumbSize: IntSize, constraints: Constraints ->
+        thumb = { thumb() }
+    ) { thumbSize: IntSize, constraints: Constraints ->
 
         require(steps >= 0) { "steps should be >= 0" }
         val onValueChangeState = rememberUpdatedState(onValueChange)
@@ -465,12 +466,11 @@ private fun SliderComposeLayout(
             it.measure(constraints)
         }.first()
 
-
         val sliderWidth = sliderPlaceable.width
         val sliderHeight = sliderPlaceable.height
 
         layout(sliderWidth, sliderHeight) {
             sliderPlaceable.placeRelative(0, 0)
         }
     }
-}
+}

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

@@ -446,7 +446,7 @@ private fun Track(
                         pointMode = PointMode.Points,
                         brush = if (outsideFraction) inactiveTickColor
                         else activeTickColor,
-                        strokeRadius.coerceAtMost(thumbRadius / 2),
+                        strokeWidth = strokeRadius.coerceAtMost(thumbRadius / 2),
                         cap = StrokeCap.Round
                     )
                 }

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

@@ -7,21 +7,21 @@ package com.smarttoolfactory.slider
  * @param end of interval
  * @param amount e closed unit interval [0, 1]
  */
-fun lerp(start: Float, end: Float, amount: Float): Float {
+internal fun lerp(start: Float, end: Float, amount: Float): Float {
     return (1 - amount) * start + amount * (end - start)
 }
 
 /**
  * Scale x1 from start1..end1 range to start2..end2 range
 
  */
-fun scale(start1: Float, end1: Float, pos: Float, start2: Float, end2: Float) =
+internal fun scale(start1: Float, end1: Float, pos: Float, start2: Float, end2: Float) =
     lerp(start2, end2, calculateFraction(start1, end1, pos))
 
 /**
  * Scale x.start, x.endInclusive from a1..b1 range to a2..b2 range
  */
-fun scale(
+internal fun scale(
     start1: Float,
     end1: Float,
     range: ClosedFloatingPointRange<Float>,

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

@@ -16,7 +16,7 @@ import kotlin.math.roundToInt
 
 @OptIn(ExperimentalMaterialApi::class)
 @Suppress("ModifierInspectorInfo")
-fun Modifier.minimumTouchTargetSize(): Modifier = composed(
+internal fun Modifier.minimumTouchTargetSize(): Modifier = composed(
     inspectorInfo = debugInspectorInfo {
         name = "minimumTouchTargetSize"