mirror of https://github.com/SnapKit/SnapKit
Added support for view controller layout guides
This commit is contained in:
parent
62b058de00
commit
6252444966
|
@ -7,9 +7,10 @@
|
||||||
objects = {
|
objects = {
|
||||||
|
|
||||||
/* Begin PBXBuildFile section */
|
/* Begin PBXBuildFile section */
|
||||||
|
EE4910981B19A26000A54F1F /* ViewController+SnapKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE4910971B19A26000A54F1F /* ViewController+SnapKit.swift */; };
|
||||||
|
EE4910991B19A40200A54F1F /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEBCC9D819CC627D0083B827 /* SnapKit.framework */; };
|
||||||
EE94F6091AC0F10A008767FF /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE94F6081AC0F10A008767FF /* UIKit.framework */; };
|
EE94F6091AC0F10A008767FF /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE94F6081AC0F10A008767FF /* UIKit.framework */; };
|
||||||
EE94F60B1AC0F10F008767FF /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE94F60A1AC0F10F008767FF /* AppKit.framework */; };
|
EE94F60B1AC0F10F008767FF /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE94F60A1AC0F10F008767FF /* AppKit.framework */; };
|
||||||
EE94F6101AC0F143008767FF /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEBCC9D819CC627D0083B827 /* SnapKit.framework */; };
|
|
||||||
EE94F6111AC0F146008767FF /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EECDB37A1AC0C9D4006BBC11 /* SnapKit.framework */; };
|
EE94F6111AC0F146008767FF /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EECDB37A1AC0C9D4006BBC11 /* SnapKit.framework */; };
|
||||||
EECDB36C1AC0C9A6006BBC11 /* Constraint.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB35E1AC0C95C006BBC11 /* Constraint.swift */; };
|
EECDB36C1AC0C9A6006BBC11 /* Constraint.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB35E1AC0C95C006BBC11 /* Constraint.swift */; };
|
||||||
EECDB36D1AC0C9A6006BBC11 /* ConstraintAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB35F1AC0C95C006BBC11 /* ConstraintAttributes.swift */; };
|
EECDB36D1AC0C9A6006BBC11 /* ConstraintAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB35F1AC0C95C006BBC11 /* ConstraintAttributes.swift */; };
|
||||||
|
@ -50,6 +51,7 @@
|
||||||
/* End PBXContainerItemProxy section */
|
/* End PBXContainerItemProxy section */
|
||||||
|
|
||||||
/* Begin PBXFileReference section */
|
/* Begin PBXFileReference section */
|
||||||
|
EE4910971B19A26000A54F1F /* ViewController+SnapKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ViewController+SnapKit.swift"; sourceTree = "<group>"; };
|
||||||
EE94F6081AC0F10A008767FF /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
|
EE94F6081AC0F10A008767FF /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
|
||||||
EE94F60A1AC0F10F008767FF /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = DEVELOPER_DIR; };
|
EE94F60A1AC0F10F008767FF /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = DEVELOPER_DIR; };
|
||||||
EEBCC9D819CC627D0083B827 /* SnapKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SnapKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
EEBCC9D819CC627D0083B827 /* SnapKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SnapKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
|
@ -86,7 +88,7 @@
|
||||||
isa = PBXFrameworksBuildPhase;
|
isa = PBXFrameworksBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
EE94F6101AC0F143008767FF /* SnapKit.framework in Frameworks */,
|
EE4910991B19A40200A54F1F /* SnapKit.framework in Frameworks */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
|
@ -147,6 +149,7 @@
|
||||||
EEFCF3311AD9432400A425FA /* ConstraintDescription.swift */,
|
EEFCF3311AD9432400A425FA /* ConstraintDescription.swift */,
|
||||||
EECDB3611AC0C95C006BBC11 /* ConstraintMaker.swift */,
|
EECDB3611AC0C95C006BBC11 /* ConstraintMaker.swift */,
|
||||||
EECDB3671AC0C95C006BBC11 /* View+SnapKit.swift */,
|
EECDB3671AC0C95C006BBC11 /* View+SnapKit.swift */,
|
||||||
|
EE4910971B19A26000A54F1F /* ViewController+SnapKit.swift */,
|
||||||
EECDB3601AC0C95C006BBC11 /* ConstraintItem.swift */,
|
EECDB3601AC0C95C006BBC11 /* ConstraintItem.swift */,
|
||||||
EECDB3631AC0C95C006BBC11 /* EdgeInsets.swift */,
|
EECDB3631AC0C95C006BBC11 /* EdgeInsets.swift */,
|
||||||
EECDB3651AC0C95C006BBC11 /* LayoutConstraint.swift */,
|
EECDB3651AC0C95C006BBC11 /* LayoutConstraint.swift */,
|
||||||
|
@ -357,6 +360,7 @@
|
||||||
EEFCF3321AD9432400A425FA /* ConstraintDescription.swift in Sources */,
|
EEFCF3321AD9432400A425FA /* ConstraintDescription.swift in Sources */,
|
||||||
EECDB3731AC0C9A6006BBC11 /* View+SnapKit.swift in Sources */,
|
EECDB3731AC0C9A6006BBC11 /* View+SnapKit.swift in Sources */,
|
||||||
EECDB3711AC0C9A6006BBC11 /* EdgeInsets.swift in Sources */,
|
EECDB3711AC0C9A6006BBC11 /* EdgeInsets.swift in Sources */,
|
||||||
|
EE4910981B19A26000A54F1F /* ViewController+SnapKit.swift in Sources */,
|
||||||
EECDB36F1AC0C9A6006BBC11 /* ConstraintMaker.swift in Sources */,
|
EECDB36F1AC0C9A6006BBC11 /* ConstraintMaker.swift in Sources */,
|
||||||
EECDB36D1AC0C9A6006BBC11 /* ConstraintAttributes.swift in Sources */,
|
EECDB36D1AC0C9A6006BBC11 /* ConstraintAttributes.swift in Sources */,
|
||||||
EECDB3721AC0C9A6006BBC11 /* LayoutConstraint.swift in Sources */,
|
EECDB3721AC0C9A6006BBC11 /* LayoutConstraint.swift in Sources */,
|
||||||
|
|
|
@ -0,0 +1,46 @@
|
||||||
|
//
|
||||||
|
// SnapKit
|
||||||
|
//
|
||||||
|
// Copyright (c) 2011-2015 SnapKit Team - https://github.com/SnapKit
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
#if os(iOS)
|
||||||
|
import UIKit
|
||||||
|
public typealias ViewController = UIViewController
|
||||||
|
|
||||||
|
/**
|
||||||
|
Used to expose public API on view controllers
|
||||||
|
*/
|
||||||
|
public extension UIViewController {
|
||||||
|
|
||||||
|
/// top layout guide top
|
||||||
|
public var snp_topLayoutGuideTop: ConstraintItem { return ConstraintItem(object: self.topLayoutGuide, attributes: ConstraintAttributes.Top) }
|
||||||
|
|
||||||
|
/// top layout guide bottom
|
||||||
|
public var snp_topLayoutGuideBottom: ConstraintItem { return ConstraintItem(object: self.topLayoutGuide, attributes: ConstraintAttributes.Bottom) }
|
||||||
|
|
||||||
|
/// bottom layout guide top
|
||||||
|
public var snp_bottomLayoutGuideTop: ConstraintItem { return ConstraintItem(object: self.bottomLayoutGuide, attributes: ConstraintAttributes.Top) }
|
||||||
|
|
||||||
|
/// bottom layout guide bottom
|
||||||
|
public var snp_bottomLayoutGuideBottom: ConstraintItem { return ConstraintItem(object: self.bottomLayoutGuide, attributes: ConstraintAttributes.Bottom) }
|
||||||
|
|
||||||
|
}
|
||||||
|
#endif
|
|
@ -29,6 +29,22 @@ class SnapKitTests: XCTestCase {
|
||||||
super.tearDown()
|
super.tearDown()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func testLayoutGuideConstraints() {
|
||||||
|
#if os(iOS)
|
||||||
|
let vc = UIViewController()
|
||||||
|
vc.view = UIView(frame: CGRectMake(0, 0, 300, 300))
|
||||||
|
|
||||||
|
vc.view.addSubview(self.container)
|
||||||
|
|
||||||
|
self.container.snp_makeConstraints { (make) -> Void in
|
||||||
|
make.top.equalTo(vc.snp_topLayoutGuideBottom)
|
||||||
|
make.bottom.equalTo(vc.snp_bottomLayoutGuideTop)
|
||||||
|
}
|
||||||
|
|
||||||
|
XCTAssertEqual(vc.view.snp_constraints.count, 6, "Should have 6 constraints installed")
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
func testMakeConstraints() {
|
func testMakeConstraints() {
|
||||||
let v1 = View()
|
let v1 = View()
|
||||||
let v2 = View()
|
let v2 = View()
|
||||||
|
|
Loading…
Reference in New Issue