Retab

Author: Joey Lorich

EasyReader/Application/Controllers/Home/CSHomeViewController.m

@@ -70,6 +70,10 @@ -(BOOL)shouldAutorotate {
 //- (void) blockForSelector
 //{
 //                           }
+
+
+#pragma mark Observations
+
 /**
  * Assigns observers for feeds
  */
@@ -89,80 +93,80 @@ - (void) setupFeedsObserver
  */
 -(ObserverBlock) feedsDidChange
 {
-  ObserverBlock block = ^void(__weak CSHomeViewController *self, NSSet *old, NSSet *new) {
-    NSMutableArray *addedFeeds = [[new allObjects] mutableCopy];
-    NSMutableArray *removedFeeds = [[old allObjects] mutableCopy];
-    
-    [addedFeeds removeObjectsInArray:[old allObjects]];
-    [removedFeeds removeObjectsInArray:[new allObjects]];
-    
-    for ( Feed *feed in removedFeeds ){
-      [feed removeAllObservations];
-      
-      // Remove feed items associated to the feed
-      for( FeedItem *item in feed.feedItems ){
-        [_feedItems removeObject:item];
-      }
-      
-      // Delete feed which will cascade delete feed items
-      [feed deleteEntity];
-      [[NSManagedObjectContext defaultContext] saveToPersistentStoreAndWait];
-    }
+    ObserverBlock block = ^void(__weak CSHomeViewController *self, NSSet *old, NSSet *new) {
+        NSMutableArray *addedFeeds = [[new allObjects] mutableCopy];
+        NSMutableArray *removedFeeds = [[old allObjects] mutableCopy];
+        
+        [addedFeeds removeObjectsInArray:[old allObjects]];
+        [removedFeeds removeObjectsInArray:[new allObjects]];
+        
+        for ( Feed *feed in removedFeeds ){
+            [feed removeAllObservations];
+            
+            // Remove feed items associated to the feed
+            for( FeedItem *item in feed.feedItems ){
+                [_feedItems removeObject:item];
+            }
+            
+            // Delete feed which will cascade delete feed items
+            [feed deleteEntity];
+            [[NSManagedObjectContext defaultContext] saveToPersistentStoreAndWait];
+        }
+        
+        for ( Feed *feed in addedFeeds ){
+            [feed observeRelationship:@"feedItems"
+                          changeBlock:[self feedItemsDidChange]
+                       insertionBlock:nil
+                         removalBlock:nil
+                     replacementBlock:nil];
+        }
+        //redraw the collection with the changes to the feed items
+        [_feedCollectionViewDataSource sortFeedItems];
+        [_collectionView_feedItems reloadData];
+        _pageControl_itemIndicator.numberOfPages = [_feedItems count] < 6 ? [_feedItems count] : 5;
+        
+        if(_currentFeedItem){
+            [self scrollToCurrentFeedItem];
+            [_pageControl_itemIndicator setPageControllerPageAtIndex:[_feedCollectionViewDataSource.sortedFeedItems indexOfObject:_currentFeedItem]
+                                                       forCollection:_feedItems];
+        } else {
+            [_pageControl_itemIndicator setPageControllerPageAtIndex:0 forCollection:_feedItems];
+        }
+    };
 
-    for ( Feed *feed in addedFeeds ){
-      [feed observeRelationship:@"feedItems"
-                    changeBlock:[self feedItemsDidChange]
-                 insertionBlock:nil
-                   removalBlock:nil
-               replacementBlock:nil];
-    }
-    //redraw the collection with the changes to the feed items
-    [_feedCollectionViewDataSource sortFeedItems];
-    [_collectionView_feedItems reloadData];
-    _pageControl_itemIndicator.numberOfPages = [_feedItems count] < 6 ? [_feedItems count] : 5;
-      
-    if(_currentFeedItem){
-      [self scrollToCurrentFeedItem];
-      [_pageControl_itemIndicator setPageControllerPageAtIndex:[_feedCollectionViewDataSource.sortedFeedItems indexOfObject:_currentFeedItem]
-                                                 forCollection:_feedItems];
-    } else {
-      [_pageControl_itemIndicator setPageControllerPageAtIndex:0 forCollection:_feedItems];
-    }
-  };
-  
-  return block;
+    return block;
 }
 
 /**
  * Called when feedItems array on observed feeds change, shows new item button on page control
  */
 -(ObserverBlock) feedItemsDidChange
 {
-  ObserverBlock block = ^void(__weak CSHomeViewController *self, NSSet *old, NSSet *new) {
-    _feedItems = [(CSFeedItemCollectionViewDataSource *)_collectionView_feedItems.dataSource feedItems];
-
-    if(!new) {
-      NSLog(@"There are no feeds here");
-    } else {
-      NSMutableArray *addedFeedItems = [[new allObjects] mutableCopy];
-      NSMutableArray *removedFeedItems = [[old allObjects] mutableCopy];
-      
-      [addedFeedItems removeObjectsInArray:[old allObjects]];
-      [removedFeedItems removeObjectsInArray:[new allObjects]];
-      
-      for( FeedItem *item in removedFeedItems ){
-        [_feedItems removeObject:item];
-      }
-      
-      for( FeedItem *item in addedFeedItems ){
-        [_feedItems addObject:item];
-      }
-      
-      [_pageControl_itemIndicator.button_newItem setHidden:NO];
-    }
-  };
-  
-  return block;
+    ObserverBlock block = ^void(__weak CSHomeViewController *self, NSSet *old, NSSet *new) {
+        _feedItems = [(CSFeedItemCollectionViewDataSource *)_collectionView_feedItems.dataSource feedItems];
+        
+        if(!new) {
+            NSLog(@"There are no feeds here");
+        } else {
+            NSMutableArray *addedFeedItems = [[new allObjects] mutableCopy];
+            NSMutableArray *removedFeedItems = [[old allObjects] mutableCopy];
+            
+            [addedFeedItems removeObjectsInArray:[old allObjects]];
+            [removedFeedItems removeObjectsInArray:[new allObjects]];
+            
+            for( FeedItem *item in removedFeedItems ){
+                [_feedItems removeObject:item];
+            }
+            
+            for( FeedItem *item in addedFeedItems ){
+                [_feedItems addObject:item];
+            }
+            
+            [_pageControl_itemIndicator.button_newItem setHidden:NO];
+        }
+    };
+    
+    return block;
 }
 
 #pragma mark - IBActions
@@ -181,7 +185,7 @@ -(void)setUpVerticalScrollView{
     NSInteger width = self.verticalScrollView.frame.size.width;
     NSInteger height = self.verticalScrollView.frame.size.height;
     self.verticalScrollView.contentSize = CGSizeMake(width, height*2);
-  
+    
     self.verticalScrollView.pagingEnabled =YES;
     self.verticalScrollView.delegate = self;
 }
@@ -193,7 +197,7 @@ - (void)setUpCollectionView
 {
     //    NSArray *feedItems = [FeedItem MR_findAll];
     NSSet *feedItems = _currentUser.feedItems;
-  
+    
     _feedCollectionViewDataSource =
     [[CSFeedItemCollectionViewDataSource alloc] initWithFeedItems:feedItems
                                            reusableCellIdentifier:@"feedItemCell"