some fix

- layout extension fix
- deleted unused code
- deleted backgroundColor and barColor

Author: VislovIvan

Sources/ComponentsKit/Components/Slider/Models/SliderVM.swift

@@ -78,23 +78,7 @@ extension SliderVM {
     return 4
   }
   var handleOverlaySide: CGFloat {
-    12
-  }
-  var backgroundColor: UniversalColor {
-    switch style {
-    case .light:
-      return self.color.background
-    case .striped:
-      return self.color.main
-    }
-  }
-  var barColor: UniversalColor {
-    switch style {
-    case .light:
-      return self.color.main
-    case .striped:
-      return self.color.contrast
-    }
+    return 12
   }
   private func stripesCGPath(in rect: CGRect) -> CGMutablePath {
     let stripeWidth: CGFloat = 2
@@ -148,31 +132,24 @@ extension SliderVM {
   }
 }
 
-public extension SliderVM {
-  var sliderHeight: CGFloat {
-    self.trackHeight
-  }
-
+extension SliderVM {
   var containerHeight: CGFloat {
     max(self.handleSize.height, self.trackHeight)
   }
 
-  func leftWidth(for totalWidth: CGFloat, progress: CGFloat) -> CGFloat {
-    let sliderWidth = max(0, totalWidth - self.handleSize.width - 2 * self.trackSpacing)
-    return sliderWidth * progress
-  }
-
-  func rightWidth(for totalWidth: CGFloat, progress: CGFloat) -> CGFloat {
-    let sliderWidth = max(0, totalWidth - self.handleSize.width - 2 * self.trackSpacing)
-    return sliderWidth - self.leftWidth(for: totalWidth, progress: progress)
+  private func sliderWidth(for totalWidth: CGFloat) -> CGFloat {
+    max(0, totalWidth - self.handleSize.width - 2 * self.trackSpacing)
   }
 
   func barWidth(for totalWidth: CGFloat, progress: CGFloat) -> CGFloat {
-    self.leftWidth(for: totalWidth, progress: progress)
+    let width = self.sliderWidth(for: totalWidth)
+    return width * progress
   }
 
   func backgroundWidth(for totalWidth: CGFloat, progress: CGFloat) -> CGFloat {
-    self.rightWidth(for: totalWidth, progress: progress)
+    let width = self.sliderWidth(for: totalWidth)
+    let filled = width * progress
+    return width - filled
   }
 }
 

Sources/ComponentsKit/Components/Slider/SUSlider.swift

@@ -32,17 +32,14 @@ public struct SUSlider: View {
 
   public var body: some View {
     GeometryReader { geometry in
-      let containerHeight = self.model.containerHeight
-      let sliderHeight = self.model.sliderHeight
-
       let barWidth = self.model.barWidth(for: geometry.size.width, progress: self.progress)
       let backgroundWidth = self.model.backgroundWidth(for: geometry.size.width, progress: self.progress)
 
       HStack(spacing: self.model.trackSpacing) {
         // Progress segment
-        RoundedRectangle(cornerRadius: self.model.cornerRadius(for: sliderHeight))
+        RoundedRectangle(cornerRadius: self.model.cornerRadius(for: self.model.trackHeight))
           .foregroundStyle(self.model.color.main.color)
-          .frame(width: barWidth, height: sliderHeight)
+          .frame(width: barWidth, height: self.model.trackHeight)
 
         // Handle
         RoundedRectangle(cornerRadius: self.model.cornerRadius(for: self.model.handleSize.height))
@@ -75,23 +72,22 @@ public struct SUSlider: View {
         Group {
           switch self.model.style {
           case .light:
-            RoundedRectangle(cornerRadius: self.model.cornerRadius(for: sliderHeight))
-              .foregroundStyle(self.model.backgroundColor.color)
+            RoundedRectangle(cornerRadius: self.model.cornerRadius(for: self.model.trackHeight))
+              .foregroundStyle(self.model.color.background.color)
               .frame(width: backgroundWidth)
-
           case .striped:
             ZStack {
-              RoundedRectangle(cornerRadius: self.model.cornerRadius(for: sliderHeight))
+              RoundedRectangle(cornerRadius: self.model.cornerRadius(for: self.model.trackHeight))
                 .foregroundStyle(self.model.color.contrast.color)
 
               StripesShapeSlider(model: self.model)
                 .foregroundStyle(self.model.color.main.color)
-                .cornerRadius(self.model.cornerRadius(for: sliderHeight))
+                .cornerRadius(self.model.cornerRadius(for: self.model.trackHeight))
             }
             .frame(width: backgroundWidth)
           }
         }
-        .frame(height: sliderHeight)
+        .frame(height: self.model.trackHeight)
       }
     }
     .frame(height: self.model.containerHeight)