Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NT-549] Keyboard dismissal when user taps save #1058

Merged
merged 4 commits into from
Feb 5, 2020
Merged

[NT-549] Keyboard dismissal when user taps save #1058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4189975
zipcodeTextField is not longer a first responder when user taps save …
cdolm92 Feb 4, 2020
84d89fb
removed zipcodeTextFieldBecomeFirstResponder untested output
cdolm92 Feb 4, 2020
1187299
Merge branch 'master' of https://github.com/kickstarter/ios-oss into …
cdolm92 Feb 4, 2020
ad00117
removed paymentCardTextFieldDidEndEditing
cdolm92 Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions Kickstarter-iOS/Views/Controllers/AddNewCardViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,6 @@ internal final class AddNewCardViewController: UIViewController,
self?.messageBannerViewController?.showBanner(with: .error, message: errorMessage)
}

self.viewModel.outputs.zipcodeTextFieldBecomeFirstResponder
.observeForControllerAction()
.observeValues { [weak self] _ in
self?.zipcodeView.textField.becomeFirstResponder()
}

Keyboard.change
.observeForUI()
.observeValues { [weak self] change in
Expand Down Expand Up @@ -375,10 +369,6 @@ extension AddNewCardViewController {
textField.expirationYear, textField.cvc, stpCardBrand.creditCardType
))
}

internal func paymentCardTextFieldDidEndEditing(_: STPPaymentCardTextField) {
self.viewModel.inputs.paymentCardTextFieldDidEndEditing()
}
}

// MARK: - Styles
Expand Down
9 changes: 0 additions & 9 deletions Library/ViewModels/AddNewCardViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public protocol AddNewCardViewModelInputs {
func cardholderNameTextFieldReturn()
func creditCardChanged(cardDetails: CardDetails)
func configure(with intent: AddNewCardIntent, project: Project?)
func paymentCardTextFieldDidEndEditing()
func paymentInfo(isValid: Bool)
func rememberThisCardToggleChanged(to value: Bool)
func saveButtonTapped()
Expand All @@ -45,7 +44,6 @@ public protocol AddNewCardViewModelOutputs {
var saveButtonIsEnabled: Signal<Bool, Never> { get }
var setStripePublishableKey: Signal<String, Never> { get }
var unsupportedCardBrandErrorText: Signal<String, Never> { get }
var zipcodeTextFieldBecomeFirstResponder: Signal<Void, Never> { get }
}

public protocol AddNewCardViewModelType {
Expand Down Expand Up @@ -78,7 +76,6 @@ public final class AddNewCardViewModel: AddNewCardViewModelType, AddNewCardViewM

self.cardholderNameBecomeFirstResponder = self.viewDidLoadProperty.signal
self.paymentDetailsBecomeFirstResponder = self.cardholderNameTextFieldReturnProperty.signal
self.zipcodeTextFieldBecomeFirstResponder = self.paymentCardTextFieldDidEndEditingProperty.signal

let zipcode = self.zipcodeProperty.signal.skipNil()
let zipcodeIsValid: Signal<Bool, Never> = zipcode.map { !$0.isEmpty }
Expand Down Expand Up @@ -241,11 +238,6 @@ public final class AddNewCardViewModel: AddNewCardViewModelType, AddNewCardViewM
self.addNewCardIntentAndProjectProperty.value = (intent, project)
}

private let paymentCardTextFieldDidEndEditingProperty = MutableProperty(())
public func paymentCardTextFieldDidEndEditing() {
self.paymentCardTextFieldDidEndEditingProperty.value = ()
}

private let paymentInfoIsValidProperty = MutableProperty(false)
public func paymentInfo(isValid: Bool) {
self.paymentInfoIsValidProperty.value = isValid
Expand Down Expand Up @@ -306,7 +298,6 @@ public final class AddNewCardViewModel: AddNewCardViewModelType, AddNewCardViewM
public let saveButtonIsEnabled: Signal<Bool, Never>
public let setStripePublishableKey: Signal<String, Never>
public let unsupportedCardBrandErrorText: Signal<String, Never>
public let zipcodeTextFieldBecomeFirstResponder: Signal<Void, Never>

public var inputs: AddNewCardViewModelInputs { return self }
public var outputs: AddNewCardViewModelOutputs { return self }
Expand Down
5 changes: 0 additions & 5 deletions Library/ViewModels/AddNewCardViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ internal final class AddNewCardViewModelTests: TestCase {
private let setStripePublishableKey = TestObserver<String, Never>()
private let unsupportedCardBrandErrorText = TestObserver<String, Never>()
private let zipcode = TestObserver<String, Never>()
private let zipcodeTextFieldBecomeFirstResponder = TestObserver<Void, Never>()

override func setUp() {
super.setUp()
Expand Down Expand Up @@ -55,8 +54,6 @@ internal final class AddNewCardViewModelTests: TestCase {
self.vm.outputs.saveButtonIsEnabled.observe(self.saveButtonIsEnabled.observer)
self.vm.outputs.setStripePublishableKey.observe(self.setStripePublishableKey.observer)
self.vm.outputs.unsupportedCardBrandErrorText.observe(self.unsupportedCardBrandErrorText.observer)
self.vm.outputs.zipcodeTextFieldBecomeFirstResponder
.observe(self.zipcodeTextFieldBecomeFirstResponder.observer)
}

func testZipcodeTextFieldReturn_submitsPaymentDetails() {
Expand Down Expand Up @@ -172,7 +169,6 @@ internal final class AddNewCardViewModelTests: TestCase {
func testBecomeFirstResponder() {
self.cardholderNameBecomeFirstResponder.assertDidNotEmitValue()
self.paymentDetailsBecomeFirstResponder.assertDidNotEmitValue()
self.zipcodeTextFieldBecomeFirstResponder.assertDidNotEmitValue()
self.activityIndicatorShouldShow.assertDidNotEmitValue()
self.saveButtonIsEnabled.assertDidNotEmitValue()

Expand All @@ -182,7 +178,6 @@ internal final class AddNewCardViewModelTests: TestCase {
self.cardholderNameBecomeFirstResponder
.assertValueCount(1, "Cardholder name field is first responder when view loads.")
self.paymentDetailsBecomeFirstResponder.assertDidNotEmitValue("Not first responder when view loads")
self.zipcodeTextFieldBecomeFirstResponder.assertDidNotEmitValue()
self.vm.inputs.cardholderNameChanged("")
self.vm.inputs.paymentInfo(isValid: false)
self.vm.inputs.zipcodeChanged(zipcode: "")
Expand Down