refactor: move a method for calculating time width to the model

Author: mikhailChelbaev

Sources/ComponentsKit/Countdown/Models/CountdownVM.swift

@@ -185,11 +185,30 @@ extension CountdownVM {
       return result
     }
   }
+}
 
+extension CountdownVM {
   func shouldRecalculateWidth(_ oldModel: Self) -> Bool {
     return self.unitsPosition != oldModel.unitsPosition
     || self.style != oldModel.style
     || self.preferredFont != oldModel.preferredFont
     || self.size != oldModel.size
+    || self.locale != oldModel.locale
+  }
+
+  func timeWidth(manager: CountdownManager) -> CGFloat {
+    let values: [(Int, CountdownHelpers.Unit)] = [
+      (manager.days, .days),
+      (manager.hours, .hours),
+      (manager.minutes, .minutes),
+      (manager.seconds, .seconds)
+    ]
+
+    let widths = values.map { value, unit -> CGFloat in
+      let attributedString = self.timeText(value: value, unit: unit)
+      return CountdownWidthCalculator.preferredWidth(for: attributedString, model: self)
+    }
+
+    return (widths.max() ?? self.defaultMinWidth) + self.horizontalPadding * 2
   }
 }

Sources/ComponentsKit/Countdown/SUCountdown.swift

@@ -55,22 +55,24 @@ public struct SUCountdown: View {
     }
     .onAppear {
       self.manager.start(until: self.model.until)
-      self.calculateWidth(model: self.model)
+      self.timeWidth = self.model.timeWidth(manager: self.manager)
     }
     .onChange(of: self.model.until) { newDate in
       self.manager.stop()
       self.manager.start(until: newDate)
     }
     .onChange(of: self.model) { newValue in
       if newValue.shouldRecalculateWidth(self.model) {
-        self.calculateWidth(model: newValue)
+        self.timeWidth = newValue.timeWidth(manager: self.manager)
       }
     }
     .onDisappear {
       self.manager.stop()
     }
   }
 
+  // MARK: - Subviews
+
   private func styledTime(
     value: Int,
     unit: CountdownHelpers.Unit
@@ -99,20 +101,4 @@ public struct SUCountdown: View {
         .fill(self.model.backgroundColor.color(for: self.colorScheme))
       )
   }
-
-  private func calculateWidth(model: CountdownVM) {
-    let values: [(Int, CountdownHelpers.Unit)] = [
-      (self.manager.days, .days),
-      (self.manager.hours, .hours),
-      (self.manager.minutes, .minutes),
-      (self.manager.seconds, .seconds)
-    ]
-
-    let widths = values.map { value, unit -> CGFloat in
-      let attributedString = model.timeText(value: value, unit: unit)
-      return CountdownWidthCalculator.preferredWidth(for: attributedString, model: model)
-    }
-
-    self.timeWidth = (widths.max() ?? self.model.defaultMinWidth) + self.model.horizontalPadding * 2
-  }
 }