From b53f1251f4521cb6022031b08756d1a0ee61d6be Mon Sep 17 00:00:00 2001 From: Tyler Fox Date: Sun, 1 Sep 2013 23:08:43 -0700 Subject: [PATCH] Rename API method to be more concise --- Source/UIView+AutoLayout.h | 10 +++++----- Source/UIView+AutoLayout.m | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Source/UIView+AutoLayout.h b/Source/UIView+AutoLayout.h index 220c8cd..5d2068e 100755 --- a/Source/UIView+AutoLayout.h +++ b/Source/UIView+AutoLayout.h @@ -59,13 +59,13 @@ typedef void(^ALConstraintsBlock)(void); // a block of method calls to the UI /** Removes the given constraints from the views they have been added to. */ + (void)removeConstraints:(NSArray *)constraints; -/** Recursively removes all layout constraints from the view and its subviews. - NOTE: This method preserves low-priority intrinsic content size constraints, which you usually do not want to remove. */ +/** Recursively removes all explicit constraints from the view and its subviews. + NOTE: This method preserves implicit constraints, such as intrinsic content size constraints, which you usually do not want to remove. */ - (void)removeAllConstraintsFromViewAndSubviews; -/** Recursively removes all constraints from the view and its subviews, optionally including intrinsic content size constraints. - WARNING: Intrinsic content size constraints are auto-generated lower priority constraints, and you usually do not want to remove these. */ -- (void)removeAllConstraintsFromViewAndSubviewsIncludingIntrinsicContentSizeConstraints:(BOOL)shouldRemoveIntrinsicContentSizeConstraints; +/** Recursively removes all constraints from the view and its subviews, optionally including implicit constraints. + WARNING: Implicit constraints are auto-generated lower priority constraints, and you usually do not want to remove these. */ +- (void)removeAllConstraintsFromViewAndSubviewsIncludingImplicitConstraints:(BOOL)shouldRemoveImplicitConstraints; /** Centers the view in its superview. */ diff --git a/Source/UIView+AutoLayout.m b/Source/UIView+AutoLayout.m index 016e881..c1f1f2d 100755 --- a/Source/UIView+AutoLayout.m +++ b/Source/UIView+AutoLayout.m @@ -103,33 +103,33 @@ + (void)removeConstraints:(NSArray *)constraints } /** - Recursively removes all layout constraints from the view and its subviews. - NOTE: This method preserves low-priority intrinsic content size constraints, which you usually do not want to remove. + Recursively removes all explicit constraints from the view and its subviews. + NOTE: This method preserves implicit constraints, such as intrinsic content size constraints, which you usually do not want to remove. */ - (void)removeAllConstraintsFromViewAndSubviews { - [self removeAllConstraintsFromViewAndSubviewsIncludingIntrinsicContentSizeConstraints:NO]; + [self removeAllConstraintsFromViewAndSubviewsIncludingImplicitConstraints:NO]; } /** - Recursively removes all constraints from the view and its subviews, optionally including intrinsic content size constraints. - WARNING: Intrinsic content size constraints are auto-generated lower priority constraints that attempt to keep a view at its - intrinsic content size (by hugging its content & resisting compression), and you usually do not want to remove these. + Recursively removes all constraints from the view and its subviews, optionally including implicit constraints. + WARNING: WARNING: Implicit constraints are auto-generated lower priority constraints (such as those that attempt to keep a view + at its intrinsic content size by hugging its content & resisting compression), and you usually do not want to remove these. - @param shouldRemoveIntrinsicContentSizeConstraints Whether intrinsic content size constraints should be removed or skipped. + @param shouldRemoveImplicitConstraints Whether implicit constraints should be removed or skipped. */ -- (void)removeAllConstraintsFromViewAndSubviewsIncludingIntrinsicContentSizeConstraints:(BOOL)shouldRemoveIntrinsicContentSizeConstraints +- (void)removeAllConstraintsFromViewAndSubviewsIncludingImplicitConstraints:(BOOL)shouldRemoveImplicitConstraints { NSMutableArray *constraintsToRemove = [NSMutableArray new]; for (NSLayoutConstraint *constraint in self.constraints) { - BOOL isIntrinsicContentSizeConstraint = [NSStringFromClass([constraint class]) isEqualToString:@"NSContentSizeLayoutConstraint"]; - if (shouldRemoveIntrinsicContentSizeConstraints || !isIntrinsicContentSizeConstraint) { + BOOL isImplicitConstraint = [NSStringFromClass([constraint class]) isEqualToString:@"NSContentSizeLayoutConstraint"]; + if (shouldRemoveImplicitConstraints || !isImplicitConstraint) { [constraintsToRemove addObject:constraint]; } } [UIView removeConstraints:constraintsToRemove]; for (UIView *subview in self.subviews) { - [subview removeAllConstraintsFromViewAndSubviewsIncludingIntrinsicContentSizeConstraints:shouldRemoveIntrinsicContentSizeConstraints]; + [subview removeAllConstraintsFromViewAndSubviewsIncludingImplicitConstraints:shouldRemoveImplicitConstraints]; } }