refresh spinner

edge hits for horizontal scrolling

Author: Alfredo Uribe

EasyReader.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 #import <UIKit/UIKit.h>
 #import "FeedItem.h"
+#import "EZRHomeCollectionViewDelegate.h"
 
 @class EZRFeedItemCollectionView;
 
@@ -25,11 +26,14 @@
  */
 @interface EZRFeedItemCollectionView : UICollectionView
 
+@property UIActivityIndicatorView *indicator;
+
 /// The feed item that is currently focused
 @property (nonatomic, readonly) FeedItem *currentFeedItem;
 
 /// The curent visible page index
 @property (nonatomic, readonly) NSInteger currentPageIndex;
 
+@property (nonatomic, weak) EZRHomeCollectionViewDelegate* delegate;
 
 @end

EasyReader/Application/Controllers/Home/CollectionView/EZRFeedItemCollectionView.h

@@ -8,6 +8,7 @@
 
 #import "EZRFeedItemCollectionView.h"
 #import "EZRFeedItemCollectionViewCell.h"
+#import "EZRHomeViewController.h"
 
 @implementation EZRFeedItemCollectionView
 {
@@ -36,9 +37,49 @@ - (id)initWithCoder:(NSCoder *)aDecoder {
         self.pagingEnabled = YES;
     }
 
+    [self setupTapRecognizer];
+    [self setupRefreshIndicator];
+    
     return self;
 }
 
+- (void)setupTapRecognizer {
+    UITapGestureRecognizer *singleTapGestureRecognizer =
+    [[UITapGestureRecognizer alloc] initWithTarget:self
+                                            action:@selector(singleTap:)];
+    singleTapGestureRecognizer.numberOfTapsRequired = 1;
+    singleTapGestureRecognizer.enabled = YES;
+    singleTapGestureRecognizer.cancelsTouchesInView = NO;
+    [self addGestureRecognizer:singleTapGestureRecognizer];
+}
+
+- (void)setupRefreshIndicator {
+    self.indicator = [[UIActivityIndicatorView alloc]initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
+    self.indicator.frame = CGRectMake(10.0, ([self frame].size.height-40.0)/2, 40.0, 40.0);
+    [self addSubview:self.indicator];
+    [self bringSubviewToFront:self.indicator];
+    [UIApplication sharedApplication].networkActivityIndicatorVisible = TRUE;
+    self.delegate.isRefreshing = NO;
+}
+
+- (void)singleTap:(UITapGestureRecognizer *)gesture {
+    float viewWidth = [self frame].size.width;
+    float x = [gesture locationInView:self].x - (viewWidth*[self currentPageIndex]);
+    EZRHomeViewController *controller = self.delegate.controller;
+    
+    if (x <= viewWidth/4 && [self currentPageIndex] != 0) {
+        [self scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:[self currentPageIndex]-1 inSection:0]
+                     atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally
+                             animated:YES];
+    } else if (x >= (viewWidth*3)/4 &&
+               [self currentPageIndex] != [[[controller currentFeedsProvider] feedItems] count]-1) {
+        [self scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:[self currentPageIndex]+1 inSection:0]
+                     atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally
+                             animated:YES];
+    }
+}
+
+
 - (void)layoutSubviews {
     [super layoutSubviews];
 

EasyReader/Application/Controllers/Home/CollectionView/EZRFeedItemCollectionView.m

@@ -16,4 +16,8 @@
  */
 @interface EZRHomeCollectionViewDelegate : NSObject <UICollectionViewDelegate, EZRFeedItemCollectionViewCellDelegate>
 
+@property (nonatomic, weak) IBOutlet EZRHomeViewController *controller;
+
+@property BOOL isRefreshing;
+
 @end

EasyReader/Application/Controllers/Home/CollectionView/EZRHomeCollectionViewDelegate.h

@@ -24,8 +24,6 @@ - (void)prefetchImagesNearIndex:(NSInteger)currentPageIndex count:(NSInteger)cou
 
 @interface EZRHomeCollectionViewDelegate ()
 
-@property (nonatomic, weak) IBOutlet EZRHomeViewController *controller;
-
 @property (nonatomic, weak) IBOutlet EZRFeedItemCollectionView *collectionView;
 
 @property (nonatomic, weak) IBOutlet UIScrollView *scrollView_vertical;
@@ -39,7 +37,6 @@ @implementation EZRHomeCollectionViewDelegate
     BOOL _scrollingAtStart;
 }
 
-
 /**
  * Fires when the collection view scrolls
  * Determines the current page index, and if it's changed it sets the appropriate page control
@@ -73,10 +70,15 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
 
 -(void) scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate
 {
-    if (_scrollingAtStart) {
-        [EZRFeedItemUpdateService requestFiveMinutesOfFeedItems:self];
+    if (_scrollingAtStart && !self.isRefreshing) {
+        self.isRefreshing = YES;
+        
+        [self.collectionView.indicator startAnimating];
+        [EZRFeedItemUpdateService requestFiveMinutesOfFeedItemsWithCompletion:^void (BOOL success) {
+            [self.collectionView.indicator stopAnimating];
+            self.isRefreshing = NO;
+        }];
     }
-
 }
 
 /**

EasyReader/Application/Controllers/Home/CollectionView/EZRHomeCollectionViewDelegate.m

@@ -13,6 +13,8 @@
 #import "EZRFeedItemCollectionView.h"
 #import "CSNestableScrollView.h"
 
+#import "EZRCurrentFeedsProvider.h"
+
 // View Controllers
 #import "CSBaseViewController.h"
 #import "EZRNestableWebView.h"
@@ -46,6 +48,9 @@
 
 # pragma mark - Properties
 
+/// The current feeds provider object
+@property (nonatomic, strong) EZRCurrentFeedsProvider *currentFeedsProvider;
+
 /// Feed Item currently visible
 @property (nonatomic, readonly) FeedItem *currentFeedItem;
 

EasyReader/Application/Controllers/Home/EZRHomeViewController.h

@@ -35,7 +35,6 @@
 #import "EZRHomeScrollViewDelegate.h"
 #import "EZRHomePageControlDataSource.h"
 #import "EZRHomeWebViewDelegate.h"
-#import "EZRCurrentFeedsProvider.h"
 
 #import "CLDArrayCollectionViewDataSource.h"
 
@@ -51,10 +50,6 @@ @interface EZRHomeViewController()
 
 @property User *currentUser;
 
-
-/// The current feeds provider object
-@property (nonatomic, strong) EZRCurrentFeedsProvider *currentFeedsProvider;
-
 /// The social sharing toolbar
 @property (nonatomic, weak) IBOutlet CLDSocialShareToolbar *socialShareToolbar;
 

EasyReader/Application/Controllers/Home/EZRHomeViewController.m

@@ -21,6 +21,6 @@
 /**
  * Requests five minutes of feed items
  */
-+ (void)requestFiveMinutesOfFeedItems:(id)sender;
++ (void)requestFiveMinutesOfFeedItemsWithCompletion:(void (^)(BOOL success)) completion;
 
 @end

EasyReader/Application/Services/EZRFeedItemUpdateService.h

@@ -6,6 +6,7 @@
 //  Copyright (c) 2014 Cloudspace. All rights reserved.
 //
 
+#import "EZRFeedItemCollectionView.h"
 #import "EZRFeedItemUpdateService.h"
 #import "FeedItem.h"
 #import "Feed.h"
@@ -46,14 +47,18 @@ + (void) feedInvocations
 
 + (void)requestFiveMinutesOfFeedItems:(id)sender
 {
+    [self requestFiveMinutesOfFeedItemsWithCompletion:nil];
+}
+
++ (void)requestFiveMinutesOfFeedItemsWithCompletion:(void (^)(BOOL success)) completion {
     NSCalendar *calendar = [NSCalendar currentCalendar];
     NSDate *today = [NSDate date];
 
     NSDateComponents *fiveMinutesAgoComponents = [[NSDateComponents alloc] init];
     [fiveMinutesAgoComponents setMinute:-5];
     NSDate *fiveMinutesAgo = [calendar dateByAddingComponents:fiveMinutesAgoComponents toDate:today options:0];
 
-    [self requestFeedItemsSince:fiveMinutesAgo];
+    [self requestFeedItemsSince:fiveMinutesAgo withCompletion:completion];
 
     NSLog(@"Invocation ran!");
 }
@@ -74,15 +79,26 @@ + (void)requestOneWeekOfFeedItems
 
 + (void)requestFeedItemsSince:(NSDate *)since
 {
+    [self requestFeedItemsSince:since withCompletion:nil];
+}
+
++ (void)requestFeedItemsSince:(NSDate *)since withCompletion:(void (^)(BOOL success)) completion {
     [FeedItem requestFeedItemsFromFeeds:[[User current] feeds]
                                   since:since
                                 success:^(id responseData, NSInteger httpStatus){
                                     NSInteger count = [responseData[@"feed_items"] count];
-                                    
                                     if (count > 0) {
-                                      NSLog(@"%ld feed Items have been added", (long)count);
+                                        NSLog(@"%ld feed Items have been added", (long)count);
+                                    }
+                                    
+                                    if (completion ) {
+                                        completion(YES);
+                                    }
+                                }failure:^(id responseObject, NSInteger httpStatus, NSError *error) {
+                                    if (completion ) {
+                                        completion(NO);
                                     }
-                                }failure:nil
+                                }
      ];
 }
 

EasyReader/Application/Services/EZRFeedItemUpdateService.m

@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.0.46</string>
+	<string>2.0.47</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>