Work on moving relationships into the storyboards

Author: Joey Lorich

EasyReader.xcodeproj/project.pbxproj

@@ -305,10 +305,6 @@
 		9DFC326D18FD8CB8008A2A44 /* CSArrayCollectionViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DFC326B18FD8CB8008A2A44 /* CSArrayCollectionViewDataSource.m */; };
 		9DFC326E18FD8CB8008A2A44 /* CSArrayCollectionViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DFC326B18FD8CB8008A2A44 /* CSArrayCollectionViewDataSource.m */; };
 		9DFC326F18FD8CB8008A2A44 /* CSArrayCollectionViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DFC326B18FD8CB8008A2A44 /* CSArrayCollectionViewDataSource.m */; };
-		9DFD89EA18FC66E800630CBF /* EZRHomeFeedImagePrefetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DFD89E918FC66E800630CBF /* EZRHomeFeedImagePrefetcher.m */; };
-		9DFD89EB18FC66E800630CBF /* EZRHomeFeedImagePrefetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DFD89E918FC66E800630CBF /* EZRHomeFeedImagePrefetcher.m */; };
-		9DFD89EC18FC66E800630CBF /* EZRHomeFeedImagePrefetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DFD89E918FC66E800630CBF /* EZRHomeFeedImagePrefetcher.m */; };
-		9DFD89ED18FC66E800630CBF /* EZRHomeFeedImagePrefetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DFD89E918FC66E800630CBF /* EZRHomeFeedImagePrefetcher.m */; };
 		9DFD89F618FC7D9300630CBF /* CSArrayTableViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DFD89F518FC7D9300630CBF /* CSArrayTableViewDataSource.m */; };
 		9DFD89F718FC7D9300630CBF /* CSArrayTableViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DFD89F518FC7D9300630CBF /* CSArrayTableViewDataSource.m */; };
 		9DFD89F818FC7D9300630CBF /* CSArrayTableViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DFD89F518FC7D9300630CBF /* CSArrayTableViewDataSource.m */; };
@@ -489,8 +485,6 @@
 		9DFC326518FD7263008A2A44 /* EZRCurrentFeedsProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRCurrentFeedsProvider.m; sourceTree = "<group>"; };
 		9DFC326A18FD8CB8008A2A44 /* CSArrayCollectionViewDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSArrayCollectionViewDataSource.h; sourceTree = "<group>"; };
 		9DFC326B18FD8CB8008A2A44 /* CSArrayCollectionViewDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSArrayCollectionViewDataSource.m; sourceTree = "<group>"; };
-		9DFD89E818FC66E800630CBF /* EZRHomeFeedImagePrefetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EZRHomeFeedImagePrefetcher.h; path = Home/EZRHomeFeedImagePrefetcher.h; sourceTree = "<group>"; };
-		9DFD89E918FC66E800630CBF /* EZRHomeFeedImagePrefetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EZRHomeFeedImagePrefetcher.m; path = Home/EZRHomeFeedImagePrefetcher.m; sourceTree = "<group>"; };
 		9DFD89F418FC7D9300630CBF /* CSArrayTableViewDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSArrayTableViewDataSource.h; sourceTree = "<group>"; };
 		9DFD89F518FC7D9300630CBF /* CSArrayTableViewDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSArrayTableViewDataSource.m; sourceTree = "<group>"; };
 		A7ACF08D0CD54248B25E110A /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -798,8 +792,6 @@
 				2751F4DB18DA0D3000339C96 /* FeedItemCollectionView */,
 				2751F4D818DA0A6B00339C96 /* EZRHomeViewController.h */,
 				2751F4D918DA0A6B00339C96 /* EZRHomeViewController.m */,
-				9DFD89E818FC66E800630CBF /* EZRHomeFeedImagePrefetcher.h */,
-				9DFD89E918FC66E800630CBF /* EZRHomeFeedImagePrefetcher.m */,
 				9D38DDD318EB08D600C67022 /* EZRHomeCollectionViewDelegate.h */,
 				9D38DDD418EB08D600C67022 /* EZRHomeCollectionViewDelegate.m */,
 				9D38DDEB18EB0A7600C67022 /* EZRHomeScrollViewDelegate.h */,
@@ -1407,7 +1399,6 @@
 				9D79270B18DA1D0300E1D3E1 /* EZRAppDelegate.m in Sources */,
 				9D79270C18DA1D0300E1D3E1 /* main.m in Sources */,
 				9D38DDD718EB08D600C67022 /* EZRHomeCollectionViewDelegate.m in Sources */,
-				9DFD89EC18FC66E800630CBF /* EZRHomeFeedImagePrefetcher.m in Sources */,
 				9D79270D18DA1D0300E1D3E1 /* EZRHomeViewController.m in Sources */,
 				9D38DDE318EB090500C67022 /* EZRHomePageControlDelegate.m in Sources */,
 				9DFC326E18FD8CB8008A2A44 /* CSArrayCollectionViewDataSource.m in Sources */,
@@ -1470,7 +1461,6 @@
 				9D79275118DA1D3800E1D3E1 /* EZRHomeViewController.m in Sources */,
 				9D79275218DA1D3800E1D3E1 /* EZRFeedItemCollectionView.m in Sources */,
 				9D79275318DA1D3800E1D3E1 /* NSObject+CSReflectionAdditions.m in Sources */,
-				9DFD89ED18FC66E800630CBF /* EZRHomeFeedImagePrefetcher.m in Sources */,
 				9D38DDEA18EB091B00C67022 /* EZRHomePageControlDataSource.m in Sources */,
 				9D79275418DA1D3800E1D3E1 /* CSRemoteObject.m in Sources */,
 				9DFC326F18FD8CB8008A2A44 /* CSArrayCollectionViewDataSource.m in Sources */,
@@ -1559,7 +1549,6 @@
 				9D9CBACD18DCC68A00532F8C /* EZRFeedItemCollectionView.m in Sources */,
 				9D639E7D18E0A53100350B5F /* APIMockResponse.m in Sources */,
 				9D9CBACE18DCC68A00532F8C /* NSObject+CSReflectionAdditions.m in Sources */,
-				9DFD89EB18FC66E800630CBF /* EZRHomeFeedImagePrefetcher.m in Sources */,
 				9D38DDE818EB091B00C67022 /* EZRHomePageControlDataSource.m in Sources */,
 				9D9CBACF18DCC68A00532F8C /* CSRemoteObject.m in Sources */,
 				9DFC326D18FD8CB8008A2A44 /* CSArrayCollectionViewDataSource.m in Sources */,
@@ -1622,7 +1611,6 @@
 				9DAC172E170A043200383722 /* main.m in Sources */,
 				2751F4DA18DA0A6B00339C96 /* EZRHomeViewController.m in Sources */,
 				2751F4E418DA0D3000339C96 /* EZRFeedItemCollectionView.m in Sources */,
-				9DFD89EA18FC66E800630CBF /* EZRHomeFeedImagePrefetcher.m in Sources */,
 				9D38DDE718EB091B00C67022 /* EZRHomePageControlDataSource.m in Sources */,
 				2751F4D718DA02C100339C96 /* NSObject+CSReflectionAdditions.m in Sources */,
 				9DFC326C18FD8CB8008A2A44 /* CSArrayCollectionViewDataSource.m in Sources */,
@@ -1805,7 +1793,7 @@
 					UIKit,
 				);
 				PRODUCT_NAME = Staging;
-				PROVISIONING_PROFILE = "AE75F2A8-B0F9-486D-8DE0-CFEA22EC508C";
+				PROVISIONING_PROFILE = "56017F00-F968-4F0C-8C2F-8CEFF1BE147E";
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = "armv7 arm64 armv7s";
 				WRAPPER_EXTENSION = app;

EasyReader/Application/Controllers/EZRHomeScrollViewDelegate.h

@@ -14,11 +14,4 @@
  */
 @interface EZRHomeScrollViewDelegate : NSObject <UIScrollViewDelegate>
 
-/**
- * Initializes a new scroll view delegate for the given home view controller instance
- *
- * @param homeController The home view controller
- */
-- (instancetype)initWithController:(EZRHomeViewController *)homeController;
-
 @end

EasyReader/Application/Controllers/EZRHomeScrollViewDelegate.m

@@ -8,41 +8,46 @@
 
 #import "EZRHomeScrollViewDelegate.h"
 #import "EZRHomeViewController.h"
+#import "EZRFeedItemCollectionView.h"
+
+@interface EZRHomeScrollViewDelegate ()
+
+@property (nonatomic, weak) IBOutlet EZRNestableWebView *webView_feedItem;
+
+@property (nonatomic, weak) IBOutlet EZRFeedItemCollectionView *collectionView_feedItems;
+
+@end
 
 @implementation EZRHomeScrollViewDelegate
 {
-    EZRHomeViewController *controller;
     NSString *currentURL;
     BOOL dragging;
     CGPoint dragStart;
 }
 
-- (instancetype)initWithController:(EZRHomeViewController *)homeController
-{
+- (instancetype)init {
     self = [super init];
 
     if (self) {
-        controller = homeController;
         dragging = NO;
     }
 
     return self;
 }
-
 //
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
     // Make scrolling back up to the top feel more natural
     if (scrollView.contentOffset.y == scrollView.frame.size.height) {
-        if (controller.webView_feedItem.scrollView.contentOffset.y == 0) {
-            controller.webView_feedItem.scrollView.contentOffset = CGPointMake(0, 1);
+        if (self.webView_feedItem.scrollView.contentOffset.y == 0) {
+            self.webView_feedItem.scrollView.contentOffset = CGPointMake(0, 1);
         }
     }
 
     // Prevent collectionview scrolling when shar bar is showing
     if (scrollView.contentOffset.y < 0) {
-        controller.collectionView_feedItems.userInteractionEnabled = NO;
+        self.collectionView_feedItems.userInteractionEnabled = NO;
     } else {
-        controller.collectionView_feedItems.userInteractionEnabled = YES;
+        self.collectionView_feedItems.userInteractionEnabled = YES;
     }
 
     // Don't allow drags from the share view to go past the base view without a stop

EasyReader/Application/Controllers/Home/EZRHomeCollectionViewDelegate.h

@@ -16,10 +16,4 @@
  */
 @interface EZRHomeCollectionViewDelegate : NSObject <UICollectionViewDelegate, EZRFeedItemCollectionViewCellDelegate>
 
-/**
- * Initializes a collection view delegate for the given home view controller instance
- *
- * @param homeController The home view controller
- */- (instancetype)initWithController:(EZRHomeViewController *)homeController;
-
 @end

EasyReader/Application/Controllers/Home/EZRHomeCollectionViewDelegate.m

@@ -17,31 +17,26 @@
 @interface EZRHomeViewController (Additions)
 
 - (void)prefetchImagesNearIndex:(NSInteger)currentPageIndex count:(NSInteger)count;
-- (void)setCurrentFeedItem:(FeedItem *)item;
-- (void)setCurrentPageIndex:(NSInteger)index;
+
+@end
+
+
+@interface EZRHomeCollectionViewDelegate ()
+
+@property (nonatomic, weak) IBOutlet EZRHomeViewController *controller;
+
+@property (nonatomic, weak) IBOutlet EZRFeedItemCollectionView *collectionView;
+
+@property (nonatomic, weak) IBOutlet UIScrollView *scrollView_vertical;
 
 @end
 
 
 @implementation EZRHomeCollectionViewDelegate
 {
-    EZRHomeViewController    *controller;
-    EZRFeedItemCollectionView *collectionView;
     FeedItem *previousFeedItem;
 }
 
-- (instancetype)initWithController:(EZRHomeViewController *)homeController
-{
-    self = [super init];
-    
-    if (self)
-    {
-        controller     = homeController;
-        collectionView = homeController.collectionView_feedItems;
-    }
-    
-    return self;
-}
 
 /**
  * Fires when the collection view scrolls
@@ -51,20 +46,20 @@ - (instancetype)initWithController:(EZRHomeViewController *)homeController
  */
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView
 {
-    FeedItem *currentFeedItem = collectionView.currentFeedItem;
-    NSInteger pageIndex = collectionView.currentPageIndex;
+    FeedItem *currentFeedItem = self.collectionView.currentFeedItem;
+    NSInteger pageIndex = self.collectionView.currentPageIndex;
 
-    if (previousFeedItem != collectionView.currentFeedItem) {
-        [controller resetWebView];
+    if (previousFeedItem != self.collectionView.currentFeedItem) {
+        [self.controller resetWebView];
 
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
-            if (collectionView.currentFeedItem == currentFeedItem) {
-                [controller loadURLForFeedItem:currentFeedItem];
+            if (self.collectionView.currentFeedItem == currentFeedItem) {
+                [self.controller loadURLForFeedItem:currentFeedItem];
             }
         });
 
-        [controller prefetchImagesNearIndex:pageIndex count:5];
-        [controller.pageControl_itemIndicator setPageControllerPageAtIndex:pageIndex];
+        [self.controller prefetchImagesNearIndex:pageIndex count:5];
+        [self.controller.pageControl_itemIndicator setPageControllerPageAtIndex:pageIndex];
 
         previousFeedItem = currentFeedItem;
     }
@@ -74,8 +69,8 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
  * Scrolls the window down when a title is tapped
  */
 - (void)didTapHeadlineOfCell:(EZRFeedItemCollectionViewCell *)cell {
-    CGPoint lowestPoint = CGPointMake(0, controller.scrollView_vertical.contentSize.height - CGRectGetHeight(controller.scrollView_vertical.frame));
-    [controller.scrollView_vertical setContentOffset:lowestPoint animated:YES];
+    CGPoint lowestPoint = CGPointMake(0, self.scrollView_vertical.contentSize.height - CGRectGetHeight(self.scrollView_vertical.frame));
+    [self.scrollView_vertical setContentOffset:lowestPoint animated:YES];
 }
 
 @end

EasyReader/Application/Controllers/Home/EZRHomeFeedImagePrefetcher.h

@@ -39,8 +39,6 @@
 /// The collection view which holds the individual feed items
 @property (strong, nonatomic) IBOutlet EZRFeedItemCollectionView *collectionView_feedItems;
 
-/// Displays website that hosts article
-@property (nonatomic, strong) EZRNestableWebView *webView_feedItem;
 
 /// The up indicator displayed over the web view to assist in navigating to the top of the page
 @property (nonatomic, strong) UIImageView *upIndicatorView;
@@ -54,6 +52,8 @@
 /// Feed Item currently visible
 @property (nonatomic, readonly) NSInteger currentPageIndex;
 
+/// Displays website that hosts article
+@property (nonatomic, weak) IBOutlet EZRNestableWebView *webView_feedItem;
 
 # pragma mark - Methods