Merge in menu changes

Author: Joey Lorich

EasyReader.xcodeproj/project.pbxproj

@@ -47,7 +47,10 @@ - (void)setUpApplicationWindow
 {
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 
-    CSMenuLeftViewController *leftMenuViewController = [[CSMenuLeftViewController alloc] init];
+    UIStoryboard *mainStoryBoard = [UIStoryboard storyboardWithName:@"Main_iPhone" bundle:nil];
+
+    CSMenuLeftViewController *leftMenuViewController = (CSMenuLeftViewController*)[mainStoryBoard instantiateViewControllerWithIdentifier:@"LeftMenu"];
+    
     CSRootViewController *rootVC = [[CSRootViewController alloc] init];
 
     MFSideMenuContainerViewController *container = [MFSideMenuContainerViewController

EasyReader/Application/AppDelegates/CSAppDelegate.m

@@ -16,7 +16,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [[APIRouter shared] registerRoute:@"feedDefaults" path:@"/feeds/default/"  requestMethod:kAPIRequestMethodGET];
     [[APIRouter shared] registerRoute:@"feedCreate"   path:@"/feeds/"          requestMethod:kAPIRequestMethodPOST];
     [[APIRouter shared] registerRoute:@"feedSearch"   path:@"/feeds/search/"   requestMethod:kAPIRequestMethodGET];
-    [[APIRouter shared] registerRoute:@"feedItems"    path:@"/feeds/"          requestMethod:kAPIRequestMethodGET];
+    [[APIRouter shared] registerRoute:@"feedItems"    path:@"/feed_items/"          requestMethod:kAPIRequestMethodGET];
 
     return YES;
 }

EasyReader/Application/AppDelegates/CSRegisterRoutesService.m

@@ -0,0 +1,28 @@
+//
+//  UIColor+EZRSharedColorAdditions.h
+//  EasyReader
+//
+//  Created by Michael Beattie on 3/24/14.
+//  Copyright (c) 2014 Cloudspace. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+/**
+ * Extends UIColor to provide a set of standard colors used across the application
+ */
+@interface UIColor (EZRSharedColorAdditions)
+
+#pragma mark - Color Methods
+
+/// The menu background color
++ (UIColor *) EZR_menuBackground;
+
+/// The menu input background color
++ (UIColor *) EZR_menuInputBackground;
+
+/// The gradient background color
++ (UIColor *) EZR_charcoal;
++ (UIColor *) EZR_charcoalWithOpacity:(float)opacity;
+
+@end

EasyReader/Application/Categories/UIColor+EZRSharedColorAdditions.h

@@ -0,0 +1,23 @@
+//
+//  UIColor+EZRSharedColorAdditions.m
+//  EasyReader
+//
+//  Created by Michael Beattie on 3/24/14.
+//  Copyright (c) 2014 Cloudspace. All rights reserved.
+//
+
+#import "UIColor+EZRSharedColorAdditions.h"
+
+@implementation UIColor (EZRSharedColorAdditions)
+
+#pragma mark - Color Methods
+
++ (UIColor *) EZR_menuBackground           { return [UIColor colorWithRed:51/255.0 green:58/255.0 blue:74/255.0 alpha:1.0]; }
++ (UIColor *) EZR_menuInputBackground      { return [UIColor colorWithRed:67/255.0 green:74/255.0 blue:94/255.0 alpha:1.0]; }
+
++ (UIColor *) EZR_charcoal                 { return [UIColor EZR_charcoalWithOpacity:1]; }
++ (UIColor *) EZR_charcoalWithOpacity:(float)opacity {
+    return [UIColor colorWithRed:39/255.0f green:42/255.0f blue:44/255.0f alpha:opacity];
+}
+
+@end

EasyReader/Application/Categories/UIColor+EZRSharedColorAdditions.m

@@ -38,6 +38,16 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
   return self;
 }
 
+- (BOOL)shouldAutorotate
+{
+    return NO;
+}
+
+- (NSUInteger)supportedInterfaceOrientations
+{
+    return UIInterfaceOrientationPortrait;
+}
+
 /**
  * If the left menu is open, it closes it
  * Otherwise it opens to the left menu