finished animated fades at ends

new item dot is now working

Author: Alfredo Uribe

EasyReader/Application/Api/CSFeedItemUpdater.m

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

EasyReader/Application/Controllers/Home/CSHomeViewController.h

@@ -9,6 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "CSBaseViewController.h"
 #import "CSCollectionPageControl.h"
+#import "CSFeedItemCollectionViewDataSource.h"
 
 @class User;
 
@@ -19,8 +20,12 @@
 @property (strong, nonatomic) IBOutlet CSCollectionPageControl *pageControl_itemIndicator;
 @property (nonatomic, strong) UIWebView *feedItemWebView;
 @property (nonatomic, strong) NSMutableSet *feedItems;
-@property User* currentUser;
 
+@property User* currentUser;
+@property CSFeedItemCollectionViewDataSource *feedCollectionViewDataSource;
+@property FeedItem *currentFeedItem;
 @property int collectionCellGoingTo;
 
+- (void)scrollToCurrentFeedItem;
+
 @end

EasyReader/Application/Controllers/Home/CSHomeViewController.m

@@ -17,8 +17,6 @@
 #import "User.h"
 
 @interface CSHomeViewController (){
-  CSFeedItemCollectionViewDataSource *feedCollectionViewDataSource;
-  FeedItem *currentFeedItem;
   NSString *currentURL;
 }
 
@@ -35,6 +33,7 @@ - (void)viewDidLoad
   [super viewDidLoad];
   _feedItems = [[NSMutableSet alloc] init];
   [_pageControl_itemIndicator setUpFadesOnView:[_pageControl_itemIndicator superview]];
+  _pageControl_itemIndicator.controller_owner = self;
   [self setUpCollectionView];
   [self setUpWebView];
   [self setupFeedItemObserver];
@@ -89,14 +88,16 @@ - (void) setupFeedItemObserver
                                         }
 
                                         //redraw the collection with the changes to the feed items
-                                        [feedCollectionViewDataSource sortFeedItems];
+                                        [_feedCollectionViewDataSource sortFeedItems];
                                         [_collectionView_feedItems reloadData];
                                         _pageControl_itemIndicator.numberOfPages = [_feedItems count] < 6 ? [_feedItems count] : 5;
 
-                                        if(currentFeedItem){
+                                        if(_currentFeedItem){
                                           [self scrollToCurrentFeedItem];
-                                          [_pageControl_itemIndicator setPageControllerPageAtIndex:[feedCollectionViewDataSource.sortedFeedItems indexOfObject:currentFeedItem]
+                                          [_pageControl_itemIndicator setPageControllerPageAtIndex:[_feedCollectionViewDataSource.sortedFeedItems indexOfObject:_currentFeedItem]
                                                                                      forCollection:_feedItems];
+                                        } else {
+                                          [_pageControl_itemIndicator setPageControllerPageAtIndex:0 forCollection:_feedItems];
                                         }
                                       }
                                    insertionBlock:nil
@@ -117,26 +118,17 @@ - (void)setUpCollectionView
   User *current = [User current];
   NSSet *feedItems = current.feedItems;
 
-  feedCollectionViewDataSource =
+  _feedCollectionViewDataSource =
       [[CSFeedItemCollectionViewDataSource alloc] initWithFeedItems:feedItems
                                        reusableCellIdentifier:@"feedItemCell"
                                                configureBlock:[self configureFeedItem]];
 
-  self.collectionView_feedItems.dataSource = feedCollectionViewDataSource;
+  self.collectionView_feedItems.dataSource = _feedCollectionViewDataSource;
   self.collectionView_feedItems.delegate = self;
 
 
 }
 
--(void)newItemButton:(id)sender
-{
-  currentFeedItem = [feedCollectionViewDataSource.sortedFeedItems firstObject];
-  [self scrollToCurrentFeedItem];
-  self.collectionCellGoingTo = 0;
-  [_pageControl_itemIndicator setPageControllerPageAtIndex:[feedCollectionViewDataSource.sortedFeedItems indexOfObject:currentFeedItem]
-                                             forCollection:_feedItems];
-}
-
 #pragma mark - IBActions
 
 // Receives left menu link click
@@ -188,8 +180,8 @@ - (void)scrollViewDidEndDecelerating:(UIScrollView *)sender {
     // If we are scrolling in the collectionView only
     if([sender isMemberOfClass:[CSFeedItemCollectionView class]]) {
         // unload the webView if we have moved to a new feedItem
-        if(currentFeedItem != self.collectionView_feedItems.currentFeedItem){
-            currentFeedItem = self.collectionView_feedItems.currentFeedItem;
+        if(_currentFeedItem != self.collectionView_feedItems.currentFeedItem){
+            _currentFeedItem = self.collectionView_feedItems.currentFeedItem;
             [self.feedItemWebView loadHTMLString:@"<html><head></head><body></body></html>" baseURL:nil];
         }
     }
@@ -198,7 +190,7 @@ - (void)scrollViewDidEndDecelerating:(UIScrollView *)sender {
 // Scroll to the currentFeedItem when the feedItems update
 - (void)scrollToCurrentFeedItem
 {
-    NSUInteger index = [feedCollectionViewDataSource.sortedFeedItems indexOfObject:currentFeedItem];
+    NSUInteger index = [_feedCollectionViewDataSource.sortedFeedItems indexOfObject:_currentFeedItem];
     NSIndexPath *indexPath = [NSIndexPath indexPathForRow:index inSection:0];
     [_collectionView_feedItems scrollToItemAtIndexPath:indexPath atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:NO];
 }

EasyReader/Application/Controls/CSCollectionPageControl.h

@@ -7,15 +7,17 @@
 //
 
 #import <UIKit/UIKit.h>
+@class CSHomeViewController;
 
 @interface CSCollectionPageControl : UIPageControl
 
+@property CSHomeViewController *controller_owner;
 @property UIButton *button_newItem;
 @property UIView *view_maskLayer;
 @property UIView *view_leftFade;
 @property UIView *view_rightFade;
 
 - (void)setPageControllerPageAtIndex:(int)index forCollection:(NSSet*)collection;
--(void)setUpFadesOnView:(UIView*)mask;
+- (void)setUpFadesOnView:(UIView*)mask;
 
 @end

EasyReader/Application/Controls/CSCollectionPageControl.m

@@ -7,8 +7,16 @@
 //
 
 #import "CSCollectionPageControl.h"
+#import "CSFeedItemCollectionViewDataSource.h"
+#import "CSHomeViewController.h"
 
 @implementation CSCollectionPageControl
+{
+  float leftFadeOrigin;
+  float rightFadeOrigin;
+  float gradientWidth;
+  float fadeMovement;
+}
 
 - (id)initWithCoder:(NSCoder *)aDecoder
 {
@@ -25,11 +33,25 @@ - (id)initWithCoder:(NSCoder *)aDecoder
   return self;
 }
 
+-(void)newItemButton:(id)sender
+{
+  CSFeedItemCollectionViewDataSource *dataSource = [_controller_owner feedCollectionViewDataSource];
+  [_controller_owner setCurrentFeedItem:[[dataSource sortedFeedItems] firstObject]];
+  [_controller_owner scrollToCurrentFeedItem];
+  _controller_owner.collectionCellGoingTo = 0;
+  [self setPageControllerPageAtIndex:[[dataSource sortedFeedItems]indexOfObject:_controller_owner.currentFeedItem]
+                       forCollection:_controller_owner.feedItems];
+}
+
 -(void)setUpFadesOnView:(UIView*)mask
 {
   _view_maskLayer = [[UIView alloc] init];
+  gradientWidth = 40;
+  fadeMovement = 10;
+  
   _view_leftFade = [[UIView alloc] init];
-  _view_leftFade.frame = CGRectMake(110, 10, 30, 20);
+  _view_leftFade.frame = CGRectMake(110, 10, gradientWidth, 20);
+  leftFadeOrigin = 110;
   _view_leftFade.backgroundColor = [UIColor blackColor];
 
   CAGradientLayer *leftLayer = [CAGradientLayer layer];
@@ -40,7 +62,8 @@ -(void)setUpFadesOnView:(UIView*)mask
   _view_leftFade.layer.mask = leftLayer;
 
   _view_rightFade = [[UIView alloc] init];
-  _view_rightFade.frame = CGRectMake(160, 10, 50, 20);
+  _view_rightFade.frame = CGRectMake(170, 10, gradientWidth, 20);
+  rightFadeOrigin = 170;
   _view_rightFade.backgroundColor = [UIColor blackColor];
 
   CAGradientLayer *rightLayer = [CAGradientLayer layer];
@@ -53,35 +76,31 @@ -(void)setUpFadesOnView:(UIView*)mask
   [_view_maskLayer addSubview:_view_leftFade];
   [_view_maskLayer addSubview:_view_rightFade];
   [mask addSubview:_view_maskLayer];
-  NSLog(@"added?");
 }
 
 - (void)setPageControllerPageAtIndex:(int)index forCollection:(NSSet*)collection
 {
   if ([collection count] < 6){
     self.currentPage = index;
   } else {
-    if( index <= 2 ){
+    if( index < 2 ){
       self.currentPage = index;
-      [_view_leftFade setHidden:YES];
+      [UIView animateWithDuration:.75 animations:^{
+        _view_leftFade.frame = CGRectMake(leftFadeOrigin-(fadeMovement*(2-index)), 10, gradientWidth, 20);
+      }];
     } else if(index > ([collection count]-3) ){
       self.currentPage = 5-([collection count]-index);
-      [_view_rightFade setHidden:YES];
+      [UIView animateWithDuration:.75 animations:^{
+        _view_rightFade.frame = CGRectMake(rightFadeOrigin+(fadeMovement*(3-([collection count]-index))), 10, gradientWidth, 20);
+      }];
     } else {
       self.currentPage = 2;
-      [_view_leftFade setHidden:NO];
-      [_view_rightFade setHidden:NO];
+      [UIView animateWithDuration:.75 animations:^{
+        _view_leftFade.frame = CGRectMake(leftFadeOrigin, 10, gradientWidth, 20);
+        _view_rightFade.frame = CGRectMake(rightFadeOrigin, 10, gradientWidth, 20);
+      }];
     }
   }
 }
 
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect
-{
-    // Drawing code
-}
-*/
-
 @end