Move more relationships to the storyboard

Author: Joey Lorich

EasyReader.xcodeproj/project.pbxproj

@@ -7,74 +7,69 @@
 //
 
 #import "EZRRootViewController.h"
-
 #import "EZRMenuViewController.h"
 #import "EZRHomeViewController.h"
 
 
+#pragma mark - MFSideMenuContainerViewController
 
-//#import "UIViewController+NibLoader.h"
-
-
+/**
+ * Category to enable access to the private menuContainerView property
+ */
 @interface MFSideMenuContainerViewController ()
 
+/// The menu container view
 @property (nonatomic, strong) UIView *menuContainerView;
 
 @end
 
 
+#pragma mark - Root view controller
+
 @implementation EZRRootViewController
 
 /**
  * Creates the menu contorllers and side menu
  */
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{    
-  self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-  
-  if (self) {
-    // Create view controller
-    UIStoryboard *storyboard_home = [UIStoryboard storyboardWithName:@"Main_iPhone" bundle:[NSBundle mainBundle]];
-    EZRHomeViewController *collections = [storyboard_home instantiateViewControllerWithIdentifier:@"Home"];
-    _viewController_main = collections;
-
-    [self setViewControllers:@[_viewController_main]];
-  }
-  
-  return self;
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    
+    if (self) {
+        UIStoryboard *storyboard_home = [UIStoryboard storyboardWithName:@"Main_iPhone" bundle:[NSBundle mainBundle]];
+        EZRHomeViewController *collections = [storyboard_home instantiateViewControllerWithIdentifier:@"Home"];
+        _viewController_main = collections;
+        
+        [self setViewControllers:@[_viewController_main]];
+    }
+    
+    return self;
 }
 
-- (void)viewDidAppear:(BOOL)animated
-{
+/**
+ * Disable the gesture recognizer on the left view controller so that it doesn't interfere with
+ * swipe to delete on the feed menu tableview
+ */
+- (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
 
     MFSideMenuContainerViewController *container = (MFSideMenuContainerViewController *)[[[[UIApplication sharedApplication] delegate] window] rootViewController];
-//    container.menuContainerView.gestureRecognizers
-    
 
     for (UIGestureRecognizer *recognizer in container.menuContainerView.gestureRecognizers) {
         [recognizer setEnabled:NO];
-//        [container.menuContainerView removeGestureRecognizer:recognizer];
     }
-
 }
 
 /**
  * If the left menu is open, it closes it
  * Otherwise it opens to the left menu
  */
-- (void) toggleLeftMenu
-{
-  if (self.menuContainerViewController.menuState == MFSideMenuStateLeftMenuOpen)
-  {
-    [self.menuContainerViewController setMenuState:MFSideMenuStateClosed completion:^{}];
-  
-  }
-  else
-  {
-    [self.menuContainerViewController toggleLeftSideMenuCompletion:^{}];
-  }
+- (void) toggleLeftMenu {
+    if (self.menuContainerViewController.menuState == MFSideMenuStateLeftMenuOpen) {
+        [self.menuContainerViewController setMenuState:MFSideMenuStateClosed completion:^{}];
+        
+    } else {
+        [self.menuContainerViewController toggleLeftSideMenuCompletion:^{}];
+    }
 }
 
-
 @end

EasyReader/Application/AppDelegates/EZRApplicationStyleService.m

@@ -33,7 +33,6 @@
 #import "EZRFeedImageService.h"
 #import "EZRHomeCollectionViewDelegate.h"
 #import "EZRHomeScrollViewDelegate.h"
-#import "EZRHomePageControlDelegate.h"
 #import "EZRHomePageControlDataSource.h"
 #import "EZRHomeWebViewDelegate.h"
 #import "EZRCurrentFeedsProvider.h"
@@ -62,6 +61,8 @@ @interface EZRHomeViewController()
 /// The home collection view delegate
 @property (nonatomic, weak) IBOutlet EZRHomeCollectionViewDelegate *collectionViewDelegate;
 
+/// The delegate for the web view
+@property (nonatomic, weak) IBOutlet EZRHomeWebViewDelegate *webViewDelegate;
 
 
 
@@ -70,19 +71,6 @@ @interface EZRHomeViewController()
 
 @implementation EZRHomeViewController
 {
-    /// The collectionView delegate
-    /// The scroll view delegate
-    EZRHomeScrollViewDelegate *scrollViewDelegate;
-    
-    /// The page control delegate
-    EZRHomePageControlDelegate *pageControlDelegate;
-    
-    /// The page control data source
-    EZRHomePageControlDataSource  *pageControlDataSource;
-    
-    /// The delegate for the web view
-    EZRHomeWebViewDelegate *webViewDelegate;
-    
     /// The data source for the collection view
     CLDArrayCollectionViewDataSource *collectionViewArrayDataSource;
 
@@ -146,7 +134,6 @@ - (void)viewDidLoad
 
     [[EZRGoogleAnalyticsService shared] sendView:@"Home"];
 
-    [self setUpPageControl];
     [self setUpVerticalScrollView];
     [self setUpCollectionView];
     [self setUpWebView];
@@ -171,15 +158,9 @@ - (void)viewDidLoad
                                                object:nil];
 
     AVAudioSession *audioSession = [AVAudioSession sharedInstance];
-    BOOL ok;
+
     NSError *setCategoryError = nil;
-    ok = [audioSession setCategory:AVAudioSessionCategoryPlayback
-                             error:&setCategoryError];
-    if (!ok) {
-        NSLog(@"%s setCategoryError=%@", __PRETTY_FUNCTION__, setCategoryError);
-    }
-    
-    //[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:nil];
+    [audioSession setCategory:AVAudioSessionCategoryPlayback error:&setCategoryError];
 }
 
 /**
@@ -219,18 +200,6 @@ -(BOOL)shouldAutorotate {
 
 #pragma mark - Setup methods
 
-/**
- * Sets up the page control
- */
-- (void) setUpPageControl
-{
-    pageControlDelegate   = [[EZRHomePageControlDelegate alloc] initWithController:self];
-    pageControlDataSource = [[EZRHomePageControlDataSource alloc] init];
-    
-    self.pageControl_itemIndicator.delegate = pageControlDelegate;
-    self.pageControl_itemIndicator.datasource = pageControlDataSource;
-}
-
 /**
  * Sets up vertical scroll view on controller start up
  */
@@ -243,6 +212,9 @@ -(void)setUpVerticalScrollView
     [self.scrollView_vertical setContentOffset:CGPointMake(0, 60)];
 }
 
+/**
+ * Sets up the share toolbar
+ */
 - (void)setUpShareToolbar {
     [self.scrollView_vertical insertSubview:self.socialShareToolbar belowSubview:self.webView_feedItem];
     self.socialShareToolbar.backgroundTransparent = YES;
@@ -287,7 +259,7 @@ -(void)setUpWebView
     [self.webView_feedItem setBackgroundColor:[UIColor blackColor]];
     [self.scrollView_vertical addSubview:self.webView_feedItem];
 
-    self.webView_feedItem.scrollView.delegate = webViewDelegate;
+    self.webView_feedItem.scrollView.delegate = self.webViewDelegate;
 
     self.webView_feedItem.multipleTouchEnabled = YES;
     self.webView_feedItem.scalesPageToFit = YES;