Leverage new APIs to efficiently activate/deactivate arrays of constraints

smileyborg · smileyborg · commit 0a1d6878d95b · 2014-11-10T15:46:46.000-08:00
- Use the class methods on NSLayoutConstraint to activate and
deactivate arrays of constraints. These can be more efficient than
activating/deactivating constraints individually.
- Fix the preprocessor conditionals so that OS X 10.10 and higher can
use the new constraint activation/deactivation APIs when available
diff --git a/Example/PureLayoutTests/PureLayoutPriorityTests.m b/Example/PureLayoutTests/PureLayoutPriorityTests.m
@@ -145,7 +145,7 @@ - (void)testPriorityForPinningEdges
     }];
     
     [self assertConstraintIsAddedWithDefaultPriorities:^NSLayoutConstraint *{
-        return [weakSelf.viewB autoPinEdge:ALEdgeTrailing toEdge:ALEdgeLeft ofView:weakSelf.viewC withOffset:-95.0];
+        return [weakSelf.viewB autoPinEdge:ALEdgeTrailing toEdge:ALEdgeLeading ofView:weakSelf.viewC withOffset:-95.0];
     }];
     
     [self assertConstraintIsAddedWithDefaultPriorities:^NSLayoutConstraint *{
diff --git a/Source/ALView+PureLayout.h b/Source/ALView+PureLayout.h
@@ -1,6 +1,6 @@
 //
 //  ALView+PureLayout.h
-//  v2.0.1
+//  v2.0.2
 //  https://github.com/smileyborg/PureLayout
 //
 //  Copyright (c) 2012 Richard Turton
diff --git a/Source/ALView+PureLayout.m b/Source/ALView+PureLayout.m
@@ -1,6 +1,6 @@
 //
 //  ALView+PureLayout.m
-//  v2.0.1
+//  v2.0.2
 //  https://github.com/smileyborg/PureLayout
 //
 //  Copyright (c) 2012 Richard Turton
diff --git a/Source/NSArray+PureLayout.h b/Source/NSArray+PureLayout.h
@@ -1,6 +1,6 @@
 //
 //  NSArray+PureLayout.h
-//  v2.0.1
+//  v2.0.2
 //  https://github.com/smileyborg/PureLayout
 //
 //  Copyright (c) 2012 Richard Turton
diff --git a/Source/NSArray+PureLayout.m b/Source/NSArray+PureLayout.m
@@ -1,6 +1,6 @@
 //
 //  NSArray+PureLayout.m
-//  v2.0.1
+//  v2.0.2
 //  https://github.com/smileyborg/PureLayout
 //
 //  Copyright (c) 2012 Richard Turton
@@ -45,6 +45,20 @@ @implementation NSArray (PureLayout)
  */
 - (void)autoInstallConstraints
 {
+#if __PureLayout_MinBaseSDK_iOS_8_0 || __PureLayout_MinBaseSDK_OSX_10_10
+    if ([NSLayoutConstraint respondsToSelector:@selector(activateConstraints:)]) {
+        for (id object in self) {
+            if ([object isKindOfClass:[NSLayoutConstraint class]]) {
+                [ALView al_applyGlobalStateToConstraint:object];
+            }
+        }
+        if (![ALView al_preventAutomaticConstraintInstallation]) {
+            [NSLayoutConstraint activateConstraints:self];
+        }
+        return;
+    }
+#endif /* __PureLayout_MinBaseSDK_iOS_8_0 || __PureLayout_MinBaseSDK_OSX_10_10 */
+    
     for (id object in self) {
         if ([object isKindOfClass:[NSLayoutConstraint class]]) {
             [((NSLayoutConstraint *)object) autoInstall];
@@ -57,6 +71,13 @@ - (void)autoInstallConstraints
  */
 - (void)autoRemoveConstraints
 {
+#if __PureLayout_MinBaseSDK_iOS_8_0 || __PureLayout_MinBaseSDK_OSX_10_10
+    if ([NSLayoutConstraint respondsToSelector:@selector(deactivateConstraints:)]) {
+        [NSLayoutConstraint deactivateConstraints:self];
+        return;
+    }
+#endif /* __PureLayout_MinBaseSDK_iOS_8_0 || __PureLayout_MinBaseSDK_OSX_10_10 */
+    
     for (id object in self) {
         if ([object isKindOfClass:[NSLayoutConstraint class]]) {
             [((NSLayoutConstraint *)object) autoRemove];
@@ -359,10 +380,10 @@ - (NSArray *)autoDistributeViewsAlongAxis:(ALAxis)axis
             return nil;
     }
 #if TARGET_OS_IPHONE
-    BOOL isRightToLeftLayout = [UIApplication sharedApplication].userInterfaceLayoutDirection == UIUserInterfaceLayoutDirectionRightToLeft;
+    BOOL isRightToLeftLayout = [[UIApplication sharedApplication] userInterfaceLayoutDirection] == UIUserInterfaceLayoutDirectionRightToLeft;
 #else
-    BOOL isRightToLeftLayout =  [NSApp userInterfaceLayoutDirection] == NSUserInterfaceLayoutDirectionRightToLeft;
-#endif
+    BOOL isRightToLeftLayout = [[NSApplication sharedApplication] userInterfaceLayoutDirection] == NSUserInterfaceLayoutDirectionRightToLeft;
+#endif /* TARGET_OS_IPHONE */
     BOOL shouldFlipOrder = isRightToLeftLayout && (axis != ALAxisVertical); // imitate the effect of leading/trailing when distributing horizontally
     
     NSMutableArray *constraints = [NSMutableArray new];
diff --git a/Source/NSLayoutConstraint+PureLayout.h b/Source/NSLayoutConstraint+PureLayout.h
@@ -1,6 +1,6 @@
 //
 //  NSLayoutConstraint+PureLayout.h
-//  v2.0.1
+//  v2.0.2
 //  https://github.com/smileyborg/PureLayout
 //
 //  Copyright (c) 2013-2014 Tyler Fox
diff --git a/Source/NSLayoutConstraint+PureLayout.m b/Source/NSLayoutConstraint+PureLayout.m
@@ -1,6 +1,6 @@
 //
 //  NSLayoutConstraint+PureLayout.m
-//  v2.0.1
+//  v2.0.2
 //  https://github.com/smileyborg/PureLayout
 //
 //  Copyright (c) 2013-2014 Tyler Fox
@@ -43,15 +43,15 @@ @implementation NSLayoutConstraint (PureLayout)
  */
 - (void)autoInstall
 {
-#if __PureLayout_MinBaseSDK_iOS_8_0
+#if __PureLayout_MinBaseSDK_iOS_8_0 || __PureLayout_MinBaseSDK_OSX_10_10
     if ([self respondsToSelector:@selector(setActive:)]) {
         [ALView al_applyGlobalStateToConstraint:self];
         if (![ALView al_preventAutomaticConstraintInstallation]) {
             self.active = YES;
         }
         return;
     }
-#endif /* __PureLayout_MinBaseSDK_iOS_8_0 */
+#endif /* __PureLayout_MinBaseSDK_iOS_8_0 || __PureLayout_MinBaseSDK_OSX_10_10 */
     
     NSAssert(self.firstItem || self.secondItem, @"Can't install a constraint with nil firstItem and secondItem.");
     if (self.firstItem) {
@@ -74,12 +74,12 @@ - (void)autoInstall
  */
 - (void)autoRemove
 {
-#if __PureLayout_MinBaseSDK_iOS_8_0
+#if __PureLayout_MinBaseSDK_iOS_8_0 || __PureLayout_MinBaseSDK_OSX_10_10
     if ([self respondsToSelector:@selector(setActive:)]) {
         self.active = NO;
         return;
     }
-#endif /* __PureLayout_MinBaseSDK_iOS_8_0 */
+#endif /* __PureLayout_MinBaseSDK_iOS_8_0 || __PureLayout_MinBaseSDK_OSX_10_10 */
     
     if (self.secondItem) {
         ALView *commonSuperview = [self.firstItem al_commonSuperviewWithView:self.secondItem];
diff --git a/Source/PureLayout+Internal.h b/Source/PureLayout+Internal.h
@@ -1,6 +1,6 @@
 //
 //  PureLayout+Internal.h
-//  v2.0.1
+//  v2.0.2
 //  https://github.com/smileyborg/PureLayout
 //
 //  Copyright (c) 2014 Tyler Fox
diff --git a/Source/PureLayout.h b/Source/PureLayout.h
@@ -1,6 +1,6 @@
 //
 //  PureLayout.h
-//  v2.0.1
+//  v2.0.2
 //  https://github.com/smileyborg/PureLayout
 //
 //  Copyright (c) 2014 Tyler Fox
diff --git a/Source/PureLayoutDefines.h b/Source/PureLayoutDefines.h
@@ -1,6 +1,6 @@
 //
 //  PureLayoutDefines.h
-//  v2.0.1
+//  v2.0.2
 //  https://github.com/smileyborg/PureLayout
 //
 //  Copyright (c) 2014 Tyler Fox
