public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-08-31 22:20:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handling paging on any view when sycning dashboard with river.

Browse source
This commit is contained in:
Samuel Clay 2014-02-21 12:45:17 -08:00
parent be44b5dba4
commit 1d0f0bb45a
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clients/ios/Classes/NBContainerViewController.m
View file

@ -881,9 +881,6 @@
} }
if (self.feedDetailViewController.storiesCollection.transferredFromDashboard) { if (self.feedDetailViewController.storiesCollection.transferredFromDashboard) {
[self.dashboardViewController.storiesModule.storiesCollection
transferStoriesFromCollection:self.feedDetailViewController.storiesCollection];
self.dashboardViewController.storiesModule.feedPage = self.feedDetailViewController.feedPage + 1;
[self.dashboardViewController.storiesModule fadeSelectedCell]; [self.dashboardViewController.storiesModule fadeSelectedCell];
} }
} }

7
clients/ios/Classes/NewsBlurViewController.m
View file

@ -241,7 +241,12 @@ static UIFont *userLabelFont;
// NSLog(@"back gesture: %d, %f - %f/%f", (int)gesture.state, percentage, point.x, viewWidth); // NSLog(@"back gesture: %d, %f - %f/%f", (int)gesture.state, percentage, point.x, viewWidth);
if (gesture.state == UIGestureRecognizerStateBegan) { if (gesture.state == UIGestureRecognizerStateBegan) {
[appDelegate.dashboardViewController.storiesModule fadeSelectedCell:NO]; if (appDelegate.storiesCollection.transferredFromDashboard) {
[appDelegate.dashboardViewController.storiesModule.storiesCollection
transferStoriesFromCollection:appDelegate.storiesCollection];
appDelegate.dashboardViewController.storiesModule.feedPage = appDelegate.feedDetailViewController.feedPage + 1;
[appDelegate.dashboardViewController.storiesModule fadeSelectedCell:NO];
}
} else if (gesture.state == UIGestureRecognizerStateChanged) { } else if (gesture.state == UIGestureRecognizerStateChanged) {
[appDelegate.masterContainerViewController interactiveTransitionFromFeedDetail:percentage]; [appDelegate.masterContainerViewController interactiveTransitionFromFeedDetail:percentage];
} else if (gesture.state == UIGestureRecognizerStateEnded) { } else if (gesture.state == UIGestureRecognizerStateEnded) {