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

Fixing issue when loading pages on ios app but loading the story page controller early and not refreshing on page load.

Browse source
This commit is contained in:
Samuel Clay 2012-12-06 15:30:16 -08:00
parent afbba14390
commit a723b79d25
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
media/ios/Classes/FeedDetailViewController.m
View file

@ -462,6 +462,7 @@
[self renderStories:confirmedNewStories];
[appDelegate.storyPageControl resizeScrollView];
[appDelegate.storyPageControl setStoryFromScroll:YES];
}
#pragma mark -

22
media/ios/Classes/StoryPageControl.m
View file

@ -292,29 +292,31 @@
// NSLog(@"Out of bounds: was %d, now %d", pageController.pageIndex, newIndex);
CGRect pageFrame = pageController.view.frame;
pageFrame.origin.x = self.scrollView.frame.size.width * newIndex;
pageFrame.origin.y = self.scrollView.frame.size.height;
pageFrame.size.height = 0;
pageFrame.origin.y = 48;
pageFrame.size.height = self.scrollView.frame.size.height;
pageController.view.frame = pageFrame;
}
int wasIndex = pageController.pageIndex;
pageController.pageIndex = newIndex;
NSLog(@"Applied Index: Was %d, now %d (%d/%d/%d) [%d stories]", wasIndex, newIndex, previousPage.pageIndex, currentPage.pageIndex, nextPage.pageIndex, [appDelegate.activeFeedStoryLocations count]);
NSLog(@"Applied Index: Was %d, now %d (%d/%d/%d) [%d stories - %d]", wasIndex, newIndex, previousPage.pageIndex, currentPage.pageIndex, nextPage.pageIndex, [appDelegate.activeFeedStoryLocations count], outOfBounds);
if (newIndex > 0 && newIndex >= [appDelegate.activeFeedStoryLocations count]) {
pageController.pageIndex = -2;
if (self.appDelegate.feedDetailViewController.feedPage < 50 &&
!self.appDelegate.feedDetailViewController.pageFinished &&
!self.appDelegate.feedDetailViewController.pageFetching) {
[self.appDelegate.feedDetailViewController fetchNextPage:^() {
NSLog(@"Fetched next page, %d stories", [appDelegate.activeFeedStoryLocations count]);
[self applyNewIndex:newIndex pageController:pageController];
}];
} else {
// [appDelegate.navigationController
// popToViewController:[appDelegate.navigationController.viewControllers
// objectAtIndex:0]
// animated:YES];
// [appDelegate hideStoryDetailView];
} else if (!self.appDelegate.feedDetailViewController.pageFinished &&
!self.appDelegate.feedDetailViewController.pageFetching) {
[appDelegate.navigationController
popToViewController:[appDelegate.navigationController.viewControllers
objectAtIndex:0]
animated:YES];
[appDelegate hideStoryDetailView];
}
} else if (!outOfBounds) {
int location = [appDelegate indexFromLocation:pageController.pageIndex];