Merge pull request #83 from cloudspace/sort_by_published

Make default sort published_at

Author: jlorich

EasyReader.xcodeproj/project.pbxproj

@@ -37,8 +37,9 @@ - (NSString *)feedName
 
 - (NSString *)headline
 {
-    NSString *timeAgo = [self.updatedAt timeAgo];
     NSString *feedName = self.feed.name;
+    NSString *timeAgo = self.publishedAt ? [self.publishedAt timeAgo] : [self.updatedAt timeAgo];
+    
 
     if (feedName.length > 30) {
         feedName = [[feedName substringToIndex:30] stringByAppendingString:@"..."];

EasyReader/Application/Models/FeedItem.m

@@ -76,8 +76,7 @@ - (instancetype) init
         _feeds = [self.currentUser.feeds sortedArrayByAttributes:@[@"name"]
                                                        ascending:[self nameSortDirection]];
 
-        _feedItems = [self.currentUser.feedItems sortedArrayByAttributes:@[@"createdAt"]
-                                                               ascending:[self createdAtSortDirection]];
+        _feedItems = [self sorted:self.currentUser.feedItems];
         _visibleFeedItems = _feedItems;
 
         [[NSNotificationCenter defaultCenter] addObserver:self
@@ -110,8 +109,7 @@ - (void)selectedFeedDidChange:(NSNotification *)notification
     [self willChangeValueForKey:@"visibleFeedItems"];
 
     if (feed) {
-        _visibleFeedItems = [feed.feedItems sortedArrayByAttributes:@[@"createdAt"]
-                                                          ascending:[self createdAtSortDirection]];
+        _visibleFeedItems = [self sorted:feed.feedItems];
         currentFeed = feed;
     } else {
         _visibleFeedItems = _feedItems;
@@ -166,8 +164,7 @@ - (void) userFeedsDidChange:(User *)currentUser oldFeeds:(NSSet *)oldFeeds newFe
     _feeds = [newFeeds sortedArrayByAttributes:@[@"name"]
                                      ascending:[self nameSortDirection]];
 
-    _feedItems = [feedItems sortedArrayByAttributes:@[@"createdAt"]
-                                          ascending:[self createdAtSortDirection]];
+    _feedItems = [self sorted:feedItems];
 
     if (!currentFeed) {
         _visibleFeedItems = _feedItems;
@@ -203,22 +200,30 @@ - (void)observeFeedItemsForFeeds:(NSArray *)feeds {
         [self willChangeValueForKey:@"visibleFeedItems"];
         [self willChangeValueForKey:@"feedItems"];
 
-        _feedItems = [self.currentUser.feedItems sortedArrayByAttributes:@[@"createdAt"]
-                                                               ascending:[self createdAtSortDirection]];
+        _feedItems = [self sorted:self.currentUser.feedItems];
 
         if (!currentFeed) {
             _visibleFeedItems = _feedItems;
         } else {
-            _visibleFeedItems = [currentFeed.feedItems sortedArrayByAttributes:@[@"createdAt"]
-                                                                     ascending:[self createdAtSortDirection]];
+            _visibleFeedItems = [self sorted:currentFeed.feedItems];
         }
 
         [self didChangeValueForKey:@"feedItems"];
         [self didChangeValueForKey:@"visibleFeedItems"];
     };
 }
 
-- (BOOL)createdAtSortDirection {
+- (NSArray *)sorted:(NSSet*)feedItems {
+    return [feedItems sortedArrayByAttributes:[self feedItemSortAttributes]
+                                    ascending:[self feedItemSortDirection]];
+}
+
+- (NSArray *)feedItemSortAttributes
+{
+    return @[@"publishedAt", @"createdAt"];
+}
+
+- (BOOL)feedItemSortDirection {
     return NO;
 }
 

EasyReader/Application/Services/EZRCurrentFeedsProvider.m

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.1</string>
+	<string>2.2</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>