public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing bug around starting at one intelligence level, going into the feed detail view, switching to a new intelligence level, then backing out to the feeds view and needing it to update with the correct intelligence level.

Browse source
This commit is contained in:
Samuel Clay 2011-08-02 18:19:46 -07:00
parent 94ddd4396c
commit 437c7ae5a3
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
media/iphone/Classes/NewsBlurViewController.h
View file

@ -33,6 +33,7 @@
- (IBAction)doLogoutButton;
- (NSString *)showUnreadCount:(NSDictionary *)feed;
- (IBAction)selectIntelligence;
- (void)updateFeedsWithIntelligence:(int)previousLevel newLevel:(int)newLevel;
- (void)calculateFeedLocations;
+ (int)computeMaxScoreForFeed:(NSDictionary *)feed;

39
media/iphone/Classes/NewsBlurViewController.m
View file

@ -56,6 +56,10 @@
arrayWithObject:appDelegate.activeFeedIndexPath]
withRowAnimation:UITableViewRowAnimationNone];
[self.feedTitlesTable endUpdates];
NSInteger previousLevel = [self.intelligenceControl selectedSegmentIndex] - 1;
NSInteger newLevel = [appDelegate selectedIntelligence];
[self updateFeedsWithIntelligence:previousLevel newLevel:newLevel];
}
[self.intelligenceControl setImage:[UIImage imageNamed:@"bullet_red.png"] forSegmentAtIndex:0];
[self.intelligenceControl setImage:[UIImage imageNamed:@"bullet_yellow.png"] forSegmentAtIndex:1];
@ -254,21 +258,16 @@
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
int section_index = 0;
for (id f in self.dictFoldersArray) {
if (section_index == indexPath.section) {
NSArray *feeds = [[NSArray alloc] initWithArray:[self.dictFolders objectForKey:f]];
id feedId = [feeds objectAtIndex:indexPath.row];
NSString *feedIdStr = [NSString stringWithFormat:@"%@",feedId];
[appDelegate setActiveFeed:[self.dictFeeds
objectForKey:feedIdStr]];
[appDelegate setActiveFeedIndexPath:indexPath];
[feeds release];
break;
}
section_index++;
}
//NSLog(@"App Delegate: %@", self.appDelegate);
NSString *folderName = [self.dictFoldersArray objectAtIndex:indexPath.section];
NSArray *feeds = [self.dictFolders objectForKey:folderName];
NSArray *activeFolderFeeds = [self.activeFeedLocations objectForKey:folderName];
int location = [[activeFolderFeeds objectAtIndex:indexPath.row] intValue];
id feedId = [feeds objectAtIndex:location];
NSString *feedIdStr = [NSString stringWithFormat:@"%@",feedId];
NSDictionary *feed = [self.dictFeeds objectForKey:feedIdStr];
[appDelegate setActiveFeed:feed];
[appDelegate setActiveFeedIndexPath:indexPath];
[appDelegate loadFeedDetailView];
}
@ -333,9 +332,13 @@
- (IBAction)selectIntelligence {
NSInteger newLevel = [self.intelligenceControl selectedSegmentIndex] - 1;
NSInteger previousLevel = [appDelegate selectedIntelligence];
[self updateFeedsWithIntelligence:previousLevel newLevel:newLevel];
}
- (void)updateFeedsWithIntelligence:(int)previousLevel newLevel:(int)newLevel {
NSMutableArray *insertIndexPaths = [NSMutableArray array];
NSMutableArray *deleteIndexPaths = [NSMutableArray array];
NSLog(@"selectIntelligence: from %d to %d", previousLevel, newLevel);
if (newLevel < previousLevel) {
[appDelegate setSelectedIntelligence:newLevel];
[self calculateFeedLocations];
@ -390,10 +393,6 @@
withRowAnimation:UITableViewRowAnimationNone];
}
[self.feedTitlesTable endUpdates];
// NSLog(@"dictFolders: %@", self.dictFolders);
// NSLog(@"dictFeeds: %@", self.dictFeeds);
// NSLog(@"dictFoldersArray: %@", self.dictFoldersArray);
}
- (void)calculateFeedLocations {