Progressive GIF search shouldn't dismiss keyboard.

// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent 2716f50399
commit 33d3c4123a

@ -365,7 +365,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
return return
} }
strongSelf.tryToSearch() strongSelf.tryToSearch(dismissKeyboard: false)
} }
} }
@ -373,7 +373,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
tryToSearch() tryToSearch()
} }
public func tryToSearch() { public func tryToSearch(dismissKeyboard: Bool = true) {
progressiveSearchTimer?.invalidate() progressiveSearchTimer?.invalidate()
progressiveSearchTimer = nil progressiveSearchTimer = nil
@ -384,15 +384,17 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
comment: "Alert message shown when user tries to search for GIFs without entering any search terms.")) comment: "Alert message shown when user tries to search for GIFs without entering any search terms."))
return return
} }
search(query:text) search(query: text, dismissKeyboard: dismissKeyboard)
} }
private func search(query: String) { private func search(query: String, dismissKeyboard: Bool = true) {
Logger.info("\(TAG) searching: \(query)") Logger.info("\(TAG) searching: \(query)")
progressiveSearchTimer?.invalidate() progressiveSearchTimer?.invalidate()
progressiveSearchTimer = nil progressiveSearchTimer = nil
if dismissKeyboard {
self.searchBar.resignFirstResponder() self.searchBar.resignFirstResponder()
}
imageInfos = [] imageInfos = []
viewMode = .searching viewMode = .searching
self.collectionView.contentOffset = CGPoint.zero self.collectionView.contentOffset = CGPoint.zero

Loading…
Cancel
Save