Skip to content

SK-1951 Add card brand choice enhancements #177

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

Merged
skyflow-vivek merged 1 commit into from
Apr 11, 2025
Merged

SK-1951 Add card brand choice enhancements #177

Show file tree
Hide file tree
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
11 changes: 8 additions & 3 deletions Skyflow/src/main/kotlin/Skyflow/TextField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ class TextField @JvmOverloads constructor(
null
)
drawableIcon = copyIcon
drawableRight = drawableIcon
}, 2000) // 2000 milliseconds = 2 seconds
}
}
Expand Down Expand Up @@ -319,9 +320,13 @@ class TextField @JvmOverloads constructor(
isCardMetadataUpdated = true
this.options.cardMetadata = updateCollectOptions.cardMetadata
this.setupField(this.collectInput, this.options)
if (updateCollectOptions.cardMetadata.scheme.size < 2) {
invokeUserOnChangeListener()
}

val defaultCardType = if (this.options.cardMetadata.scheme.size > 1)
this.options.cardMetadata.scheme[0]
else cardType
updateCardChoice(defaultCardType, true)
changeCardIcon(defaultCardType)
invokeUserOnChangeListener()
}

@RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
Expand Down
14 changes: 10 additions & 4 deletions Skyflow/src/test/java/com/Skyflow/CollectTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1584,10 +1584,16 @@ class CollectTest {
val cardNumber = container.create(activity, collectInput, options)
cardNumber.onAttachedToWindow()

var scheme = arrayOf<CardType>()
cardNumber.on(EventName.CHANGE) { state ->
val value = state.get("value")
val cards = getCardSchemes(value.toString().length)
cardNumber.update(CollectElementOptions(cardMetadata = CardMetadata(cards)))
val value = state.getString("value")
if (value.length < 8 && scheme.isNotEmpty()) {
scheme = arrayOf(CardType.CARTES_BANCAIRES)
cardNumber.update(CollectElementOptions(cardMetadata = CardMetadata(scheme)))
} else if (value.length >= 8 && scheme.isEmpty()) {
scheme = getCardSchemes(value.length)
cardNumber.update(CollectElementOptions(cardMetadata = CardMetadata(scheme)))
}
}

var state = StateforText(cardNumber)
Expand All @@ -1598,7 +1604,7 @@ class CollectTest {
state = StateforText(cardNumber)
Assert.assertTrue(state.getInternalState().getBoolean("isRequired"))
Assert.assertNotNull(cardNumber.inputField.compoundDrawablesRelative[2])
Assert.assertEquals(CardType.MASTERCARD, cardNumber.cardType)
Assert.assertEquals(CardType.CARTES_BANCAIRES, cardNumber.cardType)
}
}

Expand Down