Merge pull request #28 from lucdion/add_percentages

Add width/height methods taking percentage parameter

Author: Luc Dion

FlexLayout.xcodeproj/project.pbxproj

@@ -11,6 +11,7 @@
 		2458137F1F4A21CF00CD676B /* PaddingSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2458137E1F4A21CF00CD676B /* PaddingSpec.swift */; };
 		249008D41F165D4C00BBE9CD /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 24DA376A1EF843C500D1AB2F /* Info.plist */; };
 		24A91B281F45E24B00AC8B3E /* MarginSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24A91B271F45E24B00AC8B3E /* MarginSpec.swift */; };
+		24CC0E401F96807400BEE2CF /* Percent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24CC0E3F1F96807400BEE2CF /* Percent.swift */; };
 		24DA37641EF843C500D1AB2F /* FlexLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24DA375A1EF843C500D1AB2F /* FlexLayout.framework */; };
 		24DA37691EF843C500D1AB2F /* FlexLayoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24DA37681EF843C500D1AB2F /* FlexLayoutTests.swift */; };
 		24DA37881EF8610400D1AB2F /* FlexLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24DA37871EF8610400D1AB2F /* FlexLayout.swift */; };
@@ -35,6 +36,7 @@
 		244F4ABD1F8196E900460B54 /* YogaKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = YogaKit.framework; path = Carthage/Build/iOS/YogaKit.framework; sourceTree = "<group>"; };
 		2458137E1F4A21CF00CD676B /* PaddingSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PaddingSpec.swift; sourceTree = "<group>"; };
 		24A91B271F45E24B00AC8B3E /* MarginSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarginSpec.swift; sourceTree = "<group>"; };
+		24CC0E3F1F96807400BEE2CF /* Percent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Percent.swift; path = Sources/Percent.swift; sourceTree = SOURCE_ROOT; };
 		24DA375A1EF843C500D1AB2F /* FlexLayout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FlexLayout.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		24DA37631EF843C500D1AB2F /* FlexLayoutTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FlexLayoutTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		24DA37681EF843C500D1AB2F /* FlexLayoutTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlexLayoutTests.swift; sourceTree = "<group>"; };
@@ -99,6 +101,7 @@
 			isa = PBXGroup;
 			children = (
 				24DA37871EF8610400D1AB2F /* FlexLayout.swift */,
+				24CC0E3F1F96807400BEE2CF /* Percent.swift */,
 				DF9174751F1D6DA20034632D /* Impl */,
 				2429E4BD1F19181F00BBC032 /* Supporting Files */,
 			);
@@ -316,6 +319,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				DF9174791F1D6DEA0034632D /* UIView+FlexLayout.swift in Sources */,
+				24CC0E401F96807400BEE2CF /* Percent.swift in Sources */,
 				DF9174771F1D6DC00034632D /* FlexLayout+Enum.swift in Sources */,
 				24DA37881EF8610400D1AB2F /* FlexLayout.swift in Sources */,
 			);
@@ -386,7 +390,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -435,7 +439,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

FlexLayout/Percent.swift

@@ -0,0 +1,38 @@
+//  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
+
+public struct Percent {
+    let value: CGFloat
+}
+
+postfix operator %
+public postfix func % (v: CGFloat) -> Percent {
+    return Percent(value: v)
+}
+
+public postfix func % (v: Int) -> Percent {
+    return Percent(value: CGFloat(v))
+}
+
+prefix operator -
+public prefix func - (p: Percent) -> Percent {
+    return Percent(value: -p.value)
+}

Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - FlexLayout (1.1.1):
+  - FlexLayout (1.1.3):
     - YogaKit (~> 1.6)
   - Nimble (7.0.1)
   - PinLayout (1.2.3)
@@ -24,7 +24,7 @@ EXTERNAL SOURCES:
     :path: ./
 
 SPEC CHECKSUMS:
-  FlexLayout: 64e758c6951a826cb7d54f09874977ad84731cb1
+  FlexLayout: 8a65c1c9426b9567b81bd0205c2b0adb670bfef4
   Nimble: 657d000e11df8aebe27cdaf9d244de7f30ed87f7
   PinLayout: 96d403c7da4e5168ba238f0401b7fed24ebfdd6f
   Quick: dafc587e21eed9f4cab3249b9f9015b0b7a7f71d

README.md

@@ -23,7 +23,7 @@ Flexbox is an incredible improvement over UIStackView. It is simpler to use, muc
 
 
 ### Requirements
-* iOS 8.0+
+* iOS 9.0+
 * Xcode 8.0+ / Xcode 9.0
 * Swift 3.0+ / Swift 4.0
 
@@ -637,10 +637,12 @@ For example, if all items have `grow` set to 1, every child will set to an equal
 
 * **`shrink(_: CGFloat)`**  
 It specifies the "flex shrink factor", which determines how much the flex item will shrink relative to the rest of the flex items in the flex container when there isn't enough space on the main-axis.
-
+  
   When omitted, it is set to 0 and the flex shrink factor is multiplied by the flex `basis` when distributing negative space.
 
   A shrink value of 0 keeps the view's size in the main-axis direction. Note that this may cause the view to overflow its flex container.
+  
+  Shrink is about proportions. If an item has a shrink of 3, and the rest have a shrink of 1, the item will shrink 3x as fast as the rest.
 
 <br>
 
@@ -781,8 +783,12 @@ FlexLayout has methods to set the view’s height and width.
 
 * **`width(_ width: CGFloat)`**  
 The value specifies the view's width in pixels. The value must be non-negative.
+* **`width(_ percent: FPercent)`**  
+The value specifies the view's width in percentage of its container width. The value must be non-negative.
 * **`height(_ height: CGFloat)`**  
 The value specifies the view's height in pixels. The value must be non-negative.
+* **`height(_ percent: FPercent)`**  
+The value specifies the view's height in percentage of its container height. The value must be non-negative.
 * **`size(_ size: CGSize)`**  
 The value specifies view's width and the height in pixels. Values must be non-negative.
 * **`size(_ sideLength: CGFloat)`**  
@@ -792,6 +798,7 @@ The value specifies the width and the height of the view in pixels, creating a s
 ###### Usage examples:
 ```swift
   view.flex.width(100)	
+  view.flex.width(50%)	
   view.flex.height(200)
 
   view.flex.size(250)
@@ -815,23 +822,29 @@ Another case where Min and Max dimension constraints are useful is when using `a
 
 * **`minWidth(_ width: CGFloat)`** 
 The value specifies the view's minimum width of the view in pixels. The value must be non-negative.
-
+* **`minWidth(_ percent: FPercent)`** 
+The value specifies the view's minimum width of the view in percentage of its container width. The value must be non-negative.
 * **`maxWidth(_ width: CGFloat)`**  
 The value specifies the view's maximum width of the view in pixels. The value must be non-negative.
-
+* **`maxWidth(_ percent: FPercent)`**  
+The value specifies the view's maximum width of the view in percentage of its container width. The value must be non-negative.
 * **`minHeight(_ height: CGFloat)`**
 The value specifies the view's minimum height of the view in pixels. The value must be non-negative.
-
+* **`minHeight(_ percent: FPercent)`**
+The value specifies the view's minimum height of the view in percentage of its container height. The value must be non-negative.
 * **`maxHeight(_ height: CGFloat)`**
 The value specifies the view's maximum height of the view in pixels. The value must be non-negative.
+* **`maxHeight(_ percent: FPercent)`**
+The value specifies the view's maximum height of the view in percentage of its container height. The value must be non-negative.
 
 ###### Usage examples:
 ```swift
   view.flex.maxWidth(200)
+  view.flex.maxWidth(50%)
   view.flex.width(of: view1).maxWidth(250)
 
   view.flex.maxHeight(100)
-  view.flex.height(of: view1).maxHeight(200)
+  view.flex.height(of: view1).maxHeight(30%)
 ```
 <br>
 

Sources/FlexLayout.swift

@@ -341,6 +341,16 @@ public class Flex {
         return self
     }
 
+    /**
+     The value specifies the view's width in percentage of its container width. The value must be non-negative.
+     Example: view.flex.width(20%)
+     */
+    @discardableResult
+    public func width(_ percent: FPercent) -> Flex {
+        view.yoga.width = YGValue(value: Float(percent.value), unit: .percent)
+        return self
+    }
+    
     /**
      The value specifies the view's height in pixels. The value must be non-negative.
      */
@@ -350,6 +360,16 @@ public class Flex {
         return self
     }
 
+    /**
+     The value specifies the view's height in percentage of its container height. The value must be non-negative.
+     Example: view.flex.height(40%)
+     */
+    @discardableResult
+    public func height(_ percent: FPercent) -> Flex {
+        view.yoga.height = YGValue(value: Float(percent.value), unit: .percent)
+        return self
+    }
+    
     /**
      The value specifies view's width and the height in pixels. Values must be non-negative.
      */
@@ -371,16 +391,25 @@ public class Flex {
     }
 
     /**
-     The value specifies the view's minimum width of the view in pixels. The value must be non-negative.
+     The value specifies the view's minimum width in pixels. The value must be non-negative.
      */
     @discardableResult
     public func minWidth(_ value: CGFloat) -> Flex {
         view.yoga.minWidth = YGValue(value)
         return self
     }
+    
+    /**
+     The value specifies the view's minimum width in percentage of its container width. The value must be non-negative.
+     */
+    @discardableResult
+    public func minWidth(_ percent: FPercent) -> Flex {
+        view.yoga.minWidth = YGValue(value: Float(percent.value), unit: .percent)
+        return self
+    }
 
     /**
-     The value specifies the view's maximum width of the view in pixels. The value must be non-negative.
+     The value specifies the view's maximum width in pixels. The value must be non-negative.
      */
     @discardableResult
     public func maxWidth(_ value: CGFloat) -> Flex {
@@ -389,23 +418,50 @@ public class Flex {
     }
 
     /**
-     The value specifies the view's minimum height of the view in pixels. The value must be non-negative.
+     The value specifies the view's maximum width in percentage of its container width. The value must be non-negative.
+     */
+    @discardableResult
+    public func maxWidth(_ percent: FPercent) -> Flex {
+        view.yoga.maxWidth = YGValue(value: Float(percent.value), unit: .percent)
+        return self
+    }
+    
+    /**
+     The value specifies the view's minimum height in pixels. The value must be non-negative.
      */
     @discardableResult
     public func minHeight(_ value: CGFloat) -> Flex {
         view.yoga.minHeight = YGValue(value)
         return self
     }
+    
+    /**
+     The value specifies the view's minimum height in percentage of its container height. The value must be non-negative.
+     */
+    @discardableResult
+    public func minHeight(_ percent: FPercent) -> Flex {
+        view.yoga.minHeight = YGValue(value: Float(percent.value), unit: .percent)
+        return self
+    }
 
     /**
-     The value specifies the view's maximum height of the view in pixels. The value must be non-negative.
+     The value specifies the view's maximum height in pixels. The value must be non-negative.
      */
     @discardableResult
     public func maxHeight(_ value: CGFloat) -> Flex {
         view.yoga.maxHeight = YGValue(value)
         return self
     }
 
+    /**
+     The value specifies the view's maximum height in percentage of its container height. The value must be non-negative.
+     */
+    @discardableResult
+    public func maxHeight(_ percent: FPercent) -> Flex {
+        view.yoga.maxHeight = YGValue(value: Float(percent.value), unit: .percent)
+        return self
+    }
+    
     /**
      AspectRatio is a property introduced by Yoga that don't exist in CSS. AspectRatio solves the problem of knowing 
      one dimension of an element and an aspect ratio, this is very common when it comes to images, videos, and other

Sources/Percent.swift

@@ -0,0 +1,38 @@
+//  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
+
+public struct FPercent {
+    let value: CGFloat
+}
+
+postfix operator %
+public postfix func % (v: CGFloat) -> FPercent {
+    return FPercent(value: v)
+}
+
+public postfix func % (v: Int) -> FPercent {
+    return FPercent(value: CGFloat(v))
+}
+
+prefix operator -
+public prefix func - (p: FPercent) -> FPercent {
+    return FPercent(value: -p.value)
+}