Skip to content

Commit 4eef9ce

Browse files
committed
address view with paste button
1 parent 6044594 commit 4eef9ce

File tree

2 files changed

+8
-22
lines changed

2 files changed

+8
-22
lines changed

fearless/Modules/Send/SendViewController.swift

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,9 @@ final class SendViewController: UIViewController, ViewHolder {
8484
action: #selector(historyButtonClicked),
8585
for: .touchUpInside
8686
)
87-
rootView.pasteButton.addTarget(
88-
self,
89-
action: #selector(pasteButtonClicked),
90-
for: .touchUpInside
91-
)
87+
rootView.searchView.onPasteTapped = { [weak self] in
88+
self?.output.didTapPasteButton()
89+
}
9290

9391
let tapGesture = UITapGestureRecognizer(target: self, action: #selector(selectNetworkClicked))
9492
rootView.selectNetworkView.addGestureRecognizer(tapGesture)
@@ -115,10 +113,6 @@ final class SendViewController: UIViewController, ViewHolder {
115113
output.didTapScanButton()
116114
}
117115

118-
@objc private func pasteButtonClicked() {
119-
output.didTapPasteButton()
120-
}
121-
122116
@objc private func historyButtonClicked() {
123117
output.didTapHistoryButton()
124118
}
@@ -257,6 +251,9 @@ extension SendViewController: UITextFieldDelegate {
257251
rootView.amountView.set(highlighted: amountIsFirstResponder, animated: false)
258252
let searchIsFirstResponder = textField == rootView.searchView.textField
259253
rootView.searchView.set(highlighted: searchIsFirstResponder, animated: false)
254+
if searchIsFirstResponder {
255+
textField.resignFirstResponder()
256+
}
260257
}
261258

262259
func textFieldDidEndEditing(_: UITextField) {

fearless/Modules/Send/SendViewLayout.swift

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,7 @@ final class SendViewLayout: UIView {
8888
return button
8989
}()
9090

91-
let pasteButton: TriangularedButton = {
92-
let button = TriangularedButton()
93-
button.applyStackButtonStyle()
94-
button.imageWithTitleView?.iconImage = R.image.iconCopy()
95-
return button
96-
}()
97-
98-
let searchView = SearchTriangularedView()
91+
let searchView = SearchTriangularedView(withPasteButton: true)
9992

10093
var locale = Locale.current {
10194
didSet {
@@ -225,7 +218,6 @@ private extension SendViewLayout {
225218

226219
optionsStackView.addArrangedSubview(scanButton)
227220
optionsStackView.addArrangedSubview(historyButton)
228-
optionsStackView.addArrangedSubview(pasteButton)
229221

230222
bottomContainer.addSubview(optionsStackView)
231223
optionsStackView.snp.makeConstraints { make in
@@ -240,6 +232,7 @@ private extension SendViewLayout {
240232
feeView.locale = locale
241233
amountView.locale = locale
242234
scamWarningView.locale = locale
235+
searchView.locale = locale
243236

244237
searchView.textField.attributedPlaceholder = NSAttributedString(
245238
string: R.string.localizable.searchTextfieldPlaceholder(
@@ -264,10 +257,6 @@ private extension SendViewLayout {
264257
preferredLanguages: locale.rLanguages
265258
).uppercased()
266259

267-
pasteButton.imageWithTitleView?.title = R.string.localizable.commonPaste(
268-
preferredLanguages: locale.rLanguages
269-
).uppercased()
270-
271260
navigationTitleLabel.text = R.string.localizable
272261
.sendFundTitle(preferredLanguages: locale.rLanguages)
273262

0 commit comments

Comments
 (0)