FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-09 16:48:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use correct delegate methods to begin and end searching

Browse Source
This commit is contained in:
Maurice Parker 2019-09-02 12:40:14 -05:00
parent 746c06d147
commit b768877e23
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@ -42,6 +42,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange), name: UIContentSizeCategory.didChangeNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange), name: UIContentSizeCategory.didChangeNotification, object: nil)
// Setup the Search Controller // Setup the Search Controller
searchController.delegate = self
searchController.searchResultsUpdater = self searchController.searchResultsUpdater = self
searchController.obscuresBackgroundDuringPresentation = false searchController.obscuresBackgroundDuringPresentation = false
searchController.searchBar.delegate = self searchController.searchBar.delegate = self
@ -415,6 +416,20 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
// MARK: Searching // MARK: Searching
extension MasterTimelineViewController: UISearchControllerDelegate {
func willPresentSearchController(_ searchController: UISearchController) {
coordinator.beginSearching()
searchController.searchBar.showsScopeBar = true
}
func willDismissSearchController(_ searchController: UISearchController) {
coordinator.endSearching()
searchController.searchBar.showsScopeBar = false
}
}
extension MasterTimelineViewController: UISearchResultsUpdating { extension MasterTimelineViewController: UISearchResultsUpdating {
func updateSearchResults(for searchController: UISearchController) { func updateSearchResults(for searchController: UISearchController) {
@ -425,24 +440,10 @@ extension MasterTimelineViewController: UISearchResultsUpdating {
} }
extension MasterTimelineViewController: UISearchBarDelegate { extension MasterTimelineViewController: UISearchBarDelegate {
func searchBar(_ searchBar: UISearchBar, selectedScopeButtonIndexDidChange selectedScope: Int) { func searchBar(_ searchBar: UISearchBar, selectedScopeButtonIndexDidChange selectedScope: Int) {
let searchScope = SearchScope(rawValue: selectedScope)! let searchScope = SearchScope(rawValue: selectedScope)!
coordinator.searchArticles(searchBar.text!, searchScope) coordinator.searchArticles(searchBar.text!, searchScope)
} }
func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {
coordinator.beginSearching()
searchBar.showsScopeBar = true
return true
}
func searchBarShouldEndEditing(_ searchBar: UISearchBar) -> Bool {
coordinator.endSearching()
searchBar.showsScopeBar = false
return true
}
} }
// MARK: Private // MARK: Private