clean up ASCollectionView example project (facebookarchive#2384)

Hannah Troisi · web-flow · commit 0dd170dde4ac · 2016-10-20T17:10:20.000-07:00
diff --git a/examples/ASCollectionView/Sample/ItemNode.m b/examples/ASCollectionView/Sample/ItemNode.m
@@ -22,10 +22,12 @@ @implementation ItemNode
 - (instancetype)initWithString:(NSString *)string
 {
   self = [super init];
+  
   if (self != nil) {
     self.text = string;
     [self updateBackgroundColor];
   }
+  
   return self;
 }
 
@@ -43,12 +45,14 @@ - (void)updateBackgroundColor
 - (void)setSelected:(BOOL)selected
 {
   [super setSelected:selected];
+  
   [self updateBackgroundColor];
 }
 
 - (void)setHighlighted:(BOOL)highlighted
 {
   [super setHighlighted:highlighted];
+  
   [self updateBackgroundColor];
 }
 
diff --git a/examples/ASCollectionView/Sample/PresentingViewController.m b/examples/ASCollectionView/Sample/PresentingViewController.m
@@ -30,7 +30,10 @@ - (void)viewDidLoad
 {
   [super viewDidLoad];
   
-  self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Push Details" style:UIBarButtonItemStylePlain target:self action:@selector(pushNewViewController)];
+  self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Push Details"
+                                                                            style:UIBarButtonItemStylePlain
+                                                                           target:self
+                                                                           action:@selector(pushNewViewController)];
 }
 
 - (void)pushNewViewController
diff --git a/examples/ASCollectionView/Sample/SupplementaryNode.m b/examples/ASCollectionView/Sample/SupplementaryNode.m
@@ -32,12 +32,14 @@ @implementation SupplementaryNode
 - (instancetype)initWithText:(NSString *)text
 {
   self = [super init];
+  
   if (self != nil) {
     _textNode = [[ASTextNode alloc] init];
     _textNode.attributedText = [[NSAttributedString alloc] initWithString:text
                                                                  attributes:[self textAttributes]];
     [self addSubnode:_textNode];
   }
+  
   return self;
 }
 
@@ -47,6 +49,7 @@ - (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
   center.centeringOptions = ASCenterLayoutSpecCenteringXY;
   center.child = self.textNode;
   UIEdgeInsets insets = UIEdgeInsetsMake(kInsets, kInsets, kInsets, kInsets);
+  
   return [ASInsetLayoutSpec insetLayoutSpecWithInsets:insets child:center];
 }
 
diff --git a/examples/ASCollectionView/Sample/ViewController.m b/examples/ASCollectionView/Sample/ViewController.m
@@ -21,18 +21,17 @@
 #import "SupplementaryNode.h"
 #import "ItemNode.h"
 
-@interface ViewController ()
+@interface ViewController () <ASCollectionDataSource, ASCollectionViewDelegateFlowLayout>
+
 @property (nonatomic, strong) ASCollectionView *collectionView;
 @property (nonatomic, strong) NSArray *data;
-@end
-
-@interface ViewController () <ASCollectionDataSource, ASCollectionViewDelegateFlowLayout>
 
 @end
 
-
 @implementation ViewController
 
+#pragma mark - Lifecycle
+
 - (void)dealloc
 {
   self.collectionView.asyncDataSource = nil;
@@ -52,20 +51,24 @@ - (void)viewDidLoad
   // This method is deprecated because we reccommend using ASCollectionNode instead of ASCollectionView.
   // This functionality & example project remains for users who insist on using ASCollectionView.
   self.collectionView = [[ASCollectionView alloc] initWithFrame:self.view.bounds collectionViewLayout:layout];
-  self.collectionView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
   self.collectionView.asyncDataSource = self;
   self.collectionView.asyncDelegate = self;
+  
+  self.collectionView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
   self.collectionView.backgroundColor = [UIColor whiteColor];
   
   // This method is deprecated because we reccommend using ASCollectionNode instead of ASCollectionView.
   // This functionality & example project remains for users who insist on using ASCollectionView.
   [self.collectionView registerSupplementaryNodeOfKind:UICollectionElementKindSectionHeader];
   [self.collectionView registerSupplementaryNodeOfKind:UICollectionElementKindSectionFooter];
+  
   [self.view addSubview:self.collectionView];
   
 #if !SIMULATE_WEB_RESPONSE
   self.navigationItem.leftItemsSupplementBackButton = YES;
-  self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemRefresh target:self action:@selector(reloadTapped)];
+  self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemRefresh
+                                                                                        target:self
+                                                                                        action:@selector(reloadTapped)];
 #endif
 
 #if SIMULATE_WEB_RESPONSE
@@ -94,15 +97,16 @@ - (void)viewDidLoad
 #endif
 }
 
+#pragma mark - Button Actions
+
 - (void)reloadTapped
 {
   // This method is deprecated because we reccommend using ASCollectionNode instead of ASCollectionView.
   // This functionality & example project remains for users who insist on using ASCollectionView.
   [self.collectionView reloadData];
 }
 
-#pragma mark -
-#pragma mark ASCollectionView data source.
+#pragma mark - ASCollectionView Data Source
 
 - (ASCellNodeBlock)collectionView:(ASCollectionView *)collectionView nodeBlockForItemAtIndexPath:(NSIndexPath *)indexPath;
 {

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,12 @@ @implementation ItemNode`
`22`	`22`	`- (instancetype)initWithString:(NSString *)string`
`23`	`23`	`{`
`24`	`24`	`self = [super init];`
	`25`	`+`
`25`	`26`	`if (self != nil) {`
`26`	`27`	`self.text = string;`
`27`	`28`	`[self updateBackgroundColor];`
`28`	`29`	`}`
	`30`	`+`
`29`	`31`	`return self;`
`30`	`32`	`}`
`31`	`33`
`@@ -43,12 +45,14 @@ - (void)updateBackgroundColor`
`43`	`45`	`- (void)setSelected:(BOOL)selected`
`44`	`46`	`{`
`45`	`47`	`[super setSelected:selected];`
	`48`	`+`
`46`	`49`	`[self updateBackgroundColor];`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`- (void)setHighlighted:(BOOL)highlighted`
`50`	`53`	`{`
`51`	`54`	`[super setHighlighted:highlighted];`
	`55`	`+`
`52`	`56`	`[self updateBackgroundColor];`
`53`	`57`	`}`
`54`	`58`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,10 @@ - (void)viewDidLoad`
`30`	`30`	`{`
`31`	`31`	`[super viewDidLoad];`
`32`	`32`
`33`		`- self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Push Details" style:UIBarButtonItemStylePlain target:self action:@selector(pushNewViewController)];`
	`33`	`+ self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Push Details"`
	`34`	`+ style:UIBarButtonItemStylePlain`
	`35`	`+ target:self`
	`36`	`+ action:@selector(pushNewViewController)];`
`34`	`37`	`}`
`35`	`38`
`36`	`39`	`- (void)pushNewViewController`
Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,14 @@ @implementation SupplementaryNode`
`32`	`32`	`- (instancetype)initWithText:(NSString *)text`
`33`	`33`	`{`
`34`	`34`	`self = [super init];`
	`35`	`+`
`35`	`36`	`if (self != nil) {`
`36`	`37`	`_textNode = [[ASTextNode alloc] init];`
`37`	`38`	`_textNode.attributedText = [[NSAttributedString alloc] initWithString:text`
`38`	`39`	`attributes:[self textAttributes]];`
`39`	`40`	`[self addSubnode:_textNode];`
`40`	`41`	`}`
	`42`	`+`
`41`	`43`	`return self;`
`42`	`44`	`}`
`43`	`45`
`@@ -47,6 +49,7 @@ - (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize`
`47`	`49`	`center.centeringOptions = ASCenterLayoutSpecCenteringXY;`
`48`	`50`	`center.child = self.textNode;`
`49`	`51`	`UIEdgeInsets insets = UIEdgeInsetsMake(kInsets, kInsets, kInsets, kInsets);`
	`52`	`+`
`50`	`53`	`return [ASInsetLayoutSpec insetLayoutSpecWithInsets:insets child:center];`
`51`	`54`	`}`
`52`	`55`