add currentValue to ProgressBarVM

Author: mikhailChelbaev

Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/ProgressBarPreview.swift

@@ -4,10 +4,9 @@ import UIKit
 
 struct ProgressBarPreview: View {
   @State private var model = Self.initialModel
-  @State private var currentValue: CGFloat = Self.initialValue
-
-  private let progressBar = UKProgressBar(initialValue: Self.initialValue, model: Self.initialModel)
-
+  
+  private let progressBar = UKProgressBar(model: Self.initialModel)
+  
   private let timer = Timer
     .publish(every: 0.5, on: .main, in: .common)
     .autoconnect()
@@ -18,15 +17,14 @@ struct ProgressBarPreview: View {
         self.progressBar
           .preview
           .onAppear {
-            self.progressBar.currentValue = self.currentValue
             self.progressBar.model = Self.initialModel
           }
           .onChange(of: self.model) { newValue in
             self.progressBar.model = newValue
           }
       }
       PreviewWrapper(title: "SwiftUI") {
-        SUProgressBar(currentValue: self.currentValue, model: self.model)
+        SUProgressBar(model: self.model)
       }
       Form {
         ComponentColorPicker(selection: self.$model.color)
@@ -42,25 +40,20 @@ struct ProgressBarPreview: View {
       }
     }
     .onReceive(self.timer) { _ in
-      if self.currentValue < self.model.maxValue {
+      if self.model.currentValue < self.model.maxValue {
         let step = (self.model.maxValue - self.model.minValue) / 100
-        self.currentValue = min(
+        self.model.currentValue = min(
           self.model.maxValue,
-          self.currentValue + CGFloat(Int.random(in: 1...20)) * step
+          self.model.currentValue + CGFloat(Int.random(in: 1...20)) * step
         )
       } else {
-        self.currentValue = self.model.minValue
+        self.model.currentValue = self.model.minValue
       }
-      
-      self.progressBar.currentValue = self.currentValue
     }
   }
 
   // MARK: - Helpers
 
-  private static var initialValue: Double {
-    return 0.0
-  }
   private static var initialModel: ProgressBarVM {
     return .init()
   }

Sources/ComponentsKit/Components/ProgressBar/Models/ProgressBarVM.swift

@@ -7,26 +7,29 @@ public struct ProgressBarVM: ComponentVM {
   /// Defaults to `.accent`.
   public var color: ComponentColor = .accent
 
-  /// The visual style of the progress bar component.
-  ///
-  /// Defaults to `.striped`.
-  public var style: Style = .striped
-
-  /// The size of the progress bar.
+  /// The corner radius of the progress bar.
   ///
   /// Defaults to `.medium`.
-  public var size: ComponentSize = .medium
+  public var cornerRadius: ComponentRadius = .medium
 
-  /// The minimum value of the progress bar.
-  public var minValue: CGFloat = 0
+  /// The current value of the progress bar.
+  public var currentValue: CGFloat = 0
 
   /// The maximum value of the progress bar.
   public var maxValue: CGFloat = 100
 
-  /// The corner radius of the progress bar.
+  /// The minimum value of the progress bar.
+  public var minValue: CGFloat = 0
+
+  /// The size of the progress bar.
   ///
   /// Defaults to `.medium`.
-  public var cornerRadius: ComponentRadius = .medium
+  public var size: ComponentSize = .medium
+
+  /// The visual style of the progress bar component.
+  ///
+  /// Defaults to `.striped`.
+  public var style: Style = .striped
 
   /// Initializes a new instance of `ProgressBarVM` with default values.
   public init() {}
@@ -139,6 +142,13 @@ extension ProgressBarVM {
 }
 
 extension ProgressBarVM {
+  var progress: CGFloat {
+    let range = self.maxValue - self.minValue
+    guard range > 0 else { return 0 }
+    let normalized = (self.currentValue - self.minValue) / range
+    return max(0, min(1, normalized))
+  }
+
   func progress(for currentValue: CGFloat) -> CGFloat {
     let range = self.maxValue - self.minValue
     guard range > 0 else { return 0 }

Sources/ComponentsKit/Components/ProgressBar/SUProgressBar.swift

@@ -1,16 +1,16 @@
 import SwiftUI
 
-/// A SwiftUI component that displays a progress bar.
+/// A SwiftUI component that visually represents the progress of a task or process using a horizontal bar.
 public struct SUProgressBar: View {
   // MARK: - Properties
 
   /// A model that defines the appearance properties.
   public var model: ProgressBarVM
   /// The current progress value.
-  public var currentValue: CGFloat
+  public var currentValue: CGFloat?
 
   private var progress: CGFloat {
-    self.model.progress(for: self.currentValue)
+    self.currentValue.map { self.model.progress(for: $0) } ?? self.model.progress
   }
 
   // MARK: - Initializer
@@ -19,6 +19,7 @@ public struct SUProgressBar: View {
   /// - Parameters:
   ///   - currentValue: The current progress value.
   ///   - model: A model that defines the appearance properties.
+  @available(*, deprecated, message: "Set `currentValue` in the model instead.")
   public init(
     currentValue: CGFloat,
     model: ProgressBarVM = .init()
@@ -27,6 +28,15 @@ public struct SUProgressBar: View {
     self.model = model
   }
 
+  /// Initializer.
+  /// - Parameters:
+  ///   - model: A model that defines the appearance properties.
+  public init(
+    model: ProgressBarVM = .init()
+  ) {
+    self.model = model
+  }
+
   // MARK: - Body
 
   public var body: some View {

Sources/ComponentsKit/Components/ProgressBar/UKProgressBar.swift

@@ -1,9 +1,9 @@
 import AutoLayout
 import UIKit
 
-/// A UIKit component that displays a progress bar.
+/// A UIKit component that visually represents the progress of a task or process using a horizontal bar.
 open class UKProgressBar: UIView, UKComponent {
-  // MARK: - Properties
+  // MARK: - Public Properties
 
   /// A model that defines the appearance properties.
   public var model: ProgressBarVM {
@@ -13,7 +13,7 @@ open class UKProgressBar: UIView, UKComponent {
   }
 
   /// The current progress value for the progress bar.
-  public var currentValue: CGFloat {
+  public var currentValue: CGFloat? {
     didSet {
       self.updateProgressWidthAndAppearance()
     }
@@ -39,7 +39,7 @@ open class UKProgressBar: UIView, UKComponent {
   // MARK: - Private Properties
 
   private var progress: CGFloat {
-    self.model.progress(for: self.currentValue)
+    self.currentValue.map { self.model.progress(for: $0) } ?? self.model.progress
   }
 
   // MARK: - UIView Properties
@@ -54,6 +54,7 @@ open class UKProgressBar: UIView, UKComponent {
   /// - Parameters:
   ///   - initialValue: The initial progress value. Defaults to `0`.
   ///   - model: A model that defines the appearance properties.
+  @available(*, deprecated, message: "Set `currentValue` in the model instead.")
   public init(
     initialValue: CGFloat = 0,
     model: ProgressBarVM = .init()
@@ -67,6 +68,18 @@ open class UKProgressBar: UIView, UKComponent {
     self.layout()
   }
 
+  /// Initializer.
+  /// - Parameters:
+  ///   - model: A model that defines the appearance properties.
+  public init(model: ProgressBarVM = .init()) {
+    self.model = model
+    super.init(frame: .zero)
+
+    self.setup()
+    self.style()
+    self.layout()
+  }
+
   public required init?(coder: NSCoder) {
     fatalError("init(coder:) has not been implemented")
   }
@@ -138,9 +151,9 @@ open class UKProgressBar: UIView, UKComponent {
       self.setNeedsLayout()
     }
 
-    UIView.performWithoutAnimation {
+//    UIView.performWithoutAnimation {
       self.updateProgressWidthAndAppearance()
-    }
+//    }
   }
 
   private func updateProgressWidthAndAppearance() {