Added search bar component #69
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import UIKit | ||
| import Bento | ||
| import BentoKit | ||
| import BentoKitPlaygroundSupport | ||
| import PlaygroundSupport | ||
| import StyleSheets | ||
|
|
||
| let bundle = Bundle(for: Component.TextInput.self) | ||
| let styleSheet = Component.Search.StyleSheet() | ||
| .compose(\.searchBar.backgroundColor, UIColor.gray.withAlphaComponent(0.25)) | ||
| .compose(\.searchBar.showsCancelButton, true) | ||
| let component = Component.Search( | ||
| placeholder: "Placeholder", | ||
| keyboardType: .default, | ||
| didBeginEditing: { _ in | ||
| print("didBeginEditing") | ||
| }, | ||
| textDidChange: { _, text in | ||
| print("textDidChange", text) | ||
| }, | ||
| cancelButtonClicked: { | ||
| print("cancelButtonClicked") | ||
| $0.endEditing(true) | ||
| }, | ||
| styleSheet: styleSheet | ||
| ) | ||
|
|
||
| PlaygroundPage.current.liveView = renderInTableView(component: component) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <Timeline | ||
| version = "3.0"> | ||
| <TimelineItems> | ||
| </TimelineItems> | ||
| </Timeline> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| import Bento | ||
| import StyleSheets | ||
|
|
||
| extension Component { | ||
| public final class Search: AutoRenderable { | ||
| public let configurator: (View) -> Void | ||
| public let styleSheet: StyleSheet | ||
|
|
||
| public init( | ||
| placeholder: String? = nil, | ||
| keyboardType: UIKeyboardType = .default, | ||
| didBeginEditing: Optional<(UISearchBar) -> Void> = nil, | ||
| textDidChange: Optional<(UISearchBar, String) -> Void> = nil, | ||
| cancelButtonClicked: Optional<(UISearchBar) -> Void> = nil, | ||
| styleSheet: StyleSheet = StyleSheet() | ||
| ) { | ||
| self.configurator = { view in | ||
| view.searchBar.placeholder = placeholder | ||
| view.searchBar.keyboardType = keyboardType | ||
| view.didBeginEditing = didBeginEditing | ||
| view.textDidChange = textDidChange | ||
| view.cancelButtonClicked = cancelButtonClicked | ||
| view.searchBar.height(styleSheet.searchBar.height) | ||
| } | ||
| self.styleSheet = styleSheet | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension Component.Search { | ||
| public final class View: BaseView, UISearchBarDelegate { | ||
|
|
||
| let searchBar = UISearchBar() | ||
|
|
||
| var textDidChange: Optional<(UISearchBar, String) -> Void> = nil | ||
|
There was a problem hiding this comment. Do we really need the There was a problem hiding this comment. I decided to follow the signature of the delegate method. also it makes it easier to do things like dismiss keyboard when cancel is pressed (for some reason is not a default behaviour) without jumping through the hoops. it can always be ignored if not needed. |
||
| var cancelButtonClicked: Optional<(UISearchBar) -> Void> = nil | ||
| var didBeginEditing: Optional<(UISearchBar) -> Void> = nil | ||
|
|
||
| public override init(frame: CGRect) { | ||
| super.init(frame: frame) | ||
|
|
||
| searchBar.add(to: self) | ||
| .pinEdges(to: layoutMarginsGuide) | ||
|
|
||
| searchBar.delegate = self | ||
| } | ||
|
|
||
| @available(*, unavailable) | ||
| public required init?(coder aDecoder: NSCoder) { | ||
| fatalError("init(coder:) has not been implemented") | ||
| } | ||
|
|
||
| public func searchBarTextDidBeginEditing(_ searchBar: UISearchBar) { | ||
| self.didBeginEditing?(searchBar) | ||
| } | ||
|
|
||
| public func searchBarSearchButtonClicked(_ searchBar: UISearchBar) { | ||
| searchBar.endEditing(true) | ||
| } | ||
|
|
||
| public func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) { | ||
| self.textDidChange?(searchBar, searchText) | ||
| } | ||
|
|
||
| public func searchBarCancelButtonClicked(_ searchBar: UISearchBar) { | ||
| self.cancelButtonClicked?(searchBar) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension Component.Search { | ||
| public final class StyleSheet: BaseViewStyleSheet<View> { | ||
| public var searchBar = SearchBarStyleSheet() | ||
ilyapuchka marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| public init() {} | ||
|
|
||
| public override func apply(to element: View) { | ||
| super.apply(to: element) | ||
| searchBar.apply(to: element.searchBar) | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import BentoKit | ||
| import StyleSheets | ||
| import UIKit | ||
| @testable import BentoKitPlaygroundSupport | ||
|
|
||
| final class SearchSnapshotTests: SnapshotTestCase { | ||
| let placeholder = "Search for address or a postcode" | ||
|
|
||
| override func setUp() { | ||
| super.setUp() | ||
| self.recordMode = false | ||
| } | ||
|
|
||
| func testSearch() { | ||
| let styleSheet = Component.Search.StyleSheet() | ||
| .compose(\.searchBar.backgroundColor, UIColor.gray.withAlphaComponent(0.25)) | ||
| .compose(\.searchBar.showsCancelButton, true) | ||
|
|
||
| let component = Component.Search(placeholder: placeholder, styleSheet: styleSheet) | ||
|
|
||
| verifyComponentForAllSizes(component: component) | ||
| } | ||
|
|
||
| } |
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| import UIKit | ||
|
|
||
| open class SearchBarStyleSheet: ViewStyleSheet<UISearchBar> { | ||
| public var height: CGFloat | ||
| public var showsCancelButton: Bool | ||
| public var searchTextPositionAdjustment: UIOffset | ||
| public var keyboardType: UIKeyboardType | ||
| public var returnKeyType: UIReturnKeyType | ||
| public var enablesReturnKeyAutomatically: Bool | ||
|
|
||
| public init( | ||
| backgroundColor: UIColor = .white, | ||
| cornerRadius: CGFloat = 10, | ||
| height: CGFloat = 36, | ||
| showsCancelButton: Bool = false, | ||
| searchTextPositionAdjustment: UIOffset = UIOffset(horizontal: 8, vertical: 0), | ||
| keyboardType: UIKeyboardType = .default, | ||
| returnKeyType: UIReturnKeyType = .search, | ||
| enablesReturnKeyAutomatically: Bool = true | ||
| ) { | ||
| self.height = height | ||
| self.showsCancelButton = showsCancelButton | ||
| self.searchTextPositionAdjustment = searchTextPositionAdjustment | ||
| self.keyboardType = keyboardType | ||
| self.returnKeyType = returnKeyType | ||
| self.enablesReturnKeyAutomatically = enablesReturnKeyAutomatically | ||
| super.init(backgroundColor: backgroundColor, cornerRadius: cornerRadius) | ||
| } | ||
|
|
||
| open override func apply(to element: UISearchBar) { | ||
| super.apply(to: element) | ||
| element.setTextInputBackgroundColor(color: backgroundColor ?? .clear, | ||
| height: height, | ||
| cornerRadius: cornerRadius) | ||
|
There was a problem hiding this comment. Because on |
||
| element.showsCancelButton = showsCancelButton | ||
| element.searchTextPositionAdjustment = searchTextPositionAdjustment | ||
| element.keyboardType = keyboardType | ||
| element.returnKeyType = returnKeyType | ||
| element.enablesReturnKeyAutomatically = enablesReturnKeyAutomatically | ||
| element.barTintColor = tintColor | ||
| // remove system background | ||
| element.backgroundColor = .white | ||
| element.backgroundImage = UIImage() | ||
ilyapuchka marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| } | ||
|
|
||
| extension UISearchBar { | ||
| func setTextInputBackgroundColor(color: UIColor, height: CGFloat, cornerRadius: CGFloat) { | ||
| // creates an image with rounded corners from background color | ||
| let size = CGSize(width: cornerRadius * 2, height: height) | ||
| let backgroundImage = UIGraphicsImageRenderer(size: size) | ||
| .image { imageContext in | ||
| let path = UIBezierPath(roundedRect: CGRect(origin: .zero, size: size), cornerRadius: cornerRadius) | ||
|
|
||
| imageContext.cgContext.beginPath() | ||
| imageContext.cgContext.addPath(path.cgPath) | ||
| imageContext.cgContext.closePath() | ||
| imageContext.cgContext.clip() | ||
|
|
||
| imageContext.cgContext.setFillColor(color.cgColor) | ||
| imageContext.cgContext.fill(CGRect(origin: .zero, size: size)) | ||
| } | ||
| setSearchFieldBackgroundImage(backgroundImage, for: .normal) | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dito