Merge branch 'master' into feature/sizeToFit

Author: lucdion

.gitignore

@@ -14,11 +14,8 @@ fastlane/report.xml
 fastlane/test_output
 
 TestProjects/cocoapods/ios/PinLayout-iOS.xcworkspace/
-TestProjects/cocoapods/ios/Podfile.lock
 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/

.swiftlint.yml

@@ -21,6 +21,10 @@ disabled_rules: # rule identifiers to exclude from running
   - identifier_name
   - line_length
   - empty_count
+  - todo
+  - private_over_fileprivate
 
 excluded: # paths to ignore during linting. overridden by `included`.
   - Pods
+  - Example/PinLayoutExampleMacOS
+  - TestProjects

CHANGELOG.md

@@ -7,6 +7,17 @@
 
 # Change Log
 
+## [1.8.4](https://github.com/layoutBox/PinLayout/releases/tag/1.8.4)
+Released on 2018-09-25
+
+#### Minor changes
+
+* Cleanup .xcodeproj
+* Removed Swiftlint warnings
+* Fix an issue with PinLayoutSample app related to IntroRTLView example
+
+* Added by [Luc Dion](https://github.com/lucdion) in Pull Request [#177](https://github.com/layoutBox/PinLayout/pull/177) 
+
 ## [1.8.3](https://github.com/layoutBox/PinLayout/releases/tag/1.8.3)
 Released on 2018-08-28
 

Example/PinLayoutSample.xcodeproj/project.pbxproj

@@ -104,20 +104,6 @@
 			remoteInfo = "PinLayoutTests-tvOS";
 		};
 /* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		2468130D1F8D013600462E53 /* Embed App Extensions */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 13;
-			files = (
-			);
-			name = "Embed App Extensions";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
 		241637701F8E4BC200EE703A /* IntroObjectiveCViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntroObjectiveCViewController.h; sourceTree = "<group>"; };
 		241637711F8E4BC200EE703A /* IntroObjectiveCViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IntroObjectiveCViewController.m; sourceTree = "<group>"; };
@@ -499,9 +485,8 @@
 				249EFE3B1E64FAFE00165E39 /* Sources */,
 				249EFE3C1E64FAFE00165E39 /* Frameworks */,
 				249EFE3D1E64FAFE00165E39 /* Resources */,
-				5D3C4568AFC08267110D9971 /* [CP] Embed Pods Frameworks */,
 				24E6547E1E68F88D00A72A8B /* Run Swiftlint */,
-				2468130D1F8D013600462E53 /* Embed App Extensions */,
+				A57F7C48B21998F5C851B138 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -624,15 +609,15 @@
 			shellPath = /bin/sh;
 			shellScript = ../Pods/SwiftLint/swiftlint;
 		};
-		5D3C4568AFC08267110D9971 /* [CP] Embed Pods Frameworks */ = {
+		A57F7C48B21998F5C851B138 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 				"${SRCROOT}/../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
-				"${PODS_ROOT}/Reveal-SDK/RevealServer-17/iOS/RevealServer.framework",
+				"${PODS_ROOT}/Reveal-SDK/RevealServer-18/iOS/RevealServer.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -848,6 +833,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = A35A00E6536E49A548E763E6 /* Pods-PinLayoutSample.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				DEVELOPMENT_TEAM = "";
@@ -865,6 +851,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C589624E868FCB20F7C10918 /* Pods-PinLayoutSample.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				DEVELOPMENT_TEAM = "";

Example/PinLayoutSample/UI/Common/BaseFormView.swift

@@ -22,10 +22,10 @@ import PinLayout
 
 class BaseFormView: UIView {
     let formScrollView = UIScrollView()
-    
+
     init() {
         super.init(frame: .zero)
-        
+
         formScrollView.showsVerticalScrollIndicator = false
         formScrollView.keyboardDismissMode = .onDrag
 
@@ -35,7 +35,7 @@ class BaseFormView: UIView {
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: .UIKeyboardWillShow, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: .UIKeyboardWillHide, object: nil)
     }
-    
+
     required init(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -46,7 +46,7 @@ class BaseFormView: UIView {
 
     override func layoutSubviews() {
         super.layoutSubviews()
-        
+
         formScrollView.pin.all()
     }
 
@@ -55,23 +55,23 @@ class BaseFormView: UIView {
         guard let sizeValue = notification.userInfo?[UIKeyboardFrameEndUserInfoKey] as? NSValue else { return }
         setFormScrollView(bottomInset: sizeValue.cgRectValue.height)
     }
-    
+
     @objc
     internal func keyboardWillHide(notification: Notification) {
         resetScrollOffset()
     }
-    
+
     @objc
     internal func didTapScrollView() {
         endEditing(true)
         resetScrollOffset()
     }
-    
+
     private func resetScrollOffset() {
         guard formScrollView.contentInset != .zero else { return }
         setFormScrollView(bottomInset: 0)
     }
-    
+
     private func setFormScrollView(bottomInset: CGFloat) {
         formScrollView.contentInset = UIEdgeInsets(top: formScrollView.contentInset.top, left: 0,
                                                    bottom: bottomInset, right: 0)

Example/PinLayoutSample/UI/Common/BasicView.swift

@@ -21,14 +21,14 @@ import UIKit
 
 class BasicView: UIView {
     private let label = UILabel()
-    
+
     init(text: String? = nil, color: UIColor) {
         super.init(frame: .zero)
 
         backgroundColor = color
         layer.borderWidth = 1
         layer.borderColor = UIColor.lightGray.cgColor
-        
+
         label.text = text
         label.font = .systemFont(ofSize: 7)
         label.textColor = .white
@@ -39,16 +39,16 @@ class BasicView: UIView {
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
+
     override func layoutSubviews() {
         super.layoutSubviews()
-            
+
         label.pin.top().horizontally().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 && size.height != CGFloat.greatestFiniteMagnitude {
@@ -64,7 +64,7 @@ class BasicView: UIView {
             newSize.width = 40
             newSize.height = sizeThatFitsExpectedArea / newSize.width
         }
-        
+
         return newSize
     }
 }

Example/PinLayoutSample/UI/Common/Stylesheet.swift

@@ -20,6 +20,11 @@
 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) }
+    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/AdjustToContainer/AdjustToContainerView.swift

@@ -40,7 +40,7 @@ class AdjustToContainerView: UIView {
 
     override func layoutSubviews() {
         super.layoutSubviews()
-        
+
         languageSelectorView.pin.top(pin.safeArea).horizontally(pin.safeArea).sizeToFit(.width)
         swiftOpinionSelector.pin.below(of: languageSelectorView).horizontally(pin.safeArea).marginTop(10).sizeToFit(.width)
         swiftUsageSelector.pin.below(of: swiftOpinionSelector).horizontally(pin.safeArea).marginTop(10).sizeToFit(.width)

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

@@ -26,14 +26,14 @@ class AdjustToContainerViewController: UIViewController {
 
     init(pageType: PageType) {
         super.init(nibName: nil, bundle: nil)
-        
+
         title = pageType.title
     }
-    
+
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
     }
-    
+
     override func loadView() {
         view = AdjustToContainerView()
     }

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

@@ -24,7 +24,7 @@ class ChoiceSelectorView: UIView {
 
     private let textLabel = UILabel()
     private let segmentedControl = UISegmentedControl()
-    
+
     init(text: String, choices: [String]) {
         super.init(frame: .zero)
 
@@ -33,33 +33,33 @@ class ChoiceSelectorView: UIView {
         textLabel.numberOfLines = 0
         textLabel.lineBreakMode = .byWordWrapping
         addSubview(textLabel)
-        
+
         choices.forEach({ segmentedControl.insertSegment(withTitle: $0, at: segmentedControl.numberOfSegments, animated: false) })
         segmentedControl.tintColor = .pinLayoutColor
         segmentedControl.sizeToFit()
         addSubview(segmentedControl)
     }
-    
+
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
+
     override func layoutSubviews() {
         super.layoutSubviews()
         _ = layout()
     }
-    
+
     override func sizeThatFits(_ size: CGSize) -> CGSize {
         // 1) Set the width to the specified width
         self.pin.width(size.width)
-        
+
         // 2) Layout the contentView's controls
         return layout()
     }
-    
+
     private func layout() -> CGSize {
         let margin: CGFloat = 12
-        
+
         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)
@@ -69,7 +69,7 @@ class ChoiceSelectorView: UIView {
             textLabel.pin.top().horizontally().margin(margin).sizeToFit(.width)
             segmentedControl.pin.below(of: textLabel).right().margin(margin)
         }
-        
+
         return CGSize(width: frame.width, height: max(textLabel.frame.maxY, segmentedControl.frame.maxY) + margin)
     }
 }