Initial commit

Author: Luc Dion

.gitignore

@@ -19,9 +19,10 @@ TestProjects/cocoapods/macos/PinLayout-macOS.xcworkspace/
 TestProjects/cocoapods/macos/Podfile.lock
 TestProjects/cocoapods/tvos/PinLayout-tvOS.xcworkspace/
 TestProjects/cocoapods/tvos/Podfile.lock
+
 TestProjects/carthage/ios/Cartfile.resolved
 TestProjects/carthage/ios/Carthage/
 
 TestProjects/swift-package-manager
 
-Example/PinLayoutExampleMacOS
+Example/PinLayoutExampleMacOS

README.md

@@ -37,6 +37,8 @@ Extremely Fast views layouting without auto layout. No magic, pure code, full co
 * Swift 3.2+ / Swift 4.0 / Objective-C
 
 ### Recent features
+* :star: Add methods `wrapConten(...)` that adjust the view's width & height to wrap all its subviews. See [wrapContent](#wrapCcontent) for more information.
+
 * :star: PinLayout now support macOS. See [macOS Support](#macos_support) for more information.
 
 * :star: PinLayout expose the `safeAreaInsets` through [`UIView.pin.safeArea`](#safeAreaInsets), this property support not only iOS 11, but is also backward compatible for earlier iOS releases (7/8/9/10). See [safeAreaInsets support](#safeAreaInsets) for more information.
@@ -61,6 +63,7 @@ Extremely Fast views layouting without auto layout. No magic, pure code, full co
   * [Aspect Ratio](#aspect_ratio)
   * [Margins](#margins)
   * [safeAreaInsets support](#safeAreaInsets)
+  * [WrapContent](#wrapCcontent)
   * [justify, align](#justify_align)
   * [UIView's transforms](#uiview_transform)
   * [Warnings](#warnings)
@@ -1134,8 +1137,51 @@ This example runs perfectly on a iPhone X (iOS 11), but it also runs on any devi
 
 <br/>
 
+<a name="wrapCcontent"></a>
+## WrapContent
 
-<a name="aspect_ratio"></a>
+The following methods are useful to adjust the view's width and/or height to wrap all its subviews. These method also adjust subviews position to create a tight wrap.
+
+**Methods:**
+
+* **`wrapContent()`**  
+Bla. 
+* **`wrapContent(padding: CGFloat)`**  
+Bla. 
+* **`wrapContent(padding: UIEdgeInsets)`**  
+Bla. 
+* **`wrapContent(:WrapType)`**  
+Bla. 
+* **`wrapContent(:WrapType, padding: CGFloat)`**  
+Bla. 
+* **`wrapContent(:WrapType, padding: UIEdgeInsets)`**  
+Bla. 
+
+TABLE SHOWING DIFFERENCES!!!
+
+###### Usage examples:
+```swift
+	view.pin.wrapContent().center()   // wrap all subviews and centered the view inside its parent.
+	view.pin.wrapContent(padding: 20) // wrap all subviews with a padding of 20 pixels all around
+```
+
+
+###### Example:
+...:
+
+<img src="docs/pinlayout-example-justify-left.png" width="540"/>
+
+
+```swift
+   viewA.pin.....
+```
+
+<br/>
+
+
+
+
+<a name="justify_align"></a>
 ## justify() / align()
 
 **Methods:**

Sources/Impl/PinLayoutImpl+WrapContent.swift

@@ -28,12 +28,27 @@ extension PinLayoutImpl {
         return wrapContent(.all, padding: .zero, { return "wrapContent()" })
     }
 
+    func wrapContent(padding: CGFloat) -> PinLayout {
+        return wrapContent(.all, padding: UIEdgeInsets(top: padding, left: padding, bottom: padding, right: padding), { return "wrapContent(padding: \(padding)" })
+    }
+    
+    func wrapContent(padding: UIEdgeInsets) -> PinLayout {
+        return wrapContent(.all, padding: padding, { return "wrapContent(padding: \(insetsDescription(padding))" })
+    }
+
     func wrapContent(_ type: WrapType) -> PinLayout {
         return wrapContent(type, padding: .zero, { return "wrapContent(\(type.description)" })
     }
 
-    @discardableResult
-    private func wrapContent(_ type: WrapType, padding: PPadding, _ context: Context) -> PinLayout {
+    func wrapContent(_ type: WrapType, padding: CGFloat) -> PinLayout {
+        return wrapContent(type, padding: UIEdgeInsets(top: padding, left: padding, bottom: padding, right: padding), { return "wrapContent(\(type.description), padding: \(padding)" })
+    }
+
+    func wrapContent(_ type: WrapType, padding: UIEdgeInsets) -> PinLayout {
+        return wrapContent(type, padding: padding, { return "wrapContent(\(type.description), padding: \(insetsDescription(padding))" })
+    }
+
+    private func wrapContent(_ type: WrapType, padding: UIEdgeInsets, _ context: Context) -> PinLayout {
         let subviews = view.subviews
         guard !subviews.isEmpty else { return self }
         let firstViewFrame = subviews[0].frame
@@ -61,28 +76,22 @@ extension PinLayoutImpl {
         var offsetDx: CGFloat = 0
         var offsetDy: CGFloat = 0
 
-        if type == .all || type == .width {
-            let contentWidth = maxX - minX
+        if type == .all || type == .horizontally {
+            let contentWidth = maxX - minX + padding.left + padding.right
             if contentWidth >= 0 {
                 setWidth(contentWidth, context)
             }
 
-            offsetDx = -minX
-//            let contentWidth = view.subviews.max(by: { subview1, subview2 in
-//                subview1.frame.maxX < subview2.frame.maxX
-//            })?.frame.maxX ?? 0
+            offsetDx = -minX + padding.left
         }
 
-        if type == .all || type == .height {
-            let contentHeight = maxY - minY
+        if type == .all || type == .vertically {
+            let contentHeight = maxY - minY + padding.top + padding.bottom
             if contentHeight >= 0 {
                 setHeight(contentHeight, context)
             }
 
-            offsetDy = -minY
-//            let contentHeight = view.subviews.max(by: { subview1, subview2 in
-//                subview1.frame.maxY < subview2.frame.maxY
-//            })?.frame.maxY ?? 0
+            offsetDy = -minY + padding.top
         }
 
         if offsetDx != 0 || offsetDy != 0 {

Sources/PinLayout+Filters.swift

@@ -308,10 +308,48 @@ public protocol PinLayout {
     @discardableResult func size(of view: NSView) -> PinLayout
     #endif
 
+    /**
+     Adjust the view's width & height to wrap all its subviews. The method also adjust subviews position to create a tight wrap.
+     */
     @discardableResult func wrapContent() -> PinLayout
+    /**
+     Adjust the view's width & height to wrap all its subviews. The method also adds a padding around all subviews.
+
+     - Parameters:
+         - padding: Specify a padding value.
+     */
+    @discardableResult func wrapContent(padding: CGFloat) -> PinLayout
+    /**
+     Adjust the view's width & height to wrap all its subviews. The method also adds a padding around all subviews.
+
+     - Parameters:
+         - padding: Specify a padding using an UIEdgeInsets.
+     */
+    @discardableResult func wrapContent(padding: UIEdgeInsets) -> PinLayout
+
+    /**
+     Adjust the view's width AND/OR height to wrap all its subviews.
+
+     - Parameters:
+        - type: Specify the wrap type (.all, .horizontally, .vertically)
+     */
     @discardableResult func wrapContent(_ type: WrapType) -> PinLayout
-    @discardableResult func wrapContent(padding: PPadding) -> PinLayout
-    @discardableResult func wrapContent(_ type: WrapType, padding: PPadding) -> PinLayout
+    /**
+     Adjust the view's width AND/OR height to wrap all its subviews. The method also adds a padding around all subviews.
+
+     - Parameters:
+         - type: Specify the wrap type (.all, .horizontally, .vertically)
+         - padding: Specify a padding value.
+     */
+    @discardableResult func wrapContent(_ type: WrapType, padding: CGFloat) -> PinLayout
+    /**
+     Adjust the view's width AND/OR height to wrap all its subviews. The method also adds a padding around all subviews.
+
+     - Parameters:
+        - type: Specify the wrap type (.all, .horizontally, .vertically)
+        - padding: Specify a padding using an UIEdgeInsets.
+     */
+    @discardableResult func wrapContent(_ type: WrapType, padding: UIEdgeInsets) -> PinLayout
 
     /**
      Set the view aspect ratio.

Sources/PinLayout.swift

@@ -55,8 +55,8 @@ extension WrapType {
     var description: String {
         switch self {
         case .all: return ".all"
-        case .width: return ".width"
-        case .height: return ".height"
+        case .horizontally: return ".horizontally"
+        case .vertically: return ".vertically"
         }
     }
 }

Sources/Types+Description.swift

@@ -167,47 +167,12 @@ public enum FitType {
 }
 
 public enum WrapType {
-    /**
-     */
+    /// Adjust the view's width AND height to wrap all its subviews.
     case all
-    /**
-     */
-    case width
-    /**
-     */
-    case height
-}
-
-public struct PPadding {
-    let top: CGFloat
-    let left: CGFloat
-    let bottom: CGFloat
-    let right: CGFloat
-
-    static var zero: PPadding {
-        return PPadding(0)
-    }
-
-    init(_ all: CGFloat) {
-        top = all
-        left = all
-        bottom = all
-        right = all
-    }
-
-    init(_ top: CGFloat, _ left: CGFloat, _ bottom: CGFloat, _ right: CGFloat) {
-        self.top = top
-        self.left = left
-        self.bottom = bottom
-        self.right = right
-    }
-
-    init(h: CGFloat, v: CGFloat) {
-        top = v
-        left = h
-        bottom = v
-        right = h
-    }
+    /// Adjust only the view's width to wrap all its subviews. The view's height won't be modified.
+    case horizontally
+    /// Adjust only the view's height to wrap all its subviews. The view's width won't be modified.
+    case vertically
 }
 
 @objc public enum LayoutDirection: Int {