Merge in merge branch

Author: Joey Lorich

EasyReader.xcodeproj/project.pbxproj

@@ -149,17 +149,21 @@ - (NSDictionary *) feedItemsResponse
                         @"created_at": @"2014-03-05T22:32:41+00:00",
                         @"updated_at": @"2014-03-05T22:32:41+00:00",
                         @"published_at": @"2014-03-04T19:52:21+00:00"}, nil];
-    
-    NSRange subarrayRange;
-    if ( !self.requestCounter ) self.requestCounter = 1;
-    if ( self.requestCounter == 1 ){
-        subarrayRange = NSMakeRange(0,4);
-    } else {
-        subarrayRange = NSMakeRange(self.requestCounter*2,2);
-    }
-    self.requestCounter++;
-    
-    return @{@"feed_items": [items subarrayWithRange:subarrayRange]};
+  
+  NSRange subarrayRange;
+  if ( !self.requestCounter ) self.requestCounter = 1;
+  if ( self.requestCounter == 1 ){
+    subarrayRange = NSMakeRange(0,4);
+  } else {
+      if( self.requestCounter*2 < [items count]){
+          subarrayRange = NSMakeRange(self.requestCounter*2,2);
+      } else {
+          subarrayRange = NSMakeRange(8,2);
+      }
+  }
+  self.requestCounter++;
+  
+  return @{@"feed_items": [items subarrayWithRange:subarrayRange]};
 }
 
 

EasyReader/Application/Api/CSFakedDataRequestor.m

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

EasyReader/Application/Api/CSFeedItemUpdater.m

@@ -0,0 +1,18 @@
+//
+//  CSFeedSearcher.h
+//  EasyReader
+//
+//  Created by Michael Beattie on 3/20/14.
+//  Copyright (c) 2014 Cloudspace. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface CSFeedSearcher : NSObject
+
+/**
+ * API requestor for feeds similar to user input
+ */
+- (void)feedsLike:(NSString *)name;
+
+@end

EasyReader/Application/Api/CSFeedSearcher.h

@@ -0,0 +1,34 @@
+//
+//  CSFeedSearcher.m
+//  EasyReader
+//
+//  Created by Michael Beattie on 3/20/14.
+//  Copyright (c) 2014 Cloudspace. All rights reserved.
+//
+
+#import "CSFeedSearcher.h"
+#import "Feed.h"
+
+@implementation CSFeedSearcher
+
+/**
+ * Returns a set of Feeds and associated FeedItems
+ */
+- (void)feedsLike:(NSString *)name
+{
+    [self searchForFeedsLike:name];
+}
+
+/**
+ * Call to the API that returns feeds similar to user input
+ */
+- (void)searchForFeedsLike:(NSString *)name
+{
+    [Feed requestFeedsByName:name
+                     success:^(id responseData){
+                         NSLog(@"Search for feeds");
+                     }
+                     failure:^(id responseData){}];
+}
+
+@end

EasyReader/Application/Api/CSFeedSearcher.m

@@ -27,16 +27,63 @@ @implementation CSAppDelegate
  */
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    [self registerService:[CSRegisterRoutesService shared]];
-    [self registerService:[CSCoreDataService shared]];
-    [self registerService:[CSApplicationStyleService shared]];
-    [self registerService:[CSFeedUpdateService shared]];
+  self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+  // Override point for customization after application launch.
+  
+  // Observe account status in settings!!
+  // This is important, if something changes we need to check authentication settingsi
+  //[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(canTweetStatus) name:ACAccountStoreDidChangeNotification object:nil];
+  
+  //  [self applyStyles];
+  
+  
+  //
+  // Set up core data
+  //
+  [MagicalRecord setupAutoMigratingCoreDataStack];
+  
+  CSFeedItemUpdater *updater = [[CSFeedItemUpdater alloc]  init];
+  [updater start];
+  
+  //
+  // Set up root view controller and menu container
+  //
+  UIStoryboard *storyboard_home = [UIStoryboard storyboardWithName:@"Main_iPhone" bundle:[NSBundle mainBundle]];
 
-    [self invokeServiceMethodWithSelector:@selector(application:didFinishLaunchingWithOptions:) withArgument:&launchOptions];
+  CSMenuLeftViewController *leftMenuViewController = [storyboard_home instantiateViewControllerWithIdentifier:@"LeftMenu"];
+  CSRootViewController *rootVC = [[CSRootViewController alloc] init];
+  
+  self.container = [MFSideMenuContainerViewController containerWithCenterViewController:rootVC
+                                                             leftMenuViewController:leftMenuViewController
+                                                            rightMenuViewController:nil];
+  
+  self.window.rootViewController = self.container;
+  [self.window makeKeyAndVisible];
 
-    [self setUpApplicationWindow];
-    
-    return YES;
+  return YES;
+}
+
+
+- (void)applicationWillResignActive:(UIApplication *)application
+{
+  // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+  // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+}
+
+- (void)applicationDidEnterBackground:(UIApplication *)application
+{
+  // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
+  // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+}
+
+- (void)applicationWillEnterForeground:(UIApplication *)application
+{
+  // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application
+{
+  // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
 }
 
 /**

EasyReader/Application/AppDelegates/CSAppDelegate.m

@@ -38,13 +38,6 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
   return self;
 }
 
-- (void) viewWillAppear:(BOOL)animated
-{
-  [super viewWillAppear:animated];
-  CSAppDelegate *delegate = (CSAppDelegate *)[UIApplication sharedApplication].delegate;
-  delegate.container.panMode = MFSideMenuPanModeNone;
-}
-
 /**
  * If the left menu is open, it closes it
  * Otherwise it opens to the left menu

EasyReader/Application/Controllers/CSRootViewController.m

@@ -8,15 +8,24 @@
 
 #import <UIKit/UIKit.h>
 #import "CSBaseViewController.h"
+#import "CSCollectionPageControl.h"
+#import "CSFeedItemCollectionViewDataSource.h"
 
 @class User;
 
 @interface CSHomeViewController : CSBaseViewController<UICollectionViewDelegate,UIScrollViewDelegate>
 
 @property (weak, nonatomic) IBOutlet UIScrollView *verticalScrollView;
 @property (strong, nonatomic) IBOutlet UIButton *button_leftMenu;
+@property (strong, nonatomic) IBOutlet CSCollectionPageControl *pageControl_itemIndicator;
 @property (nonatomic, strong) UIWebView *feedItemWebView;
-@property (nonatomic, strong) NSSet *feedItems;
+@property (nonatomic, strong) NSMutableSet *feedItems;
+
 @property User* currentUser;
+@property CSFeedItemCollectionViewDataSource *feedCollectionViewDataSource;
+@property FeedItem *currentFeedItem;
+@property int collectionCellGoingTo;
+
+- (void)scrollToCurrentFeedItem;
 
 @end