diff --git a/clients/ios/Classes/ActivityCell.m b/clients/ios/Classes/ActivityCell.m index 9ccc5011b..7bee7081e 100644 --- a/clients/ios/Classes/ActivityCell.m +++ b/clients/ios/Classes/ActivityCell.m @@ -58,9 +58,9 @@ // position label to bounds labelFrame.origin.x = leftMargin*2 + avatarSize; - labelFrame.origin.y = topMargin - 1; + labelFrame.origin.y = 0; labelFrame.size.width = contentRect.size.width - leftMargin - avatarSize - leftMargin - rightMargin - 20; - labelFrame.size.height = contentRect.size.height - topMargin - bottomMargin; + labelFrame.size.height = contentRect.size.height; self.activityLabel.frame = labelFrame; } @@ -108,8 +108,8 @@ feedId = [activity objectForKey:@"story_feed_id"]; } if (feedId && [feedId class] != [NSNull class]) { - NSString *faviconUrl = [NSString stringWithFormat:@"%@/rss_feeds/icon/%i", - NEWSBLUR_URL, + NSString *faviconUrl = [NSString stringWithFormat:@"%@/%i", + ICONS_HOST, [feedId intValue]]; [self.faviconView setImageWithURL:[NSURL URLWithString:faviconUrl] placeholderImage:nil]; diff --git a/clients/ios/Classes/InteractionCell.m b/clients/ios/Classes/InteractionCell.m index 202273b4e..d5aba422d 100644 --- a/clients/ios/Classes/InteractionCell.m +++ b/clients/ios/Classes/InteractionCell.m @@ -42,8 +42,8 @@ myBackView.backgroundColor = UIColorFromRGB(NEWSBLUR_HIGHLIGHT_COLOR); self.selectedBackgroundView = myBackView; - topMargin = 15; - bottomMargin = 15; + topMargin = 12; + bottomMargin = 12; leftMargin = 20; rightMargin = 20; avatarSize = 48; @@ -65,9 +65,9 @@ // position label to bounds labelFrame.origin.x = leftMargin*2 + avatarSize; - labelFrame.origin.y = topMargin - 1; + labelFrame.origin.y = 0; labelFrame.size.width = contentRect.size.width - leftMargin - avatarSize - leftMargin - rightMargin - 20; - labelFrame.size.height = contentRect.size.height - topMargin - bottomMargin; + labelFrame.size.height = contentRect.size.height; self.interactionLabel.frame = labelFrame; } diff --git a/clients/ios/Classes/SmallActivityCell.m b/clients/ios/Classes/SmallActivityCell.m index 91f921c45..3c8306fb3 100644 --- a/clients/ios/Classes/SmallActivityCell.m +++ b/clients/ios/Classes/SmallActivityCell.m @@ -52,9 +52,9 @@ // position label to bounds labelFrame.origin.x = leftMargin*2 + avatarSize; - labelFrame.origin.y = topMargin - 1; + labelFrame.origin.y = 0; labelFrame.size.width = contentRect.size.width - leftMargin - avatarSize - leftMargin - rightMargin - 20; - labelFrame.size.height = contentRect.size.height - topMargin - bottomMargin; + labelFrame.size.height = contentRect.size.height; self.activityLabel.frame = labelFrame; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { diff --git a/clients/ios/Classes/SmallInteractionCell.m b/clients/ios/Classes/SmallInteractionCell.m index 031419b9f..d2ceffb18 100644 --- a/clients/ios/Classes/SmallInteractionCell.m +++ b/clients/ios/Classes/SmallInteractionCell.m @@ -52,9 +52,9 @@ // position label to bounds labelFrame.origin.x = leftMargin*2 + avatarSize; - labelFrame.origin.y = topMargin - 1; + labelFrame.origin.y = 0; labelFrame.size.width = contentRect.size.width - leftMargin - avatarSize - leftMargin - rightMargin - 20; - labelFrame.size.height = contentRect.size.height - topMargin - bottomMargin; + labelFrame.size.height = contentRect.size.height; self.interactionLabel.frame = labelFrame; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { diff --git a/clients/ios/NewsBlur_Prefix.pch b/clients/ios/NewsBlur_Prefix.pch index 743695d63..e510fba2d 100644 --- a/clients/ios/NewsBlur_Prefix.pch +++ b/clients/ios/NewsBlur_Prefix.pch @@ -12,14 +12,17 @@ #define BACKGROUND_REFRESH_SECONDS -5 #define NEWSBLUR_URL [NSString stringWithFormat:@"http://nb.local.com"] #define NEWSBLUR_HOST [NSString stringWithFormat:@"nb.local.com"] + #define ICONS_HOST [NSString stringWithFormat:@"http://nb.local.com/rss_feeds/icon"] #elif PROD_DEBUG #define BACKGROUND_REFRESH_SECONDS -5 #define NEWSBLUR_URL [NSString stringWithFormat:@"http://debug.newsblur.com"] #define NEWSBLUR_HOST [NSString stringWithFormat:@"debug.newsblur.com"] + #define ICONS_HOST [NSString stringWithFormat:@"https://s3.amazonaws.com/icons.newsblur.com"] #else #define BACKGROUND_REFRESH_SECONDS -10*60 #define NEWSBLUR_URL [NSString stringWithFormat:@"https://www.newsblur.com"] #define NEWSBLUR_HOST [NSString stringWithFormat:@"www.newsblur.com"] + #define ICONS_HOST [NSString stringWithFormat:@"https://s3.amazonaws.com/icons.newsblur.com"] #endif #define _ Underscore