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

iOS: fixed #1219 & #1224 (iPad layout issues)

Browse source 
This was a curly one to trace; related to social feeds.
This commit is contained in:
David Sinclair 2019-08-23 20:14:22 -07:00
parent b7871c84f9
commit 98e6429b25
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -573,9 +573,10 @@
- (void)finishedLoadingFeedsNotification:(NSNotification *)notification {
if (self.restoringFeedID.length > 0) {
NSDictionary *feed = [appDelegate getFeed:self.restoringFeedID];
BOOL isSocial = [appDelegate isSocialFeed:self.restoringFeedID];
if (feed != nil) {
appDelegate.storiesCollection.isSocialView = NO;
appDelegate.storiesCollection.isSocialView = isSocial;
appDelegate.storiesCollection.activeFeed = feed;
[appDelegate loadFeedDetailView:NO];
[self viewWillAppear:NO];

4
clients/ios/Classes/NewsBlurAppDelegate.m
View file

@ -2136,7 +2136,9 @@
NSString *folder = storiesCollection.activeFolder;
NSString *title = storiesCollection.activeTitle;
if ([folder isEqualToString:@"river_blurblogs"]) {
if (folder == nil || title == nil) {
return;
} else if ([folder isEqualToString:@"river_blurblogs"]) {
activity.title = @"Read All Shared Stories";
} else if ([folder isEqualToString:@"river_global"]) {
activity.title = @"Read Global Shared Stories";

9
clients/ios/Classes/StoryPageControl.m
View file

@ -813,11 +813,12 @@
if (self.restoringStoryId.length > 0) {
NSInteger pageIndex = [appDelegate.storiesCollection indexOfStoryId:self.restoringStoryId];
if (pageIndex < 0) {
[appDelegate hideStoryDetailView];
// [self doNextUnreadStory:nil];
} else {
if (pageIndex >= 0) {
[self changePage:pageIndex animated:NO];
} else if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
[self doNextUnreadStory:nil];
} else {
[appDelegate hideStoryDetailView];
}
self.restoringStoryId = nil;