FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hide timeline First Unread button when detail view displayed.

Browse Source
This commit is contained in:
Maurice Parker 2019-04-22 15:31:34 -05:00
parent 0bfd19ab30
commit b2e080cf8e
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
iOS/Base.lproj/Main.storyboard
View File

@ -153,6 +153,9 @@
</toolbarItems> </toolbarItems>
<navigationItem key="navigationItem" title="Timeline" largeTitleDisplayMode="never" id="wcC-1L-ug4"/> <navigationItem key="navigationItem" title="Timeline" largeTitleDisplayMode="never" id="wcC-1L-ug4"/>
<simulatedToolbarMetrics key="simulatedBottomBarMetrics"/> <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
<connections>
<outlet property="nextUnreadButton" destination="2v2-jD-C9k" id="9rf-5I-18f"/>
</connections>
</tableViewController> </tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="nzm-Gf-Xce" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="nzm-Gf-Xce" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>

26
iOS/Timeline/MasterTimelineViewController.swift
View File

@ -20,17 +20,11 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
return navState?.showFeedNames ?? false ? rowHeightWithFeedName : rowHeightWithoutFeedName return navState?.showFeedNames ?? false ? rowHeightWithFeedName : rowHeightWithoutFeedName
} }
@IBOutlet weak var nextUnreadButton: UIBarButtonItem!
weak var navState: NavigationStateController? weak var navState: NavigationStateController?
var undoableCommands = [UndoableCommand]() var undoableCommands = [UndoableCommand]()
var detailViewController: DetailViewController? {
if let split = splitViewController {
let controllers = split.viewControllers
return (controllers[controllers.count-1] as! UINavigationController).topViewController as? DetailViewController
}
return nil
}
override var canBecomeFirstResponder: Bool { override var canBecomeFirstResponder: Bool {
return true return true
} }
@ -56,6 +50,8 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
refreshControl = UIRefreshControl() refreshControl = UIRefreshControl()
refreshControl!.addTarget(self, action: #selector(refreshAccounts(_:)), for: .valueChanged) refreshControl!.addTarget(self, action: #selector(refreshAccounts(_:)), for: .valueChanged)
splitViewController?.delegate = self
} }
override func viewDidAppear(_ animated: Bool) { override func viewDidAppear(_ animated: Bool) {
@ -339,6 +335,20 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
} }
extension MasterTimelineViewController: UISplitViewControllerDelegate {
func splitViewController(_ svc: UISplitViewController, willChangeTo displayMode: UISplitViewController.DisplayMode) {
if displayMode == .allVisible {
nextUnreadButton.isEnabled = false
nextUnreadButton.title = ""
} else {
nextUnreadButton.isEnabled = false
nextUnreadButton.title = NSLocalizedString("First Unread", comment: "First Unread")
}
}
}
// MARK: Private // MARK: Private
private extension MasterTimelineViewController { private extension MasterTimelineViewController {