[#67863352] added ability to remove feeds and added header comments

Author: Michael Beattie

EasyReader/Application/Api/CSFakedDataRequestor.m

@@ -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/CSFeedSearcher.h

@@ -10,6 +10,9 @@
 
 @interface CSFeedSearcher : NSObject
 
+/**
+ * API requestor for feeds similar to user input
+ */
 - (void)feedsLike:(NSString *)name;
 
 @end

EasyReader/Application/Api/CSFeedSearcher.m

@@ -12,7 +12,7 @@
 @implementation CSFeedSearcher
 
 /**
- * API requestor for feeds similar to user input
+ * Returns a set of Feeds and associated FeedItems
  */
 - (void)feedsLike:(NSString *)name
 {

EasyReader/Application/Controllers/CSRootViewController.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/Menu/CSMenuLeftViewController.m

@@ -12,6 +12,7 @@
 #import "UIImageView+AFNetworking.h"
 
 #import "Feed.h"
+#import "FeedItem.h"
 #import "User.h"
 #import "CSAppDelegate.h"
 #import "CSRootViewController.h"
@@ -135,7 +136,7 @@ - (void)menuStateEventOccurred:(NSNotification *)notification {
       case MFSideMenuStateEventMenuDidClose:
         weakSelf.textField_searchInput.text = @"";
         [weakSelf.tableView_feeds setEditing:NO animated:YES];
-        weakSelf.menuContainerViewController.panMode = MFSideMenuPanModeDefault;
+        weakSelf.menuContainerViewController.panMode = MFSideMenuPanModeNone;
 
         // Reset to the users feeds
         weakSelf.tableView_feeds.dataSource = userFeedDataSource;

EasyReader/Application/Controllers/Menu/MenuDataSources/CSMenuSearchFeedDataSource.h

@@ -10,8 +10,17 @@
 
 @interface CSMenuSearchFeedDataSource : NSObject<UITableViewDataSource>
 
+#pragma mark - Properties
+/**
+ * Feeds used to populate the menu table
+ */
 @property (nonatomic, retain) NSMutableSet *feeds;
 
+
+#pragma mark - Methods
+/**
+ * Updates the list of feeds used to populate the menu table
+ */
 - (void)updateWithFeeds:(NSMutableSet *)feeds;
 
 @end

EasyReader/Application/Controllers/Menu/MenuDataSources/CSMenuSearchFeedDataSource.m

@@ -9,6 +9,7 @@
 #import "CSMenuSearchFeedDataSource.h"
 #import "CSUserFeedCell.h"
 #import "Feed.h"
+#import "FeedItem.h"
 #import "UIImageView+AFNetworking.h"
 
 @implementation CSMenuSearchFeedDataSource
@@ -30,7 +31,8 @@ - (id)init
 }
 
 /**
- * Sets the feeds to those returned by the search
+ * Sets the feeds to those returned by the search API or
+ * The custom feed being created by the user
  */
 - (void)updateWithFeeds:(NSMutableSet *)feeds
 {
@@ -107,6 +109,10 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
     {
         Feed *toDelete = [self.feeds allObjects][indexPath.row];
 
+        [self.feeds removeObject:toDelete];
+        [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade];
+        
+        for( FeedItem *item in toDelete.feedItems ) [item deleteEntity];
         [toDelete deleteEntity];
 
         [[NSManagedObjectContext defaultContext] saveToPersistentStoreAndWait];
@@ -118,12 +124,7 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
  */
 - (UITableViewCellEditingStyle) tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if (!tableView.isEditing)
-    {
-        return UITableViewCellEditingStyleNone;
-    }
-    
-    if (indexPath.section == 0 && indexPath.row == [self tableView:tableView numberOfRowsInSection:0] - 1)
+    if ( indexPath.row == [_feeds count] )
     {
         return UITableViewCellEditingStyleInsert;
     }

EasyReader/Application/Controllers/Menu/MenuDataSources/CSMenuUserFeedDataSource.h

@@ -10,8 +10,17 @@
 
 @interface CSMenuUserFeedDataSource : NSObject<UITableViewDataSource>
 
+#pragma mark - Properties
+/**
+ * Feeds used to populate the menu table
+ */
 @property (nonatomic, retain) NSMutableSet *feeds;
 
+
+#pragma mark - Methods
+/**
+ * Updates the list of feeds used to populate the menu table
+ */
 - (void)updateWithFeeds:(NSMutableSet *)feeds;
 
 @end

EasyReader/Application/Controllers/Menu/MenuDataSources/CSMenuUserFeedDataSource.m

@@ -117,12 +117,7 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
  */
 - (UITableViewCellEditingStyle) tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if (!tableView.isEditing)
-    {
-        return UITableViewCellEditingStyleNone;
-    }
-    
-    if (indexPath.section == 0 && indexPath.row == [self tableView:tableView numberOfRowsInSection:0] - 1)
+    if ( indexPath.row == [_feeds count] )
     {
         return UITableViewCellEditingStyleInsert;
     }