Refactoring Margin constraint ♻️

chicio · Jan 29, 2021 · c1b401d · c1b401d
1 parent cd3c085
commit c1b401d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 15 deletions.
diff --git a/Source/Constraint/MarginConstraintFactory.swift b/Source/Constraint/MarginConstraintFactory.swift
@@ -10,33 +10,33 @@ import Foundation
 import UIKit
 
 class MarginConstraintFactory {
-    static func leadingConstraint(target: UIView, parent: UIView?, value: CGFloat) -> NSLayoutConstraint {
+    static func leadingConstraint(views: ContraintViews, value: CGFloat) -> NSLayoutConstraint {
         return MarginConstraintFactory.make(
-            views: ContraintViews(target: target, parent: parent),
+            views: views,
             margin: .leading,
             value: value
         )
     }
 
-    static func trailingConstraint(target: UIView, parent: UIView?, value: CGFloat) -> NSLayoutConstraint {
+    static func trailingConstraint(views: ContraintViews, value: CGFloat) -> NSLayoutConstraint {
         return MarginConstraintFactory.make(
-            views: ContraintViews(target: target, parent: parent),
+            views: views,
             margin: .trailing,
             value: value
         )
     }
 
-    static func topConstraint(target: UIView, parent: UIView?, value: CGFloat) -> NSLayoutConstraint {
+    static func topConstraint(views: ContraintViews, value: CGFloat) -> NSLayoutConstraint {
         return MarginConstraintFactory.make(
-            views: ContraintViews(target: target, parent: parent),
+            views: views,
             margin: .top,
             value: value
         )
     }
 
-    static func bottomConstraint(target: UIView, parent: UIView?, value: CGFloat) -> NSLayoutConstraint {
+    static func bottomConstraint(views: ContraintViews, value: CGFloat) -> NSLayoutConstraint {
         return MarginConstraintFactory.make(
-            views: ContraintViews(target: target, parent: parent),
+            views: views,
             margin: .bottom,
             value: value
         )

diff --git a/Source/UI/Bar.swift b/Source/UI/Bar.swift
@@ -27,10 +27,12 @@ class Bar: UIView {
     }
 
     private func createConstraintsUsing(leading: CGFloat, trailing: CGFloat, height: CGFloat) -> [NSLayoutConstraint] {
-        leadingConstraint = MarginConstraintFactory.leadingConstraint(target: self, parent: superview, value: leading)
+        leadingConstraint = MarginConstraintFactory.leadingConstraint(
+            views: ContraintViews(target: self, parent: superview),
+            value: leading
+        )
         trailingConstraint = MarginConstraintFactory.trailingConstraint(
-            target: self,
-            parent: superview,
+            views: ContraintViews(target: self, parent: superview),
             value: -1.0 * trailing
         )
         heightConstraint = DimensionConstraintFactory.heightConstraint(target: self, value: height)

diff --git a/Source/UI/Progress.swift b/Source/UI/Progress.swift
@@ -45,10 +45,22 @@ class Progress: Gradient {
         let backgroundImageView = createBackgroundUsing(image: image, edgeInset: edgeInset, corners: corners)
         addSubview(backgroundImageView)
         NSLayoutConstraint.activate([
-            MarginConstraintFactory.leadingConstraint(target: backgroundImageView, parent: self, value: 0.0),
-            MarginConstraintFactory.trailingConstraint(target: backgroundImageView, parent: self, value: 0.0),
-            MarginConstraintFactory.topConstraint(target: backgroundImageView, parent: self, value: 0.0),
-            MarginConstraintFactory.bottomConstraint(target: backgroundImageView, parent: self, value: 0.0)
+            MarginConstraintFactory.leadingConstraint(
+                views: ContraintViews(target: backgroundImageView, parent: self),
+                value: 0.0
+            ),
+            MarginConstraintFactory.trailingConstraint(
+                views: ContraintViews(target: backgroundImageView, parent: self),
+                value: 0.0
+            ),
+            MarginConstraintFactory.topConstraint(
+                views: ContraintViews(target: backgroundImageView, parent: self),
+                value: 0.0
+            ),
+            MarginConstraintFactory.bottomConstraint(
+                views: ContraintViews(target: backgroundImageView, parent: self),
+                value: 0.0
+            )
         ])
     }