From 87595c7d3b9daaaa4e30ec63818d92a33bd56fb4 Mon Sep 17 00:00:00 2001 From: Hannah Troisi Date: Wed, 28 Sep 2016 10:05:31 -0700 Subject: [PATCH] [Layout API] Rename ASStaticLayoutSpec to ASAbsoluteLayoutSpec (#2288) * Rename static to absolute * Fix examples, rename ASAbsoluteLayoutSpec class method * rename +staticLayoutSpecWithChildren to +absoluteLayoutSpecWithChildren * address Michael's comments --- AsyncDisplayKit.xcodeproj/project.pbxproj | 44 +++++++++--------- AsyncDisplayKit/ASButtonNode.mm | 2 +- AsyncDisplayKit/ASVideoPlayerNode.mm | 2 +- AsyncDisplayKit/AsyncDisplayKit.h | 2 +- ...ticLayoutSpec.h => ASAbsoluteLayoutSpec.h} | 8 ++-- ...cLayoutSpec.mm => ASAbsoluteLayoutSpec.mm} | 12 ++--- ...ticLayoutable.h => ASAbsoluteLayoutable.h} | 6 +-- AsyncDisplayKit/Layout/ASLayoutSpec.mm | 2 +- AsyncDisplayKit/Layout/ASLayoutValidation.h | 4 +- AsyncDisplayKit/Layout/ASLayoutValidation.mm | 6 +-- AsyncDisplayKit/Layout/ASLayoutable.h | 6 +-- ....m => ASAbsoluteLayoutSpecSnapshotTests.m} | 14 +++--- .../ASDisplayNodeImplicitHierarchyTests.m | 20 ++++---- ...testChildrenMeasuredWithAutoMaxSize@2x.png | Bin ...testChildrenMeasuredWithAutoMaxSize@3x.png | Bin ...estSizingBehaviour_overflowChildren@2x.png | Bin ...estSizingBehaviour_overflowChildren@3x.png | Bin ...stSizingBehaviour_underflowChildren@2x.png | Bin ...stSizingBehaviour_underflowChildren@3x.png | Bin ...testSizingBehaviour_wrappedChildren@2x.png | Bin ...testSizingBehaviour_wrappedChildren@3x.png | Bin .../ASViewController/Sample/DetailCellNode.m | 2 +- .../ASViewController/Sample/DetailRootNode.m | 2 +- .../Sample/OverviewComponentsViewController.m | 8 ++-- .../CatDealsCollectionView/Sample/ItemNode.m | 2 +- examples/Videos/Sample/ViewController.m | 2 +- 26 files changed, 71 insertions(+), 73 deletions(-) rename AsyncDisplayKit/Layout/{ASStaticLayoutSpec.h => ASAbsoluteLayoutSpec.h} (75%) rename AsyncDisplayKit/Layout/{ASStaticLayoutSpec.mm => ASAbsoluteLayoutSpec.mm} (90%) rename AsyncDisplayKit/Layout/{ASStaticLayoutable.h => ASAbsoluteLayoutable.h} (86%) rename AsyncDisplayKitTests/{ASStaticLayoutSpecSnapshotTests.m => ASAbsoluteLayoutSpecSnapshotTests.m} (88%) rename AsyncDisplayKitTests/ReferenceImages_64/{ASStaticLayoutSpecSnapshotTests => ASAbsoluteLayoutSpecSnapshotTests}/testChildrenMeasuredWithAutoMaxSize@2x.png (100%) rename AsyncDisplayKitTests/ReferenceImages_64/{ASStaticLayoutSpecSnapshotTests => ASAbsoluteLayoutSpecSnapshotTests}/testChildrenMeasuredWithAutoMaxSize@3x.png (100%) rename AsyncDisplayKitTests/ReferenceImages_64/{ASStaticLayoutSpecSnapshotTests => ASAbsoluteLayoutSpecSnapshotTests}/testSizingBehaviour_overflowChildren@2x.png (100%) rename AsyncDisplayKitTests/ReferenceImages_64/{ASStaticLayoutSpecSnapshotTests => ASAbsoluteLayoutSpecSnapshotTests}/testSizingBehaviour_overflowChildren@3x.png (100%) rename AsyncDisplayKitTests/ReferenceImages_64/{ASStaticLayoutSpecSnapshotTests => ASAbsoluteLayoutSpecSnapshotTests}/testSizingBehaviour_underflowChildren@2x.png (100%) rename AsyncDisplayKitTests/ReferenceImages_64/{ASStaticLayoutSpecSnapshotTests => ASAbsoluteLayoutSpecSnapshotTests}/testSizingBehaviour_underflowChildren@3x.png (100%) rename AsyncDisplayKitTests/ReferenceImages_64/{ASStaticLayoutSpecSnapshotTests => ASAbsoluteLayoutSpecSnapshotTests}/testSizingBehaviour_wrappedChildren@2x.png (100%) rename AsyncDisplayKitTests/ReferenceImages_64/{ASStaticLayoutSpecSnapshotTests => ASAbsoluteLayoutSpecSnapshotTests}/testSizingBehaviour_wrappedChildren@3x.png (100%) diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj index d5699da155..cf0531770d 100644 --- a/AsyncDisplayKit.xcodeproj/project.pbxproj +++ b/AsyncDisplayKit.xcodeproj/project.pbxproj @@ -151,8 +151,8 @@ 34EFC7701B701CFA00AD841F /* ASStackLayoutDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = AC21EC0F1B3D0BF600C8B19A /* ASStackLayoutDefines.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34EFC7711B701CFF00AD841F /* ASStackLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED161B17843500DA7C62 /* ASStackLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34EFC7721B701D0300AD841F /* ASStackLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED171B17843500DA7C62 /* ASStackLayoutSpec.mm */; }; - 34EFC7731B701D0700AD841F /* ASStaticLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED181B17843500DA7C62 /* ASStaticLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 34EFC7741B701D0A00AD841F /* ASStaticLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED191B17843500DA7C62 /* ASStaticLayoutSpec.mm */; }; + 34EFC7731B701D0700AD841F /* ASAbsoluteLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED181B17843500DA7C62 /* ASAbsoluteLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 34EFC7741B701D0A00AD841F /* ASAbsoluteLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED191B17843500DA7C62 /* ASAbsoluteLayoutSpec.mm */; }; 34EFC7751B701D2400AD841F /* ASStackPositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED471B17847A00DA7C62 /* ASStackPositionedLayout.h */; }; 34EFC7761B701D2A00AD841F /* ASStackPositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED481B17847A00DA7C62 /* ASStackPositionedLayout.mm */; }; 34EFC7771B701D2D00AD841F /* ASStackUnpositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED491B17847A00DA7C62 /* ASStackUnpositionedLayout.h */; }; @@ -267,7 +267,7 @@ 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 /* ASStaticLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6BB3B01B8CC9C200F13F52 /* ASStaticLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9C6BB3B31B8CC9C200F13F52 /* ASAbsoluteLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6BB3B01B8CC9C200F13F52 /* ASAbsoluteLayoutable.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, ); }; }; @@ -293,7 +293,7 @@ 9F06E5CD1B4CAF4200F015D8 /* ASCollectionViewTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F06E5CC1B4CAF4200F015D8 /* ASCollectionViewTests.mm */; }; A2763D7A1CBDD57D00A9ADBD /* ASPINRemoteImageDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = A2763D771CBDD57D00A9ADBD /* ASPINRemoteImageDownloader.h */; }; A37320101C571B740011FC94 /* ASTextNode+Beta.h in Headers */ = {isa = PBXBuildFile; fileRef = A373200E1C571B050011FC94 /* ASTextNode+Beta.h */; settings = {ATTRIBUTES = (Public, ); }; }; - AC026B581BD3F61800BBC17E /* ASStaticLayoutSpecSnapshotTests.m in Sources */ = {isa = PBXBuildFile; fileRef = AC026B571BD3F61800BBC17E /* ASStaticLayoutSpecSnapshotTests.m */; }; + AC026B581BD3F61800BBC17E /* ASAbsoluteLayoutSpecSnapshotTests.m in Sources */ = {isa = PBXBuildFile; fileRef = AC026B571BD3F61800BBC17E /* ASAbsoluteLayoutSpecSnapshotTests.m */; }; AC026B6A1BD57D6F00BBC17E /* ASChangeSetDataController.h in Headers */ = {isa = PBXBuildFile; fileRef = AC026B671BD57D6F00BBC17E /* ASChangeSetDataController.h */; settings = {ATTRIBUTES = (Public, ); }; }; AC026B6B1BD57D6F00BBC17E /* ASChangeSetDataController.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC026B681BD57D6F00BBC17E /* ASChangeSetDataController.mm */; }; AC026B6C1BD57D6F00BBC17E /* ASChangeSetDataController.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC026B681BD57D6F00BBC17E /* ASChangeSetDataController.mm */; }; @@ -314,7 +314,7 @@ ACF6ED2C1B17843500DA7C62 /* ASOverlayLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED131B17843500DA7C62 /* ASOverlayLayoutSpec.mm */; }; ACF6ED2E1B17843500DA7C62 /* ASRatioLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED151B17843500DA7C62 /* ASRatioLayoutSpec.mm */; }; ACF6ED301B17843500DA7C62 /* ASStackLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED171B17843500DA7C62 /* ASStackLayoutSpec.mm */; }; - ACF6ED321B17843500DA7C62 /* ASStaticLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED191B17843500DA7C62 /* ASStaticLayoutSpec.mm */; }; + ACF6ED321B17843500DA7C62 /* ASAbsoluteLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED191B17843500DA7C62 /* ASAbsoluteLayoutSpec.mm */; }; ACF6ED4C1B17847A00DA7C62 /* ASInternalHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED441B17847A00DA7C62 /* ASInternalHelpers.m */; }; ACF6ED501B17847A00DA7C62 /* ASStackPositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED481B17847A00DA7C62 /* ASStackPositionedLayout.mm */; }; ACF6ED521B17847A00DA7C62 /* ASStackUnpositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED4A1B17847A00DA7C62 /* ASStackUnpositionedLayout.mm */; }; @@ -571,8 +571,8 @@ F7CE6C681D2CDB3E00BE4C15 /* ASStackLayoutable.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9C49C36E1B853957000B0DD5 /* ASStackLayoutable.h */; }; F7CE6C691D2CDB3E00BE4C15 /* ASStackLayoutDefines.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = AC21EC0F1B3D0BF600C8B19A /* ASStackLayoutDefines.h */; }; F7CE6C6A1D2CDB3E00BE4C15 /* ASStackLayoutSpec.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = ACF6ED161B17843500DA7C62 /* ASStackLayoutSpec.h */; }; - F7CE6C6B1D2CDB3E00BE4C15 /* ASStaticLayoutable.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9C6BB3B01B8CC9C200F13F52 /* ASStaticLayoutable.h */; }; - F7CE6C6C1D2CDB3E00BE4C15 /* ASStaticLayoutSpec.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = ACF6ED181B17843500DA7C62 /* ASStaticLayoutSpec.h */; }; + F7CE6C6B1D2CDB3E00BE4C15 /* ASAbsoluteLayoutable.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9C6BB3B01B8CC9C200F13F52 /* ASAbsoluteLayoutable.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 */; }; F7CE6C6F1D2CDB3E00BE4C15 /* ASTextNodeTypes.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 257754BC1BEE458E00737CA5 /* ASTextNodeTypes.h */; }; @@ -743,8 +743,8 @@ F7CE6C681D2CDB3E00BE4C15 /* ASStackLayoutable.h in CopyFiles */, F7CE6C691D2CDB3E00BE4C15 /* ASStackLayoutDefines.h in CopyFiles */, F7CE6C6A1D2CDB3E00BE4C15 /* ASStackLayoutSpec.h in CopyFiles */, - F7CE6C6B1D2CDB3E00BE4C15 /* ASStaticLayoutable.h in CopyFiles */, - F7CE6C6C1D2CDB3E00BE4C15 /* ASStaticLayoutSpec.h in CopyFiles */, + F7CE6C6B1D2CDB3E00BE4C15 /* ASAbsoluteLayoutable.h in CopyFiles */, + F7CE6C6C1D2CDB3E00BE4C15 /* ASAbsoluteLayoutSpec.h in CopyFiles */, F7CE6C6D1D2CDB3E00BE4C15 /* ASTextKitComponents.h in CopyFiles */, F7CE6C6E1D2CDB3E00BE4C15 /* ASTextNodeWordKerner.h in CopyFiles */, F7CE6C6F1D2CDB3E00BE4C15 /* ASTextNodeTypes.h in CopyFiles */, @@ -1033,7 +1033,7 @@ 9C49C36E1B853957000B0DD5 /* ASStackLayoutable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASStackLayoutable.h; path = AsyncDisplayKit/Layout/ASStackLayoutable.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 /* ASStaticLayoutable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASStaticLayoutable.h; path = AsyncDisplayKit/Layout/ASStaticLayoutable.h; sourceTree = ""; }; + 9C6BB3B01B8CC9C200F13F52 /* ASAbsoluteLayoutable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASAbsoluteLayoutable.h; path = AsyncDisplayKit/Layout/ASAbsoluteLayoutable.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 = ""; }; @@ -1048,7 +1048,7 @@ A2763D781CBDD57D00A9ADBD /* ASPINRemoteImageDownloader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ASPINRemoteImageDownloader.m; path = Details/ASPINRemoteImageDownloader.m; sourceTree = ""; }; A32FEDD31C501B6A004F642A /* ASTextKitFontSizeAdjuster.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASTextKitFontSizeAdjuster.h; path = TextKit/ASTextKitFontSizeAdjuster.h; sourceTree = ""; }; A373200E1C571B050011FC94 /* ASTextNode+Beta.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ASTextNode+Beta.h"; sourceTree = ""; }; - AC026B571BD3F61800BBC17E /* ASStaticLayoutSpecSnapshotTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASStaticLayoutSpecSnapshotTests.m; sourceTree = ""; }; + AC026B571BD3F61800BBC17E /* ASAbsoluteLayoutSpecSnapshotTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASAbsoluteLayoutSpecSnapshotTests.m; sourceTree = ""; }; AC026B671BD57D6F00BBC17E /* ASChangeSetDataController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASChangeSetDataController.h; sourceTree = ""; }; AC026B681BD57D6F00BBC17E /* ASChangeSetDataController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASChangeSetDataController.mm; sourceTree = ""; }; AC026B6D1BD57DBF00BBC17E /* _ASHierarchyChangeSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _ASHierarchyChangeSet.h; sourceTree = ""; }; @@ -1081,8 +1081,8 @@ ACF6ED151B17843500DA7C62 /* ASRatioLayoutSpec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = ASRatioLayoutSpec.mm; path = AsyncDisplayKit/Layout/ASRatioLayoutSpec.mm; sourceTree = ""; }; ACF6ED161B17843500DA7C62 /* ASStackLayoutSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASStackLayoutSpec.h; path = AsyncDisplayKit/Layout/ASStackLayoutSpec.h; sourceTree = ""; }; ACF6ED171B17843500DA7C62 /* ASStackLayoutSpec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ASStackLayoutSpec.mm; path = AsyncDisplayKit/Layout/ASStackLayoutSpec.mm; sourceTree = ""; }; - ACF6ED181B17843500DA7C62 /* ASStaticLayoutSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASStaticLayoutSpec.h; path = AsyncDisplayKit/Layout/ASStaticLayoutSpec.h; sourceTree = ""; }; - ACF6ED191B17843500DA7C62 /* ASStaticLayoutSpec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = ASStaticLayoutSpec.mm; path = AsyncDisplayKit/Layout/ASStaticLayoutSpec.mm; sourceTree = ""; }; + ACF6ED181B17843500DA7C62 /* ASAbsoluteLayoutSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASAbsoluteLayoutSpec.h; path = AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.h; sourceTree = ""; }; + ACF6ED191B17843500DA7C62 /* ASAbsoluteLayoutSpec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = ASAbsoluteLayoutSpec.mm; path = AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.mm; sourceTree = ""; }; ACF6ED431B17847A00DA7C62 /* ASInternalHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASInternalHelpers.h; sourceTree = ""; }; ACF6ED441B17847A00DA7C62 /* ASInternalHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASInternalHelpers.m; sourceTree = ""; }; ACF6ED451B17847A00DA7C62 /* ASLayoutSpecUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASLayoutSpecUtilities.h; sourceTree = ""; }; @@ -1396,7 +1396,7 @@ 696FCB301D6E46050093471E /* ASBackgroundLayoutSpecSnapshotTests.mm */, ACF6ED5A1B178DC700DA7C62 /* ASRatioLayoutSpecSnapshotTests.mm */, ACF6ED5B1B178DC700DA7C62 /* ASStackLayoutSpecSnapshotTests.mm */, - AC026B571BD3F61800BBC17E /* ASStaticLayoutSpecSnapshotTests.m */, + AC026B571BD3F61800BBC17E /* ASAbsoluteLayoutSpecSnapshotTests.m */, 81E95C131D62639600336598 /* ASTextNodeSnapshotTests.m */, ACF6ED571B178DC700DA7C62 /* ASLayoutSpecSnapshotTestsHelper.h */, ACF6ED581B178DC700DA7C62 /* ASLayoutSpecSnapshotTestsHelper.m */, @@ -1707,9 +1707,9 @@ AC21EC0F1B3D0BF600C8B19A /* ASStackLayoutDefines.h */, ACF6ED161B17843500DA7C62 /* ASStackLayoutSpec.h */, ACF6ED171B17843500DA7C62 /* ASStackLayoutSpec.mm */, - 9C6BB3B01B8CC9C200F13F52 /* ASStaticLayoutable.h */, - ACF6ED181B17843500DA7C62 /* ASStaticLayoutSpec.h */, - ACF6ED191B17843500DA7C62 /* ASStaticLayoutSpec.mm */, + 9C6BB3B01B8CC9C200F13F52 /* ASAbsoluteLayoutable.h */, + ACF6ED181B17843500DA7C62 /* ASAbsoluteLayoutSpec.h */, + ACF6ED191B17843500DA7C62 /* ASAbsoluteLayoutSpec.mm */, ); name = Layout; path = ..; @@ -1896,8 +1896,8 @@ 34EFC7751B701D2400AD841F /* ASStackPositionedLayout.h in Headers */, 69E1006E1CA89CB600D88C1B /* ASEnvironmentInternal.h in Headers */, 34EFC7771B701D2D00AD841F /* ASStackUnpositionedLayout.h in Headers */, - 9C6BB3B31B8CC9C200F13F52 /* ASStaticLayoutable.h in Headers */, - 34EFC7731B701D0700AD841F /* ASStaticLayoutSpec.h in Headers */, + 9C6BB3B31B8CC9C200F13F52 /* ASAbsoluteLayoutable.h in Headers */, + 34EFC7731B701D0700AD841F /* ASAbsoluteLayoutSpec.h in Headers */, CC446A2F1D80AAE00071FD03 /* ASObjectDescriptionHelpers.h in Headers */, 254C6B781BF94DF4003EC431 /* ASTextKitContext.h in Headers */, B350620A1B010EFD0018CF92 /* ASTableView.h in Headers */, @@ -2227,7 +2227,7 @@ 81EE38501C8E94F000456208 /* ASRunLoopQueue.mm in Sources */, 9C70F2041CDA4EFA007D6C76 /* ASTraitCollection.m in Sources */, 92074A691CC8BADA00918F75 /* ASControlNode+tvOS.m in Sources */, - ACF6ED321B17843500DA7C62 /* ASStaticLayoutSpec.mm in Sources */, + ACF6ED321B17843500DA7C62 /* ASAbsoluteLayoutSpec.mm in Sources */, AC026B6B1BD57D6F00BBC17E /* ASChangeSetDataController.mm in Sources */, 68355B311CB5799E001D4E68 /* ASImageNode+AnimatedImage.mm in Sources */, 9CFFC6C01CCAC73C006A6476 /* ASViewController.mm in Sources */, @@ -2273,7 +2273,7 @@ 058D0A3B195D057000B7D73C /* ASDisplayNodeTestsHelper.m in Sources */, 83A7D95E1D446A6E00BF333E /* ASWeakMapTests.m in Sources */, 056D21551ABCEF50001107EF /* ASImageNodeSnapshotTests.m in Sources */, - AC026B581BD3F61800BBC17E /* ASStaticLayoutSpecSnapshotTests.m in Sources */, + AC026B581BD3F61800BBC17E /* ASAbsoluteLayoutSpecSnapshotTests.m in Sources */, ACF6ED5E1B178DC700DA7C62 /* ASInsetLayoutSpecSnapshotTests.mm in Sources */, ACF6ED601B178DC700DA7C62 /* ASLayoutSpecSnapshotTestsHelper.m in Sources */, CC7FD9E11BB5F750005CCB2B /* ASPhotosFrameworkImageRequestTests.m in Sources */, @@ -2413,7 +2413,7 @@ DE84918E1C8FFF9F003D89E9 /* ASRunLoopQueue.mm in Sources */, 68FC85E51CE29B7E00EDD713 /* ASTabBarController.m in Sources */, AC026B6C1BD57D6F00BBC17E /* ASChangeSetDataController.mm in Sources */, - 34EFC7741B701D0A00AD841F /* ASStaticLayoutSpec.mm in Sources */, + 34EFC7741B701D0A00AD841F /* ASAbsoluteLayoutSpec.mm in Sources */, 92074A6A1CC8BADA00918F75 /* ASControlNode+tvOS.m in Sources */, DB78412E1C6BCE1600A9E2B4 /* _ASTransitionContext.m in Sources */, B350620B1B010EFD0018CF92 /* ASTableView.mm in Sources */, diff --git a/AsyncDisplayKit/ASButtonNode.mm b/AsyncDisplayKit/ASButtonNode.mm index 3628213431..a0eb08dea0 100644 --- a/AsyncDisplayKit/ASButtonNode.mm +++ b/AsyncDisplayKit/ASButtonNode.mm @@ -14,7 +14,7 @@ #import "ASDisplayNode+Subclasses.h" #import "ASBackgroundLayoutSpec.h" #import "ASInsetLayoutSpec.h" -#import "ASStaticLayoutSpec.h" +#import "ASAbsoluteLayoutSpec.h" @interface ASButtonNode () { diff --git a/AsyncDisplayKit/ASVideoPlayerNode.mm b/AsyncDisplayKit/ASVideoPlayerNode.mm index cd1068ec71..a099eaecdc 100644 --- a/AsyncDisplayKit/ASVideoPlayerNode.mm +++ b/AsyncDisplayKit/ASVideoPlayerNode.mm @@ -726,7 +726,7 @@ static void *ASVideoPlayerNodeContext = &ASVideoPlayerNodeContext; [overlaySpec.style setSizeWithCGSize:maxSize]; [children addObject:overlaySpec]; - return [ASStaticLayoutSpec staticLayoutSpecWithChildren:children]; + return [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:children]; } - (ASLayoutSpec *)defaultLayoutSpecThatFits:(CGSize)maxSize diff --git a/AsyncDisplayKit/AsyncDisplayKit.h b/AsyncDisplayKit/AsyncDisplayKit.h index bdb769ec43..2d89f9a272 100644 --- a/AsyncDisplayKit/AsyncDisplayKit.h +++ b/AsyncDisplayKit/AsyncDisplayKit.h @@ -56,7 +56,7 @@ #import #import #import -#import +#import #import #import diff --git a/AsyncDisplayKit/Layout/ASStaticLayoutSpec.h b/AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.h similarity index 75% rename from AsyncDisplayKit/Layout/ASStaticLayoutSpec.h rename to AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.h index cdd85907f0..00824e0ab1 100644 --- a/AsyncDisplayKit/Layout/ASStaticLayoutSpec.h +++ b/AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.h @@ -1,5 +1,5 @@ // -// ASStaticLayoutSpec.h +// ASAbsoluteLayoutSpec.h // AsyncDisplayKit // // Copyright (c) 2014-present, Facebook, Inc. All rights reserved. @@ -17,12 +17,12 @@ NS_ASSUME_NONNULL_BEGIN * * Computes a size that is the union of all childrens' frames. */ -@interface ASStaticLayoutSpec : ASLayoutSpec +@interface ASAbsoluteLayoutSpec : ASLayoutSpec /** - @param children Children to be positioned at fixed positions, each conforms to ASStaticLayoutable + @param children Children to be positioned at fixed positions, each conforms to ASAbsoluteLayoutable */ -+ (instancetype)staticLayoutSpecWithChildren:(NSArray> *)children; ++ (instancetype)absoluteLayoutSpecWithChildren:(NSArray> *)children; @end diff --git a/AsyncDisplayKit/Layout/ASStaticLayoutSpec.mm b/AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.mm similarity index 90% rename from AsyncDisplayKit/Layout/ASStaticLayoutSpec.mm rename to AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.mm index 3ebcc83a0b..1b86fdcb15 100644 --- a/AsyncDisplayKit/Layout/ASStaticLayoutSpec.mm +++ b/AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.mm @@ -1,5 +1,5 @@ // -// ASStaticLayoutSpec.mm +// ASAbsoluteLayoutSpec.mm // AsyncDisplayKit // // Copyright (c) 2014-present, Facebook, Inc. All rights reserved. @@ -8,14 +8,14 @@ // of patent rights can be found in the PATENTS file in the same directory. // -#import "ASStaticLayoutSpec.h" +#import "ASAbsoluteLayoutSpec.h" #import "ASLayoutSpecUtilities.h" #import "ASLayout.h" -@implementation ASStaticLayoutSpec +@implementation ASAbsoluteLayoutSpec -+ (instancetype)staticLayoutSpecWithChildren:(NSArray *)children ++ (instancetype)absoluteLayoutSpecWithChildren:(NSArray *)children { return [[self alloc] initWithChildren:children]; } @@ -78,7 +78,7 @@ @end -@implementation ASStaticLayoutSpec (ASEnvironment) +@implementation ASAbsoluteLayoutSpec (ASEnvironment) - (BOOL)supportsUpwardPropagation { @@ -87,7 +87,7 @@ @end -@implementation ASStaticLayoutSpec (Debugging) +@implementation ASAbsoluteLayoutSpec (Debugging) #pragma mark - ASLayoutableAsciiArtProtocol diff --git a/AsyncDisplayKit/Layout/ASStaticLayoutable.h b/AsyncDisplayKit/Layout/ASAbsoluteLayoutable.h similarity index 86% rename from AsyncDisplayKit/Layout/ASStaticLayoutable.h rename to AsyncDisplayKit/Layout/ASAbsoluteLayoutable.h index 955a939653..0b07b474ae 100644 --- a/AsyncDisplayKit/Layout/ASStaticLayoutable.h +++ b/AsyncDisplayKit/Layout/ASAbsoluteLayoutable.h @@ -1,5 +1,5 @@ // -// ASStaticLayoutable.h +// ASAbsoluteLayoutable.h // AsyncDisplayKit // // Copyright (c) 2014-present, Facebook, Inc. All rights reserved. @@ -11,9 +11,9 @@ NS_ASSUME_NONNULL_BEGIN /** - * Layout options that can be defined for an ASLayoutable being added to a ASStaticLayoutSpec. + * Layout options that can be defined for an ASLayoutable being added to a ASAbsoluteLayoutSpec. */ -@protocol ASStaticLayoutable +@protocol ASAbsoluteLayoutable /** * @abstract The position of this object within its parent spec. diff --git a/AsyncDisplayKit/Layout/ASLayoutSpec.mm b/AsyncDisplayKit/Layout/ASLayoutSpec.mm index c4126f8aaa..6e0b09a67f 100644 --- a/AsyncDisplayKit/Layout/ASLayoutSpec.mm +++ b/AsyncDisplayKit/Layout/ASLayoutSpec.mm @@ -186,7 +186,7 @@ } // Subclasses can override this method to return NO, because upward propagation is not enabled if a layout -// specification has more than one child. Currently ASStackLayoutSpec and ASStaticLayoutSpec are currently +// specification has more than one child. Currently ASStackLayoutSpec and ASAbsoluteLayoutSpec are currently // the specifications that are known to have more than one. - (BOOL)supportsUpwardPropagation { diff --git a/AsyncDisplayKit/Layout/ASLayoutValidation.h b/AsyncDisplayKit/Layout/ASLayoutValidation.h index d0db9bf18e..1b18ba7cd7 100644 --- a/AsyncDisplayKit/Layout/ASLayoutValidation.h +++ b/AsyncDisplayKit/Layout/ASLayoutValidation.h @@ -39,8 +39,8 @@ typedef void (^ASLayoutableBlockValidatorBlock)(id layout); @end /* - * ASLayoutables that have sizeRange or layoutPosition set needs to be wrapped into a ASStaticLayoutSpec. This - * validator checks if sublayouts has sizeRange or layoutPosition set and is wrapped in a ASStaticLayoutSpec + * ASLayoutables that have sizeRange or layoutPosition set needs to be wrapped into a ASAbsoluteLayoutSpec. This + * validator checks if sublayouts has sizeRange or layoutPosition set and is wrapped in a ASAbsoluteLayoutSpec */ @interface ASLayoutableStaticValidator : NSObject diff --git a/AsyncDisplayKit/Layout/ASLayoutValidation.mm b/AsyncDisplayKit/Layout/ASLayoutValidation.mm index 20261b2d67..cf7ba92638 100644 --- a/AsyncDisplayKit/Layout/ASLayoutValidation.mm +++ b/AsyncDisplayKit/Layout/ASLayoutValidation.mm @@ -12,7 +12,7 @@ #import "ASLayout.h" #import "ASDisplayNode.h" -#import "ASStaticLayoutSpec.h" +#import "ASAbsoluteLayoutSpec.h" #import "ASStackLayoutSpec.h" #import @@ -69,14 +69,14 @@ static NSString *ASLayoutValidationWrappingAssertMessage(SEL selector, id obj, C id sublayoutLayoutable = sublayout.layoutable; NSString *assertMessage = nil; - Class stackContainerClass = [ASStaticLayoutSpec class]; + Class stackContainerClass = [ASAbsoluteLayoutSpec class]; // Check for default layoutPosition if (!CGPointEqualToPoint(sublayoutLayoutable.style.layoutPosition, CGPointZero)) { assertMessage = ASLayoutValidationWrappingAssertMessage(@selector(layoutPosition), sublayoutLayoutable, stackContainerClass); } - // Sublayout layoutable should be wrapped in a ASStaticLayoutSpec + // Sublayout layoutable should be wrapped in a ASAbsoluteLayoutSpec if (assertMessage == nil || [layoutable isKindOfClass:stackContainerClass]) { continue; } diff --git a/AsyncDisplayKit/Layout/ASLayoutable.h b/AsyncDisplayKit/Layout/ASLayoutable.h index 15423cc097..9801901a95 100644 --- a/AsyncDisplayKit/Layout/ASLayoutable.h +++ b/AsyncDisplayKit/Layout/ASLayoutable.h @@ -11,7 +11,7 @@ #import #import #import -#import +#import #import #import @@ -176,7 +176,7 @@ extern NSString * const ASLayoutableStyleLayoutPositionProperty; - (void)style:(__kindof ASLayoutableStyle *)style propertyDidChange:(NSString *)propertyName; @end -@interface ASLayoutableStyle : NSObject +@interface ASLayoutableStyle : NSObject #pragma mark - Delegate @@ -306,7 +306,7 @@ extern NSString * const ASLayoutableStyleLayoutPositionProperty; @property (nonatomic, assign) CGFloat descender; -#pragma mark - ASStaticLayoutable +#pragma mark - ASAbsoluteLayoutable /** * @abstract The position of this object within its parent spec. diff --git a/AsyncDisplayKitTests/ASStaticLayoutSpecSnapshotTests.m b/AsyncDisplayKitTests/ASAbsoluteLayoutSpecSnapshotTests.m similarity index 88% rename from AsyncDisplayKitTests/ASStaticLayoutSpecSnapshotTests.m rename to AsyncDisplayKitTests/ASAbsoluteLayoutSpecSnapshotTests.m index 3df4d579ae..24231dde26 100644 --- a/AsyncDisplayKitTests/ASStaticLayoutSpecSnapshotTests.m +++ b/AsyncDisplayKitTests/ASAbsoluteLayoutSpecSnapshotTests.m @@ -1,5 +1,5 @@ // -// ASStaticLayoutSpecSnapshotTests.m +// ASAbsoluteLayoutSpecSnapshotTests.m // AsyncDisplayKit // // Created by Huy Nguyen on 18/10/15. @@ -12,13 +12,13 @@ #import "ASLayoutSpecSnapshotTestsHelper.h" -#import "ASStaticLayoutSpec.h" +#import "ASAbsoluteLayoutSpec.h" #import "ASBackgroundLayoutSpec.h" -@interface ASStaticLayoutSpecSnapshotTests : ASLayoutSpecSnapshotTestCase +@interface ASAbsoluteLayoutSpecSnapshotTests : ASLayoutSpecSnapshotTestCase @end -@implementation ASStaticLayoutSpecSnapshotTests +@implementation ASAbsoluteLayoutSpecSnapshotTests - (void)testSizingBehaviour { @@ -62,10 +62,8 @@ [subnodes insertObject:backgroundNode atIndex:0]; ASLayoutSpec *layoutSpec = - [ASBackgroundLayoutSpec - backgroundLayoutSpecWithChild: - [ASStaticLayoutSpec - staticLayoutSpecWithChildren:children] + [ASBackgroundLayoutSpec backgroundLayoutSpecWithChild: + [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:children] background:backgroundNode]; [self testLayoutSpec:layoutSpec sizeRange:sizeRange subnodes:subnodes identifier:identifier]; diff --git a/AsyncDisplayKitTests/ASDisplayNodeImplicitHierarchyTests.m b/AsyncDisplayKitTests/ASDisplayNodeImplicitHierarchyTests.m index c1877b26da..5b278052a0 100644 --- a/AsyncDisplayKitTests/ASDisplayNodeImplicitHierarchyTests.m +++ b/AsyncDisplayKitTests/ASDisplayNodeImplicitHierarchyTests.m @@ -16,7 +16,7 @@ #import "ASDisplayNode+Beta.h" #import "ASDisplayNode+Subclasses.h" -#import "ASStaticLayoutSpec.h" +#import "ASAbsoluteLayoutSpec.h" #import "ASStackLayoutSpec.h" #import "ASInsetLayoutSpec.h" @@ -68,7 +68,7 @@ ASSpecTestDisplayNode *node = [[ASSpecTestDisplayNode alloc] init]; node.automaticallyManagesSubnodes = YES; node.layoutSpecBlock = ^(ASDisplayNode *weakNode, ASSizeRange constrainedSize) { - ASStaticLayoutSpec *staticLayout = [ASStaticLayoutSpec staticLayoutSpecWithChildren:@[node4]]; + ASAbsoluteLayoutSpec *staticLayout = [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[node4]]; ASStackLayoutSpec *stack1 = [[ASStackLayoutSpec alloc] init]; [stack1 setChildren:@[node1, node2]]; @@ -76,7 +76,7 @@ ASStackLayoutSpec *stack2 = [[ASStackLayoutSpec alloc] init]; [stack2 setChildren:@[node3, staticLayout]]; - return [ASStaticLayoutSpec staticLayoutSpecWithChildren:@[stack1, stack2, node5]]; + return [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[stack1, stack2, node5]]; }; [node layoutThatFits:ASSizeRangeMake(CGSizeZero)]; XCTAssertEqual(node.subnodes[0], node5); @@ -97,11 +97,11 @@ node.layoutSpecBlock = ^(ASDisplayNode *weakNode, ASSizeRange constrainedSize){ ASSpecTestDisplayNode *strongNode = (ASSpecTestDisplayNode *)weakNode; if ([strongNode.layoutState isEqualToNumber:@1]) { - return [ASStaticLayoutSpec staticLayoutSpecWithChildren:@[node1, node2]]; + return [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[node1, node2]]; } else { ASStackLayoutSpec *stackLayout = [[ASStackLayoutSpec alloc] init]; [stackLayout setChildren:@[node3, node2]]; - return [ASStaticLayoutSpec staticLayoutSpecWithChildren:@[node1, stackLayout]]; + return [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[node1, stackLayout]]; } }; @@ -126,7 +126,7 @@ ASSpecTestDisplayNode *node = [[ASSpecTestDisplayNode alloc] init]; node.automaticallyManagesSubnodes = YES; node.layoutSpecBlock = ^ASLayoutSpec *(ASDisplayNode *weakNode, ASSizeRange constrainedSize){ - return [ASStaticLayoutSpec staticLayoutSpecWithChildren:@[node1]]; + return [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[node1]]; }; XCTAssertNoThrow([node layoutThatFits:ASSizeRangeMake(CGSizeZero)]); @@ -160,9 +160,9 @@ node.layoutSpecBlock = ^(ASDisplayNode *weakNode, ASSizeRange constrainedSize) { ASSpecTestDisplayNode *strongNode = (ASSpecTestDisplayNode *)weakNode; if ([strongNode.layoutState isEqualToNumber:@1]) { - return [ASStaticLayoutSpec staticLayoutSpecWithChildren:@[node1]]; + return [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[node1]]; } else { - return [ASStaticLayoutSpec staticLayoutSpecWithChildren:@[node2]]; + return [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[node2]]; } }; @@ -205,9 +205,9 @@ node.layoutSpecBlock = ^(ASDisplayNode *weakNode, ASSizeRange constrainedSize) { ASSpecTestDisplayNode *strongNode = (ASSpecTestDisplayNode *)weakNode; if ([strongNode.layoutState isEqualToNumber:@1]) { - return [ASStaticLayoutSpec staticLayoutSpecWithChildren:@[node1]]; + return [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[node1]]; } else { - return [ASStaticLayoutSpec staticLayoutSpecWithChildren:@[node2]]; + return [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[node2]]; } }; diff --git a/AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testChildrenMeasuredWithAutoMaxSize@2x.png b/AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testChildrenMeasuredWithAutoMaxSize@2x.png similarity index 100% rename from AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testChildrenMeasuredWithAutoMaxSize@2x.png rename to AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testChildrenMeasuredWithAutoMaxSize@2x.png diff --git a/AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testChildrenMeasuredWithAutoMaxSize@3x.png b/AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testChildrenMeasuredWithAutoMaxSize@3x.png similarity index 100% rename from AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testChildrenMeasuredWithAutoMaxSize@3x.png rename to AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testChildrenMeasuredWithAutoMaxSize@3x.png diff --git a/AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testSizingBehaviour_overflowChildren@2x.png b/AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testSizingBehaviour_overflowChildren@2x.png similarity index 100% rename from AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testSizingBehaviour_overflowChildren@2x.png rename to AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testSizingBehaviour_overflowChildren@2x.png diff --git a/AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testSizingBehaviour_overflowChildren@3x.png b/AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testSizingBehaviour_overflowChildren@3x.png similarity index 100% rename from AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testSizingBehaviour_overflowChildren@3x.png rename to AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testSizingBehaviour_overflowChildren@3x.png diff --git a/AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testSizingBehaviour_underflowChildren@2x.png b/AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testSizingBehaviour_underflowChildren@2x.png similarity index 100% rename from AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testSizingBehaviour_underflowChildren@2x.png rename to AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testSizingBehaviour_underflowChildren@2x.png diff --git a/AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testSizingBehaviour_underflowChildren@3x.png b/AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testSizingBehaviour_underflowChildren@3x.png similarity index 100% rename from AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testSizingBehaviour_underflowChildren@3x.png rename to AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testSizingBehaviour_underflowChildren@3x.png diff --git a/AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testSizingBehaviour_wrappedChildren@2x.png b/AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testSizingBehaviour_wrappedChildren@2x.png similarity index 100% rename from AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testSizingBehaviour_wrappedChildren@2x.png rename to AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testSizingBehaviour_wrappedChildren@2x.png diff --git a/AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testSizingBehaviour_wrappedChildren@3x.png b/AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testSizingBehaviour_wrappedChildren@3x.png similarity index 100% rename from AsyncDisplayKitTests/ReferenceImages_64/ASStaticLayoutSpecSnapshotTests/testSizingBehaviour_wrappedChildren@3x.png rename to AsyncDisplayKitTests/ReferenceImages_64/ASAbsoluteLayoutSpecSnapshotTests/testSizingBehaviour_wrappedChildren@3x.png diff --git a/examples/ASViewController/Sample/DetailCellNode.m b/examples/ASViewController/Sample/DetailCellNode.m index 27705cdc8f..adba6917ee 100644 --- a/examples/ASViewController/Sample/DetailCellNode.m +++ b/examples/ASViewController/Sample/DetailCellNode.m @@ -40,7 +40,7 @@ { self.imageNode.position = CGPointZero; [self.imageNode.style setSizeWithCGSize:constrainedSize.max]; - return [ASStaticLayoutSpec staticLayoutSpecWithChildren:@[self.imageNode]]; + return [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[self.imageNode]]; } - (void)layoutDidFinish diff --git a/examples/ASViewController/Sample/DetailRootNode.m b/examples/ASViewController/Sample/DetailRootNode.m index ad907986db..3292bfda6f 100644 --- a/examples/ASViewController/Sample/DetailRootNode.m +++ b/examples/ASViewController/Sample/DetailRootNode.m @@ -64,7 +64,7 @@ static const NSInteger kImageHeight = 200; { self.collectionNode.position = CGPointZero; [self.collectionNode.style setSizeWithCGSize:constrainedSize.max]; - return [ASStaticLayoutSpec staticLayoutSpecWithChildren:@[self.collectionNode]]; + return [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[self.collectionNode]]; } #pragma mark - ASCollectionDataSource diff --git a/examples/AsyncDisplayKitOverview/Sample/OverviewComponentsViewController.m b/examples/AsyncDisplayKitOverview/Sample/OverviewComponentsViewController.m index da63c86cec..99934764a2 100644 --- a/examples/AsyncDisplayKitOverview/Sample/OverviewComponentsViewController.m +++ b/examples/AsyncDisplayKitOverview/Sample/OverviewComponentsViewController.m @@ -359,16 +359,16 @@ typedef ASLayoutSpec *(^OverviewDisplayNodeSizeThatFitsBlock)(ASSizeRange constr [parentNode addSubnode:childNode]; [mutableLayoutSpecData addObject:parentNode]; -#pragma mark ASStaticLayoutSpec +#pragma mark ASAbsoluteLayoutSpec childNode = [self childNode]; - // Add a layout position to the child node that the static layout spec will pick up and place it on that position + // Add a layout position to the child node that the absolute layout spec will pick up and place it on that position childNode.style.layoutPosition = CGPointMake(10.0, 10.0); parentNode = [self parentNodeWithChild:childNode]; - parentNode.entryTitle = @"ASStaticLayoutSpec"; + parentNode.entryTitle = @"ASAbsoluteLayoutSpec"; parentNode.entryDescription = @"Allows positioning children at fixed offsets."; parentNode.sizeThatFitsBlock = ^ASLayoutSpec *(ASSizeRange constrainedSize) { - return [ASStaticLayoutSpec staticLayoutSpecWithChildren:@[childNode]]; + return [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[childNode]]; }; [parentNode addSubnode:childNode]; [mutableLayoutSpecData addObject:parentNode]; diff --git a/examples/CatDealsCollectionView/Sample/ItemNode.m b/examples/CatDealsCollectionView/Sample/ItemNode.m index 2e18c65494..3fb7a39364 100644 --- a/examples/CatDealsCollectionView/Sample/ItemNode.m +++ b/examples/CatDealsCollectionView/Sample/ItemNode.m @@ -291,7 +291,7 @@ const CGFloat kSoldOutGBHeight = 50.0; self.badge.style.layoutPosition = CGPointMake(0, constrainedSize.max.height - kFixedLabelsAreaHeight - kBadgeHeight); self.badge.style.height = ASDimensionMakeWithPoints(kBadgeHeight); - ASStaticLayoutSpec *badgePosition = [ASStaticLayoutSpec staticLayoutSpecWithChildren:@[self.badge]]; + ASAbsoluteLayoutSpec *badgePosition = [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[self.badge]]; ASOverlayLayoutSpec *badgeOverImage = [ASOverlayLayoutSpec overlayLayoutSpecWithChild:imagePlace overlay:badgePosition]; badgeOverImage.style.flexGrow = YES; diff --git a/examples/Videos/Sample/ViewController.m b/examples/Videos/Sample/ViewController.m index 94e556f1c8..a4a4dea5e2 100644 --- a/examples/Videos/Sample/ViewController.m +++ b/examples/Videos/Sample/ViewController.m @@ -66,7 +66,7 @@ [hlsVideoNode.style setSizeWithCGSize:CGSizeMake(mainScreenBoundsSize.width / 2.0, mainScreenBoundsSize.height / 3.0)]; hlsVideoNode.style.layoutPosition = CGPointMake(0.0, mainScreenBoundsSize.height / 3.0); - return [ASStaticLayoutSpec staticLayoutSpecWithChildren:@[guitarVideoNode, nicCageVideoNode, simonVideoNode, hlsVideoNode]]; + return [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:@[guitarVideoNode, nicCageVideoNode, simonVideoNode, hlsVideoNode]]; }; [self.view addSubnode:_rootNode];