diff --git a/clients/ios/Classes/FeedsObjCViewController.h b/clients/ios/Classes/FeedsObjCViewController.h index 408a33457..952f0b4be 100644 --- a/clients/ios/Classes/FeedsObjCViewController.h +++ b/clients/ios/Classes/FeedsObjCViewController.h @@ -123,6 +123,8 @@ UIGestureRecognizerDelegate, UISearchBarDelegate> { - (void)fadeFeed:(NSString *)feedId; - (IBAction)tapAddSite:(id)sender; +- (void)selectWidgetStories; + - (void)resetToolbar; - (void)layoutHeaderCounts:(UIInterfaceOrientation)orientation; - (void)refreshHeaderCounts; diff --git a/clients/ios/Classes/FeedsObjCViewController.m b/clients/ios/Classes/FeedsObjCViewController.m index d204bf117..f386906d7 100644 --- a/clients/ios/Classes/FeedsObjCViewController.m +++ b/clients/ios/Classes/FeedsObjCViewController.m @@ -1798,6 +1798,14 @@ heightForHeaderInSection:(NSInteger)section { [self didSelectSectionHeaderWithTag:NewsBlurTopSectionAllStories]; } +- (void)selectWidgetStories { + NSInteger tag = [appDelegate.dictFoldersArray indexOfObject:@"widget_stories"]; + + if (tag != NSNotFound) { + [self didSelectSectionHeaderWithTag:tag]; + } +} + #pragma mark - MCSwipeTableViewCellDelegate // When the user starts swiping the cell this method is called diff --git a/clients/ios/Classes/NewsBlurAppDelegate.m b/clients/ios/Classes/NewsBlurAppDelegate.m index 003dce7b3..5e9a08133 100644 --- a/clients/ios/Classes/NewsBlurAppDelegate.m +++ b/clients/ios/Classes/NewsBlurAppDelegate.m @@ -1699,24 +1699,12 @@ - (void)backgroundLoadNotificationStory { if (self.inFindingStoryMode) { - if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { - [self loadFeedDetailView]; - } else if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) { + if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad && [storiesCollection.activeFolder isEqualToString:@"widget_stories"]) { + [self.feedsViewController selectWidgetStories]; + } else { [self loadRiverFeedDetailView:self.feedDetailViewController withFolder:storiesCollection.activeFolder]; -// [self showFeedsListAnimated:NO]; -// [self hidePopoverAnimated:NO completion:^{ -// if (self.feedsNavigationController.presentedViewController) { -// [self.feedsNavigationController dismissViewControllerAnimated:NO completion:^{ -// [self loadFeedDetailView]; -// }]; -// } else { -// [self loadFeedDetailView]; -// } -// }]; } - } - - if (self.tryFeedFeedId && !self.isTryFeedView) { + } else if (self.tryFeedFeedId && !self.isTryFeedView) { [self loadFeed:self.tryFeedFeedId withStory:self.tryFeedStoryId animated:NO]; } else if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad && !self.isCompactWidth && self.storiesCollection == nil) { [self loadRiverFeedDetailView:self.feedDetailViewController withFolder:storiesCollection.activeFolder];