New ASDelegateProxy class to unify logic for Table & Collection forwarding. Fix dealloc-during-animation crash.

2025-12-22 14:20:20 +00:00 · 2015-12-23 20:01:52 -08:00
parent 928c440b4c
commit ca57059322
14 changed files with 382 additions and 233 deletions
--- a/examples/ASCollectionView/Sample.xcodeproj/project.pbxproj
+++ b/examples/ASCollectionView/Sample.xcodeproj/project.pbxproj
@@ -15,6 +15,7 @@
 		AC3C4A6A1A11F47200143C57 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AC3C4A691A11F47200143C57 /* ViewController.m */; };
 		AC3C4A8E1A11F80C00143C57 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AC3C4A8D1A11F80C00143C57 /* Images.xcassets */; };
 		FABD6D156A3EB118497E5CE6 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F02BAF78E68BC56FD8C161B7 /* libPods.a */; };
+		FC3FCA801C2B1564009F6D6D /* PresentingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC3FCA7F1C2B1564009F6D6D /* PresentingViewController.m */; };
 /* End PBXBuildFile section */

 /* Begin PBXFileReference section */
@@ -34,6 +35,8 @@
 		AC3C4A8D1A11F80C00143C57 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		CD1ABB23007FEDB31D8C1978 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
 		F02BAF78E68BC56FD8C161B7 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		FC3FCA7E1C2B1564009F6D6D /* PresentingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PresentingViewController.h; sourceTree = "<group>"; };
+		FC3FCA7F1C2B1564009F6D6D /* PresentingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PresentingViewController.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -82,6 +85,8 @@
 				AC3C4A661A11F47200143C57 /* AppDelegate.m */,
 				AC3C4A681A11F47200143C57 /* ViewController.h */,
 				AC3C4A691A11F47200143C57 /* ViewController.m */,
+				FC3FCA7E1C2B1564009F6D6D /* PresentingViewController.h */,
+				FC3FCA7F1C2B1564009F6D6D /* PresentingViewController.m */,
 				AC3C4A8D1A11F80C00143C57 /* Images.xcassets */,
 				AC3C4A611A11F47200143C57 /* Supporting Files */,
 				9B92C87F1BC17D3000EE46B2 /* SupplementaryNode.h */,
@@ -125,7 +130,6 @@
 				AC3C4A5B1A11F47200143C57 /* Frameworks */,
 				AC3C4A5C1A11F47200143C57 /* Resources */,
 				A6902C454C7661D0D277AC62 /* Copy Pods Resources */,
-				EC37EEC9933F5786936BFE7C /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -196,21 +200,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		EC37EEC9933F5786936BFE7C /* 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;
-		};
 		F868CFBB21824CC9521B6588 /* Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -236,6 +225,7 @@
 				25FDEC921BF31EE700CEB123 /* ItemNode.m in Sources */,
 				AC3C4A6A1A11F47200143C57 /* ViewController.m in Sources */,
 				9B92C8811BC17D3000EE46B2 /* SupplementaryNode.m in Sources */,
+				FC3FCA801C2B1564009F6D6D /* PresentingViewController.m in Sources */,
 				AC3C4A671A11F47200143C57 /* AppDelegate.m in Sources */,
 				AC3C4A641A11F47200143C57 /* main.m in Sources */,
 			);
--- a/examples/ASCollectionView/Sample.xcworkspace/contents.xcworkspacedata
+++ b/examples/ASCollectionView/Sample.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:Sample.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>
--- a/examples/ASCollectionView/Sample/AppDelegate.h
+++ b/examples/ASCollectionView/Sample/AppDelegate.h
@@ -11,6 +11,8 @@

 #import <UIKit/UIKit.h>

+#define SIMULATE_WEB_RESPONSE 0
+
@interface AppDelegate : UIResponder <UIApplicationDelegate>

@property (strong, nonatomic) UIWindow *window;
--- a/examples/ASCollectionView/Sample/AppDelegate.m
+++ b/examples/ASCollectionView/Sample/AppDelegate.m
@@ -11,6 +11,7 @@

 #import "AppDelegate.h"

+#import "PresentingViewController.h"
 #import "ViewController.h"

@implementation AppDelegate
@@ -31,10 +32,14 @@
 - (void)pushNewViewControllerAnimated:(BOOL)animated
 {
  UINavigationController *navController = (UINavigationController *)self.window.rootViewController;
-  
+
+#if SIMULATE_WEB_RESPONSE
+  UIViewController *viewController = [[PresentingViewController alloc] init];
+#else
  UIViewController *viewController = [[ViewController alloc] init];
  viewController.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Push Another Copy" style:UIBarButtonItemStylePlain target:self action:@selector(pushNewViewController)];
-
+#endif
+  
  [navController pushViewController:viewController animated:animated];
 }

--- a/examples/ASCollectionView/Sample/PresentingViewController.h
+++ b/examples/ASCollectionView/Sample/PresentingViewController.h
@@ -0,0 +1,13 @@
+//
+//  PresentingViewController.h
+//  Sample
+//
+//  Created by Tom King on 12/23/15.
+//  Copyright © 2015 Facebook. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface PresentingViewController : UIViewController
+
+@end
--- a/examples/ASCollectionView/Sample/PresentingViewController.m
+++ b/examples/ASCollectionView/Sample/PresentingViewController.m
@@ -0,0 +1,30 @@
+//
+//  PresentingViewController.m
+//  Sample
+//
+//  Created by Tom King on 12/23/15.
+//  Copyright © 2015 Facebook. All rights reserved.
+//
+
+#import "PresentingViewController.h"
+#import "ViewController.h"
+
+@interface PresentingViewController ()
+
+@end
+
+@implementation PresentingViewController
+
+- (void)viewDidLoad
+{
+  [super viewDidLoad];
+  self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Push Details" style:UIBarButtonItemStylePlain target:self action:@selector(pushNewViewController)];
+}
+
+- (void)pushNewViewController
+{
+  ViewController *controller = [[ViewController alloc] init];
+  [self.navigationController pushViewController:controller animated:true];
+}
+
+@end
--- a/examples/ASCollectionView/Sample/ViewController.m
+++ b/examples/ASCollectionView/Sample/ViewController.m
@@ -18,6 +18,7 @@
@interface ViewController () <ASCollectionViewDataSource, ASCollectionViewDelegateFlowLayout>
 {
  ASCollectionView *_collectionView;
+  NSArray *_data;
 }

@end
@@ -37,7 +38,7 @@
  layout.headerReferenceSize = CGSizeMake(50.0, 50.0);
  layout.footerReferenceSize = CGSizeMake(50.0, 50.0);
  
-  _collectionView = [[ASCollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout asyncDataFetching:YES];
+  _collectionView = [[ASCollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
  _collectionView.asyncDataSource = self;
  _collectionView.asyncDelegate = self;
  _collectionView.backgroundColor = [UIColor whiteColor];
@@ -45,8 +46,10 @@
  [_collectionView registerSupplementaryNodeOfKind:UICollectionElementKindSectionHeader];
  [_collectionView registerSupplementaryNodeOfKind:UICollectionElementKindSectionFooter];
  
+#if !SIMULATE_WEB_RESPONSE
  self.navigationItem.leftItemsSupplementBackButton = YES;
  self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemRefresh target:self action:@selector(reloadTapped)];
+#endif
  
  return self;
 }
@@ -56,6 +59,31 @@
  [super viewDidLoad];
  
  [self.view addSubview:_collectionView];
+
+#if SIMULATE_WEB_RESPONSE
+  __weak typeof(self) weakSelf = self;
+  void(^mockWebService)() = ^{
+    NSLog(@"ViewController \"got data from a web service\"");
+    ViewController *strongSelf = weakSelf;
+    if (strongSelf != nil)
+    {
+      NSLog(@"ViewController is not nil");
+      strongSelf->_data = [[NSArray alloc] init];
+      [strongSelf->_collectionView performBatchUpdates:^{
+        [strongSelf->_collectionView insertSections:[[NSIndexSet alloc] initWithIndexesInRange:NSMakeRange(0, 100)]];
+      } completion:nil];
+      NSLog(@"ViewController finished updating collectionView");
+    }
+    else {
+      NSLog(@"ViewController is nil - won't update collectionView");
+    }
+  };
+  
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), mockWebService);
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    [self.navigationController popViewControllerAnimated:YES];
+  });
+#endif
 }

 - (void)viewWillLayoutSubviews
@@ -101,7 +129,11 @@

 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
 {
+#if SIMULATE_WEB_RESPONSE
+  return _data == nil ? 0 : 100;
+#else
  return 100;
+#endif
 }

 - (void)collectionViewLockDataSource:(ASCollectionView *)collectionView
@@ -125,4 +157,11 @@
  return UIEdgeInsetsMake(20.0, 20.0, 20.0, 20.0);
 }

+#if SIMULATE_WEB_RESPONSE
+-(void)dealloc
+{
+  NSLog(@"ViewController is deallocing");
+}
+#endif
+
@end