[#67874900] sorted feedItems by date and auto scroll to currentFeedItem

Author: Michael Beattie

EasyReader/Application/Controllers/Home/CSHomeViewController.h

@@ -16,7 +16,7 @@
 @property (weak, nonatomic) IBOutlet UIScrollView *verticalScrollView;
 @property (strong, nonatomic) IBOutlet UIButton *button_leftMenu;
 @property (nonatomic, strong) UIWebView *feedItemWebView;
-@property (nonatomic, strong) NSMutableArray *feedItems;
+@property (nonatomic, strong) NSSet *feedItems;
 @property User* currentUser;
 
 @end

EasyReader/Application/Controllers/Home/CSHomeViewController.m

@@ -80,8 +80,11 @@ - (void) setupFeedItemObserver
                                           }
 
                                           //redraw the collection with the changes to the feed items
+                                          [feedCollectionViewDataSource sortFeedItems];
                                           [_collectionView_feedItems reloadData];
-                                          
+                                          if(currentFeedItem){
+                                            [self scrollToCurrentFeedItem];
+                                          }
                                         }
                                      insertionBlock:nil
                                        removalBlock:nil
@@ -98,13 +101,9 @@ - (void) setupFeedItemObserver
 
 - (void)setUpCollectionView
 {
-//    User *current = [User current];
-//    
-//    NSSet *feedItems = current.feedItems;
+    User *current = [User current];
+    NSSet *feedItems = current.feedItems;
 
-    NSArray *feedItems = [FeedItem MR_findAll];
-    FeedItem *first = feedItems[0];
-    NSLog(@"%@", first.name);
     feedCollectionViewDataSource =
         [[CSFeedItemCollectionViewDataSource alloc] initWithFeedItems:feedItems
                                          reusableCellIdentifier:@"feedItemCell"
@@ -173,6 +172,14 @@ - (void)scrollViewDidEndDecelerating:(UIScrollView *)sender {
     }
 }
 
+// Scroll to the currentFeedItem when the feedItems update
+- (void)scrollToCurrentFeedItem
+{
+    NSUInteger index = [feedCollectionViewDataSource.sortedFeedItems indexOfObject:currentFeedItem];
+    NSIndexPath *indexPath = [NSIndexPath indexPathForRow:index inSection:0];
+    [_collectionView_feedItems scrollToItemAtIndexPath:indexPath atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:NO];
+}
+
 -(void)loadFeedItemWebView
 {
     // Check if this is a new url

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

@@ -23,11 +23,14 @@ typedef void (^configureFeedItemCell)(CSFeedItemCell *, FeedItem *);
  * @param The identifier to use to dequeue reusable cells for the collection view
  * @param configureFeedItemCell A block which will configure the cell based on the given FeedItem
  */
-- (id)initWithFeedItems:(NSArray *)feedItems
+- (id)initWithFeedItems:(NSSet *)feedItems
  reusableCellIdentifier:(NSString *)reusableCellIdentifier
          configureBlock:(configureFeedItemCell)configureFeedItemCell;
 
+- (void)sortFeedItems;
+
 /// The FeedItems for this data source
 @property (nonatomic, strong) NSMutableSet *feedItems;
+@property (nonatomic, strong) NSArray *sortedFeedItems;
 
 @end

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

@@ -22,32 +22,35 @@ @implementation CSFeedItemCollectionViewDataSource
 /**
  * Sets each instance variable to the values in the given parameters
  */
-- (id)initWithFeedItems:(NSArray *)feedItems
+- (id)initWithFeedItems:(NSSet *)feedItems
  reusableCellIdentifier:(NSString *)reusableCellIdentifier
          configureBlock:(void (^)(CSFeedItemCell *, FeedItem *))configureFeedItemCell
 {
   self = [super init];
 
   if (self)
   {
-    _feedItems = [NSMutableSet setWithArray:feedItems];
+    _feedItems = [NSMutableSet setWithSet:feedItems];
     _reusableCellIdentifier = reusableCellIdentifier;
     _configureFeedItemCell = configureFeedItemCell;
+    
+    _sortedFeedItems = [[NSArray alloc] init];
+    [self sortFeedItems];
   }
-  
+    
   return self;
 }
 
+// Sort feedItems by updatedAt
 - (void)sortFeedItems
 {
-    NSMutableArray *sortableArray = [NSMutableArray arrayWithArray:[self.feedItems allObjects]];
+    NSArray *sortableArray = [NSArray arrayWithArray:[self.feedItems allObjects]];
 
     NSSortDescriptor *sortDescriptor;
     sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"updatedAt"
                                                  ascending:NO];
     NSArray *sortDescriptors = [NSArray arrayWithObject:sortDescriptor];
-    NSArray *sortedArray;
-    sortedArray = [sortableArray sortedArrayUsingDescriptors:sortDescriptors];
+    self.sortedFeedItems = [sortableArray sortedArrayUsingDescriptors:sortDescriptors];
 }
 
 /**
@@ -69,7 +72,7 @@ - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
  */
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
-  return [_feedItems count];
+  return [_sortedFeedItems count];
 }
 
 /**
@@ -83,7 +86,7 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
   CSFeedItemCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:_reusableCellIdentifier
                                                                          forIndexPath:indexPath];
 
-  FeedItem *item = [_feedItems allObjects][indexPath.row];
+  FeedItem *item = [_sortedFeedItems objectAtIndex:indexPath.row];
 
   _configureFeedItemCell(cell, item);