Skip to content

Commit 0d9ba46

Browse files
author
iBinh
committed
fix dismiss
1 parent c7164ae commit 0d9ba46

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

GoongGeocoder/GoongAutocompleteViewController.swift

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import UIKit
3434
self.searchBar!.barTintColor = .white
3535
self.searchBar!.delegate = self
3636
self.searchBar!.placeholder = "Search for place";
37+
self.searchBar!.showsCancelButton = true
3738
}
3839
self.navigationItem.titleView = searchBar
3940
setupTableview()
@@ -52,29 +53,14 @@ import UIKit
5253
}
5354
extension GoongAutocompleteViewController: UISearchBarDelegate {
5455
public func searchBarCancelButtonClicked(_ searchBar: UISearchBar) {
55-
self.cancelSearching()
56-
searchActive = false;
56+
self.navigationController?.dismiss(animated: true, completion: nil)
5757
}
5858

5959
public func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
6060
self.view.endEditing(true)
6161
searchBar.searchTextField.resignFirstResponder()
6262
}
6363

64-
public func searchBarTextDidBeginEditing(_ searchBar: UISearchBar) {
65-
self.searchBar!.setShowsCancelButton(true, animated: true)
66-
}
67-
68-
public func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
69-
self.searchBar!.setShowsCancelButton(false, animated: false)
70-
}
71-
72-
func cancelSearching(){
73-
searchActive = false;
74-
self.searchBar!.resignFirstResponder()
75-
self.searchBar!.text = ""
76-
}
77-
7864
public func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
7965
NSObject.cancelPreviousPerformRequests(withTarget: self, selector: #selector(self.search), object: nil)
8066
self.perform(#selector(self.search), with: nil, afterDelay: 0.5)

0 commit comments

Comments
 (0)