New Reader list design

WordPress/Classes/NSDate+StringFormatting.h

@@ -0,0 +1,15 @@
+//
+//  NSDate+StringFormatting.h
+//  WordPress
+//
+//  Created by Michael Johnston on 11/17/13.
+//  Copyright (c) 2013 WordPress. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSDate (StringFormatting)
+
+- (NSString *)shortString;
+
+@end

WordPress/Classes/NSDate+StringFormatting.m

@@ -0,0 +1,30 @@
+//
+//  NSDate+StringFormatting.m
+//  WordPress
+//
+//  Created by Michael Johnston on 11/17/13.
+//  Copyright (c) 2013 WordPress. All rights reserved.
+//
+
+#import "NSDate+StringFormatting.h"
+
+@implementation NSDate (StringFormatting)
+
+- (NSString *)shortString {
+    NSString *shortString;
+	NSTimeInterval diff = [[NSDate date] timeIntervalSince1970] - [self timeIntervalSince1970];
+
+	if(diff < 60) {
+		shortString = [NSString stringWithFormat:@"%is", (int)diff];
+	} else if(diff < 3600) {
+		shortString = [NSString stringWithFormat:@"%im", (int)floor(diff / 60)];
+	} else if (diff < 86400) {
+		shortString = [NSString stringWithFormat:@"%ih", (int)floor(diff / 3600)];
+	} else {
+		shortString = [NSString stringWithFormat:@"%id", (int)floor(diff / 86400)];
+	}
+
+	return shortString;
+}
+
+@end

WordPress/Classes/ReaderComment.h

@@ -62,6 +62,4 @@
 + (void)createOrUpdateWithDictionary:(NSDictionary *)dict forPost:(ReaderPost *)post withContext:(NSManagedObjectContext *)context;
 
 
-- (NSString *)shortDate;
-
 @end

WordPress/Classes/ReaderComment.m

@@ -185,24 +185,4 @@ - (void)updateFromDictionary:(NSDictionary *)dict {
 
 }
 
-
-- (NSString *)shortDate {
-
-	NSString *str;
-	NSTimeInterval diff = [[NSDate date] timeIntervalSince1970] - [self.dateCreated timeIntervalSince1970];
-
-	if(diff < 60) {
-		str = [NSString stringWithFormat:@"%is", (int)diff];
-	} else if(diff < 3600) {
-		str = [NSString stringWithFormat:@"%im", (int)floor(diff / 60)];
-	} else if (diff < 86400) {
-		str = [NSString stringWithFormat:@"%ih", (int)floor(diff / 3600)];
-	} else {
-		str = [NSString stringWithFormat:@"%id", (int)floor(diff / 86400)];
-	}
-
-	return str;
-
-}
-
 @end

WordPress/Classes/ReaderCommentTableViewCell.m

@@ -11,6 +11,7 @@
 #import "UIImageView+Gravatar.h"
 #import "WordPressAppDelegate.h"
 #import "WPWebViewController.h"
+#import "NSDate+StringFormatting.h"
 
 #define RCTVCVerticalPadding 5.0f
 #define RCTVCIndentationWidth 10.0f
@@ -197,7 +198,7 @@ - (void)configureCell:(ReaderComment *)comment {
 
 	[self.contentView addSubview:self.cellImageView];
 
-	_dateLabel.text = [comment shortDate];
+	_dateLabel.text = [comment.dateCreated shortString];
 	_authorLabel.text = comment.author;
 	[self.cellImageView setImageWithURL:[NSURL URLWithString:comment.authorAvatarURL] placeholderImage:[UIImage imageNamed:@"blavatar-wpcom.png"]];
 

WordPress/Classes/ReaderPost.h

@@ -45,6 +45,10 @@ extern NSString *const ReaderExtrasArrayKey;
 @property (nonatomic, strong) NSString *summary;
 @property (nonatomic, strong) NSMutableSet *comments;
 @property (nonatomic, readonly, strong) NSURL *featuredImageURL;
+@property (nonatomic, strong) NSString *primaryTagName;
+@property (nonatomic, strong) NSString *primaryTagSlug;
+@property (nonatomic, strong) NSString *tags;
+
 
 /**
  An array of dictionaries representing available REST API endpoints to retrieve posts for the Reader.
@@ -111,6 +115,7 @@ extern NSString *const ReaderExtrasArrayKey;
 
 - (NSString *)prettyDateString;
 
+- (BOOL)isFollowable;
 
 - (BOOL)isFreshlyPressed;
 
@@ -129,6 +134,7 @@ extern NSString *const ReaderExtrasArrayKey;
 
 - (NSDictionary *)getStoredComment;
 
+- (NSString *)authorString;
 
 - (NSString *)avatar;
 

WordPress/Classes/ReaderPost.m

@@ -62,6 +62,9 @@ @implementation ReaderPost
 @dynamic storedComment;
 @dynamic summary;
 @dynamic comments;
+@dynamic primaryTagName;
+@dynamic primaryTagSlug;
+@dynamic tags;
 
 + (void)load {
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleLogoutNotification:) name:WordPressComApiDidLogoutNotification object:nil];
@@ -209,6 +212,12 @@ + (void)createOrUpdateWithDictionary:(NSDictionary *)dict forEndpoint:(NSString
 	NSNumber *blogSiteID = [dict numberForKey:@"site_id"];
 	NSNumber *siteID = [dict numberForKey:@"blog_id"];
 	NSNumber *postID = [dict numberForKey:@"ID"];
+
+    // Some endpoints (e.g. tags) use different case
+    if (siteID == nil) {
+        siteID = [dict numberForKey:@"site_ID"];
+        blogSiteID = [dict numberForKey:@"site_ID"];
+    }
 
 	// following, likes and topics endpoints
 	if ([dict valueForKey:@"blog_site_id"] != nil) {
@@ -282,7 +291,6 @@ - (void)updateFromDictionary:(NSDictionary *)dict {
 	self.dateSynced = [NSDate date];
 }
 
-
 - (void)updateFromRESTDictionary:(NSDictionary *)dict {
 	// REST api.  Freshly Pressed, sites/site/posts
 
@@ -351,6 +359,16 @@ - (void)updateFromRESTDictionary:(NSDictionary *)dict {
 	self.blogURL = [NSString stringWithFormat:@"%@://%@/", url.scheme, url.host];
 
 	self.summary = [self createSummary:self.content makePlainText:YES];
+
+    NSDictionary *tagsDict = [dict objectForKey:@"tags"];
+    NSArray *tagsList = [NSArray arrayWithArray:[tagsDict allKeys]];
+    self.tags = [tagsList componentsJoinedByString:@", "];
+
+    if ([tagsDict count] > 0) {
+        NSDictionary *tagDict = [[tagsDict allValues] objectAtIndex:0];
+        self.primaryTagSlug = tagDict[@"slug"];
+        self.primaryTagName = tagDict[@"name"];
+    }
 }
 
 
@@ -423,6 +441,22 @@ - (void)updateFromReaderDictionary:(NSDictionary *)dict {
 		img = [img stringByDecodingXMLCharacters];
 		self.postAvatar = [self parseImageSrcFromHTML:img];
 	}
+
+    NSDictionary *tagsDict = [dict objectForKey:@"topics"];
+
+    if ([tagsDict count] > 0) {
+        NSArray *tagsList = [NSArray arrayWithArray:[tagsDict allValues]];
+        self.tags = [tagsList componentsJoinedByString:@", "];
+    }
+
+    NSDictionary *primaryTagDict = [dict objectForKey:@"primary_tag"];
+    if ([primaryTagDict isKindOfClass:[NSDictionary class]]) {
+        self.primaryTagName = primaryTagDict[@"name"];
+        self.primaryTagSlug = primaryTagDict[@"slug"];
+    } else if ([tagsDict count] > 0) {
+        self.primaryTagSlug = [[tagsDict allKeys] objectAtIndex:0];
+        self.primaryTagName = [tagsDict objectForKey:self.primaryTagSlug];
+    }
 }
 
 
@@ -606,6 +640,9 @@ - (NSString *)prettyDateString {
     return [formatter stringFromDate:date];
 }
 
+- (BOOL)isFollowable {
+    return self.siteID != nil;
+}
 
 - (BOOL)isFreshlyPressed {
 	return ([self.endpoint rangeOfString:@"freshly-pressed"].location != NSNotFound)? YES : NO;
@@ -643,6 +680,15 @@ - (NSDictionary *)getStoredComment {
 	return @{@"commentID":commentID, @"comment":commentText};
 }
 
+- (NSString *)authorString {
+    if ([self.blogName length] > 0) {
+        return self.blogName;
+    } else if ([self.authorDisplayName length] > 0) {
+        return self.authorDisplayName;
+    } else {
+        return self.author;
+    }
+}
 
 - (NSString *)avatar {
 	return (self.postAvatar == nil) ? self.authorAvatarURL : self.postAvatar;

WordPress/Classes/ReaderPostTableViewCell.h

@@ -14,10 +14,22 @@
 @property (nonatomic, strong) UIImageView *avatarImageView;
 
 + (CGFloat)cellHeightForPost:(ReaderPost *)post withWidth:(CGFloat)width;
++ (ReaderPostTableViewCell *)cellForSubview:(UIView *)subview;
 
 - (void)configureCell:(ReaderPost *)post;
-- (void)setReblogTarget:(id)target action:(SEL)selector;
 - (void)setFeaturedImage:(UIImage *)image;
 - (void)setAvatar:(UIImage *)avatar;
 
+@property (nonatomic, strong) ReaderPost *post;
+@property (nonatomic, strong) UIButton *followButton;
+@property (nonatomic, strong) UIButton *tagButton;
+@property (nonatomic, strong) UIButton *likeButton;
+@property (nonatomic, strong) UIButton *reblogButton;
+@property (nonatomic, strong) UIButton *commentButton;
+@property (nonatomic, strong) UIButton *timeButton;
+
+extern CGFloat const RPTVCMaxImageHeightPercentage;
+
+- (void)updateControlBar;
+
 @end