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

Focus on CardInputWidget field with first error #2038

Merged
merged 1 commit into from
Jan 8, 2020
+21 −16
Merged

Focus on CardInputWidget field with first error #2038

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 21 additions & 16 deletions stripe/src/main/java/com/stripe/android/view/CardInputWidget.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,19 +117,13 @@ class CardInputWidget @JvmOverloads constructor(
*/
override val paymentMethodCard: PaymentMethodCreateParams.Card?
get() {
val cardNumber = cardNumberEditText.cardNumber
val cardDate = expiryDateEditText.validDateFields
val cvcValue = cvcValue

return if (cardNumber != null && cardDate != null && cvcValue != null) {
return card?.let {
PaymentMethodCreateParams.Card(
number = cardNumber,
cvc = cvcValue,
expiryMonth = cardDate.first,
expiryYear = cardDate.second
number = it.number,
cvc = it.cvc,
expiryMonth = it.expMonth,
expiryYear = it.expYear
)
} else {
null
}
}

Expand Down Expand Up @@ -167,15 +161,26 @@ class CardInputWidget @JvmOverloads constructor(
get() {
val cardNumber = cardNumberEditText.cardNumber
val cardDate = expiryDateEditText.validDateFields
return if (cardNumber != null && cardDate != null) {
cvcValue?.let {
Card.Builder(cardNumber, cardDate.first, cardDate.second, it)
val cvcValue = this.cvcValue

when {
cardNumber == null -> {
cardNumberEditText.requestFocus()
}
cardDate == null -> {
expiryDateEditText.requestFocus()
}
cvcValue == null -> {
cvcNumberEditText.requestFocus()
}
else -> {
return Card.Builder(cardNumber, cardDate.first, cardDate.second, cvcValue)
.addressZip(postalCodeValue)
.loggingTokens(listOf(LOGGING_TOKEN))
}
} else {
null
}

return null
}

private val frameWidth: Int
Expand Down