From 8b3ec83bfd40589ca8fd2d35bb54e3301c2f5f99 Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Fri, 8 Jul 2016 11:47:46 -0700 Subject: [PATCH] Small name changes --- .../Details/ASCollectionViewFlowLayoutInspector.m | 6 +++--- AsyncDisplayKitTests/ASCollectionViewTests.m | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AsyncDisplayKit/Details/ASCollectionViewFlowLayoutInspector.m b/AsyncDisplayKit/Details/ASCollectionViewFlowLayoutInspector.m index 721acc5174..480dbb1514 100644 --- a/AsyncDisplayKit/Details/ASCollectionViewFlowLayoutInspector.m +++ b/AsyncDisplayKit/Details/ASCollectionViewFlowLayoutInspector.m @@ -19,7 +19,7 @@ // Returns a constrained size to let the cells layout itself as far as possible based on the scrollable direction // of the collection view -static inline ASSizeRange NodeConstrainedSizeWithCollectionView(ASCollectionView *collectionView) { +static inline ASSizeRange NodeConstrainedSizeForScrollDirection(ASCollectionView *collectionView) { CGSize maxSize = collectionView.bounds.size; if (ASScrollDirectionContainsHorizontalDirection(collectionView.scrollableDirections)) { maxSize.width = FLT_MAX; @@ -65,7 +65,7 @@ static inline ASSizeRange NodeConstrainedSizeWithCollectionView(ASCollectionView return [collectionView.asyncDataSource collectionView:collectionView constrainedSizeForNodeAtIndexPath:indexPath]; } - return NodeConstrainedSizeWithCollectionView(collectionView); + return NodeConstrainedSizeForScrollDirection(collectionView); } - (ASSizeRange)collectionView:(ASCollectionView *)collectionView constrainedSizeForSupplementaryNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath @@ -156,7 +156,7 @@ static inline ASSizeRange NodeConstrainedSizeWithCollectionView(ASCollectionView return ASSizeRangeMake(itemSize, itemSize); } - return NodeConstrainedSizeWithCollectionView(collectionView); + return NodeConstrainedSizeForScrollDirection(collectionView); } - (ASSizeRange)collectionView:(ASCollectionView *)collectionView constrainedSizeForSupplementaryNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath diff --git a/AsyncDisplayKitTests/ASCollectionViewTests.m b/AsyncDisplayKitTests/ASCollectionViewTests.m index d67c6561c1..f1fbed1aa0 100644 --- a/AsyncDisplayKitTests/ASCollectionViewTests.m +++ b/AsyncDisplayKitTests/ASCollectionViewTests.m @@ -124,7 +124,7 @@ XCTAssert([collectionView.layoutInspector isKindOfClass:[ASCollectionViewFlowLayoutInspector class]], @"should have a flow layout inspector by default"); } -- (void)testThatISetALayoutInspectorForCustomLayouts +- (void)testThatADefaultLayoutInspectorIsProvidedForCustomLayouts { UICollectionViewLayout *layout = [[UICollectionViewLayout alloc] init]; ASCollectionView *collectionView = [[ASCollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];