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

#817 (three column layout)

Browse source 
- When using top or bottom layout on iPad, now includes the feed detail menu in the nav bar.
- Fixed an empty middle column when switching from top or bottom layout to left layout.
This commit is contained in:
David Sinclair 2021-04-24 20:46:54 -07:00
parent 5a741f36c6
commit 883d654686
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clients/ios/Classes/DetailViewController.swift
View file

@ -164,6 +164,12 @@ class DetailViewController: BaseViewController {
checkViewControllers()
appDelegate.feedsViewController.loadOfflineFeeds(false)
if layout != .left, let controller = feedDetailViewController {
navigationItem.leftBarButtonItems = [controller.settingsBarButton]
} else {
navigationItem.leftBarButtonItems = []
}
}
/// Update the theme.
@ -253,6 +259,7 @@ private extension DetailViewController {
remove(viewController: feedDetailViewController)
feedDetailViewController = nil
appDelegate.feedDetailNavigationController = supplementaryFeedDetailNavigationController
appDelegate.feedDetailViewController = supplementaryFeedDetailViewController
appDelegate.splitViewController.setViewController(supplementaryFeedDetailNavigationController, for: .supplementary)
supplementaryFeedDetailNavigationController = nil
@ -268,6 +275,7 @@ private extension DetailViewController {
supplementaryFeedDetailNavigationController = appDelegate.feedDetailNavigationController
supplementaryFeedDetailViewController = appDelegate.feedDetailViewController
appDelegate.feedDetailNavigationController = nil
appDelegate.feedDetailViewController = feedDetailViewController
appDelegate.splitViewController.setViewController(nil, for: .supplementary)
} else {

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

@ -1880,7 +1880,7 @@
detailViewController.navigationItem.titleView = [self makeFeedTitle:storiesCollection.activeFeed];
if (!isPlaceholder && feedDetailView == feedDetailViewController && feedDetailView.view.window == nil) {
if (self.isCompactWidth && !isPlaceholder && feedDetailView == feedDetailViewController && feedDetailView.view.window == nil) {
UIBarButtonItem *newBackButton = [[UIBarButtonItem alloc] initWithTitle: @"All"
style: UIBarButtonItemStylePlain
target: nil