Merge pull request #81 from mirego/update_hCenter_vCenter_float_percent

Breaking change related to hCenter(CGFloat), hCenter(percent), vCenter(CGFloat), vCenter(percent)

Author: Luc Dion

CHANGELOG.md

@@ -6,16 +6,27 @@
 
 
 # Change Log
+## [1.3.0](https://github.com/mirego/PinLayout/releases/tag/1.3.0)
+Released on 2017-08-18. 
+
+#### Change
+* **Breaking change related to hCenter(CGFloat), hCenter(percent), vCenter(CGFloat), vCenter(percent)**:  
+  * **`vCenter(_ value: CGFloat)`** and **`vCenter(_ percent: Percent)`**:  
+The value specifies the distance vertically of the view's center **related to the superview's center** in pixels. Previously it was related to the **superview's top edge**.
+  * **`hCenter(_ value: CGFloat)`** and **`hCenter(_ percent: Percent)`**:  
+The value specifies the distance horizontally of the view's center **related to the superview's center** in pixels. Previously it was related to the **superview's left edge**.
 
 ## [1.2.4](https://github.com/mirego/PinLayout/releases/tag/1.2.4)
 #### Change
 * Add methods to pin hCenter and vCenter to any other view's edges (including the new hCenter and vCenter edges)
-	*  New methods:
-		*  func hCenter(to edge: HorizontalEdge) -> PinLayout
-		*  func vCenter(to edge: VerticalEdge) -> PinLayout
-	*  New UIView's edges:
-		*  UIView.edge.hCenter
-		*  UIView.edge.vCenter
+	*  **New methods**:
+		* **`hCenter(to: edge)`**  
+        Position horizontally the view's center directly on another view’s edge (left/hCenter/right)
+		* **`vCenter(to: edge)`**  
+        Position vertically the view's center directly on another view’s edge (top/vCenter/bottom).
+	*  **New UIView's edges**:
+		*  **`UIView.edge.hCenter`**
+		*  **`UIView.edge.vCenter`**
 	* Added by [Luc Dion](https://github.com/lucdion) in Pull Request [#80](https://github.com/mirego/PinLayout/pull/80) 
 
 ## [1.2.3](https://github.com/mirego/PinLayout/releases/tag/1.2.3)

Example/PinLayoutSample/UI/Examples/TableViewExample/TableViewExampleViewController.swift

@@ -52,16 +52,17 @@ class TableViewExampleViewController: BaseViewController {
         mainView.configure(methods: [
             Method(name: "top(_ value: CGFloat)", description: "The value specifies the top edge distance from the superview's top edge in pixels."),
             Method(name: "top(_ percent: Percent)", description: "The value specifies the top edge distance from the superview's top edge in percentage of its superview's height."),
-            Method(name: "left(_ value: CGFloat)", description: "The value specifies the left edge distance from the superview's left edge in pixels. The value specifies the left edge distance from the superview's left edge in pixels."),
-            Method(name: "left(_ percent: Percent)", description: "The value specifies the left edge distance from the superview's left edge in percentage of its superview's width."),
+            Method(name: "vCenter(_ value: CGFloat)", description: "The value specifies the distance vertically of the view's center related to the superview's center in pixels."),
+            Method(name: "vCenter(_ percent: Percent)", description: "The value specifies the distance vertically of the view's center related to the superview's center in percentage of its superview's height."),
             Method(name: "bottom(_ value: CGFloat)", description: "The value specifies the bottom edge distance from the superview's bottom edge in pixels."),
             Method(name: "bottom(_ percent: Percent)", description: "The value specifies the bottom edge distance from the superview's bottom edge in percentage of its superview's height."),
+            
+            Method(name: "left(_ value: CGFloat)", description: "The value specifies the left edge distance from the superview's left edge in pixels. The value specifies the left edge distance from the superview's left edge in pixels."),
+            Method(name: "left(_ percent: Percent)", description: "The value specifies the left edge distance from the superview's left edge in percentage of its superview's width."),
+            Method(name: "hCenter(_ value: CGFloat)", description: "The value specifies the distance horizontally of the view's center related to the superview's center in pixels."),
+            Method(name: "hCenter(_ percent: Percent)", description: "The value specifies the distance horizontally of the view's center related to the superview's center in percentage of its superview's height."),
             Method(name: "right(_ value: CGFloat)", description: "The value specifies the right edge distance from the superview's right edge in pixels."),
-            Method(name: "right(_ percent: Percent)", description: "The value specifies the right edge distance from the superview's right edge in percentage of its superview's width."),
-            Method(name: "hCenter(_ value: CGFloat)", description: "The value specifies the horizontal center distance from the superview's left edge in pixels."),
-            Method(name: "hCenter(_ percent: Percent)", description: "The value specifies the horizontal center distance from the superview's left edge in percentage of its superview's width."),
-            Method(name: "vCenter(_ value: CGFloat)", description: "The value specifies the vertical center distance from the superview's top edge in pixels."),
-            Method(name: "vCenter(_ percent: Percent)", description: "The value specifies the vertical center distance from the superview's top edge in percentage of its superview's height.")
+            Method(name: "right(_ percent: Percent)", description: "The value specifies the right edge distance from the superview's right edge in percentage of its superview's width.")
         ])
     }
 }

PinLayout.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "PinLayout"
-  s.version      = "1.2.4"
+  s.version      = "1.3.0"
   s.summary      = "Fast Swift UIViews layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable."
 
   # This description is used to generate tags and improve search results.

README.md

@@ -176,9 +176,8 @@ These results also mean that **PinLayout is by far faster than any layout framew
 
 [See here a more complete details, results and explanation of the benchmark](docs/Benchmark.md).
 
-<p align="center"> Tested on a iPhone 6S iOS 10.3.2</p>
 <p align="center">
-  <img src="docs/Benchmark/benchmark_iphone6s.png" alt="PinLayout Performance" width=600/>
+  <img src="docs/Benchmark/benchmark_iphone7.png" alt="PinLayout Performance" width=600/>
 </p>
 
 <br/>
@@ -221,9 +220,9 @@ The value specifies the top edge distance from the superview's top edge in pixel
 * **`top(_ percent: Percent)`**  
 The value specifies the top edge distance from the superview's top edge in percentage of its superview's height.
 * **`vCenter(_ value: CGFloat)`**  
-The value specifies the vertical center distance from the superview's top edge in pixels.
+The value specifies the distance vertically of the view's center related to the superview's center in pixels. A positive value move the view down and a negative value move it up relative to the superview's center.
 * **`vCenter(_ percent: Percent)`**  
-The value specifies the vertical center distance from the superview's top edge in percentage of its superview's height.
+The value specifies the distance vertically of the view's center related to the superview's center in percentage of its superview's height. A positive value move the view down and a negative value move it up relative to the superview's center.
 * **`bottom(_ value: CGFloat)`**  
 The value specifies the bottom edge **distance from the superview's bottom edge** in pixels.
 * **`bottom(_ percent: Percent)`**  
@@ -233,9 +232,9 @@ The value specifies the left edge distance from the superview's left edge in pix
 * **`left(_ percent: Percent)`**  
 The value specifies the left edge distance from the superview's left edge in percentage of its superview's width.
 * **`hCenter(_ value: CGFloat)`**  
-The value specifies the horizontal center distance from the superview's left edge in pixels.
+The value specifies the distance horizontally of the view's center related to the superview's center in pixels. A positive value move the view to the right  and a negative value move it to the left relative to the superview's center.
 * **`hCenter(_ percent: Percent)`**  
-The value specifies the horizontal center distance from the superview's left edge in percentage of its superview's width.
+The value specifies the distance horizontally of the view's center related to the superview's center in percentage of its superview's width. A positive value move the view to the right  and a negative value move it to the left relative to the superview's center.
 * **`right(_ value: CGFloat)`**  
 The value specifies the right edge **distance from the superview's right edge** in pixels.
 * **`right(_ percent: Percent)`**  
@@ -256,9 +255,9 @@ In RTL direction the value specifies the left edge distance from the superview's
 ###### Usage Examples:
 
 ```swift
-    view.pin.top(20).left(20)
-    view.pin.top(25%).hCenter(0)
-    view.pin.left(12).vCenter(100)
+    view.pin.top(20).bottom(20)	  // The view has a top margin and a bottom margin of 20 pixels 
+    view.pin.top(25%).hCenter(0)   // The view is centered horizontally
+    view.pin.left(12).vCenter(0)   // The view is centered vertically
     view.pin.start(20).end(20)
 ```
 
@@ -373,17 +372,23 @@ In RTL direction it position the view's bottom edge directly on another view’s
 	view.pin.left(to: view1.edge.right).top(to: view2.edge.right)
 ```
 
-###### Example:
-Layout using an edge.
-
-The following example will layout the view B left edge on the view A right edge. It only changes the view B left coordinate.
+###### Example 1:
+This example layout the view B left edge on the view A right edge. It only changes the view B left coordinate.
 
 ![](docs/example-edges.png)
 
 ```swift
 	viewB.pin.left(to: viewA.edge.right)
 ```
 
+###### Example 2:
+This example center horizontally the view B inside the view A with a top margin of 10 from the same view.
+![](docs/pinlayout_example_hCenter_edge.png)
+
+```swift
+    aView.pin.top(to: bView.edge.top).hCenter(to: bView.edge.hCenter).marginTop(10)
+``` 
+
 <br/>
 
 ## Anchors <a name="anchors"></a>

Sources/PinLayoutImpl.swift

@@ -192,15 +192,16 @@ class PinLayoutImpl: PinLayout {
     @discardableResult
     func hCenter(_ value: CGFloat) -> PinLayout {
         func context() -> String { return "hCenter(\(value))" }
-        setHorizontalCenter(value, context)
+        guard let layoutSuperview = layoutSuperview(context) else { return self }
+        setHorizontalCenter((layoutSuperview.frame.width / 2) + value, context)
         return self
     }
 
     @discardableResult
     func hCenter(_ percent: Percent) -> PinLayout {
         func context() -> String { return "hCenter(\(percent))" }
         guard let layoutSuperview = layoutSuperview(context) else { return self }
-        setHorizontalCenter(percent.of(layoutSuperview.frame.width), context)
+        setHorizontalCenter((layoutSuperview.frame.width / 2) + percent.of(layoutSuperview.frame.width), context)
         return self
     }
 
@@ -215,15 +216,16 @@ class PinLayoutImpl: PinLayout {
     @discardableResult
     func vCenter(_ value: CGFloat) -> PinLayout {
         func context() -> String { return "vCenter(\(value))" }
-        setVerticalCenter(value, context)
+        guard let layoutSuperview = layoutSuperview(context) else { return self }
+        setVerticalCenter((layoutSuperview.frame.height / 2) + value, context)
         return self
     }
 
     @discardableResult
     func vCenter(_ percent: Percent) -> PinLayout {
         func context() -> String { return "vCenter(\(percent))" }
         guard let layoutSuperview = layoutSuperview(context) else { return self }
-        setVerticalCenter(percent.of(layoutSuperview.frame.height), context)
+        setVerticalCenter((layoutSuperview.frame.height / 2) + percent.of(layoutSuperview.frame.height), context)
         return self
     }
 

Tests/JustifyAlignSpec.swift

@@ -88,9 +88,9 @@ class JustifyAlignSpec: QuickSpec {
                 expect(_pinlayoutUnitTestLastWarning).to(contain(["justify", "center", "won't be applied", "left and right"]))
             }
 
-            it("test when hCenter has been set") {
+            it("test when hCenter has been set and justify() won't be applied") {
                 aView.pin.hCenter(60).justify(.center)
-                expect(aView.frame).to(equal(CGRect(x: 10.0, y: 100.0, width: 100.0, height: 60.0)))
+                expect(aView.frame).to(equal(CGRect(x: 210.0, y: 100.0, width: 100.0, height: 60.0)))
                 expect(_pinlayoutUnitTestLastWarning).to(contain(["justify", "center", "won't be applied", "hCenter"]))
             }
         }
@@ -123,9 +123,9 @@ class JustifyAlignSpec: QuickSpec {
                 expect(_pinlayoutUnitTestLastWarning).to(contain(["align(.center)", "won't be applied", "top and bottom"]))
             }
 
-            it("test when hCenter has been set") {
+            it("test when hCenter has been set and align() won't be applied") {
                 aView.pin.hCenter(60).align(.center)
-                expect(aView.frame).to(equal(CGRect(x: 10.0, y: 100.0, width: 100.0, height: 60.0)))
+                expect(aView.frame).to(equal(CGRect(x: 210.0, y: 100.0, width: 100.0, height: 60.0)))
                 expect(_pinlayoutUnitTestLastWarning).to(contain(["align(.center)", "won't be applied", "top and bottom"]))
             }
         }