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

Scrolling in the feed view loads more stories! Need a progress indicator and a bottom of the feed indicator.

Browse source
This commit is contained in:
Samuel Clay 2011-07-22 09:10:13 -07:00
parent 86741fbed4
commit 0864a1db33
3 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -14,3 +14,7 @@ logs
mongo/
**/*.xcuserstate
media/iphone/NewsBlur.xcodeproj/project.xcworkspace/xcuserdata/conesus.xcuserdatad/UserInterfaceState.xcuserstate
UserInterfaceState.xcuserstate
UserInterfaceState\.xcuserstate
*.xcuserstate
xcuserdata

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

@ -30,7 +30,7 @@
}
- (void)viewWillAppear:(BOOL)animated {
NSLog(@"Loaded Feed view: %@", appDelegate.activeFeed);
// NSLog(@"Loaded Feed view: %@", appDelegate.activeFeed);
self.title = [appDelegate.activeFeed objectForKey:@"feed_title"];
[super viewWillAppear:animated];
@ -71,7 +71,9 @@
if ([appDelegate.activeFeed objectForKey:@"id"] != nil && !self.pageFetching) {
self.feedPage = page;
self.pageFetching = YES;
[storyTitlesTable scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:YES];
if ([appDelegate.activeFeedStories count] == 0) {
[storyTitlesTable scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:YES];
}
NSString *theFeedDetailURL = [[NSString alloc]
initWithFormat:@"http://nb.local.host:8000/reader/feed/%@?page=%d",
@ -104,16 +106,27 @@
encoding:NSUTF8StringEncoding];
NSDictionary *results = [[NSDictionary alloc]
initWithDictionary:[jsonS JSONValue]];
if (self.feedPage == 1) {
[appDelegate setActiveFeedStories:[results objectForKey:@"stories"]];
} else {
[appDelegate addActiveFeedStories:[results objectForKey:@"stories"]];
}
NSLog(@"Stories: %d on page %d", [appDelegate.activeFeedStories count], self.feedPage);
NSArray *newStories = [results objectForKey:@"stories"];
NSUInteger existingStoriesCount = [stories count];
// NSArray *indexPaths = [NSArray alloc]
// [self.storyTitlesTable insertRowsAtIndexPaths:indexPaths withRowAnimation:NO];
if (self.feedPage == 1) {
[appDelegate setActiveFeedStories:newStories];
} else {
[appDelegate addActiveFeedStories:newStories];
}
NSLog(@"Stories: %d on page %d. %d stories already.", [appDelegate.activeFeedStories count], self.feedPage, existingStoriesCount);
if (existingStoriesCount > 0) {
int endPosition = [newStories count]+existingStoriesCount;
NSMutableArray *indexPaths = [NSMutableArray alloc];
for (int i=0; i < [newStories count]; i++) {
int row = existingStoriesCount+i;
[indexPaths addObject:[NSIndexPath indexPathForRow:row inSection:0]];
}
[self.storyTitlesTable insertRowsAtIndexPaths:indexPaths withRowAnimation:UITableViewRowAnimationNone];
[indexPaths release];
} else {
[self.storyTitlesTable reloadData];
}
self.pageFetching = NO;
[results release];
[jsonS release];

2
media/iphone/Classes/NewsBlurAppDelegate.m
View file

@ -158,7 +158,7 @@
}
- (void)addActiveFeedStories:(NSArray *)stories {
NSLog(@"Adding: %d to %@", [stories count], stories);
// NSLog(@"Adding: %d to %@", [stories count], stories);
self.activeFeedStories = [self.activeFeedStories arrayByAddingObjectsFromArray:stories];
}