kiwix/kiwix-apple
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-apple.git synced 2025-09-27 13:59:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

searchBar

Browse Source
This commit is contained in:
Chris Li 2017-01-04 23:34:49 -05:00
parent 243bbece05
commit fdeb7bf39d
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Kiwix-iOS/View/SearchBar.swift
View File

@ -99,18 +99,25 @@ class SearchBar: UIView, UITextFieldDelegate {
} }
func textDidChange(textField: UITextField) { func textDidChange(textField: UITextField) {
guard let searchText = textField.text else {return} guard let textFieldText = textField.text else {return}
if delayTextChangeCallback { delegate?.textDidChange(text: textFieldText, searchBar: self)
guard self.cachedSearchText != searchText else {return} // if textFieldText == "" {
self.cachedSearchText = searchText // print("about to call delegate")
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Double(Int64(275 * USEC_PER_SEC)) / Double(NSEC_PER_SEC)) { //
guard searchText == self.cachedSearchText else {return} // } else {
self.delegate?.textDidChange(text: searchText, searchBar: self) // self.delegate?.textDidChange(text: textFieldText, searchBar: self)
} // if delayTextChangeCallback {
} else { // guard self.cachedSearchText != textFieldText else {return}
cachedSearchText = searchText // self.cachedSearchText = textFieldText
delegate?.textDidChange(text: searchText, searchBar: self) // DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Double(Int64(275 * USEC_PER_SEC)) / Double(NSEC_PER_SEC)) {
} // guard textFieldText == self.cachedSearchText else {return}
// self.delegate?.textDidChange(text: textFieldText, searchBar: self)
// }
// } else {
// cachedSearchText = textFieldText
// delegate?.textDidChange(text: textFieldText, searchBar: self)
// }
// }
} }
func textFieldShouldReturn(_ textField: UITextField) -> Bool { func textFieldShouldReturn(_ textField: UITextField) -> Bool {
@ -191,7 +198,7 @@ private class SearchBarTextField: UITextField {
} }
override func clearButtonRect(forBounds bounds: CGRect) -> CGRect { override func clearButtonRect(forBounds bounds: CGRect) -> CGRect {
return super.clearButtonRect(forBounds: bounds).offsetBy(dx: 10, dy: 0) return super.clearButtonRect(forBounds: bounds).insetBy(dx: -4, dy: -6).offsetBy(dx: 4, dy: 0)
} }
} }
@ -239,7 +246,7 @@ private class SearchBarBackgroundView: UIView {
} }
override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
let frame = self.bounds.insetBy(dx: -6, dy: -12) let frame = self.bounds.insetBy(dx: 0, dy: -12)
return frame.contains(point) ? self : nil return frame.contains(point) ? self : nil
} }
@ -248,7 +255,7 @@ private class SearchBarBackgroundView: UIView {
func animateIn() { func animateIn() {
isAnimatingIn = true isAnimatingIn = true
UIView.animate(withDuration: 0.1, delay: 0.0, options: .curveEaseOut, animations: { UIView.animate(withDuration: 0.1, delay: 0.0, options: .curveEaseOut, animations: {
self.backgroundColor = UIColor.darkGray self.backgroundColor = UIColor.darkGray.withAlphaComponent(0.75)
}) { (completed) in }) { (completed) in
self.isAnimatingIn = false self.isAnimatingIn = false
guard !self.isTouching else {return} guard !self.isTouching else {return}