Code review adjustments

Mindera · Jan 16, 2020 · a9ad12a · a9ad12a
1 parent b2f6325
commit a9ad12a
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 152 deletions.
diff --git a/Sources/AutoLayout/Array+ConstrainableProxy.swift b/Sources/AutoLayout/Array+ConstrainableProxy.swift
@@ -6,10 +6,7 @@ extension Array where Element: LeadingConstrainableProxy {
     func alignLeading() -> [NSLayoutConstraint] {
 
         guard let first = first else { return [] }
-        return self[1...].map {
-            $0.prepare()
-            return first.leading(to: $0)
-        }
+        return self[1...].map { first.leading(to: $0) }
     }
 }
 
@@ -19,10 +16,7 @@ extension Array where Element: TrailingConstrainableProxy {
     func alignTrailing() -> [NSLayoutConstraint] {
 
         guard let first = first else { return [] }
-        return self[1...].map {
-            $0.prepare()
-            return first.trailing(to: $0)
-        }
+        return self[1...].map { first.trailing(to: $0) }
     }
 }
 
@@ -32,10 +26,7 @@ extension Array where Element: TopConstrainableProxy {
     func alignTop() -> [NSLayoutConstraint] {
 
         guard let first = first else { return [] }
-        return self[1...].map {
-            $0.prepare()
-            return first.top(to: $0)
-        }
+        return self[1...].map { first.top(to: $0) }
     }
 }
 
@@ -45,10 +36,7 @@ extension Array where Element: BottomConstrainableProxy {
     func alignBottom() -> [NSLayoutConstraint] {
 
         guard let first = first else { return [] }
-        return self[1...].map {
-            $0.prepare()
-            return first.bottom(to: $0)
-        }
+        return self[1...].map { first.bottom(to: $0) }
     }
 }
 
@@ -58,20 +46,14 @@ extension Array where Element: PositionConstrainableProxy {
     func alignCenterX() -> [NSLayoutConstraint] {
 
         guard let first = first else { return [] }
-        return self[1...].map {
-            $0.prepare()
-            return first.centerX(to: $0)
-        }
+        return self[1...].map { first.centerX(to: $0) }
     }
 
     @discardableResult
     func alignCenterY() -> [NSLayoutConstraint] {
 
         guard let first = first else { return [] }
-        return self[1...].map {
-            $0.prepare()
-            return first.centerY(to: $0)
-        }
+        return self[1...].map { first.centerY(to: $0) }
     }
 }
 
@@ -81,20 +63,13 @@ extension Array where Element: WidthConstrainableProxy {
     func equalWidth() -> [NSLayoutConstraint] {
 
         guard let first = first else { return [] }
-        return self[1...].map {
-            $0.prepare()
-            return first.width(to: $0)
-        }
+        return self[1...].map { first.width(to: $0) }
     }
 
     @discardableResult
     func equal(width: CGFloat) -> [NSLayoutConstraint] {
 
-        guard isEmpty == false else { return [] }
-        return map {
-            $0.prepare()
-            return $0.width(width, relation: .equal)
-        }
+        map { $0.width(width, relation: .equal) }
     }
 }
 
@@ -104,10 +79,7 @@ extension Array where Element: HeightConstrainableProxy {
     func equalHeight() -> [NSLayoutConstraint] {
 
         guard let first = first else { return [] }
-        return self[1...].map {
-            $0.prepare()
-            return first.height(to: $0)
-        }
+        return self[1...].map { first.height(to: $0) }
     }
 }
 
@@ -116,7 +88,7 @@ extension Array where Element: LeadingConstrainableProxy & TrailingConstrainable
     @discardableResult
     func distributeHorizontally(margin: CGFloat = 0.0) -> [NSLayoutConstraint] {
 
-        last?.prepare()
+        guard isEmpty == false else { return [] }
         return zip(self, self[1...]).map { first, second in
             second.leadingToTrailing(of: first, offset: margin)
         }
@@ -128,7 +100,7 @@ extension Array where Element: TopConstrainableProxy & BottomConstrainableProxy
     @discardableResult
     func distributeVertically(margin: CGFloat = 0.0) -> [NSLayoutConstraint] {
 
-        last?.prepare()
+        guard isEmpty == false else { return [] }
         return zip(self, self[1...]).map { first, second in
             second.topToBottom(of: first, offset: margin)
         }

diff --git a/Sources/AutoLayout/Constrain.swift b/Sources/AutoLayout/Constrain.swift
@@ -20,12 +20,8 @@ final class ConstraintGroup {
     }
 
     var isActive: Bool {
-        get {
-            return constraints.allSatisfy { $0.isActive }
-        }
-        set {
-             newValue ? install(constraints) : uninstall(constraints)
-        }
+        get { constraints.allSatisfy { $0.isActive } }
+        set { newValue ? install(constraints) : uninstall(constraints) }
     }
 
     private func install(_ constraints: [NSLayoutConstraint]) {