Merge pull request #964 from levi/master

[ASPagerNode] Integrate feedback from initial review, incl. move view properties to -didLoad.

Author: appleguy

AsyncDisplayKit/ASCollectionNode.h

@@ -18,4 +18,48 @@
 
 @property (nonatomic, readonly) ASCollectionView *view;
 
+/**
+ * Tuning parameters for a range type.
+ *
+ * @param rangeType The range type to get the tuning parameters for.
+ *
+ * @returns A tuning parameter value for the given range type.
+ *
+ * Defaults to the render range having one sceenful both leading and trailing and the preload range having two
+ * screenfuls in both directions.
+ */
+- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType;
+
+/**
+ * Set the tuning parameters for a range type.
+ *
+ * @param tuningParameters The tuning parameters to store for a range type.
+ * @param rangeType The range type to set the tuning parameters for.
+ */
+- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType;
+
+/**
+ * Reload everything from scratch, destroying the working range and all cached nodes.
+ *
+ * @param completion block to run on completion of asynchronous loading or nil. If supplied, the block is run on
+ * the main thread.
+ * @warning This method is substantially more expensive than UICollectionView's version.
+ */
+- (void)reloadDataWithCompletion:(void (^)())completion;
+
+/**
+ * Reload everything from scratch, destroying the working range and all cached nodes.
+ *
+ * @warning This method is substantially more expensive than UICollectionView's version.
+ */
+- (void)reloadData;
+
+/**
+ * Reload everything from scratch entirely on the main thread, destroying the working range and all cached nodes.
+ *
+ * @warning This method is substantially more expensive than UICollectionView's version and will block the main thread
+ * while all the cells load.
+ */
+- (void)reloadDataImmediately;
+
 @end

AsyncDisplayKit/ASCollectionNode.m

@@ -43,4 +43,31 @@ - (void)clearFetchedData
   [self.view clearFetchedData];
 }
 
+#pragma mark - ASCollectionView Forwards
+
+- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType
+{
+  return [self.view tuningParametersForRangeType:rangeType];
+}
+
+- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType
+{
+  return [self.view setTuningParameters:tuningParameters forRangeType:rangeType];
+}
+
+- (void)reloadDataWithCompletion:(void (^)())completion
+{
+  [self.view reloadDataWithCompletion:completion];
+}
+
+- (void)reloadData
+{
+  [self.view reloadData];
+}
+
+- (void)reloadDataImmediately
+{
+  [self.view reloadDataImmediately];
+}
+
 @end

AsyncDisplayKit/ASPagerNode.h

@@ -14,9 +14,7 @@
 
 @property (weak, nonatomic) id<ASPagerNodeDataSource> dataSource;
 
-- (void)reloadData;
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType;
+- (void)scrollToPageAtIndex:(NSInteger)index animated:(BOOL)animated;
 
 @end
 

AsyncDisplayKit/ASPagerNode.m

@@ -27,29 +27,34 @@ - (instancetype)init
 
   self = [super initWithCollectionViewLayout:_flowLayout];
   if (self != nil) {
-    self.view.asyncDataSource = self;
-    self.view.asyncDelegate = self;
-    
-    self.view.pagingEnabled = YES;
-    self.view.allowsSelection = NO;
-    self.view.showsVerticalScrollIndicator = NO;
-    self.view.showsHorizontalScrollIndicator = NO;
-    
-    ASRangeTuningParameters tuningParams = { .leadingBufferScreenfuls = 1.0, .trailingBufferScreenfuls = 1.0 };
-    [self setTuningParameters:tuningParams forRangeType:ASLayoutRangeTypePreload];
-    [self setTuningParameters:tuningParams forRangeType:ASLayoutRangeTypeRender];
   }
   return self;
 }
 
-- (void)reloadData
+- (void)didLoad
 {
-  [self.view reloadData];
+  [super didLoad];
+  
+  self.view.asyncDataSource = self;
+  self.view.asyncDelegate = self;
+  
+  self.view.pagingEnabled = YES;
+  self.view.allowsSelection = NO;
+  self.view.showsVerticalScrollIndicator = NO;
+  self.view.showsHorizontalScrollIndicator = NO;
+  
+  ASRangeTuningParameters preloadParams = { .leadingBufferScreenfuls = 2.0, .trailingBufferScreenfuls = 2.0 };
+  ASRangeTuningParameters renderParams = { .leadingBufferScreenfuls = 1.0, .trailingBufferScreenfuls = 1.0 };
+  [self setTuningParameters:preloadParams forRangeType:ASLayoutRangeTypePreload];
+  [self setTuningParameters:renderParams forRangeType:ASLayoutRangeTypeRender];
 }
 
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType
+#pragma mark - Helpers
+
+- (void)scrollToPageAtIndex:(NSInteger)index animated:(BOOL)animated
 {
-  [self.view setTuningParameters:tuningParameters forRangeType:rangeType];
+  NSIndexPath *indexPath = [NSIndexPath indexPathForItem:index inSection:0];
+  [self.view scrollToItemAtIndexPath:indexPath atScrollPosition:UICollectionViewScrollPositionLeft animated:animated];
 }
 
 #pragma mark - ASCollectionViewDataSource

examples/PagerNode/Sample.xcodeproj/project.pbxproj

@@ -123,7 +123,6 @@
 				05E2127E19D4DB510098F589 /* Frameworks */,
 				05E2127F19D4DB510098F589 /* Resources */,
 				F012A6F39E0149F18F564F50 /* Copy Pods Resources */,
-				D668455448B2FFAC9BEF28DD /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -180,21 +179,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		D668455448B2FFAC9BEF28DD /* Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		E080B80F89C34A25B3488E26 /* Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;