[#67767620] modified to display searched feeds from api

Author: Michael Beattie

EasyReader/Application/Controllers/Menu/CSMenuLeftViewController.m

@@ -139,6 +139,8 @@ - (void)menuStateEventOccurred:(NSNotification *)notification {
     }
 }
 
+
+#pragma mark - DataSource Methods
 /**
  * Update the feeds in the menu when a user begins or ends a search
  */
@@ -157,32 +159,57 @@ - (void)searchFieldDidChange
 
             // Add custom feed to the searchFeeds
             [searchedFeeds addObject:customFeed];
+            
+            // Update the searchFeed datasource
+            [searchFeedDataSource updateWithFeeds:searchedFeeds];
+            [self updateSearchFeedDataSource];
         } else {
             // Return feeds from the API similar to user input
             // Add these feeds to the searchFeed datasource
 
             [Feed requestFeedsByName:self.textField_searchInput.text
                              success:^(id responseData, NSInteger httpStatus){
-                                 NSLog(@"Search for feeds successful");
+                                NSDictionary *feeds = [responseData objectForKey:@"feeds"];
+                                for ( NSDictionary *feed in feeds){
+                                    [searchedFeeds addObject:feed];
+                                }
+                                // Update the searchFeed datasource
+                                [searchFeedDataSource updateWithFeeds:searchedFeeds];
+                                [self updateSearchFeedDataSource];
                              }
                              failure:^(id responseData, NSInteger httpStatus, NSError *error){
                                  NSLog(@"Error searching for feeds");
                              }];
         }
-    
-        // Switch to the searchFeed datasource and update the table
-        [searchFeedDataSource updateWithFeeds:searchedFeeds];
-        self.tableView_feeds.dataSource = searchFeedDataSource;
-        
-        // Reload the table with new searchFeeds
-        [self.tableView_feeds reloadData];
     } else {
         // Switch to the userFeeds datasource
-        self.tableView_feeds.dataSource = userFeedDataSource;
-        [self.tableView_feeds reloadData];
+        [self updateUserFeedDataSource];
     }
 }
 
+/**
+ * Switch to and reload the menu from the searchFeedDataSource
+ */
+- (void)updateSearchFeedDataSource
+{
+    // Switch to the searchFeed datasource
+    self.tableView_feeds.dataSource = searchFeedDataSource;
+    
+    // Reload the table with new searchFeeds
+    [self.tableView_feeds reloadData];
+}
+
+/**
+ * Switch to and reload the menu from the userFeedDataSource
+ */
+- (void)updateUserFeedDataSource
+{
+    // Switch to the searchFeed datasource
+    self.tableView_feeds.dataSource = userFeedDataSource;
+    
+    // Reload the table with new searchFeeds
+    [self.tableView_feeds reloadData];
+}
 
 #pragma mark - Count Methods
 /**

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

@@ -90,19 +90,20 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
  */
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if ([[self.sortedFeeds objectAtIndex:indexPath.row] isKindOfClass:[Feed class]]) {
+    if ([[self.sortedFeeds objectAtIndex:indexPath.row] objectForKey:@"feed_items"]) {
         // Dequeue a styled cell
         CSSearchFeedCell *cell = (CSSearchFeedCell *)[tableView dequeueReusableCellWithIdentifier:@"SearchFeedCell"];
-
-        Feed *feed = [self.sortedFeeds objectAtIndex:indexPath.row];
-        cell.feed = feed;
+        
+        NSDictionary *searchedFeed = [self.sortedFeeds objectAtIndex:indexPath.row];
 
         // Set the label text
-        cell.label_name.text = feed.name;
+        cell.label_name.text = [searchedFeed objectForKey:@"name"];
 
         // Show feed icons
-        [cell.imageView_icon setHidden:NO];
-        [cell.imageView setImageWithURL:[NSURL URLWithString:feed.icon] placeholderImage:nil];
+        NSString *iconUrl = [searchedFeed objectForKey:@"icon"];
+        if (!iconUrl.isBlank) {
+         [cell.imageView setImageWithURL:[NSURL URLWithString:[searchedFeed objectForKey:@"icon"]] placeholderImage:nil];
+        }
 
         UIView *selectedBackgroundView = [[UIView alloc] init];
         [selectedBackgroundView setBackgroundColor: [UIColor EZR_charcoal]];