public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-21 05:45:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing issue around missing favicon colors. Also correctly showing river pages and counting read stories for optimization.

Browse source
This commit is contained in:
Samuel Clay 2011-10-26 09:05:59 -07:00
parent 592dd1b052
commit 4ea82f11f9
1 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
media/iphone/Classes/FeedDetailViewController.m
View file

@ -195,7 +195,22 @@
if (request.tag == [[results objectForKey:@"feed_id"] intValue]) {
[pull finishedLoading];
[self renderStories:[results objectForKey:@"stories"]];
NSArray *newStories = [results objectForKey:@"stories"];
NSMutableArray *confirmedNewStories = [NSMutableArray array];
if ([appDelegate.activeFeedStories count]) {
NSMutableSet *storyIds = [NSMutableSet set];
for (id story in appDelegate.activeFeedStories) {
[storyIds addObject:[story objectForKey:@"id"]];
}
for (id story in newStories) {
if (![storyIds containsObject:[story objectForKey:@"id"]]) {
[confirmedNewStories addObject:story];
}
}
} else {
confirmedNewStories = [[newStories copy] autorelease];
}
[self renderStories:confirmedNewStories];
}
[results release];
@ -213,11 +228,20 @@
[self.storyTitlesTable reloadData];
[storyTitlesTable scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:YES];
}
int readStoriesCount = 0;
if (self.feedPage > 1) {
for (id story in appDelegate.activeFeedStories) {
if ([[story objectForKey:@"read_status"] intValue] == 1) {
readStoriesCount += 1;
}
}
}
NSString *theFeedDetailURL = [NSString stringWithFormat:@"http://%@/reader/river_stories/?feeds=%@&page=%d",
NSString *theFeedDetailURL = [NSString stringWithFormat:@"http://%@/reader/river_stories/?feeds=%@&page=%d&read_stories_count=%d",
NEWSBLUR_URL,
[appDelegate.activeFolderFeeds componentsJoinedByString:@"&feeds="],
self.feedPage];
self.feedPage,
readStoriesCount];
NSURL *urlFeedDetail = [NSURL URLWithString:theFeedDetailURL];
__block ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:urlFeedDetail];
@ -418,6 +442,9 @@
gradient.frame = CGRectMake(0, 0, cell.frame.size.width, 27);
unsigned int color = 0;
NSString *favicon_color = [feed objectForKey:@"favicon_color"];
if ([favicon_color class] == [NSNull class]) {
favicon_color = @"505050";
}
NSString *red = [favicon_color substringFrom:0 to:2];
NSString *green = [favicon_color substringFrom:2 to:4];
NSString *blue = [favicon_color substringFrom:4 to:6];