update SliderState

Author: KamelMohamad

slider/src/main/java/io/monstarlab/mosaic/slider/SliderState.kt

@@ -63,13 +63,13 @@ public class SliderState(
      * Internal value returned as fraction, used for displaying and specifying
      * the "real" position of the thumb
      */
-    internal val valueAsFraction: Float
-        get() {
-            val inverted = valueDistribution.inverse(value)
-            val invertedRange = valueDistribution.inverse(range)
-            return calcFraction(invertedRange.start, invertedRange.endInclusive, inverted)
+    internal val offsetAsFraction: Float
+        get() = if (totalWidth == 0f) 0f else {
+            val valueFraction = value.valueToFraction(range)
+            valueDistribution.inverse(valueFraction)
         }
 
+
     internal val disabledRangeAsFractions: ClosedFloatingPointRange<Float>
         get() = coerceRangeIntoFractions(disabledRange)
 
@@ -115,25 +115,18 @@ public class SliderState(
      * Scales offset in to the value that user should see
      */
     private fun scaleToUserValue(offset: Float): Float {
-        val invertedRange = valueDistribution.inverse(range)
-        val value = scale(0f, totalWidth, offset, invertedRange.start, invertedRange.endInclusive)
-        return coerceValue(valueDistribution.interpolate(value))
+
+        val value = valueDistribution.interpolate(offset / totalWidth)
+            .fractionToValue(range)
+        return coerceValue(value)
     }
 
     /**
      * Converts value of the user into the raw offset on the track
      */
     private fun scaleToOffset(value: Float): Float {
-        val coerced = coerceValue(value)
-        val invertedRange = valueDistribution.inverse(range)
-        val invertedValue = valueDistribution.inverse(coerced)
-        return scale(
-            invertedRange.start,
-            invertedRange.endInclusive,
-            invertedValue,
-            0f,
-            totalWidth,
-        )
+        val valueAsFraction = coerceValue(value).valueToFraction(range)
+        return valueDistribution.inverse(valueAsFraction).fractionToValue(0f, totalWidth)
     }
 
     internal fun coerceValue(value: Float): Float {
@@ -156,17 +149,9 @@ public class SliderState(
         subrange: ClosedFloatingPointRange<Float>,
     ): ClosedFloatingPointRange<Float> {
         if (subrange.isEmpty()) return subrange
-        val interpolatedRange = valueDistribution.interpolate(range)
-        val interpolatedSubrange = valueDistribution.interpolate(subrange)
-        return calcFraction(
-            interpolatedRange.start,
-            interpolatedRange.endInclusive,
-            interpolatedSubrange.start,
-        )..calcFraction(
-            interpolatedRange.start,
-            interpolatedRange.endInclusive,
-            interpolatedSubrange.endInclusive,
-        )
+        val start = valueDistribution.inverse(subrange.start.valueToFraction(range))
+        val end = valueDistribution.inverse(subrange.endInclusive.valueToFraction(range))
+        return start..end
     }
 }