Working page controller

now has 5 dots and logic in place to move highlight appropriately

Author: Alfredo Uribe

EasyReader/Application/Api/CSFeedItemUpdater.m

@@ -32,7 +32,7 @@ - (void) start
   [myInvocation setTarget:self];
   [myInvocation setSelector:@selector(requestFiveMinutesOfFeedItems:)];
 
-  int interval = 60 * 1;
+  int interval = 20 * 1;
   [NSTimer scheduledTimerWithTimeInterval:interval invocation:myInvocation repeats:YES];
 }
 

EasyReader/Application/Controllers/Home/CSHomeViewController.h

@@ -15,8 +15,11 @@
 
 @property (weak, nonatomic) IBOutlet UIScrollView *verticalScrollView;
 @property (strong, nonatomic) IBOutlet UIButton *button_leftMenu;
+@property (strong, nonatomic) IBOutlet UIPageControl *pageControl_itemIndicator;
 @property (nonatomic, strong) UIWebView *feedItemWebView;
-@property (nonatomic, strong) NSSet *feedItems;
+@property (nonatomic, strong) NSMutableSet *feedItems;
 @property User* currentUser;
 
+@property int collectionCellGoingTo;
+
 @end

EasyReader/Application/Controllers/Home/CSHomeViewController.m

@@ -32,11 +32,12 @@ @implementation CSHomeViewController
 
 - (void)viewDidLoad
 {
-    [super viewDidLoad];
-    [self setUpCollectionView];
-    [self setUpWebView];
-    [self setupFeedItemObserver];
-    // Do any additional setup after loading the view.
+  _feedItems = [[NSMutableSet alloc] init];
+  [super viewDidLoad];
+  [self setUpCollectionView];
+  [self setUpWebView];
+  [self setupFeedItemObserver];
+  // Do any additional setup after loading the view.
 }
 
 - (void)viewDidLayoutSubviews
@@ -62,6 +63,9 @@ - (void) setupFeedItemObserver
                       for ( Feed *feed in addedFeeds ){
                           [feed observeRelationship:@"feedItems"
                                         changeBlock:^(__weak Feed *feed, NSSet *old, NSSet *new) {
+                                          
+                                          _feedItems = [(CSFeedItemCollectionViewDataSource *)_collectionView_feedItems.dataSource feedItems];
+                                          
                                           if(!new) {
                                             NSLog(@"startup?");
                                           } else {
@@ -72,46 +76,51 @@ - (void) setupFeedItemObserver
                                             [removedFeedItems removeObjectsInArray:[new allObjects]];
 
                                             for( FeedItem *item in removedFeedItems ){
-                                              [[(CSFeedItemCollectionViewDataSource *)_collectionView_feedItems.dataSource feedItems] removeObject:item];
+                                              [_feedItems removeObject:item];
                                             }
 
                                             for( FeedItem *item in addedFeedItems ){
-                                              [[(CSFeedItemCollectionViewDataSource *)_collectionView_feedItems.dataSource feedItems] addObject:item];
+                                              [_feedItems addObject:item];
                                             }
                                           }
 
                                           //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];
+                                            [self setPageControllerPageAtIndex:[feedCollectionViewDataSource.sortedFeedItems indexOfObject:currentFeedItem]];
                                           }
                                         }
                                      insertionBlock:nil
                                        removalBlock:nil
                                    replacementBlock:nil];
                       }
-                      
-                      //properties:@[@"title", @"summary", @"updatedAt", @"publishedAt", @"createdAt", @"image", @"url"]
                   }
                insertionBlock:nil
                  removalBlock:nil
              replacementBlock:nil
      ];
 }
 
+// Sets up collection view on controller start up
 - (void)setUpCollectionView
 {
-    User *current = [User current];
-    NSSet *feedItems = current.feedItems;
-
-    feedCollectionViewDataSource =
-        [[CSFeedItemCollectionViewDataSource alloc] initWithFeedItems:feedItems
-                                         reusableCellIdentifier:@"feedItemCell"
-                                                 configureBlock:[self configureFeedItem]];
-    
-    self.collectionView_feedItems.dataSource = feedCollectionViewDataSource;
-    self.collectionView_feedItems.delegate = self;
+  User *current = [User current];
+  NSSet *feedItems = current.feedItems;
+
+  feedCollectionViewDataSource =
+      [[CSFeedItemCollectionViewDataSource alloc] initWithFeedItems:feedItems
+                                       reusableCellIdentifier:@"feedItemCell"
+                                               configureBlock:[self configureFeedItem]];
+  
+  self.collectionView_feedItems.dataSource = feedCollectionViewDataSource;
+  self.collectionView_feedItems.delegate = self;
+  
+  self.collectionView_feedItems.pagingEnabled = YES;
+  self.pageControl_itemIndicator.currentPage = 0;
 }
 
 
@@ -181,7 +190,29 @@ - (void)scrollToCurrentFeedItem
     [_collectionView_feedItems scrollToItemAtIndexPath:indexPath atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:NO];
 }
 
--(void)loadFeedItemWebView
+
+- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath
+{
+  int newIndex = indexPath.row+((indexPath.row-self.collectionCellGoingTo)*-1);
+  [self setPageControllerPageAtIndex:newIndex];
+}
+
+- (void)setPageControllerPageAtIndex:(int)index
+{
+  if ([_feedItems count] < 6){
+    _pageControl_itemIndicator.currentPage = index;
+  } else {
+    if( index < 3 ){
+      _pageControl_itemIndicator.currentPage = index;
+    } else if(index > ([_feedItems count]-3) ){
+      _pageControl_itemIndicator.currentPage = 5-([_feedItems count]-index);
+    } else {
+      _pageControl_itemIndicator.currentPage = 2;
+    }
+  }
+}
+
+- (void)loadFeedItemWebView
 {
     // Check if this is a new url
     if(currentURL != self.collectionView_feedItems.currentFeedItem.url){

EasyReader/Application/Controllers/Home/FeedItemCollectionView/CSFeedItemCollectionViewDataSource.m

@@ -7,6 +7,7 @@
 //
 
 #import "CSFeedItemCollectionViewDataSource.h"
+#import "CSHomeViewController.h"
 #import "FeedItem.h"
 #import "CSFeedItemCell.h"
 
@@ -87,9 +88,10 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
                                                                          forIndexPath:indexPath];
 
   FeedItem *item = [_sortedFeedItems objectAtIndex:indexPath.row];
-  
   _configureFeedItemCell(cell, item);
 
+  [(CSHomeViewController*)collectionView.delegate setCollectionCellGoingTo:indexPath.row];
+  
   return cell;
 }
 

EasyReader/Application/Models/User.m

@@ -24,7 +24,7 @@ - (NSSet *)feedItems
 
     for (Feed *feed in self.feeds)
     {
-        [feedItems setByAddingObjectsFromSet:feed.feedItems];
+        [feedItems addObjectsFromArray:[feed.feedItems allObjects]];
     }
 
     return feedItems;

EasyReader/Application/Views/Main_iPhone.storyboard

@@ -132,7 +132,7 @@
                                             <action selector="buttonLeftMenu_touchUpInside_goToMenu:" destination="Hgn-0q-Z1W" eventType="touchUpInside" id="hMD-Og-FDZ"/>
                                         </connections>
                                     </button>
-                                    <pageControl opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="3" translatesAutoresizingMaskIntoConstraints="NO" id="vdW-Yb-aAb">
+                                    <pageControl opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="5" translatesAutoresizingMaskIntoConstraints="NO" id="vdW-Yb-aAb">
                                         <rect key="frame" x="0.0" y="531" width="320" height="37"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -152,6 +152,7 @@
                     <connections>
                         <outlet property="button_leftMenu" destination="wb1-Na-kaO" id="0oK-RY-cyj"/>
                         <outlet property="collectionView_feedItems" destination="xvT-99-V3u" id="kb5-it-zd3"/>
+                        <outlet property="pageControl_itemIndicator" destination="vdW-Yb-aAb" id="8X6-MF-OZ3"/>
                         <outlet property="verticalScrollView" destination="EWA-9Z-pb1" id="yj7-Ir-WAm"/>
                     </connections>
                 </viewController>