Merge pull request #145 from layoutBox/add_wrapContent_example

Add a wrapContent example

Author: lucdion

Example/PinLayoutSample.xcodeproj/project.pbxproj

@@ -49,6 +49,8 @@
 		DF4C1AAA205AF10900DED50B /* RoundedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AA7205AF10900DED50B /* RoundedButton.swift */; };
 		DF4C1AAE205AF78A00DED50B /* SafeAreaCornersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AAC205AF78A00DED50B /* SafeAreaCornersViewController.swift */; };
 		DF4C1AAF205AF78A00DED50B /* SafeAreaCornersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AAD205AF78A00DED50B /* SafeAreaCornersView.swift */; };
+		DFEAF74A20C9648A00E33147 /* WrapContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFEAF74920C9648A00E33147 /* WrapContentView.swift */; };
+		DFEAF74C20C9649F00E33147 /* WrapContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFEAF74B20C9649F00E33147 /* WrapContentViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -80,6 +82,27 @@
 			remoteGlobalIDString = 244DF2F81EF46C500090508B;
 			remoteInfo = PinLayoutTVOS;
 		};
+		DFEAF71B20C840F300E33147 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 2439CC1E1E665858003326FB /* PinLayout.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = DF1A5D2C2084CF9700725EF5;
+			remoteInfo = "PinLayout-macOS";
+		};
+		DFEAF71D20C840F300E33147 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 2439CC1E1E665858003326FB /* PinLayout.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = DF1A5D1D2084C94700725EF5;
+			remoteInfo = "PinLayoutTests-macOS";
+		};
+		DFEAF71F20C840F300E33147 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 2439CC1E1E665858003326FB /* PinLayout.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = DFF6F9C22084DCD3004F5AED;
+			remoteInfo = "PinLayoutTests-tvOS";
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -156,6 +179,8 @@
 		DF4C1AA7205AF10900DED50B /* RoundedButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RoundedButton.swift; sourceTree = "<group>"; };
 		DF4C1AAC205AF78A00DED50B /* SafeAreaCornersViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaCornersViewController.swift; sourceTree = "<group>"; };
 		DF4C1AAD205AF78A00DED50B /* SafeAreaCornersView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaCornersView.swift; sourceTree = "<group>"; };
+		DFEAF74920C9648A00E33147 /* WrapContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WrapContentView.swift; sourceTree = "<group>"; };
+		DFEAF74B20C9649F00E33147 /* WrapContentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WrapContentViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -195,8 +220,11 @@
 			isa = PBXGroup;
 			children = (
 				2439CC241E665858003326FB /* PinLayout.framework */,
-				24DA374F1EF7F90700D1AB2F /* PinLayoutTVOS.framework */,
-				2439CC261E665858003326FB /* PinLayoutTests.xctest */,
+				DFEAF71C20C840F300E33147 /* PinLayout.framework */,
+				24DA374F1EF7F90700D1AB2F /* PinLayout.framework */,
+				2439CC261E665858003326FB /* PinLayoutTests-iOS.xctest */,
+				DFEAF71E20C840F300E33147 /* PinLayoutTests-macOS.xctest */,
+				DFEAF72020C840F300E33147 /* PinLayoutTests-tvOS.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -220,6 +248,7 @@
 				24A9C1EF1EF0542500F2CF64 /* TableViewExample */,
 				24F2460C1FA8D4D100B6332E /* CollectionViewExample */,
 				DF4C1A9F205AEDFC00DED50B /* SafeArea */,
+				DFEAF71520C840F300E33147 /* WrapContent */,
 				2497CFEA1EF40B8100DFD13B /* Form */,
 				24D18D181F3DECD6008129EF /* IntroRTL */,
 				2416376F1F8E4BC200EE703A /* IntroObjectiveC */,
@@ -411,6 +440,15 @@
 			path = AutoAdjustingSize;
 			sourceTree = "<group>";
 		};
+		DFEAF71520C840F300E33147 /* WrapContent */ = {
+			isa = PBXGroup;
+			children = (
+				DFEAF74920C9648A00E33147 /* WrapContentView.swift */,
+				DFEAF74B20C9649F00E33147 /* WrapContentViewController.swift */,
+			);
+			path = WrapContent;
+			sourceTree = "<group>";
+		};
 		F143180314A617EFD07C5709 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -494,20 +532,41 @@
 			remoteRef = 2439CC231E665858003326FB /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		2439CC261E665858003326FB /* PinLayoutTests.xctest */ = {
+		2439CC261E665858003326FB /* PinLayoutTests-iOS.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = PinLayoutTests.xctest;
+			path = "PinLayoutTests-iOS.xctest";
 			remoteRef = 2439CC251E665858003326FB /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		24DA374F1EF7F90700D1AB2F /* PinLayoutTVOS.framework */ = {
+		24DA374F1EF7F90700D1AB2F /* PinLayout.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
-			path = PinLayoutTVOS.framework;
+			path = PinLayout.framework;
 			remoteRef = 24DA374E1EF7F90700D1AB2F /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		DFEAF71C20C840F300E33147 /* PinLayout.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = PinLayout.framework;
+			remoteRef = DFEAF71B20C840F300E33147 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		DFEAF71E20C840F300E33147 /* PinLayoutTests-macOS.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "PinLayoutTests-macOS.xctest";
+			remoteRef = DFEAF71D20C840F300E33147 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		DFEAF72020C840F300E33147 /* PinLayoutTests-tvOS.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "PinLayoutTests-tvOS.xctest";
+			remoteRef = DFEAF71F20C840F300E33147 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -591,6 +650,7 @@
 				2439CC551E665C6B003326FB /* RelativeViewController.swift in Sources */,
 				247157941F87BD680003424F /* UIEdgeInsets+PinLayout.swift in Sources */,
 				24D18D1E1F3DED0D008129EF /* IntroRTLViewController.swift in Sources */,
+				DFEAF74C20C9649F00E33147 /* WrapContentViewController.swift in Sources */,
 				24F246121FA8D4D100B6332E /* HouseCell.swift in Sources */,
 				DF4C1AAE205AF78A00DED50B /* SafeAreaCornersViewController.swift in Sources */,
 				24A9C2031EF16A3E00F2CF64 /* AutoAdjustingSizeView.swift in Sources */,
@@ -604,6 +664,7 @@
 				2497CFED1EF40B9100DFD13B /* FormView.swift in Sources */,
 				24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */,
 				DF4C1AA5205AEDFC00DED50B /* SafeAreaViewController.swift in Sources */,
+				DFEAF74A20C9648A00E33147 /* WrapContentView.swift in Sources */,
 				249EFE431E64FAFE00165E39 /* AppDelegate.swift in Sources */,
 				2497CFEE1EF40B9100DFD13B /* FormViewController.swift in Sources */,
 				24A9C1F31EF0542F00F2CF64 /* TableViewExampleViewController.swift in Sources */,

Example/PinLayoutSample/UI/Common/Stylesheet.swift

@@ -21,4 +21,5 @@ import UIKit
 
 extension UIColor {
     class var pinLayoutColor: UIColor { return UIColor(red: 90.0 / 255.0, green: 171.0 / 255.0, blue: 243.0 / 255.0, alpha: 1.0) }
+    class var lightColor: UIColor { return UIColor(red: 230.0 / 255.0, green: 240.0 / 255.0, blue: 255.0 / 255.0, alpha: 1.0) }
 }

Example/PinLayoutSample/UI/Examples/New Group/ObjectiveC.m

@@ -0,0 +1,143 @@
+//  Copyright (c) 2017 Luc Dion
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+
+import UIKit
+import PinLayout
+
+class WrapContentView: UIView {
+    fileprivate let topContainer = UIView()
+    fileprivate let topLogo = UIImageView(image: UIImage(named: "PinLayout-logo"))
+    fileprivate let topLabel = UILabel()
+
+    fileprivate let separatorView1 = UIView()
+
+    fileprivate let middleContainer = UIView()
+    fileprivate let middleLabel = UILabel()
+    fileprivate let button1 = UIButton(type: .custom)
+    fileprivate let button2 = UIButton(type: .custom)
+    fileprivate let button3 = UIButton(type: .custom)
+
+    fileprivate let separatorView2 = UIView()
+
+    fileprivate let bottomContainer = UIView()
+    fileprivate let bottomLogo = UIImageView(image: UIImage(named: "PinLayout-logo"))
+    fileprivate let bottomLabel = UILabel()
+
+    init() {
+        super.init(frame: .zero)
+        backgroundColor = .white
+
+        topContainer.backgroundColor = .lightColor
+        addSubview(topContainer)
+
+        //
+        // Top section
+        //
+        topLogo.contentMode = .scaleAspectFit
+        topContainer.addSubview(topLogo)
+
+        configureLabel(topLabel, text: "This view use 'pin.wrapContent()' to wrap its subviews (logo and label). This view horizontally center at the top.")
+        topContainer.addSubview(topLabel)
+
+        // Separator 1
+        separatorView1.pin.height(1)
+        separatorView1.backgroundColor = .pinLayoutColor
+        addSubview(separatorView1)
+
+        //
+        // Middle section
+        //
+        middleContainer.backgroundColor = .lightColor
+        addSubview(middleContainer)
+
+        configureLabel(middleLabel, text: "This view use 'pin.wrapContent()' to wrap its subviews (1 label and 3 buttons). This view is horizontally centered.")
+        middleContainer.addSubview(middleLabel)
+
+        button1.setTitle("Button 1", for: .normal)
+        button1.setTitleColor(.black, for: .normal)
+        button1.sizeToFit()
+        middleContainer.addSubview(button1)
+
+        button2.setTitle("Button 2", for: .normal)
+        button2.setTitleColor(.black, for: .normal)
+        button2.sizeToFit()
+        middleContainer.addSubview(button2)
+
+        button3.setTitle("Button 3", for: .normal)
+        button3.setTitleColor(.black, for: .normal)
+        button3.sizeToFit()
+        middleContainer.addSubview(button3)
+
+        // Separator 2
+        separatorView2.pin.height(1)
+        separatorView2.backgroundColor = .pinLayoutColor
+        addSubview(separatorView2)
+
+        //
+        // Bottom section
+        //
+        bottomContainer.backgroundColor = .lightColor
+        addSubview(bottomContainer)
+
+        bottomLogo.contentMode = .scaleAspectFit
+        bottomContainer.addSubview(bottomLogo)
+
+        configureLabel(bottomLabel, text: "This view use 'pin.wrapContent()' to wrap its subviews (logo and label). This view is horizontally centered. This view is vertically center in the region between the separator and the bottom of the screen using '.align(.center)'")
+        bottomContainer.addSubview(bottomLabel)
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        let padding: CGFloat = 10
+        
+        // Top section
+        topLogo.pin.width(100).aspectRatio()
+        topLabel.pin.below(of: topLogo, aligned: .center).width(260).sizeToFit(.width).marginTop(padding)
+        topContainer.pin.wrapContent(padding: 4).top(pin.safeArea.top + padding).hCenter()
+
+        // Separator1
+        separatorView1.pin.below(of: topContainer, aligned: .center).width(80%).marginTop(padding)
+
+        middleLabel.pin.width(260).sizeToFit(.width)
+        button2.pin.below(of: middleLabel, aligned: .center).marginTop(padding)
+        button1.pin.before(of: button2, aligned: .center).marginRight(padding)
+        button3.pin.after(of: button2, aligned: .center).marginLeft(padding)
+        middleContainer.pin.wrapContent(padding: 4).below(of: separatorView1).hCenter().marginTop(padding)
+
+        // Separator2
+        separatorView2.pin.below(of: middleContainer, aligned: .center).width(80%).marginTop(padding)
+
+        // Bottom section
+        bottomLogo.pin.width(100).aspectRatio()
+        bottomLabel.pin.after(of: bottomLogo, aligned: .top).width(200).sizeToFit(.width)
+        bottomContainer.pin.wrapContent(padding: 4).below(of: separatorView2).bottom().align(.center).hCenter()
+    }
+
+    private func configureLabel(_ label: UILabel, text: String) {
+        label.text = text
+        label.font = .systemFont(ofSize: 14)
+        label.textAlignment = .center
+        label.numberOfLines = 0
+        label.lineBreakMode = .byWordWrapping
+    }
+}

Example/PinLayoutSample/UI/Examples/WrapContent/WrapContentView.swift

@@ -0,0 +1,40 @@
+//  Copyright (c) 2017 Luc Dion
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+
+import UIKit
+
+class WrapContentViewController: UIViewController {
+    fileprivate var mainView: WrapContentView {
+        return self.view as! WrapContentView
+    }
+
+    init(pageType: PageType) {
+        super.init(nibName: nil, bundle: nil)
+        
+        title = pageType.text
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+    }
+    
+    override func loadView() {
+        view = WrapContentView()
+    }
+}

Example/PinLayoutSample/UI/Examples/WrapContent/WrapContentViewController.swift

@@ -25,6 +25,7 @@ enum PageType: Int {
     case tableView
     case collectionView
     case safeArea
+    case wrapContent
     case form
     case relativePositions
     case multiRelativePositions
@@ -41,6 +42,7 @@ enum PageType: Int {
         case .tableView:              return "UITableView with variable cell's height"
         case .collectionView:         return "UICollectionView Example"
         case .safeArea:               return "SafeArea"
+        case .wrapContent:            return "wrapContent Example"
         case .form:                   return "Form Example"
         case .relativePositions:      return "Relative Positionning"
         case .multiRelativePositions: return "Multiple Relatives Positionning"
@@ -65,6 +67,8 @@ enum PageType: Int {
             let tabbarController = UITabBarController()
             tabbarController.setViewControllers([SafeAreaViewController(), SafeAreaCornersViewController()], animated: false)
             return tabbarController
+        case .wrapContent:
+            return WrapContentViewController(pageType: self)
         case .form:
             return FormViewController(pageType: self)
         case .relativePositions: