Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support UIViewController's topLayoutGuide and bottomLayoutGuide #212

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Masonry.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
3AED06201AD5A1400053CC65 /* MASCompositeConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AED05DC1AD5A0470053CC65 /* MASCompositeConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; };
3AED06211AD5A1400053CC65 /* NSLayoutConstraint+MASDebugAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AED05ED1AD5A0470053CC65 /* NSLayoutConstraint+MASDebugAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
3AED06221AD5A1400053CC65 /* MASConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AED05DE1AD5A0470053CC65 /* MASConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; };
446A261F1B3A78F500115471 /* ViewController+MASAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 446A261D1B3A78F500115471 /* ViewController+MASAdditions.h */; };
446A26201B3A78F500115471 /* ViewController+MASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 446A261E1B3A78F500115471 /* ViewController+MASAdditions.m */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -82,6 +84,8 @@
3AED05F01AD5A0470053CC65 /* View+MASAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "View+MASAdditions.m"; sourceTree = "<group>"; };
3AED05F11AD5A0470053CC65 /* View+MASShorthandAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "View+MASShorthandAdditions.h"; sourceTree = "<group>"; };
3AED06271AD5A1400053CC65 /* Masonry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Masonry.framework; sourceTree = BUILT_PRODUCTS_DIR; };
446A261D1B3A78F500115471 /* ViewController+MASAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ViewController+MASAdditions.h"; sourceTree = "<group>"; };
446A261E1B3A78F500115471 /* ViewController+MASAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "ViewController+MASAdditions.m"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -146,6 +150,8 @@
3AED05ED1AD5A0470053CC65 /* NSLayoutConstraint+MASDebugAdditions.h */,
3AED05EE1AD5A0470053CC65 /* NSLayoutConstraint+MASDebugAdditions.m */,
3AED05BA1AD59FD40053CC65 /* Supporting Files */,
446A261D1B3A78F500115471 /* ViewController+MASAdditions.h */,
446A261E1B3A78F500115471 /* ViewController+MASAdditions.m */,
);
path = Masonry;
sourceTree = "<group>";
Expand All @@ -165,6 +171,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
446A261F1B3A78F500115471 /* ViewController+MASAdditions.h in Headers */,
3AED06051AD5A0470053CC65 /* View+MASAdditions.h in Headers */,
3AED06071AD5A0470053CC65 /* View+MASShorthandAdditions.h in Headers */,
3AED05FC1AD5A0470053CC65 /* MASViewAttribute.h in Headers */,
Expand Down Expand Up @@ -296,6 +303,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
446A26201B3A78F500115471 /* ViewController+MASAdditions.m in Sources */,
3AED06011AD5A0470053CC65 /* NSArray+MASAdditions.m in Sources */,
3AED05FD1AD5A0470053CC65 /* MASViewAttribute.m in Sources */,
3AED05FA1AD5A0470053CC65 /* MASLayoutConstraint.m in Sources */,
Expand Down
4 changes: 3 additions & 1 deletion Masonry/MASViewConstraint.m
Original file line number Diff line number Diff line change
Expand Up @@ -339,12 +339,14 @@ - (void)install {
layoutConstraint.priority = self.layoutPriority;
layoutConstraint.mas_key = self.mas_key;

if (secondLayoutItem) {
if ([secondLayoutItem isKindOfClass:[MAS_VIEW class]]) {
MAS_VIEW *closestCommonSuperview = [firstLayoutItem mas_closestCommonSuperview:secondLayoutItem];
NSAssert(closestCommonSuperview,
@"couldn't find a common superview for %@ and %@",
firstLayoutItem, secondLayoutItem);
self.installedView = closestCommonSuperview;
} else if (firstLayoutItem.superview) {
self.installedView = firstLayoutItem.superview;
} else {
self.installedView = firstLayoutItem;
}
Expand Down
1 change: 1 addition & 0 deletions Masonry/Masonry.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ FOUNDATION_EXPORT const unsigned char MasonryVersionString[];
#import "MASConstraintMaker.h"
#import "MASLayoutConstraint.h"
#import "NSLayoutConstraint+MASDebugAdditions.h"
#import "ViewController+MASAdditions.h"
20 changes: 20 additions & 0 deletions Masonry/ViewController+MASAdditions.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//
// ViewController_MASAdditions.h
// Masonry
//
// Created by Ray Lillywhite on 6/23/15.
// Copyright © 2015 Jonas Budelmann. All rights reserved.
//

#import <Foundation/Foundation.h>

#if TARGET_OS_IPHONE
#import <UIKit/UIKit.h>
@class MASViewAttribute;
@interface UIViewController (MASAdditions)

@property (nonatomic, strong, readonly) MASViewAttribute *mas_topLayoutGuide;
@property (nonatomic, strong, readonly) MASViewAttribute *mas_bottomLayoutGuide;

@end
#endif
24 changes: 24 additions & 0 deletions Masonry/ViewController+MASAdditions.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
//
// NSObject+ViewController_MASAdditions.m
// Masonry
//
// Created by Ray Lillywhite on 6/23/15.
// Copyright © 2015 Jonas Budelmann. All rights reserved.
//

#import "ViewController+MASAdditions.h"
#import "MASViewConstraint.h"

#if TARGET_OS_IPHONE
@implementation UIViewController (MASAdditions)

- (MASViewAttribute *)mas_topLayoutGuide {
return [[MASViewAttribute alloc] initWithView:self.topLayoutGuide layoutAttribute:NSLayoutAttributeBottom];
}

- (MASViewAttribute *)mas_bottomLayoutGuide {
return [[MASViewAttribute alloc] initWithView:self.bottomLayoutGuide layoutAttribute:NSLayoutAttributeTop];
}

@end
#endif
2 changes: 1 addition & 1 deletion Tests/Specs/MASViewConstraintSpec.m
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ - (void)testInstallWidthAsConstant {
expect(constraint.layoutConstraint.secondItem).to.beNil();
expect(constraint.layoutConstraint.relation).to.equal(NSLayoutRelationEqual);
expect(constraint.layoutConstraint.constant).to.equal(10);
expect(constraint.firstViewAttribute.view.constraints[0]).to.beIdenticalTo(constraint.layoutConstraint);
expect(constraint.firstViewAttribute.view.superview.constraints[0]).to.beIdenticalTo(constraint.layoutConstraint);
}


Expand Down