Extract flow layout methods into a separate delegate

levi · Levi McCallum · commit 2956c0cd8a72 · 2015-10-15T11:38:47.000-07:00
diff --git a/AsyncDisplayKit/ASCollectionView.h b/AsyncDisplayKit/ASCollectionView.h
@@ -342,18 +342,34 @@
  */
 - (BOOL)shouldBatchFetchForCollectionView:(ASCollectionView *)collectionView;
 
+@end
+
+@protocol ASCollectionViewDelegateFlowLayout <ASCollectionViewDelegate>
+
+@optional
+
 /**
  * Passthrough support to UICollectionViewDelegateFlowLayout sectionInset behavior.
  *
  * @param collectionView The sender.
  * @param collectionViewLayout The layout object requesting the information.
- * #param section The index number of the section whose insets are needed.
+ * @param section The index number of the section whose insets are needed.
  *
  * @discussion The same rules apply as the UICollectionView implementation, but this can also be used without a UICollectionViewFlowLayout.
  * https://developer.apple.com/library/ios/documentation/UIKit/Reference/UICollectionViewDelegateFlowLayout_protocol/index.html#//apple_ref/occ/intfm/UICollectionViewDelegateFlowLayout/collectionView:layout:insetForSectionAtIndex:
  *
  */
-- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section;
+- (UIEdgeInsets)collectionView:(ASCollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section;
+
+/**
+ * Asks the delegate for the size of the header in the specified section.
+ */
+- (CGSize)collectionView:(ASCollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section;
+
+/**
+ * Asks the delegate for the size of the footer in the specified section.
+ */
+- (CGSize)collectionView:(ASCollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout referenceSizeForFooterInSection:(NSInteger)section;
 
 @end
 
diff --git a/AsyncDisplayKit/ASCollectionView.mm b/AsyncDisplayKit/ASCollectionView.mm
@@ -628,7 +628,7 @@ - (ASSizeRange)dataController:(ASDataController *)dataController constrainedSize
   }
   
   if (_asyncDelegateImplementsInsetSection) {
-    sectionInset = [_asyncDelegate collectionView:self layout:self.collectionViewLayout insetForSectionAtIndex:indexPath.section];
+    sectionInset = [(id<ASCollectionViewDelegateFlowLayout>)_asyncDelegate collectionView:self layout:self.collectionViewLayout insetForSectionAtIndex:indexPath.section];
   }
 
   if (ASScrollDirectionContainsHorizontalDirection([self scrollableDirections])) {
diff --git a/examples/ASCollectionView/Sample/ViewController.m b/examples/ASCollectionView/Sample/ViewController.m
@@ -13,7 +13,7 @@
 
 #import <AsyncDisplayKit/AsyncDisplayKit.h>
 
-@interface ViewController () <ASCollectionViewDataSource, ASCollectionViewDelegate>
+@interface ViewController () <ASCollectionViewDataSource, ASCollectionViewDelegateFlowLayout>
 {
   ASCollectionView *_collectionView;
 }
@@ -95,7 +95,7 @@ - (void)collectionView:(UICollectionView *)collectionView willBeginBatchFetchWit
   [context completeBatchFetching:YES];
 }
 
-- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section {
+- (UIEdgeInsets)collectionView:(ASCollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section {
   return UIEdgeInsetsMake(20.0, 20.0, 20.0, 20.0);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -628,7 +628,7 @@ - (ASSizeRange)dataController:(ASDataController *)dataController constrainedSize`
`628`	`628`	`}`
`629`	`629`
`630`	`630`	`if (_asyncDelegateImplementsInsetSection) {`
`631`		`- sectionInset = [_asyncDelegate collectionView:self layout:self.collectionViewLayout insetForSectionAtIndex:indexPath.section];`
	`631`	`+ sectionInset = [(id<ASCollectionViewDelegateFlowLayout>)_asyncDelegate collectionView:self layout:self.collectionViewLayout insetForSectionAtIndex:indexPath.section];`
`632`	`632`	`}`
`633`	`633`
`634`	`634`	`if (ASScrollDirectionContainsHorizontalDirection([self scrollableDirections])) {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`#import <AsyncDisplayKit/AsyncDisplayKit.h>`
`15`	`15`
`16`		`-@interface ViewController () <ASCollectionViewDataSource, ASCollectionViewDelegate>`
	`16`	`+@interface ViewController () <ASCollectionViewDataSource, ASCollectionViewDelegateFlowLayout>`
`17`	`17`	`{`
`18`	`18`	`ASCollectionView *_collectionView;`
`19`	`19`	`}`
`@@ -95,7 +95,7 @@ - (void)collectionView:(UICollectionView *)collectionView willBeginBatchFetchWit`
`95`	`95`	`[context completeBatchFetching:YES];`
`96`	`96`	`}`
`97`	`97`
`98`		`-- (UIEdgeInsets)collectionView:(UICollectionView )collectionView layout:(UICollectionViewLayout )collectionViewLayout insetForSectionAtIndex:(NSInteger)section {`
	`98`	`+- (UIEdgeInsets)collectionView:(ASCollectionView )collectionView layout:(UICollectionViewLayout )collectionViewLayout insetForSectionAtIndex:(NSInteger)section {`
`99`	`99`	`return UIEdgeInsetsMake(20.0, 20.0, 20.0, 20.0);`
`100`	`100`	`}`
`101`	`101`