From dfbaa357069714f8b669c72def1a3fbf7e92c186 Mon Sep 17 00:00:00 2001 From: Huy Nguyen Date: Wed, 16 Sep 2015 23:04:18 +0300 Subject: [PATCH 01/17] Disable an unstable test in ASTableViewTests. --- AsyncDisplayKitTests/ASTableViewTests.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDisplayKitTests/ASTableViewTests.m b/AsyncDisplayKitTests/ASTableViewTests.m index 1d074ac317..bdba88cf19 100644 --- a/AsyncDisplayKitTests/ASTableViewTests.m +++ b/AsyncDisplayKitTests/ASTableViewTests.m @@ -379,7 +379,7 @@ }]; } -- (void)testRelayoutRowsAfterEditingModeIsChangedAndTheyBecomeVisible +- (void)DISABLED_testRelayoutRowsAfterEditingModeIsChangedAndTheyBecomeVisible { CGSize tableViewSize = CGSizeMake(100, 500); ASTestTableView *tableView = [[ASTestTableView alloc] initWithFrame:CGRectMake(0, 0, tableViewSize.width, tableViewSize.height) From b1dfaa1effe85788faabbda0ed2c812c460c523c Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Wed, 16 Sep 2015 14:17:52 -0700 Subject: [PATCH 02/17] Update project indentation settings --- AsyncDisplayKit.xcodeproj/project.pbxproj | 1 + examples/ASCollectionView/Sample.xcodeproj/project.pbxproj | 3 +++ .../ASTableViewStressTest/Sample.xcodeproj/project.pbxproj | 3 +++ examples/EditableText/Sample.xcodeproj/project.pbxproj | 3 +++ .../Sample.xcodeproj/project.pbxproj | 3 +++ examples/Kittens/Sample.xcodeproj/project.pbxproj | 1 + examples/Multiplex/Sample.xcodeproj/project.pbxproj | 3 +++ examples/Placeholders/Sample.xcodeproj/project.pbxproj | 3 +++ examples/Swift/Sample.xcodeproj/project.pbxproj | 1 + .../Life Without CocoaPods.xcodeproj/project.pbxproj | 3 +++ 10 files changed, 24 insertions(+) diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj index c3c4b105bf..4b5e1b22b2 100644 --- a/AsyncDisplayKit.xcodeproj/project.pbxproj +++ b/AsyncDisplayKit.xcodeproj/project.pbxproj @@ -721,6 +721,7 @@ indentWidth = 2; sourceTree = ""; tabWidth = 2; + usesTabs = 0; }; 058D09AD195D04C000B7D73C /* Products */ = { isa = PBXGroup; diff --git a/examples/ASCollectionView/Sample.xcodeproj/project.pbxproj b/examples/ASCollectionView/Sample.xcodeproj/project.pbxproj index de4cdb410f..7f64fc5596 100644 --- a/examples/ASCollectionView/Sample.xcodeproj/project.pbxproj +++ b/examples/ASCollectionView/Sample.xcodeproj/project.pbxproj @@ -77,8 +77,11 @@ AC3C4A8D1A11F80C00143C57 /* Images.xcassets */, AC3C4A611A11F47200143C57 /* Supporting Files */, ); + indentWidth = 2; path = Sample; sourceTree = ""; + tabWidth = 2; + usesTabs = 0; }; AC3C4A611A11F47200143C57 /* Supporting Files */ = { isa = PBXGroup; diff --git a/examples/ASTableViewStressTest/Sample.xcodeproj/project.pbxproj b/examples/ASTableViewStressTest/Sample.xcodeproj/project.pbxproj index 7ae0001200..e066c2fcd1 100644 --- a/examples/ASTableViewStressTest/Sample.xcodeproj/project.pbxproj +++ b/examples/ASTableViewStressTest/Sample.xcodeproj/project.pbxproj @@ -52,7 +52,10 @@ 1A943BF0259746F18D6E423F /* Frameworks */, 1AE410B73DA5C3BD087ACDD7 /* Pods */, ); + indentWidth = 2; sourceTree = ""; + tabWidth = 2; + usesTabs = 0; }; 05E2128219D4DB510098F589 /* Products */ = { isa = PBXGroup; diff --git a/examples/EditableText/Sample.xcodeproj/project.pbxproj b/examples/EditableText/Sample.xcodeproj/project.pbxproj index 0e69ba3272..a1a1bd3d35 100644 --- a/examples/EditableText/Sample.xcodeproj/project.pbxproj +++ b/examples/EditableText/Sample.xcodeproj/project.pbxproj @@ -52,7 +52,10 @@ 1A943BF0259746F18D6E423F /* Frameworks */, 1AE410B73DA5C3BD087ACDD7 /* Pods */, ); + indentWidth = 2; sourceTree = ""; + tabWidth = 2; + usesTabs = 0; }; 05E2128219D4DB510098F589 /* Products */ = { isa = PBXGroup; diff --git a/examples/HorizontalWithinVerticalScrolling/Sample.xcodeproj/project.pbxproj b/examples/HorizontalWithinVerticalScrolling/Sample.xcodeproj/project.pbxproj index ba7ab3428a..aabd4dda02 100644 --- a/examples/HorizontalWithinVerticalScrolling/Sample.xcodeproj/project.pbxproj +++ b/examples/HorizontalWithinVerticalScrolling/Sample.xcodeproj/project.pbxproj @@ -58,7 +58,10 @@ 1A943BF0259746F18D6E423F /* Frameworks */, 1AE410B73DA5C3BD087ACDD7 /* Pods */, ); + indentWidth = 2; sourceTree = ""; + tabWidth = 2; + usesTabs = 0; }; 05E2128219D4DB510098F589 /* Products */ = { isa = PBXGroup; diff --git a/examples/Kittens/Sample.xcodeproj/project.pbxproj b/examples/Kittens/Sample.xcodeproj/project.pbxproj index 1e08bbe8c1..ddfd884074 100644 --- a/examples/Kittens/Sample.xcodeproj/project.pbxproj +++ b/examples/Kittens/Sample.xcodeproj/project.pbxproj @@ -61,6 +61,7 @@ indentWidth = 2; sourceTree = ""; tabWidth = 2; + usesTabs = 0; }; 05E2128219D4DB510098F589 /* Products */ = { isa = PBXGroup; diff --git a/examples/Multiplex/Sample.xcodeproj/project.pbxproj b/examples/Multiplex/Sample.xcodeproj/project.pbxproj index 0e69ba3272..a1a1bd3d35 100644 --- a/examples/Multiplex/Sample.xcodeproj/project.pbxproj +++ b/examples/Multiplex/Sample.xcodeproj/project.pbxproj @@ -52,7 +52,10 @@ 1A943BF0259746F18D6E423F /* Frameworks */, 1AE410B73DA5C3BD087ACDD7 /* Pods */, ); + indentWidth = 2; sourceTree = ""; + tabWidth = 2; + usesTabs = 0; }; 05E2128219D4DB510098F589 /* Products */ = { isa = PBXGroup; diff --git a/examples/Placeholders/Sample.xcodeproj/project.pbxproj b/examples/Placeholders/Sample.xcodeproj/project.pbxproj index 0749dfd00c..1931d888f0 100644 --- a/examples/Placeholders/Sample.xcodeproj/project.pbxproj +++ b/examples/Placeholders/Sample.xcodeproj/project.pbxproj @@ -66,7 +66,10 @@ 1A943BF0259746F18D6E423F /* Frameworks */, 1AE410B73DA5C3BD087ACDD7 /* Pods */, ); + indentWidth = 2; sourceTree = ""; + tabWidth = 2; + usesTabs = 0; }; 05E2128219D4DB510098F589 /* Products */ = { isa = PBXGroup; diff --git a/examples/Swift/Sample.xcodeproj/project.pbxproj b/examples/Swift/Sample.xcodeproj/project.pbxproj index 4a845e166a..36632d7d46 100644 --- a/examples/Swift/Sample.xcodeproj/project.pbxproj +++ b/examples/Swift/Sample.xcodeproj/project.pbxproj @@ -52,6 +52,7 @@ indentWidth = 2; sourceTree = ""; tabWidth = 2; + usesTabs = 0; }; 050E7C6F19D22E19004363C2 /* Products */ = { isa = PBXGroup; diff --git a/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcodeproj/project.pbxproj b/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcodeproj/project.pbxproj index a024fc389d..4d01b90df2 100644 --- a/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcodeproj/project.pbxproj +++ b/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcodeproj/project.pbxproj @@ -57,7 +57,10 @@ 058968F11ABCE06E0059CE2A /* Life Without CocoaPods */, 058968F01ABCE06E0059CE2A /* Products */, ); + indentWidth = 2; sourceTree = ""; + tabWidth = 2; + usesTabs = 0; }; 058968F01ABCE06E0059CE2A /* Products */ = { isa = PBXGroup; From 7e3a0b3223d72740c62b997a742da6781cb51213 Mon Sep 17 00:00:00 2001 From: rcancro <@pinterest.com> Date: Wed, 16 Sep 2015 14:33:54 -0700 Subject: [PATCH 03/17] Changed copyIntoOptions to copyFromOptions I thought I already did this. I think copyFrom is a better name. --- AsyncDisplayKit/Layout/ASLayoutOptions.h | 2 +- AsyncDisplayKit/Layout/ASLayoutOptions.mm | 4 ++-- AsyncDisplayKit/Layout/ASLayoutSpec.mm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AsyncDisplayKit/Layout/ASLayoutOptions.h b/AsyncDisplayKit/Layout/ASLayoutOptions.h index 74352a34cf..7b9800ff79 100644 --- a/AsyncDisplayKit/Layout/ASLayoutOptions.h +++ b/AsyncDisplayKit/Layout/ASLayoutOptions.h @@ -64,7 +64,7 @@ * * @param layoutOptions The layoutOptions to copy from */ -- (void)copyIntoOptions:(ASLayoutOptions *)layoutOptions; +- (void)copyFromOptions:(ASLayoutOptions *)layoutOptions; #pragma mark - ASStackLayoutable diff --git a/AsyncDisplayKit/Layout/ASLayoutOptions.mm b/AsyncDisplayKit/Layout/ASLayoutOptions.mm index 67481cae02..e96f955c21 100644 --- a/AsyncDisplayKit/Layout/ASLayoutOptions.mm +++ b/AsyncDisplayKit/Layout/ASLayoutOptions.mm @@ -86,11 +86,11 @@ static Class gDefaultLayoutOptionsClass = nil; - (id)copyWithZone:(NSZone *)zone { ASLayoutOptions *copy = [[[self class] alloc] init]; - [copy copyIntoOptions:self]; + [copy copyFromOptions:self]; return copy; } -- (void)copyIntoOptions:(ASLayoutOptions *)layoutOptions +- (void)copyFromOptions:(ASLayoutOptions *)layoutOptions { ASDN::MutexLocker l(_propertyLock); self.flexBasis = layoutOptions.flexBasis; diff --git a/AsyncDisplayKit/Layout/ASLayoutSpec.mm b/AsyncDisplayKit/Layout/ASLayoutSpec.mm index 46e56dff4a..3ba312709b 100644 --- a/AsyncDisplayKit/Layout/ASLayoutSpec.mm +++ b/AsyncDisplayKit/Layout/ASLayoutSpec.mm @@ -82,7 +82,7 @@ static NSString * const kDefaultChildrenKey = @"kDefaultChildrenKey"; id finalLayoutable = [child finalLayoutable]; if (finalLayoutable != child) { - [finalLayoutable.layoutOptions copyIntoOptions:child.layoutOptions]; + [finalLayoutable.layoutOptions copyFromOptions:child.layoutOptions]; return finalLayoutable; } } From 1b25cdd1eb7d8b44e92fb0ebdb653f9830029b89 Mon Sep 17 00:00:00 2001 From: Jack Flintermann Date: Wed, 16 Sep 2015 19:45:00 -0400 Subject: [PATCH 04/17] clean up compile sources phase --- AsyncDisplayKit.xcodeproj/project.pbxproj | 282 +++++++++++----------- 1 file changed, 142 insertions(+), 140 deletions(-) diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj index c3c4b105bf..586189ebf5 100644 --- a/AsyncDisplayKit.xcodeproj/project.pbxproj +++ b/AsyncDisplayKit.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 044284FD1BAA365100D16268 /* UICollectionViewLayout+ASConvenience.m in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E0E1B371875007741D0 /* UICollectionViewLayout+ASConvenience.m */; }; 0515EA211A15769900BA8B9A /* Photos.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 051943141A1575670030A7D0 /* Photos.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 0515EA221A1576A100BA8B9A /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 051943121A1575630030A7D0 /* AssetsLibrary.framework */; }; 0516FA3C1A15563400B4EBED /* ASAvailability.h in Headers */ = {isa = PBXBuildFile; fileRef = 0516FA3A1A15563400B4EBED /* ASAvailability.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -1459,73 +1460,73 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 430E7C911B4C23F100697A4C /* ASIndexPath.m in Sources */, - 058D0A26195D050800B7D73C /* _ASCoreAnimationExtras.mm in Sources */, + 058D0A22195D050800B7D73C /* _ASAsyncTransaction.m in Sources */, 058D0A23195D050800B7D73C /* _ASAsyncTransactionContainer.m in Sources */, - 058D0A1E195D050800B7D73C /* ASTextNodeShadower.m in Sources */, - ACF6ED2E1B17843500DA7C62 /* ASRatioLayoutSpec.mm in Sources */, + 058D0A24195D050800B7D73C /* _ASAsyncTransactionGroup.m in Sources */, + 058D0A26195D050800B7D73C /* _ASCoreAnimationExtras.mm in Sources */, 058D0A18195D050800B7D73C /* _ASDisplayLayer.mm in Sources */, - ACF6ED321B17843500DA7C62 /* ASStaticLayoutSpec.mm in Sources */, + 058D0A19195D050800B7D73C /* _ASDisplayView.mm in Sources */, + 058D0A27195D050800B7D73C /* _ASPendingState.m in Sources */, + 205F0E1A1B37339C007741D0 /* ASAbstractLayoutController.mm in Sources */, + ACF6ED1B1B17843500DA7C62 /* ASBackgroundLayoutSpec.mm in Sources */, + 0549634A1A1EA066000F8E56 /* ASBasicImageDownloader.mm in Sources */, + 299DA1AA1A828D2900162D41 /* ASBatchContext.mm in Sources */, + 296A0A2F1A9516B2005ACEAA /* ASBatchFetching.m in Sources */, + AC6456091B0A335000CF11B8 /* ASCellNode.m in Sources */, + ACF6ED1D1B17843500DA7C62 /* ASCenterLayoutSpec.mm in Sources */, + 18C2ED801B9B7DE800F627B3 /* ASCollectionNode.m in Sources */, + AC3C4A521A1139C100143C57 /* ASCollectionView.mm in Sources */, + 205F0E1E1B373A2C007741D0 /* ASCollectionViewLayoutController.mm in Sources */, + 058D0A13195D050800B7D73C /* ASControlNode.m in Sources */, + 464052211A3F83C40061C0BA /* ASDataController.mm in Sources */, + 05A6D05B19D0EB64002DD95E /* ASDealloc2MainObject.m in Sources */, + ACF6ED211B17843500DA7C62 /* ASDimension.mm in Sources */, + 058D0A28195D050800B7D73C /* ASDisplayNode+AsyncDisplay.mm in Sources */, + 058D0A29195D050800B7D73C /* ASDisplayNode+DebugTiming.mm in Sources */, + 058D0A2A195D050800B7D73C /* ASDisplayNode+UIViewBridge.mm in Sources */, + 058D0A14195D050800B7D73C /* ASDisplayNode.mm in Sources */, + 058D0A15195D050800B7D73C /* ASDisplayNodeExtras.mm in Sources */, + 0587F9BE1A7309ED00AFF0BA /* ASEditableTextNode.mm in Sources */, + 464052231A3F83C40061C0BA /* ASFlowLayoutController.mm in Sources */, + 058D0A1A195D050800B7D73C /* ASHighlightOverlayLayer.mm in Sources */, + 058D0A2B195D050800B7D73C /* ASImageNode+CGExtras.m in Sources */, + 058D0A16195D050800B7D73C /* ASImageNode.mm in Sources */, + 430E7C911B4C23F100697A4C /* ASIndexPath.m in Sources */, + ACF6ED231B17843500DA7C62 /* ASInsetLayoutSpec.mm in Sources */, + ACF6ED4C1B17847A00DA7C62 /* ASInternalHelpers.mm in Sources */, + ACF6ED251B17843500DA7C62 /* ASLayout.mm in Sources */, 9C5FA3531B8F6ADF00A62714 /* ASLayoutOptions.mm in Sources */, 9C5FA35F1B90C9A500A62714 /* ASLayoutOptionsPrivate.mm in Sources */, - ACF6ED2C1B17843500DA7C62 /* ASOverlayLayoutSpec.mm in Sources */, - 058D0A2C195D050800B7D73C /* ASSentinel.m in Sources */, - 205F0E221B376416007741D0 /* CGRect+ASConvenience.m in Sources */, - 205F0E1A1B37339C007741D0 /* ASAbstractLayoutController.mm in Sources */, - 464052211A3F83C40061C0BA /* ASDataController.mm in Sources */, - 299DA1AA1A828D2900162D41 /* ASBatchContext.mm in Sources */, - 058D0A15195D050800B7D73C /* ASDisplayNodeExtras.mm in Sources */, - ACF6ED501B17847A00DA7C62 /* ASStackPositionedLayout.mm in Sources */, - 058D0A1F195D050800B7D73C /* ASTextNodeTextKitHelpers.mm in Sources */, - ACF6ED1B1B17843500DA7C62 /* ASBackgroundLayoutSpec.mm in Sources */, - 055F1A3519ABD3E3004DAFF1 /* ASTableView.mm in Sources */, - 205F0E121B371BD7007741D0 /* ASScrollDirection.m in Sources */, - AC47D9461B3BB41900AAEE9D /* ASRelativeSize.mm in Sources */, ACF6ED271B17843500DA7C62 /* ASLayoutSpec.mm in Sources */, - 9C8221971BA237B80037F19A /* ASStackBaselinePositionedLayout.mm in Sources */, - ACF6ED211B17843500DA7C62 /* ASDimension.mm in Sources */, 464052261A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm in Sources */, - 055B9FA91A1C154B00035D6D /* ASNetworkImageNode.mm in Sources */, - ACF6ED521B17847A00DA7C62 /* ASStackUnpositionedLayout.mm in Sources */, - ACF6ED1D1B17843500DA7C62 /* ASCenterLayoutSpec.mm in Sources */, - 058D0A1D195D050800B7D73C /* ASTextNodeRenderer.mm in Sources */, - 292C59A41A956527007E5DD6 /* ASRangeHandlerRender.mm in Sources */, - 058D0A2A195D050800B7D73C /* ASDisplayNode+UIViewBridge.mm in Sources */, - AC3C4A521A1139C100143C57 /* ASCollectionView.mm in Sources */, - 292C59A11A956527007E5DD6 /* ASRangeHandlerPreload.mm in Sources */, - 058D0A20195D050800B7D73C /* ASTextNodeWordKerner.m in Sources */, - 058D0A1A195D050800B7D73C /* ASHighlightOverlayLayer.mm in Sources */, - 464052231A3F83C40061C0BA /* ASFlowLayoutController.mm in Sources */, - 058D0A28195D050800B7D73C /* ASDisplayNode+AsyncDisplay.mm in Sources */, - 0587F9BE1A7309ED00AFF0BA /* ASEditableTextNode.mm in Sources */, - 18C2ED801B9B7DE800F627B3 /* ASCollectionNode.m in Sources */, - 058D0A21195D050800B7D73C /* NSMutableAttributedString+TextKitAdditions.m in Sources */, - ACF6ED251B17843500DA7C62 /* ASLayout.mm in Sources */, - 058D0A25195D050800B7D73C /* UIView+ASConvenience.m in Sources */, - 0549634A1A1EA066000F8E56 /* ASBasicImageDownloader.mm in Sources */, - 058D0A14195D050800B7D73C /* ASDisplayNode.mm in Sources */, - 058D0A1B195D050800B7D73C /* ASMutableAttributedStringBuilder.m in Sources */, - 058D0A2B195D050800B7D73C /* ASImageNode+CGExtras.m in Sources */, - 058D0A24195D050800B7D73C /* _ASAsyncTransactionGroup.m in Sources */, - 058D0A1C195D050800B7D73C /* ASTextNodeCoreTextAdditions.m in Sources */, - 058D0A13195D050800B7D73C /* ASControlNode.m in Sources */, - ACF6ED4C1B17847A00DA7C62 /* ASInternalHelpers.mm in Sources */, - 058D0A19195D050800B7D73C /* _ASDisplayView.mm in Sources */, - 205F0E101B371875007741D0 /* UICollectionViewLayout+ASConvenience.m in Sources */, - 05A6D05B19D0EB64002DD95E /* ASDealloc2MainObject.m in Sources */, - 058D0A17195D050800B7D73C /* ASTextNode.mm in Sources */, - AC6456091B0A335000CF11B8 /* ASCellNode.m in Sources */, - ACF6ED231B17843500DA7C62 /* ASInsetLayoutSpec.mm in Sources */, - 058D0A27195D050800B7D73C /* _ASPendingState.m in Sources */, 0516FA411A1563D200B4EBED /* ASMultiplexImageNode.mm in Sources */, - 058D0A16195D050800B7D73C /* ASImageNode.mm in Sources */, - 058D0A29195D050800B7D73C /* ASDisplayNode+DebugTiming.mm in Sources */, - 205F0E1E1B373A2C007741D0 /* ASCollectionViewLayoutController.mm in Sources */, - 058D0A22195D050800B7D73C /* _ASAsyncTransaction.m in Sources */, - ACF6ED301B17843500DA7C62 /* ASStackLayoutSpec.mm in Sources */, + 058D0A1B195D050800B7D73C /* ASMutableAttributedStringBuilder.m in Sources */, + 055B9FA91A1C154B00035D6D /* ASNetworkImageNode.mm in Sources */, + ACF6ED2C1B17843500DA7C62 /* ASOverlayLayoutSpec.mm in Sources */, 055F1A3919ABD413004DAFF1 /* ASRangeController.mm in Sources */, - 296A0A2F1A9516B2005ACEAA /* ASBatchFetching.m in Sources */, + 292C59A11A956527007E5DD6 /* ASRangeHandlerPreload.mm in Sources */, + 292C59A41A956527007E5DD6 /* ASRangeHandlerRender.mm in Sources */, + ACF6ED2E1B17843500DA7C62 /* ASRatioLayoutSpec.mm in Sources */, + AC47D9461B3BB41900AAEE9D /* ASRelativeSize.mm in Sources */, + 205F0E121B371BD7007741D0 /* ASScrollDirection.m in Sources */, D785F6631A74327E00291744 /* ASScrollNode.m in Sources */, + 058D0A2C195D050800B7D73C /* ASSentinel.m in Sources */, + 9C8221971BA237B80037F19A /* ASStackBaselinePositionedLayout.mm in Sources */, + ACF6ED301B17843500DA7C62 /* ASStackLayoutSpec.mm in Sources */, + ACF6ED501B17847A00DA7C62 /* ASStackPositionedLayout.mm in Sources */, + ACF6ED521B17847A00DA7C62 /* ASStackUnpositionedLayout.mm in Sources */, + ACF6ED321B17843500DA7C62 /* ASStaticLayoutSpec.mm in Sources */, + 055F1A3519ABD3E3004DAFF1 /* ASTableView.mm in Sources */, + 058D0A17195D050800B7D73C /* ASTextNode.mm in Sources */, + 058D0A1C195D050800B7D73C /* ASTextNodeCoreTextAdditions.m in Sources */, + 058D0A1D195D050800B7D73C /* ASTextNodeRenderer.mm in Sources */, + 058D0A1E195D050800B7D73C /* ASTextNodeShadower.m in Sources */, + 058D0A1F195D050800B7D73C /* ASTextNodeTextKitHelpers.mm in Sources */, + 058D0A20195D050800B7D73C /* ASTextNodeWordKerner.m in Sources */, + 205F0E221B376416007741D0 /* CGRect+ASConvenience.m in Sources */, + 058D0A21195D050800B7D73C /* NSMutableAttributedString+TextKitAdditions.m in Sources */, + 205F0E101B371875007741D0 /* UICollectionViewLayout+ASConvenience.m in Sources */, + 058D0A25195D050800B7D73C /* UIView+ASConvenience.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1533,32 +1534,32 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - ACF6ED611B178DC700DA7C62 /* ASOverlayLayoutSpecSnapshotTests.mm in Sources */, - ACF6ED621B178DC700DA7C62 /* ASRatioLayoutSpecSnapshotTests.mm in Sources */, - 2911485C1A77147A005D0878 /* ASControlNodeTests.m in Sources */, - 296A0A351A951ABF005ACEAA /* ASBatchFetchingTests.m in Sources */, - 058D0A3E195D057000B7D73C /* ASTextNodeRendererTests.m in Sources */, - 058D0A3D195D057000B7D73C /* ASTextNodeCoreTextAdditionsTests.m in Sources */, - 058D0A3C195D057000B7D73C /* ASMutableAttributedStringBuilderTests.m in Sources */, - 242995D31B29743C00090100 /* ASBasicImageDownloaderTests.m in Sources */, - 058D0A3F195D057000B7D73C /* ASTextNodeShadowerTests.m in Sources */, - ACF6ED631B178DC700DA7C62 /* ASStackLayoutSpecSnapshotTests.mm in Sources */, 29CDC2E21AAE70D000833CA4 /* ASBasicImageDownloaderContextTests.m in Sources */, - 056D21551ABCEF50001107EF /* ASImageNodeSnapshotTests.m in Sources */, - 05EA6FE71AC0966E00E35788 /* ASSnapshotTestCase.mm in Sources */, - ACF6ED5E1B178DC700DA7C62 /* ASInsetLayoutSpecSnapshotTests.mm in Sources */, - 058D0A3B195D057000B7D73C /* ASDisplayNodeTestsHelper.m in Sources */, - 058D0A3A195D057000B7D73C /* ASDisplayNodeTests.m in Sources */, - ACF6ED601B178DC700DA7C62 /* ASLayoutSpecSnapshotTestsHelper.m in Sources */, - 052EE0661A159FEF002C6279 /* ASMultiplexImageNodeTests.m in Sources */, - ACF6ED5D1B178DC700DA7C62 /* ASDimensionTests.mm in Sources */, - 058D0A39195D057000B7D73C /* ASDisplayNodeAppearanceTests.m in Sources */, - 058D0A41195D057000B7D73C /* ASTextNodeWordKernerTests.mm in Sources */, + 242995D31B29743C00090100 /* ASBasicImageDownloaderTests.m in Sources */, + 296A0A351A951ABF005ACEAA /* ASBatchFetchingTests.m in Sources */, ACF6ED5C1B178DC700DA7C62 /* ASCenterLayoutSpecSnapshotTests.mm in Sources */, 9F06E5CD1B4CAF4200F015D8 /* ASCollectionViewTests.m in Sources */, - 058D0A40195D057000B7D73C /* ASTextNodeTests.m in Sources */, - 3C9C128519E616EF00E942A0 /* ASTableViewTests.m in Sources */, + 2911485C1A77147A005D0878 /* ASControlNodeTests.m in Sources */, + ACF6ED5D1B178DC700DA7C62 /* ASDimensionTests.mm in Sources */, 058D0A38195D057000B7D73C /* ASDisplayLayerTests.m in Sources */, + 058D0A39195D057000B7D73C /* ASDisplayNodeAppearanceTests.m in Sources */, + 058D0A3A195D057000B7D73C /* ASDisplayNodeTests.m in Sources */, + 058D0A3B195D057000B7D73C /* ASDisplayNodeTestsHelper.m in Sources */, + 056D21551ABCEF50001107EF /* ASImageNodeSnapshotTests.m in Sources */, + ACF6ED5E1B178DC700DA7C62 /* ASInsetLayoutSpecSnapshotTests.mm in Sources */, + ACF6ED601B178DC700DA7C62 /* ASLayoutSpecSnapshotTestsHelper.m in Sources */, + 052EE0661A159FEF002C6279 /* ASMultiplexImageNodeTests.m in Sources */, + 058D0A3C195D057000B7D73C /* ASMutableAttributedStringBuilderTests.m in Sources */, + ACF6ED611B178DC700DA7C62 /* ASOverlayLayoutSpecSnapshotTests.mm in Sources */, + ACF6ED621B178DC700DA7C62 /* ASRatioLayoutSpecSnapshotTests.mm in Sources */, + 05EA6FE71AC0966E00E35788 /* ASSnapshotTestCase.mm in Sources */, + ACF6ED631B178DC700DA7C62 /* ASStackLayoutSpecSnapshotTests.mm in Sources */, + 3C9C128519E616EF00E942A0 /* ASTableViewTests.m in Sources */, + 058D0A3D195D057000B7D73C /* ASTextNodeCoreTextAdditionsTests.m in Sources */, + 058D0A3E195D057000B7D73C /* ASTextNodeRendererTests.m in Sources */, + 058D0A3F195D057000B7D73C /* ASTextNodeShadowerTests.m in Sources */, + 058D0A40195D057000B7D73C /* ASTextNodeTests.m in Sources */, + 058D0A41195D057000B7D73C /* ASTextNodeWordKernerTests.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1566,72 +1567,73 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 34EFC7641B701CC600AD841F /* ASCenterLayoutSpec.mm in Sources */, - B350623B1B010EFD0018CF92 /* NSMutableAttributedString+TextKitAdditions.m in Sources */, - B35062401B010EFD0018CF92 /* _ASAsyncTransactionContainer.m in Sources */, - B35062311B010EFD0018CF92 /* ASTextNodeRenderer.mm in Sources */, - B35062051B010EFD0018CF92 /* ASMultiplexImageNode.mm in Sources */, - B35061FC1B010EFD0018CF92 /* ASDisplayNode.mm in Sources */, - B35062181B010EFD0018CF92 /* ASDataController.mm in Sources */, - 34EFC7781B701D3100AD841F /* ASStackUnpositionedLayout.mm in Sources */, - B35062501B010EFD0018CF92 /* ASDisplayNode+DebugTiming.mm in Sources */, - B35062471B010EFD0018CF92 /* ASBatchFetching.m in Sources */, - B350624E1B010EFD0018CF92 /* ASDisplayNode+AsyncDisplay.mm in Sources */, - 34EFC76F1B701CF700AD841F /* ASRatioLayoutSpec.mm in Sources */, - 9C5FA3601B90C9A500A62714 /* ASLayoutOptionsPrivate.mm in Sources */, - 34EFC7681B701CDE00AD841F /* ASLayout.mm in Sources */, - B35061F61B010EFD0018CF92 /* ASCollectionView.mm in Sources */, - 34EFC75C1B701BD200AD841F /* ASDimension.mm in Sources */, - 509E68621B3AEDA5009B9150 /* ASAbstractLayoutController.mm in Sources */, - 34EFC7601B701C8B00AD841F /* ASInsetLayoutSpec.mm in Sources */, - 34EFC7661B701CD200AD841F /* ASRelativeSize.mm in Sources */, - B350620B1B010EFD0018CF92 /* ASTableView.mm in Sources */, - 34EFC7721B701D0300AD841F /* ASStackLayoutSpec.mm in Sources */, B350623D1B010EFD0018CF92 /* _ASAsyncTransaction.m in Sources */, - B35062161B010EFD0018CF92 /* ASBatchContext.mm in Sources */, - B350620E1B010EFD0018CF92 /* ASTextNode.mm in Sources */, - B35062141B010EFD0018CF92 /* ASBasicImageDownloader.mm in Sources */, - B350621C1B010EFD0018CF92 /* ASFlowLayoutController.mm in Sources */, - B35062231B010EFD0018CF92 /* ASMultidimensionalArrayUtils.mm in Sources */, - 509E68641B3AEDB7009B9150 /* ASCollectionViewLayoutController.mm in Sources */, - 9C5FA3541B8F6ADF00A62714 /* ASLayoutOptions.mm in Sources */, - B350621E1B010EFD0018CF92 /* ASHighlightOverlayLayer.mm in Sources */, - B35062271B010EFD0018CF92 /* ASRangeController.mm in Sources */, - 18C2ED831B9B7DE800F627B3 /* ASCollectionNode.m in Sources */, - B35061F91B010EFD0018CF92 /* ASControlNode.m in Sources */, - AC47D9421B3B891B00AAEE9D /* ASCellNode.m in Sources */, - 509E68661B3AEDD7009B9150 /* CGRect+ASConvenience.m in Sources */, - B35062561B010EFD0018CF92 /* ASSentinel.m in Sources */, - B350624A1B010EFD0018CF92 /* _ASCoreAnimationExtras.mm in Sources */, - B35062071B010EFD0018CF92 /* ASNetworkImageNode.mm in Sources */, - B35062011B010EFD0018CF92 /* ASEditableTextNode.mm in Sources */, - B35062441B010EFD0018CF92 /* UIView+ASConvenience.m in Sources */, - 34EFC7761B701D2A00AD841F /* ASStackPositionedLayout.mm in Sources */, - B350622F1B010EFD0018CF92 /* ASTextNodeCoreTextAdditions.m in Sources */, - 34EFC76D1B701CF100AD841F /* ASOverlayLayoutSpec.mm in Sources */, - B35062031B010EFD0018CF92 /* ASImageNode.mm in Sources */, - B35062091B010EFD0018CF92 /* ASScrollNode.m in Sources */, - B35062251B010EFD0018CF92 /* ASMutableAttributedStringBuilder.m in Sources */, - 9C8221981BA237B80037F19A /* ASStackBaselinePositionedLayout.mm in Sources */, - 430E7C921B4C23F100697A4C /* ASIndexPath.m in Sources */, - 34EFC7741B701D0A00AD841F /* ASStaticLayoutSpec.mm in Sources */, - B35062381B010EFD0018CF92 /* ASTextNodeWordKerner.m in Sources */, - B35062101B010EFD0018CF92 /* _ASDisplayLayer.mm in Sources */, - B35062351B010EFD0018CF92 /* ASTextNodeTextKitHelpers.mm in Sources */, + B35062401B010EFD0018CF92 /* _ASAsyncTransactionContainer.m in Sources */, B35062421B010EFD0018CF92 /* _ASAsyncTransactionGroup.m in Sources */, - B35061FF1B010EFD0018CF92 /* ASDisplayNodeExtras.mm in Sources */, - 34EFC76B1B701CEB00AD841F /* ASLayoutSpec.mm in Sources */, + B350624A1B010EFD0018CF92 /* _ASCoreAnimationExtras.mm in Sources */, + B35062101B010EFD0018CF92 /* _ASDisplayLayer.mm in Sources */, B35062121B010EFD0018CF92 /* _ASDisplayView.mm in Sources */, - 34EFC7621B701CA400AD841F /* ASBackgroundLayoutSpec.mm in Sources */, B350624C1B010EFD0018CF92 /* _ASPendingState.m in Sources */, - 34EFC75E1B701BF000AD841F /* ASInternalHelpers.mm in Sources */, - B35062541B010EFD0018CF92 /* ASImageNode+CGExtras.m in Sources */, - 509E68601B3AED8E009B9150 /* ASScrollDirection.m in Sources */, - B350622C1B010EFD0018CF92 /* ASRangeHandlerRender.mm in Sources */, - B350622A1B010EFD0018CF92 /* ASRangeHandlerPreload.mm in Sources */, - B35062511B010EFD0018CF92 /* ASDisplayNode+UIViewBridge.mm in Sources */, + 509E68621B3AEDA5009B9150 /* ASAbstractLayoutController.mm in Sources */, + 34EFC7621B701CA400AD841F /* ASBackgroundLayoutSpec.mm in Sources */, + B35062141B010EFD0018CF92 /* ASBasicImageDownloader.mm in Sources */, + B35062161B010EFD0018CF92 /* ASBatchContext.mm in Sources */, + B35062471B010EFD0018CF92 /* ASBatchFetching.m in Sources */, + AC47D9421B3B891B00AAEE9D /* ASCellNode.m in Sources */, + 34EFC7641B701CC600AD841F /* ASCenterLayoutSpec.mm in Sources */, + 18C2ED831B9B7DE800F627B3 /* ASCollectionNode.m in Sources */, + B35061F61B010EFD0018CF92 /* ASCollectionView.mm in Sources */, + 509E68641B3AEDB7009B9150 /* ASCollectionViewLayoutController.mm in Sources */, + B35061F91B010EFD0018CF92 /* ASControlNode.m in Sources */, + B35062181B010EFD0018CF92 /* ASDataController.mm in Sources */, B350621A1B010EFD0018CF92 /* ASDealloc2MainObject.m in Sources */, + 34EFC75C1B701BD200AD841F /* ASDimension.mm in Sources */, + B350624E1B010EFD0018CF92 /* ASDisplayNode+AsyncDisplay.mm in Sources */, + B35062501B010EFD0018CF92 /* ASDisplayNode+DebugTiming.mm in Sources */, + B35062511B010EFD0018CF92 /* ASDisplayNode+UIViewBridge.mm in Sources */, + B35061FC1B010EFD0018CF92 /* ASDisplayNode.mm in Sources */, + B35061FF1B010EFD0018CF92 /* ASDisplayNodeExtras.mm in Sources */, + B35062011B010EFD0018CF92 /* ASEditableTextNode.mm in Sources */, + B350621C1B010EFD0018CF92 /* ASFlowLayoutController.mm in Sources */, + B350621E1B010EFD0018CF92 /* ASHighlightOverlayLayer.mm in Sources */, + B35062541B010EFD0018CF92 /* ASImageNode+CGExtras.m in Sources */, + B35062031B010EFD0018CF92 /* ASImageNode.mm in Sources */, + 430E7C921B4C23F100697A4C /* ASIndexPath.m in Sources */, + 34EFC7601B701C8B00AD841F /* ASInsetLayoutSpec.mm in Sources */, + 34EFC75E1B701BF000AD841F /* ASInternalHelpers.mm in Sources */, + 34EFC7681B701CDE00AD841F /* ASLayout.mm in Sources */, + 9C5FA3541B8F6ADF00A62714 /* ASLayoutOptions.mm in Sources */, + 9C5FA3601B90C9A500A62714 /* ASLayoutOptionsPrivate.mm in Sources */, + 34EFC76B1B701CEB00AD841F /* ASLayoutSpec.mm in Sources */, + B35062231B010EFD0018CF92 /* ASMultidimensionalArrayUtils.mm in Sources */, + B35062051B010EFD0018CF92 /* ASMultiplexImageNode.mm in Sources */, + B35062251B010EFD0018CF92 /* ASMutableAttributedStringBuilder.m in Sources */, + B35062071B010EFD0018CF92 /* ASNetworkImageNode.mm in Sources */, + 34EFC76D1B701CF100AD841F /* ASOverlayLayoutSpec.mm in Sources */, + B35062271B010EFD0018CF92 /* ASRangeController.mm in Sources */, + B350622A1B010EFD0018CF92 /* ASRangeHandlerPreload.mm in Sources */, + B350622C1B010EFD0018CF92 /* ASRangeHandlerRender.mm in Sources */, + 34EFC76F1B701CF700AD841F /* ASRatioLayoutSpec.mm in Sources */, + 34EFC7661B701CD200AD841F /* ASRelativeSize.mm in Sources */, + 509E68601B3AED8E009B9150 /* ASScrollDirection.m in Sources */, + B35062091B010EFD0018CF92 /* ASScrollNode.m in Sources */, + B35062561B010EFD0018CF92 /* ASSentinel.m in Sources */, + 9C8221981BA237B80037F19A /* ASStackBaselinePositionedLayout.mm in Sources */, + 34EFC7721B701D0300AD841F /* ASStackLayoutSpec.mm in Sources */, + 34EFC7761B701D2A00AD841F /* ASStackPositionedLayout.mm in Sources */, + 34EFC7781B701D3100AD841F /* ASStackUnpositionedLayout.mm in Sources */, + 34EFC7741B701D0A00AD841F /* ASStaticLayoutSpec.mm in Sources */, + B350620B1B010EFD0018CF92 /* ASTableView.mm in Sources */, + B350620E1B010EFD0018CF92 /* ASTextNode.mm in Sources */, + B350622F1B010EFD0018CF92 /* ASTextNodeCoreTextAdditions.m in Sources */, + B35062311B010EFD0018CF92 /* ASTextNodeRenderer.mm in Sources */, B35062331B010EFD0018CF92 /* ASTextNodeShadower.m in Sources */, + B35062351B010EFD0018CF92 /* ASTextNodeTextKitHelpers.mm in Sources */, + B35062381B010EFD0018CF92 /* ASTextNodeWordKerner.m in Sources */, + 509E68661B3AEDD7009B9150 /* CGRect+ASConvenience.m in Sources */, + B350623B1B010EFD0018CF92 /* NSMutableAttributedString+TextKitAdditions.m in Sources */, + 044284FD1BAA365100D16268 /* UICollectionViewLayout+ASConvenience.m in Sources */, + B35062441B010EFD0018CF92 /* UIView+ASConvenience.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; From b217f7c28a583dad71afe95c3ef32badcd15364f Mon Sep 17 00:00:00 2001 From: Jack Flintermann Date: Wed, 16 Sep 2015 19:52:31 -0400 Subject: [PATCH 05/17] remove .ms from header build phases --- AsyncDisplayKit.xcodeproj/project.pbxproj | 352 ++++++++++------------ 1 file changed, 163 insertions(+), 189 deletions(-) diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj index 586189ebf5..7e7efdcd26 100644 --- a/AsyncDisplayKit.xcodeproj/project.pbxproj +++ b/AsyncDisplayKit.xcodeproj/project.pbxproj @@ -1046,126 +1046,100 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - AC21EC101B3D0BF600C8B19A /* ASStackLayoutDefines.h in Headers */, - AC47D9451B3BB41900AAEE9D /* ASRelativeSize.h in Headers */, - 9C49C36F1B853957000B0DD5 /* ASStackLayoutable.h in Headers */, - ACF6ED511B17847A00DA7C62 /* ASStackUnpositionedLayout.h in Headers */, - ACF6ED2D1B17843500DA7C62 /* ASRatioLayoutSpec.h in Headers */, - ACF6ED261B17843500DA7C62 /* ASLayoutSpec.h in Headers */, - ACF6ED221B17843500DA7C62 /* ASInsetLayoutSpec.h in Headers */, - ACF6ED201B17843500DA7C62 /* ASDimension.h in Headers */, - ACF6ED2B1B17843500DA7C62 /* ASOverlayLayoutSpec.h in Headers */, - ACF6ED1C1B17843500DA7C62 /* ASCenterLayoutSpec.h in Headers */, - 9C6BB3B21B8CC9C200F13F52 /* ASStaticLayoutable.h in Headers */, - ACF6ED2A1B17843500DA7C62 /* ASLayoutable.h in Headers */, - ACF6ED311B17843500DA7C62 /* ASStaticLayoutSpec.h in Headers */, - ACF6ED241B17843500DA7C62 /* ASLayout.h in Headers */, - ACF6ED2F1B17843500DA7C62 /* ASStackLayoutSpec.h in Headers */, - 9C65A72A1BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h in Headers */, - ACF6ED1A1B17843500DA7C62 /* ASBackgroundLayoutSpec.h in Headers */, - 291B63FB1AA53A7A000A71B3 /* ASScrollDirection.h in Headers */, - 464052221A3F83C40061C0BA /* ASFlowLayoutController.h in Headers */, - 464052241A3F83C40061C0BA /* ASLayoutController.h in Headers */, - 464052201A3F83C40061C0BA /* ASDataController.h in Headers */, - 05A6D05A19D0EB64002DD95E /* ASDealloc2MainObject.h in Headers */, - 9C8221951BA237B80037F19A /* ASStackBaselinePositionedLayout.h in Headers */, - 0516FA401A1563D200B4EBED /* ASMultiplexImageNode.h in Headers */, - 058D0A47195D05CB00B7D73C /* ASControlNode.h in Headers */, - 058D0A48195D05CB00B7D73C /* ASControlNode.m in Headers */, - 058D0A49195D05CB00B7D73C /* ASControlNode+Subclasses.h in Headers */, - 058D0A4A195D05CB00B7D73C /* ASDisplayNode.h in Headers */, - 1950C4491A3BB5C1005C8279 /* ASEqualityHelpers.h in Headers */, - 9C5FA3511B8F6ADF00A62714 /* ASLayoutOptions.h in Headers */, - 058D0A4B195D05CB00B7D73C /* ASDisplayNode.mm in Headers */, - 430E7C8F1B4C23F100697A4C /* ASIndexPath.h in Headers */, - 058D0A4C195D05CB00B7D73C /* ASDisplayNode+Subclasses.h in Headers */, - 058D0A4D195D05CB00B7D73C /* ASDisplayNodeExtras.h in Headers */, - 058D0A4E195D05CB00B7D73C /* ASDisplayNodeExtras.mm in Headers */, - 058D0A4F195D05CB00B7D73C /* ASImageNode.h in Headers */, - 058D0A50195D05CB00B7D73C /* ASImageNode.mm in Headers */, - 058D0A51195D05CB00B7D73C /* ASTextNode.h in Headers */, - 296A0A2E1A9516B2005ACEAA /* ASBatchFetching.h in Headers */, - 058D0A52195D05CB00B7D73C /* ASTextNode.mm in Headers */, - 055F1A3819ABD413004DAFF1 /* ASRangeController.h in Headers */, - 292C59A31A956527007E5DD6 /* ASRangeHandlerRender.h in Headers */, - 055F1A3419ABD3E3004DAFF1 /* ASTableView.h in Headers */, - 0574D5E219C110940097DC25 /* ASTableViewProtocols.h in Headers */, - 055F1A3C19ABD43F004DAFF1 /* ASCellNode.h in Headers */, - 058D0A53195D05DC00B7D73C /* _ASDisplayLayer.h in Headers */, - 058D0A54195D05DC00B7D73C /* _ASDisplayLayer.mm in Headers */, - 058D0A55195D05DC00B7D73C /* _ASDisplayView.h in Headers */, - 058D0A56195D05DC00B7D73C /* _ASDisplayView.mm in Headers */, - 058D0A57195D05DC00B7D73C /* ASHighlightOverlayLayer.h in Headers */, - 058D0A58195D05DC00B7D73C /* ASHighlightOverlayLayer.mm in Headers */, - 058D0A59195D05DC00B7D73C /* ASMutableAttributedStringBuilder.h in Headers */, - 058D0A5A195D05DC00B7D73C /* ASMutableAttributedStringBuilder.m in Headers */, - 058D0A5B195D05DC00B7D73C /* ASTextNodeCoreTextAdditions.h in Headers */, - 058D0A5C195D05DC00B7D73C /* ASTextNodeCoreTextAdditions.m in Headers */, - 205F0E191B37339C007741D0 /* ASAbstractLayoutController.h in Headers */, - 058D0A5D195D05DC00B7D73C /* ASTextNodeRenderer.h in Headers */, - 058D0A5E195D05DC00B7D73C /* ASTextNodeRenderer.mm in Headers */, - 058D0A5F195D05DC00B7D73C /* ASTextNodeShadower.h in Headers */, - 058D0A60195D05DC00B7D73C /* ASTextNodeShadower.m in Headers */, - 058D0A61195D05DC00B7D73C /* ASTextNodeTextKitHelpers.h in Headers */, - 058D0A62195D05DC00B7D73C /* ASTextNodeTextKitHelpers.mm in Headers */, - 058D0A63195D05DC00B7D73C /* ASTextNodeTypes.h in Headers */, - 292C599F1A956527007E5DD6 /* ASLayoutRangeType.h in Headers */, - 464052251A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h in Headers */, - 058D0A64195D05DC00B7D73C /* ASTextNodeWordKerner.h in Headers */, - 299DA1A91A828D2900162D41 /* ASBatchContext.h in Headers */, - 058D0A65195D05DC00B7D73C /* ASTextNodeWordKerner.m in Headers */, - 058D0A66195D05DC00B7D73C /* NSMutableAttributedString+TextKitAdditions.h in Headers */, - 058D0A67195D05DC00B7D73C /* NSMutableAttributedString+TextKitAdditions.m in Headers */, + 058D0A71195D05F800B7D73C /* _AS-objc-internal.h in Headers */, 058D0A68195D05EC00B7D73C /* _ASAsyncTransaction.h in Headers */, - 205F0E0F1B371875007741D0 /* UICollectionViewLayout+ASConvenience.h in Headers */, - 058D0A69195D05EC00B7D73C /* _ASAsyncTransaction.m in Headers */, 058D0A6A195D05EC00B7D73C /* _ASAsyncTransactionContainer+Private.h in Headers */, 058D0A6B195D05EC00B7D73C /* _ASAsyncTransactionContainer.h in Headers */, - 18C2ED7E1B9B7DE800F627B3 /* ASCollectionNode.h in Headers */, - 058D0A6C195D05EC00B7D73C /* _ASAsyncTransactionContainer.m in Headers */, - 6BDC61F61979037800E50D21 /* AsyncDisplayKit.h in Headers */, - 9CDC18CC1B910E12004965E2 /* ASLayoutablePrivate.h in Headers */, 058D0A6D195D05EC00B7D73C /* _ASAsyncTransactionGroup.h in Headers */, - 058D0A6E195D05EC00B7D73C /* _ASAsyncTransactionGroup.m in Headers */, - 205F0E1D1B373A2C007741D0 /* ASCollectionViewLayoutController.h in Headers */, - 058D0A6F195D05EC00B7D73C /* UIView+ASConvenience.h in Headers */, - 058D0A70195D05EC00B7D73C /* UIView+ASConvenience.m in Headers */, - ACF6ED4B1B17847A00DA7C62 /* ASInternalHelpers.h in Headers */, + 058D0A72195D05F800B7D73C /* _ASCoreAnimationExtras.h in Headers */, + 058D0A53195D05DC00B7D73C /* _ASDisplayLayer.h in Headers */, + 058D0A55195D05DC00B7D73C /* _ASDisplayView.h in Headers */, + 058D0A74195D05F800B7D73C /* _ASPendingState.h in Headers */, + 058D0A76195D05F900B7D73C /* _ASScopeTimer.h in Headers */, + 205F0E191B37339C007741D0 /* ASAbstractLayoutController.h in Headers */, 058D0A82195D060300B7D73C /* ASAssert.h in Headers */, 0516FA3C1A15563400B4EBED /* ASAvailability.h in Headers */, - 0516FA3D1A15563400B4EBED /* ASLog.h in Headers */, + ACF6ED1A1B17843500DA7C62 /* ASBackgroundLayoutSpec.h in Headers */, 058D0A83195D060300B7D73C /* ASBaseDefines.h in Headers */, - 058D0A84195D060300B7D73C /* ASDisplayNodeExtraIvars.h in Headers */, - AC3C4A511A1139C100143C57 /* ASCollectionView.h in Headers */, - 292C59A01A956527007E5DD6 /* ASRangeHandlerPreload.h in Headers */, - 055B9FA81A1C154B00035D6D /* ASNetworkImageNode.h in Headers */, - ACF6ED4E1B17847A00DA7C62 /* ASStackLayoutSpecUtilities.h in Headers */, - ACF6ED4D1B17847A00DA7C62 /* ASLayoutSpecUtilities.h in Headers */, - ACF6ED4F1B17847A00DA7C62 /* ASStackPositionedLayout.h in Headers */, 054963491A1EA066000F8E56 /* ASBasicImageDownloader.h in Headers */, - AC3C4A541A113EEC00143C57 /* ASCollectionViewProtocols.h in Headers */, - D785F6621A74327E00291744 /* ASScrollNode.h in Headers */, - 0587F9BD1A7309ED00AFF0BA /* ASEditableTextNode.h in Headers */, - 05F20AA41A15733C00DCA68A /* ASImageProtocols.h in Headers */, - 058D0A71195D05F800B7D73C /* _AS-objc-internal.h in Headers */, - 058D0A72195D05F800B7D73C /* _ASCoreAnimationExtras.h in Headers */, - 058D0A73195D05F800B7D73C /* _ASCoreAnimationExtras.mm in Headers */, - 058D0A74195D05F800B7D73C /* _ASPendingState.h in Headers */, - 058D0A75195D05F800B7D73C /* _ASPendingState.m in Headers */, - 058D0A76195D05F900B7D73C /* _ASScopeTimer.h in Headers */, - 058D0A77195D05F900B7D73C /* ASDisplayNode+AsyncDisplay.mm in Headers */, - 058D0A78195D05F900B7D73C /* ASDisplayNode+DebugTiming.h in Headers */, - 058D0A79195D05F900B7D73C /* ASDisplayNode+DebugTiming.mm in Headers */, - 058D0A7A195D05F900B7D73C /* ASDisplayNode+UIViewBridge.mm in Headers */, 2967F9E21AB0A5190072E4AB /* ASBasicImageDownloaderInternal.h in Headers */, - 205F0E211B376416007741D0 /* CGRect+ASConvenience.h in Headers */, + 299DA1A91A828D2900162D41 /* ASBatchContext.h in Headers */, + 296A0A2E1A9516B2005ACEAA /* ASBatchFetching.h in Headers */, + 055F1A3C19ABD43F004DAFF1 /* ASCellNode.h in Headers */, + ACF6ED1C1B17843500DA7C62 /* ASCenterLayoutSpec.h in Headers */, + 18C2ED7E1B9B7DE800F627B3 /* ASCollectionNode.h in Headers */, + AC3C4A511A1139C100143C57 /* ASCollectionView.h in Headers */, + 205F0E1D1B373A2C007741D0 /* ASCollectionViewLayoutController.h in Headers */, + AC3C4A541A113EEC00143C57 /* ASCollectionViewProtocols.h in Headers */, + 058D0A49195D05CB00B7D73C /* ASControlNode+Subclasses.h in Headers */, + 058D0A47195D05CB00B7D73C /* ASControlNode.h in Headers */, + 464052201A3F83C40061C0BA /* ASDataController.h in Headers */, + 05A6D05A19D0EB64002DD95E /* ASDealloc2MainObject.h in Headers */, + ACF6ED201B17843500DA7C62 /* ASDimension.h in Headers */, + 058D0A78195D05F900B7D73C /* ASDisplayNode+DebugTiming.h in Headers */, + 058D0A4C195D05CB00B7D73C /* ASDisplayNode+Subclasses.h in Headers */, + 058D0A4A195D05CB00B7D73C /* ASDisplayNode.h in Headers */, + 058D0A84195D060300B7D73C /* ASDisplayNodeExtraIvars.h in Headers */, + 058D0A4D195D05CB00B7D73C /* ASDisplayNodeExtras.h in Headers */, 058D0A7B195D05F900B7D73C /* ASDisplayNodeInternal.h in Headers */, + 0587F9BD1A7309ED00AFF0BA /* ASEditableTextNode.h in Headers */, + 1950C4491A3BB5C1005C8279 /* ASEqualityHelpers.h in Headers */, + 464052221A3F83C40061C0BA /* ASFlowLayoutController.h in Headers */, + 058D0A57195D05DC00B7D73C /* ASHighlightOverlayLayer.h in Headers */, 058D0A7C195D05F900B7D73C /* ASImageNode+CGExtras.h in Headers */, - 058D0A7D195D05F900B7D73C /* ASImageNode+CGExtras.m in Headers */, + 058D0A4F195D05CB00B7D73C /* ASImageNode.h in Headers */, + 05F20AA41A15733C00DCA68A /* ASImageProtocols.h in Headers */, + 430E7C8F1B4C23F100697A4C /* ASIndexPath.h in Headers */, + ACF6ED221B17843500DA7C62 /* ASInsetLayoutSpec.h in Headers */, + ACF6ED4B1B17847A00DA7C62 /* ASInternalHelpers.h in Headers */, + ACF6ED241B17843500DA7C62 /* ASLayout.h in Headers */, + ACF6ED2A1B17843500DA7C62 /* ASLayoutable.h in Headers */, + 9CDC18CC1B910E12004965E2 /* ASLayoutablePrivate.h in Headers */, + 464052241A3F83C40061C0BA /* ASLayoutController.h in Headers */, + 9C5FA3511B8F6ADF00A62714 /* ASLayoutOptions.h in Headers */, + 9C65A72A1BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h in Headers */, + 292C599F1A956527007E5DD6 /* ASLayoutRangeType.h in Headers */, + ACF6ED261B17843500DA7C62 /* ASLayoutSpec.h in Headers */, + ACF6ED4D1B17847A00DA7C62 /* ASLayoutSpecUtilities.h in Headers */, + 0516FA3D1A15563400B4EBED /* ASLog.h in Headers */, + 464052251A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h in Headers */, + 0516FA401A1563D200B4EBED /* ASMultiplexImageNode.h in Headers */, + 058D0A59195D05DC00B7D73C /* ASMutableAttributedStringBuilder.h in Headers */, + 055B9FA81A1C154B00035D6D /* ASNetworkImageNode.h in Headers */, + ACF6ED2B1B17843500DA7C62 /* ASOverlayLayoutSpec.h in Headers */, + 055F1A3819ABD413004DAFF1 /* ASRangeController.h in Headers */, 292C59A21A956527007E5DD6 /* ASRangeHandler.h in Headers */, + 292C59A01A956527007E5DD6 /* ASRangeHandlerPreload.h in Headers */, + 292C59A31A956527007E5DD6 /* ASRangeHandlerRender.h in Headers */, + ACF6ED2D1B17843500DA7C62 /* ASRatioLayoutSpec.h in Headers */, + AC47D9451B3BB41900AAEE9D /* ASRelativeSize.h in Headers */, + 291B63FB1AA53A7A000A71B3 /* ASScrollDirection.h in Headers */, + D785F6621A74327E00291744 /* ASScrollNode.h in Headers */, 058D0A7F195D05F900B7D73C /* ASSentinel.h in Headers */, - 058D0A80195D05F900B7D73C /* ASSentinel.m in Headers */, + 9C8221951BA237B80037F19A /* ASStackBaselinePositionedLayout.h in Headers */, + 9C49C36F1B853957000B0DD5 /* ASStackLayoutable.h in Headers */, + AC21EC101B3D0BF600C8B19A /* ASStackLayoutDefines.h in Headers */, + ACF6ED2F1B17843500DA7C62 /* ASStackLayoutSpec.h in Headers */, + ACF6ED4E1B17847A00DA7C62 /* ASStackLayoutSpecUtilities.h in Headers */, + ACF6ED4F1B17847A00DA7C62 /* ASStackPositionedLayout.h in Headers */, + ACF6ED511B17847A00DA7C62 /* ASStackUnpositionedLayout.h in Headers */, + 9C6BB3B21B8CC9C200F13F52 /* ASStaticLayoutable.h in Headers */, + ACF6ED311B17843500DA7C62 /* ASStaticLayoutSpec.h in Headers */, + 055F1A3419ABD3E3004DAFF1 /* ASTableView.h in Headers */, + 0574D5E219C110940097DC25 /* ASTableViewProtocols.h in Headers */, + 058D0A51195D05CB00B7D73C /* ASTextNode.h in Headers */, + 058D0A5B195D05DC00B7D73C /* ASTextNodeCoreTextAdditions.h in Headers */, + 058D0A5D195D05DC00B7D73C /* ASTextNodeRenderer.h in Headers */, + 058D0A5F195D05DC00B7D73C /* ASTextNodeShadower.h in Headers */, + 058D0A61195D05DC00B7D73C /* ASTextNodeTextKitHelpers.h in Headers */, + 058D0A63195D05DC00B7D73C /* ASTextNodeTypes.h in Headers */, + 058D0A64195D05DC00B7D73C /* ASTextNodeWordKerner.h in Headers */, 058D0A81195D05F900B7D73C /* ASThread.h in Headers */, + 6BDC61F61979037800E50D21 /* AsyncDisplayKit.h in Headers */, + 205F0E211B376416007741D0 /* CGRect+ASConvenience.h in Headers */, + 058D0A66195D05DC00B7D73C /* NSMutableAttributedString+TextKitAdditions.h in Headers */, + 205F0E0F1B371875007741D0 /* UICollectionViewLayout+ASConvenience.h in Headers */, + 058D0A6F195D05EC00B7D73C /* UIView+ASConvenience.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1173,98 +1147,98 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 9C6BB3B31B8CC9C200F13F52 /* ASStaticLayoutable.h in Headers */, - B35062321B010EFD0018CF92 /* ASTextNodeShadower.h in Headers */, - 34EFC7651B701CCC00AD841F /* ASRelativeSize.h in Headers */, - B35062431B010EFD0018CF92 /* UIView+ASConvenience.h in Headers */, - B350622D1B010EFD0018CF92 /* ASScrollDirection.h in Headers */, - B35061FB1B010EFD0018CF92 /* ASDisplayNode.h in Headers */, - 34EFC7671B701CD900AD841F /* ASLayout.h in Headers */, - B35062361B010EFD0018CF92 /* ASTextNodeTypes.h in Headers */, - B35062341B010EFD0018CF92 /* ASTextNodeTextKitHelpers.h in Headers */, - B35061FA1B010EFD0018CF92 /* ASControlNode+Subclasses.h in Headers */, - B35062371B010EFD0018CF92 /* ASTextNodeWordKerner.h in Headers */, - B35062261B010EFD0018CF92 /* ASRangeController.h in Headers */, - B35062111B010EFD0018CF92 /* _ASDisplayView.h in Headers */, - B35061F81B010EFD0018CF92 /* ASControlNode.h in Headers */, - 430E7C901B4C23F100697A4C /* ASIndexPath.h in Headers */, - B35062281B010EFD0018CF92 /* ASRangeHandler.h in Headers */, - B35061FD1B010EFD0018CF92 /* ASDisplayNode+Subclasses.h in Headers */, - 18C2ED7F1B9B7DE800F627B3 /* ASCollectionNode.h in Headers */, - B35062491B010EFD0018CF92 /* _ASCoreAnimationExtras.h in Headers */, - B35061F31B010EFD0018CF92 /* ASCellNode.h in Headers */, - 34EFC76C1B701CED00AD841F /* ASOverlayLayoutSpec.h in Headers */, - B35062201B010EFD0018CF92 /* ASLayoutController.h in Headers */, - B35062571B010F070018CF92 /* ASAssert.h in Headers */, - B35062411B010EFD0018CF92 /* _ASAsyncTransactionGroup.h in Headers */, - B350623C1B010EFD0018CF92 /* _ASAsyncTransaction.h in Headers */, - B350625C1B010F070018CF92 /* ASLog.h in Headers */, - B35062551B010EFD0018CF92 /* ASSentinel.h in Headers */, - 34EFC75B1B701BAF00AD841F /* ASDimension.h in Headers */, - B350624B1B010EFD0018CF92 /* _ASPendingState.h in Headers */, - B35062391B010EFD0018CF92 /* ASThread.h in Headers */, - B35062131B010EFD0018CF92 /* ASBasicImageDownloader.h in Headers */, - 34EFC7791B701D3600AD841F /* ASLayoutSpecUtilities.h in Headers */, - 9C5FA3521B8F6ADF00A62714 /* ASLayoutOptions.h in Headers */, - 34EFC76A1B701CE600AD841F /* ASLayoutSpec.h in Headers */, - B35062221B010EFD0018CF92 /* ASMultidimensionalArrayUtils.h in Headers */, - B350625B1B010F070018CF92 /* ASEqualityHelpers.h in Headers */, - B35061F71B010EFD0018CF92 /* ASCollectionViewProtocols.h in Headers */, - 509E68631B3AEDB4009B9150 /* ASCollectionViewLayoutController.h in Headers */, - B35062241B010EFD0018CF92 /* ASMutableAttributedStringBuilder.h in Headers */, - B350621D1B010EFD0018CF92 /* ASHighlightOverlayLayer.h in Headers */, - B35062171B010EFD0018CF92 /* ASDataController.h in Headers */, - 34EFC7711B701CFF00AD841F /* ASStackLayoutSpec.h in Headers */, - B350625A1B010F070018CF92 /* ASDisplayNodeExtraIvars.h in Headers */, - B350621F1B010EFD0018CF92 /* ASImageProtocols.h in Headers */, - B350620A1B010EFD0018CF92 /* ASTableView.h in Headers */, - 2C107F5B1BA9F54500F13DE5 /* AsyncDisplayKit.h in Headers */, - B35062451B010EFD0018CF92 /* ASBatchFetching.h in Headers */, - B350620C1B010EFD0018CF92 /* ASTableViewProtocols.h in Headers */, B35062481B010EFD0018CF92 /* _AS-objc-internal.h in Headers */, + B350623C1B010EFD0018CF92 /* _ASAsyncTransaction.h in Headers */, + B350623E1B010EFD0018CF92 /* _ASAsyncTransactionContainer+Private.h in Headers */, B350623F1B010EFD0018CF92 /* _ASAsyncTransactionContainer.h in Headers */, - 9C49C3701B853961000B0DD5 /* ASStackLayoutable.h in Headers */, - 34EFC7731B701D0700AD841F /* ASStaticLayoutSpec.h in Headers */, - B35062081B010EFD0018CF92 /* ASScrollNode.h in Headers */, - B35061F51B010EFD0018CF92 /* ASCollectionView.h in Headers */, + B35062411B010EFD0018CF92 /* _ASAsyncTransactionGroup.h in Headers */, + B35062491B010EFD0018CF92 /* _ASCoreAnimationExtras.h in Headers */, + B350620F1B010EFD0018CF92 /* _ASDisplayLayer.h in Headers */, + B35062111B010EFD0018CF92 /* _ASDisplayView.h in Headers */, + B350624B1B010EFD0018CF92 /* _ASPendingState.h in Headers */, + B350624D1B010EFD0018CF92 /* _ASScopeTimer.h in Headers */, + 509E68611B3AEDA0009B9150 /* ASAbstractLayoutController.h in Headers */, + B35062571B010F070018CF92 /* ASAssert.h in Headers */, B35062581B010F070018CF92 /* ASAvailability.h in Headers */, + 34EFC7611B701C9C00AD841F /* ASBackgroundLayoutSpec.h in Headers */, + B35062591B010F070018CF92 /* ASBaseDefines.h in Headers */, + B35062131B010EFD0018CF92 /* ASBasicImageDownloader.h in Headers */, B35062461B010EFD0018CF92 /* ASBasicImageDownloaderInternal.h in Headers */, + B35062151B010EFD0018CF92 /* ASBatchContext.h in Headers */, + B35062451B010EFD0018CF92 /* ASBatchFetching.h in Headers */, + B35061F31B010EFD0018CF92 /* ASCellNode.h in Headers */, + 34EFC7631B701CBF00AD841F /* ASCenterLayoutSpec.h in Headers */, + 18C2ED7F1B9B7DE800F627B3 /* ASCollectionNode.h in Headers */, + B35061F51B010EFD0018CF92 /* ASCollectionView.h in Headers */, + 509E68631B3AEDB4009B9150 /* ASCollectionViewLayoutController.h in Headers */, + B35061F71B010EFD0018CF92 /* ASCollectionViewProtocols.h in Headers */, + B35061FA1B010EFD0018CF92 /* ASControlNode+Subclasses.h in Headers */, + B35061F81B010EFD0018CF92 /* ASControlNode.h in Headers */, + B35062171B010EFD0018CF92 /* ASDataController.h in Headers */, + B35062191B010EFD0018CF92 /* ASDealloc2MainObject.h in Headers */, + 34EFC75B1B701BAF00AD841F /* ASDimension.h in Headers */, + B350624F1B010EFD0018CF92 /* ASDisplayNode+DebugTiming.h in Headers */, + B35061FD1B010EFD0018CF92 /* ASDisplayNode+Subclasses.h in Headers */, + B35061FB1B010EFD0018CF92 /* ASDisplayNode.h in Headers */, + B350625A1B010F070018CF92 /* ASDisplayNodeExtraIvars.h in Headers */, + B35061FE1B010EFD0018CF92 /* ASDisplayNodeExtras.h in Headers */, + B35062521B010EFD0018CF92 /* ASDisplayNodeInternal.h in Headers */, + B35062001B010EFD0018CF92 /* ASEditableTextNode.h in Headers */, + B350625B1B010F070018CF92 /* ASEqualityHelpers.h in Headers */, + B350621B1B010EFD0018CF92 /* ASFlowLayoutController.h in Headers */, + B350621D1B010EFD0018CF92 /* ASHighlightOverlayLayer.h in Headers */, + B35062531B010EFD0018CF92 /* ASImageNode+CGExtras.h in Headers */, + B35062021B010EFD0018CF92 /* ASImageNode.h in Headers */, + B350621F1B010EFD0018CF92 /* ASImageProtocols.h in Headers */, + 430E7C901B4C23F100697A4C /* ASIndexPath.h in Headers */, + 34EFC75F1B701C8600AD841F /* ASInsetLayoutSpec.h in Headers */, + 34EFC75D1B701BE900AD841F /* ASInternalHelpers.h in Headers */, + 34EFC7671B701CD900AD841F /* ASLayout.h in Headers */, + 34EFC7691B701CE100AD841F /* ASLayoutable.h in Headers */, + 9CDC18CD1B910E12004965E2 /* ASLayoutablePrivate.h in Headers */, + B35062201B010EFD0018CF92 /* ASLayoutController.h in Headers */, + 9C5FA3521B8F6ADF00A62714 /* ASLayoutOptions.h in Headers */, + 9C65A72B1BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h in Headers */, + B35062211B010EFD0018CF92 /* ASLayoutRangeType.h in Headers */, + 34EFC76A1B701CE600AD841F /* ASLayoutSpec.h in Headers */, + 34EFC7791B701D3600AD841F /* ASLayoutSpecUtilities.h in Headers */, + B350625C1B010F070018CF92 /* ASLog.h in Headers */, + B35062221B010EFD0018CF92 /* ASMultidimensionalArrayUtils.h in Headers */, + B35062041B010EFD0018CF92 /* ASMultiplexImageNode.h in Headers */, + B35062241B010EFD0018CF92 /* ASMutableAttributedStringBuilder.h in Headers */, + B35062061B010EFD0018CF92 /* ASNetworkImageNode.h in Headers */, + 34EFC76C1B701CED00AD841F /* ASOverlayLayoutSpec.h in Headers */, + B35062261B010EFD0018CF92 /* ASRangeController.h in Headers */, + B35062281B010EFD0018CF92 /* ASRangeHandler.h in Headers */, + B35062291B010EFD0018CF92 /* ASRangeHandlerPreload.h in Headers */, B350622B1B010EFD0018CF92 /* ASRangeHandlerRender.h in Headers */, + 34EFC76E1B701CF400AD841F /* ASRatioLayoutSpec.h in Headers */, + 34EFC7651B701CCC00AD841F /* ASRelativeSize.h in Headers */, + B350622D1B010EFD0018CF92 /* ASScrollDirection.h in Headers */, + B35062081B010EFD0018CF92 /* ASScrollNode.h in Headers */, + B35062551B010EFD0018CF92 /* ASSentinel.h in Headers */, + 9C8221961BA237B80037F19A /* ASStackBaselinePositionedLayout.h in Headers */, + 9C49C3701B853961000B0DD5 /* ASStackLayoutable.h in Headers */, + 34EFC7701B701CFA00AD841F /* ASStackLayoutDefines.h in Headers */, + 34EFC7711B701CFF00AD841F /* ASStackLayoutSpec.h in Headers */, 34EFC7751B701D2400AD841F /* ASStackPositionedLayout.h in Headers */, 34EFC7771B701D2D00AD841F /* ASStackUnpositionedLayout.h in Headers */, - B350622E1B010EFD0018CF92 /* ASTextNodeCoreTextAdditions.h in Headers */, - B35062061B010EFD0018CF92 /* ASNetworkImageNode.h in Headers */, - 34EFC7691B701CE100AD841F /* ASLayoutable.h in Headers */, - 34EFC75F1B701C8600AD841F /* ASInsetLayoutSpec.h in Headers */, - 34EFC7631B701CBF00AD841F /* ASCenterLayoutSpec.h in Headers */, - B350624D1B010EFD0018CF92 /* _ASScopeTimer.h in Headers */, - 34EFC7701B701CFA00AD841F /* ASStackLayoutDefines.h in Headers */, - 509E68651B3AEDC5009B9150 /* CGRect+ASConvenience.h in Headers */, - B350624F1B010EFD0018CF92 /* ASDisplayNode+DebugTiming.h in Headers */, - B35062211B010EFD0018CF92 /* ASLayoutRangeType.h in Headers */, - B35062521B010EFD0018CF92 /* ASDisplayNodeInternal.h in Headers */, - B35061FE1B010EFD0018CF92 /* ASDisplayNodeExtras.h in Headers */, - B35062041B010EFD0018CF92 /* ASMultiplexImageNode.h in Headers */, - B35062021B010EFD0018CF92 /* ASImageNode.h in Headers */, - 34EFC75D1B701BE900AD841F /* ASInternalHelpers.h in Headers */, - 34EFC7611B701C9C00AD841F /* ASBackgroundLayoutSpec.h in Headers */, - B35062301B010EFD0018CF92 /* ASTextNodeRenderer.h in Headers */, - 509E68611B3AEDA0009B9150 /* ASAbstractLayoutController.h in Headers */, - 9C65A72B1BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h in Headers */, + 9C6BB3B31B8CC9C200F13F52 /* ASStaticLayoutable.h in Headers */, + 34EFC7731B701D0700AD841F /* ASStaticLayoutSpec.h in Headers */, + B350620A1B010EFD0018CF92 /* ASTableView.h in Headers */, + B350620C1B010EFD0018CF92 /* ASTableViewProtocols.h in Headers */, B350620D1B010EFD0018CF92 /* ASTextNode.h in Headers */, - 34EFC76E1B701CF400AD841F /* ASRatioLayoutSpec.h in Headers */, - B35062151B010EFD0018CF92 /* ASBatchContext.h in Headers */, - B350621B1B010EFD0018CF92 /* ASFlowLayoutController.h in Headers */, - B35062291B010EFD0018CF92 /* ASRangeHandlerPreload.h in Headers */, - B35062001B010EFD0018CF92 /* ASEditableTextNode.h in Headers */, + B350622E1B010EFD0018CF92 /* ASTextNodeCoreTextAdditions.h in Headers */, + B35062301B010EFD0018CF92 /* ASTextNodeRenderer.h in Headers */, + B35062321B010EFD0018CF92 /* ASTextNodeShadower.h in Headers */, + B35062341B010EFD0018CF92 /* ASTextNodeTextKitHelpers.h in Headers */, + B35062361B010EFD0018CF92 /* ASTextNodeTypes.h in Headers */, + B35062371B010EFD0018CF92 /* ASTextNodeWordKerner.h in Headers */, + B35062391B010EFD0018CF92 /* ASThread.h in Headers */, + 2C107F5B1BA9F54500F13DE5 /* AsyncDisplayKit.h in Headers */, + 509E68651B3AEDC5009B9150 /* CGRect+ASConvenience.h in Headers */, B350623A1B010EFD0018CF92 /* NSMutableAttributedString+TextKitAdditions.h in Headers */, - B350623E1B010EFD0018CF92 /* _ASAsyncTransactionContainer+Private.h in Headers */, - 9C8221961BA237B80037F19A /* ASStackBaselinePositionedLayout.h in Headers */, - B35062591B010F070018CF92 /* ASBaseDefines.h in Headers */, - B35062191B010EFD0018CF92 /* ASDealloc2MainObject.h in Headers */, - B350620F1B010EFD0018CF92 /* _ASDisplayLayer.h in Headers */, - 9CDC18CD1B910E12004965E2 /* ASLayoutablePrivate.h in Headers */, - B35062531B010EFD0018CF92 /* ASImageNode+CGExtras.h in Headers */, + B35062431B010EFD0018CF92 /* UIView+ASConvenience.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; From d95f0ea1bd2caa2b14cdc33426edf36cf91d919c Mon Sep 17 00:00:00 2001 From: Jack Flintermann Date: Wed, 16 Sep 2015 20:05:10 -0400 Subject: [PATCH 06/17] synchronize target build phases --- AsyncDisplayKit.xcodeproj/project.pbxproj | 138 +++++++++------------- 1 file changed, 57 insertions(+), 81 deletions(-) diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj index 7e7efdcd26..06b8b3d07d 100644 --- a/AsyncDisplayKit.xcodeproj/project.pbxproj +++ b/AsyncDisplayKit.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ 044284FD1BAA365100D16268 /* UICollectionViewLayout+ASConvenience.m in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E0E1B371875007741D0 /* UICollectionViewLayout+ASConvenience.m */; }; + 044284FE1BAA387800D16268 /* ASStackLayoutSpecUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED461B17847A00DA7C62 /* ASStackLayoutSpecUtilities.h */; }; 0515EA211A15769900BA8B9A /* Photos.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 051943141A1575670030A7D0 /* Photos.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 0515EA221A1576A100BA8B9A /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 051943121A1575630030A7D0 /* AssetsLibrary.framework */; }; 0516FA3C1A15563400B4EBED /* ASAvailability.h in Headers */ = {isa = PBXBuildFile; fileRef = 0516FA3A1A15563400B4EBED /* ASAvailability.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -76,62 +77,36 @@ 058D0A40195D057000B7D73C /* ASTextNodeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 058D0A36195D057000B7D73C /* ASTextNodeTests.m */; }; 058D0A41195D057000B7D73C /* ASTextNodeWordKernerTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 058D0A37195D057000B7D73C /* ASTextNodeWordKernerTests.mm */; }; 058D0A47195D05CB00B7D73C /* ASControlNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09D5195D050800B7D73C /* ASControlNode.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A48195D05CB00B7D73C /* ASControlNode.m in Headers */ = {isa = PBXBuildFile; fileRef = 058D09D6195D050800B7D73C /* ASControlNode.m */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A49195D05CB00B7D73C /* ASControlNode+Subclasses.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09D7195D050800B7D73C /* ASControlNode+Subclasses.h */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A4A195D05CB00B7D73C /* ASDisplayNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09D8195D050800B7D73C /* ASDisplayNode.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A4B195D05CB00B7D73C /* ASDisplayNode.mm in Headers */ = {isa = PBXBuildFile; fileRef = 058D09D9195D050800B7D73C /* ASDisplayNode.mm */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A4C195D05CB00B7D73C /* ASDisplayNode+Subclasses.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09DA195D050800B7D73C /* ASDisplayNode+Subclasses.h */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A4D195D05CB00B7D73C /* ASDisplayNodeExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09DB195D050800B7D73C /* ASDisplayNodeExtras.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A4E195D05CB00B7D73C /* ASDisplayNodeExtras.mm in Headers */ = {isa = PBXBuildFile; fileRef = 058D09DC195D050800B7D73C /* ASDisplayNodeExtras.mm */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A4F195D05CB00B7D73C /* ASImageNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09DD195D050800B7D73C /* ASImageNode.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A50195D05CB00B7D73C /* ASImageNode.mm in Headers */ = {isa = PBXBuildFile; fileRef = 058D09DE195D050800B7D73C /* ASImageNode.mm */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A51195D05CB00B7D73C /* ASTextNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09DF195D050800B7D73C /* ASTextNode.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A52195D05CB00B7D73C /* ASTextNode.mm in Headers */ = {isa = PBXBuildFile; fileRef = 058D09E0195D050800B7D73C /* ASTextNode.mm */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A53195D05DC00B7D73C /* _ASDisplayLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09E2195D050800B7D73C /* _ASDisplayLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A54195D05DC00B7D73C /* _ASDisplayLayer.mm in Headers */ = {isa = PBXBuildFile; fileRef = 058D09E3195D050800B7D73C /* _ASDisplayLayer.mm */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A55195D05DC00B7D73C /* _ASDisplayView.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09E4195D050800B7D73C /* _ASDisplayView.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A56195D05DC00B7D73C /* _ASDisplayView.mm in Headers */ = {isa = PBXBuildFile; fileRef = 058D09E5195D050800B7D73C /* _ASDisplayView.mm */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A57195D05DC00B7D73C /* ASHighlightOverlayLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09E6195D050800B7D73C /* ASHighlightOverlayLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A58195D05DC00B7D73C /* ASHighlightOverlayLayer.mm in Headers */ = {isa = PBXBuildFile; fileRef = 058D09E7195D050800B7D73C /* ASHighlightOverlayLayer.mm */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A59195D05DC00B7D73C /* ASMutableAttributedStringBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09E8195D050800B7D73C /* ASMutableAttributedStringBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A5A195D05DC00B7D73C /* ASMutableAttributedStringBuilder.m in Headers */ = {isa = PBXBuildFile; fileRef = 058D09E9195D050800B7D73C /* ASMutableAttributedStringBuilder.m */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A5B195D05DC00B7D73C /* ASTextNodeCoreTextAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09EA195D050800B7D73C /* ASTextNodeCoreTextAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A5C195D05DC00B7D73C /* ASTextNodeCoreTextAdditions.m in Headers */ = {isa = PBXBuildFile; fileRef = 058D09EB195D050800B7D73C /* ASTextNodeCoreTextAdditions.m */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A5D195D05DC00B7D73C /* ASTextNodeRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09EC195D050800B7D73C /* ASTextNodeRenderer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A5E195D05DC00B7D73C /* ASTextNodeRenderer.mm in Headers */ = {isa = PBXBuildFile; fileRef = 058D09ED195D050800B7D73C /* ASTextNodeRenderer.mm */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A5F195D05DC00B7D73C /* ASTextNodeShadower.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09EE195D050800B7D73C /* ASTextNodeShadower.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A60195D05DC00B7D73C /* ASTextNodeShadower.m in Headers */ = {isa = PBXBuildFile; fileRef = 058D09EF195D050800B7D73C /* ASTextNodeShadower.m */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A61195D05DC00B7D73C /* ASTextNodeTextKitHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09F0195D050800B7D73C /* ASTextNodeTextKitHelpers.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A62195D05DC00B7D73C /* ASTextNodeTextKitHelpers.mm in Headers */ = {isa = PBXBuildFile; fileRef = 058D09F1195D050800B7D73C /* ASTextNodeTextKitHelpers.mm */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A63195D05DC00B7D73C /* ASTextNodeTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09F2195D050800B7D73C /* ASTextNodeTypes.h */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A64195D05DC00B7D73C /* ASTextNodeWordKerner.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09F3195D050800B7D73C /* ASTextNodeWordKerner.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A65195D05DC00B7D73C /* ASTextNodeWordKerner.m in Headers */ = {isa = PBXBuildFile; fileRef = 058D09F4195D050800B7D73C /* ASTextNodeWordKerner.m */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A66195D05DC00B7D73C /* NSMutableAttributedString+TextKitAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09F5195D050800B7D73C /* NSMutableAttributedString+TextKitAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A67195D05DC00B7D73C /* NSMutableAttributedString+TextKitAdditions.m in Headers */ = {isa = PBXBuildFile; fileRef = 058D09F6195D050800B7D73C /* NSMutableAttributedString+TextKitAdditions.m */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A68195D05EC00B7D73C /* _ASAsyncTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09F8195D050800B7D73C /* _ASAsyncTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A69195D05EC00B7D73C /* _ASAsyncTransaction.m in Headers */ = {isa = PBXBuildFile; fileRef = 058D09F9195D050800B7D73C /* _ASAsyncTransaction.m */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A6A195D05EC00B7D73C /* _ASAsyncTransactionContainer+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09FA195D050800B7D73C /* _ASAsyncTransactionContainer+Private.h */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A6B195D05EC00B7D73C /* _ASAsyncTransactionContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09FB195D050800B7D73C /* _ASAsyncTransactionContainer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A6C195D05EC00B7D73C /* _ASAsyncTransactionContainer.m in Headers */ = {isa = PBXBuildFile; fileRef = 058D09FC195D050800B7D73C /* _ASAsyncTransactionContainer.m */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A6D195D05EC00B7D73C /* _ASAsyncTransactionGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09FD195D050800B7D73C /* _ASAsyncTransactionGroup.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A6E195D05EC00B7D73C /* _ASAsyncTransactionGroup.m in Headers */ = {isa = PBXBuildFile; fileRef = 058D09FE195D050800B7D73C /* _ASAsyncTransactionGroup.m */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A6F195D05EC00B7D73C /* UIView+ASConvenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09FF195D050800B7D73C /* UIView+ASConvenience.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A70195D05EC00B7D73C /* UIView+ASConvenience.m in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A00195D050800B7D73C /* UIView+ASConvenience.m */; settings = {ATTRIBUTES = (Public, ); }; }; - 058D0A71195D05F800B7D73C /* _AS-objc-internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A02195D050800B7D73C /* _AS-objc-internal.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 058D0A72195D05F800B7D73C /* _ASCoreAnimationExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A03195D050800B7D73C /* _ASCoreAnimationExtras.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 058D0A73195D05F800B7D73C /* _ASCoreAnimationExtras.mm in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A04195D050800B7D73C /* _ASCoreAnimationExtras.mm */; settings = {ATTRIBUTES = (Private, ); }; }; - 058D0A74195D05F800B7D73C /* _ASPendingState.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A05195D050800B7D73C /* _ASPendingState.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 058D0A75195D05F800B7D73C /* _ASPendingState.m in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A06195D050800B7D73C /* _ASPendingState.m */; settings = {ATTRIBUTES = (Private, ); }; }; - 058D0A76195D05F900B7D73C /* _ASScopeTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A07195D050800B7D73C /* _ASScopeTimer.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 058D0A77195D05F900B7D73C /* ASDisplayNode+AsyncDisplay.mm in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A08195D050800B7D73C /* ASDisplayNode+AsyncDisplay.mm */; settings = {ATTRIBUTES = (Private, ); }; }; - 058D0A78195D05F900B7D73C /* ASDisplayNode+DebugTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A09195D050800B7D73C /* ASDisplayNode+DebugTiming.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 058D0A79195D05F900B7D73C /* ASDisplayNode+DebugTiming.mm in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A0A195D050800B7D73C /* ASDisplayNode+DebugTiming.mm */; settings = {ATTRIBUTES = (Private, ); }; }; - 058D0A7A195D05F900B7D73C /* ASDisplayNode+UIViewBridge.mm in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A0B195D050800B7D73C /* ASDisplayNode+UIViewBridge.mm */; settings = {ATTRIBUTES = (Private, ); }; }; - 058D0A7B195D05F900B7D73C /* ASDisplayNodeInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A0C195D050800B7D73C /* ASDisplayNodeInternal.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 058D0A7C195D05F900B7D73C /* ASImageNode+CGExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A0D195D050800B7D73C /* ASImageNode+CGExtras.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 058D0A7D195D05F900B7D73C /* ASImageNode+CGExtras.m in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A0E195D050800B7D73C /* ASImageNode+CGExtras.m */; settings = {ATTRIBUTES = (Private, ); }; }; - 058D0A7F195D05F900B7D73C /* ASSentinel.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A10195D050800B7D73C /* ASSentinel.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 058D0A80195D05F900B7D73C /* ASSentinel.m in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A11195D050800B7D73C /* ASSentinel.m */; settings = {ATTRIBUTES = (Private, ); }; }; + 058D0A71195D05F800B7D73C /* _AS-objc-internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A02195D050800B7D73C /* _AS-objc-internal.h */; }; + 058D0A72195D05F800B7D73C /* _ASCoreAnimationExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A03195D050800B7D73C /* _ASCoreAnimationExtras.h */; }; + 058D0A74195D05F800B7D73C /* _ASPendingState.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A05195D050800B7D73C /* _ASPendingState.h */; }; + 058D0A76195D05F900B7D73C /* _ASScopeTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A07195D050800B7D73C /* _ASScopeTimer.h */; }; + 058D0A78195D05F900B7D73C /* ASDisplayNode+DebugTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A09195D050800B7D73C /* ASDisplayNode+DebugTiming.h */; }; + 058D0A7B195D05F900B7D73C /* ASDisplayNodeInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A0C195D050800B7D73C /* ASDisplayNodeInternal.h */; }; + 058D0A7C195D05F900B7D73C /* ASImageNode+CGExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A0D195D050800B7D73C /* ASImageNode+CGExtras.h */; }; + 058D0A7F195D05F900B7D73C /* ASSentinel.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A10195D050800B7D73C /* ASSentinel.h */; }; 058D0A81195D05F900B7D73C /* ASThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A12195D050800B7D73C /* ASThread.h */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A82195D060300B7D73C /* ASAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A43195D058D00B7D73C /* ASAssert.h */; settings = {ATTRIBUTES = (Public, ); }; }; 058D0A83195D060300B7D73C /* ASBaseDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A44195D058D00B7D73C /* ASBaseDefines.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -144,7 +119,7 @@ 18C2ED7F1B9B7DE800F627B3 /* ASCollectionNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 18C2ED7C1B9B7DE800F627B3 /* ASCollectionNode.h */; settings = {ATTRIBUTES = (Public, ); }; }; 18C2ED801B9B7DE800F627B3 /* ASCollectionNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 18C2ED7D1B9B7DE800F627B3 /* ASCollectionNode.m */; }; 18C2ED831B9B7DE800F627B3 /* ASCollectionNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 18C2ED7D1B9B7DE800F627B3 /* ASCollectionNode.m */; }; - 1950C4491A3BB5C1005C8279 /* ASEqualityHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 1950C4481A3BB5C1005C8279 /* ASEqualityHelpers.h */; }; + 1950C4491A3BB5C1005C8279 /* ASEqualityHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 1950C4481A3BB5C1005C8279 /* ASEqualityHelpers.h */; settings = {ATTRIBUTES = (Public, ); }; }; 204C979E1B362CB3002B1083 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 204C979D1B362CB3002B1083 /* Default-568h@2x.png */; }; 205F0E0F1B371875007741D0 /* UICollectionViewLayout+ASConvenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 205F0E0D1B371875007741D0 /* UICollectionViewLayout+ASConvenience.h */; settings = {ATTRIBUTES = (Public, ); }; }; 205F0E101B371875007741D0 /* UICollectionViewLayout+ASConvenience.m in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E0E1B371875007741D0 /* UICollectionViewLayout+ASConvenience.m */; }; @@ -153,7 +128,7 @@ 205F0E1A1B37339C007741D0 /* ASAbstractLayoutController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E181B37339C007741D0 /* ASAbstractLayoutController.mm */; }; 205F0E1D1B373A2C007741D0 /* ASCollectionViewLayoutController.h in Headers */ = {isa = PBXBuildFile; fileRef = 205F0E1B1B373A2C007741D0 /* ASCollectionViewLayoutController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 205F0E1E1B373A2C007741D0 /* ASCollectionViewLayoutController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E1C1B373A2C007741D0 /* ASCollectionViewLayoutController.mm */; }; - 205F0E211B376416007741D0 /* CGRect+ASConvenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 205F0E1F1B376416007741D0 /* CGRect+ASConvenience.h */; }; + 205F0E211B376416007741D0 /* CGRect+ASConvenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 205F0E1F1B376416007741D0 /* CGRect+ASConvenience.h */; settings = {ATTRIBUTES = (Public, ); }; }; 205F0E221B376416007741D0 /* CGRect+ASConvenience.m in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E201B376416007741D0 /* CGRect+ASConvenience.m */; }; 242995D31B29743C00090100 /* ASBasicImageDownloaderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 242995D21B29743C00090100 /* ASBasicImageDownloaderTests.m */; }; 2911485C1A77147A005D0878 /* ASControlNodeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2911485B1A77147A005D0878 /* ASControlNodeTests.m */; }; @@ -164,8 +139,8 @@ 292C59A21A956527007E5DD6 /* ASRangeHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 292C599C1A956527007E5DD6 /* ASRangeHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; 292C59A31A956527007E5DD6 /* ASRangeHandlerRender.h in Headers */ = {isa = PBXBuildFile; fileRef = 292C599D1A956527007E5DD6 /* ASRangeHandlerRender.h */; settings = {ATTRIBUTES = (Public, ); }; }; 292C59A41A956527007E5DD6 /* ASRangeHandlerRender.mm in Sources */ = {isa = PBXBuildFile; fileRef = 292C599E1A956527007E5DD6 /* ASRangeHandlerRender.mm */; }; - 2967F9E21AB0A5190072E4AB /* ASBasicImageDownloaderInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2967F9E11AB0A4CF0072E4AB /* ASBasicImageDownloaderInternal.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 296A0A2E1A9516B2005ACEAA /* ASBatchFetching.h in Headers */ = {isa = PBXBuildFile; fileRef = 296A0A2C1A9516B2005ACEAA /* ASBatchFetching.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 2967F9E21AB0A5190072E4AB /* ASBasicImageDownloaderInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2967F9E11AB0A4CF0072E4AB /* ASBasicImageDownloaderInternal.h */; }; + 296A0A2E1A9516B2005ACEAA /* ASBatchFetching.h in Headers */ = {isa = PBXBuildFile; fileRef = 296A0A2C1A9516B2005ACEAA /* ASBatchFetching.h */; settings = {ATTRIBUTES = (Public, ); }; }; 296A0A2F1A9516B2005ACEAA /* ASBatchFetching.m in Sources */ = {isa = PBXBuildFile; fileRef = 296A0A2D1A9516B2005ACEAA /* ASBatchFetching.m */; }; 296A0A351A951ABF005ACEAA /* ASBatchFetchingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 296A0A341A951ABF005ACEAA /* ASBatchFetchingTests.m */; }; 299DA1A91A828D2900162D41 /* ASBatchContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 299DA1A71A828D2900162D41 /* ASBatchContext.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -174,7 +149,7 @@ 2C107F5B1BA9F54500F13DE5 /* AsyncDisplayKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BDC61F51978FEA400E50D21 /* AsyncDisplayKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34EFC75B1B701BAF00AD841F /* ASDimension.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED071B17843500DA7C62 /* ASDimension.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34EFC75C1B701BD200AD841F /* ASDimension.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED081B17843500DA7C62 /* ASDimension.mm */; }; - 34EFC75D1B701BE900AD841F /* ASInternalHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED431B17847A00DA7C62 /* ASInternalHelpers.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 34EFC75D1B701BE900AD841F /* ASInternalHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED431B17847A00DA7C62 /* ASInternalHelpers.h */; }; 34EFC75E1B701BF000AD841F /* ASInternalHelpers.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED441B17847A00DA7C62 /* ASInternalHelpers.mm */; }; 34EFC75F1B701C8600AD841F /* ASInsetLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED091B17843500DA7C62 /* ASInsetLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34EFC7601B701C8B00AD841F /* ASInsetLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED0A1B17843500DA7C62 /* ASInsetLayoutSpec.mm */; }; @@ -198,11 +173,11 @@ 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 */; }; - 34EFC7751B701D2400AD841F /* ASStackPositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED471B17847A00DA7C62 /* ASStackPositionedLayout.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 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 */; settings = {ATTRIBUTES = (Public, ); }; }; + 34EFC7771B701D2D00AD841F /* ASStackUnpositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED491B17847A00DA7C62 /* ASStackUnpositionedLayout.h */; }; 34EFC7781B701D3100AD841F /* ASStackUnpositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED4A1B17847A00DA7C62 /* ASStackUnpositionedLayout.mm */; }; - 34EFC7791B701D3600AD841F /* ASLayoutSpecUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED451B17847A00DA7C62 /* ASLayoutSpecUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 34EFC7791B701D3600AD841F /* ASLayoutSpecUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED451B17847A00DA7C62 /* ASLayoutSpecUtilities.h */; }; 3C9C128519E616EF00E942A0 /* ASTableViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C9C128419E616EF00E942A0 /* ASTableViewTests.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 430E7C8F1B4C23F100697A4C /* ASIndexPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 430E7C8D1B4C23F100697A4C /* ASIndexPath.h */; settings = {ATTRIBUTES = (Public, ); }; }; 430E7C901B4C23F100697A4C /* ASIndexPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 430E7C8D1B4C23F100697A4C /* ASIndexPath.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -213,14 +188,14 @@ 464052221A3F83C40061C0BA /* ASFlowLayoutController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4640521B1A3F83C40061C0BA /* ASFlowLayoutController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 464052231A3F83C40061C0BA /* ASFlowLayoutController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4640521C1A3F83C40061C0BA /* ASFlowLayoutController.mm */; }; 464052241A3F83C40061C0BA /* ASLayoutController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4640521D1A3F83C40061C0BA /* ASLayoutController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 464052251A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 4640521E1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h */; }; + 464052251A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 4640521E1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; 464052261A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4640521F1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm */; }; 509E68601B3AED8E009B9150 /* ASScrollDirection.m in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E111B371BD7007741D0 /* ASScrollDirection.m */; }; 509E68611B3AEDA0009B9150 /* ASAbstractLayoutController.h in Headers */ = {isa = PBXBuildFile; fileRef = 205F0E171B37339C007741D0 /* ASAbstractLayoutController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 509E68621B3AEDA5009B9150 /* ASAbstractLayoutController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E181B37339C007741D0 /* ASAbstractLayoutController.mm */; }; 509E68631B3AEDB4009B9150 /* ASCollectionViewLayoutController.h in Headers */ = {isa = PBXBuildFile; fileRef = 205F0E1B1B373A2C007741D0 /* ASCollectionViewLayoutController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 509E68641B3AEDB7009B9150 /* ASCollectionViewLayoutController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E1C1B373A2C007741D0 /* ASCollectionViewLayoutController.mm */; }; - 509E68651B3AEDC5009B9150 /* CGRect+ASConvenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 205F0E1F1B376416007741D0 /* CGRect+ASConvenience.h */; }; + 509E68651B3AEDC5009B9150 /* CGRect+ASConvenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 205F0E1F1B376416007741D0 /* CGRect+ASConvenience.h */; settings = {ATTRIBUTES = (Public, ); }; }; 509E68661B3AEDD7009B9150 /* CGRect+ASConvenience.m in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E201B376416007741D0 /* CGRect+ASConvenience.m */; }; 6BDC61F61979037800E50D21 /* AsyncDisplayKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BDC61F51978FEA400E50D21 /* AsyncDisplayKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9C49C36F1B853957000B0DD5 /* ASStackLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C49C36E1B853957000B0DD5 /* ASStackLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -231,12 +206,12 @@ 9C5FA3541B8F6ADF00A62714 /* ASLayoutOptions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C5FA3501B8F6ADF00A62714 /* ASLayoutOptions.mm */; }; 9C5FA35F1B90C9A500A62714 /* ASLayoutOptionsPrivate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C5FA35C1B90C9A500A62714 /* ASLayoutOptionsPrivate.mm */; }; 9C5FA3601B90C9A500A62714 /* ASLayoutOptionsPrivate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C5FA35C1B90C9A500A62714 /* ASLayoutOptionsPrivate.mm */; }; - 9C65A72A1BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C65A7291BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 9C65A72B1BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C65A7291BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 9C65A72A1BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C65A7291BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h */; }; + 9C65A72B1BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C65A7291BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h */; }; 9C6BB3B21B8CC9C200F13F52 /* ASStaticLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6BB3B01B8CC9C200F13F52 /* ASStaticLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9C6BB3B31B8CC9C200F13F52 /* ASStaticLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6BB3B01B8CC9C200F13F52 /* ASStaticLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9C8221951BA237B80037F19A /* ASStackBaselinePositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C8221931BA237B80037F19A /* ASStackBaselinePositionedLayout.h */; settings = {ASSET_TAGS = (); }; }; - 9C8221961BA237B80037F19A /* ASStackBaselinePositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C8221931BA237B80037F19A /* ASStackBaselinePositionedLayout.h */; settings = {ASSET_TAGS = (); }; }; + 9C8221951BA237B80037F19A /* ASStackBaselinePositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C8221931BA237B80037F19A /* ASStackBaselinePositionedLayout.h */; }; + 9C8221961BA237B80037F19A /* ASStackBaselinePositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C8221931BA237B80037F19A /* ASStackBaselinePositionedLayout.h */; }; 9C8221971BA237B80037F19A /* ASStackBaselinePositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C8221941BA237B80037F19A /* ASStackBaselinePositionedLayout.mm */; settings = {ASSET_TAGS = (); }; }; 9C8221981BA237B80037F19A /* ASStackBaselinePositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C8221941BA237B80037F19A /* ASStackBaselinePositionedLayout.mm */; settings = {ASSET_TAGS = (); }; }; 9CDC18CC1B910E12004965E2 /* ASLayoutablePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9CDC18CB1B910E12004965E2 /* ASLayoutablePrivate.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -271,13 +246,13 @@ ACF6ED301B17843500DA7C62 /* ASStackLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED171B17843500DA7C62 /* ASStackLayoutSpec.mm */; }; ACF6ED311B17843500DA7C62 /* ASStaticLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED181B17843500DA7C62 /* ASStaticLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; ACF6ED321B17843500DA7C62 /* ASStaticLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED191B17843500DA7C62 /* ASStaticLayoutSpec.mm */; }; - ACF6ED4B1B17847A00DA7C62 /* ASInternalHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED431B17847A00DA7C62 /* ASInternalHelpers.h */; settings = {ATTRIBUTES = (Private, ); }; }; + ACF6ED4B1B17847A00DA7C62 /* ASInternalHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED431B17847A00DA7C62 /* ASInternalHelpers.h */; }; ACF6ED4C1B17847A00DA7C62 /* ASInternalHelpers.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED441B17847A00DA7C62 /* ASInternalHelpers.mm */; }; - ACF6ED4D1B17847A00DA7C62 /* ASLayoutSpecUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED451B17847A00DA7C62 /* ASLayoutSpecUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; }; - ACF6ED4E1B17847A00DA7C62 /* ASStackLayoutSpecUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED461B17847A00DA7C62 /* ASStackLayoutSpecUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; }; - ACF6ED4F1B17847A00DA7C62 /* ASStackPositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED471B17847A00DA7C62 /* ASStackPositionedLayout.h */; settings = {ATTRIBUTES = (Private, ); }; }; + ACF6ED4D1B17847A00DA7C62 /* ASLayoutSpecUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED451B17847A00DA7C62 /* ASLayoutSpecUtilities.h */; }; + ACF6ED4E1B17847A00DA7C62 /* ASStackLayoutSpecUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED461B17847A00DA7C62 /* ASStackLayoutSpecUtilities.h */; }; + ACF6ED4F1B17847A00DA7C62 /* ASStackPositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED471B17847A00DA7C62 /* ASStackPositionedLayout.h */; }; ACF6ED501B17847A00DA7C62 /* ASStackPositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED481B17847A00DA7C62 /* ASStackPositionedLayout.mm */; }; - ACF6ED511B17847A00DA7C62 /* ASStackUnpositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED491B17847A00DA7C62 /* ASStackUnpositionedLayout.h */; settings = {ATTRIBUTES = (Public, ); }; }; + ACF6ED511B17847A00DA7C62 /* ASStackUnpositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED491B17847A00DA7C62 /* ASStackUnpositionedLayout.h */; }; ACF6ED521B17847A00DA7C62 /* ASStackUnpositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED4A1B17847A00DA7C62 /* ASStackUnpositionedLayout.mm */; }; ACF6ED5C1B178DC700DA7C62 /* ASCenterLayoutSpecSnapshotTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED531B178DC700DA7C62 /* ASCenterLayoutSpecSnapshotTests.mm */; }; ACF6ED5D1B178DC700DA7C62 /* ASDimensionTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED541B178DC700DA7C62 /* ASDimensionTests.mm */; }; @@ -332,7 +307,7 @@ B350621F1B010EFD0018CF92 /* ASImageProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 05F20AA31A15733C00DCA68A /* ASImageProtocols.h */; settings = {ATTRIBUTES = (Public, ); }; }; B35062201B010EFD0018CF92 /* ASLayoutController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4640521D1A3F83C40061C0BA /* ASLayoutController.h */; settings = {ATTRIBUTES = (Public, ); }; }; B35062211B010EFD0018CF92 /* ASLayoutRangeType.h in Headers */ = {isa = PBXBuildFile; fileRef = 292C59991A956527007E5DD6 /* ASLayoutRangeType.h */; settings = {ATTRIBUTES = (Public, ); }; }; - B35062221B010EFD0018CF92 /* ASMultidimensionalArrayUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 4640521E1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h */; }; + B35062221B010EFD0018CF92 /* ASMultidimensionalArrayUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 4640521E1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; B35062231B010EFD0018CF92 /* ASMultidimensionalArrayUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4640521F1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm */; }; B35062241B010EFD0018CF92 /* ASMutableAttributedStringBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09E8195D050800B7D73C /* ASMutableAttributedStringBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; }; B35062251B010EFD0018CF92 /* ASMutableAttributedStringBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 058D09E9195D050800B7D73C /* ASMutableAttributedStringBuilder.m */; }; @@ -367,29 +342,29 @@ B35062421B010EFD0018CF92 /* _ASAsyncTransactionGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 058D09FE195D050800B7D73C /* _ASAsyncTransactionGroup.m */; }; B35062431B010EFD0018CF92 /* UIView+ASConvenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09FF195D050800B7D73C /* UIView+ASConvenience.h */; settings = {ATTRIBUTES = (Public, ); }; }; B35062441B010EFD0018CF92 /* UIView+ASConvenience.m in Sources */ = {isa = PBXBuildFile; fileRef = 058D0A00195D050800B7D73C /* UIView+ASConvenience.m */; }; - B35062451B010EFD0018CF92 /* ASBatchFetching.h in Headers */ = {isa = PBXBuildFile; fileRef = 296A0A2C1A9516B2005ACEAA /* ASBatchFetching.h */; settings = {ATTRIBUTES = (Private, ); }; }; - B35062461B010EFD0018CF92 /* ASBasicImageDownloaderInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2967F9E11AB0A4CF0072E4AB /* ASBasicImageDownloaderInternal.h */; settings = {ATTRIBUTES = (Private, ); }; }; + B35062451B010EFD0018CF92 /* ASBatchFetching.h in Headers */ = {isa = PBXBuildFile; fileRef = 296A0A2C1A9516B2005ACEAA /* ASBatchFetching.h */; settings = {ATTRIBUTES = (Public, ); }; }; + B35062461B010EFD0018CF92 /* ASBasicImageDownloaderInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2967F9E11AB0A4CF0072E4AB /* ASBasicImageDownloaderInternal.h */; }; B35062471B010EFD0018CF92 /* ASBatchFetching.m in Sources */ = {isa = PBXBuildFile; fileRef = 296A0A2D1A9516B2005ACEAA /* ASBatchFetching.m */; }; - B35062481B010EFD0018CF92 /* _AS-objc-internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A02195D050800B7D73C /* _AS-objc-internal.h */; settings = {ATTRIBUTES = (Private, ); }; }; - B35062491B010EFD0018CF92 /* _ASCoreAnimationExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A03195D050800B7D73C /* _ASCoreAnimationExtras.h */; settings = {ATTRIBUTES = (Private, ); }; }; + B35062481B010EFD0018CF92 /* _AS-objc-internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A02195D050800B7D73C /* _AS-objc-internal.h */; }; + B35062491B010EFD0018CF92 /* _ASCoreAnimationExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A03195D050800B7D73C /* _ASCoreAnimationExtras.h */; }; B350624A1B010EFD0018CF92 /* _ASCoreAnimationExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 058D0A04195D050800B7D73C /* _ASCoreAnimationExtras.mm */; }; - B350624B1B010EFD0018CF92 /* _ASPendingState.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A05195D050800B7D73C /* _ASPendingState.h */; settings = {ATTRIBUTES = (Private, ); }; }; + B350624B1B010EFD0018CF92 /* _ASPendingState.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A05195D050800B7D73C /* _ASPendingState.h */; }; B350624C1B010EFD0018CF92 /* _ASPendingState.m in Sources */ = {isa = PBXBuildFile; fileRef = 058D0A06195D050800B7D73C /* _ASPendingState.m */; }; - B350624D1B010EFD0018CF92 /* _ASScopeTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A07195D050800B7D73C /* _ASScopeTimer.h */; settings = {ATTRIBUTES = (Private, ); }; }; + B350624D1B010EFD0018CF92 /* _ASScopeTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A07195D050800B7D73C /* _ASScopeTimer.h */; }; B350624E1B010EFD0018CF92 /* ASDisplayNode+AsyncDisplay.mm in Sources */ = {isa = PBXBuildFile; fileRef = 058D0A08195D050800B7D73C /* ASDisplayNode+AsyncDisplay.mm */; }; - B350624F1B010EFD0018CF92 /* ASDisplayNode+DebugTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A09195D050800B7D73C /* ASDisplayNode+DebugTiming.h */; settings = {ATTRIBUTES = (Private, ); }; }; + B350624F1B010EFD0018CF92 /* ASDisplayNode+DebugTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A09195D050800B7D73C /* ASDisplayNode+DebugTiming.h */; }; B35062501B010EFD0018CF92 /* ASDisplayNode+DebugTiming.mm in Sources */ = {isa = PBXBuildFile; fileRef = 058D0A0A195D050800B7D73C /* ASDisplayNode+DebugTiming.mm */; }; B35062511B010EFD0018CF92 /* ASDisplayNode+UIViewBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 058D0A0B195D050800B7D73C /* ASDisplayNode+UIViewBridge.mm */; }; - B35062521B010EFD0018CF92 /* ASDisplayNodeInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A0C195D050800B7D73C /* ASDisplayNodeInternal.h */; settings = {ATTRIBUTES = (Private, ); }; }; - B35062531B010EFD0018CF92 /* ASImageNode+CGExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A0D195D050800B7D73C /* ASImageNode+CGExtras.h */; settings = {ATTRIBUTES = (Private, ); }; }; + B35062521B010EFD0018CF92 /* ASDisplayNodeInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A0C195D050800B7D73C /* ASDisplayNodeInternal.h */; }; + B35062531B010EFD0018CF92 /* ASImageNode+CGExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A0D195D050800B7D73C /* ASImageNode+CGExtras.h */; }; B35062541B010EFD0018CF92 /* ASImageNode+CGExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 058D0A0E195D050800B7D73C /* ASImageNode+CGExtras.m */; }; - B35062551B010EFD0018CF92 /* ASSentinel.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A10195D050800B7D73C /* ASSentinel.h */; settings = {ATTRIBUTES = (Private, ); }; }; + B35062551B010EFD0018CF92 /* ASSentinel.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A10195D050800B7D73C /* ASSentinel.h */; }; B35062561B010EFD0018CF92 /* ASSentinel.m in Sources */ = {isa = PBXBuildFile; fileRef = 058D0A11195D050800B7D73C /* ASSentinel.m */; }; B35062571B010F070018CF92 /* ASAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A43195D058D00B7D73C /* ASAssert.h */; settings = {ATTRIBUTES = (Public, ); }; }; B35062581B010F070018CF92 /* ASAvailability.h in Headers */ = {isa = PBXBuildFile; fileRef = 0516FA3A1A15563400B4EBED /* ASAvailability.h */; settings = {ATTRIBUTES = (Public, ); }; }; B35062591B010F070018CF92 /* ASBaseDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A44195D058D00B7D73C /* ASBaseDefines.h */; settings = {ATTRIBUTES = (Public, ); }; }; B350625A1B010F070018CF92 /* ASDisplayNodeExtraIvars.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A45195D058D00B7D73C /* ASDisplayNodeExtraIvars.h */; settings = {ATTRIBUTES = (Public, ); }; }; - B350625B1B010F070018CF92 /* ASEqualityHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 1950C4481A3BB5C1005C8279 /* ASEqualityHelpers.h */; }; + B350625B1B010F070018CF92 /* ASEqualityHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 1950C4481A3BB5C1005C8279 /* ASEqualityHelpers.h */; settings = {ATTRIBUTES = (Public, ); }; }; B350625C1B010F070018CF92 /* ASLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 0516FA3B1A15563400B4EBED /* ASLog.h */; settings = {ATTRIBUTES = (Public, ); }; }; B350625D1B0111740018CF92 /* Photos.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 051943141A1575670030A7D0 /* Photos.framework */; }; B350625E1B0111780018CF92 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 051943121A1575630030A7D0 /* AssetsLibrary.framework */; }; @@ -1046,23 +1021,18 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 058D0A71195D05F800B7D73C /* _AS-objc-internal.h in Headers */, 058D0A68195D05EC00B7D73C /* _ASAsyncTransaction.h in Headers */, 058D0A6A195D05EC00B7D73C /* _ASAsyncTransactionContainer+Private.h in Headers */, 058D0A6B195D05EC00B7D73C /* _ASAsyncTransactionContainer.h in Headers */, 058D0A6D195D05EC00B7D73C /* _ASAsyncTransactionGroup.h in Headers */, - 058D0A72195D05F800B7D73C /* _ASCoreAnimationExtras.h in Headers */, 058D0A53195D05DC00B7D73C /* _ASDisplayLayer.h in Headers */, 058D0A55195D05DC00B7D73C /* _ASDisplayView.h in Headers */, - 058D0A74195D05F800B7D73C /* _ASPendingState.h in Headers */, - 058D0A76195D05F900B7D73C /* _ASScopeTimer.h in Headers */, 205F0E191B37339C007741D0 /* ASAbstractLayoutController.h in Headers */, 058D0A82195D060300B7D73C /* ASAssert.h in Headers */, 0516FA3C1A15563400B4EBED /* ASAvailability.h in Headers */, ACF6ED1A1B17843500DA7C62 /* ASBackgroundLayoutSpec.h in Headers */, 058D0A83195D060300B7D73C /* ASBaseDefines.h in Headers */, 054963491A1EA066000F8E56 /* ASBasicImageDownloader.h in Headers */, - 2967F9E21AB0A5190072E4AB /* ASBasicImageDownloaderInternal.h in Headers */, 299DA1A91A828D2900162D41 /* ASBatchContext.h in Headers */, 296A0A2E1A9516B2005ACEAA /* ASBatchFetching.h in Headers */, 055F1A3C19ABD43F004DAFF1 /* ASCellNode.h in Headers */, @@ -1076,31 +1046,25 @@ 464052201A3F83C40061C0BA /* ASDataController.h in Headers */, 05A6D05A19D0EB64002DD95E /* ASDealloc2MainObject.h in Headers */, ACF6ED201B17843500DA7C62 /* ASDimension.h in Headers */, - 058D0A78195D05F900B7D73C /* ASDisplayNode+DebugTiming.h in Headers */, 058D0A4C195D05CB00B7D73C /* ASDisplayNode+Subclasses.h in Headers */, 058D0A4A195D05CB00B7D73C /* ASDisplayNode.h in Headers */, 058D0A84195D060300B7D73C /* ASDisplayNodeExtraIvars.h in Headers */, 058D0A4D195D05CB00B7D73C /* ASDisplayNodeExtras.h in Headers */, - 058D0A7B195D05F900B7D73C /* ASDisplayNodeInternal.h in Headers */, 0587F9BD1A7309ED00AFF0BA /* ASEditableTextNode.h in Headers */, 1950C4491A3BB5C1005C8279 /* ASEqualityHelpers.h in Headers */, 464052221A3F83C40061C0BA /* ASFlowLayoutController.h in Headers */, 058D0A57195D05DC00B7D73C /* ASHighlightOverlayLayer.h in Headers */, - 058D0A7C195D05F900B7D73C /* ASImageNode+CGExtras.h in Headers */, 058D0A4F195D05CB00B7D73C /* ASImageNode.h in Headers */, 05F20AA41A15733C00DCA68A /* ASImageProtocols.h in Headers */, 430E7C8F1B4C23F100697A4C /* ASIndexPath.h in Headers */, ACF6ED221B17843500DA7C62 /* ASInsetLayoutSpec.h in Headers */, - ACF6ED4B1B17847A00DA7C62 /* ASInternalHelpers.h in Headers */, ACF6ED241B17843500DA7C62 /* ASLayout.h in Headers */, ACF6ED2A1B17843500DA7C62 /* ASLayoutable.h in Headers */, 9CDC18CC1B910E12004965E2 /* ASLayoutablePrivate.h in Headers */, 464052241A3F83C40061C0BA /* ASLayoutController.h in Headers */, 9C5FA3511B8F6ADF00A62714 /* ASLayoutOptions.h in Headers */, - 9C65A72A1BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h in Headers */, 292C599F1A956527007E5DD6 /* ASLayoutRangeType.h in Headers */, ACF6ED261B17843500DA7C62 /* ASLayoutSpec.h in Headers */, - ACF6ED4D1B17847A00DA7C62 /* ASLayoutSpecUtilities.h in Headers */, 0516FA3D1A15563400B4EBED /* ASLog.h in Headers */, 464052251A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h in Headers */, 0516FA401A1563D200B4EBED /* ASMultiplexImageNode.h in Headers */, @@ -1115,14 +1079,9 @@ AC47D9451B3BB41900AAEE9D /* ASRelativeSize.h in Headers */, 291B63FB1AA53A7A000A71B3 /* ASScrollDirection.h in Headers */, D785F6621A74327E00291744 /* ASScrollNode.h in Headers */, - 058D0A7F195D05F900B7D73C /* ASSentinel.h in Headers */, - 9C8221951BA237B80037F19A /* ASStackBaselinePositionedLayout.h in Headers */, 9C49C36F1B853957000B0DD5 /* ASStackLayoutable.h in Headers */, AC21EC101B3D0BF600C8B19A /* ASStackLayoutDefines.h in Headers */, ACF6ED2F1B17843500DA7C62 /* ASStackLayoutSpec.h in Headers */, - ACF6ED4E1B17847A00DA7C62 /* ASStackLayoutSpecUtilities.h in Headers */, - ACF6ED4F1B17847A00DA7C62 /* ASStackPositionedLayout.h in Headers */, - ACF6ED511B17847A00DA7C62 /* ASStackUnpositionedLayout.h in Headers */, 9C6BB3B21B8CC9C200F13F52 /* ASStaticLayoutable.h in Headers */, ACF6ED311B17843500DA7C62 /* ASStaticLayoutSpec.h in Headers */, 055F1A3419ABD3E3004DAFF1 /* ASTableView.h in Headers */, @@ -1140,6 +1099,22 @@ 058D0A66195D05DC00B7D73C /* NSMutableAttributedString+TextKitAdditions.h in Headers */, 205F0E0F1B371875007741D0 /* UICollectionViewLayout+ASConvenience.h in Headers */, 058D0A6F195D05EC00B7D73C /* UIView+ASConvenience.h in Headers */, + ACF6ED4F1B17847A00DA7C62 /* ASStackPositionedLayout.h in Headers */, + ACF6ED511B17847A00DA7C62 /* ASStackUnpositionedLayout.h in Headers */, + ACF6ED4E1B17847A00DA7C62 /* ASStackLayoutSpecUtilities.h in Headers */, + 9C8221951BA237B80037F19A /* ASStackBaselinePositionedLayout.h in Headers */, + 058D0A7F195D05F900B7D73C /* ASSentinel.h in Headers */, + ACF6ED4D1B17847A00DA7C62 /* ASLayoutSpecUtilities.h in Headers */, + 9C65A72A1BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h in Headers */, + ACF6ED4B1B17847A00DA7C62 /* ASInternalHelpers.h in Headers */, + 058D0A7C195D05F900B7D73C /* ASImageNode+CGExtras.h in Headers */, + 058D0A7B195D05F900B7D73C /* ASDisplayNodeInternal.h in Headers */, + 058D0A78195D05F900B7D73C /* ASDisplayNode+DebugTiming.h in Headers */, + 2967F9E21AB0A5190072E4AB /* ASBasicImageDownloaderInternal.h in Headers */, + 058D0A76195D05F900B7D73C /* _ASScopeTimer.h in Headers */, + 058D0A74195D05F800B7D73C /* _ASPendingState.h in Headers */, + 058D0A72195D05F800B7D73C /* _ASCoreAnimationExtras.h in Headers */, + 058D0A71195D05F800B7D73C /* _AS-objc-internal.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1221,6 +1196,7 @@ 9C49C3701B853961000B0DD5 /* ASStackLayoutable.h in Headers */, 34EFC7701B701CFA00AD841F /* ASStackLayoutDefines.h in Headers */, 34EFC7711B701CFF00AD841F /* ASStackLayoutSpec.h in Headers */, + 044284FE1BAA387800D16268 /* ASStackLayoutSpecUtilities.h in Headers */, 34EFC7751B701D2400AD841F /* ASStackPositionedLayout.h in Headers */, 34EFC7771B701D2D00AD841F /* ASStackUnpositionedLayout.h in Headers */, 9C6BB3B31B8CC9C200F13F52 /* ASStaticLayoutable.h in Headers */, From 2c7ac3bf0c89e3a7abe7228df06a68cb8520949e Mon Sep 17 00:00:00 2001 From: Jack Flintermann Date: Wed, 16 Sep 2015 20:09:03 -0400 Subject: [PATCH 07/17] add UICollectionView+ASConvenience.h --- AsyncDisplayKit.xcodeproj/project.pbxproj | 34 ++++++++++++----------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj index 06b8b3d07d..2d9e6488b3 100644 --- a/AsyncDisplayKit.xcodeproj/project.pbxproj +++ b/AsyncDisplayKit.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 044284FD1BAA365100D16268 /* UICollectionViewLayout+ASConvenience.m in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E0E1B371875007741D0 /* UICollectionViewLayout+ASConvenience.m */; }; 044284FE1BAA387800D16268 /* ASStackLayoutSpecUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED461B17847A00DA7C62 /* ASStackLayoutSpecUtilities.h */; }; + 044284FF1BAA3BD600D16268 /* UICollectionViewLayout+ASConvenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 205F0E0D1B371875007741D0 /* UICollectionViewLayout+ASConvenience.h */; settings = {ATTRIBUTES = (Public, ); }; }; 0515EA211A15769900BA8B9A /* Photos.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 051943141A1575670030A7D0 /* Photos.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 0515EA221A1576A100BA8B9A /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 051943121A1575630030A7D0 /* AssetsLibrary.framework */; }; 0516FA3C1A15563400B4EBED /* ASAvailability.h in Headers */ = {isa = PBXBuildFile; fileRef = 0516FA3A1A15563400B4EBED /* ASAvailability.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -1021,18 +1022,23 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 058D0A71195D05F800B7D73C /* _AS-objc-internal.h in Headers */, 058D0A68195D05EC00B7D73C /* _ASAsyncTransaction.h in Headers */, 058D0A6A195D05EC00B7D73C /* _ASAsyncTransactionContainer+Private.h in Headers */, 058D0A6B195D05EC00B7D73C /* _ASAsyncTransactionContainer.h in Headers */, 058D0A6D195D05EC00B7D73C /* _ASAsyncTransactionGroup.h in Headers */, + 058D0A72195D05F800B7D73C /* _ASCoreAnimationExtras.h in Headers */, 058D0A53195D05DC00B7D73C /* _ASDisplayLayer.h in Headers */, 058D0A55195D05DC00B7D73C /* _ASDisplayView.h in Headers */, + 058D0A74195D05F800B7D73C /* _ASPendingState.h in Headers */, + 058D0A76195D05F900B7D73C /* _ASScopeTimer.h in Headers */, 205F0E191B37339C007741D0 /* ASAbstractLayoutController.h in Headers */, 058D0A82195D060300B7D73C /* ASAssert.h in Headers */, 0516FA3C1A15563400B4EBED /* ASAvailability.h in Headers */, ACF6ED1A1B17843500DA7C62 /* ASBackgroundLayoutSpec.h in Headers */, 058D0A83195D060300B7D73C /* ASBaseDefines.h in Headers */, 054963491A1EA066000F8E56 /* ASBasicImageDownloader.h in Headers */, + 2967F9E21AB0A5190072E4AB /* ASBasicImageDownloaderInternal.h in Headers */, 299DA1A91A828D2900162D41 /* ASBatchContext.h in Headers */, 296A0A2E1A9516B2005ACEAA /* ASBatchFetching.h in Headers */, 055F1A3C19ABD43F004DAFF1 /* ASCellNode.h in Headers */, @@ -1046,25 +1052,31 @@ 464052201A3F83C40061C0BA /* ASDataController.h in Headers */, 05A6D05A19D0EB64002DD95E /* ASDealloc2MainObject.h in Headers */, ACF6ED201B17843500DA7C62 /* ASDimension.h in Headers */, + 058D0A78195D05F900B7D73C /* ASDisplayNode+DebugTiming.h in Headers */, 058D0A4C195D05CB00B7D73C /* ASDisplayNode+Subclasses.h in Headers */, 058D0A4A195D05CB00B7D73C /* ASDisplayNode.h in Headers */, 058D0A84195D060300B7D73C /* ASDisplayNodeExtraIvars.h in Headers */, 058D0A4D195D05CB00B7D73C /* ASDisplayNodeExtras.h in Headers */, + 058D0A7B195D05F900B7D73C /* ASDisplayNodeInternal.h in Headers */, 0587F9BD1A7309ED00AFF0BA /* ASEditableTextNode.h in Headers */, 1950C4491A3BB5C1005C8279 /* ASEqualityHelpers.h in Headers */, 464052221A3F83C40061C0BA /* ASFlowLayoutController.h in Headers */, 058D0A57195D05DC00B7D73C /* ASHighlightOverlayLayer.h in Headers */, + 058D0A7C195D05F900B7D73C /* ASImageNode+CGExtras.h in Headers */, 058D0A4F195D05CB00B7D73C /* ASImageNode.h in Headers */, 05F20AA41A15733C00DCA68A /* ASImageProtocols.h in Headers */, 430E7C8F1B4C23F100697A4C /* ASIndexPath.h in Headers */, ACF6ED221B17843500DA7C62 /* ASInsetLayoutSpec.h in Headers */, + ACF6ED4B1B17847A00DA7C62 /* ASInternalHelpers.h in Headers */, ACF6ED241B17843500DA7C62 /* ASLayout.h in Headers */, ACF6ED2A1B17843500DA7C62 /* ASLayoutable.h in Headers */, 9CDC18CC1B910E12004965E2 /* ASLayoutablePrivate.h in Headers */, 464052241A3F83C40061C0BA /* ASLayoutController.h in Headers */, 9C5FA3511B8F6ADF00A62714 /* ASLayoutOptions.h in Headers */, + 9C65A72A1BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h in Headers */, 292C599F1A956527007E5DD6 /* ASLayoutRangeType.h in Headers */, ACF6ED261B17843500DA7C62 /* ASLayoutSpec.h in Headers */, + ACF6ED4D1B17847A00DA7C62 /* ASLayoutSpecUtilities.h in Headers */, 0516FA3D1A15563400B4EBED /* ASLog.h in Headers */, 464052251A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h in Headers */, 0516FA401A1563D200B4EBED /* ASMultiplexImageNode.h in Headers */, @@ -1079,9 +1091,14 @@ AC47D9451B3BB41900AAEE9D /* ASRelativeSize.h in Headers */, 291B63FB1AA53A7A000A71B3 /* ASScrollDirection.h in Headers */, D785F6621A74327E00291744 /* ASScrollNode.h in Headers */, + 058D0A7F195D05F900B7D73C /* ASSentinel.h in Headers */, + 9C8221951BA237B80037F19A /* ASStackBaselinePositionedLayout.h in Headers */, 9C49C36F1B853957000B0DD5 /* ASStackLayoutable.h in Headers */, AC21EC101B3D0BF600C8B19A /* ASStackLayoutDefines.h in Headers */, ACF6ED2F1B17843500DA7C62 /* ASStackLayoutSpec.h in Headers */, + ACF6ED4E1B17847A00DA7C62 /* ASStackLayoutSpecUtilities.h in Headers */, + ACF6ED4F1B17847A00DA7C62 /* ASStackPositionedLayout.h in Headers */, + ACF6ED511B17847A00DA7C62 /* ASStackUnpositionedLayout.h in Headers */, 9C6BB3B21B8CC9C200F13F52 /* ASStaticLayoutable.h in Headers */, ACF6ED311B17843500DA7C62 /* ASStaticLayoutSpec.h in Headers */, 055F1A3419ABD3E3004DAFF1 /* ASTableView.h in Headers */, @@ -1099,22 +1116,6 @@ 058D0A66195D05DC00B7D73C /* NSMutableAttributedString+TextKitAdditions.h in Headers */, 205F0E0F1B371875007741D0 /* UICollectionViewLayout+ASConvenience.h in Headers */, 058D0A6F195D05EC00B7D73C /* UIView+ASConvenience.h in Headers */, - ACF6ED4F1B17847A00DA7C62 /* ASStackPositionedLayout.h in Headers */, - ACF6ED511B17847A00DA7C62 /* ASStackUnpositionedLayout.h in Headers */, - ACF6ED4E1B17847A00DA7C62 /* ASStackLayoutSpecUtilities.h in Headers */, - 9C8221951BA237B80037F19A /* ASStackBaselinePositionedLayout.h in Headers */, - 058D0A7F195D05F900B7D73C /* ASSentinel.h in Headers */, - ACF6ED4D1B17847A00DA7C62 /* ASLayoutSpecUtilities.h in Headers */, - 9C65A72A1BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h in Headers */, - ACF6ED4B1B17847A00DA7C62 /* ASInternalHelpers.h in Headers */, - 058D0A7C195D05F900B7D73C /* ASImageNode+CGExtras.h in Headers */, - 058D0A7B195D05F900B7D73C /* ASDisplayNodeInternal.h in Headers */, - 058D0A78195D05F900B7D73C /* ASDisplayNode+DebugTiming.h in Headers */, - 2967F9E21AB0A5190072E4AB /* ASBasicImageDownloaderInternal.h in Headers */, - 058D0A76195D05F900B7D73C /* _ASScopeTimer.h in Headers */, - 058D0A74195D05F800B7D73C /* _ASPendingState.h in Headers */, - 058D0A72195D05F800B7D73C /* _ASCoreAnimationExtras.h in Headers */, - 058D0A71195D05F800B7D73C /* _AS-objc-internal.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1214,6 +1215,7 @@ 2C107F5B1BA9F54500F13DE5 /* AsyncDisplayKit.h in Headers */, 509E68651B3AEDC5009B9150 /* CGRect+ASConvenience.h in Headers */, B350623A1B010EFD0018CF92 /* NSMutableAttributedString+TextKitAdditions.h in Headers */, + 044284FF1BAA3BD600D16268 /* UICollectionViewLayout+ASConvenience.h in Headers */, B35062431B010EFD0018CF92 /* UIView+ASConvenience.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; From ff1be72e04fc777d0444f15579dd684799dafbc7 Mon Sep 17 00:00:00 2001 From: Jack Flintermann Date: Wed, 16 Sep 2015 20:15:48 -0400 Subject: [PATCH 08/17] add module.modulemap --- AsyncDisplayKit.xcodeproj/project.pbxproj | 4 ++++ AsyncDisplayKit/module.modulemap | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 AsyncDisplayKit/module.modulemap diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj index 2d9e6488b3..c184860bbd 100644 --- a/AsyncDisplayKit.xcodeproj/project.pbxproj +++ b/AsyncDisplayKit.xcodeproj/project.pbxproj @@ -405,6 +405,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 044285011BAA3CC700D16268 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; 0516FA3A1A15563400B4EBED /* ASAvailability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASAvailability.h; sourceTree = ""; }; 0516FA3B1A15563400B4EBED /* ASLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASLog.h; sourceTree = ""; }; 0516FA3E1A1563D200B4EBED /* ASMultiplexImageNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASMultiplexImageNode.h; sourceTree = ""; }; @@ -770,6 +771,7 @@ children = ( 058D0A42195D058D00B7D73C /* Base */, 058D09B3195D04C000B7D73C /* AsyncDisplayKit-Prefix.pch */, + 044285011BAA3CC700D16268 /* module.modulemap */, ); name = "Supporting Files"; sourceTree = ""; @@ -1827,6 +1829,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = AsyncDisplayKit/module.modulemap; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_NAME = AsyncDisplayKit; SKIP_INSTALL = YES; @@ -1854,6 +1857,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = AsyncDisplayKit/module.modulemap; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = AsyncDisplayKit; SKIP_INSTALL = YES; diff --git a/AsyncDisplayKit/module.modulemap b/AsyncDisplayKit/module.modulemap new file mode 100644 index 0000000000..fd7d49e620 --- /dev/null +++ b/AsyncDisplayKit/module.modulemap @@ -0,0 +1,19 @@ +framework module AsyncDisplayKit { + umbrella header "AsyncDisplayKit.h" + + export * + module * { + export * + } + + explicit module ASControlNode_Subclasses { + header "ASControlNode+Subclasses.h" + export * + } + + explicit module ASDisplayNode_Subclasses { + header "ASDisplayNode+Subclasses.h" + export * + } + +} From ce33149548062ef81d9354a06bd2f3e4055ea9dc Mon Sep 17 00:00:00 2001 From: Jack Flintermann Date: Wed, 16 Sep 2015 23:31:48 -0400 Subject: [PATCH 09/17] make additional private headers actually private; import all public headers in AsyncDisplayKit.h --- AsyncDisplayKit.xcodeproj/project.pbxproj | 48 +++++++++---------- AsyncDisplayKit/AsyncDisplayKit.h | 4 +- .../{Details => Private}/ASBatchFetching.h | 0 .../{Details => Private}/ASBatchFetching.m | 0 .../ASMultidimensionalArrayUtils.h | 0 .../ASMultidimensionalArrayUtils.mm | 0 6 files changed, 27 insertions(+), 25 deletions(-) rename AsyncDisplayKit/{Details => Private}/ASBatchFetching.h (100%) rename AsyncDisplayKit/{Details => Private}/ASBatchFetching.m (100%) rename AsyncDisplayKit/{Details => Private}/ASMultidimensionalArrayUtils.h (100%) rename AsyncDisplayKit/{Details => Private}/ASMultidimensionalArrayUtils.mm (100%) diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj index c184860bbd..4c74a681a0 100644 --- a/AsyncDisplayKit.xcodeproj/project.pbxproj +++ b/AsyncDisplayKit.xcodeproj/project.pbxproj @@ -10,6 +10,14 @@ 044284FD1BAA365100D16268 /* UICollectionViewLayout+ASConvenience.m in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E0E1B371875007741D0 /* UICollectionViewLayout+ASConvenience.m */; }; 044284FE1BAA387800D16268 /* ASStackLayoutSpecUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED461B17847A00DA7C62 /* ASStackLayoutSpecUtilities.h */; }; 044284FF1BAA3BD600D16268 /* UICollectionViewLayout+ASConvenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 205F0E0D1B371875007741D0 /* UICollectionViewLayout+ASConvenience.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 044285071BAA63FE00D16268 /* ASBatchFetching.h in Headers */ = {isa = PBXBuildFile; fileRef = 044285051BAA63FE00D16268 /* ASBatchFetching.h */; settings = {ASSET_TAGS = (); }; }; + 044285081BAA63FE00D16268 /* ASBatchFetching.h in Headers */ = {isa = PBXBuildFile; fileRef = 044285051BAA63FE00D16268 /* ASBatchFetching.h */; settings = {ASSET_TAGS = (); }; }; + 044285091BAA63FE00D16268 /* ASBatchFetching.m in Sources */ = {isa = PBXBuildFile; fileRef = 044285061BAA63FE00D16268 /* ASBatchFetching.m */; settings = {ASSET_TAGS = (); }; }; + 0442850A1BAA63FE00D16268 /* ASBatchFetching.m in Sources */ = {isa = PBXBuildFile; fileRef = 044285061BAA63FE00D16268 /* ASBatchFetching.m */; settings = {ASSET_TAGS = (); }; }; + 0442850D1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 0442850B1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.h */; settings = {ASSET_TAGS = (); }; }; + 0442850E1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 0442850B1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.h */; settings = {ASSET_TAGS = (); }; }; + 0442850F1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0442850C1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.mm */; settings = {ASSET_TAGS = (); }; }; + 044285101BAA64EC00D16268 /* ASMultidimensionalArrayUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0442850C1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.mm */; settings = {ASSET_TAGS = (); }; }; 0515EA211A15769900BA8B9A /* Photos.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 051943141A1575670030A7D0 /* Photos.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 0515EA221A1576A100BA8B9A /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 051943121A1575630030A7D0 /* AssetsLibrary.framework */; }; 0516FA3C1A15563400B4EBED /* ASAvailability.h in Headers */ = {isa = PBXBuildFile; fileRef = 0516FA3A1A15563400B4EBED /* ASAvailability.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -141,8 +149,6 @@ 292C59A31A956527007E5DD6 /* ASRangeHandlerRender.h in Headers */ = {isa = PBXBuildFile; fileRef = 292C599D1A956527007E5DD6 /* ASRangeHandlerRender.h */; settings = {ATTRIBUTES = (Public, ); }; }; 292C59A41A956527007E5DD6 /* ASRangeHandlerRender.mm in Sources */ = {isa = PBXBuildFile; fileRef = 292C599E1A956527007E5DD6 /* ASRangeHandlerRender.mm */; }; 2967F9E21AB0A5190072E4AB /* ASBasicImageDownloaderInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2967F9E11AB0A4CF0072E4AB /* ASBasicImageDownloaderInternal.h */; }; - 296A0A2E1A9516B2005ACEAA /* ASBatchFetching.h in Headers */ = {isa = PBXBuildFile; fileRef = 296A0A2C1A9516B2005ACEAA /* ASBatchFetching.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 296A0A2F1A9516B2005ACEAA /* ASBatchFetching.m in Sources */ = {isa = PBXBuildFile; fileRef = 296A0A2D1A9516B2005ACEAA /* ASBatchFetching.m */; }; 296A0A351A951ABF005ACEAA /* ASBatchFetchingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 296A0A341A951ABF005ACEAA /* ASBatchFetchingTests.m */; }; 299DA1A91A828D2900162D41 /* ASBatchContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 299DA1A71A828D2900162D41 /* ASBatchContext.h */; settings = {ATTRIBUTES = (Public, ); }; }; 299DA1AA1A828D2900162D41 /* ASBatchContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 299DA1A81A828D2900162D41 /* ASBatchContext.mm */; }; @@ -189,8 +195,6 @@ 464052221A3F83C40061C0BA /* ASFlowLayoutController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4640521B1A3F83C40061C0BA /* ASFlowLayoutController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 464052231A3F83C40061C0BA /* ASFlowLayoutController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4640521C1A3F83C40061C0BA /* ASFlowLayoutController.mm */; }; 464052241A3F83C40061C0BA /* ASLayoutController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4640521D1A3F83C40061C0BA /* ASLayoutController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 464052251A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 4640521E1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 464052261A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4640521F1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm */; }; 509E68601B3AED8E009B9150 /* ASScrollDirection.m in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E111B371BD7007741D0 /* ASScrollDirection.m */; }; 509E68611B3AEDA0009B9150 /* ASAbstractLayoutController.h in Headers */ = {isa = PBXBuildFile; fileRef = 205F0E171B37339C007741D0 /* ASAbstractLayoutController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 509E68621B3AEDA5009B9150 /* ASAbstractLayoutController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E181B37339C007741D0 /* ASAbstractLayoutController.mm */; }; @@ -308,8 +312,6 @@ B350621F1B010EFD0018CF92 /* ASImageProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 05F20AA31A15733C00DCA68A /* ASImageProtocols.h */; settings = {ATTRIBUTES = (Public, ); }; }; B35062201B010EFD0018CF92 /* ASLayoutController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4640521D1A3F83C40061C0BA /* ASLayoutController.h */; settings = {ATTRIBUTES = (Public, ); }; }; B35062211B010EFD0018CF92 /* ASLayoutRangeType.h in Headers */ = {isa = PBXBuildFile; fileRef = 292C59991A956527007E5DD6 /* ASLayoutRangeType.h */; settings = {ATTRIBUTES = (Public, ); }; }; - B35062221B010EFD0018CF92 /* ASMultidimensionalArrayUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 4640521E1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; - B35062231B010EFD0018CF92 /* ASMultidimensionalArrayUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4640521F1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm */; }; B35062241B010EFD0018CF92 /* ASMutableAttributedStringBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09E8195D050800B7D73C /* ASMutableAttributedStringBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; }; B35062251B010EFD0018CF92 /* ASMutableAttributedStringBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 058D09E9195D050800B7D73C /* ASMutableAttributedStringBuilder.m */; }; B35062261B010EFD0018CF92 /* ASRangeController.h in Headers */ = {isa = PBXBuildFile; fileRef = 055F1A3619ABD413004DAFF1 /* ASRangeController.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -343,9 +345,7 @@ B35062421B010EFD0018CF92 /* _ASAsyncTransactionGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 058D09FE195D050800B7D73C /* _ASAsyncTransactionGroup.m */; }; B35062431B010EFD0018CF92 /* UIView+ASConvenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D09FF195D050800B7D73C /* UIView+ASConvenience.h */; settings = {ATTRIBUTES = (Public, ); }; }; B35062441B010EFD0018CF92 /* UIView+ASConvenience.m in Sources */ = {isa = PBXBuildFile; fileRef = 058D0A00195D050800B7D73C /* UIView+ASConvenience.m */; }; - B35062451B010EFD0018CF92 /* ASBatchFetching.h in Headers */ = {isa = PBXBuildFile; fileRef = 296A0A2C1A9516B2005ACEAA /* ASBatchFetching.h */; settings = {ATTRIBUTES = (Public, ); }; }; B35062461B010EFD0018CF92 /* ASBasicImageDownloaderInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2967F9E11AB0A4CF0072E4AB /* ASBasicImageDownloaderInternal.h */; }; - B35062471B010EFD0018CF92 /* ASBatchFetching.m in Sources */ = {isa = PBXBuildFile; fileRef = 296A0A2D1A9516B2005ACEAA /* ASBatchFetching.m */; }; B35062481B010EFD0018CF92 /* _AS-objc-internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A02195D050800B7D73C /* _AS-objc-internal.h */; }; B35062491B010EFD0018CF92 /* _ASCoreAnimationExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 058D0A03195D050800B7D73C /* _ASCoreAnimationExtras.h */; }; B350624A1B010EFD0018CF92 /* _ASCoreAnimationExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 058D0A04195D050800B7D73C /* _ASCoreAnimationExtras.mm */; }; @@ -406,6 +406,10 @@ /* Begin PBXFileReference section */ 044285011BAA3CC700D16268 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; + 044285051BAA63FE00D16268 /* ASBatchFetching.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASBatchFetching.h; sourceTree = ""; }; + 044285061BAA63FE00D16268 /* ASBatchFetching.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASBatchFetching.m; sourceTree = ""; }; + 0442850B1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASMultidimensionalArrayUtils.h; sourceTree = ""; }; + 0442850C1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASMultidimensionalArrayUtils.mm; sourceTree = ""; }; 0516FA3A1A15563400B4EBED /* ASAvailability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASAvailability.h; sourceTree = ""; }; 0516FA3B1A15563400B4EBED /* ASLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASLog.h; sourceTree = ""; }; 0516FA3E1A1563D200B4EBED /* ASMultiplexImageNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASMultiplexImageNode.h; sourceTree = ""; }; @@ -539,8 +543,6 @@ 292C599D1A956527007E5DD6 /* ASRangeHandlerRender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASRangeHandlerRender.h; sourceTree = ""; }; 292C599E1A956527007E5DD6 /* ASRangeHandlerRender.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASRangeHandlerRender.mm; sourceTree = ""; }; 2967F9E11AB0A4CF0072E4AB /* ASBasicImageDownloaderInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASBasicImageDownloaderInternal.h; sourceTree = ""; }; - 296A0A2C1A9516B2005ACEAA /* ASBatchFetching.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASBatchFetching.h; path = ../Details/ASBatchFetching.h; sourceTree = ""; }; - 296A0A2D1A9516B2005ACEAA /* ASBatchFetching.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ASBatchFetching.m; path = ../Details/ASBatchFetching.m; sourceTree = ""; }; 296A0A311A951715005ACEAA /* ASScrollDirection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASScrollDirection.h; path = AsyncDisplayKit/Details/ASScrollDirection.h; sourceTree = SOURCE_ROOT; }; 296A0A341A951ABF005ACEAA /* ASBatchFetchingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASBatchFetchingTests.m; sourceTree = ""; }; 299DA1A71A828D2900162D41 /* ASBatchContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASBatchContext.h; sourceTree = ""; }; @@ -554,8 +556,6 @@ 4640521B1A3F83C40061C0BA /* ASFlowLayoutController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASFlowLayoutController.h; sourceTree = ""; }; 4640521C1A3F83C40061C0BA /* ASFlowLayoutController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASFlowLayoutController.mm; sourceTree = ""; }; 4640521D1A3F83C40061C0BA /* ASLayoutController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASLayoutController.h; sourceTree = ""; }; - 4640521E1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASMultidimensionalArrayUtils.h; sourceTree = ""; }; - 4640521F1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASMultidimensionalArrayUtils.mm; sourceTree = ""; }; 6BDC61F51978FEA400E50D21 /* AsyncDisplayKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AsyncDisplayKit.h; sourceTree = ""; }; 9C49C36E1B853957000B0DD5 /* ASStackLayoutable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASStackLayoutable.h; path = AsyncDisplayKit/Layout/ASStackLayoutable.h; sourceTree = ""; }; 9C5FA34F1B8F6ADF00A62714 /* ASLayoutOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASLayoutOptions.h; path = AsyncDisplayKit/Layout/ASLayoutOptions.h; sourceTree = ""; }; @@ -852,8 +852,6 @@ 05F20AA31A15733C00DCA68A /* ASImageProtocols.h */, 4640521D1A3F83C40061C0BA /* ASLayoutController.h */, 292C59991A956527007E5DD6 /* ASLayoutRangeType.h */, - 4640521E1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h */, - 4640521F1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm */, 058D09E8195D050800B7D73C /* ASMutableAttributedStringBuilder.h */, 058D09E9195D050800B7D73C /* ASMutableAttributedStringBuilder.m */, 055F1A3619ABD413004DAFF1 /* ASRangeController.h */, @@ -910,9 +908,7 @@ 9C65A7291BA8EA4D0084DA91 /* ASLayoutOptionsPrivate.h */, 9C8221931BA237B80037F19A /* ASStackBaselinePositionedLayout.h */, 9C8221941BA237B80037F19A /* ASStackBaselinePositionedLayout.mm */, - 296A0A2C1A9516B2005ACEAA /* ASBatchFetching.h */, 2967F9E11AB0A4CF0072E4AB /* ASBasicImageDownloaderInternal.h */, - 296A0A2D1A9516B2005ACEAA /* ASBatchFetching.m */, 058D0A02195D050800B7D73C /* _AS-objc-internal.h */, 058D0A03195D050800B7D73C /* _ASCoreAnimationExtras.h */, 058D0A04195D050800B7D73C /* _ASCoreAnimationExtras.mm */, @@ -920,6 +916,8 @@ 058D0A06195D050800B7D73C /* _ASPendingState.m */, 058D0A07195D050800B7D73C /* _ASScopeTimer.h */, 058D0A08195D050800B7D73C /* ASDisplayNode+AsyncDisplay.mm */, + 044285051BAA63FE00D16268 /* ASBatchFetching.h */, + 044285061BAA63FE00D16268 /* ASBatchFetching.m */, 058D0A09195D050800B7D73C /* ASDisplayNode+DebugTiming.h */, 058D0A0A195D050800B7D73C /* ASDisplayNode+DebugTiming.mm */, 058D0A0B195D050800B7D73C /* ASDisplayNode+UIViewBridge.mm */, @@ -936,6 +934,8 @@ ACF6ED481B17847A00DA7C62 /* ASStackPositionedLayout.mm */, ACF6ED491B17847A00DA7C62 /* ASStackUnpositionedLayout.h */, ACF6ED4A1B17847A00DA7C62 /* ASStackUnpositionedLayout.mm */, + 0442850B1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.h */, + 0442850C1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.mm */, ); path = Private; sourceTree = ""; @@ -1042,7 +1042,7 @@ 054963491A1EA066000F8E56 /* ASBasicImageDownloader.h in Headers */, 2967F9E21AB0A5190072E4AB /* ASBasicImageDownloaderInternal.h in Headers */, 299DA1A91A828D2900162D41 /* ASBatchContext.h in Headers */, - 296A0A2E1A9516B2005ACEAA /* ASBatchFetching.h in Headers */, + 044285071BAA63FE00D16268 /* ASBatchFetching.h in Headers */, 055F1A3C19ABD43F004DAFF1 /* ASCellNode.h in Headers */, ACF6ED1C1B17843500DA7C62 /* ASCenterLayoutSpec.h in Headers */, 18C2ED7E1B9B7DE800F627B3 /* ASCollectionNode.h in Headers */, @@ -1080,7 +1080,7 @@ ACF6ED261B17843500DA7C62 /* ASLayoutSpec.h in Headers */, ACF6ED4D1B17847A00DA7C62 /* ASLayoutSpecUtilities.h in Headers */, 0516FA3D1A15563400B4EBED /* ASLog.h in Headers */, - 464052251A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h in Headers */, + 0442850D1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.h in Headers */, 0516FA401A1563D200B4EBED /* ASMultiplexImageNode.h in Headers */, 058D0A59195D05DC00B7D73C /* ASMutableAttributedStringBuilder.h in Headers */, 055B9FA81A1C154B00035D6D /* ASNetworkImageNode.h in Headers */, @@ -1143,7 +1143,7 @@ B35062131B010EFD0018CF92 /* ASBasicImageDownloader.h in Headers */, B35062461B010EFD0018CF92 /* ASBasicImageDownloaderInternal.h in Headers */, B35062151B010EFD0018CF92 /* ASBatchContext.h in Headers */, - B35062451B010EFD0018CF92 /* ASBatchFetching.h in Headers */, + 044285081BAA63FE00D16268 /* ASBatchFetching.h in Headers */, B35061F31B010EFD0018CF92 /* ASCellNode.h in Headers */, 34EFC7631B701CBF00AD841F /* ASCenterLayoutSpec.h in Headers */, 18C2ED7F1B9B7DE800F627B3 /* ASCollectionNode.h in Headers */, @@ -1181,7 +1181,7 @@ 34EFC76A1B701CE600AD841F /* ASLayoutSpec.h in Headers */, 34EFC7791B701D3600AD841F /* ASLayoutSpecUtilities.h in Headers */, B350625C1B010F070018CF92 /* ASLog.h in Headers */, - B35062221B010EFD0018CF92 /* ASMultidimensionalArrayUtils.h in Headers */, + 0442850E1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.h in Headers */, B35062041B010EFD0018CF92 /* ASMultiplexImageNode.h in Headers */, B35062241B010EFD0018CF92 /* ASMutableAttributedStringBuilder.h in Headers */, B35062061B010EFD0018CF92 /* ASNetworkImageNode.h in Headers */, @@ -1425,7 +1425,6 @@ ACF6ED1B1B17843500DA7C62 /* ASBackgroundLayoutSpec.mm in Sources */, 0549634A1A1EA066000F8E56 /* ASBasicImageDownloader.mm in Sources */, 299DA1AA1A828D2900162D41 /* ASBatchContext.mm in Sources */, - 296A0A2F1A9516B2005ACEAA /* ASBatchFetching.m in Sources */, AC6456091B0A335000CF11B8 /* ASCellNode.m in Sources */, ACF6ED1D1B17843500DA7C62 /* ASCenterLayoutSpec.mm in Sources */, 18C2ED801B9B7DE800F627B3 /* ASCollectionNode.m in Sources */, @@ -1452,12 +1451,13 @@ 9C5FA3531B8F6ADF00A62714 /* ASLayoutOptions.mm in Sources */, 9C5FA35F1B90C9A500A62714 /* ASLayoutOptionsPrivate.mm in Sources */, ACF6ED271B17843500DA7C62 /* ASLayoutSpec.mm in Sources */, - 464052261A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm in Sources */, 0516FA411A1563D200B4EBED /* ASMultiplexImageNode.mm in Sources */, 058D0A1B195D050800B7D73C /* ASMutableAttributedStringBuilder.m in Sources */, 055B9FA91A1C154B00035D6D /* ASNetworkImageNode.mm in Sources */, ACF6ED2C1B17843500DA7C62 /* ASOverlayLayoutSpec.mm in Sources */, + 0442850F1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.mm in Sources */, 055F1A3919ABD413004DAFF1 /* ASRangeController.mm in Sources */, + 044285091BAA63FE00D16268 /* ASBatchFetching.m in Sources */, 292C59A11A956527007E5DD6 /* ASRangeHandlerPreload.mm in Sources */, 292C59A41A956527007E5DD6 /* ASRangeHandlerRender.mm in Sources */, ACF6ED2E1B17843500DA7C62 /* ASRatioLayoutSpec.mm in Sources */, @@ -1532,7 +1532,6 @@ 34EFC7621B701CA400AD841F /* ASBackgroundLayoutSpec.mm in Sources */, B35062141B010EFD0018CF92 /* ASBasicImageDownloader.mm in Sources */, B35062161B010EFD0018CF92 /* ASBatchContext.mm in Sources */, - B35062471B010EFD0018CF92 /* ASBatchFetching.m in Sources */, AC47D9421B3B891B00AAEE9D /* ASCellNode.m in Sources */, 34EFC7641B701CC600AD841F /* ASCenterLayoutSpec.mm in Sources */, 18C2ED831B9B7DE800F627B3 /* ASCollectionNode.m in Sources */, @@ -1559,12 +1558,13 @@ 9C5FA3541B8F6ADF00A62714 /* ASLayoutOptions.mm in Sources */, 9C5FA3601B90C9A500A62714 /* ASLayoutOptionsPrivate.mm in Sources */, 34EFC76B1B701CEB00AD841F /* ASLayoutSpec.mm in Sources */, - B35062231B010EFD0018CF92 /* ASMultidimensionalArrayUtils.mm in Sources */, B35062051B010EFD0018CF92 /* ASMultiplexImageNode.mm in Sources */, B35062251B010EFD0018CF92 /* ASMutableAttributedStringBuilder.m in Sources */, B35062071B010EFD0018CF92 /* ASNetworkImageNode.mm in Sources */, 34EFC76D1B701CF100AD841F /* ASOverlayLayoutSpec.mm in Sources */, + 044285101BAA64EC00D16268 /* ASMultidimensionalArrayUtils.mm in Sources */, B35062271B010EFD0018CF92 /* ASRangeController.mm in Sources */, + 0442850A1BAA63FE00D16268 /* ASBatchFetching.m in Sources */, B350622A1B010EFD0018CF92 /* ASRangeHandlerPreload.mm in Sources */, B350622C1B010EFD0018CF92 /* ASRangeHandlerRender.mm in Sources */, 34EFC76F1B701CF700AD841F /* ASRatioLayoutSpec.mm in Sources */, diff --git a/AsyncDisplayKit/AsyncDisplayKit.h b/AsyncDisplayKit/AsyncDisplayKit.h index 46798f9009..fef5761c7b 100644 --- a/AsyncDisplayKit/AsyncDisplayKit.h +++ b/AsyncDisplayKit/AsyncDisplayKit.h @@ -49,6 +49,7 @@ #import #import #import +#import #import #import #import @@ -57,7 +58,6 @@ #import #import #import -//#import #import #import #import @@ -65,5 +65,7 @@ #import #import #import +#import #import +#import #import diff --git a/AsyncDisplayKit/Details/ASBatchFetching.h b/AsyncDisplayKit/Private/ASBatchFetching.h similarity index 100% rename from AsyncDisplayKit/Details/ASBatchFetching.h rename to AsyncDisplayKit/Private/ASBatchFetching.h diff --git a/AsyncDisplayKit/Details/ASBatchFetching.m b/AsyncDisplayKit/Private/ASBatchFetching.m similarity index 100% rename from AsyncDisplayKit/Details/ASBatchFetching.m rename to AsyncDisplayKit/Private/ASBatchFetching.m diff --git a/AsyncDisplayKit/Details/ASMultidimensionalArrayUtils.h b/AsyncDisplayKit/Private/ASMultidimensionalArrayUtils.h similarity index 100% rename from AsyncDisplayKit/Details/ASMultidimensionalArrayUtils.h rename to AsyncDisplayKit/Private/ASMultidimensionalArrayUtils.h diff --git a/AsyncDisplayKit/Details/ASMultidimensionalArrayUtils.mm b/AsyncDisplayKit/Private/ASMultidimensionalArrayUtils.mm similarity index 100% rename from AsyncDisplayKit/Details/ASMultidimensionalArrayUtils.mm rename to AsyncDisplayKit/Private/ASMultidimensionalArrayUtils.mm From 5c4a506af403f1f4fafa8cd10d4885fa61d3341d Mon Sep 17 00:00:00 2001 From: Jack Flintermann Date: Wed, 16 Sep 2015 23:33:56 -0400 Subject: [PATCH 10/17] fix .DS_Store in gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f14b49ea6b..fe38cb6027 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -DS_Store +.DS_Store *.pbxuser *.perspective From b84c3712115f040da2c37a55daaaab369fc3b2df Mon Sep 17 00:00:00 2001 From: Jack Flintermann Date: Wed, 16 Sep 2015 23:39:19 -0400 Subject: [PATCH 11/17] fix breaking test imports --- AsyncDisplayKitTests/ASBasicImageDownloaderContextTests.m | 2 +- AsyncDisplayKitTests/ASSnapshotTestCase.mm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/AsyncDisplayKitTests/ASBasicImageDownloaderContextTests.m b/AsyncDisplayKitTests/ASBasicImageDownloaderContextTests.m index 47ce631ef6..5fa9b155b2 100644 --- a/AsyncDisplayKitTests/ASBasicImageDownloaderContextTests.m +++ b/AsyncDisplayKitTests/ASBasicImageDownloaderContextTests.m @@ -6,8 +6,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import #import +#import "ASBasicImageDownloaderInternal.h" #import diff --git a/AsyncDisplayKitTests/ASSnapshotTestCase.mm b/AsyncDisplayKitTests/ASSnapshotTestCase.mm index cce364ab34..a70b21a3d2 100644 --- a/AsyncDisplayKitTests/ASSnapshotTestCase.mm +++ b/AsyncDisplayKitTests/ASSnapshotTestCase.mm @@ -7,8 +7,7 @@ */ #import "ASSnapshotTestCase.h" - -#import +#import "ASDisplayNodeInternal.h" @implementation ASSnapshotTestCase From 07c0d78c71a60c000cf2aad9577bf0d321861cd0 Mon Sep 17 00:00:00 2001 From: Huy Nguyen Date: Wed, 16 Sep 2015 22:22:08 +0300 Subject: [PATCH 12/17] Add ASViewController and update Multiplex sample to use it. --- AsyncDisplayKit.xcodeproj/project.pbxproj | 8 + AsyncDisplayKit/ASViewController.h | 18 ++ AsyncDisplayKit/ASViewController.m | 47 ++++++ AsyncDisplayKit/AsyncDisplayKit.h | 2 + .../Sample.xcodeproj/project.pbxproj | 6 + examples/Multiplex/Sample/ScreenNode.h | 19 +++ examples/Multiplex/Sample/ScreenNode.m | 156 ++++++++++++++++++ examples/Multiplex/Sample/ViewController.h | 4 +- examples/Multiplex/Sample/ViewController.m | 153 ++--------------- 9 files changed, 270 insertions(+), 143 deletions(-) create mode 100644 AsyncDisplayKit/ASViewController.h create mode 100644 AsyncDisplayKit/ASViewController.m create mode 100644 examples/Multiplex/Sample/ScreenNode.h create mode 100644 examples/Multiplex/Sample/ScreenNode.m diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj index fec206adb5..e6a8490473 100644 --- a/AsyncDisplayKit.xcodeproj/project.pbxproj +++ b/AsyncDisplayKit.xcodeproj/project.pbxproj @@ -230,6 +230,8 @@ AC47D9451B3BB41900AAEE9D /* ASRelativeSize.h in Headers */ = {isa = PBXBuildFile; fileRef = AC47D9431B3BB41900AAEE9D /* ASRelativeSize.h */; settings = {ATTRIBUTES = (Public, ); }; }; AC47D9461B3BB41900AAEE9D /* ASRelativeSize.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC47D9441B3BB41900AAEE9D /* ASRelativeSize.mm */; }; AC6456091B0A335000CF11B8 /* ASCellNode.m in Sources */ = {isa = PBXBuildFile; fileRef = AC6456071B0A335000CF11B8 /* ASCellNode.m */; }; + ACC945A91BA9E7A0005E1FB8 /* ASViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = ACC945A81BA9E7A0005E1FB8 /* ASViewController.h */; }; + ACC945AB1BA9E7C1005E1FB8 /* ASViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ACC945AA1BA9E7C1005E1FB8 /* ASViewController.m */; }; ACF6ED1A1B17843500DA7C62 /* ASBackgroundLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED011B17843500DA7C62 /* ASBackgroundLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; ACF6ED1B1B17843500DA7C62 /* ASBackgroundLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED021B17843500DA7C62 /* ASBackgroundLayoutSpec.mm */; }; ACF6ED1C1B17843500DA7C62 /* ASCenterLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED031B17843500DA7C62 /* ASCenterLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -574,6 +576,8 @@ AC47D9431B3BB41900AAEE9D /* ASRelativeSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASRelativeSize.h; path = AsyncDisplayKit/Layout/ASRelativeSize.h; sourceTree = ""; }; AC47D9441B3BB41900AAEE9D /* ASRelativeSize.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ASRelativeSize.mm; path = AsyncDisplayKit/Layout/ASRelativeSize.mm; sourceTree = ""; }; AC6456071B0A335000CF11B8 /* ASCellNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASCellNode.m; sourceTree = ""; }; + ACC945A81BA9E7A0005E1FB8 /* ASViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASViewController.h; sourceTree = ""; }; + ACC945AA1BA9E7C1005E1FB8 /* ASViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASViewController.m; sourceTree = ""; }; ACF6ED011B17843500DA7C62 /* ASBackgroundLayoutSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASBackgroundLayoutSpec.h; path = AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.h; sourceTree = ""; }; ACF6ED021B17843500DA7C62 /* ASBackgroundLayoutSpec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = ASBackgroundLayoutSpec.mm; path = AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.mm; sourceTree = ""; }; ACF6ED031B17843500DA7C62 /* ASCenterLayoutSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASCenterLayoutSpec.h; path = AsyncDisplayKit/Layout/ASCenterLayoutSpec.h; sourceTree = ""; }; @@ -758,6 +762,8 @@ 0574D5E119C110610097DC25 /* ASTableViewProtocols.h */, 058D09DF195D050800B7D73C /* ASTextNode.h */, 058D09E0195D050800B7D73C /* ASTextNode.mm */, + ACC945A81BA9E7A0005E1FB8 /* ASViewController.h */, + ACC945AA1BA9E7C1005E1FB8 /* ASViewController.m */, 6BDC61F51978FEA400E50D21 /* AsyncDisplayKit.h */, 058D09E1195D050800B7D73C /* Details */, 058D0A01195D050800B7D73C /* Private */, @@ -1114,6 +1120,7 @@ 058D0A63195D05DC00B7D73C /* ASTextNodeTypes.h in Headers */, 058D0A64195D05DC00B7D73C /* ASTextNodeWordKerner.h in Headers */, 058D0A81195D05F900B7D73C /* ASThread.h in Headers */, + ACC945A91BA9E7A0005E1FB8 /* ASViewController.h in Headers */, 6BDC61F61979037800E50D21 /* AsyncDisplayKit.h in Headers */, 205F0E211B376416007741D0 /* CGRect+ASConvenience.h in Headers */, 058D0A66195D05DC00B7D73C /* NSMutableAttributedString+TextKitAdditions.h in Headers */, @@ -1478,6 +1485,7 @@ 058D0A1E195D050800B7D73C /* ASTextNodeShadower.m in Sources */, 058D0A1F195D050800B7D73C /* ASTextNodeTextKitHelpers.mm in Sources */, 058D0A20195D050800B7D73C /* ASTextNodeWordKerner.m in Sources */, + ACC945AB1BA9E7C1005E1FB8 /* ASViewController.m in Sources */, 205F0E221B376416007741D0 /* CGRect+ASConvenience.m in Sources */, 058D0A21195D050800B7D73C /* NSMutableAttributedString+TextKitAdditions.m in Sources */, 205F0E101B371875007741D0 /* UICollectionViewLayout+ASConvenience.m in Sources */, diff --git a/AsyncDisplayKit/ASViewController.h b/AsyncDisplayKit/ASViewController.h new file mode 100644 index 0000000000..7be26d5916 --- /dev/null +++ b/AsyncDisplayKit/ASViewController.h @@ -0,0 +1,18 @@ +// +// ASViewController.h +// AsyncDisplayKit +// +// Created by Huy Nguyen on 16/09/15. +// Copyright (c) 2015 Facebook. All rights reserved. +// + +#import +#import + +@interface ASViewController : UIViewController + +@property (nonatomic, strong, readonly) ASDisplayNode *node; + +- (instancetype)initWithNode:(ASDisplayNode *)node; + +@end \ No newline at end of file diff --git a/AsyncDisplayKit/ASViewController.m b/AsyncDisplayKit/ASViewController.m new file mode 100644 index 0000000000..6645198398 --- /dev/null +++ b/AsyncDisplayKit/ASViewController.m @@ -0,0 +1,47 @@ +// +// ASViewController.m +// AsyncDisplayKit +// +// Created by Huy Nguyen on 16/09/15. +// Copyright (c) 2015 Facebook. All rights reserved. +// + +#import "ASViewController.h" +#import "ASAssert.h" +#import "ASDimension.h" + +@implementation ASViewController + +- (instancetype)initWithNode:(ASDisplayNode *)node +{ + if (!(self = [super init])) { + return nil; + } + + ASDisplayNodeAssertNotNil(node, @"Node must not be nil"); + ASDisplayNodeAssertTrue(!node.layerBacked); + _node = node; + + return self; +} + +- (void)loadView +{ + ASDisplayNodeAssertTrue(!_node.layerBacked); + self.view = _node.view; +} + +- (void)viewWillLayoutSubviews +{ + ASSizeRange constrainedSize = ASSizeRangeMake(self.view.bounds.size, self.view.bounds.size); + [_node measureWithSizeRange:constrainedSize]; + [super viewWillLayoutSubviews]; +} + +- (void)viewWillAppear:(BOOL)animated +{ + [super viewWillAppear:animated]; + [_node recursivelyFetchData]; +} + +@end diff --git a/AsyncDisplayKit/AsyncDisplayKit.h b/AsyncDisplayKit/AsyncDisplayKit.h index fef5761c7b..6b2aa9ea9d 100644 --- a/AsyncDisplayKit/AsyncDisplayKit.h +++ b/AsyncDisplayKit/AsyncDisplayKit.h @@ -26,6 +26,8 @@ #import +#import + #import #import #import diff --git a/examples/Multiplex/Sample.xcodeproj/project.pbxproj b/examples/Multiplex/Sample.xcodeproj/project.pbxproj index a1a1bd3d35..1383d38552 100644 --- a/examples/Multiplex/Sample.xcodeproj/project.pbxproj +++ b/examples/Multiplex/Sample.xcodeproj/project.pbxproj @@ -14,6 +14,7 @@ 3EC0CDCBA10D483D9F386E5E /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D24B17D1E4A4E7A9566C5E9 /* libPods.a */; }; 6C2C82AC19EE274300767484 /* Default-667h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C2C82AA19EE274300767484 /* Default-667h@2x.png */; }; 6C2C82AD19EE274300767484 /* Default-736h@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C2C82AB19EE274300767484 /* Default-736h@3x.png */; }; + ACC945AE1BA9EFBA005E1FB8 /* ScreenNode.m in Sources */ = {isa = PBXBuildFile; fileRef = ACC945AD1BA9EFBA005E1FB8 /* ScreenNode.m */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -29,6 +30,8 @@ 3D24B17D1E4A4E7A9566C5E9 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; 6C2C82AA19EE274300767484 /* Default-667h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-667h@2x.png"; sourceTree = SOURCE_ROOT; }; 6C2C82AB19EE274300767484 /* Default-736h@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-736h@3x.png"; sourceTree = SOURCE_ROOT; }; + ACC945AC1BA9EFB3005E1FB8 /* ScreenNode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScreenNode.h; sourceTree = ""; }; + ACC945AD1BA9EFBA005E1FB8 /* ScreenNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreenNode.m; sourceTree = ""; }; C068F1D3F0CC317E895FCDAB /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -72,6 +75,8 @@ 05E2128919D4DB510098F589 /* AppDelegate.m */, 05E2128B19D4DB510098F589 /* ViewController.h */, 05E2128C19D4DB510098F589 /* ViewController.m */, + ACC945AC1BA9EFB3005E1FB8 /* ScreenNode.h */, + ACC945AD1BA9EFBA005E1FB8 /* ScreenNode.m */, 05E2128419D4DB510098F589 /* Supporting Files */, ); path = Sample; @@ -214,6 +219,7 @@ 05E2128D19D4DB510098F589 /* ViewController.m in Sources */, 05E2128A19D4DB510098F589 /* AppDelegate.m in Sources */, 05E2128719D4DB510098F589 /* main.m in Sources */, + ACC945AE1BA9EFBA005E1FB8 /* ScreenNode.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/examples/Multiplex/Sample/ScreenNode.h b/examples/Multiplex/Sample/ScreenNode.h new file mode 100644 index 0000000000..38ea2e63cb --- /dev/null +++ b/examples/Multiplex/Sample/ScreenNode.h @@ -0,0 +1,19 @@ +// +// ScreenNode.h +// Sample +// +// Created by Huy Nguyen on 16/09/15. +// Copyright (c) 2015 Facebook. All rights reserved. +// + +#import + +@interface ScreenNode : ASDisplayNode + +@property (nonatomic, strong) ASMultiplexImageNode *imageNode; +@property (nonatomic, strong) ASTextNode *textNode; + +- (void)start; +- (void)reload; + +@end \ No newline at end of file diff --git a/examples/Multiplex/Sample/ScreenNode.m b/examples/Multiplex/Sample/ScreenNode.m new file mode 100644 index 0000000000..1032e059eb --- /dev/null +++ b/examples/Multiplex/Sample/ScreenNode.m @@ -0,0 +1,156 @@ +// +// ScreenNode.m +// Sample +// +// Created by Huy Nguyen on 16/09/15. +// Copyright (c) 2015 Facebook. All rights reserved. +// + +#import "ScreenNode.h" +#import "AsyncDisplayKit/AsyncDisplayKit.h" + +@interface ScreenNode() +@end + +@implementation ScreenNode + +- (instancetype)init +{ + if (!(self = [super init])) { + return nil; + } + + // multiplex image node! + // NB: we're using a custom downloader with an artificial delay for this demo, but ASBasicImageDownloader works too! + _imageNode = [[ASMultiplexImageNode alloc] initWithCache:nil downloader:self]; + _imageNode.dataSource = self; + _imageNode.delegate = self; + + // placeholder colour + _imageNode.backgroundColor = ASDisplayNodeDefaultPlaceholderColor(); + + // load low-quality images before high-quality images + _imageNode.downloadsIntermediateImages = YES; + + // simple status label + _textNode = [[ASTextNode alloc] init]; + + [self addSubnode:_imageNode]; + [self addSubnode:_textNode]; + + return self; +} + +- (void)start +{ + [self setText:@"loading…"]; + _textNode.userInteractionEnabled = NO; + _imageNode.imageIdentifiers = @[ @"best", @"medium", @"worst" ]; // go! +} + +- (void)reload { + [self start]; + [_imageNode reloadImageIdentifierSources]; +} + +- (void)setText:(NSString *)text +{ + NSDictionary *attributes = @{NSFontAttributeName: [UIFont fontWithName:@"HelveticaNeue-Light" size:22.0f]}; + NSAttributedString *string = [[NSAttributedString alloc] initWithString:text + attributes:attributes]; + _textNode.attributedString = string; + [self setNeedsLayout]; +} + +- (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize +{ + return + [ASInsetLayoutSpec + insetLayoutSpecWithInsets:UIEdgeInsetsMake(10, 10, 10, 10) + child: + [ASStackLayoutSpec + stackLayoutSpecWithDirection:ASStackLayoutDirectionVertical + spacing:10 + justifyContent:ASStackLayoutJustifyContentCenter + alignItems:ASStackLayoutAlignItemsCenter + children:@[[ASRatioLayoutSpec ratioLayoutSpecWithRatio:1 child:_imageNode], _textNode]]]; +} + +#pragma mark - +#pragma mark ASMultiplexImageNode data source & delegate. + +- (NSURL *)multiplexImageNode:(ASMultiplexImageNode *)imageNode URLForImageIdentifier:(id)imageIdentifier +{ + if ([imageIdentifier isEqualToString:@"worst"]) { + return [NSURL URLWithString:@"https://raw.githubusercontent.com/facebook/AsyncDisplayKit/master/examples/Multiplex/worst.png"]; + } + + if ([imageIdentifier isEqualToString:@"medium"]) { + return [NSURL URLWithString:@"https://raw.githubusercontent.com/facebook/AsyncDisplayKit/master/examples/Multiplex/medium.png"]; + } + + if ([imageIdentifier isEqualToString:@"best"]) { + return [NSURL URLWithString:@"https://raw.githubusercontent.com/facebook/AsyncDisplayKit/master/examples/Multiplex/best.png"]; + } + + // unexpected identifier + return nil; +} + +- (void)multiplexImageNode:(ASMultiplexImageNode *)imageNode didFinishDownloadingImageWithIdentifier:(id)imageIdentifier error:(NSError *)error +{ + [self setText:[NSString stringWithFormat:@"loaded '%@'", imageIdentifier]]; + + if ([imageIdentifier isEqualToString:@"best"]) { + [self setText:[_textNode.attributedString.string stringByAppendingString:@". tap to reload"]]; + _textNode.userInteractionEnabled = YES; + } +} + + +#pragma mark - +#pragma mark ASImageDownloaderProtocol. + +- (id)downloadImageWithURL:(NSURL *)URL + callbackQueue:(dispatch_queue_t)callbackQueue + downloadProgressBlock:(void (^)(CGFloat progress))downloadProgressBlock + completion:(void (^)(CGImageRef image, NSError *error))completion +{ + // if no callback queue is supplied, run on the main thread + if (callbackQueue == nil) { + callbackQueue = dispatch_get_main_queue(); + } + + // call completion blocks + void (^handler)(NSURLResponse *, NSData *, NSError *) = ^(NSURLResponse *response, NSData *data, NSError *connectionError) { + // add an artificial delay + usleep(1.0 * USEC_PER_SEC); + + // ASMultiplexImageNode callbacks + dispatch_async(callbackQueue, ^{ + if (downloadProgressBlock) { + downloadProgressBlock(1.0f); + } + + if (completion) { + completion([[UIImage imageWithData:data] CGImage], connectionError); + } + }); + }; + + // let NSURLConnection do the heavy lifting + NSURLRequest *request = [NSURLRequest requestWithURL:URL]; + [NSURLConnection sendAsynchronousRequest:request + queue:[[NSOperationQueue alloc] init] + completionHandler:handler]; + + // return nil, don't support cancellation + return nil; +} + +- (void)cancelImageDownloadForIdentifier:(id)downloadIdentifier +{ + // no-op, don't support cancellation +} + +@end diff --git a/examples/Multiplex/Sample/ViewController.h b/examples/Multiplex/Sample/ViewController.h index d0e9200d88..b73c290852 100644 --- a/examples/Multiplex/Sample/ViewController.h +++ b/examples/Multiplex/Sample/ViewController.h @@ -9,8 +9,8 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#import +#import -@interface ViewController : UIViewController +@interface ViewController : ASViewController @end diff --git a/examples/Multiplex/Sample/ViewController.m b/examples/Multiplex/Sample/ViewController.m index 7af462d91c..b3c5717340 100644 --- a/examples/Multiplex/Sample/ViewController.m +++ b/examples/Multiplex/Sample/ViewController.m @@ -10,77 +10,39 @@ */ #import "ViewController.h" +#import "ScreenNode.h" -#import - - -@interface ViewController () -{ - ASMultiplexImageNode *_imageNode; - - UILabel *_textLabel; +@interface ViewController() { + ScreenNode *_screenNode; } @end - @implementation ViewController - (instancetype)init { - if (!(self = [super init])) + ScreenNode *node = [[ScreenNode alloc] init]; + if (!(self = [super initWithNode:node])) return nil; - - // multiplex image node! - // NB: we're using a custom downloader with an artificial delay for this demo, but ASBasicImageDownloader works too! - _imageNode = [[ASMultiplexImageNode alloc] initWithCache:nil downloader:self]; - _imageNode.dataSource = self; - _imageNode.delegate = self; - - // placeholder colour - _imageNode.backgroundColor = ASDisplayNodeDefaultPlaceholderColor(); - - // load low-quality images before high-quality images - _imageNode.downloadsIntermediateImages = YES; - - - // simple status label - _textLabel = [[UILabel alloc] init]; - _textLabel.textAlignment = NSTextAlignmentCenter; - _textLabel.font = [UIFont fontWithName:@"HelveticaNeue-Light" size:22.0f]; + _screenNode = node; // tap to reload UITapGestureRecognizer *gr = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(reload:)]; - [_textLabel addGestureRecognizer:gr]; - + [_screenNode.textNode.view addGestureRecognizer:gr]; return self; } -- (void)viewDidLoad +- (void)viewWillAppear:(BOOL)animated { - [super viewDidLoad]; - - [self.view addSubnode:_imageNode]; - [self.view addSubview:_textLabel]; - - [self start]; + [super viewWillAppear:animated]; + [_screenNode start]; } -- (void)viewWillLayoutSubviews -{ - static CGFloat padding = 40.0f; - - // lay out image - CGFloat imageWidth = self.view.bounds.size.width - padding; - CGPoint imageOrigin = CGPointMake(roundf((self.view.bounds.size.width - imageWidth) / 2.0f), - roundf((self.view.bounds.size.height - imageWidth) / 2.0f)); - _imageNode.frame = (CGRect){ imageOrigin, CGSizeMake(imageWidth, imageWidth) }; - - // label - CGSize textSize = [_textLabel sizeThatFits:CGSizeMake(self.view.bounds.size.width, FLT_MAX)]; - _textLabel.frame = CGRectMake(0.0f, imageOrigin.y + imageWidth + padding, self.view.bounds.size.width, textSize.height); +- (void)reload:(id)sender { + [_screenNode reload]; } - (BOOL)prefersStatusBarHidden @@ -88,95 +50,4 @@ return YES; } -- (void)start -{ - _textLabel.text = @"loading…"; - _textLabel.userInteractionEnabled = NO; - - _imageNode.imageIdentifiers = @[ @"best", @"medium", @"worst" ]; // go! -} - -- (void)reload:(id)sender { - [self start]; - [_imageNode reloadImageIdentifierSources]; -} - - -#pragma mark - -#pragma mark ASMultiplexImageNode data source & delegate. - -- (NSURL *)multiplexImageNode:(ASMultiplexImageNode *)imageNode URLForImageIdentifier:(id)imageIdentifier -{ - if ([imageIdentifier isEqualToString:@"worst"]) { - return [NSURL URLWithString:@"https://raw.githubusercontent.com/facebook/AsyncDisplayKit/master/examples/Multiplex/worst.png"]; - } - - if ([imageIdentifier isEqualToString:@"medium"]) { - return [NSURL URLWithString:@"https://raw.githubusercontent.com/facebook/AsyncDisplayKit/master/examples/Multiplex/medium.png"]; - } - - if ([imageIdentifier isEqualToString:@"best"]) { - return [NSURL URLWithString:@"https://raw.githubusercontent.com/facebook/AsyncDisplayKit/master/examples/Multiplex/best.png"]; - } - - // unexpected identifier - return nil; -} - -- (void)multiplexImageNode:(ASMultiplexImageNode *)imageNode didFinishDownloadingImageWithIdentifier:(id)imageIdentifier error:(NSError *)error -{ - _textLabel.text = [NSString stringWithFormat:@"loaded '%@'", imageIdentifier]; - - if ([imageIdentifier isEqualToString:@"best"]) { - _textLabel.text = [_textLabel.text stringByAppendingString:@". tap to reload"]; - _textLabel.userInteractionEnabled = YES; - } -} - - -#pragma mark - -#pragma mark ASImageDownloaderProtocol. - -- (id)downloadImageWithURL:(NSURL *)URL - callbackQueue:(dispatch_queue_t)callbackQueue - downloadProgressBlock:(void (^)(CGFloat progress))downloadProgressBlock - completion:(void (^)(CGImageRef image, NSError *error))completion -{ - // if no callback queue is supplied, run on the main thread - if (callbackQueue == nil) { - callbackQueue = dispatch_get_main_queue(); - } - - // call completion blocks - void (^handler)(NSURLResponse *, NSData *, NSError *) = ^(NSURLResponse *response, NSData *data, NSError *connectionError) { - // add an artificial delay - usleep(1.0 * USEC_PER_SEC); - - // ASMultiplexImageNode callbacks - dispatch_async(callbackQueue, ^{ - if (downloadProgressBlock) { - downloadProgressBlock(1.0f); - } - - if (completion) { - completion([[UIImage imageWithData:data] CGImage], connectionError); - } - }); - }; - - // let NSURLConnection do the heavy lifting - NSURLRequest *request = [NSURLRequest requestWithURL:URL]; - [NSURLConnection sendAsynchronousRequest:request - queue:[[NSOperationQueue alloc] init] - completionHandler:handler]; - - // return nil, don't support cancellation - return nil; -} - -- (void)cancelImageDownloadForIdentifier:(id)downloadIdentifier -{ - // no-op, don't support cancellation -} - @end From 72d108cd980a44c99c121fac6516d5fd74099bb3 Mon Sep 17 00:00:00 2001 From: Huy Nguyen Date: Wed, 16 Sep 2015 23:28:12 +0300 Subject: [PATCH 13/17] Minor fixes in ASViewController and Multiplex sample. --- AsyncDisplayKit/ASViewController.m | 3 ++- examples/Multiplex/Sample/ScreenNode.h | 2 +- examples/Multiplex/Sample/ScreenNode.m | 17 +++++++---------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/AsyncDisplayKit/ASViewController.m b/AsyncDisplayKit/ASViewController.m index 6645198398..2a9f555178 100644 --- a/AsyncDisplayKit/ASViewController.m +++ b/AsyncDisplayKit/ASViewController.m @@ -33,7 +33,8 @@ - (void)viewWillLayoutSubviews { - ASSizeRange constrainedSize = ASSizeRangeMake(self.view.bounds.size, self.view.bounds.size); + CGSize viewSize = self.view.bounds.size; + ASSizeRange constrainedSize = ASSizeRangeMake(viewSize, viewSize); [_node measureWithSizeRange:constrainedSize]; [super viewWillLayoutSubviews]; } diff --git a/examples/Multiplex/Sample/ScreenNode.h b/examples/Multiplex/Sample/ScreenNode.h index 38ea2e63cb..b1b5024ed6 100644 --- a/examples/Multiplex/Sample/ScreenNode.h +++ b/examples/Multiplex/Sample/ScreenNode.h @@ -16,4 +16,4 @@ - (void)start; - (void)reload; -@end \ No newline at end of file +@end diff --git a/examples/Multiplex/Sample/ScreenNode.m b/examples/Multiplex/Sample/ScreenNode.m index 1032e059eb..109cc69ed4 100644 --- a/examples/Multiplex/Sample/ScreenNode.m +++ b/examples/Multiplex/Sample/ScreenNode.m @@ -64,16 +64,13 @@ - (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize { - return - [ASInsetLayoutSpec - insetLayoutSpecWithInsets:UIEdgeInsetsMake(10, 10, 10, 10) - child: - [ASStackLayoutSpec - stackLayoutSpecWithDirection:ASStackLayoutDirectionVertical - spacing:10 - justifyContent:ASStackLayoutJustifyContentCenter - alignItems:ASStackLayoutAlignItemsCenter - children:@[[ASRatioLayoutSpec ratioLayoutSpecWithRatio:1 child:_imageNode], _textNode]]]; + ASRatioLayoutSpec *imagePlaceholder = [ASRatioLayoutSpec ratioLayoutSpecWithRatio:1 child:_imageNode]; + ASStackLayoutSpec *verticalStack = [ASStackLayoutSpec stackLayoutSpecWithDirection:ASStackLayoutDirectionVertical + spacing:10 + justifyContent:ASStackLayoutJustifyContentCenter + alignItems:ASStackLayoutAlignItemsCenter + children:@[imagePlaceholder, _textNode]]; + return [ASInsetLayoutSpec insetLayoutSpecWithInsets:UIEdgeInsetsMake(10, 10, 10, 10) child:verticalStack]; } #pragma mark - From fcd76dbd198adbc615f292fd5040b6c822cf5861 Mon Sep 17 00:00:00 2001 From: Huy Nguyen Date: Wed, 16 Sep 2015 23:36:19 +0300 Subject: [PATCH 14/17] Use nonnull annotation, instead of sanity check, for node property in ASViewController. --- AsyncDisplayKit.xcodeproj/project.pbxproj | 2 +- AsyncDisplayKit/ASViewController.h | 8 ++++---- AsyncDisplayKit/ASViewController.m | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj index e6a8490473..6c4132aa8d 100644 --- a/AsyncDisplayKit.xcodeproj/project.pbxproj +++ b/AsyncDisplayKit.xcodeproj/project.pbxproj @@ -230,7 +230,7 @@ AC47D9451B3BB41900AAEE9D /* ASRelativeSize.h in Headers */ = {isa = PBXBuildFile; fileRef = AC47D9431B3BB41900AAEE9D /* ASRelativeSize.h */; settings = {ATTRIBUTES = (Public, ); }; }; AC47D9461B3BB41900AAEE9D /* ASRelativeSize.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC47D9441B3BB41900AAEE9D /* ASRelativeSize.mm */; }; AC6456091B0A335000CF11B8 /* ASCellNode.m in Sources */ = {isa = PBXBuildFile; fileRef = AC6456071B0A335000CF11B8 /* ASCellNode.m */; }; - ACC945A91BA9E7A0005E1FB8 /* ASViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = ACC945A81BA9E7A0005E1FB8 /* ASViewController.h */; }; + ACC945A91BA9E7A0005E1FB8 /* ASViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = ACC945A81BA9E7A0005E1FB8 /* ASViewController.h */; settings = {ATTRIBUTES = (Public, ); }; }; ACC945AB1BA9E7C1005E1FB8 /* ASViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ACC945AA1BA9E7C1005E1FB8 /* ASViewController.m */; }; ACF6ED1A1B17843500DA7C62 /* ASBackgroundLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED011B17843500DA7C62 /* ASBackgroundLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; ACF6ED1B1B17843500DA7C62 /* ASBackgroundLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED021B17843500DA7C62 /* ASBackgroundLayoutSpec.mm */; }; diff --git a/AsyncDisplayKit/ASViewController.h b/AsyncDisplayKit/ASViewController.h index 7be26d5916..a00cebd90d 100644 --- a/AsyncDisplayKit/ASViewController.h +++ b/AsyncDisplayKit/ASViewController.h @@ -7,12 +7,12 @@ // #import -#import +#import @interface ASViewController : UIViewController -@property (nonatomic, strong, readonly) ASDisplayNode *node; +@property (nonatomic, strong, readonly, nonnull) ASDisplayNode *node; -- (instancetype)initWithNode:(ASDisplayNode *)node; +- (nullable instancetype)initWithNode:(nonnull ASDisplayNode *)node; -@end \ No newline at end of file +@end diff --git a/AsyncDisplayKit/ASViewController.m b/AsyncDisplayKit/ASViewController.m index 2a9f555178..77395356f2 100644 --- a/AsyncDisplayKit/ASViewController.m +++ b/AsyncDisplayKit/ASViewController.m @@ -18,7 +18,6 @@ return nil; } - ASDisplayNodeAssertNotNil(node, @"Node must not be nil"); ASDisplayNodeAssertTrue(!node.layerBacked); _node = node; From 8ebc3bdf6713efe42578705e714d36591c1f5545 Mon Sep 17 00:00:00 2001 From: Huy Nguyen Date: Thu, 17 Sep 2015 00:03:39 +0300 Subject: [PATCH 15/17] Fix Multiplex sample does not load image: screenNode must be started before its -fetchData method is called. --- examples/Multiplex/Sample/ViewController.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/Multiplex/Sample/ViewController.m b/examples/Multiplex/Sample/ViewController.m index b3c5717340..e694aa79bd 100644 --- a/examples/Multiplex/Sample/ViewController.m +++ b/examples/Multiplex/Sample/ViewController.m @@ -37,8 +37,9 @@ - (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; + // This should be done before calling super's viewWillAppear which triggers data fetching on the node. [_screenNode start]; + [super viewWillAppear:animated]; } - (void)reload:(id)sender { From 1ef1b647c9ffbd3204716d0cf7559b6377908cf9 Mon Sep 17 00:00:00 2001 From: Huy Nguyen Date: Thu, 17 Sep 2015 00:11:41 +0300 Subject: [PATCH 16/17] Remove unnecessary import in ScreenNode.m --- examples/Multiplex/Sample/ScreenNode.m | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/Multiplex/Sample/ScreenNode.m b/examples/Multiplex/Sample/ScreenNode.m index 109cc69ed4..632a50c4fb 100644 --- a/examples/Multiplex/Sample/ScreenNode.m +++ b/examples/Multiplex/Sample/ScreenNode.m @@ -7,7 +7,6 @@ // #import "ScreenNode.h" -#import "AsyncDisplayKit/AsyncDisplayKit.h" @interface ScreenNode() @end From a8643417100a86e0b75a1e55134d4ac7b1692890 Mon Sep 17 00:00:00 2001 From: Huy Nguyen Date: Thu, 17 Sep 2015 16:03:02 +0300 Subject: [PATCH 17/17] Remove nonnull and nuulable annotations in ASViewController. Travis don't recognize them (yet). --- AsyncDisplayKit/ASViewController.h | 5 +++-- AsyncDisplayKit/ASViewController.m | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/AsyncDisplayKit/ASViewController.h b/AsyncDisplayKit/ASViewController.h index a00cebd90d..e3b18661fe 100644 --- a/AsyncDisplayKit/ASViewController.h +++ b/AsyncDisplayKit/ASViewController.h @@ -11,8 +11,9 @@ @interface ASViewController : UIViewController -@property (nonatomic, strong, readonly, nonnull) ASDisplayNode *node; +@property (nonatomic, strong, readonly) ASDisplayNode *node; -- (nullable instancetype)initWithNode:(nonnull ASDisplayNode *)node; +//TODO Use nonnull annotation late on. Travis doesn't recognize it (yet). +- (instancetype)initWithNode:(ASDisplayNode *)node; @end diff --git a/AsyncDisplayKit/ASViewController.m b/AsyncDisplayKit/ASViewController.m index 77395356f2..2a9f555178 100644 --- a/AsyncDisplayKit/ASViewController.m +++ b/AsyncDisplayKit/ASViewController.m @@ -18,6 +18,7 @@ return nil; } + ASDisplayNodeAssertNotNil(node, @"Node must not be nil"); ASDisplayNodeAssertTrue(!node.layerBacked); _node = node;