TVOS Update

idefav · Dec 15, 2015 · 86ae830 · 86ae830
1 parent 75323c4
commit 86ae830
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 20 deletions.
diff --git a/Masonry/MASCompositeConstraint.m b/Masonry/MASCompositeConstraint.m
@@ -97,7 +97,7 @@ - (MASConstraint *)addConstraintWithLayoutAttribute:(NSLayoutAttribute)layoutAtt
 
 #pragma mark - Animator proxy
 
-#if TARGET_OS_MAC && !TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_MAC && !(TARGET_OS_IPHONE || TARGET_OS_TV)
 
 - (MASConstraint *)animator {
     for (MASConstraint *constraint in self.childConstraints) {

diff --git a/Masonry/MASConstraint.h b/Masonry/MASConstraint.h
@@ -127,7 +127,7 @@
 - (MASConstraint *)centerY;
 - (MASConstraint *)baseline;
 
-#if TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 
 - (MASConstraint *)leftMargin;
 - (MASConstraint *)rightMargin;
@@ -178,7 +178,7 @@
 
 // NSLayoutConstraint Installation support
 
-#if TARGET_OS_MAC && !TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_MAC && !(TARGET_OS_IPHONE || TARGET_OS_TV)
 /**
  *  Whether or not to go through the animator proxy when modifying the constraint
  */

diff --git a/Masonry/MASConstraint.m b/Masonry/MASConstraint.m
@@ -208,7 +208,7 @@ - (MASConstraint *)baseline {
     return [self addConstraintWithLayoutAttribute:NSLayoutAttributeBaseline];
 }
 
-#if TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 
 - (MASConstraint *)leftMargin {
     return [self addConstraintWithLayoutAttribute:NSLayoutAttributeLeftMargin];
@@ -264,7 +264,7 @@ - (void)setCenterOffset:(CGPoint __unused)centerOffset { MASMethodNotImplemented
 
 - (void)setOffset:(CGFloat __unused)offset { MASMethodNotImplemented(); }
 
-#if TARGET_OS_MAC && !TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_MAC && !(TARGET_OS_IPHONE || TARGET_OS_TV)
 
 - (MASConstraint *)animator { MASMethodNotImplemented(); }
 

diff --git a/Masonry/MASConstraintMaker.h b/Masonry/MASConstraintMaker.h
@@ -22,7 +22,7 @@ typedef NS_OPTIONS(NSInteger, MASAttribute) {
     MASAttributeCenterY = 1 << NSLayoutAttributeCenterY,
     MASAttributeBaseline = 1 << NSLayoutAttributeBaseline,
 
-#if TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 
     MASAttributeLeftMargin = 1 << NSLayoutAttributeLeftMargin,
     MASAttributeRightMargin = 1 << NSLayoutAttributeRightMargin,
@@ -60,7 +60,7 @@ typedef NS_OPTIONS(NSInteger, MASAttribute) {
 @property (nonatomic, strong, readonly) MASConstraint *centerY;
 @property (nonatomic, strong, readonly) MASConstraint *baseline;
 
-#if TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 
 @property (nonatomic, strong, readonly) MASConstraint *leftMargin;
 @property (nonatomic, strong, readonly) MASConstraint *rightMargin;

diff --git a/Masonry/MASConstraintMaker.m b/Masonry/MASConstraintMaker.m
@@ -78,7 +78,7 @@ - (MASConstraint *)addConstraintWithAttributes:(MASAttribute)attrs {
     __unused MASAttribute anyAttribute = (MASAttributeLeft | MASAttributeRight | MASAttributeTop | MASAttributeBottom | MASAttributeLeading
                                           | MASAttributeTrailing | MASAttributeWidth | MASAttributeHeight | MASAttributeCenterX
                                           | MASAttributeCenterY | MASAttributeBaseline
-#if TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_IPHONE || TARGET_OS_TV
                                           | MASAttributeLeftMargin | MASAttributeRightMargin | MASAttributeTopMargin | MASAttributeBottomMargin
                                           | MASAttributeLeadingMargin | MASAttributeTrailingMargin | MASAttributeCenterXWithinMargins
                                           | MASAttributeCenterYWithinMargins
@@ -101,7 +101,7 @@ - (MASConstraint *)addConstraintWithAttributes:(MASAttribute)attrs {
     if (attrs & MASAttributeCenterY) [attributes addObject:self.view.mas_centerY];
     if (attrs & MASAttributeBaseline) [attributes addObject:self.view.mas_baseline];
 
-#if TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 
     if (attrs & MASAttributeLeftMargin) [attributes addObject:self.view.mas_leftMargin];
     if (attrs & MASAttributeRightMargin) [attributes addObject:self.view.mas_rightMargin];
@@ -182,7 +182,7 @@ - (MASConstraint *)baseline {
     };
 }
 
-#if TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 
 - (MASConstraint *)leftMargin {
     return [self addConstraintWithLayoutAttribute:NSLayoutAttributeLeftMargin];

diff --git a/Masonry/MASUtilities.h b/Masonry/MASUtilities.h
@@ -12,8 +12,6 @@
 
 #if TARGET_OS_IPHONE || TARGET_OS_TV
 
-    #define TARGET_OS_IPHONE_AND_OS_TV 1
-
     #import <UIKit/UIKit.h>
     #define MAS_VIEW UIView
     #define MAS_VIEW_CONTROLLER UIViewController

diff --git a/Masonry/MASViewConstraint.m b/Masonry/MASViewConstraint.m
@@ -86,7 +86,7 @@ + (NSArray *)installedConstraintsForView:(MAS_VIEW *)view {
 - (void)setLayoutConstant:(CGFloat)layoutConstant {
     _layoutConstant = layoutConstant;
 
-#if TARGET_OS_MAC && !TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_MAC && !(TARGET_OS_IPHONE || TARGET_OS_TV)
     if (self.useAnimator) {
         [self.layoutConstraint.animator setConstant:layoutConstant];
     } else {
@@ -211,7 +211,7 @@ - (MASConstraint *)addConstraintWithLayoutAttribute:(NSLayoutAttribute)layoutAtt
 
 #pragma mark - Animator proxy
 
-#if TARGET_OS_MAC && !TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_MAC && !(TARGET_OS_IPHONE || TARGET_OS_TV)
 
 - (MASConstraint *)animator {
     self.useAnimator = YES;

diff --git a/Masonry/NSLayoutConstraint+MASDebugAdditions.m b/Masonry/NSLayoutConstraint+MASDebugAdditions.m
@@ -44,7 +44,7 @@ + (NSDictionary *)layoutAttributeDescriptionsByValue {
             @(NSLayoutAttributeCenterY)  : @"centerY",
             @(NSLayoutAttributeBaseline) : @"baseline",
 
-#if TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_IPHONE || TARGET_OS_TV
             @(NSLayoutAttributeLeftMargin)           : @"leftMargin",
             @(NSLayoutAttributeRightMargin)          : @"rightMargin",
             @(NSLayoutAttributeTopMargin)            : @"topMargin",
@@ -66,7 +66,7 @@ + (NSDictionary *)layoutPriorityDescriptionsByValue {
     static dispatch_once_t once;
     static NSDictionary *descriptionMap;
     dispatch_once(&once, ^{
-#if TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_IPHONE || TARGET_OS_TV
         descriptionMap = @{
             @(MASLayoutPriorityDefaultHigh)      : @"high",
             @(MASLayoutPriorityDefaultLow)       : @"low",

diff --git a/Masonry/View+MASAdditions.h b/Masonry/View+MASAdditions.h
@@ -32,7 +32,7 @@
 @property (nonatomic, strong, readonly) MASViewAttribute *mas_baseline;
 @property (nonatomic, strong, readonly) MASViewAttribute *(^mas_attribute)(NSLayoutAttribute attr);
 
-#if TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 
 @property (nonatomic, strong, readonly) MASViewAttribute *mas_leftMargin;
 @property (nonatomic, strong, readonly) MASViewAttribute *mas_rightMargin;

diff --git a/Masonry/View+MASAdditions.m b/Masonry/View+MASAdditions.m
@@ -87,7 +87,7 @@ - (MASViewAttribute *)mas_baseline {
     };
 }
 
-#if TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 
 - (MASViewAttribute *)mas_leftMargin {
     return [[MASViewAttribute alloc] initWithView:self layoutAttribute:NSLayoutAttributeLeftMargin];

diff --git a/Masonry/View+MASShorthandAdditions.h b/Masonry/View+MASShorthandAdditions.h
@@ -29,7 +29,7 @@
 @property (nonatomic, strong, readonly) MASViewAttribute *baseline;
 @property (nonatomic, strong, readonly) MASViewAttribute *(^attribute)(NSLayoutAttribute attr);
 
-#if TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 
 @property (nonatomic, strong, readonly) MASViewAttribute *leftMargin;
 @property (nonatomic, strong, readonly) MASViewAttribute *rightMargin;
@@ -67,7 +67,7 @@ MAS_ATTR_FORWARD(centerX);
 MAS_ATTR_FORWARD(centerY);
 MAS_ATTR_FORWARD(baseline);
 
-#if TARGET_OS_IPHONE_AND_OS_TV
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 
 MAS_ATTR_FORWARD(leftMargin);
 MAS_ATTR_FORWARD(rightMargin);