Merge pull request #11 from componentskit/extract-auto-layout-helpers

Extract auto layout helpers into a separate package

Author: mikhailChelbaev

App/ComponentsKitApp/ComponentsKitApp/Demos/UIKitLogin.swift

@@ -159,7 +159,7 @@ final class UIKitLogin: UIViewController {
   }
 
   private func layout() {
-    self.scrollView.pinToSafeEdges()
+    self.scrollView.allEdges()
 
     self.stackView.top(20)
     self.stackView.bottom(20)
@@ -177,7 +177,7 @@ final class UIKitLogin: UIViewController {
     ).isActive = true
     self.stackView.centerHorizontally()
 
-    self.loader.below(of: self.stackView, padding: 50)
+    self.loader.below(self.stackView, padding: 50)
     self.loader.centerHorizontally()
   }
 

App/ComponentsKitApp/ComponentsKitApp/Helpers/UKComponentPreview.swift

@@ -13,8 +13,7 @@ struct UKComponentPreview<View, Model>: UIViewRepresentable where View: UKCompon
 
       self.addSubview(self.component)
 
-      self.component.centerVertically()
-      self.component.centerHorizontally()
+      self.component.center()
 
       self.component.topAnchor.constraint(
         greaterThanOrEqualTo: self.topAnchor

Package.swift

@@ -13,9 +13,15 @@ let package = Package(
       targets: ["ComponentsKit"]
     )
   ],
+  dependencies: [
+    .package(url: "https://github.com/componentskit/AutoLayout", from: "1.0.0")
+  ],
   targets: [
     .target(
-      name: "ComponentsKit"
+      name: "ComponentsKit",
+      dependencies: [
+        .product(name: "AutoLayout", package: "AutoLayout")
+      ]
     )
   ]
 )

Sources/ComponentsKit/Button/UKButton.swift

@@ -1,4 +1,5 @@
 import UIKit
+import AutoLayout
 
 /// A UIKit component that performs an action when it is tapped by a user.
 open class UKButton: UIView, UKComponent {
@@ -26,7 +27,7 @@ open class UKButton: UIView, UKComponent {
     }
   }
 
-  private var titleLabelConstraints: AnchoredConstraints = .init()
+  private var titleLabelConstraints: LayoutConstraints = .init()
 
   // MARK: Subviews
 
@@ -85,8 +86,7 @@ open class UKButton: UIView, UKComponent {
 
   private func layout() {
     self.titleLabelConstraints = self.titleLabel.horizontally(self.model.horizontalPadding)
-    self.titleLabel.centerVertically()
-    self.titleLabel.centerHorizontally()
+    self.titleLabel.center()
 
     self.titleLabelConstraints.leading?.priority = .defaultHigh
     self.titleLabelConstraints.trailing?.priority = .defaultHigh

Sources/ComponentsKit/Checkbox/UKCheckbox.swift

@@ -1,4 +1,5 @@
 import UIKit
+import AutoLayout
 
 /// A UIKit component that can be selected by a user.
 open class UKCheckbox: UIView, UKComponent {
@@ -23,8 +24,8 @@ open class UKCheckbox: UIView, UKComponent {
     }
   }
 
-  private var titleLabelConstraints: AnchoredConstraints = .init()
-  private var checkboxContainerConstraints: AnchoredConstraints = .init()
+  private var titleLabelConstraints: LayoutConstraints = .init()
+  private var checkboxContainerConstraints: LayoutConstraints = .init()
 
   // MARK: Subviews
 
@@ -131,10 +132,10 @@ open class UKCheckbox: UIView, UKComponent {
   // MARK: Layout
 
   private func layout() {
-    self.stackView.pinToEdges()
+    self.stackView.allEdges()
 
     self.checkboxContainerConstraints = self.checkboxContainer.size(self.model.checkboxSide)
-    self.checkboxBackground.pinToEdges()
+    self.checkboxBackground.allEdges()
   }
 
   // MARK: Update