Change add icon, minor bugfixes

Joey Lorich · Joey Lorich · commit 2d60cc73d960 · 2014-05-06T16:21:04.000-04:00
diff --git a/EasyReader/Application/Controllers/Home/EZRHomeViewController.m b/EasyReader/Application/Controllers/Home/EZRHomeViewController.m
@@ -325,7 +325,7 @@ - (void)selectedFeedDidChange:(NSNotification *)notification
     Feed *feed = notification.object;
     
     if ((!feed || feed != lastSelectedFeed) && [self.collectionView_feedItems numberOfItemsInSection:0] > 0) {
-        [self.collectionView_feedItems scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:0 inSection:0] atScrollPosition:UICollectionViewScrollPositionLeft animated:YES];
+        [self.collectionView_feedItems scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:0 inSection:0] atScrollPosition:UICollectionViewScrollPositionLeft animated:NO];
     }
 }
 
diff --git a/EasyReader/Application/Controllers/Menu/EZRMenuSearchController.m b/EasyReader/Application/Controllers/Menu/EZRMenuSearchController.m
@@ -119,7 +119,10 @@ - (void)postSearchStateChangeNotification:(EZRSearchState)state
 {
     [[NSNotificationCenter defaultCenter] postNotificationName:kEZRFeedSearchStateChangedNotification
                                                         object:nil
-                                                      userInfo:@{@"searchState": [NSNumber numberWithInt:state]}];
+                                                      userInfo:@{
+                                                                 @"searchState": [NSNumber numberWithInt:state],
+                                                                 @"searchText": self.searchBar.text
+                                                                 }];
 }
 
 #pragma mark - UISearchBarDelegate Methods
diff --git a/EasyReader/Application/Controllers/Menu/EZRMenuTableViewDelegate.m b/EasyReader/Application/Controllers/Menu/EZRMenuTableViewDelegate.m
@@ -32,6 +32,21 @@ @interface EZRMenuTableViewDelegate ()
 
 @implementation EZRMenuTableViewDelegate
 
+- (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+
+    if ([cell isKindOfClass:[EZRMenuFeedCell class]]) {
+        EZRMenuFeedCell  *ezrcell = (EZRMenuFeedCell *)cell;
+        if (!ezrcell.feed) {
+            return UITableViewCellEditingStyleNone;
+        }
+    }
+    
+    return UITableViewCellEditingStyleDelete;
+}
+
+
 /**
  * Handles selection of a row
  */
diff --git a/EasyReader/Application/Controllers/Menu/EZRMenuViewController.m b/EasyReader/Application/Controllers/Menu/EZRMenuViewController.m
@@ -118,6 +118,8 @@ - (void)searchStateChanged:(NSNotification *)notification {
             originalMenuHeight = self.menuHeight.constant;
             
             self.tableView_menu.dataSource = self.searchFeedDataSource;
+            self.searchFeedDataSource.source = @[];
+            [self.searchFeedDataSource setLastSearchTerm:nil];
             self.menuHeight.constant = originalMenuHeight - 216;
             break;
         }
@@ -128,7 +130,9 @@ - (void)searchStateChanged:(NSNotification *)notification {
             break;
         }
         case kEZRSearchStateResultsAvailable:
-            // Do nothing, just need to realod
+            [self.searchFeedDataSource setLastSearchTerm:[[notification userInfo] objectForKey:@"searchText"]];
+            
+            // Do nothing, just need to reload
             break;
     }
     
diff --git a/EasyReader/Application/Controllers/Menu/MenuCells/EZRSearchFeedCell.m b/EasyReader/Application/Controllers/Menu/MenuCells/EZRSearchFeedCell.m
@@ -20,7 +20,7 @@ @implementation EZRSearchFeedCell
 - (void)setFeedData:(NSDictionary *)feedData
 {
     _feedData = feedData;
-    self.imageView_icon.image = [UIImage imageNamed:@"icon_plus"];
+    //self.imageView_icon.image = [UIImage imageNamed:@"icon_plus"];
     self.label_name.text = [feedData objectForKey:@"name"];
 }
 
diff --git a/EasyReader/Application/Controllers/Menu/MenuDataSources/EZRMenuSearchFeedDataSource.h b/EasyReader/Application/Controllers/Menu/MenuDataSources/EZRMenuSearchFeedDataSource.h
@@ -14,7 +14,20 @@
  */
 @interface EZRMenuSearchFeedDataSource : CSArrayTableViewDataSource
 
+#pragma mark - Properties
+
 /// A dictionary of feed data to use as the base for this data source
 @property (nonatomic, retain) NSDictionary *feedData;
 
+
+#pragma mark - Methods
+
+/**
+ * Sets the last search term used.  This is used to determine which cell to display (no results, or empty).
+ *
+ * @param lastSearchTerm The most recent search term
+ */
+- (void) setLastSearchTerm:(NSString *)lastSearchTerm;
+
+
 @end
diff --git a/EasyReader/Application/Controllers/Menu/MenuDataSources/EZRMenuSearchFeedDataSource.m b/EasyReader/Application/Controllers/Menu/MenuDataSources/EZRMenuSearchFeedDataSource.m
@@ -13,6 +13,9 @@
 #import "EZRSearchFeedCell.h"
 
 @implementation EZRMenuSearchFeedDataSource
+{
+    NSString *_lastSearchTerm;
+}
 
 - (instancetype) init{
     self = [super init];
@@ -30,12 +33,40 @@ - (instancetype) init{
 
 #pragma mark - Public methods
 
+- (void) setLastSearchTerm:(NSString *)lastSearchTerm {
+    _lastSearchTerm = lastSearchTerm;
+}
+
 - (void)setFeedData:(NSDictionary *)feedData
 {
     NSSet *feedSet = [NSSet setWithArray:feedData[@"feeds"]];
     
     self.source = [feedSet sortedArrayByAttributes:@[@"name"] ascending:YES];
 }
 
+-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    int numberOfResults = [super tableView:tableView numberOfRowsInSection:section];
+    
+    if (numberOfResults == 0 && self.source.count == 0) {
+        return 1;
+    }
+    
+    return numberOfResults;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    UITableViewCell *cell;
+    
+    if (indexPath.section == 0 && indexPath.row == 0 && self.source.count == 0 && _lastSearchTerm.length > 0) {
+        cell =  [tableView dequeueReusableCellWithIdentifier:@"NoResultsFoundCell"];
+    } else if (indexPath.section == 0 && indexPath.row == 0 && self.source.count == 0 && _lastSearchTerm.length == 0) {
+        cell =  [tableView dequeueReusableCellWithIdentifier:@"NoSearchTextCell"];
+    } else {
+        cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
+    }
+    
+    return cell;
+}
+
 
 @end
diff --git a/EasyReader/Application/Controllers/Menu/MenuDataSources/EZRMenuUserFeedDataSource.m b/EasyReader/Application/Controllers/Menu/MenuDataSources/EZRMenuUserFeedDataSource.m
@@ -58,7 +58,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     UITableViewCell *cell;
     
     if (indexPath.row == 0) {
-        cell = [tableView dequeueReusableCellWithIdentifier:self.reusableCellIdentifier];
+        cell = [tableView dequeueReusableCellWithIdentifier:self.reusableCellIdentifier];;
         ((EZRMenuFeedCell*)cell).feed = nil;
         ((EZRMenuFeedCell*)cell).label_name.text = @"All Feeds";
         if (self.currentFeedsProvider.currentFeed == nil) {
diff --git a/EasyReader/Application/Services/EZRFeedImageService.m b/EasyReader/Application/Services/EZRFeedImageService.m
@@ -23,8 +23,6 @@
 static EZRFeedImageService *sharedInstance;
 
 
-
-
 @implementation EZRFeedImageService
 {
     /// A cache of feed item images
@@ -42,6 +40,7 @@ @implementation EZRFeedImageService
     /// An array of URLs that are currently being processed
     NSMutableArray *imageURLsCurrentlyBeingProcessed;
     
+    /// A list of prefetched images
     NSMutableArray *prefetched;
 }
 
diff --git a/EasyReader/Application/Views/Main_iPhone.storyboard b/EasyReader/Application/Views/Main_iPhone.storyboard
@@ -278,12 +278,12 @@
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ptb-Kv-s5O">
-                                                    <rect key="frame" x="20" y="14" width="16" height="16"/>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="icon_addFeed" translatesAutoresizingMaskIntoConstraints="NO" id="Ptb-Kv-s5O">
+                                                    <rect key="frame" x="240" y="14" width="15" height="15"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 </imageView>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SoB-0g-JfK">
-                                                    <rect key="frame" x="51" y="11" width="204" height="21"/>
+                                                    <rect key="frame" x="20" y="11" width="204" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="16"/>
@@ -298,6 +298,44 @@
                                             <outlet property="label_name" destination="SoB-0g-JfK" id="tc1-yU-AWq"/>
                                         </connections>
                                     </tableViewCell>
+                                    <tableViewCell userInteractionEnabled="NO" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" shouldIndentWhileEditing="NO" reuseIdentifier="NoResultsFoundCell" rowHeight="91" id="dUz-bt-mor">
+                                        <rect key="frame" x="0.0" y="154" width="320" height="91"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dUz-bt-mor" id="SKa-XC-6mc">
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="91"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="No results found." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oN8-ml-mIo">
+                                                    <rect key="frame" x="20" y="11" width="265" height="21"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="16"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                    </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="NoSearchTextCell" rowHeight="91" id="8BG-5Q-34X">
+                                        <rect key="frame" x="0.0" y="245" width="320" height="91"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8BG-5Q-34X" id="ZzY-xb-OXn">
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="91"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e7H-J1-LqO">
+                                                    <rect key="frame" x="6" y="35" width="265" height="21"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="16"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                    </tableViewCell>
                                 </prototypes>
                                 <connections>
                                     <outlet property="dataSource" destination="sJh-MY-rG4" id="me7-tU-DuK"/>
@@ -346,6 +384,7 @@
     </scenes>
     <resources>
         <image name="button_menu" width="44" height="44"/>
+        <image name="icon_addFeed" width="15" height="15"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
diff --git a/EasyReader/Resources/Media.xcassets/icon_addFeed.imageset/Contents.json b/EasyReader/Resources/Media.xcassets/icon_addFeed.imageset/Contents.json
@@ -0,0 +1,17 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "icon_addFeed.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/EasyReader/Resources/Media.xcassets/icon_addFeed.imageset/icon_addFeed.png b/EasyReader/Resources/Media.xcassets/icon_addFeed.imageset/icon_addFeed.png

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ - (void)selectedFeedDidChange:(NSNotification *)notification`
`325`	`325`	`Feed *feed = notification.object;`
`326`	`326`
`327`	`327`	`if ((!feed \|\| feed != lastSelectedFeed) && [self.collectionView_feedItems numberOfItemsInSection:0] > 0) {`
`328`		`- [self.collectionView_feedItems scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:0 inSection:0] atScrollPosition:UICollectionViewScrollPositionLeft animated:YES];`
	`328`	`+ [self.collectionView_feedItems scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:0 inSection:0] atScrollPosition:UICollectionViewScrollPositionLeft animated:NO];`
`329`	`329`	`}`
`330`	`330`	`}`
`331`	`331`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,10 @@ - (void)postSearchStateChangeNotification:(EZRSearchState)state`
`119`	`119`	`{`
`120`	`120`	`[[NSNotificationCenter defaultCenter] postNotificationName:kEZRFeedSearchStateChangedNotification`
`121`	`121`	`object:nil`
`122`		`- userInfo:@{@"searchState": [NSNumber numberWithInt:state]}];`
	`122`	`+ userInfo:@{`
	`123`	`+ @"searchState": [NSNumber numberWithInt:state],`
	`124`	`+ @"searchText": self.searchBar.text`
	`125`	`+ }];`
`123`	`126`	`}`
`124`	`127`
`125`	`128`	`#pragma mark - UISearchBarDelegate Methods`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,8 @@ - (void)searchStateChanged:(NSNotification *)notification {`
`118`	`118`	`originalMenuHeight = self.menuHeight.constant;`
`119`	`119`
`120`	`120`	`self.tableView_menu.dataSource = self.searchFeedDataSource;`
	`121`	`+ self.searchFeedDataSource.source = @[];`
	`122`	`+ [self.searchFeedDataSource setLastSearchTerm:nil];`
`121`	`123`	`self.menuHeight.constant = originalMenuHeight - 216;`
`122`	`124`	`break;`
`123`	`125`	`}`
`@@ -128,7 +130,9 @@ - (void)searchStateChanged:(NSNotification *)notification {`
`128`	`130`	`break;`
`129`	`131`	`}`
`130`	`132`	`case kEZRSearchStateResultsAvailable:`
`131`		`- // Do nothing, just need to realod`
	`133`	`+ [self.searchFeedDataSource setLastSearchTerm:[[notification userInfo] objectForKey:@"searchText"]];`
	`134`	`+`
	`135`	`+ // Do nothing, just need to reload`
`132`	`136`	`break;`
`133`	`137`	`}`
`134`	`138`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ @implementation EZRSearchFeedCell`
`20`	`20`	`- (void)setFeedData:(NSDictionary *)feedData`
`21`	`21`	`{`
`22`	`22`	`_feedData = feedData;`
`23`		`- self.imageView_icon.image = [UIImage imageNamed:@"icon_plus"];`
	`23`	`+ //self.imageView_icon.image = [UIImage imageNamed:@"icon_plus"];`
`24`	`24`	`self.label_name.text = [feedData objectForKey:@"name"];`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@`
`23`	`23`	`static EZRFeedImageService *sharedInstance;`
`24`	`24`
`25`	`25`
`26`		`-`
`27`		`-`
`28`	`26`	`@implementation EZRFeedImageService`
`29`	`27`	`{`
`30`	`28`	`/// A cache of feed item images`
`@@ -42,6 +40,7 @@ @implementation EZRFeedImageService`
`42`	`40`	`/// An array of URLs that are currently being processed`
`43`	`41`	`NSMutableArray *imageURLsCurrentlyBeingProcessed;`
`44`	`42`
	`43`	`+ /// A list of prefetched images`
`45`	`44`	`NSMutableArray *prefetched;`
`46`	`45`	`}`
`47`	`46`