FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-01-11 01:04:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Exit search if Go To Feed is selected. Issue #1557

Browse Source
This commit is contained in:
Maurice Parker 2020-01-15 17:53:12 -07:00
parent 3e604e0b34
commit d68eccc55e
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@ -199,6 +199,10 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
updateUI() updateUI()
} }
func hideSearch() {
navigationItem.searchController?.isActive = false
}
func showSearchAll() { func showSearchAll() {
navigationItem.searchController?.isActive = true navigationItem.searchController?.isActive = true
navigationItem.searchController?.searchBar.selectedScopeButtonIndex = 1 navigationItem.searchController?.searchBar.selectedScopeButtonIndex = 1

4
iOS/SceneCoordinator.swift
View File

@ -940,6 +940,10 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
} }
func discloseFeed(_ feed: WebFeed, animated: Bool, completion: (() -> Void)? = nil) { func discloseFeed(_ feed: WebFeed, animated: Bool, completion: (() -> Void)? = nil) {
if isSearching {
masterTimelineViewController?.hideSearch()
}
masterFeedViewController.discloseFeed(feed, animated: animated) { masterFeedViewController.discloseFeed(feed, animated: animated) {
completion?() completion?()
} }