Merge pull request #101 from mirego/add_fitWidth_fitHeight

New method `sizeToFit(:FitType)` & `fitSize()` is now deprecated

Author: lucdion

.gitignore

@@ -6,4 +6,6 @@ build/
 xcuserdata
 data/
 
-Pods/
+Pods/
+
+docs/1.2

Example/PinLayoutSample/UI/Common/BasicView.swift

@@ -43,18 +43,19 @@ class BasicView: UIView {
     override func layoutSubviews() {
         super.layoutSubviews()
 
-        label.pin.top().left().right().margin(4).fitSize()
+        label.pin.top().left().right().margin(4).sizeToFit(.width)
     }
 
     var sizeThatFitsExpectedArea: CGFloat = 40 * 40
+    var sizeThatFitSizeOffset: CGFloat = 0
 
     override func sizeThatFits(_ size: CGSize) -> CGSize {
         var newSize = CGSize()
         if size.width != CGFloat.greatestFiniteMagnitude {
-            newSize.width = size.width
+            newSize.width = size.width + sizeThatFitSizeOffset
             newSize.height = sizeThatFitsExpectedArea / newSize.width
         } else if size.height != CGFloat.greatestFiniteMagnitude {
-            newSize.height = size.height
+            newSize.height = size.height + sizeThatFitSizeOffset
             newSize.width = sizeThatFitsExpectedArea / newSize.height
         } else {
             newSize.width = 40

Example/PinLayoutSample/UI/Examples/AdjustToContainer/AdjustToContainerView.swift

@@ -23,17 +23,17 @@ import PinLayout
 class AdjustToContainerView: BaseView {
     fileprivate let contentView = UIView()
     fileprivate let languageSelectorView = ChoiceSelectorView(text: "What is your favorite language?", choices: ["Swift", "Objective-C", "C++"])
-    fileprivate let swiftOpinionSelectorView = ChoiceSelectorView(text: "Overall, are you satisfied with the Swift performance in your projects?", choices: ["Yes", "No"])
-    fileprivate let swiftUsageSelectorView = ChoiceSelectorView(text: "How often do you typically use Swift?", choices: ["Daily", "Weekly", "Montly", "Do not use"])
+    fileprivate let swiftOpinionSelector = ChoiceSelectorView(text: "Overall, are you satisfied with the Swift performance in your projects?", choices: ["Yes", "No"])
+    fileprivate let swiftUsageSelector = ChoiceSelectorView(text: "How often do you typically use Swift?", choices: ["Daily", "Weekly", "Montly", "Do not use"])
 
     override init() {
         super.init()
 
         addSubview(contentView)
 
         contentView.addSubview(languageSelectorView)
-        contentView.addSubview(swiftOpinionSelectorView)
-        contentView.addSubview(swiftUsageSelectorView)
+        contentView.addSubview(swiftOpinionSelector)
+        contentView.addSubview(swiftUsageSelector)
     }
 
     required init?(coder aDecoder: NSCoder) {
@@ -46,8 +46,8 @@ class AdjustToContainerView: BaseView {
         // Layout the contentView using the view's safeArea.
         contentView.pin.all().margin(safeArea)
 
-        languageSelectorView.pin.top().left().right().fitSize()
-        swiftOpinionSelectorView.pin.below(of: languageSelectorView, aligned: .left).right().marginTop(10).fitSize()
-        swiftUsageSelectorView.pin.below(of: swiftOpinionSelectorView, aligned: .left).right().marginTop(10).fitSize()
+        languageSelectorView.pin.top().left().right().sizeToFit(.width)
+        swiftOpinionSelector.pin.below(of: languageSelectorView, aligned: .left).right().marginTop(10).sizeToFit(.width)
+        swiftUsageSelector.pin.below(of: swiftOpinionSelector, aligned: .left).right().marginTop(10).sizeToFit(.width)
     }
 }

Example/PinLayoutSample/UI/Examples/AdjustToContainer/Subviews/ChoiceSelectorView.swift

@@ -63,10 +63,10 @@ class ChoiceSelectorView: UIView {
         if frame.width > 500 {
             // The UISegmentedControl is at the top-right corner and the label takes the remaining horizontal space.
             segmentedControl.pin.top().right().margin(margin)
-            textLabel.pin.top().left().before(of: segmentedControl).margin(margin).fitSize()
+            textLabel.pin.top().left().before(of: segmentedControl).margin(margin).sizeToFit(.width)
         } else {
             // The UISegmentedControl is placed below the label.
-            textLabel.pin.top().left().right().margin(margin).fitSize()
+            textLabel.pin.top().left().right().margin(margin).sizeToFit(.width)
             segmentedControl.pin.below(of: textLabel).right().margin(margin)
         }
 

Example/PinLayoutSample/UI/Examples/CollectionViewExample/HouseCell.swift

@@ -65,6 +65,7 @@ class HouseCell: UICollectionViewCell {
         nameLabel.text = house.name
         priceLabel.text = house.price
         distanceLabel.text = "\(house.distance) KM"
+        distanceLabel.textAlignment = .right
 
         mainImage.download(url: house.mainImageURL)
         mainImage.contentMode = .scaleAspectFill
@@ -79,13 +80,13 @@ class HouseCell: UICollectionViewCell {
 
     private func layout() {
         headerView.pin.top().horizontally().height(100)
-        nameLabel.pin.top().horizontally().margin(padding).fitSize()
+        nameLabel.pin.top().horizontally().margin(padding).sizeToFit(.width)
 
         mainImage.pin.below(of: nameLabel).horizontally().height(300).marginTop(padding)
 
         footerView.pin.below(of: mainImage).horizontally()
-        priceLabel.pin.top().horizontally().fitSize().margin(6, padding)
-        distanceLabel.pin.top().after(of: priceLabel).right().fitSize().justify(.right).margin(6, padding)
+        priceLabel.pin.top().horizontally().margin(6, padding).sizeToFit(.width)
+        distanceLabel.pin.top().after(of: priceLabel).right().margin(6, padding).sizeToFit(.width)
         footerView.pin.height(max(priceLabel.frame.maxY, distanceLabel.frame.maxY) + 6)
 
         contentView.pin.height(footerView.frame.maxY)

Example/PinLayoutSample/UI/Examples/Intro/IntroView.swift

@@ -64,7 +64,7 @@ class IntroView: BaseView {
 
         logo.pin.top().left().size(100).aspectRatio().marginTop(10)
         segmented.pin.after(of: logo, aligned: .top).right().marginLeft(10)
-        textLabel.pin.below(of: segmented, aligned: .left).width(of: segmented).pinEdges().marginTop(10).fitSize()
+        textLabel.pin.below(of: segmented, aligned: .left).width(of: segmented).pinEdges().marginTop(10).sizeToFit(.width)
         separatorView.pin.below(of: [logo, textLabel], aligned: .left).right(to: segmented.edge.right).marginTop(10)
     }
 }

Example/PinLayoutSample/UI/Examples/IntroObjectiveC/IntroObjectiveCView.m

@@ -61,7 +61,7 @@ - (void) layoutSubviews {
 
     [[[[[[logo.pinObjc top] left] width:100] aspectRatio] marginWithTop:topLayoutGuide + 10 horizontal:10 bottom:10] layout];
     [[[[segmented.pinObjc rightOf:logo aligned:VerticalAlignTop] right] marginHorizontal:10] layout];
-    [[[[[[textLabel.pinObjc belowOf:segmented aligned:HorizontalAlignLeft] widthOf:segmented] pinEdges] marginTop:10] fitSize] layout];
+    [[[[[[textLabel.pinObjc belowOf:segmented aligned:HorizontalAlignLeft] widthOf:segmented] pinEdges] marginTop:10] sizeToFit:FitWidth] layout];
     [[[[[separatorView.pinObjc belowOfViews:@[logo, textLabel] aligned:HorizontalAlignLeft] rightTo:segmented.edge.right] height:1] marginTop:10] layout];
 }
 

Example/PinLayoutSample/UI/Examples/IntroRTL/IntroRTLView.swift

@@ -69,7 +69,7 @@ class IntroRTLView: BaseView {
 
         logo.pin.top().start().size(100).aspectRatio().marginTop(10)
         segmented.pin.after(of: logo, aligned: .top).end().marginStart(10)
-        textLabel.pin.below(of: segmented, aligned: .start).width(of: segmented).pinEdges().marginTop(10).fitSize()
+        textLabel.pin.below(of: segmented, aligned: .start).width(of: segmented).pinEdges().marginTop(10).sizeToFit(.width)
         separatorView.pin.below(of: [logo, textLabel], aligned: .start).end(to: segmented.edge.end).marginTop(10)
     }
 }

Example/PinLayoutSample/UI/Examples/TableViewExample/Cells/MethodCell.swift

@@ -61,8 +61,8 @@ class MethodCell: UITableViewCell {
 
     fileprivate func layout() {
         iconImageView.pin.top().left().size(30).margin(margin)
-        nameLabel.pin.right(of: iconImageView, aligned: .center).right().marginHorizontal(margin).fitSize()
-        descriptionLabel.pin.below(of: [iconImageView, nameLabel]).left().right().margin(margin).fitSize()
+        nameLabel.pin.right(of: iconImageView, aligned: .center).right().marginHorizontal(margin).sizeToFit(.width)
+        descriptionLabel.pin.below(of: [iconImageView, nameLabel]).left().right().margin(margin).sizeToFit(.width)
     }
 
     override func sizeThatFits(_ size: CGSize) -> CGSize {

Example/PinLayoutSample/UI/Examples/TableViewExample/Cells/MethodGroupHeader.swift

@@ -43,6 +43,6 @@ class MethodGroupHeader: UITableViewHeaderFooterView {
     override func layoutSubviews() {
         super.layoutSubviews()
 
-        titleLabel.pin.left().right().vCenter().margin(10).fitSize()
+        titleLabel.pin.left().right().vCenter().margin(10).sizeToFit(.width)
     }
 }