From 47f73576ef8b1d537509346de100d6038b0b59d4 Mon Sep 17 00:00:00 2001 From: Hannah Troisi Date: Thu, 29 Sep 2016 12:29:21 -0700 Subject: [PATCH] [Layout] Rename ASStackLayoutable to ASStackLayoutElement (#2322) * redo all renaming, push new branch * rename a few missed occurances of static --- AsyncDisplayKit.xcodeproj/project.pbxproj | 24 +++++++++---------- ...Layoutable.h => ASAbsoluteLayoutElement.h} | 4 ++-- AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.h | 4 ++-- .../Layout/ASBackgroundLayoutSpec.h | 2 +- AsyncDisplayKit/Layout/ASLayoutElement.h | 12 +++++----- AsyncDisplayKit/Layout/ASLayoutElement.mm | 4 ++-- .../Layout/ASLayoutSpec+Subclasses.h | 14 +++++------ .../Layout/ASLayoutSpec+Subclasses.mm | 24 +++++++++---------- AsyncDisplayKit/Layout/ASLayoutSpec.mm | 6 ++--- AsyncDisplayKit/Layout/ASOverlayLayoutSpec.h | 6 ++--- ...ackLayoutable.h => ASStackLayoutElement.h} | 4 ++-- .../ASDisplayNodeImplicitHierarchyTests.m | 4 ++-- 12 files changed, 54 insertions(+), 54 deletions(-) rename AsyncDisplayKit/Layout/{ASAbsoluteLayoutable.h => ASAbsoluteLayoutElement.h} (90%) rename AsyncDisplayKit/Layout/{ASStackLayoutable.h => ASStackLayoutElement.h} (97%) diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj index 1db3f05eb8..e4d636adb3 100644 --- a/AsyncDisplayKit.xcodeproj/project.pbxproj +++ b/AsyncDisplayKit.xcodeproj/project.pbxproj @@ -260,11 +260,11 @@ 92DD2FEA1BF4D49B0074C9DD /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92DD2FE51BF4D05E0074C9DD /* MapKit.framework */; }; 9B92C8851BC2EB6E00EE46B2 /* ASCollectionDataController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 251B8EF31BBB3D690087C538 /* ASCollectionDataController.mm */; }; 9B92C8861BC2EB7600EE46B2 /* ASCollectionViewFlowLayoutInspector.m in Sources */ = {isa = PBXBuildFile; fileRef = 251B8EF51BBB3D690087C538 /* ASCollectionViewFlowLayoutInspector.m */; }; - 9C49C3701B853961000B0DD5 /* ASStackLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C49C36E1B853957000B0DD5 /* ASStackLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9C49C3701B853961000B0DD5 /* ASStackLayoutElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C49C36E1B853957000B0DD5 /* ASStackLayoutElement.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9C55866A1BD549CB00B50E3A /* ASAsciiArtBoxCreator.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C5586681BD549CB00B50E3A /* ASAsciiArtBoxCreator.m */; }; 9C55866B1BD54A1900B50E3A /* ASAsciiArtBoxCreator.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C5586681BD549CB00B50E3A /* ASAsciiArtBoxCreator.m */; }; 9C55866C1BD54A3000B50E3A /* ASAsciiArtBoxCreator.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C5586671BD549CB00B50E3A /* ASAsciiArtBoxCreator.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9C6BB3B31B8CC9C200F13F52 /* ASAbsoluteLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6BB3B01B8CC9C200F13F52 /* ASAbsoluteLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9C6BB3B31B8CC9C200F13F52 /* ASAbsoluteLayoutElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6BB3B01B8CC9C200F13F52 /* ASAbsoluteLayoutElement.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9C70F2041CDA4EFA007D6C76 /* ASTraitCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C70F2021CDA4EFA007D6C76 /* ASTraitCollection.m */; }; 9C70F2051CDA4F06007D6C76 /* ASTraitCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C70F2021CDA4EFA007D6C76 /* ASTraitCollection.m */; }; 9C70F2061CDA4F0C007D6C76 /* ASTraitCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C70F2011CDA4EFA007D6C76 /* ASTraitCollection.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -565,10 +565,10 @@ F7CE6C651D2CDB3E00BE4C15 /* ASRatioLayoutSpec.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = ACF6ED141B17843500DA7C62 /* ASRatioLayoutSpec.h */; }; F7CE6C661D2CDB3E00BE4C15 /* ASRelativeLayoutSpec.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7A06A7391C35F08800FE8DAA /* ASRelativeLayoutSpec.h */; }; F7CE6C671D2CDB3E00BE4C15 /* ASRelativeSize.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = AC47D9431B3BB41900AAEE9D /* ASRelativeSize.h */; }; - F7CE6C681D2CDB3E00BE4C15 /* ASStackLayoutable.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9C49C36E1B853957000B0DD5 /* ASStackLayoutable.h */; }; + F7CE6C681D2CDB3E00BE4C15 /* ASStackLayoutElement.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9C49C36E1B853957000B0DD5 /* ASStackLayoutElement.h */; }; F7CE6C691D2CDB3E00BE4C15 /* ASStackLayoutDefines.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = AC21EC0F1B3D0BF600C8B19A /* ASStackLayoutDefines.h */; }; F7CE6C6A1D2CDB3E00BE4C15 /* ASStackLayoutSpec.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = ACF6ED161B17843500DA7C62 /* ASStackLayoutSpec.h */; }; - F7CE6C6B1D2CDB3E00BE4C15 /* ASAbsoluteLayoutable.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9C6BB3B01B8CC9C200F13F52 /* ASAbsoluteLayoutable.h */; }; + F7CE6C6B1D2CDB3E00BE4C15 /* ASAbsoluteLayoutElement.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9C6BB3B01B8CC9C200F13F52 /* ASAbsoluteLayoutElement.h */; }; F7CE6C6C1D2CDB3E00BE4C15 /* ASAbsoluteLayoutSpec.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = ACF6ED181B17843500DA7C62 /* ASAbsoluteLayoutSpec.h */; }; F7CE6C6D1D2CDB3E00BE4C15 /* ASTextKitComponents.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 257754BA1BEE458E00737CA5 /* ASTextKitComponents.h */; }; F7CE6C6E1D2CDB3E00BE4C15 /* ASTextNodeWordKerner.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 257754B91BEE458E00737CA5 /* ASTextNodeWordKerner.h */; }; @@ -736,10 +736,10 @@ F7CE6C651D2CDB3E00BE4C15 /* ASRatioLayoutSpec.h in CopyFiles */, F7CE6C661D2CDB3E00BE4C15 /* ASRelativeLayoutSpec.h in CopyFiles */, F7CE6C671D2CDB3E00BE4C15 /* ASRelativeSize.h in CopyFiles */, - F7CE6C681D2CDB3E00BE4C15 /* ASStackLayoutable.h in CopyFiles */, + F7CE6C681D2CDB3E00BE4C15 /* ASStackLayoutElement.h in CopyFiles */, F7CE6C691D2CDB3E00BE4C15 /* ASStackLayoutDefines.h in CopyFiles */, F7CE6C6A1D2CDB3E00BE4C15 /* ASStackLayoutSpec.h in CopyFiles */, - F7CE6C6B1D2CDB3E00BE4C15 /* ASAbsoluteLayoutable.h in CopyFiles */, + F7CE6C6B1D2CDB3E00BE4C15 /* ASAbsoluteLayoutElement.h in CopyFiles */, F7CE6C6C1D2CDB3E00BE4C15 /* ASAbsoluteLayoutSpec.h in CopyFiles */, F7CE6C6D1D2CDB3E00BE4C15 /* ASTextKitComponents.h in CopyFiles */, F7CE6C6E1D2CDB3E00BE4C15 /* ASTextNodeWordKerner.h in CopyFiles */, @@ -1023,10 +1023,10 @@ 92DD2FE11BF4B97E0074C9DD /* ASMapNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASMapNode.h; sourceTree = ""; }; 92DD2FE21BF4B97E0074C9DD /* ASMapNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASMapNode.mm; sourceTree = ""; }; 92DD2FE51BF4D05E0074C9DD /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; }; - 9C49C36E1B853957000B0DD5 /* ASStackLayoutable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASStackLayoutable.h; path = AsyncDisplayKit/Layout/ASStackLayoutable.h; sourceTree = ""; }; + 9C49C36E1B853957000B0DD5 /* ASStackLayoutElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASStackLayoutElement.h; path = AsyncDisplayKit/Layout/ASStackLayoutElement.h; sourceTree = ""; }; 9C5586671BD549CB00B50E3A /* ASAsciiArtBoxCreator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASAsciiArtBoxCreator.h; path = AsyncDisplayKit/Layout/ASAsciiArtBoxCreator.h; sourceTree = ""; }; 9C5586681BD549CB00B50E3A /* ASAsciiArtBoxCreator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ASAsciiArtBoxCreator.m; path = AsyncDisplayKit/Layout/ASAsciiArtBoxCreator.m; sourceTree = ""; }; - 9C6BB3B01B8CC9C200F13F52 /* ASAbsoluteLayoutable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASAbsoluteLayoutable.h; path = AsyncDisplayKit/Layout/ASAbsoluteLayoutable.h; sourceTree = ""; }; + 9C6BB3B01B8CC9C200F13F52 /* ASAbsoluteLayoutElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASAbsoluteLayoutElement.h; path = AsyncDisplayKit/Layout/ASAbsoluteLayoutElement.h; sourceTree = ""; }; 9C70F2011CDA4EFA007D6C76 /* ASTraitCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASTraitCollection.h; sourceTree = ""; }; 9C70F2021CDA4EFA007D6C76 /* ASTraitCollection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASTraitCollection.m; sourceTree = ""; }; 9C8221931BA237B80037F19A /* ASStackBaselinePositionedLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASStackBaselinePositionedLayout.h; sourceTree = ""; }; @@ -1694,11 +1694,11 @@ 7A06A7381C35F08800FE8DAA /* ASRelativeLayoutSpec.mm */, AC47D9431B3BB41900AAEE9D /* ASRelativeSize.h */, AC47D9441B3BB41900AAEE9D /* ASRelativeSize.mm */, - 9C49C36E1B853957000B0DD5 /* ASStackLayoutable.h */, + 9C49C36E1B853957000B0DD5 /* ASStackLayoutElement.h */, AC21EC0F1B3D0BF600C8B19A /* ASStackLayoutDefines.h */, ACF6ED161B17843500DA7C62 /* ASStackLayoutSpec.h */, ACF6ED171B17843500DA7C62 /* ASStackLayoutSpec.mm */, - 9C6BB3B01B8CC9C200F13F52 /* ASAbsoluteLayoutable.h */, + 9C6BB3B01B8CC9C200F13F52 /* ASAbsoluteLayoutElement.h */, ACF6ED181B17843500DA7C62 /* ASAbsoluteLayoutSpec.h */, ACF6ED191B17843500DA7C62 /* ASAbsoluteLayoutSpec.mm */, ); @@ -1869,7 +1869,7 @@ B35062551B010EFD0018CF92 /* ASSentinel.h in Headers */, 9C8221961BA237B80037F19A /* ASStackBaselinePositionedLayout.h in Headers */, 9C70F20E1CDBE9E5007D6C76 /* NSArray+Diffing.h in Headers */, - 9C49C3701B853961000B0DD5 /* ASStackLayoutable.h in Headers */, + 9C49C3701B853961000B0DD5 /* ASStackLayoutElement.h in Headers */, DE040EF91C2B40AC004692FF /* ASCollectionViewFlowLayoutInspector.h in Headers */, 34EFC7701B701CFA00AD841F /* ASStackLayoutDefines.h in Headers */, 764D83D51C8EA515009B4FB8 /* AsyncDisplayKit+Debug.h in Headers */, @@ -1886,7 +1886,7 @@ 34EFC7751B701D2400AD841F /* ASStackPositionedLayout.h in Headers */, 69E1006E1CA89CB600D88C1B /* ASEnvironmentInternal.h in Headers */, 34EFC7771B701D2D00AD841F /* ASStackUnpositionedLayout.h in Headers */, - 9C6BB3B31B8CC9C200F13F52 /* ASAbsoluteLayoutable.h in Headers */, + 9C6BB3B31B8CC9C200F13F52 /* ASAbsoluteLayoutElement.h in Headers */, 34EFC7731B701D0700AD841F /* ASAbsoluteLayoutSpec.h in Headers */, CC446A2F1D80AAE00071FD03 /* ASObjectDescriptionHelpers.h in Headers */, 254C6B781BF94DF4003EC431 /* ASTextKitContext.h in Headers */, diff --git a/AsyncDisplayKit/Layout/ASAbsoluteLayoutable.h b/AsyncDisplayKit/Layout/ASAbsoluteLayoutElement.h similarity index 90% rename from AsyncDisplayKit/Layout/ASAbsoluteLayoutable.h rename to AsyncDisplayKit/Layout/ASAbsoluteLayoutElement.h index 25c168e4e9..58c5973ed6 100644 --- a/AsyncDisplayKit/Layout/ASAbsoluteLayoutable.h +++ b/AsyncDisplayKit/Layout/ASAbsoluteLayoutElement.h @@ -1,5 +1,5 @@ // -// ASAbsoluteLayoutable.h +// ASAbsoluteLayoutElement.h // AsyncDisplayKit // // Copyright (c) 2014-present, Facebook, Inc. All rights reserved. @@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN /** * Layout options that can be defined for an ASLayoutElement being added to a ASAbsoluteLayoutSpec. */ -@protocol ASAbsoluteLayoutable +@protocol ASAbsoluteLayoutElement /** * @abstract The position of this object within its parent spec. diff --git a/AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.h b/AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.h index 00824e0ab1..0d87996f2e 100644 --- a/AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.h +++ b/AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.h @@ -20,9 +20,9 @@ NS_ASSUME_NONNULL_BEGIN @interface ASAbsoluteLayoutSpec : ASLayoutSpec /** - @param children Children to be positioned at fixed positions, each conforms to ASAbsoluteLayoutable + @param children Children to be positioned at fixed positions, each conforms to ASAbsoluteLayoutElement */ -+ (instancetype)absoluteLayoutSpecWithChildren:(NSArray> *)children; ++ (instancetype)absoluteLayoutSpecWithChildren:(NSArray> *)children; @end diff --git a/AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.h b/AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.h index f722f9c644..65d23b2b68 100644 --- a/AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.h +++ b/AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.h @@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN @interface ASBackgroundLayoutSpec : ASLayoutSpec /** - * Background layoutable for this layout spec + * Background layoutElement for this layout spec */ @property (nullable, nonatomic, strong) id background; diff --git a/AsyncDisplayKit/Layout/ASLayoutElement.h b/AsyncDisplayKit/Layout/ASLayoutElement.h index b3ebc6c8f2..894574e133 100644 --- a/AsyncDisplayKit/Layout/ASLayoutElement.h +++ b/AsyncDisplayKit/Layout/ASLayoutElement.h @@ -10,8 +10,8 @@ #import #import -#import -#import +#import +#import #import #import #import @@ -174,10 +174,10 @@ extern NSString * const ASLayoutElementStyleLayoutPositionProperty; - (void)style:(__kindof ASLayoutElementStyle *)style propertyDidChange:(NSString *)propertyName; @end -@interface ASLayoutElementStyle : NSObject +@interface ASLayoutElementStyle : NSObject /** - * @abstract Initializes the layoutable style with a specified delegate + * @abstract Initializes the layoutElement style with a specified delegate */ - (instancetype)initWithDelegate:(id)delegate; @@ -252,7 +252,7 @@ extern NSString * const ASLayoutElementStyleLayoutPositionProperty; - (void)setExactSizeWithCGSize:(CGSize)size; -#pragma mark - ASStackLayoutable +#pragma mark - ASStackLayoutElement /** * @abstract Additional space to place before this object in the stacking direction. @@ -303,7 +303,7 @@ extern NSString * const ASLayoutElementStyleLayoutPositionProperty; */ @property (nonatomic, assign) CGFloat descender; -#pragma mark - ASAbsoluteLayoutable +#pragma mark - ASAbsoluteLayoutElement /** * @abstract The position of this object within its parent spec. diff --git a/AsyncDisplayKit/Layout/ASLayoutElement.mm b/AsyncDisplayKit/Layout/ASLayoutElement.mm index 5a25a48320..a7e85e747d 100644 --- a/AsyncDisplayKit/Layout/ASLayoutElement.mm +++ b/AsyncDisplayKit/Layout/ASLayoutElement.mm @@ -235,7 +235,7 @@ do {\ self.maxHeight = ASDimensionMakeWithPoints(size.height); } -#pragma mark - ASStackLayoutable +#pragma mark - ASStackLayoutElement - (void)setSpacingBefore:(CGFloat)spacingBefore { @@ -293,7 +293,7 @@ do {\ ASLayoutElementStyleCallDelegate(ASLayoutElementStyleDescenderProperty); } -#pragma mark - ASStaticLayoutable +#pragma mark - ASAbsoluteLayoutElement - (void)setLayoutPosition:(CGPoint)layoutPosition { diff --git a/AsyncDisplayKit/Layout/ASLayoutSpec+Subclasses.h b/AsyncDisplayKit/Layout/ASLayoutSpec+Subclasses.h index 2109231ec9..60c66a9106 100644 --- a/AsyncDisplayKit/Layout/ASLayoutSpec+Subclasses.h +++ b/AsyncDisplayKit/Layout/ASLayoutSpec+Subclasses.h @@ -13,25 +13,25 @@ NS_ASSUME_NONNULL_BEGIN @interface ASLayoutSpec (Subclassing) /** - * Helper method for finalLayoutable support + * Helper method for finalLayoutElement support * - * @warning If you are getting recursion crashes here after implementing finalLayoutable, make sure - * that you are setting isFinalLayoutable flag to YES. This must be one BEFORE adding a child + * @warning If you are getting recursion crashes here after implementing finalLayoutElement, make sure + * that you are setting isFinalLayoutElement flag to YES. This must be one BEFORE adding a child * to the new ASLayoutElement. * * For example: - * - (id)finalLayoutable + * - (id)finalLayoutElement * { * ASInsetLayoutSpec *insetSpec = [[ASInsetLayoutSpec alloc] init]; * insetSpec.insets = UIEdgeInsetsMake(10,10,10,10); - * insetSpec.isFinalLayoutable = YES; + * insetSpec.isFinalLayoutElement = YES; * [insetSpec setChild:self]; * return insetSpec; * } * - * @see finalLayoutable + * @see finalLayoutElement */ -- (id)layoutableToAddFromLayoutable:(id)child; +- (id)layoutElementToAddFromLayoutElement:(id)child; /** * Adds a child with the given identifier to this layout spec. diff --git a/AsyncDisplayKit/Layout/ASLayoutSpec+Subclasses.mm b/AsyncDisplayKit/Layout/ASLayoutSpec+Subclasses.mm index b54e72de37..517f25aac9 100644 --- a/AsyncDisplayKit/Layout/ASLayoutSpec+Subclasses.mm +++ b/AsyncDisplayKit/Layout/ASLayoutSpec+Subclasses.mm @@ -46,9 +46,9 @@ @implementation ASLayoutSpec (Subclassing) -#pragma mark - Final layoutable +#pragma mark - Final layoutElement -- (id)layoutableToAddFromLayoutable:(id)child +- (id)layoutElementToAddFromLayoutElement:(id)child { if (self.isFinalLayoutElement == NO) { id finalLayoutElement = [child finalLayoutElement]; @@ -73,7 +73,7 @@ { ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable"); - id layoutable = child ? [self layoutableToAddFromLayoutable:child] : [ASNullLayoutSpec null]; + id layoutElement = child ? [self layoutElementToAddFromLayoutElement:child] : [ASNullLayoutSpec null]; if (child) { if (_childrenArray.count < index) { @@ -86,25 +86,25 @@ } } - // Replace object at the given index with the layoutable - _childrenArray[index] = layoutable; + // Replace object at the given index with the layoutElement + _childrenArray[index] = layoutElement; - // TODO: Should we propagate up the layoutable at it could happen that multiple children will propagated up their + // TODO: Should we propagate up the layoutElement at it could happen that multiple children will propagated up their // layout options and one child will overwrite values from another child - // [self propagateUpLayoutable:finalLayoutElement]; + // [self propagateUpLayoutElement:finalLayoutElement]; } - (id)childAtIndex:(NSUInteger)index { - id layoutable = nil; + id layoutElement = nil; if (index < _childrenArray.count) { - layoutable = _childrenArray[index]; + layoutElement = _childrenArray[index]; } - // Null layoutable should not be accessed - ASDisplayNodeAssert(layoutable != [ASNullLayoutSpec null], @"Access child at index without set a child at that index"); + // Null layoutElement should not be accessed + ASDisplayNodeAssert(layoutElement != [ASNullLayoutSpec null], @"Access child at index without set a child at that index"); - return layoutable; + return layoutElement; } @end diff --git a/AsyncDisplayKit/Layout/ASLayoutSpec.mm b/AsyncDisplayKit/Layout/ASLayoutSpec.mm index f50f92ee5e..c5c226b5de 100644 --- a/AsyncDisplayKit/Layout/ASLayoutSpec.mm +++ b/AsyncDisplayKit/Layout/ASLayoutSpec.mm @@ -55,7 +55,7 @@ return YES; } -#pragma mark - Final Layoutable +#pragma mark - Final LayoutElement - (id)finalLayoutElement { @@ -122,7 +122,7 @@ ASDisplayNodeAssert(_childrenArray.count < 2, @"This layout spec does not support more than one child. Use the setChildren: or the setChild:AtIndex: API"); if (child) { - id finalLayoutElement = [self layoutableToAddFromLayoutable:child]; + id finalLayoutElement = [self layoutElementToAddFromLayoutElement:child]; if (finalLayoutElement) { _childrenArray[0] = finalLayoutElement; [self propagateUpLayoutElement:finalLayoutElement]; @@ -156,7 +156,7 @@ NSUInteger i = 0; for (id child in children) { ASDisplayNodeAssert([child conformsToProtocol:NSProtocolFromString(@"ASLayoutElement")], @"Child %@ of spec %@ is not an ASLayoutElement!", child, self); - _childrenArray[i] = [self layoutableToAddFromLayoutable:child]; + _childrenArray[i] = [self layoutElementToAddFromLayoutElement:child]; i += 1; } } diff --git a/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.h b/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.h index 4e8a6220c2..53c43f4af3 100644 --- a/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.h +++ b/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.h @@ -18,15 +18,15 @@ NS_ASSUME_NONNULL_BEGIN @interface ASOverlayLayoutSpec : ASLayoutSpec /** - * Overlay layoutable of this layout spec + * Overlay layoutElement of this layout spec */ @property (nullable, nonatomic, strong) id overlay; /** - * Creates and returns an ASOverlayLayoutSpec object with a given child and an layoutable that act as overlay. + * Creates and returns an ASOverlayLayoutSpec object with a given child and an layoutElement that act as overlay. * * @param child A child that is laid out to determine the size of this spec. - * @param overlay A layoutable object that is laid out over the child. If this is nil, the overlay is omitted. + * @param overlay A layoutElement object that is laid out over the child. If this is nil, the overlay is omitted. */ + (instancetype)overlayLayoutSpecWithChild:(id)child overlay:(nullable id)overlay; diff --git a/AsyncDisplayKit/Layout/ASStackLayoutable.h b/AsyncDisplayKit/Layout/ASStackLayoutElement.h similarity index 97% rename from AsyncDisplayKit/Layout/ASStackLayoutable.h rename to AsyncDisplayKit/Layout/ASStackLayoutElement.h index b0fa2f8360..830d99cb54 100644 --- a/AsyncDisplayKit/Layout/ASStackLayoutable.h +++ b/AsyncDisplayKit/Layout/ASStackLayoutElement.h @@ -1,5 +1,5 @@ // -// ASStackLayoutable.h +// ASStackLayoutElement.h // AsyncDisplayKit // // Copyright (c) 2014-present, Facebook, Inc. All rights reserved. @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN /** * Layout options that can be defined for an ASLayoutElement being added to a ASStackLayoutSpec. */ -@protocol ASStackLayoutable +@protocol ASStackLayoutElement /** * @abstract Additional space to place before this object in the stacking direction. diff --git a/AsyncDisplayKitTests/ASDisplayNodeImplicitHierarchyTests.m b/AsyncDisplayKitTests/ASDisplayNodeImplicitHierarchyTests.m index 5b278052a0..356de3ad87 100644 --- a/AsyncDisplayKitTests/ASDisplayNodeImplicitHierarchyTests.m +++ b/AsyncDisplayKitTests/ASDisplayNodeImplicitHierarchyTests.m @@ -68,13 +68,13 @@ ASSpecTestDisplayNode *node = [[ASSpecTestDisplayNode alloc] init]; node.automaticallyManagesSubnodes = YES; node.layoutSpecBlock = ^(ASDisplayNode *weakNode, ASSizeRange constrainedSize) { - ASAbsoluteLayoutSpec *staticLayout = [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[node4]]; + ASAbsoluteLayoutSpec *absoluteLayout = [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[node4]]; ASStackLayoutSpec *stack1 = [[ASStackLayoutSpec alloc] init]; [stack1 setChildren:@[node1, node2]]; ASStackLayoutSpec *stack2 = [[ASStackLayoutSpec alloc] init]; - [stack2 setChildren:@[node3, staticLayout]]; + [stack2 setChildren:@[node3, absoluteLayout]]; return [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[stack1, stack2, node5]]; };