From 32233b22c12674da7da09c7a117d5e695bf24bce Mon Sep 17 00:00:00 2001 From: Joseph Jreij Date: Wed, 10 Jul 2024 15:11:18 +0200 Subject: [PATCH 001/299] Update drop-in preview screenshots in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21b18185da..148201c9c3 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ This repository is available under the [MIT license](LICENSE). [shield.license.image]: https://img.shields.io/github/license/Adyen/adyen-android [shield.license.link]: LICENSE [docs.android]: https://docs.adyen.com/online-payments/build-your-integration/?platform=Android -[header.preview]: https://github.com/Adyen/adyen-android/assets/9079915/e6e18a07-b30f-41f0-b7ef-701b20e2e339 +[header.preview]: https://github.com/Adyen/adyen-android/assets/9079915/b664bce1-ef8e-49be-8cb6-60f291d8061e [adyen.testAccount]: https://www.adyen.com/signup [docs.apiKey]: https://docs.adyen.com/development-resources/how-to-get-the-api-key [docs.clientKey]: https://docs.adyen.com/development-resources/client-side-authentication#get-your-client-key From fdc005ebfdaaaac75e75695f04c45ecf1e4ee6e2 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Mon, 8 Jul 2024 14:55:01 +0200 Subject: [PATCH 002/299] Revert "Implement a flow where submit button can be disabled when there is no option selected." This reverts commit 16b96fb8 COAND-946 --- .../ui/DefaultACHDirectDebitDelegate.kt | 2 - .../ui/DefaultACHDirectDebitDelegateTest.kt | 9 ---- .../ui/DefaultBacsDirectDebitDelegate.kt | 2 - .../DefaultBacsDirectDebitDelegateTest.kt | 9 ---- .../blik/internal/ui/DefaultBlikDelegate.kt | 2 - .../blik/internal/ui/StoredBlikDelegate.kt | 2 - .../internal/ui/DefaultBlikDelegateTest.kt | 9 ---- .../internal/ui/StoredBlikDelegateTest.kt | 9 ---- .../internal/ui/DefaultBoletoDelegate.kt | 2 - .../internal/ui/DefaultBoletoDelegateTest.kt | 9 ---- .../card/internal/ui/DefaultCardDelegate.kt | 2 - .../card/internal/ui/StoredCardDelegate.kt | 2 - .../internal/ui/DefaultCardDelegateTest.kt | 9 ---- .../internal/ui/StoredCardDelegateTest.kt | 9 ---- .../internal/ui/DefaultCashAppPayDelegate.kt | 2 - .../ui/DefaultCashAppPayDelegateTest.kt | 9 ---- .../internal/ui/DefaultEContextDelegate.kt | 2 - .../ui/DefaultEContextDelegateTest.kt | 9 ---- .../internal/ui/DefaultGiftCardDelegate.kt | 2 - .../ui/DefaultGiftCardDelegateTest.kt | 9 ---- .../internal/ui/DefaultIssuerListDelegate.kt | 2 - .../ui/DefaultIssuerListDelegateTest.kt | 9 ---- .../mbway/internal/ui/DefaultMBWayDelegate.kt | 2 - .../internal/ui/DefaultMBWayDelegateTest.kt | 9 ---- .../ui/DefaultOnlineBankingDelegate.kt | 2 - .../ui/DefaultOnlineBankingDelegateTest.kt | 9 ---- .../sepa/internal/ui/DefaultSepaDelegate.kt | 2 - .../internal/ui/DefaultSepaDelegateTest.kt | 9 ---- ui-core/api/ui-core.api | 4 -- .../checkout/ui/core/AdyenComponentView.kt | 43 ++++++------------- .../ui/core/internal/ui/ButtonDelegate.kt | 9 ---- .../internal/ui/PaymentComponentUIState.kt | 4 +- .../ui/core/internal/ui/SubmitHandler.kt | 1 - .../ui/core/internal/ui/SubmitHandlerTest.kt | 11 ----- .../upi/internal/ui/DefaultUPIDelegate.kt | 6 --- .../upi/internal/ui/DefaultUPIDelegateTest.kt | 42 ------------------ 36 files changed, 13 insertions(+), 261 deletions(-) diff --git a/ach/src/main/java/com/adyen/checkout/ach/internal/ui/DefaultACHDirectDebitDelegate.kt b/ach/src/main/java/com/adyen/checkout/ach/internal/ui/DefaultACHDirectDebitDelegate.kt index 80d015789f..5532b95b4e 100644 --- a/ach/src/main/java/com/adyen/checkout/ach/internal/ui/DefaultACHDirectDebitDelegate.kt +++ b/ach/src/main/java/com/adyen/checkout/ach/internal/ui/DefaultACHDirectDebitDelegate.kt @@ -373,8 +373,6 @@ internal class DefaultACHDirectDebitDelegate( override fun shouldShowSubmitButton(): Boolean = isConfirmationRequired() && componentParams.isSubmitButtonVisible - override fun shouldEnableSubmitButton(): Boolean = true - companion object { private const val ENCRYPTION_KEY_FOR_BANK_ACCOUNT_NUMBER = "bankAccountNumber" private const val ENCRYPTION_KEY_FOR_BANK_LOCATION_ID = "bankLocationId" diff --git a/ach/src/test/java/com/adyen/checkout/ach/internal/ui/DefaultACHDirectDebitDelegateTest.kt b/ach/src/test/java/com/adyen/checkout/ach/internal/ui/DefaultACHDirectDebitDelegateTest.kt index 15bd9df139..67e4ccaa3b 100644 --- a/ach/src/test/java/com/adyen/checkout/ach/internal/ui/DefaultACHDirectDebitDelegateTest.kt +++ b/ach/src/test/java/com/adyen/checkout/ach/internal/ui/DefaultACHDirectDebitDelegateTest.kt @@ -605,15 +605,6 @@ internal class DefaultACHDirectDebitDelegateTest( } } - @Nested - inner class SubmitButtonEnableTest { - - @Test - fun `when shouldEnableSubmitButton is called, then true is returned`() { - assertTrue(delegate.shouldEnableSubmitButton()) - } - } - @Nested inner class SubmitHandlerTest { diff --git a/bacs/src/main/java/com/adyen/checkout/bacs/internal/ui/DefaultBacsDirectDebitDelegate.kt b/bacs/src/main/java/com/adyen/checkout/bacs/internal/ui/DefaultBacsDirectDebitDelegate.kt index 47a80bf346..dbadaf3077 100644 --- a/bacs/src/main/java/com/adyen/checkout/bacs/internal/ui/DefaultBacsDirectDebitDelegate.kt +++ b/bacs/src/main/java/com/adyen/checkout/bacs/internal/ui/DefaultBacsDirectDebitDelegate.kt @@ -218,8 +218,6 @@ internal class DefaultBacsDirectDebitDelegate( override fun shouldShowSubmitButton(): Boolean = isConfirmationRequired() && componentParams.isSubmitButtonVisible - override fun shouldEnableSubmitButton(): Boolean = true - override fun setInteractionBlocked(isInteractionBlocked: Boolean) { submitHandler.setInteractionBlocked(isInteractionBlocked) } diff --git a/bacs/src/test/java/com/adyen/checkout/bacs/internal/DefaultBacsDirectDebitDelegateTest.kt b/bacs/src/test/java/com/adyen/checkout/bacs/internal/DefaultBacsDirectDebitDelegateTest.kt index acf4d247b6..40d6987840 100644 --- a/bacs/src/test/java/com/adyen/checkout/bacs/internal/DefaultBacsDirectDebitDelegateTest.kt +++ b/bacs/src/test/java/com/adyen/checkout/bacs/internal/DefaultBacsDirectDebitDelegateTest.kt @@ -477,15 +477,6 @@ internal class DefaultBacsDirectDebitDelegateTest( } } - @Nested - inner class SubmitButtonEnableTest { - - @Test - fun `when shouldEnableSubmitButton is called, then true is returned`() { - assertTrue(delegate.shouldEnableSubmitButton()) - } - } - @Nested inner class SubmitHandlerTest { diff --git a/blik/src/main/java/com/adyen/checkout/blik/internal/ui/DefaultBlikDelegate.kt b/blik/src/main/java/com/adyen/checkout/blik/internal/ui/DefaultBlikDelegate.kt index 8f8d7e607b..910ebf01c0 100644 --- a/blik/src/main/java/com/adyen/checkout/blik/internal/ui/DefaultBlikDelegate.kt +++ b/blik/src/main/java/com/adyen/checkout/blik/internal/ui/DefaultBlikDelegate.kt @@ -162,8 +162,6 @@ internal class DefaultBlikDelegate( override fun shouldShowSubmitButton(): Boolean = isConfirmationRequired() && componentParams.isSubmitButtonVisible - override fun shouldEnableSubmitButton(): Boolean = true - override fun setInteractionBlocked(isInteractionBlocked: Boolean) { submitHandler.setInteractionBlocked(isInteractionBlocked) } diff --git a/blik/src/main/java/com/adyen/checkout/blik/internal/ui/StoredBlikDelegate.kt b/blik/src/main/java/com/adyen/checkout/blik/internal/ui/StoredBlikDelegate.kt index bc6cc6bd23..1b76cadc1a 100644 --- a/blik/src/main/java/com/adyen/checkout/blik/internal/ui/StoredBlikDelegate.kt +++ b/blik/src/main/java/com/adyen/checkout/blik/internal/ui/StoredBlikDelegate.kt @@ -141,8 +141,6 @@ internal class StoredBlikDelegate( override fun shouldShowSubmitButton(): Boolean = isConfirmationRequired() && componentParams.isSubmitButtonVisible - override fun shouldEnableSubmitButton(): Boolean = true - override fun setInteractionBlocked(isInteractionBlocked: Boolean) { submitHandler.setInteractionBlocked(isInteractionBlocked) } diff --git a/blik/src/test/java/com/adyen/checkout/blik/internal/ui/DefaultBlikDelegateTest.kt b/blik/src/test/java/com/adyen/checkout/blik/internal/ui/DefaultBlikDelegateTest.kt index 32404e6413..5eb99626cc 100644 --- a/blik/src/test/java/com/adyen/checkout/blik/internal/ui/DefaultBlikDelegateTest.kt +++ b/blik/src/test/java/com/adyen/checkout/blik/internal/ui/DefaultBlikDelegateTest.kt @@ -218,15 +218,6 @@ internal class DefaultBlikDelegateTest( } } - @Nested - inner class SubmitButtonEnableTest { - - @Test - fun `when shouldEnableSubmitButton is called, then true is returned`() { - assertTrue(delegate.shouldEnableSubmitButton()) - } - } - @Nested inner class SubmitHandlerTest { diff --git a/blik/src/test/java/com/adyen/checkout/blik/internal/ui/StoredBlikDelegateTest.kt b/blik/src/test/java/com/adyen/checkout/blik/internal/ui/StoredBlikDelegateTest.kt index c22d90961f..13c5a7822f 100644 --- a/blik/src/test/java/com/adyen/checkout/blik/internal/ui/StoredBlikDelegateTest.kt +++ b/blik/src/test/java/com/adyen/checkout/blik/internal/ui/StoredBlikDelegateTest.kt @@ -81,15 +81,6 @@ class StoredBlikDelegateTest( } } - @Nested - inner class SubmitButtonEnableTest { - - @Test - fun `when shouldEnableSubmitButton is called, then true is returned`() { - assertTrue(delegate.shouldEnableSubmitButton()) - } - } - @Nested inner class SubmitHandlerTest { diff --git a/boleto/src/main/java/com/adyen/checkout/boleto/internal/ui/DefaultBoletoDelegate.kt b/boleto/src/main/java/com/adyen/checkout/boleto/internal/ui/DefaultBoletoDelegate.kt index 747f8fe3d9..2b596506f3 100644 --- a/boleto/src/main/java/com/adyen/checkout/boleto/internal/ui/DefaultBoletoDelegate.kt +++ b/boleto/src/main/java/com/adyen/checkout/boleto/internal/ui/DefaultBoletoDelegate.kt @@ -303,8 +303,6 @@ internal class DefaultBoletoDelegate( override fun shouldShowSubmitButton(): Boolean = isConfirmationRequired() && componentParams.isSubmitButtonVisible - override fun shouldEnableSubmitButton(): Boolean = true - override fun onCleared() { removeObserver() analyticsManager.clear(this) diff --git a/boleto/src/test/java/com/adyen/checkout/boleto/internal/ui/DefaultBoletoDelegateTest.kt b/boleto/src/test/java/com/adyen/checkout/boleto/internal/ui/DefaultBoletoDelegateTest.kt index 65842fb08a..9f97e7bc41 100644 --- a/boleto/src/test/java/com/adyen/checkout/boleto/internal/ui/DefaultBoletoDelegateTest.kt +++ b/boleto/src/test/java/com/adyen/checkout/boleto/internal/ui/DefaultBoletoDelegateTest.kt @@ -481,15 +481,6 @@ internal class DefaultBoletoDelegateTest( } } - @Nested - inner class SubmitButtonEnableTest { - - @Test - fun `when shouldEnableSubmitButton is called, then true is returned`() { - assertTrue(delegate.shouldEnableSubmitButton()) - } - } - @Nested inner class SubmitHandlerTest { @Test diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt index f298d4f789..9197e66969 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt @@ -812,8 +812,6 @@ class DefaultCardDelegate( override fun shouldShowSubmitButton(): Boolean = isConfirmationRequired() && componentParams.isSubmitButtonVisible - override fun shouldEnableSubmitButton(): Boolean = true - override fun setOnBinValueListener(listener: ((binValue: String) -> Unit)?) { onBinValueListener = listener } diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt index cf40a1c7c1..1955f79e36 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt @@ -419,8 +419,6 @@ internal class StoredCardDelegate( override fun shouldShowSubmitButton(): Boolean = isConfirmationRequired() && componentParams.isSubmitButtonVisible - override fun shouldEnableSubmitButton(): Boolean = true - override fun updateAddressInputData(update: AddressInputModel.() -> Unit) { // no ops } diff --git a/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt index 4c8b19f7dd..b50f01edf4 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt @@ -1006,15 +1006,6 @@ internal class DefaultCardDelegateTest( } } - @Nested - inner class SubmitButtonEnableTest { - - @Test - fun `when shouldEnableSubmitButton is called, then true is returned`() { - assertTrue(delegate.shouldEnableSubmitButton()) - } - } - @Nested inner class SubmitHandlerTest { diff --git a/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt index 99c9935c0d..947d950850 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt @@ -394,15 +394,6 @@ internal class StoredCardDelegateTest( } } - @Nested - inner class SubmitButtonEnableTest { - - @Test - fun `when shouldEnableSubmitButton is called, then true is returned`() { - assertTrue(delegate.shouldEnableSubmitButton()) - } - } - @Nested inner class SubmitHandlerTest { diff --git a/cashapppay/src/main/java/com/adyen/checkout/cashapppay/internal/ui/DefaultCashAppPayDelegate.kt b/cashapppay/src/main/java/com/adyen/checkout/cashapppay/internal/ui/DefaultCashAppPayDelegate.kt index 99caf15d7f..e5b178176b 100644 --- a/cashapppay/src/main/java/com/adyen/checkout/cashapppay/internal/ui/DefaultCashAppPayDelegate.kt +++ b/cashapppay/src/main/java/com/adyen/checkout/cashapppay/internal/ui/DefaultCashAppPayDelegate.kt @@ -317,8 +317,6 @@ constructor( override fun shouldShowSubmitButton(): Boolean = isConfirmationRequired() && componentParams.isSubmitButtonVisible - override fun shouldEnableSubmitButton(): Boolean = true - internal fun setInteractionBlocked(isInteractionBlocked: Boolean) { submitHandler.setInteractionBlocked(isInteractionBlocked) } diff --git a/cashapppay/src/test/java/com/adyen/checkout/cashapppay/internal/ui/DefaultCashAppPayDelegateTest.kt b/cashapppay/src/test/java/com/adyen/checkout/cashapppay/internal/ui/DefaultCashAppPayDelegateTest.kt index 237fe31d56..ce429124c9 100644 --- a/cashapppay/src/test/java/com/adyen/checkout/cashapppay/internal/ui/DefaultCashAppPayDelegateTest.kt +++ b/cashapppay/src/test/java/com/adyen/checkout/cashapppay/internal/ui/DefaultCashAppPayDelegateTest.kt @@ -170,15 +170,6 @@ internal class DefaultCashAppPayDelegateTest( } } - @Nested - inner class SubmitButtonEnableTest { - - @Test - fun `when shouldEnableSubmitButton is called, then true is returned`() { - assertTrue(delegate.shouldEnableSubmitButton()) - } - } - @Nested inner class SubmitHandlerTest { diff --git a/econtext/src/main/java/com/adyen/checkout/econtext/internal/ui/DefaultEContextDelegate.kt b/econtext/src/main/java/com/adyen/checkout/econtext/internal/ui/DefaultEContextDelegate.kt index 4f22601b9e..55ff652f7f 100644 --- a/econtext/src/main/java/com/adyen/checkout/econtext/internal/ui/DefaultEContextDelegate.kt +++ b/econtext/src/main/java/com/adyen/checkout/econtext/internal/ui/DefaultEContextDelegate.kt @@ -226,8 +226,6 @@ internal class DefaultEContextDelegate< return isConfirmationRequired() && componentParams.isSubmitButtonVisible } - override fun shouldEnableSubmitButton(): Boolean = true - override fun setInteractionBlocked(isInteractionBlocked: Boolean) { submitHandler.setInteractionBlocked(isInteractionBlocked) } diff --git a/econtext/src/test/java/com/adyen/checkout/econtext/internal/ui/DefaultEContextDelegateTest.kt b/econtext/src/test/java/com/adyen/checkout/econtext/internal/ui/DefaultEContextDelegateTest.kt index 3a1dbe3008..ce2542bc71 100644 --- a/econtext/src/test/java/com/adyen/checkout/econtext/internal/ui/DefaultEContextDelegateTest.kt +++ b/econtext/src/test/java/com/adyen/checkout/econtext/internal/ui/DefaultEContextDelegateTest.kt @@ -223,15 +223,6 @@ internal class DefaultEContextDelegateTest( } } - @Nested - inner class SubmitButtonEnableTest { - - @Test - fun `when shouldEnableSubmitButton is called, then true is returned`() { - assertTrue(delegate.shouldEnableSubmitButton()) - } - } - @Nested inner class SubmitHandlerTest { diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt index 264efc478b..300563cc7d 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt @@ -272,8 +272,6 @@ internal class DefaultGiftCardDelegate( override fun shouldShowSubmitButton(): Boolean = isConfirmationRequired() && componentParams.isSubmitButtonVisible - override fun shouldEnableSubmitButton(): Boolean = true - override fun setInteractionBlocked(isInteractionBlocked: Boolean) { submitHandler.setInteractionBlocked(isInteractionBlocked) } diff --git a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt index eb000170ce..4f7c60116f 100644 --- a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt +++ b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt @@ -205,15 +205,6 @@ internal class DefaultGiftCardDelegateTest( } } - @Nested - inner class SubmitButtonEnableTest { - - @Test - fun `when shouldEnableSubmitButton is called, then true is returned`() { - assertTrue(delegate.shouldEnableSubmitButton()) - } - } - @Nested inner class SubmitHandlerTest { diff --git a/issuer-list/src/main/java/com/adyen/checkout/issuerlist/internal/ui/DefaultIssuerListDelegate.kt b/issuer-list/src/main/java/com/adyen/checkout/issuerlist/internal/ui/DefaultIssuerListDelegate.kt index dddb28da13..c438256fd5 100644 --- a/issuer-list/src/main/java/com/adyen/checkout/issuerlist/internal/ui/DefaultIssuerListDelegate.kt +++ b/issuer-list/src/main/java/com/adyen/checkout/issuerlist/internal/ui/DefaultIssuerListDelegate.kt @@ -178,8 +178,6 @@ internal class DefaultIssuerListDelegate< override fun shouldShowSubmitButton(): Boolean = isConfirmationRequired() && componentParams.isSubmitButtonVisible - override fun shouldEnableSubmitButton(): Boolean = true - override fun setInteractionBlocked(isInteractionBlocked: Boolean) { submitHandler.setInteractionBlocked(isInteractionBlocked) } diff --git a/issuer-list/src/test/java/com/adyen/checkout/issuerlist/internal/ui/DefaultIssuerListDelegateTest.kt b/issuer-list/src/test/java/com/adyen/checkout/issuerlist/internal/ui/DefaultIssuerListDelegateTest.kt index 07b943abca..ce91016bae 100644 --- a/issuer-list/src/test/java/com/adyen/checkout/issuerlist/internal/ui/DefaultIssuerListDelegateTest.kt +++ b/issuer-list/src/test/java/com/adyen/checkout/issuerlist/internal/ui/DefaultIssuerListDelegateTest.kt @@ -260,15 +260,6 @@ internal class DefaultIssuerListDelegateTest( } } - @Nested - inner class SubmitButtonEnableTest { - - @Test - fun `when shouldEnableSubmitButton is called, then true is returned`() { - assertTrue(delegate.shouldEnableSubmitButton()) - } - } - @Nested inner class SubmitHandlerTest { diff --git a/mbway/src/main/java/com/adyen/checkout/mbway/internal/ui/DefaultMBWayDelegate.kt b/mbway/src/main/java/com/adyen/checkout/mbway/internal/ui/DefaultMBWayDelegate.kt index f8efc544ce..344bbc1d18 100644 --- a/mbway/src/main/java/com/adyen/checkout/mbway/internal/ui/DefaultMBWayDelegate.kt +++ b/mbway/src/main/java/com/adyen/checkout/mbway/internal/ui/DefaultMBWayDelegate.kt @@ -178,8 +178,6 @@ internal class DefaultMBWayDelegate( override fun shouldShowSubmitButton(): Boolean = isConfirmationRequired() && componentParams.isSubmitButtonVisible - override fun shouldEnableSubmitButton(): Boolean = true - override fun setInteractionBlocked(isInteractionBlocked: Boolean) { submitHandler.setInteractionBlocked(isInteractionBlocked) } diff --git a/mbway/src/test/java/com/adyen/checkout/mbway/internal/ui/DefaultMBWayDelegateTest.kt b/mbway/src/test/java/com/adyen/checkout/mbway/internal/ui/DefaultMBWayDelegateTest.kt index 1466a922ac..2cc1edbdb4 100644 --- a/mbway/src/test/java/com/adyen/checkout/mbway/internal/ui/DefaultMBWayDelegateTest.kt +++ b/mbway/src/test/java/com/adyen/checkout/mbway/internal/ui/DefaultMBWayDelegateTest.kt @@ -223,15 +223,6 @@ internal class DefaultMBWayDelegateTest( } } - @Nested - inner class SubmitButtonEnableTest { - - @Test - fun `when shouldEnableSubmitButton is called, then true is returned`() { - assertTrue(delegate.shouldEnableSubmitButton()) - } - } - @Nested inner class SubmitHandlerTest { diff --git a/online-banking-core/src/main/java/com/adyen/checkout/onlinebankingcore/internal/ui/DefaultOnlineBankingDelegate.kt b/online-banking-core/src/main/java/com/adyen/checkout/onlinebankingcore/internal/ui/DefaultOnlineBankingDelegate.kt index 4870a0d597..4ce120e348 100644 --- a/online-banking-core/src/main/java/com/adyen/checkout/onlinebankingcore/internal/ui/DefaultOnlineBankingDelegate.kt +++ b/online-banking-core/src/main/java/com/adyen/checkout/onlinebankingcore/internal/ui/DefaultOnlineBankingDelegate.kt @@ -188,8 +188,6 @@ internal class DefaultOnlineBankingDelegate< override fun shouldShowSubmitButton(): Boolean = isConfirmationRequired() && componentParams.isSubmitButtonVisible - override fun shouldEnableSubmitButton(): Boolean = true - override fun setInteractionBlocked(isInteractionBlocked: Boolean) { submitHandler.setInteractionBlocked(isInteractionBlocked) } diff --git a/online-banking-core/src/test/java/com/adyen/checkout/onlinebankingcore/internal/ui/DefaultOnlineBankingDelegateTest.kt b/online-banking-core/src/test/java/com/adyen/checkout/onlinebankingcore/internal/ui/DefaultOnlineBankingDelegateTest.kt index 4bef1ab993..bd1eb44666 100644 --- a/online-banking-core/src/test/java/com/adyen/checkout/onlinebankingcore/internal/ui/DefaultOnlineBankingDelegateTest.kt +++ b/online-banking-core/src/test/java/com/adyen/checkout/onlinebankingcore/internal/ui/DefaultOnlineBankingDelegateTest.kt @@ -204,15 +204,6 @@ internal class DefaultOnlineBankingDelegateTest( } } - @Nested - inner class SubmitButtonEnableTest { - - @Test - fun `when shouldEnableSubmitButton is called, then true is returned`() { - assertTrue(delegate.shouldEnableSubmitButton()) - } - } - @Nested inner class SubmitHandlerTest { diff --git a/sepa/src/main/java/com/adyen/checkout/sepa/internal/ui/DefaultSepaDelegate.kt b/sepa/src/main/java/com/adyen/checkout/sepa/internal/ui/DefaultSepaDelegate.kt index ea1607f31d..66d0be7204 100644 --- a/sepa/src/main/java/com/adyen/checkout/sepa/internal/ui/DefaultSepaDelegate.kt +++ b/sepa/src/main/java/com/adyen/checkout/sepa/internal/ui/DefaultSepaDelegate.kt @@ -152,8 +152,6 @@ internal class DefaultSepaDelegate( override fun shouldShowSubmitButton(): Boolean = isConfirmationRequired() && componentParams.isSubmitButtonVisible - override fun shouldEnableSubmitButton(): Boolean = true - override fun setInteractionBlocked(isInteractionBlocked: Boolean) { submitHandler.setInteractionBlocked(isInteractionBlocked) } diff --git a/sepa/src/test/java/com/adyen/checkout/sepa/internal/ui/DefaultSepaDelegateTest.kt b/sepa/src/test/java/com/adyen/checkout/sepa/internal/ui/DefaultSepaDelegateTest.kt index 21c76c52a3..5f9a0ad68a 100644 --- a/sepa/src/test/java/com/adyen/checkout/sepa/internal/ui/DefaultSepaDelegateTest.kt +++ b/sepa/src/test/java/com/adyen/checkout/sepa/internal/ui/DefaultSepaDelegateTest.kt @@ -150,15 +150,6 @@ internal class DefaultSepaDelegateTest( } } - @Nested - inner class SubmitButtonEnableTest { - - @Test - fun `when shouldEnableSubmitButton is called, then true is returned`() { - assertTrue(delegate.shouldEnableSubmitButton()) - } - } - @Nested inner class SubmitHandlerTest { diff --git a/ui-core/api/ui-core.api b/ui-core/api/ui-core.api index 669d9ed39d..45030c84f3 100644 --- a/ui-core/api/ui-core.api +++ b/ui-core/api/ui-core.api @@ -62,10 +62,6 @@ public final class com/adyen/checkout/ui/core/internal/ui/PaymentComponentUIEven public static final field INSTANCE Lcom/adyen/checkout/ui/core/internal/ui/PaymentComponentUIEvent$InvalidUI; } -public final class com/adyen/checkout/ui/core/internal/ui/PaymentComponentUIEvent$StateUpdated : com/adyen/checkout/ui/core/internal/ui/PaymentComponentUIEvent { - public static final field INSTANCE Lcom/adyen/checkout/ui/core/internal/ui/PaymentComponentUIEvent$StateUpdated; -} - public final class com/adyen/checkout/ui/core/internal/ui/PaymentComponentUIState$Blocked : com/adyen/checkout/ui/core/internal/ui/PaymentComponentUIState { public static final field INSTANCE Lcom/adyen/checkout/ui/core/internal/ui/PaymentComponentUIState$Blocked; } diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/AdyenComponentView.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/AdyenComponentView.kt index 462926595f..8988f179d0 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/AdyenComponentView.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/AdyenComponentView.kt @@ -67,8 +67,6 @@ class AdyenComponentView @JvmOverloads constructor( private var isInteractionBlocked = false private var componentView: ComponentView? = null - private var buttonDelegate: ButtonDelegate? = null - private var buttonView: PayButton? = null private var attachedComponent = WeakReference(null) @@ -133,8 +131,7 @@ class AdyenComponentView @JvmOverloads constructor( binding.frameLayoutComponentContainer.addView(componentView.getView()) componentView.initView(delegate, coroutineScope, localizedContext) - buttonDelegate = (delegate as? ButtonDelegate) - val buttonDelegate = buttonDelegate + val buttonDelegate = (delegate as? ButtonDelegate) if (buttonDelegate?.isConfirmationRequired() == true) { val uiStateDelegate = (delegate as? UIStateDelegate) uiStateDelegate?.uiStateFlow?.onEach { @@ -144,15 +141,14 @@ class AdyenComponentView @JvmOverloads constructor( uiStateDelegate?.uiEventFlow?.onEach { when (it) { PaymentComponentUIEvent.InvalidUI -> highlightValidationErrors() - PaymentComponentUIEvent.StateUpdated -> updateViewStates() } }?.launchIn(coroutineScope) binding.frameLayoutButtonContainer.isVisible = buttonDelegate.shouldShowSubmitButton() - buttonView = (viewType as ButtonComponentViewType) + val buttonView = (viewType as ButtonComponentViewType) .buttonViewProvider.getButton(context) - buttonView?.setText(viewType, componentParams, localizedContext) - buttonView?.setOnClickListener { + buttonView.setText(viewType, componentParams, localizedContext) + buttonView.setOnClickListener { buttonDelegate.onSubmit() } binding.frameLayoutButtonContainer.addView(buttonView) @@ -181,29 +177,6 @@ class AdyenComponentView @JvmOverloads constructor( if (isInteractionBlocked) { resetFocus() hideKeyboard() - } else { - updateViewStates() - } - } - - /** - * Highlight and focus on the current validation errors for the user to take action. - * If the component doesn't need validation or if everything is already valid, nothing will happen. - */ - fun highlightValidationErrors() { - componentView?.highlightValidationErrors() - } - - /** - * Update view visibility and enabled states when component state is updated. - * - * This function will be called also when setInteractionBlocked() is called with a `true` value. This case is - * necessary, because after interaction block is lifted, views which do not need to be enabled will become enabled - * because of the setInteractionBlocked() implementation. - */ - private fun updateViewStates() { - buttonDelegate?.shouldEnableSubmitButton()?.let { shouldEnable -> - buttonView?.isEnabled = shouldEnable } } @@ -233,6 +206,14 @@ class AdyenComponentView @JvmOverloads constructor( setText(text) } + /** + * Highlight and focus on the current validation errors for the user to take action. + * If the component doesn't need validation or if everything is already valid, nothing will happen. + */ + fun highlightValidationErrors() { + componentView?.highlightValidationErrors() + } + override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean { if (isInteractionBlocked) return true return super.onInterceptTouchEvent(ev) diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/ButtonDelegate.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/ButtonDelegate.kt index 7cc3e4a018..19684832cd 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/ButtonDelegate.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/ButtonDelegate.kt @@ -16,13 +16,4 @@ interface ButtonDelegate { fun isConfirmationRequired(): Boolean fun shouldShowSubmitButton(): Boolean - - /** - * Indicates whether the submit button should be enabled. For some components, the submit button - * is enabled after user interaction. Each component delegate defines what this means in the - * context of its specific implementation. - * - * This function gets called every time there is a change in the component state. - */ - fun shouldEnableSubmitButton(): Boolean } diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/PaymentComponentUIState.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/PaymentComponentUIState.kt index 40662b930f..5690e86b9b 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/PaymentComponentUIState.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/PaymentComponentUIState.kt @@ -33,8 +33,6 @@ sealed class PaymentComponentUIState { } @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) -abstract class PaymentComponentUIEvent { +sealed class PaymentComponentUIEvent { object InvalidUI : PaymentComponentUIEvent() - - object StateUpdated : PaymentComponentUIEvent() } diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/SubmitHandler.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/SubmitHandler.kt index 8b4c71589b..bd28ce5a1e 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/SubmitHandler.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/SubmitHandler.kt @@ -54,7 +54,6 @@ class SubmitHandler>( } resetUIState() } - uiEventChannel.trySend(PaymentComponentUIEvent.StateUpdated) }.launchIn(coroutineScope) } diff --git a/ui-core/src/test/java/com/adyen/checkout/ui/core/internal/ui/SubmitHandlerTest.kt b/ui-core/src/test/java/com/adyen/checkout/ui/core/internal/ui/SubmitHandlerTest.kt index 2a568b4c63..e998f78c44 100644 --- a/ui-core/src/test/java/com/adyen/checkout/ui/core/internal/ui/SubmitHandlerTest.kt +++ b/ui-core/src/test/java/com/adyen/checkout/ui/core/internal/ui/SubmitHandlerTest.kt @@ -60,17 +60,6 @@ internal class SubmitHandlerTest { assertEquals(expected, submitHandler.submitFlow.first()) } - - @Test - fun `component state flow gets updated, then StateUpdated state should be emitted`() = runTest { - val componentStateFlow = MutableStateFlow(createComponentState()) - submitHandler = createSubmitHandler() - submitHandler.initialize(CoroutineScope(UnconfinedTestDispatcher()), componentStateFlow) - - componentStateFlow.tryEmit(createComponentState()) - - assertEquals(PaymentComponentUIEvent.StateUpdated, submitHandler.uiEventFlow.first()) - } } @Nested diff --git a/upi/src/main/java/com/adyen/checkout/upi/internal/ui/DefaultUPIDelegate.kt b/upi/src/main/java/com/adyen/checkout/upi/internal/ui/DefaultUPIDelegate.kt index 8d09fc66db..a1f8752ede 100644 --- a/upi/src/main/java/com/adyen/checkout/upi/internal/ui/DefaultUPIDelegate.kt +++ b/upi/src/main/java/com/adyen/checkout/upi/internal/ui/DefaultUPIDelegate.kt @@ -309,12 +309,6 @@ internal class DefaultUPIDelegate( override fun shouldShowSubmitButton(): Boolean = isConfirmationRequired() && componentParams.isSubmitButtonVisible - override fun shouldEnableSubmitButton(): Boolean = when (outputData.selectedMode) { - UPISelectedMode.INTENT -> outputData.selectedUPIIntentItem != null - UPISelectedMode.VPA -> true - UPISelectedMode.QR -> true - } - override fun onCleared() { removeObserver() analyticsManager.clear(this) diff --git a/upi/src/test/java/com/adyen/checkout/upi/internal/ui/DefaultUPIDelegateTest.kt b/upi/src/test/java/com/adyen/checkout/upi/internal/ui/DefaultUPIDelegateTest.kt index 2d7f3e8ad5..f9af48f28b 100644 --- a/upi/src/test/java/com/adyen/checkout/upi/internal/ui/DefaultUPIDelegateTest.kt +++ b/upi/src/test/java/com/adyen/checkout/upi/internal/ui/DefaultUPIDelegateTest.kt @@ -406,48 +406,6 @@ internal class DefaultUPIDelegateTest( } } - @Nested - inner class SubmitButtonEnableTest { - - @Test - fun `when selected mode is INTENT and there is no selected upi intent item, then submit button should not be enabled`() { - delegate.updateInputData { - selectedMode = UPISelectedMode.INTENT - selectedUPIIntentItem = null - } - - assertFalse(delegate.shouldEnableSubmitButton()) - } - - @Test - fun `when selected mode is INTENT and there is selected upi intent item, then submit button should be enabled`() { - delegate.updateInputData { - selectedMode = UPISelectedMode.INTENT - selectedUPIIntentItem = UPIIntentItem.GenericApp() - } - - assertTrue(delegate.shouldEnableSubmitButton()) - } - - @Test - fun `when selected mode is VPA, then submit button should be enabled`() { - delegate.updateInputData { - selectedMode = UPISelectedMode.VPA - } - - assertTrue(delegate.shouldEnableSubmitButton()) - } - - @Test - fun `when selected mode is QR, then submit button should be enabled`() { - delegate.updateInputData { - selectedMode = UPISelectedMode.QR - } - - assertTrue(delegate.shouldEnableSubmitButton()) - } - } - @Nested inner class SubmitHandlerTest { From 704fbea777674002fc653ce8a9939f93e96735a5 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Tue, 9 Jul 2024 13:44:37 +0200 Subject: [PATCH 003/299] Add an error disclaimer to show when user clicks Continue for UPI intent and there are no apps selected COAND-946 --- .../upi/internal/ui/DefaultUPIDelegate.kt | 18 ++++- .../upi/internal/ui/model/UPIOutputData.kt | 1 + .../checkout/upi/internal/ui/view/UPIView.kt | 9 +++ .../warning_disclaimer_background.xml | 14 ++++ upi/src/main/res/layout/upi_view.xml | 11 ++- .../main/res/template/values/strings.xml.tt | 1 + upi/src/main/res/values-ar/strings.xml | 1 + upi/src/main/res/values-cs-rCZ/strings.xml | 1 + upi/src/main/res/values-da-rDK/strings.xml | 1 + upi/src/main/res/values-de-rDE/strings.xml | 1 + upi/src/main/res/values-el-rGR/strings.xml | 1 + upi/src/main/res/values-es-rES/strings.xml | 1 + upi/src/main/res/values-fi-rFI/strings.xml | 1 + upi/src/main/res/values-fr-rFR/strings.xml | 1 + upi/src/main/res/values-hr-rHR/strings.xml | 1 + upi/src/main/res/values-hu-rHU/strings.xml | 1 + upi/src/main/res/values-it-rIT/strings.xml | 1 + upi/src/main/res/values-ja-rJP/strings.xml | 1 + upi/src/main/res/values-ko-rKR/strings.xml | 1 + upi/src/main/res/values-nb-rNO/strings.xml | 1 + upi/src/main/res/values-nl-rNL/strings.xml | 1 + upi/src/main/res/values-pl-rPL/strings.xml | 1 + upi/src/main/res/values-pt-rBR/strings.xml | 1 + upi/src/main/res/values-pt-rPT/strings.xml | 1 + upi/src/main/res/values-ro-rRO/strings.xml | 1 + upi/src/main/res/values-ru-rRU/strings.xml | 1 + upi/src/main/res/values-sk-rSK/strings.xml | 1 + upi/src/main/res/values-sl-rSI/strings.xml | 1 + upi/src/main/res/values-sv-rSE/strings.xml | 1 + upi/src/main/res/values-zh-rCN/strings.xml | 1 + upi/src/main/res/values-zh-rTW/strings.xml | 1 + upi/src/main/res/values/strings.xml | 1 + upi/src/main/res/values/styles.xml | 8 ++ .../upi/internal/ui/DefaultUPIDelegateTest.kt | 77 ++++++++++++++++++- 34 files changed, 159 insertions(+), 6 deletions(-) create mode 100644 upi/src/main/res/drawable/warning_disclaimer_background.xml diff --git a/upi/src/main/java/com/adyen/checkout/upi/internal/ui/DefaultUPIDelegate.kt b/upi/src/main/java/com/adyen/checkout/upi/internal/ui/DefaultUPIDelegate.kt index a1f8752ede..5549d05871 100644 --- a/upi/src/main/java/com/adyen/checkout/upi/internal/ui/DefaultUPIDelegate.kt +++ b/upi/src/main/java/com/adyen/checkout/upi/internal/ui/DefaultUPIDelegate.kt @@ -119,11 +119,15 @@ internal class DefaultUPIDelegate( private fun createOutputData(includeValidationErrors: Boolean = false) = with(inputData) { val availableModes = createAvailableModes(this, paymentMethod, includeValidationErrors) val intentVirtualPaymentAddressFieldState = validateVirtualPaymentAddress(intentVirtualPaymentAddress) + val selectedMode = selectedMode ?: availableModes.first().mapToSelectedMode() + val showNoSelectedUPIIntentItemError = + shouldShowNoSelectedUPIIntentItemError(selectedMode, selectedUPIIntentItem, includeValidationErrors) UPIOutputData( - selectedMode = selectedMode ?: availableModes.first().mapToSelectedMode(), - selectedUPIIntentItem = selectedUPIIntentItem, availableModes = availableModes, + selectedMode = selectedMode, + selectedUPIIntentItem = selectedUPIIntentItem, + showNoSelectedUPIIntentItemError = showNoSelectedUPIIntentItemError, virtualPaymentAddressFieldState = validateVirtualPaymentAddress(vpaVirtualPaymentAddress), intentVirtualPaymentAddressFieldState = intentVirtualPaymentAddressFieldState, ) @@ -194,6 +198,16 @@ internal class DefaultUPIDelegate( FieldState(virtualPaymentAddress, Validation.Invalid(R.string.checkout_upi_vpa_validation)) } + private fun shouldShowNoSelectedUPIIntentItemError( + selectedMode: UPISelectedMode, + selectedUPIIntentItem: UPIIntentItem?, + includeValidationErrors: Boolean, + ) = if (includeValidationErrors) { + selectedMode == UPISelectedMode.INTENT && selectedUPIIntentItem == null + } else { + false + } + private fun outputDataChanged(outputData: UPIOutputData) { _outputDataFlow.tryEmit(outputData) } diff --git a/upi/src/main/java/com/adyen/checkout/upi/internal/ui/model/UPIOutputData.kt b/upi/src/main/java/com/adyen/checkout/upi/internal/ui/model/UPIOutputData.kt index f9be234789..74828e2c10 100644 --- a/upi/src/main/java/com/adyen/checkout/upi/internal/ui/model/UPIOutputData.kt +++ b/upi/src/main/java/com/adyen/checkout/upi/internal/ui/model/UPIOutputData.kt @@ -15,6 +15,7 @@ internal class UPIOutputData( val availableModes: List, val selectedMode: UPISelectedMode, var selectedUPIIntentItem: UPIIntentItem? = null, + val showNoSelectedUPIIntentItemError: Boolean, val virtualPaymentAddressFieldState: FieldState, val intentVirtualPaymentAddressFieldState: FieldState, ) : OutputData { diff --git a/upi/src/main/java/com/adyen/checkout/upi/internal/ui/view/UPIView.kt b/upi/src/main/java/com/adyen/checkout/upi/internal/ui/view/UPIView.kt index 17a220face..d30e01652b 100644 --- a/upi/src/main/java/com/adyen/checkout/upi/internal/ui/view/UPIView.kt +++ b/upi/src/main/java/com/adyen/checkout/upi/internal/ui/view/UPIView.kt @@ -92,6 +92,10 @@ internal class UPIView @JvmOverloads constructor( R.style.AdyenCheckout_UPI_QRButton, localizedContext, ) + binding.textViewNoAppSelected.setLocalizedTextFromStyle( + R.style.AdyenCheckout_UPI_NoAppSelectedTextView, + localizedContext, + ) binding.textInputLayoutVpa.setLocalizedHintFromStyle( R.style.AdyenCheckout_UPI_VPAEditText, localizedContext, @@ -120,6 +124,7 @@ internal class UPIView @JvmOverloads constructor( private fun outputDataChanged(outputData: UPIOutputData) { initPicker(outputData.availableModes, outputData.selectedMode) + initError(outputData) } private fun initPicker(availableModes: List, selectedMode: UPISelectedMode) { @@ -218,6 +223,10 @@ internal class UPIView @JvmOverloads constructor( } } + private fun initError(outputData: UPIOutputData) { + binding.textViewNoAppSelected.isVisible = outputData.showNoSelectedUPIIntentItemError + } + private fun initVpaInput(delegate: UPIDelegate, localizedContext: Context) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { binding.editTextVpa.setAutofillHints(HintConstants.AUTOFILL_HINT_UPI_VPA) diff --git a/upi/src/main/res/drawable/warning_disclaimer_background.xml b/upi/src/main/res/drawable/warning_disclaimer_background.xml new file mode 100644 index 0000000000..8e3177080f --- /dev/null +++ b/upi/src/main/res/drawable/warning_disclaimer_background.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/upi/src/main/res/layout/upi_view.xml b/upi/src/main/res/layout/upi_view.xml index 3dc7b53c42..921c7a1486 100644 --- a/upi/src/main/res/layout/upi_view.xml +++ b/upi/src/main/res/layout/upi_view.xml @@ -54,15 +54,24 @@ + + diff --git a/upi/src/main/res/template/values/strings.xml.tt b/upi/src/main/res/template/values/strings.xml.tt index 1a1b06dd81..8faf6d9167 100644 --- a/upi/src/main/res/template/values/strings.xml.tt +++ b/upi/src/main/res/template/values/strings.xml.tt @@ -14,6 +14,7 @@ %%continue%% %%upi.mode.enterUpiId%% %%upi.mode.otherUpi%% + %%upi.error.noAppSelected%% Pay by any UPI app diff --git a/upi/src/main/res/values-ar/strings.xml b/upi/src/main/res/values-ar/strings.xml index 11cd7897ef..8d0ce7b98f 100644 --- a/upi/src/main/res/values-ar/strings.xml +++ b/upi/src/main/res/values-ar/strings.xml @@ -14,5 +14,6 @@ متابعة أدخل معرف UPI خيارات UPI الأخرى + للمتابعة؛ حدد وسيلة للدفع \ No newline at end of file diff --git a/upi/src/main/res/values-cs-rCZ/strings.xml b/upi/src/main/res/values-cs-rCZ/strings.xml index 964362e3c0..4c8979253e 100644 --- a/upi/src/main/res/values-cs-rCZ/strings.xml +++ b/upi/src/main/res/values-cs-rCZ/strings.xml @@ -14,5 +14,6 @@ Pokračovat Zadejte UPI ID Jiné UPI + Pro pokračování je potřeba vybrat platební metodu \ No newline at end of file diff --git a/upi/src/main/res/values-da-rDK/strings.xml b/upi/src/main/res/values-da-rDK/strings.xml index 8ca7e6d976..0b2d47d93f 100644 --- a/upi/src/main/res/values-da-rDK/strings.xml +++ b/upi/src/main/res/values-da-rDK/strings.xml @@ -14,5 +14,6 @@ Fortsæt Indtast UPI-id Andet UPI + Vælg en betalingsmåde for at fortsætte \ No newline at end of file diff --git a/upi/src/main/res/values-de-rDE/strings.xml b/upi/src/main/res/values-de-rDE/strings.xml index c0239bccda..f281089802 100644 --- a/upi/src/main/res/values-de-rDE/strings.xml +++ b/upi/src/main/res/values-de-rDE/strings.xml @@ -14,5 +14,6 @@ Weiter UPI-ID eingeben Andere UPI + Wählen Sie eine Zahlungsmethode aus, um fortzufahren \ No newline at end of file diff --git a/upi/src/main/res/values-el-rGR/strings.xml b/upi/src/main/res/values-el-rGR/strings.xml index 9cd8742975..ea94019813 100644 --- a/upi/src/main/res/values-el-rGR/strings.xml +++ b/upi/src/main/res/values-el-rGR/strings.xml @@ -14,5 +14,6 @@ Συνέχεια Εισαγωγή αναγνωριστικού UPI Άλλο UPI + Επιλέξτε μια μέθοδο πληρωμής για να συνεχίσετε \ No newline at end of file diff --git a/upi/src/main/res/values-es-rES/strings.xml b/upi/src/main/res/values-es-rES/strings.xml index b11baf6ad9..f208163fe0 100644 --- a/upi/src/main/res/values-es-rES/strings.xml +++ b/upi/src/main/res/values-es-rES/strings.xml @@ -14,5 +14,6 @@ Continuar Introduzca el ID de la UPI Otras UPI + Selecciona un método de pago para continuar \ No newline at end of file diff --git a/upi/src/main/res/values-fi-rFI/strings.xml b/upi/src/main/res/values-fi-rFI/strings.xml index e6d94a9691..8ca097b4df 100644 --- a/upi/src/main/res/values-fi-rFI/strings.xml +++ b/upi/src/main/res/values-fi-rFI/strings.xml @@ -14,5 +14,6 @@ Jatka Syötä UPI-tunnus Muu UPI + Jatka valitsemalla maksutapa \ No newline at end of file diff --git a/upi/src/main/res/values-fr-rFR/strings.xml b/upi/src/main/res/values-fr-rFR/strings.xml index 6f510e9fb8..7e1c25eb0f 100644 --- a/upi/src/main/res/values-fr-rFR/strings.xml +++ b/upi/src/main/res/values-fr-rFR/strings.xml @@ -14,5 +14,6 @@ Continuer Entrez l\'identifiant UPI Autres UPI + Sélectionnez un mode de paiement pour continuer \ No newline at end of file diff --git a/upi/src/main/res/values-hr-rHR/strings.xml b/upi/src/main/res/values-hr-rHR/strings.xml index 8db213bc9a..7e5b7d64de 100644 --- a/upi/src/main/res/values-hr-rHR/strings.xml +++ b/upi/src/main/res/values-hr-rHR/strings.xml @@ -14,5 +14,6 @@ Nastavi Unesite UPI ID Ostale UPI opcije + Za nastavak odaberite način plaćanja \ No newline at end of file diff --git a/upi/src/main/res/values-hu-rHU/strings.xml b/upi/src/main/res/values-hu-rHU/strings.xml index d91afcb15d..451a757fe6 100644 --- a/upi/src/main/res/values-hu-rHU/strings.xml +++ b/upi/src/main/res/values-hu-rHU/strings.xml @@ -14,5 +14,6 @@ Folytatás UPI-azonosító megadása Egyéb UPI + A folytatáshoz válasszon fizetési módot \ No newline at end of file diff --git a/upi/src/main/res/values-it-rIT/strings.xml b/upi/src/main/res/values-it-rIT/strings.xml index 3411be9699..0589d3be4b 100644 --- a/upi/src/main/res/values-it-rIT/strings.xml +++ b/upi/src/main/res/values-it-rIT/strings.xml @@ -14,5 +14,6 @@ Continua Immetti l\'ID UPI Altro UPI + Seleziona un metodo di pagamento per continuare \ No newline at end of file diff --git a/upi/src/main/res/values-ja-rJP/strings.xml b/upi/src/main/res/values-ja-rJP/strings.xml index cbd5efe4c6..7c6fe22d66 100644 --- a/upi/src/main/res/values-ja-rJP/strings.xml +++ b/upi/src/main/res/values-ja-rJP/strings.xml @@ -14,5 +14,6 @@ 続ける UPI IDを入力してください その他のUPI + 支払い方法を選択して続行する \ No newline at end of file diff --git a/upi/src/main/res/values-ko-rKR/strings.xml b/upi/src/main/res/values-ko-rKR/strings.xml index 1eab6e948d..0b13a075dd 100644 --- a/upi/src/main/res/values-ko-rKR/strings.xml +++ b/upi/src/main/res/values-ko-rKR/strings.xml @@ -14,5 +14,6 @@ 계속 UPI ID 입력 기타 UPI + 계속 진행하려면 결제 수단을 선택하세요 \ No newline at end of file diff --git a/upi/src/main/res/values-nb-rNO/strings.xml b/upi/src/main/res/values-nb-rNO/strings.xml index 2a1f390d29..426ad0d7c8 100644 --- a/upi/src/main/res/values-nb-rNO/strings.xml +++ b/upi/src/main/res/values-nb-rNO/strings.xml @@ -14,5 +14,6 @@ Fortsett Angi UPI-ID Andre UPI-alternativer + Velg en betalingsmetode for å fortsette \ No newline at end of file diff --git a/upi/src/main/res/values-nl-rNL/strings.xml b/upi/src/main/res/values-nl-rNL/strings.xml index b33d89975c..f58175272f 100644 --- a/upi/src/main/res/values-nl-rNL/strings.xml +++ b/upi/src/main/res/values-nl-rNL/strings.xml @@ -14,5 +14,6 @@ Doorgaan UPI-ID invoeren Andere UPI + Selecteer een betalingsmethode om door te gaan \ No newline at end of file diff --git a/upi/src/main/res/values-pl-rPL/strings.xml b/upi/src/main/res/values-pl-rPL/strings.xml index 10227af3a7..40d4ea9d32 100644 --- a/upi/src/main/res/values-pl-rPL/strings.xml +++ b/upi/src/main/res/values-pl-rPL/strings.xml @@ -14,5 +14,6 @@ Kontynuuj Wprowadź identyfikator UPI Inne UPI + Wybierz metodę płatności, aby kontynuować \ No newline at end of file diff --git a/upi/src/main/res/values-pt-rBR/strings.xml b/upi/src/main/res/values-pt-rBR/strings.xml index 92390cb2ad..bc926d525c 100644 --- a/upi/src/main/res/values-pt-rBR/strings.xml +++ b/upi/src/main/res/values-pt-rBR/strings.xml @@ -14,5 +14,6 @@ Continuar Digite o ID UPI Outro UPI + Selecione um método de pagamento para continuar \ No newline at end of file diff --git a/upi/src/main/res/values-pt-rPT/strings.xml b/upi/src/main/res/values-pt-rPT/strings.xml index ee0c103545..c416d88bc1 100644 --- a/upi/src/main/res/values-pt-rPT/strings.xml +++ b/upi/src/main/res/values-pt-rPT/strings.xml @@ -14,5 +14,6 @@ Continuar Introduza o ID da aplicação UPI Outras UPI + Selecione um método de pagamento para continuar \ No newline at end of file diff --git a/upi/src/main/res/values-ro-rRO/strings.xml b/upi/src/main/res/values-ro-rRO/strings.xml index 1f8de28e53..82e60bee4f 100644 --- a/upi/src/main/res/values-ro-rRO/strings.xml +++ b/upi/src/main/res/values-ro-rRO/strings.xml @@ -14,5 +14,6 @@ Continuare Completați identificatorul UPI Alte UPI + Selectați o metodă de plată pentru a continua \ No newline at end of file diff --git a/upi/src/main/res/values-ru-rRU/strings.xml b/upi/src/main/res/values-ru-rRU/strings.xml index 4d87583e11..c1b79db251 100644 --- a/upi/src/main/res/values-ru-rRU/strings.xml +++ b/upi/src/main/res/values-ru-rRU/strings.xml @@ -14,5 +14,6 @@ Продолжить Введите идентификатор UPI Другие UPI + Для продолжения выберите способ оплаты \ No newline at end of file diff --git a/upi/src/main/res/values-sk-rSK/strings.xml b/upi/src/main/res/values-sk-rSK/strings.xml index 56db4c8012..36a09d8358 100644 --- a/upi/src/main/res/values-sk-rSK/strings.xml +++ b/upi/src/main/res/values-sk-rSK/strings.xml @@ -14,5 +14,6 @@ Pokračovať Zadajte UPI ID Iné UPI + Pokračujte výberom spôsobu platby \ No newline at end of file diff --git a/upi/src/main/res/values-sl-rSI/strings.xml b/upi/src/main/res/values-sl-rSI/strings.xml index 0540532f21..68c55327b2 100644 --- a/upi/src/main/res/values-sl-rSI/strings.xml +++ b/upi/src/main/res/values-sl-rSI/strings.xml @@ -14,5 +14,6 @@ Nadaljuj Vnesite UPI ID Drugi UPI + Za nadaljevanje izberite način plačila \ No newline at end of file diff --git a/upi/src/main/res/values-sv-rSE/strings.xml b/upi/src/main/res/values-sv-rSE/strings.xml index e43cf41789..c9abd2522e 100644 --- a/upi/src/main/res/values-sv-rSE/strings.xml +++ b/upi/src/main/res/values-sv-rSE/strings.xml @@ -14,5 +14,6 @@ Fortsätt Ange UPI-ID Annan UPI + Välj en betalningsmetod för att fortsätta \ No newline at end of file diff --git a/upi/src/main/res/values-zh-rCN/strings.xml b/upi/src/main/res/values-zh-rCN/strings.xml index 6534c8ff26..3dce605d7f 100644 --- a/upi/src/main/res/values-zh-rCN/strings.xml +++ b/upi/src/main/res/values-zh-rCN/strings.xml @@ -14,5 +14,6 @@ 继续 输入 UPI ID 其他 UPI + 选择支付方式继续 \ No newline at end of file diff --git a/upi/src/main/res/values-zh-rTW/strings.xml b/upi/src/main/res/values-zh-rTW/strings.xml index f050ce1eb5..a42167dfc6 100644 --- a/upi/src/main/res/values-zh-rTW/strings.xml +++ b/upi/src/main/res/values-zh-rTW/strings.xml @@ -14,5 +14,6 @@ 繼續 輸入 UPI ID 其他 UPI + 選取付款方式以繼續 \ No newline at end of file diff --git a/upi/src/main/res/values/strings.xml b/upi/src/main/res/values/strings.xml index 77dd22c4f6..f52b8855f4 100644 --- a/upi/src/main/res/values/strings.xml +++ b/upi/src/main/res/values/strings.xml @@ -14,6 +14,7 @@ Continue Enter UPI ID Other UPI + Select a payment method to continue Pay by any UPI app diff --git a/upi/src/main/res/values/styles.xml b/upi/src/main/res/values/styles.xml index 5737826544..6f1ef84460 100644 --- a/upi/src/main/res/values/styles.xml +++ b/upi/src/main/res/values/styles.xml @@ -34,6 +34,14 @@ false + + + + + + + + + diff --git a/ui-core/src/main/res/layout/address_lookup_view.xml b/ui-core/src/main/res/layout/address_lookup_view.xml index 9653a6af54..c2cab59a65 100644 --- a/ui-core/src/main/res/layout/address_lookup_view.xml +++ b/ui-core/src/main/res/layout/address_lookup_view.xml @@ -30,44 +30,31 @@ + android:layout_height="wrap_content" /> - @string/checkout_address_lookup_submit - - - - From 5271665ed47c7999cc75618ee6eaca011943d5d4 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Thu, 15 Aug 2024 14:09:37 +0200 Subject: [PATCH 107/299] Don't allow direct usage of android:hint COAND-956 --- .../com/adyen/checkout/lint/TextInLayoutXml.kt | 3 ++- .../adyen/checkout/lint/TextInLayoutXmlTest.kt | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lint/src/main/java/com/adyen/checkout/lint/TextInLayoutXml.kt b/lint/src/main/java/com/adyen/checkout/lint/TextInLayoutXml.kt index eb80d56ed4..21d81efcf6 100644 --- a/lint/src/main/java/com/adyen/checkout/lint/TextInLayoutXml.kt +++ b/lint/src/main/java/com/adyen/checkout/lint/TextInLayoutXml.kt @@ -20,7 +20,7 @@ import org.w3c.dom.Attr internal val TEXT_IN_LAYOUT_XML_ISSUE = Issue.create( id = "TextInLayoutXml", - briefDescription = "android:text should not be used directly", + briefDescription = "Text should not be set directly", explanation = """ Text should be defined in a style, so that merchants can easily override it. """.trimIndent().replace(Regex("(\n*)\n"), "$1"), @@ -35,6 +35,7 @@ internal class TextInLayoutXmlDetector : LayoutDetector() { override fun getApplicableAttributes(): Collection = listOf( SdkConstants.ATTR_TEXT, + SdkConstants.ATTR_HINT, ) override fun visitAttribute(context: XmlContext, attribute: Attr) { diff --git a/lint/src/test/java/com/adyen/checkout/lint/TextInLayoutXmlTest.kt b/lint/src/test/java/com/adyen/checkout/lint/TextInLayoutXmlTest.kt index fa8f4e1d68..88067c8f85 100644 --- a/lint/src/test/java/com/adyen/checkout/lint/TextInLayoutXmlTest.kt +++ b/lint/src/test/java/com/adyen/checkout/lint/TextInLayoutXmlTest.kt @@ -25,6 +25,17 @@ internal class TextInLayoutXmlTest { android:layout_width="match_parent" android:layout_height="wrap_content" android:text="test" /> + + + + + """.trimIndent(), @@ -38,7 +49,10 @@ internal class TextInLayoutXmlTest { res/layout/some_view.xml:12: Error: Text should be defined in a style [TextInLayoutXml] android:text="test" /> ~~~~~~~~~~~~~~~~~~~ - 1 errors, 0 warnings + res/layout/some_view.xml:22: Error: Text should be defined in a style [TextInLayoutXml] + android:hint="hint" /> + ~~~~~~~~~~~~~~~~~~~ + 2 errors, 0 warnings """, ) } From 395c6d2332c55434bbca35e6d9e2cfe710c6e137 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Thu, 15 Aug 2024 10:44:39 +0200 Subject: [PATCH 108/299] Add lint rule that checks if context.getString() is used COAND-956 --- .../adyen/checkout/lint/ContextGetString.kt | 68 +++++++++++++ .../adyen/checkout/lint/LintIssueRegistry.kt | 1 + .../checkout/lint/ContextGetStringTest.kt | 96 +++++++++++++++++++ 3 files changed, 165 insertions(+) create mode 100644 lint/src/main/java/com/adyen/checkout/lint/ContextGetString.kt create mode 100644 lint/src/test/java/com/adyen/checkout/lint/ContextGetStringTest.kt diff --git a/lint/src/main/java/com/adyen/checkout/lint/ContextGetString.kt b/lint/src/main/java/com/adyen/checkout/lint/ContextGetString.kt new file mode 100644 index 0000000000..7354c08357 --- /dev/null +++ b/lint/src/main/java/com/adyen/checkout/lint/ContextGetString.kt @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by oscars on 14/8/2024. + */ + +package com.adyen.checkout.lint + +import com.android.tools.lint.detector.api.Category +import com.android.tools.lint.detector.api.Detector +import com.android.tools.lint.detector.api.Implementation +import com.android.tools.lint.detector.api.Issue +import com.android.tools.lint.detector.api.JavaContext +import com.android.tools.lint.detector.api.Scope +import com.android.tools.lint.detector.api.Severity +import com.intellij.psi.PsiMethod +import org.jetbrains.uast.UCallExpression +import org.jetbrains.uast.getContainingUClass + +internal val CONTEXT_GET_STRING_ISSUE = Issue.create( + id = "ContextGetString", + briefDescription = "Context.getString() should not be used directly", + explanation = """ + Use localizedContext.getString() instead of context.getString to make sure strings are localized correctly. + """.trimIndent().replace(Regex("(\n*)\n"), "$1"), + implementation = Implementation(ContextGetStringDetector::class.java, Scope.JAVA_FILE_SCOPE), + category = Category.I18N, + priority = 5, + severity = Severity.ERROR, + androidSpecific = true, +) + +internal class ContextGetStringDetector : Detector(), Detector.UastScanner { + + override fun getApplicableMethodNames(): List = listOf( + "getString", + ) + + override fun visitMethodCall(context: JavaContext, node: UCallExpression, method: PsiMethod) { + if (!context.evaluator.isMemberInClass(method, "android.content.Context")) return + + if (!isCalledInsideOfViewClass(context, node)) return + + val receiver = node.receiver?.asSourceString() + // Ignore parenthesis + ?.replace("(", "") + ?.replace(")", "") + + if (receiver != "localizedContext") { + context.report( + CONTEXT_GET_STRING_ISSUE, + node, + context.getLocation(node.receiver), + "context used instead of localizedContext", + fix() + .alternatives( + fix().replace().with("localizedContext").build(), + ), + ) + } + } + + private fun isCalledInsideOfViewClass(context: JavaContext, node: UCallExpression): Boolean { + return context.evaluator.extendsClass(node.receiver?.getContainingUClass(), "android.view.View") + } +} diff --git a/lint/src/main/java/com/adyen/checkout/lint/LintIssueRegistry.kt b/lint/src/main/java/com/adyen/checkout/lint/LintIssueRegistry.kt index 173e2205cb..664187418c 100644 --- a/lint/src/main/java/com/adyen/checkout/lint/LintIssueRegistry.kt +++ b/lint/src/main/java/com/adyen/checkout/lint/LintIssueRegistry.kt @@ -18,6 +18,7 @@ internal class LintIssueRegistry : IssueRegistry() { override val api: Int = CURRENT_API override val issues: List = listOf( + CONTEXT_GET_STRING_ISSUE, NOT_ADYEN_LOG_ISSUE, OBJECT_IN_PUBLIC_SEALED_CLASS_ISSUE, TEXT_IN_LAYOUT_XML_ISSUE, diff --git a/lint/src/test/java/com/adyen/checkout/lint/ContextGetStringTest.kt b/lint/src/test/java/com/adyen/checkout/lint/ContextGetStringTest.kt new file mode 100644 index 0000000000..7acd134a90 --- /dev/null +++ b/lint/src/test/java/com/adyen/checkout/lint/ContextGetStringTest.kt @@ -0,0 +1,96 @@ +package com.adyen.checkout.lint + +import com.android.tools.lint.checks.infrastructure.LintDetectorTest.kotlin +import com.android.tools.lint.checks.infrastructure.TestLintTask.lint +import org.junit.Test + +class ContextGetStringTest { + + @Test + fun whenContextGetStringIsUsedInViewClass_thenIssueIsDetected() { + lint() + .files( + CONTEXT_STUB, + VIEW_STUB, + kotlin( + """ + package test + + import android.content.Context + import android.view.View + + class MyView : View() { + fun initialize(context: Context) { + context.getString(0) + } + } + """.trimIndent(), + ), + // Check if deep inheritance works as well + kotlin( + """ + package test + + import android.content.Context + import android.view.LinearLayout + + class MyLayout : LinearLayout() { + fun initialize(context: Context) { + context.getString(1) + } + } + """.trimIndent(), + ), + ) + .issues(CONTEXT_GET_STRING_ISSUE) + .allowMissingSdk() + .run() + .expect( + """ + src/test/MyLayout.kt:8: Error: context used instead of localizedContext [ContextGetString] + context.getString(1) + ~~~~~~~ + src/test/MyView.kt:8: Error: context used instead of localizedContext [ContextGetString] + context.getString(0) + ~~~~~~~ + 2 errors, 0 warnings + """.trimIndent(), + ) + .expectFixDiffs( + """ + Fix for src/test/MyLayout.kt line 8: Replace with localizedContext: + @@ -8 +8 + - context.getString(1) + + localizedContext.getString(1) + Fix for src/test/MyView.kt line 8: Replace with localizedContext: + @@ -8 +8 + - context.getString(0) + + localizedContext.getString(0) + """.trimIndent(), + ) + } + + companion object { + + private val CONTEXT_STUB = kotlin( + """ + package android.content + + class Context { + + fun getString(resId: Int): String = "stub" + } + """.trimIndent(), + ) + + private val VIEW_STUB = kotlin( + """ + package android.view + + open class View + open class ViewGroup : View() + open class LinearLayout : ViewGroup() + """, + ) + } +} From 86d990953a429cbf2f4ca145d7126b14ed890a00 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Wed, 29 May 2024 15:41:27 +0200 Subject: [PATCH 109/299] Add configData field to info events COAND-916 --- .../core/internal/data/model/JsonUtils.kt | 21 +++++++++++++++++++ .../core/internal/analytics/AnalyticsEvent.kt | 1 + .../core/internal/analytics/GenericEvents.kt | 2 ++ .../remote/AnalyticsTrackRequestProvider.kt | 1 + .../internal/data/model/AnalyticsTrackInfo.kt | 5 +++++ 5 files changed, 30 insertions(+) diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/internal/data/model/JsonUtils.kt b/checkout-core/src/main/java/com/adyen/checkout/core/internal/data/model/JsonUtils.kt index 5647b82796..f131b2eda4 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/internal/data/model/JsonUtils.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/internal/data/model/JsonUtils.kt @@ -89,6 +89,27 @@ inline fun JSONObject.jsonToMap( return map } +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +fun JSONObject.getMapOrNull(key: String): Map? { + return if (has(key)) getJSONObject(key).toMap() else null +} + +private fun JSONObject.toMap(): Map { + val map = mutableMapOf() + + val iterator = keys() + while(iterator.hasNext()) { + val key = iterator.next() + val value = this[key] + + if (value is String) { + map[key] = value + } + } + + return map +} + @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) object JsonUtils { diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/AnalyticsEvent.kt b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/AnalyticsEvent.kt index 76cd8a775a..680768d24d 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/AnalyticsEvent.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/AnalyticsEvent.kt @@ -32,6 +32,7 @@ sealed interface AnalyticsEvent { val issuer: String? = null, val validationErrorCode: String? = null, val validationErrorMessage: String? = null, + val configData: Map? = null, ) : AnalyticsEvent { enum class Type(val value: String) { DISPLAYED("displayed"), diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/GenericEvents.kt b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/GenericEvents.kt index 3bb610e21f..202163e236 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/GenericEvents.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/GenericEvents.kt @@ -20,11 +20,13 @@ object GenericEvents { component: String, isStoredPaymentMethod: Boolean? = null, brand: String? = null, + configData: Map? = null, ) = AnalyticsEvent.Info( component = component, type = AnalyticsEvent.Info.Type.RENDERED, isStoredPaymentMethod = isStoredPaymentMethod, brand = brand, + configData = configData, ) fun displayed( diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/data/remote/AnalyticsTrackRequestProvider.kt b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/data/remote/AnalyticsTrackRequestProvider.kt index c87cb24e2b..00a98f47e3 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/data/remote/AnalyticsTrackRequestProvider.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/data/remote/AnalyticsTrackRequestProvider.kt @@ -39,6 +39,7 @@ internal class AnalyticsTrackRequestProvider { issuer = issuer, validationErrorCode = validationErrorCode, validationErrorMessage = validationErrorMessage, + configData = configData, ) private fun AnalyticsEvent.Log.mapToTrackEvent() = AnalyticsTrackLog( diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/internal/data/model/AnalyticsTrackInfo.kt b/components-core/src/main/java/com/adyen/checkout/components/core/internal/data/model/AnalyticsTrackInfo.kt index b3a83a534a..fd9fb7d2d5 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/internal/data/model/AnalyticsTrackInfo.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/internal/data/model/AnalyticsTrackInfo.kt @@ -12,6 +12,7 @@ import com.adyen.checkout.core.exception.ModelSerializationException import com.adyen.checkout.core.internal.data.model.ModelObject import com.adyen.checkout.core.internal.data.model.getBooleanOrNull import com.adyen.checkout.core.internal.data.model.getLongOrNull +import com.adyen.checkout.core.internal.data.model.getMapOrNull import com.adyen.checkout.core.internal.data.model.getStringOrNull import kotlinx.parcelize.Parcelize import org.json.JSONException @@ -29,6 +30,7 @@ internal data class AnalyticsTrackInfo( val issuer: String?, val validationErrorCode: String?, val validationErrorMessage: String?, + val configData: Map?, ) : ModelObject() { companion object { @@ -42,6 +44,7 @@ internal data class AnalyticsTrackInfo( private const val ISSUER = "issuer" private const val VALIDATION_ERROR_CODE = "validationErrorCode" private const val VALIDATION_ERROR_MESSAGE = "validationErrorMessage" + private const val CONFIG_DATA = "configData" @JvmField val SERIALIZER: Serializer = object : Serializer { @@ -58,6 +61,7 @@ internal data class AnalyticsTrackInfo( putOpt(ISSUER, modelObject.issuer) putOpt(VALIDATION_ERROR_CODE, modelObject.validationErrorCode) putOpt(VALIDATION_ERROR_MESSAGE, modelObject.validationErrorMessage) + putOpt(CONFIG_DATA, modelObject.configData?.let { JSONObject(it) }) } } catch (e: JSONException) { throw ModelSerializationException(AnalyticsTrackInfo::class.java, e) @@ -78,6 +82,7 @@ internal data class AnalyticsTrackInfo( issuer = getStringOrNull(ISSUER), validationErrorCode = getStringOrNull(VALIDATION_ERROR_CODE), validationErrorMessage = getStringOrNull(VALIDATION_ERROR_MESSAGE), + configData = getMapOrNull(CONFIG_DATA), ) } } catch (e: JSONException) { From a6c45cb2f280143355a3513622b7d6ccc4fe06d5 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Tue, 6 Aug 2024 14:26:31 +0200 Subject: [PATCH 110/299] Create CardConfigDataGenerator COAND-967 --- .../internal/ui/CardConfigDataGenerator.kt | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 card/src/main/java/com/adyen/checkout/card/internal/ui/CardConfigDataGenerator.kt diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/CardConfigDataGenerator.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/CardConfigDataGenerator.kt new file mode 100644 index 0000000000..48ef383c0c --- /dev/null +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/CardConfigDataGenerator.kt @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by oscars on 6/8/2024. + */ + +package com.adyen.checkout.card.internal.ui + +import androidx.annotation.RestrictTo +import com.adyen.checkout.card.KCPAuthVisibility +import com.adyen.checkout.card.SocialSecurityNumberVisibility +import com.adyen.checkout.card.internal.ui.model.CVCVisibility +import com.adyen.checkout.card.internal.ui.model.CardComponentParams +import com.adyen.checkout.card.internal.ui.model.StoredCVCVisibility +import com.adyen.checkout.ui.core.internal.ui.model.AddressParams + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +class CardConfigDataGenerator { + + fun generate( + configuration: CardComponentParams, + isStored: Boolean, + ): Map { + return mapOf( + // TODO Check if we need to send null or empty list + "billingAddressAllowedCountries" to ((configuration.addressParams as? AddressParams.FullAddress) + ?.supportedCountryCodes?.joinToString(",") ?: ""), + "billingAddressMode" to getBillingAddressMode(configuration.addressParams), + "billingAddressRequired" to (configuration.addressParams !is AddressParams.None).toString(), + "brands" to configuration.supportedCardBrands.joinToString(",") { it.txVariant }, + "enableStoreDetails" to configuration.isStorePaymentFieldVisible.toString(), + "hasHolderName" to configuration.isHolderNameRequired.toString(), + "hasInstallmentOptions" to (configuration.installmentParams != null).toString(), + "hideCVC" to getHideCVC(configuration, isStored), + "holderNameRequired" to configuration.isHolderNameRequired.toString(), + "showInstallmentAmounts" to (configuration.installmentParams?.showInstallmentAmount ?: false).toString(), + "showKCPType" to getShowKCPType(configuration.kcpAuthVisibility), + "showPayButton" to configuration.isSubmitButtonVisible.toString(), + "socialSecurityNumberMode" to getSocialSecurityNumberMode(configuration.socialSecurityNumberVisibility), + ) + } + + private fun getBillingAddressMode(addressParams: AddressParams): String { + return when (addressParams) { + is AddressParams.FullAddress -> "full" + is AddressParams.Lookup -> "lookup" + AddressParams.None -> "none" + is AddressParams.PostalCode -> "partial" + } + } + + private fun getHideCVC(configuration: CardComponentParams, isStored: Boolean): String { + return if (isStored) { + when (configuration.storedCVCVisibility) { + StoredCVCVisibility.SHOW -> "show" + StoredCVCVisibility.HIDE -> "hide" + } + } else { + when (configuration.cvcVisibility) { + CVCVisibility.ALWAYS_SHOW -> "show" + CVCVisibility.ALWAYS_HIDE -> "hide" + CVCVisibility.HIDE_FIRST -> "auto" + } + } + } + + private fun getShowKCPType(kcpAuthVisibility: KCPAuthVisibility): String { + return when (kcpAuthVisibility) { + KCPAuthVisibility.SHOW -> "show" + KCPAuthVisibility.HIDE -> "hide" + } + } + + private fun getSocialSecurityNumberMode(socialSecurityNumberVisibility: SocialSecurityNumberVisibility): String { + return when (socialSecurityNumberVisibility) { + SocialSecurityNumberVisibility.SHOW -> "show" + SocialSecurityNumberVisibility.HIDE -> "hide" + } + } +} From 4ee3855ae2da15b583b4d8abee2518164b781798 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Wed, 7 Aug 2024 17:26:20 +0200 Subject: [PATCH 111/299] Use CardConfigDataGenerator in card delegates COAND-967 --- .../internal/provider/BcmcComponentProvider.kt | 3 +++ .../internal/provider/CardComponentProvider.kt | 5 +++++ .../card/internal/ui/DefaultCardDelegate.kt | 8 ++++++-- .../card/internal/ui/StoredCardDelegate.kt | 2 ++ .../card/internal/ui/DefaultCardDelegateTest.kt | 10 +++++++++- .../card/internal/ui/StoredCardDelegateTest.kt | 15 +++++++++++++-- 6 files changed, 38 insertions(+), 5 deletions(-) diff --git a/bcmc/src/main/java/com/adyen/checkout/bcmc/internal/provider/BcmcComponentProvider.kt b/bcmc/src/main/java/com/adyen/checkout/bcmc/internal/provider/BcmcComponentProvider.kt index 3834bf4b89..972fa7ba9a 100644 --- a/bcmc/src/main/java/com/adyen/checkout/bcmc/internal/provider/BcmcComponentProvider.kt +++ b/bcmc/src/main/java/com/adyen/checkout/bcmc/internal/provider/BcmcComponentProvider.kt @@ -23,6 +23,7 @@ import com.adyen.checkout.bcmc.internal.ui.model.BcmcComponentParamsMapper import com.adyen.checkout.bcmc.toCheckoutConfiguration import com.adyen.checkout.card.internal.data.api.BinLookupService import com.adyen.checkout.card.internal.data.api.DefaultDetectCardTypeRepository +import com.adyen.checkout.card.internal.ui.CardConfigDataGenerator import com.adyen.checkout.card.internal.ui.CardValidationMapper import com.adyen.checkout.card.internal.ui.DefaultCardDelegate import com.adyen.checkout.components.core.CheckoutConfiguration @@ -138,6 +139,7 @@ constructor( addressRepository = addressRepository, shopperLocale = componentParams.shopperLocale, ), + cardConfigDataGenerator = CardConfigDataGenerator(), ) val genericActionDelegate = @@ -243,6 +245,7 @@ constructor( addressRepository = addressRepository, shopperLocale = componentParams.shopperLocale, ), + cardConfigDataGenerator = CardConfigDataGenerator(), ) val genericActionDelegate = diff --git a/card/src/main/java/com/adyen/checkout/card/internal/provider/CardComponentProvider.kt b/card/src/main/java/com/adyen/checkout/card/internal/provider/CardComponentProvider.kt index fce090c372..76adc9bb9e 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/provider/CardComponentProvider.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/provider/CardComponentProvider.kt @@ -20,6 +20,7 @@ import com.adyen.checkout.card.CardComponentState import com.adyen.checkout.card.CardConfiguration import com.adyen.checkout.card.internal.data.api.BinLookupService import com.adyen.checkout.card.internal.data.api.DefaultDetectCardTypeRepository +import com.adyen.checkout.card.internal.ui.CardConfigDataGenerator import com.adyen.checkout.card.internal.ui.CardValidationMapper import com.adyen.checkout.card.internal.ui.DefaultCardDelegate import com.adyen.checkout.card.internal.ui.StoredCardDelegate @@ -158,6 +159,7 @@ constructor( addressRepository = DefaultAddressRepository(AddressService(httpClient)), shopperLocale = componentParams.shopperLocale, ), + cardConfigDataGenerator = CardConfigDataGenerator(), ) val genericActionDelegate = @@ -268,6 +270,7 @@ constructor( addressRepository = DefaultAddressRepository(AddressService(httpClient)), shopperLocale = componentParams.shopperLocale, ), + cardConfigDataGenerator = CardConfigDataGenerator(), ) val genericActionDelegate = @@ -381,6 +384,7 @@ constructor( cardEncryptor = cardEncryptor, publicKeyRepository = publicKeyRepository, submitHandler = SubmitHandler(savedStateHandle), + cardConfigDataGenerator = CardConfigDataGenerator(), ) val genericActionDelegate = @@ -477,6 +481,7 @@ constructor( cardEncryptor = cardEncryptor, publicKeyRepository = publicKeyRepository, submitHandler = SubmitHandler(savedStateHandle), + cardConfigDataGenerator = CardConfigDataGenerator(), ) val genericActionDelegate = diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt index 9197e66969..441bd017a8 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt @@ -105,7 +105,8 @@ class DefaultCardDelegate( private val cardEncryptor: BaseCardEncryptor, private val genericEncryptor: BaseGenericEncryptor, private val submitHandler: SubmitHandler, - private val addressLookupDelegate: AddressLookupDelegate + private val addressLookupDelegate: AddressLookupDelegate, + private val cardConfigDataGenerator: CardConfigDataGenerator, ) : CardDelegate, AddressLookupDelegate by addressLookupDelegate { private val inputData: CardInputData = CardInputData() @@ -176,7 +177,10 @@ class DefaultCardDelegate( adyenLog(AdyenLogLevel.VERBOSE) { "initializeAnalytics" } analyticsManager.initialize(this, coroutineScope) - val event = GenericEvents.rendered(paymentMethod.type.orEmpty()) + val event = GenericEvents.rendered( + component = paymentMethod.type.orEmpty(), + configData = cardConfigDataGenerator.generate(configuration = componentParams, isStored = false), + ) analyticsManager.trackEvent(event) } diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt index 1955f79e36..a977dd9d92 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt @@ -77,6 +77,7 @@ internal class StoredCardDelegate( private val cardEncryptor: BaseCardEncryptor, private val publicKeyRepository: PublicKeyRepository, private val submitHandler: SubmitHandler, + private val cardConfigDataGenerator: CardConfigDataGenerator, ) : CardDelegate { private val noCvcBrands: Set = hashSetOf(CardBrand(cardType = CardType.BCMC)) @@ -159,6 +160,7 @@ internal class StoredCardDelegate( val event = GenericEvents.rendered( component = storedPaymentMethod.type.orEmpty(), isStoredPaymentMethod = true, + configData = cardConfigDataGenerator.generate(configuration = componentParams, isStored = true) ) analyticsManager.trackEvent(event) } diff --git a/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt index 2fc9d89ad4..a062943fd9 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt @@ -92,6 +92,8 @@ import org.junit.jupiter.params.provider.Arguments.arguments import org.junit.jupiter.params.provider.MethodSource import org.mockito.Mock import org.mockito.junit.jupiter.MockitoExtension +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn import org.mockito.kotlin.verify import org.mockito.kotlin.whenever import java.util.Locale @@ -101,6 +103,7 @@ import java.util.Locale internal class DefaultCardDelegateTest( @Mock private val submitHandler: SubmitHandler, @Mock private val addressLookupDelegate: AddressLookupDelegate, + @Mock private val cardConfigDataGenerator: CardConfigDataGenerator, ) { private lateinit var cardEncryptor: TestCardEncryptor @@ -121,6 +124,7 @@ internal class DefaultCardDelegateTest( analyticsManager = TestAnalyticsManager() whenever(addressLookupDelegate.addressLookupSubmitFlow).thenReturn(MutableStateFlow(AddressInputModel())) + whenever(cardConfigDataGenerator.generate(any(), any())) doReturn emptyMap() delegate = createCardDelegate() } @@ -1047,7 +1051,10 @@ internal class DefaultCardDelegateTest( fun `when delegate is initialized, then render event is tracked`() { delegate.initialize(CoroutineScope(UnconfinedTestDispatcher())) - val expectedEvent = GenericEvents.rendered(PaymentMethodTypes.SCHEME) + val expectedEvent = GenericEvents.rendered( + component = PaymentMethodTypes.SCHEME, + configData = emptyMap(), + ) analyticsManager.assertLastEventEquals(expectedEvent) } @@ -1266,6 +1273,7 @@ internal class DefaultCardDelegateTest( analyticsManager = analyticsManager, submitHandler = submitHandler, addressLookupDelegate = addressLookupDelegate, + cardConfigDataGenerator = cardConfigDataGenerator, ) } diff --git a/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt index fdb3b4ecd4..2f1a93809e 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt @@ -72,13 +72,17 @@ import org.junit.jupiter.params.provider.Arguments.arguments import org.junit.jupiter.params.provider.MethodSource import org.mockito.Mock import org.mockito.junit.jupiter.MockitoExtension +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import java.util.Locale @OptIn(ExperimentalCoroutinesApi::class) @ExtendWith(MockitoExtension::class, TestDispatcherExtension::class) internal class StoredCardDelegateTest( - @Mock private val submitHandler: SubmitHandler + @Mock private val submitHandler: SubmitHandler, + @Mock private val cardConfigDataGenerator: CardConfigDataGenerator, ) { private lateinit var cardEncryptor: TestCardEncryptor @@ -92,6 +96,8 @@ internal class StoredCardDelegateTest( publicKeyRepository = TestPublicKeyRepository() analyticsManager = TestAnalyticsManager() delegate = createCardDelegate() + + whenever(cardConfigDataGenerator.generate(any(), any())) doReturn emptyMap() } @Test @@ -435,7 +441,11 @@ internal class StoredCardDelegateTest( fun `when delegate is initialized, then render event is tracked`() { delegate.initialize(CoroutineScope(UnconfinedTestDispatcher())) - val expectedEvent = GenericEvents.rendered(PaymentMethodTypes.SCHEME, isStoredPaymentMethod = true) + val expectedEvent = GenericEvents.rendered( + component = PaymentMethodTypes.SCHEME, + isStoredPaymentMethod = true, + configData = emptyMap(), + ) analyticsManager.assertLastEventEquals(expectedEvent) } @@ -500,6 +510,7 @@ internal class StoredCardDelegateTest( analyticsManager = analyticsManager, submitHandler = submitHandler, order = order, + cardConfigDataGenerator = cardConfigDataGenerator, ) } From 9104c29776f4f5ad172f0585b665f10cbc6e92ef Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Mon, 19 Aug 2024 13:52:31 +0200 Subject: [PATCH 112/299] Don't use default values for optional fields It's better to not send in fields when they are not configured. COAND-967 --- .../internal/ui/CardConfigDataGenerator.kt | 40 +++++++++++-------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/CardConfigDataGenerator.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/CardConfigDataGenerator.kt index 48ef383c0c..4cb3a439d1 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/CardConfigDataGenerator.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/CardConfigDataGenerator.kt @@ -23,23 +23,29 @@ class CardConfigDataGenerator { configuration: CardComponentParams, isStored: Boolean, ): Map { - return mapOf( - // TODO Check if we need to send null or empty list - "billingAddressAllowedCountries" to ((configuration.addressParams as? AddressParams.FullAddress) - ?.supportedCountryCodes?.joinToString(",") ?: ""), - "billingAddressMode" to getBillingAddressMode(configuration.addressParams), - "billingAddressRequired" to (configuration.addressParams !is AddressParams.None).toString(), - "brands" to configuration.supportedCardBrands.joinToString(",") { it.txVariant }, - "enableStoreDetails" to configuration.isStorePaymentFieldVisible.toString(), - "hasHolderName" to configuration.isHolderNameRequired.toString(), - "hasInstallmentOptions" to (configuration.installmentParams != null).toString(), - "hideCVC" to getHideCVC(configuration, isStored), - "holderNameRequired" to configuration.isHolderNameRequired.toString(), - "showInstallmentAmounts" to (configuration.installmentParams?.showInstallmentAmount ?: false).toString(), - "showKCPType" to getShowKCPType(configuration.kcpAuthVisibility), - "showPayButton" to configuration.isSubmitButtonVisible.toString(), - "socialSecurityNumberMode" to getSocialSecurityNumberMode(configuration.socialSecurityNumberVisibility), - ) + return buildMap { + if (configuration.addressParams is AddressParams.FullAddress) { + val countryList = configuration.addressParams.supportedCountryCodes.joinToString(",") + put("billingAddressAllowedCountries", countryList) + } + + put("billingAddressMode", getBillingAddressMode(configuration.addressParams)) + put("billingAddressRequired", (configuration.addressParams !is AddressParams.None).toString()) + put("brands", configuration.supportedCardBrands.joinToString(",") { it.txVariant }) + put("enableStoreDetails", configuration.isStorePaymentFieldVisible.toString()) + put("hasHolderName", configuration.isHolderNameRequired.toString()) + put("hasInstallmentOptions", (configuration.installmentParams != null).toString()) + put("hideCVC", getHideCVC(configuration, isStored)) + put("holderNameRequired", configuration.isHolderNameRequired.toString()) + + if (configuration.installmentParams != null) { + put("showInstallmentAmounts", configuration.installmentParams.showInstallmentAmount.toString()) + } + + put("showKCPType", getShowKCPType(configuration.kcpAuthVisibility)) + put("showPayButton", configuration.isSubmitButtonVisible.toString()) + put("socialSecurityNumberMode", getSocialSecurityNumberMode(configuration.socialSecurityNumberVisibility)) + } } private fun getBillingAddressMode(addressParams: AddressParams): String { From 715b25ad249bac8dbbcb5e42d20bba9f73f102a7 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Mon, 19 Aug 2024 16:05:41 +0200 Subject: [PATCH 113/299] Add unit tests for CardConfigDataGenerator COAND-967 --- .../ui/CardConfigDataGeneratorTest.kt | 266 ++++++++++++++++++ .../core/internal/data/model/JsonUtils.kt | 4 +- .../AnalyticsTrackRequestProviderTest.kt | 2 + .../data/model/AnalyticsTrackInfoTest.kt | 12 + .../data/model/AnalyticsTrackRequestTest.kt | 2 + 5 files changed, 285 insertions(+), 1 deletion(-) create mode 100644 card/src/test/java/com/adyen/checkout/card/internal/ui/CardConfigDataGeneratorTest.kt diff --git a/card/src/test/java/com/adyen/checkout/card/internal/ui/CardConfigDataGeneratorTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/ui/CardConfigDataGeneratorTest.kt new file mode 100644 index 0000000000..86cb7de384 --- /dev/null +++ b/card/src/test/java/com/adyen/checkout/card/internal/ui/CardConfigDataGeneratorTest.kt @@ -0,0 +1,266 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by oscars on 19/8/2024. + */ + +package com.adyen.checkout.card.internal.ui + +import com.adyen.checkout.card.CardBrand +import com.adyen.checkout.card.KCPAuthVisibility +import com.adyen.checkout.card.SocialSecurityNumberVisibility +import com.adyen.checkout.card.internal.ui.model.AddressFieldPolicyParams +import com.adyen.checkout.card.internal.ui.model.CVCVisibility +import com.adyen.checkout.card.internal.ui.model.CardComponentParams +import com.adyen.checkout.card.internal.ui.model.InstallmentParams +import com.adyen.checkout.card.internal.ui.model.StoredCVCVisibility +import com.adyen.checkout.components.core.internal.ui.model.AnalyticsParams +import com.adyen.checkout.components.core.internal.ui.model.AnalyticsParamsLevel +import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParams +import com.adyen.checkout.core.Environment +import com.adyen.checkout.ui.core.internal.ui.model.AddressParams +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.params.ParameterizedTest +import org.junit.jupiter.params.provider.Arguments.arguments +import org.junit.jupiter.params.provider.MethodSource +import java.util.Locale + +internal class CardConfigDataGeneratorTest { + + private lateinit var cardConfigDataGenerator: CardConfigDataGenerator + + @BeforeEach + fun beforeEach() { + cardConfigDataGenerator = CardConfigDataGenerator() + } + + @ParameterizedTest + @MethodSource("testSource") + fun `when mapping, then expect`( + configuration: CardComponentParams, + isStored: Boolean, + expected: Map + ) { + val result = cardConfigDataGenerator.generate(configuration, isStored) + + assertEquals(expected, result) + } + + companion object { + + @JvmStatic + fun testSource() = listOf( + arguments( + createCardComponentParams( + isSubmitButtonVisible = true, + isHolderNameRequired = true, + supportedCardBrands = listOf(CardBrand("mc"), CardBrand("visa")), + isStorePaymentFieldVisible = true, + socialSecurityNumberVisibility = SocialSecurityNumberVisibility.SHOW, + kcpAuthVisibility = KCPAuthVisibility.SHOW, + installmentParams = InstallmentParams(shopperLocale = Locale.US, showInstallmentAmount = true), + addressParams = AddressParams.FullAddress( + supportedCountryCodes = listOf("US", "CA"), + addressFieldPolicy = AddressFieldPolicyParams.Required, + ), + cvcVisibility = CVCVisibility.ALWAYS_SHOW, + storedCVCVisibility = StoredCVCVisibility.HIDE, + ), + false, + mapOf( + "billingAddressAllowedCountries" to "US,CA", + "billingAddressMode" to "full", + "billingAddressRequired" to "true", + "brands" to "mc,visa", + "enableStoreDetails" to "true", + "hasHolderName" to "true", + "hasInstallmentOptions" to "true", + "hideCVC" to "show", + "holderNameRequired" to "true", + "showInstallmentAmounts" to "true", + "showKCPType" to "show", + "showPayButton" to "true", + "socialSecurityNumberMode" to "show", + ), + ), + arguments( + createCardComponentParams( + isSubmitButtonVisible = false, + isHolderNameRequired = false, + supportedCardBrands = emptyList(), + isStorePaymentFieldVisible = false, + socialSecurityNumberVisibility = SocialSecurityNumberVisibility.HIDE, + kcpAuthVisibility = KCPAuthVisibility.HIDE, + installmentParams = InstallmentParams(shopperLocale = Locale.US, showInstallmentAmount = false), + addressParams = AddressParams.PostalCode(addressFieldPolicy = AddressFieldPolicyParams.Required), + cvcVisibility = CVCVisibility.HIDE_FIRST, + storedCVCVisibility = StoredCVCVisibility.SHOW, + ), + false, + mapOf( + "billingAddressMode" to "partial", + "billingAddressRequired" to "true", + "brands" to "", + "enableStoreDetails" to "false", + "hasHolderName" to "false", + "hasInstallmentOptions" to "true", + "hideCVC" to "auto", + "holderNameRequired" to "false", + "showInstallmentAmounts" to "false", + "showKCPType" to "hide", + "showPayButton" to "false", + "socialSecurityNumberMode" to "hide", + ), + ), + arguments( + createCardComponentParams( + isSubmitButtonVisible = false, + isHolderNameRequired = false, + supportedCardBrands = emptyList(), + isStorePaymentFieldVisible = false, + socialSecurityNumberVisibility = SocialSecurityNumberVisibility.HIDE, + kcpAuthVisibility = KCPAuthVisibility.HIDE, + installmentParams = null, + addressParams = AddressParams.Lookup(), + cvcVisibility = CVCVisibility.ALWAYS_HIDE, + storedCVCVisibility = StoredCVCVisibility.SHOW, + ), + false, + mapOf( + "billingAddressMode" to "lookup", + "billingAddressRequired" to "true", + "brands" to "", + "enableStoreDetails" to "false", + "hasHolderName" to "false", + "hasInstallmentOptions" to "false", + "hideCVC" to "hide", + "holderNameRequired" to "false", + "showKCPType" to "hide", + "showPayButton" to "false", + "socialSecurityNumberMode" to "hide", + ), + ), + arguments( + createCardComponentParams( + isSubmitButtonVisible = false, + isHolderNameRequired = false, + supportedCardBrands = emptyList(), + isStorePaymentFieldVisible = false, + socialSecurityNumberVisibility = SocialSecurityNumberVisibility.HIDE, + kcpAuthVisibility = KCPAuthVisibility.HIDE, + installmentParams = null, + addressParams = AddressParams.None, + cvcVisibility = CVCVisibility.ALWAYS_HIDE, + storedCVCVisibility = StoredCVCVisibility.SHOW, + ), + false, + mapOf( + "billingAddressMode" to "none", + "billingAddressRequired" to "false", + "brands" to "", + "enableStoreDetails" to "false", + "hasHolderName" to "false", + "hasInstallmentOptions" to "false", + "hideCVC" to "hide", + "holderNameRequired" to "false", + "showKCPType" to "hide", + "showPayButton" to "false", + "socialSecurityNumberMode" to "hide", + ), + ), + arguments( + createCardComponentParams( + isSubmitButtonVisible = false, + isHolderNameRequired = false, + supportedCardBrands = emptyList(), + isStorePaymentFieldVisible = false, + socialSecurityNumberVisibility = SocialSecurityNumberVisibility.HIDE, + kcpAuthVisibility = KCPAuthVisibility.HIDE, + installmentParams = null, + addressParams = AddressParams.None, + cvcVisibility = CVCVisibility.ALWAYS_HIDE, + storedCVCVisibility = StoredCVCVisibility.SHOW, + ), + true, + mapOf( + "billingAddressMode" to "none", + "billingAddressRequired" to "false", + "brands" to "", + "enableStoreDetails" to "false", + "hasHolderName" to "false", + "hasInstallmentOptions" to "false", + "hideCVC" to "show", + "holderNameRequired" to "false", + "showKCPType" to "hide", + "showPayButton" to "false", + "socialSecurityNumberMode" to "hide", + ), + ), + arguments( + createCardComponentParams( + isSubmitButtonVisible = false, + isHolderNameRequired = false, + supportedCardBrands = emptyList(), + isStorePaymentFieldVisible = false, + socialSecurityNumberVisibility = SocialSecurityNumberVisibility.HIDE, + kcpAuthVisibility = KCPAuthVisibility.HIDE, + installmentParams = null, + addressParams = AddressParams.None, + cvcVisibility = CVCVisibility.ALWAYS_SHOW, + storedCVCVisibility = StoredCVCVisibility.HIDE, + ), + true, + mapOf( + "billingAddressMode" to "none", + "billingAddressRequired" to "false", + "brands" to "", + "enableStoreDetails" to "false", + "hasHolderName" to "false", + "hasInstallmentOptions" to "false", + "hideCVC" to "hide", + "holderNameRequired" to "false", + "showKCPType" to "hide", + "showPayButton" to "false", + "socialSecurityNumberMode" to "hide", + ), + ), + ) + + @Suppress("LongParameterList") + private fun createCardComponentParams( + isSubmitButtonVisible: Boolean, + isHolderNameRequired: Boolean, + supportedCardBrands: List, + isStorePaymentFieldVisible: Boolean, + socialSecurityNumberVisibility: SocialSecurityNumberVisibility, + kcpAuthVisibility: KCPAuthVisibility, + installmentParams: InstallmentParams?, + addressParams: AddressParams, + cvcVisibility: CVCVisibility, + storedCVCVisibility: StoredCVCVisibility, + ) = CardComponentParams( + commonComponentParams = CommonComponentParams( + shopperLocale = Locale.US, + environment = Environment.TEST, + clientKey = "clientKey", + analyticsParams = AnalyticsParams(AnalyticsParamsLevel.ALL, ""), + isCreatedByDropIn = false, + amount = null, + ), + isSubmitButtonVisible = isSubmitButtonVisible, + isHolderNameRequired = isHolderNameRequired, + supportedCardBrands = supportedCardBrands, + shopperReference = "shopperReference", + isStorePaymentFieldVisible = isStorePaymentFieldVisible, + socialSecurityNumberVisibility = socialSecurityNumberVisibility, + kcpAuthVisibility = kcpAuthVisibility, + installmentParams = installmentParams, + addressParams = addressParams, + cvcVisibility = cvcVisibility, + storedCVCVisibility = storedCVCVisibility, + ) + } +} diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/internal/data/model/JsonUtils.kt b/checkout-core/src/main/java/com/adyen/checkout/core/internal/data/model/JsonUtils.kt index f131b2eda4..1c3f67530d 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/internal/data/model/JsonUtils.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/internal/data/model/JsonUtils.kt @@ -5,6 +5,8 @@ * * Created by caiof on 17/12/2020. */ +@file:Suppress("TooManyFunctions") + package com.adyen.checkout.core.internal.data.model import androidx.annotation.RestrictTo @@ -98,7 +100,7 @@ private fun JSONObject.toMap(): Map { val map = mutableMapOf() val iterator = keys() - while(iterator.hasNext()) { + while (iterator.hasNext()) { val key = iterator.next() val value = this[key] diff --git a/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/data/remote/AnalyticsTrackRequestProviderTest.kt b/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/data/remote/AnalyticsTrackRequestProviderTest.kt index cf8acdff31..a16e48b1e0 100644 --- a/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/data/remote/AnalyticsTrackRequestProviderTest.kt +++ b/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/data/remote/AnalyticsTrackRequestProviderTest.kt @@ -33,6 +33,7 @@ internal class AnalyticsTrackRequestProviderTest { issuer = "issuer", validationErrorCode = "418", validationErrorMessage = "I'm a teapot", + configData = mapOf("test" to "yes"), ), ) val logList = listOf( @@ -64,6 +65,7 @@ internal class AnalyticsTrackRequestProviderTest { issuer = "issuer", validationErrorCode = "418", validationErrorMessage = "I'm a teapot", + configData = mapOf("test" to "yes"), ), ), logs = listOf( diff --git a/components-core/src/test/java/com/adyen/checkout/components/core/internal/data/model/AnalyticsTrackInfoTest.kt b/components-core/src/test/java/com/adyen/checkout/components/core/internal/data/model/AnalyticsTrackInfoTest.kt index dbf8d1336d..9f5fa36c66 100644 --- a/components-core/src/test/java/com/adyen/checkout/components/core/internal/data/model/AnalyticsTrackInfoTest.kt +++ b/components-core/src/test/java/com/adyen/checkout/components/core/internal/data/model/AnalyticsTrackInfoTest.kt @@ -21,6 +21,7 @@ internal class AnalyticsTrackInfoTest { issuer = "ing", validationErrorCode = "418", validationErrorMessage = "I'm a teapot", + mapOf("test" to "something"), ) val actual = AnalyticsTrackInfo.SERIALIZER.serialize(request) @@ -36,6 +37,11 @@ internal class AnalyticsTrackInfoTest { .put("issuer", "ing") .put("validationErrorCode", "418") .put("validationErrorMessage", "I'm a teapot") + .put( + "configData", + JSONObject() + .put("test", "something"), + ) assertEquals(expected.toString(), actual.toString()) } @@ -53,6 +59,11 @@ internal class AnalyticsTrackInfoTest { .put("issuer", "ing") .put("validationErrorCode", "418") .put("validationErrorMessage", "I'm a teapot") + .put( + "configData", + JSONObject() + .put("test", "something"), + ) val actual = AnalyticsTrackInfo.SERIALIZER.deserialize(response) @@ -67,6 +78,7 @@ internal class AnalyticsTrackInfoTest { issuer = "ing", validationErrorCode = "418", validationErrorMessage = "I'm a teapot", + mapOf("test" to "something"), ) assertEquals(expected, actual) diff --git a/components-core/src/test/java/com/adyen/checkout/components/core/internal/data/model/AnalyticsTrackRequestTest.kt b/components-core/src/test/java/com/adyen/checkout/components/core/internal/data/model/AnalyticsTrackRequestTest.kt index b67c29f61a..412916ac55 100644 --- a/components-core/src/test/java/com/adyen/checkout/components/core/internal/data/model/AnalyticsTrackRequestTest.kt +++ b/components-core/src/test/java/com/adyen/checkout/components/core/internal/data/model/AnalyticsTrackRequestTest.kt @@ -21,6 +21,7 @@ internal class AnalyticsTrackRequestTest { issuer = null, validationErrorCode = null, validationErrorMessage = null, + configData = null, ), ) val logs = listOf( @@ -67,6 +68,7 @@ internal class AnalyticsTrackRequestTest { issuer = null, validationErrorCode = null, validationErrorMessage = null, + configData = null, ), ) val logs = listOf( From 89a0be88bbb1c6240bb79da9eed598475e690665 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Tue, 20 Aug 2024 11:41:39 +0200 Subject: [PATCH 114/299] Dump public api specs The new additions are not actually public, but the plugin doesn't understand that parent classes with @RestrictTo are actually internal. COAND-967 --- components-core/api/components-core.api | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/components-core/api/components-core.api b/components-core/api/components-core.api index 83d75ee9f1..fc2a97b36d 100644 --- a/components-core/api/components-core.api +++ b/components-core/api/components-core.api @@ -1654,11 +1654,12 @@ public abstract interface class com/adyen/checkout/components/core/internal/Paym } public final class com/adyen/checkout/components/core/internal/analytics/AnalyticsEvent$Info : com/adyen/checkout/components/core/internal/analytics/AnalyticsEvent { - public fun (Ljava/lang/String;JZLjava/lang/String;Lcom/adyen/checkout/components/core/internal/analytics/AnalyticsEvent$Info$Type;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V - public synthetic fun (Ljava/lang/String;JZLjava/lang/String;Lcom/adyen/checkout/components/core/internal/analytics/AnalyticsEvent$Info$Type;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Ljava/lang/String;JZLjava/lang/String;Lcom/adyen/checkout/components/core/internal/analytics/AnalyticsEvent$Info$Type;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V + public synthetic fun (Ljava/lang/String;JZLjava/lang/String;Lcom/adyen/checkout/components/core/internal/analytics/AnalyticsEvent$Info$Type;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ljava/lang/String; public final fun component10 ()Ljava/lang/String; public final fun component11 ()Ljava/lang/String; + public final fun component12 ()Ljava/util/Map; public final fun component2 ()J public final fun component3 ()Z public final fun component4 ()Ljava/lang/String; @@ -1667,11 +1668,12 @@ public final class com/adyen/checkout/components/core/internal/analytics/Analyti public final fun component7 ()Ljava/lang/Boolean; public final fun component8 ()Ljava/lang/String; public final fun component9 ()Ljava/lang/String; - public final fun copy (Ljava/lang/String;JZLjava/lang/String;Lcom/adyen/checkout/components/core/internal/analytics/AnalyticsEvent$Info$Type;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/analytics/AnalyticsEvent$Info; - public static synthetic fun copy$default (Lcom/adyen/checkout/components/core/internal/analytics/AnalyticsEvent$Info;Ljava/lang/String;JZLjava/lang/String;Lcom/adyen/checkout/components/core/internal/analytics/AnalyticsEvent$Info$Type;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/adyen/checkout/components/core/internal/analytics/AnalyticsEvent$Info; + public final fun copy (Ljava/lang/String;JZLjava/lang/String;Lcom/adyen/checkout/components/core/internal/analytics/AnalyticsEvent$Info$Type;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)Lcom/adyen/checkout/components/core/internal/analytics/AnalyticsEvent$Info; + public static synthetic fun copy$default (Lcom/adyen/checkout/components/core/internal/analytics/AnalyticsEvent$Info;Ljava/lang/String;JZLjava/lang/String;Lcom/adyen/checkout/components/core/internal/analytics/AnalyticsEvent$Info$Type;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lcom/adyen/checkout/components/core/internal/analytics/AnalyticsEvent$Info; public fun equals (Ljava/lang/Object;)Z public final fun getBrand ()Ljava/lang/String; public fun getComponent ()Ljava/lang/String; + public final fun getConfigData ()Ljava/util/Map; public fun getId ()Ljava/lang/String; public final fun getIssuer ()Ljava/lang/String; public fun getShouldForceSend ()Z From 100482bf5aef0f5356e97ad45acc85817f80a851 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Wed, 21 Aug 2024 17:00:33 +0200 Subject: [PATCH 115/299] Track rendered event on drop-in COAND-967 --- .../internal/ui/DropInConfigDataGenerator.kt | 22 ++++++++++++ .../dropin/internal/ui/DropInViewModel.kt | 10 ++++++ .../internal/ui/DropInViewModelFactory.kt | 3 ++ .../dropin/internal/ui/DropInViewModelTest.kt | 35 ++++++++++++++++++- 4 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInConfigDataGenerator.kt diff --git a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInConfigDataGenerator.kt b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInConfigDataGenerator.kt new file mode 100644 index 0000000000..3050cc52d1 --- /dev/null +++ b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInConfigDataGenerator.kt @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by oscars on 21/8/2024. + */ + +package com.adyen.checkout.dropin.internal.ui + +import com.adyen.checkout.dropin.internal.ui.model.DropInParams + +internal class DropInConfigDataGenerator { + + fun generate(configuration: DropInParams): Map { + return mapOf( + "skipPaymentMethodList" to configuration.skipListWhenSinglePaymentMethod.toString(), + "openFirstStoredPaymentMethod" to configuration.showPreselectedStoredPaymentMethod.toString(), + "isRemovingStoredPaymentMethodsEnabled" to configuration.isRemovingStoredPaymentMethodsEnabled.toString(), + ) + } +} diff --git a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInViewModel.kt b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInViewModel.kt index 6bf6aa7711..245e476b32 100644 --- a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInViewModel.kt +++ b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInViewModel.kt @@ -25,6 +25,7 @@ import com.adyen.checkout.components.core.PaymentMethodTypes import com.adyen.checkout.components.core.PaymentMethodsApiResponse import com.adyen.checkout.components.core.StoredPaymentMethod import com.adyen.checkout.components.core.internal.analytics.AnalyticsManager +import com.adyen.checkout.components.core.internal.analytics.GenericEvents import com.adyen.checkout.components.core.internal.data.api.OrderStatusRepository import com.adyen.checkout.components.core.internal.ui.model.DropInOverrideParams import com.adyen.checkout.components.core.internal.util.bufferedChannel @@ -58,6 +59,7 @@ internal class DropInViewModel( private val orderStatusRepository: OrderStatusRepository, internal val analyticsManager: AnalyticsManager, private val initialDropInParams: DropInParams, + private val dropInConfigDataGenerator: DropInConfigDataGenerator, private val coroutineDispatcher: CoroutineDispatcher = Dispatchers.IO, ) : ViewModel() { @@ -233,6 +235,12 @@ internal class DropInViewModel( private fun initializeAnalytics() { adyenLog(AdyenLogLevel.VERBOSE) { "initializeAnalytics" } analyticsManager.initialize(this, viewModelScope) + + val event = GenericEvents.rendered( + component = ANALYTICS_COMPONENT, + configData = dropInConfigDataGenerator.generate(configuration = dropInParams), + ) + analyticsManager.trackEvent(event) } /** @@ -475,6 +483,8 @@ internal class DropInViewModel( companion object { + private const val ANALYTICS_COMPONENT = "dropin" + // These payment methods are either action only or have no UI. private val SKIP_TO_SINGLE_PM_BLOCK_LIST = listOf( PaymentMethodTypes.DUIT_NOW, diff --git a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInViewModelFactory.kt b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInViewModelFactory.kt index 752f575ac2..014b6026fc 100644 --- a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInViewModelFactory.kt +++ b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInViewModelFactory.kt @@ -62,12 +62,15 @@ internal class DropInViewModelFactory( sessionId = bundleHandler.sessionDetails?.id, ) + val dropInConfigDataGenerator = DropInConfigDataGenerator() + @Suppress("UNCHECKED_CAST") return DropInViewModel( bundleHandler, orderStatusRepository, analyticsManager, dropInParams, + dropInConfigDataGenerator, ) as T } diff --git a/drop-in/src/test/java/com/adyen/checkout/dropin/internal/ui/DropInViewModelTest.kt b/drop-in/src/test/java/com/adyen/checkout/dropin/internal/ui/DropInViewModelTest.kt index fd3744e3b8..16f17e24d3 100644 --- a/drop-in/src/test/java/com/adyen/checkout/dropin/internal/ui/DropInViewModelTest.kt +++ b/drop-in/src/test/java/com/adyen/checkout/dropin/internal/ui/DropInViewModelTest.kt @@ -5,6 +5,7 @@ import com.adyen.checkout.components.core.PaymentMethod import com.adyen.checkout.components.core.PaymentMethodTypes import com.adyen.checkout.components.core.PaymentMethodsApiResponse import com.adyen.checkout.components.core.StoredPaymentMethod +import com.adyen.checkout.components.core.internal.analytics.GenericEvents import com.adyen.checkout.components.core.internal.analytics.TestAnalyticsManager import com.adyen.checkout.components.core.internal.data.api.OrderStatusRepository import com.adyen.checkout.components.core.internal.ui.model.AnalyticsParams @@ -14,6 +15,8 @@ import com.adyen.checkout.dropin.internal.ui.model.DropInParams import com.adyen.checkout.test.LoggingExtension import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Nested +import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments.arguments @@ -29,14 +32,17 @@ import java.util.Locale internal class DropInViewModelTest( @Mock private val bundleHandler: DropInSavedStateHandleContainer, @Mock private val orderStatusRepository: OrderStatusRepository, + @Mock private val dropInConfigDataGenerator: DropInConfigDataGenerator, ) { + private lateinit var analyticsManager: TestAnalyticsManager private lateinit var viewModel: DropInViewModel @BeforeEach fun beforeEach() { whenever(bundleHandler.checkoutConfiguration) doReturn mock() whenever(bundleHandler.serviceComponentName) doReturn mock() + analyticsManager = TestAnalyticsManager() } @ParameterizedTest @@ -68,13 +74,40 @@ internal class DropInViewModelTest( assertEquals(expected, result) } + @Nested + inner class AnalyticsTest { + + @Test + fun `when drop-in is created, then analytics is initialized`() { + viewModel = createDropInViewModel() + + viewModel.onCreated(false) + + analyticsManager.assertIsInitialized() + } + + @Test + fun `when drop-in is created, then render event is tracked`() { + viewModel = createDropInViewModel() + + viewModel.onCreated(false) + + val expected = GenericEvents.rendered( + component = "dropin", + configData = emptyMap(), + ) + analyticsManager.assertLastEventEquals(expected) + } + } + private fun createDropInViewModel( dropInParams: DropInParams = createDropInParams(), ) = DropInViewModel( bundleHandler = bundleHandler, orderStatusRepository = orderStatusRepository, - analyticsManager = TestAnalyticsManager(), + analyticsManager = analyticsManager, initialDropInParams = dropInParams, + dropInConfigDataGenerator = dropInConfigDataGenerator, ) private fun createDropInParams( From 2822f8651d6d069b8b6ea5e07fa79e84cc6effc7 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Fri, 23 Aug 2024 10:08:49 +0200 Subject: [PATCH 116/299] Add unit test for DropInConfigDataGenerator COAND-967 --- .../ui/DropInConfigDataGeneratorTest.kt | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 drop-in/src/test/java/com/adyen/checkout/dropin/internal/ui/DropInConfigDataGeneratorTest.kt diff --git a/drop-in/src/test/java/com/adyen/checkout/dropin/internal/ui/DropInConfigDataGeneratorTest.kt b/drop-in/src/test/java/com/adyen/checkout/dropin/internal/ui/DropInConfigDataGeneratorTest.kt new file mode 100644 index 0000000000..befe36f88e --- /dev/null +++ b/drop-in/src/test/java/com/adyen/checkout/dropin/internal/ui/DropInConfigDataGeneratorTest.kt @@ -0,0 +1,45 @@ +package com.adyen.checkout.dropin.internal.ui + +import com.adyen.checkout.components.core.internal.ui.model.AnalyticsParams +import com.adyen.checkout.components.core.internal.ui.model.AnalyticsParamsLevel +import com.adyen.checkout.core.Environment +import com.adyen.checkout.dropin.internal.ui.model.DropInParams +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import java.util.Locale + +internal class DropInConfigDataGeneratorTest { + + private lateinit var dropInConfigDataGenerator: DropInConfigDataGenerator + + @BeforeEach + fun beforeEach() { + dropInConfigDataGenerator = DropInConfigDataGenerator() + } + + @Test + fun `when generating config data, then fields are correctly mapped`() { + val result = dropInConfigDataGenerator.generate(createDropInParams()) + + val expected = mapOf( + "skipPaymentMethodList" to "false", + "openFirstStoredPaymentMethod" to "true", + "isRemovingStoredPaymentMethodsEnabled" to "true", + ) + assertEquals(expected, result) + } + + private fun createDropInParams() = DropInParams( + shopperLocale = Locale.US, + environment = Environment.TEST, + clientKey = "clientKey", + analyticsParams = AnalyticsParams(AnalyticsParamsLevel.ALL, "clientKey"), + amount = null, + showPreselectedStoredPaymentMethod = true, + skipListWhenSinglePaymentMethod = false, + isRemovingStoredPaymentMethodsEnabled = true, + additionalDataForDropInService = null, + overriddenPaymentMethodInformation = emptyMap(), + ) +} From 6a6f583c87260c647c62b386c695351a5c187353 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Wed, 21 Aug 2024 17:13:03 +0200 Subject: [PATCH 117/299] Add multibanco to supported list COAND-972 --- .../com/adyen/checkout/components/core/PaymentMethodTypes.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt index 80cafc037c..09688a37b6 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt @@ -121,6 +121,7 @@ object PaymentMethodTypes { MOLPAY_MALAYSIA, MOLPAY_THAILAND, MOLPAY_VIETNAM, + MULTIBANCO, ONLINE_BANKING_CZ, ONLINE_BANKING_PL, ONLINE_BANKING_SK, @@ -133,8 +134,8 @@ object PaymentMethodTypes { SEPA, TWINT, UPI, - UPI_INTENT, UPI_COLLECT, + UPI_INTENT, UPI_QR, WECHAT_PAY_SDK, ) From 3da4c63187076b397778f6ce7917672970fa73a3 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Wed, 21 Aug 2024 17:17:56 +0200 Subject: [PATCH 118/299] Add pay by bank to SKIP_TO_SINGLE_PM_BLOCK_LIST COAND-972 --- .../com/adyen/checkout/dropin/internal/ui/DropInViewModel.kt | 1 + .../adyen/checkout/dropin/internal/ui/DropInViewModelTest.kt | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInViewModel.kt b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInViewModel.kt index 245e476b32..a6e513d1f2 100644 --- a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInViewModel.kt +++ b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInViewModel.kt @@ -492,6 +492,7 @@ internal class DropInViewModel( PaymentMethodTypes.GOOGLE_PAY_LEGACY, PaymentMethodTypes.IDEAL, PaymentMethodTypes.MULTIBANCO, + PaymentMethodTypes.PAY_BY_BANK, PaymentMethodTypes.PAY_NOW, PaymentMethodTypes.PIX, PaymentMethodTypes.PROMPT_PAY, diff --git a/drop-in/src/test/java/com/adyen/checkout/dropin/internal/ui/DropInViewModelTest.kt b/drop-in/src/test/java/com/adyen/checkout/dropin/internal/ui/DropInViewModelTest.kt index 16f17e24d3..c7f82d2f3f 100644 --- a/drop-in/src/test/java/com/adyen/checkout/dropin/internal/ui/DropInViewModelTest.kt +++ b/drop-in/src/test/java/com/adyen/checkout/dropin/internal/ui/DropInViewModelTest.kt @@ -299,6 +299,11 @@ internal class DropInViewModelTest( createPayPaymentMethodsApiResponse(listOf(PaymentMethodTypes.MULTIBANCO)), false, ), + arguments( + true, + createPayPaymentMethodsApiResponse(listOf(PaymentMethodTypes.PAY_BY_BANK)), + false, + ), arguments( true, createPayPaymentMethodsApiResponse(listOf(PaymentMethodTypes.PAY_NOW)), From d8632ba33692c250fd5705b92a473beb81346c8d Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Wed, 21 Aug 2024 17:19:07 +0200 Subject: [PATCH 119/299] Add iDeal to supported instant payment methods COAND-972 --- .../internal/provider/InstantPaymentComponentProvider.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instant/src/main/java/com/adyen/checkout/instant/internal/provider/InstantPaymentComponentProvider.kt b/instant/src/main/java/com/adyen/checkout/instant/internal/provider/InstantPaymentComponentProvider.kt index 8fd990b0ee..d36a06de23 100644 --- a/instant/src/main/java/com/adyen/checkout/instant/internal/provider/InstantPaymentComponentProvider.kt +++ b/instant/src/main/java/com/adyen/checkout/instant/internal/provider/InstantPaymentComponentProvider.kt @@ -279,12 +279,13 @@ constructor( @VisibleForTesting internal val EXPLICITLY_SUPPORTED_PAYMENT_METHOD_TYPES = listOf( PaymentMethodTypes.DUIT_NOW, + PaymentMethodTypes.IDEAL, + PaymentMethodTypes.MULTIBANCO, PaymentMethodTypes.PAY_NOW, PaymentMethodTypes.PIX, PaymentMethodTypes.PROMPT_PAY, PaymentMethodTypes.TWINT, PaymentMethodTypes.WECHAT_PAY_SDK, - PaymentMethodTypes.MULTIBANCO, ) } } From c6610b3acca59ed87efee7ef9e3b6959dbcbf261 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Thu, 22 Aug 2024 13:54:51 +0200 Subject: [PATCH 120/299] Revert "Add iDeal to supported instant payment methods" This reverts commit ff69cb5bf84b450cfbe432f8b5bc4fc04efffdcf. Since iDeal uses IdealPaymentMethod it can't be used with InstantPaymentComponent (uses GenericPaymentMethod). COAND-972 --- .../internal/provider/InstantPaymentComponentProvider.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/instant/src/main/java/com/adyen/checkout/instant/internal/provider/InstantPaymentComponentProvider.kt b/instant/src/main/java/com/adyen/checkout/instant/internal/provider/InstantPaymentComponentProvider.kt index d36a06de23..8fd990b0ee 100644 --- a/instant/src/main/java/com/adyen/checkout/instant/internal/provider/InstantPaymentComponentProvider.kt +++ b/instant/src/main/java/com/adyen/checkout/instant/internal/provider/InstantPaymentComponentProvider.kt @@ -279,13 +279,12 @@ constructor( @VisibleForTesting internal val EXPLICITLY_SUPPORTED_PAYMENT_METHOD_TYPES = listOf( PaymentMethodTypes.DUIT_NOW, - PaymentMethodTypes.IDEAL, - PaymentMethodTypes.MULTIBANCO, PaymentMethodTypes.PAY_NOW, PaymentMethodTypes.PIX, PaymentMethodTypes.PROMPT_PAY, PaymentMethodTypes.TWINT, PaymentMethodTypes.WECHAT_PAY_SDK, + PaymentMethodTypes.MULTIBANCO, ) } } From 27fc1d48eca33a1aef47b9adf6b170e30f7d8de1 Mon Sep 17 00:00:00 2001 From: josephj Date: Wed, 28 Aug 2024 14:32:43 +0200 Subject: [PATCH 121/299] Fix labels in templates Labels are case sensitive COAND-842 --- .github/ISSUE_TEMPLATE/ask_question.md | 2 +- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/ask_question.md b/.github/ISSUE_TEMPLATE/ask_question.md index c3e16d1eae..ed004b63bc 100644 --- a/.github/ISSUE_TEMPLATE/ask_question.md +++ b/.github/ISSUE_TEMPLATE/ask_question.md @@ -2,7 +2,7 @@ name: Ask a question about: Use this template to ask general questions about our SDK. title: '' -labels: 'question' +labels: 'Question' assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 882c52c82f..a86854e594 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -2,7 +2,7 @@ name: Bug report about: Use this template to report any issues or bugs you encounter while using our SDK. title: '' -labels: 'bug report' +labels: 'Bug report' assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index b5bbdb6ad2..c83170f8a5 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -2,7 +2,7 @@ name: Feature request about: Use this template to submit a feature request for our SDK. title: '' -labels: 'enhancement' +labels: 'Enhancement' assignees: '' --- From a6008123aff1fe5d495f97da162b3a77cb689c00 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 07:44:52 +0000 Subject: [PATCH 122/299] Update dependency com.adyen.threeds:adyen-3ds2 to v2.2.20 --- dependencies.gradle | 2 +- gradle/verification-metadata.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 60e64ecbba..e4fdd7ee13 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -53,7 +53,7 @@ ext { compose_viewmodel_version = '2.8.3' // Adyen Dependencies - adyen3ds2_version = "2.2.19" + adyen3ds2_version = "2.2.20" // External Dependencies cash_app_pay_version = '2.5.0' diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 98704ad4e5..9d8a7f87f4 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -4251,6 +4251,14 @@ + + + + + + + + From 26e33422b04eeb7a1db86458bc41e4a2834efc23 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Tue, 27 Aug 2024 09:50:13 +0200 Subject: [PATCH 123/299] Remove failing 3DS2 tests COAND-973 --- .../ui/DefaultAdyen3DS2DelegateTest.kt | 18 +++++++++++------- .../ui/SharedChallengeStatusHandlerTest.kt | 7 ++++--- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/3ds2/src/test/java/com/adyen/checkout/adyen3ds2/internal/ui/DefaultAdyen3DS2DelegateTest.kt b/3ds2/src/test/java/com/adyen/checkout/adyen3ds2/internal/ui/DefaultAdyen3DS2DelegateTest.kt index e0ddd3380e..28421c3db9 100644 --- a/3ds2/src/test/java/com/adyen/checkout/adyen3ds2/internal/ui/DefaultAdyen3DS2DelegateTest.kt +++ b/3ds2/src/test/java/com/adyen/checkout/adyen3ds2/internal/ui/DefaultAdyen3DS2DelegateTest.kt @@ -203,7 +203,8 @@ internal class DefaultAdyen3DS2DelegateTest( assertEquals(error, exceptionFlow.latestValue.cause) } - @Test + // commenting this out because of failing tests, should be fixed later in collaboration with the 3DS2 team + // @Test fun `3ds2 sdk returns an initialization error, then details are emitted`() = runTest { val transStatus = "X" val additionalDetails = "mockAdditionalDetails" @@ -417,7 +418,8 @@ internal class DefaultAdyen3DS2DelegateTest( @DisplayName("when transaction is") inner class TransactionTest { - @Test + // commenting this out because of failing tests, should be fixed later in collaboration with the 3DS2 team + // @Test fun `completed, then details are emitted`() = runTest { val details = JSONObject("{\"threeds2.challengeResult\":\"eyJ0cmFuc1N0YXR1cyI6InRyYW5zYWN0aW9uU3RhdHVzIn0=\"}") @@ -436,7 +438,8 @@ internal class DefaultAdyen3DS2DelegateTest( assertEquals(expected.details.toString(), detailsFlow.latestValue.details.toString()) } - @Test + // commenting this out because of failing tests, should be fixed later in collaboration with the 3DS2 team + // @Test fun `completed and creating details fails, then an error is emitted`() = runTest { val error = ComponentException("test") // We have to mock the serializer in order to throw an exception @@ -456,8 +459,7 @@ internal class DefaultAdyen3DS2DelegateTest( assertEquals(error, exceptionFlow.latestValue) } - // commenting this out because of failing tests, should be fixed later in collaboration with the 3DS2 team - // @Test + @Test fun `cancelled, then an error is emitted`() = runTest { val exceptionFlow = delegate.exceptionFlow.test(testScheduler) @@ -485,7 +487,8 @@ internal class DefaultAdyen3DS2DelegateTest( assertNotNull(detailsFlow.latestValue.details) } - @Test + // commenting this out because of failing tests, should be fixed later in collaboration with the 3DS2 team + // @Test fun `error, then details are emitted`() = runTest { val detailsFlow = delegate.detailsFlow.test(testScheduler) @@ -652,7 +655,8 @@ internal class DefaultAdyen3DS2DelegateTest( } } - @Test + // commenting this out because of failing tests, should be fixed later in collaboration with the 3DS2 team + // @Test fun `when details are emitted, then state is cleared`() = runTest { val savedStateHandle = SavedStateHandle().apply { set( diff --git a/3ds2/src/test/java/com/adyen/checkout/adyen3ds2/internal/ui/SharedChallengeStatusHandlerTest.kt b/3ds2/src/test/java/com/adyen/checkout/adyen3ds2/internal/ui/SharedChallengeStatusHandlerTest.kt index 73c6d5e0d2..d3b91dd168 100644 --- a/3ds2/src/test/java/com/adyen/checkout/adyen3ds2/internal/ui/SharedChallengeStatusHandlerTest.kt +++ b/3ds2/src/test/java/com/adyen/checkout/adyen3ds2/internal/ui/SharedChallengeStatusHandlerTest.kt @@ -3,7 +3,6 @@ package com.adyen.checkout.adyen3ds2.internal.ui import com.adyen.threeds2.ChallengeResult import com.adyen.threeds2.ChallengeStatusHandler import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Test internal class SharedChallengeStatusHandlerTest { @@ -12,7 +11,8 @@ internal class SharedChallengeStatusHandlerTest { SharedChallengeStatusHandler.reset() } - @Test + // commenting this out because of failing tests, should be fixed later in collaboration with the 3DS2 team + // @Test fun `when onCompletion is triggered, then listener is called`() { val onCompletionListener = TestOnCompletionListener() SharedChallengeStatusHandler.onCompletionListener = onCompletionListener @@ -22,7 +22,8 @@ internal class SharedChallengeStatusHandlerTest { onCompletionListener.assertOnCompletionCalled() } - @Test + // commenting this out because of failing tests, should be fixed later in collaboration with the 3DS2 team + // @Test fun `when onCompletion is triggered and no listener is set, then onCompletion is queued until a listener is set`() { val onCompletionListener = TestOnCompletionListener() SharedChallengeStatusHandler.onCompletion(ChallengeResult.Completed("test")) From 957ae4271e67ac4ba9701ef7ed144b5555c6da31 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Tue, 27 Aug 2024 09:50:20 +0200 Subject: [PATCH 124/299] Add release notes COAND-973 --- RELEASE_NOTES.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 18e1d566db..32eff87a82 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -14,3 +14,9 @@ ## Improved - For UPI Intent an error message will be shown when "Continue" button is pressed without selecting any UPI option. - For drop-in, improved accessibility of back/close button in the navigation bar. + +## Changed +- Dependency versions: + | Name | Version | + |--------------------------------------------------------------------------------------------------------|-------------------------------| + | [Adyen 3DS2](https://github.com/Adyen/adyen-3ds2-android/releases/tag/2.2.20) | **2.2.20** | From f498f608da4461059391b03a7e76d7d5bb3702a0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Sep 2024 12:22:10 +0000 Subject: [PATCH 125/299] Update hilt_version to v2.52 --- dependencies.gradle | 2 +- gradle/verification-metadata.xml | 103 +++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index e4fdd7ee13..ecfd2783c2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -24,7 +24,7 @@ ext { ksp_version = '1.9.24-1.0.20' detekt_gradle_plugin_version = "1.23.6" dokka_version = "1.9.20" - hilt_version = "2.51.1" + hilt_version = "2.52" compose_compiler_version = '1.5.14' // Code quality diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 9d8a7f87f4..4b4a96e0bf 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -7579,6 +7579,14 @@ + + + + + + + + @@ -7603,6 +7611,14 @@ + + + + + + + + @@ -7627,6 +7643,14 @@ + + + + + + + + @@ -7651,6 +7675,14 @@ + + + + + + + + @@ -7675,6 +7707,14 @@ + + + + + + + + @@ -7691,6 +7731,14 @@ + + + + + + + + @@ -7715,6 +7763,14 @@ + + + + + + + + @@ -7731,6 +7787,14 @@ + + + + + + + + @@ -7755,6 +7819,14 @@ + + + + + + + + @@ -7779,6 +7851,14 @@ + + + + + + + + @@ -7794,6 +7874,11 @@ + + + + + @@ -10063,6 +10148,14 @@ + + + + + + + + @@ -10629,6 +10722,11 @@ + + + + + @@ -11249,6 +11347,11 @@ + + + + + From 85cd11215194af2b8161ca03b7d0b54c6e9b2034 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 08:33:14 +0000 Subject: [PATCH 126/299] Update lint_version to v31.5.2 --- dependencies.gradle | 2 +- gradle/verification-metadata.xml | 184 +++++++++++++++++++++++++++++++ 2 files changed, 185 insertions(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index ecfd2783c2..c76c893bd2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -78,7 +78,7 @@ ext { jose4j_version = '0.9.6' junit_jupiter_version = "5.10.3" konsist_version = "0.15.1" - lint_version = "31.5.1" + lint_version = "31.5.2" mockito_kotlin_version = "5.4.0" mockito_version = "5.12.0" robolectric_version = "4.13" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 4b4a96e0bf..658eebe76e 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -4519,6 +4519,14 @@ + + + + + + + + @@ -4567,6 +4575,14 @@ + + + + + + + + @@ -4615,6 +4631,14 @@ + + + + + + + + @@ -4663,6 +4687,14 @@ + + + + + + + + @@ -4711,6 +4743,14 @@ + + + + + + + + @@ -4759,6 +4799,14 @@ + + + + + + + + @@ -4807,6 +4855,14 @@ + + + + + + + + @@ -4903,6 +4959,14 @@ + + + + + + + + @@ -4951,6 +5015,14 @@ + + + + + + + + @@ -4999,6 +5071,14 @@ + + + + + + + + @@ -5113,6 +5193,14 @@ + + + + + + + + @@ -5353,6 +5441,14 @@ + + + + + + + + @@ -5609,6 +5705,14 @@ + + + + + + + + @@ -5681,6 +5785,14 @@ + + + + + + + + @@ -5769,6 +5881,14 @@ + + + + + + + + @@ -5817,6 +5937,14 @@ + + + + + + + + @@ -5865,6 +5993,14 @@ + + + + + + + + @@ -5913,6 +6049,14 @@ + + + + + + + + @@ -5961,6 +6105,14 @@ + + + + + + + + @@ -6009,6 +6161,14 @@ + + + + + + + + @@ -6057,6 +6217,14 @@ + + + + + + + + @@ -6153,6 +6321,14 @@ + + + + + + + + @@ -6161,6 +6337,14 @@ + + + + + + + + From 1f45c61f97ca6907fa8c4af7ca27054d1e9d09c3 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:15:51 +0200 Subject: [PATCH 127/299] Hide other payment methods header when there's no other groups of payment methods available COAND-975 --- .../dropin/internal/ui/PaymentMethodsListViewModel.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/PaymentMethodsListViewModel.kt b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/PaymentMethodsListViewModel.kt index ded22cc20f..d5f6b7f255 100644 --- a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/PaymentMethodsListViewModel.kt +++ b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/PaymentMethodsListViewModel.kt @@ -125,6 +125,7 @@ internal class PaymentMethodsListViewModel( add(PaymentMethodHeader(PaymentMethodHeader.TYPE_GIFT_CARD_HEADER)) addAll(giftCardsList) } + val hasGiftCards = giftCardsList.isNotEmpty() // payment notes order?.remainingAmount?.let { remainingAmount -> val value = CurrencyUtils.formatAmount(remainingAmount, dropInParams.shopperLocale) @@ -145,11 +146,15 @@ internal class PaymentMethodsListViewModel( if (paymentMethodsList.isNotEmpty()) { val headerType = if (hasStoredPaymentMethods) { PaymentMethodHeader.TYPE_REGULAR_HEADER_WITH_STORED - } else { + } else if (hasGiftCards) { PaymentMethodHeader.TYPE_REGULAR_HEADER_WITHOUT_STORED + } else { + null } - add(PaymentMethodHeader(headerType)) + headerType?.let { + add(PaymentMethodHeader(it)) + } addAll(paymentMethodsList) } } From 0c68e98e6e7baa17a264b11bf149021221350646 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:19:46 +0200 Subject: [PATCH 128/299] Change style of headers in payment methods list COAND-975 --- drop-in/src/main/res/values/styles.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drop-in/src/main/res/values/styles.xml b/drop-in/src/main/res/values/styles.xml index 6d2d7fe167..65150a16f0 100644 --- a/drop-in/src/main/res/values/styles.xml +++ b/drop-in/src/main/res/values/styles.xml @@ -51,8 +51,9 @@ @dimen/standard_margin true false - 14sp + 12sp bold + 0.5 + + + + From 37190be1c06e48916fe2190888391bd36571ce15 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Tue, 16 Jul 2024 11:00:24 +0200 Subject: [PATCH 182/299] Add translations COAND-927 --- twint/src/main/res/values-ar/strings.xml | 11 +++++++++++ twint/src/main/res/values-bg-rBG/strings.xml | 11 +++++++++++ twint/src/main/res/values-ca-rES/strings.xml | 11 +++++++++++ twint/src/main/res/values-cs-rCZ/strings.xml | 11 +++++++++++ twint/src/main/res/values-da-rDK/strings.xml | 11 +++++++++++ twint/src/main/res/values-de-rDE/strings.xml | 11 +++++++++++ twint/src/main/res/values-el-rGR/strings.xml | 11 +++++++++++ twint/src/main/res/values-es-rES/strings.xml | 11 +++++++++++ twint/src/main/res/values-et-rEE/strings.xml | 11 +++++++++++ twint/src/main/res/values-fi-rFI/strings.xml | 11 +++++++++++ twint/src/main/res/values-fr-rFR/strings.xml | 11 +++++++++++ twint/src/main/res/values-hr-rHR/strings.xml | 11 +++++++++++ twint/src/main/res/values-hu-rHU/strings.xml | 11 +++++++++++ twint/src/main/res/values-is-rIS/strings.xml | 11 +++++++++++ twint/src/main/res/values-it-rIT/strings.xml | 11 +++++++++++ twint/src/main/res/values-ja-rJP/strings.xml | 11 +++++++++++ twint/src/main/res/values-ko-rKR/strings.xml | 11 +++++++++++ twint/src/main/res/values-lt-rLT/strings.xml | 11 +++++++++++ twint/src/main/res/values-lv-rLV/strings.xml | 11 +++++++++++ twint/src/main/res/values-nb-rNO/strings.xml | 11 +++++++++++ twint/src/main/res/values-nl-rNL/strings.xml | 11 +++++++++++ twint/src/main/res/values-pl-rPL/strings.xml | 11 +++++++++++ twint/src/main/res/values-pt-rBR/strings.xml | 11 +++++++++++ twint/src/main/res/values-pt-rPT/strings.xml | 11 +++++++++++ twint/src/main/res/values-ro-rRO/strings.xml | 11 +++++++++++ twint/src/main/res/values-ru-rRU/strings.xml | 11 +++++++++++ twint/src/main/res/values-sk-rSK/strings.xml | 11 +++++++++++ twint/src/main/res/values-sl-rSI/strings.xml | 11 +++++++++++ twint/src/main/res/values-sv-rSE/strings.xml | 11 +++++++++++ twint/src/main/res/values-zh-rCN/strings.xml | 11 +++++++++++ twint/src/main/res/values-zh-rTW/strings.xml | 11 +++++++++++ twint/src/main/res/values/strings.xml | 4 ++-- 32 files changed, 343 insertions(+), 2 deletions(-) create mode 100644 twint/src/main/res/values-ar/strings.xml create mode 100644 twint/src/main/res/values-bg-rBG/strings.xml create mode 100644 twint/src/main/res/values-ca-rES/strings.xml create mode 100644 twint/src/main/res/values-cs-rCZ/strings.xml create mode 100644 twint/src/main/res/values-da-rDK/strings.xml create mode 100644 twint/src/main/res/values-de-rDE/strings.xml create mode 100644 twint/src/main/res/values-el-rGR/strings.xml create mode 100644 twint/src/main/res/values-es-rES/strings.xml create mode 100644 twint/src/main/res/values-et-rEE/strings.xml create mode 100644 twint/src/main/res/values-fi-rFI/strings.xml create mode 100644 twint/src/main/res/values-fr-rFR/strings.xml create mode 100644 twint/src/main/res/values-hr-rHR/strings.xml create mode 100644 twint/src/main/res/values-hu-rHU/strings.xml create mode 100644 twint/src/main/res/values-is-rIS/strings.xml create mode 100644 twint/src/main/res/values-it-rIT/strings.xml create mode 100644 twint/src/main/res/values-ja-rJP/strings.xml create mode 100644 twint/src/main/res/values-ko-rKR/strings.xml create mode 100644 twint/src/main/res/values-lt-rLT/strings.xml create mode 100644 twint/src/main/res/values-lv-rLV/strings.xml create mode 100644 twint/src/main/res/values-nb-rNO/strings.xml create mode 100644 twint/src/main/res/values-nl-rNL/strings.xml create mode 100644 twint/src/main/res/values-pl-rPL/strings.xml create mode 100644 twint/src/main/res/values-pt-rBR/strings.xml create mode 100644 twint/src/main/res/values-pt-rPT/strings.xml create mode 100644 twint/src/main/res/values-ro-rRO/strings.xml create mode 100644 twint/src/main/res/values-ru-rRU/strings.xml create mode 100644 twint/src/main/res/values-sk-rSK/strings.xml create mode 100644 twint/src/main/res/values-sl-rSI/strings.xml create mode 100644 twint/src/main/res/values-sv-rSE/strings.xml create mode 100644 twint/src/main/res/values-zh-rCN/strings.xml create mode 100644 twint/src/main/res/values-zh-rTW/strings.xml diff --git a/twint/src/main/res/values-ar/strings.xml b/twint/src/main/res/values-ar/strings.xml new file mode 100644 index 0000000000..3c676a010f --- /dev/null +++ b/twint/src/main/res/values-ar/strings.xml @@ -0,0 +1,11 @@ + + + + حفظ لمدفوعاتي القادمة + \ No newline at end of file diff --git a/twint/src/main/res/values-bg-rBG/strings.xml b/twint/src/main/res/values-bg-rBG/strings.xml new file mode 100644 index 0000000000..b33c81e03f --- /dev/null +++ b/twint/src/main/res/values-bg-rBG/strings.xml @@ -0,0 +1,11 @@ + + + + Запазване за следващото ми плащане + \ No newline at end of file diff --git a/twint/src/main/res/values-ca-rES/strings.xml b/twint/src/main/res/values-ca-rES/strings.xml new file mode 100644 index 0000000000..2eb0bf4599 --- /dev/null +++ b/twint/src/main/res/values-ca-rES/strings.xml @@ -0,0 +1,11 @@ + + + + Desa\'l per al meu proper pagament + \ No newline at end of file diff --git a/twint/src/main/res/values-cs-rCZ/strings.xml b/twint/src/main/res/values-cs-rCZ/strings.xml new file mode 100644 index 0000000000..ea36c1927e --- /dev/null +++ b/twint/src/main/res/values-cs-rCZ/strings.xml @@ -0,0 +1,11 @@ + + + + Uložit pro příští platby + \ No newline at end of file diff --git a/twint/src/main/res/values-da-rDK/strings.xml b/twint/src/main/res/values-da-rDK/strings.xml new file mode 100644 index 0000000000..83eaefc275 --- /dev/null +++ b/twint/src/main/res/values-da-rDK/strings.xml @@ -0,0 +1,11 @@ + + + + Gem til min næste betaling + \ No newline at end of file diff --git a/twint/src/main/res/values-de-rDE/strings.xml b/twint/src/main/res/values-de-rDE/strings.xml new file mode 100644 index 0000000000..d957332637 --- /dev/null +++ b/twint/src/main/res/values-de-rDE/strings.xml @@ -0,0 +1,11 @@ + + + + Für zukünftige Zahlvorgänge speichern + \ No newline at end of file diff --git a/twint/src/main/res/values-el-rGR/strings.xml b/twint/src/main/res/values-el-rGR/strings.xml new file mode 100644 index 0000000000..f2b61e492a --- /dev/null +++ b/twint/src/main/res/values-el-rGR/strings.xml @@ -0,0 +1,11 @@ + + + + Αποθήκευση για την επόμενη πληρωμή μου + \ No newline at end of file diff --git a/twint/src/main/res/values-es-rES/strings.xml b/twint/src/main/res/values-es-rES/strings.xml new file mode 100644 index 0000000000..480120a6c0 --- /dev/null +++ b/twint/src/main/res/values-es-rES/strings.xml @@ -0,0 +1,11 @@ + + + + Recordar para mi próximo pago + \ No newline at end of file diff --git a/twint/src/main/res/values-et-rEE/strings.xml b/twint/src/main/res/values-et-rEE/strings.xml new file mode 100644 index 0000000000..219eb4ee28 --- /dev/null +++ b/twint/src/main/res/values-et-rEE/strings.xml @@ -0,0 +1,11 @@ + + + + Salvesta mu järgmise makse jaoks + \ No newline at end of file diff --git a/twint/src/main/res/values-fi-rFI/strings.xml b/twint/src/main/res/values-fi-rFI/strings.xml new file mode 100644 index 0000000000..beb439e1af --- /dev/null +++ b/twint/src/main/res/values-fi-rFI/strings.xml @@ -0,0 +1,11 @@ + + + + Tallenna seuraavaa maksuani varten + \ No newline at end of file diff --git a/twint/src/main/res/values-fr-rFR/strings.xml b/twint/src/main/res/values-fr-rFR/strings.xml new file mode 100644 index 0000000000..c636922f89 --- /dev/null +++ b/twint/src/main/res/values-fr-rFR/strings.xml @@ -0,0 +1,11 @@ + + + + Sauvegarder pour mon prochain paiement + \ No newline at end of file diff --git a/twint/src/main/res/values-hr-rHR/strings.xml b/twint/src/main/res/values-hr-rHR/strings.xml new file mode 100644 index 0000000000..e0a3103fc5 --- /dev/null +++ b/twint/src/main/res/values-hr-rHR/strings.xml @@ -0,0 +1,11 @@ + + + + Pohrani za moje sljedeće plaćanje + \ No newline at end of file diff --git a/twint/src/main/res/values-hu-rHU/strings.xml b/twint/src/main/res/values-hu-rHU/strings.xml new file mode 100644 index 0000000000..71aaa91f6e --- /dev/null +++ b/twint/src/main/res/values-hu-rHU/strings.xml @@ -0,0 +1,11 @@ + + + + Mentés a következő fizetéshez + \ No newline at end of file diff --git a/twint/src/main/res/values-is-rIS/strings.xml b/twint/src/main/res/values-is-rIS/strings.xml new file mode 100644 index 0000000000..49a032ebef --- /dev/null +++ b/twint/src/main/res/values-is-rIS/strings.xml @@ -0,0 +1,11 @@ + + + + Spara fyrir næstu greiðslu + \ No newline at end of file diff --git a/twint/src/main/res/values-it-rIT/strings.xml b/twint/src/main/res/values-it-rIT/strings.xml new file mode 100644 index 0000000000..1f450a5576 --- /dev/null +++ b/twint/src/main/res/values-it-rIT/strings.xml @@ -0,0 +1,11 @@ + + + + Salva per il prossimo pagamento + \ No newline at end of file diff --git a/twint/src/main/res/values-ja-rJP/strings.xml b/twint/src/main/res/values-ja-rJP/strings.xml new file mode 100644 index 0000000000..f3d599c38d --- /dev/null +++ b/twint/src/main/res/values-ja-rJP/strings.xml @@ -0,0 +1,11 @@ + + + + 次回のお支払いのため詳細を保存 + \ No newline at end of file diff --git a/twint/src/main/res/values-ko-rKR/strings.xml b/twint/src/main/res/values-ko-rKR/strings.xml new file mode 100644 index 0000000000..ef67d17d60 --- /dev/null +++ b/twint/src/main/res/values-ko-rKR/strings.xml @@ -0,0 +1,11 @@ + + + + 다음 결제를 위해 이 수단 저장 + \ No newline at end of file diff --git a/twint/src/main/res/values-lt-rLT/strings.xml b/twint/src/main/res/values-lt-rLT/strings.xml new file mode 100644 index 0000000000..5584f3d058 --- /dev/null +++ b/twint/src/main/res/values-lt-rLT/strings.xml @@ -0,0 +1,11 @@ + + + + Išsaugoti kitam mokėjimui + \ No newline at end of file diff --git a/twint/src/main/res/values-lv-rLV/strings.xml b/twint/src/main/res/values-lv-rLV/strings.xml new file mode 100644 index 0000000000..02801275ac --- /dev/null +++ b/twint/src/main/res/values-lv-rLV/strings.xml @@ -0,0 +1,11 @@ + + + + Saglabāt manam nākamajam maksājumam + \ No newline at end of file diff --git a/twint/src/main/res/values-nb-rNO/strings.xml b/twint/src/main/res/values-nb-rNO/strings.xml new file mode 100644 index 0000000000..3be320881d --- /dev/null +++ b/twint/src/main/res/values-nb-rNO/strings.xml @@ -0,0 +1,11 @@ + + + + Lagre til min neste betaling + \ No newline at end of file diff --git a/twint/src/main/res/values-nl-rNL/strings.xml b/twint/src/main/res/values-nl-rNL/strings.xml new file mode 100644 index 0000000000..47497632a2 --- /dev/null +++ b/twint/src/main/res/values-nl-rNL/strings.xml @@ -0,0 +1,11 @@ + + + + Bewaar voor mijn volgende betaling + \ No newline at end of file diff --git a/twint/src/main/res/values-pl-rPL/strings.xml b/twint/src/main/res/values-pl-rPL/strings.xml new file mode 100644 index 0000000000..c04ebef994 --- /dev/null +++ b/twint/src/main/res/values-pl-rPL/strings.xml @@ -0,0 +1,11 @@ + + + + Zapisz na potrzeby następnej płatności + \ No newline at end of file diff --git a/twint/src/main/res/values-pt-rBR/strings.xml b/twint/src/main/res/values-pt-rBR/strings.xml new file mode 100644 index 0000000000..ed2bbccfe6 --- /dev/null +++ b/twint/src/main/res/values-pt-rBR/strings.xml @@ -0,0 +1,11 @@ + + + + Salvar para meu próximo pagamento + \ No newline at end of file diff --git a/twint/src/main/res/values-pt-rPT/strings.xml b/twint/src/main/res/values-pt-rPT/strings.xml new file mode 100644 index 0000000000..b61951548e --- /dev/null +++ b/twint/src/main/res/values-pt-rPT/strings.xml @@ -0,0 +1,11 @@ + + + + Guardar para o meu próximo pagamento + \ No newline at end of file diff --git a/twint/src/main/res/values-ro-rRO/strings.xml b/twint/src/main/res/values-ro-rRO/strings.xml new file mode 100644 index 0000000000..612d0dbc24 --- /dev/null +++ b/twint/src/main/res/values-ro-rRO/strings.xml @@ -0,0 +1,11 @@ + + + + Salvează pentru următoarea mea plată + \ No newline at end of file diff --git a/twint/src/main/res/values-ru-rRU/strings.xml b/twint/src/main/res/values-ru-rRU/strings.xml new file mode 100644 index 0000000000..a0d065257e --- /dev/null +++ b/twint/src/main/res/values-ru-rRU/strings.xml @@ -0,0 +1,11 @@ + + + + Сохранить для следующего платежа + \ No newline at end of file diff --git a/twint/src/main/res/values-sk-rSK/strings.xml b/twint/src/main/res/values-sk-rSK/strings.xml new file mode 100644 index 0000000000..99b5522b90 --- /dev/null +++ b/twint/src/main/res/values-sk-rSK/strings.xml @@ -0,0 +1,11 @@ + + + + Uložiť pre moju ďalšiu platbu + \ No newline at end of file diff --git a/twint/src/main/res/values-sl-rSI/strings.xml b/twint/src/main/res/values-sl-rSI/strings.xml new file mode 100644 index 0000000000..36550aca6f --- /dev/null +++ b/twint/src/main/res/values-sl-rSI/strings.xml @@ -0,0 +1,11 @@ + + + + Shrani za moje naslednje plačilo + \ No newline at end of file diff --git a/twint/src/main/res/values-sv-rSE/strings.xml b/twint/src/main/res/values-sv-rSE/strings.xml new file mode 100644 index 0000000000..efbef0ed6c --- /dev/null +++ b/twint/src/main/res/values-sv-rSE/strings.xml @@ -0,0 +1,11 @@ + + + + Spara till min nästa betalning + \ No newline at end of file diff --git a/twint/src/main/res/values-zh-rCN/strings.xml b/twint/src/main/res/values-zh-rCN/strings.xml new file mode 100644 index 0000000000..2dc4996f5d --- /dev/null +++ b/twint/src/main/res/values-zh-rCN/strings.xml @@ -0,0 +1,11 @@ + + + + 保存以便下次支付使用 + \ No newline at end of file diff --git a/twint/src/main/res/values-zh-rTW/strings.xml b/twint/src/main/res/values-zh-rTW/strings.xml new file mode 100644 index 0000000000..a84f33995d --- /dev/null +++ b/twint/src/main/res/values-zh-rTW/strings.xml @@ -0,0 +1,11 @@ + + + + 儲存以供下次付款使用 + \ No newline at end of file diff --git a/twint/src/main/res/values/strings.xml b/twint/src/main/res/values/strings.xml index b2df9ec5ac..e6745cc0fc 100644 --- a/twint/src/main/res/values/strings.xml +++ b/twint/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - - - - - - - - - - + From e0145184e1e55dc981d34512a2e27ef115ae0442 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Tue, 24 Sep 2024 11:15:56 +0200 Subject: [PATCH 207/299] Add documentation for the Twint integration COAND-927 --- docs/payment-methods/TWINT.md | 91 +++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 docs/payment-methods/TWINT.md diff --git a/docs/payment-methods/TWINT.md b/docs/payment-methods/TWINT.md new file mode 100644 index 0000000000..5c6b98e9c0 --- /dev/null +++ b/docs/payment-methods/TWINT.md @@ -0,0 +1,91 @@ +# Twint +On this page, you can find additional configuration for adding Twint to your integration. + +## Drop-in +### Sessions +The integration works out of the box for sessions implementation. Check out the integration guide [here](https://docs.adyen.com/online-payments/build-your-integration/sessions-flow/?platform=Android&integration=Drop-in). + +### Advanced +There is no additional configuration required. Follow the [Advanced flow integration guide](https://docs.adyen.com/online-payments/build-your-integration/advanced-flow/?platform=Android&integration=Drop-in). + +## Components +Use the following module and component names: +- To import the module use `twint`. + +```Groovy +implementation "com.adyen.checkout:twint:YOUR_VERSION" +``` + +- To launch and show the Component use `TwintComponent`. + +```Kotlin +val component = TwintComponent.PROVIDER.get( + activity = activity, // or fragment = fragment + checkoutSession = checkoutSession, // Should be passed only for sessions + paymentMethod = paymentMethod, + configuration = checkoutConfiguration, + componentCallback = callback, +) +``` + +### Sessions +Make sure to follow the Android Components integration guide for sessions integration [here](https://docs.adyen.com/online-payments/build-your-integration/sessions-flow?platform=Android&integration=Components). + +### Advanced +Make sure to follow the Android Components integration guide for advanced integration [here](https://docs.adyen.com/online-payments/build-your-integration/advanced-flow/?platform=Android&integration=Components). + +## Optional configurations + +```Kotlin +CheckoutConfiguration( + environment = environment, + clientKey = clientKey, + .. +) { + twint { + setShowStorePaymentField(true) + setActionHandlingMethod(ActionHandlingMethod.PREFER_NATIVE) + } +} +``` + +`setShowStorePaymentField` allows you to specify if a switch is shown that enables shoppers to store their details for faster future payments. +`setActionHandlingMethod` allows you to specify how the action returned from the `/payments` call will be handled. `ActionHandlingMethod.PREFER_NATIVE` will try to use a native flow and `ActionHandlingMethod.PREFER_WEB` will try to use a web/browser based flow. + +## Stored Twint payments +### Sessions +- Include the [`storedPaymentMethodMode`](https://docs.adyen.com/api-explorer/Checkout/latest/post/sessions#request-storePaymentMethodMode) and [`shopperReference`](https://docs.adyen.com/api-explorer/Checkout/latest/post/sessions#request-storePaymentMethodMode) parameter in your [`/sessions`](https://docs.adyen.com/api-explorer/Checkout/latest/post/sessions) request. +- The API response will contain a list of the shopper's stored payment methods. +- For drop-in, pass the API response as explained in [the integration guide](https://docs.adyen.com/online-payments/build-your-integration/sessions-flow/?platform=Android&integration=Drop-in) and it will show the stored payment methods. +- For components, get the Twint `StoredPaymentMethod` from the list and pass it when creating the `TwintComponent`: +```Kotlin +val storedPaymentMethods = checkoutSession.sessionSetupResponse.paymentMethodsApiResponse?.storedPaymentMethods +val storedPaymentMethod = storedPaymentMethods?.filter { it.type == PaymentMethodTypes.TWINT } + +val component = TwintComponent.PROVIDER.get( + activity = activity, // or fragment = fragment + checkoutSession = checkoutSession, // Should be passed only for sessions + storedPaymentMethod = storedPaymentMethod, + configuration = checkoutConfiguration, + componentCallback = callback, +) +``` + +### Advanced +- When a shopper chooses to pay, they will be provided with the option to store their payment details. To remove the option to store payment details, add `setShowStorePaymentField(false)` when configuring Twint. +- The `PaymentComponentState` will contain the shopper's choice in `data.storePaymentMethod`. +- Include [`storePaymentMethod`](https://docs.adyen.com/api-explorer/Checkout/latest/post/payments#request-storePaymentMethod) and [`shopperReference`](https://docs.adyen.com/api-explorer/Checkout/latest/post/payments#request-shopperReference) in the [`/payments`](https://docs.adyen.com/api-explorer/Checkout/latest/post/payments) request. +- Include the `shopperReference` in the [`/paymentMethods`](https://docs.adyen.com/api-explorer/Checkout/latest/post/paymentMethods) request and the response will contain a list of the shopper's stored payment methods. +- For drop-in, pass the API response as explained in [the integration guide](https://docs.adyen.com/online-payments/build-your-integration/advanced-flow/?platform=Android&integration=Drop-in) and it will show the stored payment methods. +- For components, get the Twint `StoredPaymentMethod` from the list and pass it when creating the `TwintComponent`: +```Kotlin +val storedPaymentMethods = paymentMethodsApiResponse?.storedPaymentMethods +val storedPaymentMethod = storedPaymentMethods?.filter { it.type == PaymentMethodTypes.TWINT } + +val component = TwintComponent.PROVIDER.get( + activity = activity, // or fragment = fragment + storedPaymentMethod = storedPaymentMethod, + configuration = checkoutConfiguration, + componentCallback = callback, +) +``` From 79c4b66dac0dd11bf811efb207046b12b3b12355 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Tue, 24 Sep 2024 11:55:51 +0200 Subject: [PATCH 208/299] Add release notes COAND-927 --- RELEASE_NOTES.md | 5 +++++ docs/payment-methods/TWINT.md | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 694ae27108..0f90773a11 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -11,6 +11,10 @@ ## New - Added support for 6 more locales: Catalan (ca-ES), Icelandic (is-IS), Bulgarian (bg-BG), Estonian (et-EE), Latvian (lv-LV) and Lithuanian (lt-lT). +- For Twint, storing payment details and paying with them is now supported. See the documentation [here](/docs/payment-methods/TWINT.md). + +> [!WARNING] +> For the Twint component integration, you are now required to use `TwintComponent` instead of `InstantPaymentComponent`. See the [documentation](/docs/payment-methods/TWINT.md) to find out the details. ## Improved - For UPI Intent an error message will be shown when "Continue" button is pressed without selecting @@ -30,3 +34,4 @@ | Previous | Now | |------------------------------------------|------------------------------------------| | AdyenCheckout.TextAppearance.HeaderTitle | AdyenCheckout.TextAppearance.HeaderLabel | +- `com.adyen.checkout.instant.ActionHandlingMethod` is moved to `com.adyen.checkout.components.core.ActionHandlingMethod` diff --git a/docs/payment-methods/TWINT.md b/docs/payment-methods/TWINT.md index 5c6b98e9c0..80579e6890 100644 --- a/docs/payment-methods/TWINT.md +++ b/docs/payment-methods/TWINT.md @@ -54,17 +54,17 @@ CheckoutConfiguration( ## Stored Twint payments ### Sessions -- Include the [`storedPaymentMethodMode`](https://docs.adyen.com/api-explorer/Checkout/latest/post/sessions#request-storePaymentMethodMode) and [`shopperReference`](https://docs.adyen.com/api-explorer/Checkout/latest/post/sessions#request-storePaymentMethodMode) parameter in your [`/sessions`](https://docs.adyen.com/api-explorer/Checkout/latest/post/sessions) request. +- Include the [`storedPaymentMethodMode`](https://docs.adyen.com/api-explorer/Checkout/latest/post/sessions#request-storePaymentMethodMode) and [`shopperReference`](https://docs.adyen.com/api-explorer/Checkout/latest/post/sessions#request-shopperReference) parameter in your [`/sessions`](https://docs.adyen.com/api-explorer/Checkout/latest/post/sessions) request. - The API response will contain a list of the shopper's stored payment methods. -- For drop-in, pass the API response as explained in [the integration guide](https://docs.adyen.com/online-payments/build-your-integration/sessions-flow/?platform=Android&integration=Drop-in) and it will show the stored payment methods. +- For drop-in, pass the API response as explained in [the integration guide](https://docs.adyen.com/online-payments/build-your-integration/sessions-flow/?platform=Android&integration=Drop-in#set-up) and it will show the stored payment methods. - For components, get the Twint `StoredPaymentMethod` from the list and pass it when creating the `TwintComponent`: ```Kotlin val storedPaymentMethods = checkoutSession.sessionSetupResponse.paymentMethodsApiResponse?.storedPaymentMethods -val storedPaymentMethod = storedPaymentMethods?.filter { it.type == PaymentMethodTypes.TWINT } +val storedPaymentMethod = storedPaymentMethods?.firstOrNull { TwintComponent.PROVIDER.isPaymentMethodSupported(it) } val component = TwintComponent.PROVIDER.get( activity = activity, // or fragment = fragment - checkoutSession = checkoutSession, // Should be passed only for sessions + checkoutSession = checkoutSession, storedPaymentMethod = storedPaymentMethod, configuration = checkoutConfiguration, componentCallback = callback, @@ -75,12 +75,12 @@ val component = TwintComponent.PROVIDER.get( - When a shopper chooses to pay, they will be provided with the option to store their payment details. To remove the option to store payment details, add `setShowStorePaymentField(false)` when configuring Twint. - The `PaymentComponentState` will contain the shopper's choice in `data.storePaymentMethod`. - Include [`storePaymentMethod`](https://docs.adyen.com/api-explorer/Checkout/latest/post/payments#request-storePaymentMethod) and [`shopperReference`](https://docs.adyen.com/api-explorer/Checkout/latest/post/payments#request-shopperReference) in the [`/payments`](https://docs.adyen.com/api-explorer/Checkout/latest/post/payments) request. -- Include the `shopperReference` in the [`/paymentMethods`](https://docs.adyen.com/api-explorer/Checkout/latest/post/paymentMethods) request and the response will contain a list of the shopper's stored payment methods. -- For drop-in, pass the API response as explained in [the integration guide](https://docs.adyen.com/online-payments/build-your-integration/advanced-flow/?platform=Android&integration=Drop-in) and it will show the stored payment methods. +- Include the [`shopperReference`](https://docs.adyen.com/api-explorer/Checkout/latest/post/paymentMethods#request-shopperReference) in the [`/paymentMethods`](https://docs.adyen.com/api-explorer/Checkout/latest/post/paymentMethods) request and the response will contain a list of the shopper's stored payment methods. +- For drop-in, pass the API response as explained in [the integration guide](https://docs.adyen.com/online-payments/build-your-integration/advanced-flow/?platform=Android&integration=Drop-in#set-up) and it will show the stored payment methods. - For components, get the Twint `StoredPaymentMethod` from the list and pass it when creating the `TwintComponent`: ```Kotlin val storedPaymentMethods = paymentMethodsApiResponse?.storedPaymentMethods -val storedPaymentMethod = storedPaymentMethods?.filter { it.type == PaymentMethodTypes.TWINT } +val storedPaymentMethod = storedPaymentMethods?.firstOrNull { TwintComponent.PROVIDER.isPaymentMethodSupported(it) } val component = TwintComponent.PROVIDER.get( activity = activity, // or fragment = fragment From ebc6519b5535a3fafe6057b648e9a21eb8ab14a4 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Wed, 2 Oct 2024 10:59:34 +0400 Subject: [PATCH 209/299] Always make the initial analytics call COAND-980 --- .../internal/analytics/DefaultAnalyticsManager.kt | 9 --------- .../analytics/DefaultAnalyticsManagerTest.kt | 14 ++++++-------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManager.kt b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManager.kt index 89e0fcb27c..8bf1b33999 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManager.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManager.kt @@ -49,14 +49,8 @@ internal class DefaultAnalyticsManager( isInitialized = true ownerReference = owner::class.qualifiedName - _coroutineScope = coroutineScope - if (cannotSendEvents()) { - checkoutAttemptId = CHECKOUT_ATTEMPT_ID_FOR_DISABLED_ANALYTICS - return - } - coroutineScope.launch(coroutineDispatcher) { runSuspendCatching { analyticsRepository.fetchCheckoutAttemptId() @@ -141,9 +135,6 @@ internal class DefaultAnalyticsManager( } companion object { - @VisibleForTesting - internal const val CHECKOUT_ATTEMPT_ID_FOR_DISABLED_ANALYTICS = "do-not-track" - @VisibleForTesting internal val DISPATCH_INTERVAL_MILLIS = 10.seconds.inWholeMilliseconds } diff --git a/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManagerTest.kt b/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManagerTest.kt index 0401fc5e95..d4e779ea00 100644 --- a/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManagerTest.kt +++ b/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManagerTest.kt @@ -45,20 +45,18 @@ internal class DefaultAnalyticsManagerTest( inner class InitializeTest { @Test - fun `sending events is disabled, then checkoutAttemptId is anonymous`() = runTest { - analyticsManager = createAnalyticsManager(AnalyticsParamsLevel.NONE) + fun `fetching checkoutAttemptId succeeds, then it is set`() = runTest { + whenever(analyticsRepository.fetchCheckoutAttemptId()) doReturn "test value" analyticsManager.initialize(this@InitializeTest, this) - assertEquals( - DefaultAnalyticsManager.CHECKOUT_ATTEMPT_ID_FOR_DISABLED_ANALYTICS, - analyticsManager.getCheckoutAttemptId(), - ) - verify(analyticsRepository, never()).fetchCheckoutAttemptId() + assertEquals("test value", analyticsManager.getCheckoutAttemptId()) + analyticsManager.clear(this@InitializeTest) } @Test - fun `fetching checkoutAttemptId succeeds, then it is set`() = runTest { + fun `sending events is disabled, then checkoutAttemptId is still set`() = runTest { + analyticsManager = createAnalyticsManager(AnalyticsParamsLevel.NONE) whenever(analyticsRepository.fetchCheckoutAttemptId()) doReturn "test value" analyticsManager.initialize(this@InitializeTest, this) From 5feb36a00e3e8560e9851a3679dee55d183a6cd0 Mon Sep 17 00:00:00 2001 From: josephj Date: Wed, 2 Oct 2024 11:42:28 +0200 Subject: [PATCH 210/299] Add action to manage stale issues COAND-995 --- .github/workflows/stale_issues.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/stale_issues.yml diff --git a/.github/workflows/stale_issues.yml b/.github/workflows/stale_issues.yml new file mode 100644 index 0000000000..9820d97618 --- /dev/null +++ b/.github/workflows/stale_issues.yml @@ -0,0 +1,23 @@ +# This workflow warns and then closes issues that have had no activity for a specified amount of time. +# +# You can adjust the behavior by modifying this file. +# For more information, see: +# https://github.com/actions/stale +name: Manage stale issues + +on: + schedule: + - cron: '0 0 * * *' # Run every day at midnight + +jobs: + close_stale_prs: + runs-on: ubuntu-latest + steps: + - name: Close stale issues + uses: actions/stale@v9 + with: + any-of-labels: 'Needs more info' + stale-issue-message: 'This issue is now stale because it has been open for 14 days with no activity. Please provide the requested information or the issue will be closed automatically.' + close-issue-message: 'This issue is now closed because it has been stalled for 14 days with no activity.' + days-before-issue-stale: 14 + days-before-issue-close: 14 From d589abad9bf06452efe701cb1b5df0e50d97762f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 14:23:48 +0000 Subject: [PATCH 211/299] Update JamesIves/github-pages-deploy-action action to v4.6.4 --- .github/workflows/publish_docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_docs.yml b/.github/workflows/publish_docs.yml index 7c8c1e3b47..d30b80b4ed 100644 --- a/.github/workflows/publish_docs.yml +++ b/.github/workflows/publish_docs.yml @@ -38,7 +38,7 @@ jobs: # Deploy to GitHub Pages - name: Deploy GitHub Pages - uses: JamesIves/github-pages-deploy-action@v4.6.3 + uses: JamesIves/github-pages-deploy-action@v4.6.4 with: BRANCH: gh-pages FOLDER: build/docs/ From eba8c0594280b2ab8b62792c4867fbd8ff2ef6a6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 15:04:51 +0000 Subject: [PATCH 212/299] Update detekt_version to v1.23.7 --- dependencies.gradle | 2 +- gradle/verification-metadata.xml | 266 +++++++++++++++++++++++++++++++ 2 files changed, 267 insertions(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 4c8504e94c..2631581ee2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -28,7 +28,7 @@ ext { compose_compiler_version = '1.5.14' // Code quality - detekt_version = "1.23.6" + detekt_version = "1.23.7" jacoco_version = '0.8.12' ktlint_version = '1.3.1' sonarqube_version = '5.0.0.4638' diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index f9f7a88ef5..2e0de0223b 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -9625,6 +9625,11 @@ + + + + + @@ -9649,6 +9654,14 @@ + + + + + + + + @@ -9765,6 +9778,14 @@ + + + + + + + + @@ -9781,6 +9802,14 @@ + + + + + + + + @@ -9797,6 +9826,14 @@ + + + + + + + + @@ -9813,6 +9850,14 @@ + + + + + + + + @@ -9845,6 +9890,14 @@ + + + + + + + + @@ -9861,6 +9914,14 @@ + + + + + + + + @@ -9877,6 +9938,14 @@ + + + + + + + + @@ -9893,6 +9962,14 @@ + + + + + + + + @@ -9909,6 +9986,14 @@ + + + + + + + + @@ -9925,6 +10010,14 @@ + + + + + + + + @@ -9941,6 +10034,14 @@ + + + + + + + + @@ -9957,6 +10058,14 @@ + + + + + + + + @@ -9973,6 +10082,14 @@ + + + + + + + + @@ -9989,6 +10106,14 @@ + + + + + + + + @@ -10005,6 +10130,14 @@ + + + + + + + + @@ -10021,6 +10154,14 @@ + + + + + + + + @@ -10037,6 +10178,14 @@ + + + + + + + + @@ -10053,6 +10202,14 @@ + + + + + + + + @@ -10069,6 +10226,14 @@ + + + + + + + + @@ -10085,6 +10250,14 @@ + + + + + + + + @@ -10101,6 +10274,14 @@ + + + + + + + + @@ -10117,6 +10298,14 @@ + + + + + + + + @@ -10133,6 +10322,14 @@ + + + + + + + + @@ -10149,6 +10346,14 @@ + + + + + + + + @@ -11176,6 +11381,14 @@ + + + + + + + + @@ -11648,6 +11861,14 @@ + + + + + + + + @@ -11728,6 +11949,14 @@ + + + + + + + + @@ -12117,6 +12346,14 @@ + + + + + + + + @@ -12149,6 +12386,14 @@ + + + + + + + + @@ -12342,6 +12587,14 @@ + + + + + + + + @@ -12427,6 +12680,11 @@ + + + + + @@ -14224,6 +14482,14 @@ + + + + + + + + From 114cf45cb679e37cb56d6794152894702088bbb8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 08:07:45 +0000 Subject: [PATCH 213/299] Update plugin io.gitlab.arturbosch.detekt to v1.23.7 --- dependencies.gradle | 2 +- gradle/verification-metadata.xml | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 2631581ee2..c8dbe97ad7 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -22,7 +22,7 @@ ext { android_gradle_plugin_version = '8.5.1' kotlin_version = '1.9.24' ksp_version = '1.9.24-1.0.20' - detekt_gradle_plugin_version = "1.23.6" + detekt_gradle_plugin_version = "1.23.7" dokka_version = "1.9.20" hilt_version = "2.52" compose_compiler_version = '1.5.14' diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 2e0de0223b..0925ad0ca5 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -9874,6 +9874,14 @@ + + + + + + + + @@ -10364,6 +10372,11 @@ + + + + + From 039a7233357165a3821957d0eaca799894681c54 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:10:27 +0000 Subject: [PATCH 214/299] Update dependency com.lemonappdev:konsist to v0.16.1 --- dependencies.gradle | 2 +- gradle/verification-metadata.xml | 61 ++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index c8dbe97ad7..65346b6b81 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -78,7 +78,7 @@ ext { json_version = '20240303' jose4j_version = '0.9.6' junit_jupiter_version = "5.10.3" - konsist_version = "0.15.1" + konsist_version = "0.16.1" lint_version = "31.5.2" mockito_kotlin_version = "5.4.0" mockito_version = "5.12.0" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 0925ad0ca5..c6b04db3d5 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -8599,6 +8599,14 @@ + + + + + + + + @@ -11882,6 +11890,14 @@ + + + + + + + + @@ -11970,6 +11986,14 @@ + + + + + + + + @@ -12407,6 +12431,14 @@ + + + + + + + + @@ -12608,6 +12640,14 @@ + + + + + + + + @@ -12698,6 +12738,11 @@ + + + + + @@ -12783,6 +12828,14 @@ + + + + + + + + @@ -12878,6 +12931,14 @@ + + + + + + + + From 7ad2fd6eca9a6b27d360c7ebc2b1f1857d196721 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:35:33 +0000 Subject: [PATCH 215/299] Update junit5 monorepo to v5.11.1 --- dependencies.gradle | 2 +- gradle/verification-metadata.xml | 56 ++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 65346b6b81..774384d7dd 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -77,7 +77,7 @@ ext { espresso_version = "3.6.1" json_version = '20240303' jose4j_version = '0.9.6' - junit_jupiter_version = "5.10.3" + junit_jupiter_version = "5.11.1" konsist_version = "0.16.1" lint_version = "31.5.2" mockito_kotlin_version = "5.4.0" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index c6b04db3d5..b51c646b79 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -13552,6 +13552,14 @@ + + + + + + + + @@ -13592,6 +13600,14 @@ + + + + + + + + @@ -13616,6 +13632,14 @@ + + + + + + + + @@ -13640,6 +13664,14 @@ + + + + + + + + @@ -13664,6 +13696,14 @@ + + + + + + + + @@ -13688,6 +13728,14 @@ + + + + + + + + @@ -13712,6 +13760,14 @@ + + + + + + + + From 3f2195962a96fb3f009f0d2ad299930d7d249981 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 12:58:16 +0000 Subject: [PATCH 216/299] Update lint_version to v31.7.0 --- dependencies.gradle | 2 +- gradle/verification-metadata.xml | 192 +++++++++++++++++++++++++++++++ 2 files changed, 193 insertions(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 774384d7dd..32d56f0416 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -79,7 +79,7 @@ ext { jose4j_version = '0.9.6' junit_jupiter_version = "5.11.1" konsist_version = "0.16.1" - lint_version = "31.5.2" + lint_version = "31.7.0" mockito_kotlin_version = "5.4.0" mockito_version = "5.12.0" robolectric_version = "4.13" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index b51c646b79..a0f46268a8 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -4535,6 +4535,14 @@ + + + + + + + + @@ -4591,6 +4599,14 @@ + + + + + + + + @@ -4647,6 +4663,14 @@ + + + + + + + + @@ -4703,6 +4727,14 @@ + + + + + + + + @@ -4759,6 +4791,14 @@ + + + + + + + + @@ -4815,6 +4855,14 @@ + + + + + + + + @@ -4871,6 +4919,14 @@ + + + + + + + + @@ -4975,6 +5031,14 @@ + + + + + + + + @@ -5031,6 +5095,14 @@ + + + + + + + + @@ -5087,6 +5159,14 @@ + + + + + + + + @@ -5209,6 +5289,14 @@ + + + + + + + + @@ -5457,6 +5545,14 @@ + + + + + + + + @@ -5721,6 +5817,14 @@ + + + + + + + + @@ -5801,6 +5905,14 @@ + + + + + + + + @@ -5897,6 +6009,14 @@ + + + + + + + + @@ -5953,6 +6073,14 @@ + + + + + + + + @@ -6009,6 +6137,14 @@ + + + + + + + + @@ -6065,6 +6201,14 @@ + + + + + + + + @@ -6121,6 +6265,14 @@ + + + + + + + + @@ -6177,6 +6329,14 @@ + + + + + + + + @@ -6233,6 +6393,14 @@ + + + + + + + + @@ -6337,6 +6505,14 @@ + + + + + + + + @@ -6353,6 +6529,14 @@ + + + + + + + + @@ -11083,6 +11267,14 @@ + + + + + + + + From b0784cdd4350ea98ab6f0140e0d1cf6abb1ce50e Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Tue, 1 Oct 2024 13:36:13 +0200 Subject: [PATCH 217/299] Fix malformed locale in analytics setup request COAND-993 --- .../analytics/data/remote/DefaultAnalyticsSetupProvider.kt | 2 +- .../analytics/data/remote/DefaultAnalyticsSetupProviderTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/data/remote/DefaultAnalyticsSetupProvider.kt b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/data/remote/DefaultAnalyticsSetupProvider.kt index 8ef42aaf53..50473beac8 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/data/remote/DefaultAnalyticsSetupProvider.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/data/remote/DefaultAnalyticsSetupProvider.kt @@ -30,7 +30,7 @@ internal class DefaultAnalyticsSetupProvider( version = AnalyticsPlatformParams.version, channel = AnalyticsPlatformParams.channel, platform = AnalyticsPlatformParams.platform, - locale = shopperLocale.toString(), + locale = shopperLocale.toLanguageTag(), component = getComponentQueryParameter(source), flavor = getFlavorQueryParameter(isCreatedByDropIn), deviceBrand = Build.BRAND, diff --git a/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/data/remote/DefaultAnalyticsSetupProviderTest.kt b/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/data/remote/DefaultAnalyticsSetupProviderTest.kt index cbf9029ad7..4ce23be7e7 100644 --- a/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/data/remote/DefaultAnalyticsSetupProviderTest.kt +++ b/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/data/remote/DefaultAnalyticsSetupProviderTest.kt @@ -36,7 +36,7 @@ internal class DefaultAnalyticsSetupProviderTest { version = AnalyticsPlatformParams.version, channel = AnalyticsPlatformParams.channel, platform = AnalyticsPlatformParams.platform, - locale = Locale.US.toString(), + locale = Locale.US.toLanguageTag(), component = "scheme", flavor = "components", deviceBrand = Build.BRAND, From b7ac1585b44c40c38a895684d711bc93d557c017 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Fri, 4 Oct 2024 12:34:50 +0200 Subject: [PATCH 218/299] Don't fallback to normal redirect flow Before we used to fallback to the normal redirect flow if we would lose nativeRedirectData. Instead, we can just send null in the native redirect request and the backend will be able to recover the state. COAND-996 --- .../redirect/internal/data/model/NativeRedirectRequest.kt | 2 +- .../checkout/redirect/internal/ui/DefaultRedirectDelegate.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/redirect/src/main/java/com/adyen/checkout/redirect/internal/data/model/NativeRedirectRequest.kt b/redirect/src/main/java/com/adyen/checkout/redirect/internal/data/model/NativeRedirectRequest.kt index efbcc16d52..5af879ad99 100644 --- a/redirect/src/main/java/com/adyen/checkout/redirect/internal/data/model/NativeRedirectRequest.kt +++ b/redirect/src/main/java/com/adyen/checkout/redirect/internal/data/model/NativeRedirectRequest.kt @@ -16,7 +16,7 @@ import org.json.JSONObject @Parcelize internal data class NativeRedirectRequest( - val redirectData: String, + val redirectData: String?, val returnQueryString: String, ) : ModelObject() { diff --git a/redirect/src/main/java/com/adyen/checkout/redirect/internal/ui/DefaultRedirectDelegate.kt b/redirect/src/main/java/com/adyen/checkout/redirect/internal/ui/DefaultRedirectDelegate.kt index 375cd2a270..c9b438fbd3 100644 --- a/redirect/src/main/java/com/adyen/checkout/redirect/internal/ui/DefaultRedirectDelegate.kt +++ b/redirect/src/main/java/com/adyen/checkout/redirect/internal/ui/DefaultRedirectDelegate.kt @@ -147,7 +147,7 @@ constructor( val details = redirectHandler.parseRedirectResult(intent.data) val nativeRedirectData = paymentDataRepository.nativeRedirectData when { - nativeRedirectData != null -> { + action?.type == ActionTypes.NATIVE_REDIRECT -> { handleNativeRedirect(nativeRedirectData, details) } @@ -167,7 +167,7 @@ constructor( ) } - private fun handleNativeRedirect(nativeRedirectData: String, details: JSONObject) { + private fun handleNativeRedirect(nativeRedirectData: String?, details: JSONObject) { coroutineScope.launch { val request = NativeRedirectRequest( redirectData = nativeRedirectData, From acf647ea7350ecc4034841655550fd2d641fda5b Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Thu, 3 Oct 2024 13:24:29 +0400 Subject: [PATCH 219/299] Send failed checkoutAttemptId value when the request fails COAND-982 --- .../analytics/DefaultAnalyticsManager.kt | 16 ++++++- .../analytics/DefaultAnalyticsManagerTest.kt | 45 +++++++++++++++++-- 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManager.kt b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManager.kt index 8bf1b33999..f975497f29 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManager.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManager.kt @@ -58,7 +58,10 @@ internal class DefaultAnalyticsManager( onSuccess = { attemptId -> checkoutAttemptId = attemptId?.also { startTimer() } }, - onFailure = { adyenLog(AdyenLogLevel.WARN, it) { "Failed to fetch checkoutAttemptId." } }, + onFailure = { + adyenLog(AdyenLogLevel.WARN, it) { "Failed to fetch checkoutAttemptId." } + checkoutAttemptId = FAILED_CHECKOUT_ATTEMPT_ID + }, ) } } @@ -104,6 +107,11 @@ internal class DefaultAnalyticsManager( return } + if (cannotSendEvents()) { + adyenLog(AdyenLogLevel.DEBUG) { "Not allowed to send events, ignoring." } + return + } + runSuspendCatching { analyticsRepository.sendEvents(checkoutAttemptId) }.fold( @@ -115,7 +123,8 @@ internal class DefaultAnalyticsManager( override fun getCheckoutAttemptId(): String? = checkoutAttemptId private fun cannotSendEvents(): Boolean { - return analyticsParams.level.priority <= AnalyticsParamsLevel.NONE.priority + return analyticsParams.level.priority <= AnalyticsParamsLevel.NONE.priority || + checkoutAttemptId == FAILED_CHECKOUT_ATTEMPT_ID } override fun clear(owner: Any) { @@ -135,6 +144,9 @@ internal class DefaultAnalyticsManager( } companion object { + @VisibleForTesting + internal val FAILED_CHECKOUT_ATTEMPT_ID = "fetch-checkoutAttemptId-failed" + @VisibleForTesting internal val DISPATCH_INTERVAL_MILLIS = 10.seconds.inWholeMilliseconds } diff --git a/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManagerTest.kt b/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManagerTest.kt index d4e779ea00..d3d58fca70 100644 --- a/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManagerTest.kt +++ b/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManagerTest.kt @@ -11,7 +11,6 @@ import kotlinx.coroutines.test.StandardTestDispatcher import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Assertions.assertNull import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Nested @@ -66,12 +65,12 @@ internal class DefaultAnalyticsManagerTest( } @Test - fun `fetching checkoutAttemptId fails, then checkoutAttemptId is null`() = runTest { + fun `fetching checkoutAttemptId fails, then checkoutAttemptId is failed checkoutAttemptId`() = runTest { whenever(analyticsRepository.fetchCheckoutAttemptId()) doAnswer { error("test") } analyticsManager.initialize(this@InitializeTest, this) - assertNull(analyticsManager.getCheckoutAttemptId()) + assertEquals(DefaultAnalyticsManager.FAILED_CHECKOUT_ATTEMPT_ID, analyticsManager.getCheckoutAttemptId()) } @Test @@ -99,6 +98,16 @@ internal class DefaultAnalyticsManagerTest( verify(analyticsRepository, never()).storeEvent(any()) } + @Test + fun `fetching checkoutAttemptId failed, then events should not be stored`() = runTest { + whenever(analyticsRepository.fetchCheckoutAttemptId()) doAnswer { error("test") } + analyticsManager.initialize(this@TrackEventTest, this) + + analyticsManager.trackEvent(GenericEvents.rendered("dropin", false)) + + verify(analyticsRepository, never()).storeEvent(any()) + } + @Test fun `sending events is enabled, then events should be stored`() = runTest { analyticsManager.initialize(this@TrackEventTest, this) @@ -158,6 +167,36 @@ internal class DefaultAnalyticsManagerTest( analyticsManager.clear(this@DefaultAnalyticsManagerTest) } + @Test + fun `when sending events and sending events is disabled, then events are not sent`() = runTest { + analyticsManager = createAnalyticsManager(AnalyticsParamsLevel.NONE) + analyticsManager.initialize(this@DefaultAnalyticsManagerTest, this) + val event = AnalyticsEvent.Info( + component = "test", + shouldForceSend = true, + ) + + analyticsManager.trackEvent(event) + + verify(analyticsRepository, never()).sendEvents(any()) + analyticsManager.clear(this@DefaultAnalyticsManagerTest) + } + + @Test + fun `when sending events and checkoutAttemptId has failed fetching, then events are not sent`() = runTest { + whenever(analyticsRepository.fetchCheckoutAttemptId()) doAnswer { error("test") } + analyticsManager.initialize(this@DefaultAnalyticsManagerTest, this) + val event = AnalyticsEvent.Info( + component = "test", + shouldForceSend = true, + ) + + analyticsManager.trackEvent(event) + + verify(analyticsRepository, never()).sendEvents(any()) + analyticsManager.clear(this@DefaultAnalyticsManagerTest) + } + private fun createAnalyticsManager( analyticsParamsLevel: AnalyticsParamsLevel = AnalyticsParamsLevel.ALL, coroutineDispatcher: CoroutineDispatcher = UnconfinedTestDispatcher(), From de498c7dbb5fb1e9af50e980391462a4cf4f3421 Mon Sep 17 00:00:00 2001 From: josephj Date: Mon, 7 Oct 2024 09:34:06 +0200 Subject: [PATCH 220/299] Replace `has` with ``!isNull` when reading JSON values COAND-994 --- .../core/internal/data/model/JsonUtils.kt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/internal/data/model/JsonUtils.kt b/checkout-core/src/main/java/com/adyen/checkout/core/internal/data/model/JsonUtils.kt index 1c3f67530d..b43eb93eea 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/internal/data/model/JsonUtils.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/internal/data/model/JsonUtils.kt @@ -20,22 +20,27 @@ private const val PARSING_ERROR = "PARSING_ERROR" @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) fun JSONObject.getStringOrNull(key: String): String? { - return if (has(key)) getString(key) else null + return if (!isNull(key)) getString(key) else null } @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) fun JSONObject.getBooleanOrNull(key: String): Boolean? { - return if (has(key)) getBoolean(key) else null + return if (!isNull(key)) getBoolean(key) else null } @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) fun JSONObject.getIntOrNull(key: String): Int? { - return if (has(key)) getInt(key) else null + return if (!isNull(key)) getInt(key) else null } @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) fun JSONObject.getLongOrNull(key: String): Long? { - return if (has(key)) getLong(key) else null + return if (!isNull(key)) getLong(key) else null +} + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +fun JSONObject.getDoubleOrNull(key: String): Double? { + return if (!isNull(key)) getDouble(key) else null } @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) @@ -93,7 +98,7 @@ inline fun JSONObject.jsonToMap( @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) fun JSONObject.getMapOrNull(key: String): Map? { - return if (has(key)) getJSONObject(key).toMap() else null + return if (!isNull(key)) getJSONObject(key).toMap() else null } private fun JSONObject.toMap(): Map { From 113d57846a516acdda909886ecd64362b49eaf2d Mon Sep 17 00:00:00 2001 From: josephj Date: Mon, 7 Oct 2024 09:42:10 +0200 Subject: [PATCH 221/299] Update release notes COAND-994 --- RELEASE_NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 0f90773a11..29fe1ec0b9 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -29,6 +29,9 @@ |--------------------------------------------------------------------------------------------------------|-------------------------------| | [Adyen 3DS2](https://github.com/Adyen/adyen-3ds2-android/releases/tag/2.2.20) | **2.2.20** | +## Fixed +- JSON deserialization no longer returns the coerced `"null"` string when parsing JSON objects with explicit null values. + ## Deprecated - The style for payment method list headers has been changed. | Previous | Now | From 6a290283ba74c4b5235b0225745cf398fe8eb80e Mon Sep 17 00:00:00 2001 From: josephj Date: Mon, 7 Oct 2024 12:20:15 +0200 Subject: [PATCH 222/299] Add tests for JsonUtils COAND-994 --- .../core/internal/data/model/JsonUtilsTest.kt | 201 ++++++++++++++++-- 1 file changed, 183 insertions(+), 18 deletions(-) diff --git a/checkout-core/src/test/java/com/adyen/checkout/core/internal/data/model/JsonUtilsTest.kt b/checkout-core/src/test/java/com/adyen/checkout/core/internal/data/model/JsonUtilsTest.kt index 0bc61f7172..2a920d7abb 100644 --- a/checkout-core/src/test/java/com/adyen/checkout/core/internal/data/model/JsonUtilsTest.kt +++ b/checkout-core/src/test/java/com/adyen/checkout/core/internal/data/model/JsonUtilsTest.kt @@ -7,9 +7,8 @@ */ package com.adyen.checkout.core.internal.data.model -import org.json.JSONArray +import org.json.JSONObject import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Assertions.assertNotNull import org.junit.jupiter.api.Assertions.assertNull import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test @@ -17,27 +16,193 @@ import org.junit.jupiter.api.Test internal class JsonUtilsTest { @Test - fun parseOptStringList_Pass_ParseStringArray() { - val jsonArray = JSONArray() - val testString = "Test" - jsonArray.put(testString) - val stringList = JsonUtils.parseOptStringList(jsonArray) - assertNotNull(stringList) - val first = stringList!![0] - assertEquals(testString, first) + fun `when calling getStringOrNull with a non null string then result should be that string`() { + val jsonObject = JSONObject( + """ + { "key": "value" } + """.trimIndent(), + ) + val result = jsonObject.getStringOrNull("key") + assertEquals("value", result) } @Test - fun parseOptStringList_Pass_ParseEmptyArray() { - val jsonArray = JSONArray() - val stringList = JsonUtils.parseOptStringList(jsonArray) - assertNotNull(stringList) - assertTrue(stringList!!.isEmpty()) + fun `when calling getStringOrNull with a null string then result should be null`() { + val jsonObject = JSONObject( + """ + { "key": null } + """.trimIndent(), + ) + val result = jsonObject.getStringOrNull("key") + assertNull(result) } @Test - fun parseOptStringList_Pass_ParseNull() { - val stringList = JsonUtils.parseOptStringList(null) - assertNull(stringList) + fun `when calling getStringOrNull with a non existent string then result should be null`() { + val jsonObject = JSONObject() + val result = jsonObject.getStringOrNull("key") + assertNull(result) + } + + @Test + fun `when calling getIntOrNull with a non null integer then result should be that integer`() { + val jsonObject = JSONObject( + """ + { "key": 1 } + """.trimIndent(), + ) + val result = jsonObject.getIntOrNull("key") + assertEquals(1, result) + } + + @Test + fun `when calling getIntOrNull with a null integer then result should be null`() { + val jsonObject = JSONObject( + """ + { "key": null } + """.trimIndent(), + ) + val result = jsonObject.getIntOrNull("key") + assertNull(result) + } + + @Test + fun `when calling getIntOrNull with a non existent integer then result should be null`() { + val jsonObject = JSONObject() + val result = jsonObject.getIntOrNull("key") + assertNull(result) + } + + @Test + fun `when calling getBooleanOrNull with a non null boolean then result should be that boolean`() { + val jsonObject = JSONObject( + """ + { "key": true } + """.trimIndent(), + ) + val result = jsonObject.getBooleanOrNull("key") + assertEquals(true, result) + } + + @Test + fun `when calling getBooleanOrNull with a null boolean then result should be null`() { + val jsonObject = JSONObject( + """ + { "key": null } + """.trimIndent(), + ) + val result = jsonObject.getBooleanOrNull("key") + assertNull(result) + } + + @Test + fun `when calling getBooleanOrNull with a non existent boolean then result should be null`() { + val jsonObject = JSONObject() + val result = jsonObject.getBooleanOrNull("key") + assertNull(result) + } + + @Test + fun `when calling getLongOrNull with a non null long then result should be that long`() { + val jsonObject = JSONObject( + """ + { "key": 92233720368547758 } + """.trimIndent(), + ) + val result = jsonObject.getLongOrNull("key") + assertEquals(92233720368547758L, result) + } + + @Test + fun `when calling getLongOrNull with a null long then result should be null`() { + val jsonObject = JSONObject( + """ + { "key": null } + """.trimIndent(), + ) + val result = jsonObject.getLongOrNull("key") + assertNull(result) + } + + @Test + fun `when calling getLongOrNull with a non existent long then result should be null`() { + val jsonObject = JSONObject() + val result = jsonObject.getLongOrNull("key") + assertNull(result) + } + + @Test + fun `when calling getDoubleOrNull with a non null double then result should be that double`() { + val jsonObject = JSONObject( + """ + { "key": 13.37 } + """.trimIndent(), + ) + val result = jsonObject.getDoubleOrNull("key") + assertEquals(13.37, result) + } + + @Test + fun `when calling getDoubleOrNull with a null double then result should be null`() { + val jsonObject = JSONObject( + """ + { "key": null } + """.trimIndent(), + ) + val result = jsonObject.getDoubleOrNull("key") + assertNull(result) + } + + @Test + fun `when calling getDoubleOrNull with a non existent double then result should be null`() { + val jsonObject = JSONObject() + val result = jsonObject.getDoubleOrNull("key") + assertNull(result) + } + + @Test + fun `when calling parseOptStringList with a non empty JSON array then result should be matching string list`() { + val jsonObject = JSONObject( + """ + { + "array":["value1", "value2", "value3"] + } + """.trimIndent(), + ) + val result = JsonUtils.parseOptStringList(jsonObject.optJSONArray("array")) + assertEquals(listOf("value1", "value2", "value3"), result) + } + + @Test + fun `when calling parseOptStringList with an empty JSON array then result should be a empty list`() { + val jsonObject = JSONObject( + """ + { + "array":[] + } + """.trimIndent(), + ) + val result = JsonUtils.parseOptStringList(jsonObject.optJSONArray("array")) + assertTrue(result != null && result.isEmpty()) + } + + @Test + fun `when calling parseOptStringList with a null JSON array then result should be null`() { + val jsonObject = JSONObject( + """ + { + "array": null + } + """.trimIndent(), + ) + val result = JsonUtils.parseOptStringList(jsonObject.optJSONArray("array")) + assertNull(result) + } + + @Test + fun `when calling parseOptStringList with a non existent JSON array then result should be null`() { + val jsonObject = JSONObject() + val result = JsonUtils.parseOptStringList(jsonObject.optJSONArray("array")) + assertNull(result) } } From c431e47ceefdad5484be22d1fb3cbfcb55a3ee34 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Mon, 7 Oct 2024 16:27:09 +0200 Subject: [PATCH 223/299] Put reference to Adyen Test Cards in the README and release notes COAND-1001 --- README.md | 5 ++++- RELEASE_NOTES.md | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 91d3708965..8b0551c800 100644 --- a/README.md +++ b/README.md @@ -65,10 +65,12 @@ If you are upgrading from 4.x.x to a current release, check out our [migration g If you use ProGuard or R8, you do not need to manually add any rules, as they are automatically embedded in the artifacts. Please let us know if you find any issues. -## Development +## Development and testing For development and testing purposes the project is accompanied by a test app. See [here](example-app/README.md) how to set it up and run it. +To test your integration you could use [Adyen Test Cards Android][adyenTestCardsAndroid]. This will allow you to easily prefill test payment method information. + ## Support If you have a feature request, or spotted a bug or a technical problem, [create an issue here][github.newIssue]. For other questions, contact our Support Team via [Customer Area][adyen.support] or via email: support@adyen.com @@ -119,3 +121,4 @@ This repository is available under the [MIT license](LICENSE). [dokka]: https://adyen.github.io/adyen-android/ [docs.checkout]: https://docs.adyen.com/online-payments/ [docs.apiExplorer]: https://docs.adyen.com/api-explorer/ +[adyenTestCardsAndroid]: https://github.com/Adyen/adyen-testcards-android diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 29fe1ec0b9..3e75ac5471 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -12,6 +12,7 @@ - Added support for 6 more locales: Catalan (ca-ES), Icelandic (is-IS), Bulgarian (bg-BG), Estonian (et-EE), Latvian (lv-LV) and Lithuanian (lt-lT). - For Twint, storing payment details and paying with them is now supported. See the documentation [here](/docs/payment-methods/TWINT.md). +- You can now use [Adyen Test Cards Android](https://github.com/Adyen/adyen-testcards-android) to prefill test payment method information, making testing your integration easier. > [!WARNING] > For the Twint component integration, you are now required to use `TwintComponent` instead of `InstantPaymentComponent`. See the [documentation](/docs/payment-methods/TWINT.md) to find out the details. From 3375079e26f71772028c4cf0b7898eb800d360b8 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Tue, 16 Jul 2024 11:26:16 +0200 Subject: [PATCH 224/299] Create mealvoucher module COAND-683 --- mealvoucher/.gitignore | 1 + mealvoucher/build.gradle | 48 ++++++++++++++++++++++++ mealvoucher/consumer-rules.pro | 0 mealvoucher/proguard-rules.pro | 21 +++++++++++ mealvoucher/src/main/AndroidManifest.xml | 9 +++++ settings.gradle | 2 +- 6 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 mealvoucher/.gitignore create mode 100644 mealvoucher/build.gradle create mode 100644 mealvoucher/consumer-rules.pro create mode 100644 mealvoucher/proguard-rules.pro create mode 100644 mealvoucher/src/main/AndroidManifest.xml diff --git a/mealvoucher/.gitignore b/mealvoucher/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/mealvoucher/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/mealvoucher/build.gradle b/mealvoucher/build.gradle new file mode 100644 index 0000000000..6b36fac9c8 --- /dev/null +++ b/mealvoucher/build.gradle @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ararat on 16/7/2024. + */ + +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'kotlin-parcelize' +} + +ext.mavenArtifactId = "mealvoucher" +ext.mavenArtifactName = "Adyen checkout Meal Voucher component" +ext.mavenArtifactDescription = "Adyen checkout Meal Voucher component client for Adyen's Checkout API." + +apply from: "${rootDir}/config/gradle/sharedTasks.gradle" + +android { + namespace 'com.adyen.checkout.mealvoucher' + compileSdk compile_sdk_version + + defaultConfig { + minSdk min_sdk_version + targetSdk target_sdk_version + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles "consumer-rules.pro" + } + + buildFeatures { + viewBinding true + } + + testOptions { + unitTests.returnDefaultValues = true + } +} + +dependencies { + // Checkout + api project(':giftcard') + + // Tests + // TODO Add test implementations +} diff --git a/mealvoucher/consumer-rules.pro b/mealvoucher/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mealvoucher/proguard-rules.pro b/mealvoucher/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/mealvoucher/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/mealvoucher/src/main/AndroidManifest.xml b/mealvoucher/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..038a13dc67 --- /dev/null +++ b/mealvoucher/src/main/AndroidManifest.xml @@ -0,0 +1,9 @@ + + + diff --git a/settings.gradle b/settings.gradle index df3a3cd53a..f8b845dc57 100644 --- a/settings.gradle +++ b/settings.gradle @@ -48,6 +48,7 @@ include ':3ds2', ':issuer-list', ':lint', ':mbway', + ':mealvoucher', ':molpay', ':online-banking-core', ':online-banking-cz', @@ -69,4 +70,3 @@ include ':3ds2', ':upi', ':voucher', ':wechatpay' - From 7e341cd153a8b37888be5126971c95d0e45ac2d0 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Tue, 16 Jul 2024 13:44:36 +0200 Subject: [PATCH 225/299] Create MealVoucher component related classes COAND-683 --- .../mealvoucher/MealVoucherComponent.kt | 14 ++ .../MealVoucherComponentCallback.kt | 13 ++ .../mealvoucher/MealVoucherComponentState.kt | 13 ++ .../mealvoucher/MealVoucherConfiguration.kt | 14 ++ .../SessionsMealVoucherComponentCallback.kt | 13 ++ .../provider/MealVoucherComponentProvider.kt | 120 ++++++++++++++++++ 6 files changed, 187 insertions(+) create mode 100644 mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt create mode 100644 mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentCallback.kt create mode 100644 mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentState.kt create mode 100644 mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt create mode 100644 mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/SessionsMealVoucherComponentCallback.kt create mode 100644 mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt new file mode 100644 index 0000000000..ec7577e165 --- /dev/null +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 16/7/2024. + */ + +package com.adyen.checkout.mealvoucher + +import com.adyen.checkout.giftcard.GiftCardComponent + +// TODO extend from giftcard +typealias MealVoucherComponent = GiftCardComponent diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentCallback.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentCallback.kt new file mode 100644 index 0000000000..acd461771d --- /dev/null +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentCallback.kt @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 16/7/2024. + */ + +package com.adyen.checkout.mealvoucher + +import com.adyen.checkout.giftcard.GiftCardComponentCallback + +typealias MealVoucherComponentCallback = GiftCardComponentCallback diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentState.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentState.kt new file mode 100644 index 0000000000..0cea62478a --- /dev/null +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentState.kt @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 16/7/2024. + */ + +package com.adyen.checkout.mealvoucher + +import com.adyen.checkout.giftcard.GiftCardComponentState + +typealias MealVoucherComponentState = GiftCardComponentState diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt new file mode 100644 index 0000000000..4aa1ae0b0e --- /dev/null +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 16/7/2024. + */ + +package com.adyen.checkout.mealvoucher + +import com.adyen.checkout.giftcard.GiftCardConfiguration + +// TODO create new config +typealias MealVoucherConfiguration = GiftCardConfiguration diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/SessionsMealVoucherComponentCallback.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/SessionsMealVoucherComponentCallback.kt new file mode 100644 index 0000000000..7354a004b0 --- /dev/null +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/SessionsMealVoucherComponentCallback.kt @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 16/7/2024. + */ + +package com.adyen.checkout.mealvoucher + +import com.adyen.checkout.giftcard.SessionsGiftCardComponentCallback + +typealias SessionsMealVoucherComponentCallback = SessionsGiftCardComponentCallback diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt new file mode 100644 index 0000000000..11c5f51b1f --- /dev/null +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt @@ -0,0 +1,120 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 16/7/2024. + */ + +package com.adyen.checkout.mealvoucher.internal.provider + +import android.app.Application +import androidx.annotation.RestrictTo +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.ViewModelStoreOwner +import androidx.savedstate.SavedStateRegistryOwner +import com.adyen.checkout.components.core.CheckoutConfiguration +import com.adyen.checkout.components.core.Order +import com.adyen.checkout.components.core.PaymentMethod +import com.adyen.checkout.components.core.internal.analytics.AnalyticsManager +import com.adyen.checkout.components.core.internal.provider.PaymentComponentProvider +import com.adyen.checkout.components.core.internal.ui.model.DropInOverrideParams +import com.adyen.checkout.core.exception.ComponentException +import com.adyen.checkout.core.internal.util.LocaleProvider +import com.adyen.checkout.mealvoucher.MealVoucherComponent +import com.adyen.checkout.mealvoucher.MealVoucherComponentCallback +import com.adyen.checkout.mealvoucher.MealVoucherComponentState +import com.adyen.checkout.mealvoucher.MealVoucherConfiguration +import com.adyen.checkout.mealvoucher.SessionsMealVoucherComponentCallback +import com.adyen.checkout.sessions.core.CheckoutSession +import com.adyen.checkout.sessions.core.internal.provider.SessionPaymentComponentProvider + +class MealVoucherComponentProvider +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +// TODO remove suppress annotation +@Suppress("UnusedPrivateProperty") +constructor( + private val dropInOverrideParams: DropInOverrideParams? = null, + private val analyticsManager: AnalyticsManager? = null, + private val localeProvider: LocaleProvider = LocaleProvider(), +) : + PaymentComponentProvider< + MealVoucherComponent, + MealVoucherConfiguration, + MealVoucherComponentState, + MealVoucherComponentCallback, + >, + SessionPaymentComponentProvider< + MealVoucherComponent, + MealVoucherConfiguration, + MealVoucherComponentState, + SessionsMealVoucherComponentCallback, + > { + override fun get( + savedStateRegistryOwner: SavedStateRegistryOwner, + viewModelStoreOwner: ViewModelStoreOwner, + lifecycleOwner: LifecycleOwner, + paymentMethod: PaymentMethod, + checkoutConfiguration: CheckoutConfiguration, + application: Application, + componentCallback: MealVoucherComponentCallback, + order: Order?, + key: String? + ): MealVoucherComponent { + TODO("Not yet implemented") + } + + override fun get( + savedStateRegistryOwner: SavedStateRegistryOwner, + viewModelStoreOwner: ViewModelStoreOwner, + lifecycleOwner: LifecycleOwner, + paymentMethod: PaymentMethod, + configuration: MealVoucherConfiguration, + application: Application, + componentCallback: MealVoucherComponentCallback, + order: Order?, + key: String? + ): MealVoucherComponent { + TODO("Not yet implemented") + } + + override fun get( + savedStateRegistryOwner: SavedStateRegistryOwner, + viewModelStoreOwner: ViewModelStoreOwner, + lifecycleOwner: LifecycleOwner, + checkoutSession: CheckoutSession, + paymentMethod: PaymentMethod, + checkoutConfiguration: CheckoutConfiguration, + application: Application, + componentCallback: SessionsMealVoucherComponentCallback, + key: String? + ): MealVoucherComponent { + TODO("Not yet implemented") + } + + override fun get( + savedStateRegistryOwner: SavedStateRegistryOwner, + viewModelStoreOwner: ViewModelStoreOwner, + lifecycleOwner: LifecycleOwner, + checkoutSession: CheckoutSession, + paymentMethod: PaymentMethod, + configuration: MealVoucherConfiguration, + application: Application, + componentCallback: SessionsMealVoucherComponentCallback, + key: String? + ): MealVoucherComponent { + TODO("Not yet implemented") + } + + @Suppress("UnusedPrivateMember") + private fun assertSupported(paymentMethod: PaymentMethod) { + if (!isPaymentMethodSupported(paymentMethod)) { + throw ComponentException("Unsupported payment method ${paymentMethod.type}") + } + } + + override fun isPaymentMethodSupported(paymentMethod: PaymentMethod): Boolean { + // TODO create PAYMENT_METHOD_TYPES after extending MealVoucherComponent from GiftCardComponent + return MealVoucherComponent.PAYMENT_METHOD_TYPES.contains(paymentMethod.type) + } +} From 7c74dac928e78f41354b9db281038b15dd0fd3e7 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Wed, 17 Jul 2024 13:12:35 +0200 Subject: [PATCH 226/299] Implement MealVoucherComponentProvider and MealVoucherComponent COAND-683 --- components-core/api/components-core.api | 3 + .../components/core/PaymentMethodTypes.kt | 3 + giftcard/api/giftcard.api | 6 +- .../checkout/giftcard/GiftCardComponent.kt | 8 +- .../giftcard/GiftCardConfiguration.kt | 5 +- .../internal/GiftCardComponentEventHandler.kt | 4 +- ...essionsGiftCardComponentCallbackWrapper.kt | 4 +- .../internal/ui/DefaultGiftCardDelegate.kt | 4 +- .../giftcard/internal/ui/GiftCardDelegate.kt | 4 +- .../ui/model/GiftCardComponentParams.kt | 4 +- .../ui/model/GiftCardComponentParamsMapper.kt | 4 +- .../internal/ui/model/GiftCardInputData.kt | 4 +- .../internal/ui/model/GiftCardOutputData.kt | 4 +- mealvoucher/api/mealvoucher.api | 49 +++++ .../mealvoucher/MealVoucherComponent.kt | 27 ++- .../provider/MealVoucherComponentProvider.kt | 186 +++++++++++++++++- 16 files changed, 300 insertions(+), 19 deletions(-) create mode 100644 mealvoucher/api/mealvoucher.api diff --git a/components-core/api/components-core.api b/components-core/api/components-core.api index d789a20e62..f88a04e80a 100644 --- a/components-core/api/components-core.api +++ b/components-core/api/components-core.api @@ -901,6 +901,9 @@ public final class com/adyen/checkout/components/core/PaymentMethodTypes { public static final field IDEAL Ljava/lang/String; public static final field INSTANCE Lcom/adyen/checkout/components/core/PaymentMethodTypes; public static final field MB_WAY Ljava/lang/String; + public static final field MEAL_VOUCHER_FR_GROUPEUP Ljava/lang/String; + public static final field MEAL_VOUCHER_FR_NATIXIS Ljava/lang/String; + public static final field MEAL_VOUCHER_FR_SODEXO Ljava/lang/String; public static final field MOLPAY_MALAYSIA Ljava/lang/String; public static final field MOLPAY_THAILAND Ljava/lang/String; public static final field MOLPAY_VIETNAM Ljava/lang/String; diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt index a208ab1f13..e340d0a764 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt @@ -36,6 +36,9 @@ object PaymentMethodTypes { const val GOOGLE_PAY_LEGACY = "paywithgoogle" const val IDEAL = "ideal" const val MB_WAY = "mbway" + const val MEAL_VOUCHER_FR_GROUPEUP = "mealVoucher_FR_groupeup" + const val MEAL_VOUCHER_FR_NATIXIS = "mealVoucher_FR_natixis" + const val MEAL_VOUCHER_FR_SODEXO = "mealVoucher_FR_sodexo" const val MOLPAY_MALAYSIA = "molpay_ebanking_fpx_MY" const val MOLPAY_THAILAND = "molpay_ebanking_TH" const val MOLPAY_VIETNAM = "molpay_ebanking_VN" diff --git a/giftcard/api/giftcard.api b/giftcard/api/giftcard.api index 103099b8d3..29648a9423 100644 --- a/giftcard/api/giftcard.api +++ b/giftcard/api/giftcard.api @@ -69,7 +69,7 @@ public final class com/adyen/checkout/giftcard/GiftCardAction$SendPayment$Creato public synthetic fun newArray (I)[Ljava/lang/Object; } -public final class com/adyen/checkout/giftcard/GiftCardComponent : androidx/lifecycle/ViewModel, com/adyen/checkout/action/core/internal/ActionHandlingComponent, com/adyen/checkout/components/core/internal/ButtonComponent, com/adyen/checkout/components/core/internal/PaymentComponent, com/adyen/checkout/ui/core/internal/ui/ViewableComponent { +public class com/adyen/checkout/giftcard/GiftCardComponent : androidx/lifecycle/ViewModel, com/adyen/checkout/action/core/internal/ActionHandlingComponent, com/adyen/checkout/components/core/internal/ButtonComponent, com/adyen/checkout/components/core/internal/PaymentComponent, com/adyen/checkout/ui/core/internal/ui/ViewableComponent { public static final field Companion Lcom/adyen/checkout/giftcard/GiftCardComponent$Companion; public static final field PAYMENT_METHOD_TYPES Ljava/util/List; public static final field PROVIDER Lcom/adyen/checkout/giftcard/internal/provider/GiftCardComponentProvider; @@ -79,6 +79,7 @@ public final class com/adyen/checkout/giftcard/GiftCardComponent : androidx/life public fun handleAction (Lcom/adyen/checkout/components/core/action/Action;Landroid/app/Activity;)V public fun handleIntent (Landroid/content/Intent;)V public fun isConfirmationRequired ()Z + protected fun onCleared ()V public final fun resolveBalanceResult (Lcom/adyen/checkout/components/core/BalanceResult;)V public final fun resolveOrderResponse (Lcom/adyen/checkout/components/core/OrderResponse;)V public fun setInteractionBlocked (Z)V @@ -221,6 +222,9 @@ public final class com/adyen/checkout/giftcard/internal/provider/GiftCardCompone public fun isPaymentMethodSupported (Lcom/adyen/checkout/components/core/PaymentMethod;)Z } +public final class com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate$Companion { +} + public final class com/adyen/checkout/giftcard/internal/util/GiftCardBalanceStatus$FullPayment : com/adyen/checkout/giftcard/internal/util/GiftCardBalanceStatus { public fun (Lcom/adyen/checkout/components/core/Amount;Lcom/adyen/checkout/components/core/Amount;)V public final fun getAmountPaid ()Lcom/adyen/checkout/components/core/Amount; diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardComponent.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardComponent.kt index b4dd8d0e65..133f1c2007 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardComponent.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardComponent.kt @@ -7,6 +7,7 @@ */ package com.adyen.checkout.giftcard +import androidx.annotation.RestrictTo import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -35,7 +36,9 @@ import kotlinx.coroutines.flow.Flow /** * A [PaymentComponent] that supports the [PaymentMethodTypes.GIFTCARD] payment method. */ -class GiftCardComponent internal constructor( +open class GiftCardComponent +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +constructor( private val giftCardDelegate: GiftCardDelegate, private val genericActionDelegate: GenericActionDelegate, private val actionHandlingComponent: DefaultActionHandlingComponent, @@ -60,7 +63,8 @@ class GiftCardComponent internal constructor( componentEventHandler.initialize(viewModelScope) } - internal fun observe( + @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) + fun observe( lifecycleOwner: LifecycleOwner, callback: (PaymentComponentEvent) -> Unit ) { diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardConfiguration.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardConfiguration.kt index c10c34159c..c9b1d7fe01 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardConfiguration.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardConfiguration.kt @@ -8,6 +8,7 @@ package com.adyen.checkout.giftcard import android.content.Context +import androidx.annotation.RestrictTo import com.adyen.checkout.action.core.GenericActionConfiguration import com.adyen.checkout.action.core.internal.ActionHandlingPaymentMethodConfigurationBuilder import com.adyen.checkout.components.core.Amount @@ -150,7 +151,9 @@ internal fun CheckoutConfiguration.getGiftCardConfiguration(): GiftCardConfigura return getConfiguration(PaymentMethodTypes.GIFTCARD) } -internal fun GiftCardConfiguration.toCheckoutConfiguration(): CheckoutConfiguration { +// TODO revert RestrictTo annotation after implementing MealVoucherConfiguration class. +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +fun GiftCardConfiguration.toCheckoutConfiguration(): CheckoutConfiguration { return CheckoutConfiguration( shopperLocale = shopperLocale, environment = environment, diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/GiftCardComponentEventHandler.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/GiftCardComponentEventHandler.kt index 9658d2b87c..87fe5839de 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/GiftCardComponentEventHandler.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/GiftCardComponentEventHandler.kt @@ -1,5 +1,6 @@ package com.adyen.checkout.giftcard.internal +import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.internal.BaseComponentCallback import com.adyen.checkout.components.core.internal.ComponentEventHandler import com.adyen.checkout.components.core.internal.PaymentComponentEvent @@ -12,7 +13,8 @@ import com.adyen.checkout.giftcard.GiftCardComponentState import com.adyen.checkout.giftcard.GiftCardException import kotlinx.coroutines.CoroutineScope -internal class GiftCardComponentEventHandler : ComponentEventHandler { +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +class GiftCardComponentEventHandler : ComponentEventHandler { // no ops override fun initialize(coroutineScope: CoroutineScope) = Unit diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/SessionsGiftCardComponentCallbackWrapper.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/SessionsGiftCardComponentCallbackWrapper.kt index aafcd3732a..d982ae0235 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/SessionsGiftCardComponentCallbackWrapper.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/SessionsGiftCardComponentCallbackWrapper.kt @@ -1,5 +1,6 @@ package com.adyen.checkout.giftcard.internal +import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.ActionComponentData import com.adyen.checkout.components.core.BalanceResult import com.adyen.checkout.components.core.ComponentError @@ -19,7 +20,8 @@ import java.lang.ref.WeakReference * propagated to the merchants. */ @Suppress("TooManyFunctions") -internal class SessionsGiftCardComponentCallbackWrapper( +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +class SessionsGiftCardComponentCallbackWrapper( component: GiftCardComponent, private val componentCallback: SessionsGiftCardComponentCallback, ) : SessionsGiftCardComponentCallback { diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt index 300563cc7d..bab37da4c3 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt @@ -8,6 +8,7 @@ package com.adyen.checkout.giftcard.internal.ui +import androidx.annotation.RestrictTo import androidx.annotation.VisibleForTesting import androidx.lifecycle.LifecycleOwner import com.adyen.checkout.components.core.Amount @@ -57,7 +58,8 @@ import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.launch @Suppress("TooManyFunctions", "LongParameterList") -internal class DefaultGiftCardDelegate( +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +class DefaultGiftCardDelegate( private val observerRepository: PaymentObserverRepository, private val paymentMethod: PaymentMethod, private val order: OrderRequest?, diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/GiftCardDelegate.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/GiftCardDelegate.kt index a460fd12a3..fcb3ef3b02 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/GiftCardDelegate.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/GiftCardDelegate.kt @@ -8,6 +8,7 @@ package com.adyen.checkout.giftcard.internal.ui +import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.BalanceResult import com.adyen.checkout.components.core.OrderResponse import com.adyen.checkout.components.core.internal.ui.PaymentComponentDelegate @@ -20,7 +21,8 @@ import com.adyen.checkout.ui.core.internal.ui.UIStateDelegate import com.adyen.checkout.ui.core.internal.ui.ViewProvidingDelegate import kotlinx.coroutines.flow.Flow -internal interface GiftCardDelegate : +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +interface GiftCardDelegate : PaymentComponentDelegate, ViewProvidingDelegate, ButtonDelegate, diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams.kt index 49d3df4d47..397b8fa82d 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams.kt @@ -8,11 +8,13 @@ package com.adyen.checkout.giftcard.internal.ui.model +import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.internal.ui.model.ButtonParams import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParams import com.adyen.checkout.components.core.internal.ui.model.ComponentParams -internal data class GiftCardComponentParams( +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +data class GiftCardComponentParams( private val commonComponentParams: CommonComponentParams, override val isSubmitButtonVisible: Boolean, val isPinRequired: Boolean, diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapper.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapper.kt index f41ad7a2d7..306f0dfa78 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapper.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapper.kt @@ -8,6 +8,7 @@ package com.adyen.checkout.giftcard.internal.ui.model +import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.CheckoutConfiguration import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParamsMapper import com.adyen.checkout.components.core.internal.ui.model.DropInOverrideParams @@ -15,7 +16,8 @@ import com.adyen.checkout.components.core.internal.ui.model.SessionParams import com.adyen.checkout.giftcard.getGiftCardConfiguration import java.util.Locale -internal class GiftCardComponentParamsMapper( +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +class GiftCardComponentParamsMapper( private val commonComponentParamsMapper: CommonComponentParamsMapper, ) { diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt index 2c2f2595ec..c20578e7f1 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt @@ -8,9 +8,11 @@ package com.adyen.checkout.giftcard.internal.ui.model +import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.internal.ui.model.InputData -internal data class GiftCardInputData( +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +data class GiftCardInputData( var cardNumber: String = "", var pin: String = "" ) : InputData diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardOutputData.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardOutputData.kt index b7dcead7a2..b01ba0b441 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardOutputData.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardOutputData.kt @@ -8,10 +8,12 @@ package com.adyen.checkout.giftcard.internal.ui.model +import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.OutputData -internal data class GiftCardOutputData( +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +data class GiftCardOutputData( val numberFieldState: FieldState, val pinFieldState: FieldState, ) : OutputData { diff --git a/mealvoucher/api/mealvoucher.api b/mealvoucher/api/mealvoucher.api new file mode 100644 index 0000000000..6453837eef --- /dev/null +++ b/mealvoucher/api/mealvoucher.api @@ -0,0 +1,49 @@ +public final class com/adyen/checkout/mealvoucher/BuildConfig { + public static final field BUILD_TYPE Ljava/lang/String; + public static final field CHECKOUT_VERSION Ljava/lang/String; + public static final field DEBUG Z + public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String; + public fun ()V +} + +public final class com/adyen/checkout/mealvoucher/MealVoucherComponent : com/adyen/checkout/giftcard/GiftCardComponent { + public static final field Companion Lcom/adyen/checkout/mealvoucher/MealVoucherComponent$Companion; + public static final field PAYMENT_METHOD_TYPES Ljava/util/List; + public static final field PROVIDER Lcom/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider; +} + +public final class com/adyen/checkout/mealvoucher/MealVoucherComponent$Companion { +} + +public final class com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider : com/adyen/checkout/components/core/internal/provider/PaymentComponentProvider, com/adyen/checkout/sessions/core/internal/provider/SessionPaymentComponentProvider { + public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; + public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; + public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/GiftCardConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; + public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; + public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/GiftCardConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; + public synthetic fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; + public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public synthetic fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; + public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/GiftCardConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public synthetic fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; + public synthetic fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; + public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/GiftCardConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public synthetic fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; + public synthetic fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Landroid/app/Application;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; + public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public synthetic fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Landroid/app/Application;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; + public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/GiftCardConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public synthetic fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Landroid/app/Application;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; + public synthetic fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Landroid/app/Application;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; + public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/GiftCardConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun isPaymentMethodSupported (Lcom/adyen/checkout/components/core/PaymentMethod;)Z +} + diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt index ec7577e165..60b5d71ab8 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt @@ -8,7 +8,30 @@ package com.adyen.checkout.mealvoucher +import com.adyen.checkout.action.core.internal.DefaultActionHandlingComponent +import com.adyen.checkout.action.core.internal.ui.GenericActionDelegate +import com.adyen.checkout.components.core.PaymentMethodTypes +import com.adyen.checkout.components.core.internal.ComponentEventHandler import com.adyen.checkout.giftcard.GiftCardComponent +import com.adyen.checkout.giftcard.internal.ui.GiftCardDelegate +import com.adyen.checkout.mealvoucher.internal.provider.MealVoucherComponentProvider -// TODO extend from giftcard -typealias MealVoucherComponent = GiftCardComponent +class MealVoucherComponent internal constructor( + giftCardDelegate: GiftCardDelegate, + genericActionDelegate: GenericActionDelegate, + actionHandlingComponent: DefaultActionHandlingComponent, + internal val componentEventHandler: ComponentEventHandler, +) : GiftCardComponent(giftCardDelegate, genericActionDelegate, actionHandlingComponent, componentEventHandler) { + companion object { + @JvmField + val PROVIDER = MealVoucherComponentProvider() + + // TODO update it to correct txVariants + @JvmField + val PAYMENT_METHOD_TYPES = listOf( + PaymentMethodTypes.MEAL_VOUCHER_FR_GROUPEUP, + PaymentMethodTypes.MEAL_VOUCHER_FR_NATIXIS, + PaymentMethodTypes.MEAL_VOUCHER_FR_SODEXO, + ) + } +} diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt index 11c5f51b1f..8a8dc0be12 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt @@ -11,23 +11,48 @@ package com.adyen.checkout.mealvoucher.internal.provider import android.app.Application import androidx.annotation.RestrictTo import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelStoreOwner import androidx.savedstate.SavedStateRegistryOwner +import com.adyen.checkout.action.core.internal.DefaultActionHandlingComponent +import com.adyen.checkout.action.core.internal.provider.GenericActionComponentProvider import com.adyen.checkout.components.core.CheckoutConfiguration import com.adyen.checkout.components.core.Order import com.adyen.checkout.components.core.PaymentMethod +import com.adyen.checkout.components.core.internal.PaymentObserverRepository import com.adyen.checkout.components.core.internal.analytics.AnalyticsManager +import com.adyen.checkout.components.core.internal.analytics.AnalyticsManagerFactory +import com.adyen.checkout.components.core.internal.analytics.AnalyticsSource +import com.adyen.checkout.components.core.internal.data.api.DefaultPublicKeyRepository +import com.adyen.checkout.components.core.internal.data.api.PublicKeyService import com.adyen.checkout.components.core.internal.provider.PaymentComponentProvider +import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParamsMapper import com.adyen.checkout.components.core.internal.ui.model.DropInOverrideParams +import com.adyen.checkout.components.core.internal.util.get +import com.adyen.checkout.components.core.internal.util.viewModelFactory import com.adyen.checkout.core.exception.ComponentException +import com.adyen.checkout.core.internal.data.api.HttpClientFactory import com.adyen.checkout.core.internal.util.LocaleProvider +import com.adyen.checkout.cse.internal.CardEncryptorFactory +import com.adyen.checkout.giftcard.internal.GiftCardComponentEventHandler +import com.adyen.checkout.giftcard.internal.SessionsGiftCardComponentCallbackWrapper +import com.adyen.checkout.giftcard.internal.SessionsGiftCardComponentEventHandler +import com.adyen.checkout.giftcard.internal.ui.DefaultGiftCardDelegate +import com.adyen.checkout.giftcard.internal.ui.model.GiftCardComponentParamsMapper +import com.adyen.checkout.giftcard.toCheckoutConfiguration import com.adyen.checkout.mealvoucher.MealVoucherComponent import com.adyen.checkout.mealvoucher.MealVoucherComponentCallback import com.adyen.checkout.mealvoucher.MealVoucherComponentState import com.adyen.checkout.mealvoucher.MealVoucherConfiguration import com.adyen.checkout.mealvoucher.SessionsMealVoucherComponentCallback import com.adyen.checkout.sessions.core.CheckoutSession +import com.adyen.checkout.sessions.core.internal.SessionInteractor +import com.adyen.checkout.sessions.core.internal.SessionSavedStateHandleContainer +import com.adyen.checkout.sessions.core.internal.data.api.SessionRepository +import com.adyen.checkout.sessions.core.internal.data.api.SessionService import com.adyen.checkout.sessions.core.internal.provider.SessionPaymentComponentProvider +import com.adyen.checkout.sessions.core.internal.ui.model.SessionParamsFactory +import com.adyen.checkout.ui.core.internal.ui.SubmitHandler class MealVoucherComponentProvider @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) @@ -61,7 +86,61 @@ constructor( order: Order?, key: String? ): MealVoucherComponent { - TODO("Not yet implemented") + assertSupported(paymentMethod) + + val cardEncryptor = CardEncryptorFactory.provide() + val giftCardFactory = viewModelFactory(savedStateRegistryOwner, null) { savedStateHandle -> + // TODO check if we need meal voucher component params mapper + val componentParams = GiftCardComponentParamsMapper(CommonComponentParamsMapper()).mapToParams( + checkoutConfiguration = checkoutConfiguration, + deviceLocale = localeProvider.getLocale(application), + dropInOverrideParams = dropInOverrideParams, + componentSessionParams = null, + ) + + val httpClient = HttpClientFactory.getHttpClient(componentParams.environment) + val publicKeyService = PublicKeyService(httpClient) + + val analyticsManager = analyticsManager ?: AnalyticsManagerFactory().provide( + componentParams = componentParams, + application = application, + source = AnalyticsSource.PaymentComponent(paymentMethod.type.orEmpty()), + sessionId = null, + ) + + val giftCardDelegate = DefaultGiftCardDelegate( + observerRepository = PaymentObserverRepository(), + paymentMethod = paymentMethod, + order = order, + analyticsManager = analyticsManager, + publicKeyRepository = DefaultPublicKeyRepository(publicKeyService), + componentParams = componentParams, + cardEncryptor = cardEncryptor, + submitHandler = SubmitHandler(savedStateHandle), + // TODO pass component view type + ) + + val genericActionDelegate = + GenericActionComponentProvider(analyticsManager, dropInOverrideParams).getDelegate( + checkoutConfiguration = checkoutConfiguration, + savedStateHandle = savedStateHandle, + application = application, + ) + + MealVoucherComponent( + giftCardDelegate = giftCardDelegate, + genericActionDelegate = genericActionDelegate, + actionHandlingComponent = DefaultActionHandlingComponent(genericActionDelegate, giftCardDelegate), + componentEventHandler = GiftCardComponentEventHandler(), + ) + } + + return ViewModelProvider(viewModelStoreOwner, giftCardFactory)[key, MealVoucherComponent::class.java] + .also { component -> + component.observe(lifecycleOwner) { + component.componentEventHandler.onPaymentComponentEvent(it, componentCallback) + } + } } override fun get( @@ -75,9 +154,20 @@ constructor( order: Order?, key: String? ): MealVoucherComponent { - TODO("Not yet implemented") + return get( + savedStateRegistryOwner = savedStateRegistryOwner, + viewModelStoreOwner = viewModelStoreOwner, + lifecycleOwner = lifecycleOwner, + paymentMethod = paymentMethod, + checkoutConfiguration = configuration.toCheckoutConfiguration(), + application = application, + componentCallback = componentCallback, + order = order, + key = key, + ) } + @Suppress("LongMethod") override fun get( savedStateRegistryOwner: SavedStateRegistryOwner, viewModelStoreOwner: ViewModelStoreOwner, @@ -89,7 +179,84 @@ constructor( componentCallback: SessionsMealVoucherComponentCallback, key: String? ): MealVoucherComponent { - TODO("Not yet implemented") + assertSupported(paymentMethod) + + val cardEncryptor = CardEncryptorFactory.provide() + val giftCardFactory = viewModelFactory(savedStateRegistryOwner, null) { savedStateHandle -> + // TODO check if we need meal voucher component params mapper + val componentParams = GiftCardComponentParamsMapper(CommonComponentParamsMapper()).mapToParams( + checkoutConfiguration = checkoutConfiguration, + deviceLocale = localeProvider.getLocale(application), + dropInOverrideParams = dropInOverrideParams, + componentSessionParams = SessionParamsFactory.create(checkoutSession), + ) + + val httpClient = HttpClientFactory.getHttpClient(componentParams.environment) + val publicKeyService = PublicKeyService(httpClient) + + val analyticsManager = analyticsManager ?: AnalyticsManagerFactory().provide( + componentParams = componentParams, + application = application, + source = AnalyticsSource.PaymentComponent(paymentMethod.type.orEmpty()), + sessionId = checkoutSession.sessionSetupResponse.id, + ) + + val giftCardDelegate = DefaultGiftCardDelegate( + observerRepository = PaymentObserverRepository(), + paymentMethod = paymentMethod, + order = checkoutSession.order, + analyticsManager = analyticsManager, + publicKeyRepository = DefaultPublicKeyRepository(publicKeyService), + componentParams = componentParams, + cardEncryptor = cardEncryptor, + submitHandler = SubmitHandler(savedStateHandle), + // TODO pass component view type + ) + + val genericActionDelegate = + GenericActionComponentProvider(analyticsManager, dropInOverrideParams).getDelegate( + checkoutConfiguration = checkoutConfiguration, + savedStateHandle = savedStateHandle, + application = application, + ) + + val sessionSavedStateHandleContainer = SessionSavedStateHandleContainer( + savedStateHandle = savedStateHandle, + checkoutSession = checkoutSession, + ) + + val sessionInteractor = SessionInteractor( + sessionRepository = SessionRepository( + sessionService = SessionService(httpClient), + clientKey = componentParams.clientKey, + ), + sessionModel = sessionSavedStateHandleContainer.getSessionModel(), + isFlowTakenOver = sessionSavedStateHandleContainer.isFlowTakenOver ?: false, + ) + + val sessionsGiftCardComponentEventHandler = SessionsGiftCardComponentEventHandler( + sessionInteractor = sessionInteractor, + sessionSavedStateHandleContainer = sessionSavedStateHandleContainer, + ) + + MealVoucherComponent( + giftCardDelegate = giftCardDelegate, + genericActionDelegate = genericActionDelegate, + actionHandlingComponent = DefaultActionHandlingComponent(genericActionDelegate, giftCardDelegate), + componentEventHandler = sessionsGiftCardComponentEventHandler, + ) + } + + return ViewModelProvider(viewModelStoreOwner, giftCardFactory)[key, MealVoucherComponent::class.java] + .also { component -> + val internalComponentCallback = SessionsGiftCardComponentCallbackWrapper( + component, + componentCallback, + ) + component.observe(lifecycleOwner) { + component.componentEventHandler.onPaymentComponentEvent(it, internalComponentCallback) + } + } } override fun get( @@ -103,7 +270,17 @@ constructor( componentCallback: SessionsMealVoucherComponentCallback, key: String? ): MealVoucherComponent { - TODO("Not yet implemented") + return get( + savedStateRegistryOwner = savedStateRegistryOwner, + viewModelStoreOwner = viewModelStoreOwner, + lifecycleOwner = lifecycleOwner, + checkoutSession = checkoutSession, + paymentMethod = paymentMethod, + checkoutConfiguration = configuration.toCheckoutConfiguration(), + application = application, + componentCallback = componentCallback, + key = key, + ) } @Suppress("UnusedPrivateMember") @@ -114,7 +291,6 @@ constructor( } override fun isPaymentMethodSupported(paymentMethod: PaymentMethod): Boolean { - // TODO create PAYMENT_METHOD_TYPES after extending MealVoucherComponent from GiftCardComponent return MealVoucherComponent.PAYMENT_METHOD_TYPES.contains(paymentMethod.type) } } From 906fd4fb8e92a5322f72834561a6b67e7da38f77 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Wed, 17 Jul 2024 15:16:57 +0200 Subject: [PATCH 227/299] Implement MealVoucherViewProvider COAND-683 --- .../components/core/PaymentMethodTypes.kt | 3 ++ drop-in/build.gradle | 1 + .../internal/provider/ComponentProvider.kt | 12 ++++++ .../internal/provider/FragmentProvider.kt | 6 ++- .../provider/GiftCardComponentProvider.kt | 3 ++ .../internal/ui/DefaultGiftCardDelegate.kt | 3 +- .../internal/ui/GiftCardViewProvider.kt | 6 ++- .../giftcard/GiftCardComponentTest.kt | 6 +-- .../ui/DefaultGiftCardDelegateTest.kt | 1 + .../provider/MealVoucherComponentProvider.kt | 5 ++- .../internal/ui/MealVoucherViewProvider.kt | 33 +++++++++++++++ .../internal/ui/view/MealVoucherView.kt | 42 +++++++++++++++++++ 12 files changed, 112 insertions(+), 9 deletions(-) create mode 100644 mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt create mode 100644 mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt index e340d0a764..8317ac51b4 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt @@ -121,6 +121,9 @@ object PaymentMethodTypes { GOOGLE_PAY_LEGACY, IDEAL, MB_WAY, + MEAL_VOUCHER_FR_GROUPEUP, + MEAL_VOUCHER_FR_NATIXIS, + MEAL_VOUCHER_FR_SODEXO, MOLPAY_MALAYSIA, MOLPAY_THAILAND, MOLPAY_VIETNAM, diff --git a/drop-in/build.gradle b/drop-in/build.gradle index b8cdf6b877..2cd50660a0 100644 --- a/drop-in/build.gradle +++ b/drop-in/build.gradle @@ -63,6 +63,7 @@ dependencies { api project(':ideal') api project(":instant") api project(':mbway') + api project(':mealvoucher') api project(':molpay') api project(':online-banking-cz') api project(':online-banking-jp') diff --git a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/ComponentProvider.kt b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/ComponentProvider.kt index 9dc9753b93..6474b5ecea 100644 --- a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/ComponentProvider.kt +++ b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/ComponentProvider.kt @@ -67,6 +67,9 @@ import com.adyen.checkout.instant.internal.provider.InstantPaymentComponentProvi import com.adyen.checkout.mbway.MBWayComponent import com.adyen.checkout.mbway.MBWayComponentState import com.adyen.checkout.mbway.internal.provider.MBWayComponentProvider +import com.adyen.checkout.mealvoucher.MealVoucherComponent +import com.adyen.checkout.mealvoucher.MealVoucherComponentCallback +import com.adyen.checkout.mealvoucher.internal.provider.MealVoucherComponentProvider import com.adyen.checkout.molpay.MolpayComponent import com.adyen.checkout.molpay.MolpayComponentState import com.adyen.checkout.molpay.internal.provider.MolpayComponentProvider @@ -333,6 +336,15 @@ internal fun getComponentFor( ) } + checkCompileOnly { MealVoucherComponent.PROVIDER.isPaymentMethodSupported(paymentMethod) } -> { + MealVoucherComponentProvider(dropInOverrideParams, analyticsManager).get( + fragment = fragment, + paymentMethod = paymentMethod, + checkoutConfiguration = checkoutConfiguration, + callback = componentCallback as MealVoucherComponentCallback, + ) + } + checkCompileOnly { MolpayComponent.PROVIDER.isPaymentMethodSupported(paymentMethod) } -> { MolpayComponentProvider(dropInOverrideParams, analyticsManager).get( fragment = fragment, diff --git a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/FragmentProvider.kt b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/FragmentProvider.kt index 954e795ee4..ae85e9459a 100644 --- a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/FragmentProvider.kt +++ b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/FragmentProvider.kt @@ -21,6 +21,7 @@ import com.adyen.checkout.dropin.internal.ui.GooglePayComponentDialogFragment import com.adyen.checkout.dropin.internal.util.checkCompileOnly import com.adyen.checkout.giftcard.GiftCardComponent import com.adyen.checkout.googlepay.GooglePayComponent +import com.adyen.checkout.mealvoucher.MealVoucherComponent internal fun getFragmentForStoredPaymentMethod( storedPaymentMethod: StoredPaymentMethod, @@ -47,7 +48,10 @@ internal fun getFragmentForPaymentMethod(paymentMethod: PaymentMethod): DropInBo BacsDirectDebitDialogFragment.newInstance(paymentMethod) } - checkCompileOnly { GiftCardComponent.PROVIDER.isPaymentMethodSupported(paymentMethod) } -> { + checkCompileOnly { + GiftCardComponent.PROVIDER.isPaymentMethodSupported(paymentMethod) || + MealVoucherComponent.PROVIDER.isPaymentMethodSupported(paymentMethod) + } -> { GiftCardComponentDialogFragment.newInstance(paymentMethod) } diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/provider/GiftCardComponentProvider.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/provider/GiftCardComponentProvider.kt index 68df28ecdb..8bb876e46e 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/provider/GiftCardComponentProvider.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/provider/GiftCardComponentProvider.kt @@ -42,6 +42,7 @@ import com.adyen.checkout.giftcard.internal.GiftCardComponentEventHandler import com.adyen.checkout.giftcard.internal.SessionsGiftCardComponentCallbackWrapper import com.adyen.checkout.giftcard.internal.SessionsGiftCardComponentEventHandler import com.adyen.checkout.giftcard.internal.ui.DefaultGiftCardDelegate +import com.adyen.checkout.giftcard.internal.ui.GiftCardComponentViewType import com.adyen.checkout.giftcard.internal.ui.model.GiftCardComponentParamsMapper import com.adyen.checkout.giftcard.toCheckoutConfiguration import com.adyen.checkout.sessions.core.CheckoutSession @@ -114,6 +115,7 @@ constructor( componentParams = componentParams, cardEncryptor = cardEncryptor, submitHandler = SubmitHandler(savedStateHandle), + componentViewType = GiftCardComponentViewType(), ) val genericActionDelegate = @@ -205,6 +207,7 @@ constructor( componentParams = componentParams, cardEncryptor = cardEncryptor, submitHandler = SubmitHandler(savedStateHandle), + componentViewType = GiftCardComponentViewType(), ) val genericActionDelegate = diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt index bab37da4c3..bcb3ffa8e5 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt @@ -68,6 +68,7 @@ class DefaultGiftCardDelegate( override val componentParams: GiftCardComponentParams, private val cardEncryptor: BaseCardEncryptor, private val submitHandler: SubmitHandler, + componentViewType: GiftCardComponentViewType ) : GiftCardDelegate { private val inputData: GiftCardInputData = GiftCardInputData() @@ -83,7 +84,7 @@ class DefaultGiftCardDelegate( private val exceptionChannel: Channel = bufferedChannel() override val exceptionFlow: Flow = exceptionChannel.receiveAsFlow() - private val _viewFlow: MutableStateFlow = MutableStateFlow(GiftCardComponentViewType) + private val _viewFlow: MutableStateFlow = MutableStateFlow(componentViewType) override val viewFlow: Flow = _viewFlow override val submitFlow: Flow = submitHandler.submitFlow diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/GiftCardViewProvider.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/GiftCardViewProvider.kt index 640e238629..12f642cac2 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/GiftCardViewProvider.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/GiftCardViewProvider.kt @@ -9,6 +9,7 @@ package com.adyen.checkout.giftcard.internal.ui import android.content.Context +import androidx.annotation.RestrictTo import com.adyen.checkout.giftcard.R import com.adyen.checkout.giftcard.internal.ui.view.GiftCardView import com.adyen.checkout.ui.core.internal.ui.ButtonComponentViewType @@ -23,13 +24,14 @@ internal object GiftCardViewProvider : ViewProvider { context: Context, ): ComponentView { return when (viewType) { - GiftCardComponentViewType -> GiftCardView(context) + is GiftCardComponentViewType -> GiftCardView(context) else -> throw IllegalArgumentException("Unsupported view type") } } } -internal object GiftCardComponentViewType : ButtonComponentViewType { +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +open class GiftCardComponentViewType : ButtonComponentViewType { override val viewProvider: ViewProvider = GiftCardViewProvider override val buttonTextResId: Int = R.string.checkout_giftcard_redeem_button } diff --git a/giftcard/src/test/java/com/adyen/checkout/giftcard/GiftCardComponentTest.kt b/giftcard/src/test/java/com/adyen/checkout/giftcard/GiftCardComponentTest.kt index 925eafdc05..eac6dc18a6 100644 --- a/giftcard/src/test/java/com/adyen/checkout/giftcard/GiftCardComponentTest.kt +++ b/giftcard/src/test/java/com/adyen/checkout/giftcard/GiftCardComponentTest.kt @@ -51,7 +51,7 @@ internal class GiftCardComponentTest( @BeforeEach fun before() { - whenever(giftCardDelegate.viewFlow) doReturn MutableStateFlow(GiftCardComponentViewType) + whenever(giftCardDelegate.viewFlow) doReturn MutableStateFlow(GiftCardComponentViewType()) whenever(genericActionDelegate.viewFlow) doReturn MutableStateFlow(null) component = GiftCardComponent( @@ -100,7 +100,7 @@ internal class GiftCardComponentTest( @Test fun `when component is initialized then view flow should match gift card delegate view flow`() = runTest { component.viewFlow.test { - assertEquals(GiftCardComponentViewType, awaitItem()) + assert(awaitItem() is GiftCardComponentViewType) expectNoEvents() } } @@ -140,7 +140,7 @@ internal class GiftCardComponentTest( component.viewFlow.test { // this value should match the value of the main delegate and not the action delegate // and in practice the initial value of the action delegate view flow is always null so it should be ignored - assertEquals(GiftCardComponentViewType, awaitItem()) + assert(awaitItem() is GiftCardComponentViewType) actionDelegateViewFlow.emit(TestComponentViewType.VIEW_TYPE_2) assertEquals(TestComponentViewType.VIEW_TYPE_2, awaitItem()) diff --git a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt index d11287994b..0097316b0c 100644 --- a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt +++ b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt @@ -434,6 +434,7 @@ internal class DefaultGiftCardDelegateTest( cardEncryptor = cardEncryptor, analyticsManager = analyticsManager, submitHandler = submitHandler, + componentViewType = GiftCardComponentViewType(), ) private fun createCheckoutConfiguration( diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt index 8a8dc0be12..556d85d4a9 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt @@ -45,6 +45,7 @@ import com.adyen.checkout.mealvoucher.MealVoucherComponentCallback import com.adyen.checkout.mealvoucher.MealVoucherComponentState import com.adyen.checkout.mealvoucher.MealVoucherConfiguration import com.adyen.checkout.mealvoucher.SessionsMealVoucherComponentCallback +import com.adyen.checkout.mealvoucher.internal.ui.MealVoucherComponentViewType import com.adyen.checkout.sessions.core.CheckoutSession import com.adyen.checkout.sessions.core.internal.SessionInteractor import com.adyen.checkout.sessions.core.internal.SessionSavedStateHandleContainer @@ -117,7 +118,7 @@ constructor( componentParams = componentParams, cardEncryptor = cardEncryptor, submitHandler = SubmitHandler(savedStateHandle), - // TODO pass component view type + componentViewType = MealVoucherComponentViewType, ) val genericActionDelegate = @@ -210,7 +211,7 @@ constructor( componentParams = componentParams, cardEncryptor = cardEncryptor, submitHandler = SubmitHandler(savedStateHandle), - // TODO pass component view type + componentViewType = MealVoucherComponentViewType, ) val genericActionDelegate = diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt new file mode 100644 index 0000000000..fa803fd24f --- /dev/null +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 17/7/2024. + */ + +package com.adyen.checkout.mealvoucher.internal.ui + +import android.content.Context +import com.adyen.checkout.giftcard.internal.ui.GiftCardComponentViewType +import com.adyen.checkout.mealvoucher.internal.ui.view.MealVoucherView +import com.adyen.checkout.ui.core.internal.ui.ButtonComponentViewType +import com.adyen.checkout.ui.core.internal.ui.ComponentView +import com.adyen.checkout.ui.core.internal.ui.ComponentViewType +import com.adyen.checkout.ui.core.internal.ui.ViewProvider + +internal object MealVoucherViewProvider : ViewProvider { + override fun getView(viewType: ComponentViewType, context: Context): ComponentView { + return when (viewType) { + MealVoucherComponentViewType -> MealVoucherView(context) + else -> throw IllegalArgumentException("Unsupported view type") + } + } +} + +internal object MealVoucherComponentViewType : GiftCardComponentViewType() { + override val viewProvider: ViewProvider = MealVoucherViewProvider + + // TODO update button text if necessary + override val buttonTextResId: Int = ButtonComponentViewType.DEFAULT_BUTTON_TEXT_RES_ID +} diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt new file mode 100644 index 0000000000..123bc934d5 --- /dev/null +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 17/7/2024. + */ + +package com.adyen.checkout.mealvoucher.internal.ui.view + +import android.content.Context +import android.util.AttributeSet +import android.view.View +import android.widget.LinearLayout +import com.adyen.checkout.components.core.internal.ui.ComponentDelegate +import com.adyen.checkout.ui.core.internal.ui.ComponentView +import kotlinx.coroutines.CoroutineScope + +internal class MealVoucherView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : + LinearLayout( + context, + attrs, + defStyleAttr, + ), + ComponentView { + + override fun initView(delegate: ComponentDelegate, coroutineScope: CoroutineScope, localizedContext: Context) { + TODO("Not yet implemented") + } + + override fun highlightValidationErrors() { + TODO("Not yet implemented") + } + + override fun getView(): View { + TODO("Not yet implemented") + } +} From f834d2d09854a03a5f8aad1362739b5a021c983f Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Wed, 17 Jul 2024 15:43:03 +0200 Subject: [PATCH 228/299] Move ExpiryDateInput and ExpiryDate to ui-core COAND-683 --- bcmc/src/main/res/layout/bcmc_view.xml | 2 +- card/api/card.api | 18 ----- .../card/internal/ui/DefaultCardDelegate.kt | 2 +- .../card/internal/ui/StoredCardDelegate.kt | 2 +- .../card/internal/ui/model/CardInputData.kt | 1 + .../card/internal/ui/model/CardOutputData.kt | 1 + .../card/internal/ui/view/CardView.kt | 2 +- .../card/internal/util/CardValidationUtils.kt | 6 +- card/src/main/res/layout/card_view.xml | 2 +- card/src/main/res/layout/stored_card_view.xml | 2 +- .../internal/ui/DefaultCardDelegateTest.kt | 2 +- .../internal/ui/StoredCardDelegateTest.kt | 2 +- .../internal/util/CardValidationUtilsTest.kt | 72 +++++++++---------- ui-core/api/ui-core.api | 18 +++++ .../ui/core}/internal/ui/model/ExpiryDate.kt | 6 +- .../core}/internal/ui/view/ExpiryDateInput.kt | 9 ++- 16 files changed, 74 insertions(+), 73 deletions(-) rename {card/src/main/java/com/adyen/checkout/card => ui-core/src/main/java/com/adyen/checkout/ui/core}/internal/ui/model/ExpiryDate.kt (78%) rename {card/src/main/java/com/adyen/checkout/card => ui-core/src/main/java/com/adyen/checkout/ui/core}/internal/ui/view/ExpiryDateInput.kt (94%) diff --git a/bcmc/src/main/res/layout/bcmc_view.xml b/bcmc/src/main/res/layout/bcmc_view.xml index 2006a79cc0..d5eced4735 100644 --- a/bcmc/src/main/res/layout/bcmc_view.xml +++ b/bcmc/src/main/res/layout/bcmc_view.xml @@ -62,7 +62,7 @@ android:layout_height="wrap_content" android:layout_weight="1"> - (Ljava/util/List;ZLcom/adyen/checkout/card/CardBrand;)V public final fun component1 ()Ljava/util/List; @@ -612,21 +609,6 @@ public final class com/adyen/checkout/card/internal/ui/view/CardNumberInput$Comp public final class com/adyen/checkout/card/internal/ui/view/CardView$Companion { } -public final class com/adyen/checkout/card/internal/ui/view/ExpiryDateInput : com/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText { - public static final field Companion Lcom/adyen/checkout/card/internal/ui/view/ExpiryDateInput$Companion; - public static final field SEPARATOR Ljava/lang/String; - public fun (Landroid/content/Context;)V - public fun (Landroid/content/Context;Landroid/util/AttributeSet;)V - public fun (Landroid/content/Context;Landroid/util/AttributeSet;I)V - public synthetic fun (Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun afterTextChanged (Landroid/text/Editable;)V - public final fun getDate ()Lcom/adyen/checkout/card/internal/ui/model/ExpiryDate; - public final fun setDate (Lcom/adyen/checkout/card/internal/ui/model/ExpiryDate;)V -} - -public final class com/adyen/checkout/card/internal/ui/view/ExpiryDateInput$Companion { -} - public final class com/adyen/checkout/card/internal/ui/view/SecurityCodeInput : com/adyen/checkout/card/internal/ui/view/CardNumberInput { public static final field Companion Lcom/adyen/checkout/card/internal/ui/view/SecurityCodeInput$Companion; public fun (Landroid/content/Context;)V diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt index 441bd017a8..2b576aceb7 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt @@ -25,7 +25,6 @@ import com.adyen.checkout.card.internal.ui.model.CardComponentParams import com.adyen.checkout.card.internal.ui.model.CardInputData import com.adyen.checkout.card.internal.ui.model.CardListItem import com.adyen.checkout.card.internal.ui.model.CardOutputData -import com.adyen.checkout.card.internal.ui.model.ExpiryDate import com.adyen.checkout.card.internal.ui.model.InputFieldUIState import com.adyen.checkout.card.internal.ui.model.InstallmentParams import com.adyen.checkout.card.internal.ui.view.InstallmentModel @@ -73,6 +72,7 @@ import com.adyen.checkout.ui.core.internal.ui.SubmitHandler import com.adyen.checkout.ui.core.internal.ui.model.AddressListItem import com.adyen.checkout.ui.core.internal.ui.model.AddressOutputData import com.adyen.checkout.ui.core.internal.ui.model.AddressParams +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.util.AddressFormUtils import com.adyen.checkout.ui.core.internal.util.AddressValidationUtils import com.adyen.checkout.ui.core.internal.util.SocialSecurityNumberUtils diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt index a977dd9d92..572a6341b1 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt @@ -19,7 +19,6 @@ import com.adyen.checkout.card.internal.data.model.DetectedCardType import com.adyen.checkout.card.internal.ui.model.CardComponentParams import com.adyen.checkout.card.internal.ui.model.CardInputData import com.adyen.checkout.card.internal.ui.model.CardOutputData -import com.adyen.checkout.card.internal.ui.model.ExpiryDate import com.adyen.checkout.card.internal.ui.model.InputFieldUIState import com.adyen.checkout.card.internal.ui.model.StoredCVCVisibility import com.adyen.checkout.card.internal.util.CardValidationUtils @@ -56,6 +55,7 @@ import com.adyen.checkout.ui.core.internal.ui.PaymentComponentUIEvent import com.adyen.checkout.ui.core.internal.ui.PaymentComponentUIState import com.adyen.checkout.ui.core.internal.ui.SubmitHandler import com.adyen.checkout.ui.core.internal.ui.model.AddressOutputData +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.util.AddressValidationUtils import com.adyen.threeds2.ThreeDS2Service import kotlinx.coroutines.CoroutineScope diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardInputData.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardInputData.kt index a2220b0373..2197aef39a 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardInputData.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardInputData.kt @@ -12,6 +12,7 @@ import com.adyen.checkout.card.internal.ui.view.InstallmentModel import com.adyen.checkout.components.core.internal.ui.model.AddressInputModel import com.adyen.checkout.components.core.internal.ui.model.InputData import com.adyen.checkout.ui.core.internal.ui.model.AddressLookupInputData +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) data class CardInputData( diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardOutputData.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardOutputData.kt index 2808cf026b..75ee9203b0 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardOutputData.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardOutputData.kt @@ -15,6 +15,7 @@ import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.OutputData import com.adyen.checkout.ui.core.internal.ui.AddressFormUIState import com.adyen.checkout.ui.core.internal.ui.model.AddressOutputData +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) data class CardOutputData( diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt index 94a67ec482..23c99424f7 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt @@ -31,7 +31,6 @@ import com.adyen.checkout.card.internal.data.model.DetectedCardType import com.adyen.checkout.card.internal.ui.CardDelegate import com.adyen.checkout.card.internal.ui.model.CardListItem import com.adyen.checkout.card.internal.ui.model.CardOutputData -import com.adyen.checkout.card.internal.ui.model.ExpiryDate import com.adyen.checkout.card.internal.ui.model.InputFieldUIState import com.adyen.checkout.card.internal.util.InstallmentUtils import com.adyen.checkout.components.core.internal.ui.ComponentDelegate @@ -43,6 +42,7 @@ import com.adyen.checkout.ui.core.internal.ui.AddressFormUIState import com.adyen.checkout.ui.core.internal.ui.ComponentView import com.adyen.checkout.ui.core.internal.ui.loadLogo import com.adyen.checkout.ui.core.internal.ui.model.AddressOutputData +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.ui.view.AdyenTextInputEditText import com.adyen.checkout.ui.core.internal.ui.view.RoundCornerImageView import com.adyen.checkout.ui.core.internal.util.hideError diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index e8ae57ac35..d0ad0723a2 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -14,11 +14,11 @@ import com.adyen.checkout.card.CardType import com.adyen.checkout.card.R import com.adyen.checkout.card.internal.data.model.Brand import com.adyen.checkout.card.internal.data.model.DetectedCardType -import com.adyen.checkout.card.internal.ui.model.ExpiryDate import com.adyen.checkout.card.internal.ui.model.InputFieldUIState import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.core.internal.util.StringUtil +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import java.util.Calendar import java.util.GregorianCalendar @@ -100,12 +100,12 @@ object CardValidationUtils { isInMinMonthRange && isInMaxYearRange -> FieldState(expiryDate, Validation.Valid) !isInMaxYearRange -> FieldState( expiryDate, - Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_far_in_future) + Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_far_in_future), ) !isInMinMonthRange -> FieldState( expiryDate, - Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_old) + Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_old), ) else -> invalidState diff --git a/card/src/main/res/layout/card_view.xml b/card/src/main/res/layout/card_view.xml index 80ff6dad6e..7b91ff7c49 100644 --- a/card/src/main/res/layout/card_view.xml +++ b/card/src/main/res/layout/card_view.xml @@ -100,7 +100,7 @@ android:layout_marginEnd="@dimen/standard_half_margin" android:layout_weight="1"> - - (Landroid/content/Context;)V public fun (Landroid/content/Context;Landroid/util/AttributeSet;)V @@ -271,6 +274,21 @@ public abstract interface class com/adyen/checkout/ui/core/internal/ui/view/Adye public abstract fun onTextChanged (Landroid/text/Editable;)V } +public final class com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput : com/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText { + public static final field Companion Lcom/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput$Companion; + public static final field SEPARATOR Ljava/lang/String; + public fun (Landroid/content/Context;)V + public fun (Landroid/content/Context;Landroid/util/AttributeSet;)V + public fun (Landroid/content/Context;Landroid/util/AttributeSet;I)V + public synthetic fun (Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun afterTextChanged (Landroid/text/Editable;)V + public final fun getDate ()Lcom/adyen/checkout/ui/core/internal/ui/model/ExpiryDate; + public final fun setDate (Lcom/adyen/checkout/ui/core/internal/ui/model/ExpiryDate;)V +} + +public final class com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput$Companion { +} + public final class com/adyen/checkout/ui/core/internal/ui/view/PaymentInProgressView : androidx/constraintlayout/widget/ConstraintLayout, com/adyen/checkout/ui/core/internal/ui/ComponentView { public fun getView ()Landroid/view/View; public fun highlightValidationErrors ()V diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/ExpiryDate.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/model/ExpiryDate.kt similarity index 78% rename from card/src/main/java/com/adyen/checkout/card/internal/ui/model/ExpiryDate.kt rename to ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/model/ExpiryDate.kt index f33d2599f5..f175b67482 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/ExpiryDate.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/model/ExpiryDate.kt @@ -1,11 +1,11 @@ /* - * Copyright (c) 2019 Adyen N.V. + * Copyright (c) 2024 Adyen N.V. * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by arman on 16/9/2019. + * Created by ararat on 17/7/2024. */ -package com.adyen.checkout.card.internal.ui.model +package com.adyen.checkout.ui.core.internal.ui.model import androidx.annotation.RestrictTo diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/ExpiryDateInput.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt similarity index 94% rename from card/src/main/java/com/adyen/checkout/card/internal/ui/view/ExpiryDateInput.kt rename to ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt index bffb91417c..cd13c7c3e9 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/ExpiryDateInput.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt @@ -1,21 +1,20 @@ /* - * Copyright (c) 2022 Adyen N.V. + * Copyright (c) 2024 Adyen N.V. * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by caiof on 25/3/2022. + * Created by ararat on 17/7/2024. */ -package com.adyen.checkout.card.internal.ui.view +package com.adyen.checkout.ui.core.internal.ui.view import android.content.Context import android.os.Build import android.text.Editable import android.util.AttributeSet -import com.adyen.checkout.card.internal.ui.model.ExpiryDate import com.adyen.checkout.core.AdyenLogLevel import com.adyen.checkout.core.internal.util.StringUtil.normalize import com.adyen.checkout.core.internal.util.adyenLog -import com.adyen.checkout.ui.core.internal.ui.view.AdyenTextInputEditText +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import java.text.ParseException import java.text.SimpleDateFormat import java.util.Calendar From 42ee825cdb5f72687b52e2fe212020ea52069444 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Thu, 18 Jul 2024 13:55:11 +0200 Subject: [PATCH 229/299] Move SecurityCodeInput to ui-core and extend from AdyenTextInputEditText instead of CardNumberInput COAND-683 --- .../checkout/card/internal/ui/view/CardNumberInput.kt | 5 ++--- .../com/adyen/checkout/card/internal/ui/view/CardView.kt | 1 + .../checkout/card/internal/ui/view/StoredCardView.kt | 1 + card/src/main/res/layout/card_view.xml | 2 +- card/src/main/res/layout/stored_card_view.xml | 2 +- .../ui/core}/internal/ui/view/SecurityCodeInput.kt | 8 ++++---- 6 files changed, 10 insertions(+), 9 deletions(-) rename {card/src/main/java/com/adyen/checkout/card => ui-core/src/main/java/com/adyen/checkout/ui/core}/internal/ui/view/SecurityCodeInput.kt (77%) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardNumberInput.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardNumberInput.kt index b72f24e95f..1a92b6e5db 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardNumberInput.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardNumberInput.kt @@ -21,12 +21,11 @@ import com.adyen.checkout.ui.core.internal.ui.view.AdyenTextInputEditText /** * Input that support formatting for card number. */ -open class CardNumberInput @JvmOverloads constructor( +class CardNumberInput @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : - AdyenTextInputEditText(context, attrs, defStyleAttr) { +) : AdyenTextInputEditText(context, attrs, defStyleAttr) { private var isAmexCard = false override val rawValue: String diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt index 23c99424f7..e68b4c0274 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt @@ -45,6 +45,7 @@ import com.adyen.checkout.ui.core.internal.ui.model.AddressOutputData import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.ui.view.AdyenTextInputEditText import com.adyen.checkout.ui.core.internal.ui.view.RoundCornerImageView +import com.adyen.checkout.ui.core.internal.ui.view.SecurityCodeInput import com.adyen.checkout.ui.core.internal.util.hideError import com.adyen.checkout.ui.core.internal.util.isVisible import com.adyen.checkout.ui.core.internal.util.setLocalizedHintFromStyle diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/StoredCardView.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/StoredCardView.kt index 44ae5c95c4..df41020e2e 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/StoredCardView.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/StoredCardView.kt @@ -29,6 +29,7 @@ import com.adyen.checkout.core.internal.util.BuildUtils import com.adyen.checkout.ui.core.internal.ui.ComponentView import com.adyen.checkout.ui.core.internal.ui.loadLogo import com.adyen.checkout.ui.core.internal.ui.view.RoundCornerImageView +import com.adyen.checkout.ui.core.internal.ui.view.SecurityCodeInput import com.adyen.checkout.ui.core.internal.util.hideError import com.adyen.checkout.ui.core.internal.util.setLocalizedHintFromStyle import com.adyen.checkout.ui.core.internal.util.showError diff --git a/card/src/main/res/layout/card_view.xml b/card/src/main/res/layout/card_view.xml index 7b91ff7c49..a2e7806fdf 100644 --- a/card/src/main/res/layout/card_view.xml +++ b/card/src/main/res/layout/card_view.xml @@ -115,7 +115,7 @@ android:layout_marginStart="@dimen/standard_half_margin" android:layout_weight="1"> - - Date: Thu, 18 Jul 2024 14:42:58 +0200 Subject: [PATCH 230/299] Create meal voucher view COAND-683 --- giftcard/api/giftcard.api | 29 ++++ .../internal/ui/view/GiftCardNumberInput.kt | 5 +- mealvoucher/api/mealvoucher.api | 12 ++ .../internal/ui/view/MealVoucherView.kt | 138 +++++++++++++++++- .../src/main/res/layout/meal_voucher_view.xml | 65 +++++++++ mealvoucher/src/main/res/values/strings.xml | 14 ++ mealvoucher/src/main/res/values/styles.xml | 29 ++++ 7 files changed, 286 insertions(+), 6 deletions(-) create mode 100644 mealvoucher/src/main/res/layout/meal_voucher_view.xml create mode 100644 mealvoucher/src/main/res/values/strings.xml create mode 100644 mealvoucher/src/main/res/values/styles.xml diff --git a/giftcard/api/giftcard.api b/giftcard/api/giftcard.api index 29648a9423..7c78cdecb0 100644 --- a/giftcard/api/giftcard.api +++ b/giftcard/api/giftcard.api @@ -225,6 +225,35 @@ public final class com/adyen/checkout/giftcard/internal/provider/GiftCardCompone public final class com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate$Companion { } +public final class com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams : com/adyen/checkout/components/core/internal/ui/model/ButtonParams, com/adyen/checkout/components/core/internal/ui/model/ComponentParams { + public fun (Lcom/adyen/checkout/components/core/internal/ui/model/CommonComponentParams;ZZ)V + public final fun component2 ()Z + public final fun component3 ()Z + public final fun copy (Lcom/adyen/checkout/components/core/internal/ui/model/CommonComponentParams;ZZ)Lcom/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams; + public static synthetic fun copy$default (Lcom/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams;Lcom/adyen/checkout/components/core/internal/ui/model/CommonComponentParams;ZZILjava/lang/Object;)Lcom/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams; + public fun equals (Ljava/lang/Object;)Z + public fun getAmount ()Lcom/adyen/checkout/components/core/Amount; + public fun getAnalyticsParams ()Lcom/adyen/checkout/components/core/internal/ui/model/AnalyticsParams; + public fun getClientKey ()Ljava/lang/String; + public fun getEnvironment ()Lcom/adyen/checkout/core/Environment; + public fun getShopperLocale ()Ljava/util/Locale; + public fun hashCode ()I + public fun isCreatedByDropIn ()Z + public final fun isPinRequired ()Z + public fun isSubmitButtonVisible ()Z + public fun toString ()Ljava/lang/String; +} + +public final class com/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput : com/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText { + public static final field Companion Lcom/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput$Companion; + public fun (Landroid/content/Context;)V + public fun (Landroid/content/Context;Landroid/util/AttributeSet;)V + public fun getRawValue ()Ljava/lang/String; +} + +public final class com/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput$Companion { +} + public final class com/adyen/checkout/giftcard/internal/util/GiftCardBalanceStatus$FullPayment : com/adyen/checkout/giftcard/internal/util/GiftCardBalanceStatus { public fun (Lcom/adyen/checkout/components/core/Amount;Lcom/adyen/checkout/components/core/Amount;)V public final fun getAmountPaid ()Lcom/adyen/checkout/components/core/Amount; diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput.kt index 7ef348f58a..fc3c1a2e51 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput.kt @@ -14,6 +14,7 @@ import android.text.Editable import android.text.InputType import android.text.method.DigitsKeyListener import android.util.AttributeSet +import androidx.annotation.RestrictTo import androidx.autofill.HintConstants import com.adyen.checkout.giftcard.internal.util.GiftCardNumberUtils import com.adyen.checkout.giftcard.internal.util.GiftCardNumberUtils.DIGIT_SEPARATOR @@ -21,7 +22,9 @@ import com.adyen.checkout.giftcard.internal.util.GiftCardNumberUtils.MAXIMUM_GIF import com.adyen.checkout.giftcard.internal.util.GiftCardNumberUtils.MAX_DIGIT_SEPARATOR_COUNT import com.adyen.checkout.ui.core.internal.ui.view.AdyenTextInputEditText -internal class GiftCardNumberInput( +class GiftCardNumberInput +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/mealvoucher/api/mealvoucher.api b/mealvoucher/api/mealvoucher.api index 6453837eef..f36274c09c 100644 --- a/mealvoucher/api/mealvoucher.api +++ b/mealvoucher/api/mealvoucher.api @@ -15,6 +15,18 @@ public final class com/adyen/checkout/mealvoucher/MealVoucherComponent : com/ady public final class com/adyen/checkout/mealvoucher/MealVoucherComponent$Companion { } +public final class com/adyen/checkout/mealvoucher/databinding/MealVoucherViewBinding : androidx/viewbinding/ViewBinding { + public final field editTextMealVoucherCardNumber Lcom/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput; + public final field editTextMealVoucherExpiryDate Lcom/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput; + public final field editTextMealVoucherSecurityCode Lcom/adyen/checkout/ui/core/internal/ui/view/SecurityCodeInput; + public final field textInputLayoutMealVoucherCardNumber Lcom/google/android/material/textfield/TextInputLayout; + public final field textInputLayoutMealVoucherExpiryDate Lcom/google/android/material/textfield/TextInputLayout; + public final field textInputLayoutMealVoucherSecurityCode Lcom/google/android/material/textfield/TextInputLayout; + public static fun bind (Landroid/view/View;)Lcom/adyen/checkout/mealvoucher/databinding/MealVoucherViewBinding; + public fun getRoot ()Landroid/view/View; + public static fun inflate (Landroid/view/LayoutInflater;Landroid/view/ViewGroup;)Lcom/adyen/checkout/mealvoucher/databinding/MealVoucherViewBinding; +} + public final class com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider : com/adyen/checkout/components/core/internal/provider/PaymentComponentProvider, com/adyen/checkout/sessions/core/internal/provider/SessionPaymentComponentProvider { public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt index 123bc934d5..89ffe7b455 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt @@ -9,12 +9,26 @@ package com.adyen.checkout.mealvoucher.internal.ui.view import android.content.Context +import android.text.Editable import android.util.AttributeSet +import android.view.LayoutInflater import android.view.View +import android.view.View.OnFocusChangeListener import android.widget.LinearLayout import com.adyen.checkout.components.core.internal.ui.ComponentDelegate +import com.adyen.checkout.components.core.internal.ui.model.Validation +import com.adyen.checkout.core.AdyenLogLevel +import com.adyen.checkout.core.internal.util.adyenLog +import com.adyen.checkout.giftcard.internal.ui.GiftCardDelegate +import com.adyen.checkout.mealvoucher.R +import com.adyen.checkout.mealvoucher.databinding.MealVoucherViewBinding import com.adyen.checkout.ui.core.internal.ui.ComponentView +import com.adyen.checkout.ui.core.internal.util.hideError +import com.adyen.checkout.ui.core.internal.util.isVisible +import com.adyen.checkout.ui.core.internal.util.setLocalizedHintFromStyle +import com.adyen.checkout.ui.core.internal.util.showError import kotlinx.coroutines.CoroutineScope +import com.adyen.checkout.ui.core.R as UICoreR internal class MealVoucherView @JvmOverloads constructor( context: Context, @@ -28,15 +42,129 @@ internal class MealVoucherView @JvmOverloads constructor( ), ComponentView { + private val binding: MealVoucherViewBinding = MealVoucherViewBinding.inflate(LayoutInflater.from(context), this) + + private lateinit var localizedContext: Context + + private lateinit var giftCardDelegate: GiftCardDelegate + + init { + orientation = VERTICAL + val padding = resources.getDimension(UICoreR.dimen.standard_margin).toInt() + setPadding(padding, padding, padding, 0) + + // TODO Support autofill if necessary + } + override fun initView(delegate: ComponentDelegate, coroutineScope: CoroutineScope, localizedContext: Context) { - TODO("Not yet implemented") + require(delegate is GiftCardDelegate) { "Unsupported delegate type" } + giftCardDelegate = delegate + + this.localizedContext = localizedContext + initCardNumberField(localizedContext) + initExpiryDateField(localizedContext) + initSecurityCodeField(localizedContext) } - override fun highlightValidationErrors() { - TODO("Not yet implemented") + private fun initCardNumberField(localizedContext: Context) { + binding.textInputLayoutMealVoucherCardNumber.setLocalizedHintFromStyle( + R.style.AdyenCheckout_MealVoucher_CardNumberInput, + localizedContext, + ) + + binding.editTextMealVoucherCardNumber.setOnChangeListener { + giftCardDelegate.updateInputData { cardNumber = binding.editTextMealVoucherCardNumber.rawValue } + binding.textInputLayoutMealVoucherCardNumber.hideError() + } + + binding.editTextMealVoucherCardNumber.onFocusChangeListener = OnFocusChangeListener { _, hasFocus -> + val cardNumberValidation = giftCardDelegate.outputData.numberFieldState.validation + if (hasFocus) { + binding.textInputLayoutMealVoucherCardNumber.hideError() + } else if (cardNumberValidation is Validation.Invalid) { + binding.textInputLayoutMealVoucherCardNumber.showError( + localizedContext.getString(cardNumberValidation.reason) + ) + } + } } - override fun getView(): View { - TODO("Not yet implemented") + private fun initExpiryDateField(localizedContext: Context) { + binding.textInputLayoutMealVoucherExpiryDate.setLocalizedHintFromStyle( + R.style.AdyenCheckout_MealVoucher_ExpiryDateInput, + localizedContext, + ) + + binding.editTextMealVoucherExpiryDate.setOnChangeListener { + val date = binding.editTextMealVoucherExpiryDate.date + giftCardDelegate.updateInputData { + // TODO Update expiry date + } + binding.textInputLayoutMealVoucherExpiryDate.hideError() + } + + binding.editTextMealVoucherExpiryDate.onFocusChangeListener = OnFocusChangeListener { _, hasFocus -> + // TODO Get validation from outputData + if (hasFocus) { + binding.textInputLayoutMealVoucherExpiryDate.hideError() + } else { + // TODO Check if validation is invalid and show error + } + } + } + + private fun initSecurityCodeField(localizedContext: Context) { + if (giftCardDelegate.isPinRequired()) { + binding.textInputLayoutMealVoucherSecurityCode.setLocalizedHintFromStyle( + R.style.AdyenCheckout_MealVoucher_SecurityCodeInput, + localizedContext, + ) + + binding.editTextMealVoucherSecurityCode.setOnChangeListener { editable: Editable -> + giftCardDelegate.updateInputData { pin = editable.toString() } + binding.textInputLayoutMealVoucherSecurityCode.hideError() + } + + binding.editTextMealVoucherSecurityCode.onFocusChangeListener = OnFocusChangeListener { _, hasFocus -> + val securityCodeValidation = giftCardDelegate.outputData.pinFieldState.validation + if (hasFocus) { + binding.textInputLayoutMealVoucherSecurityCode.hideError() + } else if (securityCodeValidation is Validation.Invalid) { + binding.textInputLayoutMealVoucherSecurityCode.showError( + localizedContext.getString( + securityCodeValidation.reason, + ), + ) + } + } + } else { + binding.textInputLayoutMealVoucherSecurityCode.isVisible = false + } } + + override fun highlightValidationErrors() { + adyenLog(AdyenLogLevel.DEBUG) { "highlightValidationErrors" } + val outputData = giftCardDelegate.outputData + var isErrorFocused = false + val cardNumberValidation = outputData.numberFieldState.validation + if (cardNumberValidation is Validation.Invalid) { + isErrorFocused = true + binding.textInputLayoutMealVoucherCardNumber.requestFocus() + binding.textInputLayoutMealVoucherCardNumber.showError( + localizedContext.getString(cardNumberValidation.reason), + ) + } + // TODO Add expiry date validation + val securityCodeValidation = outputData.pinFieldState.validation + if (securityCodeValidation is Validation.Invalid) { + if (!isErrorFocused) { + binding.textInputLayoutMealVoucherSecurityCode.requestFocus() + } + binding.textInputLayoutMealVoucherSecurityCode.showError( + localizedContext.getString(securityCodeValidation.reason), + ) + } + } + + override fun getView(): View = this } diff --git a/mealvoucher/src/main/res/layout/meal_voucher_view.xml b/mealvoucher/src/main/res/layout/meal_voucher_view.xml new file mode 100644 index 0000000000..62284e99e2 --- /dev/null +++ b/mealvoucher/src/main/res/layout/meal_voucher_view.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mealvoucher/src/main/res/values/strings.xml b/mealvoucher/src/main/res/values/strings.xml new file mode 100644 index 0000000000..5602e91fde --- /dev/null +++ b/mealvoucher/src/main/res/values/strings.xml @@ -0,0 +1,14 @@ + + + + + Card number + Expiry date + Security code + diff --git a/mealvoucher/src/main/res/values/styles.xml b/mealvoucher/src/main/res/values/styles.xml new file mode 100644 index 0000000000..61b9c07830 --- /dev/null +++ b/mealvoucher/src/main/res/values/styles.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + From 0a2d7ed664ff444d5fd6c4b4f1521031efcd193e Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Fri, 19 Jul 2024 11:58:32 +0200 Subject: [PATCH 231/299] Run apiDump COAND-683 --- card/api/card.api | 3 +-- giftcard/api/giftcard.api | 19 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/card/api/card.api b/card/api/card.api index 56c3e12998..4a26520fdb 100644 --- a/card/api/card.api +++ b/card/api/card.api @@ -592,13 +592,12 @@ public final class com/adyen/checkout/card/internal/ui/model/InstallmentOptionPa public fun toString ()Ljava/lang/String; } -public class com/adyen/checkout/card/internal/ui/view/CardNumberInput : com/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText { +public final class com/adyen/checkout/card/internal/ui/view/CardNumberInput : com/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText { public static final field Companion Lcom/adyen/checkout/card/internal/ui/view/CardNumberInput$Companion; public fun (Landroid/content/Context;)V public fun (Landroid/content/Context;Landroid/util/AttributeSet;)V public fun (Landroid/content/Context;Landroid/util/AttributeSet;I)V public synthetic fun (Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V - protected fun afterTextChanged (Landroid/text/Editable;)V public fun getRawValue ()Ljava/lang/String; public final fun setAmexCardFormat (Z)V } diff --git a/giftcard/api/giftcard.api b/giftcard/api/giftcard.api index 7c78cdecb0..d63b8e3910 100644 --- a/giftcard/api/giftcard.api +++ b/giftcard/api/giftcard.api @@ -225,25 +225,6 @@ public final class com/adyen/checkout/giftcard/internal/provider/GiftCardCompone public final class com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate$Companion { } -public final class com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams : com/adyen/checkout/components/core/internal/ui/model/ButtonParams, com/adyen/checkout/components/core/internal/ui/model/ComponentParams { - public fun (Lcom/adyen/checkout/components/core/internal/ui/model/CommonComponentParams;ZZ)V - public final fun component2 ()Z - public final fun component3 ()Z - public final fun copy (Lcom/adyen/checkout/components/core/internal/ui/model/CommonComponentParams;ZZ)Lcom/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams; - public static synthetic fun copy$default (Lcom/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams;Lcom/adyen/checkout/components/core/internal/ui/model/CommonComponentParams;ZZILjava/lang/Object;)Lcom/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams; - public fun equals (Ljava/lang/Object;)Z - public fun getAmount ()Lcom/adyen/checkout/components/core/Amount; - public fun getAnalyticsParams ()Lcom/adyen/checkout/components/core/internal/ui/model/AnalyticsParams; - public fun getClientKey ()Ljava/lang/String; - public fun getEnvironment ()Lcom/adyen/checkout/core/Environment; - public fun getShopperLocale ()Ljava/util/Locale; - public fun hashCode ()I - public fun isCreatedByDropIn ()Z - public final fun isPinRequired ()Z - public fun isSubmitButtonVisible ()Z - public fun toString ()Ljava/lang/String; -} - public final class com/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput : com/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText { public static final field Companion Lcom/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput$Companion; public fun (Landroid/content/Context;)V From 7d41b1643ea7f6a03b60c5714ddd7cc9c4935cde Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Tue, 23 Jul 2024 15:05:21 +0200 Subject: [PATCH 232/299] Create MealVoucherComponentParamsMapper and add isExpiryDateRequired field COAND-683 --- .../giftcard/GiftCardConfiguration.kt | 4 +- .../ui/model/GiftCardComponentParams.kt | 1 + .../ui/model/GiftCardComponentParamsMapper.kt | 1 + .../provider/MealVoucherComponentProvider.kt | 8 ++- .../model/MealVoucherComponentParamsMapper.kt | 49 +++++++++++++++++++ 5 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardConfiguration.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardConfiguration.kt index c9b1d7fe01..c38f38f07a 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardConfiguration.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardConfiguration.kt @@ -147,7 +147,9 @@ fun CheckoutConfiguration.giftCard( return this } -internal fun CheckoutConfiguration.getGiftCardConfiguration(): GiftCardConfiguration? { +// TODO revert RestrictTo annotation after implementing MealVoucherConfiguration class. +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +fun CheckoutConfiguration.getGiftCardConfiguration(): GiftCardConfiguration? { return getConfiguration(PaymentMethodTypes.GIFTCARD) } diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams.kt index 397b8fa82d..5e5914fc6d 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParams.kt @@ -18,4 +18,5 @@ data class GiftCardComponentParams( private val commonComponentParams: CommonComponentParams, override val isSubmitButtonVisible: Boolean, val isPinRequired: Boolean, + val isExpiryDateRequired: Boolean, ) : ComponentParams by commonComponentParams, ButtonParams diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapper.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapper.kt index 306f0dfa78..b324b4a2f0 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapper.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapper.kt @@ -40,6 +40,7 @@ class GiftCardComponentParamsMapper( isSubmitButtonVisible = dropInOverrideParams?.isSubmitButtonVisible ?: giftCardConfiguration?.isSubmitButtonVisible ?: true, isPinRequired = giftCardConfiguration?.isPinRequired ?: true, + isExpiryDateRequired = false, ) } } diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt index 556d85d4a9..07f4ffa15a 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt @@ -38,7 +38,6 @@ import com.adyen.checkout.giftcard.internal.GiftCardComponentEventHandler import com.adyen.checkout.giftcard.internal.SessionsGiftCardComponentCallbackWrapper import com.adyen.checkout.giftcard.internal.SessionsGiftCardComponentEventHandler import com.adyen.checkout.giftcard.internal.ui.DefaultGiftCardDelegate -import com.adyen.checkout.giftcard.internal.ui.model.GiftCardComponentParamsMapper import com.adyen.checkout.giftcard.toCheckoutConfiguration import com.adyen.checkout.mealvoucher.MealVoucherComponent import com.adyen.checkout.mealvoucher.MealVoucherComponentCallback @@ -46,6 +45,7 @@ import com.adyen.checkout.mealvoucher.MealVoucherComponentState import com.adyen.checkout.mealvoucher.MealVoucherConfiguration import com.adyen.checkout.mealvoucher.SessionsMealVoucherComponentCallback import com.adyen.checkout.mealvoucher.internal.ui.MealVoucherComponentViewType +import com.adyen.checkout.mealvoucher.internal.ui.model.MealVoucherComponentParamsMapper import com.adyen.checkout.sessions.core.CheckoutSession import com.adyen.checkout.sessions.core.internal.SessionInteractor import com.adyen.checkout.sessions.core.internal.SessionSavedStateHandleContainer @@ -91,8 +91,7 @@ constructor( val cardEncryptor = CardEncryptorFactory.provide() val giftCardFactory = viewModelFactory(savedStateRegistryOwner, null) { savedStateHandle -> - // TODO check if we need meal voucher component params mapper - val componentParams = GiftCardComponentParamsMapper(CommonComponentParamsMapper()).mapToParams( + val componentParams = MealVoucherComponentParamsMapper(CommonComponentParamsMapper()).mapToParams( checkoutConfiguration = checkoutConfiguration, deviceLocale = localeProvider.getLocale(application), dropInOverrideParams = dropInOverrideParams, @@ -184,8 +183,7 @@ constructor( val cardEncryptor = CardEncryptorFactory.provide() val giftCardFactory = viewModelFactory(savedStateRegistryOwner, null) { savedStateHandle -> - // TODO check if we need meal voucher component params mapper - val componentParams = GiftCardComponentParamsMapper(CommonComponentParamsMapper()).mapToParams( + val componentParams = MealVoucherComponentParamsMapper(CommonComponentParamsMapper()).mapToParams( checkoutConfiguration = checkoutConfiguration, deviceLocale = localeProvider.getLocale(application), dropInOverrideParams = dropInOverrideParams, diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt new file mode 100644 index 0000000000..249a423aa5 --- /dev/null +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ararat on 23/7/2024. + */ + +package com.adyen.checkout.mealvoucher.internal.ui.model + +import androidx.annotation.RestrictTo +import com.adyen.checkout.components.core.CheckoutConfiguration +import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParamsMapper +import com.adyen.checkout.components.core.internal.ui.model.DropInOverrideParams +import com.adyen.checkout.components.core.internal.ui.model.SessionParams +import com.adyen.checkout.giftcard.getGiftCardConfiguration +import com.adyen.checkout.giftcard.internal.ui.model.GiftCardComponentParams +import java.util.Locale + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +class MealVoucherComponentParamsMapper( + private val commonComponentParamsMapper: CommonComponentParamsMapper, +) { + + fun mapToParams( + checkoutConfiguration: CheckoutConfiguration, + deviceLocale: Locale, + dropInOverrideParams: DropInOverrideParams?, + componentSessionParams: SessionParams?, + ): GiftCardComponentParams { + val commonComponentParamsMapperData = commonComponentParamsMapper.mapToParams( + checkoutConfiguration, + deviceLocale, + dropInOverrideParams, + componentSessionParams, + ) + val commonComponentParams = commonComponentParamsMapperData.commonComponentParams + // TODO Change this to getMealVoucherConfiguration() + val giftCardConfiguration = checkoutConfiguration.getGiftCardConfiguration() + return GiftCardComponentParams( + commonComponentParams = commonComponentParams, + isSubmitButtonVisible = dropInOverrideParams?.isSubmitButtonVisible + ?: giftCardConfiguration?.isSubmitButtonVisible ?: true, + // TODO Check if we need a config for pin required or not for Meal voucher + isPinRequired = giftCardConfiguration?.isPinRequired ?: true, + isExpiryDateRequired = true, + ) + } +} From 5f700ef6782558b92f842097aa5635301dbccd73 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Tue, 23 Jul 2024 15:06:52 +0200 Subject: [PATCH 233/299] Add expiry date to DefaultGiftCardDelegate COAND-683 --- components-core/api/components-core.api | 6 ++- .../paymentmethod/GiftCardPaymentMethod.kt | 9 +++++ .../adyen/checkout/giftcard/GiftCardAction.kt | 1 + .../internal/ui/DefaultGiftCardDelegate.kt | 37 +++++++++++++++---- .../internal/ui/model/GiftCardInputData.kt | 4 +- .../internal/ui/model/GiftCardOutputData.kt | 6 ++- .../ui/DefaultGiftCardDelegateTest.kt | 6 +++ .../GiftCardComponentParamsMapperTest.kt | 1 + .../internal/ui/MealVoucherViewProvider.kt | 2 +- 9 files changed, 60 insertions(+), 12 deletions(-) diff --git a/components-core/api/components-core.api b/components-core/api/components-core.api index f88a04e80a..336a1c67b3 100644 --- a/components-core/api/components-core.api +++ b/components-core/api/components-core.api @@ -2402,16 +2402,20 @@ public final class com/adyen/checkout/components/core/paymentmethod/GiftCardPaym public static final field Companion Lcom/adyen/checkout/components/core/paymentmethod/GiftCardPaymentMethod$Companion; public static final field PAYMENT_METHOD_TYPE Ljava/lang/String; public static final field SERIALIZER Lcom/adyen/checkout/core/internal/data/model/ModelObject$Serializer; - public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V public fun describeContents ()I public final fun getBrand ()Ljava/lang/String; public fun getCheckoutAttemptId ()Ljava/lang/String; public final fun getEncryptedCardNumber ()Ljava/lang/String; + public final fun getEncryptedExpiryMonth ()Ljava/lang/String; + public final fun getEncryptedExpiryYear ()Ljava/lang/String; public final fun getEncryptedSecurityCode ()Ljava/lang/String; public fun getType ()Ljava/lang/String; public final fun setBrand (Ljava/lang/String;)V public fun setCheckoutAttemptId (Ljava/lang/String;)V public final fun setEncryptedCardNumber (Ljava/lang/String;)V + public final fun setEncryptedExpiryMonth (Ljava/lang/String;)V + public final fun setEncryptedExpiryYear (Ljava/lang/String;)V public final fun setEncryptedSecurityCode (Ljava/lang/String;)V public fun setType (Ljava/lang/String;)V public fun writeToParcel (Landroid/os/Parcel;I)V diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/paymentmethod/GiftCardPaymentMethod.kt b/components-core/src/main/java/com/adyen/checkout/components/core/paymentmethod/GiftCardPaymentMethod.kt index 59b60fb83b..f4824fe7b1 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/paymentmethod/GiftCardPaymentMethod.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/paymentmethod/GiftCardPaymentMethod.kt @@ -15,11 +15,14 @@ import org.json.JSONException import org.json.JSONObject @Parcelize +@Suppress("LongParameterList") class GiftCardPaymentMethod( override var type: String?, override var checkoutAttemptId: String?, var encryptedCardNumber: String?, var encryptedSecurityCode: String?, + var encryptedExpiryMonth: String?, + var encryptedExpiryYear: String?, var brand: String?, ) : PaymentMethodDetails() { @@ -27,6 +30,8 @@ class GiftCardPaymentMethod( const val PAYMENT_METHOD_TYPE = PaymentMethodTypes.GIFTCARD private const val ENCRYPTED_CARD_NUMBER = "encryptedCardNumber" private const val ENCRYPTED_SECURITY_CODE = "encryptedSecurityCode" + private const val ENCRYPTED_EXPIRY_MONTH = "encryptedExpiryMonth" + private const val ENCRYPTED_EXPIRY_YEAR = "encryptedExpiryYear" private const val BRAND = "brand" @JvmField @@ -38,6 +43,8 @@ class GiftCardPaymentMethod( putOpt(CHECKOUT_ATTEMPT_ID, modelObject.checkoutAttemptId) putOpt(ENCRYPTED_CARD_NUMBER, modelObject.encryptedCardNumber) putOpt(ENCRYPTED_SECURITY_CODE, modelObject.encryptedSecurityCode) + putOpt(ENCRYPTED_EXPIRY_MONTH, modelObject.encryptedExpiryMonth) + putOpt(ENCRYPTED_EXPIRY_YEAR, modelObject.encryptedExpiryYear) putOpt(BRAND, modelObject.brand) } } catch (e: JSONException) { @@ -51,6 +58,8 @@ class GiftCardPaymentMethod( checkoutAttemptId = jsonObject.getStringOrNull(CHECKOUT_ATTEMPT_ID), encryptedCardNumber = jsonObject.getStringOrNull(ENCRYPTED_CARD_NUMBER), encryptedSecurityCode = jsonObject.getStringOrNull(ENCRYPTED_SECURITY_CODE), + encryptedExpiryMonth = jsonObject.getStringOrNull(ENCRYPTED_EXPIRY_MONTH), + encryptedExpiryYear = jsonObject.getStringOrNull(ENCRYPTED_EXPIRY_YEAR), brand = jsonObject.getStringOrNull(BRAND), ) } diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardAction.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardAction.kt index 82394469d2..5d9f9cce3d 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardAction.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardAction.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import android.os.Parcelable import kotlinx.parcelize.Parcelize +// TODO Add more information here what the actions means @SuppressLint("ObjectInPublicSealedClass") @Parcelize sealed class GiftCardAction : Parcelable { diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt index bcb3ffa8e5..a5c2ba244b 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt @@ -50,6 +50,7 @@ import com.adyen.checkout.ui.core.internal.ui.ComponentViewType import com.adyen.checkout.ui.core.internal.ui.PaymentComponentUIEvent import com.adyen.checkout.ui.core.internal.ui.PaymentComponentUIState import com.adyen.checkout.ui.core.internal.ui.SubmitHandler +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.Flow @@ -166,16 +167,26 @@ class DefaultGiftCardDelegate( private fun createOutputData() = GiftCardOutputData( numberFieldState = GiftCardNumberUtils.validateInputField(inputData.cardNumber), pinFieldState = getPinFieldState(inputData.pin), + expiryDateFieldState = getExpiryDateFieldState(inputData.expiryDate), ) - private fun getPinFieldState(pin: String): FieldState { - return if (isPinRequired()) { - GiftCardPinUtils.validateInputField(pin) - } else { - FieldState(pin, Validation.Valid) - } + private fun getPinFieldState(pin: String) = if (isPinRequired()) { + GiftCardPinUtils.validateInputField(pin) + } else { + FieldState(pin, Validation.Valid) } + override fun isPinRequired(): Boolean = componentParams.isPinRequired + + private fun getExpiryDateFieldState(expiryDate: ExpiryDate) = if (isExpiryDateRequired()) { + // TODO Implement validation + FieldState(expiryDate, Validation.Valid) + } else { + FieldState(expiryDate, Validation.Valid) + } + + private fun isExpiryDateRequired() = componentParams.isExpiryDateRequired + @VisibleForTesting internal fun updateComponentState(outputData: GiftCardOutputData) { val componentState = createComponentState(outputData) @@ -220,6 +231,8 @@ class DefaultGiftCardDelegate( checkoutAttemptId = analyticsManager.getCheckoutAttemptId(), encryptedCardNumber = encryptedCard.encryptedCardNumber, encryptedSecurityCode = encryptedCard.encryptedSecurityCode, + encryptedExpiryMonth = encryptedCard.encryptedExpiryMonth, + encryptedExpiryYear = encryptedCard.encryptedExpiryYear, brand = paymentMethod.brand, ) @@ -255,9 +268,19 @@ class DefaultGiftCardDelegate( ): EncryptedCard? = try { val unencryptedCard = UnencryptedCard.Builder().run { setNumber(outputData.numberFieldState.value) + if (componentParams.isPinRequired) { setCvc(outputData.pinFieldState.value) } + + val expiryDateResult = outputData.expiryDateFieldState.value + if (componentParams.isExpiryDateRequired && expiryDateResult != ExpiryDate.EMPTY_DATE) { + setExpiryDate( + expiryMonth = expiryDateResult.expiryMonth.toString(), + expiryYear = expiryDateResult.expiryYear.toString(), + ) + } + build() } @@ -354,8 +377,6 @@ class DefaultGiftCardDelegate( submitHandler.onSubmit(updatedState) } - override fun isPinRequired(): Boolean = componentParams.isPinRequired - override fun onCleared() { removeObserver() analyticsManager.clear(this) diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt index c20578e7f1..ffc3826991 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt @@ -10,9 +10,11 @@ package com.adyen.checkout.giftcard.internal.ui.model import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.internal.ui.model.InputData +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) data class GiftCardInputData( var cardNumber: String = "", - var pin: String = "" + var pin: String = "", + var expiryDate: ExpiryDate = ExpiryDate.EMPTY_DATE, ) : InputData diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardOutputData.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardOutputData.kt index b01ba0b441..a0a3fc55e9 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardOutputData.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardOutputData.kt @@ -11,13 +11,17 @@ package com.adyen.checkout.giftcard.internal.ui.model import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.OutputData +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) data class GiftCardOutputData( val numberFieldState: FieldState, val pinFieldState: FieldState, + val expiryDateFieldState: FieldState, ) : OutputData { override val isValid: Boolean - get() = numberFieldState.validation.isValid() && pinFieldState.validation.isValid() + get() = numberFieldState.validation.isValid() && + pinFieldState.validation.isValid() && + expiryDateFieldState.validation.isValid() } diff --git a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt index 0097316b0c..cfa317b33b 100644 --- a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt +++ b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt @@ -19,6 +19,8 @@ import com.adyen.checkout.components.core.internal.analytics.GenericEvents import com.adyen.checkout.components.core.internal.analytics.TestAnalyticsManager import com.adyen.checkout.components.core.internal.data.api.TestPublicKeyRepository import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParamsMapper +import com.adyen.checkout.components.core.internal.ui.model.FieldState +import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.core.Environment import com.adyen.checkout.cse.internal.TestCardEncryptor import com.adyen.checkout.giftcard.GiftCardAction @@ -34,6 +36,7 @@ import com.adyen.checkout.giftcard.internal.util.GiftCardPinUtils import com.adyen.checkout.test.TestDispatcherExtension import com.adyen.checkout.test.extensions.test import com.adyen.checkout.ui.core.internal.ui.SubmitHandler +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.UnconfinedTestDispatcher @@ -455,6 +458,8 @@ internal class DefaultGiftCardDelegateTest( ) = GiftCardOutputData( numberFieldState = GiftCardNumberUtils.validateInputField(number), pinFieldState = GiftCardPinUtils.validateInputField(pin), + // expiry date is valid since it doesn't apply to gift cards + expiryDateFieldState = FieldState(TEST_EXPIRY_DATE, Validation.Valid), ) companion object { @@ -462,6 +467,7 @@ internal class DefaultGiftCardDelegateTest( private val TEST_ORDER = OrderRequest("PSP", "ORDER_DATA") private const val TEST_CHECKOUT_ATTEMPT_ID = "TEST_CHECKOUT_ATTEMPT_ID" private const val TEST_PAYMENT_METHOD_TYPE = "TEST_PAYMENT_METHOD_TYPE" + private val TEST_EXPIRY_DATE = ExpiryDate(3, 2030) @JvmStatic fun amountSource() = listOf( diff --git a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapperTest.kt b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapperTest.kt index 6abfbead7b..3d8e531dbf 100644 --- a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapperTest.kt +++ b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapperTest.kt @@ -232,6 +232,7 @@ internal class GiftCardComponentParamsMapperTest { ), isSubmitButtonVisible = isSubmitButtonVisible, isPinRequired = isPinRequired, + isExpiryDateRequired = false ) } diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt index fa803fd24f..87df6568f8 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt @@ -28,6 +28,6 @@ internal object MealVoucherViewProvider : ViewProvider { internal object MealVoucherComponentViewType : GiftCardComponentViewType() { override val viewProvider: ViewProvider = MealVoucherViewProvider - // TODO update button text if necessary + // TODO Add the Redeem text also in meal voucher module override val buttonTextResId: Int = ButtonComponentViewType.DEFAULT_BUTTON_TEXT_RES_ID } From 1d74d0f4783fd28284b507f854b044d2c7cced3a Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:44:36 +0200 Subject: [PATCH 234/299] Extract common expiry date validation logic to ui-core COAND-683 --- .../card/internal/util/CardValidationUtils.kt | 88 +++++-------------- .../util/ExpiryDateValidationResult.kt | 19 ++++ .../util/ExpiryDateValidationUtils.kt | 79 +++++++++++++++++ 3 files changed, 118 insertions(+), 68 deletions(-) create mode 100644 ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationResult.kt create mode 100644 ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index d0ad0723a2..491a3eb889 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -19,6 +19,8 @@ import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.core.internal.util.StringUtil import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate +import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationResult +import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationUtils import java.util.Calendar import java.util.GregorianCalendar @@ -37,11 +39,6 @@ object CardValidationUtils { private const val GENERAL_CARD_SECURITY_CODE_SIZE = 3 private const val AMEX_SECURITY_CODE_SIZE = 4 - // Date - private const val MONTHS_IN_YEAR = 12 - private const val MAXIMUM_YEARS_IN_FUTURE = 30 - private const val MAXIMUM_EXPIRED_MONTHS = 3 - /** * Validate card number. */ @@ -90,49 +87,27 @@ object CardValidationUtils { fieldPolicy: Brand.FieldPolicy?, calendar: Calendar ): FieldState { - val invalidState = FieldState(expiryDate, Validation.Invalid(R.string.checkout_expiry_date_not_valid)) - return when { - dateExists(expiryDate) -> { - val isInMaxYearRange = isInMaxYearRange(expiryDate, calendar) - val isInMinMonthRange = isInMinMonthRange(expiryDate, calendar) - val fieldState = when { - // higher than maxPast and lower than maxFuture - isInMinMonthRange && isInMaxYearRange -> FieldState(expiryDate, Validation.Valid) - !isInMaxYearRange -> FieldState( - expiryDate, - Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_far_in_future), - ) - - !isInMinMonthRange -> FieldState( - expiryDate, - Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_old), - ) - - else -> invalidState - } - fieldState - } - - fieldPolicy?.isRequired() == false && expiryDate != ExpiryDate.INVALID_DATE -> { - FieldState(expiryDate, Validation.Valid) - } + val expiryDateValidation = ExpiryDateValidationUtils.validateExpiryDateInternal(expiryDate, calendar) - else -> invalidState - } - } + return when (expiryDateValidation) { + ExpiryDateValidationResult.VALID -> FieldState(expiryDate, Validation.Valid) + ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> FieldState( + expiryDate, + Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_far_in_future), + ) - private fun isInMaxYearRange(expiryDate: ExpiryDate, calendar: Calendar): Boolean { - val expiryDateCalendar = getExpiryCalendar(expiryDate) - val maxFutureCalendar = calendar.clone() as GregorianCalendar - maxFutureCalendar.add(Calendar.YEAR, MAXIMUM_YEARS_IN_FUTURE) - return expiryDateCalendar.get(Calendar.YEAR) <= maxFutureCalendar.get(Calendar.YEAR) - } + ExpiryDateValidationResult.INVALID_TOO_OLD -> FieldState( + expiryDate, + Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_old), + ) - private fun isInMinMonthRange(expiryDate: ExpiryDate, calendar: Calendar): Boolean { - val expiryDateCalendar = getExpiryCalendar(expiryDate) - val maxPastCalendar = calendar.clone() as GregorianCalendar - maxPastCalendar.add(Calendar.MONTH, -MAXIMUM_EXPIRED_MONTHS) - return expiryDateCalendar >= maxPastCalendar + ExpiryDateValidationResult.INVALID_EXPIRY_DATE -> + if (fieldPolicy?.isRequired() == false && expiryDate != ExpiryDate.INVALID_DATE) { + FieldState(expiryDate, Validation.Valid) + } else { + FieldState(expiryDate, Validation.Invalid(R.string.checkout_expiry_date_not_valid)) + } + } } /** @@ -160,29 +135,6 @@ object CardValidationUtils { } return FieldState(normalizedSecurityCode, validation) } - - private fun dateExists(expiryDate: ExpiryDate): Boolean { - return ( - expiryDate !== ExpiryDate.EMPTY_DATE && - isValidMonth(expiryDate.expiryMonth) && - expiryDate.expiryYear > 0 - ) - } - - private fun isValidMonth(month: Int): Boolean { - return month in 1..MONTHS_IN_YEAR - } - - private fun getExpiryCalendar(expiryDate: ExpiryDate): Calendar { - val expiryCalendar = GregorianCalendar.getInstance() - expiryCalendar.clear() - // First day of the expiry month. Calendar.MONTH is zero-based. - expiryCalendar[expiryDate.expiryYear, expiryDate.expiryMonth - 1] = 1 - // Go to next month and remove 1 day to be on the last day of the expiry month. - expiryCalendar.add(Calendar.MONTH, 1) - expiryCalendar.add(Calendar.DAY_OF_MONTH, -1) - return expiryCalendar - } } @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationResult.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationResult.kt new file mode 100644 index 0000000000..495438d03f --- /dev/null +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationResult.kt @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 24/7/2024. + */ + +package com.adyen.checkout.ui.core.internal.util + +import androidx.annotation.RestrictTo + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +enum class ExpiryDateValidationResult { + VALID, + INVALID_TOO_FAR_IN_THE_FUTURE, + INVALID_TOO_OLD, + INVALID_EXPIRY_DATE +} diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt new file mode 100644 index 0000000000..8ff2fc765d --- /dev/null +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 23/7/2024. + */ + +package com.adyen.checkout.ui.core.internal.util + +import androidx.annotation.RestrictTo +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate +import java.util.Calendar +import java.util.GregorianCalendar + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +object ExpiryDateValidationUtils { + // Date + private const val MONTHS_IN_YEAR = 12 + private const val MAXIMUM_YEARS_IN_FUTURE = 30 + private const val MAXIMUM_EXPIRED_MONTHS = 3 + + fun validateExpiryDateInternal( + expiryDate: ExpiryDate, + calendar: Calendar + ) = when { + dateExists(expiryDate) -> { + val isInMaxYearRange = isInMaxYearRange(expiryDate, calendar) + val isInMinMonthRange = isInMinMonthRange(expiryDate, calendar) + + when { + // higher than maxPast and lower than maxFuture + isInMinMonthRange && isInMaxYearRange -> ExpiryDateValidationResult.VALID + !isInMaxYearRange -> ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE + // Too old (!isInMinMonthRange) + else -> ExpiryDateValidationResult.INVALID_TOO_OLD + } + } + + else -> ExpiryDateValidationResult.INVALID_EXPIRY_DATE + } + + private fun isInMaxYearRange(expiryDate: ExpiryDate, calendar: Calendar): Boolean { + val expiryDateCalendar = getExpiryCalendar(expiryDate) + val maxFutureCalendar = calendar.clone() as GregorianCalendar + maxFutureCalendar.add(Calendar.YEAR, MAXIMUM_YEARS_IN_FUTURE) + return expiryDateCalendar.get(Calendar.YEAR) <= maxFutureCalendar.get(Calendar.YEAR) + } + + private fun isInMinMonthRange(expiryDate: ExpiryDate, calendar: Calendar): Boolean { + val expiryDateCalendar = getExpiryCalendar(expiryDate) + val maxPastCalendar = calendar.clone() as GregorianCalendar + maxPastCalendar.add(Calendar.MONTH, -MAXIMUM_EXPIRED_MONTHS) + return expiryDateCalendar >= maxPastCalendar + } + + private fun dateExists(expiryDate: ExpiryDate): Boolean { + return ( + expiryDate !== ExpiryDate.EMPTY_DATE && + isValidMonth(expiryDate.expiryMonth) && + expiryDate.expiryYear > 0 + ) + } + + private fun isValidMonth(month: Int): Boolean { + return month in 1..MONTHS_IN_YEAR + } + + private fun getExpiryCalendar(expiryDate: ExpiryDate): Calendar { + val expiryCalendar = GregorianCalendar.getInstance() + expiryCalendar.clear() + // First day of the expiry month. Calendar.MONTH is zero-based. + expiryCalendar[expiryDate.expiryYear, expiryDate.expiryMonth - 1] = 1 + // Go to next month and remove 1 day to be on the last day of the expiry month. + expiryCalendar.add(Calendar.MONTH, 1) + expiryCalendar.add(Calendar.DAY_OF_MONTH, -1) + return expiryCalendar + } +} From 521f90371196cc824cf8173ee78b20685fd2fe94 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:08:37 +0200 Subject: [PATCH 235/299] Implement expiry date validation and extract validation logic to GiftCardValidator COAND-683 --- .../provider/GiftCardComponentProvider.kt | 3 ++ .../internal/ui/DefaultGiftCardDelegate.kt | 13 +++-- .../internal/util/DefaultGiftCardValidator.kt | 27 +++++++++++ .../internal/util/GiftCardNumberUtils.kt | 4 +- .../internal/util/GiftCardPinUtils.kt | 4 +- .../internal/util/GiftCardValidator.kt | 47 +++++++++++++++++++ .../ui/DefaultGiftCardDelegateTest.kt | 2 + .../provider/MealVoucherComponentProvider.kt | 3 ++ .../internal/ui/view/MealVoucherView.kt | 25 ++++++++-- .../util/MealVoucherValidationUtils.kt | 47 +++++++++++++++++++ .../internal/util/MealVoucherValidator.kt | 30 ++++++++++++ mealvoucher/src/main/res/values/strings.xml | 4 ++ 12 files changed, 195 insertions(+), 14 deletions(-) create mode 100644 giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt create mode 100644 giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidator.kt create mode 100644 mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt create mode 100644 mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/provider/GiftCardComponentProvider.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/provider/GiftCardComponentProvider.kt index 8bb876e46e..3e214dc087 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/provider/GiftCardComponentProvider.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/provider/GiftCardComponentProvider.kt @@ -44,6 +44,7 @@ import com.adyen.checkout.giftcard.internal.SessionsGiftCardComponentEventHandle import com.adyen.checkout.giftcard.internal.ui.DefaultGiftCardDelegate import com.adyen.checkout.giftcard.internal.ui.GiftCardComponentViewType import com.adyen.checkout.giftcard.internal.ui.model.GiftCardComponentParamsMapper +import com.adyen.checkout.giftcard.internal.util.DefaultGiftCardValidator import com.adyen.checkout.giftcard.toCheckoutConfiguration import com.adyen.checkout.sessions.core.CheckoutSession import com.adyen.checkout.sessions.core.internal.SessionInteractor @@ -115,6 +116,7 @@ constructor( componentParams = componentParams, cardEncryptor = cardEncryptor, submitHandler = SubmitHandler(savedStateHandle), + validator = DefaultGiftCardValidator(), componentViewType = GiftCardComponentViewType(), ) @@ -207,6 +209,7 @@ constructor( componentParams = componentParams, cardEncryptor = cardEncryptor, submitHandler = SubmitHandler(savedStateHandle), + validator = DefaultGiftCardValidator(), componentViewType = GiftCardComponentViewType(), ) diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt index a5c2ba244b..d133f0b346 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt @@ -43,8 +43,7 @@ import com.adyen.checkout.giftcard.internal.ui.model.GiftCardInputData import com.adyen.checkout.giftcard.internal.ui.model.GiftCardOutputData import com.adyen.checkout.giftcard.internal.util.GiftCardBalanceStatus import com.adyen.checkout.giftcard.internal.util.GiftCardBalanceUtils -import com.adyen.checkout.giftcard.internal.util.GiftCardNumberUtils -import com.adyen.checkout.giftcard.internal.util.GiftCardPinUtils +import com.adyen.checkout.giftcard.internal.util.GiftCardValidator import com.adyen.checkout.ui.core.internal.ui.ButtonComponentViewType import com.adyen.checkout.ui.core.internal.ui.ComponentViewType import com.adyen.checkout.ui.core.internal.ui.PaymentComponentUIEvent @@ -69,7 +68,8 @@ class DefaultGiftCardDelegate( override val componentParams: GiftCardComponentParams, private val cardEncryptor: BaseCardEncryptor, private val submitHandler: SubmitHandler, - componentViewType: GiftCardComponentViewType + private val validator: GiftCardValidator, + componentViewType: GiftCardComponentViewType, ) : GiftCardDelegate { private val inputData: GiftCardInputData = GiftCardInputData() @@ -165,13 +165,13 @@ class DefaultGiftCardDelegate( } private fun createOutputData() = GiftCardOutputData( - numberFieldState = GiftCardNumberUtils.validateInputField(inputData.cardNumber), + numberFieldState = validator.validateNumber(inputData.cardNumber), pinFieldState = getPinFieldState(inputData.pin), expiryDateFieldState = getExpiryDateFieldState(inputData.expiryDate), ) private fun getPinFieldState(pin: String) = if (isPinRequired()) { - GiftCardPinUtils.validateInputField(pin) + validator.validatePin(pin) } else { FieldState(pin, Validation.Valid) } @@ -179,8 +179,7 @@ class DefaultGiftCardDelegate( override fun isPinRequired(): Boolean = componentParams.isPinRequired private fun getExpiryDateFieldState(expiryDate: ExpiryDate) = if (isExpiryDateRequired()) { - // TODO Implement validation - FieldState(expiryDate, Validation.Valid) + validator.validateExpiryDate(expiryDate) } else { FieldState(expiryDate, Validation.Valid) } diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt new file mode 100644 index 0000000000..1baa28db90 --- /dev/null +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 24/7/2024. + */ + +package com.adyen.checkout.giftcard.internal.util + +import com.adyen.checkout.components.core.internal.ui.model.FieldState +import com.adyen.checkout.components.core.internal.ui.model.Validation +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate + +internal class DefaultGiftCardValidator : GiftCardValidator { + override fun validateNumber(number: String): FieldState { + return GiftCardNumberUtils.validateInputField(number) + } + + override fun validatePin(pin: String): FieldState { + return GiftCardPinUtils.validateInputField(pin) + } + + override fun validateExpiryDate(expiryDate: ExpiryDate): FieldState { + return FieldState(expiryDate, Validation.Valid) + } +} diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtils.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtils.kt index ef4e9be344..0e63c23a90 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtils.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtils.kt @@ -8,11 +8,13 @@ package com.adyen.checkout.giftcard.internal.util +import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.giftcard.R -internal object GiftCardNumberUtils { +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +object GiftCardNumberUtils { private const val CARD_NUMBER_MASK_GROUP_LENGTH = 4 const val DIGIT_SEPARATOR = ' ' diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtils.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtils.kt index 33bfd50853..6a884d09f1 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtils.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtils.kt @@ -8,11 +8,13 @@ package com.adyen.checkout.giftcard.internal.util +import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.giftcard.R -internal object GiftCardPinUtils { +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +object GiftCardPinUtils { private const val MINIMUM_GIFT_CARD_PIN_LENGTH = 3 private const val MAXIMUM_GIFT_CARD_PIN_LENGTH = 10 diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidator.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidator.kt new file mode 100644 index 0000000000..4c55fc1ea6 --- /dev/null +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidator.kt @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 24/7/2024. + */ + +package com.adyen.checkout.giftcard.internal.util + +import androidx.annotation.RestrictTo +import com.adyen.checkout.components.core.internal.ui.model.FieldState +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate + +/** + * Validator class responsible for validating input fields in [com.adyen.checkout.giftcard.GiftCardComponent]. + */ +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +interface GiftCardValidator { + + /** + * Validates gift card number. + * + * @param number Gift Card number input. + * + * @return FieldState object containing validation result. + */ + fun validateNumber(number: String): FieldState + + /** + * Validates gift card pin. + * + * @param pin Gift Card pin input. + * + * @return FieldState object containing validation result. + */ + fun validatePin(pin: String): FieldState + + /** + * Validates gift card expiry date. + * + * @param expiryDate Gift Card expiry date input. + * + * @return FieldState object containing validation result. + */ + fun validateExpiryDate(expiryDate: ExpiryDate): FieldState +} diff --git a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt index cfa317b33b..481ede0443 100644 --- a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt +++ b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt @@ -30,6 +30,7 @@ import com.adyen.checkout.giftcard.GiftCardException import com.adyen.checkout.giftcard.giftCard import com.adyen.checkout.giftcard.internal.ui.model.GiftCardComponentParamsMapper import com.adyen.checkout.giftcard.internal.ui.model.GiftCardOutputData +import com.adyen.checkout.giftcard.internal.util.DefaultGiftCardValidator import com.adyen.checkout.giftcard.internal.util.GiftCardBalanceStatus import com.adyen.checkout.giftcard.internal.util.GiftCardNumberUtils import com.adyen.checkout.giftcard.internal.util.GiftCardPinUtils @@ -437,6 +438,7 @@ internal class DefaultGiftCardDelegateTest( cardEncryptor = cardEncryptor, analyticsManager = analyticsManager, submitHandler = submitHandler, + validator = DefaultGiftCardValidator(), componentViewType = GiftCardComponentViewType(), ) diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt index 07f4ffa15a..86a1915b72 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt @@ -46,6 +46,7 @@ import com.adyen.checkout.mealvoucher.MealVoucherConfiguration import com.adyen.checkout.mealvoucher.SessionsMealVoucherComponentCallback import com.adyen.checkout.mealvoucher.internal.ui.MealVoucherComponentViewType import com.adyen.checkout.mealvoucher.internal.ui.model.MealVoucherComponentParamsMapper +import com.adyen.checkout.mealvoucher.internal.util.MealVoucherValidator import com.adyen.checkout.sessions.core.CheckoutSession import com.adyen.checkout.sessions.core.internal.SessionInteractor import com.adyen.checkout.sessions.core.internal.SessionSavedStateHandleContainer @@ -117,6 +118,7 @@ constructor( componentParams = componentParams, cardEncryptor = cardEncryptor, submitHandler = SubmitHandler(savedStateHandle), + validator = MealVoucherValidator(), componentViewType = MealVoucherComponentViewType, ) @@ -209,6 +211,7 @@ constructor( componentParams = componentParams, cardEncryptor = cardEncryptor, submitHandler = SubmitHandler(savedStateHandle), + validator = MealVoucherValidator(), componentViewType = MealVoucherComponentViewType, ) diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt index 89ffe7b455..ea2409dab8 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt @@ -98,17 +98,21 @@ internal class MealVoucherView @JvmOverloads constructor( binding.editTextMealVoucherExpiryDate.setOnChangeListener { val date = binding.editTextMealVoucherExpiryDate.date giftCardDelegate.updateInputData { - // TODO Update expiry date + expiryDate = date } binding.textInputLayoutMealVoucherExpiryDate.hideError() } binding.editTextMealVoucherExpiryDate.onFocusChangeListener = OnFocusChangeListener { _, hasFocus -> - // TODO Get validation from outputData + val expiryDateValidation = giftCardDelegate.outputData.expiryDateFieldState.validation if (hasFocus) { binding.textInputLayoutMealVoucherExpiryDate.hideError() - } else { - // TODO Check if validation is invalid and show error + } else if (expiryDateValidation is Validation.Invalid) { + binding.textInputLayoutMealVoucherExpiryDate.showError( + localizedContext.getString( + expiryDateValidation.reason, + ), + ) } } } @@ -146,6 +150,7 @@ internal class MealVoucherView @JvmOverloads constructor( adyenLog(AdyenLogLevel.DEBUG) { "highlightValidationErrors" } val outputData = giftCardDelegate.outputData var isErrorFocused = false + val cardNumberValidation = outputData.numberFieldState.validation if (cardNumberValidation is Validation.Invalid) { isErrorFocused = true @@ -154,7 +159,17 @@ internal class MealVoucherView @JvmOverloads constructor( localizedContext.getString(cardNumberValidation.reason), ) } - // TODO Add expiry date validation + + val expiryDateValidation = outputData.expiryDateFieldState.validation + if (expiryDateValidation is Validation.Invalid) { + if (!isErrorFocused) { + binding.textInputLayoutMealVoucherExpiryDate.requestFocus() + } + binding.textInputLayoutMealVoucherExpiryDate.showError( + localizedContext.getString(expiryDateValidation.reason), + ) + } + val securityCodeValidation = outputData.pinFieldState.validation if (securityCodeValidation is Validation.Invalid) { if (!isErrorFocused) { diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt new file mode 100644 index 0000000000..e88dc03ffd --- /dev/null +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 24/7/2024. + */ + +package com.adyen.checkout.mealvoucher.internal.util + +import com.adyen.checkout.components.core.internal.ui.model.FieldState +import com.adyen.checkout.components.core.internal.ui.model.Validation +import com.adyen.checkout.mealvoucher.R +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate +import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationResult +import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationUtils +import org.jetbrains.annotations.VisibleForTesting +import java.util.Calendar +import java.util.GregorianCalendar + +internal object MealVoucherValidationUtils { + + fun validateExpiryDate(expiryDate: ExpiryDate): FieldState { + return validateExpiryDate(expiryDate, GregorianCalendar.getInstance()) + } + + @VisibleForTesting + internal fun validateExpiryDate(expiryDate: ExpiryDate, calendar: Calendar): FieldState { + return when (ExpiryDateValidationUtils.validateExpiryDateInternal(expiryDate, calendar)) { + ExpiryDateValidationResult.VALID -> FieldState(expiryDate, Validation.Valid) + ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> FieldState( + expiryDate, + Validation.Invalid(R.string.checkout_meal_voucher_expiry_date_not_valid_too_far_in_future), + ) + + ExpiryDateValidationResult.INVALID_TOO_OLD -> FieldState( + expiryDate, + Validation.Invalid(R.string.checkout_meal_voucher_expiry_date_not_valid_too_old), + ) + + ExpiryDateValidationResult.INVALID_EXPIRY_DATE -> FieldState( + expiryDate, + Validation.Invalid(R.string.checkout_meal_voucher_expiry_date_not_valid), + ) + } + } +} diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt new file mode 100644 index 0000000000..7495727182 --- /dev/null +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 24/7/2024. + */ + +package com.adyen.checkout.mealvoucher.internal.util + +import com.adyen.checkout.components.core.internal.ui.model.FieldState +import com.adyen.checkout.giftcard.internal.util.GiftCardNumberUtils +import com.adyen.checkout.giftcard.internal.util.GiftCardPinUtils +import com.adyen.checkout.giftcard.internal.util.GiftCardValidator +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate + +internal class MealVoucherValidator : GiftCardValidator { + + override fun validateNumber(number: String): FieldState { + return GiftCardNumberUtils.validateInputField(number) + } + + override fun validatePin(pin: String): FieldState { + return GiftCardPinUtils.validateInputField(pin) + } + + override fun validateExpiryDate(expiryDate: ExpiryDate): FieldState { + return MealVoucherValidationUtils.validateExpiryDate(expiryDate) + } +} diff --git a/mealvoucher/src/main/res/values/strings.xml b/mealvoucher/src/main/res/values/strings.xml index 5602e91fde..091dbef620 100644 --- a/mealvoucher/src/main/res/values/strings.xml +++ b/mealvoucher/src/main/res/values/strings.xml @@ -11,4 +11,8 @@ Card number Expiry date Security code + + Invalid expiry date + Card too old + Date too far in the future From 3d1aed38419ad897424fdc7a42f0a9e1b8a5d15a Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Wed, 24 Jul 2024 15:02:28 +0200 Subject: [PATCH 236/299] Provide different messages for giftcard and meal voucher on card validation COAND-683 --- .../internal/util/DefaultGiftCardValidator.kt | 5 +-- .../internal/util/GiftCardNumberUtils.kt | 18 ++++----- .../util/GiftCardNumberValidationResult.kt | 17 +++++++++ .../internal/util/GiftCardValidationUtils.kt | 33 ++++++++++++++++ .../ui/DefaultGiftCardDelegateTest.kt | 38 ++++++++++++------- .../util/MealVoucherValidationUtils.kt | 14 +++++++ .../internal/util/MealVoucherValidator.kt | 3 +- mealvoucher/src/main/res/values/strings.xml | 2 + 8 files changed, 100 insertions(+), 30 deletions(-) create mode 100644 giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberValidationResult.kt create mode 100644 giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidationUtils.kt diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt index 1baa28db90..87cb5cbab8 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt @@ -9,12 +9,11 @@ package com.adyen.checkout.giftcard.internal.util import com.adyen.checkout.components.core.internal.ui.model.FieldState -import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate internal class DefaultGiftCardValidator : GiftCardValidator { override fun validateNumber(number: String): FieldState { - return GiftCardNumberUtils.validateInputField(number) + return GiftCardValidationUtils.validateNumber(number) } override fun validatePin(pin: String): FieldState { @@ -22,6 +21,6 @@ internal class DefaultGiftCardValidator : GiftCardValidator { } override fun validateExpiryDate(expiryDate: ExpiryDate): FieldState { - return FieldState(expiryDate, Validation.Valid) + return GiftCardValidationUtils.validateExpiryDate(expiryDate) } } diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtils.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtils.kt index 0e63c23a90..99fb9986cf 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtils.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtils.kt @@ -9,9 +9,6 @@ package com.adyen.checkout.giftcard.internal.util import androidx.annotation.RestrictTo -import com.adyen.checkout.components.core.internal.ui.model.FieldState -import com.adyen.checkout.components.core.internal.ui.model.Validation -import com.adyen.checkout.giftcard.R @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) object GiftCardNumberUtils { @@ -41,15 +38,14 @@ object GiftCardNumberUtils { return text.replace(DIGIT_SEPARATOR.toString(), "") } - fun validateInputField(giftCardNumber: String): FieldState { + // TODO Add tests + fun validateInputField(giftCardNumber: String): GiftCardNumberValidationResult { val rawInput = getRawValue(giftCardNumber) - val validation = when { - rawInput.length < MINIMUM_GIFT_CARD_NUMBER_LENGTH -> - Validation.Invalid(R.string.checkout_giftcard_number_not_valid) - rawInput.length > MAXIMUM_GIFT_CARD_NUMBER_LENGTH -> - Validation.Invalid(R.string.checkout_giftcard_number_not_valid) - else -> Validation.Valid + + return when { + rawInput.length < MINIMUM_GIFT_CARD_NUMBER_LENGTH -> GiftCardNumberValidationResult.INVALID + rawInput.length > MAXIMUM_GIFT_CARD_NUMBER_LENGTH -> GiftCardNumberValidationResult.INVALID + else -> GiftCardNumberValidationResult.VALID } - return FieldState(rawInput, validation) } } diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberValidationResult.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberValidationResult.kt new file mode 100644 index 0000000000..a0b8140b07 --- /dev/null +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberValidationResult.kt @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ararat on 24/7/2024. + */ + +package com.adyen.checkout.giftcard.internal.util + +import androidx.annotation.RestrictTo + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +enum class GiftCardNumberValidationResult { + VALID, + INVALID, +} diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidationUtils.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidationUtils.kt new file mode 100644 index 0000000000..fab7cd267d --- /dev/null +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidationUtils.kt @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ararat on 24/7/2024. + */ + +package com.adyen.checkout.giftcard.internal.util + +import com.adyen.checkout.components.core.internal.ui.model.FieldState +import com.adyen.checkout.components.core.internal.ui.model.Validation +import com.adyen.checkout.giftcard.R +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate + +internal object GiftCardValidationUtils { + + fun validateNumber(number: String): FieldState { + val validation = GiftCardNumberUtils.validateInputField(number) + + return when (validation) { + GiftCardNumberValidationResult.VALID -> FieldState(number, Validation.Valid) + GiftCardNumberValidationResult.INVALID -> FieldState( + number, + Validation.Invalid(R.string.checkout_giftcard_number_not_valid), + ) + } + } + + fun validateExpiryDate(expiryDate: ExpiryDate): FieldState { + return FieldState(expiryDate, Validation.Valid) + } +} diff --git a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt index 481ede0443..3860d5cf6b 100644 --- a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt +++ b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt @@ -32,8 +32,6 @@ import com.adyen.checkout.giftcard.internal.ui.model.GiftCardComponentParamsMapp import com.adyen.checkout.giftcard.internal.ui.model.GiftCardOutputData import com.adyen.checkout.giftcard.internal.util.DefaultGiftCardValidator import com.adyen.checkout.giftcard.internal.util.GiftCardBalanceStatus -import com.adyen.checkout.giftcard.internal.util.GiftCardNumberUtils -import com.adyen.checkout.giftcard.internal.util.GiftCardPinUtils import com.adyen.checkout.test.TestDispatcherExtension import com.adyen.checkout.test.extensions.test import com.adyen.checkout.ui.core.internal.ui.SubmitHandler @@ -100,7 +98,7 @@ internal class DefaultGiftCardDelegateTest( @Test fun `public key is null, then component state should not be ready`() = runTest { delegate.componentStateFlow.test { - delegate.updateComponentState(giftCardOutputDataWith("5555444433330000", "737")) + delegate.updateComponentState(createValidOutputData()) val componentState = expectMostRecentItem() @@ -115,7 +113,7 @@ internal class DefaultGiftCardDelegateTest( delegate.initialize(CoroutineScope(UnconfinedTestDispatcher())) delegate.componentStateFlow.test { - delegate.updateComponentState(giftCardOutputDataWith("123", "737")) + delegate.updateComponentState(createInvalidOutputData()) val componentState = expectMostRecentItem() @@ -133,7 +131,7 @@ internal class DefaultGiftCardDelegateTest( delegate.initialize(CoroutineScope(UnconfinedTestDispatcher())) delegate.componentStateFlow.test { - delegate.updateComponentState(giftCardOutputDataWith("5555444433330000", "737")) + delegate.updateComponentState(createValidOutputData()) val componentState = expectMostRecentItem() @@ -149,7 +147,7 @@ internal class DefaultGiftCardDelegateTest( delegate.initialize(CoroutineScope(UnconfinedTestDispatcher())) delegate.componentStateFlow.test { - delegate.updateComponentState(giftCardOutputDataWith("5555444433330000", "737")) + delegate.updateComponentState(createValidOutputData("5555444433330000")) val componentState = expectMostRecentItem() @@ -427,7 +425,7 @@ internal class DefaultGiftCardDelegateTest( private fun createGiftCardDelegate( configuration: CheckoutConfiguration = createCheckoutConfiguration(), - order: OrderRequest? = TEST_ORDER + order: OrderRequest? = TEST_ORDER, ) = DefaultGiftCardDelegate( observerRepository = PaymentObserverRepository(), paymentMethod = PaymentMethod(type = TEST_PAYMENT_METHOD_TYPE), @@ -454,14 +452,24 @@ internal class DefaultGiftCardDelegateTest( giftCard(configuration) } - private fun giftCardOutputDataWith( - number: String, - @Suppress("SameParameterValue") pin: String, + private fun createValidOutputData( + number: String = TEST_NUMBER, + pin: String = TEST_PIN, + expiryDate: ExpiryDate = TEST_EXPIRY_DATE, ) = GiftCardOutputData( - numberFieldState = GiftCardNumberUtils.validateInputField(number), - pinFieldState = GiftCardPinUtils.validateInputField(pin), - // expiry date is valid since it doesn't apply to gift cards - expiryDateFieldState = FieldState(TEST_EXPIRY_DATE, Validation.Valid), + numberFieldState = FieldState(number, Validation.Valid), + pinFieldState = FieldState(pin, Validation.Valid), + expiryDateFieldState = FieldState(expiryDate, Validation.Valid), + ) + + private fun createInvalidOutputData( + number: String = TEST_NUMBER, + pin: String = TEST_PIN, + expiryDate: ExpiryDate = TEST_EXPIRY_DATE, + ) = GiftCardOutputData( + numberFieldState = FieldState(number, Validation.Invalid(-1)), + pinFieldState = FieldState(pin, Validation.Invalid(-1)), + expiryDateFieldState = FieldState(expiryDate, Validation.Valid), ) companion object { @@ -469,6 +477,8 @@ internal class DefaultGiftCardDelegateTest( private val TEST_ORDER = OrderRequest("PSP", "ORDER_DATA") private const val TEST_CHECKOUT_ATTEMPT_ID = "TEST_CHECKOUT_ATTEMPT_ID" private const val TEST_PAYMENT_METHOD_TYPE = "TEST_PAYMENT_METHOD_TYPE" + private const val TEST_NUMBER = "test_number" + private const val TEST_PIN = "test_pin" private val TEST_EXPIRY_DATE = ExpiryDate(3, 2030) @JvmStatic diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt index e88dc03ffd..18cfc568cf 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt @@ -10,6 +10,8 @@ package com.adyen.checkout.mealvoucher.internal.util import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation +import com.adyen.checkout.giftcard.internal.util.GiftCardNumberUtils +import com.adyen.checkout.giftcard.internal.util.GiftCardNumberValidationResult import com.adyen.checkout.mealvoucher.R import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationResult @@ -20,6 +22,18 @@ import java.util.GregorianCalendar internal object MealVoucherValidationUtils { + fun validateNumber(number: String): FieldState { + val validation = GiftCardNumberUtils.validateInputField(number) + + return when (validation) { + GiftCardNumberValidationResult.VALID -> FieldState(number, Validation.Valid) + GiftCardNumberValidationResult.INVALID -> FieldState( + number, + Validation.Invalid(R.string.checkout_meal_voucher_number_not_valid), + ) + } + } + fun validateExpiryDate(expiryDate: ExpiryDate): FieldState { return validateExpiryDate(expiryDate, GregorianCalendar.getInstance()) } diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt index 7495727182..c26621c735 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt @@ -9,7 +9,6 @@ package com.adyen.checkout.mealvoucher.internal.util import com.adyen.checkout.components.core.internal.ui.model.FieldState -import com.adyen.checkout.giftcard.internal.util.GiftCardNumberUtils import com.adyen.checkout.giftcard.internal.util.GiftCardPinUtils import com.adyen.checkout.giftcard.internal.util.GiftCardValidator import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate @@ -17,7 +16,7 @@ import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate internal class MealVoucherValidator : GiftCardValidator { override fun validateNumber(number: String): FieldState { - return GiftCardNumberUtils.validateInputField(number) + return MealVoucherValidationUtils.validateNumber(number) } override fun validatePin(pin: String): FieldState { diff --git a/mealvoucher/src/main/res/values/strings.xml b/mealvoucher/src/main/res/values/strings.xml index 091dbef620..94393fa07c 100644 --- a/mealvoucher/src/main/res/values/strings.xml +++ b/mealvoucher/src/main/res/values/strings.xml @@ -12,6 +12,8 @@ Expiry date Security code + Invalid card number + Invalid expiry date Card too old Date too far in the future From 86322175efa26547aaaf6562bf2bcdd0ebd5dfe8 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Wed, 24 Jul 2024 15:22:17 +0200 Subject: [PATCH 237/299] Provide different messages for giftcard and meal voucher on pin validation COAND-683 --- .../internal/util/DefaultGiftCardValidator.kt | 2 +- .../giftcard/internal/util/GiftCardPinUtils.kt | 17 +++++------------ .../util/GiftCardPinValidationResult.kt | 17 +++++++++++++++++ .../internal/util/GiftCardValidationUtils.kt | 12 ++++++++++++ .../internal/util/MealVoucherValidationUtils.kt | 14 ++++++++++++++ .../internal/util/MealVoucherValidator.kt | 3 +-- mealvoucher/src/main/res/values/strings.xml | 1 + 7 files changed, 51 insertions(+), 15 deletions(-) create mode 100644 giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinValidationResult.kt diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt index 87cb5cbab8..4295711cbb 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt @@ -17,7 +17,7 @@ internal class DefaultGiftCardValidator : GiftCardValidator { } override fun validatePin(pin: String): FieldState { - return GiftCardPinUtils.validateInputField(pin) + return GiftCardValidationUtils.validatePin(pin) } override fun validateExpiryDate(expiryDate: ExpiryDate): FieldState { diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtils.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtils.kt index 6a884d09f1..0d4cedaffd 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtils.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtils.kt @@ -9,9 +9,6 @@ package com.adyen.checkout.giftcard.internal.util import androidx.annotation.RestrictTo -import com.adyen.checkout.components.core.internal.ui.model.FieldState -import com.adyen.checkout.components.core.internal.ui.model.Validation -import com.adyen.checkout.giftcard.R @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) object GiftCardPinUtils { @@ -19,14 +16,10 @@ object GiftCardPinUtils { private const val MINIMUM_GIFT_CARD_PIN_LENGTH = 3 private const val MAXIMUM_GIFT_CARD_PIN_LENGTH = 10 - fun validateInputField(giftCardPin: String): FieldState { - val validation = when { - giftCardPin.length < MINIMUM_GIFT_CARD_PIN_LENGTH -> - Validation.Invalid(R.string.checkout_giftcard_pin_not_valid) - giftCardPin.length > MAXIMUM_GIFT_CARD_PIN_LENGTH -> - Validation.Invalid(R.string.checkout_giftcard_pin_not_valid) - else -> Validation.Valid - } - return FieldState(giftCardPin, validation) + // TODO Add tests + fun validateInputField(giftCardPin: String) = when { + giftCardPin.length < MINIMUM_GIFT_CARD_PIN_LENGTH -> GiftCardPinValidationResult.INVALID + giftCardPin.length > MAXIMUM_GIFT_CARD_PIN_LENGTH -> GiftCardPinValidationResult.INVALID + else -> GiftCardPinValidationResult.VALID } } diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinValidationResult.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinValidationResult.kt new file mode 100644 index 0000000000..2992935b76 --- /dev/null +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinValidationResult.kt @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ararat on 24/7/2024. + */ + +package com.adyen.checkout.giftcard.internal.util + +import androidx.annotation.RestrictTo + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +enum class GiftCardPinValidationResult { + VALID, + INVALID, +} diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidationUtils.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidationUtils.kt index fab7cd267d..d6809ec60d 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidationUtils.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidationUtils.kt @@ -27,6 +27,18 @@ internal object GiftCardValidationUtils { } } + fun validatePin(pin: String): FieldState { + val validation = GiftCardPinUtils.validateInputField(pin) + + return when (validation) { + GiftCardPinValidationResult.VALID -> FieldState(pin, Validation.Valid) + GiftCardPinValidationResult.INVALID -> FieldState( + pin, + Validation.Invalid(R.string.checkout_giftcard_pin_not_valid), + ) + } + } + fun validateExpiryDate(expiryDate: ExpiryDate): FieldState { return FieldState(expiryDate, Validation.Valid) } diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt index 18cfc568cf..aa71059299 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt @@ -12,6 +12,8 @@ import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.giftcard.internal.util.GiftCardNumberUtils import com.adyen.checkout.giftcard.internal.util.GiftCardNumberValidationResult +import com.adyen.checkout.giftcard.internal.util.GiftCardPinUtils +import com.adyen.checkout.giftcard.internal.util.GiftCardPinValidationResult import com.adyen.checkout.mealvoucher.R import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationResult @@ -34,6 +36,18 @@ internal object MealVoucherValidationUtils { } } + fun validatePin(pin: String): FieldState { + val validation = GiftCardPinUtils.validateInputField(pin) + + return when (validation) { + GiftCardPinValidationResult.VALID -> FieldState(pin, Validation.Valid) + GiftCardPinValidationResult.INVALID -> FieldState( + pin, + Validation.Invalid(R.string.checkout_meal_voucher_pin_not_valid), + ) + } + } + fun validateExpiryDate(expiryDate: ExpiryDate): FieldState { return validateExpiryDate(expiryDate, GregorianCalendar.getInstance()) } diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt index c26621c735..dcde9100e4 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt @@ -9,7 +9,6 @@ package com.adyen.checkout.mealvoucher.internal.util import com.adyen.checkout.components.core.internal.ui.model.FieldState -import com.adyen.checkout.giftcard.internal.util.GiftCardPinUtils import com.adyen.checkout.giftcard.internal.util.GiftCardValidator import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate @@ -20,7 +19,7 @@ internal class MealVoucherValidator : GiftCardValidator { } override fun validatePin(pin: String): FieldState { - return GiftCardPinUtils.validateInputField(pin) + return MealVoucherValidationUtils.validatePin(pin) } override fun validateExpiryDate(expiryDate: ExpiryDate): FieldState { diff --git a/mealvoucher/src/main/res/values/strings.xml b/mealvoucher/src/main/res/values/strings.xml index 94393fa07c..496a47b259 100644 --- a/mealvoucher/src/main/res/values/strings.xml +++ b/mealvoucher/src/main/res/values/strings.xml @@ -13,6 +13,7 @@ Security code Invalid card number + Invalid security code Invalid expiry date Card too old From 00b46404a88feaafdca2f770c51f74d78576f89a Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:28:27 +0200 Subject: [PATCH 238/299] Create GiftCardProtocol GiftCardProtocol is used to make and get necessary details for different Gift Card flows such as gift cards and meal vouchers. COAND-693 --- components-core/api/components-core.api | 1 + .../components/core/PaymentMethodTypes.kt | 1 + .../paymentmethod/PaymentMethodDetails.kt | 7 +++- .../provider/GiftCardComponentProvider.kt | 6 +-- .../internal/ui/DefaultGiftCardDelegate.kt | 16 +++----- .../ui/protocol/DefaultGiftCardProtocol.kt | 37 ++++++++++++++++++ .../internal/ui/protocol/GiftCardProtocol.kt | 27 +++++++++++++ .../ui/DefaultGiftCardDelegateTest.kt | 3 +- .../provider/MealVoucherComponentProvider.kt | 6 +-- .../ui/protocol/MealVoucherProtocol.kt | 39 +++++++++++++++++++ 10 files changed, 125 insertions(+), 18 deletions(-) create mode 100644 giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/protocol/DefaultGiftCardProtocol.kt create mode 100644 giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/protocol/GiftCardProtocol.kt create mode 100644 mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/protocol/MealVoucherProtocol.kt diff --git a/components-core/api/components-core.api b/components-core/api/components-core.api index 336a1c67b3..9d27010c17 100644 --- a/components-core/api/components-core.api +++ b/components-core/api/components-core.api @@ -901,6 +901,7 @@ public final class com/adyen/checkout/components/core/PaymentMethodTypes { public static final field IDEAL Ljava/lang/String; public static final field INSTANCE Lcom/adyen/checkout/components/core/PaymentMethodTypes; public static final field MB_WAY Ljava/lang/String; + public static final field MEAL_VOUCHER_FR Ljava/lang/String; public static final field MEAL_VOUCHER_FR_GROUPEUP Ljava/lang/String; public static final field MEAL_VOUCHER_FR_NATIXIS Ljava/lang/String; public static final field MEAL_VOUCHER_FR_SODEXO Ljava/lang/String; diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt index 8317ac51b4..2daa2a4101 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt @@ -39,6 +39,7 @@ object PaymentMethodTypes { const val MEAL_VOUCHER_FR_GROUPEUP = "mealVoucher_FR_groupeup" const val MEAL_VOUCHER_FR_NATIXIS = "mealVoucher_FR_natixis" const val MEAL_VOUCHER_FR_SODEXO = "mealVoucher_FR_sodexo" + const val MEAL_VOUCHER_FR = "mealVoucher_FR" const val MOLPAY_MALAYSIA = "molpay_ebanking_fpx_MY" const val MOLPAY_THAILAND = "molpay_ebanking_TH" const val MOLPAY_VIETNAM = "molpay_ebanking_VN" diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/paymentmethod/PaymentMethodDetails.kt b/components-core/src/main/java/com/adyen/checkout/components/core/paymentmethod/PaymentMethodDetails.kt index 27f614339a..4fd527ee0b 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/paymentmethod/PaymentMethodDetails.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/paymentmethod/PaymentMethodDetails.kt @@ -65,7 +65,12 @@ abstract class PaymentMethodDetails : ModelObject() { DotpayPaymentMethod.PAYMENT_METHOD_TYPE -> DotpayPaymentMethod.SERIALIZER EPSPaymentMethod.PAYMENT_METHOD_TYPE -> EPSPaymentMethod.SERIALIZER EntercashPaymentMethod.PAYMENT_METHOD_TYPE -> EntercashPaymentMethod.SERIALIZER - GiftCardPaymentMethod.PAYMENT_METHOD_TYPE -> GiftCardPaymentMethod.SERIALIZER + GiftCardPaymentMethod.PAYMENT_METHOD_TYPE, + PaymentMethodTypes.MEAL_VOUCHER_FR_GROUPEUP, + PaymentMethodTypes.MEAL_VOUCHER_FR_NATIXIS, + PaymentMethodTypes.MEAL_VOUCHER_FR_SODEXO, + PaymentMethodTypes.MEAL_VOUCHER_FR -> GiftCardPaymentMethod.SERIALIZER + IdealPaymentMethod.PAYMENT_METHOD_TYPE -> IdealPaymentMethod.SERIALIZER MBWayPaymentMethod.PAYMENT_METHOD_TYPE -> MBWayPaymentMethod.SERIALIZER OnlineBankingCZPaymentMethod.PAYMENT_METHOD_TYPE -> OnlineBankingCZPaymentMethod.SERIALIZER diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/provider/GiftCardComponentProvider.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/provider/GiftCardComponentProvider.kt index 3e214dc087..7471f9ceb9 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/provider/GiftCardComponentProvider.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/provider/GiftCardComponentProvider.kt @@ -42,8 +42,8 @@ import com.adyen.checkout.giftcard.internal.GiftCardComponentEventHandler import com.adyen.checkout.giftcard.internal.SessionsGiftCardComponentCallbackWrapper import com.adyen.checkout.giftcard.internal.SessionsGiftCardComponentEventHandler import com.adyen.checkout.giftcard.internal.ui.DefaultGiftCardDelegate -import com.adyen.checkout.giftcard.internal.ui.GiftCardComponentViewType import com.adyen.checkout.giftcard.internal.ui.model.GiftCardComponentParamsMapper +import com.adyen.checkout.giftcard.internal.ui.protocol.DefaultGiftCardProtocol import com.adyen.checkout.giftcard.internal.util.DefaultGiftCardValidator import com.adyen.checkout.giftcard.toCheckoutConfiguration import com.adyen.checkout.sessions.core.CheckoutSession @@ -117,7 +117,7 @@ constructor( cardEncryptor = cardEncryptor, submitHandler = SubmitHandler(savedStateHandle), validator = DefaultGiftCardValidator(), - componentViewType = GiftCardComponentViewType(), + protocol = DefaultGiftCardProtocol(), ) val genericActionDelegate = @@ -210,7 +210,7 @@ constructor( cardEncryptor = cardEncryptor, submitHandler = SubmitHandler(savedStateHandle), validator = DefaultGiftCardValidator(), - componentViewType = GiftCardComponentViewType(), + protocol = DefaultGiftCardProtocol(), ) val genericActionDelegate = diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt index d133f0b346..05133287ab 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt @@ -26,7 +26,6 @@ import com.adyen.checkout.components.core.internal.data.api.PublicKeyRepository import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.components.core.internal.util.bufferedChannel -import com.adyen.checkout.components.core.paymentmethod.GiftCardPaymentMethod import com.adyen.checkout.core.AdyenLogLevel import com.adyen.checkout.core.exception.CheckoutException import com.adyen.checkout.core.exception.ComponentException @@ -41,6 +40,7 @@ import com.adyen.checkout.giftcard.GiftCardException import com.adyen.checkout.giftcard.internal.ui.model.GiftCardComponentParams import com.adyen.checkout.giftcard.internal.ui.model.GiftCardInputData import com.adyen.checkout.giftcard.internal.ui.model.GiftCardOutputData +import com.adyen.checkout.giftcard.internal.ui.protocol.GiftCardProtocol import com.adyen.checkout.giftcard.internal.util.GiftCardBalanceStatus import com.adyen.checkout.giftcard.internal.util.GiftCardBalanceUtils import com.adyen.checkout.giftcard.internal.util.GiftCardValidator @@ -69,7 +69,7 @@ class DefaultGiftCardDelegate( private val cardEncryptor: BaseCardEncryptor, private val submitHandler: SubmitHandler, private val validator: GiftCardValidator, - componentViewType: GiftCardComponentViewType, + private val protocol: GiftCardProtocol ) : GiftCardDelegate { private val inputData: GiftCardInputData = GiftCardInputData() @@ -85,7 +85,7 @@ class DefaultGiftCardDelegate( private val exceptionChannel: Channel = bufferedChannel() override val exceptionFlow: Flow = exceptionChannel.receiveAsFlow() - private val _viewFlow: MutableStateFlow = MutableStateFlow(componentViewType) + private val _viewFlow: MutableStateFlow = MutableStateFlow(protocol.getComponentViewType()) override val viewFlow: Flow = _viewFlow override val submitFlow: Flow = submitHandler.submitFlow @@ -225,14 +225,10 @@ class DefaultGiftCardDelegate( giftCardAction = GiftCardAction.Idle, ) - val giftCardPaymentMethod = GiftCardPaymentMethod( - type = GiftCardPaymentMethod.PAYMENT_METHOD_TYPE, + val giftCardPaymentMethod = protocol.createPaymentMethod( + paymentMethod = paymentMethod, + encryptedCard = encryptedCard, checkoutAttemptId = analyticsManager.getCheckoutAttemptId(), - encryptedCardNumber = encryptedCard.encryptedCardNumber, - encryptedSecurityCode = encryptedCard.encryptedSecurityCode, - encryptedExpiryMonth = encryptedCard.encryptedExpiryMonth, - encryptedExpiryYear = encryptedCard.encryptedExpiryYear, - brand = paymentMethod.brand, ) val lastDigits = outputData.numberFieldState.value.takeLast(LAST_DIGITS_LENGTH) diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/protocol/DefaultGiftCardProtocol.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/protocol/DefaultGiftCardProtocol.kt new file mode 100644 index 0000000000..ce49c162bd --- /dev/null +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/protocol/DefaultGiftCardProtocol.kt @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 30/7/2024. + */ + +package com.adyen.checkout.giftcard.internal.ui.protocol + +import com.adyen.checkout.components.core.PaymentMethod +import com.adyen.checkout.components.core.paymentmethod.GiftCardPaymentMethod +import com.adyen.checkout.cse.EncryptedCard +import com.adyen.checkout.giftcard.internal.ui.GiftCardComponentViewType +import com.adyen.checkout.ui.core.internal.ui.ComponentViewType + +internal class DefaultGiftCardProtocol : GiftCardProtocol { + override fun getComponentViewType(): ComponentViewType { + return GiftCardComponentViewType() + } + + override fun createPaymentMethod( + paymentMethod: PaymentMethod, + encryptedCard: EncryptedCard, + checkoutAttemptId: String? + ): GiftCardPaymentMethod { + return GiftCardPaymentMethod( + type = paymentMethod.type, + checkoutAttemptId = checkoutAttemptId, + encryptedCardNumber = encryptedCard.encryptedCardNumber, + encryptedSecurityCode = encryptedCard.encryptedSecurityCode, + encryptedExpiryMonth = encryptedCard.encryptedExpiryMonth, + encryptedExpiryYear = encryptedCard.encryptedExpiryYear, + brand = paymentMethod.brand, + ) + } +} diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/protocol/GiftCardProtocol.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/protocol/GiftCardProtocol.kt new file mode 100644 index 0000000000..5104936d64 --- /dev/null +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/protocol/GiftCardProtocol.kt @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 30/7/2024. + */ + +package com.adyen.checkout.giftcard.internal.ui.protocol + +import androidx.annotation.RestrictTo +import com.adyen.checkout.components.core.PaymentMethod +import com.adyen.checkout.components.core.paymentmethod.GiftCardPaymentMethod +import com.adyen.checkout.cse.EncryptedCard +import com.adyen.checkout.ui.core.internal.ui.ComponentViewType + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +interface GiftCardProtocol { + + fun getComponentViewType(): ComponentViewType + + fun createPaymentMethod( + paymentMethod: PaymentMethod, + encryptedCard: EncryptedCard, + checkoutAttemptId: String? + ): GiftCardPaymentMethod +} diff --git a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt index 3860d5cf6b..39b79376ec 100644 --- a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt +++ b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt @@ -30,6 +30,7 @@ import com.adyen.checkout.giftcard.GiftCardException import com.adyen.checkout.giftcard.giftCard import com.adyen.checkout.giftcard.internal.ui.model.GiftCardComponentParamsMapper import com.adyen.checkout.giftcard.internal.ui.model.GiftCardOutputData +import com.adyen.checkout.giftcard.internal.ui.protocol.DefaultGiftCardProtocol import com.adyen.checkout.giftcard.internal.util.DefaultGiftCardValidator import com.adyen.checkout.giftcard.internal.util.GiftCardBalanceStatus import com.adyen.checkout.test.TestDispatcherExtension @@ -437,7 +438,7 @@ internal class DefaultGiftCardDelegateTest( analyticsManager = analyticsManager, submitHandler = submitHandler, validator = DefaultGiftCardValidator(), - componentViewType = GiftCardComponentViewType(), + protocol = DefaultGiftCardProtocol(), ) private fun createCheckoutConfiguration( diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt index 86a1915b72..e0b4fada0b 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt @@ -44,8 +44,8 @@ import com.adyen.checkout.mealvoucher.MealVoucherComponentCallback import com.adyen.checkout.mealvoucher.MealVoucherComponentState import com.adyen.checkout.mealvoucher.MealVoucherConfiguration import com.adyen.checkout.mealvoucher.SessionsMealVoucherComponentCallback -import com.adyen.checkout.mealvoucher.internal.ui.MealVoucherComponentViewType import com.adyen.checkout.mealvoucher.internal.ui.model.MealVoucherComponentParamsMapper +import com.adyen.checkout.mealvoucher.internal.ui.protocol.MealVoucherProtocol import com.adyen.checkout.mealvoucher.internal.util.MealVoucherValidator import com.adyen.checkout.sessions.core.CheckoutSession import com.adyen.checkout.sessions.core.internal.SessionInteractor @@ -119,7 +119,7 @@ constructor( cardEncryptor = cardEncryptor, submitHandler = SubmitHandler(savedStateHandle), validator = MealVoucherValidator(), - componentViewType = MealVoucherComponentViewType, + protocol = MealVoucherProtocol(), ) val genericActionDelegate = @@ -212,7 +212,7 @@ constructor( cardEncryptor = cardEncryptor, submitHandler = SubmitHandler(savedStateHandle), validator = MealVoucherValidator(), - componentViewType = MealVoucherComponentViewType, + protocol = MealVoucherProtocol(), ) val genericActionDelegate = diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/protocol/MealVoucherProtocol.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/protocol/MealVoucherProtocol.kt new file mode 100644 index 0000000000..3ab72cd24c --- /dev/null +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/protocol/MealVoucherProtocol.kt @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 30/7/2024. + */ + +package com.adyen.checkout.mealvoucher.internal.ui.protocol + +import com.adyen.checkout.components.core.PaymentMethod +import com.adyen.checkout.components.core.PaymentMethodTypes +import com.adyen.checkout.components.core.paymentmethod.GiftCardPaymentMethod +import com.adyen.checkout.cse.EncryptedCard +import com.adyen.checkout.giftcard.internal.ui.protocol.GiftCardProtocol +import com.adyen.checkout.mealvoucher.internal.ui.MealVoucherComponentViewType +import com.adyen.checkout.ui.core.internal.ui.ComponentViewType + +internal class MealVoucherProtocol : GiftCardProtocol { + override fun getComponentViewType(): ComponentViewType { + return MealVoucherComponentViewType + } + + override fun createPaymentMethod( + paymentMethod: PaymentMethod, + encryptedCard: EncryptedCard, + checkoutAttemptId: String? + ): GiftCardPaymentMethod { + return GiftCardPaymentMethod( + type = PaymentMethodTypes.MEAL_VOUCHER_FR, + checkoutAttemptId = checkoutAttemptId, + encryptedCardNumber = encryptedCard.encryptedCardNumber, + encryptedSecurityCode = encryptedCard.encryptedSecurityCode, + encryptedExpiryMonth = encryptedCard.encryptedExpiryMonth, + encryptedExpiryYear = encryptedCard.encryptedExpiryYear, + brand = paymentMethod.type, + ) + } +} From 60cf1c8aca547d77d2a0582c4992bbdecd47cfc3 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:28:27 +0200 Subject: [PATCH 239/299] Create GiftCardProtocol GiftCardProtocol is used to make and get necessary details for different Gift Card flows such as gift cards and meal vouchers. COAND-693 --- .../com/adyen/checkout/components/core/PaymentMethodTypes.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt index 2daa2a4101..7bf630c057 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt @@ -36,6 +36,7 @@ object PaymentMethodTypes { const val GOOGLE_PAY_LEGACY = "paywithgoogle" const val IDEAL = "ideal" const val MB_WAY = "mbway" + const val MEAL_VOUCHER_FR = "mealVoucher_FR" // not a txVariant, only to be used for /payments call const val MEAL_VOUCHER_FR_GROUPEUP = "mealVoucher_FR_groupeup" const val MEAL_VOUCHER_FR_NATIXIS = "mealVoucher_FR_natixis" const val MEAL_VOUCHER_FR_SODEXO = "mealVoucher_FR_sodexo" From 202d07b68310f563677c1b28c982eb44d4c753de Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Thu, 1 Aug 2024 15:10:59 +0400 Subject: [PATCH 240/299] Create meal voucher configuration COAND-683 --- .../CheckoutConfigurationProvider.kt | 5 + .../giftcard/GiftCardConfiguration.kt | 9 +- mealvoucher/api/mealvoucher.api | 49 ++++- .../mealvoucher/MealVoucherConfiguration.kt | 167 +++++++++++++++++- .../provider/MealVoucherComponentProvider.kt | 4 +- .../model/MealVoucherComponentParamsMapper.kt | 10 +- 6 files changed, 219 insertions(+), 25 deletions(-) diff --git a/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt b/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt index 7462ac4771..64d7731a91 100644 --- a/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt +++ b/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt @@ -26,6 +26,7 @@ import com.adyen.checkout.example.data.storage.KeyValueStorage import com.adyen.checkout.giftcard.giftCard import com.adyen.checkout.googlepay.googlePay import com.adyen.checkout.instant.instantPayment +import com.adyen.checkout.mealvoucher.mealVoucher import dagger.hilt.android.qualifiers.ApplicationContext import java.util.Locale import javax.inject.Inject @@ -83,6 +84,10 @@ internal class CheckoutConfigurationProvider @Inject constructor( setPinRequired(true) } + mealVoucher { + setSecurityCodeRequired(true) + } + googlePay { setCountryCode(keyValueStorage.getCountry()) } diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardConfiguration.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardConfiguration.kt index c38f38f07a..c10c34159c 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardConfiguration.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardConfiguration.kt @@ -8,7 +8,6 @@ package com.adyen.checkout.giftcard import android.content.Context -import androidx.annotation.RestrictTo import com.adyen.checkout.action.core.GenericActionConfiguration import com.adyen.checkout.action.core.internal.ActionHandlingPaymentMethodConfigurationBuilder import com.adyen.checkout.components.core.Amount @@ -147,15 +146,11 @@ fun CheckoutConfiguration.giftCard( return this } -// TODO revert RestrictTo annotation after implementing MealVoucherConfiguration class. -@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) -fun CheckoutConfiguration.getGiftCardConfiguration(): GiftCardConfiguration? { +internal fun CheckoutConfiguration.getGiftCardConfiguration(): GiftCardConfiguration? { return getConfiguration(PaymentMethodTypes.GIFTCARD) } -// TODO revert RestrictTo annotation after implementing MealVoucherConfiguration class. -@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) -fun GiftCardConfiguration.toCheckoutConfiguration(): CheckoutConfiguration { +internal fun GiftCardConfiguration.toCheckoutConfiguration(): CheckoutConfiguration { return CheckoutConfiguration( shopperLocale = shopperLocale, environment = environment, diff --git a/mealvoucher/api/mealvoucher.api b/mealvoucher/api/mealvoucher.api index f36274c09c..f7441de3d9 100644 --- a/mealvoucher/api/mealvoucher.api +++ b/mealvoucher/api/mealvoucher.api @@ -15,6 +15,43 @@ public final class com/adyen/checkout/mealvoucher/MealVoucherComponent : com/ady public final class com/adyen/checkout/mealvoucher/MealVoucherComponent$Companion { } +public final class com/adyen/checkout/mealvoucher/MealVoucherConfiguration : com/adyen/checkout/components/core/internal/ButtonConfiguration, com/adyen/checkout/components/core/internal/Configuration { + public static final field CREATOR Landroid/os/Parcelable$Creator; + public synthetic fun (Ljava/util/Locale;Lcom/adyen/checkout/core/Environment;Ljava/lang/String;Lcom/adyen/checkout/components/core/AnalyticsConfiguration;Lcom/adyen/checkout/components/core/Amount;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/adyen/checkout/action/core/GenericActionConfiguration;Lkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun describeContents ()I + public fun getAmount ()Lcom/adyen/checkout/components/core/Amount; + public fun getAnalyticsConfiguration ()Lcom/adyen/checkout/components/core/AnalyticsConfiguration; + public fun getClientKey ()Ljava/lang/String; + public fun getEnvironment ()Lcom/adyen/checkout/core/Environment; + public fun getShopperLocale ()Ljava/util/Locale; + public final fun isSecurityCodeRequired ()Ljava/lang/Boolean; + public fun isSubmitButtonVisible ()Ljava/lang/Boolean; + public fun writeToParcel (Landroid/os/Parcel;I)V +} + +public final class com/adyen/checkout/mealvoucher/MealVoucherConfiguration$Builder : com/adyen/checkout/action/core/internal/ActionHandlingPaymentMethodConfigurationBuilder, com/adyen/checkout/components/core/internal/ButtonConfigurationBuilder { + public fun (Landroid/content/Context;Lcom/adyen/checkout/core/Environment;Ljava/lang/String;)V + public fun (Lcom/adyen/checkout/core/Environment;Ljava/lang/String;)V + public fun (Ljava/util/Locale;Lcom/adyen/checkout/core/Environment;Ljava/lang/String;)V + public synthetic fun buildInternal ()Lcom/adyen/checkout/components/core/internal/Configuration; + public final fun setSecurityCodeRequired (Z)Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration$Builder; + public synthetic fun setSubmitButtonVisible (Z)Lcom/adyen/checkout/components/core/internal/ButtonConfigurationBuilder; + public fun setSubmitButtonVisible (Z)Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration$Builder; +} + +public final class com/adyen/checkout/mealvoucher/MealVoucherConfiguration$Creator : android/os/Parcelable$Creator { + public fun ()V + public final fun createFromParcel (Landroid/os/Parcel;)Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration; + public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object; + public final fun newArray (I)[Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration; + public synthetic fun newArray (I)[Ljava/lang/Object; +} + +public final class com/adyen/checkout/mealvoucher/MealVoucherConfigurationKt { + public static final fun mealVoucher (Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lkotlin/jvm/functions/Function1;)Lcom/adyen/checkout/components/core/CheckoutConfiguration; + public static synthetic fun mealVoucher$default (Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/adyen/checkout/components/core/CheckoutConfiguration; +} + public final class com/adyen/checkout/mealvoucher/databinding/MealVoucherViewBinding : androidx/viewbinding/ViewBinding { public final field editTextMealVoucherCardNumber Lcom/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput; public final field editTextMealVoucherExpiryDate Lcom/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput; @@ -31,31 +68,31 @@ public final class com/adyen/checkout/mealvoucher/internal/provider/MealVoucherC public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; - public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/GiftCardConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; - public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/GiftCardConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; public synthetic fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; public synthetic fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; - public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/GiftCardConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; public synthetic fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; public synthetic fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; - public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/GiftCardConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; public synthetic fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; public synthetic fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Landroid/app/Application;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; public synthetic fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Landroid/app/Application;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; - public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/GiftCardConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; public synthetic fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Landroid/app/Application;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; public synthetic fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Landroid/app/Application;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; - public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/GiftCardConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; public fun isPaymentMethodSupported (Lcom/adyen/checkout/components/core/PaymentMethod;)Z } diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt index 4aa1ae0b0e..56a80ab8c0 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt @@ -8,7 +8,168 @@ package com.adyen.checkout.mealvoucher -import com.adyen.checkout.giftcard.GiftCardConfiguration +import android.content.Context +import com.adyen.checkout.action.core.GenericActionConfiguration +import com.adyen.checkout.action.core.internal.ActionHandlingPaymentMethodConfigurationBuilder +import com.adyen.checkout.components.core.Amount +import com.adyen.checkout.components.core.AnalyticsConfiguration +import com.adyen.checkout.components.core.CheckoutConfiguration +import com.adyen.checkout.components.core.internal.ButtonConfiguration +import com.adyen.checkout.components.core.internal.ButtonConfigurationBuilder +import com.adyen.checkout.components.core.internal.Configuration +import com.adyen.checkout.components.core.internal.util.CheckoutConfigurationMarker +import com.adyen.checkout.core.Environment +import kotlinx.parcelize.Parcelize +import java.util.Locale -// TODO create new config -typealias MealVoucherConfiguration = GiftCardConfiguration +/** + * Configuration class for the [MealVoucherComponent]. + */ +@Parcelize +@Suppress("LongParameterList") +class MealVoucherConfiguration private constructor( + override val shopperLocale: Locale?, + override val environment: Environment, + override val clientKey: String, + override val analyticsConfiguration: AnalyticsConfiguration?, + override val amount: Amount?, + override val isSubmitButtonVisible: Boolean?, + val isSecurityCodeRequired: Boolean?, + internal val genericActionConfiguration: GenericActionConfiguration, +) : Configuration, ButtonConfiguration { + + /** + * Builder to create a [MealVoucherConfiguration]. + */ + class Builder : + ActionHandlingPaymentMethodConfigurationBuilder, + ButtonConfigurationBuilder { + + private var isSecurityCodeRequired: Boolean? = null + private var isSubmitButtonVisible: Boolean? = null + + /** + * Initialize a configuration builder with the required fields. + * + * The shopper locale will match the value passed to the API with the sessions flow, or the primary user locale + * on the device otherwise. Check out the + * [Sessions API documentation](https://docs.adyen.com/api-explorer/Checkout/latest/post/sessions) on how to set + * this value. + * + * @param environment The [Environment] to be used for internal network calls from the SDK to Adyen. + * @param clientKey Your Client Key used for internal network calls from the SDK to Adyen. + */ + constructor(environment: Environment, clientKey: String) : super( + environment, + clientKey, + ) + + /** + * Alternative constructor that uses the [context] to fetch the user locale and use it as a shopper locale. + * + * @param context A context + * @param environment The [Environment] to be used for internal network calls from the SDK to Adyen. + * @param clientKey Your Client Key used for internal network calls from the SDK to Adyen. + */ + @Deprecated("You can omit the context parameter") + constructor(context: Context, environment: Environment, clientKey: String) : super( + context, + environment, + clientKey, + ) + + /** + * Initialize a configuration builder with the required fields and a shopper locale. + * + * @param shopperLocale The [Locale] of the shopper. + * @param environment The [Environment] to be used for internal network calls from the SDK to Adyen. + * @param clientKey Your Client Key used for internal network calls from the SDK to Adyen. + */ + constructor(shopperLocale: Locale, environment: Environment, clientKey: String) : super( + shopperLocale, + environment, + clientKey, + ) + + /** + * Sets if submit button will be visible or not. + * + * Default is True. + * + * @param isSubmitButtonVisible Is submit button should be visible or not. + */ + override fun setSubmitButtonVisible(isSubmitButtonVisible: Boolean): Builder { + this.isSubmitButtonVisible = isSubmitButtonVisible + return this + } + + /** + * Set if the Security code field should be hidden from the Component and not requested to the shopper. + * Note that this might have implications for the transaction. + * + * Default is true. + * + * @param isSecurityCodeRequired If Security code should be hidden or not. + */ + fun setSecurityCodeRequired(isSecurityCodeRequired: Boolean): Builder { + this.isSecurityCodeRequired = isSecurityCodeRequired + return this + } + + override fun buildInternal(): MealVoucherConfiguration { + return MealVoucherConfiguration( + shopperLocale = shopperLocale, + environment = environment, + clientKey = clientKey, + analyticsConfiguration = analyticsConfiguration, + amount = amount, + isSubmitButtonVisible = isSubmitButtonVisible, + isSecurityCodeRequired = isSecurityCodeRequired, + genericActionConfiguration = genericActionConfigurationBuilder.build(), + ) + } + } +} + +fun CheckoutConfiguration.mealVoucher( + configuration: @CheckoutConfigurationMarker MealVoucherConfiguration.Builder.() -> Unit = {} +): CheckoutConfiguration { + val config = MealVoucherConfiguration.Builder(environment, clientKey) + .apply { + shopperLocale?.let { setShopperLocale(it) } + amount?.let { setAmount(it) } + analyticsConfiguration?.let { setAnalyticsConfiguration(it) } + } + .apply(configuration) + .build() + + MealVoucherComponent.PAYMENT_METHOD_TYPES.forEach { key -> + addConfiguration(key, config) + } + + return this +} + +internal fun CheckoutConfiguration.getMealVoucherConfiguration(): MealVoucherConfiguration? { + return MealVoucherComponent.PAYMENT_METHOD_TYPES.firstNotNullOfOrNull { key -> + getConfiguration(key) + } +} + +internal fun MealVoucherConfiguration.toCheckoutConfiguration(): CheckoutConfiguration { + return CheckoutConfiguration( + shopperLocale = shopperLocale, + environment = environment, + clientKey = clientKey, + amount = amount, + analyticsConfiguration = analyticsConfiguration, + ) { + MealVoucherComponent.PAYMENT_METHOD_TYPES.forEach { key -> + addConfiguration(key, this@toCheckoutConfiguration) + } + + genericActionConfiguration.getAllConfigurations().forEach { + addActionConfiguration(it) + } + } +} diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt index e0b4fada0b..3c7e615b82 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt @@ -38,7 +38,6 @@ import com.adyen.checkout.giftcard.internal.GiftCardComponentEventHandler import com.adyen.checkout.giftcard.internal.SessionsGiftCardComponentCallbackWrapper import com.adyen.checkout.giftcard.internal.SessionsGiftCardComponentEventHandler import com.adyen.checkout.giftcard.internal.ui.DefaultGiftCardDelegate -import com.adyen.checkout.giftcard.toCheckoutConfiguration import com.adyen.checkout.mealvoucher.MealVoucherComponent import com.adyen.checkout.mealvoucher.MealVoucherComponentCallback import com.adyen.checkout.mealvoucher.MealVoucherComponentState @@ -47,6 +46,7 @@ import com.adyen.checkout.mealvoucher.SessionsMealVoucherComponentCallback import com.adyen.checkout.mealvoucher.internal.ui.model.MealVoucherComponentParamsMapper import com.adyen.checkout.mealvoucher.internal.ui.protocol.MealVoucherProtocol import com.adyen.checkout.mealvoucher.internal.util.MealVoucherValidator +import com.adyen.checkout.mealvoucher.toCheckoutConfiguration import com.adyen.checkout.sessions.core.CheckoutSession import com.adyen.checkout.sessions.core.internal.SessionInteractor import com.adyen.checkout.sessions.core.internal.SessionSavedStateHandleContainer @@ -58,8 +58,6 @@ import com.adyen.checkout.ui.core.internal.ui.SubmitHandler class MealVoucherComponentProvider @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) -// TODO remove suppress annotation -@Suppress("UnusedPrivateProperty") constructor( private val dropInOverrideParams: DropInOverrideParams? = null, private val analyticsManager: AnalyticsManager? = null, diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt index 249a423aa5..75f5889306 100644 --- a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt +++ b/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt @@ -13,8 +13,8 @@ import com.adyen.checkout.components.core.CheckoutConfiguration import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParamsMapper import com.adyen.checkout.components.core.internal.ui.model.DropInOverrideParams import com.adyen.checkout.components.core.internal.ui.model.SessionParams -import com.adyen.checkout.giftcard.getGiftCardConfiguration import com.adyen.checkout.giftcard.internal.ui.model.GiftCardComponentParams +import com.adyen.checkout.mealvoucher.getMealVoucherConfiguration import java.util.Locale @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) @@ -35,14 +35,12 @@ class MealVoucherComponentParamsMapper( componentSessionParams, ) val commonComponentParams = commonComponentParamsMapperData.commonComponentParams - // TODO Change this to getMealVoucherConfiguration() - val giftCardConfiguration = checkoutConfiguration.getGiftCardConfiguration() + val mealVoucherConfiguration = checkoutConfiguration.getMealVoucherConfiguration() return GiftCardComponentParams( commonComponentParams = commonComponentParams, isSubmitButtonVisible = dropInOverrideParams?.isSubmitButtonVisible - ?: giftCardConfiguration?.isSubmitButtonVisible ?: true, - // TODO Check if we need a config for pin required or not for Meal voucher - isPinRequired = giftCardConfiguration?.isPinRequired ?: true, + ?: mealVoucherConfiguration?.isSubmitButtonVisible ?: true, + isPinRequired = mealVoucherConfiguration?.isSecurityCodeRequired ?: true, isExpiryDateRequired = true, ) } From 3b8788ab9cf2ba37a1bcd1fc4045ab3cbafeec4f Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Wed, 14 Aug 2024 16:05:17 +0200 Subject: [PATCH 241/299] Remove unnecessary payment method type COAND-683 --- .../com/adyen/checkout/components/core/PaymentMethodTypes.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt index 7bf630c057..2daa2a4101 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt @@ -36,7 +36,6 @@ object PaymentMethodTypes { const val GOOGLE_PAY_LEGACY = "paywithgoogle" const val IDEAL = "ideal" const val MB_WAY = "mbway" - const val MEAL_VOUCHER_FR = "mealVoucher_FR" // not a txVariant, only to be used for /payments call const val MEAL_VOUCHER_FR_GROUPEUP = "mealVoucher_FR_groupeup" const val MEAL_VOUCHER_FR_NATIXIS = "mealVoucher_FR_natixis" const val MEAL_VOUCHER_FR_SODEXO = "mealVoucher_FR_sodexo" From 71ef9c9c467702a604ffb1cf8ac2437c886a8a7a Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:28:27 +0200 Subject: [PATCH 242/299] Create GiftCardProtocol GiftCardProtocol is used to make and get necessary details for different Gift Card flows such as gift cards and meal vouchers. COAND-693 --- .../com/adyen/checkout/components/core/PaymentMethodTypes.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt index 2daa2a4101..7bf630c057 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt @@ -36,6 +36,7 @@ object PaymentMethodTypes { const val GOOGLE_PAY_LEGACY = "paywithgoogle" const val IDEAL = "ideal" const val MB_WAY = "mbway" + const val MEAL_VOUCHER_FR = "mealVoucher_FR" // not a txVariant, only to be used for /payments call const val MEAL_VOUCHER_FR_GROUPEUP = "mealVoucher_FR_groupeup" const val MEAL_VOUCHER_FR_NATIXIS = "mealVoucher_FR_natixis" const val MEAL_VOUCHER_FR_SODEXO = "mealVoucher_FR_sodexo" From 41d185b61f94b5a6b89e40e9484c6079f10ab495 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Fri, 2 Aug 2024 10:50:03 +0400 Subject: [PATCH 243/299] Change mealvoucher naming to meal_voucher COAND-683 --- drop-in/build.gradle | 2 +- {mealvoucher => meal-voucher}/.gitignore | 0 .../api/mealvoucher.api => meal-voucher/api/meal-voucher.api | 0 {mealvoucher => meal-voucher}/build.gradle | 0 {mealvoucher => meal-voucher}/consumer-rules.pro | 0 {mealvoucher => meal-voucher}/proguard-rules.pro | 0 {mealvoucher => meal-voucher}/src/main/AndroidManifest.xml | 0 .../java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt | 0 .../adyen/checkout/mealvoucher/MealVoucherComponentCallback.kt | 0 .../com/adyen/checkout/mealvoucher/MealVoucherComponentState.kt | 0 .../com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt | 0 .../mealvoucher/SessionsMealVoucherComponentCallback.kt | 0 .../internal/provider/MealVoucherComponentProvider.kt | 0 .../checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt | 0 .../internal/ui/model/MealVoucherComponentParamsMapper.kt | 0 .../mealvoucher/internal/ui/protocol/MealVoucherProtocol.kt | 0 .../checkout/mealvoucher/internal/ui/view/MealVoucherView.kt | 0 .../mealvoucher/internal/util/MealVoucherValidationUtils.kt | 0 .../checkout/mealvoucher/internal/util/MealVoucherValidator.kt | 0 .../src/main/res/layout/meal_voucher_view.xml | 0 {mealvoucher => meal-voucher}/src/main/res/values/strings.xml | 0 {mealvoucher => meal-voucher}/src/main/res/values/styles.xml | 0 settings.gradle | 2 +- 23 files changed, 2 insertions(+), 2 deletions(-) rename {mealvoucher => meal-voucher}/.gitignore (100%) rename mealvoucher/api/mealvoucher.api => meal-voucher/api/meal-voucher.api (100%) rename {mealvoucher => meal-voucher}/build.gradle (100%) rename {mealvoucher => meal-voucher}/consumer-rules.pro (100%) rename {mealvoucher => meal-voucher}/proguard-rules.pro (100%) rename {mealvoucher => meal-voucher}/src/main/AndroidManifest.xml (100%) rename {mealvoucher => meal-voucher}/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt (100%) rename {mealvoucher => meal-voucher}/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentCallback.kt (100%) rename {mealvoucher => meal-voucher}/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentState.kt (100%) rename {mealvoucher => meal-voucher}/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt (100%) rename {mealvoucher => meal-voucher}/src/main/java/com/adyen/checkout/mealvoucher/SessionsMealVoucherComponentCallback.kt (100%) rename {mealvoucher => meal-voucher}/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt (100%) rename {mealvoucher => meal-voucher}/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt (100%) rename {mealvoucher => meal-voucher}/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt (100%) rename {mealvoucher => meal-voucher}/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/protocol/MealVoucherProtocol.kt (100%) rename {mealvoucher => meal-voucher}/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt (100%) rename {mealvoucher => meal-voucher}/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt (100%) rename {mealvoucher => meal-voucher}/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt (100%) rename {mealvoucher => meal-voucher}/src/main/res/layout/meal_voucher_view.xml (100%) rename {mealvoucher => meal-voucher}/src/main/res/values/strings.xml (100%) rename {mealvoucher => meal-voucher}/src/main/res/values/styles.xml (100%) diff --git a/drop-in/build.gradle b/drop-in/build.gradle index 2cd50660a0..ac9c0908cf 100644 --- a/drop-in/build.gradle +++ b/drop-in/build.gradle @@ -63,7 +63,7 @@ dependencies { api project(':ideal') api project(":instant") api project(':mbway') - api project(':mealvoucher') + api project(':meal-voucher') api project(':molpay') api project(':online-banking-cz') api project(':online-banking-jp') diff --git a/mealvoucher/.gitignore b/meal-voucher/.gitignore similarity index 100% rename from mealvoucher/.gitignore rename to meal-voucher/.gitignore diff --git a/mealvoucher/api/mealvoucher.api b/meal-voucher/api/meal-voucher.api similarity index 100% rename from mealvoucher/api/mealvoucher.api rename to meal-voucher/api/meal-voucher.api diff --git a/mealvoucher/build.gradle b/meal-voucher/build.gradle similarity index 100% rename from mealvoucher/build.gradle rename to meal-voucher/build.gradle diff --git a/mealvoucher/consumer-rules.pro b/meal-voucher/consumer-rules.pro similarity index 100% rename from mealvoucher/consumer-rules.pro rename to meal-voucher/consumer-rules.pro diff --git a/mealvoucher/proguard-rules.pro b/meal-voucher/proguard-rules.pro similarity index 100% rename from mealvoucher/proguard-rules.pro rename to meal-voucher/proguard-rules.pro diff --git a/mealvoucher/src/main/AndroidManifest.xml b/meal-voucher/src/main/AndroidManifest.xml similarity index 100% rename from mealvoucher/src/main/AndroidManifest.xml rename to meal-voucher/src/main/AndroidManifest.xml diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt similarity index 100% rename from mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt rename to meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentCallback.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentCallback.kt similarity index 100% rename from mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentCallback.kt rename to meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentCallback.kt diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentState.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentState.kt similarity index 100% rename from mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentState.kt rename to meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentState.kt diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt similarity index 100% rename from mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt rename to meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/SessionsMealVoucherComponentCallback.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/SessionsMealVoucherComponentCallback.kt similarity index 100% rename from mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/SessionsMealVoucherComponentCallback.kt rename to meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/SessionsMealVoucherComponentCallback.kt diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt similarity index 100% rename from mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt rename to meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt similarity index 100% rename from mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt rename to meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt similarity index 100% rename from mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt rename to meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/protocol/MealVoucherProtocol.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/protocol/MealVoucherProtocol.kt similarity index 100% rename from mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/protocol/MealVoucherProtocol.kt rename to meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/protocol/MealVoucherProtocol.kt diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt similarity index 100% rename from mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt rename to meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt similarity index 100% rename from mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt rename to meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt diff --git a/mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt similarity index 100% rename from mealvoucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt rename to meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt diff --git a/mealvoucher/src/main/res/layout/meal_voucher_view.xml b/meal-voucher/src/main/res/layout/meal_voucher_view.xml similarity index 100% rename from mealvoucher/src/main/res/layout/meal_voucher_view.xml rename to meal-voucher/src/main/res/layout/meal_voucher_view.xml diff --git a/mealvoucher/src/main/res/values/strings.xml b/meal-voucher/src/main/res/values/strings.xml similarity index 100% rename from mealvoucher/src/main/res/values/strings.xml rename to meal-voucher/src/main/res/values/strings.xml diff --git a/mealvoucher/src/main/res/values/styles.xml b/meal-voucher/src/main/res/values/styles.xml similarity index 100% rename from mealvoucher/src/main/res/values/styles.xml rename to meal-voucher/src/main/res/values/styles.xml diff --git a/settings.gradle b/settings.gradle index f8b845dc57..6f623b9782 100644 --- a/settings.gradle +++ b/settings.gradle @@ -48,7 +48,7 @@ include ':3ds2', ':issuer-list', ':lint', ':mbway', - ':mealvoucher', + ':meal-voucher', ':molpay', ':online-banking-core', ':online-banking-cz', From 919208596d4d1a28fec623f4d7483087081a19e2 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Fri, 16 Aug 2024 13:34:25 +0200 Subject: [PATCH 244/299] Remove unnecessary MEAL_VOUCHER_FR from PaymentMethodTypes COAND-683 --- .../com/adyen/checkout/components/core/PaymentMethodTypes.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt index 7bf630c057..2daa2a4101 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/PaymentMethodTypes.kt @@ -36,7 +36,6 @@ object PaymentMethodTypes { const val GOOGLE_PAY_LEGACY = "paywithgoogle" const val IDEAL = "ideal" const val MB_WAY = "mbway" - const val MEAL_VOUCHER_FR = "mealVoucher_FR" // not a txVariant, only to be used for /payments call const val MEAL_VOUCHER_FR_GROUPEUP = "mealVoucher_FR_groupeup" const val MEAL_VOUCHER_FR_NATIXIS = "mealVoucher_FR_natixis" const val MEAL_VOUCHER_FR_SODEXO = "mealVoucher_FR_sodexo" From 94550307d27f6eefcb6df0fd8fbf2f80f2c18605 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Wed, 7 Aug 2024 11:57:46 +0200 Subject: [PATCH 245/299] Update class visibilities COAND-683 --- .../internal/ui/model/GiftCardComponentParamsMapper.kt | 4 +--- .../internal/ui/model/MealVoucherComponentParamsMapper.kt | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapper.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapper.kt index b324b4a2f0..8f46343b32 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapper.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardComponentParamsMapper.kt @@ -8,7 +8,6 @@ package com.adyen.checkout.giftcard.internal.ui.model -import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.CheckoutConfiguration import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParamsMapper import com.adyen.checkout.components.core.internal.ui.model.DropInOverrideParams @@ -16,8 +15,7 @@ import com.adyen.checkout.components.core.internal.ui.model.SessionParams import com.adyen.checkout.giftcard.getGiftCardConfiguration import java.util.Locale -@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) -class GiftCardComponentParamsMapper( +internal class GiftCardComponentParamsMapper( private val commonComponentParamsMapper: CommonComponentParamsMapper, ) { diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt index 75f5889306..48e78ed2fc 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt +++ b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt @@ -8,7 +8,6 @@ package com.adyen.checkout.mealvoucher.internal.ui.model -import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.CheckoutConfiguration import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParamsMapper import com.adyen.checkout.components.core.internal.ui.model.DropInOverrideParams @@ -17,8 +16,7 @@ import com.adyen.checkout.giftcard.internal.ui.model.GiftCardComponentParams import com.adyen.checkout.mealvoucher.getMealVoucherConfiguration import java.util.Locale -@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) -class MealVoucherComponentParamsMapper( +internal class MealVoucherComponentParamsMapper( private val commonComponentParamsMapper: CommonComponentParamsMapper, ) { From baec23a7bdb3d8d699d0b1d3540cc04af604edc4 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Tue, 13 Aug 2024 14:54:11 +0200 Subject: [PATCH 246/299] Write tests for GiftCardNumberUtils COAND-683 --- .../internal/util/GiftCardNumberUtils.kt | 1 - .../internal/util/GiftCardNumberUtilsTest.kt | 98 ++++++++++++------- 2 files changed, 61 insertions(+), 38 deletions(-) diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtils.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtils.kt index 99fb9986cf..ad00d926b3 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtils.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtils.kt @@ -38,7 +38,6 @@ object GiftCardNumberUtils { return text.replace(DIGIT_SEPARATOR.toString(), "") } - // TODO Add tests fun validateInputField(giftCardNumber: String): GiftCardNumberValidationResult { val rawInput = getRawValue(giftCardNumber) diff --git a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtilsTest.kt b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtilsTest.kt index 81a0f31776..6a5dca12d4 100644 --- a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtilsTest.kt +++ b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtilsTest.kt @@ -1,57 +1,81 @@ package com.adyen.checkout.giftcard.internal.util import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test +import org.junit.jupiter.params.ParameterizedTest +import org.junit.jupiter.params.provider.Arguments.arguments +import org.junit.jupiter.params.provider.MethodSource internal class GiftCardNumberUtilsTest { - @Test - fun formatEmptyInput() { - assertEquals("", GiftCardNumberUtils.formatInput("")) - } + @ParameterizedTest + @MethodSource("giftCardNumberFormatSource") + fun `when formatInput is called, then expected formatted number is returned`( + giftCardNumber: String, + expectedFormattedNumber: String, + ) { + val actualResult = GiftCardNumberUtils.formatInput(giftCardNumber) - @Test - fun format3DigitInput() { - assertEquals("123", GiftCardNumberUtils.formatInput("123")) + assertEquals(expectedFormattedNumber, actualResult) } - @Test - fun format4DigitInput() { - assertEquals("1234", GiftCardNumberUtils.formatInput("1234")) - } + @ParameterizedTest + @MethodSource("giftCardNumberRawValueSource") + fun `when getRawValue is called, then expected raw value is returned`( + giftCardNumber: String, + expectedRawValue: String, + ) { + val actualResult = GiftCardNumberUtils.getRawValue(giftCardNumber) - @Test - fun format5DigitInput() { - assertEquals("1234 5", GiftCardNumberUtils.formatInput("12345")) + assertEquals(expectedRawValue, actualResult) } - @Test - fun format7DigitInput() { - assertEquals("1234 567", GiftCardNumberUtils.formatInput("1234567")) - } + @ParameterizedTest + @MethodSource("giftCardNumberValidationSource") + fun `when validateInputField is called, then expected validation result is returned`( + giftCardNumber: String, + expectedValidationResult: GiftCardNumberValidationResult + ) { + val actualResult = GiftCardNumberUtils.validateInputField(giftCardNumber) - @Test - fun format8DigitInput() { - assertEquals("1234 5678", GiftCardNumberUtils.formatInput("12345678")) + assertEquals(expectedValidationResult, actualResult) } - @Test - fun format9DigitInput() { - assertEquals("1234 5678 9", GiftCardNumberUtils.formatInput("123456789")) - } + companion object { - @Test - fun format16DigitInput() { - assertEquals("1234 5678 4321 9876", GiftCardNumberUtils.formatInput("1234567843219876")) - } + @JvmStatic + fun giftCardNumberFormatSource() = listOf( + // giftCardNumber, expectedFormattedNumber + arguments("", ""), + arguments("123", "123"), + arguments("1234", "1234"), + arguments("12345", "1234 5"), + arguments("1234567", "1234 567"), + arguments("12345678", "1234 5678"), + arguments("123456789", "1234 5678 9"), + arguments("1234567843219876", "1234 5678 4321 9876"), + arguments("1234567843219876000", "1234 5678 4321 9876 000"), + arguments("hioj rfg1247fds gd8453 h3h", "hioj rfg1 247f dsgd 8453 h3h"), + ) - @Test - fun format19DigitInput() { - assertEquals("1234 5678 4321 9876 000", GiftCardNumberUtils.formatInput("1234567843219876000")) - } + @JvmStatic + fun giftCardNumberRawValueSource() = listOf( + // giftCardNumber, expectedRawValue + arguments("", ""), + arguments("123", "123"), + arguments("1234 5", "12345"), + arguments("1234 5678", "12345678"), + arguments("1234 5678 9", "123456789"), + arguments("1234 5678 4321 9876 000", "1234567843219876000"), + arguments("hioj rfg1247fds gd8453 h3h", "hiojrfg1247fdsgd8453h3h"), + ) - @Test - fun formatAlphanumericInputWithSpaces() { - assertEquals("hioj rfg1 247f dsgd 8453 h3h", GiftCardNumberUtils.formatInput("hioj rfg1247fds gd8453 h3h")) + @JvmStatic + fun giftCardNumberValidationSource() = listOf( + // giftCardNumber, expectedValidationResult + arguments("", GiftCardNumberValidationResult.INVALID), + arguments("12345678901234", GiftCardNumberValidationResult.INVALID), + arguments("123456789012345678901234567890123", GiftCardNumberValidationResult.INVALID), + arguments("123456789012345678901234567890", GiftCardNumberValidationResult.VALID), + ) } } From 48caad47c702290ee8fbd25319c9d7384703f475 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Tue, 13 Aug 2024 15:33:39 +0200 Subject: [PATCH 247/299] Add tests for ExpiryDateValidationUtils COAND-693 --- .../card/internal/util/CardValidationUtils.kt | 4 +- .../util/MealVoucherValidationUtils.kt | 2 +- .../util/ExpiryDateValidationUtils.kt | 2 +- .../util/ExpiryDateValidationUtilsTest.kt | 92 +++++++++++++++++++ 4 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 ui-core/src/test/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtilsTest.kt diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index 491a3eb889..391e9b45ae 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -87,7 +87,9 @@ object CardValidationUtils { fieldPolicy: Brand.FieldPolicy?, calendar: Calendar ): FieldState { - val expiryDateValidation = ExpiryDateValidationUtils.validateExpiryDateInternal(expiryDate, calendar) + // TODO move ExpiryDateValidationUtils.validateExpiryDate call + // to validateExpiryDate(ExpiryDate,Brand.FieldPolicy?) for better testability, then update test + val expiryDateValidation = ExpiryDateValidationUtils.validateExpiryDate(expiryDate, calendar) return when (expiryDateValidation) { ExpiryDateValidationResult.VALID -> FieldState(expiryDate, Validation.Valid) diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt index aa71059299..868cf56380 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt +++ b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt @@ -54,7 +54,7 @@ internal object MealVoucherValidationUtils { @VisibleForTesting internal fun validateExpiryDate(expiryDate: ExpiryDate, calendar: Calendar): FieldState { - return when (ExpiryDateValidationUtils.validateExpiryDateInternal(expiryDate, calendar)) { + return when (ExpiryDateValidationUtils.validateExpiryDate(expiryDate, calendar)) { ExpiryDateValidationResult.VALID -> FieldState(expiryDate, Validation.Valid) ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> FieldState( expiryDate, diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt index 8ff2fc765d..7cc01810ec 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt @@ -20,7 +20,7 @@ object ExpiryDateValidationUtils { private const val MAXIMUM_YEARS_IN_FUTURE = 30 private const val MAXIMUM_EXPIRED_MONTHS = 3 - fun validateExpiryDateInternal( + fun validateExpiryDate( expiryDate: ExpiryDate, calendar: Calendar ) = when { diff --git a/ui-core/src/test/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtilsTest.kt b/ui-core/src/test/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtilsTest.kt new file mode 100644 index 0000000000..a06c5d9a48 --- /dev/null +++ b/ui-core/src/test/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtilsTest.kt @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 13/8/2024. + */ + +package com.adyen.checkout.ui.core.internal.util + +import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.params.ParameterizedTest +import org.junit.jupiter.params.provider.Arguments.arguments +import org.junit.jupiter.params.provider.MethodSource +import java.util.Calendar +import java.util.GregorianCalendar + +class ExpiryDateValidationUtilsTest { + + @ParameterizedTest + @MethodSource("expiryDateValidationSource") + fun `when validateExpiryDate is called, then expected validation result is returned`( + expiryDateInput: ExpiryDate, + calendar: Calendar, + expectedValidationResult: ExpiryDateValidationResult, + ) { + val actualResult = ExpiryDateValidationUtils.validateExpiryDate(expiryDateInput, calendar) + + assertEquals(expectedValidationResult, actualResult) + } + + companion object { + + @JvmStatic + fun expiryDateValidationSource() = listOf( + // Invalid expiry date + arguments( + ExpiryDate.EMPTY_DATE, + GregorianCalendar.getInstance(), + ExpiryDateValidationResult.INVALID_EXPIRY_DATE, + ), + arguments( + ExpiryDate.INVALID_DATE, + GregorianCalendar.getInstance(), + ExpiryDateValidationResult.INVALID_EXPIRY_DATE, + ), + // Date 30 years in future + arguments( + ExpiryDate(12, 2052), // 12/2052 (last valid date in future) + GregorianCalendar(2022, 4, 23), // 23/05/2022 + ExpiryDateValidationResult.VALID, + ), + // Date more than 30 years in future + arguments( + ExpiryDate(1, 2053), // 01/2053 (first invalid date in future) + GregorianCalendar(2022, 4, 23), // 23/05/2022 + ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, + ), + // Date 8 years in future + arguments( + ExpiryDate(1, 2030), // 01/2030 + GregorianCalendar(2022, 4, 23), // 23/05/2022 + ExpiryDateValidationResult.VALID, + ), + // Date 1 month in past + arguments( + ExpiryDate(4, 2022), // 04/2022 (last valid date in past) + GregorianCalendar(2022, 4, 23), // 23/05/2022 + ExpiryDateValidationResult.VALID, + ), + // Date 3 months in past + arguments( + ExpiryDate(2, 2022), // 02/2022 (last valid date in past) + GregorianCalendar(2022, 4, 23), // 23/05/2022 + ExpiryDateValidationResult.VALID, + ), + // Date more than 3 months in past + arguments( + ExpiryDate(1, 2022), // 01/2022 (first invalid date in past) + GregorianCalendar(2022, 4, 23), // 23/05/2022 + ExpiryDateValidationResult.INVALID_TOO_OLD, + ), + // Date 1 year in future + arguments( + ExpiryDate(1, 2023), // 01/2023 + GregorianCalendar(2022, 4, 23), // 23/05/2022 + ExpiryDateValidationResult.VALID, + ), + ) + } +} From 8ad43d8d642ea644d9b1b77bd1db4606dd572d59 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Tue, 20 Aug 2024 13:29:47 +0200 Subject: [PATCH 248/299] Add tests for CardValidationUtils COAND-693 --- .../card/internal/util/CardValidationUtils.kt | 16 +- .../internal/util/CardValidationUtilsTest.kt | 224 +++++++++--------- 2 files changed, 115 insertions(+), 125 deletions(-) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index 391e9b45ae..de619525e6 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -21,7 +21,6 @@ import com.adyen.checkout.core.internal.util.StringUtil import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationResult import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationUtils -import java.util.Calendar import java.util.GregorianCalendar @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) @@ -77,21 +76,20 @@ object CardValidationUtils { /** * Validate Expiry Date. */ - fun validateExpiryDate(expiryDate: ExpiryDate, fieldPolicy: Brand.FieldPolicy?): FieldState { - return validateExpiryDate(expiryDate, fieldPolicy, GregorianCalendar.getInstance()) + internal fun validateExpiryDate(expiryDate: ExpiryDate, fieldPolicy: Brand.FieldPolicy?): FieldState { + val expiryDateValidation = + ExpiryDateValidationUtils.validateExpiryDate(expiryDate, GregorianCalendar.getInstance()) + + return validateExpiryDate(expiryDate, fieldPolicy, expiryDateValidation) } @VisibleForTesting internal fun validateExpiryDate( expiryDate: ExpiryDate, fieldPolicy: Brand.FieldPolicy?, - calendar: Calendar + expiryDateValidationResult: ExpiryDateValidationResult, ): FieldState { - // TODO move ExpiryDateValidationUtils.validateExpiryDate call - // to validateExpiryDate(ExpiryDate,Brand.FieldPolicy?) for better testability, then update test - val expiryDateValidation = ExpiryDateValidationUtils.validateExpiryDate(expiryDate, calendar) - - return when (expiryDateValidation) { + return when (expiryDateValidationResult) { ExpiryDateValidationResult.VALID -> FieldState(expiryDate, Validation.Valid) ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> FieldState( expiryDate, diff --git a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt index 621a35dd98..9de20f5892 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt @@ -17,11 +17,11 @@ import com.adyen.checkout.card.internal.ui.model.InputFieldUIState import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate +import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationResult import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test -import java.util.GregorianCalendar internal class CardValidationUtilsTest { @@ -30,7 +30,7 @@ internal class CardValidationUtilsTest { inner class ValidateCardNumberTest { @Test - fun `number is valid without separators then result should be valid`() { + fun `number is valid without separators, then result should be valid`() { val number = "5454545454545454" val validation = CardValidationUtils.validateCardNumber( number = number, @@ -41,7 +41,7 @@ internal class CardValidationUtilsTest { } @Test - fun `number is valid with formatting spacing then result should be valid`() { + fun `number is valid with formatting spacing, then result should be valid`() { val number = "3700 0000 0000 002" val validation = CardValidationUtils.validateCardNumber( number = number, @@ -52,7 +52,7 @@ internal class CardValidationUtilsTest { } @Test - fun `number is valid with random spaces then result should be valid`() { + fun `number is valid with random spaces, then result should be valid`() { val number = "55 770 0005 57 7 00 04" val validation = CardValidationUtils.validateCardNumber( number = number, @@ -63,7 +63,7 @@ internal class CardValidationUtilsTest { } @Test - fun `number contains alphabetical characters then result should be invalid`() { + fun `number contains alphabetical characters, then result should be invalid`() { val number = "2137f7834a2390" val validation = CardValidationUtils.validateCardNumber( number = number, @@ -75,7 +75,7 @@ internal class CardValidationUtilsTest { } @Test - fun `number contains illegal characters then result should be invalid`() { + fun `number contains illegal characters, then result should be invalid`() { val number = "287,7482-3674" val validation = CardValidationUtils.validateCardNumber( number = number, @@ -87,7 +87,7 @@ internal class CardValidationUtilsTest { } @Test - fun `number is too short then result should be invalid`() { + fun `number is too short, then result should be invalid`() { val number = "1234123" val validation = CardValidationUtils.validateCardNumber( number = number, @@ -99,7 +99,7 @@ internal class CardValidationUtilsTest { } @Test - fun `number is too long then result should be invalid`() { + fun `number is too long, then result should be invalid`() { val number = "37467643756457884754" val validation = CardValidationUtils.validateCardNumber( number = number, @@ -111,7 +111,7 @@ internal class CardValidationUtilsTest { } @Test - fun `brand is unsupported then result should be invalid`() { + fun `brand is unsupported, then result should be invalid`() { val number = "6771 7980 2100 0008" val validation = CardValidationUtils.validateCardNumber( number = number, @@ -122,7 +122,7 @@ internal class CardValidationUtilsTest { } @Test - fun `luhn check fails then result should be invalid`() { + fun `luhn check fails, then result should be invalid`() { val number = "8475 1789 7235 6236" val validation = CardValidationUtils.validateCardNumber( number = number, @@ -133,7 +133,7 @@ internal class CardValidationUtilsTest { } @Test - fun `luhn check fails but luhn check is disabled then result should be valid`() { + fun `luhn check fails but luhn check is disabled, then result should be valid`() { val number = "192382023091310912" val validation = CardValidationUtils.validateCardNumber( number = number, @@ -149,201 +149,193 @@ internal class CardValidationUtilsTest { inner class ValidateExpiryDateTest { @Test - fun `date is 30 years in the future then result should be valid`() { - val mockCalendarInstance = GregorianCalendar(2022, 4, 23) // 23/05/2022 - val expiryDate = ExpiryDate(12, 2052) // 12/2052 (last valid date in future) + fun `date is valid, then result should be valid`() { + val expiryDate = ExpiryDate(12, 2053) val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, fieldPolicy = Brand.FieldPolicy.REQUIRED, - calendar = mockCalendarInstance, + expiryDateValidationResult = ExpiryDateValidationResult.VALID, ) + assertEquals(FieldState(expiryDate, Validation.Valid), actual) } @Test - fun `date is more than 30 years in the future then result should be invalid as not within max range`() { - val mockCalendarInstance = GregorianCalendar(2022, 4, 23) // 23/05/2022 - val expiryDate = ExpiryDate(1, 2053) // 01/2053 (first invalid date in future) + fun `date is too far in the future, then result should be invalid`() { + val expiryDate = ExpiryDate(12, 2300) val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, fieldPolicy = Brand.FieldPolicy.REQUIRED, - calendar = mockCalendarInstance, + expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future + assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) } @Test - fun `date is 8 years in the future then result should be valid`() { - val mockCalendarInstance = GregorianCalendar(2022, 4, 23) // 23/05/2022 - val expiryDate = ExpiryDate(1, 2030) // 01/2030 + fun `date is too old, then result should be invalid`() { + val expiryDate = ExpiryDate(12, 2022) val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, fieldPolicy = Brand.FieldPolicy.REQUIRED, - calendar = mockCalendarInstance, + expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_OLD, ) - assertEquals(FieldState(expiryDate, Validation.Valid), actual) + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old + + assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) } @Test - fun `date is 1 month in the past then result should be valid`() { - // month is 0 based in calendar - val mockCalendarInstance = GregorianCalendar(2022, 4, 23) // 23/05/2022 - // month is 1 based in expiry date - val expiryDate = ExpiryDate(4, 2022) // 04/2022 (last valid date in past) + fun `date is valid with field policy optional, then result should be valid`() { + val expiryDate = ExpiryDate(12, 2053) val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, - fieldPolicy = Brand.FieldPolicy.REQUIRED, - calendar = mockCalendarInstance, + fieldPolicy = Brand.FieldPolicy.OPTIONAL, + expiryDateValidationResult = ExpiryDateValidationResult.VALID, ) + assertEquals(FieldState(expiryDate, Validation.Valid), actual) } @Test - fun `date is 3 months in the past then result should be valid`() { - // month is 0 based in calendar - val mockCalendarInstance = GregorianCalendar(2022, 4, 23) // 23/05/2022 - // month is 1 based in expiry date - val expiryDate = ExpiryDate(2, 2022) // 02/2022 (last valid date in past) + fun `date is valid with field policy hidden, then result should be valid`() { + val expiryDate = ExpiryDate(12, 2053) val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, - fieldPolicy = Brand.FieldPolicy.REQUIRED, - calendar = mockCalendarInstance, + fieldPolicy = Brand.FieldPolicy.HIDDEN, + expiryDateValidationResult = ExpiryDateValidationResult.VALID, ) + assertEquals(FieldState(expiryDate, Validation.Valid), actual) } @Test - fun `date is more than 3 months in the past then result should be invalid as not within min range`() { - // month is 0 based in calendar - val mockCalendarInstance = GregorianCalendar(2022, 4, 23) // 23/05/2022 - // month is 1 based in expiry date - val expiryDate = ExpiryDate(1, 2022) // 01/2022 (first invalid date in past) + fun `date is too far in the future with field policy optional, then result should be invalid`() { + val expiryDate = ExpiryDate(12, 2300) val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, - fieldPolicy = Brand.FieldPolicy.REQUIRED, - calendar = mockCalendarInstance, + fieldPolicy = Brand.FieldPolicy.OPTIONAL, + expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, ) - val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future + assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) } @Test - fun `date is 1 year in the future then result should be valid`() { - val mockCalendarInstance = GregorianCalendar(2022, 4, 23) // 23/05/2022 - val expiryDate = ExpiryDate(1, 2023) // 01/2023 + fun `date is too far in the future with field policy hidden, then result should be invalid`() { + val expiryDate = ExpiryDate(12, 2300) val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, - fieldPolicy = Brand.FieldPolicy.REQUIRED, - calendar = mockCalendarInstance, + fieldPolicy = Brand.FieldPolicy.HIDDEN, + expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, ) - assertEquals(FieldState(expiryDate, Validation.Valid), actual) - } + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future - @Test - fun `date is valid with field policy required then result should be valid`() { - val mockCalendarInstance = GregorianCalendar(2022, 4, 23) // 23/05/2022 - val expiryDate = ExpiryDate(1, 2023) // 01/2023 - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, - fieldPolicy = Brand.FieldPolicy.REQUIRED, - calendar = mockCalendarInstance, - ) - assertEquals(FieldState(expiryDate, Validation.Valid), actual) + assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) } @Test - fun `date is valid with field policy optional then result should be valid`() { - val mockCalendarInstance = GregorianCalendar(2022, 4, 23) // 23/05/2022 - val expiryDate = ExpiryDate(1, 2023) // 01/2023 + fun `date is too old with field policy optional, then result should be invalid`() { + val expiryDate = ExpiryDate(12, 2022) val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, fieldPolicy = Brand.FieldPolicy.OPTIONAL, - calendar = mockCalendarInstance, + expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_OLD, ) - assertEquals(FieldState(expiryDate, Validation.Valid), actual) + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old + + assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) } @Test - fun `date is valid with field policy hidden then result should be valid`() { - val mockCalendarInstance = GregorianCalendar(2022, 4, 23) // 23/05/2022 - val expiryDate = ExpiryDate(1, 2023) // 01/2023 + fun `date is too old with field policy hidden, then result should be invalid`() { + val expiryDate = ExpiryDate(12, 2022) val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, fieldPolicy = Brand.FieldPolicy.HIDDEN, - calendar = mockCalendarInstance, + expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_OLD, ) - assertEquals(FieldState(expiryDate, Validation.Valid), actual) + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old + + assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) } @Test - fun `date is invalid with field policy required then result should be invalid`() { - val mockCalendarInstance = GregorianCalendar(2022, 4, 23) // 23/05/2022 - val expiryDate = ExpiryDate(1, 2022) // 01/2022 + fun `date is empty with field policy required, then result should be invalid`() { + val expiryDate = ExpiryDate.EMPTY_DATE val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, fieldPolicy = Brand.FieldPolicy.REQUIRED, - calendar = mockCalendarInstance, + expiryDateValidationResult = ExpiryDateValidationResult.INVALID_EXPIRY_DATE, ) - val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid + assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) } @Test - fun `date is invalid with field policy optional then result should be invalid`() { - val mockCalendarInstance = GregorianCalendar(2022, 4, 23) // 23/05/2022 - val expiryDate = ExpiryDate(1, 2022) // 01/2022 + fun `date is empty with field policy optional, then result should be valid`() { + val expiryDate = ExpiryDate.EMPTY_DATE val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, fieldPolicy = Brand.FieldPolicy.OPTIONAL, - calendar = mockCalendarInstance, + expiryDateValidationResult = ExpiryDateValidationResult.VALID, ) - val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old - assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + + assertEquals(FieldState(expiryDate, Validation.Valid), actual) } @Test - fun `date is invalid with field policy hidden then result should be invalid`() { - val mockCalendarInstance = GregorianCalendar(2022, 4, 23) // 23/05/2022 - val expiryDate = ExpiryDate(1, 2022) // 01/2022 + fun `date is empty with field policy hidden, then result should be valid`() { + val expiryDate = ExpiryDate.EMPTY_DATE val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, fieldPolicy = Brand.FieldPolicy.HIDDEN, - calendar = mockCalendarInstance, + expiryDateValidationResult = ExpiryDateValidationResult.VALID, ) - val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old - assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + + assertEquals(FieldState(expiryDate, Validation.Valid), actual) } @Test - fun `date is empty with field policy required then result should be invalid`() { - val expiryDate = ExpiryDate.EMPTY_DATE + fun `date is invalid with field policy required, then result should be invalid`() { + val expiryDate = ExpiryDate.INVALID_DATE val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, fieldPolicy = Brand.FieldPolicy.REQUIRED, + expiryDateValidationResult = ExpiryDateValidationResult.INVALID_EXPIRY_DATE, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid + assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) } @Test - fun `date is empty with field policy optional then result should be valid`() { - val expiryDate = ExpiryDate.EMPTY_DATE + fun `date is invalid with field policy optional, then result should be invalid`() { + val expiryDate = ExpiryDate.INVALID_DATE val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, fieldPolicy = Brand.FieldPolicy.OPTIONAL, + expiryDateValidationResult = ExpiryDateValidationResult.INVALID_EXPIRY_DATE, ) - assertEquals(FieldState(expiryDate, Validation.Valid), actual) + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid + + assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) } @Test - fun `date is empty with field policy hidden then result should be valid`() { - val expiryDate = ExpiryDate.EMPTY_DATE + fun `date is invalid with field policy hidden, then result should be invalid`() { + val expiryDate = ExpiryDate.INVALID_DATE val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, fieldPolicy = Brand.FieldPolicy.HIDDEN, + expiryDateValidationResult = ExpiryDateValidationResult.INVALID_EXPIRY_DATE, ) - assertEquals(FieldState(expiryDate, Validation.Valid), actual) + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid + + assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) } } @@ -352,7 +344,7 @@ internal class CardValidationUtilsTest { inner class ValidateSecurityCodeTest { @Test - fun `cvc is empty then result should be invalid`() { + fun `cvc is empty, then result should be invalid`() { val cvc = "" val actual = CardValidationUtils.validateSecurityCode(cvc, getDetectedCardType(), InputFieldUIState.REQUIRED) @@ -360,7 +352,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is 1 digit then result should be invalid`() { + fun `cvc is 1 digit, then result should be invalid`() { val cvc = "7" val actual = CardValidationUtils.validateSecurityCode(cvc, getDetectedCardType(), InputFieldUIState.REQUIRED) @@ -368,7 +360,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is 2 digits then result should be invalid`() { + fun `cvc is 2 digits, then result should be invalid`() { val cvc = "12" val actual = CardValidationUtils.validateSecurityCode(cvc, getDetectedCardType(), InputFieldUIState.REQUIRED) @@ -376,7 +368,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is 3 digits then result should be valid`() { + fun `cvc is 3 digits, then result should be valid`() { val cvc = "737" val actual = CardValidationUtils.validateSecurityCode(cvc, getDetectedCardType(), InputFieldUIState.REQUIRED) @@ -384,7 +376,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is 4 digits then result should be invalid`() { + fun `cvc is 4 digits, then result should be invalid`() { val cvc = "8689" val actual = CardValidationUtils.validateSecurityCode(cvc, getDetectedCardType(), InputFieldUIState.REQUIRED) @@ -392,7 +384,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is 6 digits then result should be invalid`() { + fun `cvc is 6 digits, then result should be invalid`() { val cvc = "457835" val actual = CardValidationUtils.validateSecurityCode( cvc, @@ -403,7 +395,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is 3 digits with AMEX then result should be invalid`() { + fun `cvc is 3 digits with AMEX, then result should be invalid`() { val cvc = "737" val actual = CardValidationUtils.validateSecurityCode( cvc, @@ -414,7 +406,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is 4 digits with AMEX then result should be valid`() { + fun `cvc is 4 digits with AMEX, then result should be valid`() { val cvc = "8689" val actual = CardValidationUtils.validateSecurityCode( cvc, @@ -425,7 +417,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc has invalid characters then result should be invalid`() { + fun `cvc has invalid characters, then result should be invalid`() { val cvc = "1%y" val actual = CardValidationUtils.validateSecurityCode(cvc, getDetectedCardType(), InputFieldUIState.REQUIRED) @@ -433,7 +425,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is valid with field policy required then result should be valid`() { + fun `cvc is valid with field policy required, then result should be valid`() { val cvc = "546" val actual = CardValidationUtils.validateSecurityCode( cvc, @@ -444,7 +436,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is valid with field policy optional then result should be valid`() { + fun `cvc is valid with field policy optional, then result should be valid`() { val cvc = "345" val actual = CardValidationUtils.validateSecurityCode( cvc, @@ -455,7 +447,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is valid with field policy hidden then result should be valid`() { + fun `cvc is valid with field policy hidden, then result should be valid`() { val cvc = "156" val actual = CardValidationUtils.validateSecurityCode( cvc, @@ -466,7 +458,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is invalid with field policy required then result should be invalid`() { + fun `cvc is invalid with field policy required, then result should be invalid`() { val cvc = "77" val actual = CardValidationUtils.validateSecurityCode( cvc, @@ -477,7 +469,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is invalid with field policy optional then result should be invalid`() { + fun `cvc is invalid with field policy optional, then result should be invalid`() { val cvc = "9" val actual = CardValidationUtils.validateSecurityCode( cvc, @@ -488,7 +480,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is invalid with field policy hidden then result should be valid`() { + fun `cvc is invalid with field policy hidden, then result should be valid`() { val cvc = "1358" val actual = CardValidationUtils.validateSecurityCode( cvc, @@ -499,7 +491,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is empty with field policy required then result should be invalid`() { + fun `cvc is empty with field policy required, then result should be invalid`() { val cvc = "" val actual = CardValidationUtils.validateSecurityCode( cvc, @@ -510,7 +502,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is empty with field policy optional then result should be valid`() { + fun `cvc is empty with field policy optional, then result should be valid`() { val cvc = "" val actual = CardValidationUtils.validateSecurityCode( cvc, @@ -521,7 +513,7 @@ internal class CardValidationUtilsTest { } @Test - fun `cvc is empty with field policy hidden then result should be valid`() { + fun `cvc is empty with field policy hidden, then result should be valid`() { val cvc = "" val actual = CardValidationUtils.validateSecurityCode( cvc, From f2306f125fb506e360f1954bfda39b0bf3797e35 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Tue, 20 Aug 2024 15:30:37 +0200 Subject: [PATCH 249/299] Add tests for GiftCardPinUtils COAND-693 --- .../internal/util/GiftCardPinUtils.kt | 1 - .../internal/util/GiftCardNumberUtilsTest.kt | 12 +++--- .../internal/util/GiftCardPinUtilsTest.kt | 41 +++++++++++++++++++ 3 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 giftcard/src/test/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtilsTest.kt diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtils.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtils.kt index 0d4cedaffd..75ce327447 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtils.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtils.kt @@ -16,7 +16,6 @@ object GiftCardPinUtils { private const val MINIMUM_GIFT_CARD_PIN_LENGTH = 3 private const val MAXIMUM_GIFT_CARD_PIN_LENGTH = 10 - // TODO Add tests fun validateInputField(giftCardPin: String) = when { giftCardPin.length < MINIMUM_GIFT_CARD_PIN_LENGTH -> GiftCardPinValidationResult.INVALID giftCardPin.length > MAXIMUM_GIFT_CARD_PIN_LENGTH -> GiftCardPinValidationResult.INVALID diff --git a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtilsTest.kt b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtilsTest.kt index 6a5dca12d4..ac70bb342e 100644 --- a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtilsTest.kt +++ b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/util/GiftCardNumberUtilsTest.kt @@ -13,9 +13,9 @@ internal class GiftCardNumberUtilsTest { giftCardNumber: String, expectedFormattedNumber: String, ) { - val actualResult = GiftCardNumberUtils.formatInput(giftCardNumber) + val actual = GiftCardNumberUtils.formatInput(giftCardNumber) - assertEquals(expectedFormattedNumber, actualResult) + assertEquals(expectedFormattedNumber, actual) } @ParameterizedTest @@ -24,9 +24,9 @@ internal class GiftCardNumberUtilsTest { giftCardNumber: String, expectedRawValue: String, ) { - val actualResult = GiftCardNumberUtils.getRawValue(giftCardNumber) + val actual = GiftCardNumberUtils.getRawValue(giftCardNumber) - assertEquals(expectedRawValue, actualResult) + assertEquals(expectedRawValue, actual) } @ParameterizedTest @@ -35,9 +35,9 @@ internal class GiftCardNumberUtilsTest { giftCardNumber: String, expectedValidationResult: GiftCardNumberValidationResult ) { - val actualResult = GiftCardNumberUtils.validateInputField(giftCardNumber) + val actual = GiftCardNumberUtils.validateInputField(giftCardNumber) - assertEquals(expectedValidationResult, actualResult) + assertEquals(expectedValidationResult, actual) } companion object { diff --git a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtilsTest.kt b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtilsTest.kt new file mode 100644 index 0000000000..604a737417 --- /dev/null +++ b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/util/GiftCardPinUtilsTest.kt @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ararat on 20/8/2024. + */ + +package com.adyen.checkout.giftcard.internal.util + +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.params.ParameterizedTest +import org.junit.jupiter.params.provider.Arguments.arguments +import org.junit.jupiter.params.provider.MethodSource + +internal class GiftCardPinUtilsTest { + + @ParameterizedTest + @MethodSource("giftCardPinValidationSource") + fun `when validateInputField is called, then expected validation result is returned`( + giftCardPin: String, + expectedValidationResult: GiftCardPinValidationResult + ) { + val actual = GiftCardPinUtils.validateInputField(giftCardPin) + + assertEquals(expectedValidationResult, actual) + } + + companion object { + + @JvmStatic + fun giftCardPinValidationSource() = listOf( + // giftCardPin, expectedValidationResult + arguments("", GiftCardPinValidationResult.INVALID), + arguments("12", GiftCardPinValidationResult.INVALID), + arguments("123", GiftCardPinValidationResult.VALID), + arguments("1234567890", GiftCardPinValidationResult.VALID), + arguments("123456789012345678901234567890123", GiftCardPinValidationResult.INVALID), + ) + } +} From e54642afd421c07880a2026d87d739bbc3ad8e01 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Thu, 22 Aug 2024 14:21:01 +0200 Subject: [PATCH 250/299] Optimize CardValidationUtils and update unit tests COAND-693 --- .../card/internal/util/CardValidationUtils.kt | 52 ++++---- .../internal/util/CardValidationUtilsTest.kt | 123 +++++++++--------- .../util/MealVoucherValidationUtils.kt | 3 +- .../util/ExpiryDateValidationResult.kt | 3 +- .../util/ExpiryDateValidationUtils.kt | 4 +- .../util/ExpiryDateValidationUtilsTest.kt | 6 +- 6 files changed, 99 insertions(+), 92 deletions(-) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index de619525e6..35e15ed185 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -21,6 +21,7 @@ import com.adyen.checkout.core.internal.util.StringUtil import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationResult import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationUtils +import java.util.Calendar import java.util.GregorianCalendar @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) @@ -76,37 +77,40 @@ object CardValidationUtils { /** * Validate Expiry Date. */ - internal fun validateExpiryDate(expiryDate: ExpiryDate, fieldPolicy: Brand.FieldPolicy?): FieldState { - val expiryDateValidation = - ExpiryDateValidationUtils.validateExpiryDate(expiryDate, GregorianCalendar.getInstance()) + internal fun validateExpiryDate( + expiryDate: ExpiryDate, + fieldPolicy: Brand.FieldPolicy?, + calendar: Calendar = GregorianCalendar.getInstance() + ): FieldState { + val expiryDateValidationResult = + ExpiryDateValidationUtils.validateExpiryDate(expiryDate, calendar) + val validation = generateExpiryDateValidation(fieldPolicy, expiryDateValidationResult) - return validateExpiryDate(expiryDate, fieldPolicy, expiryDateValidation) + return FieldState(expiryDate, validation) } @VisibleForTesting - internal fun validateExpiryDate( - expiryDate: ExpiryDate, + internal fun generateExpiryDateValidation( fieldPolicy: Brand.FieldPolicy?, expiryDateValidationResult: ExpiryDateValidationResult, - ): FieldState { + ): Validation { return when (expiryDateValidationResult) { - ExpiryDateValidationResult.VALID -> FieldState(expiryDate, Validation.Valid) - ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> FieldState( - expiryDate, - Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_far_in_future), - ) - - ExpiryDateValidationResult.INVALID_TOO_OLD -> FieldState( - expiryDate, - Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_old), - ) - - ExpiryDateValidationResult.INVALID_EXPIRY_DATE -> - if (fieldPolicy?.isRequired() == false && expiryDate != ExpiryDate.INVALID_DATE) { - FieldState(expiryDate, Validation.Valid) - } else { - FieldState(expiryDate, Validation.Invalid(R.string.checkout_expiry_date_not_valid)) - } + ExpiryDateValidationResult.VALID -> Validation.Valid + + ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> + Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_far_in_future) + + ExpiryDateValidationResult.INVALID_TOO_OLD -> + Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_old) + + ExpiryDateValidationResult.INVALID_DATE_FORMAT -> + Validation.Invalid(R.string.checkout_expiry_date_not_valid) + + ExpiryDateValidationResult.INVALID_OTHER_REASON -> if (fieldPolicy?.isRequired() == false) { + Validation.Valid + } else { + Validation.Invalid(R.string.checkout_expiry_date_not_valid) + } } } diff --git a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt index 9de20f5892..14f87a9363 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt @@ -19,9 +19,11 @@ import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationResult import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test +import java.util.GregorianCalendar internal class CardValidationUtilsTest { @@ -149,193 +151,190 @@ internal class CardValidationUtilsTest { inner class ValidateExpiryDateTest { @Test - fun `date is valid, then result should be valid`() { - val expiryDate = ExpiryDate(12, 2053) + fun `date is valid, then correct fieldState should be returned`() { + val expiryDate = ExpiryDate(4, 2025) // 04/2025 + val calendar = GregorianCalendar(2024, 4, 24) // 24/04/2024 val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, fieldPolicy = Brand.FieldPolicy.REQUIRED, - expiryDateValidationResult = ExpiryDateValidationResult.VALID, + calendar = calendar, ) assertEquals(FieldState(expiryDate, Validation.Valid), actual) } @Test - fun `date is too far in the future, then result should be invalid`() { - val expiryDate = ExpiryDate(12, 2300) + fun `date is invalid, then correct fieldState should be returned`() { + val expiryDate = ExpiryDate(4, 2020) // 04/2020 + val calendar = GregorianCalendar(2024, 4, 24) // 24/04/2024 val actual = CardValidationUtils.validateExpiryDate( expiryDate = expiryDate, + fieldPolicy = Brand.FieldPolicy.REQUIRED, + calendar = calendar, + ) + + assertEquals(expiryDate, actual.value) + assertTrue(actual.validation is Validation.Invalid) + } + + @Test + fun `date is valid, then result should be valid`() { + val actual = CardValidationUtils.generateExpiryDateValidation( + fieldPolicy = Brand.FieldPolicy.REQUIRED, + expiryDateValidationResult = ExpiryDateValidationResult.VALID, + ) + + assertEquals(Validation.Valid, actual) + } + + @Test + fun `date is too far in the future, then result should be invalid`() { + val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.REQUIRED, expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future - assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual) } @Test fun `date is too old, then result should be invalid`() { - val expiryDate = ExpiryDate(12, 2022) - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, + val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.REQUIRED, expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_OLD, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old - assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual) } @Test fun `date is valid with field policy optional, then result should be valid`() { - val expiryDate = ExpiryDate(12, 2053) - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, + val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.OPTIONAL, expiryDateValidationResult = ExpiryDateValidationResult.VALID, ) - assertEquals(FieldState(expiryDate, Validation.Valid), actual) + assertEquals(Validation.Valid, actual) } @Test fun `date is valid with field policy hidden, then result should be valid`() { - val expiryDate = ExpiryDate(12, 2053) - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, + val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.HIDDEN, expiryDateValidationResult = ExpiryDateValidationResult.VALID, ) - assertEquals(FieldState(expiryDate, Validation.Valid), actual) + assertEquals(Validation.Valid, actual) } @Test fun `date is too far in the future with field policy optional, then result should be invalid`() { - val expiryDate = ExpiryDate(12, 2300) - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, + val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.OPTIONAL, expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future - assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual) } @Test fun `date is too far in the future with field policy hidden, then result should be invalid`() { - val expiryDate = ExpiryDate(12, 2300) - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, + val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.HIDDEN, expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future - assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual) } @Test fun `date is too old with field policy optional, then result should be invalid`() { - val expiryDate = ExpiryDate(12, 2022) - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, + val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.OPTIONAL, expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_OLD, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old - assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual) } @Test fun `date is too old with field policy hidden, then result should be invalid`() { - val expiryDate = ExpiryDate(12, 2022) - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, + val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.HIDDEN, expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_OLD, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old - assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual) } @Test fun `date is empty with field policy required, then result should be invalid`() { - val expiryDate = ExpiryDate.EMPTY_DATE - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, + val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.REQUIRED, - expiryDateValidationResult = ExpiryDateValidationResult.INVALID_EXPIRY_DATE, + expiryDateValidationResult = ExpiryDateValidationResult.INVALID_OTHER_REASON, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid - assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual) } @Test fun `date is empty with field policy optional, then result should be valid`() { - val expiryDate = ExpiryDate.EMPTY_DATE - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, + val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.OPTIONAL, expiryDateValidationResult = ExpiryDateValidationResult.VALID, ) - assertEquals(FieldState(expiryDate, Validation.Valid), actual) + assertEquals(Validation.Valid, actual) } @Test fun `date is empty with field policy hidden, then result should be valid`() { - val expiryDate = ExpiryDate.EMPTY_DATE - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, + val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.HIDDEN, expiryDateValidationResult = ExpiryDateValidationResult.VALID, ) - assertEquals(FieldState(expiryDate, Validation.Valid), actual) + assertEquals(Validation.Valid, actual) } @Test fun `date is invalid with field policy required, then result should be invalid`() { - val expiryDate = ExpiryDate.INVALID_DATE - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, + val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.REQUIRED, - expiryDateValidationResult = ExpiryDateValidationResult.INVALID_EXPIRY_DATE, + expiryDateValidationResult = ExpiryDateValidationResult.INVALID_DATE_FORMAT, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid - assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual) } @Test fun `date is invalid with field policy optional, then result should be invalid`() { - val expiryDate = ExpiryDate.INVALID_DATE - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, + val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.OPTIONAL, - expiryDateValidationResult = ExpiryDateValidationResult.INVALID_EXPIRY_DATE, + expiryDateValidationResult = ExpiryDateValidationResult.INVALID_DATE_FORMAT, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid - assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual) } @Test fun `date is invalid with field policy hidden, then result should be invalid`() { - val expiryDate = ExpiryDate.INVALID_DATE - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, + val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.HIDDEN, - expiryDateValidationResult = ExpiryDateValidationResult.INVALID_EXPIRY_DATE, + expiryDateValidationResult = ExpiryDateValidationResult.INVALID_DATE_FORMAT, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid - assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual) } } diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt index 868cf56380..2679e0a2a1 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt +++ b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt @@ -66,7 +66,8 @@ internal object MealVoucherValidationUtils { Validation.Invalid(R.string.checkout_meal_voucher_expiry_date_not_valid_too_old), ) - ExpiryDateValidationResult.INVALID_EXPIRY_DATE -> FieldState( + ExpiryDateValidationResult.INVALID_DATE_FORMAT, + ExpiryDateValidationResult.INVALID_OTHER_REASON -> FieldState( expiryDate, Validation.Invalid(R.string.checkout_meal_voucher_expiry_date_not_valid), ) diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationResult.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationResult.kt index 495438d03f..398798f680 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationResult.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationResult.kt @@ -15,5 +15,6 @@ enum class ExpiryDateValidationResult { VALID, INVALID_TOO_FAR_IN_THE_FUTURE, INVALID_TOO_OLD, - INVALID_EXPIRY_DATE + INVALID_DATE_FORMAT, + INVALID_OTHER_REASON, } diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt index 7cc01810ec..b59b0f7a0a 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt @@ -37,7 +37,9 @@ object ExpiryDateValidationUtils { } } - else -> ExpiryDateValidationResult.INVALID_EXPIRY_DATE + expiryDate == ExpiryDate.INVALID_DATE -> ExpiryDateValidationResult.INVALID_DATE_FORMAT + + else -> ExpiryDateValidationResult.INVALID_OTHER_REASON } private fun isInMaxYearRange(expiryDate: ExpiryDate, calendar: Calendar): Boolean { diff --git a/ui-core/src/test/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtilsTest.kt b/ui-core/src/test/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtilsTest.kt index a06c5d9a48..bcc21e2cc4 100644 --- a/ui-core/src/test/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtilsTest.kt +++ b/ui-core/src/test/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtilsTest.kt @@ -16,7 +16,7 @@ import org.junit.jupiter.params.provider.MethodSource import java.util.Calendar import java.util.GregorianCalendar -class ExpiryDateValidationUtilsTest { +internal class ExpiryDateValidationUtilsTest { @ParameterizedTest @MethodSource("expiryDateValidationSource") @@ -38,12 +38,12 @@ class ExpiryDateValidationUtilsTest { arguments( ExpiryDate.EMPTY_DATE, GregorianCalendar.getInstance(), - ExpiryDateValidationResult.INVALID_EXPIRY_DATE, + ExpiryDateValidationResult.INVALID_OTHER_REASON, ), arguments( ExpiryDate.INVALID_DATE, GregorianCalendar.getInstance(), - ExpiryDateValidationResult.INVALID_EXPIRY_DATE, + ExpiryDateValidationResult.INVALID_DATE_FORMAT, ), // Date 30 years in future arguments( From aac23318796943077900027d2e1ae087ce48d5a7 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Wed, 31 Jul 2024 14:07:58 +0200 Subject: [PATCH 251/299] Update meal voucher translations COAND-693 --- .../main/res/template/values/strings.xml.tt | 20 +++++++++++++++++++ .../src/main/res/values-ar/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-bg-rBG/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-ca-rES/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-cs-rCZ/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-da-rDK/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-de-rDE/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-el-rGR/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-es-rES/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-et-rEE/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-fi-rFI/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-fr-rFR/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-hr-rHR/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-hu-rHU/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-is-rIS/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-it-rIT/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-ja-rJP/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-ko-rKR/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-lt-rLT/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-lv-rLV/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-nb-rNO/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-nl-rNL/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-pl-rPL/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-pt-rBR/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-pt-rPT/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-ro-rRO/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-ru-rRU/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-sk-rSK/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-sl-rSI/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-sv-rSE/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-zh-rCN/strings.xml | 20 +++++++++++++++++++ .../src/main/res/values-zh-rTW/strings.xml | 20 +++++++++++++++++++ meal-voucher/src/main/res/values/strings.xml | 19 +++++++++--------- 33 files changed, 649 insertions(+), 10 deletions(-) create mode 100644 meal-voucher/src/main/res/template/values/strings.xml.tt create mode 100644 meal-voucher/src/main/res/values-ar/strings.xml create mode 100644 meal-voucher/src/main/res/values-bg-rBG/strings.xml create mode 100644 meal-voucher/src/main/res/values-ca-rES/strings.xml create mode 100644 meal-voucher/src/main/res/values-cs-rCZ/strings.xml create mode 100644 meal-voucher/src/main/res/values-da-rDK/strings.xml create mode 100644 meal-voucher/src/main/res/values-de-rDE/strings.xml create mode 100644 meal-voucher/src/main/res/values-el-rGR/strings.xml create mode 100644 meal-voucher/src/main/res/values-es-rES/strings.xml create mode 100644 meal-voucher/src/main/res/values-et-rEE/strings.xml create mode 100644 meal-voucher/src/main/res/values-fi-rFI/strings.xml create mode 100644 meal-voucher/src/main/res/values-fr-rFR/strings.xml create mode 100644 meal-voucher/src/main/res/values-hr-rHR/strings.xml create mode 100644 meal-voucher/src/main/res/values-hu-rHU/strings.xml create mode 100644 meal-voucher/src/main/res/values-is-rIS/strings.xml create mode 100644 meal-voucher/src/main/res/values-it-rIT/strings.xml create mode 100644 meal-voucher/src/main/res/values-ja-rJP/strings.xml create mode 100644 meal-voucher/src/main/res/values-ko-rKR/strings.xml create mode 100644 meal-voucher/src/main/res/values-lt-rLT/strings.xml create mode 100644 meal-voucher/src/main/res/values-lv-rLV/strings.xml create mode 100644 meal-voucher/src/main/res/values-nb-rNO/strings.xml create mode 100644 meal-voucher/src/main/res/values-nl-rNL/strings.xml create mode 100644 meal-voucher/src/main/res/values-pl-rPL/strings.xml create mode 100644 meal-voucher/src/main/res/values-pt-rBR/strings.xml create mode 100644 meal-voucher/src/main/res/values-pt-rPT/strings.xml create mode 100644 meal-voucher/src/main/res/values-ro-rRO/strings.xml create mode 100644 meal-voucher/src/main/res/values-ru-rRU/strings.xml create mode 100644 meal-voucher/src/main/res/values-sk-rSK/strings.xml create mode 100644 meal-voucher/src/main/res/values-sl-rSI/strings.xml create mode 100644 meal-voucher/src/main/res/values-sv-rSE/strings.xml create mode 100644 meal-voucher/src/main/res/values-zh-rCN/strings.xml create mode 100644 meal-voucher/src/main/res/values-zh-rTW/strings.xml diff --git a/meal-voucher/src/main/res/template/values/strings.xml.tt b/meal-voucher/src/main/res/template/values/strings.xml.tt new file mode 100644 index 0000000000..3c406799a1 --- /dev/null +++ b/meal-voucher/src/main/res/template/values/strings.xml.tt @@ -0,0 +1,20 @@ + + + + %%creditCard.numberField.title%% + %%creditCard.expiryDateField.title%% + %%creditCard.cvcField.title%% + + %%card.numberField.invalid%% + %%card.securityCodeField.invalid%% + + %%card.expiryDateField.invalid%% + %%card.expiryDateField.invalid%% + %%card.expiryDateField.invalid%% + diff --git a/meal-voucher/src/main/res/values-ar/strings.xml b/meal-voucher/src/main/res/values-ar/strings.xml new file mode 100644 index 0000000000..2a1431737a --- /dev/null +++ b/meal-voucher/src/main/res/values-ar/strings.xml @@ -0,0 +1,20 @@ + + + + رقم البطاقة + تاريخ الانتهاء + رمز الأمان + + أدخل رقم بطاقة صحيح + أدخل رمز أمان صحيح + + أدخل تاريخ انتهاء صحيح + أدخل تاريخ انتهاء صحيح + أدخل تاريخ انتهاء صحيح + diff --git a/meal-voucher/src/main/res/values-bg-rBG/strings.xml b/meal-voucher/src/main/res/values-bg-rBG/strings.xml new file mode 100644 index 0000000000..6cca6923ad --- /dev/null +++ b/meal-voucher/src/main/res/values-bg-rBG/strings.xml @@ -0,0 +1,20 @@ + + + + Номер на карта + Дата на валидност + Код за сигурност + + Въведи правилния номер на картата + Въведи правилния код за сигурност + + Въведи правилната дата на валидност + Въведи правилната дата на валидност + Въведи правилната дата на валидност + diff --git a/meal-voucher/src/main/res/values-ca-rES/strings.xml b/meal-voucher/src/main/res/values-ca-rES/strings.xml new file mode 100644 index 0000000000..2fe4abcb83 --- /dev/null +++ b/meal-voucher/src/main/res/values-ca-rES/strings.xml @@ -0,0 +1,20 @@ + + + + Número de targeta + Data de caducitat + Codi de seguretat + + Introduïu un número de targeta correcte + Introduïu un codi de seguretat correcte + + Introduïu una data de caducitat correcta + Introduïu una data de caducitat correcta + Introduïu una data de caducitat correcta + diff --git a/meal-voucher/src/main/res/values-cs-rCZ/strings.xml b/meal-voucher/src/main/res/values-cs-rCZ/strings.xml new file mode 100644 index 0000000000..ec30aeefb1 --- /dev/null +++ b/meal-voucher/src/main/res/values-cs-rCZ/strings.xml @@ -0,0 +1,20 @@ + + + + Číslo karty + Konec platnosti + Bezpečnostní kód + + Zadejte správné číslo karty + Zadejte správný bezpečnostní kód + + Zadejte správné datum konce platnosti + Zadejte správné datum konce platnosti + Zadejte správné datum konce platnosti + diff --git a/meal-voucher/src/main/res/values-da-rDK/strings.xml b/meal-voucher/src/main/res/values-da-rDK/strings.xml new file mode 100644 index 0000000000..cd5fbb53b9 --- /dev/null +++ b/meal-voucher/src/main/res/values-da-rDK/strings.xml @@ -0,0 +1,20 @@ + + + + Kortnummer + Udløbsdato + Sikkerhedskode + + Indtast et korrekt kortnummer + Indtast en korrekt sikkerhedskode + + Indtast en korrekt udløbsdato + Indtast en korrekt udløbsdato + Indtast en korrekt udløbsdato + diff --git a/meal-voucher/src/main/res/values-de-rDE/strings.xml b/meal-voucher/src/main/res/values-de-rDE/strings.xml new file mode 100644 index 0000000000..176437fa2d --- /dev/null +++ b/meal-voucher/src/main/res/values-de-rDE/strings.xml @@ -0,0 +1,20 @@ + + + + Kartennummer + Ablaufdatum + Sicherheitscode + + Geben Sie eine korrekte Kartennummer ein + Geben Sie einen korrekten Sicherheitscode ein + + Geben Sie ein korrektes Ablaufdatum ein + Geben Sie ein korrektes Ablaufdatum ein + Geben Sie ein korrektes Ablaufdatum ein + diff --git a/meal-voucher/src/main/res/values-el-rGR/strings.xml b/meal-voucher/src/main/res/values-el-rGR/strings.xml new file mode 100644 index 0000000000..50cad35f39 --- /dev/null +++ b/meal-voucher/src/main/res/values-el-rGR/strings.xml @@ -0,0 +1,20 @@ + + + + Αριθμός κάρτας + Ημερομηνία λήξης + Κωδικός ασφαλείας + + Εισαγάγετε σωστό αριθμό κάρτας + Εισαγάγετε σωστό κωδικό ασφάλειας + + Εισαγάγετε σωστή ημερομηνία λήξης + Εισαγάγετε σωστή ημερομηνία λήξης + Εισαγάγετε σωστή ημερομηνία λήξης + diff --git a/meal-voucher/src/main/res/values-es-rES/strings.xml b/meal-voucher/src/main/res/values-es-rES/strings.xml new file mode 100644 index 0000000000..069d523ae4 --- /dev/null +++ b/meal-voucher/src/main/res/values-es-rES/strings.xml @@ -0,0 +1,20 @@ + + + + Número de tarjeta + Fecha de expiración + Código de seguridad + + Introduzca un número de tarjeta correcto + Introduzca un código de seguridad correcto + + Introduzca una fecha de caducidad correcta + Introduzca una fecha de caducidad correcta + Introduzca una fecha de caducidad correcta + diff --git a/meal-voucher/src/main/res/values-et-rEE/strings.xml b/meal-voucher/src/main/res/values-et-rEE/strings.xml new file mode 100644 index 0000000000..ebbdadfe59 --- /dev/null +++ b/meal-voucher/src/main/res/values-et-rEE/strings.xml @@ -0,0 +1,20 @@ + + + + Kaardi number + Aegumise kuupäev + Turvakood + + Sisestage õige kaardinumber + Sisestage õige turvakood + + Sisestage õige aegumiskuupäev + Sisestage õige aegumiskuupäev + Sisestage õige aegumiskuupäev + diff --git a/meal-voucher/src/main/res/values-fi-rFI/strings.xml b/meal-voucher/src/main/res/values-fi-rFI/strings.xml new file mode 100644 index 0000000000..faa7fa338b --- /dev/null +++ b/meal-voucher/src/main/res/values-fi-rFI/strings.xml @@ -0,0 +1,20 @@ + + + + Kortin numero + Voimassaolopäivämäärä + Turvakoodi + + Anna oikea kortin numero + Anna oikea turvakoodi + + Anna oikea viimeinen voimassaolopäivä + Anna oikea viimeinen voimassaolopäivä + Anna oikea viimeinen voimassaolopäivä + diff --git a/meal-voucher/src/main/res/values-fr-rFR/strings.xml b/meal-voucher/src/main/res/values-fr-rFR/strings.xml new file mode 100644 index 0000000000..5a34bdc10d --- /dev/null +++ b/meal-voucher/src/main/res/values-fr-rFR/strings.xml @@ -0,0 +1,20 @@ + + + + Numéro de la carte + Date d\'expiration + Code de sécurité + + Saisissez un numéro de carte correct + Saisissez un code de sécurité correct + + Saisissez une date d\'expiration correcte + Saisissez une date d\'expiration correcte + Saisissez une date d\'expiration correcte + diff --git a/meal-voucher/src/main/res/values-hr-rHR/strings.xml b/meal-voucher/src/main/res/values-hr-rHR/strings.xml new file mode 100644 index 0000000000..be64f6ca1a --- /dev/null +++ b/meal-voucher/src/main/res/values-hr-rHR/strings.xml @@ -0,0 +1,20 @@ + + + + Broj kartice + Datum isteka + Sigurnosni kôd + + Unesite ispravan broj kartice + Unesite ispravan sigurnosni kôd + + Unesite ispravan datum isteka + Unesite ispravan datum isteka + Unesite ispravan datum isteka + diff --git a/meal-voucher/src/main/res/values-hu-rHU/strings.xml b/meal-voucher/src/main/res/values-hu-rHU/strings.xml new file mode 100644 index 0000000000..bca069b2d1 --- /dev/null +++ b/meal-voucher/src/main/res/values-hu-rHU/strings.xml @@ -0,0 +1,20 @@ + + + + Kártyaszám + Lejárati dátum + Biztonsági kód + + Adjon meg egy helyes kártyaszámot + Adjon meg egy helyes biztonsági kódot + + Adjon meg egy helyes lejárati dátumot + Adjon meg egy helyes lejárati dátumot + Adjon meg egy helyes lejárati dátumot + diff --git a/meal-voucher/src/main/res/values-is-rIS/strings.xml b/meal-voucher/src/main/res/values-is-rIS/strings.xml new file mode 100644 index 0000000000..7a191990c0 --- /dev/null +++ b/meal-voucher/src/main/res/values-is-rIS/strings.xml @@ -0,0 +1,20 @@ + + + + Kortanúmer + Gildisdadgur + Öryggiskóði + + Sláðu inn rétt kortanúmer + Sláðu inn réttan öryggiskóða + + Sláðu inn réttan gildisdag + Sláðu inn réttan gildisdag + Sláðu inn réttan gildisdag + diff --git a/meal-voucher/src/main/res/values-it-rIT/strings.xml b/meal-voucher/src/main/res/values-it-rIT/strings.xml new file mode 100644 index 0000000000..1cd176a799 --- /dev/null +++ b/meal-voucher/src/main/res/values-it-rIT/strings.xml @@ -0,0 +1,20 @@ + + + + Numero carta + Data di scadenza + Codice di sicurezza + + Immetti un numero di carta corretto + Immetti un codice di sicurezza corretto + + Immetti una data di scadenza corretta + Immetti una data di scadenza corretta + Immetti una data di scadenza corretta + diff --git a/meal-voucher/src/main/res/values-ja-rJP/strings.xml b/meal-voucher/src/main/res/values-ja-rJP/strings.xml new file mode 100644 index 0000000000..7b943cf487 --- /dev/null +++ b/meal-voucher/src/main/res/values-ja-rJP/strings.xml @@ -0,0 +1,20 @@ + + + + カード番号 + 有効期限 + セキュリティコード + + 正しいカード番号を入力してください + 正しいセキュリティコードを入力してください + + 正しい有効期限を入力してください + 正しい有効期限を入力してください + 正しい有効期限を入力してください + diff --git a/meal-voucher/src/main/res/values-ko-rKR/strings.xml b/meal-voucher/src/main/res/values-ko-rKR/strings.xml new file mode 100644 index 0000000000..aeee8e0456 --- /dev/null +++ b/meal-voucher/src/main/res/values-ko-rKR/strings.xml @@ -0,0 +1,20 @@ + + + + 카드 번호 + 만료일 + 보안 코드 + + 정확한 카드 번호를 입력하세요 + 정확한 보안 코드를 입력하세요 + + 정확한 만료일을 입력하세요 + 정확한 만료일을 입력하세요 + 정확한 만료일을 입력하세요 + diff --git a/meal-voucher/src/main/res/values-lt-rLT/strings.xml b/meal-voucher/src/main/res/values-lt-rLT/strings.xml new file mode 100644 index 0000000000..cb33290bd8 --- /dev/null +++ b/meal-voucher/src/main/res/values-lt-rLT/strings.xml @@ -0,0 +1,20 @@ + + + + Kortelės numeris + Galiojimo data + Saugos kodas + + Įveskite teisingą kortelės numerį + Įveskite teisingą saugos kodą + + Įveskite teisingą galiojimo datą + Įveskite teisingą galiojimo datą + Įveskite teisingą galiojimo datą + diff --git a/meal-voucher/src/main/res/values-lv-rLV/strings.xml b/meal-voucher/src/main/res/values-lv-rLV/strings.xml new file mode 100644 index 0000000000..8f28ce3f49 --- /dev/null +++ b/meal-voucher/src/main/res/values-lv-rLV/strings.xml @@ -0,0 +1,20 @@ + + + + Kartes numurs + Derīguma termiņš + Drošības kods + + Ievadiet pareizu kartes numuru + Ievadiet pareizu drošības kodu + + Ievadiet pareizu derīguma termiņu + Ievadiet pareizu derīguma termiņu + Ievadiet pareizu derīguma termiņu + diff --git a/meal-voucher/src/main/res/values-nb-rNO/strings.xml b/meal-voucher/src/main/res/values-nb-rNO/strings.xml new file mode 100644 index 0000000000..641f3757b9 --- /dev/null +++ b/meal-voucher/src/main/res/values-nb-rNO/strings.xml @@ -0,0 +1,20 @@ + + + + Kortnummer + Utløpsdato + Sikkerhetskode + + Angi et korrekt kortnummer + Angi en korrekt sikkerhetskode + + Angi en korrekt utløpsdato + Angi en korrekt utløpsdato + Angi en korrekt utløpsdato + diff --git a/meal-voucher/src/main/res/values-nl-rNL/strings.xml b/meal-voucher/src/main/res/values-nl-rNL/strings.xml new file mode 100644 index 0000000000..224fd4d7c8 --- /dev/null +++ b/meal-voucher/src/main/res/values-nl-rNL/strings.xml @@ -0,0 +1,20 @@ + + + + Kaartnummer + Vervaldatum + Beveiligingscode + + Voer een correct kaartnummer in + Voer een correcte beveiligingscode in + + Voer een correcte vervaldatum in + Voer een correcte vervaldatum in + Voer een correcte vervaldatum in + diff --git a/meal-voucher/src/main/res/values-pl-rPL/strings.xml b/meal-voucher/src/main/res/values-pl-rPL/strings.xml new file mode 100644 index 0000000000..60107c7cb6 --- /dev/null +++ b/meal-voucher/src/main/res/values-pl-rPL/strings.xml @@ -0,0 +1,20 @@ + + + + Numer karty + Data ważności + Kod zabezpieczający + + Wprowadź prawidłowy numer karty + Wprowadź prawidłowy kod bezpieczeństwa + + Wprowadź prawidłową datę ważności + Wprowadź prawidłową datę ważności + Wprowadź prawidłową datę ważności + diff --git a/meal-voucher/src/main/res/values-pt-rBR/strings.xml b/meal-voucher/src/main/res/values-pt-rBR/strings.xml new file mode 100644 index 0000000000..0dd8ae34ce --- /dev/null +++ b/meal-voucher/src/main/res/values-pt-rBR/strings.xml @@ -0,0 +1,20 @@ + + + + Número do cartão + Data de validade + Código de segurança + + Digite um número de cartão correto + Digite um código de segurança correto + + Digite uma data de validade correta + Digite uma data de validade correta + Digite uma data de validade correta + diff --git a/meal-voucher/src/main/res/values-pt-rPT/strings.xml b/meal-voucher/src/main/res/values-pt-rPT/strings.xml new file mode 100644 index 0000000000..e6c964dbe7 --- /dev/null +++ b/meal-voucher/src/main/res/values-pt-rPT/strings.xml @@ -0,0 +1,20 @@ + + + + Número de cartão + Data de validade + Código de segurança + + Introduza um número de cartão correto + Introduza um código de segurança correto + + Introduza uma data de validade correta + Introduza uma data de validade correta + Introduza uma data de validade correta + diff --git a/meal-voucher/src/main/res/values-ro-rRO/strings.xml b/meal-voucher/src/main/res/values-ro-rRO/strings.xml new file mode 100644 index 0000000000..91b1335efa --- /dev/null +++ b/meal-voucher/src/main/res/values-ro-rRO/strings.xml @@ -0,0 +1,20 @@ + + + + Număr card + Data expirării + Cod de securitate + + Completați un număr de card corect + Completați un cod de securitate corect + + Completați o dată de expirare corectă + Completați o dată de expirare corectă + Completați o dată de expirare corectă + diff --git a/meal-voucher/src/main/res/values-ru-rRU/strings.xml b/meal-voucher/src/main/res/values-ru-rRU/strings.xml new file mode 100644 index 0000000000..950c071f05 --- /dev/null +++ b/meal-voucher/src/main/res/values-ru-rRU/strings.xml @@ -0,0 +1,20 @@ + + + + Номер карты + Срок действия + Защитный код + + Введите правильный номер карты + Введите правильный защитный код + + Введите правильную дату окончания срока действия + Введите правильную дату окончания срока действия + Введите правильную дату окончания срока действия + diff --git a/meal-voucher/src/main/res/values-sk-rSK/strings.xml b/meal-voucher/src/main/res/values-sk-rSK/strings.xml new file mode 100644 index 0000000000..bdce0761a3 --- /dev/null +++ b/meal-voucher/src/main/res/values-sk-rSK/strings.xml @@ -0,0 +1,20 @@ + + + + Číslo karty + Koniec platnosti + Bezpečnostný kód + + Zadajte správne číslo karty + Zadajte správny bezpečnostný kód + + Zadajte správny dátum vypršania platnosti + Zadajte správny dátum vypršania platnosti + Zadajte správny dátum vypršania platnosti + diff --git a/meal-voucher/src/main/res/values-sl-rSI/strings.xml b/meal-voucher/src/main/res/values-sl-rSI/strings.xml new file mode 100644 index 0000000000..827354c502 --- /dev/null +++ b/meal-voucher/src/main/res/values-sl-rSI/strings.xml @@ -0,0 +1,20 @@ + + + + Številka kartice + Datum veljavnosti + Varnostna koda + + Vnesite pravilno številko kartice + Vnesite pravilno varnostno kodo + + Vnesite pravilen datum poteka veljavnosti + Vnesite pravilen datum poteka veljavnosti + Vnesite pravilen datum poteka veljavnosti + diff --git a/meal-voucher/src/main/res/values-sv-rSE/strings.xml b/meal-voucher/src/main/res/values-sv-rSE/strings.xml new file mode 100644 index 0000000000..eb07e82705 --- /dev/null +++ b/meal-voucher/src/main/res/values-sv-rSE/strings.xml @@ -0,0 +1,20 @@ + + + + Kortnummer + Utgångsdatum + Säkerhetskod + + Ange ett korrekt kortnummer + Ange en korrekt säkerhetskod + + Ange ett korrekt utgångsdatum + Ange ett korrekt utgångsdatum + Ange ett korrekt utgångsdatum + diff --git a/meal-voucher/src/main/res/values-zh-rCN/strings.xml b/meal-voucher/src/main/res/values-zh-rCN/strings.xml new file mode 100644 index 0000000000..7ab42a1364 --- /dev/null +++ b/meal-voucher/src/main/res/values-zh-rCN/strings.xml @@ -0,0 +1,20 @@ + + + + 卡号 + 有效期 + 安全码 + + 输入正确的卡号 + 输入正确的安全码 + + 输入正确的到期日 + 输入正确的到期日 + 输入正确的到期日 + diff --git a/meal-voucher/src/main/res/values-zh-rTW/strings.xml b/meal-voucher/src/main/res/values-zh-rTW/strings.xml new file mode 100644 index 0000000000..2dc515bd93 --- /dev/null +++ b/meal-voucher/src/main/res/values-zh-rTW/strings.xml @@ -0,0 +1,20 @@ + + + + 信用卡號碼 + 到期日期 + 安全碼 + + 請輸入正確的卡號 + 請輸入正確的安全碼 + + 請輸入正確的到期日 + 請輸入正確的到期日 + 請輸入正確的到期日 + diff --git a/meal-voucher/src/main/res/values/strings.xml b/meal-voucher/src/main/res/values/strings.xml index 496a47b259..cd3201c18b 100644 --- a/meal-voucher/src/main/res/values/strings.xml +++ b/meal-voucher/src/main/res/values/strings.xml @@ -3,19 +3,18 @@ ~ ~ This file is open source and available under the MIT license. See the LICENSE file for more info. ~ - ~ Created by ararat on 17/7/2024. + ~ Created by ozgur on 31/7/2024. --> - - Card number - Expiry date - Security code + Card number + Expiry date + Security code - Invalid card number - Invalid security code + Enter a correct card number + Enter a correct security code - Invalid expiry date - Card too old - Date too far in the future + Enter a correct expiry date + Enter a correct expiry date + Enter a correct expiry date From 4c0ef5116fe285704fbd73e2c7a89b5d6e5bc5c1 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Tue, 27 Aug 2024 10:30:23 +0200 Subject: [PATCH 252/299] Update max digit limit for security code input COAND-693 --- meal-voucher/api/meal-voucher.api | 2 +- meal-voucher/src/main/res/layout/meal_voucher_view.xml | 2 +- meal-voucher/src/main/res/values/styles.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meal-voucher/api/meal-voucher.api b/meal-voucher/api/meal-voucher.api index f7441de3d9..f8ed974f8f 100644 --- a/meal-voucher/api/meal-voucher.api +++ b/meal-voucher/api/meal-voucher.api @@ -55,7 +55,7 @@ public final class com/adyen/checkout/mealvoucher/MealVoucherConfigurationKt { public final class com/adyen/checkout/mealvoucher/databinding/MealVoucherViewBinding : androidx/viewbinding/ViewBinding { public final field editTextMealVoucherCardNumber Lcom/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput; public final field editTextMealVoucherExpiryDate Lcom/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput; - public final field editTextMealVoucherSecurityCode Lcom/adyen/checkout/ui/core/internal/ui/view/SecurityCodeInput; + public final field editTextMealVoucherSecurityCode Lcom/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText; public final field textInputLayoutMealVoucherCardNumber Lcom/google/android/material/textfield/TextInputLayout; public final field textInputLayoutMealVoucherExpiryDate Lcom/google/android/material/textfield/TextInputLayout; public final field textInputLayoutMealVoucherSecurityCode Lcom/google/android/material/textfield/TextInputLayout; diff --git a/meal-voucher/src/main/res/layout/meal_voucher_view.xml b/meal-voucher/src/main/res/layout/meal_voucher_view.xml index 62284e99e2..2e316576bb 100644 --- a/meal-voucher/src/main/res/layout/meal_voucher_view.xml +++ b/meal-voucher/src/main/res/layout/meal_voucher_view.xml @@ -55,7 +55,7 @@ android:layout_marginStart="@dimen/standard_half_margin" android:layout_weight="1"> - diff --git a/meal-voucher/src/main/res/values/styles.xml b/meal-voucher/src/main/res/values/styles.xml index 61b9c07830..8d3b432758 100644 --- a/meal-voucher/src/main/res/values/styles.xml +++ b/meal-voucher/src/main/res/values/styles.xml @@ -23,7 +23,7 @@ From e64052a3a13d1d2d76499fd3b23917442ac6fcaa Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Mon, 2 Sep 2024 11:50:09 +0200 Subject: [PATCH 253/299] Run apiDump COAND-693 --- card/api/card.api | 11 ----------- ui-core/api/ui-core.api | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/card/api/card.api b/card/api/card.api index 4a26520fdb..f9287c8c79 100644 --- a/card/api/card.api +++ b/card/api/card.api @@ -608,14 +608,3 @@ public final class com/adyen/checkout/card/internal/ui/view/CardNumberInput$Comp public final class com/adyen/checkout/card/internal/ui/view/CardView$Companion { } -public final class com/adyen/checkout/card/internal/ui/view/SecurityCodeInput : com/adyen/checkout/card/internal/ui/view/CardNumberInput { - public static final field Companion Lcom/adyen/checkout/card/internal/ui/view/SecurityCodeInput$Companion; - public fun (Landroid/content/Context;)V - public fun (Landroid/content/Context;Landroid/util/AttributeSet;)V - public fun (Landroid/content/Context;Landroid/util/AttributeSet;I)V - public synthetic fun (Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V -} - -public final class com/adyen/checkout/card/internal/ui/view/SecurityCodeInput$Companion { -} - diff --git a/ui-core/api/ui-core.api b/ui-core/api/ui-core.api index b8f51113d6..9c07f31f10 100644 --- a/ui-core/api/ui-core.api +++ b/ui-core/api/ui-core.api @@ -317,6 +317,17 @@ public final class com/adyen/checkout/ui/core/internal/ui/view/RoundCornerImageV public final class com/adyen/checkout/ui/core/internal/ui/view/RoundCornerImageView$Companion { } +public final class com/adyen/checkout/ui/core/internal/ui/view/SecurityCodeInput : com/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText { + public static final field Companion Lcom/adyen/checkout/ui/core/internal/ui/view/SecurityCodeInput$Companion; + public fun (Landroid/content/Context;)V + public fun (Landroid/content/Context;Landroid/util/AttributeSet;)V + public fun (Landroid/content/Context;Landroid/util/AttributeSet;I)V + public synthetic fun (Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V +} + +public final class com/adyen/checkout/ui/core/internal/ui/view/SecurityCodeInput$Companion { +} + public final class com/adyen/checkout/ui/core/internal/ui/view/SocialSecurityNumberInput : com/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText { public static final field Companion Lcom/adyen/checkout/ui/core/internal/ui/view/SocialSecurityNumberInput$Companion; public fun (Landroid/content/Context;)V From 985c07d9ba9960efcda7e74cff166b9b95751f00 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Wed, 28 Aug 2024 11:24:14 +0200 Subject: [PATCH 254/299] Add meal voucher component, configuration and params mapper tests COAND-693 --- .../checkout/giftcard/GiftCardComponent.kt | 3 +- meal-voucher/build.gradle | 7 +- .../mealvoucher/MealVoucherComponentTest.kt | 213 ++++++++++++++ .../MealVoucherConfigurationTest.kt | 101 +++++++ .../MealVoucherComponentParamsMapperTest.kt | 272 ++++++++++++++++++ 5 files changed, 594 insertions(+), 2 deletions(-) create mode 100644 meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherComponentTest.kt create mode 100644 meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherConfigurationTest.kt create mode 100644 meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapperTest.kt diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardComponent.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardComponent.kt index 133f1c2007..8b13fe32e9 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardComponent.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardComponent.kt @@ -72,7 +72,8 @@ constructor( genericActionDelegate.observe(lifecycleOwner, viewModelScope, callback.toActionCallback()) } - internal fun removeObserver() { + @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) + fun removeObserver() { giftCardDelegate.removeObserver() genericActionDelegate.removeObserver() } diff --git a/meal-voucher/build.gradle b/meal-voucher/build.gradle index 6b36fac9c8..db687d0cb2 100644 --- a/meal-voucher/build.gradle +++ b/meal-voucher/build.gradle @@ -44,5 +44,10 @@ dependencies { api project(':giftcard') // Tests - // TODO Add test implementations + testImplementation testFixtures(project(':test-core')) + testImplementation testFixtures(project(':components-core')) + testImplementation testFixtures(project(':ui-core')) + testImplementation testLibraries.junit5 + testImplementation testLibraries.kotlinCoroutines + testImplementation testLibraries.mockito } diff --git a/meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherComponentTest.kt b/meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherComponentTest.kt new file mode 100644 index 0000000000..21dfd64be0 --- /dev/null +++ b/meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherComponentTest.kt @@ -0,0 +1,213 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 27/8/2024. + */ + +package com.adyen.checkout.mealvoucher + +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.viewModelScope +import app.cash.turbine.test +import com.adyen.checkout.action.core.internal.DefaultActionHandlingComponent +import com.adyen.checkout.action.core.internal.ui.GenericActionDelegate +import com.adyen.checkout.components.core.BalanceResult +import com.adyen.checkout.components.core.OrderResponse +import com.adyen.checkout.components.core.internal.ComponentEventHandler +import com.adyen.checkout.components.core.internal.PaymentComponentEvent +import com.adyen.checkout.giftcard.internal.ui.GiftCardComponentViewType +import com.adyen.checkout.giftcard.internal.ui.GiftCardDelegate +import com.adyen.checkout.mealvoucher.internal.ui.MealVoucherComponentViewType +import com.adyen.checkout.test.LoggingExtension +import com.adyen.checkout.test.TestDispatcherExtension +import com.adyen.checkout.test.extensions.invokeOnCleared +import com.adyen.checkout.ui.core.internal.ui.TestComponentViewType +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.extension.ExtendWith +import org.mockito.Mock +import org.mockito.junit.jupiter.MockitoExtension +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@ExtendWith(MockitoExtension::class, TestDispatcherExtension::class, LoggingExtension::class) +internal class MealVoucherComponentTest( + @Mock private val giftCardDelegate: GiftCardDelegate, + @Mock private val genericActionDelegate: GenericActionDelegate, + @Mock private val actionHandlingComponent: DefaultActionHandlingComponent, + @Mock private val componentEventHandler: ComponentEventHandler, +) { + private lateinit var component: MealVoucherComponent + + @BeforeEach + fun before() { + whenever(giftCardDelegate.viewFlow) doReturn MutableStateFlow(MealVoucherComponentViewType) + whenever(genericActionDelegate.viewFlow) doReturn MutableStateFlow(null) + + component = MealVoucherComponent( + giftCardDelegate = giftCardDelegate, + genericActionDelegate = genericActionDelegate, + actionHandlingComponent = actionHandlingComponent, + componentEventHandler = componentEventHandler, + ) + } + + @Test + fun `when component is created then delegates are initialized`() { + verify(giftCardDelegate).initialize(component.viewModelScope) + verify(genericActionDelegate).initialize(component.viewModelScope) + verify(componentEventHandler).initialize(component.viewModelScope) + } + + @Test + fun `when component is cleared then delegates are cleared`() { + component.invokeOnCleared() + + verify(giftCardDelegate).onCleared() + verify(genericActionDelegate).onCleared() + verify(componentEventHandler).onCleared() + } + + @Test + fun `when observe is called then observe in delegates is called`() { + val lifecycleOwner = mock() + val callback: (PaymentComponentEvent) -> Unit = {} + + component.observe(lifecycleOwner, callback) + + verify(giftCardDelegate).observe(lifecycleOwner, component.viewModelScope, callback) + verify(genericActionDelegate).observe(eq(lifecycleOwner), eq(component.viewModelScope), any()) + } + + @Test + fun `when removeObserver is called then removeObserver in delegates is called`() { + component.removeObserver() + + verify(giftCardDelegate).removeObserver() + verify(genericActionDelegate).removeObserver() + } + + @Test + fun `when component is initialized then view flow should match gift card delegate view flow`() = runTest { + component.viewFlow.test { + assert(awaitItem() is MealVoucherComponentViewType) + expectNoEvents() + } + } + + @Test + fun `when gift card delegate view flow emits a value then component view flow should match that value`() = runTest { + val giftCardDelegateViewFlow = MutableStateFlow(TestComponentViewType.VIEW_TYPE_1) + whenever(giftCardDelegate.viewFlow) doReturn giftCardDelegateViewFlow + component = MealVoucherComponent( + giftCardDelegate = giftCardDelegate, + genericActionDelegate = genericActionDelegate, + actionHandlingComponent = actionHandlingComponent, + componentEventHandler = componentEventHandler, + ) + + component.viewFlow.test { + assertEquals(TestComponentViewType.VIEW_TYPE_1, awaitItem()) + + giftCardDelegateViewFlow.emit(TestComponentViewType.VIEW_TYPE_2) + assertEquals(TestComponentViewType.VIEW_TYPE_2, awaitItem()) + + expectNoEvents() + } + } + + @Test + fun `when action delegate view flow emits a value then component view flow should match that value`() = runTest { + val actionDelegateViewFlow = MutableStateFlow(TestComponentViewType.VIEW_TYPE_1) + whenever(genericActionDelegate.viewFlow) doReturn actionDelegateViewFlow + component = MealVoucherComponent( + giftCardDelegate = giftCardDelegate, + genericActionDelegate = genericActionDelegate, + actionHandlingComponent = actionHandlingComponent, + componentEventHandler = componentEventHandler, + ) + + component.viewFlow.test { + // this value should match the value of the main delegate and not the action delegate + // and in practice the initial value of the action delegate view flow is always null so it should be ignored + assert(awaitItem() is GiftCardComponentViewType) + + actionDelegateViewFlow.emit(TestComponentViewType.VIEW_TYPE_2) + assertEquals(TestComponentViewType.VIEW_TYPE_2, awaitItem()) + + expectNoEvents() + } + } + + @Test + fun `when isConfirmationRequired, then delegate is called`() { + component.isConfirmationRequired() + verify(giftCardDelegate).isConfirmationRequired() + } + + @Test + fun `when resolveBalanceResult is called and active delegate is the payment delegate, then delegate resolveBalanceResult is called`() { + whenever(component.delegate).thenReturn(giftCardDelegate) + component.resolveBalanceResult(BALANCE_RESULT) + verify(giftCardDelegate).resolveBalanceResult(BALANCE_RESULT) + } + + @Test + fun `when resolveBalanceResult is called and active delegate is the action delegate, then delegate resolveBalanceResult is not called`() { + whenever(component.delegate).thenReturn(genericActionDelegate) + component.resolveBalanceResult(BALANCE_RESULT) + verify(giftCardDelegate, never()).resolveBalanceResult(BALANCE_RESULT) + } + + @Test + fun `when resolveOrderResponse is called and active delegate is the payment delegate, then delegate resolveOrderResponse is called`() { + whenever(component.delegate).thenReturn(giftCardDelegate) + component.resolveOrderResponse(ORDER_RESPONSE) + verify(giftCardDelegate).resolveOrderResponse(ORDER_RESPONSE) + } + + @Test + fun `when resolveOrderResponse is called and active delegate is the action delegate, then delegate resolveOrderResponse is not called`() { + whenever(component.delegate).thenReturn(genericActionDelegate) + component.resolveOrderResponse(ORDER_RESPONSE) + verify(giftCardDelegate, never()).resolveOrderResponse(ORDER_RESPONSE) + } + + @Test + fun `when submit is called and active delegate is the payment delegate, then delegate onSubmit is called`() { + whenever(component.delegate).thenReturn(giftCardDelegate) + component.submit() + verify(giftCardDelegate).onSubmit() + } + + @Test + fun `when submit is called and active delegate is the action delegate, then delegate onSubmit is not called`() { + whenever(component.delegate).thenReturn(genericActionDelegate) + component.submit() + verify(giftCardDelegate, never()).onSubmit() + } + + companion object { + private val BALANCE_RESULT = BalanceResult( + balance = null, + transactionLimit = null, + ) + + private val ORDER_RESPONSE = OrderResponse( + pspReference = "psp", + orderData = "orderData", + amount = null, + remainingAmount = null, + ) + } +} diff --git a/meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherConfigurationTest.kt b/meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherConfigurationTest.kt new file mode 100644 index 0000000000..94c3c74f87 --- /dev/null +++ b/meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherConfigurationTest.kt @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 28/8/2024. + */ + +package com.adyen.checkout.mealvoucher + +import com.adyen.checkout.components.core.Amount +import com.adyen.checkout.components.core.AnalyticsConfiguration +import com.adyen.checkout.components.core.AnalyticsLevel +import com.adyen.checkout.components.core.CheckoutConfiguration +import com.adyen.checkout.core.Environment +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test +import java.util.Locale + +internal class MealVoucherConfigurationTest { + + @Test + fun `when creating the configuration through CheckoutConfiguration, then it should be the same as when the builder is used`() { + val checkoutConfiguration = CheckoutConfiguration( + shopperLocale = Locale.US, + environment = Environment.TEST, + clientKey = TEST_CLIENT_KEY, + amount = Amount("EUR", 123L), + analyticsConfiguration = AnalyticsConfiguration(AnalyticsLevel.ALL), + ) { + mealVoucher { + setSubmitButtonVisible(false) + setSecurityCodeRequired(false) + } + } + + val actual = checkoutConfiguration.getMealVoucherConfiguration() + + val expected = MealVoucherConfiguration.Builder( + shopperLocale = Locale.US, + environment = Environment.TEST, + clientKey = TEST_CLIENT_KEY, + ) + .setAmount(Amount("EUR", 123L)) + .setAnalyticsConfiguration(AnalyticsConfiguration(AnalyticsLevel.ALL)) + .setSubmitButtonVisible(false) + .setSecurityCodeRequired(false) + .build() + + assertEquals(expected.shopperLocale, actual?.shopperLocale) + assertEquals(expected.environment, actual?.environment) + assertEquals(expected.clientKey, actual?.clientKey) + assertEquals(expected.amount, actual?.amount) + assertEquals(expected.analyticsConfiguration, actual?.analyticsConfiguration) + assertEquals(expected.isSubmitButtonVisible, actual?.isSubmitButtonVisible) + assertEquals(expected.isSecurityCodeRequired, actual?.isSecurityCodeRequired) + } + + @Test + fun `when the configuration is mapped to CheckoutConfiguration, then CheckoutConfiguration is created correctly`() { + val config = MealVoucherConfiguration.Builder( + shopperLocale = Locale.US, + environment = Environment.TEST, + clientKey = TEST_CLIENT_KEY, + ) + .setAmount(Amount("EUR", 123L)) + .setAnalyticsConfiguration(AnalyticsConfiguration(AnalyticsLevel.ALL)) + .setSubmitButtonVisible(false) + .setSecurityCodeRequired(false) + .build() + + val actual = config.toCheckoutConfiguration() + + val expected = CheckoutConfiguration( + shopperLocale = Locale.US, + environment = Environment.TEST, + clientKey = TEST_CLIENT_KEY, + amount = Amount("EUR", 123L), + analyticsConfiguration = AnalyticsConfiguration(AnalyticsLevel.ALL), + ) + + assertEquals(expected.shopperLocale, actual.shopperLocale) + assertEquals(expected.environment, actual.environment) + assertEquals(expected.clientKey, actual.clientKey) + assertEquals(expected.amount, actual.amount) + assertEquals(expected.analyticsConfiguration, actual.analyticsConfiguration) + + val actualMealVoucherConfig = actual.getMealVoucherConfiguration() + assertEquals(config.shopperLocale, actualMealVoucherConfig?.shopperLocale) + assertEquals(config.environment, actualMealVoucherConfig?.environment) + assertEquals(config.clientKey, actualMealVoucherConfig?.clientKey) + assertEquals(config.amount, actualMealVoucherConfig?.amount) + assertEquals(config.analyticsConfiguration, actualMealVoucherConfig?.analyticsConfiguration) + assertEquals(config.isSubmitButtonVisible, actualMealVoucherConfig?.isSubmitButtonVisible) + assertEquals(config.isSecurityCodeRequired, actualMealVoucherConfig?.isSecurityCodeRequired) + } + + companion object { + private const val TEST_CLIENT_KEY = "test_qwertyuiopasdfghjklzxcvbnmqwerty" + } +} diff --git a/meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapperTest.kt b/meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapperTest.kt new file mode 100644 index 0000000000..8f0f17cf7f --- /dev/null +++ b/meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapperTest.kt @@ -0,0 +1,272 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 27/8/2024. + */ + +package com.adyen.checkout.mealvoucher.internal.ui.model + +import com.adyen.checkout.components.core.Amount +import com.adyen.checkout.components.core.AnalyticsConfiguration +import com.adyen.checkout.components.core.AnalyticsLevel +import com.adyen.checkout.components.core.CheckoutConfiguration +import com.adyen.checkout.components.core.internal.ui.model.AnalyticsParams +import com.adyen.checkout.components.core.internal.ui.model.AnalyticsParamsLevel +import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParams +import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParamsMapper +import com.adyen.checkout.components.core.internal.ui.model.DropInOverrideParams +import com.adyen.checkout.components.core.internal.ui.model.SessionInstallmentConfiguration +import com.adyen.checkout.components.core.internal.ui.model.SessionParams +import com.adyen.checkout.core.Environment +import com.adyen.checkout.giftcard.internal.ui.model.GiftCardComponentParams +import com.adyen.checkout.mealvoucher.MealVoucherConfiguration +import com.adyen.checkout.mealvoucher.mealVoucher +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test +import org.junit.jupiter.params.ParameterizedTest +import org.junit.jupiter.params.provider.Arguments.arguments +import org.junit.jupiter.params.provider.MethodSource +import java.util.Locale + +internal class MealVoucherComponentParamsMapperTest { + + private val mealVoucherComponentParamsMapper = MealVoucherComponentParamsMapper(CommonComponentParamsMapper()) + + @Test + fun `when drop-in override params are null then params should match the component configuration`() { + val configuration = createCheckoutConfiguration { + setSubmitButtonVisible(false) + setSecurityCodeRequired(false) + } + + val params = mealVoucherComponentParamsMapper.mapToParams(configuration, DEVICE_LOCALE, null, null) + + val expected = getComponentParams( + isPinRequired = false, + isSubmitButtonVisible = false, + ) + + assertEquals(expected, params) + } + + @Test + fun `when drop-in override params are set then they should override component configuration fields`() { + val configuration = CheckoutConfiguration( + shopperLocale = Locale.GERMAN, + environment = Environment.EUROPE, + clientKey = TEST_CLIENT_KEY_2, + amount = Amount( + currency = "EUR", + value = 49_00L, + ), + analyticsConfiguration = AnalyticsConfiguration(AnalyticsLevel.NONE), + ) { + mealVoucher { + setAmount(Amount("USD", 1_00L)) + setAnalyticsConfiguration(AnalyticsConfiguration(AnalyticsLevel.ALL)) + } + } + + val dropInOverrideParams = DropInOverrideParams(Amount("DKK", 17_50L), null) + val params = + mealVoucherComponentParamsMapper.mapToParams(configuration, DEVICE_LOCALE, dropInOverrideParams, null) + + val expected = getComponentParams( + shopperLocale = Locale.GERMAN, + environment = Environment.EUROPE, + clientKey = TEST_CLIENT_KEY_2, + analyticsParams = AnalyticsParams(AnalyticsParamsLevel.NONE, TEST_CLIENT_KEY_2), + isCreatedByDropIn = true, + amount = Amount( + currency = "DKK", + value = 17_50L, + ), + isPinRequired = true, + isSubmitButtonVisible = true, + ) + + assertEquals(expected, params) + } + + @Test + fun `when setSubmitButtonVisible is set to false in meal voucher configuration and drop-in override params are set then component params should have isSubmitButtonVisible true`() { + val configuration = CheckoutConfiguration( + environment = Environment.EUROPE, + clientKey = TEST_CLIENT_KEY_2, + ) { + mealVoucher { + setSubmitButtonVisible(false) + } + } + + val dropInOverrideParams = DropInOverrideParams(Amount("CAD", 123L), null) + val params = + mealVoucherComponentParamsMapper.mapToParams(configuration, DEVICE_LOCALE, dropInOverrideParams, null) + + assertEquals(true, params.isSubmitButtonVisible) + } + + @ParameterizedTest + @MethodSource("amountSource") + fun `amount should match value set in sessions then drop in then component configuration`( + configurationValue: Amount, + dropInValue: Amount?, + sessionsValue: Amount?, + expectedValue: Amount + ) { + val testConfiguration = createCheckoutConfiguration(configurationValue) + + val dropInOverrideParams = dropInValue?.let { DropInOverrideParams(it, null) } + val sessionParams = createSessionParams( + amount = sessionsValue, + ) + + val params = mealVoucherComponentParamsMapper.mapToParams( + checkoutConfiguration = testConfiguration, + deviceLocale = DEVICE_LOCALE, + dropInOverrideParams = dropInOverrideParams, + componentSessionParams = sessionParams, + ) + + val expected = getComponentParams(amount = expectedValue, isCreatedByDropIn = dropInOverrideParams != null) + + assertEquals(expected, params) + } + + @ParameterizedTest + @MethodSource("shopperLocaleSource") + fun `shopper locale should match value set in configuration then sessions then device locale`( + configurationValue: Locale?, + sessionsValue: Locale?, + deviceLocaleValue: Locale, + expectedValue: Locale, + ) { + val configuration = createCheckoutConfiguration(shopperLocale = configurationValue) + + val sessionParams = createSessionParams( + shopperLocale = sessionsValue, + ) + + val params = mealVoucherComponentParamsMapper.mapToParams( + checkoutConfiguration = configuration, + deviceLocale = deviceLocaleValue, + dropInOverrideParams = null, + componentSessionParams = sessionParams, + ) + + val expected = getComponentParams( + shopperLocale = expectedValue, + ) + + assertEquals(expected, params) + } + + @Test + fun `environment and client key should match value set in sessions`() { + val configuration = createCheckoutConfiguration() + + val sessionParams = createSessionParams( + environment = Environment.INDIA, + clientKey = TEST_CLIENT_KEY_2, + ) + + val params = mealVoucherComponentParamsMapper.mapToParams( + checkoutConfiguration = configuration, + deviceLocale = DEVICE_LOCALE, + dropInOverrideParams = null, + componentSessionParams = sessionParams, + ) + + val expected = getComponentParams( + environment = Environment.INDIA, + clientKey = TEST_CLIENT_KEY_2, + ) + + assertEquals(expected, params) + } + + @Suppress("LongParameterList") + private fun getComponentParams( + shopperLocale: Locale = DEVICE_LOCALE, + environment: Environment = Environment.TEST, + clientKey: String = TEST_CLIENT_KEY_1, + analyticsParams: AnalyticsParams = AnalyticsParams(AnalyticsParamsLevel.ALL, TEST_CLIENT_KEY_1), + isCreatedByDropIn: Boolean = false, + amount: Amount? = null, + isSubmitButtonVisible: Boolean = true, + isPinRequired: Boolean = true, + ): GiftCardComponentParams { + return GiftCardComponentParams( + commonComponentParams = CommonComponentParams( + shopperLocale = shopperLocale, + environment = environment, + clientKey = clientKey, + analyticsParams = analyticsParams, + isCreatedByDropIn = isCreatedByDropIn, + amount = amount, + ), + isSubmitButtonVisible = isSubmitButtonVisible, + isPinRequired = isPinRequired, + isExpiryDateRequired = true, + ) + } + + @Suppress("LongParameterList") + private fun createSessionParams( + environment: Environment = Environment.TEST, + clientKey: String = TEST_CLIENT_KEY_1, + enableStoreDetails: Boolean? = null, + installmentConfiguration: SessionInstallmentConfiguration? = null, + showRemovePaymentMethodButton: Boolean? = null, + amount: Amount? = null, + returnUrl: String? = "", + shopperLocale: Locale? = null, + ) = SessionParams( + environment = environment, + clientKey = clientKey, + enableStoreDetails = enableStoreDetails, + installmentConfiguration = installmentConfiguration, + showRemovePaymentMethodButton = showRemovePaymentMethodButton, + amount = amount, + returnUrl = returnUrl, + shopperLocale = shopperLocale, + ) + + private fun createCheckoutConfiguration( + amount: Amount? = null, + shopperLocale: Locale? = null, + configuration: MealVoucherConfiguration.Builder.() -> Unit = {} + ) = CheckoutConfiguration( + shopperLocale = shopperLocale, + environment = Environment.TEST, + clientKey = TEST_CLIENT_KEY_1, + amount = amount, + ) { + mealVoucher(configuration) + } + + companion object { + private const val TEST_CLIENT_KEY_1 = "test_qwertyuiopasdfghjklzxcvbnmqwerty" + private const val TEST_CLIENT_KEY_2 = "live_qwertyui34566776787zxcvbnmqwerty" + private val DEVICE_LOCALE = Locale("nl", "NL") + + @JvmStatic + fun amountSource() = listOf( + // configurationValue, dropInValue, sessionsValue, expectedValue + arguments(Amount("EUR", 100), Amount("USD", 200), Amount("CAD", 300), Amount("CAD", 300)), + arguments(Amount("EUR", 100), Amount("USD", 200), null, Amount("USD", 200)), + arguments(Amount("EUR", 100), null, null, Amount("EUR", 100)), + ) + + @JvmStatic + fun shopperLocaleSource() = listOf( + // configurationValue, sessionsValue, deviceLocaleValue, expectedValue + arguments(null, null, Locale.US, Locale.US), + arguments(Locale.GERMAN, null, Locale.US, Locale.GERMAN), + arguments(null, Locale.CHINESE, Locale.US, Locale.CHINESE), + arguments(Locale.GERMAN, Locale.CHINESE, Locale.US, Locale.GERMAN), + ) + } +} From 83f2cef927fd11d7232c485a412268173a1a9411 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Wed, 28 Aug 2024 11:37:12 +0200 Subject: [PATCH 255/299] Fix remaining meal voucher todos COAND-693 --- .../adyen/checkout/giftcard/GiftCardAction.kt | 23 ++++++++++++++++++- .../mealvoucher/MealVoucherComponent.kt | 1 - .../internal/ui/MealVoucherViewProvider.kt | 4 ---- .../internal/ui/view/MealVoucherView.kt | 8 +++++-- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardAction.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardAction.kt index 5d9f9cce3d..7817fde1c9 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardAction.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/GiftCardAction.kt @@ -4,12 +4,33 @@ import android.annotation.SuppressLint import android.os.Parcelable import kotlinx.parcelize.Parcelize -// TODO Add more information here what the actions means +/** + * This class is used in [com.adyen.checkout.giftcard.internal.GiftCardComponentEventHandler] and + * [com.adyen.checkout.giftcard.internal.SessionsGiftCardComponentEventHandler] to decide what action needs to be taken + * in partial payments flow. This class is used to distinguish separate actions that can be taken when submit button + * is clicked. + */ @SuppressLint("ObjectInPublicSealedClass") @Parcelize sealed class GiftCardAction : Parcelable { + + /** + * No action to be taken. + */ object Idle : GiftCardAction() + + /** + * Check balance of the partial payment method. + */ object CheckBalance : GiftCardAction() + + /** + * Submit the payment. + */ object SendPayment : GiftCardAction() + + /** + * Create an order. + */ object CreateOrder : GiftCardAction() } diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt index 60b5d71ab8..26ca711747 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt +++ b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt @@ -26,7 +26,6 @@ class MealVoucherComponent internal constructor( @JvmField val PROVIDER = MealVoucherComponentProvider() - // TODO update it to correct txVariants @JvmField val PAYMENT_METHOD_TYPES = listOf( PaymentMethodTypes.MEAL_VOUCHER_FR_GROUPEUP, diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt index 87df6568f8..be054172f5 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt +++ b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt @@ -11,7 +11,6 @@ package com.adyen.checkout.mealvoucher.internal.ui import android.content.Context import com.adyen.checkout.giftcard.internal.ui.GiftCardComponentViewType import com.adyen.checkout.mealvoucher.internal.ui.view.MealVoucherView -import com.adyen.checkout.ui.core.internal.ui.ButtonComponentViewType import com.adyen.checkout.ui.core.internal.ui.ComponentView import com.adyen.checkout.ui.core.internal.ui.ComponentViewType import com.adyen.checkout.ui.core.internal.ui.ViewProvider @@ -27,7 +26,4 @@ internal object MealVoucherViewProvider : ViewProvider { internal object MealVoucherComponentViewType : GiftCardComponentViewType() { override val viewProvider: ViewProvider = MealVoucherViewProvider - - // TODO Add the Redeem text also in meal voucher module - override val buttonTextResId: Int = ButtonComponentViewType.DEFAULT_BUTTON_TEXT_RES_ID } diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt index ea2409dab8..193086025d 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt +++ b/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt @@ -9,12 +9,14 @@ package com.adyen.checkout.mealvoucher.internal.ui.view import android.content.Context +import android.os.Build import android.text.Editable import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import android.view.View.OnFocusChangeListener import android.widget.LinearLayout +import androidx.autofill.HintConstants import com.adyen.checkout.components.core.internal.ui.ComponentDelegate import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.core.AdyenLogLevel @@ -53,7 +55,9 @@ internal class MealVoucherView @JvmOverloads constructor( val padding = resources.getDimension(UICoreR.dimen.standard_margin).toInt() setPadding(padding, padding, padding, 0) - // TODO Support autofill if necessary + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + binding.editTextMealVoucherSecurityCode.setAutofillHints(HintConstants.AUTOFILL_HINT_GIFT_CARD_PIN) + } } override fun initView(delegate: ComponentDelegate, coroutineScope: CoroutineScope, localizedContext: Context) { @@ -83,7 +87,7 @@ internal class MealVoucherView @JvmOverloads constructor( binding.textInputLayoutMealVoucherCardNumber.hideError() } else if (cardNumberValidation is Validation.Invalid) { binding.textInputLayoutMealVoucherCardNumber.showError( - localizedContext.getString(cardNumberValidation.reason) + localizedContext.getString(cardNumberValidation.reason), ) } } From 0b9767f002b7641fdf6ff010b96d56415da92fb4 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Fri, 6 Sep 2024 14:38:47 +0200 Subject: [PATCH 256/299] Rename meal-voucher module to meal-voucher-fr COAND-693 --- drop-in/build.gradle | 2 +- .../internal/provider/ComponentProvider.kt | 12 +-- .../internal/provider/FragmentProvider.kt | 4 +- .../CheckoutConfigurationProvider.kt | 4 +- {meal-voucher => meal-voucher-fr}/.gitignore | 0 .../api/meal-voucher-fr.api | 78 +++++++++--------- .../build.gradle | 8 +- .../consumer-rules.pro | 0 .../proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../mealvoucherfr/MealVoucherFRComponent.kt | 12 +-- .../MealVoucherFRComponentCallback.kt | 4 +- .../MealVoucherFRComponentState.kt | 4 +- .../MealVoucherFRConfiguration.kt | 32 ++++---- .../SessionsMealVoucherFRComponentCallback.kt | 4 +- .../MealVoucherFRComponentProvider.kt | 82 +++++++++---------- .../internal/ui/MealVoucherFRViewProvider.kt | 14 ++-- .../MealVoucherFRComponentParamsMapper.kt | 14 ++-- .../ui/protocol/MealVoucherFRProtocol.kt | 10 +-- .../internal/ui/view/MealVoucherFRView.kt | 74 ++++++++--------- .../util/MealVoucherFRValidationUtils.kt | 18 ++-- .../internal/util/MealVoucherFRValidator.kt | 12 +-- .../main/res/layout/meal_voucher_fr_view.xml | 26 +++--- .../main/res/template/values/strings.xml.tt | 20 +++++ .../src/main/res/values-ar/strings.xml | 20 +++++ .../src/main/res/values-bg-rBG/strings.xml | 20 +++++ .../src/main/res/values-ca-rES/strings.xml | 20 +++++ .../src/main/res/values-cs-rCZ/strings.xml | 20 +++++ .../src/main/res/values-da-rDK/strings.xml | 20 +++++ .../src/main/res/values-de-rDE/strings.xml | 20 +++++ .../src/main/res/values-el-rGR/strings.xml | 20 +++++ .../src/main/res/values-es-rES/strings.xml | 20 +++++ .../src/main/res/values-et-rEE/strings.xml | 20 +++++ .../src/main/res/values-fi-rFI/strings.xml | 20 +++++ .../src/main/res/values-fr-rFR/strings.xml | 20 +++++ .../src/main/res/values-hr-rHR/strings.xml | 20 +++++ .../src/main/res/values-hu-rHU/strings.xml | 20 +++++ .../src/main/res/values-is-rIS/strings.xml | 20 +++++ .../src/main/res/values-it-rIT/strings.xml | 20 +++++ .../src/main/res/values-ja-rJP/strings.xml | 20 +++++ .../src/main/res/values-ko-rKR/strings.xml | 20 +++++ .../src/main/res/values-lt-rLT/strings.xml | 20 +++++ .../src/main/res/values-lv-rLV/strings.xml | 20 +++++ .../src/main/res/values-nb-rNO/strings.xml | 20 +++++ .../src/main/res/values-nl-rNL/strings.xml | 20 +++++ .../src/main/res/values-pl-rPL/strings.xml | 20 +++++ .../src/main/res/values-pt-rBR/strings.xml | 20 +++++ .../src/main/res/values-pt-rPT/strings.xml | 20 +++++ .../src/main/res/values-ro-rRO/strings.xml | 20 +++++ .../src/main/res/values-ru-rRU/strings.xml | 20 +++++ .../src/main/res/values-sk-rSK/strings.xml | 20 +++++ .../src/main/res/values-sl-rSI/strings.xml | 20 +++++ .../src/main/res/values-sv-rSE/strings.xml | 20 +++++ .../src/main/res/values-zh-rCN/strings.xml | 20 +++++ .../src/main/res/values-zh-rTW/strings.xml | 20 +++++ .../src/main/res/values/strings.xml | 20 +++++ .../src/main/res/values/styles.xml | 14 ++-- .../MealVoucherFRComponentTest.kt | 22 ++--- .../MealVoucherFRConfigurationTest.kt | 28 +++---- .../MealVoucherFRComponentParamsMapperTest.kt | 30 +++---- .../main/res/template/values/strings.xml.tt | 20 ----- .../src/main/res/values-ar/strings.xml | 20 ----- .../src/main/res/values-bg-rBG/strings.xml | 20 ----- .../src/main/res/values-ca-rES/strings.xml | 20 ----- .../src/main/res/values-cs-rCZ/strings.xml | 20 ----- .../src/main/res/values-da-rDK/strings.xml | 20 ----- .../src/main/res/values-de-rDE/strings.xml | 20 ----- .../src/main/res/values-el-rGR/strings.xml | 20 ----- .../src/main/res/values-es-rES/strings.xml | 20 ----- .../src/main/res/values-et-rEE/strings.xml | 20 ----- .../src/main/res/values-fi-rFI/strings.xml | 20 ----- .../src/main/res/values-fr-rFR/strings.xml | 20 ----- .../src/main/res/values-hr-rHR/strings.xml | 20 ----- .../src/main/res/values-hu-rHU/strings.xml | 20 ----- .../src/main/res/values-is-rIS/strings.xml | 20 ----- .../src/main/res/values-it-rIT/strings.xml | 20 ----- .../src/main/res/values-ja-rJP/strings.xml | 20 ----- .../src/main/res/values-ko-rKR/strings.xml | 20 ----- .../src/main/res/values-lt-rLT/strings.xml | 20 ----- .../src/main/res/values-lv-rLV/strings.xml | 20 ----- .../src/main/res/values-nb-rNO/strings.xml | 20 ----- .../src/main/res/values-nl-rNL/strings.xml | 20 ----- .../src/main/res/values-pl-rPL/strings.xml | 20 ----- .../src/main/res/values-pt-rBR/strings.xml | 20 ----- .../src/main/res/values-pt-rPT/strings.xml | 20 ----- .../src/main/res/values-ro-rRO/strings.xml | 20 ----- .../src/main/res/values-ru-rRU/strings.xml | 20 ----- .../src/main/res/values-sk-rSK/strings.xml | 20 ----- .../src/main/res/values-sl-rSI/strings.xml | 20 ----- .../src/main/res/values-sv-rSE/strings.xml | 20 ----- .../src/main/res/values-zh-rCN/strings.xml | 20 ----- .../src/main/res/values-zh-rTW/strings.xml | 20 ----- meal-voucher/src/main/res/values/strings.xml | 20 ----- settings.gradle | 2 +- 94 files changed, 915 insertions(+), 915 deletions(-) rename {meal-voucher => meal-voucher-fr}/.gitignore (100%) rename meal-voucher/api/meal-voucher.api => meal-voucher-fr/api/meal-voucher-fr.api (70%) rename {meal-voucher => meal-voucher-fr}/build.gradle (80%) rename {meal-voucher => meal-voucher-fr}/consumer-rules.pro (100%) rename {meal-voucher => meal-voucher-fr}/proguard-rules.pro (100%) rename {meal-voucher => meal-voucher-fr}/src/main/AndroidManifest.xml (100%) rename meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt => meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponent.kt (79%) rename meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentCallback.kt => meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponentCallback.kt (69%) rename meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentState.kt => meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponentState.kt (69%) rename meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt => meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration.kt (85%) rename meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/SessionsMealVoucherComponentCallback.kt => meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/SessionsMealVoucherFRComponentCallback.kt (66%) rename meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt => meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/provider/MealVoucherFRComponentProvider.kt (83%) rename meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt => meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/MealVoucherFRViewProvider.kt (59%) rename meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt => meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/model/MealVoucherFRComponentParamsMapper.kt (75%) rename meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/protocol/MealVoucherProtocol.kt => meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/protocol/MealVoucherFRProtocol.kt (81%) rename meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt => meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/view/MealVoucherFRView.kt (64%) rename meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt => meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt (89%) rename meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt => meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidator.kt (62%) rename meal-voucher/src/main/res/layout/meal_voucher_view.xml => meal-voucher-fr/src/main/res/layout/meal_voucher_fr_view.xml (70%) create mode 100644 meal-voucher-fr/src/main/res/template/values/strings.xml.tt create mode 100644 meal-voucher-fr/src/main/res/values-ar/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-bg-rBG/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-ca-rES/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-cs-rCZ/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-da-rDK/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-de-rDE/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-el-rGR/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-es-rES/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-et-rEE/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-fi-rFI/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-fr-rFR/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-hr-rHR/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-hu-rHU/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-is-rIS/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-it-rIT/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-ja-rJP/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-ko-rKR/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-lt-rLT/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-lv-rLV/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-nb-rNO/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-nl-rNL/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-pl-rPL/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-pt-rBR/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-pt-rPT/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-ro-rRO/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-ru-rRU/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-sk-rSK/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-sl-rSI/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-sv-rSE/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-zh-rCN/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values-zh-rTW/strings.xml create mode 100644 meal-voucher-fr/src/main/res/values/strings.xml rename {meal-voucher => meal-voucher-fr}/src/main/res/values/styles.xml (64%) rename meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherComponentTest.kt => meal-voucher-fr/src/test/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponentTest.kt (93%) rename meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherConfigurationTest.kt => meal-voucher-fr/src/test/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRConfigurationTest.kt (81%) rename meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapperTest.kt => meal-voucher-fr/src/test/java/com/adyen/checkout/mealvoucherfr/internal/ui/model/MealVoucherFRComponentParamsMapperTest.kt (89%) delete mode 100644 meal-voucher/src/main/res/template/values/strings.xml.tt delete mode 100644 meal-voucher/src/main/res/values-ar/strings.xml delete mode 100644 meal-voucher/src/main/res/values-bg-rBG/strings.xml delete mode 100644 meal-voucher/src/main/res/values-ca-rES/strings.xml delete mode 100644 meal-voucher/src/main/res/values-cs-rCZ/strings.xml delete mode 100644 meal-voucher/src/main/res/values-da-rDK/strings.xml delete mode 100644 meal-voucher/src/main/res/values-de-rDE/strings.xml delete mode 100644 meal-voucher/src/main/res/values-el-rGR/strings.xml delete mode 100644 meal-voucher/src/main/res/values-es-rES/strings.xml delete mode 100644 meal-voucher/src/main/res/values-et-rEE/strings.xml delete mode 100644 meal-voucher/src/main/res/values-fi-rFI/strings.xml delete mode 100644 meal-voucher/src/main/res/values-fr-rFR/strings.xml delete mode 100644 meal-voucher/src/main/res/values-hr-rHR/strings.xml delete mode 100644 meal-voucher/src/main/res/values-hu-rHU/strings.xml delete mode 100644 meal-voucher/src/main/res/values-is-rIS/strings.xml delete mode 100644 meal-voucher/src/main/res/values-it-rIT/strings.xml delete mode 100644 meal-voucher/src/main/res/values-ja-rJP/strings.xml delete mode 100644 meal-voucher/src/main/res/values-ko-rKR/strings.xml delete mode 100644 meal-voucher/src/main/res/values-lt-rLT/strings.xml delete mode 100644 meal-voucher/src/main/res/values-lv-rLV/strings.xml delete mode 100644 meal-voucher/src/main/res/values-nb-rNO/strings.xml delete mode 100644 meal-voucher/src/main/res/values-nl-rNL/strings.xml delete mode 100644 meal-voucher/src/main/res/values-pl-rPL/strings.xml delete mode 100644 meal-voucher/src/main/res/values-pt-rBR/strings.xml delete mode 100644 meal-voucher/src/main/res/values-pt-rPT/strings.xml delete mode 100644 meal-voucher/src/main/res/values-ro-rRO/strings.xml delete mode 100644 meal-voucher/src/main/res/values-ru-rRU/strings.xml delete mode 100644 meal-voucher/src/main/res/values-sk-rSK/strings.xml delete mode 100644 meal-voucher/src/main/res/values-sl-rSI/strings.xml delete mode 100644 meal-voucher/src/main/res/values-sv-rSE/strings.xml delete mode 100644 meal-voucher/src/main/res/values-zh-rCN/strings.xml delete mode 100644 meal-voucher/src/main/res/values-zh-rTW/strings.xml delete mode 100644 meal-voucher/src/main/res/values/strings.xml diff --git a/drop-in/build.gradle b/drop-in/build.gradle index ac9c0908cf..293e17728a 100644 --- a/drop-in/build.gradle +++ b/drop-in/build.gradle @@ -63,7 +63,7 @@ dependencies { api project(':ideal') api project(":instant") api project(':mbway') - api project(':meal-voucher') + api project(':meal-voucher-fr') api project(':molpay') api project(':online-banking-cz') api project(':online-banking-jp') diff --git a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/ComponentProvider.kt b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/ComponentProvider.kt index 6474b5ecea..fdff02accb 100644 --- a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/ComponentProvider.kt +++ b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/ComponentProvider.kt @@ -67,9 +67,9 @@ import com.adyen.checkout.instant.internal.provider.InstantPaymentComponentProvi import com.adyen.checkout.mbway.MBWayComponent import com.adyen.checkout.mbway.MBWayComponentState import com.adyen.checkout.mbway.internal.provider.MBWayComponentProvider -import com.adyen.checkout.mealvoucher.MealVoucherComponent -import com.adyen.checkout.mealvoucher.MealVoucherComponentCallback -import com.adyen.checkout.mealvoucher.internal.provider.MealVoucherComponentProvider +import com.adyen.checkout.mealvoucherfr.MealVoucherFRComponent +import com.adyen.checkout.mealvoucherfr.MealVoucherFRComponentCallback +import com.adyen.checkout.mealvoucherfr.internal.provider.MealVoucherFRComponentProvider import com.adyen.checkout.molpay.MolpayComponent import com.adyen.checkout.molpay.MolpayComponentState import com.adyen.checkout.molpay.internal.provider.MolpayComponentProvider @@ -336,12 +336,12 @@ internal fun getComponentFor( ) } - checkCompileOnly { MealVoucherComponent.PROVIDER.isPaymentMethodSupported(paymentMethod) } -> { - MealVoucherComponentProvider(dropInOverrideParams, analyticsManager).get( + checkCompileOnly { MealVoucherFRComponent.PROVIDER.isPaymentMethodSupported(paymentMethod) } -> { + MealVoucherFRComponentProvider(dropInOverrideParams, analyticsManager).get( fragment = fragment, paymentMethod = paymentMethod, checkoutConfiguration = checkoutConfiguration, - callback = componentCallback as MealVoucherComponentCallback, + callback = componentCallback as MealVoucherFRComponentCallback, ) } diff --git a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/FragmentProvider.kt b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/FragmentProvider.kt index ae85e9459a..9b4c8c9ec5 100644 --- a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/FragmentProvider.kt +++ b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/provider/FragmentProvider.kt @@ -21,7 +21,7 @@ import com.adyen.checkout.dropin.internal.ui.GooglePayComponentDialogFragment import com.adyen.checkout.dropin.internal.util.checkCompileOnly import com.adyen.checkout.giftcard.GiftCardComponent import com.adyen.checkout.googlepay.GooglePayComponent -import com.adyen.checkout.mealvoucher.MealVoucherComponent +import com.adyen.checkout.mealvoucherfr.MealVoucherFRComponent internal fun getFragmentForStoredPaymentMethod( storedPaymentMethod: StoredPaymentMethod, @@ -50,7 +50,7 @@ internal fun getFragmentForPaymentMethod(paymentMethod: PaymentMethod): DropInBo checkCompileOnly { GiftCardComponent.PROVIDER.isPaymentMethodSupported(paymentMethod) || - MealVoucherComponent.PROVIDER.isPaymentMethodSupported(paymentMethod) + MealVoucherFRComponent.PROVIDER.isPaymentMethodSupported(paymentMethod) } -> { GiftCardComponentDialogFragment.newInstance(paymentMethod) } diff --git a/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt b/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt index 64d7731a91..4d35bcc87b 100644 --- a/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt +++ b/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt @@ -26,7 +26,7 @@ import com.adyen.checkout.example.data.storage.KeyValueStorage import com.adyen.checkout.giftcard.giftCard import com.adyen.checkout.googlepay.googlePay import com.adyen.checkout.instant.instantPayment -import com.adyen.checkout.mealvoucher.mealVoucher +import com.adyen.checkout.mealvoucherfr.mealVoucherFR import dagger.hilt.android.qualifiers.ApplicationContext import java.util.Locale import javax.inject.Inject @@ -84,7 +84,7 @@ internal class CheckoutConfigurationProvider @Inject constructor( setPinRequired(true) } - mealVoucher { + mealVoucherFR { setSecurityCodeRequired(true) } diff --git a/meal-voucher/.gitignore b/meal-voucher-fr/.gitignore similarity index 100% rename from meal-voucher/.gitignore rename to meal-voucher-fr/.gitignore diff --git a/meal-voucher/api/meal-voucher.api b/meal-voucher-fr/api/meal-voucher-fr.api similarity index 70% rename from meal-voucher/api/meal-voucher.api rename to meal-voucher-fr/api/meal-voucher-fr.api index f8ed974f8f..0807f26b4b 100644 --- a/meal-voucher/api/meal-voucher.api +++ b/meal-voucher-fr/api/meal-voucher-fr.api @@ -1,4 +1,4 @@ -public final class com/adyen/checkout/mealvoucher/BuildConfig { +public final class com/adyen/checkout/mealvoucherfr/BuildConfig { public static final field BUILD_TYPE Ljava/lang/String; public static final field CHECKOUT_VERSION Ljava/lang/String; public static final field DEBUG Z @@ -6,16 +6,16 @@ public final class com/adyen/checkout/mealvoucher/BuildConfig { public fun ()V } -public final class com/adyen/checkout/mealvoucher/MealVoucherComponent : com/adyen/checkout/giftcard/GiftCardComponent { - public static final field Companion Lcom/adyen/checkout/mealvoucher/MealVoucherComponent$Companion; +public final class com/adyen/checkout/mealvoucherfr/MealVoucherFRComponent : com/adyen/checkout/giftcard/GiftCardComponent { + public static final field Companion Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRComponent$Companion; public static final field PAYMENT_METHOD_TYPES Ljava/util/List; - public static final field PROVIDER Lcom/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider; + public static final field PROVIDER Lcom/adyen/checkout/mealvoucherfr/internal/provider/MealVoucherFRComponentProvider; } -public final class com/adyen/checkout/mealvoucher/MealVoucherComponent$Companion { +public final class com/adyen/checkout/mealvoucherfr/MealVoucherFRComponent$Companion { } -public final class com/adyen/checkout/mealvoucher/MealVoucherConfiguration : com/adyen/checkout/components/core/internal/ButtonConfiguration, com/adyen/checkout/components/core/internal/Configuration { +public final class com/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration : com/adyen/checkout/components/core/internal/ButtonConfiguration, com/adyen/checkout/components/core/internal/Configuration { public static final field CREATOR Landroid/os/Parcelable$Creator; public synthetic fun (Ljava/util/Locale;Lcom/adyen/checkout/core/Environment;Ljava/lang/String;Lcom/adyen/checkout/components/core/AnalyticsConfiguration;Lcom/adyen/checkout/components/core/Amount;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/adyen/checkout/action/core/GenericActionConfiguration;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public fun describeContents ()I @@ -29,70 +29,70 @@ public final class com/adyen/checkout/mealvoucher/MealVoucherConfiguration : com public fun writeToParcel (Landroid/os/Parcel;I)V } -public final class com/adyen/checkout/mealvoucher/MealVoucherConfiguration$Builder : com/adyen/checkout/action/core/internal/ActionHandlingPaymentMethodConfigurationBuilder, com/adyen/checkout/components/core/internal/ButtonConfigurationBuilder { +public final class com/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration$Builder : com/adyen/checkout/action/core/internal/ActionHandlingPaymentMethodConfigurationBuilder, com/adyen/checkout/components/core/internal/ButtonConfigurationBuilder { public fun (Landroid/content/Context;Lcom/adyen/checkout/core/Environment;Ljava/lang/String;)V public fun (Lcom/adyen/checkout/core/Environment;Ljava/lang/String;)V public fun (Ljava/util/Locale;Lcom/adyen/checkout/core/Environment;Ljava/lang/String;)V public synthetic fun buildInternal ()Lcom/adyen/checkout/components/core/internal/Configuration; - public final fun setSecurityCodeRequired (Z)Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration$Builder; + public final fun setSecurityCodeRequired (Z)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration$Builder; public synthetic fun setSubmitButtonVisible (Z)Lcom/adyen/checkout/components/core/internal/ButtonConfigurationBuilder; - public fun setSubmitButtonVisible (Z)Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration$Builder; + public fun setSubmitButtonVisible (Z)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration$Builder; } -public final class com/adyen/checkout/mealvoucher/MealVoucherConfiguration$Creator : android/os/Parcelable$Creator { +public final class com/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration$Creator : android/os/Parcelable$Creator { public fun ()V - public final fun createFromParcel (Landroid/os/Parcel;)Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration; + public final fun createFromParcel (Landroid/os/Parcel;)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration; public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object; - public final fun newArray (I)[Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration; + public final fun newArray (I)[Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration; public synthetic fun newArray (I)[Ljava/lang/Object; } -public final class com/adyen/checkout/mealvoucher/MealVoucherConfigurationKt { - public static final fun mealVoucher (Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lkotlin/jvm/functions/Function1;)Lcom/adyen/checkout/components/core/CheckoutConfiguration; - public static synthetic fun mealVoucher$default (Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/adyen/checkout/components/core/CheckoutConfiguration; +public final class com/adyen/checkout/mealvoucherfr/MealVoucherFRConfigurationKt { + public static final fun mealVoucherFR (Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lkotlin/jvm/functions/Function1;)Lcom/adyen/checkout/components/core/CheckoutConfiguration; + public static synthetic fun mealVoucherFR$default (Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/adyen/checkout/components/core/CheckoutConfiguration; } -public final class com/adyen/checkout/mealvoucher/databinding/MealVoucherViewBinding : androidx/viewbinding/ViewBinding { - public final field editTextMealVoucherCardNumber Lcom/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput; - public final field editTextMealVoucherExpiryDate Lcom/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput; - public final field editTextMealVoucherSecurityCode Lcom/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText; - public final field textInputLayoutMealVoucherCardNumber Lcom/google/android/material/textfield/TextInputLayout; - public final field textInputLayoutMealVoucherExpiryDate Lcom/google/android/material/textfield/TextInputLayout; - public final field textInputLayoutMealVoucherSecurityCode Lcom/google/android/material/textfield/TextInputLayout; - public static fun bind (Landroid/view/View;)Lcom/adyen/checkout/mealvoucher/databinding/MealVoucherViewBinding; +public final class com/adyen/checkout/mealvoucherfr/databinding/MealVoucherFrViewBinding : androidx/viewbinding/ViewBinding { + public final field editTextMealVoucherFRCardNumber Lcom/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput; + public final field editTextMealVoucherFRExpiryDate Lcom/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput; + public final field editTextMealVoucherFRSecurityCode Lcom/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText; + public final field textInputLayoutMealVoucherFRCardNumber Lcom/google/android/material/textfield/TextInputLayout; + public final field textInputLayoutMealVoucherFRExpiryDate Lcom/google/android/material/textfield/TextInputLayout; + public final field textInputLayoutMealVoucherFRSecurityCode Lcom/google/android/material/textfield/TextInputLayout; + public static fun bind (Landroid/view/View;)Lcom/adyen/checkout/mealvoucherfr/databinding/MealVoucherFrViewBinding; public fun getRoot ()Landroid/view/View; - public static fun inflate (Landroid/view/LayoutInflater;Landroid/view/ViewGroup;)Lcom/adyen/checkout/mealvoucher/databinding/MealVoucherViewBinding; + public static fun inflate (Landroid/view/LayoutInflater;Landroid/view/ViewGroup;)Lcom/adyen/checkout/mealvoucherfr/databinding/MealVoucherFrViewBinding; } -public final class com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider : com/adyen/checkout/components/core/internal/provider/PaymentComponentProvider, com/adyen/checkout/sessions/core/internal/provider/SessionPaymentComponentProvider { +public final class com/adyen/checkout/mealvoucherfr/internal/provider/MealVoucherFRComponentProvider : com/adyen/checkout/components/core/internal/provider/PaymentComponentProvider, com/adyen/checkout/sessions/core/internal/provider/SessionPaymentComponentProvider { public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; - public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRComponent; public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; - public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; - public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRComponent; + public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRComponent; public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; - public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; - public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRComponent; + public fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRComponent; public synthetic fun get (Landroidx/activity/ComponentActivity;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; public synthetic fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; - public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRComponent; public synthetic fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; - public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; - public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRComponent; + public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRComponent; public synthetic fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; public synthetic fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; - public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; - public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRComponent; + public fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRComponent; public synthetic fun get (Landroidx/fragment/app/Fragment;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; public synthetic fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Landroid/app/Application;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; - public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRComponent; public synthetic fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Landroid/app/Application;Lcom/adyen/checkout/components/core/ComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; - public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; - public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/GiftCardComponentCallback;Lcom/adyen/checkout/components/core/OrderRequest;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRComponent; + public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRComponent; public synthetic fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/CheckoutConfiguration;Landroid/app/Application;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; public synthetic fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/components/core/internal/Configuration;Landroid/app/Application;Lcom/adyen/checkout/sessions/core/SessionComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/components/core/internal/PaymentComponent; - public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucher/MealVoucherConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucher/MealVoucherComponent; + public fun get (Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/LifecycleOwner;Lcom/adyen/checkout/sessions/core/CheckoutSession;Lcom/adyen/checkout/components/core/PaymentMethod;Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration;Landroid/app/Application;Lcom/adyen/checkout/giftcard/SessionsGiftCardComponentCallback;Ljava/lang/String;)Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRComponent; public fun isPaymentMethodSupported (Lcom/adyen/checkout/components/core/PaymentMethod;)Z } diff --git a/meal-voucher/build.gradle b/meal-voucher-fr/build.gradle similarity index 80% rename from meal-voucher/build.gradle rename to meal-voucher-fr/build.gradle index db687d0cb2..dcdce4b80c 100644 --- a/meal-voucher/build.gradle +++ b/meal-voucher-fr/build.gradle @@ -12,14 +12,14 @@ plugins { id 'kotlin-parcelize' } -ext.mavenArtifactId = "mealvoucher" -ext.mavenArtifactName = "Adyen checkout Meal Voucher component" -ext.mavenArtifactDescription = "Adyen checkout Meal Voucher component client for Adyen's Checkout API." +ext.mavenArtifactId = "meal-voucher-fr" +ext.mavenArtifactName = "Adyen checkout Meal Voucher France component" +ext.mavenArtifactDescription = "Adyen checkout Meal Voucher France component client for Adyen's Checkout API." apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { - namespace 'com.adyen.checkout.mealvoucher' + namespace 'com.adyen.checkout.mealvoucherfr' compileSdk compile_sdk_version defaultConfig { diff --git a/meal-voucher/consumer-rules.pro b/meal-voucher-fr/consumer-rules.pro similarity index 100% rename from meal-voucher/consumer-rules.pro rename to meal-voucher-fr/consumer-rules.pro diff --git a/meal-voucher/proguard-rules.pro b/meal-voucher-fr/proguard-rules.pro similarity index 100% rename from meal-voucher/proguard-rules.pro rename to meal-voucher-fr/proguard-rules.pro diff --git a/meal-voucher/src/main/AndroidManifest.xml b/meal-voucher-fr/src/main/AndroidManifest.xml similarity index 100% rename from meal-voucher/src/main/AndroidManifest.xml rename to meal-voucher-fr/src/main/AndroidManifest.xml diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponent.kt similarity index 79% rename from meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt rename to meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponent.kt index 26ca711747..80e5516644 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponent.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponent.kt @@ -3,10 +3,10 @@ * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by ozgur on 16/7/2024. + * Created by ozgur on 6/9/2024. */ -package com.adyen.checkout.mealvoucher +package com.adyen.checkout.mealvoucherfr import com.adyen.checkout.action.core.internal.DefaultActionHandlingComponent import com.adyen.checkout.action.core.internal.ui.GenericActionDelegate @@ -14,17 +14,17 @@ import com.adyen.checkout.components.core.PaymentMethodTypes import com.adyen.checkout.components.core.internal.ComponentEventHandler import com.adyen.checkout.giftcard.GiftCardComponent import com.adyen.checkout.giftcard.internal.ui.GiftCardDelegate -import com.adyen.checkout.mealvoucher.internal.provider.MealVoucherComponentProvider +import com.adyen.checkout.mealvoucherfr.internal.provider.MealVoucherFRComponentProvider -class MealVoucherComponent internal constructor( +class MealVoucherFRComponent internal constructor( giftCardDelegate: GiftCardDelegate, genericActionDelegate: GenericActionDelegate, actionHandlingComponent: DefaultActionHandlingComponent, - internal val componentEventHandler: ComponentEventHandler, + internal val componentEventHandler: ComponentEventHandler, ) : GiftCardComponent(giftCardDelegate, genericActionDelegate, actionHandlingComponent, componentEventHandler) { companion object { @JvmField - val PROVIDER = MealVoucherComponentProvider() + val PROVIDER = MealVoucherFRComponentProvider() @JvmField val PAYMENT_METHOD_TYPES = listOf( diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentCallback.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponentCallback.kt similarity index 69% rename from meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentCallback.kt rename to meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponentCallback.kt index acd461771d..66320a593b 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentCallback.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponentCallback.kt @@ -6,8 +6,8 @@ * Created by ozgur on 16/7/2024. */ -package com.adyen.checkout.mealvoucher +package com.adyen.checkout.mealvoucherfr import com.adyen.checkout.giftcard.GiftCardComponentCallback -typealias MealVoucherComponentCallback = GiftCardComponentCallback +typealias MealVoucherFRComponentCallback = GiftCardComponentCallback diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentState.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponentState.kt similarity index 69% rename from meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentState.kt rename to meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponentState.kt index 0cea62478a..7099a01c52 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherComponentState.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponentState.kt @@ -6,8 +6,8 @@ * Created by ozgur on 16/7/2024. */ -package com.adyen.checkout.mealvoucher +package com.adyen.checkout.mealvoucherfr import com.adyen.checkout.giftcard.GiftCardComponentState -typealias MealVoucherComponentState = GiftCardComponentState +typealias MealVoucherFRComponentState = GiftCardComponentState diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration.kt similarity index 85% rename from meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt rename to meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration.kt index 56a80ab8c0..8d19757368 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/MealVoucherConfiguration.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration.kt @@ -3,10 +3,10 @@ * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by ozgur on 16/7/2024. + * Created by ozgur on 6/9/2024. */ -package com.adyen.checkout.mealvoucher +package com.adyen.checkout.mealvoucherfr import android.content.Context import com.adyen.checkout.action.core.GenericActionConfiguration @@ -23,11 +23,11 @@ import kotlinx.parcelize.Parcelize import java.util.Locale /** - * Configuration class for the [MealVoucherComponent]. + * Configuration class for the [MealVoucherFRComponent]. */ @Parcelize @Suppress("LongParameterList") -class MealVoucherConfiguration private constructor( +class MealVoucherFRConfiguration private constructor( override val shopperLocale: Locale?, override val environment: Environment, override val clientKey: String, @@ -39,10 +39,10 @@ class MealVoucherConfiguration private constructor( ) : Configuration, ButtonConfiguration { /** - * Builder to create a [MealVoucherConfiguration]. + * Builder to create a [MealVoucherFRConfiguration]. */ class Builder : - ActionHandlingPaymentMethodConfigurationBuilder, + ActionHandlingPaymentMethodConfigurationBuilder, ButtonConfigurationBuilder { private var isSecurityCodeRequired: Boolean? = null @@ -116,8 +116,8 @@ class MealVoucherConfiguration private constructor( return this } - override fun buildInternal(): MealVoucherConfiguration { - return MealVoucherConfiguration( + override fun buildInternal(): MealVoucherFRConfiguration { + return MealVoucherFRConfiguration( shopperLocale = shopperLocale, environment = environment, clientKey = clientKey, @@ -131,10 +131,10 @@ class MealVoucherConfiguration private constructor( } } -fun CheckoutConfiguration.mealVoucher( - configuration: @CheckoutConfigurationMarker MealVoucherConfiguration.Builder.() -> Unit = {} +fun CheckoutConfiguration.mealVoucherFR( + configuration: @CheckoutConfigurationMarker MealVoucherFRConfiguration.Builder.() -> Unit = {} ): CheckoutConfiguration { - val config = MealVoucherConfiguration.Builder(environment, clientKey) + val config = MealVoucherFRConfiguration.Builder(environment, clientKey) .apply { shopperLocale?.let { setShopperLocale(it) } amount?.let { setAmount(it) } @@ -143,20 +143,20 @@ fun CheckoutConfiguration.mealVoucher( .apply(configuration) .build() - MealVoucherComponent.PAYMENT_METHOD_TYPES.forEach { key -> + MealVoucherFRComponent.PAYMENT_METHOD_TYPES.forEach { key -> addConfiguration(key, config) } return this } -internal fun CheckoutConfiguration.getMealVoucherConfiguration(): MealVoucherConfiguration? { - return MealVoucherComponent.PAYMENT_METHOD_TYPES.firstNotNullOfOrNull { key -> +internal fun CheckoutConfiguration.getMealVoucherFRConfiguration(): MealVoucherFRConfiguration? { + return MealVoucherFRComponent.PAYMENT_METHOD_TYPES.firstNotNullOfOrNull { key -> getConfiguration(key) } } -internal fun MealVoucherConfiguration.toCheckoutConfiguration(): CheckoutConfiguration { +internal fun MealVoucherFRConfiguration.toCheckoutConfiguration(): CheckoutConfiguration { return CheckoutConfiguration( shopperLocale = shopperLocale, environment = environment, @@ -164,7 +164,7 @@ internal fun MealVoucherConfiguration.toCheckoutConfiguration(): CheckoutConfigu amount = amount, analyticsConfiguration = analyticsConfiguration, ) { - MealVoucherComponent.PAYMENT_METHOD_TYPES.forEach { key -> + MealVoucherFRComponent.PAYMENT_METHOD_TYPES.forEach { key -> addConfiguration(key, this@toCheckoutConfiguration) } diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/SessionsMealVoucherComponentCallback.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/SessionsMealVoucherFRComponentCallback.kt similarity index 66% rename from meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/SessionsMealVoucherComponentCallback.kt rename to meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/SessionsMealVoucherFRComponentCallback.kt index 7354a004b0..0b5b2ba813 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/SessionsMealVoucherComponentCallback.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/SessionsMealVoucherFRComponentCallback.kt @@ -6,8 +6,8 @@ * Created by ozgur on 16/7/2024. */ -package com.adyen.checkout.mealvoucher +package com.adyen.checkout.mealvoucherfr import com.adyen.checkout.giftcard.SessionsGiftCardComponentCallback -typealias SessionsMealVoucherComponentCallback = SessionsGiftCardComponentCallback +typealias SessionsMealVoucherFRComponentCallback = SessionsGiftCardComponentCallback diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/provider/MealVoucherFRComponentProvider.kt similarity index 83% rename from meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt rename to meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/provider/MealVoucherFRComponentProvider.kt index 3c7e615b82..5b5abf7e91 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/provider/MealVoucherComponentProvider.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/provider/MealVoucherFRComponentProvider.kt @@ -3,10 +3,10 @@ * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by ozgur on 16/7/2024. + * Created by ozgur on 6/9/2024. */ -package com.adyen.checkout.mealvoucher.internal.provider +package com.adyen.checkout.mealvoucherfr.internal.provider import android.app.Application import androidx.annotation.RestrictTo @@ -38,15 +38,15 @@ import com.adyen.checkout.giftcard.internal.GiftCardComponentEventHandler import com.adyen.checkout.giftcard.internal.SessionsGiftCardComponentCallbackWrapper import com.adyen.checkout.giftcard.internal.SessionsGiftCardComponentEventHandler import com.adyen.checkout.giftcard.internal.ui.DefaultGiftCardDelegate -import com.adyen.checkout.mealvoucher.MealVoucherComponent -import com.adyen.checkout.mealvoucher.MealVoucherComponentCallback -import com.adyen.checkout.mealvoucher.MealVoucherComponentState -import com.adyen.checkout.mealvoucher.MealVoucherConfiguration -import com.adyen.checkout.mealvoucher.SessionsMealVoucherComponentCallback -import com.adyen.checkout.mealvoucher.internal.ui.model.MealVoucherComponentParamsMapper -import com.adyen.checkout.mealvoucher.internal.ui.protocol.MealVoucherProtocol -import com.adyen.checkout.mealvoucher.internal.util.MealVoucherValidator -import com.adyen.checkout.mealvoucher.toCheckoutConfiguration +import com.adyen.checkout.mealvoucherfr.MealVoucherFRComponent +import com.adyen.checkout.mealvoucherfr.MealVoucherFRComponentCallback +import com.adyen.checkout.mealvoucherfr.MealVoucherFRComponentState +import com.adyen.checkout.mealvoucherfr.MealVoucherFRConfiguration +import com.adyen.checkout.mealvoucherfr.SessionsMealVoucherFRComponentCallback +import com.adyen.checkout.mealvoucherfr.internal.ui.model.MealVoucherFRComponentParamsMapper +import com.adyen.checkout.mealvoucherfr.internal.ui.protocol.MealVoucherFRProtocol +import com.adyen.checkout.mealvoucherfr.internal.util.MealVoucherFRValidator +import com.adyen.checkout.mealvoucherfr.toCheckoutConfiguration import com.adyen.checkout.sessions.core.CheckoutSession import com.adyen.checkout.sessions.core.internal.SessionInteractor import com.adyen.checkout.sessions.core.internal.SessionSavedStateHandleContainer @@ -56,7 +56,7 @@ import com.adyen.checkout.sessions.core.internal.provider.SessionPaymentComponen import com.adyen.checkout.sessions.core.internal.ui.model.SessionParamsFactory import com.adyen.checkout.ui.core.internal.ui.SubmitHandler -class MealVoucherComponentProvider +class MealVoucherFRComponentProvider @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) constructor( private val dropInOverrideParams: DropInOverrideParams? = null, @@ -64,16 +64,16 @@ constructor( private val localeProvider: LocaleProvider = LocaleProvider(), ) : PaymentComponentProvider< - MealVoucherComponent, - MealVoucherConfiguration, - MealVoucherComponentState, - MealVoucherComponentCallback, + MealVoucherFRComponent, + MealVoucherFRConfiguration, + MealVoucherFRComponentState, + MealVoucherFRComponentCallback, >, SessionPaymentComponentProvider< - MealVoucherComponent, - MealVoucherConfiguration, - MealVoucherComponentState, - SessionsMealVoucherComponentCallback, + MealVoucherFRComponent, + MealVoucherFRConfiguration, + MealVoucherFRComponentState, + SessionsMealVoucherFRComponentCallback, > { override fun get( savedStateRegistryOwner: SavedStateRegistryOwner, @@ -82,15 +82,15 @@ constructor( paymentMethod: PaymentMethod, checkoutConfiguration: CheckoutConfiguration, application: Application, - componentCallback: MealVoucherComponentCallback, + componentCallback: MealVoucherFRComponentCallback, order: Order?, key: String? - ): MealVoucherComponent { + ): MealVoucherFRComponent { assertSupported(paymentMethod) val cardEncryptor = CardEncryptorFactory.provide() val giftCardFactory = viewModelFactory(savedStateRegistryOwner, null) { savedStateHandle -> - val componentParams = MealVoucherComponentParamsMapper(CommonComponentParamsMapper()).mapToParams( + val componentParams = MealVoucherFRComponentParamsMapper(CommonComponentParamsMapper()).mapToParams( checkoutConfiguration = checkoutConfiguration, deviceLocale = localeProvider.getLocale(application), dropInOverrideParams = dropInOverrideParams, @@ -116,8 +116,8 @@ constructor( componentParams = componentParams, cardEncryptor = cardEncryptor, submitHandler = SubmitHandler(savedStateHandle), - validator = MealVoucherValidator(), - protocol = MealVoucherProtocol(), + validator = MealVoucherFRValidator(), + protocol = MealVoucherFRProtocol(), ) val genericActionDelegate = @@ -127,7 +127,7 @@ constructor( application = application, ) - MealVoucherComponent( + MealVoucherFRComponent( giftCardDelegate = giftCardDelegate, genericActionDelegate = genericActionDelegate, actionHandlingComponent = DefaultActionHandlingComponent(genericActionDelegate, giftCardDelegate), @@ -135,7 +135,7 @@ constructor( ) } - return ViewModelProvider(viewModelStoreOwner, giftCardFactory)[key, MealVoucherComponent::class.java] + return ViewModelProvider(viewModelStoreOwner, giftCardFactory)[key, MealVoucherFRComponent::class.java] .also { component -> component.observe(lifecycleOwner) { component.componentEventHandler.onPaymentComponentEvent(it, componentCallback) @@ -148,12 +148,12 @@ constructor( viewModelStoreOwner: ViewModelStoreOwner, lifecycleOwner: LifecycleOwner, paymentMethod: PaymentMethod, - configuration: MealVoucherConfiguration, + configuration: MealVoucherFRConfiguration, application: Application, - componentCallback: MealVoucherComponentCallback, + componentCallback: MealVoucherFRComponentCallback, order: Order?, key: String? - ): MealVoucherComponent { + ): MealVoucherFRComponent { return get( savedStateRegistryOwner = savedStateRegistryOwner, viewModelStoreOwner = viewModelStoreOwner, @@ -176,14 +176,14 @@ constructor( paymentMethod: PaymentMethod, checkoutConfiguration: CheckoutConfiguration, application: Application, - componentCallback: SessionsMealVoucherComponentCallback, + componentCallback: SessionsMealVoucherFRComponentCallback, key: String? - ): MealVoucherComponent { + ): MealVoucherFRComponent { assertSupported(paymentMethod) val cardEncryptor = CardEncryptorFactory.provide() val giftCardFactory = viewModelFactory(savedStateRegistryOwner, null) { savedStateHandle -> - val componentParams = MealVoucherComponentParamsMapper(CommonComponentParamsMapper()).mapToParams( + val componentParams = MealVoucherFRComponentParamsMapper(CommonComponentParamsMapper()).mapToParams( checkoutConfiguration = checkoutConfiguration, deviceLocale = localeProvider.getLocale(application), dropInOverrideParams = dropInOverrideParams, @@ -209,8 +209,8 @@ constructor( componentParams = componentParams, cardEncryptor = cardEncryptor, submitHandler = SubmitHandler(savedStateHandle), - validator = MealVoucherValidator(), - protocol = MealVoucherProtocol(), + validator = MealVoucherFRValidator(), + protocol = MealVoucherFRProtocol(), ) val genericActionDelegate = @@ -239,7 +239,7 @@ constructor( sessionSavedStateHandleContainer = sessionSavedStateHandleContainer, ) - MealVoucherComponent( + MealVoucherFRComponent( giftCardDelegate = giftCardDelegate, genericActionDelegate = genericActionDelegate, actionHandlingComponent = DefaultActionHandlingComponent(genericActionDelegate, giftCardDelegate), @@ -247,7 +247,7 @@ constructor( ) } - return ViewModelProvider(viewModelStoreOwner, giftCardFactory)[key, MealVoucherComponent::class.java] + return ViewModelProvider(viewModelStoreOwner, giftCardFactory)[key, MealVoucherFRComponent::class.java] .also { component -> val internalComponentCallback = SessionsGiftCardComponentCallbackWrapper( component, @@ -265,11 +265,11 @@ constructor( lifecycleOwner: LifecycleOwner, checkoutSession: CheckoutSession, paymentMethod: PaymentMethod, - configuration: MealVoucherConfiguration, + configuration: MealVoucherFRConfiguration, application: Application, - componentCallback: SessionsMealVoucherComponentCallback, + componentCallback: SessionsMealVoucherFRComponentCallback, key: String? - ): MealVoucherComponent { + ): MealVoucherFRComponent { return get( savedStateRegistryOwner = savedStateRegistryOwner, viewModelStoreOwner = viewModelStoreOwner, @@ -291,6 +291,6 @@ constructor( } override fun isPaymentMethodSupported(paymentMethod: PaymentMethod): Boolean { - return MealVoucherComponent.PAYMENT_METHOD_TYPES.contains(paymentMethod.type) + return MealVoucherFRComponent.PAYMENT_METHOD_TYPES.contains(paymentMethod.type) } } diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/MealVoucherFRViewProvider.kt similarity index 59% rename from meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt rename to meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/MealVoucherFRViewProvider.kt index be054172f5..3f5e9c96ce 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/MealVoucherViewProvider.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/MealVoucherFRViewProvider.kt @@ -3,27 +3,27 @@ * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by ozgur on 17/7/2024. + * Created by ozgur on 6/9/2024. */ -package com.adyen.checkout.mealvoucher.internal.ui +package com.adyen.checkout.mealvoucherfr.internal.ui import android.content.Context import com.adyen.checkout.giftcard.internal.ui.GiftCardComponentViewType -import com.adyen.checkout.mealvoucher.internal.ui.view.MealVoucherView +import com.adyen.checkout.mealvoucherfr.internal.ui.view.MealVoucherFRView import com.adyen.checkout.ui.core.internal.ui.ComponentView import com.adyen.checkout.ui.core.internal.ui.ComponentViewType import com.adyen.checkout.ui.core.internal.ui.ViewProvider -internal object MealVoucherViewProvider : ViewProvider { +internal object MealVoucherFRViewProvider : ViewProvider { override fun getView(viewType: ComponentViewType, context: Context): ComponentView { return when (viewType) { - MealVoucherComponentViewType -> MealVoucherView(context) + MealVoucherFRComponentViewType -> MealVoucherFRView(context) else -> throw IllegalArgumentException("Unsupported view type") } } } -internal object MealVoucherComponentViewType : GiftCardComponentViewType() { - override val viewProvider: ViewProvider = MealVoucherViewProvider +internal object MealVoucherFRComponentViewType : GiftCardComponentViewType() { + override val viewProvider: ViewProvider = MealVoucherFRViewProvider } diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/model/MealVoucherFRComponentParamsMapper.kt similarity index 75% rename from meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt rename to meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/model/MealVoucherFRComponentParamsMapper.kt index 48e78ed2fc..6bb9f5f65d 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapper.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/model/MealVoucherFRComponentParamsMapper.kt @@ -3,20 +3,20 @@ * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by ararat on 23/7/2024. + * Created by ozgur on 6/9/2024. */ -package com.adyen.checkout.mealvoucher.internal.ui.model +package com.adyen.checkout.mealvoucherfr.internal.ui.model import com.adyen.checkout.components.core.CheckoutConfiguration import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParamsMapper import com.adyen.checkout.components.core.internal.ui.model.DropInOverrideParams import com.adyen.checkout.components.core.internal.ui.model.SessionParams import com.adyen.checkout.giftcard.internal.ui.model.GiftCardComponentParams -import com.adyen.checkout.mealvoucher.getMealVoucherConfiguration +import com.adyen.checkout.mealvoucherfr.getMealVoucherFRConfiguration import java.util.Locale -internal class MealVoucherComponentParamsMapper( +internal class MealVoucherFRComponentParamsMapper( private val commonComponentParamsMapper: CommonComponentParamsMapper, ) { @@ -33,12 +33,12 @@ internal class MealVoucherComponentParamsMapper( componentSessionParams, ) val commonComponentParams = commonComponentParamsMapperData.commonComponentParams - val mealVoucherConfiguration = checkoutConfiguration.getMealVoucherConfiguration() + val mealVoucherFRConfiguration = checkoutConfiguration.getMealVoucherFRConfiguration() return GiftCardComponentParams( commonComponentParams = commonComponentParams, isSubmitButtonVisible = dropInOverrideParams?.isSubmitButtonVisible - ?: mealVoucherConfiguration?.isSubmitButtonVisible ?: true, - isPinRequired = mealVoucherConfiguration?.isSecurityCodeRequired ?: true, + ?: mealVoucherFRConfiguration?.isSubmitButtonVisible ?: true, + isPinRequired = mealVoucherFRConfiguration?.isSecurityCodeRequired ?: true, isExpiryDateRequired = true, ) } diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/protocol/MealVoucherProtocol.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/protocol/MealVoucherFRProtocol.kt similarity index 81% rename from meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/protocol/MealVoucherProtocol.kt rename to meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/protocol/MealVoucherFRProtocol.kt index 3ab72cd24c..39378223b1 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/protocol/MealVoucherProtocol.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/protocol/MealVoucherFRProtocol.kt @@ -3,22 +3,22 @@ * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by ozgur on 30/7/2024. + * Created by ozgur on 6/9/2024. */ -package com.adyen.checkout.mealvoucher.internal.ui.protocol +package com.adyen.checkout.mealvoucherfr.internal.ui.protocol import com.adyen.checkout.components.core.PaymentMethod import com.adyen.checkout.components.core.PaymentMethodTypes import com.adyen.checkout.components.core.paymentmethod.GiftCardPaymentMethod import com.adyen.checkout.cse.EncryptedCard import com.adyen.checkout.giftcard.internal.ui.protocol.GiftCardProtocol -import com.adyen.checkout.mealvoucher.internal.ui.MealVoucherComponentViewType +import com.adyen.checkout.mealvoucherfr.internal.ui.MealVoucherFRComponentViewType import com.adyen.checkout.ui.core.internal.ui.ComponentViewType -internal class MealVoucherProtocol : GiftCardProtocol { +internal class MealVoucherFRProtocol : GiftCardProtocol { override fun getComponentViewType(): ComponentViewType { - return MealVoucherComponentViewType + return MealVoucherFRComponentViewType } override fun createPaymentMethod( diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/view/MealVoucherFRView.kt similarity index 64% rename from meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt rename to meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/view/MealVoucherFRView.kt index 193086025d..71e7e7a15f 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/ui/view/MealVoucherView.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/view/MealVoucherFRView.kt @@ -3,10 +3,10 @@ * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by ozgur on 17/7/2024. + * Created by ozgur on 6/9/2024. */ -package com.adyen.checkout.mealvoucher.internal.ui.view +package com.adyen.checkout.mealvoucherfr.internal.ui.view import android.content.Context import android.os.Build @@ -22,8 +22,8 @@ import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.core.AdyenLogLevel import com.adyen.checkout.core.internal.util.adyenLog import com.adyen.checkout.giftcard.internal.ui.GiftCardDelegate -import com.adyen.checkout.mealvoucher.R -import com.adyen.checkout.mealvoucher.databinding.MealVoucherViewBinding +import com.adyen.checkout.mealvoucherfr.R +import com.adyen.checkout.mealvoucherfr.databinding.MealVoucherFrViewBinding import com.adyen.checkout.ui.core.internal.ui.ComponentView import com.adyen.checkout.ui.core.internal.util.hideError import com.adyen.checkout.ui.core.internal.util.isVisible @@ -32,7 +32,7 @@ import com.adyen.checkout.ui.core.internal.util.showError import kotlinx.coroutines.CoroutineScope import com.adyen.checkout.ui.core.R as UICoreR -internal class MealVoucherView @JvmOverloads constructor( +internal class MealVoucherFRView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 @@ -44,7 +44,7 @@ internal class MealVoucherView @JvmOverloads constructor( ), ComponentView { - private val binding: MealVoucherViewBinding = MealVoucherViewBinding.inflate(LayoutInflater.from(context), this) + private val binding: MealVoucherFrViewBinding = MealVoucherFrViewBinding.inflate(LayoutInflater.from(context), this) private lateinit var localizedContext: Context @@ -56,7 +56,7 @@ internal class MealVoucherView @JvmOverloads constructor( setPadding(padding, padding, padding, 0) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - binding.editTextMealVoucherSecurityCode.setAutofillHints(HintConstants.AUTOFILL_HINT_GIFT_CARD_PIN) + binding.editTextMealVoucherFRSecurityCode.setAutofillHints(HintConstants.AUTOFILL_HINT_GIFT_CARD_PIN) } } @@ -71,22 +71,22 @@ internal class MealVoucherView @JvmOverloads constructor( } private fun initCardNumberField(localizedContext: Context) { - binding.textInputLayoutMealVoucherCardNumber.setLocalizedHintFromStyle( - R.style.AdyenCheckout_MealVoucher_CardNumberInput, + binding.textInputLayoutMealVoucherFRCardNumber.setLocalizedHintFromStyle( + R.style.AdyenCheckout_MealVoucherFR_CardNumberInput, localizedContext, ) - binding.editTextMealVoucherCardNumber.setOnChangeListener { - giftCardDelegate.updateInputData { cardNumber = binding.editTextMealVoucherCardNumber.rawValue } - binding.textInputLayoutMealVoucherCardNumber.hideError() + binding.editTextMealVoucherFRCardNumber.setOnChangeListener { + giftCardDelegate.updateInputData { cardNumber = binding.editTextMealVoucherFRCardNumber.rawValue } + binding.textInputLayoutMealVoucherFRCardNumber.hideError() } - binding.editTextMealVoucherCardNumber.onFocusChangeListener = OnFocusChangeListener { _, hasFocus -> + binding.editTextMealVoucherFRCardNumber.onFocusChangeListener = OnFocusChangeListener { _, hasFocus -> val cardNumberValidation = giftCardDelegate.outputData.numberFieldState.validation if (hasFocus) { - binding.textInputLayoutMealVoucherCardNumber.hideError() + binding.textInputLayoutMealVoucherFRCardNumber.hideError() } else if (cardNumberValidation is Validation.Invalid) { - binding.textInputLayoutMealVoucherCardNumber.showError( + binding.textInputLayoutMealVoucherFRCardNumber.showError( localizedContext.getString(cardNumberValidation.reason), ) } @@ -94,25 +94,25 @@ internal class MealVoucherView @JvmOverloads constructor( } private fun initExpiryDateField(localizedContext: Context) { - binding.textInputLayoutMealVoucherExpiryDate.setLocalizedHintFromStyle( - R.style.AdyenCheckout_MealVoucher_ExpiryDateInput, + binding.textInputLayoutMealVoucherFRExpiryDate.setLocalizedHintFromStyle( + R.style.AdyenCheckout_MealVoucherFR_ExpiryDateInput, localizedContext, ) - binding.editTextMealVoucherExpiryDate.setOnChangeListener { - val date = binding.editTextMealVoucherExpiryDate.date + binding.editTextMealVoucherFRExpiryDate.setOnChangeListener { + val date = binding.editTextMealVoucherFRExpiryDate.date giftCardDelegate.updateInputData { expiryDate = date } - binding.textInputLayoutMealVoucherExpiryDate.hideError() + binding.textInputLayoutMealVoucherFRExpiryDate.hideError() } - binding.editTextMealVoucherExpiryDate.onFocusChangeListener = OnFocusChangeListener { _, hasFocus -> + binding.editTextMealVoucherFRExpiryDate.onFocusChangeListener = OnFocusChangeListener { _, hasFocus -> val expiryDateValidation = giftCardDelegate.outputData.expiryDateFieldState.validation if (hasFocus) { - binding.textInputLayoutMealVoucherExpiryDate.hideError() + binding.textInputLayoutMealVoucherFRExpiryDate.hideError() } else if (expiryDateValidation is Validation.Invalid) { - binding.textInputLayoutMealVoucherExpiryDate.showError( + binding.textInputLayoutMealVoucherFRExpiryDate.showError( localizedContext.getString( expiryDateValidation.reason, ), @@ -123,22 +123,22 @@ internal class MealVoucherView @JvmOverloads constructor( private fun initSecurityCodeField(localizedContext: Context) { if (giftCardDelegate.isPinRequired()) { - binding.textInputLayoutMealVoucherSecurityCode.setLocalizedHintFromStyle( - R.style.AdyenCheckout_MealVoucher_SecurityCodeInput, + binding.textInputLayoutMealVoucherFRSecurityCode.setLocalizedHintFromStyle( + R.style.AdyenCheckout_MealVoucherFR_SecurityCodeInput, localizedContext, ) - binding.editTextMealVoucherSecurityCode.setOnChangeListener { editable: Editable -> + binding.editTextMealVoucherFRSecurityCode.setOnChangeListener { editable: Editable -> giftCardDelegate.updateInputData { pin = editable.toString() } - binding.textInputLayoutMealVoucherSecurityCode.hideError() + binding.textInputLayoutMealVoucherFRSecurityCode.hideError() } - binding.editTextMealVoucherSecurityCode.onFocusChangeListener = OnFocusChangeListener { _, hasFocus -> + binding.editTextMealVoucherFRSecurityCode.onFocusChangeListener = OnFocusChangeListener { _, hasFocus -> val securityCodeValidation = giftCardDelegate.outputData.pinFieldState.validation if (hasFocus) { - binding.textInputLayoutMealVoucherSecurityCode.hideError() + binding.textInputLayoutMealVoucherFRSecurityCode.hideError() } else if (securityCodeValidation is Validation.Invalid) { - binding.textInputLayoutMealVoucherSecurityCode.showError( + binding.textInputLayoutMealVoucherFRSecurityCode.showError( localizedContext.getString( securityCodeValidation.reason, ), @@ -146,7 +146,7 @@ internal class MealVoucherView @JvmOverloads constructor( } } } else { - binding.textInputLayoutMealVoucherSecurityCode.isVisible = false + binding.textInputLayoutMealVoucherFRSecurityCode.isVisible = false } } @@ -158,8 +158,8 @@ internal class MealVoucherView @JvmOverloads constructor( val cardNumberValidation = outputData.numberFieldState.validation if (cardNumberValidation is Validation.Invalid) { isErrorFocused = true - binding.textInputLayoutMealVoucherCardNumber.requestFocus() - binding.textInputLayoutMealVoucherCardNumber.showError( + binding.textInputLayoutMealVoucherFRCardNumber.requestFocus() + binding.textInputLayoutMealVoucherFRCardNumber.showError( localizedContext.getString(cardNumberValidation.reason), ) } @@ -167,9 +167,9 @@ internal class MealVoucherView @JvmOverloads constructor( val expiryDateValidation = outputData.expiryDateFieldState.validation if (expiryDateValidation is Validation.Invalid) { if (!isErrorFocused) { - binding.textInputLayoutMealVoucherExpiryDate.requestFocus() + binding.textInputLayoutMealVoucherFRExpiryDate.requestFocus() } - binding.textInputLayoutMealVoucherExpiryDate.showError( + binding.textInputLayoutMealVoucherFRExpiryDate.showError( localizedContext.getString(expiryDateValidation.reason), ) } @@ -177,9 +177,9 @@ internal class MealVoucherView @JvmOverloads constructor( val securityCodeValidation = outputData.pinFieldState.validation if (securityCodeValidation is Validation.Invalid) { if (!isErrorFocused) { - binding.textInputLayoutMealVoucherSecurityCode.requestFocus() + binding.textInputLayoutMealVoucherFRSecurityCode.requestFocus() } - binding.textInputLayoutMealVoucherSecurityCode.showError( + binding.textInputLayoutMealVoucherFRSecurityCode.showError( localizedContext.getString(securityCodeValidation.reason), ) } diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt similarity index 89% rename from meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt rename to meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt index 2679e0a2a1..1dfd4efc9f 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidationUtils.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt @@ -3,10 +3,10 @@ * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by ozgur on 24/7/2024. + * Created by ozgur on 6/9/2024. */ -package com.adyen.checkout.mealvoucher.internal.util +package com.adyen.checkout.mealvoucherfr.internal.util import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation @@ -14,7 +14,7 @@ import com.adyen.checkout.giftcard.internal.util.GiftCardNumberUtils import com.adyen.checkout.giftcard.internal.util.GiftCardNumberValidationResult import com.adyen.checkout.giftcard.internal.util.GiftCardPinUtils import com.adyen.checkout.giftcard.internal.util.GiftCardPinValidationResult -import com.adyen.checkout.mealvoucher.R +import com.adyen.checkout.mealvoucherfr.R import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationResult import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationUtils @@ -22,7 +22,7 @@ import org.jetbrains.annotations.VisibleForTesting import java.util.Calendar import java.util.GregorianCalendar -internal object MealVoucherValidationUtils { +internal object MealVoucherFRValidationUtils { fun validateNumber(number: String): FieldState { val validation = GiftCardNumberUtils.validateInputField(number) @@ -31,7 +31,7 @@ internal object MealVoucherValidationUtils { GiftCardNumberValidationResult.VALID -> FieldState(number, Validation.Valid) GiftCardNumberValidationResult.INVALID -> FieldState( number, - Validation.Invalid(R.string.checkout_meal_voucher_number_not_valid), + Validation.Invalid(R.string.checkout_meal_voucher_fr_number_not_valid), ) } } @@ -43,7 +43,7 @@ internal object MealVoucherValidationUtils { GiftCardPinValidationResult.VALID -> FieldState(pin, Validation.Valid) GiftCardPinValidationResult.INVALID -> FieldState( pin, - Validation.Invalid(R.string.checkout_meal_voucher_pin_not_valid), + Validation.Invalid(R.string.checkout_meal_voucher_fr_pin_not_valid), ) } } @@ -58,18 +58,18 @@ internal object MealVoucherValidationUtils { ExpiryDateValidationResult.VALID -> FieldState(expiryDate, Validation.Valid) ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> FieldState( expiryDate, - Validation.Invalid(R.string.checkout_meal_voucher_expiry_date_not_valid_too_far_in_future), + Validation.Invalid(R.string.checkout_meal_voucher_fr_expiry_date_not_valid_too_far_in_future), ) ExpiryDateValidationResult.INVALID_TOO_OLD -> FieldState( expiryDate, - Validation.Invalid(R.string.checkout_meal_voucher_expiry_date_not_valid_too_old), + Validation.Invalid(R.string.checkout_meal_voucher_fr_expiry_date_not_valid_too_old), ) ExpiryDateValidationResult.INVALID_DATE_FORMAT, ExpiryDateValidationResult.INVALID_OTHER_REASON -> FieldState( expiryDate, - Validation.Invalid(R.string.checkout_meal_voucher_expiry_date_not_valid), + Validation.Invalid(R.string.checkout_meal_voucher_fr_expiry_date_not_valid), ) } } diff --git a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidator.kt similarity index 62% rename from meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt rename to meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidator.kt index dcde9100e4..e06cb4d3b5 100644 --- a/meal-voucher/src/main/java/com/adyen/checkout/mealvoucher/internal/util/MealVoucherValidator.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidator.kt @@ -3,26 +3,26 @@ * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by ozgur on 24/7/2024. + * Created by ozgur on 6/9/2024. */ -package com.adyen.checkout.mealvoucher.internal.util +package com.adyen.checkout.mealvoucherfr.internal.util import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.giftcard.internal.util.GiftCardValidator import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate -internal class MealVoucherValidator : GiftCardValidator { +internal class MealVoucherFRValidator : GiftCardValidator { override fun validateNumber(number: String): FieldState { - return MealVoucherValidationUtils.validateNumber(number) + return MealVoucherFRValidationUtils.validateNumber(number) } override fun validatePin(pin: String): FieldState { - return MealVoucherValidationUtils.validatePin(pin) + return MealVoucherFRValidationUtils.validatePin(pin) } override fun validateExpiryDate(expiryDate: ExpiryDate): FieldState { - return MealVoucherValidationUtils.validateExpiryDate(expiryDate) + return MealVoucherFRValidationUtils.validateExpiryDate(expiryDate) } } diff --git a/meal-voucher/src/main/res/layout/meal_voucher_view.xml b/meal-voucher-fr/src/main/res/layout/meal_voucher_fr_view.xml similarity index 70% rename from meal-voucher/src/main/res/layout/meal_voucher_view.xml rename to meal-voucher-fr/src/main/res/layout/meal_voucher_fr_view.xml index 2e316576bb..2485ae1b8e 100644 --- a/meal-voucher/src/main/res/layout/meal_voucher_view.xml +++ b/meal-voucher-fr/src/main/res/layout/meal_voucher_fr_view.xml @@ -14,16 +14,16 @@ tools:parentTag="android.widget.LinearLayout"> + android:id="@+id/editText_mealVoucherFRCardNumber" + style="@style/AdyenCheckout.MealVoucherFR.CardNumberInput" + android:nextFocusDown="@id/editText_mealVoucherFRExpiryDate" + android:nextFocusForward="@id/editText_mealVoucherFRExpiryDate" /> + android:id="@+id/editText_mealVoucherFRExpiryDate" + style="@style/AdyenCheckout.MealVoucherFR.ExpiryDateInput" + android:nextFocusDown="@id/editText_mealVoucherFRSecurityCode" + android:nextFocusForward="@id/editText_mealVoucherFRSecurityCode" /> + android:id="@+id/editText_mealVoucherFRSecurityCode" + style="@style/AdyenCheckout.MealVoucherFR.SecurityCodeInput" /> diff --git a/meal-voucher-fr/src/main/res/template/values/strings.xml.tt b/meal-voucher-fr/src/main/res/template/values/strings.xml.tt new file mode 100644 index 0000000000..0282dbba25 --- /dev/null +++ b/meal-voucher-fr/src/main/res/template/values/strings.xml.tt @@ -0,0 +1,20 @@ + + + + %%creditCard.numberField.title%% + %%creditCard.expiryDateField.title%% + %%creditCard.cvcField.title%% + + %%card.numberField.invalid%% + %%card.securityCodeField.invalid%% + + %%card.expiryDateField.invalid%% + %%card.expiryDateField.invalid%% + %%card.expiryDateField.invalid%% + diff --git a/meal-voucher-fr/src/main/res/values-ar/strings.xml b/meal-voucher-fr/src/main/res/values-ar/strings.xml new file mode 100644 index 0000000000..01ab4167a2 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-ar/strings.xml @@ -0,0 +1,20 @@ + + + + رقم البطاقة + تاريخ الانتهاء + رمز الأمان + + أدخل رقم بطاقة صحيح + أدخل رمز أمان صحيح + + أدخل تاريخ انتهاء صحيح + أدخل تاريخ انتهاء صحيح + أدخل تاريخ انتهاء صحيح + diff --git a/meal-voucher-fr/src/main/res/values-bg-rBG/strings.xml b/meal-voucher-fr/src/main/res/values-bg-rBG/strings.xml new file mode 100644 index 0000000000..0b133b107b --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-bg-rBG/strings.xml @@ -0,0 +1,20 @@ + + + + Номер на карта + Дата на валидност + Код за сигурност + + Въведи правилния номер на картата + Въведи правилния код за сигурност + + Въведи правилната дата на валидност + Въведи правилната дата на валидност + Въведи правилната дата на валидност + diff --git a/meal-voucher-fr/src/main/res/values-ca-rES/strings.xml b/meal-voucher-fr/src/main/res/values-ca-rES/strings.xml new file mode 100644 index 0000000000..d6a7c027a6 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-ca-rES/strings.xml @@ -0,0 +1,20 @@ + + + + Número de targeta + Data de caducitat + Codi de seguretat + + Introduïu un número de targeta correcte + Introduïu un codi de seguretat correcte + + Introduïu una data de caducitat correcta + Introduïu una data de caducitat correcta + Introduïu una data de caducitat correcta + diff --git a/meal-voucher-fr/src/main/res/values-cs-rCZ/strings.xml b/meal-voucher-fr/src/main/res/values-cs-rCZ/strings.xml new file mode 100644 index 0000000000..5097f47aa2 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-cs-rCZ/strings.xml @@ -0,0 +1,20 @@ + + + + Číslo karty + Konec platnosti + Bezpečnostní kód + + Zadejte správné číslo karty + Zadejte správný bezpečnostní kód + + Zadejte správné datum konce platnosti + Zadejte správné datum konce platnosti + Zadejte správné datum konce platnosti + diff --git a/meal-voucher-fr/src/main/res/values-da-rDK/strings.xml b/meal-voucher-fr/src/main/res/values-da-rDK/strings.xml new file mode 100644 index 0000000000..7f869380a9 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-da-rDK/strings.xml @@ -0,0 +1,20 @@ + + + + Kortnummer + Udløbsdato + Sikkerhedskode + + Indtast et korrekt kortnummer + Indtast en korrekt sikkerhedskode + + Indtast en korrekt udløbsdato + Indtast en korrekt udløbsdato + Indtast en korrekt udløbsdato + diff --git a/meal-voucher-fr/src/main/res/values-de-rDE/strings.xml b/meal-voucher-fr/src/main/res/values-de-rDE/strings.xml new file mode 100644 index 0000000000..a9155db57e --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-de-rDE/strings.xml @@ -0,0 +1,20 @@ + + + + Kartennummer + Ablaufdatum + Sicherheitscode + + Geben Sie eine korrekte Kartennummer ein + Geben Sie einen korrekten Sicherheitscode ein + + Geben Sie ein korrektes Ablaufdatum ein + Geben Sie ein korrektes Ablaufdatum ein + Geben Sie ein korrektes Ablaufdatum ein + diff --git a/meal-voucher-fr/src/main/res/values-el-rGR/strings.xml b/meal-voucher-fr/src/main/res/values-el-rGR/strings.xml new file mode 100644 index 0000000000..e3dc37eaa3 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-el-rGR/strings.xml @@ -0,0 +1,20 @@ + + + + Αριθμός κάρτας + Ημερομηνία λήξης + Κωδικός ασφαλείας + + Εισαγάγετε σωστό αριθμό κάρτας + Εισαγάγετε σωστό κωδικό ασφάλειας + + Εισαγάγετε σωστή ημερομηνία λήξης + Εισαγάγετε σωστή ημερομηνία λήξης + Εισαγάγετε σωστή ημερομηνία λήξης + diff --git a/meal-voucher-fr/src/main/res/values-es-rES/strings.xml b/meal-voucher-fr/src/main/res/values-es-rES/strings.xml new file mode 100644 index 0000000000..33359d8f3a --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-es-rES/strings.xml @@ -0,0 +1,20 @@ + + + + Número de tarjeta + Fecha de expiración + Código de seguridad + + Introduzca un número de tarjeta correcto + Introduzca un código de seguridad correcto + + Introduzca una fecha de caducidad correcta + Introduzca una fecha de caducidad correcta + Introduzca una fecha de caducidad correcta + diff --git a/meal-voucher-fr/src/main/res/values-et-rEE/strings.xml b/meal-voucher-fr/src/main/res/values-et-rEE/strings.xml new file mode 100644 index 0000000000..f6dd231867 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-et-rEE/strings.xml @@ -0,0 +1,20 @@ + + + + Kaardi number + Aegumise kuupäev + Turvakood + + Sisestage õige kaardinumber + Sisestage õige turvakood + + Sisestage õige aegumiskuupäev + Sisestage õige aegumiskuupäev + Sisestage õige aegumiskuupäev + diff --git a/meal-voucher-fr/src/main/res/values-fi-rFI/strings.xml b/meal-voucher-fr/src/main/res/values-fi-rFI/strings.xml new file mode 100644 index 0000000000..4bd94a2068 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-fi-rFI/strings.xml @@ -0,0 +1,20 @@ + + + + Kortin numero + Voimassaolopäivämäärä + Turvakoodi + + Anna oikea kortin numero + Anna oikea turvakoodi + + Anna oikea viimeinen voimassaolopäivä + Anna oikea viimeinen voimassaolopäivä + Anna oikea viimeinen voimassaolopäivä + diff --git a/meal-voucher-fr/src/main/res/values-fr-rFR/strings.xml b/meal-voucher-fr/src/main/res/values-fr-rFR/strings.xml new file mode 100644 index 0000000000..95d48bd7cf --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-fr-rFR/strings.xml @@ -0,0 +1,20 @@ + + + + Numéro de la carte + Date d\'expiration + Code de sécurité + + Saisissez un numéro de carte correct + Saisissez un code de sécurité correct + + Saisissez une date d\'expiration correcte + Saisissez une date d\'expiration correcte + Saisissez une date d\'expiration correcte + diff --git a/meal-voucher-fr/src/main/res/values-hr-rHR/strings.xml b/meal-voucher-fr/src/main/res/values-hr-rHR/strings.xml new file mode 100644 index 0000000000..6f0278aaef --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-hr-rHR/strings.xml @@ -0,0 +1,20 @@ + + + + Broj kartice + Datum isteka + Sigurnosni kôd + + Unesite ispravan broj kartice + Unesite ispravan sigurnosni kôd + + Unesite ispravan datum isteka + Unesite ispravan datum isteka + Unesite ispravan datum isteka + diff --git a/meal-voucher-fr/src/main/res/values-hu-rHU/strings.xml b/meal-voucher-fr/src/main/res/values-hu-rHU/strings.xml new file mode 100644 index 0000000000..ee989adc20 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-hu-rHU/strings.xml @@ -0,0 +1,20 @@ + + + + Kártyaszám + Lejárati dátum + Biztonsági kód + + Adjon meg egy helyes kártyaszámot + Adjon meg egy helyes biztonsági kódot + + Adjon meg egy helyes lejárati dátumot + Adjon meg egy helyes lejárati dátumot + Adjon meg egy helyes lejárati dátumot + diff --git a/meal-voucher-fr/src/main/res/values-is-rIS/strings.xml b/meal-voucher-fr/src/main/res/values-is-rIS/strings.xml new file mode 100644 index 0000000000..2a3b0618e7 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-is-rIS/strings.xml @@ -0,0 +1,20 @@ + + + + Kortanúmer + Gildisdadgur + Öryggiskóði + + Sláðu inn rétt kortanúmer + Sláðu inn réttan öryggiskóða + + Sláðu inn réttan gildisdag + Sláðu inn réttan gildisdag + Sláðu inn réttan gildisdag + diff --git a/meal-voucher-fr/src/main/res/values-it-rIT/strings.xml b/meal-voucher-fr/src/main/res/values-it-rIT/strings.xml new file mode 100644 index 0000000000..26dae84e0f --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-it-rIT/strings.xml @@ -0,0 +1,20 @@ + + + + Numero carta + Data di scadenza + Codice di sicurezza + + Immetti un numero di carta corretto + Immetti un codice di sicurezza corretto + + Immetti una data di scadenza corretta + Immetti una data di scadenza corretta + Immetti una data di scadenza corretta + diff --git a/meal-voucher-fr/src/main/res/values-ja-rJP/strings.xml b/meal-voucher-fr/src/main/res/values-ja-rJP/strings.xml new file mode 100644 index 0000000000..aa1d90c41e --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-ja-rJP/strings.xml @@ -0,0 +1,20 @@ + + + + カード番号 + 有効期限 + セキュリティコード + + 正しいカード番号を入力してください + 正しいセキュリティコードを入力してください + + 正しい有効期限を入力してください + 正しい有効期限を入力してください + 正しい有効期限を入力してください + diff --git a/meal-voucher-fr/src/main/res/values-ko-rKR/strings.xml b/meal-voucher-fr/src/main/res/values-ko-rKR/strings.xml new file mode 100644 index 0000000000..8e17a00df2 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-ko-rKR/strings.xml @@ -0,0 +1,20 @@ + + + + 카드 번호 + 만료일 + 보안 코드 + + 정확한 카드 번호를 입력하세요 + 정확한 보안 코드를 입력하세요 + + 정확한 만료일을 입력하세요 + 정확한 만료일을 입력하세요 + 정확한 만료일을 입력하세요 + diff --git a/meal-voucher-fr/src/main/res/values-lt-rLT/strings.xml b/meal-voucher-fr/src/main/res/values-lt-rLT/strings.xml new file mode 100644 index 0000000000..da1c53ac5a --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-lt-rLT/strings.xml @@ -0,0 +1,20 @@ + + + + Kortelės numeris + Galiojimo data + Saugos kodas + + Įveskite teisingą kortelės numerį + Įveskite teisingą saugos kodą + + Įveskite teisingą galiojimo datą + Įveskite teisingą galiojimo datą + Įveskite teisingą galiojimo datą + diff --git a/meal-voucher-fr/src/main/res/values-lv-rLV/strings.xml b/meal-voucher-fr/src/main/res/values-lv-rLV/strings.xml new file mode 100644 index 0000000000..7b50d0bb97 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-lv-rLV/strings.xml @@ -0,0 +1,20 @@ + + + + Kartes numurs + Derīguma termiņš + Drošības kods + + Ievadiet pareizu kartes numuru + Ievadiet pareizu drošības kodu + + Ievadiet pareizu derīguma termiņu + Ievadiet pareizu derīguma termiņu + Ievadiet pareizu derīguma termiņu + diff --git a/meal-voucher-fr/src/main/res/values-nb-rNO/strings.xml b/meal-voucher-fr/src/main/res/values-nb-rNO/strings.xml new file mode 100644 index 0000000000..56557537a0 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-nb-rNO/strings.xml @@ -0,0 +1,20 @@ + + + + Kortnummer + Utløpsdato + Sikkerhetskode + + Angi et korrekt kortnummer + Angi en korrekt sikkerhetskode + + Angi en korrekt utløpsdato + Angi en korrekt utløpsdato + Angi en korrekt utløpsdato + diff --git a/meal-voucher-fr/src/main/res/values-nl-rNL/strings.xml b/meal-voucher-fr/src/main/res/values-nl-rNL/strings.xml new file mode 100644 index 0000000000..5d8357bdda --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-nl-rNL/strings.xml @@ -0,0 +1,20 @@ + + + + Kaartnummer + Vervaldatum + Beveiligingscode + + Voer een correct kaartnummer in + Voer een correcte beveiligingscode in + + Voer een correcte vervaldatum in + Voer een correcte vervaldatum in + Voer een correcte vervaldatum in + diff --git a/meal-voucher-fr/src/main/res/values-pl-rPL/strings.xml b/meal-voucher-fr/src/main/res/values-pl-rPL/strings.xml new file mode 100644 index 0000000000..e227e4498a --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-pl-rPL/strings.xml @@ -0,0 +1,20 @@ + + + + Numer karty + Data ważności + Kod zabezpieczający + + Wprowadź prawidłowy numer karty + Wprowadź prawidłowy kod bezpieczeństwa + + Wprowadź prawidłową datę ważności + Wprowadź prawidłową datę ważności + Wprowadź prawidłową datę ważności + diff --git a/meal-voucher-fr/src/main/res/values-pt-rBR/strings.xml b/meal-voucher-fr/src/main/res/values-pt-rBR/strings.xml new file mode 100644 index 0000000000..a5c1757bb7 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-pt-rBR/strings.xml @@ -0,0 +1,20 @@ + + + + Número do cartão + Data de validade + Código de segurança + + Digite um número de cartão correto + Digite um código de segurança correto + + Digite uma data de validade correta + Digite uma data de validade correta + Digite uma data de validade correta + diff --git a/meal-voucher-fr/src/main/res/values-pt-rPT/strings.xml b/meal-voucher-fr/src/main/res/values-pt-rPT/strings.xml new file mode 100644 index 0000000000..60044b0b57 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-pt-rPT/strings.xml @@ -0,0 +1,20 @@ + + + + Número de cartão + Data de validade + Código de segurança + + Introduza um número de cartão correto + Introduza um código de segurança correto + + Introduza uma data de validade correta + Introduza uma data de validade correta + Introduza uma data de validade correta + diff --git a/meal-voucher-fr/src/main/res/values-ro-rRO/strings.xml b/meal-voucher-fr/src/main/res/values-ro-rRO/strings.xml new file mode 100644 index 0000000000..25281dbae9 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-ro-rRO/strings.xml @@ -0,0 +1,20 @@ + + + + Număr card + Data expirării + Cod de securitate + + Completați un număr de card corect + Completați un cod de securitate corect + + Completați o dată de expirare corectă + Completați o dată de expirare corectă + Completați o dată de expirare corectă + diff --git a/meal-voucher-fr/src/main/res/values-ru-rRU/strings.xml b/meal-voucher-fr/src/main/res/values-ru-rRU/strings.xml new file mode 100644 index 0000000000..f6bc5ae8b6 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-ru-rRU/strings.xml @@ -0,0 +1,20 @@ + + + + Номер карты + Срок действия + Защитный код + + Введите правильный номер карты + Введите правильный защитный код + + Введите правильную дату окончания срока действия + Введите правильную дату окончания срока действия + Введите правильную дату окончания срока действия + diff --git a/meal-voucher-fr/src/main/res/values-sk-rSK/strings.xml b/meal-voucher-fr/src/main/res/values-sk-rSK/strings.xml new file mode 100644 index 0000000000..f310aecae9 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-sk-rSK/strings.xml @@ -0,0 +1,20 @@ + + + + Číslo karty + Koniec platnosti + Bezpečnostný kód + + Zadajte správne číslo karty + Zadajte správny bezpečnostný kód + + Zadajte správny dátum vypršania platnosti + Zadajte správny dátum vypršania platnosti + Zadajte správny dátum vypršania platnosti + diff --git a/meal-voucher-fr/src/main/res/values-sl-rSI/strings.xml b/meal-voucher-fr/src/main/res/values-sl-rSI/strings.xml new file mode 100644 index 0000000000..0f5e424a05 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-sl-rSI/strings.xml @@ -0,0 +1,20 @@ + + + + Številka kartice + Datum veljavnosti + Varnostna koda + + Vnesite pravilno številko kartice + Vnesite pravilno varnostno kodo + + Vnesite pravilen datum poteka veljavnosti + Vnesite pravilen datum poteka veljavnosti + Vnesite pravilen datum poteka veljavnosti + diff --git a/meal-voucher-fr/src/main/res/values-sv-rSE/strings.xml b/meal-voucher-fr/src/main/res/values-sv-rSE/strings.xml new file mode 100644 index 0000000000..fcfa292c4f --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-sv-rSE/strings.xml @@ -0,0 +1,20 @@ + + + + Kortnummer + Utgångsdatum + Säkerhetskod + + Ange ett korrekt kortnummer + Ange en korrekt säkerhetskod + + Ange ett korrekt utgångsdatum + Ange ett korrekt utgångsdatum + Ange ett korrekt utgångsdatum + diff --git a/meal-voucher-fr/src/main/res/values-zh-rCN/strings.xml b/meal-voucher-fr/src/main/res/values-zh-rCN/strings.xml new file mode 100644 index 0000000000..da583d1d30 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-zh-rCN/strings.xml @@ -0,0 +1,20 @@ + + + + 卡号 + 有效期 + 安全码 + + 输入正确的卡号 + 输入正确的安全码 + + 输入正确的到期日 + 输入正确的到期日 + 输入正确的到期日 + diff --git a/meal-voucher-fr/src/main/res/values-zh-rTW/strings.xml b/meal-voucher-fr/src/main/res/values-zh-rTW/strings.xml new file mode 100644 index 0000000000..5098302a12 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values-zh-rTW/strings.xml @@ -0,0 +1,20 @@ + + + + 信用卡號碼 + 到期日期 + 安全碼 + + 請輸入正確的卡號 + 請輸入正確的安全碼 + + 請輸入正確的到期日 + 請輸入正確的到期日 + 請輸入正確的到期日 + diff --git a/meal-voucher-fr/src/main/res/values/strings.xml b/meal-voucher-fr/src/main/res/values/strings.xml new file mode 100644 index 0000000000..aded5c1d74 --- /dev/null +++ b/meal-voucher-fr/src/main/res/values/strings.xml @@ -0,0 +1,20 @@ + + + + Card number + Expiry date + Security code + + Enter a correct card number + Enter a correct security code + + Enter a correct expiry date + Enter a correct expiry date + Enter a correct expiry date + diff --git a/meal-voucher/src/main/res/values/styles.xml b/meal-voucher-fr/src/main/res/values/styles.xml similarity index 64% rename from meal-voucher/src/main/res/values/styles.xml rename to meal-voucher-fr/src/main/res/values/styles.xml index 8d3b432758..7ec38c39dd 100644 --- a/meal-voucher/src/main/res/values/styles.xml +++ b/meal-voucher-fr/src/main/res/values/styles.xml @@ -8,20 +8,20 @@ - - - diff --git a/meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherComponentTest.kt b/meal-voucher-fr/src/test/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponentTest.kt similarity index 93% rename from meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherComponentTest.kt rename to meal-voucher-fr/src/test/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponentTest.kt index 21dfd64be0..a4c1f1fdfb 100644 --- a/meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherComponentTest.kt +++ b/meal-voucher-fr/src/test/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRComponentTest.kt @@ -6,7 +6,7 @@ * Created by ozgur on 27/8/2024. */ -package com.adyen.checkout.mealvoucher +package com.adyen.checkout.mealvoucherfr import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.viewModelScope @@ -19,7 +19,7 @@ import com.adyen.checkout.components.core.internal.ComponentEventHandler import com.adyen.checkout.components.core.internal.PaymentComponentEvent import com.adyen.checkout.giftcard.internal.ui.GiftCardComponentViewType import com.adyen.checkout.giftcard.internal.ui.GiftCardDelegate -import com.adyen.checkout.mealvoucher.internal.ui.MealVoucherComponentViewType +import com.adyen.checkout.mealvoucherfr.internal.ui.MealVoucherFRComponentViewType import com.adyen.checkout.test.LoggingExtension import com.adyen.checkout.test.TestDispatcherExtension import com.adyen.checkout.test.extensions.invokeOnCleared @@ -41,20 +41,20 @@ import org.mockito.kotlin.verify import org.mockito.kotlin.whenever @ExtendWith(MockitoExtension::class, TestDispatcherExtension::class, LoggingExtension::class) -internal class MealVoucherComponentTest( +internal class MealVoucherFRComponentTest( @Mock private val giftCardDelegate: GiftCardDelegate, @Mock private val genericActionDelegate: GenericActionDelegate, @Mock private val actionHandlingComponent: DefaultActionHandlingComponent, - @Mock private val componentEventHandler: ComponentEventHandler, + @Mock private val componentEventHandler: ComponentEventHandler, ) { - private lateinit var component: MealVoucherComponent + private lateinit var component: MealVoucherFRComponent @BeforeEach fun before() { - whenever(giftCardDelegate.viewFlow) doReturn MutableStateFlow(MealVoucherComponentViewType) + whenever(giftCardDelegate.viewFlow) doReturn MutableStateFlow(MealVoucherFRComponentViewType) whenever(genericActionDelegate.viewFlow) doReturn MutableStateFlow(null) - component = MealVoucherComponent( + component = MealVoucherFRComponent( giftCardDelegate = giftCardDelegate, genericActionDelegate = genericActionDelegate, actionHandlingComponent = actionHandlingComponent, @@ -81,7 +81,7 @@ internal class MealVoucherComponentTest( @Test fun `when observe is called then observe in delegates is called`() { val lifecycleOwner = mock() - val callback: (PaymentComponentEvent) -> Unit = {} + val callback: (PaymentComponentEvent) -> Unit = {} component.observe(lifecycleOwner, callback) @@ -100,7 +100,7 @@ internal class MealVoucherComponentTest( @Test fun `when component is initialized then view flow should match gift card delegate view flow`() = runTest { component.viewFlow.test { - assert(awaitItem() is MealVoucherComponentViewType) + assert(awaitItem() is MealVoucherFRComponentViewType) expectNoEvents() } } @@ -109,7 +109,7 @@ internal class MealVoucherComponentTest( fun `when gift card delegate view flow emits a value then component view flow should match that value`() = runTest { val giftCardDelegateViewFlow = MutableStateFlow(TestComponentViewType.VIEW_TYPE_1) whenever(giftCardDelegate.viewFlow) doReturn giftCardDelegateViewFlow - component = MealVoucherComponent( + component = MealVoucherFRComponent( giftCardDelegate = giftCardDelegate, genericActionDelegate = genericActionDelegate, actionHandlingComponent = actionHandlingComponent, @@ -130,7 +130,7 @@ internal class MealVoucherComponentTest( fun `when action delegate view flow emits a value then component view flow should match that value`() = runTest { val actionDelegateViewFlow = MutableStateFlow(TestComponentViewType.VIEW_TYPE_1) whenever(genericActionDelegate.viewFlow) doReturn actionDelegateViewFlow - component = MealVoucherComponent( + component = MealVoucherFRComponent( giftCardDelegate = giftCardDelegate, genericActionDelegate = genericActionDelegate, actionHandlingComponent = actionHandlingComponent, diff --git a/meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherConfigurationTest.kt b/meal-voucher-fr/src/test/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRConfigurationTest.kt similarity index 81% rename from meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherConfigurationTest.kt rename to meal-voucher-fr/src/test/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRConfigurationTest.kt index 94c3c74f87..c08b55de9c 100644 --- a/meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/MealVoucherConfigurationTest.kt +++ b/meal-voucher-fr/src/test/java/com/adyen/checkout/mealvoucherfr/MealVoucherFRConfigurationTest.kt @@ -6,7 +6,7 @@ * Created by ozgur on 28/8/2024. */ -package com.adyen.checkout.mealvoucher +package com.adyen.checkout.mealvoucherfr import com.adyen.checkout.components.core.Amount import com.adyen.checkout.components.core.AnalyticsConfiguration @@ -17,7 +17,7 @@ import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import java.util.Locale -internal class MealVoucherConfigurationTest { +internal class MealVoucherFRConfigurationTest { @Test fun `when creating the configuration through CheckoutConfiguration, then it should be the same as when the builder is used`() { @@ -28,15 +28,15 @@ internal class MealVoucherConfigurationTest { amount = Amount("EUR", 123L), analyticsConfiguration = AnalyticsConfiguration(AnalyticsLevel.ALL), ) { - mealVoucher { + mealVoucherFR { setSubmitButtonVisible(false) setSecurityCodeRequired(false) } } - val actual = checkoutConfiguration.getMealVoucherConfiguration() + val actual = checkoutConfiguration.getMealVoucherFRConfiguration() - val expected = MealVoucherConfiguration.Builder( + val expected = MealVoucherFRConfiguration.Builder( shopperLocale = Locale.US, environment = Environment.TEST, clientKey = TEST_CLIENT_KEY, @@ -58,7 +58,7 @@ internal class MealVoucherConfigurationTest { @Test fun `when the configuration is mapped to CheckoutConfiguration, then CheckoutConfiguration is created correctly`() { - val config = MealVoucherConfiguration.Builder( + val config = MealVoucherFRConfiguration.Builder( shopperLocale = Locale.US, environment = Environment.TEST, clientKey = TEST_CLIENT_KEY, @@ -85,14 +85,14 @@ internal class MealVoucherConfigurationTest { assertEquals(expected.amount, actual.amount) assertEquals(expected.analyticsConfiguration, actual.analyticsConfiguration) - val actualMealVoucherConfig = actual.getMealVoucherConfiguration() - assertEquals(config.shopperLocale, actualMealVoucherConfig?.shopperLocale) - assertEquals(config.environment, actualMealVoucherConfig?.environment) - assertEquals(config.clientKey, actualMealVoucherConfig?.clientKey) - assertEquals(config.amount, actualMealVoucherConfig?.amount) - assertEquals(config.analyticsConfiguration, actualMealVoucherConfig?.analyticsConfiguration) - assertEquals(config.isSubmitButtonVisible, actualMealVoucherConfig?.isSubmitButtonVisible) - assertEquals(config.isSecurityCodeRequired, actualMealVoucherConfig?.isSecurityCodeRequired) + val actualMealVoucherFRConfig = actual.getMealVoucherFRConfiguration() + assertEquals(config.shopperLocale, actualMealVoucherFRConfig?.shopperLocale) + assertEquals(config.environment, actualMealVoucherFRConfig?.environment) + assertEquals(config.clientKey, actualMealVoucherFRConfig?.clientKey) + assertEquals(config.amount, actualMealVoucherFRConfig?.amount) + assertEquals(config.analyticsConfiguration, actualMealVoucherFRConfig?.analyticsConfiguration) + assertEquals(config.isSubmitButtonVisible, actualMealVoucherFRConfig?.isSubmitButtonVisible) + assertEquals(config.isSecurityCodeRequired, actualMealVoucherFRConfig?.isSecurityCodeRequired) } companion object { diff --git a/meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapperTest.kt b/meal-voucher-fr/src/test/java/com/adyen/checkout/mealvoucherfr/internal/ui/model/MealVoucherFRComponentParamsMapperTest.kt similarity index 89% rename from meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapperTest.kt rename to meal-voucher-fr/src/test/java/com/adyen/checkout/mealvoucherfr/internal/ui/model/MealVoucherFRComponentParamsMapperTest.kt index 8f0f17cf7f..bb814e8a8c 100644 --- a/meal-voucher/src/test/java/com/adyen/checkout/mealvoucher/internal/ui/model/MealVoucherComponentParamsMapperTest.kt +++ b/meal-voucher-fr/src/test/java/com/adyen/checkout/mealvoucherfr/internal/ui/model/MealVoucherFRComponentParamsMapperTest.kt @@ -6,7 +6,7 @@ * Created by ozgur on 27/8/2024. */ -package com.adyen.checkout.mealvoucher.internal.ui.model +package com.adyen.checkout.mealvoucherfr.internal.ui.model import com.adyen.checkout.components.core.Amount import com.adyen.checkout.components.core.AnalyticsConfiguration @@ -21,8 +21,8 @@ import com.adyen.checkout.components.core.internal.ui.model.SessionInstallmentCo import com.adyen.checkout.components.core.internal.ui.model.SessionParams import com.adyen.checkout.core.Environment import com.adyen.checkout.giftcard.internal.ui.model.GiftCardComponentParams -import com.adyen.checkout.mealvoucher.MealVoucherConfiguration -import com.adyen.checkout.mealvoucher.mealVoucher +import com.adyen.checkout.mealvoucherfr.MealVoucherFRConfiguration +import com.adyen.checkout.mealvoucherfr.mealVoucherFR import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.params.ParameterizedTest @@ -30,9 +30,9 @@ import org.junit.jupiter.params.provider.Arguments.arguments import org.junit.jupiter.params.provider.MethodSource import java.util.Locale -internal class MealVoucherComponentParamsMapperTest { +internal class MealVoucherFRComponentParamsMapperTest { - private val mealVoucherComponentParamsMapper = MealVoucherComponentParamsMapper(CommonComponentParamsMapper()) + private val mealVoucherFRComponentParamsMapper = MealVoucherFRComponentParamsMapper(CommonComponentParamsMapper()) @Test fun `when drop-in override params are null then params should match the component configuration`() { @@ -41,7 +41,7 @@ internal class MealVoucherComponentParamsMapperTest { setSecurityCodeRequired(false) } - val params = mealVoucherComponentParamsMapper.mapToParams(configuration, DEVICE_LOCALE, null, null) + val params = mealVoucherFRComponentParamsMapper.mapToParams(configuration, DEVICE_LOCALE, null, null) val expected = getComponentParams( isPinRequired = false, @@ -63,7 +63,7 @@ internal class MealVoucherComponentParamsMapperTest { ), analyticsConfiguration = AnalyticsConfiguration(AnalyticsLevel.NONE), ) { - mealVoucher { + mealVoucherFR { setAmount(Amount("USD", 1_00L)) setAnalyticsConfiguration(AnalyticsConfiguration(AnalyticsLevel.ALL)) } @@ -71,7 +71,7 @@ internal class MealVoucherComponentParamsMapperTest { val dropInOverrideParams = DropInOverrideParams(Amount("DKK", 17_50L), null) val params = - mealVoucherComponentParamsMapper.mapToParams(configuration, DEVICE_LOCALE, dropInOverrideParams, null) + mealVoucherFRComponentParamsMapper.mapToParams(configuration, DEVICE_LOCALE, dropInOverrideParams, null) val expected = getComponentParams( shopperLocale = Locale.GERMAN, @@ -96,14 +96,14 @@ internal class MealVoucherComponentParamsMapperTest { environment = Environment.EUROPE, clientKey = TEST_CLIENT_KEY_2, ) { - mealVoucher { + mealVoucherFR { setSubmitButtonVisible(false) } } val dropInOverrideParams = DropInOverrideParams(Amount("CAD", 123L), null) val params = - mealVoucherComponentParamsMapper.mapToParams(configuration, DEVICE_LOCALE, dropInOverrideParams, null) + mealVoucherFRComponentParamsMapper.mapToParams(configuration, DEVICE_LOCALE, dropInOverrideParams, null) assertEquals(true, params.isSubmitButtonVisible) } @@ -123,7 +123,7 @@ internal class MealVoucherComponentParamsMapperTest { amount = sessionsValue, ) - val params = mealVoucherComponentParamsMapper.mapToParams( + val params = mealVoucherFRComponentParamsMapper.mapToParams( checkoutConfiguration = testConfiguration, deviceLocale = DEVICE_LOCALE, dropInOverrideParams = dropInOverrideParams, @@ -149,7 +149,7 @@ internal class MealVoucherComponentParamsMapperTest { shopperLocale = sessionsValue, ) - val params = mealVoucherComponentParamsMapper.mapToParams( + val params = mealVoucherFRComponentParamsMapper.mapToParams( checkoutConfiguration = configuration, deviceLocale = deviceLocaleValue, dropInOverrideParams = null, @@ -172,7 +172,7 @@ internal class MealVoucherComponentParamsMapperTest { clientKey = TEST_CLIENT_KEY_2, ) - val params = mealVoucherComponentParamsMapper.mapToParams( + val params = mealVoucherFRComponentParamsMapper.mapToParams( checkoutConfiguration = configuration, deviceLocale = DEVICE_LOCALE, dropInOverrideParams = null, @@ -237,14 +237,14 @@ internal class MealVoucherComponentParamsMapperTest { private fun createCheckoutConfiguration( amount: Amount? = null, shopperLocale: Locale? = null, - configuration: MealVoucherConfiguration.Builder.() -> Unit = {} + configuration: MealVoucherFRConfiguration.Builder.() -> Unit = {} ) = CheckoutConfiguration( shopperLocale = shopperLocale, environment = Environment.TEST, clientKey = TEST_CLIENT_KEY_1, amount = amount, ) { - mealVoucher(configuration) + mealVoucherFR(configuration) } companion object { diff --git a/meal-voucher/src/main/res/template/values/strings.xml.tt b/meal-voucher/src/main/res/template/values/strings.xml.tt deleted file mode 100644 index 3c406799a1..0000000000 --- a/meal-voucher/src/main/res/template/values/strings.xml.tt +++ /dev/null @@ -1,20 +0,0 @@ - - - - %%creditCard.numberField.title%% - %%creditCard.expiryDateField.title%% - %%creditCard.cvcField.title%% - - %%card.numberField.invalid%% - %%card.securityCodeField.invalid%% - - %%card.expiryDateField.invalid%% - %%card.expiryDateField.invalid%% - %%card.expiryDateField.invalid%% - diff --git a/meal-voucher/src/main/res/values-ar/strings.xml b/meal-voucher/src/main/res/values-ar/strings.xml deleted file mode 100644 index 2a1431737a..0000000000 --- a/meal-voucher/src/main/res/values-ar/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - رقم البطاقة - تاريخ الانتهاء - رمز الأمان - - أدخل رقم بطاقة صحيح - أدخل رمز أمان صحيح - - أدخل تاريخ انتهاء صحيح - أدخل تاريخ انتهاء صحيح - أدخل تاريخ انتهاء صحيح - diff --git a/meal-voucher/src/main/res/values-bg-rBG/strings.xml b/meal-voucher/src/main/res/values-bg-rBG/strings.xml deleted file mode 100644 index 6cca6923ad..0000000000 --- a/meal-voucher/src/main/res/values-bg-rBG/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Номер на карта - Дата на валидност - Код за сигурност - - Въведи правилния номер на картата - Въведи правилния код за сигурност - - Въведи правилната дата на валидност - Въведи правилната дата на валидност - Въведи правилната дата на валидност - diff --git a/meal-voucher/src/main/res/values-ca-rES/strings.xml b/meal-voucher/src/main/res/values-ca-rES/strings.xml deleted file mode 100644 index 2fe4abcb83..0000000000 --- a/meal-voucher/src/main/res/values-ca-rES/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Número de targeta - Data de caducitat - Codi de seguretat - - Introduïu un número de targeta correcte - Introduïu un codi de seguretat correcte - - Introduïu una data de caducitat correcta - Introduïu una data de caducitat correcta - Introduïu una data de caducitat correcta - diff --git a/meal-voucher/src/main/res/values-cs-rCZ/strings.xml b/meal-voucher/src/main/res/values-cs-rCZ/strings.xml deleted file mode 100644 index ec30aeefb1..0000000000 --- a/meal-voucher/src/main/res/values-cs-rCZ/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Číslo karty - Konec platnosti - Bezpečnostní kód - - Zadejte správné číslo karty - Zadejte správný bezpečnostní kód - - Zadejte správné datum konce platnosti - Zadejte správné datum konce platnosti - Zadejte správné datum konce platnosti - diff --git a/meal-voucher/src/main/res/values-da-rDK/strings.xml b/meal-voucher/src/main/res/values-da-rDK/strings.xml deleted file mode 100644 index cd5fbb53b9..0000000000 --- a/meal-voucher/src/main/res/values-da-rDK/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Kortnummer - Udløbsdato - Sikkerhedskode - - Indtast et korrekt kortnummer - Indtast en korrekt sikkerhedskode - - Indtast en korrekt udløbsdato - Indtast en korrekt udløbsdato - Indtast en korrekt udløbsdato - diff --git a/meal-voucher/src/main/res/values-de-rDE/strings.xml b/meal-voucher/src/main/res/values-de-rDE/strings.xml deleted file mode 100644 index 176437fa2d..0000000000 --- a/meal-voucher/src/main/res/values-de-rDE/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Kartennummer - Ablaufdatum - Sicherheitscode - - Geben Sie eine korrekte Kartennummer ein - Geben Sie einen korrekten Sicherheitscode ein - - Geben Sie ein korrektes Ablaufdatum ein - Geben Sie ein korrektes Ablaufdatum ein - Geben Sie ein korrektes Ablaufdatum ein - diff --git a/meal-voucher/src/main/res/values-el-rGR/strings.xml b/meal-voucher/src/main/res/values-el-rGR/strings.xml deleted file mode 100644 index 50cad35f39..0000000000 --- a/meal-voucher/src/main/res/values-el-rGR/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Αριθμός κάρτας - Ημερομηνία λήξης - Κωδικός ασφαλείας - - Εισαγάγετε σωστό αριθμό κάρτας - Εισαγάγετε σωστό κωδικό ασφάλειας - - Εισαγάγετε σωστή ημερομηνία λήξης - Εισαγάγετε σωστή ημερομηνία λήξης - Εισαγάγετε σωστή ημερομηνία λήξης - diff --git a/meal-voucher/src/main/res/values-es-rES/strings.xml b/meal-voucher/src/main/res/values-es-rES/strings.xml deleted file mode 100644 index 069d523ae4..0000000000 --- a/meal-voucher/src/main/res/values-es-rES/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Número de tarjeta - Fecha de expiración - Código de seguridad - - Introduzca un número de tarjeta correcto - Introduzca un código de seguridad correcto - - Introduzca una fecha de caducidad correcta - Introduzca una fecha de caducidad correcta - Introduzca una fecha de caducidad correcta - diff --git a/meal-voucher/src/main/res/values-et-rEE/strings.xml b/meal-voucher/src/main/res/values-et-rEE/strings.xml deleted file mode 100644 index ebbdadfe59..0000000000 --- a/meal-voucher/src/main/res/values-et-rEE/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Kaardi number - Aegumise kuupäev - Turvakood - - Sisestage õige kaardinumber - Sisestage õige turvakood - - Sisestage õige aegumiskuupäev - Sisestage õige aegumiskuupäev - Sisestage õige aegumiskuupäev - diff --git a/meal-voucher/src/main/res/values-fi-rFI/strings.xml b/meal-voucher/src/main/res/values-fi-rFI/strings.xml deleted file mode 100644 index faa7fa338b..0000000000 --- a/meal-voucher/src/main/res/values-fi-rFI/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Kortin numero - Voimassaolopäivämäärä - Turvakoodi - - Anna oikea kortin numero - Anna oikea turvakoodi - - Anna oikea viimeinen voimassaolopäivä - Anna oikea viimeinen voimassaolopäivä - Anna oikea viimeinen voimassaolopäivä - diff --git a/meal-voucher/src/main/res/values-fr-rFR/strings.xml b/meal-voucher/src/main/res/values-fr-rFR/strings.xml deleted file mode 100644 index 5a34bdc10d..0000000000 --- a/meal-voucher/src/main/res/values-fr-rFR/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Numéro de la carte - Date d\'expiration - Code de sécurité - - Saisissez un numéro de carte correct - Saisissez un code de sécurité correct - - Saisissez une date d\'expiration correcte - Saisissez une date d\'expiration correcte - Saisissez une date d\'expiration correcte - diff --git a/meal-voucher/src/main/res/values-hr-rHR/strings.xml b/meal-voucher/src/main/res/values-hr-rHR/strings.xml deleted file mode 100644 index be64f6ca1a..0000000000 --- a/meal-voucher/src/main/res/values-hr-rHR/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Broj kartice - Datum isteka - Sigurnosni kôd - - Unesite ispravan broj kartice - Unesite ispravan sigurnosni kôd - - Unesite ispravan datum isteka - Unesite ispravan datum isteka - Unesite ispravan datum isteka - diff --git a/meal-voucher/src/main/res/values-hu-rHU/strings.xml b/meal-voucher/src/main/res/values-hu-rHU/strings.xml deleted file mode 100644 index bca069b2d1..0000000000 --- a/meal-voucher/src/main/res/values-hu-rHU/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Kártyaszám - Lejárati dátum - Biztonsági kód - - Adjon meg egy helyes kártyaszámot - Adjon meg egy helyes biztonsági kódot - - Adjon meg egy helyes lejárati dátumot - Adjon meg egy helyes lejárati dátumot - Adjon meg egy helyes lejárati dátumot - diff --git a/meal-voucher/src/main/res/values-is-rIS/strings.xml b/meal-voucher/src/main/res/values-is-rIS/strings.xml deleted file mode 100644 index 7a191990c0..0000000000 --- a/meal-voucher/src/main/res/values-is-rIS/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Kortanúmer - Gildisdadgur - Öryggiskóði - - Sláðu inn rétt kortanúmer - Sláðu inn réttan öryggiskóða - - Sláðu inn réttan gildisdag - Sláðu inn réttan gildisdag - Sláðu inn réttan gildisdag - diff --git a/meal-voucher/src/main/res/values-it-rIT/strings.xml b/meal-voucher/src/main/res/values-it-rIT/strings.xml deleted file mode 100644 index 1cd176a799..0000000000 --- a/meal-voucher/src/main/res/values-it-rIT/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Numero carta - Data di scadenza - Codice di sicurezza - - Immetti un numero di carta corretto - Immetti un codice di sicurezza corretto - - Immetti una data di scadenza corretta - Immetti una data di scadenza corretta - Immetti una data di scadenza corretta - diff --git a/meal-voucher/src/main/res/values-ja-rJP/strings.xml b/meal-voucher/src/main/res/values-ja-rJP/strings.xml deleted file mode 100644 index 7b943cf487..0000000000 --- a/meal-voucher/src/main/res/values-ja-rJP/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - カード番号 - 有効期限 - セキュリティコード - - 正しいカード番号を入力してください - 正しいセキュリティコードを入力してください - - 正しい有効期限を入力してください - 正しい有効期限を入力してください - 正しい有効期限を入力してください - diff --git a/meal-voucher/src/main/res/values-ko-rKR/strings.xml b/meal-voucher/src/main/res/values-ko-rKR/strings.xml deleted file mode 100644 index aeee8e0456..0000000000 --- a/meal-voucher/src/main/res/values-ko-rKR/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - 카드 번호 - 만료일 - 보안 코드 - - 정확한 카드 번호를 입력하세요 - 정확한 보안 코드를 입력하세요 - - 정확한 만료일을 입력하세요 - 정확한 만료일을 입력하세요 - 정확한 만료일을 입력하세요 - diff --git a/meal-voucher/src/main/res/values-lt-rLT/strings.xml b/meal-voucher/src/main/res/values-lt-rLT/strings.xml deleted file mode 100644 index cb33290bd8..0000000000 --- a/meal-voucher/src/main/res/values-lt-rLT/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Kortelės numeris - Galiojimo data - Saugos kodas - - Įveskite teisingą kortelės numerį - Įveskite teisingą saugos kodą - - Įveskite teisingą galiojimo datą - Įveskite teisingą galiojimo datą - Įveskite teisingą galiojimo datą - diff --git a/meal-voucher/src/main/res/values-lv-rLV/strings.xml b/meal-voucher/src/main/res/values-lv-rLV/strings.xml deleted file mode 100644 index 8f28ce3f49..0000000000 --- a/meal-voucher/src/main/res/values-lv-rLV/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Kartes numurs - Derīguma termiņš - Drošības kods - - Ievadiet pareizu kartes numuru - Ievadiet pareizu drošības kodu - - Ievadiet pareizu derīguma termiņu - Ievadiet pareizu derīguma termiņu - Ievadiet pareizu derīguma termiņu - diff --git a/meal-voucher/src/main/res/values-nb-rNO/strings.xml b/meal-voucher/src/main/res/values-nb-rNO/strings.xml deleted file mode 100644 index 641f3757b9..0000000000 --- a/meal-voucher/src/main/res/values-nb-rNO/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Kortnummer - Utløpsdato - Sikkerhetskode - - Angi et korrekt kortnummer - Angi en korrekt sikkerhetskode - - Angi en korrekt utløpsdato - Angi en korrekt utløpsdato - Angi en korrekt utløpsdato - diff --git a/meal-voucher/src/main/res/values-nl-rNL/strings.xml b/meal-voucher/src/main/res/values-nl-rNL/strings.xml deleted file mode 100644 index 224fd4d7c8..0000000000 --- a/meal-voucher/src/main/res/values-nl-rNL/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Kaartnummer - Vervaldatum - Beveiligingscode - - Voer een correct kaartnummer in - Voer een correcte beveiligingscode in - - Voer een correcte vervaldatum in - Voer een correcte vervaldatum in - Voer een correcte vervaldatum in - diff --git a/meal-voucher/src/main/res/values-pl-rPL/strings.xml b/meal-voucher/src/main/res/values-pl-rPL/strings.xml deleted file mode 100644 index 60107c7cb6..0000000000 --- a/meal-voucher/src/main/res/values-pl-rPL/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Numer karty - Data ważności - Kod zabezpieczający - - Wprowadź prawidłowy numer karty - Wprowadź prawidłowy kod bezpieczeństwa - - Wprowadź prawidłową datę ważności - Wprowadź prawidłową datę ważności - Wprowadź prawidłową datę ważności - diff --git a/meal-voucher/src/main/res/values-pt-rBR/strings.xml b/meal-voucher/src/main/res/values-pt-rBR/strings.xml deleted file mode 100644 index 0dd8ae34ce..0000000000 --- a/meal-voucher/src/main/res/values-pt-rBR/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Número do cartão - Data de validade - Código de segurança - - Digite um número de cartão correto - Digite um código de segurança correto - - Digite uma data de validade correta - Digite uma data de validade correta - Digite uma data de validade correta - diff --git a/meal-voucher/src/main/res/values-pt-rPT/strings.xml b/meal-voucher/src/main/res/values-pt-rPT/strings.xml deleted file mode 100644 index e6c964dbe7..0000000000 --- a/meal-voucher/src/main/res/values-pt-rPT/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Número de cartão - Data de validade - Código de segurança - - Introduza um número de cartão correto - Introduza um código de segurança correto - - Introduza uma data de validade correta - Introduza uma data de validade correta - Introduza uma data de validade correta - diff --git a/meal-voucher/src/main/res/values-ro-rRO/strings.xml b/meal-voucher/src/main/res/values-ro-rRO/strings.xml deleted file mode 100644 index 91b1335efa..0000000000 --- a/meal-voucher/src/main/res/values-ro-rRO/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Număr card - Data expirării - Cod de securitate - - Completați un număr de card corect - Completați un cod de securitate corect - - Completați o dată de expirare corectă - Completați o dată de expirare corectă - Completați o dată de expirare corectă - diff --git a/meal-voucher/src/main/res/values-ru-rRU/strings.xml b/meal-voucher/src/main/res/values-ru-rRU/strings.xml deleted file mode 100644 index 950c071f05..0000000000 --- a/meal-voucher/src/main/res/values-ru-rRU/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Номер карты - Срок действия - Защитный код - - Введите правильный номер карты - Введите правильный защитный код - - Введите правильную дату окончания срока действия - Введите правильную дату окончания срока действия - Введите правильную дату окончания срока действия - diff --git a/meal-voucher/src/main/res/values-sk-rSK/strings.xml b/meal-voucher/src/main/res/values-sk-rSK/strings.xml deleted file mode 100644 index bdce0761a3..0000000000 --- a/meal-voucher/src/main/res/values-sk-rSK/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Číslo karty - Koniec platnosti - Bezpečnostný kód - - Zadajte správne číslo karty - Zadajte správny bezpečnostný kód - - Zadajte správny dátum vypršania platnosti - Zadajte správny dátum vypršania platnosti - Zadajte správny dátum vypršania platnosti - diff --git a/meal-voucher/src/main/res/values-sl-rSI/strings.xml b/meal-voucher/src/main/res/values-sl-rSI/strings.xml deleted file mode 100644 index 827354c502..0000000000 --- a/meal-voucher/src/main/res/values-sl-rSI/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Številka kartice - Datum veljavnosti - Varnostna koda - - Vnesite pravilno številko kartice - Vnesite pravilno varnostno kodo - - Vnesite pravilen datum poteka veljavnosti - Vnesite pravilen datum poteka veljavnosti - Vnesite pravilen datum poteka veljavnosti - diff --git a/meal-voucher/src/main/res/values-sv-rSE/strings.xml b/meal-voucher/src/main/res/values-sv-rSE/strings.xml deleted file mode 100644 index eb07e82705..0000000000 --- a/meal-voucher/src/main/res/values-sv-rSE/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Kortnummer - Utgångsdatum - Säkerhetskod - - Ange ett korrekt kortnummer - Ange en korrekt säkerhetskod - - Ange ett korrekt utgångsdatum - Ange ett korrekt utgångsdatum - Ange ett korrekt utgångsdatum - diff --git a/meal-voucher/src/main/res/values-zh-rCN/strings.xml b/meal-voucher/src/main/res/values-zh-rCN/strings.xml deleted file mode 100644 index 7ab42a1364..0000000000 --- a/meal-voucher/src/main/res/values-zh-rCN/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - 卡号 - 有效期 - 安全码 - - 输入正确的卡号 - 输入正确的安全码 - - 输入正确的到期日 - 输入正确的到期日 - 输入正确的到期日 - diff --git a/meal-voucher/src/main/res/values-zh-rTW/strings.xml b/meal-voucher/src/main/res/values-zh-rTW/strings.xml deleted file mode 100644 index 2dc515bd93..0000000000 --- a/meal-voucher/src/main/res/values-zh-rTW/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - 信用卡號碼 - 到期日期 - 安全碼 - - 請輸入正確的卡號 - 請輸入正確的安全碼 - - 請輸入正確的到期日 - 請輸入正確的到期日 - 請輸入正確的到期日 - diff --git a/meal-voucher/src/main/res/values/strings.xml b/meal-voucher/src/main/res/values/strings.xml deleted file mode 100644 index cd3201c18b..0000000000 --- a/meal-voucher/src/main/res/values/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Card number - Expiry date - Security code - - Enter a correct card number - Enter a correct security code - - Enter a correct expiry date - Enter a correct expiry date - Enter a correct expiry date - diff --git a/settings.gradle b/settings.gradle index 6f623b9782..05d6c3e282 100644 --- a/settings.gradle +++ b/settings.gradle @@ -48,7 +48,7 @@ include ':3ds2', ':issuer-list', ':lint', ':mbway', - ':meal-voucher', + ':meal-voucher-fr', ':molpay', ':online-banking-core', ':online-banking-cz', From a9dd250b4308287bd8c284bbc837c9b720a5408e Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Tue, 10 Sep 2024 10:38:37 +0200 Subject: [PATCH 257/299] Add release notes COAND-693 --- RELEASE_NOTES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 3e75ac5471..d9cd8ca548 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -11,6 +11,10 @@ ## New - Added support for 6 more locales: Catalan (ca-ES), Icelandic (is-IS), Bulgarian (bg-BG), Estonian (et-EE), Latvian (lv-LV) and Lithuanian (lt-lT). +- French meal vouchers are now available with the following payment method types: + - Up. Payment method type: **mealVoucher_FR_groupeup**. + - Natixis. Payment method type: **mealVoucher_FR_natixis**. + - Sodexo. Payment method type: **mealVoucher_FR_sodexo**. - For Twint, storing payment details and paying with them is now supported. See the documentation [here](/docs/payment-methods/TWINT.md). - You can now use [Adyen Test Cards Android](https://github.com/Adyen/adyen-testcards-android) to prefill test payment method information, making testing your integration easier. From 1b391588124e2ce93043d60de6903efdc2ca73f6 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Tue, 10 Sep 2024 14:04:15 +0200 Subject: [PATCH 258/299] Add meal voucher configuration in DropInConfiguration COAND-693 --- drop-in/api/drop-in.api | 1 + .../com/adyen/checkout/dropin/DropInConfiguration.kt | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/drop-in/api/drop-in.api b/drop-in/api/drop-in.api index a28a1e8da2..1901c4dd73 100644 --- a/drop-in/api/drop-in.api +++ b/drop-in/api/drop-in.api @@ -124,6 +124,7 @@ public final class com/adyen/checkout/dropin/DropInConfiguration$Builder : com/a public final fun addInstantPaymentConfiguration (Lcom/adyen/checkout/instant/InstantPaymentConfiguration;Ljava/lang/String;)Lcom/adyen/checkout/dropin/DropInConfiguration$Builder; public static synthetic fun addInstantPaymentConfiguration$default (Lcom/adyen/checkout/dropin/DropInConfiguration$Builder;Lcom/adyen/checkout/instant/InstantPaymentConfiguration;Ljava/lang/String;ILjava/lang/Object;)Lcom/adyen/checkout/dropin/DropInConfiguration$Builder; public final fun addMBWayConfiguration (Lcom/adyen/checkout/mbway/MBWayConfiguration;)Lcom/adyen/checkout/dropin/DropInConfiguration$Builder; + public final fun addMealVoucherFRConfiguration (Lcom/adyen/checkout/mealvoucherfr/MealVoucherFRConfiguration;)Lcom/adyen/checkout/dropin/DropInConfiguration$Builder; public final fun addMolpayMalasyaConfiguration (Lcom/adyen/checkout/molpay/MolpayConfiguration;)Lcom/adyen/checkout/dropin/DropInConfiguration$Builder; public final fun addMolpayThailandConfiguration (Lcom/adyen/checkout/molpay/MolpayConfiguration;)Lcom/adyen/checkout/dropin/DropInConfiguration$Builder; public final fun addMolpayVietnamConfiguration (Lcom/adyen/checkout/molpay/MolpayConfiguration;)Lcom/adyen/checkout/dropin/DropInConfiguration$Builder; diff --git a/drop-in/src/main/java/com/adyen/checkout/dropin/DropInConfiguration.kt b/drop-in/src/main/java/com/adyen/checkout/dropin/DropInConfiguration.kt index 85bb0fed9c..ad03713868 100644 --- a/drop-in/src/main/java/com/adyen/checkout/dropin/DropInConfiguration.kt +++ b/drop-in/src/main/java/com/adyen/checkout/dropin/DropInConfiguration.kt @@ -38,6 +38,7 @@ import com.adyen.checkout.ideal.IdealConfiguration import com.adyen.checkout.instant.GLOBAL_INSTANT_CONFIG_KEY import com.adyen.checkout.instant.InstantPaymentConfiguration import com.adyen.checkout.mbway.MBWayConfiguration +import com.adyen.checkout.mealvoucherfr.MealVoucherFRConfiguration import com.adyen.checkout.molpay.MolpayConfiguration import com.adyen.checkout.onlinebankingcz.OnlineBankingCZConfiguration import com.adyen.checkout.onlinebankingjp.OnlineBankingJPConfiguration @@ -428,6 +429,16 @@ class DropInConfiguration private constructor( return this } + /** + * Add configuration for French meal voucher payment method. + */ + fun addMealVoucherFRConfiguration(mealVoucherFRConfiguration: MealVoucherFRConfiguration): Builder { + availablePaymentConfigs[PaymentMethodTypes.MEAL_VOUCHER_FR_GROUPEUP] = mealVoucherFRConfiguration + availablePaymentConfigs[PaymentMethodTypes.MEAL_VOUCHER_FR_NATIXIS] = mealVoucherFRConfiguration + availablePaymentConfigs[PaymentMethodTypes.MEAL_VOUCHER_FR_SODEXO] = mealVoucherFRConfiguration + return this + } + /** * Add configuration for instant payment methods. */ From 6025e8e2563c91a6dda937373ff5ba0303db2bed Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Tue, 10 Sep 2024 16:12:26 +0200 Subject: [PATCH 259/299] Restrict input edit texts COAND-693 --- card/api/card.api | 4 ---- .../card/internal/ui/view/CardNumberInput.kt | 6 +++++- giftcard/api/giftcard.api | 2 -- .../giftcard/internal/ui/view/GiftCardNumberInput.kt | 5 +---- ui-core/api/ui-core.api | 12 ------------ .../ui/core/internal/ui/view/ExpiryDateInput.kt | 6 +++++- .../ui/core/internal/ui/view/SecurityCodeInput.kt | 6 +++++- .../internal/ui/view/SocialSecurityNumberInput.kt | 10 +++++----- 8 files changed, 21 insertions(+), 30 deletions(-) diff --git a/card/api/card.api b/card/api/card.api index f9287c8c79..3651d7f4c3 100644 --- a/card/api/card.api +++ b/card/api/card.api @@ -594,10 +594,6 @@ public final class com/adyen/checkout/card/internal/ui/model/InstallmentOptionPa public final class com/adyen/checkout/card/internal/ui/view/CardNumberInput : com/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText { public static final field Companion Lcom/adyen/checkout/card/internal/ui/view/CardNumberInput$Companion; - public fun (Landroid/content/Context;)V - public fun (Landroid/content/Context;Landroid/util/AttributeSet;)V - public fun (Landroid/content/Context;Landroid/util/AttributeSet;I)V - public synthetic fun (Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun getRawValue ()Ljava/lang/String; public final fun setAmexCardFormat (Z)V } diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardNumberInput.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardNumberInput.kt index 1a92b6e5db..47e70e3e79 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardNumberInput.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardNumberInput.kt @@ -14,6 +14,7 @@ import android.text.Editable import android.text.InputType import android.text.method.DigitsKeyListener import android.util.AttributeSet +import androidx.annotation.RestrictTo import com.adyen.checkout.card.internal.util.CardNumberUtils import com.adyen.checkout.card.internal.util.CardValidationUtils import com.adyen.checkout.ui.core.internal.ui.view.AdyenTextInputEditText @@ -21,7 +22,10 @@ import com.adyen.checkout.ui.core.internal.ui.view.AdyenTextInputEditText /** * Input that support formatting for card number. */ -class CardNumberInput @JvmOverloads constructor( +class CardNumberInput +@JvmOverloads +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/giftcard/api/giftcard.api b/giftcard/api/giftcard.api index d63b8e3910..6e75ac9624 100644 --- a/giftcard/api/giftcard.api +++ b/giftcard/api/giftcard.api @@ -227,8 +227,6 @@ public final class com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelega public final class com/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput : com/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText { public static final field Companion Lcom/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput$Companion; - public fun (Landroid/content/Context;)V - public fun (Landroid/content/Context;Landroid/util/AttributeSet;)V public fun getRawValue ()Ljava/lang/String; } diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput.kt index fc3c1a2e51..460f5731ce 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/view/GiftCardNumberInput.kt @@ -23,6 +23,7 @@ import com.adyen.checkout.giftcard.internal.util.GiftCardNumberUtils.MAX_DIGIT_S import com.adyen.checkout.ui.core.internal.ui.view.AdyenTextInputEditText class GiftCardNumberInput +@JvmOverloads @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) constructor( context: Context, @@ -30,10 +31,6 @@ constructor( defStyleAttr: Int = 0 ) : AdyenTextInputEditText(context, attrs, defStyleAttr) { - constructor(context: Context) : this(context, null, 0) - - constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0) - init { enforceMaxInputLength(MAXIMUM_GIFT_CARD_NUMBER_LENGTH + MAX_DIGIT_SEPARATOR_COUNT) inputType = InputType.TYPE_CLASS_NUMBER diff --git a/ui-core/api/ui-core.api b/ui-core/api/ui-core.api index 9c07f31f10..5ef258d298 100644 --- a/ui-core/api/ui-core.api +++ b/ui-core/api/ui-core.api @@ -277,10 +277,6 @@ public abstract interface class com/adyen/checkout/ui/core/internal/ui/view/Adye public final class com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput : com/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText { public static final field Companion Lcom/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput$Companion; public static final field SEPARATOR Ljava/lang/String; - public fun (Landroid/content/Context;)V - public fun (Landroid/content/Context;Landroid/util/AttributeSet;)V - public fun (Landroid/content/Context;Landroid/util/AttributeSet;I)V - public synthetic fun (Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun afterTextChanged (Landroid/text/Editable;)V public final fun getDate ()Lcom/adyen/checkout/ui/core/internal/ui/model/ExpiryDate; public final fun setDate (Lcom/adyen/checkout/ui/core/internal/ui/model/ExpiryDate;)V @@ -319,10 +315,6 @@ public final class com/adyen/checkout/ui/core/internal/ui/view/RoundCornerImageV public final class com/adyen/checkout/ui/core/internal/ui/view/SecurityCodeInput : com/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText { public static final field Companion Lcom/adyen/checkout/ui/core/internal/ui/view/SecurityCodeInput$Companion; - public fun (Landroid/content/Context;)V - public fun (Landroid/content/Context;Landroid/util/AttributeSet;)V - public fun (Landroid/content/Context;Landroid/util/AttributeSet;I)V - public synthetic fun (Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V } public final class com/adyen/checkout/ui/core/internal/ui/view/SecurityCodeInput$Companion { @@ -330,10 +322,6 @@ public final class com/adyen/checkout/ui/core/internal/ui/view/SecurityCodeInput public final class com/adyen/checkout/ui/core/internal/ui/view/SocialSecurityNumberInput : com/adyen/checkout/ui/core/internal/ui/view/AdyenTextInputEditText { public static final field Companion Lcom/adyen/checkout/ui/core/internal/ui/view/SocialSecurityNumberInput$Companion; - public fun (Landroid/content/Context;)V - public fun (Landroid/content/Context;Landroid/util/AttributeSet;)V - public fun (Landroid/content/Context;Landroid/util/AttributeSet;I)V - public synthetic fun (Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun setSocialSecurityNumber (Ljava/lang/String;)V } diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt index cd13c7c3e9..d40b1eaa7f 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt @@ -11,6 +11,7 @@ import android.content.Context import android.os.Build import android.text.Editable import android.util.AttributeSet +import androidx.annotation.RestrictTo import com.adyen.checkout.core.AdyenLogLevel import com.adyen.checkout.core.internal.util.StringUtil.normalize import com.adyen.checkout.core.internal.util.adyenLog @@ -21,7 +22,10 @@ import java.util.Calendar import java.util.GregorianCalendar import java.util.Locale -class ExpiryDateInput @JvmOverloads constructor( +class ExpiryDateInput +@JvmOverloads +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/SecurityCodeInput.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/SecurityCodeInput.kt index 8972098010..9e94499fba 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/SecurityCodeInput.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/SecurityCodeInput.kt @@ -10,8 +10,12 @@ package com.adyen.checkout.ui.core.internal.ui.view import android.content.Context import android.os.Build import android.util.AttributeSet +import androidx.annotation.RestrictTo -class SecurityCodeInput @JvmOverloads constructor( +class SecurityCodeInput +@JvmOverloads +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/SocialSecurityNumberInput.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/SocialSecurityNumberInput.kt index b9302472b1..27dc2c10e7 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/SocialSecurityNumberInput.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/SocialSecurityNumberInput.kt @@ -13,9 +13,13 @@ import android.text.Editable import android.text.InputType import android.text.method.DigitsKeyListener import android.util.AttributeSet +import androidx.annotation.RestrictTo import com.adyen.checkout.ui.core.internal.util.SocialSecurityNumberUtils -class SocialSecurityNumberInput constructor( +class SocialSecurityNumberInput +@JvmOverloads +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 @@ -25,10 +29,6 @@ class SocialSecurityNumberInput constructor( private const val SUPPORTED_CHARS = "0123456789./-" } - constructor(context: Context) : this(context, null, 0) - - constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0) - init { enforceMaxInputLength( SocialSecurityNumberUtils.CNPJ_DIGIT_LIMIT + SocialSecurityNumberUtils.CNPJ_MASK_SEPARATORS.size, From 4b2e695e5a7d55b8293b580eddaabb6b956ec01e Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Mon, 16 Sep 2024 15:52:32 +0200 Subject: [PATCH 260/299] Add documentation for French meal vouchers COAND-693 --- RELEASE_NOTES.md | 2 +- docs/payment-methods/FRENCH_MEAL_VOUCHER.md | 145 ++++++++++++++++++++ 2 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 docs/payment-methods/FRENCH_MEAL_VOUCHER.md diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index d9cd8ca548..04976b4a51 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -11,7 +11,7 @@ ## New - Added support for 6 more locales: Catalan (ca-ES), Icelandic (is-IS), Bulgarian (bg-BG), Estonian (et-EE), Latvian (lv-LV) and Lithuanian (lt-lT). -- French meal vouchers are now available with the following payment method types: +- French meal vouchers are now available with the following payment method types. See the documentation [here](/docs/payment-methods/FRENCH_MEAL_VOUCHER.md). - Up. Payment method type: **mealVoucher_FR_groupeup**. - Natixis. Payment method type: **mealVoucher_FR_natixis**. - Sodexo. Payment method type: **mealVoucher_FR_sodexo**. diff --git a/docs/payment-methods/FRENCH_MEAL_VOUCHER.md b/docs/payment-methods/FRENCH_MEAL_VOUCHER.md new file mode 100644 index 0000000000..23ce036d85 --- /dev/null +++ b/docs/payment-methods/FRENCH_MEAL_VOUCHER.md @@ -0,0 +1,145 @@ +# French meal voucher +On this page, you can find additional configuration for adding French meal vouchers to your integration. + +## Drop-in +### Sessions +The integration works out of the box for sessions implementation. + +### Advanced +Follow the [Advanced flow integration guide](https://docs.adyen.com/online-payments/build-your-integration/advanced-flow/?platform=Android&integration=Drop-in) and make sure the Drop-in is configured correctly and supports [partial payments](https://docs.adyen.com/online-payments/partial-payments/). + +To configure Drop-in to create and cancel orders, implement the following methods in your `DropInService`: + +| Method | Explanation | +|--------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `onBalanceCheck(paymentComponentState: PaymentComponentState<*>)` | Called when the shopper pays with a meal voucher. Make a [/paymentMethods/balance](https://docs.adyen.com/api-explorer/Checkout/latest/post/paymentMethods/balance) request. | +| `onOrderRequest()` | Called when the meal voucher balance is less than the transaction amount. Make an [/orders](https://docs.adyen.com/api-explorer/Checkout/latest/post/orders) request with the amount of the total transaction amount. | +| `onOrderCancel(order: Order, shouldUpdatePaymentMethods: Boolean)` | Called when the shopper cancels the meal voucher transaction. Make an [orders/cancel](https://docs.adyen.com/api-explorer/#/CheckoutService/latest/post/orders/cancel) request. | + +The following example shows how to configure Drop-in for meal vouchers: +```Kotlin +override fun onBalanceCheck(paymentComponentState: PaymentComponentState<*>) { + // Make a POST /paymentMethods/balance request + if (isSuccessfulResponse()) { + val balanceResult = BalanceResult.SERIALIZER.deserialize(jsonResponse) + val dropInServiceResult = BalanceDropInServiceResult.Balance(balanceResult) + sendBalanceResult(dropInServiceResult) + } else { + val dropInServiceResult = BalanceDropInServiceResult.Error(..) + sendBalanceResult(dropInServiceResult) + } +} + +override fun onOrderRequest() { + // Make a POST /orders request + if (isSuccessfulResponse()) { + val orderResponse = OrderResponse.SERIALIZER.deserialize(jsonResponse) + val dropInServiceResult = OrderDropInServiceResult.OrderCreated(orderResponse) + sendOrderResult(dropInServiceResult) + } else { + val dropInServiceResult = OrderDropInServiceResult.Error(..) + sendOrderResult(dropInServiceResult) + } +} + +override fun onOrderCancel(order: Order, shouldUpdatePaymentMethods: Boolean) { + val orderJson = OrderRequest.SERIALIZER.serialize(order) + // Make a POST /orders/cancel request + if (isSuccessfulResponse()) { + if (shouldUpdatePaymentMethods) { + // shouldUpdatePaymentMethods is true when the shopper manually removes their meal vouchers and cancels the order + // The total reverts to the original amount and you might need to fetch your payment methods and update Drop-in with the new list of payment methods + val paymentMethods = fetchPaymentMethods() // Fetch the payment methods here + val dropInServiceResult = DropInServiceResult.Update(paymentMethods, null) // Update the payment methods + } else { + // shouldUpdatePaymentMethods is false when Drop-in is closed while the order is in progress + // If this happens, there is no need to make any further calls. + } + } else { + val dropInServiceResult = DropInServiceResult.Error(..) + sendResult(dropInServiceResult) + } +} +``` + +### Configurations +To create the configuration object and pass it when launching Drop-in, please follow the guide [here](https://docs.adyen.com/online-payments/build-your-integration/advanced-flow/?platform=Android&integration=Drop-in#configure). + +Additional configurations for French meal vouchers: +```Kotlin +CheckoutConfiguration( + environment = environment, + clientKey = clientKey, + .. +) { + mealVoucherFR { + setSecurityCodeRequired(true) + } +} +``` + +`setSecurityCodeRequired` allows you to specify if the Security code field should be hidden from the Component and not requested by the shopper. Note that this might have implications for the transaction. + +## Components +Make sure to follow the [Android Components integration guide](https://docs.adyen.com/online-payments/build-your-integration/sessions-flow?platform=Android&integration=Components) and use the following module and component names: + +To [import the module](https://docs.adyen.com/online-payments/build-your-integration/sessions-flow/?platform=Android&integration=Components#import) use `meal-voucher-fr`. + + +```Groovy +implementation "com.adyen.checkout:meal-voucher-fr:YOUR_VERSION" +``` + +To [launch and show the Component](https://docs.adyen.com/online-payments/build-your-integration/sessions-flow?platform=Android&integration=Components#launch-and-show) use `MealVoucherFRComponent`. +```Kotlin +val component = MealVoucherFRComponent.PROVIDER.get( + activity = activity, + checkoutSession = checkoutSession, + paymentMethod = paymentMethod, + configuration = checkoutConfiguration, + componentCallback = callback, +) +``` + +The `componentCallback` which is passed to the `MealVoucherFRComponent.PROVIDER` requires the following methods to be implemented: + +| Method | Explanation | +|-------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `onRequestOrder()` | In this method you should make a network call to the [/orders](https://docs.adyen.com/api-explorer/Checkout/latest/post/orders) endpoint of the Checkout API through your server. This method is called when the user is trying to pay a part of the amount using a partial payment method. | +| `onBalanceCheck(paymentComponentState: PaymentComponentState<*>)` | In this method you should make a network call to the [/paymentMethods/balance](https://docs.adyen.com/api-explorer/Checkout/latest/post/paymentMethods/balance) endpoint of the Checkout API through your server. This method is called right after the user enters their meal voucher details and submits them. | + +The following example shows how to implement the `MealVoucherFRComponentCallback`: + +```Kotlin +override fun onRequestOrder() { + // Make a POST /orders request + if (isSuccessfulResponse()) { + val orderResponse = OrderResponse.SERIALIZER.deserialize(jsonResponse) + frenchMealVoucherComponent.resolveOrderResponse(event.order) + } +} + +override fun onBalanceCheck(paymentComponentState: PaymentComponentState<*>) { + // Make a POST /paymentMethods/balance request + if (isSuccessfulResponse()) { + val balanceResult = BalanceResult.SERIALIZER.deserialize(jsonResponse) + frenchMealVoucherComponent.resolveBalanceResult(event.balanceResult) + } +} +``` + +### Configurations +To create the configuration object and pass it to the component, please follow the guide [here](https://docs.adyen.com/online-payments/build-your-integration/advanced-flow/?platform=Android&integration=Components#configure). +```Kotlin +CheckoutConfiguration( + environment = environment, + clientKey = clientKey, + .. +) { + mealVoucherFR { + setSecurityCodeRequired(true) + } +} +``` + +`setSecurityCodeRequired` allows you to specify if the Security code field should be hidden from the Component and not requested by the shopper. Note that this might have implications for the transaction. From 090c5b00adadc3629b49425b9c127e287a4bdbe2 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Tue, 17 Sep 2024 11:19:06 +0200 Subject: [PATCH 261/299] Move and rename address lookup documentation COAND-693 --- .../{ADDRESS_LOOKUP.md => payment-methods/CARD_ADDRESS_LOOKUP.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/{ADDRESS_LOOKUP.md => payment-methods/CARD_ADDRESS_LOOKUP.md} (100%) diff --git a/docs/ADDRESS_LOOKUP.md b/docs/payment-methods/CARD_ADDRESS_LOOKUP.md similarity index 100% rename from docs/ADDRESS_LOOKUP.md rename to docs/payment-methods/CARD_ADDRESS_LOOKUP.md From ba72dd7d16915e082e5b17234797714096998678 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Tue, 17 Sep 2024 11:19:33 +0200 Subject: [PATCH 262/299] Update Readme COAND-693 --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8b0551c800..07999eecbe 100644 --- a/README.md +++ b/README.md @@ -52,9 +52,11 @@ implementation "com.adyen.checkout:card:5.6.0" The library is available on [Maven Central][mavenRepo]. -## UI Customization +## Additional documentation -[See the UI Customization Guide for more.](docs/UI_CUSTOMIZATION.md) +* [UI Customization guide][docs.github.uiCustomization] + +* [Additional documentation for payment methods][docs.github.paymentMethods] ## Migrate from v4 @@ -111,6 +113,8 @@ This repository is available under the [MIT license](LICENSE). [docs.clientKey]: https://docs.adyen.com/development-resources/client-side-authentication#get-your-client-key [docs.dropIn]: https://docs.adyen.com/online-payments/build-your-integration/?platform=Android&integration=Drop-in [docs.components]: https://docs.adyen.com/online-payments/build-your-integration/?platform=Android&integration=Components +[docs.github.uiCustomization]: docs/UI_CUSTOMIZATION.md +[docs.github.paymentMethods]: docs/payment-methods [mavenRepo]: https://repo1.maven.org/maven2/com/adyen/checkout/ [migration.guide]: https://docs.adyen.com/online-payments/build-your-integration/migrate-to-android-5-0-0 [github.newIssue]: https://github.com/Adyen/adyen-android/issues/new/choose From ceebc2e70e108b47f148f89877abc4e969b96b7b Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Fri, 20 Sep 2024 16:30:00 +0200 Subject: [PATCH 263/299] Improve French meal voucher documentation COAND-693 --- docs/payment-methods/FRENCH_MEAL_VOUCHER.md | 45 ++++++++------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/docs/payment-methods/FRENCH_MEAL_VOUCHER.md b/docs/payment-methods/FRENCH_MEAL_VOUCHER.md index 23ce036d85..262bfec0ca 100644 --- a/docs/payment-methods/FRENCH_MEAL_VOUCHER.md +++ b/docs/payment-methods/FRENCH_MEAL_VOUCHER.md @@ -3,7 +3,7 @@ On this page, you can find additional configuration for adding French meal vouch ## Drop-in ### Sessions -The integration works out of the box for sessions implementation. +The integration works out of the box for sessions implementation. Check out the integration guide [here](https://docs.adyen.com/online-payments/build-your-integration/sessions-flow/?platform=Android&integration=Drop-in). ### Advanced Follow the [Advanced flow integration guide](https://docs.adyen.com/online-payments/build-your-integration/advanced-flow/?platform=Android&integration=Drop-in) and make sure the Drop-in is configured correctly and supports [partial payments](https://docs.adyen.com/online-payments/partial-payments/). @@ -14,7 +14,7 @@ To configure Drop-in to create and cancel orders, implement the following method |--------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | `onBalanceCheck(paymentComponentState: PaymentComponentState<*>)` | Called when the shopper pays with a meal voucher. Make a [/paymentMethods/balance](https://docs.adyen.com/api-explorer/Checkout/latest/post/paymentMethods/balance) request. | | `onOrderRequest()` | Called when the meal voucher balance is less than the transaction amount. Make an [/orders](https://docs.adyen.com/api-explorer/Checkout/latest/post/orders) request with the amount of the total transaction amount. | -| `onOrderCancel(order: Order, shouldUpdatePaymentMethods: Boolean)` | Called when the shopper cancels the meal voucher transaction. Make an [orders/cancel](https://docs.adyen.com/api-explorer/#/CheckoutService/latest/post/orders/cancel) request. | +| `onOrderCancel(order: Order, shouldUpdatePaymentMethods: Boolean)` | Called when the shopper cancels the meal voucher transaction. Make an [/orders/cancel](https://docs.adyen.com/api-explorer/#/CheckoutService/latest/post/orders/cancel) request. | The following example shows how to configure Drop-in for meal vouchers: ```Kotlin @@ -62,45 +62,32 @@ override fun onOrderCancel(order: Order, shouldUpdatePaymentMethods: Boolean) { } ``` -### Configurations -To create the configuration object and pass it when launching Drop-in, please follow the guide [here](https://docs.adyen.com/online-payments/build-your-integration/advanced-flow/?platform=Android&integration=Drop-in#configure). - -Additional configurations for French meal vouchers: -```Kotlin -CheckoutConfiguration( - environment = environment, - clientKey = clientKey, - .. -) { - mealVoucherFR { - setSecurityCodeRequired(true) - } -} -``` - -`setSecurityCodeRequired` allows you to specify if the Security code field should be hidden from the Component and not requested by the shopper. Note that this might have implications for the transaction. - ## Components -Make sure to follow the [Android Components integration guide](https://docs.adyen.com/online-payments/build-your-integration/sessions-flow?platform=Android&integration=Components) and use the following module and component names: - -To [import the module](https://docs.adyen.com/online-payments/build-your-integration/sessions-flow/?platform=Android&integration=Components#import) use `meal-voucher-fr`. - +Use the following module and component names: +- To import the module use `meal-voucher-fr`. ```Groovy implementation "com.adyen.checkout:meal-voucher-fr:YOUR_VERSION" ``` -To [launch and show the Component](https://docs.adyen.com/online-payments/build-your-integration/sessions-flow?platform=Android&integration=Components#launch-and-show) use `MealVoucherFRComponent`. +- To launch and show the Component use `MealVoucherFRComponent`. + ```Kotlin val component = MealVoucherFRComponent.PROVIDER.get( - activity = activity, - checkoutSession = checkoutSession, + activity = activity, // or fragment = fragment + checkoutSession = checkoutSession, // Should be passed only for sessions paymentMethod = paymentMethod, configuration = checkoutConfiguration, componentCallback = callback, ) ``` +### Sessions +Make sure to follow the Android Components integration guide for sessions integration [here](https://docs.adyen.com/online-payments/build-your-integration/sessions-flow?platform=Android&integration=Components). + +### Advanced +Make sure to follow the Android Components integration guide for advanced integration [here](https://docs.adyen.com/online-payments/build-your-integration/advanced-flow/?platform=Android&integration=Components). + The `componentCallback` which is passed to the `MealVoucherFRComponent.PROVIDER` requires the following methods to be implemented: | Method | Explanation | @@ -128,8 +115,8 @@ override fun onBalanceCheck(paymentComponentState: PaymentComponentState<*>) { } ``` -### Configurations -To create the configuration object and pass it to the component, please follow the guide [here](https://docs.adyen.com/online-payments/build-your-integration/advanced-flow/?platform=Android&integration=Components#configure). +## Optional configurations + ```Kotlin CheckoutConfiguration( environment = environment, From 491b4414917ea55cf7b0d7f48689e20a648931ad Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Mon, 23 Sep 2024 14:33:24 +0200 Subject: [PATCH 264/299] Add readme for payment methods COAND-693 --- docs/payment-methods/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 docs/payment-methods/README.md diff --git a/docs/payment-methods/README.md b/docs/payment-methods/README.md new file mode 100644 index 0000000000..485d69cb14 --- /dev/null +++ b/docs/payment-methods/README.md @@ -0,0 +1,8 @@ +Additional documentation for payment methods not yet included in our [integration guide](https://docs.adyen.com/online-payments/build-your-integration/) is available below. These may be removed once integrated into the guide. + +Please see the list of documentation below: + +| Documentation | Explanation | +|----------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------| +| [Address lookup for cards](CARD_ADDRESS_LOOKUP.md) | Additional address configuration which allows suggesting addresses to the shopper when they enter data into the address input | +| [French meal vouchers](FRENCH_MEAL_VOUCHER.md) | Implementation guide for French meal vouchers | From d8c2ba29da7b5cc435d32735d12785d5fa5f731d Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Mon, 23 Sep 2024 14:56:36 +0200 Subject: [PATCH 265/299] Add documentation for Gift card COAND-693 --- docs/payment-methods/GIFT_CARD.md | 132 ++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 docs/payment-methods/GIFT_CARD.md diff --git a/docs/payment-methods/GIFT_CARD.md b/docs/payment-methods/GIFT_CARD.md new file mode 100644 index 0000000000..94af61b35a --- /dev/null +++ b/docs/payment-methods/GIFT_CARD.md @@ -0,0 +1,132 @@ +# Gift card +On this page, you can find additional configuration for adding Gift cards to your integration. + +## Drop-in +### Sessions +The integration works out of the box for sessions implementation. Check out the integration guide [here](https://docs.adyen.com/online-payments/build-your-integration/sessions-flow/?platform=Android&integration=Drop-in). + +### Advanced +Follow the [Advanced flow integration guide](https://docs.adyen.com/online-payments/build-your-integration/advanced-flow/?platform=Android&integration=Drop-in) and make sure the Drop-in is configured correctly and supports [partial payments](https://docs.adyen.com/online-payments/partial-payments/). + +To configure Drop-in to create and cancel orders, implement the following methods in your `DropInService`: + +| Method | Explanation | +|--------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `onBalanceCheck(paymentComponentState: PaymentComponentState<*>)` | Called when the shopper pays with a gift card. Make a [/paymentMethods/balance](https://docs.adyen.com/api-explorer/Checkout/latest/post/paymentMethods/balance) request. | +| `onOrderRequest()` | Called when the gift card balance is less than the transaction amount. Make an [/orders](https://docs.adyen.com/api-explorer/Checkout/latest/post/orders) request with the amount of the total transaction amount. | +| `onOrderCancel(order: Order, shouldUpdatePaymentMethods: Boolean)` | Called when the shopper cancels the gift card transaction. Make an [/orders/cancel](https://docs.adyen.com/api-explorer/#/CheckoutService/latest/post/orders/cancel) request. | + +The following example shows how to configure Drop-in for gift cards: +```Kotlin +override fun onBalanceCheck(paymentComponentState: PaymentComponentState<*>) { + // Make a POST /paymentMethods/balance request + if (isSuccessfulResponse()) { + val balanceResult = BalanceResult.SERIALIZER.deserialize(jsonResponse) + val dropInServiceResult = BalanceDropInServiceResult.Balance(balanceResult) + sendBalanceResult(dropInServiceResult) + } else { + val dropInServiceResult = BalanceDropInServiceResult.Error(..) + sendBalanceResult(dropInServiceResult) + } +} + +override fun onOrderRequest() { + // Make a POST /orders request + if (isSuccessfulResponse()) { + val orderResponse = OrderResponse.SERIALIZER.deserialize(jsonResponse) + val dropInServiceResult = OrderDropInServiceResult.OrderCreated(orderResponse) + sendOrderResult(dropInServiceResult) + } else { + val dropInServiceResult = OrderDropInServiceResult.Error(..) + sendOrderResult(dropInServiceResult) + } +} + +override fun onOrderCancel(order: Order, shouldUpdatePaymentMethods: Boolean) { + val orderJson = OrderRequest.SERIALIZER.serialize(order) + // Make a POST /orders/cancel request + if (isSuccessfulResponse()) { + if (shouldUpdatePaymentMethods) { + // shouldUpdatePaymentMethods is true when the shopper manually removes their gift cards and cancels the order + // The total reverts to the original amount and you might need to fetch your payment methods and update Drop-in with the new list of payment methods + val paymentMethods = fetchPaymentMethods() // Fetch the payment methods here + val dropInServiceResult = DropInServiceResult.Update(paymentMethods, null) // Update the payment methods + } else { + // shouldUpdatePaymentMethods is false when Drop-in is closed while the order is in progress + // If this happens, there is no need to make any further calls. + } + } else { + val dropInServiceResult = DropInServiceResult.Error(..) + sendResult(dropInServiceResult) + } +} +``` + +## Components +Use the following module and component names: +- To import the module use `giftcard`. + +```Groovy +implementation "com.adyen.checkout:giftcard:YOUR_VERSION" +``` + +- To launch and show the Component use `GiftCardComponent`. + +```Kotlin +val component = GiftCardComponent.PROVIDER.get( + activity = activity, // or fragment = fragment + checkoutSession = checkoutSession, // Should be passed only for sessions + paymentMethod = paymentMethod, + configuration = checkoutConfiguration, + componentCallback = callback, +) +``` + +### Sessions +Make sure to follow the Android Components integration guide for sessions integration [here](https://docs.adyen.com/online-payments/build-your-integration/sessions-flow?platform=Android&integration=Components). + +### Advanced +Make sure to follow the Android Components integration guide for advanced integration [here](https://docs.adyen.com/online-payments/build-your-integration/advanced-flow/?platform=Android&integration=Components). + +The `componentCallback` which is passed to the `GiftCardComponent.PROVIDER` requires the following methods to be implemented: + +| Method | Explanation | +|-------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `onRequestOrder()` | In this method you should make a network call to the [/orders](https://docs.adyen.com/api-explorer/Checkout/latest/post/orders) endpoint of the Checkout API through your server. This method is called when the user is trying to pay a part of the amount using a partial payment method. | +| `onBalanceCheck(paymentComponentState: PaymentComponentState<*>)` | In this method you should make a network call to the [/paymentMethods/balance](https://docs.adyen.com/api-explorer/Checkout/latest/post/paymentMethods/balance) endpoint of the Checkout API through your server. This method is called right after the user enters their gift card details and submits them. | + +The following example shows how to implement the `GiftCardComponentCallback`: + +```Kotlin +override fun onRequestOrder() { + // Make a POST /orders request + if (isSuccessfulResponse()) { + val orderResponse = OrderResponse.SERIALIZER.deserialize(jsonResponse) + giftCardComponent.resolveOrderResponse(event.order) + } +} + +override fun onBalanceCheck(paymentComponentState: PaymentComponentState<*>) { + // Make a POST /paymentMethods/balance request + if (isSuccessfulResponse()) { + val balanceResult = BalanceResult.SERIALIZER.deserialize(jsonResponse) + giftCardComponent.resolveBalanceResult(event.balanceResult) + } +} +``` + +## Optional configurations + +```Kotlin +CheckoutConfiguration( + environment = environment, + clientKey = clientKey, + .. +) { + giftCard { + setPinRequired(true) + } +} +``` + +`setPinRequired` allows you to specify if the Pin field should be hidden from the Component and not requested by the shopper. Note that this might have implications for the transaction. From 77530f22476924740667329ca2ba3afadaf86982 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Mon, 23 Sep 2024 14:56:54 +0200 Subject: [PATCH 266/299] Update payment methods README COAND-693 --- docs/payment-methods/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/payment-methods/README.md b/docs/payment-methods/README.md index 485d69cb14..111bb291ae 100644 --- a/docs/payment-methods/README.md +++ b/docs/payment-methods/README.md @@ -6,3 +6,4 @@ Please see the list of documentation below: |----------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------| | [Address lookup for cards](CARD_ADDRESS_LOOKUP.md) | Additional address configuration which allows suggesting addresses to the shopper when they enter data into the address input | | [French meal vouchers](FRENCH_MEAL_VOUCHER.md) | Implementation guide for French meal vouchers | +| [Gift cards](GIFT_CARD.md) | Implementation guide for Gift cards | From 0df176dfebba502b736483e0a5b82778c7a50414 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:15:28 +0200 Subject: [PATCH 267/299] Update texts for meal voucher and gift card removal in drop-in COAND-985 --- drop-in/src/main/res/template/values/strings.xml.tt | 4 ++-- drop-in/src/main/res/values-ar/strings.xml | 4 ++-- drop-in/src/main/res/values-bg-rBG/strings.xml | 4 ++-- drop-in/src/main/res/values-ca-rES/strings.xml | 4 ++-- drop-in/src/main/res/values-cs-rCZ/strings.xml | 4 ++-- drop-in/src/main/res/values-da-rDK/strings.xml | 4 ++-- drop-in/src/main/res/values-de-rDE/strings.xml | 4 ++-- drop-in/src/main/res/values-el-rGR/strings.xml | 4 ++-- drop-in/src/main/res/values-es-rES/strings.xml | 4 ++-- drop-in/src/main/res/values-et-rEE/strings.xml | 4 ++-- drop-in/src/main/res/values-fi-rFI/strings.xml | 4 ++-- drop-in/src/main/res/values-fr-rFR/strings.xml | 4 ++-- drop-in/src/main/res/values-hr-rHR/strings.xml | 4 ++-- drop-in/src/main/res/values-hu-rHU/strings.xml | 4 ++-- drop-in/src/main/res/values-is-rIS/strings.xml | 4 ++-- drop-in/src/main/res/values-it-rIT/strings.xml | 4 ++-- drop-in/src/main/res/values-ja-rJP/strings.xml | 4 ++-- drop-in/src/main/res/values-ko-rKR/strings.xml | 4 ++-- drop-in/src/main/res/values-lt-rLT/strings.xml | 4 ++-- drop-in/src/main/res/values-lv-rLV/strings.xml | 4 ++-- drop-in/src/main/res/values-nb-rNO/strings.xml | 4 ++-- drop-in/src/main/res/values-nl-rNL/strings.xml | 4 ++-- drop-in/src/main/res/values-pl-rPL/strings.xml | 4 ++-- drop-in/src/main/res/values-pt-rBR/strings.xml | 4 ++-- drop-in/src/main/res/values-pt-rPT/strings.xml | 4 ++-- drop-in/src/main/res/values-ro-rRO/strings.xml | 4 ++-- drop-in/src/main/res/values-ru-rRU/strings.xml | 4 ++-- drop-in/src/main/res/values-sk-rSK/strings.xml | 4 ++-- drop-in/src/main/res/values-sl-rSI/strings.xml | 4 ++-- drop-in/src/main/res/values-sv-rSE/strings.xml | 4 ++-- drop-in/src/main/res/values-zh-rCN/strings.xml | 4 ++-- drop-in/src/main/res/values-zh-rTW/strings.xml | 4 ++-- drop-in/src/main/res/values/strings.xml | 4 ++-- 33 files changed, 66 insertions(+), 66 deletions(-) diff --git a/drop-in/src/main/res/template/values/strings.xml.tt b/drop-in/src/main/res/template/values/strings.xml.tt index 7a0d819747..7cc909d604 100644 --- a/drop-in/src/main/res/template/values/strings.xml.tt +++ b/drop-in/src/main/res/template/values/strings.xml.tt @@ -24,8 +24,8 @@ %%paymentmethods.paid%% %%storedPaymentMethod.disable.button%% %%giftcardTransactionLimit%% - %%giftcard.remove.title%% - %%giftcard.remove.body.allgiftcards%% + %%paymentmethods.applied.remove.title%% + %%paymentmethods.applied.remove.body%% %%storedPaymentMethod.disable.confirmButton%% %%storedPaymentMethod.disable.cancelButton%% %%storedPaymentMethod.disable.confirmation%% diff --git a/drop-in/src/main/res/values-ar/strings.xml b/drop-in/src/main/res/values-ar/strings.xml index 6c7d0cdd94..448d465c8d 100644 --- a/drop-in/src/main/res/values-ar/strings.xml +++ b/drop-in/src/main/res/values-ar/strings.xml @@ -24,8 +24,8 @@ مُطبَّق إزالة يسمح فقط بحد أقصى %s لكل معاملة على بطاقة الهدايا هذه - تأكيد إزالة البطاقة - هل ترغب في إزالة بطاقات الهدايا المضافة؟ + تأكيد عملية الإزالة + هل تريد إزالة العناصر المحددة؟ نعم، أرغب في إزالتها إلغاء إزالة طريقة الدفع المخزنة diff --git a/drop-in/src/main/res/values-bg-rBG/strings.xml b/drop-in/src/main/res/values-bg-rBG/strings.xml index 576925b367..b4868bd9e9 100644 --- a/drop-in/src/main/res/values-bg-rBG/strings.xml +++ b/drop-in/src/main/res/values-bg-rBG/strings.xml @@ -24,8 +24,8 @@ Приложено Премахване Макс. %s разрешени за транзакция на тази карта за подарък - Потвърдете премахването на картата - Да се премахнат ли добавените подаръчни карти? + Потвърдете премахването + Да се премахнат ли приложените елементи? Да, премахнете Отказ Премахнете съхранения метод на плащане diff --git a/drop-in/src/main/res/values-ca-rES/strings.xml b/drop-in/src/main/res/values-ca-rES/strings.xml index 3f1705a43e..6533c215d7 100644 --- a/drop-in/src/main/res/values-ca-rES/strings.xml +++ b/drop-in/src/main/res/values-ca-rES/strings.xml @@ -24,8 +24,8 @@ Aplicat Elimina Màx. %s permès per transacció en aquesta targeta regal - Confirmeu l\'eliminació de la targeta - Voleu suprimir les targetes regal afegides? + Confirma la supressió + Voleu suprimir els elements aplicats? Sí, elimina-ho Cancel·la Elimina la forma de pagament emmagatzemada diff --git a/drop-in/src/main/res/values-cs-rCZ/strings.xml b/drop-in/src/main/res/values-cs-rCZ/strings.xml index 9be8cba434..30ac6d0e93 100644 --- a/drop-in/src/main/res/values-cs-rCZ/strings.xml +++ b/drop-in/src/main/res/values-cs-rCZ/strings.xml @@ -24,8 +24,8 @@ Aplikováno Odebrat Maximální povolená částka za jednu transakci touto dárkovou kartou je %s. - Potvrďte odebrání karty - Odebrat přidané dárkové karty? + Potvrďte odebrání + Odebrat použité položky? Ano, odebrat Zrušit Odebrat uložený způsob platby diff --git a/drop-in/src/main/res/values-da-rDK/strings.xml b/drop-in/src/main/res/values-da-rDK/strings.xml index 8ad78e6d97..152b5ab31d 100644 --- a/drop-in/src/main/res/values-da-rDK/strings.xml +++ b/drop-in/src/main/res/values-da-rDK/strings.xml @@ -24,8 +24,8 @@ Anvendt Fjern Maks. %s tilladt pr. transaktion på dette gavekort - Bekræft fjernelse af kort - Fjern tilføjede gavekort? + Bekræft fjernelse + Fjern anvendte elementer? Ja, fjern Annuller Fjern gemt betalingsmåde diff --git a/drop-in/src/main/res/values-de-rDE/strings.xml b/drop-in/src/main/res/values-de-rDE/strings.xml index cf731887ec..a7665a3f46 100644 --- a/drop-in/src/main/res/values-de-rDE/strings.xml +++ b/drop-in/src/main/res/values-de-rDE/strings.xml @@ -24,8 +24,8 @@ Angewandt Entfernen Der zulässige Höchstbetrag pro Transaktion für diese Geschenkkarte ist %s - Entfernen der Karte bestätigen - Hinzugefügte Geschenkgutscheine entfernen? + Entfernung bestätigen + Angewendete Elemente entfernen? Ja, entfernen Abbrechen Gespeicherte Zahlungsmethode entfernen diff --git a/drop-in/src/main/res/values-el-rGR/strings.xml b/drop-in/src/main/res/values-el-rGR/strings.xml index c47353535f..e1bee615a9 100644 --- a/drop-in/src/main/res/values-el-rGR/strings.xml +++ b/drop-in/src/main/res/values-el-rGR/strings.xml @@ -24,8 +24,8 @@ Εφαρμοσμένες Αφαίρεση Το μέγιστο επιτρεπόμενο ποσό ανά συναλλαγή σε αυτήν τη δωροκάρτα είναι %s - Επιβεβαίωση αφαίρεσης κάρτας - Αφαίρεση των προστεθειμένων δωροκαρτών; + Επιβεβαίωση αφαίρεσης + Αφαίρεση εφαρμοσμένων στοιχείων; Ναι, αφαίρεση Άκυρο Αφαίρεση αποθηκευμένου τρόπου πληρωμής diff --git a/drop-in/src/main/res/values-es-rES/strings.xml b/drop-in/src/main/res/values-es-rES/strings.xml index 69ec8cc9e6..21bfe5a7f5 100644 --- a/drop-in/src/main/res/values-es-rES/strings.xml +++ b/drop-in/src/main/res/values-es-rES/strings.xml @@ -24,8 +24,8 @@ Aplicado Eliminar Se permite un máximo de %s por transacción en esta tarjeta regalo - Confirmar retirada de tarjeta - ¿Quiere retirar las tarjetas de regalo añadidas? + Confirme la eliminación + ¿Eliminar elementos aplicados? Sí, eliminar Cancelar Eliminar método de pago almacenado diff --git a/drop-in/src/main/res/values-et-rEE/strings.xml b/drop-in/src/main/res/values-et-rEE/strings.xml index df2cf4f0ff..eb1625cb17 100644 --- a/drop-in/src/main/res/values-et-rEE/strings.xml +++ b/drop-in/src/main/res/values-et-rEE/strings.xml @@ -24,8 +24,8 @@ Rakendatud Eemalda Selle kinkekaardi limiit tehingu kohta on %s - Kinnita kaardi eemaldamine - Kas eemaldada lisatud kinkekaardid? + Kinnitage eemaldamine + Kas eemaldada rakendatud üksused? Jah, eemalda Katkesta Eemalda salvestatud makseviis diff --git a/drop-in/src/main/res/values-fi-rFI/strings.xml b/drop-in/src/main/res/values-fi-rFI/strings.xml index a346f65f24..9743b5051b 100644 --- a/drop-in/src/main/res/values-fi-rFI/strings.xml +++ b/drop-in/src/main/res/values-fi-rFI/strings.xml @@ -24,8 +24,8 @@ Käytetyt Poista Maks. %s sallittu tapahtumaa kohti tällä lahjakortilla - Vahvista kortin poisto - Poistetaanko lisätyt lahjakortit? + Vahvista poisto + Poistetaanko käytetyt kohteet? Kyllä, poista Peruuta Poista tallennettu maksutapa diff --git a/drop-in/src/main/res/values-fr-rFR/strings.xml b/drop-in/src/main/res/values-fr-rFR/strings.xml index 7585ce0628..bc1833ce69 100644 --- a/drop-in/src/main/res/values-fr-rFR/strings.xml +++ b/drop-in/src/main/res/values-fr-rFR/strings.xml @@ -24,8 +24,8 @@ Appliquée Supprimer Montant maximum autorisé par transaction avec cette carte cadeau : %s - Confirmer la suppression de la carte - Supprimer les cartes-cadeaux ajoutées ? + Confirmer la suppression + Supprimer les éléments appliqués ? Oui, supprimer Annuler Supprimer le mode de paiement enregistré diff --git a/drop-in/src/main/res/values-hr-rHR/strings.xml b/drop-in/src/main/res/values-hr-rHR/strings.xml index db04821da5..cb44fa6017 100644 --- a/drop-in/src/main/res/values-hr-rHR/strings.xml +++ b/drop-in/src/main/res/values-hr-rHR/strings.xml @@ -24,8 +24,8 @@ Primijenjeni Ukloni Na ovoj je poklon-kartici maks. dopušteno %s po transakciji - Potvrdite uklanjanje kartice - Ukloniti dodane poklon-kartice? + Potvrdite uklanjanje + Ukloniti primijenjene stavke? Da, ukloni Otkaži Uklonite pohranjeni način plaćanja diff --git a/drop-in/src/main/res/values-hu-rHU/strings.xml b/drop-in/src/main/res/values-hu-rHU/strings.xml index 340fa0ff46..2f29403d21 100644 --- a/drop-in/src/main/res/values-hu-rHU/strings.xml +++ b/drop-in/src/main/res/values-hu-rHU/strings.xml @@ -24,8 +24,8 @@ Alkalmazott Eltávolítás Ezen az ajándékkártyán a tranzakciónként engedélyezett maximális összeg %s - Kártya eltávolításának megerősítése - Eltávolítja a hozzáadott ajándékkártyákat? + Eltávolítás megerősítése + Eltávolítja az alkalmazott elemeket? Igen, eltávolítom Mégse Tárolt fizetési mód eltávolítása diff --git a/drop-in/src/main/res/values-is-rIS/strings.xml b/drop-in/src/main/res/values-is-rIS/strings.xml index 57bf1b070c..c2a8d97faa 100644 --- a/drop-in/src/main/res/values-is-rIS/strings.xml +++ b/drop-in/src/main/res/values-is-rIS/strings.xml @@ -24,8 +24,8 @@ Notaðar Fjarlægja Hám. %s leyfð fyrir hverja færslu á þessu gjafakorti - Staðfesta að kort hafi verið fjarlægt - Fjarlægja gjafakort sem bætt var við? + Staðfesta fjarlægingu + Fjarlægja notuð atriði? Já, fjarlægja Hætta við Fjarlægja geymdan greiðslumáta diff --git a/drop-in/src/main/res/values-it-rIT/strings.xml b/drop-in/src/main/res/values-it-rIT/strings.xml index 1ef8c2e05a..45bb470369 100644 --- a/drop-in/src/main/res/values-it-rIT/strings.xml +++ b/drop-in/src/main/res/values-it-rIT/strings.xml @@ -24,8 +24,8 @@ Applicato Rimuovi Importo massimo di %s per transazione su questo buono regalo - Conferma rimozione della carta - Rimuovere le carte regalo aggiunte? + Conferma rimozione + Rimuovere gli elementi applicati? Sì, rimuoverli Cancella Rimuovi il metodo di pagamento archiviato diff --git a/drop-in/src/main/res/values-ja-rJP/strings.xml b/drop-in/src/main/res/values-ja-rJP/strings.xml index e8179ba018..e4fef06ecc 100644 --- a/drop-in/src/main/res/values-ja-rJP/strings.xml +++ b/drop-in/src/main/res/values-ja-rJP/strings.xml @@ -24,8 +24,8 @@ 適用済み 削除 このギフトカードでの取引ごとに許可される最大%s - カードの削除を確認する - 追加したギフトカードを削除しますか？ + 削除を確認 + 適用されたアイテムを削除しますか？ はい、削除します キャンセル 保存されている支払方法を削除する diff --git a/drop-in/src/main/res/values-ko-rKR/strings.xml b/drop-in/src/main/res/values-ko-rKR/strings.xml index 72f47f09a6..96cff1f36e 100644 --- a/drop-in/src/main/res/values-ko-rKR/strings.xml +++ b/drop-in/src/main/res/values-ko-rKR/strings.xml @@ -24,8 +24,8 @@ 적용된 삭제 이 기프트카드로 건당 결제 가능한 최고 액수는 %s - 카드 삭제 확인 - 추가된 기프트 카드를 삭제할까요? + 삭제 확인 + 적용된 항목을 삭제하시겠습니까? 예, 삭제합니다 취소 저장된 결제 수단 삭제 diff --git a/drop-in/src/main/res/values-lt-rLT/strings.xml b/drop-in/src/main/res/values-lt-rLT/strings.xml index 71efebe558..7c6bee0a3f 100644 --- a/drop-in/src/main/res/values-lt-rLT/strings.xml +++ b/drop-in/src/main/res/values-lt-rLT/strings.xml @@ -24,8 +24,8 @@ Taikomi Pašalinti Maks. Vienai šios dovanų kortelės operacijai leidžiama %s - Patvirtinkite kortelės išėmimą - Pašalinti pridėtas dovanų korteles? + Patvirtinkite pašalinimą + Pašalinti pritaikytus elementus? Taip, pašalinti Atšaukti Pašalinti išsaugotą mokėjimo būdą diff --git a/drop-in/src/main/res/values-lv-rLV/strings.xml b/drop-in/src/main/res/values-lv-rLV/strings.xml index 665da6469a..821850197f 100644 --- a/drop-in/src/main/res/values-lv-rLV/strings.xml +++ b/drop-in/src/main/res/values-lv-rLV/strings.xml @@ -24,8 +24,8 @@ Piemērots Noņemt Maksimālā %s, kas atļauta katram darījumam ar šo dāvanu karti - Apstipriniet kartes noņemšanu - Vai noņemt pievienotās dāvanu kartes? + Apstipriniet noņemšanu + Vai noņemt piemērotos vienumus? Jā, noņemt Atcelt Noņemt saglabāto samaksas veidu diff --git a/drop-in/src/main/res/values-nb-rNO/strings.xml b/drop-in/src/main/res/values-nb-rNO/strings.xml index 2f53466fbb..5b0285dbc7 100644 --- a/drop-in/src/main/res/values-nb-rNO/strings.xml +++ b/drop-in/src/main/res/values-nb-rNO/strings.xml @@ -24,8 +24,8 @@ Anvendt Fjern Maksimalt %s per transaksjon er tillatt på dette gavekortet - Bekreft fjerning av kort - Vil du fjerne gavekort som er lagt til? + Bekreft fjerning + Vil du fjerne de brukte elementene? Ja, fjern Avbryt Fjern lagret betalingsmetode diff --git a/drop-in/src/main/res/values-nl-rNL/strings.xml b/drop-in/src/main/res/values-nl-rNL/strings.xml index 79d57f3167..53048a51f6 100644 --- a/drop-in/src/main/res/values-nl-rNL/strings.xml +++ b/drop-in/src/main/res/values-nl-rNL/strings.xml @@ -24,8 +24,8 @@ Toegepast Verwijderen Max. %s toegestaan per transactie met deze cadeaubon - Verwijdering van kaart bevestigen - Toegevoegde cadeaukaarten verwijderen? + Verwijdering bevestigen + Toegepaste artikelen verwijderen? Ja, verwijderen Annuleren Opgeslagen betalingsmethode verwijderen diff --git a/drop-in/src/main/res/values-pl-rPL/strings.xml b/drop-in/src/main/res/values-pl-rPL/strings.xml index ce5256e90d..d8e653d514 100644 --- a/drop-in/src/main/res/values-pl-rPL/strings.xml +++ b/drop-in/src/main/res/values-pl-rPL/strings.xml @@ -24,8 +24,8 @@ Stosowane Usuń Maks. dozwolona kwota (%s) na transakcję tą kartą upominkową - Potwierdź usunięcie karty - Usunąć dodane karty podarunkowe? + Potwierdź usunięcie + Usunąć zastosowane elementy? Tak, usuń Anuluj Usuń zapisaną metodę płatności diff --git a/drop-in/src/main/res/values-pt-rBR/strings.xml b/drop-in/src/main/res/values-pt-rBR/strings.xml index d0b4ab611a..e59fde9b56 100644 --- a/drop-in/src/main/res/values-pt-rBR/strings.xml +++ b/drop-in/src/main/res/values-pt-rBR/strings.xml @@ -24,8 +24,8 @@ Aplicado Remover Máximo de %s permitido por transação neste cartão-presente - Confirme a remoção do cartão - Remover vales-presente adicionados? + Confirme a remoção + Remover itens aplicados? Sim, remover Cancelar Remover método de pagamento armazenado diff --git a/drop-in/src/main/res/values-pt-rPT/strings.xml b/drop-in/src/main/res/values-pt-rPT/strings.xml index 19102fedb1..42b655d3ee 100644 --- a/drop-in/src/main/res/values-pt-rPT/strings.xml +++ b/drop-in/src/main/res/values-pt-rPT/strings.xml @@ -24,8 +24,8 @@ Aplicado Remover Máximo de %s permitido por transação neste cartão presente - Confirmar a remoção do cartão - Remover os cartões de presentes adicionados? + Confirmar remoção + Remover itens aplicados? Sim, remover Cancelar Remover método de pagamento guardado diff --git a/drop-in/src/main/res/values-ro-rRO/strings.xml b/drop-in/src/main/res/values-ro-rRO/strings.xml index 1681b9147c..524600a2db 100644 --- a/drop-in/src/main/res/values-ro-rRO/strings.xml +++ b/drop-in/src/main/res/values-ro-rRO/strings.xml @@ -24,8 +24,8 @@ Aplicate Ștergere Pentru acest card cadou, suma maximă permisă per tranzacție este de %s - Confirmați eliminarea cardului - Eliminați cardurile cadou adăugate? + Confirmați eliminarea + Eliminați elementele aplicate? Da, șterge Anulare Ștergeți metoda de plată memorată diff --git a/drop-in/src/main/res/values-ru-rRU/strings.xml b/drop-in/src/main/res/values-ru-rRU/strings.xml index 3193e63dc9..bddbdaaaeb 100644 --- a/drop-in/src/main/res/values-ru-rRU/strings.xml +++ b/drop-in/src/main/res/values-ru-rRU/strings.xml @@ -24,8 +24,8 @@ Применяется Удалить Максимальная сумма операции по этой подарочной карте: %s - Подтвердите удаление карты - Удалить добавленные подарочные карты? + Подтвердить удаление + Удалить примененные элементы? Да, удалить Отменить Удалить сохраненный способ оплаты diff --git a/drop-in/src/main/res/values-sk-rSK/strings.xml b/drop-in/src/main/res/values-sk-rSK/strings.xml index 9806625825..8b86911f92 100644 --- a/drop-in/src/main/res/values-sk-rSK/strings.xml +++ b/drop-in/src/main/res/values-sk-rSK/strings.xml @@ -24,8 +24,8 @@ Použité Odstrániť Pre transakciu s touto darčekovou kartou je povolené maximum %s - Potvrďte odstránenie karty - Odstrániť pridané darčekové karty? + Potvrďte odstránenie + Chcete odstrániť použité položky? Áno, odstrániť Zrušiť Odstrániť uložený spôsob platby diff --git a/drop-in/src/main/res/values-sl-rSI/strings.xml b/drop-in/src/main/res/values-sl-rSI/strings.xml index 2e6de8d973..ac53c3df2e 100644 --- a/drop-in/src/main/res/values-sl-rSI/strings.xml +++ b/drop-in/src/main/res/values-sl-rSI/strings.xml @@ -24,8 +24,8 @@ Uporabljeno Odstrani Za posamezno transakcijo na tej darilni kartici je dovoljeno največ %s - Potrdite odstranitev kartice - Želite odstraniti dodane darilne kartice? + Potrdite odstranitev + Želite odstraniti uporabljene elemente? Da, odstrani Prekliči Odstrani shranjen način plačila diff --git a/drop-in/src/main/res/values-sv-rSE/strings.xml b/drop-in/src/main/res/values-sv-rSE/strings.xml index 095e54296f..83ecbdefb5 100644 --- a/drop-in/src/main/res/values-sv-rSE/strings.xml +++ b/drop-in/src/main/res/values-sv-rSE/strings.xml @@ -24,8 +24,8 @@ Tillämpade Ta bort Maximalt %s per transaktion är tillåtet på detta presentkort - Bekräfta borttagning av kort - Ta bort tillagda presentkort? + Bekräfta borttagning + Vill du ta bort tillämpade objekt? Ja, ta bort Avbryt Ta bort sparat betalningssätt diff --git a/drop-in/src/main/res/values-zh-rCN/strings.xml b/drop-in/src/main/res/values-zh-rCN/strings.xml index ec3e1009a5..3e335058e9 100644 --- a/drop-in/src/main/res/values-zh-rCN/strings.xml +++ b/drop-in/src/main/res/values-zh-rCN/strings.xml @@ -24,8 +24,8 @@ 已应用 删除 此礼品卡上每笔交易允许的最大金额为 %s - 确认删除卡片 - 删除已添加礼品卡？ + 确认移除 + 删除已应用的项目？ 是，删除 取消 删除存储的支付方式 diff --git a/drop-in/src/main/res/values-zh-rTW/strings.xml b/drop-in/src/main/res/values-zh-rTW/strings.xml index f62c6b0102..341d4c5a4b 100644 --- a/drop-in/src/main/res/values-zh-rTW/strings.xml +++ b/drop-in/src/main/res/values-zh-rTW/strings.xml @@ -24,8 +24,8 @@ 已套用 移除 此禮品卡每筆交易的金額上限為 %s - 確認移除該卡 - 移除已新增禮品卡？ + 確認移除 + 移除已套用的項目？ 是，請移除 取消 移除已儲存付款方式 diff --git a/drop-in/src/main/res/values/strings.xml b/drop-in/src/main/res/values/strings.xml index af716417cb..bac8a6f5a1 100644 --- a/drop-in/src/main/res/values/strings.xml +++ b/drop-in/src/main/res/values/strings.xml @@ -24,8 +24,8 @@ Applied Remove Max. %s allowed per transaction on this gift card - Confirm card removal - Remove added giftcards? + Confirm removal + Remove applied items? Yes, remove Cancel Remove stored payment method From 8478c3956456c703db632ffc4d436c5af4128cc3 Mon Sep 17 00:00:00 2001 From: Joseph Jreij Date: Tue, 8 Oct 2024 14:44:43 +0200 Subject: [PATCH 268/299] Add twint to payment methods docs readme --- docs/payment-methods/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/payment-methods/README.md b/docs/payment-methods/README.md index 111bb291ae..fb1fcd8df0 100644 --- a/docs/payment-methods/README.md +++ b/docs/payment-methods/README.md @@ -7,3 +7,4 @@ Please see the list of documentation below: | [Address lookup for cards](CARD_ADDRESS_LOOKUP.md) | Additional address configuration which allows suggesting addresses to the shopper when they enter data into the address input | | [French meal vouchers](FRENCH_MEAL_VOUCHER.md) | Implementation guide for French meal vouchers | | [Gift cards](GIFT_CARD.md) | Implementation guide for Gift cards | +| [Twint](TWINT.md) | Implementation guide for Twint | From c4ccf7f01e25d64e7d91024a7d613b1bc607b111 Mon Sep 17 00:00:00 2001 From: josephj Date: Wed, 9 Oct 2024 17:14:14 +0200 Subject: [PATCH 269/299] Explicitly include androidx.activity:activity in gradle --- components-core/build.gradle | 1 + dependencies.gradle | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/components-core/build.gradle b/components-core/build.gradle index f2d1c525b3..8e357861ec 100644 --- a/components-core/build.gradle +++ b/components-core/build.gradle @@ -42,6 +42,7 @@ dependencies { // Dependencies api libraries.kotlinCoroutines + api libraries.androidx.activity api libraries.androidx.fragment api libraries.androidx.lifecycle diff --git a/dependencies.gradle b/dependencies.gradle index 32d56f0416..84ce8b5a81 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,19 +35,20 @@ ext { binary_compatibility_validator_version = "0.16.0" // Android Dependencies + activity_version = "1.9.2" annotation_version = "1.8.0" appcompat_version = "1.7.0" autofill_version = "1.3.0-alpha01" browser_version = "1.8.0" coroutines_version = "1.8.1" - fragment_version = "1.8.1" + fragment_version = "1.8.3" lifecycle_version = "2.8.3" material_version = "1.12.0" recyclerview_version = "1.3.2" constraintlayout_version = '2.1.4' // Compose Dependencies - compose_activity_version = '1.9.0' + compose_activity_version = '1.9.2' compose_bom_version = '2024.06.00' compose_hilt_version = '1.2.0' compose_viewmodel_version = '2.8.3' @@ -91,6 +92,7 @@ ext { libraries = [ adyen3ds2 : "com.adyen.threeds:adyen-3ds2:$adyen3ds2_version", androidx : [ + activity : "androidx.activity:activity:$activity_version", annotation : "androidx.annotation:annotation:$annotation_version", appcompat : "androidx.appcompat:appcompat:$appcompat_version", autofill : "androidx.autofill:autofill:$autofill_version", From 46b2e8fc02da5c7814ba629f9583325d338948fb Mon Sep 17 00:00:00 2001 From: josephj Date: Wed, 9 Oct 2024 17:14:23 +0200 Subject: [PATCH 270/299] Update verification-metadata.xml --- gradle/verification-metadata.xml | 50 ++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index a0f46268a8..f30444fdda 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -92,6 +92,14 @@ + + + + + + + + @@ -108,6 +116,14 @@ + + + + + + + + @@ -153,6 +169,14 @@ + + + + + + + + @@ -2544,6 +2568,14 @@ + + + + + + + + @@ -2576,6 +2608,14 @@ + + + + + + + + @@ -3209,6 +3249,11 @@ + + + + + @@ -3426,6 +3471,11 @@ + + + + + From 773bb75d42144529cab64b8d1c43af09461381b3 Mon Sep 17 00:00:00 2001 From: josephj Date: Wed, 9 Oct 2024 17:14:31 +0200 Subject: [PATCH 271/299] Update release notes --- RELEASE_NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 04976b4a51..3ffc47a005 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -33,6 +33,9 @@ | Name | Version | |--------------------------------------------------------------------------------------------------------|-------------------------------| | [Adyen 3DS2](https://github.com/Adyen/adyen-3ds2-android/releases/tag/2.2.20) | **2.2.20** | + | [AndroidX Fragment](https://developer.android.com/jetpack/androidx/releases/fragment#1.8.3) | **1.8.3** | + | [AndroidX Activity](https://developer.android.com/jetpack/androidx/releases/activity#1.9.2) | **1.9.2** | + | [AndroidX Compose Activity](https://developer.android.com/jetpack/androidx/releases/activity#1.9.2) | **1.9.2** | ## Fixed - JSON deserialization no longer returns the coerced `"null"` string when parsing JSON objects with explicit null values. From 0221fe76c23a3c2541ba8e2dbea57527f293099c Mon Sep 17 00:00:00 2001 From: josephj Date: Thu, 10 Oct 2024 10:03:02 +0200 Subject: [PATCH 272/299] Fix onNewIntent in DropInActivity --- .../adyen/checkout/dropin/internal/ui/DropInActivity.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInActivity.kt b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInActivity.kt index 106bc6a05f..609b6b8783 100644 --- a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInActivity.kt +++ b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInActivity.kt @@ -198,14 +198,10 @@ internal class DropInActivity : fragment.handleActivityResult(resultCode, data) } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) adyenLog(AdyenLogLevel.DEBUG) { "onNewIntent" } - if (intent != null) { - handleIntent(intent) - } else { - adyenLog(AdyenLogLevel.ERROR) { "Null intent" } - } + handleIntent(intent) } override fun onStart() { From 1d111b150e9e011b0443bf732d7af2e1a0bca7ed Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Wed, 2 Oct 2024 14:07:05 +0200 Subject: [PATCH 273/299] Add CardNumberValidator COAND-985 --- .../card/internal/ui/view/CardNumberInput.kt | 4 +- .../card/internal/util/CardValidationUtils.kt | 46 ++++----------- checkout-core/api/checkout-core.api | 17 ++++++ .../validation/CardNumberValidationResult.kt | 17 ++++++ .../core/ui/validation/CardNumberValidator.kt | 57 +++++++++++++++++++ 5 files changed, 104 insertions(+), 37 deletions(-) create mode 100644 checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidationResult.kt create mode 100644 checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardNumberInput.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardNumberInput.kt index 47e70e3e79..3219cfdf03 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardNumberInput.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardNumberInput.kt @@ -16,7 +16,7 @@ import android.text.method.DigitsKeyListener import android.util.AttributeSet import androidx.annotation.RestrictTo import com.adyen.checkout.card.internal.util.CardNumberUtils -import com.adyen.checkout.card.internal.util.CardValidationUtils +import com.adyen.checkout.core.ui.validation.CardNumberValidator import com.adyen.checkout.ui.core.internal.ui.view.AdyenTextInputEditText /** @@ -36,7 +36,7 @@ constructor( get() = text.toString().replace(DIGIT_SEPARATOR, "") init { - enforceMaxInputLength(CardValidationUtils.MAXIMUM_CARD_NUMBER_LENGTH + MAX_DIGIT_SEPARATOR_COUNT) + enforceMaxInputLength(CardNumberValidator.MAXIMUM_CARD_NUMBER_LENGTH + MAX_DIGIT_SEPARATOR_COUNT) inputType = InputType.TYPE_CLASS_NUMBER keyListener = DigitsKeyListener.getInstance(SUPPORTED_DIGITS + DIGIT_SEPARATOR) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index 35e15ed185..02a11782d5 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -18,6 +18,8 @@ import com.adyen.checkout.card.internal.ui.model.InputFieldUIState import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.core.internal.util.StringUtil +import com.adyen.checkout.core.ui.validation.CardNumberValidationResult +import com.adyen.checkout.core.ui.validation.CardNumberValidator import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationResult import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationUtils @@ -27,14 +29,6 @@ import java.util.GregorianCalendar @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) object CardValidationUtils { - // Luhn Check - private const val RADIX = 10 - private const val FIVE_DIGIT = 5 - - // Card Number - private const val MINIMUM_CARD_NUMBER_LENGTH = 12 - const val MAXIMUM_CARD_NUMBER_LENGTH = 19 - // Security Code private const val GENERAL_CARD_SECURITY_CODE_SIZE = 3 private const val AMEX_SECURITY_CODE_SIZE = 4 @@ -43,35 +37,17 @@ object CardValidationUtils { * Validate card number. */ fun validateCardNumber(number: String, enableLuhnCheck: Boolean, isBrandSupported: Boolean): CardNumberValidation { - val normalizedNumber = StringUtil.normalize(number) - val length = normalizedNumber.length - return when { - !StringUtil.isDigitsAndSeparatorsOnly(normalizedNumber) -> CardNumberValidation.INVALID_ILLEGAL_CHARACTERS - length > MAXIMUM_CARD_NUMBER_LENGTH -> CardNumberValidation.INVALID_TOO_LONG - length < MINIMUM_CARD_NUMBER_LENGTH -> CardNumberValidation.INVALID_TOO_SHORT - !isBrandSupported -> CardNumberValidation.INVALID_UNSUPPORTED_BRAND - enableLuhnCheck && !isLuhnChecksumValid(normalizedNumber) -> CardNumberValidation.INVALID_LUHN_CHECK - else -> CardNumberValidation.VALID - } - } - - @Suppress("MagicNumber") - private fun isLuhnChecksumValid(normalizedNumber: String): Boolean { - var s1 = 0 - var s2 = 0 - val reverse = StringBuffer(normalizedNumber).reverse().toString() - for (i in reverse.indices) { - val digit = Character.digit(reverse[i], RADIX) - if (i % 2 == 0) { - s1 += digit - } else { - s2 += 2 * digit - if (digit >= FIVE_DIGIT) { - s2 -= 9 - } + val validation = CardNumberValidator.validateCardNumber(number, enableLuhnCheck) + return when (validation) { + CardNumberValidationResult.INVALID_ILLEGAL_CHARACTERS -> CardNumberValidation.INVALID_ILLEGAL_CHARACTERS + CardNumberValidationResult.INVALID_TOO_LONG -> CardNumberValidation.INVALID_TOO_LONG + CardNumberValidationResult.INVALID_TOO_SHORT -> CardNumberValidation.INVALID_TOO_SHORT + CardNumberValidationResult.INVALID_LUHN_CHECK -> CardNumberValidation.INVALID_LUHN_CHECK + CardNumberValidationResult.VALID -> when { + !isBrandSupported -> CardNumberValidation.INVALID_UNSUPPORTED_BRAND + else -> CardNumberValidation.VALID } } - return (s1 + s2) % 10 == 0 } /** diff --git a/checkout-core/api/checkout-core.api b/checkout-core/api/checkout-core.api index 75f489a851..e65d6ba0ea 100644 --- a/checkout-core/api/checkout-core.api +++ b/checkout-core/api/checkout-core.api @@ -150,3 +150,20 @@ public final class com/adyen/checkout/core/internal/ui/DefaultImageLoader$Compan public abstract interface annotation class com/adyen/checkout/core/internal/util/Logger$LogLevel : java/lang/annotation/Annotation { } +public final class com/adyen/checkout/core/ui/validation/CardNumberValidationResult : java/lang/Enum { + public static final field INVALID_ILLEGAL_CHARACTERS Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; + public static final field INVALID_LUHN_CHECK Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; + public static final field INVALID_TOO_LONG Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; + public static final field INVALID_TOO_SHORT Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; + public static final field VALID Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public static fun valueOf (Ljava/lang/String;)Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; + public static fun values ()[Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; +} + +public final class com/adyen/checkout/core/ui/validation/CardNumberValidator { + public static final field INSTANCE Lcom/adyen/checkout/core/ui/validation/CardNumberValidator; + public static final field MAXIMUM_CARD_NUMBER_LENGTH I + public final fun validateCardNumber (Ljava/lang/String;Z)Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; +} + diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidationResult.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidationResult.kt new file mode 100644 index 0000000000..cbe3e3ed74 --- /dev/null +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidationResult.kt @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 1/10/2024. + */ + +package com.adyen.checkout.core.ui.validation + +enum class CardNumberValidationResult { + INVALID_ILLEGAL_CHARACTERS, + INVALID_TOO_LONG, + INVALID_TOO_SHORT, + INVALID_LUHN_CHECK, + VALID +} diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt new file mode 100644 index 0000000000..a982f530bd --- /dev/null +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 4/10/2024. + */ + +package com.adyen.checkout.core.ui.validation + +import com.adyen.checkout.core.internal.util.StringUtil + +object CardNumberValidator { + + // Luhn Check + private const val RADIX = 10 + private const val FIVE_DIGIT = 5 + + // Card Number + private const val MINIMUM_CARD_NUMBER_LENGTH = 12 + const val MAXIMUM_CARD_NUMBER_LENGTH = 19 + + fun validateCardNumber(number: String, enableLuhnCheck: Boolean): CardNumberValidationResult { + val normalizedNumber = StringUtil.normalize(number) + val length = normalizedNumber.length + return when { + !StringUtil.isDigitsAndSeparatorsOnly(normalizedNumber) -> + CardNumberValidationResult.INVALID_ILLEGAL_CHARACTERS + + length > MAXIMUM_CARD_NUMBER_LENGTH -> CardNumberValidationResult.INVALID_TOO_LONG + length < MINIMUM_CARD_NUMBER_LENGTH -> CardNumberValidationResult.INVALID_TOO_SHORT + enableLuhnCheck && !isLuhnChecksumValid(normalizedNumber) -> + CardNumberValidationResult.INVALID_LUHN_CHECK + + else -> CardNumberValidationResult.VALID + } + } + + @Suppress("MagicNumber") + private fun isLuhnChecksumValid(normalizedNumber: String): Boolean { + var s1 = 0 + var s2 = 0 + val reverse = StringBuffer(normalizedNumber).reverse().toString() + for (i in reverse.indices) { + val digit = Character.digit(reverse[i], RADIX) + if (i % 2 == 0) { + s1 += digit + } else { + s2 += 2 * digit + if (digit >= FIVE_DIGIT) { + s2 -= 9 + } + } + } + return (s1 + s2) % 10 == 0 + } +} From 180b84b5f4c38da34447b70d65a349501d15ea52 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Fri, 4 Oct 2024 14:25:40 +0200 Subject: [PATCH 274/299] Make ExpiryDateValidationUtils public and rename it to CardExpiryDateValidator COAND-985 --- .../card/internal/ui/DefaultCardDelegate.kt | 2 +- .../card/internal/ui/StoredCardDelegate.kt | 4 +-- .../card/internal/ui/model/CardInputData.kt | 2 +- .../card/internal/ui/model/CardOutputData.kt | 2 +- .../card/internal/ui/view/CardView.kt | 2 +- .../card/internal/util/CardValidationUtils.kt | 20 +++++------ .../internal/ui/DefaultCardDelegateTest.kt | 2 +- .../internal/ui/StoredCardDelegateTest.kt | 2 +- .../internal/util/CardValidationUtilsTest.kt | 34 +++++++++--------- checkout-core/api/checkout-core.api | 36 +++++++++++++++++++ .../checkout/core}/ui/model/ExpiryDate.kt | 7 ++-- .../CardExpiryDateValidationResult.kt | 7 ++-- .../ui/validation/CardExpiryDateValidator.kt | 24 +++++++------ .../validation/CardExpiryDateValidatorTest.kt | 30 ++++++++-------- .../internal/ui/DefaultGiftCardDelegate.kt | 2 +- .../internal/ui/model/GiftCardInputData.kt | 2 +- .../internal/ui/model/GiftCardOutputData.kt | 2 +- .../internal/util/DefaultGiftCardValidator.kt | 2 +- .../internal/util/GiftCardValidationUtils.kt | 2 +- .../internal/util/GiftCardValidator.kt | 2 +- .../ui/DefaultGiftCardDelegateTest.kt | 2 +- .../util/MealVoucherFRValidationUtils.kt | 18 +++++----- .../internal/util/MealVoucherFRValidator.kt | 2 +- ui-core/api/ui-core.api | 7 ++-- .../core/internal/ui/view/ExpiryDateInput.kt | 2 +- 25 files changed, 123 insertions(+), 94 deletions(-) rename {ui-core/src/main/java/com/adyen/checkout/ui/core/internal => checkout-core/src/main/java/com/adyen/checkout/core}/ui/model/ExpiryDate.kt (69%) rename ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationResult.kt => checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt (63%) rename ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt => checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt (77%) rename ui-core/src/test/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtilsTest.kt => checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt (74%) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt index 2b576aceb7..930f1c3dd0 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt @@ -56,6 +56,7 @@ import com.adyen.checkout.core.exception.CheckoutException import com.adyen.checkout.core.exception.ComponentException import com.adyen.checkout.core.internal.util.adyenLog import com.adyen.checkout.core.internal.util.runCompileOnly +import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.cse.EncryptedCard import com.adyen.checkout.cse.EncryptionException import com.adyen.checkout.cse.UnencryptedCard @@ -72,7 +73,6 @@ import com.adyen.checkout.ui.core.internal.ui.SubmitHandler import com.adyen.checkout.ui.core.internal.ui.model.AddressListItem import com.adyen.checkout.ui.core.internal.ui.model.AddressOutputData import com.adyen.checkout.ui.core.internal.ui.model.AddressParams -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.util.AddressFormUtils import com.adyen.checkout.ui.core.internal.util.AddressValidationUtils import com.adyen.checkout.ui.core.internal.util.SocialSecurityNumberUtils diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt index 572a6341b1..c1faaa7ee2 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt @@ -44,6 +44,7 @@ import com.adyen.checkout.core.exception.CheckoutException import com.adyen.checkout.core.exception.ComponentException import com.adyen.checkout.core.internal.util.adyenLog import com.adyen.checkout.core.internal.util.runCompileOnly +import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.cse.EncryptedCard import com.adyen.checkout.cse.EncryptionException import com.adyen.checkout.cse.UnencryptedCard @@ -55,7 +56,6 @@ import com.adyen.checkout.ui.core.internal.ui.PaymentComponentUIEvent import com.adyen.checkout.ui.core.internal.ui.PaymentComponentUIState import com.adyen.checkout.ui.core.internal.ui.SubmitHandler import com.adyen.checkout.ui.core.internal.ui.model.AddressOutputData -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.util.AddressValidationUtils import com.adyen.threeds2.ThreeDS2Service import kotlinx.coroutines.CoroutineScope @@ -160,7 +160,7 @@ internal class StoredCardDelegate( val event = GenericEvents.rendered( component = storedPaymentMethod.type.orEmpty(), isStoredPaymentMethod = true, - configData = cardConfigDataGenerator.generate(configuration = componentParams, isStored = true) + configData = cardConfigDataGenerator.generate(configuration = componentParams, isStored = true), ) analyticsManager.trackEvent(event) } diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardInputData.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardInputData.kt index 2197aef39a..78bac07412 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardInputData.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardInputData.kt @@ -11,8 +11,8 @@ import androidx.annotation.RestrictTo import com.adyen.checkout.card.internal.ui.view.InstallmentModel import com.adyen.checkout.components.core.internal.ui.model.AddressInputModel import com.adyen.checkout.components.core.internal.ui.model.InputData +import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.ui.model.AddressLookupInputData -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) data class CardInputData( diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardOutputData.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardOutputData.kt index 75ee9203b0..5924989623 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardOutputData.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardOutputData.kt @@ -13,9 +13,9 @@ import com.adyen.checkout.card.internal.data.model.DetectedCardType import com.adyen.checkout.card.internal.ui.view.InstallmentModel import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.OutputData +import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.ui.AddressFormUIState import com.adyen.checkout.ui.core.internal.ui.model.AddressOutputData -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) data class CardOutputData( diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt index e68b4c0274..e53b4342d4 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt @@ -38,11 +38,11 @@ import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.core.exception.CheckoutException import com.adyen.checkout.core.internal.util.BuildUtils +import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.ui.AddressFormUIState import com.adyen.checkout.ui.core.internal.ui.ComponentView import com.adyen.checkout.ui.core.internal.ui.loadLogo import com.adyen.checkout.ui.core.internal.ui.model.AddressOutputData -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.ui.view.AdyenTextInputEditText import com.adyen.checkout.ui.core.internal.ui.view.RoundCornerImageView import com.adyen.checkout.ui.core.internal.ui.view.SecurityCodeInput diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index 02a11782d5..e033c46ade 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -18,11 +18,11 @@ import com.adyen.checkout.card.internal.ui.model.InputFieldUIState import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.core.internal.util.StringUtil +import com.adyen.checkout.core.ui.model.ExpiryDate +import com.adyen.checkout.core.ui.validation.CardExpiryDateValidationResult +import com.adyen.checkout.core.ui.validation.CardExpiryDateValidator import com.adyen.checkout.core.ui.validation.CardNumberValidationResult import com.adyen.checkout.core.ui.validation.CardNumberValidator -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate -import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationResult -import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationUtils import java.util.Calendar import java.util.GregorianCalendar @@ -59,7 +59,7 @@ object CardValidationUtils { calendar: Calendar = GregorianCalendar.getInstance() ): FieldState { val expiryDateValidationResult = - ExpiryDateValidationUtils.validateExpiryDate(expiryDate, calendar) + CardExpiryDateValidator.validateExpiryDate(expiryDate, calendar) val validation = generateExpiryDateValidation(fieldPolicy, expiryDateValidationResult) return FieldState(expiryDate, validation) @@ -68,21 +68,21 @@ object CardValidationUtils { @VisibleForTesting internal fun generateExpiryDateValidation( fieldPolicy: Brand.FieldPolicy?, - expiryDateValidationResult: ExpiryDateValidationResult, + expiryDateValidationResult: CardExpiryDateValidationResult, ): Validation { return when (expiryDateValidationResult) { - ExpiryDateValidationResult.VALID -> Validation.Valid + CardExpiryDateValidationResult.VALID -> Validation.Valid - ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> + CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_far_in_future) - ExpiryDateValidationResult.INVALID_TOO_OLD -> + CardExpiryDateValidationResult.INVALID_TOO_OLD -> Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_old) - ExpiryDateValidationResult.INVALID_DATE_FORMAT -> + CardExpiryDateValidationResult.INVALID_DATE_FORMAT -> Validation.Invalid(R.string.checkout_expiry_date_not_valid) - ExpiryDateValidationResult.INVALID_OTHER_REASON -> if (fieldPolicy?.isRequired() == false) { + CardExpiryDateValidationResult.INVALID_OTHER_REASON -> if (fieldPolicy?.isRequired() == false) { Validation.Valid } else { Validation.Invalid(R.string.checkout_expiry_date_not_valid) diff --git a/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt index ec8f4148c6..205b79d52c 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt @@ -54,6 +54,7 @@ import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParam import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.core.Environment +import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.cse.internal.BaseCardEncryptor import com.adyen.checkout.cse.internal.BaseGenericEncryptor import com.adyen.checkout.cse.internal.TestCardEncryptor @@ -68,7 +69,6 @@ import com.adyen.checkout.ui.core.internal.ui.SubmitHandler import com.adyen.checkout.ui.core.internal.ui.model.AddressListItem import com.adyen.checkout.ui.core.internal.ui.model.AddressOutputData import com.adyen.checkout.ui.core.internal.ui.model.AddressParams -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.util.AddressFormUtils import com.adyen.threeds2.ThreeDS2Service import kotlinx.coroutines.CoroutineScope diff --git a/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt index 0776db0a95..ebec77abab 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt @@ -45,13 +45,13 @@ import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.components.core.paymentmethod.CardPaymentMethod import com.adyen.checkout.core.Environment +import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.cse.internal.BaseCardEncryptor import com.adyen.checkout.cse.internal.TestCardEncryptor import com.adyen.checkout.test.TestDispatcherExtension import com.adyen.checkout.ui.core.internal.ui.AddressFormUIState import com.adyen.checkout.ui.core.internal.ui.SubmitHandler import com.adyen.checkout.ui.core.internal.ui.model.AddressOutputData -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.util.AddressValidationUtils import com.adyen.threeds2.ThreeDS2Service import kotlinx.coroutines.CoroutineScope diff --git a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt index 14f87a9363..a09773aa66 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt @@ -16,8 +16,8 @@ import com.adyen.checkout.card.internal.data.model.DetectedCardType import com.adyen.checkout.card.internal.ui.model.InputFieldUIState import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate -import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationResult +import com.adyen.checkout.core.ui.model.ExpiryDate +import com.adyen.checkout.core.ui.validation.CardExpiryDateValidationResult import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.DisplayName @@ -181,7 +181,7 @@ internal class CardValidationUtilsTest { fun `date is valid, then result should be valid`() { val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.REQUIRED, - expiryDateValidationResult = ExpiryDateValidationResult.VALID, + expiryDateValidationResult = CardExpiryDateValidationResult.VALID, ) assertEquals(Validation.Valid, actual) @@ -191,7 +191,7 @@ internal class CardValidationUtilsTest { fun `date is too far in the future, then result should be invalid`() { val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.REQUIRED, - expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, + expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future @@ -202,7 +202,7 @@ internal class CardValidationUtilsTest { fun `date is too old, then result should be invalid`() { val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.REQUIRED, - expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_OLD, + expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_TOO_OLD, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old @@ -213,7 +213,7 @@ internal class CardValidationUtilsTest { fun `date is valid with field policy optional, then result should be valid`() { val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.OPTIONAL, - expiryDateValidationResult = ExpiryDateValidationResult.VALID, + expiryDateValidationResult = CardExpiryDateValidationResult.VALID, ) assertEquals(Validation.Valid, actual) @@ -223,7 +223,7 @@ internal class CardValidationUtilsTest { fun `date is valid with field policy hidden, then result should be valid`() { val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.HIDDEN, - expiryDateValidationResult = ExpiryDateValidationResult.VALID, + expiryDateValidationResult = CardExpiryDateValidationResult.VALID, ) assertEquals(Validation.Valid, actual) @@ -233,7 +233,7 @@ internal class CardValidationUtilsTest { fun `date is too far in the future with field policy optional, then result should be invalid`() { val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.OPTIONAL, - expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, + expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future @@ -244,7 +244,7 @@ internal class CardValidationUtilsTest { fun `date is too far in the future with field policy hidden, then result should be invalid`() { val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.HIDDEN, - expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, + expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future @@ -255,7 +255,7 @@ internal class CardValidationUtilsTest { fun `date is too old with field policy optional, then result should be invalid`() { val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.OPTIONAL, - expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_OLD, + expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_TOO_OLD, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old @@ -266,7 +266,7 @@ internal class CardValidationUtilsTest { fun `date is too old with field policy hidden, then result should be invalid`() { val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.HIDDEN, - expiryDateValidationResult = ExpiryDateValidationResult.INVALID_TOO_OLD, + expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_TOO_OLD, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old @@ -277,7 +277,7 @@ internal class CardValidationUtilsTest { fun `date is empty with field policy required, then result should be invalid`() { val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.REQUIRED, - expiryDateValidationResult = ExpiryDateValidationResult.INVALID_OTHER_REASON, + expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_OTHER_REASON, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid @@ -288,7 +288,7 @@ internal class CardValidationUtilsTest { fun `date is empty with field policy optional, then result should be valid`() { val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.OPTIONAL, - expiryDateValidationResult = ExpiryDateValidationResult.VALID, + expiryDateValidationResult = CardExpiryDateValidationResult.VALID, ) assertEquals(Validation.Valid, actual) @@ -298,7 +298,7 @@ internal class CardValidationUtilsTest { fun `date is empty with field policy hidden, then result should be valid`() { val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.HIDDEN, - expiryDateValidationResult = ExpiryDateValidationResult.VALID, + expiryDateValidationResult = CardExpiryDateValidationResult.VALID, ) assertEquals(Validation.Valid, actual) @@ -308,7 +308,7 @@ internal class CardValidationUtilsTest { fun `date is invalid with field policy required, then result should be invalid`() { val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.REQUIRED, - expiryDateValidationResult = ExpiryDateValidationResult.INVALID_DATE_FORMAT, + expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_DATE_FORMAT, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid @@ -319,7 +319,7 @@ internal class CardValidationUtilsTest { fun `date is invalid with field policy optional, then result should be invalid`() { val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.OPTIONAL, - expiryDateValidationResult = ExpiryDateValidationResult.INVALID_DATE_FORMAT, + expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_DATE_FORMAT, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid @@ -330,7 +330,7 @@ internal class CardValidationUtilsTest { fun `date is invalid with field policy hidden, then result should be invalid`() { val actual = CardValidationUtils.generateExpiryDateValidation( fieldPolicy = Brand.FieldPolicy.HIDDEN, - expiryDateValidationResult = ExpiryDateValidationResult.INVALID_DATE_FORMAT, + expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_DATE_FORMAT, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid diff --git a/checkout-core/api/checkout-core.api b/checkout-core/api/checkout-core.api index e65d6ba0ea..7398e2286f 100644 --- a/checkout-core/api/checkout-core.api +++ b/checkout-core/api/checkout-core.api @@ -150,6 +150,42 @@ public final class com/adyen/checkout/core/internal/ui/DefaultImageLoader$Compan public abstract interface annotation class com/adyen/checkout/core/internal/util/Logger$LogLevel : java/lang/annotation/Annotation { } +public final class com/adyen/checkout/core/ui/model/ExpiryDate { + public static final field Companion Lcom/adyen/checkout/core/ui/model/ExpiryDate$Companion; + public static final field EMPTY_DATE Lcom/adyen/checkout/core/ui/model/ExpiryDate; + public static final field INVALID_DATE Lcom/adyen/checkout/core/ui/model/ExpiryDate; + public fun (II)V + public final fun component1 ()I + public final fun component2 ()I + public final fun copy (II)Lcom/adyen/checkout/core/ui/model/ExpiryDate; + public static synthetic fun copy$default (Lcom/adyen/checkout/core/ui/model/ExpiryDate;IIILjava/lang/Object;)Lcom/adyen/checkout/core/ui/model/ExpiryDate; + public fun equals (Ljava/lang/Object;)Z + public final fun getExpiryMonth ()I + public final fun getExpiryYear ()I + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class com/adyen/checkout/core/ui/model/ExpiryDate$Companion { +} + +public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult : java/lang/Enum { + public static final field INVALID_DATE_FORMAT Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; + public static final field INVALID_OTHER_REASON Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; + public static final field INVALID_TOO_FAR_IN_THE_FUTURE Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; + public static final field INVALID_TOO_OLD Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; + public static final field VALID Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public static fun valueOf (Ljava/lang/String;)Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; + public static fun values ()[Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; +} + +public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidator { + public static final field INSTANCE Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidator; + public final fun validateExpiryDate (Lcom/adyen/checkout/core/ui/model/ExpiryDate;)Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; + public final fun validateExpiryDate (Lcom/adyen/checkout/core/ui/model/ExpiryDate;Ljava/util/Calendar;)Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; +} + public final class com/adyen/checkout/core/ui/validation/CardNumberValidationResult : java/lang/Enum { public static final field INVALID_ILLEGAL_CHARACTERS Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; public static final field INVALID_LUHN_CHECK Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/model/ExpiryDate.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/model/ExpiryDate.kt similarity index 69% rename from ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/model/ExpiryDate.kt rename to checkout-core/src/main/java/com/adyen/checkout/core/ui/model/ExpiryDate.kt index f175b67482..3d1f3e35c4 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/model/ExpiryDate.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/model/ExpiryDate.kt @@ -3,13 +3,10 @@ * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by ararat on 17/7/2024. + * Created by ozgur on 4/10/2024. */ -package com.adyen.checkout.ui.core.internal.ui.model +package com.adyen.checkout.core.ui.model -import androidx.annotation.RestrictTo - -@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) data class ExpiryDate( val expiryMonth: Int, val expiryYear: Int, diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationResult.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt similarity index 63% rename from ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationResult.kt rename to checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt index 398798f680..61d1a78b5e 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationResult.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt @@ -6,12 +6,9 @@ * Created by ozgur on 24/7/2024. */ -package com.adyen.checkout.ui.core.internal.util +package com.adyen.checkout.core.ui.validation -import androidx.annotation.RestrictTo - -@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) -enum class ExpiryDateValidationResult { +enum class CardExpiryDateValidationResult { VALID, INVALID_TOO_FAR_IN_THE_FUTURE, INVALID_TOO_OLD, diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt similarity index 77% rename from ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt rename to checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt index b59b0f7a0a..fb50da73b7 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtils.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt @@ -3,23 +3,25 @@ * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by ozgur on 23/7/2024. + * Created by ozgur on 4/10/2024. */ -package com.adyen.checkout.ui.core.internal.util +package com.adyen.checkout.core.ui.validation -import androidx.annotation.RestrictTo -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate +import com.adyen.checkout.core.ui.model.ExpiryDate import java.util.Calendar import java.util.GregorianCalendar -@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) -object ExpiryDateValidationUtils { +object CardExpiryDateValidator { // Date private const val MONTHS_IN_YEAR = 12 private const val MAXIMUM_YEARS_IN_FUTURE = 30 private const val MAXIMUM_EXPIRED_MONTHS = 3 + fun validateExpiryDate( + expiryDate: ExpiryDate + ) = validateExpiryDate(expiryDate, GregorianCalendar.getInstance()) + fun validateExpiryDate( expiryDate: ExpiryDate, calendar: Calendar @@ -30,16 +32,16 @@ object ExpiryDateValidationUtils { when { // higher than maxPast and lower than maxFuture - isInMinMonthRange && isInMaxYearRange -> ExpiryDateValidationResult.VALID - !isInMaxYearRange -> ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE + isInMinMonthRange && isInMaxYearRange -> CardExpiryDateValidationResult.VALID + !isInMaxYearRange -> CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE // Too old (!isInMinMonthRange) - else -> ExpiryDateValidationResult.INVALID_TOO_OLD + else -> CardExpiryDateValidationResult.INVALID_TOO_OLD } } - expiryDate == ExpiryDate.INVALID_DATE -> ExpiryDateValidationResult.INVALID_DATE_FORMAT + expiryDate == ExpiryDate.INVALID_DATE -> CardExpiryDateValidationResult.INVALID_DATE_FORMAT - else -> ExpiryDateValidationResult.INVALID_OTHER_REASON + else -> CardExpiryDateValidationResult.INVALID_OTHER_REASON } private fun isInMaxYearRange(expiryDate: ExpiryDate, calendar: Calendar): Boolean { diff --git a/ui-core/src/test/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtilsTest.kt b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt similarity index 74% rename from ui-core/src/test/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtilsTest.kt rename to checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt index bcc21e2cc4..84025a03a0 100644 --- a/ui-core/src/test/java/com/adyen/checkout/ui/core/internal/util/ExpiryDateValidationUtilsTest.kt +++ b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt @@ -3,12 +3,12 @@ * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by ozgur on 13/8/2024. + * Created by ozgur on 7/10/2024. */ -package com.adyen.checkout.ui.core.internal.util +package com.adyen.checkout.core.ui.validation -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate +import com.adyen.checkout.core.ui.model.ExpiryDate import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments.arguments @@ -16,16 +16,16 @@ import org.junit.jupiter.params.provider.MethodSource import java.util.Calendar import java.util.GregorianCalendar -internal class ExpiryDateValidationUtilsTest { +internal class CardExpiryDateValidatorTest { @ParameterizedTest @MethodSource("expiryDateValidationSource") fun `when validateExpiryDate is called, then expected validation result is returned`( expiryDateInput: ExpiryDate, calendar: Calendar, - expectedValidationResult: ExpiryDateValidationResult, + expectedValidationResult: CardExpiryDateValidationResult, ) { - val actualResult = ExpiryDateValidationUtils.validateExpiryDate(expiryDateInput, calendar) + val actualResult = CardExpiryDateValidator.validateExpiryDate(expiryDateInput, calendar) assertEquals(expectedValidationResult, actualResult) } @@ -38,54 +38,54 @@ internal class ExpiryDateValidationUtilsTest { arguments( ExpiryDate.EMPTY_DATE, GregorianCalendar.getInstance(), - ExpiryDateValidationResult.INVALID_OTHER_REASON, + CardExpiryDateValidationResult.INVALID_OTHER_REASON, ), arguments( ExpiryDate.INVALID_DATE, GregorianCalendar.getInstance(), - ExpiryDateValidationResult.INVALID_DATE_FORMAT, + CardExpiryDateValidationResult.INVALID_DATE_FORMAT, ), // Date 30 years in future arguments( ExpiryDate(12, 2052), // 12/2052 (last valid date in future) GregorianCalendar(2022, 4, 23), // 23/05/2022 - ExpiryDateValidationResult.VALID, + CardExpiryDateValidationResult.VALID, ), // Date more than 30 years in future arguments( ExpiryDate(1, 2053), // 01/2053 (first invalid date in future) GregorianCalendar(2022, 4, 23), // 23/05/2022 - ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, + CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, ), // Date 8 years in future arguments( ExpiryDate(1, 2030), // 01/2030 GregorianCalendar(2022, 4, 23), // 23/05/2022 - ExpiryDateValidationResult.VALID, + CardExpiryDateValidationResult.VALID, ), // Date 1 month in past arguments( ExpiryDate(4, 2022), // 04/2022 (last valid date in past) GregorianCalendar(2022, 4, 23), // 23/05/2022 - ExpiryDateValidationResult.VALID, + CardExpiryDateValidationResult.VALID, ), // Date 3 months in past arguments( ExpiryDate(2, 2022), // 02/2022 (last valid date in past) GregorianCalendar(2022, 4, 23), // 23/05/2022 - ExpiryDateValidationResult.VALID, + CardExpiryDateValidationResult.VALID, ), // Date more than 3 months in past arguments( ExpiryDate(1, 2022), // 01/2022 (first invalid date in past) GregorianCalendar(2022, 4, 23), // 23/05/2022 - ExpiryDateValidationResult.INVALID_TOO_OLD, + CardExpiryDateValidationResult.INVALID_TOO_OLD, ), // Date 1 year in future arguments( ExpiryDate(1, 2023), // 01/2023 GregorianCalendar(2022, 4, 23), // 23/05/2022 - ExpiryDateValidationResult.VALID, + CardExpiryDateValidationResult.VALID, ), ) } diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt index 05133287ab..6f3d1e476e 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt @@ -30,6 +30,7 @@ import com.adyen.checkout.core.AdyenLogLevel import com.adyen.checkout.core.exception.CheckoutException import com.adyen.checkout.core.exception.ComponentException import com.adyen.checkout.core.internal.util.adyenLog +import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.cse.EncryptedCard import com.adyen.checkout.cse.EncryptionException import com.adyen.checkout.cse.UnencryptedCard @@ -49,7 +50,6 @@ import com.adyen.checkout.ui.core.internal.ui.ComponentViewType import com.adyen.checkout.ui.core.internal.ui.PaymentComponentUIEvent import com.adyen.checkout.ui.core.internal.ui.PaymentComponentUIState import com.adyen.checkout.ui.core.internal.ui.SubmitHandler -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.Flow diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt index ffc3826991..7f873c1f45 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt @@ -10,7 +10,7 @@ package com.adyen.checkout.giftcard.internal.ui.model import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.internal.ui.model.InputData -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate +import com.adyen.checkout.core.ui.model.ExpiryDate @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) data class GiftCardInputData( diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardOutputData.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardOutputData.kt index a0a3fc55e9..de07ca72f7 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardOutputData.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardOutputData.kt @@ -11,7 +11,7 @@ package com.adyen.checkout.giftcard.internal.ui.model import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.OutputData -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate +import com.adyen.checkout.core.ui.model.ExpiryDate @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) data class GiftCardOutputData( diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt index 4295711cbb..0a339dcf19 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/DefaultGiftCardValidator.kt @@ -9,7 +9,7 @@ package com.adyen.checkout.giftcard.internal.util import com.adyen.checkout.components.core.internal.ui.model.FieldState -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate +import com.adyen.checkout.core.ui.model.ExpiryDate internal class DefaultGiftCardValidator : GiftCardValidator { override fun validateNumber(number: String): FieldState { diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidationUtils.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidationUtils.kt index d6809ec60d..1d645adb4c 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidationUtils.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidationUtils.kt @@ -10,8 +10,8 @@ package com.adyen.checkout.giftcard.internal.util import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation +import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.giftcard.R -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate internal object GiftCardValidationUtils { diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidator.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidator.kt index 4c55fc1ea6..cee03e1d89 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidator.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/util/GiftCardValidator.kt @@ -10,7 +10,7 @@ package com.adyen.checkout.giftcard.internal.util import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.internal.ui.model.FieldState -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate +import com.adyen.checkout.core.ui.model.ExpiryDate /** * Validator class responsible for validating input fields in [com.adyen.checkout.giftcard.GiftCardComponent]. diff --git a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt index 39b79376ec..e04c673e5a 100644 --- a/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt +++ b/giftcard/src/test/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegateTest.kt @@ -22,6 +22,7 @@ import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParam import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.core.Environment +import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.cse.internal.TestCardEncryptor import com.adyen.checkout.giftcard.GiftCardAction import com.adyen.checkout.giftcard.GiftCardComponentState @@ -36,7 +37,6 @@ import com.adyen.checkout.giftcard.internal.util.GiftCardBalanceStatus import com.adyen.checkout.test.TestDispatcherExtension import com.adyen.checkout.test.extensions.test import com.adyen.checkout.ui.core.internal.ui.SubmitHandler -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.UnconfinedTestDispatcher diff --git a/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt index 1dfd4efc9f..a527da7e0e 100644 --- a/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt @@ -10,14 +10,14 @@ package com.adyen.checkout.mealvoucherfr.internal.util import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation +import com.adyen.checkout.core.ui.model.ExpiryDate +import com.adyen.checkout.core.ui.validation.CardExpiryDateValidationResult +import com.adyen.checkout.core.ui.validation.CardExpiryDateValidator import com.adyen.checkout.giftcard.internal.util.GiftCardNumberUtils import com.adyen.checkout.giftcard.internal.util.GiftCardNumberValidationResult import com.adyen.checkout.giftcard.internal.util.GiftCardPinUtils import com.adyen.checkout.giftcard.internal.util.GiftCardPinValidationResult import com.adyen.checkout.mealvoucherfr.R -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate -import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationResult -import com.adyen.checkout.ui.core.internal.util.ExpiryDateValidationUtils import org.jetbrains.annotations.VisibleForTesting import java.util.Calendar import java.util.GregorianCalendar @@ -54,20 +54,20 @@ internal object MealVoucherFRValidationUtils { @VisibleForTesting internal fun validateExpiryDate(expiryDate: ExpiryDate, calendar: Calendar): FieldState { - return when (ExpiryDateValidationUtils.validateExpiryDate(expiryDate, calendar)) { - ExpiryDateValidationResult.VALID -> FieldState(expiryDate, Validation.Valid) - ExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> FieldState( + return when (CardExpiryDateValidator.validateExpiryDate(expiryDate, calendar)) { + CardExpiryDateValidationResult.VALID -> FieldState(expiryDate, Validation.Valid) + CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> FieldState( expiryDate, Validation.Invalid(R.string.checkout_meal_voucher_fr_expiry_date_not_valid_too_far_in_future), ) - ExpiryDateValidationResult.INVALID_TOO_OLD -> FieldState( + CardExpiryDateValidationResult.INVALID_TOO_OLD -> FieldState( expiryDate, Validation.Invalid(R.string.checkout_meal_voucher_fr_expiry_date_not_valid_too_old), ) - ExpiryDateValidationResult.INVALID_DATE_FORMAT, - ExpiryDateValidationResult.INVALID_OTHER_REASON -> FieldState( + CardExpiryDateValidationResult.INVALID_DATE_FORMAT, + CardExpiryDateValidationResult.INVALID_OTHER_REASON -> FieldState( expiryDate, Validation.Invalid(R.string.checkout_meal_voucher_fr_expiry_date_not_valid), ) diff --git a/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidator.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidator.kt index e06cb4d3b5..28b2a68b32 100644 --- a/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidator.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidator.kt @@ -9,8 +9,8 @@ package com.adyen.checkout.mealvoucherfr.internal.util import com.adyen.checkout.components.core.internal.ui.model.FieldState +import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.giftcard.internal.util.GiftCardValidator -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate internal class MealVoucherFRValidator : GiftCardValidator { diff --git a/ui-core/api/ui-core.api b/ui-core/api/ui-core.api index 5ef258d298..f9a009412f 100644 --- a/ui-core/api/ui-core.api +++ b/ui-core/api/ui-core.api @@ -217,9 +217,6 @@ public final class com/adyen/checkout/ui/core/internal/ui/model/AddressParams$Po public fun toString ()Ljava/lang/String; } -public final class com/adyen/checkout/ui/core/internal/ui/model/ExpiryDate$Companion { -} - public final class com/adyen/checkout/ui/core/internal/ui/view/AddressFormInput : android/widget/LinearLayout { public fun (Landroid/content/Context;)V public fun (Landroid/content/Context;Landroid/util/AttributeSet;)V @@ -278,8 +275,8 @@ public final class com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput : public static final field Companion Lcom/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput$Companion; public static final field SEPARATOR Ljava/lang/String; public fun afterTextChanged (Landroid/text/Editable;)V - public final fun getDate ()Lcom/adyen/checkout/ui/core/internal/ui/model/ExpiryDate; - public final fun setDate (Lcom/adyen/checkout/ui/core/internal/ui/model/ExpiryDate;)V + public final fun getDate ()Lcom/adyen/checkout/core/ui/model/ExpiryDate; + public final fun setDate (Lcom/adyen/checkout/core/ui/model/ExpiryDate;)V } public final class com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput$Companion { diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt index d40b1eaa7f..a431f6873f 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt @@ -15,7 +15,7 @@ import androidx.annotation.RestrictTo import com.adyen.checkout.core.AdyenLogLevel import com.adyen.checkout.core.internal.util.StringUtil.normalize import com.adyen.checkout.core.internal.util.adyenLog -import com.adyen.checkout.ui.core.internal.ui.model.ExpiryDate +import com.adyen.checkout.core.ui.model.ExpiryDate import java.text.ParseException import java.text.SimpleDateFormat import java.util.Calendar From 8560e56add66775bb1665e7d303420a8fc7cee8d Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Wed, 2 Oct 2024 14:36:49 +0200 Subject: [PATCH 275/299] Add CardSecurityCodeValidator COAND-985 --- .../ui/model/BcmcComponentParamsMapper.kt | 4 +- .../ui/model/BcmcComponentParamsMapperTest.kt | 4 +- card/api/card.api | 109 +----- .../adyen/checkout/card/CardComponentState.kt | 1 + .../adyen/checkout/card/CardConfiguration.kt | 2 + .../checkout/card/InstallmentConfiguration.kt | 1 + .../api/DefaultDetectCardTypeRepository.kt | 4 +- .../data/api/DetectCardTypeRepository.kt | 2 +- .../internal/data/model/DetectedCardType.kt | 2 +- .../provider/CardComponentProvider.kt | 2 + .../card/internal/ui/CardValidationMapper.kt | 59 ++- .../card/internal/ui/DefaultCardDelegate.kt | 8 +- .../card/internal/ui/StoredCardDelegate.kt | 8 +- .../internal/ui/model/CardComponentParams.kt | 2 +- .../ui/model/CardComponentParamsMapper.kt | 2 +- .../card/internal/ui/model/CardListItem.kt | 2 +- .../ui/model/InstallmentOptionParams.kt | 2 +- .../internal/ui/model/InstallmentParams.kt | 2 +- .../ui/model/InstallmentsParamsMapper.kt | 12 +- .../card/internal/ui/view/CardView.kt | 4 +- .../card/internal/util/CardValidationUtils.kt | 71 +--- .../internal/util/DualBrandedCardUtils.kt | 6 +- .../card/internal/util/InstallmentUtils.kt | 16 +- .../checkout/card/CardConfigurationTest.kt | 1 + .../com/adyen/checkout/card/CardTypeTest.kt | 2 + .../data/api/TestDetectCardTypeRepository.kt | 10 +- .../ui/CardConfigDataGeneratorTest.kt | 2 +- .../internal/ui/DefaultCardDelegateTest.kt | 4 +- .../internal/ui/StoredCardDelegateTest.kt | 5 +- .../ui/model/CardComponentParamsMapperTest.kt | 4 +- .../ui/model/InstallmentParamsMapperTest.kt | 54 +-- .../internal/util/CardValidationUtilsTest.kt | 335 +++++++----------- .../internal/util/DualBrandedCardUtilsTest.kt | 22 +- .../internal/util/InstallmentUtilsTest.kt | 182 +++++----- checkout-core/api/checkout-core.api | 87 +++++ .../com/adyen/checkout/core}/CardBrand.kt | 6 +- .../java/com/adyen/checkout/core}/CardType.kt | 6 +- .../CardSecurityCodeValidationResult.kt | 14 + .../validation/CardSecurityCodeValidator.kt | 35 ++ .../ui/validation/CardNumberValidatorTest.kt | 13 + .../CardSecurityCodeValidatorTest.kt | 81 +++++ .../ui/card/SessionsCardTakenOverViewModel.kt | 4 +- .../CheckoutConfigurationProvider.kt | 4 +- 43 files changed, 645 insertions(+), 551 deletions(-) rename {card/src/main/java/com/adyen/checkout/card => checkout-core/src/main/java/com/adyen/checkout/core}/CardBrand.kt (92%) rename {card/src/main/java/com/adyen/checkout/card => checkout-core/src/main/java/com/adyen/checkout/core}/CardType.kt (97%) create mode 100644 checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult.kt create mode 100644 checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidator.kt create mode 100644 checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardNumberValidatorTest.kt create mode 100644 checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidatorTest.kt diff --git a/bcmc/src/main/java/com/adyen/checkout/bcmc/internal/ui/model/BcmcComponentParamsMapper.kt b/bcmc/src/main/java/com/adyen/checkout/bcmc/internal/ui/model/BcmcComponentParamsMapper.kt index 93429f74d8..f963d5c105 100644 --- a/bcmc/src/main/java/com/adyen/checkout/bcmc/internal/ui/model/BcmcComponentParamsMapper.kt +++ b/bcmc/src/main/java/com/adyen/checkout/bcmc/internal/ui/model/BcmcComponentParamsMapper.kt @@ -10,8 +10,6 @@ package com.adyen.checkout.bcmc.internal.ui.model import com.adyen.checkout.bcmc.BcmcConfiguration import com.adyen.checkout.bcmc.getBcmcConfiguration -import com.adyen.checkout.card.CardBrand -import com.adyen.checkout.card.CardType import com.adyen.checkout.card.KCPAuthVisibility import com.adyen.checkout.card.SocialSecurityNumberVisibility import com.adyen.checkout.card.internal.ui.model.CVCVisibility @@ -23,6 +21,8 @@ import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParam import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParamsMapper import com.adyen.checkout.components.core.internal.ui.model.DropInOverrideParams import com.adyen.checkout.components.core.internal.ui.model.SessionParams +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import com.adyen.checkout.ui.core.internal.ui.model.AddressParams import java.util.Locale diff --git a/bcmc/src/test/java/com/adyen/checkout/bcmc/internal/ui/model/BcmcComponentParamsMapperTest.kt b/bcmc/src/test/java/com/adyen/checkout/bcmc/internal/ui/model/BcmcComponentParamsMapperTest.kt index 009c3e3777..d8013b7595 100644 --- a/bcmc/src/test/java/com/adyen/checkout/bcmc/internal/ui/model/BcmcComponentParamsMapperTest.kt +++ b/bcmc/src/test/java/com/adyen/checkout/bcmc/internal/ui/model/BcmcComponentParamsMapperTest.kt @@ -10,8 +10,6 @@ package com.adyen.checkout.bcmc.internal.ui.model import com.adyen.checkout.bcmc.BcmcConfiguration import com.adyen.checkout.bcmc.bcmc -import com.adyen.checkout.card.CardBrand -import com.adyen.checkout.card.CardType import com.adyen.checkout.card.KCPAuthVisibility import com.adyen.checkout.card.SocialSecurityNumberVisibility import com.adyen.checkout.card.internal.ui.model.CVCVisibility @@ -29,6 +27,8 @@ import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParam import com.adyen.checkout.components.core.internal.ui.model.DropInOverrideParams import com.adyen.checkout.components.core.internal.ui.model.SessionInstallmentConfiguration import com.adyen.checkout.components.core.internal.ui.model.SessionParams +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import com.adyen.checkout.core.Environment import com.adyen.checkout.ui.core.internal.ui.model.AddressParams import org.junit.jupiter.api.Assertions.assertEquals diff --git a/card/api/card.api b/card/api/card.api index 3651d7f4c3..336eaa41db 100644 --- a/card/api/card.api +++ b/card/api/card.api @@ -161,34 +161,6 @@ public final class com/adyen/checkout/card/BuildConfig { public fun ()V } -public final class com/adyen/checkout/card/CardBrand : android/os/Parcelable { - public static final field CREATOR Landroid/os/Parcelable$Creator; - public static final field Companion Lcom/adyen/checkout/card/CardBrand$Companion; - public fun (Lcom/adyen/checkout/card/CardType;)V - public fun (Ljava/lang/String;)V - public final fun component1 ()Ljava/lang/String; - public final fun copy (Ljava/lang/String;)Lcom/adyen/checkout/card/CardBrand; - public static synthetic fun copy$default (Lcom/adyen/checkout/card/CardBrand;Ljava/lang/String;ILjava/lang/Object;)Lcom/adyen/checkout/card/CardBrand; - public fun describeContents ()I - public fun equals (Ljava/lang/Object;)Z - public final fun getTxVariant ()Ljava/lang/String; - public fun hashCode ()I - public fun toString ()Ljava/lang/String; - public fun writeToParcel (Landroid/os/Parcel;I)V -} - -public final class com/adyen/checkout/card/CardBrand$Companion { - public final fun estimate (Ljava/lang/String;)Ljava/util/List; -} - -public final class com/adyen/checkout/card/CardBrand$Creator : android/os/Parcelable$Creator { - public fun ()V - public final fun createFromParcel (Landroid/os/Parcel;)Lcom/adyen/checkout/card/CardBrand; - public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object; - public final fun newArray (I)[Lcom/adyen/checkout/card/CardBrand; - public synthetic fun newArray (I)[Ljava/lang/Object; -} - public class com/adyen/checkout/card/CardComponent : androidx/lifecycle/ViewModel, com/adyen/checkout/action/core/internal/ActionHandlingComponent, com/adyen/checkout/components/core/internal/AddressLookupComponent, com/adyen/checkout/components/core/internal/ButtonComponent, com/adyen/checkout/components/core/internal/PaymentComponent, com/adyen/checkout/ui/core/internal/ui/ViewableComponent { public static final field Companion Lcom/adyen/checkout/card/CardComponent$Companion; public static final field PAYMENT_METHOD_TYPES Ljava/util/List; @@ -215,18 +187,18 @@ public final class com/adyen/checkout/card/CardComponent$Companion { } public final class com/adyen/checkout/card/CardComponentState : com/adyen/checkout/components/core/PaymentComponentState { - public fun (Lcom/adyen/checkout/components/core/PaymentComponentData;ZZLcom/adyen/checkout/card/CardBrand;Ljava/lang/String;Ljava/lang/String;)V + public fun (Lcom/adyen/checkout/components/core/PaymentComponentData;ZZLcom/adyen/checkout/core/CardBrand;Ljava/lang/String;Ljava/lang/String;)V public final fun component1 ()Lcom/adyen/checkout/components/core/PaymentComponentData; public final fun component2 ()Z public final fun component3 ()Z - public final fun component4 ()Lcom/adyen/checkout/card/CardBrand; + public final fun component4 ()Lcom/adyen/checkout/core/CardBrand; public final fun component5 ()Ljava/lang/String; public final fun component6 ()Ljava/lang/String; - public final fun copy (Lcom/adyen/checkout/components/core/PaymentComponentData;ZZLcom/adyen/checkout/card/CardBrand;Ljava/lang/String;Ljava/lang/String;)Lcom/adyen/checkout/card/CardComponentState; - public static synthetic fun copy$default (Lcom/adyen/checkout/card/CardComponentState;Lcom/adyen/checkout/components/core/PaymentComponentData;ZZLcom/adyen/checkout/card/CardBrand;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/adyen/checkout/card/CardComponentState; + public final fun copy (Lcom/adyen/checkout/components/core/PaymentComponentData;ZZLcom/adyen/checkout/core/CardBrand;Ljava/lang/String;Ljava/lang/String;)Lcom/adyen/checkout/card/CardComponentState; + public static synthetic fun copy$default (Lcom/adyen/checkout/card/CardComponentState;Lcom/adyen/checkout/components/core/PaymentComponentData;ZZLcom/adyen/checkout/core/CardBrand;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/adyen/checkout/card/CardComponentState; public fun equals (Ljava/lang/Object;)Z public final fun getBinValue ()Ljava/lang/String; - public final fun getCardBrand ()Lcom/adyen/checkout/card/CardBrand; + public final fun getCardBrand ()Lcom/adyen/checkout/core/CardBrand; public fun getData ()Lcom/adyen/checkout/components/core/PaymentComponentData; public final fun getLastFourDigits ()Ljava/lang/String; public fun hashCode ()I @@ -276,8 +248,8 @@ public final class com/adyen/checkout/card/CardConfiguration$Builder : com/adyen public final fun setSocialSecurityNumberVisibility (Lcom/adyen/checkout/card/SocialSecurityNumberVisibility;)Lcom/adyen/checkout/card/CardConfiguration$Builder; public fun setSubmitButtonVisible (Z)Lcom/adyen/checkout/card/CardConfiguration$Builder; public synthetic fun setSubmitButtonVisible (Z)Lcom/adyen/checkout/components/core/internal/ButtonConfigurationBuilder; - public final fun setSupportedCardTypes ([Lcom/adyen/checkout/card/CardBrand;)Lcom/adyen/checkout/card/CardConfiguration$Builder; - public final fun setSupportedCardTypes ([Lcom/adyen/checkout/card/CardType;)Lcom/adyen/checkout/card/CardConfiguration$Builder; + public final fun setSupportedCardTypes ([Lcom/adyen/checkout/core/CardBrand;)Lcom/adyen/checkout/card/CardConfiguration$Builder; + public final fun setSupportedCardTypes ([Lcom/adyen/checkout/core/CardType;)Lcom/adyen/checkout/card/CardConfiguration$Builder; } public final class com/adyen/checkout/card/CardConfiguration$Companion { @@ -297,51 +269,6 @@ public final class com/adyen/checkout/card/CardConfigurationKt { public static synthetic fun card$default (Lcom/adyen/checkout/components/core/CheckoutConfiguration;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/adyen/checkout/components/core/CheckoutConfiguration; } -public final class com/adyen/checkout/card/CardType : java/lang/Enum { - public static final field AMERICAN_EXPRESS Lcom/adyen/checkout/card/CardType; - public static final field ARGENCARD Lcom/adyen/checkout/card/CardType; - public static final field BCMC Lcom/adyen/checkout/card/CardType; - public static final field BIJENKORF_CARD Lcom/adyen/checkout/card/CardType; - public static final field CABAL Lcom/adyen/checkout/card/CardType; - public static final field CARTEBANCAIRE Lcom/adyen/checkout/card/CardType; - public static final field CODENSA Lcom/adyen/checkout/card/CardType; - public static final field CUP Lcom/adyen/checkout/card/CardType; - public static final field Companion Lcom/adyen/checkout/card/CardType$Companion; - public static final field DANKORT Lcom/adyen/checkout/card/CardType; - public static final field DINERS Lcom/adyen/checkout/card/CardType; - public static final field DISCOVER Lcom/adyen/checkout/card/CardType; - public static final field ELO Lcom/adyen/checkout/card/CardType; - public static final field FORBRUGSFORENINGEN Lcom/adyen/checkout/card/CardType; - public static final field HIPER Lcom/adyen/checkout/card/CardType; - public static final field HIPERCARD Lcom/adyen/checkout/card/CardType; - public static final field JCB Lcom/adyen/checkout/card/CardType; - public static final field KARENMILLER Lcom/adyen/checkout/card/CardType; - public static final field LASER Lcom/adyen/checkout/card/CardType; - public static final field MAESTRO Lcom/adyen/checkout/card/CardType; - public static final field MAESTRO_UK Lcom/adyen/checkout/card/CardType; - public static final field MASTERCARD Lcom/adyen/checkout/card/CardType; - public static final field MCALPHABANKBONUS Lcom/adyen/checkout/card/CardType; - public static final field MIR Lcom/adyen/checkout/card/CardType; - public static final field NARANJA Lcom/adyen/checkout/card/CardType; - public static final field OASIS Lcom/adyen/checkout/card/CardType; - public static final field SHOPPING Lcom/adyen/checkout/card/CardType; - public static final field SOLO Lcom/adyen/checkout/card/CardType; - public static final field TROY Lcom/adyen/checkout/card/CardType; - public static final field UATP Lcom/adyen/checkout/card/CardType; - public static final field VISA Lcom/adyen/checkout/card/CardType; - public static final field VISAALPHABANKBONUS Lcom/adyen/checkout/card/CardType; - public static final field VISADANKORT Lcom/adyen/checkout/card/CardType; - public static final field WAREHOUSE Lcom/adyen/checkout/card/CardType; - public static fun getEntries ()Lkotlin/enums/EnumEntries; - public final fun getTxVariant ()Ljava/lang/String; - public static fun valueOf (Ljava/lang/String;)Lcom/adyen/checkout/card/CardType; - public static fun values ()[Lcom/adyen/checkout/card/CardType; -} - -public final class com/adyen/checkout/card/CardType$Companion { - public final fun getByBrandName (Ljava/lang/String;)Lcom/adyen/checkout/card/CardType; -} - public final class com/adyen/checkout/card/InstallmentConfiguration : android/os/Parcelable { public static final field CREATOR Landroid/os/Parcelable$Creator; public fun ()V @@ -378,16 +305,16 @@ public abstract class com/adyen/checkout/card/InstallmentOptions : android/os/Pa public final class com/adyen/checkout/card/InstallmentOptions$CardBasedInstallmentOptions : com/adyen/checkout/card/InstallmentOptions { public static final field CREATOR Landroid/os/Parcelable$Creator; - public fun (IZLcom/adyen/checkout/card/CardBrand;)V - public fun (Ljava/util/List;ZLcom/adyen/checkout/card/CardBrand;)V + public fun (IZLcom/adyen/checkout/core/CardBrand;)V + public fun (Ljava/util/List;ZLcom/adyen/checkout/core/CardBrand;)V public final fun component1 ()Ljava/util/List; public final fun component2 ()Z - public final fun component3 ()Lcom/adyen/checkout/card/CardBrand; - public final fun copy (Ljava/util/List;ZLcom/adyen/checkout/card/CardBrand;)Lcom/adyen/checkout/card/InstallmentOptions$CardBasedInstallmentOptions; - public static synthetic fun copy$default (Lcom/adyen/checkout/card/InstallmentOptions$CardBasedInstallmentOptions;Ljava/util/List;ZLcom/adyen/checkout/card/CardBrand;ILjava/lang/Object;)Lcom/adyen/checkout/card/InstallmentOptions$CardBasedInstallmentOptions; + public final fun component3 ()Lcom/adyen/checkout/core/CardBrand; + public final fun copy (Ljava/util/List;ZLcom/adyen/checkout/core/CardBrand;)Lcom/adyen/checkout/card/InstallmentOptions$CardBasedInstallmentOptions; + public static synthetic fun copy$default (Lcom/adyen/checkout/card/InstallmentOptions$CardBasedInstallmentOptions;Ljava/util/List;ZLcom/adyen/checkout/core/CardBrand;ILjava/lang/Object;)Lcom/adyen/checkout/card/InstallmentOptions$CardBasedInstallmentOptions; public fun describeContents ()I public fun equals (Ljava/lang/Object;)Z - public final fun getCardBrand ()Lcom/adyen/checkout/card/CardBrand; + public final fun getCardBrand ()Lcom/adyen/checkout/core/CardBrand; public fun getIncludeRevolving ()Z public fun getValues ()Ljava/util/List; public fun hashCode ()I @@ -565,14 +492,14 @@ public final class com/adyen/checkout/card/internal/ui/DefaultCardDelegate$Compa } public final class com/adyen/checkout/card/internal/ui/model/InstallmentOptionParams$CardBasedInstallmentOptions : com/adyen/checkout/card/internal/ui/model/InstallmentOptionParams { - public fun (Ljava/util/List;ZLcom/adyen/checkout/card/CardBrand;)V + public fun (Ljava/util/List;ZLcom/adyen/checkout/core/CardBrand;)V public final fun component1 ()Ljava/util/List; public final fun component2 ()Z - public final fun component3 ()Lcom/adyen/checkout/card/CardBrand; - public final fun copy (Ljava/util/List;ZLcom/adyen/checkout/card/CardBrand;)Lcom/adyen/checkout/card/internal/ui/model/InstallmentOptionParams$CardBasedInstallmentOptions; - public static synthetic fun copy$default (Lcom/adyen/checkout/card/internal/ui/model/InstallmentOptionParams$CardBasedInstallmentOptions;Ljava/util/List;ZLcom/adyen/checkout/card/CardBrand;ILjava/lang/Object;)Lcom/adyen/checkout/card/internal/ui/model/InstallmentOptionParams$CardBasedInstallmentOptions; + public final fun component3 ()Lcom/adyen/checkout/core/CardBrand; + public final fun copy (Ljava/util/List;ZLcom/adyen/checkout/core/CardBrand;)Lcom/adyen/checkout/card/internal/ui/model/InstallmentOptionParams$CardBasedInstallmentOptions; + public static synthetic fun copy$default (Lcom/adyen/checkout/card/internal/ui/model/InstallmentOptionParams$CardBasedInstallmentOptions;Ljava/util/List;ZLcom/adyen/checkout/core/CardBrand;ILjava/lang/Object;)Lcom/adyen/checkout/card/internal/ui/model/InstallmentOptionParams$CardBasedInstallmentOptions; public fun equals (Ljava/lang/Object;)Z - public final fun getCardBrand ()Lcom/adyen/checkout/card/CardBrand; + public final fun getCardBrand ()Lcom/adyen/checkout/core/CardBrand; public fun getIncludeRevolving ()Z public fun getValues ()Ljava/util/List; public fun hashCode ()I diff --git a/card/src/main/java/com/adyen/checkout/card/CardComponentState.kt b/card/src/main/java/com/adyen/checkout/card/CardComponentState.kt index 71b85bf368..571f7789f4 100644 --- a/card/src/main/java/com/adyen/checkout/card/CardComponentState.kt +++ b/card/src/main/java/com/adyen/checkout/card/CardComponentState.kt @@ -10,6 +10,7 @@ package com.adyen.checkout.card import com.adyen.checkout.components.core.PaymentComponentData import com.adyen.checkout.components.core.PaymentComponentState import com.adyen.checkout.components.core.paymentmethod.CardPaymentMethod +import com.adyen.checkout.core.CardBrand /** * Represents the state of [CardComponent]. diff --git a/card/src/main/java/com/adyen/checkout/card/CardConfiguration.kt b/card/src/main/java/com/adyen/checkout/card/CardConfiguration.kt index 038d52305f..0822f5f2da 100644 --- a/card/src/main/java/com/adyen/checkout/card/CardConfiguration.kt +++ b/card/src/main/java/com/adyen/checkout/card/CardConfiguration.kt @@ -20,6 +20,8 @@ import com.adyen.checkout.components.core.internal.ButtonConfiguration import com.adyen.checkout.components.core.internal.ButtonConfigurationBuilder import com.adyen.checkout.components.core.internal.Configuration import com.adyen.checkout.components.core.internal.util.CheckoutConfigurationMarker +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import com.adyen.checkout.core.Environment import kotlinx.parcelize.Parcelize import java.util.Locale diff --git a/card/src/main/java/com/adyen/checkout/card/InstallmentConfiguration.kt b/card/src/main/java/com/adyen/checkout/card/InstallmentConfiguration.kt index 55c326481c..e73f165dfc 100644 --- a/card/src/main/java/com/adyen/checkout/card/InstallmentConfiguration.kt +++ b/card/src/main/java/com/adyen/checkout/card/InstallmentConfiguration.kt @@ -10,6 +10,7 @@ package com.adyen.checkout.card import android.os.Parcelable import com.adyen.checkout.card.internal.util.InstallmentUtils +import com.adyen.checkout.core.CardBrand import com.adyen.checkout.core.exception.CheckoutException import kotlinx.parcelize.Parcelize diff --git a/card/src/main/java/com/adyen/checkout/card/internal/data/api/DefaultDetectCardTypeRepository.kt b/card/src/main/java/com/adyen/checkout/card/internal/data/api/DefaultDetectCardTypeRepository.kt index 31f48892bc..71e5b8abd5 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/data/api/DefaultDetectCardTypeRepository.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/data/api/DefaultDetectCardTypeRepository.kt @@ -9,8 +9,6 @@ package com.adyen.checkout.card.internal.data.api import androidx.annotation.RestrictTo -import com.adyen.checkout.card.CardBrand -import com.adyen.checkout.card.CardType import com.adyen.checkout.card.internal.data.model.BinLookupRequest import com.adyen.checkout.card.internal.data.model.BinLookupResponse import com.adyen.checkout.card.internal.data.model.BinLookupResult @@ -18,6 +16,8 @@ import com.adyen.checkout.card.internal.data.model.Brand import com.adyen.checkout.card.internal.data.model.DetectedCardType import com.adyen.checkout.components.core.internal.util.bufferedChannel import com.adyen.checkout.core.AdyenLogLevel +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import com.adyen.checkout.core.internal.util.Sha256 import com.adyen.checkout.core.internal.util.adyenLog import com.adyen.checkout.core.internal.util.runSuspendCatching diff --git a/card/src/main/java/com/adyen/checkout/card/internal/data/api/DetectCardTypeRepository.kt b/card/src/main/java/com/adyen/checkout/card/internal/data/api/DetectCardTypeRepository.kt index ea81cf6544..146fb52849 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/data/api/DetectCardTypeRepository.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/data/api/DetectCardTypeRepository.kt @@ -9,8 +9,8 @@ package com.adyen.checkout.card.internal.data.api import androidx.annotation.RestrictTo -import com.adyen.checkout.card.CardBrand import com.adyen.checkout.card.internal.data.model.DetectedCardType +import com.adyen.checkout.core.CardBrand import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow diff --git a/card/src/main/java/com/adyen/checkout/card/internal/data/model/DetectedCardType.kt b/card/src/main/java/com/adyen/checkout/card/internal/data/model/DetectedCardType.kt index f2fdfe5c1c..58cbd41705 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/data/model/DetectedCardType.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/data/model/DetectedCardType.kt @@ -9,7 +9,7 @@ package com.adyen.checkout.card.internal.data.model import androidx.annotation.RestrictTo -import com.adyen.checkout.card.CardBrand +import com.adyen.checkout.core.CardBrand @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) data class DetectedCardType( diff --git a/card/src/main/java/com/adyen/checkout/card/internal/provider/CardComponentProvider.kt b/card/src/main/java/com/adyen/checkout/card/internal/provider/CardComponentProvider.kt index 76adc9bb9e..0fdf3da6c1 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/provider/CardComponentProvider.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/provider/CardComponentProvider.kt @@ -385,6 +385,7 @@ constructor( publicKeyRepository = publicKeyRepository, submitHandler = SubmitHandler(savedStateHandle), cardConfigDataGenerator = CardConfigDataGenerator(), + cardValidationMapper = CardValidationMapper() ) val genericActionDelegate = @@ -482,6 +483,7 @@ constructor( publicKeyRepository = publicKeyRepository, submitHandler = SubmitHandler(savedStateHandle), cardConfigDataGenerator = CardConfigDataGenerator(), + cardValidationMapper = CardValidationMapper() ) val genericActionDelegate = diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt index edb8f7e50a..2b7f417a9c 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt @@ -10,9 +10,15 @@ package com.adyen.checkout.card.internal.ui import androidx.annotation.RestrictTo import com.adyen.checkout.card.R +import com.adyen.checkout.card.internal.data.model.Brand +import com.adyen.checkout.card.internal.ui.model.InputFieldUIState import com.adyen.checkout.card.internal.util.CardNumberValidation import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation +import com.adyen.checkout.core.internal.util.StringUtil +import com.adyen.checkout.core.ui.model.ExpiryDate +import com.adyen.checkout.core.ui.validation.CardExpiryDateValidationResult +import com.adyen.checkout.core.ui.validation.CardSecurityCodeValidationResult @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) class CardValidationMapper { @@ -21,16 +27,67 @@ class CardValidationMapper { val fieldStateValidation = when (validation) { CardNumberValidation.INVALID_ILLEGAL_CHARACTERS -> Validation.Invalid(R.string.checkout_card_number_not_valid) + CardNumberValidation.INVALID_TOO_SHORT -> Validation.Invalid(R.string.checkout_card_number_not_valid) CardNumberValidation.INVALID_TOO_LONG -> Validation.Invalid(R.string.checkout_card_number_not_valid) CardNumberValidation.INVALID_UNSUPPORTED_BRAND -> Validation.Invalid( reason = R.string.checkout_card_brand_not_supported, - showErrorWhileEditing = true + showErrorWhileEditing = true, ) + CardNumberValidation.INVALID_LUHN_CHECK -> Validation.Invalid(R.string.checkout_card_number_not_valid) CardNumberValidation.VALID -> Validation.Valid } return FieldState(cardNumber, fieldStateValidation) } + + fun mapExpiryDateValidation( + expiryDate: ExpiryDate, + fieldPolicy: Brand.FieldPolicy?, + validationResult: CardExpiryDateValidationResult + ): FieldState { + val validation = when (validationResult) { + CardExpiryDateValidationResult.VALID -> Validation.Valid + + CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> + Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_far_in_future) + + CardExpiryDateValidationResult.INVALID_TOO_OLD -> + Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_old) + + CardExpiryDateValidationResult.INVALID_DATE_FORMAT -> + Validation.Invalid(R.string.checkout_expiry_date_not_valid) + + CardExpiryDateValidationResult.INVALID_OTHER_REASON -> if (fieldPolicy?.isRequired() == false) { + Validation.Valid + } else { + Validation.Invalid(R.string.checkout_expiry_date_not_valid) + } + } + return FieldState(expiryDate, validation) + } + + fun mapSecurityCodeValidation( + securityCode: String, + cvcUIState: InputFieldUIState, + validationResult: CardSecurityCodeValidationResult + ): FieldState { + val normalizedSecurityCode = StringUtil.normalize(securityCode) + val length = normalizedSecurityCode.length + val invalidState = Validation.Invalid(R.string.checkout_security_code_not_valid) + + val validation = when { + cvcUIState == InputFieldUIState.HIDDEN -> Validation.Valid + cvcUIState == InputFieldUIState.OPTIONAL && length == 0 -> Validation.Valid + else -> { + when (validationResult) { + CardSecurityCodeValidationResult.INVALID -> invalidState + CardSecurityCodeValidationResult.VALID -> Validation.Valid + } + } + } + + return FieldState(normalizedSecurityCode, validation) + } } diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt index 930f1c3dd0..a4aed011d4 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt @@ -12,7 +12,6 @@ import androidx.annotation.RestrictTo import androidx.annotation.VisibleForTesting import androidx.lifecycle.LifecycleOwner import com.adyen.checkout.card.BinLookupData -import com.adyen.checkout.card.CardBrand import com.adyen.checkout.card.CardComponentState import com.adyen.checkout.card.KCPAuthVisibility import com.adyen.checkout.card.R @@ -52,6 +51,7 @@ import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.components.core.internal.util.bufferedChannel import com.adyen.checkout.components.core.paymentmethod.CardPaymentMethod import com.adyen.checkout.core.AdyenLogLevel +import com.adyen.checkout.core.CardBrand import com.adyen.checkout.core.exception.CheckoutException import com.adyen.checkout.core.exception.ComponentException import com.adyen.checkout.core.internal.util.adyenLog @@ -517,7 +517,8 @@ class DefaultCardDelegate( expiryDate: ExpiryDate, expiryDatePolicy: Brand.FieldPolicy? ): FieldState { - return CardValidationUtils.validateExpiryDate(expiryDate, expiryDatePolicy) + val validation = CardValidationUtils.validateExpiryDate(expiryDate) + return cardValidationMapper.mapExpiryDateValidation(expiryDate, expiryDatePolicy, validation) } private fun validateSecurityCode( @@ -525,7 +526,8 @@ class DefaultCardDelegate( cardType: DetectedCardType? ): FieldState { val cvcUIState = makeCvcUIState(cardType) - return CardValidationUtils.validateSecurityCode(securityCode, cardType, cvcUIState) + val validation = CardValidationUtils.validateSecurityCode(securityCode, cardType) + return cardValidationMapper.mapSecurityCodeValidation(securityCode, cvcUIState, validation) } private fun validateHolderName(holderName: String): FieldState { diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt index c1faaa7ee2..fb99139e0b 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt @@ -11,9 +11,7 @@ package com.adyen.checkout.card.internal.ui import androidx.annotation.VisibleForTesting import androidx.lifecycle.LifecycleOwner import com.adyen.checkout.card.BinLookupData -import com.adyen.checkout.card.CardBrand import com.adyen.checkout.card.CardComponentState -import com.adyen.checkout.card.CardType import com.adyen.checkout.card.internal.data.model.Brand import com.adyen.checkout.card.internal.data.model.DetectedCardType import com.adyen.checkout.card.internal.ui.model.CardComponentParams @@ -40,6 +38,8 @@ import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.components.core.internal.util.bufferedChannel import com.adyen.checkout.components.core.paymentmethod.CardPaymentMethod import com.adyen.checkout.core.AdyenLogLevel +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import com.adyen.checkout.core.exception.CheckoutException import com.adyen.checkout.core.exception.ComponentException import com.adyen.checkout.core.internal.util.adyenLog @@ -78,6 +78,7 @@ internal class StoredCardDelegate( private val publicKeyRepository: PublicKeyRepository, private val submitHandler: SubmitHandler, private val cardConfigDataGenerator: CardConfigDataGenerator, + private val cardValidationMapper: CardValidationMapper ) : CardDelegate { private val noCvcBrands: Set = hashSetOf(CardBrand(cardType = CardType.BCMC)) @@ -330,7 +331,8 @@ internal class StoredCardDelegate( private fun validateSecurityCode(securityCode: String, detectedCardType: DetectedCardType): FieldState { val cvcUiState = makeCvcUIState(detectedCardType.cvcPolicy) - return CardValidationUtils.validateSecurityCode(securityCode, detectedCardType, cvcUiState) + val validation = CardValidationUtils.validateSecurityCode(securityCode, detectedCardType) + return cardValidationMapper.mapSecurityCodeValidation(securityCode, cvcUiState, validation) } private fun isCvcHidden(): Boolean { diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardComponentParams.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardComponentParams.kt index 2750ed6634..4a3cd312a6 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardComponentParams.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardComponentParams.kt @@ -9,12 +9,12 @@ package com.adyen.checkout.card.internal.ui.model import androidx.annotation.RestrictTo -import com.adyen.checkout.card.CardBrand import com.adyen.checkout.card.KCPAuthVisibility import com.adyen.checkout.card.SocialSecurityNumberVisibility import com.adyen.checkout.components.core.internal.ui.model.ButtonParams import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParams import com.adyen.checkout.components.core.internal.ui.model.ComponentParams +import com.adyen.checkout.core.CardBrand import com.adyen.checkout.ui.core.internal.ui.model.AddressParams @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardComponentParamsMapper.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardComponentParamsMapper.kt index c4c178e5d7..75e0072f39 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardComponentParamsMapper.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardComponentParamsMapper.kt @@ -9,7 +9,6 @@ package com.adyen.checkout.card.internal.ui.model import com.adyen.checkout.card.AddressConfiguration -import com.adyen.checkout.card.CardBrand import com.adyen.checkout.card.CardConfiguration import com.adyen.checkout.card.KCPAuthVisibility import com.adyen.checkout.card.SocialSecurityNumberVisibility @@ -23,6 +22,7 @@ import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParam import com.adyen.checkout.components.core.internal.ui.model.DropInOverrideParams import com.adyen.checkout.components.core.internal.ui.model.SessionParams import com.adyen.checkout.core.AdyenLogLevel +import com.adyen.checkout.core.CardBrand import com.adyen.checkout.core.internal.util.adyenLog import com.adyen.checkout.ui.core.internal.ui.model.AddressFieldPolicy import com.adyen.checkout.ui.core.internal.ui.model.AddressParams diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardListItem.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardListItem.kt index f0497afe5b..0580180d66 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardListItem.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardListItem.kt @@ -9,7 +9,7 @@ package com.adyen.checkout.card.internal.ui.model import androidx.annotation.RestrictTo -import com.adyen.checkout.card.CardBrand +import com.adyen.checkout.core.CardBrand import com.adyen.checkout.core.Environment @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/InstallmentOptionParams.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/InstallmentOptionParams.kt index 663a7aa753..6128e1cfe2 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/InstallmentOptionParams.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/InstallmentOptionParams.kt @@ -9,7 +9,7 @@ package com.adyen.checkout.card.internal.ui.model import androidx.annotation.RestrictTo -import com.adyen.checkout.card.CardBrand +import com.adyen.checkout.core.CardBrand /** * InstallmentOptionParams is used for defining the details of installment options. diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/InstallmentParams.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/InstallmentParams.kt index c6faf57113..57f9211f82 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/InstallmentParams.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/InstallmentParams.kt @@ -9,8 +9,8 @@ package com.adyen.checkout.card.internal.ui.model import androidx.annotation.RestrictTo -import com.adyen.checkout.card.CardBrand import com.adyen.checkout.components.core.Amount +import com.adyen.checkout.core.CardBrand import java.util.Locale /** diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/InstallmentsParamsMapper.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/InstallmentsParamsMapper.kt index b83f9bc76b..6ccdf3469a 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/InstallmentsParamsMapper.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/InstallmentsParamsMapper.kt @@ -8,12 +8,12 @@ package com.adyen.checkout.card.internal.ui.model -import com.adyen.checkout.card.CardBrand import com.adyen.checkout.card.InstallmentConfiguration import com.adyen.checkout.card.InstallmentOptions import com.adyen.checkout.components.core.Amount import com.adyen.checkout.components.core.internal.ui.model.SessionInstallmentConfiguration import com.adyen.checkout.components.core.internal.ui.model.SessionInstallmentOptionsParams +import com.adyen.checkout.core.CardBrand import java.util.Locale internal class InstallmentsParamsMapper { @@ -41,7 +41,7 @@ internal class InstallmentsParamsMapper { cardBasedOptions = cardBasedOptionsList, amount = amount, shopperLocale = shopperLocale, - showInstallmentAmount = showInstallmentAmount + showInstallmentAmount = showInstallmentAmount, ) } @@ -58,14 +58,14 @@ internal class InstallmentsParamsMapper { }, amount = amount, shopperLocale = shopperLocale, - showInstallmentAmount = installmentConfiguration.showInstallmentAmount + showInstallmentAmount = installmentConfiguration.showInstallmentAmount, ) } private fun InstallmentOptions.DefaultInstallmentOptions?.mapToDefaultInstallmentOptionsParam() = InstallmentOptionParams.DefaultInstallmentOptions( this?.values ?: emptyList(), - this?.includeRevolving ?: false + this?.includeRevolving ?: false, ) private fun InstallmentOptions.CardBasedInstallmentOptions.mapToCardBasedInstallmentOptionsParams() = @@ -74,14 +74,14 @@ internal class InstallmentsParamsMapper { private fun SessionInstallmentOptionsParams?.mapToDefaultInstallmentOptions() = InstallmentOptionParams.DefaultInstallmentOptions( values = this?.values ?: emptyList(), - includeRevolving = this?.plans?.contains(InstallmentOption.REVOLVING.type) ?: false + includeRevolving = this?.plans?.contains(InstallmentOption.REVOLVING.type) ?: false, ) private fun SessionInstallmentOptionsParams?.mapToCardBasedInstallmentOptions(txVariant: String) = InstallmentOptionParams.CardBasedInstallmentOptions( values = this?.values ?: emptyList(), includeRevolving = this?.plans?.contains(InstallmentOption.REVOLVING.type) ?: false, - cardBrand = CardBrand(txVariant) + cardBrand = CardBrand(txVariant), ) companion object { diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt index e53b4342d4..c915c9fa1d 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt @@ -22,9 +22,7 @@ import android.widget.LinearLayout import androidx.annotation.RestrictTo import androidx.annotation.StringRes import androidx.core.view.isVisible -import com.adyen.checkout.card.CardBrand import com.adyen.checkout.card.CardComponent -import com.adyen.checkout.card.CardType import com.adyen.checkout.card.R import com.adyen.checkout.card.databinding.CardViewBinding import com.adyen.checkout.card.internal.data.model.DetectedCardType @@ -36,6 +34,8 @@ import com.adyen.checkout.card.internal.util.InstallmentUtils import com.adyen.checkout.components.core.internal.ui.ComponentDelegate import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import com.adyen.checkout.core.exception.CheckoutException import com.adyen.checkout.core.internal.util.BuildUtils import com.adyen.checkout.core.ui.model.ExpiryDate diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index e033c46ade..aac8885406 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -8,31 +8,20 @@ package com.adyen.checkout.card.internal.util import androidx.annotation.RestrictTo -import androidx.annotation.VisibleForTesting -import com.adyen.checkout.card.CardBrand -import com.adyen.checkout.card.CardType -import com.adyen.checkout.card.R -import com.adyen.checkout.card.internal.data.model.Brand import com.adyen.checkout.card.internal.data.model.DetectedCardType -import com.adyen.checkout.card.internal.ui.model.InputFieldUIState -import com.adyen.checkout.components.core.internal.ui.model.FieldState -import com.adyen.checkout.components.core.internal.ui.model.Validation -import com.adyen.checkout.core.internal.util.StringUtil import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.core.ui.validation.CardExpiryDateValidationResult import com.adyen.checkout.core.ui.validation.CardExpiryDateValidator import com.adyen.checkout.core.ui.validation.CardNumberValidationResult import com.adyen.checkout.core.ui.validation.CardNumberValidator +import com.adyen.checkout.core.ui.validation.CardSecurityCodeValidationResult +import com.adyen.checkout.core.ui.validation.CardSecurityCodeValidator import java.util.Calendar import java.util.GregorianCalendar @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) object CardValidationUtils { - // Security Code - private const val GENERAL_CARD_SECURITY_CODE_SIZE = 3 - private const val AMEX_SECURITY_CODE_SIZE = 4 - /** * Validate card number. */ @@ -55,39 +44,9 @@ object CardValidationUtils { */ internal fun validateExpiryDate( expiryDate: ExpiryDate, - fieldPolicy: Brand.FieldPolicy?, calendar: Calendar = GregorianCalendar.getInstance() - ): FieldState { - val expiryDateValidationResult = - CardExpiryDateValidator.validateExpiryDate(expiryDate, calendar) - val validation = generateExpiryDateValidation(fieldPolicy, expiryDateValidationResult) - - return FieldState(expiryDate, validation) - } - - @VisibleForTesting - internal fun generateExpiryDateValidation( - fieldPolicy: Brand.FieldPolicy?, - expiryDateValidationResult: CardExpiryDateValidationResult, - ): Validation { - return when (expiryDateValidationResult) { - CardExpiryDateValidationResult.VALID -> Validation.Valid - - CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> - Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_far_in_future) - - CardExpiryDateValidationResult.INVALID_TOO_OLD -> - Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_old) - - CardExpiryDateValidationResult.INVALID_DATE_FORMAT -> - Validation.Invalid(R.string.checkout_expiry_date_not_valid) - - CardExpiryDateValidationResult.INVALID_OTHER_REASON -> if (fieldPolicy?.isRequired() == false) { - Validation.Valid - } else { - Validation.Invalid(R.string.checkout_expiry_date_not_valid) - } - } + ): CardExpiryDateValidationResult { + return CardExpiryDateValidator.validateExpiryDate(expiryDate, calendar) } /** @@ -95,25 +54,9 @@ object CardValidationUtils { */ internal fun validateSecurityCode( securityCode: String, - detectedCardType: DetectedCardType?, - cvcUIState: InputFieldUIState - ): FieldState { - val normalizedSecurityCode = StringUtil.normalize(securityCode) - val length = normalizedSecurityCode.length - val invalidState = Validation.Invalid(R.string.checkout_security_code_not_valid) - val validation = when { - cvcUIState == InputFieldUIState.HIDDEN -> Validation.Valid - !StringUtil.isDigitsAndSeparatorsOnly(normalizedSecurityCode) -> invalidState - cvcUIState == InputFieldUIState.OPTIONAL && length == 0 -> Validation.Valid - detectedCardType?.cardBrand == CardBrand(cardType = CardType.AMERICAN_EXPRESS) && - length == AMEX_SECURITY_CODE_SIZE -> Validation.Valid - - detectedCardType?.cardBrand != CardBrand(cardType = CardType.AMERICAN_EXPRESS) && - length == GENERAL_CARD_SECURITY_CODE_SIZE -> Validation.Valid - - else -> invalidState - } - return FieldState(normalizedSecurityCode, validation) + detectedCardType: DetectedCardType? + ): CardSecurityCodeValidationResult { + return CardSecurityCodeValidator.validateSecurityCode(securityCode, detectedCardType?.cardBrand) } } diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/DualBrandedCardUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/DualBrandedCardUtils.kt index 04a604cc35..331eae471a 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/DualBrandedCardUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/DualBrandedCardUtils.kt @@ -8,9 +8,9 @@ package com.adyen.checkout.card.internal.util -import com.adyen.checkout.card.CardBrand -import com.adyen.checkout.card.CardType import com.adyen.checkout.card.internal.data.model.DetectedCardType +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType internal object DualBrandedCardUtils { @@ -29,10 +29,12 @@ internal object DualBrandedCardUtils { hasCarteBancaire && hasVisa -> cards.sortedByDescending { it.cardBrand == CardBrand(cardType = CardType.VISA) } + hasPlcc -> cards.sortedByDescending { it.cardBrand.txVariant.contains("plcc") || it.cardBrand.txVariant.contains("cbcc") } + else -> cards } } diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/InstallmentUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/InstallmentUtils.kt index 89b17a7649..d8a058dd85 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/InstallmentUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/InstallmentUtils.kt @@ -9,7 +9,6 @@ package com.adyen.checkout.card.internal.util import android.content.Context -import com.adyen.checkout.card.CardBrand import com.adyen.checkout.card.InstallmentConfiguration import com.adyen.checkout.card.InstallmentOptions import com.adyen.checkout.card.R @@ -21,6 +20,7 @@ import com.adyen.checkout.components.core.Amount import com.adyen.checkout.components.core.Installments import com.adyen.checkout.components.core.internal.util.CurrencyUtils import com.adyen.checkout.components.core.internal.util.formatToLocalizedString +import com.adyen.checkout.core.CardBrand import java.util.Locale private const val REVOLVING_INSTALLMENT_VALUE = 1 @@ -47,7 +47,7 @@ internal object InstallmentUtils { installmentOptions = params.cardBasedOptions.firstOrNull { it.cardBrand == cardBrand }, amount = params.amount, shopperLocale = params.shopperLocale, - showAmount = params.showInstallmentAmount + showAmount = params.showInstallmentAmount, ) } @@ -56,7 +56,7 @@ internal object InstallmentUtils { installmentOptions = params.defaultOptions, amount = params.amount, shopperLocale = params.shopperLocale, - showAmount = params.showInstallmentAmount + showAmount = params.showInstallmentAmount, ) } @@ -79,7 +79,7 @@ internal object InstallmentUtils { option = InstallmentOption.ONE_TIME, amount = amount, shopperLocale = shopperLocale, - showAmount = showAmount + showAmount = showAmount, ) installmentOptionsList.add(oneTimeOption) @@ -89,7 +89,7 @@ internal object InstallmentUtils { option = InstallmentOption.REVOLVING, amount = amount, shopperLocale = shopperLocale, - showAmount = showAmount + showAmount = showAmount, ) installmentOptionsList.add(revolvingOption) } @@ -100,7 +100,7 @@ internal object InstallmentUtils { option = InstallmentOption.REGULAR, amount = amount, shopperLocale = shopperLocale, - showAmount = showAmount + showAmount = showAmount, ) } installmentOptionsList.addAll(regularOptions) @@ -125,12 +125,12 @@ internal object InstallmentUtils { context.getString( R.string.checkout_card_installments_option_regular_with_price, formattedNumberOfInstallments, - formattedInstallmentAmount + formattedInstallmentAmount, ) } else { context.getString( R.string.checkout_card_installments_option_regular, - formattedNumberOfInstallments + formattedNumberOfInstallments, ) } } diff --git a/card/src/test/java/com/adyen/checkout/card/CardConfigurationTest.kt b/card/src/test/java/com/adyen/checkout/card/CardConfigurationTest.kt index a4a202785f..1baddfb8b5 100644 --- a/card/src/test/java/com/adyen/checkout/card/CardConfigurationTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/CardConfigurationTest.kt @@ -4,6 +4,7 @@ import com.adyen.checkout.components.core.Amount import com.adyen.checkout.components.core.AnalyticsConfiguration import com.adyen.checkout.components.core.AnalyticsLevel import com.adyen.checkout.components.core.CheckoutConfiguration +import com.adyen.checkout.core.CardType import com.adyen.checkout.core.Environment import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/card/src/test/java/com/adyen/checkout/card/CardTypeTest.kt b/card/src/test/java/com/adyen/checkout/card/CardTypeTest.kt index 3afa8b1be6..0f2172420d 100644 --- a/card/src/test/java/com/adyen/checkout/card/CardTypeTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/CardTypeTest.kt @@ -8,6 +8,8 @@ package com.adyen.checkout.card +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertNotNull import org.junit.jupiter.api.Assertions.assertNull diff --git a/card/src/test/java/com/adyen/checkout/card/internal/data/api/TestDetectCardTypeRepository.kt b/card/src/test/java/com/adyen/checkout/card/internal/data/api/TestDetectCardTypeRepository.kt index cc3d20ee22..dde4b5522d 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/data/api/TestDetectCardTypeRepository.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/data/api/TestDetectCardTypeRepository.kt @@ -8,10 +8,10 @@ package com.adyen.checkout.card.internal.data.api -import com.adyen.checkout.card.CardBrand -import com.adyen.checkout.card.CardType import com.adyen.checkout.card.internal.data.model.Brand import com.adyen.checkout.card.internal.data.model.DetectedCardType +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow @@ -59,7 +59,7 @@ internal class TestDetectCardTypeRepository : DetectCardTypeRepository { isSupported = supportedCardTypes.contains(cardBrand), panLength = null, paymentMethodVariant = null, - ) + ), ) } @@ -75,7 +75,7 @@ internal class TestDetectCardTypeRepository : DetectCardTypeRepository { isSupported = supportedCardTypes.contains(cardBrand), panLength = 16, paymentMethodVariant = "mccredit", - ) + ), ) } @@ -102,7 +102,7 @@ internal class TestDetectCardTypeRepository : DetectCardTypeRepository { isSupported = supportedCardBrands.contains(cardBrandSecond), panLength = 16, paymentMethodVariant = "maestrouk", - ) + ), ) } } diff --git a/card/src/test/java/com/adyen/checkout/card/internal/ui/CardConfigDataGeneratorTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/ui/CardConfigDataGeneratorTest.kt index 86cb7de384..193a0294d3 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/ui/CardConfigDataGeneratorTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/ui/CardConfigDataGeneratorTest.kt @@ -8,7 +8,6 @@ package com.adyen.checkout.card.internal.ui -import com.adyen.checkout.card.CardBrand import com.adyen.checkout.card.KCPAuthVisibility import com.adyen.checkout.card.SocialSecurityNumberVisibility import com.adyen.checkout.card.internal.ui.model.AddressFieldPolicyParams @@ -19,6 +18,7 @@ import com.adyen.checkout.card.internal.ui.model.StoredCVCVisibility import com.adyen.checkout.components.core.internal.ui.model.AnalyticsParams import com.adyen.checkout.components.core.internal.ui.model.AnalyticsParamsLevel import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParams +import com.adyen.checkout.core.CardBrand import com.adyen.checkout.core.Environment import com.adyen.checkout.ui.core.internal.ui.model.AddressParams import org.junit.jupiter.api.Assertions.assertEquals diff --git a/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt index 205b79d52c..56377fbae0 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegateTest.kt @@ -11,10 +11,8 @@ package com.adyen.checkout.card.internal.ui import androidx.annotation.StringRes import app.cash.turbine.test import com.adyen.checkout.card.AddressConfiguration -import com.adyen.checkout.card.CardBrand import com.adyen.checkout.card.CardComponentState import com.adyen.checkout.card.CardConfiguration -import com.adyen.checkout.card.CardType import com.adyen.checkout.card.InstallmentConfiguration import com.adyen.checkout.card.InstallmentOptions import com.adyen.checkout.card.KCPAuthVisibility @@ -53,6 +51,8 @@ import com.adyen.checkout.components.core.internal.ui.model.AddressInputModel import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParamsMapper import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import com.adyen.checkout.core.Environment import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.cse.internal.BaseCardEncryptor diff --git a/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt index ebec77abab..b34d642cdd 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/ui/StoredCardDelegateTest.kt @@ -10,10 +10,8 @@ package com.adyen.checkout.card.internal.ui import app.cash.turbine.test import com.adyen.checkout.card.AddressConfiguration -import com.adyen.checkout.card.CardBrand import com.adyen.checkout.card.CardComponentState import com.adyen.checkout.card.CardConfiguration -import com.adyen.checkout.card.CardType import com.adyen.checkout.card.InstallmentConfiguration import com.adyen.checkout.card.InstallmentOptions import com.adyen.checkout.card.KCPAuthVisibility @@ -44,6 +42,8 @@ import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParam import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.components.core.paymentmethod.CardPaymentMethod +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import com.adyen.checkout.core.Environment import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.cse.internal.BaseCardEncryptor @@ -511,6 +511,7 @@ internal class StoredCardDelegateTest( submitHandler = submitHandler, order = order, cardConfigDataGenerator = cardConfigDataGenerator, + cardValidationMapper = CardValidationMapper() ) } diff --git a/card/src/test/java/com/adyen/checkout/card/internal/ui/model/CardComponentParamsMapperTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/ui/model/CardComponentParamsMapperTest.kt index 742e787f4c..fdb2308693 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/ui/model/CardComponentParamsMapperTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/ui/model/CardComponentParamsMapperTest.kt @@ -9,9 +9,7 @@ package com.adyen.checkout.card.internal.ui.model import com.adyen.checkout.card.AddressConfiguration -import com.adyen.checkout.card.CardBrand import com.adyen.checkout.card.CardConfiguration -import com.adyen.checkout.card.CardType import com.adyen.checkout.card.InstallmentConfiguration import com.adyen.checkout.card.InstallmentOptions import com.adyen.checkout.card.KCPAuthVisibility @@ -30,6 +28,8 @@ import com.adyen.checkout.components.core.internal.ui.model.DropInOverrideParams import com.adyen.checkout.components.core.internal.ui.model.SessionInstallmentConfiguration import com.adyen.checkout.components.core.internal.ui.model.SessionInstallmentOptionsParams import com.adyen.checkout.components.core.internal.ui.model.SessionParams +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import com.adyen.checkout.core.Environment import com.adyen.checkout.ui.core.internal.ui.model.AddressParams import org.junit.jupiter.api.Assertions.assertEquals diff --git a/card/src/test/java/com/adyen/checkout/card/internal/ui/model/InstallmentParamsMapperTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/ui/model/InstallmentParamsMapperTest.kt index 030ddda053..2c27926072 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/ui/model/InstallmentParamsMapperTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/ui/model/InstallmentParamsMapperTest.kt @@ -8,13 +8,13 @@ package com.adyen.checkout.card.internal.ui.model -import com.adyen.checkout.card.CardBrand -import com.adyen.checkout.card.CardType import com.adyen.checkout.card.InstallmentConfiguration import com.adyen.checkout.card.InstallmentOptions import com.adyen.checkout.components.core.Amount import com.adyen.checkout.components.core.internal.ui.model.SessionInstallmentConfiguration import com.adyen.checkout.components.core.internal.ui.model.SessionInstallmentOptionsParams +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import java.util.Locale @@ -33,25 +33,25 @@ internal class InstallmentParamsMapperTest { DEFAULT_INSTALLMENT_OPTION to SessionInstallmentOptionsParams( plans = listOf(INSTALLMENT_PLAN), preselectedValue = 2, - values = listOf(2) - ) + values = listOf(2), + ), ), - showInstallmentAmount = showInstallmentAmount + showInstallmentAmount = showInstallmentAmount, ) val expectedInstallmentParams = InstallmentParams( defaultOptions = InstallmentOptionParams.DefaultInstallmentOptions( values = listOf(2), - includeRevolving = false + includeRevolving = false, ), amount = amount, shopperLocale = shopperLocale, - showInstallmentAmount = showInstallmentAmount + showInstallmentAmount = showInstallmentAmount, ) val actualInstallmentParams = installmentsParamsMapper.mapToInstallmentParams( installmentConfiguration = sessionSetupInstallmentOptionsMap, amount = amount, - shopperLocale = shopperLocale + shopperLocale = shopperLocale, ) assertEquals(expectedInstallmentParams, actualInstallmentParams) @@ -64,28 +64,28 @@ internal class InstallmentParamsMapperTest { CardType.VISA.txVariant to SessionInstallmentOptionsParams( plans = listOf(INSTALLMENT_PLAN), preselectedValue = 2, - values = listOf(2) - ) + values = listOf(2), + ), ), - showInstallmentAmount = showInstallmentAmount + showInstallmentAmount = showInstallmentAmount, ) val expectedInstallmentParams = InstallmentParams( cardBasedOptions = listOf( InstallmentOptionParams.CardBasedInstallmentOptions( values = listOf(2), includeRevolving = false, - cardBrand = CardBrand(CardType.VISA) - ) + cardBrand = CardBrand(CardType.VISA), + ), ), amount = amount, shopperLocale = shopperLocale, - showInstallmentAmount = showInstallmentAmount + showInstallmentAmount = showInstallmentAmount, ) val actualInstallmentParams = installmentsParamsMapper.mapToInstallmentParams( installmentConfiguration = sessionSetupInstallmentOptionsMap, amount = amount, - shopperLocale = shopperLocale + shopperLocale = shopperLocale, ) assertEquals(expectedInstallmentParams, actualInstallmentParams) @@ -96,25 +96,25 @@ internal class InstallmentParamsMapperTest { val installmentConfiguration = InstallmentConfiguration( defaultOptions = InstallmentOptions.DefaultInstallmentOptions( values = listOf(2), - includeRevolving = false + includeRevolving = false, ), - showInstallmentAmount = showInstallmentAmount + showInstallmentAmount = showInstallmentAmount, ) val expectedInstallmentParams = InstallmentParams( defaultOptions = InstallmentOptionParams.DefaultInstallmentOptions( values = listOf(2), - includeRevolving = false + includeRevolving = false, ), amount = amount, shopperLocale = shopperLocale, - showInstallmentAmount = showInstallmentAmount + showInstallmentAmount = showInstallmentAmount, ) val actualInstallmentParams = installmentsParamsMapper.mapToInstallmentParams( installmentConfiguration = installmentConfiguration, amount = amount, - shopperLocale = shopperLocale + shopperLocale = shopperLocale, ) assertEquals(expectedInstallmentParams, actualInstallmentParams) @@ -127,10 +127,10 @@ internal class InstallmentParamsMapperTest { InstallmentOptions.CardBasedInstallmentOptions( values = listOf(2), includeRevolving = false, - cardBrand = CardBrand(CardType.VISA) - ) + cardBrand = CardBrand(CardType.VISA), + ), ), - showInstallmentAmount = showInstallmentAmount + showInstallmentAmount = showInstallmentAmount, ) val expectedInstallmentParams = InstallmentParams( @@ -138,18 +138,18 @@ internal class InstallmentParamsMapperTest { InstallmentOptionParams.CardBasedInstallmentOptions( values = listOf(2), includeRevolving = false, - cardBrand = CardBrand(CardType.VISA) - ) + cardBrand = CardBrand(CardType.VISA), + ), ), amount = amount, shopperLocale = shopperLocale, - showInstallmentAmount = showInstallmentAmount + showInstallmentAmount = showInstallmentAmount, ) val actualInstallmentParams = installmentsParamsMapper.mapToInstallmentParams( installmentConfiguration = installmentConfiguration, amount = amount, - shopperLocale = shopperLocale + shopperLocale = shopperLocale, ) assertEquals(expectedInstallmentParams, actualInstallmentParams) diff --git a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt index a09773aa66..5dcf1a5074 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt @@ -8,25 +8,24 @@ package com.adyen.checkout.card.internal.util -import com.adyen.checkout.card.CardBrand -import com.adyen.checkout.card.CardType import com.adyen.checkout.card.R import com.adyen.checkout.card.internal.data.model.Brand -import com.adyen.checkout.card.internal.data.model.DetectedCardType +import com.adyen.checkout.card.internal.ui.CardValidationMapper import com.adyen.checkout.card.internal.ui.model.InputFieldUIState import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.core.ui.validation.CardExpiryDateValidationResult +import com.adyen.checkout.core.ui.validation.CardSecurityCodeValidationResult import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test -import java.util.GregorianCalendar internal class CardValidationUtilsTest { + private val cardValidationMapper = CardValidationMapper() + @Nested @DisplayName("when validating card number and") inner class ValidateCardNumberTest { @@ -150,191 +149,210 @@ internal class CardValidationUtilsTest { @DisplayName("when validating expiry date and") inner class ValidateExpiryDateTest { + // TODO extract these tests to a CardValidationMapper class @Test fun `date is valid, then correct fieldState should be returned`() { val expiryDate = ExpiryDate(4, 2025) // 04/2025 - val calendar = GregorianCalendar(2024, 4, 24) // 24/04/2024 - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, - fieldPolicy = Brand.FieldPolicy.REQUIRED, - calendar = calendar, + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.REQUIRED, + CardExpiryDateValidationResult.VALID, ) assertEquals(FieldState(expiryDate, Validation.Valid), actual) } - @Test - fun `date is invalid, then correct fieldState should be returned`() { - val expiryDate = ExpiryDate(4, 2020) // 04/2020 - val calendar = GregorianCalendar(2024, 4, 24) // 24/04/2024 - val actual = CardValidationUtils.validateExpiryDate( - expiryDate = expiryDate, - fieldPolicy = Brand.FieldPolicy.REQUIRED, - calendar = calendar, - ) - - assertEquals(expiryDate, actual.value) - assertTrue(actual.validation is Validation.Invalid) - } - @Test fun `date is valid, then result should be valid`() { - val actual = CardValidationUtils.generateExpiryDateValidation( - fieldPolicy = Brand.FieldPolicy.REQUIRED, - expiryDateValidationResult = CardExpiryDateValidationResult.VALID, + val expiryDate = ExpiryDate(4, 2040) // 04/2040 + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.REQUIRED, + CardExpiryDateValidationResult.VALID, ) - assertEquals(Validation.Valid, actual) + assertEquals(Validation.Valid, actual.validation) } @Test fun `date is too far in the future, then result should be invalid`() { - val actual = CardValidationUtils.generateExpiryDateValidation( - fieldPolicy = Brand.FieldPolicy.REQUIRED, - expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, + val expiryDate = ExpiryDate(4, 2099) // 04/2099 + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.REQUIRED, + CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future - assertEquals(Validation.Invalid(expectedInvalidReason), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) } @Test fun `date is too old, then result should be invalid`() { - val actual = CardValidationUtils.generateExpiryDateValidation( - fieldPolicy = Brand.FieldPolicy.REQUIRED, - expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_TOO_OLD, + val expiryDate = ExpiryDate(4, 2020) // 04/2020 + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.REQUIRED, + CardExpiryDateValidationResult.INVALID_TOO_OLD, ) + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old - assertEquals(Validation.Invalid(expectedInvalidReason), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) } @Test fun `date is valid with field policy optional, then result should be valid`() { - val actual = CardValidationUtils.generateExpiryDateValidation( - fieldPolicy = Brand.FieldPolicy.OPTIONAL, - expiryDateValidationResult = CardExpiryDateValidationResult.VALID, + val expiryDate = ExpiryDate(4, 2040) // 04/2040 + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.OPTIONAL, + CardExpiryDateValidationResult.VALID, ) - assertEquals(Validation.Valid, actual) + assertEquals(Validation.Valid, actual.validation) } @Test fun `date is valid with field policy hidden, then result should be valid`() { - val actual = CardValidationUtils.generateExpiryDateValidation( - fieldPolicy = Brand.FieldPolicy.HIDDEN, - expiryDateValidationResult = CardExpiryDateValidationResult.VALID, + val expiryDate = ExpiryDate(4, 2040) // 04/2040 + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.HIDDEN, + CardExpiryDateValidationResult.VALID, ) - assertEquals(Validation.Valid, actual) + assertEquals(Validation.Valid, actual.validation) } @Test fun `date is too far in the future with field policy optional, then result should be invalid`() { - val actual = CardValidationUtils.generateExpiryDateValidation( - fieldPolicy = Brand.FieldPolicy.OPTIONAL, - expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, + val expiryDate = ExpiryDate(4, 2099) // 04/2099 + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.OPTIONAL, + CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, ) + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future - assertEquals(Validation.Invalid(expectedInvalidReason), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) } @Test fun `date is too far in the future with field policy hidden, then result should be invalid`() { - val actual = CardValidationUtils.generateExpiryDateValidation( - fieldPolicy = Brand.FieldPolicy.HIDDEN, - expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, + val expiryDate = ExpiryDate(4, 2099) // 04/2099 + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.HIDDEN, + CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, ) + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future - assertEquals(Validation.Invalid(expectedInvalidReason), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) } @Test fun `date is too old with field policy optional, then result should be invalid`() { - val actual = CardValidationUtils.generateExpiryDateValidation( - fieldPolicy = Brand.FieldPolicy.OPTIONAL, - expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_TOO_OLD, + val expiryDate = ExpiryDate(4, 2020) // 04/2020 + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.OPTIONAL, + CardExpiryDateValidationResult.INVALID_TOO_OLD, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old - assertEquals(Validation.Invalid(expectedInvalidReason), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) } @Test fun `date is too old with field policy hidden, then result should be invalid`() { - val actual = CardValidationUtils.generateExpiryDateValidation( - fieldPolicy = Brand.FieldPolicy.HIDDEN, - expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_TOO_OLD, + val expiryDate = ExpiryDate(4, 2020) // 04/2020 + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.HIDDEN, + CardExpiryDateValidationResult.INVALID_TOO_OLD, ) + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old - assertEquals(Validation.Invalid(expectedInvalidReason), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) } @Test fun `date is empty with field policy required, then result should be invalid`() { - val actual = CardValidationUtils.generateExpiryDateValidation( - fieldPolicy = Brand.FieldPolicy.REQUIRED, - expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_OTHER_REASON, + val expiryDate = ExpiryDate.EMPTY_DATE + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.REQUIRED, + CardExpiryDateValidationResult.INVALID_OTHER_REASON, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid - assertEquals(Validation.Invalid(expectedInvalidReason), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) } @Test fun `date is empty with field policy optional, then result should be valid`() { - val actual = CardValidationUtils.generateExpiryDateValidation( - fieldPolicy = Brand.FieldPolicy.OPTIONAL, - expiryDateValidationResult = CardExpiryDateValidationResult.VALID, + val expiryDate = ExpiryDate.EMPTY_DATE + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.OPTIONAL, + CardExpiryDateValidationResult.INVALID_OTHER_REASON, ) - - assertEquals(Validation.Valid, actual) + assertEquals(Validation.Valid, actual.validation) } @Test fun `date is empty with field policy hidden, then result should be valid`() { - val actual = CardValidationUtils.generateExpiryDateValidation( - fieldPolicy = Brand.FieldPolicy.HIDDEN, - expiryDateValidationResult = CardExpiryDateValidationResult.VALID, + val expiryDate = ExpiryDate.EMPTY_DATE + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.HIDDEN, + CardExpiryDateValidationResult.INVALID_OTHER_REASON, ) - assertEquals(Validation.Valid, actual) + assertEquals(Validation.Valid, actual.validation) } @Test fun `date is invalid with field policy required, then result should be invalid`() { - val actual = CardValidationUtils.generateExpiryDateValidation( - fieldPolicy = Brand.FieldPolicy.REQUIRED, - expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_DATE_FORMAT, + val expiryDate = ExpiryDate.INVALID_DATE + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.REQUIRED, + CardExpiryDateValidationResult.INVALID_DATE_FORMAT, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid - assertEquals(Validation.Invalid(expectedInvalidReason), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) } @Test fun `date is invalid with field policy optional, then result should be invalid`() { - val actual = CardValidationUtils.generateExpiryDateValidation( - fieldPolicy = Brand.FieldPolicy.OPTIONAL, - expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_DATE_FORMAT, + val expiryDate = ExpiryDate.INVALID_DATE + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.OPTIONAL, + CardExpiryDateValidationResult.INVALID_DATE_FORMAT, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid - assertEquals(Validation.Invalid(expectedInvalidReason), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) } @Test fun `date is invalid with field policy hidden, then result should be invalid`() { - val actual = CardValidationUtils.generateExpiryDateValidation( - fieldPolicy = Brand.FieldPolicy.HIDDEN, - expiryDateValidationResult = CardExpiryDateValidationResult.INVALID_DATE_FORMAT, + val expiryDate = ExpiryDate.INVALID_DATE + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + Brand.FieldPolicy.HIDDEN, + CardExpiryDateValidationResult.INVALID_DATE_FORMAT, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid - assertEquals(Validation.Invalid(expectedInvalidReason), actual) + assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) } } @@ -342,94 +360,13 @@ internal class CardValidationUtilsTest { @DisplayName("when validating cvc and") inner class ValidateSecurityCodeTest { - @Test - fun `cvc is empty, then result should be invalid`() { - val cvc = "" - val actual = - CardValidationUtils.validateSecurityCode(cvc, getDetectedCardType(), InputFieldUIState.REQUIRED) - assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) - } - - @Test - fun `cvc is 1 digit, then result should be invalid`() { - val cvc = "7" - val actual = - CardValidationUtils.validateSecurityCode(cvc, getDetectedCardType(), InputFieldUIState.REQUIRED) - assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) - } - - @Test - fun `cvc is 2 digits, then result should be invalid`() { - val cvc = "12" - val actual = - CardValidationUtils.validateSecurityCode(cvc, getDetectedCardType(), InputFieldUIState.REQUIRED) - assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) - } - - @Test - fun `cvc is 3 digits, then result should be valid`() { - val cvc = "737" - val actual = - CardValidationUtils.validateSecurityCode(cvc, getDetectedCardType(), InputFieldUIState.REQUIRED) - assertEquals(FieldState(cvc, Validation.Valid), actual) - } - - @Test - fun `cvc is 4 digits, then result should be invalid`() { - val cvc = "8689" - val actual = - CardValidationUtils.validateSecurityCode(cvc, getDetectedCardType(), InputFieldUIState.REQUIRED) - assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) - } - - @Test - fun `cvc is 6 digits, then result should be invalid`() { - val cvc = "457835" - val actual = CardValidationUtils.validateSecurityCode( - cvc, - getDetectedCardType(), - InputFieldUIState.REQUIRED, - ) - assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) - } - - @Test - fun `cvc is 3 digits with AMEX, then result should be invalid`() { - val cvc = "737" - val actual = CardValidationUtils.validateSecurityCode( - cvc, - getDetectedCardType(cardBrand = CardBrand(CardType.AMERICAN_EXPRESS)), - cvcUIState = InputFieldUIState.REQUIRED, - ) - assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) - } - - @Test - fun `cvc is 4 digits with AMEX, then result should be valid`() { - val cvc = "8689" - val actual = CardValidationUtils.validateSecurityCode( - cvc, - getDetectedCardType(cardBrand = CardBrand(CardType.AMERICAN_EXPRESS)), - cvcUIState = InputFieldUIState.REQUIRED, - ) - assertEquals(FieldState(cvc, Validation.Valid), actual) - } - - @Test - fun `cvc has invalid characters, then result should be invalid`() { - val cvc = "1%y" - val actual = - CardValidationUtils.validateSecurityCode(cvc, getDetectedCardType(), InputFieldUIState.REQUIRED) - assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) - } - @Test fun `cvc is valid with field policy required, then result should be valid`() { val cvc = "546" - val actual = CardValidationUtils.validateSecurityCode( + val actual = cardValidationMapper.mapSecurityCodeValidation( cvc, - getDetectedCardType(cvcPolicy = Brand.FieldPolicy.REQUIRED), - cvcUIState = InputFieldUIState.REQUIRED, + InputFieldUIState.REQUIRED, + CardSecurityCodeValidationResult.VALID, ) assertEquals(FieldState(cvc, Validation.Valid), actual) } @@ -437,10 +374,10 @@ internal class CardValidationUtilsTest { @Test fun `cvc is valid with field policy optional, then result should be valid`() { val cvc = "345" - val actual = CardValidationUtils.validateSecurityCode( + val actual = cardValidationMapper.mapSecurityCodeValidation( cvc, - getDetectedCardType(cvcPolicy = Brand.FieldPolicy.OPTIONAL), - cvcUIState = InputFieldUIState.OPTIONAL, + InputFieldUIState.OPTIONAL, + CardSecurityCodeValidationResult.VALID, ) assertEquals(FieldState(cvc, Validation.Valid), actual) } @@ -448,10 +385,10 @@ internal class CardValidationUtilsTest { @Test fun `cvc is valid with field policy hidden, then result should be valid`() { val cvc = "156" - val actual = CardValidationUtils.validateSecurityCode( + val actual = cardValidationMapper.mapSecurityCodeValidation( cvc, - getDetectedCardType(cvcPolicy = Brand.FieldPolicy.HIDDEN), - cvcUIState = InputFieldUIState.HIDDEN, + InputFieldUIState.HIDDEN, + CardSecurityCodeValidationResult.VALID, ) assertEquals(FieldState(cvc, Validation.Valid), actual) } @@ -459,10 +396,10 @@ internal class CardValidationUtilsTest { @Test fun `cvc is invalid with field policy required, then result should be invalid`() { val cvc = "77" - val actual = CardValidationUtils.validateSecurityCode( + val actual = cardValidationMapper.mapSecurityCodeValidation( cvc, - getDetectedCardType(cvcPolicy = Brand.FieldPolicy.REQUIRED), InputFieldUIState.REQUIRED, + CardSecurityCodeValidationResult.INVALID, ) assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) } @@ -470,10 +407,10 @@ internal class CardValidationUtilsTest { @Test fun `cvc is invalid with field policy optional, then result should be invalid`() { val cvc = "9" - val actual = CardValidationUtils.validateSecurityCode( + val actual = cardValidationMapper.mapSecurityCodeValidation( cvc, - getDetectedCardType(cvcPolicy = Brand.FieldPolicy.OPTIONAL), InputFieldUIState.OPTIONAL, + CardSecurityCodeValidationResult.INVALID, ) assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) } @@ -481,10 +418,10 @@ internal class CardValidationUtilsTest { @Test fun `cvc is invalid with field policy hidden, then result should be valid`() { val cvc = "1358" - val actual = CardValidationUtils.validateSecurityCode( + val actual = cardValidationMapper.mapSecurityCodeValidation( cvc, - getDetectedCardType(cvcPolicy = Brand.FieldPolicy.HIDDEN), - cvcUIState = InputFieldUIState.HIDDEN, + InputFieldUIState.HIDDEN, + CardSecurityCodeValidationResult.INVALID, ) assertEquals(FieldState(cvc, Validation.Valid), actual) } @@ -492,10 +429,10 @@ internal class CardValidationUtilsTest { @Test fun `cvc is empty with field policy required, then result should be invalid`() { val cvc = "" - val actual = CardValidationUtils.validateSecurityCode( + val actual = cardValidationMapper.mapSecurityCodeValidation( cvc, - getDetectedCardType(cvcPolicy = Brand.FieldPolicy.REQUIRED), - cvcUIState = InputFieldUIState.REQUIRED, + InputFieldUIState.REQUIRED, + CardSecurityCodeValidationResult.INVALID, ) assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) } @@ -503,10 +440,10 @@ internal class CardValidationUtilsTest { @Test fun `cvc is empty with field policy optional, then result should be valid`() { val cvc = "" - val actual = CardValidationUtils.validateSecurityCode( + val actual = cardValidationMapper.mapSecurityCodeValidation( cvc, - getDetectedCardType(cvcPolicy = Brand.FieldPolicy.OPTIONAL), - cvcUIState = InputFieldUIState.OPTIONAL, + InputFieldUIState.OPTIONAL, + CardSecurityCodeValidationResult.INVALID, ) assertEquals(FieldState(cvc, Validation.Valid), actual) } @@ -514,28 +451,12 @@ internal class CardValidationUtilsTest { @Test fun `cvc is empty with field policy hidden, then result should be valid`() { val cvc = "" - val actual = CardValidationUtils.validateSecurityCode( + val actual = cardValidationMapper.mapSecurityCodeValidation( cvc, - getDetectedCardType(cvcPolicy = Brand.FieldPolicy.HIDDEN), - cvcUIState = InputFieldUIState.HIDDEN, + InputFieldUIState.HIDDEN, + CardSecurityCodeValidationResult.INVALID, ) assertEquals(FieldState(cvc, Validation.Valid), actual) } - - private fun getDetectedCardType( - cardBrand: CardBrand = CardBrand(CardType.VISA), - cvcPolicy: Brand.FieldPolicy = Brand.FieldPolicy.REQUIRED, - ): DetectedCardType { - return DetectedCardType( - cardBrand = cardBrand, - isReliable = false, - enableLuhnCheck = true, - cvcPolicy = cvcPolicy, - expiryDatePolicy = Brand.FieldPolicy.REQUIRED, - isSupported = true, - panLength = null, - paymentMethodVariant = null, - ) - } } } diff --git a/card/src/test/java/com/adyen/checkout/card/internal/util/DualBrandedCardUtilsTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/util/DualBrandedCardUtilsTest.kt index 217875ba61..fc12855dc3 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/util/DualBrandedCardUtilsTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/util/DualBrandedCardUtilsTest.kt @@ -8,10 +8,10 @@ package com.adyen.checkout.card.internal.util -import com.adyen.checkout.card.CardBrand -import com.adyen.checkout.card.CardType import com.adyen.checkout.card.internal.data.model.Brand import com.adyen.checkout.card.internal.data.model.DetectedCardType +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test @@ -35,7 +35,7 @@ internal class DualBrandedCardUtilsTest { isSupported = true, panLength = null, paymentMethodVariant = null, - ) + ), ) assertEquals(detectedCards, DualBrandedCardUtils.sortBrands(detectedCards)) } @@ -62,7 +62,7 @@ internal class DualBrandedCardUtilsTest { isSupported = true, panLength = null, paymentMethodVariant = null, - ) + ), ) val sortedCards = listOf( @@ -85,7 +85,7 @@ internal class DualBrandedCardUtilsTest { isSupported = true, panLength = null, paymentMethodVariant = null, - ) + ), ) assertEquals(sortedCards, DualBrandedCardUtils.sortBrands(detectedCards)) @@ -113,7 +113,7 @@ internal class DualBrandedCardUtilsTest { isSupported = true, panLength = null, paymentMethodVariant = null, - ) + ), ) val sortedCards = listOf( @@ -136,7 +136,7 @@ internal class DualBrandedCardUtilsTest { isSupported = true, panLength = null, paymentMethodVariant = null, - ) + ), ) assertEquals(sortedCards, DualBrandedCardUtils.sortBrands(detectedCards)) @@ -164,7 +164,7 @@ internal class DualBrandedCardUtilsTest { isSupported = true, panLength = null, paymentMethodVariant = null, - ) + ), ) val sortedCards = listOf( @@ -187,7 +187,7 @@ internal class DualBrandedCardUtilsTest { isSupported = true, panLength = null, paymentMethodVariant = null, - ) + ), ) assertEquals(sortedCards, DualBrandedCardUtils.sortBrands(detectedCards)) @@ -215,7 +215,7 @@ internal class DualBrandedCardUtilsTest { isSupported = true, panLength = null, paymentMethodVariant = null, - ) + ), ) val sortedCards = listOf( @@ -238,7 +238,7 @@ internal class DualBrandedCardUtilsTest { isSupported = true, panLength = null, paymentMethodVariant = null, - ) + ), ) assertEquals(sortedCards, DualBrandedCardUtils.sortBrands(detectedCards)) diff --git a/card/src/test/java/com/adyen/checkout/card/internal/util/InstallmentUtilsTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/util/InstallmentUtilsTest.kt index 2e7f632728..57ed39dbf6 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/util/InstallmentUtilsTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/util/InstallmentUtilsTest.kt @@ -10,8 +10,6 @@ package com.adyen.checkout.card.internal.util import android.content.Context import androidx.annotation.StringRes -import com.adyen.checkout.card.CardBrand -import com.adyen.checkout.card.CardType import com.adyen.checkout.card.InstallmentConfiguration import com.adyen.checkout.card.InstallmentOptions import com.adyen.checkout.card.R @@ -21,6 +19,8 @@ import com.adyen.checkout.card.internal.ui.model.InstallmentParams import com.adyen.checkout.card.internal.ui.view.InstallmentModel import com.adyen.checkout.components.core.Amount import com.adyen.checkout.components.core.internal.util.formatToLocalizedString +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull @@ -60,9 +60,9 @@ internal class InstallmentUtilsTest { val installmentParams = InstallmentParams( defaultOptions = InstallmentOptionParams.DefaultInstallmentOptions( values = installmentOptionValues, - includeRevolving = false + includeRevolving = false, ), - shopperLocale = Locale.US + shopperLocale = Locale.US, ) val installmentOptions = InstallmentUtils.makeInstallmentOptions(installmentParams, null, false) @@ -82,21 +82,21 @@ internal class InstallmentUtilsTest { InstallmentOptionParams.CardBasedInstallmentOptions( values = installmentOptionValues, cardBrand = cardBrand, - includeRevolving = false + includeRevolving = false, ), InstallmentOptionParams.CardBasedInstallmentOptions( values = listOf(1, 2, 3, 4, 5, 6, 7, 8, 9), cardBrand = cardBrand, - includeRevolving = false - ) + includeRevolving = false, + ), ), - shopperLocale = Locale.US + shopperLocale = Locale.US, ) val installmentOptions = InstallmentUtils.makeInstallmentOptions( installmentParams = installmentParams, cardBrand = cardBrand, - isCardTypeReliable = true + isCardTypeReliable = true, ) val regularInstallmentOptions = installmentOptions.filter { model -> model.option == InstallmentOption.REGULAR } @@ -110,9 +110,9 @@ internal class InstallmentUtilsTest { val installmentParams = InstallmentParams( defaultOptions = InstallmentOptionParams.DefaultInstallmentOptions( values = listOf(1, 3, 5, 10), - includeRevolving = false + includeRevolving = false, ), - shopperLocale = Locale.US + shopperLocale = Locale.US, ) val installmentOptions = InstallmentUtils.makeInstallmentOptions(installmentParams, null, false) @@ -127,9 +127,9 @@ internal class InstallmentUtilsTest { val installmentParams = InstallmentParams( defaultOptions = InstallmentOptionParams.DefaultInstallmentOptions( values = listOf(1, 3, 5, 10), - includeRevolving = true + includeRevolving = true, ), - shopperLocale = Locale.US + shopperLocale = Locale.US, ) val installmentOptions = InstallmentUtils.makeInstallmentOptions(installmentParams, null, false) @@ -144,9 +144,9 @@ internal class InstallmentUtilsTest { val installmentParams = InstallmentParams( defaultOptions = InstallmentOptionParams.DefaultInstallmentOptions( values = listOf(1, 3, 5, 10), - includeRevolving = false + includeRevolving = false, ), - shopperLocale = Locale.US + shopperLocale = Locale.US, ) val installmentOptions = InstallmentUtils.makeInstallmentOptions(installmentParams, null, false) @@ -261,14 +261,14 @@ internal class InstallmentUtilsTest { InstallmentParams( defaultOptions = InstallmentOptionParams.DefaultInstallmentOptions( values = listOf(), - includeRevolving = true + includeRevolving = true, ), amount = Amount("EUR", 100L), shopperLocale = Locale.US, - showInstallmentAmount = true + showInstallmentAmount = true, ), CardBrand(CardType.VISA), - true + true, ), arguments( InstallmentParams( @@ -276,10 +276,10 @@ internal class InstallmentUtilsTest { cardBasedOptions = listOf(), amount = Amount("EUR", 100L), shopperLocale = Locale.US, - showInstallmentAmount = true + showInstallmentAmount = true, ), CardBrand(CardType.VISA), - true + true, ), arguments( InstallmentParams( @@ -287,13 +287,13 @@ internal class InstallmentUtilsTest { InstallmentOptionParams.CardBasedInstallmentOptions( values = listOf(), includeRevolving = false, - cardBrand = CardBrand(CardType.MASTERCARD) - ) + cardBrand = CardBrand(CardType.MASTERCARD), + ), ), - shopperLocale = Locale.US + shopperLocale = Locale.US, ), CardBrand(CardType.VISA), - true + true, ), arguments( InstallmentParams( @@ -301,13 +301,13 @@ internal class InstallmentUtilsTest { InstallmentOptionParams.CardBasedInstallmentOptions( values = listOf(), includeRevolving = false, - cardBrand = CardBrand(CardType.MASTERCARD) - ) + cardBrand = CardBrand(CardType.MASTERCARD), + ), ), - shopperLocale = Locale.US + shopperLocale = Locale.US, ), CardBrand(CardType.MASTERCARD), - false + false, ), arguments(null, null, false), ) @@ -320,9 +320,9 @@ internal class InstallmentUtilsTest { option = InstallmentOption.ONE_TIME, amount = null, shopperLocale = Locale.US, - showAmount = false + showAmount = false, ), - R.string.checkout_card_installments_option_one_time + R.string.checkout_card_installments_option_one_time, ), arguments( InstallmentModel( @@ -330,10 +330,10 @@ internal class InstallmentUtilsTest { option = InstallmentOption.REVOLVING, amount = null, shopperLocale = Locale.US, - showAmount = false + showAmount = false, ), - R.string.checkout_card_installments_option_revolving - ) + R.string.checkout_card_installments_option_revolving, + ), ) @JvmStatic @@ -344,8 +344,8 @@ internal class InstallmentUtilsTest { option = InstallmentOption.REGULAR, amount = Amount("USD", 100L), shopperLocale = Locale.US, - showAmount = false - ) + showAmount = false, + ), ), arguments( InstallmentModel( @@ -353,9 +353,9 @@ internal class InstallmentUtilsTest { option = InstallmentOption.REGULAR, amount = null, shopperLocale = Locale.US, - showAmount = false - ) - ) + showAmount = false, + ), + ), ) @JvmStatic @@ -366,9 +366,9 @@ internal class InstallmentUtilsTest { option = InstallmentOption.REGULAR, amount = Amount("USD", 10000L), shopperLocale = Locale.US, - showAmount = true + showAmount = true, ), - "$50.00" + "$50.00", ), arguments( InstallmentModel( @@ -376,9 +376,9 @@ internal class InstallmentUtilsTest { option = InstallmentOption.REGULAR, amount = Amount("USD", 10000L), shopperLocale = Locale.US, - showAmount = true + showAmount = true, ), - "$33.33" + "$33.33", ), arguments( InstallmentModel( @@ -386,10 +386,10 @@ internal class InstallmentUtilsTest { option = InstallmentOption.REGULAR, amount = Amount("USD", 10000L), shopperLocale = Locale.US, - showAmount = true + showAmount = true, ), - "$25.00" - ) + "$25.00", + ), ) @JvmStatic @@ -401,9 +401,9 @@ internal class InstallmentUtilsTest { option = InstallmentOption.ONE_TIME, amount = null, shopperLocale = Locale.US, - showAmount = false - ) - ) + showAmount = false, + ), + ), ) @JvmStatic @@ -414,8 +414,8 @@ internal class InstallmentUtilsTest { option = InstallmentOption.REGULAR, amount = null, shopperLocale = Locale.US, - showAmount = false - ) + showAmount = false, + ), ), arguments( InstallmentModel( @@ -423,9 +423,9 @@ internal class InstallmentUtilsTest { option = InstallmentOption.REVOLVING, amount = null, shopperLocale = Locale.US, - showAmount = false - ) - ) + showAmount = false, + ), + ), ) @JvmStatic @@ -434,21 +434,21 @@ internal class InstallmentUtilsTest { arguments( listOf( InstallmentOptions.CardBasedInstallmentOptions(10, false, CardBrand(CardType.MASTERCARD)), - ) + ), ), arguments( listOf( InstallmentOptions.CardBasedInstallmentOptions(10, false, CardBrand(CardType.MASTERCARD)), InstallmentOptions.CardBasedInstallmentOptions(10, false, CardBrand(CardType.VISA)), - ) + ), ), arguments( listOf( InstallmentOptions.CardBasedInstallmentOptions(10, false, CardBrand(CardType.MASTERCARD)), InstallmentOptions.CardBasedInstallmentOptions(10, false, CardBrand(CardType.VISA)), InstallmentOptions.CardBasedInstallmentOptions(10, false, CardBrand(CardType.AMERICAN_EXPRESS)), - ) - ) + ), + ), ) @JvmStatic @@ -457,7 +457,7 @@ internal class InstallmentUtilsTest { listOf( InstallmentOptions.CardBasedInstallmentOptions(10, false, CardBrand(CardType.MASTERCARD)), InstallmentOptions.CardBasedInstallmentOptions(10, false, CardBrand(CardType.MASTERCARD)), - ) + ), ), arguments( listOf( @@ -465,8 +465,8 @@ internal class InstallmentUtilsTest { InstallmentOptions.CardBasedInstallmentOptions(10, false, CardBrand(CardType.MASTERCARD)), InstallmentOptions.CardBasedInstallmentOptions(10, false, CardBrand(CardType.VISA)), InstallmentOptions.CardBasedInstallmentOptions(10, false, CardBrand(CardType.AMERICAN_EXPRESS)), - ) - ) + ), + ), ) @JvmStatic @@ -476,9 +476,9 @@ internal class InstallmentUtilsTest { InstallmentConfiguration( defaultOptions = InstallmentOptions.DefaultInstallmentOptions( values = listOf(2, 6, 10), - includeRevolving = false - ) - ) + includeRevolving = false, + ), + ), ), arguments( InstallmentConfiguration( @@ -486,31 +486,31 @@ internal class InstallmentUtilsTest { InstallmentOptions.CardBasedInstallmentOptions( values = listOf(2, 6, 10), includeRevolving = false, - cardBrand = CardBrand(CardType.MASTERCARD) + cardBrand = CardBrand(CardType.MASTERCARD), ), InstallmentOptions.CardBasedInstallmentOptions( values = listOf(2, 6), includeRevolving = false, - cardBrand = CardBrand(CardType.VISA) - ) - ) - ) + cardBrand = CardBrand(CardType.VISA), + ), + ), + ), ), arguments( InstallmentConfiguration( defaultOptions = InstallmentOptions.DefaultInstallmentOptions( values = listOf(2, 6), - includeRevolving = false + includeRevolving = false, ), cardBasedOptions = listOf( InstallmentOptions.CardBasedInstallmentOptions( values = listOf(2, 6), includeRevolving = false, - cardBrand = CardBrand(CardType.MASTERCARD) - ) - ) - ) - ) + cardBrand = CardBrand(CardType.MASTERCARD), + ), + ), + ), + ), ) @JvmStatic @@ -520,20 +520,20 @@ internal class InstallmentUtilsTest { whenever(defaultOptions).thenReturn( InstallmentOptions.DefaultInstallmentOptions( values = listOf(0), - includeRevolving = false - ) + includeRevolving = false, + ), ) - } + }, ), arguments( mock().apply { whenever(defaultOptions).thenReturn( InstallmentOptions.DefaultInstallmentOptions( values = listOf(1), - includeRevolving = false - ) + includeRevolving = false, + ), ) - } + }, ), arguments( mock().apply { @@ -542,31 +542,31 @@ internal class InstallmentUtilsTest { InstallmentOptions.CardBasedInstallmentOptions( values = listOf(1), includeRevolving = false, - cardBrand = CardBrand(CardType.MASTERCARD) - ) - ) + cardBrand = CardBrand(CardType.MASTERCARD), + ), + ), ) - } + }, ), arguments( mock().apply { whenever(defaultOptions).thenReturn( InstallmentOptions.DefaultInstallmentOptions( values = listOf(3, 4), - includeRevolving = false - ) + includeRevolving = false, + ), ) whenever(cardBasedOptions).thenReturn( listOf( InstallmentOptions.CardBasedInstallmentOptions( values = listOf(2, 3, 1), includeRevolving = false, - cardBrand = CardBrand(CardType.MASTERCARD) - ) - ) + cardBrand = CardBrand(CardType.MASTERCARD), + ), + ), ) - } - ) + }, + ), ) } } diff --git a/checkout-core/api/checkout-core.api b/checkout-core/api/checkout-core.api index 7398e2286f..9dcc0f5a1a 100644 --- a/checkout-core/api/checkout-core.api +++ b/checkout-core/api/checkout-core.api @@ -35,6 +35,79 @@ public final class com/adyen/checkout/core/BuildConfig { public fun ()V } +public final class com/adyen/checkout/core/CardBrand : android/os/Parcelable { + public static final field CREATOR Landroid/os/Parcelable$Creator; + public static final field Companion Lcom/adyen/checkout/core/CardBrand$Companion; + public fun (Lcom/adyen/checkout/core/CardType;)V + public fun (Ljava/lang/String;)V + public final fun component1 ()Ljava/lang/String; + public final fun copy (Ljava/lang/String;)Lcom/adyen/checkout/core/CardBrand; + public static synthetic fun copy$default (Lcom/adyen/checkout/core/CardBrand;Ljava/lang/String;ILjava/lang/Object;)Lcom/adyen/checkout/core/CardBrand; + public fun describeContents ()I + public fun equals (Ljava/lang/Object;)Z + public final fun getTxVariant ()Ljava/lang/String; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; + public fun writeToParcel (Landroid/os/Parcel;I)V +} + +public final class com/adyen/checkout/core/CardBrand$Companion { + public final fun estimate (Ljava/lang/String;)Ljava/util/List; +} + +public final class com/adyen/checkout/core/CardBrand$Creator : android/os/Parcelable$Creator { + public fun ()V + public final fun createFromParcel (Landroid/os/Parcel;)Lcom/adyen/checkout/core/CardBrand; + public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object; + public final fun newArray (I)[Lcom/adyen/checkout/core/CardBrand; + public synthetic fun newArray (I)[Ljava/lang/Object; +} + +public final class com/adyen/checkout/core/CardType : java/lang/Enum { + public static final field AMERICAN_EXPRESS Lcom/adyen/checkout/core/CardType; + public static final field ARGENCARD Lcom/adyen/checkout/core/CardType; + public static final field BCMC Lcom/adyen/checkout/core/CardType; + public static final field BIJENKORF_CARD Lcom/adyen/checkout/core/CardType; + public static final field CABAL Lcom/adyen/checkout/core/CardType; + public static final field CARTEBANCAIRE Lcom/adyen/checkout/core/CardType; + public static final field CODENSA Lcom/adyen/checkout/core/CardType; + public static final field CUP Lcom/adyen/checkout/core/CardType; + public static final field Companion Lcom/adyen/checkout/core/CardType$Companion; + public static final field DANKORT Lcom/adyen/checkout/core/CardType; + public static final field DINERS Lcom/adyen/checkout/core/CardType; + public static final field DISCOVER Lcom/adyen/checkout/core/CardType; + public static final field ELO Lcom/adyen/checkout/core/CardType; + public static final field FORBRUGSFORENINGEN Lcom/adyen/checkout/core/CardType; + public static final field HIPER Lcom/adyen/checkout/core/CardType; + public static final field HIPERCARD Lcom/adyen/checkout/core/CardType; + public static final field JCB Lcom/adyen/checkout/core/CardType; + public static final field KARENMILLER Lcom/adyen/checkout/core/CardType; + public static final field LASER Lcom/adyen/checkout/core/CardType; + public static final field MAESTRO Lcom/adyen/checkout/core/CardType; + public static final field MAESTRO_UK Lcom/adyen/checkout/core/CardType; + public static final field MASTERCARD Lcom/adyen/checkout/core/CardType; + public static final field MCALPHABANKBONUS Lcom/adyen/checkout/core/CardType; + public static final field MIR Lcom/adyen/checkout/core/CardType; + public static final field NARANJA Lcom/adyen/checkout/core/CardType; + public static final field OASIS Lcom/adyen/checkout/core/CardType; + public static final field SHOPPING Lcom/adyen/checkout/core/CardType; + public static final field SOLO Lcom/adyen/checkout/core/CardType; + public static final field TROY Lcom/adyen/checkout/core/CardType; + public static final field UATP Lcom/adyen/checkout/core/CardType; + public static final field VISA Lcom/adyen/checkout/core/CardType; + public static final field VISAALPHABANKBONUS Lcom/adyen/checkout/core/CardType; + public static final field VISADANKORT Lcom/adyen/checkout/core/CardType; + public static final field WAREHOUSE Lcom/adyen/checkout/core/CardType; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public final fun getTxVariant ()Ljava/lang/String; + public static fun valueOf (Ljava/lang/String;)Lcom/adyen/checkout/core/CardType; + public static fun values ()[Lcom/adyen/checkout/core/CardType; +} + +public final class com/adyen/checkout/core/CardType$Companion { + public final fun getByBrandName (Ljava/lang/String;)Lcom/adyen/checkout/core/CardType; +} + public final class com/adyen/checkout/core/Environment : android/os/Parcelable { public static final field APSE Lcom/adyen/checkout/core/Environment; public static final field AUSTRALIA Lcom/adyen/checkout/core/Environment; @@ -203,3 +276,17 @@ public final class com/adyen/checkout/core/ui/validation/CardNumberValidator { public final fun validateCardNumber (Ljava/lang/String;Z)Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; } +public final class com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult : java/lang/Enum { + public static final field INVALID Lcom/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult; + public static final field VALID Lcom/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public static fun valueOf (Ljava/lang/String;)Lcom/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult; + public static fun values ()[Lcom/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult; +} + +public final class com/adyen/checkout/core/ui/validation/CardSecurityCodeValidator { + public static final field INSTANCE Lcom/adyen/checkout/core/ui/validation/CardSecurityCodeValidator; + public final fun validateSecurityCode (Ljava/lang/String;Lcom/adyen/checkout/core/CardBrand;)Lcom/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult; + public static synthetic fun validateSecurityCode$default (Lcom/adyen/checkout/core/ui/validation/CardSecurityCodeValidator;Ljava/lang/String;Lcom/adyen/checkout/core/CardBrand;ILjava/lang/Object;)Lcom/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult; +} + diff --git a/card/src/main/java/com/adyen/checkout/card/CardBrand.kt b/checkout-core/src/main/java/com/adyen/checkout/core/CardBrand.kt similarity index 92% rename from card/src/main/java/com/adyen/checkout/card/CardBrand.kt rename to checkout-core/src/main/java/com/adyen/checkout/core/CardBrand.kt index c909cb2d1a..8799646372 100644 --- a/card/src/main/java/com/adyen/checkout/card/CardBrand.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/CardBrand.kt @@ -1,11 +1,11 @@ /* - * Copyright (c) 2019 Adyen N.V. + * Copyright (c) 2024 Adyen N.V. * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by arman on 16/9/2019. + * Created by ozgur on 2/10/2024. */ -package com.adyen.checkout.card +package com.adyen.checkout.core import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/card/src/main/java/com/adyen/checkout/card/CardType.kt b/checkout-core/src/main/java/com/adyen/checkout/core/CardType.kt similarity index 97% rename from card/src/main/java/com/adyen/checkout/card/CardType.kt rename to checkout-core/src/main/java/com/adyen/checkout/core/CardType.kt index 9e4b4aaa94..1f47dfb2df 100644 --- a/card/src/main/java/com/adyen/checkout/card/CardType.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/CardType.kt @@ -1,12 +1,12 @@ /* - * Copyright (c) 2023 Adyen N.V. + * Copyright (c) 2024 Adyen N.V. * * This file is open source and available under the MIT license. See the LICENSE file for more info. * - * Created by oscars on 15/2/2023. + * Created by ozgur on 2/10/2024. */ -package com.adyen.checkout.card +package com.adyen.checkout.core import java.util.regex.Pattern diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult.kt new file mode 100644 index 0000000000..614720a214 --- /dev/null +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 2/10/2024. + */ + +package com.adyen.checkout.core.ui.validation + +enum class CardSecurityCodeValidationResult { + INVALID, + VALID +} diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidator.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidator.kt new file mode 100644 index 0000000000..e3d06178ec --- /dev/null +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidator.kt @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 2/10/2024. + */ + +package com.adyen.checkout.core.ui.validation + +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType +import com.adyen.checkout.core.internal.util.StringUtil + +object CardSecurityCodeValidator { + + // Security Code + private const val GENERAL_CARD_SECURITY_CODE_SIZE = 3 + private const val AMEX_SECURITY_CODE_SIZE = 4 + + fun validateSecurityCode(securityCode: String, cardBrand: CardBrand? = null): CardSecurityCodeValidationResult { + val normalizedSecurityCode = StringUtil.normalize(securityCode) + val length = normalizedSecurityCode.length + return when { + !StringUtil.isDigitsAndSeparatorsOnly(normalizedSecurityCode) -> CardSecurityCodeValidationResult.INVALID + cardBrand == CardBrand(cardType = CardType.AMERICAN_EXPRESS) && + length == AMEX_SECURITY_CODE_SIZE -> CardSecurityCodeValidationResult.VALID + + cardBrand != CardBrand(cardType = CardType.AMERICAN_EXPRESS) && + length == GENERAL_CARD_SECURITY_CODE_SIZE -> CardSecurityCodeValidationResult.VALID + + else -> CardSecurityCodeValidationResult.INVALID + } + } +} diff --git a/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardNumberValidatorTest.kt b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardNumberValidatorTest.kt new file mode 100644 index 0000000000..228c4e95af --- /dev/null +++ b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardNumberValidatorTest.kt @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 4/10/2024. + */ + +package com.adyen.checkout.core.ui.validation + +class CardNumberValidatorTest { + // TODO add tests +} diff --git a/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidatorTest.kt b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidatorTest.kt new file mode 100644 index 0000000000..72e8eda3f0 --- /dev/null +++ b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidatorTest.kt @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 4/10/2024. + */ + +package com.adyen.checkout.core.ui.validation + +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.params.ParameterizedTest +import org.junit.jupiter.params.provider.Arguments.arguments +import org.junit.jupiter.params.provider.MethodSource + +internal class CardSecurityCodeValidatorTest { + + @ParameterizedTest + @MethodSource("securityCodeValidationSource") + fun `when validateSecurityCode is called, then expected validation result is returned`( + securityCodeInput: String, + cardBrand: CardBrand? = null, + expectedValidationResult: CardSecurityCodeValidationResult + ) { + val actualResult = CardSecurityCodeValidator.validateSecurityCode(securityCodeInput, cardBrand) + assertEquals(expectedValidationResult, actualResult) + } + + companion object { + @JvmStatic + fun securityCodeValidationSource() = listOf( + arguments( + "", + CardBrand(CardType.VISA), + CardSecurityCodeValidationResult.INVALID, + ), + arguments( + "7", + CardBrand(CardType.VISA), + CardSecurityCodeValidationResult.INVALID, + ), + arguments( + "12", + CardBrand(CardType.VISA), + CardSecurityCodeValidationResult.INVALID, + ), + arguments( + "737", + CardBrand(CardType.VISA), + CardSecurityCodeValidationResult.VALID, + ), + arguments( + "8689", + CardBrand(CardType.VISA), + CardSecurityCodeValidationResult.INVALID, + ), + arguments( + "123456", + CardBrand(CardType.VISA), + CardSecurityCodeValidationResult.INVALID, + ), + arguments( + "737", + CardBrand(CardType.AMERICAN_EXPRESS), + CardSecurityCodeValidationResult.INVALID, + ), + arguments( + "8689", + CardBrand(CardType.AMERICAN_EXPRESS), + CardSecurityCodeValidationResult.VALID, + ), + arguments( + "1%y", + null, + CardSecurityCodeValidationResult.INVALID, + ), + ) + } +} diff --git a/example-app/src/main/java/com/adyen/checkout/example/ui/card/SessionsCardTakenOverViewModel.kt b/example-app/src/main/java/com/adyen/checkout/example/ui/card/SessionsCardTakenOverViewModel.kt index c2206bbe6b..0d5d9225fd 100644 --- a/example-app/src/main/java/com/adyen/checkout/example/ui/card/SessionsCardTakenOverViewModel.kt +++ b/example-app/src/main/java/com/adyen/checkout/example/ui/card/SessionsCardTakenOverViewModel.kt @@ -12,9 +12,7 @@ import android.util.Log import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.adyen.checkout.card.CardBrand import com.adyen.checkout.card.CardComponentState -import com.adyen.checkout.card.CardType import com.adyen.checkout.components.core.ActionComponentData import com.adyen.checkout.components.core.CheckoutConfiguration import com.adyen.checkout.components.core.ComponentError @@ -22,6 +20,8 @@ import com.adyen.checkout.components.core.LookupAddress import com.adyen.checkout.components.core.PaymentComponentData import com.adyen.checkout.components.core.PaymentMethodTypes import com.adyen.checkout.components.core.action.Action +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import com.adyen.checkout.example.data.storage.KeyValueStorage import com.adyen.checkout.example.extensions.getLogTag import com.adyen.checkout.example.repositories.AddressLookupCompletionState diff --git a/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt b/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt index 4d35bcc87b..63c461912f 100644 --- a/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt +++ b/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt @@ -4,8 +4,6 @@ import android.content.Context import com.adyen.checkout.adyen3ds2.adyen3DS2 import com.adyen.checkout.bcmc.bcmc import com.adyen.checkout.card.AddressConfiguration -import com.adyen.checkout.card.CardBrand -import com.adyen.checkout.card.CardType import com.adyen.checkout.card.InstallmentConfiguration import com.adyen.checkout.card.InstallmentOptions import com.adyen.checkout.card.card @@ -16,6 +14,8 @@ import com.adyen.checkout.components.core.Amount import com.adyen.checkout.components.core.AnalyticsConfiguration import com.adyen.checkout.components.core.AnalyticsLevel import com.adyen.checkout.components.core.CheckoutConfiguration +import com.adyen.checkout.core.CardBrand +import com.adyen.checkout.core.CardType import com.adyen.checkout.core.Environment import com.adyen.checkout.dropin.dropIn import com.adyen.checkout.example.BuildConfig From a1c8934befab1cbe189833cd37815cb9c81dad0a Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Mon, 7 Oct 2024 10:45:33 +0200 Subject: [PATCH 276/299] Add internal CardExpiryDateValidation to be used in CardValidationMapper COAND-985 --- .../card/internal/ui/CardValidationMapper.kt | 24 +- .../card/internal/ui/DefaultCardDelegate.kt | 4 +- .../card/internal/util/CardValidationUtils.kt | 43 ++- .../internal/ui/CardValidationMapperTest.kt | 208 +++++++++++++ .../internal/util/CardValidationUtilsTest.kt | 274 +++--------------- 5 files changed, 296 insertions(+), 257 deletions(-) create mode 100644 card/src/test/java/com/adyen/checkout/card/internal/ui/CardValidationMapperTest.kt diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt index 2b7f417a9c..e23f4d965b 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt @@ -10,14 +10,13 @@ package com.adyen.checkout.card.internal.ui import androidx.annotation.RestrictTo import com.adyen.checkout.card.R -import com.adyen.checkout.card.internal.data.model.Brand import com.adyen.checkout.card.internal.ui.model.InputFieldUIState +import com.adyen.checkout.card.internal.util.CardExpiryDateValidation import com.adyen.checkout.card.internal.util.CardNumberValidation import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.core.internal.util.StringUtil import com.adyen.checkout.core.ui.model.ExpiryDate -import com.adyen.checkout.core.ui.validation.CardExpiryDateValidationResult import com.adyen.checkout.core.ui.validation.CardSecurityCodeValidationResult @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) @@ -44,26 +43,19 @@ class CardValidationMapper { fun mapExpiryDateValidation( expiryDate: ExpiryDate, - fieldPolicy: Brand.FieldPolicy?, - validationResult: CardExpiryDateValidationResult + validationResult: CardExpiryDateValidation, ): FieldState { val validation = when (validationResult) { - CardExpiryDateValidationResult.VALID -> Validation.Valid - - CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> + CardExpiryDateValidation.VALID -> Validation.Valid + CardExpiryDateValidation.VALID_NOT_REQUIRED -> Validation.Valid + CardExpiryDateValidation.INVALID_TOO_FAR_IN_THE_FUTURE -> Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_far_in_future) - CardExpiryDateValidationResult.INVALID_TOO_OLD -> + CardExpiryDateValidation.INVALID_TOO_OLD -> Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_old) - CardExpiryDateValidationResult.INVALID_DATE_FORMAT -> - Validation.Invalid(R.string.checkout_expiry_date_not_valid) - - CardExpiryDateValidationResult.INVALID_OTHER_REASON -> if (fieldPolicy?.isRequired() == false) { - Validation.Valid - } else { - Validation.Invalid(R.string.checkout_expiry_date_not_valid) - } + CardExpiryDateValidation.INVALID_DATE_FORMAT -> Validation.Invalid(R.string.checkout_expiry_date_not_valid) + CardExpiryDateValidation.INVALID_OTHER_REASON -> Validation.Invalid(R.string.checkout_expiry_date_not_valid) } return FieldState(expiryDate, validation) } diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt index a4aed011d4..a0a51bc714 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt @@ -517,8 +517,8 @@ class DefaultCardDelegate( expiryDate: ExpiryDate, expiryDatePolicy: Brand.FieldPolicy? ): FieldState { - val validation = CardValidationUtils.validateExpiryDate(expiryDate) - return cardValidationMapper.mapExpiryDateValidation(expiryDate, expiryDatePolicy, validation) + val validation = CardValidationUtils.validateExpiryDate(expiryDate, expiryDatePolicy) + return cardValidationMapper.mapExpiryDateValidation(expiryDate, validation) } private fun validateSecurityCode( diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index aac8885406..c8cc177711 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -8,6 +8,8 @@ package com.adyen.checkout.card.internal.util import androidx.annotation.RestrictTo +import androidx.annotation.VisibleForTesting +import com.adyen.checkout.card.internal.data.model.Brand import com.adyen.checkout.card.internal.data.model.DetectedCardType import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.core.ui.validation.CardExpiryDateValidationResult @@ -44,9 +46,36 @@ object CardValidationUtils { */ internal fun validateExpiryDate( expiryDate: ExpiryDate, + fieldPolicy: Brand.FieldPolicy?, calendar: Calendar = GregorianCalendar.getInstance() - ): CardExpiryDateValidationResult { - return CardExpiryDateValidator.validateExpiryDate(expiryDate, calendar) + ): CardExpiryDateValidation { + val result = CardExpiryDateValidator.validateExpiryDate(expiryDate, calendar) + return validateExpiryDate(result, fieldPolicy) + } + + @VisibleForTesting + internal fun validateExpiryDate( + validationResult: CardExpiryDateValidationResult, + fieldPolicy: Brand.FieldPolicy? + ): CardExpiryDateValidation { + return when (validationResult) { + CardExpiryDateValidationResult.VALID -> CardExpiryDateValidation.VALID + + CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> + CardExpiryDateValidation.INVALID_TOO_FAR_IN_THE_FUTURE + + CardExpiryDateValidationResult.INVALID_TOO_OLD -> + CardExpiryDateValidation.INVALID_TOO_OLD + + CardExpiryDateValidationResult.INVALID_DATE_FORMAT -> + CardExpiryDateValidation.INVALID_DATE_FORMAT + + CardExpiryDateValidationResult.INVALID_OTHER_REASON -> if (fieldPolicy?.isRequired() == false) { + CardExpiryDateValidation.VALID_NOT_REQUIRED + } else { + CardExpiryDateValidation.INVALID_OTHER_REASON + } + } } /** @@ -69,3 +98,13 @@ enum class CardNumberValidation { INVALID_TOO_LONG, INVALID_UNSUPPORTED_BRAND } + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +enum class CardExpiryDateValidation { + VALID, + VALID_NOT_REQUIRED, + INVALID_TOO_FAR_IN_THE_FUTURE, + INVALID_TOO_OLD, + INVALID_DATE_FORMAT, + INVALID_OTHER_REASON, +} diff --git a/card/src/test/java/com/adyen/checkout/card/internal/ui/CardValidationMapperTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/ui/CardValidationMapperTest.kt new file mode 100644 index 0000000000..061d55107c --- /dev/null +++ b/card/src/test/java/com/adyen/checkout/card/internal/ui/CardValidationMapperTest.kt @@ -0,0 +1,208 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 4/10/2024. + */ + +package com.adyen.checkout.card.internal.ui + +import com.adyen.checkout.card.R +import com.adyen.checkout.card.internal.ui.model.InputFieldUIState +import com.adyen.checkout.card.internal.util.CardExpiryDateValidation +import com.adyen.checkout.components.core.internal.ui.model.FieldState +import com.adyen.checkout.components.core.internal.ui.model.Validation +import com.adyen.checkout.core.ui.model.ExpiryDate +import com.adyen.checkout.core.ui.validation.CardSecurityCodeValidationResult +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.DisplayName +import org.junit.jupiter.api.Nested +import org.junit.jupiter.api.Test + +internal class CardValidationMapperTest { + + private val cardValidationMapper = CardValidationMapper() + + @Nested + @DisplayName("when validating expiry date and") + inner class ValidateExpiryDateTest { + + @Test + fun `date is valid, then correct fieldState should be returned`() { + val expiryDate = ExpiryDate(4, 2025) // 04/2025 + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + CardExpiryDateValidation.VALID, + ) + + assertEquals(FieldState(expiryDate, Validation.Valid), actual) + } + + @Test + fun `date is valid, then result should be valid`() { + val expiryDate = ExpiryDate(4, 2040) // 04/2040 + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + CardExpiryDateValidation.VALID, + ) + + assertEquals(FieldState(expiryDate, Validation.Valid), actual) + } + + @Test + fun `date is too far in the future, then result should be invalid`() { + val expiryDate = ExpiryDate(4, 2099) // 04/2099 + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + CardExpiryDateValidation.INVALID_TOO_FAR_IN_THE_FUTURE, + ) + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future + + assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + } + + @Test + fun `date is too old, then result should be invalid`() { + val expiryDate = ExpiryDate(4, 2020) // 04/2020 + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + CardExpiryDateValidation.INVALID_TOO_OLD, + ) + + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old + + assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + } + + @Test + fun `date is not in correct format, then result should be invalid`() { + val expiryDate = ExpiryDate(4, 20) // 04/2020 + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + CardExpiryDateValidation.INVALID_DATE_FORMAT, + ) + + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid + + assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + } + + @Test + fun `date is invalid, then result should be invalid`() { + val expiryDate = ExpiryDate(4, 2020) // 04/2020 + val actual = cardValidationMapper.mapExpiryDateValidation( + expiryDate, + CardExpiryDateValidation.INVALID_OTHER_REASON, + ) + + val expectedInvalidReason = R.string.checkout_expiry_date_not_valid + + assertEquals(FieldState(expiryDate, Validation.Invalid(expectedInvalidReason)), actual) + } + } + + @Nested + @DisplayName("when validating cvc and") + inner class ValidateSecurityCodeTest { + + @Test + fun `cvc is valid with field policy required, then result should be valid`() { + val cvc = "546" + val actual = cardValidationMapper.mapSecurityCodeValidation( + cvc, + InputFieldUIState.REQUIRED, + CardSecurityCodeValidationResult.VALID, + ) + assertEquals(FieldState(cvc, Validation.Valid), actual) + } + + @Test + fun `cvc is valid with field policy optional, then result should be valid`() { + val cvc = "345" + val actual = cardValidationMapper.mapSecurityCodeValidation( + cvc, + InputFieldUIState.OPTIONAL, + CardSecurityCodeValidationResult.VALID, + ) + assertEquals(FieldState(cvc, Validation.Valid), actual) + } + + @Test + fun `cvc is valid with field policy hidden, then result should be valid`() { + val cvc = "156" + val actual = cardValidationMapper.mapSecurityCodeValidation( + cvc, + InputFieldUIState.HIDDEN, + CardSecurityCodeValidationResult.VALID, + ) + assertEquals(FieldState(cvc, Validation.Valid), actual) + } + + @Test + fun `cvc is invalid with field policy required, then result should be invalid`() { + val cvc = "77" + val actual = cardValidationMapper.mapSecurityCodeValidation( + cvc, + InputFieldUIState.REQUIRED, + CardSecurityCodeValidationResult.INVALID, + ) + assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) + } + + @Test + fun `cvc is invalid with field policy optional, then result should be invalid`() { + val cvc = "9" + val actual = cardValidationMapper.mapSecurityCodeValidation( + cvc, + InputFieldUIState.OPTIONAL, + CardSecurityCodeValidationResult.INVALID, + ) + assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) + } + + @Test + fun `cvc is invalid with field policy hidden, then result should be valid`() { + val cvc = "1358" + val actual = cardValidationMapper.mapSecurityCodeValidation( + cvc, + InputFieldUIState.HIDDEN, + CardSecurityCodeValidationResult.INVALID, + ) + assertEquals(FieldState(cvc, Validation.Valid), actual) + } + + @Test + fun `cvc is empty with field policy required, then result should be invalid`() { + val cvc = "" + val actual = cardValidationMapper.mapSecurityCodeValidation( + cvc, + InputFieldUIState.REQUIRED, + CardSecurityCodeValidationResult.INVALID, + ) + assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) + } + + @Test + fun `cvc is empty with field policy optional, then result should be valid`() { + val cvc = "" + val actual = cardValidationMapper.mapSecurityCodeValidation( + cvc, + InputFieldUIState.OPTIONAL, + CardSecurityCodeValidationResult.INVALID, + ) + assertEquals(FieldState(cvc, Validation.Valid), actual) + } + + @Test + fun `cvc is empty with field policy hidden, then result should be valid`() { + val cvc = "" + val actual = cardValidationMapper.mapSecurityCodeValidation( + cvc, + InputFieldUIState.HIDDEN, + CardSecurityCodeValidationResult.INVALID, + ) + assertEquals(FieldState(cvc, Validation.Valid), actual) + } + } +} diff --git a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt index 5dcf1a5074..4dc16b12bf 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt @@ -8,15 +8,8 @@ package com.adyen.checkout.card.internal.util -import com.adyen.checkout.card.R import com.adyen.checkout.card.internal.data.model.Brand -import com.adyen.checkout.card.internal.ui.CardValidationMapper -import com.adyen.checkout.card.internal.ui.model.InputFieldUIState -import com.adyen.checkout.components.core.internal.ui.model.FieldState -import com.adyen.checkout.components.core.internal.ui.model.Validation -import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.core.ui.validation.CardExpiryDateValidationResult -import com.adyen.checkout.core.ui.validation.CardSecurityCodeValidationResult import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Nested @@ -24,8 +17,6 @@ import org.junit.jupiter.api.Test internal class CardValidationUtilsTest { - private val cardValidationMapper = CardValidationMapper() - @Nested @DisplayName("when validating card number and") inner class ValidateCardNumberTest { @@ -146,317 +137,126 @@ internal class CardValidationUtilsTest { } @Nested - @DisplayName("when validating expiry date and") inner class ValidateExpiryDateTest { - // TODO extract these tests to a CardValidationMapper class - @Test - fun `date is valid, then correct fieldState should be returned`() { - val expiryDate = ExpiryDate(4, 2025) // 04/2025 - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.REQUIRED, - CardExpiryDateValidationResult.VALID, - ) - - assertEquals(FieldState(expiryDate, Validation.Valid), actual) - } - - @Test - fun `date is valid, then result should be valid`() { - val expiryDate = ExpiryDate(4, 2040) // 04/2040 - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.REQUIRED, - CardExpiryDateValidationResult.VALID, - ) - - assertEquals(Validation.Valid, actual.validation) - } - - @Test - fun `date is too far in the future, then result should be invalid`() { - val expiryDate = ExpiryDate(4, 2099) // 04/2099 - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.REQUIRED, - CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, - ) - val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future - - assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) - } - - @Test - fun `date is too old, then result should be invalid`() { - val expiryDate = ExpiryDate(4, 2020) // 04/2020 - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.REQUIRED, - CardExpiryDateValidationResult.INVALID_TOO_OLD, - ) - - val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old - - assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) - } - @Test fun `date is valid with field policy optional, then result should be valid`() { - val expiryDate = ExpiryDate(4, 2040) // 04/2040 - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.OPTIONAL, + val actual = CardValidationUtils.validateExpiryDate( CardExpiryDateValidationResult.VALID, + Brand.FieldPolicy.OPTIONAL, ) - assertEquals(Validation.Valid, actual.validation) + assertEquals(CardExpiryDateValidation.VALID, actual) } @Test fun `date is valid with field policy hidden, then result should be valid`() { - val expiryDate = ExpiryDate(4, 2040) // 04/2040 - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.HIDDEN, + val actual = CardValidationUtils.validateExpiryDate( CardExpiryDateValidationResult.VALID, + Brand.FieldPolicy.HIDDEN, ) - assertEquals(Validation.Valid, actual.validation) + assertEquals(CardExpiryDateValidation.VALID, actual) } @Test fun `date is too far in the future with field policy optional, then result should be invalid`() { - val expiryDate = ExpiryDate(4, 2099) // 04/2099 - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.OPTIONAL, + val actual = CardValidationUtils.validateExpiryDate( CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, + Brand.FieldPolicy.OPTIONAL, ) - val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future - - assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) + assertEquals(CardExpiryDateValidation.INVALID_TOO_FAR_IN_THE_FUTURE, actual) } @Test fun `date is too far in the future with field policy hidden, then result should be invalid`() { - val expiryDate = ExpiryDate(4, 2099) // 04/2099 - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.HIDDEN, + val actual = CardValidationUtils.validateExpiryDate( CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, + Brand.FieldPolicy.HIDDEN, ) - val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_far_in_future - - assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) + assertEquals(CardExpiryDateValidation.INVALID_TOO_FAR_IN_THE_FUTURE, actual) } @Test fun `date is too old with field policy optional, then result should be invalid`() { - val expiryDate = ExpiryDate(4, 2020) // 04/2020 - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.OPTIONAL, + val actual = CardValidationUtils.validateExpiryDate( CardExpiryDateValidationResult.INVALID_TOO_OLD, + Brand.FieldPolicy.OPTIONAL, ) - val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old - assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) + assertEquals(CardExpiryDateValidation.INVALID_TOO_OLD, actual) } @Test fun `date is too old with field policy hidden, then result should be invalid`() { - val expiryDate = ExpiryDate(4, 2020) // 04/2020 - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.HIDDEN, + val actual = CardValidationUtils.validateExpiryDate( CardExpiryDateValidationResult.INVALID_TOO_OLD, + Brand.FieldPolicy.HIDDEN, ) - val expectedInvalidReason = R.string.checkout_expiry_date_not_valid_too_old - - assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) + assertEquals(CardExpiryDateValidation.INVALID_TOO_OLD, actual) } @Test fun `date is empty with field policy required, then result should be invalid`() { - val expiryDate = ExpiryDate.EMPTY_DATE - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.REQUIRED, + val actual = CardValidationUtils.validateExpiryDate( CardExpiryDateValidationResult.INVALID_OTHER_REASON, + Brand.FieldPolicy.REQUIRED, ) - val expectedInvalidReason = R.string.checkout_expiry_date_not_valid - assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) + assertEquals(CardExpiryDateValidation.INVALID_OTHER_REASON, actual) } @Test fun `date is empty with field policy optional, then result should be valid`() { - val expiryDate = ExpiryDate.EMPTY_DATE - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.OPTIONAL, + val actual = CardValidationUtils.validateExpiryDate( CardExpiryDateValidationResult.INVALID_OTHER_REASON, + Brand.FieldPolicy.OPTIONAL, ) - assertEquals(Validation.Valid, actual.validation) + + assertEquals(CardExpiryDateValidation.VALID_NOT_REQUIRED, actual) } @Test fun `date is empty with field policy hidden, then result should be valid`() { - val expiryDate = ExpiryDate.EMPTY_DATE - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.HIDDEN, + val actual = CardValidationUtils.validateExpiryDate( CardExpiryDateValidationResult.INVALID_OTHER_REASON, + Brand.FieldPolicy.HIDDEN, ) - assertEquals(Validation.Valid, actual.validation) + assertEquals(CardExpiryDateValidation.VALID_NOT_REQUIRED, actual) } @Test fun `date is invalid with field policy required, then result should be invalid`() { - val expiryDate = ExpiryDate.INVALID_DATE - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.REQUIRED, + val actual = CardValidationUtils.validateExpiryDate( CardExpiryDateValidationResult.INVALID_DATE_FORMAT, + Brand.FieldPolicy.REQUIRED, ) - val expectedInvalidReason = R.string.checkout_expiry_date_not_valid - assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) + assertEquals(CardExpiryDateValidation.INVALID_DATE_FORMAT, actual) } @Test fun `date is invalid with field policy optional, then result should be invalid`() { - val expiryDate = ExpiryDate.INVALID_DATE - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.OPTIONAL, + val actual = CardValidationUtils.validateExpiryDate( CardExpiryDateValidationResult.INVALID_DATE_FORMAT, + Brand.FieldPolicy.OPTIONAL, ) - val expectedInvalidReason = R.string.checkout_expiry_date_not_valid - assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) + assertEquals(CardExpiryDateValidation.INVALID_DATE_FORMAT, actual) } @Test fun `date is invalid with field policy hidden, then result should be invalid`() { - val expiryDate = ExpiryDate.INVALID_DATE - val actual = cardValidationMapper.mapExpiryDateValidation( - expiryDate, - Brand.FieldPolicy.HIDDEN, + val actual = CardValidationUtils.validateExpiryDate( CardExpiryDateValidationResult.INVALID_DATE_FORMAT, + Brand.FieldPolicy.HIDDEN, ) - val expectedInvalidReason = R.string.checkout_expiry_date_not_valid - - assertEquals(Validation.Invalid(expectedInvalidReason), actual.validation) - } - } - - @Nested - @DisplayName("when validating cvc and") - inner class ValidateSecurityCodeTest { - - @Test - fun `cvc is valid with field policy required, then result should be valid`() { - val cvc = "546" - val actual = cardValidationMapper.mapSecurityCodeValidation( - cvc, - InputFieldUIState.REQUIRED, - CardSecurityCodeValidationResult.VALID, - ) - assertEquals(FieldState(cvc, Validation.Valid), actual) - } - - @Test - fun `cvc is valid with field policy optional, then result should be valid`() { - val cvc = "345" - val actual = cardValidationMapper.mapSecurityCodeValidation( - cvc, - InputFieldUIState.OPTIONAL, - CardSecurityCodeValidationResult.VALID, - ) - assertEquals(FieldState(cvc, Validation.Valid), actual) - } - - @Test - fun `cvc is valid with field policy hidden, then result should be valid`() { - val cvc = "156" - val actual = cardValidationMapper.mapSecurityCodeValidation( - cvc, - InputFieldUIState.HIDDEN, - CardSecurityCodeValidationResult.VALID, - ) - assertEquals(FieldState(cvc, Validation.Valid), actual) - } - - @Test - fun `cvc is invalid with field policy required, then result should be invalid`() { - val cvc = "77" - val actual = cardValidationMapper.mapSecurityCodeValidation( - cvc, - InputFieldUIState.REQUIRED, - CardSecurityCodeValidationResult.INVALID, - ) - assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) - } - - @Test - fun `cvc is invalid with field policy optional, then result should be invalid`() { - val cvc = "9" - val actual = cardValidationMapper.mapSecurityCodeValidation( - cvc, - InputFieldUIState.OPTIONAL, - CardSecurityCodeValidationResult.INVALID, - ) - assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) - } - - @Test - fun `cvc is invalid with field policy hidden, then result should be valid`() { - val cvc = "1358" - val actual = cardValidationMapper.mapSecurityCodeValidation( - cvc, - InputFieldUIState.HIDDEN, - CardSecurityCodeValidationResult.INVALID, - ) - assertEquals(FieldState(cvc, Validation.Valid), actual) - } - - @Test - fun `cvc is empty with field policy required, then result should be invalid`() { - val cvc = "" - val actual = cardValidationMapper.mapSecurityCodeValidation( - cvc, - InputFieldUIState.REQUIRED, - CardSecurityCodeValidationResult.INVALID, - ) - assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) - } - - @Test - fun `cvc is empty with field policy optional, then result should be valid`() { - val cvc = "" - val actual = cardValidationMapper.mapSecurityCodeValidation( - cvc, - InputFieldUIState.OPTIONAL, - CardSecurityCodeValidationResult.INVALID, - ) - assertEquals(FieldState(cvc, Validation.Valid), actual) - } - @Test - fun `cvc is empty with field policy hidden, then result should be valid`() { - val cvc = "" - val actual = cardValidationMapper.mapSecurityCodeValidation( - cvc, - InputFieldUIState.HIDDEN, - CardSecurityCodeValidationResult.INVALID, - ) - assertEquals(FieldState(cvc, Validation.Valid), actual) + assertEquals(CardExpiryDateValidation.INVALID_DATE_FORMAT, actual) } } } From e6f8c138a67d4841fc69a6d1c5b2e315f7e32b65 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Mon, 7 Oct 2024 11:34:14 +0200 Subject: [PATCH 277/299] Add internal CardSecurityCodeValidation to be used in CardValidationMapper COAND-985 --- .../card/internal/ui/CardValidationMapper.kt | 22 ++-- .../card/internal/ui/DefaultCardDelegate.kt | 4 +- .../card/internal/ui/StoredCardDelegate.kt | 4 +- .../card/internal/util/CardValidationUtils.kt | 39 ++++++- .../internal/ui/CardValidationMapperTest.kt | 78 ++----------- .../internal/util/CardValidationUtilsTest.kt | 104 ++++++++++++++++++ 6 files changed, 160 insertions(+), 91 deletions(-) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt index e23f4d965b..ce265aea8e 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt @@ -10,14 +10,13 @@ package com.adyen.checkout.card.internal.ui import androidx.annotation.RestrictTo import com.adyen.checkout.card.R -import com.adyen.checkout.card.internal.ui.model.InputFieldUIState import com.adyen.checkout.card.internal.util.CardExpiryDateValidation import com.adyen.checkout.card.internal.util.CardNumberValidation +import com.adyen.checkout.card.internal.util.CardSecurityCodeValidation import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.core.internal.util.StringUtil import com.adyen.checkout.core.ui.model.ExpiryDate -import com.adyen.checkout.core.ui.validation.CardSecurityCodeValidationResult @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) class CardValidationMapper { @@ -62,22 +61,15 @@ class CardValidationMapper { fun mapSecurityCodeValidation( securityCode: String, - cvcUIState: InputFieldUIState, - validationResult: CardSecurityCodeValidationResult + validationResult: CardSecurityCodeValidation ): FieldState { val normalizedSecurityCode = StringUtil.normalize(securityCode) - val length = normalizedSecurityCode.length - val invalidState = Validation.Invalid(R.string.checkout_security_code_not_valid) - val validation = when { - cvcUIState == InputFieldUIState.HIDDEN -> Validation.Valid - cvcUIState == InputFieldUIState.OPTIONAL && length == 0 -> Validation.Valid - else -> { - when (validationResult) { - CardSecurityCodeValidationResult.INVALID -> invalidState - CardSecurityCodeValidationResult.VALID -> Validation.Valid - } - } + val validation = when (validationResult) { + CardSecurityCodeValidation.VALID -> Validation.Valid + CardSecurityCodeValidation.VALID_HIDDEN -> Validation.Valid + CardSecurityCodeValidation.VALID_OPTIONAL_EMPTY -> Validation.Valid + CardSecurityCodeValidation.INVALID -> Validation.Invalid(R.string.checkout_security_code_not_valid) } return FieldState(normalizedSecurityCode, validation) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt index a0a51bc714..b38a34cc1e 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt @@ -526,8 +526,8 @@ class DefaultCardDelegate( cardType: DetectedCardType? ): FieldState { val cvcUIState = makeCvcUIState(cardType) - val validation = CardValidationUtils.validateSecurityCode(securityCode, cardType) - return cardValidationMapper.mapSecurityCodeValidation(securityCode, cvcUIState, validation) + val validation = CardValidationUtils.validateSecurityCode(securityCode, cardType, cvcUIState) + return cardValidationMapper.mapSecurityCodeValidation(securityCode, validation) } private fun validateHolderName(holderName: String): FieldState { diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt index fb99139e0b..0a973e86e7 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt @@ -331,8 +331,8 @@ internal class StoredCardDelegate( private fun validateSecurityCode(securityCode: String, detectedCardType: DetectedCardType): FieldState { val cvcUiState = makeCvcUIState(detectedCardType.cvcPolicy) - val validation = CardValidationUtils.validateSecurityCode(securityCode, detectedCardType) - return cardValidationMapper.mapSecurityCodeValidation(securityCode, cvcUiState, validation) + val validation = CardValidationUtils.validateSecurityCode(securityCode, detectedCardType, cvcUiState) + return cardValidationMapper.mapSecurityCodeValidation(securityCode, validation) } private fun isCvcHidden(): Boolean { diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index c8cc177711..a09a9ab527 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -11,6 +11,8 @@ import androidx.annotation.RestrictTo import androidx.annotation.VisibleForTesting import com.adyen.checkout.card.internal.data.model.Brand import com.adyen.checkout.card.internal.data.model.DetectedCardType +import com.adyen.checkout.card.internal.ui.model.InputFieldUIState +import com.adyen.checkout.core.internal.util.StringUtil import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.core.ui.validation.CardExpiryDateValidationResult import com.adyen.checkout.core.ui.validation.CardExpiryDateValidator @@ -83,9 +85,32 @@ object CardValidationUtils { */ internal fun validateSecurityCode( securityCode: String, - detectedCardType: DetectedCardType? - ): CardSecurityCodeValidationResult { - return CardSecurityCodeValidator.validateSecurityCode(securityCode, detectedCardType?.cardBrand) + detectedCardType: DetectedCardType?, + uiState: InputFieldUIState + ): CardSecurityCodeValidation { + val result = CardSecurityCodeValidator.validateSecurityCode(securityCode, detectedCardType?.cardBrand) + return validateSecurityCode(securityCode, uiState, result) + } + + @VisibleForTesting + internal fun validateSecurityCode( + securityCode: String, + uiState: InputFieldUIState, + validationResult: CardSecurityCodeValidationResult + ): CardSecurityCodeValidation { + val normalizedSecurityCode = StringUtil.normalize(securityCode) + val length = normalizedSecurityCode.length + + return when { + uiState == InputFieldUIState.HIDDEN -> CardSecurityCodeValidation.VALID_HIDDEN + uiState == InputFieldUIState.OPTIONAL && length == 0 -> CardSecurityCodeValidation.VALID_OPTIONAL_EMPTY + else -> { + when (validationResult) { + CardSecurityCodeValidationResult.INVALID -> CardSecurityCodeValidation.INVALID + CardSecurityCodeValidationResult.VALID -> CardSecurityCodeValidation.VALID + } + } + } } } @@ -108,3 +133,11 @@ enum class CardExpiryDateValidation { INVALID_DATE_FORMAT, INVALID_OTHER_REASON, } + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +enum class CardSecurityCodeValidation { + VALID, + VALID_HIDDEN, + VALID_OPTIONAL_EMPTY, + INVALID, +} diff --git a/card/src/test/java/com/adyen/checkout/card/internal/ui/CardValidationMapperTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/ui/CardValidationMapperTest.kt index 061d55107c..2d6c9a8c98 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/ui/CardValidationMapperTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/ui/CardValidationMapperTest.kt @@ -9,12 +9,11 @@ package com.adyen.checkout.card.internal.ui import com.adyen.checkout.card.R -import com.adyen.checkout.card.internal.ui.model.InputFieldUIState import com.adyen.checkout.card.internal.util.CardExpiryDateValidation +import com.adyen.checkout.card.internal.util.CardSecurityCodeValidation import com.adyen.checkout.components.core.internal.ui.model.FieldState import com.adyen.checkout.components.core.internal.ui.model.Validation import com.adyen.checkout.core.ui.model.ExpiryDate -import com.adyen.checkout.core.ui.validation.CardSecurityCodeValidationResult import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Nested @@ -107,34 +106,31 @@ internal class CardValidationMapperTest { inner class ValidateSecurityCodeTest { @Test - fun `cvc is valid with field policy required, then result should be valid`() { + fun `cvc is valid, then result should be valid`() { val cvc = "546" val actual = cardValidationMapper.mapSecurityCodeValidation( cvc, - InputFieldUIState.REQUIRED, - CardSecurityCodeValidationResult.VALID, + CardSecurityCodeValidation.VALID, ) assertEquals(FieldState(cvc, Validation.Valid), actual) } @Test - fun `cvc is valid with field policy optional, then result should be valid`() { - val cvc = "345" + fun `cvc is empty while field is optional, then result should be valid`() { + val cvc = "" val actual = cardValidationMapper.mapSecurityCodeValidation( cvc, - InputFieldUIState.OPTIONAL, - CardSecurityCodeValidationResult.VALID, + CardSecurityCodeValidation.VALID_OPTIONAL_EMPTY, ) assertEquals(FieldState(cvc, Validation.Valid), actual) } @Test - fun `cvc is valid with field policy hidden, then result should be valid`() { + fun `cvc is hidden, then result should be valid`() { val cvc = "156" val actual = cardValidationMapper.mapSecurityCodeValidation( cvc, - InputFieldUIState.HIDDEN, - CardSecurityCodeValidationResult.VALID, + CardSecurityCodeValidation.VALID_HIDDEN, ) assertEquals(FieldState(cvc, Validation.Valid), actual) } @@ -144,65 +140,9 @@ internal class CardValidationMapperTest { val cvc = "77" val actual = cardValidationMapper.mapSecurityCodeValidation( cvc, - InputFieldUIState.REQUIRED, - CardSecurityCodeValidationResult.INVALID, - ) - assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) - } - - @Test - fun `cvc is invalid with field policy optional, then result should be invalid`() { - val cvc = "9" - val actual = cardValidationMapper.mapSecurityCodeValidation( - cvc, - InputFieldUIState.OPTIONAL, - CardSecurityCodeValidationResult.INVALID, + CardSecurityCodeValidation.INVALID, ) assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) } - - @Test - fun `cvc is invalid with field policy hidden, then result should be valid`() { - val cvc = "1358" - val actual = cardValidationMapper.mapSecurityCodeValidation( - cvc, - InputFieldUIState.HIDDEN, - CardSecurityCodeValidationResult.INVALID, - ) - assertEquals(FieldState(cvc, Validation.Valid), actual) - } - - @Test - fun `cvc is empty with field policy required, then result should be invalid`() { - val cvc = "" - val actual = cardValidationMapper.mapSecurityCodeValidation( - cvc, - InputFieldUIState.REQUIRED, - CardSecurityCodeValidationResult.INVALID, - ) - assertEquals(FieldState(cvc, Validation.Invalid(R.string.checkout_security_code_not_valid)), actual) - } - - @Test - fun `cvc is empty with field policy optional, then result should be valid`() { - val cvc = "" - val actual = cardValidationMapper.mapSecurityCodeValidation( - cvc, - InputFieldUIState.OPTIONAL, - CardSecurityCodeValidationResult.INVALID, - ) - assertEquals(FieldState(cvc, Validation.Valid), actual) - } - - @Test - fun `cvc is empty with field policy hidden, then result should be valid`() { - val cvc = "" - val actual = cardValidationMapper.mapSecurityCodeValidation( - cvc, - InputFieldUIState.HIDDEN, - CardSecurityCodeValidationResult.INVALID, - ) - assertEquals(FieldState(cvc, Validation.Valid), actual) - } } } diff --git a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt index 4dc16b12bf..afaaeb840c 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt @@ -9,7 +9,9 @@ package com.adyen.checkout.card.internal.util import com.adyen.checkout.card.internal.data.model.Brand +import com.adyen.checkout.card.internal.ui.model.InputFieldUIState import com.adyen.checkout.core.ui.validation.CardExpiryDateValidationResult +import com.adyen.checkout.core.ui.validation.CardSecurityCodeValidationResult import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Nested @@ -259,4 +261,106 @@ internal class CardValidationUtilsTest { assertEquals(CardExpiryDateValidation.INVALID_DATE_FORMAT, actual) } } + + @Nested + inner class ValidateSecurityCodeTest { + @Test + fun `cvc is valid with field policy required, then result should be valid`() { + val cvc = "546" + val actual = CardValidationUtils.validateSecurityCode( + cvc, + InputFieldUIState.REQUIRED, + CardSecurityCodeValidationResult.VALID, + ) + assertEquals(CardSecurityCodeValidation.VALID, actual) + } + + @Test + fun `cvc is valid with field policy optional, then result should be valid`() { + val cvc = "345" + val actual = CardValidationUtils.validateSecurityCode( + cvc, + InputFieldUIState.OPTIONAL, + CardSecurityCodeValidationResult.VALID, + ) + assertEquals(CardSecurityCodeValidation.VALID, actual) + } + + @Test + fun `cvc is valid with field policy hidden, then result should be valid`() { + val cvc = "156" + val actual = CardValidationUtils.validateSecurityCode( + cvc, + InputFieldUIState.HIDDEN, + CardSecurityCodeValidationResult.VALID, + ) + assertEquals(CardSecurityCodeValidation.VALID_HIDDEN, actual) + } + + @Test + fun `cvc is invalid with field policy required, then result should be invalid`() { + val cvc = "77" + val actual = CardValidationUtils.validateSecurityCode( + cvc, + InputFieldUIState.REQUIRED, + CardSecurityCodeValidationResult.INVALID, + ) + assertEquals(CardSecurityCodeValidation.INVALID, actual) + } + + @Test + fun `cvc is invalid with field policy optional, then result should be invalid`() { + val cvc = "9" + val actual = CardValidationUtils.validateSecurityCode( + cvc, + InputFieldUIState.OPTIONAL, + CardSecurityCodeValidationResult.INVALID, + ) + assertEquals(CardSecurityCodeValidation.INVALID, actual) + } + + @Test + fun `cvc is invalid with field policy hidden, then result should be valid`() { + val cvc = "1358" + val actual = CardValidationUtils.validateSecurityCode( + cvc, + InputFieldUIState.HIDDEN, + CardSecurityCodeValidationResult.INVALID, + ) + assertEquals(CardSecurityCodeValidation.VALID_HIDDEN, actual) + } + + @Test + fun `cvc is empty with field policy required, then result should be invalid`() { + val cvc = "" + val actual = CardValidationUtils.validateSecurityCode( + cvc, + InputFieldUIState.REQUIRED, + CardSecurityCodeValidationResult.INVALID, + ) + assertEquals(CardSecurityCodeValidation.INVALID, actual) + } + + @Test + fun `cvc is empty with field policy optional, then result should be valid`() { + val cvc = "" + val actual = CardValidationUtils.validateSecurityCode( + cvc, + InputFieldUIState.OPTIONAL, + CardSecurityCodeValidationResult.INVALID, + ) + assertEquals(CardSecurityCodeValidation.VALID_OPTIONAL_EMPTY, actual) + } + + @Test + fun `cvc is empty with field policy hidden, then result should be valid`() { + val cvc = "" + val actual = CardValidationUtils.validateSecurityCode( + cvc, + InputFieldUIState.HIDDEN, + CardSecurityCodeValidationResult.INVALID, + ) + assertEquals(CardSecurityCodeValidation.VALID_HIDDEN, actual) + } + } } From c06946ffae95083c14a2a235390ea295cb1e5889 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Mon, 7 Oct 2024 13:19:41 +0200 Subject: [PATCH 278/299] Extract card number validation tests to CardNumberValidatorTest Also update tests in CardValidationUtilsTest COAND-985 --- .../card/internal/util/CardValidationUtils.kt | 16 +++- .../internal/util/CardValidationUtilsTest.kt | 95 ++++--------------- .../ui/validation/CardNumberValidatorTest.kt | 70 +++++++++++++- 3 files changed, 101 insertions(+), 80 deletions(-) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index a09a9ab527..0ee4c4c5a0 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -29,9 +29,21 @@ object CardValidationUtils { /** * Validate card number. */ - fun validateCardNumber(number: String, enableLuhnCheck: Boolean, isBrandSupported: Boolean): CardNumberValidation { + internal fun validateCardNumber( + number: String, + enableLuhnCheck: Boolean, + isBrandSupported: Boolean + ): CardNumberValidation { val validation = CardNumberValidator.validateCardNumber(number, enableLuhnCheck) - return when (validation) { + return validateCardNumber(validation, isBrandSupported) + } + + @VisibleForTesting + internal fun validateCardNumber( + validationResult: CardNumberValidationResult, + isBrandSupported: Boolean + ): CardNumberValidation { + return when (validationResult) { CardNumberValidationResult.INVALID_ILLEGAL_CHARACTERS -> CardNumberValidation.INVALID_ILLEGAL_CHARACTERS CardNumberValidationResult.INVALID_TOO_LONG -> CardNumberValidation.INVALID_TOO_LONG CardNumberValidationResult.INVALID_TOO_SHORT -> CardNumberValidation.INVALID_TOO_SHORT diff --git a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt index afaaeb840c..feb52853a1 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt @@ -11,6 +11,7 @@ package com.adyen.checkout.card.internal.util import com.adyen.checkout.card.internal.data.model.Brand import com.adyen.checkout.card.internal.ui.model.InputFieldUIState import com.adyen.checkout.core.ui.validation.CardExpiryDateValidationResult +import com.adyen.checkout.core.ui.validation.CardNumberValidationResult import com.adyen.checkout.core.ui.validation.CardSecurityCodeValidationResult import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.DisplayName @@ -24,117 +25,57 @@ internal class CardValidationUtilsTest { inner class ValidateCardNumberTest { @Test - fun `number is valid without separators, then result should be valid`() { - val number = "5454545454545454" + fun `number is valid with brand supported, then result should be valid`() { val validation = CardValidationUtils.validateCardNumber( - number = number, - enableLuhnCheck = true, + validationResult = CardNumberValidationResult.VALID, isBrandSupported = true, ) assertEquals(CardNumberValidation.VALID, validation) } @Test - fun `number is valid with formatting spacing, then result should be valid`() { - val number = "3700 0000 0000 002" + fun `number is valid with brand unsupported, then result should be invalid unsupported brand`() { val validation = CardValidationUtils.validateCardNumber( - number = number, - enableLuhnCheck = true, - isBrandSupported = true, - ) - assertEquals(CardNumberValidation.VALID, validation) - } - - @Test - fun `number is valid with random spaces, then result should be valid`() { - val number = "55 770 0005 57 7 00 04" - val validation = CardValidationUtils.validateCardNumber( - number = number, - enableLuhnCheck = true, - isBrandSupported = true, - ) - assertEquals(CardNumberValidation.VALID, validation) - } - - @Test - fun `number contains alphabetical characters, then result should be invalid`() { - val number = "2137f7834a2390" - val validation = CardValidationUtils.validateCardNumber( - number = number, - enableLuhnCheck = true, - // set to false to make sure INVALID_ILLEGAL_CHARACTERS is checked before INVALID_UNSUPPORTED_BRAND + validationResult = CardNumberValidationResult.VALID, isBrandSupported = false, ) - assertEquals(CardNumberValidation.INVALID_ILLEGAL_CHARACTERS, validation) + assertEquals(CardNumberValidation.INVALID_UNSUPPORTED_BRAND, validation) } @Test - fun `number contains illegal characters, then result should be invalid`() { - val number = "287,7482-3674" + fun `number is invalid with illegal characters, then result should be invalid illegal characters`() { val validation = CardValidationUtils.validateCardNumber( - number = number, - enableLuhnCheck = true, - // set to false to make sure INVALID_ILLEGAL_CHARACTERS is checked before INVALID_UNSUPPORTED_BRAND - isBrandSupported = false, + validationResult = CardNumberValidationResult.INVALID_ILLEGAL_CHARACTERS, + isBrandSupported = true, ) assertEquals(CardNumberValidation.INVALID_ILLEGAL_CHARACTERS, validation) } @Test - fun `number is too short, then result should be invalid`() { - val number = "1234123" - val validation = CardValidationUtils.validateCardNumber( - number = number, - enableLuhnCheck = true, - // set to false to make sure INVALID_TOO_SHORT is checked before INVALID_UNSUPPORTED_BRAND - isBrandSupported = false, - ) - assertEquals(CardNumberValidation.INVALID_TOO_SHORT, validation) - } - - @Test - fun `number is too long, then result should be invalid`() { - val number = "37467643756457884754" + fun `number is too long, then result should be invalid too long`() { val validation = CardValidationUtils.validateCardNumber( - number = number, - enableLuhnCheck = true, - // set to false to make sure INVALID_TOO_LONG is checked before INVALID_UNSUPPORTED_BRAND - isBrandSupported = false, + validationResult = CardNumberValidationResult.INVALID_TOO_LONG, + isBrandSupported = true, ) assertEquals(CardNumberValidation.INVALID_TOO_LONG, validation) } @Test - fun `brand is unsupported, then result should be invalid`() { - val number = "6771 7980 2100 0008" + fun `number is too short, then result should be invalid too short`() { val validation = CardValidationUtils.validateCardNumber( - number = number, - enableLuhnCheck = true, - isBrandSupported = false, - ) - assertEquals(CardNumberValidation.INVALID_UNSUPPORTED_BRAND, validation) - } - - @Test - fun `luhn check fails, then result should be invalid`() { - val number = "8475 1789 7235 6236" - val validation = CardValidationUtils.validateCardNumber( - number = number, - enableLuhnCheck = true, + validationResult = CardNumberValidationResult.INVALID_TOO_SHORT, isBrandSupported = true, ) - assertEquals(CardNumberValidation.INVALID_LUHN_CHECK, validation) + assertEquals(CardNumberValidation.INVALID_TOO_SHORT, validation) } @Test - fun `luhn check fails but luhn check is disabled, then result should be valid`() { - val number = "192382023091310912" + fun `number is invalid due to failing luhn check, then result should be invalid luhn check`() { val validation = CardValidationUtils.validateCardNumber( - number = number, - enableLuhnCheck = false, + validationResult = CardNumberValidationResult.INVALID_LUHN_CHECK, isBrandSupported = true, ) - assertEquals(CardNumberValidation.VALID, validation) + assertEquals(CardNumberValidation.INVALID_LUHN_CHECK, validation) } } diff --git a/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardNumberValidatorTest.kt b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardNumberValidatorTest.kt index 228c4e95af..05efb2fd26 100644 --- a/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardNumberValidatorTest.kt +++ b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardNumberValidatorTest.kt @@ -8,6 +8,74 @@ package com.adyen.checkout.core.ui.validation +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.params.ParameterizedTest +import org.junit.jupiter.params.provider.Arguments.arguments +import org.junit.jupiter.params.provider.MethodSource + class CardNumberValidatorTest { - // TODO add tests + + @ParameterizedTest + @MethodSource("cardNumberValidationSource") + fun `when validateCardNumber is called, then expected validation result is returned`( + number: String, + enableLuhnCheck: Boolean, + expectedValidationResult: CardNumberValidationResult, + ) { + val actualResult = CardNumberValidator.validateCardNumber(number, enableLuhnCheck) + assertEquals(expectedValidationResult, actualResult) + } + + companion object { + @JvmStatic + fun cardNumberValidationSource() = listOf( + arguments( + "5454545454545454", + true, + CardNumberValidationResult.VALID, + ), + arguments( + "3700 0000 0000 002", + true, + CardNumberValidationResult.VALID, + ), + arguments( + "55 770 0005 57 7 00 04", + true, + CardNumberValidationResult.VALID, + ), + arguments( + "2137f7834a2390", + true, + CardNumberValidationResult.INVALID_ILLEGAL_CHARACTERS, + ), + arguments( + "287,7482-3674", + true, + CardNumberValidationResult.INVALID_ILLEGAL_CHARACTERS, + ), + arguments( + "1234123", + true, + CardNumberValidationResult.INVALID_TOO_SHORT, + ), + arguments( + "37467643756457884754", + true, + CardNumberValidationResult.INVALID_TOO_LONG, + ), + // Luhn check fails + arguments( + "8475 1789 7235 6236", + true, + CardNumberValidationResult.INVALID_LUHN_CHECK, + ), + // Luhn check is failing but disabled, result is valid + arguments( + "192382023091310912", + false, + CardNumberValidationResult.VALID, + ), + ) + } } From 244bc02bd11d000265394aaf24850f4fe489f31b Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Mon, 7 Oct 2024 15:59:01 +0200 Subject: [PATCH 279/299] Add kdocs for public card input validation classes COAND-985 --- .../validation/CardExpiryDateValidationResult.kt | 3 +++ .../core/ui/validation/CardExpiryDateValidator.kt | 15 +++++++++++++++ .../ui/validation/CardNumberValidationResult.kt | 3 +++ .../core/ui/validation/CardNumberValidator.kt | 8 ++++++++ .../CardSecurityCodeValidationResult.kt | 3 +++ .../ui/validation/CardSecurityCodeValidator.kt | 9 +++++++++ 6 files changed, 41 insertions(+) diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt index 61d1a78b5e..0d38b6859e 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt @@ -8,6 +8,9 @@ package com.adyen.checkout.core.ui.validation +/** + * Possible validation results for expiry date validation. (@see [CardExpiryDateValidator.validateExpiryDate] + */ enum class CardExpiryDateValidationResult { VALID, INVALID_TOO_FAR_IN_THE_FUTURE, diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt index fb50da73b7..2952c92cdc 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt @@ -18,10 +18,25 @@ object CardExpiryDateValidator { private const val MAXIMUM_YEARS_IN_FUTURE = 30 private const val MAXIMUM_EXPIRED_MONTHS = 3 + /** + * Validate expiry date. + * + * @param expiryDate Expiry date. + * + * @return Validation result. + */ fun validateExpiryDate( expiryDate: ExpiryDate ) = validateExpiryDate(expiryDate, GregorianCalendar.getInstance()) + /** + * Validate expiry date. + * + * @param expiryDate Expiry date. + * @param calendar Calendar instance to be used to compare given expiry date. + * + * @return Validation result. + */ fun validateExpiryDate( expiryDate: ExpiryDate, calendar: Calendar diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidationResult.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidationResult.kt index cbe3e3ed74..ba35ca0fad 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidationResult.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidationResult.kt @@ -8,6 +8,9 @@ package com.adyen.checkout.core.ui.validation +/** + * Possible validation results for card number validation. (@see [CardNumberValidator.validateCardNumber] + */ enum class CardNumberValidationResult { INVALID_ILLEGAL_CHARACTERS, INVALID_TOO_LONG, diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt index a982f530bd..3e341db505 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt @@ -20,6 +20,14 @@ object CardNumberValidator { private const val MINIMUM_CARD_NUMBER_LENGTH = 12 const val MAXIMUM_CARD_NUMBER_LENGTH = 19 + /** + * Validate card number. + * + * @param number Card number. + * @param enableLuhnCheck Whether Luhn check will be included in validation check or not. + * + * @return Validation result. + */ fun validateCardNumber(number: String, enableLuhnCheck: Boolean): CardNumberValidationResult { val normalizedNumber = StringUtil.normalize(number) val length = normalizedNumber.length diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult.kt index 614720a214..c0f42a4fad 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult.kt @@ -8,6 +8,9 @@ package com.adyen.checkout.core.ui.validation +/** + * Possible validation results for security code validation. (@see [CardSecurityCodeValidator.validateSecurityCode] + */ enum class CardSecurityCodeValidationResult { INVALID, VALID diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidator.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidator.kt index e3d06178ec..b7ebee9659 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidator.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidator.kt @@ -18,6 +18,15 @@ object CardSecurityCodeValidator { private const val GENERAL_CARD_SECURITY_CODE_SIZE = 3 private const val AMEX_SECURITY_CODE_SIZE = 4 + /** + * Validate security code (CVV/CVC). + * + * @param securityCode Security code (CVV/CVC). + * @param cardBrand Optional card brand parameter to apply specific validation to given security code + * for a card brand. + * + * @return Validation result. + */ fun validateSecurityCode(securityCode: String, cardBrand: CardBrand? = null): CardSecurityCodeValidationResult { val normalizedSecurityCode = StringUtil.normalize(securityCode) val length = normalizedSecurityCode.length From b6bacb97b0f4710d051943dfa3be547ab1aae655 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Mon, 7 Oct 2024 15:59:27 +0200 Subject: [PATCH 280/299] Update RELEASE_NOTES to include public card input validation updates COAND-985 --- RELEASE_NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 3ffc47a005..1ca15f9ed8 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -15,6 +15,7 @@ - Up. Payment method type: **mealVoucher_FR_groupeup**. - Natixis. Payment method type: **mealVoucher_FR_natixis**. - Sodexo. Payment method type: **mealVoucher_FR_sodexo**. +- For API only merchants, `CardNumberValidator`, `CardExpiryDateValidator` and `CardSecurityCodeValidator` classes are added to make validation functionality for the corresponding fields available to public. - For Twint, storing payment details and paying with them is now supported. See the documentation [here](/docs/payment-methods/TWINT.md). - You can now use [Adyen Test Cards Android](https://github.com/Adyen/adyen-testcards-android) to prefill test payment method information, making testing your integration easier. From ecef2349839ba3dfe85b3faece9746edd9ea71a3 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Tue, 8 Oct 2024 13:40:30 +0200 Subject: [PATCH 281/299] Create CardBrand type alias in card module COAND-985 --- .../main/java/com/adyen/checkout/card/CardBrand.kt | 13 +++++++++++++ .../com/adyen/checkout/card/CardComponentState.kt | 1 - .../com/adyen/checkout/card/CardConfiguration.kt | 2 -- .../main/java/com/adyen/checkout/card/CardType.kt | 13 +++++++++++++ .../adyen/checkout/card/InstallmentConfiguration.kt | 3 +-- .../ui/card/SessionsCardTakenOverViewModel.kt | 4 ++-- .../configuration/CheckoutConfigurationProvider.kt | 4 ++-- 7 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 card/src/main/java/com/adyen/checkout/card/CardBrand.kt create mode 100644 card/src/main/java/com/adyen/checkout/card/CardType.kt diff --git a/card/src/main/java/com/adyen/checkout/card/CardBrand.kt b/card/src/main/java/com/adyen/checkout/card/CardBrand.kt new file mode 100644 index 0000000000..2c741abc04 --- /dev/null +++ b/card/src/main/java/com/adyen/checkout/card/CardBrand.kt @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 8/10/2024. + */ + +package com.adyen.checkout.card + +import com.adyen.checkout.core.CardBrand + +typealias CardBrand = CardBrand diff --git a/card/src/main/java/com/adyen/checkout/card/CardComponentState.kt b/card/src/main/java/com/adyen/checkout/card/CardComponentState.kt index 571f7789f4..71b85bf368 100644 --- a/card/src/main/java/com/adyen/checkout/card/CardComponentState.kt +++ b/card/src/main/java/com/adyen/checkout/card/CardComponentState.kt @@ -10,7 +10,6 @@ package com.adyen.checkout.card import com.adyen.checkout.components.core.PaymentComponentData import com.adyen.checkout.components.core.PaymentComponentState import com.adyen.checkout.components.core.paymentmethod.CardPaymentMethod -import com.adyen.checkout.core.CardBrand /** * Represents the state of [CardComponent]. diff --git a/card/src/main/java/com/adyen/checkout/card/CardConfiguration.kt b/card/src/main/java/com/adyen/checkout/card/CardConfiguration.kt index 0822f5f2da..038d52305f 100644 --- a/card/src/main/java/com/adyen/checkout/card/CardConfiguration.kt +++ b/card/src/main/java/com/adyen/checkout/card/CardConfiguration.kt @@ -20,8 +20,6 @@ import com.adyen.checkout.components.core.internal.ButtonConfiguration import com.adyen.checkout.components.core.internal.ButtonConfigurationBuilder import com.adyen.checkout.components.core.internal.Configuration import com.adyen.checkout.components.core.internal.util.CheckoutConfigurationMarker -import com.adyen.checkout.core.CardBrand -import com.adyen.checkout.core.CardType import com.adyen.checkout.core.Environment import kotlinx.parcelize.Parcelize import java.util.Locale diff --git a/card/src/main/java/com/adyen/checkout/card/CardType.kt b/card/src/main/java/com/adyen/checkout/card/CardType.kt new file mode 100644 index 0000000000..28e6a05c2f --- /dev/null +++ b/card/src/main/java/com/adyen/checkout/card/CardType.kt @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 8/10/2024. + */ + +package com.adyen.checkout.card + +import com.adyen.checkout.core.CardType + +typealias CardType = CardType diff --git a/card/src/main/java/com/adyen/checkout/card/InstallmentConfiguration.kt b/card/src/main/java/com/adyen/checkout/card/InstallmentConfiguration.kt index e73f165dfc..ec668d1df5 100644 --- a/card/src/main/java/com/adyen/checkout/card/InstallmentConfiguration.kt +++ b/card/src/main/java/com/adyen/checkout/card/InstallmentConfiguration.kt @@ -10,7 +10,6 @@ package com.adyen.checkout.card import android.os.Parcelable import com.adyen.checkout.card.internal.util.InstallmentUtils -import com.adyen.checkout.core.CardBrand import com.adyen.checkout.core.exception.CheckoutException import kotlinx.parcelize.Parcelize @@ -40,7 +39,7 @@ data class InstallmentConfiguration( } if (!InstallmentUtils.areInstallmentValuesValid(this)) { throw CheckoutException( - "Installment Configuration contains invalid values for options. Values must be greater than 1." + "Installment Configuration contains invalid values for options. Values must be greater than 1.", ) } } diff --git a/example-app/src/main/java/com/adyen/checkout/example/ui/card/SessionsCardTakenOverViewModel.kt b/example-app/src/main/java/com/adyen/checkout/example/ui/card/SessionsCardTakenOverViewModel.kt index 0d5d9225fd..c2206bbe6b 100644 --- a/example-app/src/main/java/com/adyen/checkout/example/ui/card/SessionsCardTakenOverViewModel.kt +++ b/example-app/src/main/java/com/adyen/checkout/example/ui/card/SessionsCardTakenOverViewModel.kt @@ -12,7 +12,9 @@ import android.util.Log import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope +import com.adyen.checkout.card.CardBrand import com.adyen.checkout.card.CardComponentState +import com.adyen.checkout.card.CardType import com.adyen.checkout.components.core.ActionComponentData import com.adyen.checkout.components.core.CheckoutConfiguration import com.adyen.checkout.components.core.ComponentError @@ -20,8 +22,6 @@ import com.adyen.checkout.components.core.LookupAddress import com.adyen.checkout.components.core.PaymentComponentData import com.adyen.checkout.components.core.PaymentMethodTypes import com.adyen.checkout.components.core.action.Action -import com.adyen.checkout.core.CardBrand -import com.adyen.checkout.core.CardType import com.adyen.checkout.example.data.storage.KeyValueStorage import com.adyen.checkout.example.extensions.getLogTag import com.adyen.checkout.example.repositories.AddressLookupCompletionState diff --git a/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt b/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt index 63c461912f..4d35bcc87b 100644 --- a/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt +++ b/example-app/src/main/java/com/adyen/checkout/example/ui/configuration/CheckoutConfigurationProvider.kt @@ -4,6 +4,8 @@ import android.content.Context import com.adyen.checkout.adyen3ds2.adyen3DS2 import com.adyen.checkout.bcmc.bcmc import com.adyen.checkout.card.AddressConfiguration +import com.adyen.checkout.card.CardBrand +import com.adyen.checkout.card.CardType import com.adyen.checkout.card.InstallmentConfiguration import com.adyen.checkout.card.InstallmentOptions import com.adyen.checkout.card.card @@ -14,8 +16,6 @@ import com.adyen.checkout.components.core.Amount import com.adyen.checkout.components.core.AnalyticsConfiguration import com.adyen.checkout.components.core.AnalyticsLevel import com.adyen.checkout.components.core.CheckoutConfiguration -import com.adyen.checkout.core.CardBrand -import com.adyen.checkout.core.CardType import com.adyen.checkout.core.Environment import com.adyen.checkout.dropin.dropIn import com.adyen.checkout.example.BuildConfig From d7b812021d0ba7107556ac8bd13e7f14bb354b5d Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Tue, 8 Oct 2024 13:57:03 +0200 Subject: [PATCH 282/299] Add kdocs to ExpiryDate COAND-985 --- .../java/com/adyen/checkout/core/ui/model/ExpiryDate.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/model/ExpiryDate.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/model/ExpiryDate.kt index 3d1f3e35c4..02ad5a386b 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/model/ExpiryDate.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/model/ExpiryDate.kt @@ -7,6 +7,12 @@ */ package com.adyen.checkout.core.ui.model +/** + * Expiry date. + * + * @param expiryMonth 1 based month value. Valid values are [1-12], 1 being January and 12 being December. + * @param expiryYear 4 digit year (i.e. 2024) + */ data class ExpiryDate( val expiryMonth: Int, val expiryYear: Int, From ce6d29d5d682fc9f719237918381e1539e78d5ab Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Tue, 8 Oct 2024 16:02:29 +0200 Subject: [PATCH 283/299] Restrict EMPTY_DATE and INVALID_DATE to library group COAND-985 --- .../card/internal/ui/DefaultCardDelegate.kt | 3 ++- .../card/internal/ui/StoredCardDelegate.kt | 5 ++-- .../card/internal/ui/model/CardInputData.kt | 3 ++- checkout-core/api/checkout-core.api | 6 ----- .../core/internal/ui/model/ExpiryDateExt.kt | 26 +++++++++++++++++++ .../checkout/core/ui/model/ExpiryDate.kt | 11 +------- .../ui/validation/CardExpiryDateValidator.kt | 6 +++-- .../validation/CardExpiryDateValidatorTest.kt | 6 +++-- .../internal/ui/DefaultGiftCardDelegate.kt | 3 ++- .../internal/ui/model/GiftCardInputData.kt | 3 ++- .../core/internal/ui/view/ExpiryDateInput.kt | 6 +++-- 11 files changed, 50 insertions(+), 28 deletions(-) create mode 100644 checkout-core/src/main/java/com/adyen/checkout/core/internal/ui/model/ExpiryDateExt.kt diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt index b38a34cc1e..ebe8424217 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/DefaultCardDelegate.kt @@ -54,6 +54,7 @@ import com.adyen.checkout.core.AdyenLogLevel import com.adyen.checkout.core.CardBrand import com.adyen.checkout.core.exception.CheckoutException import com.adyen.checkout.core.exception.ComponentException +import com.adyen.checkout.core.internal.ui.model.EMPTY_DATE import com.adyen.checkout.core.internal.util.adyenLog import com.adyen.checkout.core.internal.util.runCompileOnly import com.adyen.checkout.core.ui.model.ExpiryDate @@ -451,7 +452,7 @@ class DefaultCardDelegate( if (cvc.isNotEmpty()) unencryptedCardBuilder.setCvc(cvc) } val expiryDateResult = outputData.expiryDateState.value - if (expiryDateResult != ExpiryDate.EMPTY_DATE) { + if (expiryDateResult != EMPTY_DATE) { unencryptedCardBuilder.setExpiryDate( expiryMonth = expiryDateResult.expiryMonth.toString(), expiryYear = expiryDateResult.expiryYear.toString(), diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt index 0a973e86e7..805a974aa4 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/StoredCardDelegate.kt @@ -42,6 +42,7 @@ import com.adyen.checkout.core.CardBrand import com.adyen.checkout.core.CardType import com.adyen.checkout.core.exception.CheckoutException import com.adyen.checkout.core.exception.ComponentException +import com.adyen.checkout.core.internal.ui.model.EMPTY_DATE import com.adyen.checkout.core.internal.util.adyenLog import com.adyen.checkout.core.internal.util.runCompileOnly import com.adyen.checkout.core.ui.model.ExpiryDate @@ -284,7 +285,7 @@ internal class StoredCardDelegate( if (cvc.isNotEmpty()) unencryptedCardBuilder.setCvc(cvc) } val expiryDateResult = outputData.expiryDateState.value - if (expiryDateResult != ExpiryDate.EMPTY_DATE) { + if (expiryDateResult != EMPTY_DATE) { unencryptedCardBuilder.setExpiryDate( expiryMonth = expiryDateResult.expiryMonth.toString(), expiryYear = expiryDateResult.expiryYear.toString(), @@ -393,7 +394,7 @@ internal class StoredCardDelegate( inputData.expiryDate = storedDate } catch (e: NumberFormatException) { adyenLog(AdyenLogLevel.ERROR, e) { "Failed to parse stored Date" } - inputData.expiryDate = ExpiryDate.EMPTY_DATE + inputData.expiryDate = EMPTY_DATE } onInputDataChanged() diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardInputData.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardInputData.kt index 78bac07412..ea2b796679 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardInputData.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/model/CardInputData.kt @@ -11,13 +11,14 @@ import androidx.annotation.RestrictTo import com.adyen.checkout.card.internal.ui.view.InstallmentModel import com.adyen.checkout.components.core.internal.ui.model.AddressInputModel import com.adyen.checkout.components.core.internal.ui.model.InputData +import com.adyen.checkout.core.internal.ui.model.EMPTY_DATE import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.ui.core.internal.ui.model.AddressLookupInputData @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) data class CardInputData( var cardNumber: String = "", - var expiryDate: ExpiryDate = ExpiryDate.EMPTY_DATE, + var expiryDate: ExpiryDate = EMPTY_DATE, var securityCode: String = "", var holderName: String = "", var socialSecurityNumber: String = "", diff --git a/checkout-core/api/checkout-core.api b/checkout-core/api/checkout-core.api index 9dcc0f5a1a..c248a83b09 100644 --- a/checkout-core/api/checkout-core.api +++ b/checkout-core/api/checkout-core.api @@ -224,9 +224,6 @@ public abstract interface annotation class com/adyen/checkout/core/internal/util } public final class com/adyen/checkout/core/ui/model/ExpiryDate { - public static final field Companion Lcom/adyen/checkout/core/ui/model/ExpiryDate$Companion; - public static final field EMPTY_DATE Lcom/adyen/checkout/core/ui/model/ExpiryDate; - public static final field INVALID_DATE Lcom/adyen/checkout/core/ui/model/ExpiryDate; public fun (II)V public final fun component1 ()I public final fun component2 ()I @@ -239,9 +236,6 @@ public final class com/adyen/checkout/core/ui/model/ExpiryDate { public fun toString ()Ljava/lang/String; } -public final class com/adyen/checkout/core/ui/model/ExpiryDate$Companion { -} - public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult : java/lang/Enum { public static final field INVALID_DATE_FORMAT Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; public static final field INVALID_OTHER_REASON Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/internal/ui/model/ExpiryDateExt.kt b/checkout-core/src/main/java/com/adyen/checkout/core/internal/ui/model/ExpiryDateExt.kt new file mode 100644 index 0000000000..a2bbb42418 --- /dev/null +++ b/checkout-core/src/main/java/com/adyen/checkout/core/internal/ui/model/ExpiryDateExt.kt @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ozgur on 8/10/2024. + */ + +package com.adyen.checkout.core.internal.ui.model + +import androidx.annotation.RestrictTo +import com.adyen.checkout.core.ui.model.ExpiryDate + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +@JvmField +val EMPTY_DATE: ExpiryDate = ExpiryDate(0, 0) + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +@JvmField +val INVALID_DATE: ExpiryDate = ExpiryDate(-1, -1) + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +fun ExpiryDate.isEmptyDate() = expiryMonth == 0 && expiryYear == 0 + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +fun ExpiryDate.isInvalidDate() = expiryMonth == -1 && expiryYear == -1 diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/model/ExpiryDate.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/model/ExpiryDate.kt index 02ad5a386b..f5b441dc61 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/model/ExpiryDate.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/model/ExpiryDate.kt @@ -16,13 +16,4 @@ package com.adyen.checkout.core.ui.model data class ExpiryDate( val expiryMonth: Int, val expiryYear: Int, -) { - - companion object { - @JvmField - val EMPTY_DATE = ExpiryDate(0, 0) - - @JvmField - val INVALID_DATE = ExpiryDate(-1, -1) - } -} +) diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt index 2952c92cdc..96381f0da0 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt @@ -8,6 +8,8 @@ package com.adyen.checkout.core.ui.validation +import com.adyen.checkout.core.internal.ui.model.isEmptyDate +import com.adyen.checkout.core.internal.ui.model.isInvalidDate import com.adyen.checkout.core.ui.model.ExpiryDate import java.util.Calendar import java.util.GregorianCalendar @@ -54,7 +56,7 @@ object CardExpiryDateValidator { } } - expiryDate == ExpiryDate.INVALID_DATE -> CardExpiryDateValidationResult.INVALID_DATE_FORMAT + expiryDate.isInvalidDate() -> CardExpiryDateValidationResult.INVALID_DATE_FORMAT else -> CardExpiryDateValidationResult.INVALID_OTHER_REASON } @@ -75,7 +77,7 @@ object CardExpiryDateValidator { private fun dateExists(expiryDate: ExpiryDate): Boolean { return ( - expiryDate !== ExpiryDate.EMPTY_DATE && + !expiryDate.isEmptyDate() && isValidMonth(expiryDate.expiryMonth) && expiryDate.expiryYear > 0 ) diff --git a/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt index 84025a03a0..15ae7b95d3 100644 --- a/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt +++ b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt @@ -8,6 +8,8 @@ package com.adyen.checkout.core.ui.validation +import com.adyen.checkout.core.internal.ui.model.EMPTY_DATE +import com.adyen.checkout.core.internal.ui.model.INVALID_DATE import com.adyen.checkout.core.ui.model.ExpiryDate import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.params.ParameterizedTest @@ -36,12 +38,12 @@ internal class CardExpiryDateValidatorTest { fun expiryDateValidationSource() = listOf( // Invalid expiry date arguments( - ExpiryDate.EMPTY_DATE, + EMPTY_DATE, GregorianCalendar.getInstance(), CardExpiryDateValidationResult.INVALID_OTHER_REASON, ), arguments( - ExpiryDate.INVALID_DATE, + INVALID_DATE, GregorianCalendar.getInstance(), CardExpiryDateValidationResult.INVALID_DATE_FORMAT, ), diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt index 6f3d1e476e..dd6ae91f49 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/DefaultGiftCardDelegate.kt @@ -29,6 +29,7 @@ import com.adyen.checkout.components.core.internal.util.bufferedChannel import com.adyen.checkout.core.AdyenLogLevel import com.adyen.checkout.core.exception.CheckoutException import com.adyen.checkout.core.exception.ComponentException +import com.adyen.checkout.core.internal.ui.model.EMPTY_DATE import com.adyen.checkout.core.internal.util.adyenLog import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.cse.EncryptedCard @@ -269,7 +270,7 @@ class DefaultGiftCardDelegate( } val expiryDateResult = outputData.expiryDateFieldState.value - if (componentParams.isExpiryDateRequired && expiryDateResult != ExpiryDate.EMPTY_DATE) { + if (componentParams.isExpiryDateRequired && expiryDateResult != EMPTY_DATE) { setExpiryDate( expiryMonth = expiryDateResult.expiryMonth.toString(), expiryYear = expiryDateResult.expiryYear.toString(), diff --git a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt index 7f873c1f45..10e015fc08 100644 --- a/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt +++ b/giftcard/src/main/java/com/adyen/checkout/giftcard/internal/ui/model/GiftCardInputData.kt @@ -10,11 +10,12 @@ package com.adyen.checkout.giftcard.internal.ui.model import androidx.annotation.RestrictTo import com.adyen.checkout.components.core.internal.ui.model.InputData +import com.adyen.checkout.core.internal.ui.model.EMPTY_DATE import com.adyen.checkout.core.ui.model.ExpiryDate @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) data class GiftCardInputData( var cardNumber: String = "", var pin: String = "", - var expiryDate: ExpiryDate = ExpiryDate.EMPTY_DATE, + var expiryDate: ExpiryDate = EMPTY_DATE, ) : InputData diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt index a431f6873f..169cfdf41a 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt @@ -13,6 +13,8 @@ import android.text.Editable import android.util.AttributeSet import androidx.annotation.RestrictTo import com.adyen.checkout.core.AdyenLogLevel +import com.adyen.checkout.core.internal.ui.model.EMPTY_DATE +import com.adyen.checkout.core.internal.ui.model.INVALID_DATE import com.adyen.checkout.core.internal.util.StringUtil.normalize import com.adyen.checkout.core.internal.util.adyenLog import com.adyen.checkout.core.ui.model.ExpiryDate @@ -73,11 +75,11 @@ constructor( ExpiryDate(calendar[Calendar.MONTH] + 1, calendar[Calendar.YEAR]) } catch (e: ParseException) { adyenLog(AdyenLogLevel.DEBUG, e) { "getDate - value does not match expected pattern. " } - if (rawValue.isEmpty()) ExpiryDate.EMPTY_DATE else ExpiryDate.INVALID_DATE + if (rawValue.isEmpty()) EMPTY_DATE else INVALID_DATE } } set(expiryDate) { - if (expiryDate !== ExpiryDate.EMPTY_DATE) { + if (expiryDate !== EMPTY_DATE) { adyenLog(AdyenLogLevel.VERBOSE) { "setDate - " + expiryDate.expiryYear + " " + expiryDate.expiryMonth } val calendar = GregorianCalendar.getInstance() calendar.clear() From 654ef3512f59fec21d7717ac0e570f6214e51c2e Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Tue, 8 Oct 2024 16:18:13 +0200 Subject: [PATCH 284/299] Make validateExpiryDate(ExpiryDate, Calendar) internal COAND-985 --- .../card/internal/util/CardValidationUtils.kt | 5 +---- checkout-core/api/checkout-core.api | 1 - .../core/ui/validation/CardExpiryDateValidator.kt | 12 +++--------- .../internal/util/MealVoucherFRValidationUtils.kt | 10 +--------- 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index 0ee4c4c5a0..ddedcb74ac 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -20,8 +20,6 @@ import com.adyen.checkout.core.ui.validation.CardNumberValidationResult import com.adyen.checkout.core.ui.validation.CardNumberValidator import com.adyen.checkout.core.ui.validation.CardSecurityCodeValidationResult import com.adyen.checkout.core.ui.validation.CardSecurityCodeValidator -import java.util.Calendar -import java.util.GregorianCalendar @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) object CardValidationUtils { @@ -61,9 +59,8 @@ object CardValidationUtils { internal fun validateExpiryDate( expiryDate: ExpiryDate, fieldPolicy: Brand.FieldPolicy?, - calendar: Calendar = GregorianCalendar.getInstance() ): CardExpiryDateValidation { - val result = CardExpiryDateValidator.validateExpiryDate(expiryDate, calendar) + val result = CardExpiryDateValidator.validateExpiryDate(expiryDate) return validateExpiryDate(result, fieldPolicy) } diff --git a/checkout-core/api/checkout-core.api b/checkout-core/api/checkout-core.api index c248a83b09..9a4e5e9a96 100644 --- a/checkout-core/api/checkout-core.api +++ b/checkout-core/api/checkout-core.api @@ -250,7 +250,6 @@ public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidatio public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidator { public static final field INSTANCE Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidator; public final fun validateExpiryDate (Lcom/adyen/checkout/core/ui/model/ExpiryDate;)Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; - public final fun validateExpiryDate (Lcom/adyen/checkout/core/ui/model/ExpiryDate;Ljava/util/Calendar;)Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; } public final class com/adyen/checkout/core/ui/validation/CardNumberValidationResult : java/lang/Enum { diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt index 96381f0da0..d9deb7838d 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt @@ -8,6 +8,7 @@ package com.adyen.checkout.core.ui.validation +import androidx.annotation.VisibleForTesting import com.adyen.checkout.core.internal.ui.model.isEmptyDate import com.adyen.checkout.core.internal.ui.model.isInvalidDate import com.adyen.checkout.core.ui.model.ExpiryDate @@ -31,15 +32,8 @@ object CardExpiryDateValidator { expiryDate: ExpiryDate ) = validateExpiryDate(expiryDate, GregorianCalendar.getInstance()) - /** - * Validate expiry date. - * - * @param expiryDate Expiry date. - * @param calendar Calendar instance to be used to compare given expiry date. - * - * @return Validation result. - */ - fun validateExpiryDate( + @VisibleForTesting + internal fun validateExpiryDate( expiryDate: ExpiryDate, calendar: Calendar ) = when { diff --git a/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt index a527da7e0e..93b7fe8c92 100644 --- a/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt @@ -18,9 +18,6 @@ import com.adyen.checkout.giftcard.internal.util.GiftCardNumberValidationResult import com.adyen.checkout.giftcard.internal.util.GiftCardPinUtils import com.adyen.checkout.giftcard.internal.util.GiftCardPinValidationResult import com.adyen.checkout.mealvoucherfr.R -import org.jetbrains.annotations.VisibleForTesting -import java.util.Calendar -import java.util.GregorianCalendar internal object MealVoucherFRValidationUtils { @@ -49,12 +46,7 @@ internal object MealVoucherFRValidationUtils { } fun validateExpiryDate(expiryDate: ExpiryDate): FieldState { - return validateExpiryDate(expiryDate, GregorianCalendar.getInstance()) - } - - @VisibleForTesting - internal fun validateExpiryDate(expiryDate: ExpiryDate, calendar: Calendar): FieldState { - return when (CardExpiryDateValidator.validateExpiryDate(expiryDate, calendar)) { + return when (CardExpiryDateValidator.validateExpiryDate(expiryDate)) { CardExpiryDateValidationResult.VALID -> FieldState(expiryDate, Validation.Valid) CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> FieldState( expiryDate, From bc4ea0bfd949ab2128433e65afabb32434c3b65a Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Wed, 9 Oct 2024 14:26:01 +0200 Subject: [PATCH 285/299] Convert CardExpiryDateValidationResult to a sealed class COAND-985 --- .../card/internal/util/CardValidationUtils.kt | 31 +++++++++----- .../internal/util/CardValidationUtilsTest.kt | 24 +++++------ checkout-core/api/checkout-core.api | 33 +++++++++++---- .../CardExpiryDateValidationResult.kt | 14 ++++--- .../ui/validation/CardExpiryDateValidator.kt | 10 ++--- .../validation/CardExpiryDateValidatorTest.kt | 20 ++++----- .../util/MealVoucherFRValidationUtils.kt | 42 ++++++++++++------- 7 files changed, 106 insertions(+), 68 deletions(-) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index ddedcb74ac..2c4ac9eb43 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -70,21 +70,30 @@ object CardValidationUtils { fieldPolicy: Brand.FieldPolicy? ): CardExpiryDateValidation { return when (validationResult) { - CardExpiryDateValidationResult.VALID -> CardExpiryDateValidation.VALID + is CardExpiryDateValidationResult.Valid -> CardExpiryDateValidation.VALID - CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> - CardExpiryDateValidation.INVALID_TOO_FAR_IN_THE_FUTURE + is CardExpiryDateValidationResult.Invalid -> { + when (validationResult) { + is CardExpiryDateValidationResult.Invalid.TooFarInTheFuture -> + CardExpiryDateValidation.INVALID_TOO_FAR_IN_THE_FUTURE + + is CardExpiryDateValidationResult.Invalid.TooOld -> + CardExpiryDateValidation.INVALID_TOO_OLD - CardExpiryDateValidationResult.INVALID_TOO_OLD -> - CardExpiryDateValidation.INVALID_TOO_OLD + is CardExpiryDateValidationResult.Invalid.DateFormat -> + CardExpiryDateValidation.INVALID_DATE_FORMAT - CardExpiryDateValidationResult.INVALID_DATE_FORMAT -> - CardExpiryDateValidation.INVALID_DATE_FORMAT + is CardExpiryDateValidationResult.Invalid.OtherReason -> if (fieldPolicy?.isRequired() == false) { + CardExpiryDateValidation.VALID_NOT_REQUIRED + } else { + CardExpiryDateValidation.INVALID_OTHER_REASON + } - CardExpiryDateValidationResult.INVALID_OTHER_REASON -> if (fieldPolicy?.isRequired() == false) { - CardExpiryDateValidation.VALID_NOT_REQUIRED - } else { - CardExpiryDateValidation.INVALID_OTHER_REASON + else -> { + // should not happen, due to CardExpiryDateValidationResult being an abstract class + CardExpiryDateValidation.INVALID_OTHER_REASON + } + } } } } diff --git a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt index feb52853a1..b22e887509 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt @@ -85,7 +85,7 @@ internal class CardValidationUtilsTest { @Test fun `date is valid with field policy optional, then result should be valid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.VALID, + CardExpiryDateValidationResult.Valid(), Brand.FieldPolicy.OPTIONAL, ) @@ -95,7 +95,7 @@ internal class CardValidationUtilsTest { @Test fun `date is valid with field policy hidden, then result should be valid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.VALID, + CardExpiryDateValidationResult.Valid(), Brand.FieldPolicy.HIDDEN, ) @@ -105,7 +105,7 @@ internal class CardValidationUtilsTest { @Test fun `date is too far in the future with field policy optional, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, + CardExpiryDateValidationResult.Invalid.TooFarInTheFuture(), Brand.FieldPolicy.OPTIONAL, ) @@ -115,7 +115,7 @@ internal class CardValidationUtilsTest { @Test fun `date is too far in the future with field policy hidden, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, + CardExpiryDateValidationResult.Invalid.TooFarInTheFuture(), Brand.FieldPolicy.HIDDEN, ) @@ -125,7 +125,7 @@ internal class CardValidationUtilsTest { @Test fun `date is too old with field policy optional, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.INVALID_TOO_OLD, + CardExpiryDateValidationResult.Invalid.TooOld(), Brand.FieldPolicy.OPTIONAL, ) @@ -135,7 +135,7 @@ internal class CardValidationUtilsTest { @Test fun `date is too old with field policy hidden, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.INVALID_TOO_OLD, + CardExpiryDateValidationResult.Invalid.TooOld(), Brand.FieldPolicy.HIDDEN, ) @@ -145,7 +145,7 @@ internal class CardValidationUtilsTest { @Test fun `date is empty with field policy required, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.INVALID_OTHER_REASON, + CardExpiryDateValidationResult.Invalid.OtherReason(), Brand.FieldPolicy.REQUIRED, ) @@ -155,7 +155,7 @@ internal class CardValidationUtilsTest { @Test fun `date is empty with field policy optional, then result should be valid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.INVALID_OTHER_REASON, + CardExpiryDateValidationResult.Invalid.OtherReason(), Brand.FieldPolicy.OPTIONAL, ) @@ -165,7 +165,7 @@ internal class CardValidationUtilsTest { @Test fun `date is empty with field policy hidden, then result should be valid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.INVALID_OTHER_REASON, + CardExpiryDateValidationResult.Invalid.OtherReason(), Brand.FieldPolicy.HIDDEN, ) @@ -175,7 +175,7 @@ internal class CardValidationUtilsTest { @Test fun `date is invalid with field policy required, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.INVALID_DATE_FORMAT, + CardExpiryDateValidationResult.Invalid.DateFormat(), Brand.FieldPolicy.REQUIRED, ) @@ -185,7 +185,7 @@ internal class CardValidationUtilsTest { @Test fun `date is invalid with field policy optional, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.INVALID_DATE_FORMAT, + CardExpiryDateValidationResult.Invalid.DateFormat(), Brand.FieldPolicy.OPTIONAL, ) @@ -195,7 +195,7 @@ internal class CardValidationUtilsTest { @Test fun `date is invalid with field policy hidden, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.INVALID_DATE_FORMAT, + CardExpiryDateValidationResult.Invalid.DateFormat(), Brand.FieldPolicy.HIDDEN, ) diff --git a/checkout-core/api/checkout-core.api b/checkout-core/api/checkout-core.api index 9a4e5e9a96..a9606d0670 100644 --- a/checkout-core/api/checkout-core.api +++ b/checkout-core/api/checkout-core.api @@ -236,15 +236,30 @@ public final class com/adyen/checkout/core/ui/model/ExpiryDate { public fun toString ()Ljava/lang/String; } -public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult : java/lang/Enum { - public static final field INVALID_DATE_FORMAT Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; - public static final field INVALID_OTHER_REASON Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; - public static final field INVALID_TOO_FAR_IN_THE_FUTURE Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; - public static final field INVALID_TOO_OLD Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; - public static final field VALID Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; - public static fun getEntries ()Lkotlin/enums/EnumEntries; - public static fun valueOf (Ljava/lang/String;)Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; - public static fun values ()[Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; +public abstract interface class com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult { +} + +public abstract interface class com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid : com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult { +} + +public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid$DateFormat : com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid { + public fun ()V +} + +public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid$OtherReason : com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid { + public fun ()V +} + +public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid$TooFarInTheFuture : com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid { + public fun ()V +} + +public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid$TooOld : com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid { + public fun ()V +} + +public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Valid : com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult { + public fun ()V } public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidator { diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt index 0d38b6859e..71f7229ed8 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt @@ -11,10 +11,12 @@ package com.adyen.checkout.core.ui.validation /** * Possible validation results for expiry date validation. (@see [CardExpiryDateValidator.validateExpiryDate] */ -enum class CardExpiryDateValidationResult { - VALID, - INVALID_TOO_FAR_IN_THE_FUTURE, - INVALID_TOO_OLD, - INVALID_DATE_FORMAT, - INVALID_OTHER_REASON, +sealed interface CardExpiryDateValidationResult { + class Valid : CardExpiryDateValidationResult + interface Invalid : CardExpiryDateValidationResult { + class TooFarInTheFuture : Invalid + class TooOld : Invalid + class DateFormat : Invalid + class OtherReason : Invalid + } } diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt index d9deb7838d..88b78145af 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt @@ -43,16 +43,16 @@ object CardExpiryDateValidator { when { // higher than maxPast and lower than maxFuture - isInMinMonthRange && isInMaxYearRange -> CardExpiryDateValidationResult.VALID - !isInMaxYearRange -> CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE + isInMinMonthRange && isInMaxYearRange -> CardExpiryDateValidationResult.Valid() + !isInMaxYearRange -> CardExpiryDateValidationResult.Invalid.TooFarInTheFuture() // Too old (!isInMinMonthRange) - else -> CardExpiryDateValidationResult.INVALID_TOO_OLD + else -> CardExpiryDateValidationResult.Invalid.TooOld() } } - expiryDate.isInvalidDate() -> CardExpiryDateValidationResult.INVALID_DATE_FORMAT + expiryDate.isInvalidDate() -> CardExpiryDateValidationResult.Invalid.DateFormat() - else -> CardExpiryDateValidationResult.INVALID_OTHER_REASON + else -> CardExpiryDateValidationResult.Invalid.OtherReason() } private fun isInMaxYearRange(expiryDate: ExpiryDate, calendar: Calendar): Boolean { diff --git a/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt index 15ae7b95d3..3b2f1376a6 100644 --- a/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt +++ b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt @@ -29,7 +29,7 @@ internal class CardExpiryDateValidatorTest { ) { val actualResult = CardExpiryDateValidator.validateExpiryDate(expiryDateInput, calendar) - assertEquals(expectedValidationResult, actualResult) + assertEquals(expectedValidationResult.javaClass, actualResult.javaClass) } companion object { @@ -40,54 +40,54 @@ internal class CardExpiryDateValidatorTest { arguments( EMPTY_DATE, GregorianCalendar.getInstance(), - CardExpiryDateValidationResult.INVALID_OTHER_REASON, + CardExpiryDateValidationResult.Invalid.OtherReason(), ), arguments( INVALID_DATE, GregorianCalendar.getInstance(), - CardExpiryDateValidationResult.INVALID_DATE_FORMAT, + CardExpiryDateValidationResult.Invalid.DateFormat(), ), // Date 30 years in future arguments( ExpiryDate(12, 2052), // 12/2052 (last valid date in future) GregorianCalendar(2022, 4, 23), // 23/05/2022 - CardExpiryDateValidationResult.VALID, + CardExpiryDateValidationResult.Valid(), ), // Date more than 30 years in future arguments( ExpiryDate(1, 2053), // 01/2053 (first invalid date in future) GregorianCalendar(2022, 4, 23), // 23/05/2022 - CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE, + CardExpiryDateValidationResult.Invalid.TooFarInTheFuture(), ), // Date 8 years in future arguments( ExpiryDate(1, 2030), // 01/2030 GregorianCalendar(2022, 4, 23), // 23/05/2022 - CardExpiryDateValidationResult.VALID, + CardExpiryDateValidationResult.Valid(), ), // Date 1 month in past arguments( ExpiryDate(4, 2022), // 04/2022 (last valid date in past) GregorianCalendar(2022, 4, 23), // 23/05/2022 - CardExpiryDateValidationResult.VALID, + CardExpiryDateValidationResult.Valid(), ), // Date 3 months in past arguments( ExpiryDate(2, 2022), // 02/2022 (last valid date in past) GregorianCalendar(2022, 4, 23), // 23/05/2022 - CardExpiryDateValidationResult.VALID, + CardExpiryDateValidationResult.Valid(), ), // Date more than 3 months in past arguments( ExpiryDate(1, 2022), // 01/2022 (first invalid date in past) GregorianCalendar(2022, 4, 23), // 23/05/2022 - CardExpiryDateValidationResult.INVALID_TOO_OLD, + CardExpiryDateValidationResult.Invalid.TooOld(), ), // Date 1 year in future arguments( ExpiryDate(1, 2023), // 01/2023 GregorianCalendar(2022, 4, 23), // 23/05/2022 - CardExpiryDateValidationResult.VALID, + CardExpiryDateValidationResult.Valid(), ), ) } diff --git a/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt index 93b7fe8c92..e7534cbbcd 100644 --- a/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt @@ -46,23 +46,35 @@ internal object MealVoucherFRValidationUtils { } fun validateExpiryDate(expiryDate: ExpiryDate): FieldState { - return when (CardExpiryDateValidator.validateExpiryDate(expiryDate)) { - CardExpiryDateValidationResult.VALID -> FieldState(expiryDate, Validation.Valid) - CardExpiryDateValidationResult.INVALID_TOO_FAR_IN_THE_FUTURE -> FieldState( - expiryDate, - Validation.Invalid(R.string.checkout_meal_voucher_fr_expiry_date_not_valid_too_far_in_future), - ) + return when (val result = CardExpiryDateValidator.validateExpiryDate(expiryDate)) { + is CardExpiryDateValidationResult.Valid -> FieldState(expiryDate, Validation.Valid) + is CardExpiryDateValidationResult.Invalid -> { + when (result) { + is CardExpiryDateValidationResult.Invalid.TooFarInTheFuture -> FieldState( + expiryDate, + Validation.Invalid(R.string.checkout_meal_voucher_fr_expiry_date_not_valid_too_far_in_future), + ) - CardExpiryDateValidationResult.INVALID_TOO_OLD -> FieldState( - expiryDate, - Validation.Invalid(R.string.checkout_meal_voucher_fr_expiry_date_not_valid_too_old), - ) + is CardExpiryDateValidationResult.Invalid.TooOld -> FieldState( + expiryDate, + Validation.Invalid(R.string.checkout_meal_voucher_fr_expiry_date_not_valid_too_old), + ) - CardExpiryDateValidationResult.INVALID_DATE_FORMAT, - CardExpiryDateValidationResult.INVALID_OTHER_REASON -> FieldState( - expiryDate, - Validation.Invalid(R.string.checkout_meal_voucher_fr_expiry_date_not_valid), - ) + is CardExpiryDateValidationResult.Invalid.DateFormat, + is CardExpiryDateValidationResult.Invalid.OtherReason -> FieldState( + expiryDate, + Validation.Invalid(R.string.checkout_meal_voucher_fr_expiry_date_not_valid), + ) + + else -> { + // should not happen, due to CardExpiryDateValidationResult being an abstract class + FieldState( + expiryDate, + Validation.Invalid(R.string.checkout_meal_voucher_fr_expiry_date_not_valid), + ) + } + } + } } } } From bd795b16841b49b86d3cabbae98dbce2b88d4f80 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Wed, 9 Oct 2024 14:37:00 +0200 Subject: [PATCH 286/299] Convert CardSecurityCodeValidationResult to an abstract class COAND-985 --- .../card/internal/util/CardValidationUtils.kt | 4 ++-- .../internal/util/CardValidationUtilsTest.kt | 18 ++++++++--------- checkout-core/api/checkout-core.api | 15 ++++++++------ .../CardSecurityCodeValidationResult.kt | 6 +++--- .../validation/CardSecurityCodeValidator.kt | 8 ++++---- .../CardSecurityCodeValidatorTest.kt | 20 +++++++++---------- 6 files changed, 37 insertions(+), 34 deletions(-) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index 2c4ac9eb43..1a20efe5bc 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -124,8 +124,8 @@ object CardValidationUtils { uiState == InputFieldUIState.OPTIONAL && length == 0 -> CardSecurityCodeValidation.VALID_OPTIONAL_EMPTY else -> { when (validationResult) { - CardSecurityCodeValidationResult.INVALID -> CardSecurityCodeValidation.INVALID - CardSecurityCodeValidationResult.VALID -> CardSecurityCodeValidation.VALID + is CardSecurityCodeValidationResult.Invalid -> CardSecurityCodeValidation.INVALID + is CardSecurityCodeValidationResult.Valid -> CardSecurityCodeValidation.VALID } } } diff --git a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt index b22e887509..56a4bc3c5c 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt @@ -211,7 +211,7 @@ internal class CardValidationUtilsTest { val actual = CardValidationUtils.validateSecurityCode( cvc, InputFieldUIState.REQUIRED, - CardSecurityCodeValidationResult.VALID, + CardSecurityCodeValidationResult.Valid(), ) assertEquals(CardSecurityCodeValidation.VALID, actual) } @@ -222,7 +222,7 @@ internal class CardValidationUtilsTest { val actual = CardValidationUtils.validateSecurityCode( cvc, InputFieldUIState.OPTIONAL, - CardSecurityCodeValidationResult.VALID, + CardSecurityCodeValidationResult.Valid(), ) assertEquals(CardSecurityCodeValidation.VALID, actual) } @@ -233,7 +233,7 @@ internal class CardValidationUtilsTest { val actual = CardValidationUtils.validateSecurityCode( cvc, InputFieldUIState.HIDDEN, - CardSecurityCodeValidationResult.VALID, + CardSecurityCodeValidationResult.Valid(), ) assertEquals(CardSecurityCodeValidation.VALID_HIDDEN, actual) } @@ -244,7 +244,7 @@ internal class CardValidationUtilsTest { val actual = CardValidationUtils.validateSecurityCode( cvc, InputFieldUIState.REQUIRED, - CardSecurityCodeValidationResult.INVALID, + CardSecurityCodeValidationResult.Invalid(), ) assertEquals(CardSecurityCodeValidation.INVALID, actual) } @@ -255,7 +255,7 @@ internal class CardValidationUtilsTest { val actual = CardValidationUtils.validateSecurityCode( cvc, InputFieldUIState.OPTIONAL, - CardSecurityCodeValidationResult.INVALID, + CardSecurityCodeValidationResult.Invalid(), ) assertEquals(CardSecurityCodeValidation.INVALID, actual) } @@ -266,7 +266,7 @@ internal class CardValidationUtilsTest { val actual = CardValidationUtils.validateSecurityCode( cvc, InputFieldUIState.HIDDEN, - CardSecurityCodeValidationResult.INVALID, + CardSecurityCodeValidationResult.Invalid(), ) assertEquals(CardSecurityCodeValidation.VALID_HIDDEN, actual) } @@ -277,7 +277,7 @@ internal class CardValidationUtilsTest { val actual = CardValidationUtils.validateSecurityCode( cvc, InputFieldUIState.REQUIRED, - CardSecurityCodeValidationResult.INVALID, + CardSecurityCodeValidationResult.Invalid(), ) assertEquals(CardSecurityCodeValidation.INVALID, actual) } @@ -288,7 +288,7 @@ internal class CardValidationUtilsTest { val actual = CardValidationUtils.validateSecurityCode( cvc, InputFieldUIState.OPTIONAL, - CardSecurityCodeValidationResult.INVALID, + CardSecurityCodeValidationResult.Invalid(), ) assertEquals(CardSecurityCodeValidation.VALID_OPTIONAL_EMPTY, actual) } @@ -299,7 +299,7 @@ internal class CardValidationUtilsTest { val actual = CardValidationUtils.validateSecurityCode( cvc, InputFieldUIState.HIDDEN, - CardSecurityCodeValidationResult.INVALID, + CardSecurityCodeValidationResult.Invalid(), ) assertEquals(CardSecurityCodeValidation.VALID_HIDDEN, actual) } diff --git a/checkout-core/api/checkout-core.api b/checkout-core/api/checkout-core.api index a9606d0670..90eccc90c9 100644 --- a/checkout-core/api/checkout-core.api +++ b/checkout-core/api/checkout-core.api @@ -284,12 +284,15 @@ public final class com/adyen/checkout/core/ui/validation/CardNumberValidator { public final fun validateCardNumber (Ljava/lang/String;Z)Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; } -public final class com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult : java/lang/Enum { - public static final field INVALID Lcom/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult; - public static final field VALID Lcom/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult; - public static fun getEntries ()Lkotlin/enums/EnumEntries; - public static fun valueOf (Ljava/lang/String;)Lcom/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult; - public static fun values ()[Lcom/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult; +public abstract interface class com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult { +} + +public final class com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult$Invalid : com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult { + public fun ()V +} + +public final class com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult$Valid : com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult { + public fun ()V } public final class com/adyen/checkout/core/ui/validation/CardSecurityCodeValidator { diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult.kt index c0f42a4fad..e4bb9df9b2 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidationResult.kt @@ -11,7 +11,7 @@ package com.adyen.checkout.core.ui.validation /** * Possible validation results for security code validation. (@see [CardSecurityCodeValidator.validateSecurityCode] */ -enum class CardSecurityCodeValidationResult { - INVALID, - VALID +sealed interface CardSecurityCodeValidationResult { + class Valid : CardSecurityCodeValidationResult + class Invalid : CardSecurityCodeValidationResult } diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidator.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidator.kt index b7ebee9659..5ba6520d3f 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidator.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidator.kt @@ -31,14 +31,14 @@ object CardSecurityCodeValidator { val normalizedSecurityCode = StringUtil.normalize(securityCode) val length = normalizedSecurityCode.length return when { - !StringUtil.isDigitsAndSeparatorsOnly(normalizedSecurityCode) -> CardSecurityCodeValidationResult.INVALID + !StringUtil.isDigitsAndSeparatorsOnly(normalizedSecurityCode) -> CardSecurityCodeValidationResult.Invalid() cardBrand == CardBrand(cardType = CardType.AMERICAN_EXPRESS) && - length == AMEX_SECURITY_CODE_SIZE -> CardSecurityCodeValidationResult.VALID + length == AMEX_SECURITY_CODE_SIZE -> CardSecurityCodeValidationResult.Valid() cardBrand != CardBrand(cardType = CardType.AMERICAN_EXPRESS) && - length == GENERAL_CARD_SECURITY_CODE_SIZE -> CardSecurityCodeValidationResult.VALID + length == GENERAL_CARD_SECURITY_CODE_SIZE -> CardSecurityCodeValidationResult.Valid() - else -> CardSecurityCodeValidationResult.INVALID + else -> CardSecurityCodeValidationResult.Invalid() } } } diff --git a/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidatorTest.kt b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidatorTest.kt index 72e8eda3f0..b22b066968 100644 --- a/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidatorTest.kt +++ b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardSecurityCodeValidatorTest.kt @@ -25,7 +25,7 @@ internal class CardSecurityCodeValidatorTest { expectedValidationResult: CardSecurityCodeValidationResult ) { val actualResult = CardSecurityCodeValidator.validateSecurityCode(securityCodeInput, cardBrand) - assertEquals(expectedValidationResult, actualResult) + assertEquals(expectedValidationResult.javaClass, actualResult.javaClass) } companion object { @@ -34,47 +34,47 @@ internal class CardSecurityCodeValidatorTest { arguments( "", CardBrand(CardType.VISA), - CardSecurityCodeValidationResult.INVALID, + CardSecurityCodeValidationResult.Invalid(), ), arguments( "7", CardBrand(CardType.VISA), - CardSecurityCodeValidationResult.INVALID, + CardSecurityCodeValidationResult.Invalid(), ), arguments( "12", CardBrand(CardType.VISA), - CardSecurityCodeValidationResult.INVALID, + CardSecurityCodeValidationResult.Invalid(), ), arguments( "737", CardBrand(CardType.VISA), - CardSecurityCodeValidationResult.VALID, + CardSecurityCodeValidationResult.Valid(), ), arguments( "8689", CardBrand(CardType.VISA), - CardSecurityCodeValidationResult.INVALID, + CardSecurityCodeValidationResult.Invalid(), ), arguments( "123456", CardBrand(CardType.VISA), - CardSecurityCodeValidationResult.INVALID, + CardSecurityCodeValidationResult.Invalid(), ), arguments( "737", CardBrand(CardType.AMERICAN_EXPRESS), - CardSecurityCodeValidationResult.INVALID, + CardSecurityCodeValidationResult.Invalid(), ), arguments( "8689", CardBrand(CardType.AMERICAN_EXPRESS), - CardSecurityCodeValidationResult.VALID, + CardSecurityCodeValidationResult.Valid(), ), arguments( "1%y", null, - CardSecurityCodeValidationResult.INVALID, + CardSecurityCodeValidationResult.Invalid(), ), ) } From 53c474093103061d49cd05c9fe34392774da01dd Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Wed, 9 Oct 2024 14:48:10 +0200 Subject: [PATCH 287/299] Convert CardNumberValidationResult to an abstract class COAND-985 --- .../card/internal/ui/CardValidationMapper.kt | 1 + .../card/internal/util/CardValidationUtils.kt | 21 ++++++++---- .../internal/util/CardValidationUtilsTest.kt | 12 +++---- checkout-core/api/checkout-core.api | 33 ++++++++++++++----- .../validation/CardNumberValidationResult.kt | 14 ++++---- .../core/ui/validation/CardNumberValidator.kt | 10 +++--- .../ui/validation/CardNumberValidatorTest.kt | 20 +++++------ 7 files changed, 69 insertions(+), 42 deletions(-) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt index ce265aea8e..13d278fd46 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt @@ -34,6 +34,7 @@ class CardValidationMapper { ) CardNumberValidation.INVALID_LUHN_CHECK -> Validation.Invalid(R.string.checkout_card_number_not_valid) + CardNumberValidation.INVALID_OTHER_REASON -> Validation.Invalid(R.string.checkout_card_number_not_valid) CardNumberValidation.VALID -> Validation.Valid } diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index 1a20efe5bc..5ec42647ec 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -42,11 +42,19 @@ object CardValidationUtils { isBrandSupported: Boolean ): CardNumberValidation { return when (validationResult) { - CardNumberValidationResult.INVALID_ILLEGAL_CHARACTERS -> CardNumberValidation.INVALID_ILLEGAL_CHARACTERS - CardNumberValidationResult.INVALID_TOO_LONG -> CardNumberValidation.INVALID_TOO_LONG - CardNumberValidationResult.INVALID_TOO_SHORT -> CardNumberValidation.INVALID_TOO_SHORT - CardNumberValidationResult.INVALID_LUHN_CHECK -> CardNumberValidation.INVALID_LUHN_CHECK - CardNumberValidationResult.VALID -> when { + is CardNumberValidationResult.Invalid -> { + when (validationResult) { + is CardNumberValidationResult.Invalid.IllegalCharacters -> + CardNumberValidation.INVALID_ILLEGAL_CHARACTERS + is CardNumberValidationResult.Invalid.TooLong -> CardNumberValidation.INVALID_TOO_LONG + is CardNumberValidationResult.Invalid.TooShort -> CardNumberValidation.INVALID_TOO_SHORT + is CardNumberValidationResult.Invalid.LuhnCheck -> CardNumberValidation.INVALID_LUHN_CHECK + else -> { + CardNumberValidation.INVALID_OTHER_REASON + } + } + } + is CardNumberValidationResult.Valid -> when { !isBrandSupported -> CardNumberValidation.INVALID_UNSUPPORTED_BRAND else -> CardNumberValidation.VALID } @@ -139,7 +147,8 @@ enum class CardNumberValidation { INVALID_LUHN_CHECK, INVALID_TOO_SHORT, INVALID_TOO_LONG, - INVALID_UNSUPPORTED_BRAND + INVALID_UNSUPPORTED_BRAND, + INVALID_OTHER_REASON } @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) diff --git a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt index 56a4bc3c5c..bd5d2acebe 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt @@ -27,7 +27,7 @@ internal class CardValidationUtilsTest { @Test fun `number is valid with brand supported, then result should be valid`() { val validation = CardValidationUtils.validateCardNumber( - validationResult = CardNumberValidationResult.VALID, + validationResult = CardNumberValidationResult.Valid(), isBrandSupported = true, ) assertEquals(CardNumberValidation.VALID, validation) @@ -36,7 +36,7 @@ internal class CardValidationUtilsTest { @Test fun `number is valid with brand unsupported, then result should be invalid unsupported brand`() { val validation = CardValidationUtils.validateCardNumber( - validationResult = CardNumberValidationResult.VALID, + validationResult = CardNumberValidationResult.Valid(), isBrandSupported = false, ) assertEquals(CardNumberValidation.INVALID_UNSUPPORTED_BRAND, validation) @@ -45,7 +45,7 @@ internal class CardValidationUtilsTest { @Test fun `number is invalid with illegal characters, then result should be invalid illegal characters`() { val validation = CardValidationUtils.validateCardNumber( - validationResult = CardNumberValidationResult.INVALID_ILLEGAL_CHARACTERS, + validationResult = CardNumberValidationResult.Invalid.IllegalCharacters(), isBrandSupported = true, ) assertEquals(CardNumberValidation.INVALID_ILLEGAL_CHARACTERS, validation) @@ -54,7 +54,7 @@ internal class CardValidationUtilsTest { @Test fun `number is too long, then result should be invalid too long`() { val validation = CardValidationUtils.validateCardNumber( - validationResult = CardNumberValidationResult.INVALID_TOO_LONG, + validationResult = CardNumberValidationResult.Invalid.TooLong(), isBrandSupported = true, ) assertEquals(CardNumberValidation.INVALID_TOO_LONG, validation) @@ -63,7 +63,7 @@ internal class CardValidationUtilsTest { @Test fun `number is too short, then result should be invalid too short`() { val validation = CardValidationUtils.validateCardNumber( - validationResult = CardNumberValidationResult.INVALID_TOO_SHORT, + validationResult = CardNumberValidationResult.Invalid.TooShort(), isBrandSupported = true, ) assertEquals(CardNumberValidation.INVALID_TOO_SHORT, validation) @@ -72,7 +72,7 @@ internal class CardValidationUtilsTest { @Test fun `number is invalid due to failing luhn check, then result should be invalid luhn check`() { val validation = CardValidationUtils.validateCardNumber( - validationResult = CardNumberValidationResult.INVALID_LUHN_CHECK, + validationResult = CardNumberValidationResult.Invalid.LuhnCheck(), isBrandSupported = true, ) assertEquals(CardNumberValidation.INVALID_LUHN_CHECK, validation) diff --git a/checkout-core/api/checkout-core.api b/checkout-core/api/checkout-core.api index 90eccc90c9..31229d6f59 100644 --- a/checkout-core/api/checkout-core.api +++ b/checkout-core/api/checkout-core.api @@ -267,15 +267,30 @@ public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidator public final fun validateExpiryDate (Lcom/adyen/checkout/core/ui/model/ExpiryDate;)Lcom/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult; } -public final class com/adyen/checkout/core/ui/validation/CardNumberValidationResult : java/lang/Enum { - public static final field INVALID_ILLEGAL_CHARACTERS Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; - public static final field INVALID_LUHN_CHECK Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; - public static final field INVALID_TOO_LONG Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; - public static final field INVALID_TOO_SHORT Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; - public static final field VALID Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; - public static fun getEntries ()Lkotlin/enums/EnumEntries; - public static fun valueOf (Ljava/lang/String;)Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; - public static fun values ()[Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; +public abstract interface class com/adyen/checkout/core/ui/validation/CardNumberValidationResult { +} + +public abstract interface class com/adyen/checkout/core/ui/validation/CardNumberValidationResult$Invalid : com/adyen/checkout/core/ui/validation/CardNumberValidationResult { +} + +public final class com/adyen/checkout/core/ui/validation/CardNumberValidationResult$Invalid$IllegalCharacters : com/adyen/checkout/core/ui/validation/CardNumberValidationResult$Invalid { + public fun ()V +} + +public final class com/adyen/checkout/core/ui/validation/CardNumberValidationResult$Invalid$LuhnCheck : com/adyen/checkout/core/ui/validation/CardNumberValidationResult$Invalid { + public fun ()V +} + +public final class com/adyen/checkout/core/ui/validation/CardNumberValidationResult$Invalid$TooLong : com/adyen/checkout/core/ui/validation/CardNumberValidationResult$Invalid { + public fun ()V +} + +public final class com/adyen/checkout/core/ui/validation/CardNumberValidationResult$Invalid$TooShort : com/adyen/checkout/core/ui/validation/CardNumberValidationResult$Invalid { + public fun ()V +} + +public final class com/adyen/checkout/core/ui/validation/CardNumberValidationResult$Valid : com/adyen/checkout/core/ui/validation/CardNumberValidationResult { + public fun ()V } public final class com/adyen/checkout/core/ui/validation/CardNumberValidator { diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidationResult.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidationResult.kt index ba35ca0fad..43bfd3da06 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidationResult.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidationResult.kt @@ -11,10 +11,12 @@ package com.adyen.checkout.core.ui.validation /** * Possible validation results for card number validation. (@see [CardNumberValidator.validateCardNumber] */ -enum class CardNumberValidationResult { - INVALID_ILLEGAL_CHARACTERS, - INVALID_TOO_LONG, - INVALID_TOO_SHORT, - INVALID_LUHN_CHECK, - VALID +sealed interface CardNumberValidationResult { + class Valid : CardNumberValidationResult + interface Invalid : CardNumberValidationResult { + class IllegalCharacters : Invalid + class TooLong : Invalid + class TooShort : Invalid + class LuhnCheck : Invalid + } } diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt index 3e341db505..c1525b2408 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt @@ -33,14 +33,14 @@ object CardNumberValidator { val length = normalizedNumber.length return when { !StringUtil.isDigitsAndSeparatorsOnly(normalizedNumber) -> - CardNumberValidationResult.INVALID_ILLEGAL_CHARACTERS + CardNumberValidationResult.Invalid.IllegalCharacters() - length > MAXIMUM_CARD_NUMBER_LENGTH -> CardNumberValidationResult.INVALID_TOO_LONG - length < MINIMUM_CARD_NUMBER_LENGTH -> CardNumberValidationResult.INVALID_TOO_SHORT + length > MAXIMUM_CARD_NUMBER_LENGTH -> CardNumberValidationResult.Invalid.TooLong() + length < MINIMUM_CARD_NUMBER_LENGTH -> CardNumberValidationResult.Invalid.TooShort() enableLuhnCheck && !isLuhnChecksumValid(normalizedNumber) -> - CardNumberValidationResult.INVALID_LUHN_CHECK + CardNumberValidationResult.Invalid.LuhnCheck() - else -> CardNumberValidationResult.VALID + else -> CardNumberValidationResult.Valid() } } diff --git a/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardNumberValidatorTest.kt b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardNumberValidatorTest.kt index 05efb2fd26..140fdd0d28 100644 --- a/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardNumberValidatorTest.kt +++ b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardNumberValidatorTest.kt @@ -23,7 +23,7 @@ class CardNumberValidatorTest { expectedValidationResult: CardNumberValidationResult, ) { val actualResult = CardNumberValidator.validateCardNumber(number, enableLuhnCheck) - assertEquals(expectedValidationResult, actualResult) + assertEquals(expectedValidationResult.javaClass, actualResult.javaClass) } companion object { @@ -32,49 +32,49 @@ class CardNumberValidatorTest { arguments( "5454545454545454", true, - CardNumberValidationResult.VALID, + CardNumberValidationResult.Valid(), ), arguments( "3700 0000 0000 002", true, - CardNumberValidationResult.VALID, + CardNumberValidationResult.Valid(), ), arguments( "55 770 0005 57 7 00 04", true, - CardNumberValidationResult.VALID, + CardNumberValidationResult.Valid(), ), arguments( "2137f7834a2390", true, - CardNumberValidationResult.INVALID_ILLEGAL_CHARACTERS, + CardNumberValidationResult.Invalid.IllegalCharacters(), ), arguments( "287,7482-3674", true, - CardNumberValidationResult.INVALID_ILLEGAL_CHARACTERS, + CardNumberValidationResult.Invalid.IllegalCharacters(), ), arguments( "1234123", true, - CardNumberValidationResult.INVALID_TOO_SHORT, + CardNumberValidationResult.Invalid.TooShort(), ), arguments( "37467643756457884754", true, - CardNumberValidationResult.INVALID_TOO_LONG, + CardNumberValidationResult.Invalid.TooLong(), ), // Luhn check fails arguments( "8475 1789 7235 6236", true, - CardNumberValidationResult.INVALID_LUHN_CHECK, + CardNumberValidationResult.Invalid.LuhnCheck(), ), // Luhn check is failing but disabled, result is valid arguments( "192382023091310912", false, - CardNumberValidationResult.VALID, + CardNumberValidationResult.Valid(), ), ) } From 90d44eda4d4f12f9596b66a1551452d3c250c926 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Wed, 9 Oct 2024 16:43:05 +0200 Subject: [PATCH 288/299] Remove unnecessary INVALID_DATE_FORMAT validation result COAND-985 --- .../card/internal/ui/CardValidationMapper.kt | 1 - .../card/internal/util/CardValidationUtils.kt | 18 +++++----- .../internal/ui/CardValidationMapperTest.kt | 2 +- .../internal/util/CardValidationUtilsTest.kt | 33 ++++++++++++++----- checkout-core/api/checkout-core.api | 6 +--- .../CardExpiryDateValidationResult.kt | 3 +- .../ui/validation/CardExpiryDateValidator.kt | 13 ++------ .../validation/CardExpiryDateValidatorTest.kt | 4 +-- .../util/MealVoucherFRValidationUtils.kt | 3 +- 9 files changed, 42 insertions(+), 41 deletions(-) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt index 13d278fd46..66582aa97a 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/CardValidationMapper.kt @@ -54,7 +54,6 @@ class CardValidationMapper { CardExpiryDateValidation.INVALID_TOO_OLD -> Validation.Invalid(R.string.checkout_expiry_date_not_valid_too_old) - CardExpiryDateValidation.INVALID_DATE_FORMAT -> Validation.Invalid(R.string.checkout_expiry_date_not_valid) CardExpiryDateValidation.INVALID_OTHER_REASON -> Validation.Invalid(R.string.checkout_expiry_date_not_valid) } return FieldState(expiryDate, validation) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt index 5ec42647ec..2c719d63c2 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/util/CardValidationUtils.kt @@ -12,6 +12,7 @@ import androidx.annotation.VisibleForTesting import com.adyen.checkout.card.internal.data.model.Brand import com.adyen.checkout.card.internal.data.model.DetectedCardType import com.adyen.checkout.card.internal.ui.model.InputFieldUIState +import com.adyen.checkout.core.internal.ui.model.isEmptyDate import com.adyen.checkout.core.internal.util.StringUtil import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.core.ui.validation.CardExpiryDateValidationResult @@ -69,11 +70,12 @@ object CardValidationUtils { fieldPolicy: Brand.FieldPolicy?, ): CardExpiryDateValidation { val result = CardExpiryDateValidator.validateExpiryDate(expiryDate) - return validateExpiryDate(result, fieldPolicy) + return validateExpiryDate(expiryDate, result, fieldPolicy) } @VisibleForTesting internal fun validateExpiryDate( + expiryDate: ExpiryDate, validationResult: CardExpiryDateValidationResult, fieldPolicy: Brand.FieldPolicy? ): CardExpiryDateValidation { @@ -88,13 +90,12 @@ object CardValidationUtils { is CardExpiryDateValidationResult.Invalid.TooOld -> CardExpiryDateValidation.INVALID_TOO_OLD - is CardExpiryDateValidationResult.Invalid.DateFormat -> - CardExpiryDateValidation.INVALID_DATE_FORMAT - - is CardExpiryDateValidationResult.Invalid.OtherReason -> if (fieldPolicy?.isRequired() == false) { - CardExpiryDateValidation.VALID_NOT_REQUIRED - } else { - CardExpiryDateValidation.INVALID_OTHER_REASON + is CardExpiryDateValidationResult.Invalid.NonParseableDate -> { + if (expiryDate.isEmptyDate() && fieldPolicy?.isRequired() == false) { + CardExpiryDateValidation.VALID_NOT_REQUIRED + } else { + CardExpiryDateValidation.INVALID_OTHER_REASON + } } else -> { @@ -157,7 +158,6 @@ enum class CardExpiryDateValidation { VALID_NOT_REQUIRED, INVALID_TOO_FAR_IN_THE_FUTURE, INVALID_TOO_OLD, - INVALID_DATE_FORMAT, INVALID_OTHER_REASON, } diff --git a/card/src/test/java/com/adyen/checkout/card/internal/ui/CardValidationMapperTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/ui/CardValidationMapperTest.kt index 2d6c9a8c98..b9db83c7a6 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/ui/CardValidationMapperTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/ui/CardValidationMapperTest.kt @@ -79,7 +79,7 @@ internal class CardValidationMapperTest { val expiryDate = ExpiryDate(4, 20) // 04/2020 val actual = cardValidationMapper.mapExpiryDateValidation( expiryDate, - CardExpiryDateValidation.INVALID_DATE_FORMAT, + CardExpiryDateValidation.INVALID_OTHER_REASON, ) val expectedInvalidReason = R.string.checkout_expiry_date_not_valid diff --git a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt index bd5d2acebe..e06735eb39 100644 --- a/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt +++ b/card/src/test/java/com/adyen/checkout/card/internal/util/CardValidationUtilsTest.kt @@ -10,6 +10,9 @@ package com.adyen.checkout.card.internal.util import com.adyen.checkout.card.internal.data.model.Brand import com.adyen.checkout.card.internal.ui.model.InputFieldUIState +import com.adyen.checkout.core.internal.ui.model.EMPTY_DATE +import com.adyen.checkout.core.internal.ui.model.INVALID_DATE +import com.adyen.checkout.core.ui.model.ExpiryDate import com.adyen.checkout.core.ui.validation.CardExpiryDateValidationResult import com.adyen.checkout.core.ui.validation.CardNumberValidationResult import com.adyen.checkout.core.ui.validation.CardSecurityCodeValidationResult @@ -85,6 +88,7 @@ internal class CardValidationUtilsTest { @Test fun `date is valid with field policy optional, then result should be valid`() { val actual = CardValidationUtils.validateExpiryDate( + ExpiryDate(12, 2030), CardExpiryDateValidationResult.Valid(), Brand.FieldPolicy.OPTIONAL, ) @@ -95,6 +99,7 @@ internal class CardValidationUtilsTest { @Test fun `date is valid with field policy hidden, then result should be valid`() { val actual = CardValidationUtils.validateExpiryDate( + ExpiryDate(12, 2030), CardExpiryDateValidationResult.Valid(), Brand.FieldPolicy.HIDDEN, ) @@ -105,6 +110,7 @@ internal class CardValidationUtilsTest { @Test fun `date is too far in the future with field policy optional, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( + ExpiryDate(12, 2099), CardExpiryDateValidationResult.Invalid.TooFarInTheFuture(), Brand.FieldPolicy.OPTIONAL, ) @@ -115,6 +121,7 @@ internal class CardValidationUtilsTest { @Test fun `date is too far in the future with field policy hidden, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( + ExpiryDate(12, 2099), CardExpiryDateValidationResult.Invalid.TooFarInTheFuture(), Brand.FieldPolicy.HIDDEN, ) @@ -125,6 +132,7 @@ internal class CardValidationUtilsTest { @Test fun `date is too old with field policy optional, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( + ExpiryDate(12, 2012), CardExpiryDateValidationResult.Invalid.TooOld(), Brand.FieldPolicy.OPTIONAL, ) @@ -135,6 +143,7 @@ internal class CardValidationUtilsTest { @Test fun `date is too old with field policy hidden, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( + ExpiryDate(12, 2012), CardExpiryDateValidationResult.Invalid.TooOld(), Brand.FieldPolicy.HIDDEN, ) @@ -145,7 +154,8 @@ internal class CardValidationUtilsTest { @Test fun `date is empty with field policy required, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.Invalid.OtherReason(), + EMPTY_DATE, + CardExpiryDateValidationResult.Invalid.NonParseableDate(), Brand.FieldPolicy.REQUIRED, ) @@ -155,7 +165,8 @@ internal class CardValidationUtilsTest { @Test fun `date is empty with field policy optional, then result should be valid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.Invalid.OtherReason(), + EMPTY_DATE, + CardExpiryDateValidationResult.Invalid.NonParseableDate(), Brand.FieldPolicy.OPTIONAL, ) @@ -165,7 +176,8 @@ internal class CardValidationUtilsTest { @Test fun `date is empty with field policy hidden, then result should be valid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.Invalid.OtherReason(), + EMPTY_DATE, + CardExpiryDateValidationResult.Invalid.NonParseableDate(), Brand.FieldPolicy.HIDDEN, ) @@ -175,31 +187,34 @@ internal class CardValidationUtilsTest { @Test fun `date is invalid with field policy required, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.Invalid.DateFormat(), + INVALID_DATE, + CardExpiryDateValidationResult.Invalid.NonParseableDate(), Brand.FieldPolicy.REQUIRED, ) - assertEquals(CardExpiryDateValidation.INVALID_DATE_FORMAT, actual) + assertEquals(CardExpiryDateValidation.INVALID_OTHER_REASON, actual) } @Test fun `date is invalid with field policy optional, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.Invalid.DateFormat(), + INVALID_DATE, + CardExpiryDateValidationResult.Invalid.NonParseableDate(), Brand.FieldPolicy.OPTIONAL, ) - assertEquals(CardExpiryDateValidation.INVALID_DATE_FORMAT, actual) + assertEquals(CardExpiryDateValidation.INVALID_OTHER_REASON, actual) } @Test fun `date is invalid with field policy hidden, then result should be invalid`() { val actual = CardValidationUtils.validateExpiryDate( - CardExpiryDateValidationResult.Invalid.DateFormat(), + INVALID_DATE, + CardExpiryDateValidationResult.Invalid.NonParseableDate(), Brand.FieldPolicy.HIDDEN, ) - assertEquals(CardExpiryDateValidation.INVALID_DATE_FORMAT, actual) + assertEquals(CardExpiryDateValidation.INVALID_OTHER_REASON, actual) } } diff --git a/checkout-core/api/checkout-core.api b/checkout-core/api/checkout-core.api index 31229d6f59..ccfdf3ba63 100644 --- a/checkout-core/api/checkout-core.api +++ b/checkout-core/api/checkout-core.api @@ -242,11 +242,7 @@ public abstract interface class com/adyen/checkout/core/ui/validation/CardExpiry public abstract interface class com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid : com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult { } -public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid$DateFormat : com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid { - public fun ()V -} - -public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid$OtherReason : com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid { +public final class com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid$NonParseableDate : com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult$Invalid { public fun ()V } diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt index 71f7229ed8..1ce388418f 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidationResult.kt @@ -16,7 +16,6 @@ sealed interface CardExpiryDateValidationResult { interface Invalid : CardExpiryDateValidationResult { class TooFarInTheFuture : Invalid class TooOld : Invalid - class DateFormat : Invalid - class OtherReason : Invalid + class NonParseableDate : Invalid } } diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt index 88b78145af..fd3ec3a606 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidator.kt @@ -9,8 +9,6 @@ package com.adyen.checkout.core.ui.validation import androidx.annotation.VisibleForTesting -import com.adyen.checkout.core.internal.ui.model.isEmptyDate -import com.adyen.checkout.core.internal.ui.model.isInvalidDate import com.adyen.checkout.core.ui.model.ExpiryDate import java.util.Calendar import java.util.GregorianCalendar @@ -50,9 +48,7 @@ object CardExpiryDateValidator { } } - expiryDate.isInvalidDate() -> CardExpiryDateValidationResult.Invalid.DateFormat() - - else -> CardExpiryDateValidationResult.Invalid.OtherReason() + else -> CardExpiryDateValidationResult.Invalid.NonParseableDate() } private fun isInMaxYearRange(expiryDate: ExpiryDate, calendar: Calendar): Boolean { @@ -70,11 +66,8 @@ object CardExpiryDateValidator { } private fun dateExists(expiryDate: ExpiryDate): Boolean { - return ( - !expiryDate.isEmptyDate() && - isValidMonth(expiryDate.expiryMonth) && - expiryDate.expiryYear > 0 - ) + return isValidMonth(expiryDate.expiryMonth) && + expiryDate.expiryYear > 0 } private fun isValidMonth(month: Int): Boolean { diff --git a/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt index 3b2f1376a6..8c84f87d3d 100644 --- a/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt +++ b/checkout-core/src/test/java/com/adyen/checkout/core/ui/validation/CardExpiryDateValidatorTest.kt @@ -40,12 +40,12 @@ internal class CardExpiryDateValidatorTest { arguments( EMPTY_DATE, GregorianCalendar.getInstance(), - CardExpiryDateValidationResult.Invalid.OtherReason(), + CardExpiryDateValidationResult.Invalid.NonParseableDate(), ), arguments( INVALID_DATE, GregorianCalendar.getInstance(), - CardExpiryDateValidationResult.Invalid.DateFormat(), + CardExpiryDateValidationResult.Invalid.NonParseableDate(), ), // Date 30 years in future arguments( diff --git a/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt index e7534cbbcd..da5d60b0e0 100644 --- a/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/util/MealVoucherFRValidationUtils.kt @@ -60,8 +60,7 @@ internal object MealVoucherFRValidationUtils { Validation.Invalid(R.string.checkout_meal_voucher_fr_expiry_date_not_valid_too_old), ) - is CardExpiryDateValidationResult.Invalid.DateFormat, - is CardExpiryDateValidationResult.Invalid.OtherReason -> FieldState( + is CardExpiryDateValidationResult.Invalid.NonParseableDate -> FieldState( expiryDate, Validation.Invalid(R.string.checkout_meal_voucher_fr_expiry_date_not_valid), ) From 7503f8b393f0fff1707bc812b456f47051010a34 Mon Sep 17 00:00:00 2001 From: Ararat Mnatsakanyan Date: Thu, 10 Oct 2024 15:39:34 +0400 Subject: [PATCH 289/299] Create CheckoutAttemptIdState and return different values for each checkoutAttemptId state. COAND-982 --- .../ui/DefaultACHDirectDebitDelegateTest.kt | 2 +- .../ui/DefaultCashAppPayDelegateTest.kt | 2 +- .../ui/StoredCashAppPayDelegateTest.kt | 2 +- .../internal/analytics/AnalyticsManager.kt | 2 +- .../analytics/CheckoutAttemptIdState.kt | 24 ++++ .../analytics/DefaultAnalyticsManager.kt | 41 ++++--- .../analytics/DefaultAnalyticsManagerTest.kt | 113 +++++++++--------- .../analytics/TestAnalyticsManager.kt | 12 +- .../ui/DefaultGooglePayDelegateTest.kt | 2 +- .../internal/ui/DefaultTwintDelegateTest.kt | 2 +- .../internal/ui/StoredTwintDelegateTest.kt | 2 +- 11 files changed, 118 insertions(+), 86 deletions(-) create mode 100644 components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/CheckoutAttemptIdState.kt diff --git a/ach/src/test/java/com/adyen/checkout/ach/internal/ui/DefaultACHDirectDebitDelegateTest.kt b/ach/src/test/java/com/adyen/checkout/ach/internal/ui/DefaultACHDirectDebitDelegateTest.kt index 9675ba108a..4db5fa8cdd 100644 --- a/ach/src/test/java/com/adyen/checkout/ach/internal/ui/DefaultACHDirectDebitDelegateTest.kt +++ b/ach/src/test/java/com/adyen/checkout/ach/internal/ui/DefaultACHDirectDebitDelegateTest.kt @@ -496,7 +496,7 @@ internal class DefaultACHDirectDebitDelegateTest( val expectedPaymentMethod = ACHDirectDebitPaymentMethod( type = ACHDirectDebitPaymentMethod.PAYMENT_METHOD_TYPE, - checkoutAttemptId = null, + checkoutAttemptId = TestAnalyticsManager.CHECKOUT_ATTEMPT_ID_NOT_FETCHED, encryptedBankAccountNumber = TEST_BANK_ACCOUNT_NUMBER, encryptedBankLocationId = TEST_BANK_BANK_LOCATION_ID, ownerName = TEST_OWNER_NAME, diff --git a/cashapppay/src/test/java/com/adyen/checkout/cashapppay/internal/ui/DefaultCashAppPayDelegateTest.kt b/cashapppay/src/test/java/com/adyen/checkout/cashapppay/internal/ui/DefaultCashAppPayDelegateTest.kt index 364146bd24..f009258f17 100644 --- a/cashapppay/src/test/java/com/adyen/checkout/cashapppay/internal/ui/DefaultCashAppPayDelegateTest.kt +++ b/cashapppay/src/test/java/com/adyen/checkout/cashapppay/internal/ui/DefaultCashAppPayDelegateTest.kt @@ -130,7 +130,7 @@ internal class DefaultCashAppPayDelegateTest( data = PaymentComponentData( paymentMethod = CashAppPayPaymentMethod( type = TEST_PAYMENT_METHOD_TYPE, - checkoutAttemptId = null, + checkoutAttemptId = TestAnalyticsManager.CHECKOUT_ATTEMPT_ID_NOT_FETCHED, grantId = "grantId", onFileGrantId = "grantId", customerId = "customerId", diff --git a/cashapppay/src/test/java/com/adyen/checkout/cashapppay/internal/ui/StoredCashAppPayDelegateTest.kt b/cashapppay/src/test/java/com/adyen/checkout/cashapppay/internal/ui/StoredCashAppPayDelegateTest.kt index c301b88629..bbc4f67208 100644 --- a/cashapppay/src/test/java/com/adyen/checkout/cashapppay/internal/ui/StoredCashAppPayDelegateTest.kt +++ b/cashapppay/src/test/java/com/adyen/checkout/cashapppay/internal/ui/StoredCashAppPayDelegateTest.kt @@ -100,7 +100,7 @@ internal class StoredCashAppPayDelegateTest { data = PaymentComponentData( paymentMethod = CashAppPayPaymentMethod( type = TEST_PAYMENT_METHOD_TYPE, - checkoutAttemptId = null, + checkoutAttemptId = TestAnalyticsManager.CHECKOUT_ATTEMPT_ID_NOT_FETCHED, storedPaymentMethodId = TEST_PAYMENT_METHOD_ID, ), order = TEST_ORDER, diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/AnalyticsManager.kt b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/AnalyticsManager.kt index 391ad934b8..038a38a1aa 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/AnalyticsManager.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/AnalyticsManager.kt @@ -18,7 +18,7 @@ interface AnalyticsManager { fun trackEvent(event: AnalyticsEvent) - fun getCheckoutAttemptId(): String? + fun getCheckoutAttemptId(): String fun clear(owner: Any) } diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/CheckoutAttemptIdState.kt b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/CheckoutAttemptIdState.kt new file mode 100644 index 0000000000..c8a28826ce --- /dev/null +++ b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/CheckoutAttemptIdState.kt @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2024 Adyen N.V. + * + * This file is open source and available under the MIT license. See the LICENSE file for more info. + * + * Created by ararat on 8/10/2024. + */ + +package com.adyen.checkout.components.core.internal.analytics + +import androidx.annotation.RestrictTo + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +sealed class CheckoutAttemptIdState { + + @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) + data class Available(val checkoutAttemptId: String) : CheckoutAttemptIdState() + + @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) + data object Failed : CheckoutAttemptIdState() + + @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) + data object NotAvailable : CheckoutAttemptIdState() +} diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManager.kt b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManager.kt index f975497f29..29a3a89423 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManager.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManager.kt @@ -30,7 +30,7 @@ internal class DefaultAnalyticsManager( private val coroutineDispatcher: CoroutineDispatcher = Dispatchers.IO, ) : AnalyticsManager { - private var checkoutAttemptId: String? = null + private var checkoutAttemptIdState: CheckoutAttemptIdState = CheckoutAttemptIdState.NotAvailable private var isInitialized: Boolean = false @@ -56,11 +56,15 @@ internal class DefaultAnalyticsManager( analyticsRepository.fetchCheckoutAttemptId() }.fold( onSuccess = { attemptId -> - checkoutAttemptId = attemptId?.also { startTimer() } + checkoutAttemptIdState = attemptId?.let { id -> + CheckoutAttemptIdState.Available(id) + }?.also { + startTimer() + } ?: CheckoutAttemptIdState.Failed }, onFailure = { adyenLog(AdyenLogLevel.WARN, it) { "Failed to fetch checkoutAttemptId." } - checkoutAttemptId = FAILED_CHECKOUT_ATTEMPT_ID + checkoutAttemptIdState = CheckoutAttemptIdState.Failed }, ) } @@ -101,32 +105,28 @@ internal class DefaultAnalyticsManager( } private suspend fun sendEvents() { - val checkoutAttemptId = checkoutAttemptId - if (checkoutAttemptId == null) { - adyenLog(AdyenLogLevel.WARN) { "checkoutAttemptId should not be null at this point." } - return - } - - if (cannotSendEvents()) { - adyenLog(AdyenLogLevel.DEBUG) { "Not allowed to send events, ignoring." } + val checkoutAttemptIdState = checkoutAttemptIdState as? CheckoutAttemptIdState.Available + if (checkoutAttemptIdState == null) { + adyenLog(AdyenLogLevel.WARN) { "checkoutAttemptId should be available at this point." } return } runSuspendCatching { - analyticsRepository.sendEvents(checkoutAttemptId) + analyticsRepository.sendEvents(checkoutAttemptIdState.checkoutAttemptId) }.fold( onSuccess = { /* Not necessary */ }, onFailure = { throwable -> adyenLog(AdyenLogLevel.WARN, throwable) { "Failed sending analytics events" } }, ) } - override fun getCheckoutAttemptId(): String? = checkoutAttemptId - - private fun cannotSendEvents(): Boolean { - return analyticsParams.level.priority <= AnalyticsParamsLevel.NONE.priority || - checkoutAttemptId == FAILED_CHECKOUT_ATTEMPT_ID + override fun getCheckoutAttemptId(): String = when (val checkoutAttemptIdState = checkoutAttemptIdState) { + is CheckoutAttemptIdState.Available -> checkoutAttemptIdState.checkoutAttemptId + CheckoutAttemptIdState.Failed -> FAILED_CHECKOUT_ATTEMPT_ID + CheckoutAttemptIdState.NotAvailable -> CHECKOUT_ATTEMPT_ID_NOT_FETCHED } + private fun cannotSendEvents() = analyticsParams.level.priority <= AnalyticsParamsLevel.NONE.priority + override fun clear(owner: Any) { if (ownerReference != owner::class.qualifiedName) { adyenLog(AdyenLogLevel.DEBUG) { "Clear called by not the original owner, ignoring." } @@ -136,7 +136,7 @@ internal class DefaultAnalyticsManager( adyenLog(AdyenLogLevel.DEBUG) { "Clearing analytics manager" } _coroutineScope = null - checkoutAttemptId = null + checkoutAttemptIdState = CheckoutAttemptIdState.NotAvailable ownerReference = null isInitialized = false stopTimer() @@ -145,7 +145,10 @@ internal class DefaultAnalyticsManager( companion object { @VisibleForTesting - internal val FAILED_CHECKOUT_ATTEMPT_ID = "fetch-checkoutAttemptId-failed" + internal const val CHECKOUT_ATTEMPT_ID_NOT_FETCHED = "checkoutAttemptId-not-fetched" + + @VisibleForTesting + internal const val FAILED_CHECKOUT_ATTEMPT_ID = "fetch-checkoutAttemptId-failed" @VisibleForTesting internal val DISPATCH_INTERVAL_MILLIS = 10.seconds.inWholeMilliseconds diff --git a/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManagerTest.kt b/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManagerTest.kt index d3d58fca70..545e00290f 100644 --- a/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManagerTest.kt +++ b/components-core/src/test/java/com/adyen/checkout/components/core/internal/analytics/DefaultAnalyticsManagerTest.kt @@ -39,6 +39,11 @@ internal class DefaultAnalyticsManagerTest( analyticsManager = createAnalyticsManager() } + @Test + fun `checkoutAttemptId is not available by default`() { + assertEquals(DefaultAnalyticsManager.CHECKOUT_ATTEMPT_ID_NOT_FETCHED, analyticsManager.getCheckoutAttemptId()) + } + @Nested @DisplayName("when initializing and") inner class InitializeTest { @@ -65,22 +70,23 @@ internal class DefaultAnalyticsManagerTest( } @Test - fun `fetching checkoutAttemptId fails, then checkoutAttemptId is failed checkoutAttemptId`() = runTest { + fun `fetching checkoutAttemptId fails, then checkoutAttemptId is failed`() = runTest { whenever(analyticsRepository.fetchCheckoutAttemptId()) doAnswer { error("test") } analyticsManager.initialize(this@InitializeTest, this) assertEquals(DefaultAnalyticsManager.FAILED_CHECKOUT_ATTEMPT_ID, analyticsManager.getCheckoutAttemptId()) + analyticsManager.clear(this@InitializeTest) } @Test fun `initialize is called twice, then the second time is ignored`() = runTest { whenever(analyticsRepository.fetchCheckoutAttemptId()) doAnswer { error("test") } - analyticsManager.initialize(this@InitializeTest, this) analyticsManager.initialize(this@InitializeTest, this) verify(analyticsRepository, times(1)).fetchCheckoutAttemptId() + analyticsManager.clear(this@InitializeTest) } } @@ -96,16 +102,7 @@ internal class DefaultAnalyticsManagerTest( analyticsManager.trackEvent(GenericEvents.rendered("dropin", false)) verify(analyticsRepository, never()).storeEvent(any()) - } - - @Test - fun `fetching checkoutAttemptId failed, then events should not be stored`() = runTest { - whenever(analyticsRepository.fetchCheckoutAttemptId()) doAnswer { error("test") } - analyticsManager.initialize(this@TrackEventTest, this) - - analyticsManager.trackEvent(GenericEvents.rendered("dropin", false)) - - verify(analyticsRepository, never()).storeEvent(any()) + analyticsManager.clear(this@TrackEventTest) } @Test @@ -119,6 +116,7 @@ internal class DefaultAnalyticsManagerTest( analyticsManager.trackEvent(event) verify(analyticsRepository).storeEvent(event) + analyticsManager.clear(this@TrackEventTest) } @Test @@ -137,63 +135,68 @@ internal class DefaultAnalyticsManagerTest( } } - @Test - fun `when timer ticks, then all stored events should be sent`() = runTest { - analyticsManager = createAnalyticsManager(coroutineDispatcher = StandardTestDispatcher(testScheduler)) - whenever(analyticsRepository.fetchCheckoutAttemptId()) doReturn "test value" - whenever(analyticsRepository.storeEvent(any())) doReturn Unit - whenever(analyticsRepository.sendEvents(any())) doReturn Unit - analyticsManager.initialize(this@DefaultAnalyticsManagerTest, this) + @Nested + @DisplayName("when sending events and") + inner class SendEventTest { - analyticsManager.trackEvent(GenericEvents.rendered("dropin", false)) - testScheduler.advanceTimeBy(DefaultAnalyticsManager.DISPATCH_INTERVAL_MILLIS + 1) + @Test + fun `sending events is disabled, then events are not sent`() = runTest { + analyticsManager = createAnalyticsManager(AnalyticsParamsLevel.NONE) + analyticsManager.initialize(this@SendEventTest, this) + val event = AnalyticsEvent.Info( + component = "test", + shouldForceSend = true, + ) - verify(analyticsRepository, times(1)).sendEvents(any()) - analyticsManager.clear(this@DefaultAnalyticsManagerTest) - } + analyticsManager.trackEvent(event) - @Test - fun `when sending events and checkoutAttemptId is null, then events are not sent`() = runTest { - whenever(analyticsRepository.fetchCheckoutAttemptId()) doReturn null - analyticsManager.initialize(this@DefaultAnalyticsManagerTest, this) - val event = AnalyticsEvent.Info( - component = "test", - shouldForceSend = true, - ) + verify(analyticsRepository, never()).sendEvents(any()) + analyticsManager.clear(this@SendEventTest) + } - analyticsManager.trackEvent(event) + @Test + fun `checkoutAttemptId is null when fetching, then events are not sent`() = runTest { + whenever(analyticsRepository.fetchCheckoutAttemptId()) doReturn null + analyticsManager.initialize(this@SendEventTest, this) + val event = AnalyticsEvent.Info( + component = "test", + shouldForceSend = true, + ) - verify(analyticsRepository, never()).sendEvents(any()) - analyticsManager.clear(this@DefaultAnalyticsManagerTest) - } + analyticsManager.trackEvent(event) - @Test - fun `when sending events and sending events is disabled, then events are not sent`() = runTest { - analyticsManager = createAnalyticsManager(AnalyticsParamsLevel.NONE) - analyticsManager.initialize(this@DefaultAnalyticsManagerTest, this) - val event = AnalyticsEvent.Info( - component = "test", - shouldForceSend = true, - ) + verify(analyticsRepository, never()).sendEvents(any()) + analyticsManager.clear(this@SendEventTest) + } + + @Test + fun `checkoutAttemptId has failed fetching, then events are not sent`() = runTest { + whenever(analyticsRepository.fetchCheckoutAttemptId()) doAnswer { error("test") } + analyticsManager.initialize(this@SendEventTest, this) + val event = AnalyticsEvent.Info( + component = "test", + shouldForceSend = true, + ) - analyticsManager.trackEvent(event) + analyticsManager.trackEvent(event) - verify(analyticsRepository, never()).sendEvents(any()) - analyticsManager.clear(this@DefaultAnalyticsManagerTest) + verify(analyticsRepository, never()).sendEvents(any()) + analyticsManager.clear(this@SendEventTest) + } } @Test - fun `when sending events and checkoutAttemptId has failed fetching, then events are not sent`() = runTest { - whenever(analyticsRepository.fetchCheckoutAttemptId()) doAnswer { error("test") } + fun `when timer ticks, then all stored events should be sent`() = runTest { + analyticsManager = createAnalyticsManager(coroutineDispatcher = StandardTestDispatcher(testScheduler)) + whenever(analyticsRepository.fetchCheckoutAttemptId()) doReturn "test value" + whenever(analyticsRepository.storeEvent(any())) doReturn Unit + whenever(analyticsRepository.sendEvents(any())) doReturn Unit analyticsManager.initialize(this@DefaultAnalyticsManagerTest, this) - val event = AnalyticsEvent.Info( - component = "test", - shouldForceSend = true, - ) - analyticsManager.trackEvent(event) + analyticsManager.trackEvent(GenericEvents.rendered("dropin", false)) + testScheduler.advanceTimeBy(DefaultAnalyticsManager.DISPATCH_INTERVAL_MILLIS + 1) - verify(analyticsRepository, never()).sendEvents(any()) + verify(analyticsRepository, times(1)).sendEvents(any()) analyticsManager.clear(this@DefaultAnalyticsManagerTest) } diff --git a/components-core/src/testFixtures/java/com/adyen/checkout/components/core/internal/analytics/TestAnalyticsManager.kt b/components-core/src/testFixtures/java/com/adyen/checkout/components/core/internal/analytics/TestAnalyticsManager.kt index 7862bbdecf..f04b237a7b 100644 --- a/components-core/src/testFixtures/java/com/adyen/checkout/components/core/internal/analytics/TestAnalyticsManager.kt +++ b/components-core/src/testFixtures/java/com/adyen/checkout/components/core/internal/analytics/TestAnalyticsManager.kt @@ -19,7 +19,7 @@ class TestAnalyticsManager : AnalyticsManager { private var isInitialized = false private var isCleared = false - private var checkoutAttemptId: String? = null + private var checkoutAttemptId: String = CHECKOUT_ATTEMPT_ID_NOT_FETCHED private val events: MutableList = mutableListOf() override fun initialize(owner: Any, coroutineScope: CoroutineScope) { @@ -58,11 +58,9 @@ class TestAnalyticsManager : AnalyticsManager { return re.matches(actual) } - override fun getCheckoutAttemptId(): String? { - return checkoutAttemptId - } + override fun getCheckoutAttemptId(): String = checkoutAttemptId - fun setCheckoutAttemptId(checkoutAttemptId: String?) { + fun setCheckoutAttemptId(checkoutAttemptId: String) { this.checkoutAttemptId = checkoutAttemptId } @@ -73,4 +71,8 @@ class TestAnalyticsManager : AnalyticsManager { fun assertIsCleared() { assertTrue(isCleared) } + + companion object { + const val CHECKOUT_ATTEMPT_ID_NOT_FETCHED = "not-fetched" + } } diff --git a/googlepay/src/test/java/com/adyen/checkout/googlepay/internal/ui/DefaultGooglePayDelegateTest.kt b/googlepay/src/test/java/com/adyen/checkout/googlepay/internal/ui/DefaultGooglePayDelegateTest.kt index 5142e3d634..b44f4b74be 100644 --- a/googlepay/src/test/java/com/adyen/checkout/googlepay/internal/ui/DefaultGooglePayDelegateTest.kt +++ b/googlepay/src/test/java/com/adyen/checkout/googlepay/internal/ui/DefaultGooglePayDelegateTest.kt @@ -113,7 +113,7 @@ internal class DefaultGooglePayDelegateTest { val expectedPaymentMethod = GooglePayUtils.createGooglePayPaymentMethod( paymentData = paymentData, paymentMethodType = TEST_PAYMENT_METHOD_TYPE, - checkoutAttemptId = null, + checkoutAttemptId = TestAnalyticsManager.CHECKOUT_ATTEMPT_ID_NOT_FETCHED, ) assertEquals(expectedPaymentMethod, paymentComponentData.paymentMethod) diff --git a/twint/src/test/java/com/adyen/checkout/twint/internal/ui/DefaultTwintDelegateTest.kt b/twint/src/test/java/com/adyen/checkout/twint/internal/ui/DefaultTwintDelegateTest.kt index 136de7c7e0..040e0d016c 100644 --- a/twint/src/test/java/com/adyen/checkout/twint/internal/ui/DefaultTwintDelegateTest.kt +++ b/twint/src/test/java/com/adyen/checkout/twint/internal/ui/DefaultTwintDelegateTest.kt @@ -91,7 +91,7 @@ internal class DefaultTwintDelegateTest( data = PaymentComponentData( paymentMethod = TwintPaymentMethod( type = TEST_PAYMENT_METHOD_TYPE, - checkoutAttemptId = null, + checkoutAttemptId = TestAnalyticsManager.CHECKOUT_ATTEMPT_ID_NOT_FETCHED, subtype = "sdk", ), order = TEST_ORDER, diff --git a/twint/src/test/java/com/adyen/checkout/twint/internal/ui/StoredTwintDelegateTest.kt b/twint/src/test/java/com/adyen/checkout/twint/internal/ui/StoredTwintDelegateTest.kt index 77f10e35fb..8b82667dbc 100644 --- a/twint/src/test/java/com/adyen/checkout/twint/internal/ui/StoredTwintDelegateTest.kt +++ b/twint/src/test/java/com/adyen/checkout/twint/internal/ui/StoredTwintDelegateTest.kt @@ -87,7 +87,7 @@ internal class StoredTwintDelegateTest { data = PaymentComponentData( paymentMethod = TwintPaymentMethod( type = TEST_PAYMENT_METHOD_TYPE, - checkoutAttemptId = null, + checkoutAttemptId = TestAnalyticsManager.CHECKOUT_ATTEMPT_ID_NOT_FETCHED, storedPaymentMethodId = TEST_PAYMENT_METHOD_ID, ), order = TEST_ORDER, From 0b9900935935c2a01765a3e8ec86dcb175b16a1c Mon Sep 17 00:00:00 2001 From: josephj Date: Fri, 11 Oct 2024 11:34:55 +0200 Subject: [PATCH 290/299] Clarify code docs for analytics level NONE COAND-980 --- .../adyen/checkout/components/core/AnalyticsConfiguration.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/AnalyticsConfiguration.kt b/components-core/src/main/java/com/adyen/checkout/components/core/AnalyticsConfiguration.kt index 42ebc4ffce..573aefdaab 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/AnalyticsConfiguration.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/AnalyticsConfiguration.kt @@ -34,7 +34,7 @@ enum class AnalyticsLevel { ALL, /** - * No analytics are sent from the library. + * Only Drop-in/Components analytics are not sent from the library. */ NONE, } From 08ea71251dc4b73df42bf25dba16f1de23e4cc89 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Fri, 11 Oct 2024 15:35:22 +0200 Subject: [PATCH 291/299] Restrict CardNumberValidator.MAXIMUM_CARD_NUMBER_LENGTH to library group COAND-985 --- checkout-core/api/checkout-core.api | 1 - .../adyen/checkout/core/ui/validation/CardNumberValidator.kt | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/checkout-core/api/checkout-core.api b/checkout-core/api/checkout-core.api index ccfdf3ba63..1d622e05f9 100644 --- a/checkout-core/api/checkout-core.api +++ b/checkout-core/api/checkout-core.api @@ -291,7 +291,6 @@ public final class com/adyen/checkout/core/ui/validation/CardNumberValidationRes public final class com/adyen/checkout/core/ui/validation/CardNumberValidator { public static final field INSTANCE Lcom/adyen/checkout/core/ui/validation/CardNumberValidator; - public static final field MAXIMUM_CARD_NUMBER_LENGTH I public final fun validateCardNumber (Ljava/lang/String;Z)Lcom/adyen/checkout/core/ui/validation/CardNumberValidationResult; } diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt index c1525b2408..4e2f098ee4 100644 --- a/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt +++ b/checkout-core/src/main/java/com/adyen/checkout/core/ui/validation/CardNumberValidator.kt @@ -8,6 +8,7 @@ package com.adyen.checkout.core.ui.validation +import androidx.annotation.RestrictTo import com.adyen.checkout.core.internal.util.StringUtil object CardNumberValidator { @@ -18,6 +19,8 @@ object CardNumberValidator { // Card Number private const val MINIMUM_CARD_NUMBER_LENGTH = 12 + + @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) const val MAXIMUM_CARD_NUMBER_LENGTH = 19 /** From 4000a3774803768a1fe65ca3560194272bc5dd53 Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Fri, 11 Oct 2024 15:36:32 +0200 Subject: [PATCH 292/299] Move expiry date autofill hint to CardView --- .../com/adyen/checkout/card/internal/ui/view/CardView.kt | 5 +++++ .../checkout/ui/core/internal/ui/view/ExpiryDateInput.kt | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt index c915c9fa1d..44c030ca53 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt @@ -10,6 +10,7 @@ package com.adyen.checkout.card.internal.ui.view import android.app.Activity import android.content.Context import android.content.ContextWrapper +import android.os.Build import android.text.Editable import android.text.InputType import android.util.AttributeSet @@ -86,6 +87,10 @@ class CardView @JvmOverloads constructor( orientation = VERTICAL val padding = resources.getDimension(UICoreR.dimen.standard_margin).toInt() setPadding(padding, padding, padding, 0) + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + binding.editTextExpiryDate.setAutofillHints(AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE) + } } override fun onAttachedToWindow() { diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt index 169cfdf41a..cdb7d864e2 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/ExpiryDateInput.kt @@ -8,7 +8,6 @@ package com.adyen.checkout.ui.core.internal.ui.view import android.content.Context -import android.os.Build import android.text.Editable import android.util.AttributeSet import androidx.annotation.RestrictTo @@ -39,9 +38,6 @@ constructor( enforceMaxInputLength(MAX_LENGTH) // Make sure DateFormat only accepts the correct formatting. dateFormat.isLenient = false - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - setAutofillHints(AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE) - } } public override fun afterTextChanged(editable: Editable) { From 47640538afb498c936f88ddae989630eb43d3d6a Mon Sep 17 00:00:00 2001 From: Oscar Spruit Date: Fri, 11 Oct 2024 15:40:49 +0200 Subject: [PATCH 293/299] Remove unused bcmc layout file Bcmc reused the card view currently, so there is no need for this file. --- bcmc/src/main/res/layout/bcmc_view.xml | 91 -------------------------- 1 file changed, 91 deletions(-) delete mode 100644 bcmc/src/main/res/layout/bcmc_view.xml diff --git a/bcmc/src/main/res/layout/bcmc_view.xml b/bcmc/src/main/res/layout/bcmc_view.xml deleted file mode 100644 index d5eced4735..0000000000 --- a/bcmc/src/main/res/layout/bcmc_view.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 985dfb278a79774dc0affe1db292e68d5eb63639 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 05:57:42 +0000 Subject: [PATCH 294/299] Update dependency com.adyen.threeds:adyen-3ds2 to v2.2.21 --- dependencies.gradle | 2 +- gradle/verification-metadata.xml | 99 ++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 84ce8b5a81..28aa3cf956 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -54,7 +54,7 @@ ext { compose_viewmodel_version = '2.8.3' // Adyen Dependencies - adyen3ds2_version = "2.2.20" + adyen3ds2_version = "2.2.21" // External Dependencies cash_app_pay_version = '2.5.0' diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index f30444fdda..868c7b76fa 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -254,6 +254,11 @@ + + + + + @@ -317,6 +322,14 @@ + + + + + + + + @@ -4317,6 +4330,14 @@ + + + + + + + + @@ -11224,6 +11245,14 @@ + + + + + + + + @@ -13372,6 +13401,14 @@ + + + + + + + + @@ -13407,6 +13444,11 @@ + + + + + @@ -13465,6 +13507,11 @@ + + + + + @@ -13521,6 +13568,14 @@ + + + + + + + + @@ -13550,6 +13605,11 @@ + + + + + @@ -13582,6 +13642,14 @@ + + + + + + + + @@ -13650,6 +13718,11 @@ + + + + + @@ -13665,6 +13738,11 @@ + + + + + @@ -13689,6 +13767,14 @@ + + + + + + + + @@ -13704,6 +13790,11 @@ + + + + + @@ -13728,6 +13819,14 @@ + + + + + + + + From c2bdb8bfc28baa58e362b0d750cba2b6c730527f Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Fri, 11 Oct 2024 15:59:22 +0200 Subject: [PATCH 295/299] Fix layout alignment issue when security code is hidden in meal vouchers COAND-683 --- .../checkout/mealvoucherfr/internal/ui/view/MealVoucherFRView.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/view/MealVoucherFRView.kt b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/view/MealVoucherFRView.kt index 71e7e7a15f..42fe108adf 100644 --- a/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/view/MealVoucherFRView.kt +++ b/meal-voucher-fr/src/main/java/com/adyen/checkout/mealvoucherfr/internal/ui/view/MealVoucherFRView.kt @@ -147,6 +147,7 @@ internal class MealVoucherFRView @JvmOverloads constructor( } } else { binding.textInputLayoutMealVoucherFRSecurityCode.isVisible = false + (binding.textInputLayoutMealVoucherFRExpiryDate.layoutParams as LayoutParams).marginEnd = 0 } } From 6da761b71188c039648d4141fb9192b82c5d2fbe Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Thu, 10 Oct 2024 13:03:18 +0200 Subject: [PATCH 296/299] Prepare release 5.7.0 --- README.md | 10 +++--- RELEASE_NOTES.md | 77 +++++++++++++++++++++++++++------------- dependencies.gradle | 2 +- example-app/build.gradle | 4 +-- 4 files changed, 60 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 07999eecbe..21a5822245 100644 --- a/README.md +++ b/README.md @@ -31,23 +31,23 @@ Import the corresponding module in your `build.gradle` file. For Drop-in: ```groovy -implementation "com.adyen.checkout:drop-in-compose:5.6.0" +implementation "com.adyen.checkout:drop-in-compose:5.7.0" ``` For the Credit Card component: ```groovy -implementation "com.adyen.checkout:card:5.6.0" -implementation "com.adyen.checkout:components-compose:5.6.0" +implementation "com.adyen.checkout:card:5.7.0" +implementation "com.adyen.checkout:components-compose:5.7.0" ``` ### Without Jetpack Compose For Drop-in: ```groovy -implementation "com.adyen.checkout:drop-in:5.6.0" +implementation "com.adyen.checkout:drop-in:5.7.0" ``` For the Credit Card component: ```groovy -implementation "com.adyen.checkout:card:5.6.0" +implementation "com.adyen.checkout:card:5.7.0" ``` The library is available on [Maven Central][mavenRepo]. diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 1ca15f9ed8..57c7e04c1f 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -9,41 +9,68 @@ [//]: # ( - Configurations public constructor are deprecated, please use each Configuration's builder to make a Configuration object) ## New -- Added support for 6 more locales: Catalan (ca-ES), Icelandic (is-IS), Bulgarian (bg-BG), - Estonian (et-EE), Latvian (lv-LV) and Lithuanian (lt-lT). -- French meal vouchers are now available with the following payment method types. See the documentation [here](/docs/payment-methods/FRENCH_MEAL_VOUCHER.md). - - Up. Payment method type: **mealVoucher_FR_groupeup**. - - Natixis. Payment method type: **mealVoucher_FR_natixis**. - - Sodexo. Payment method type: **mealVoucher_FR_sodexo**. -- For API only merchants, `CardNumberValidator`, `CardExpiryDateValidator` and `CardSecurityCodeValidator` classes are added to make validation functionality for the corresponding fields available to public. -- For Twint, storing payment details and paying with them is now supported. See the documentation [here](/docs/payment-methods/TWINT.md). -- You can now use [Adyen Test Cards Android](https://github.com/Adyen/adyen-testcards-android) to prefill test payment method information, making testing your integration easier. - +- You can now use [Adyen Test Cards Android](https://github.com/Adyen/adyen-testcards-android) to prefill test payment method information, to test your integration more quickly. +- For Twint: + - You can now [store payment details](/docs/payment-methods/TWINT.md#optional-configurations) and [pay with stored payment details](/docs/payment-methods/TWINT.md#stored-twint-payments). > [!WARNING] -> For the Twint component integration, you are now required to use `TwintComponent` instead of `InstantPaymentComponent`. See the [documentation](/docs/payment-methods/TWINT.md) to find out the details. +> For Twint Components integrations, you must now use [`TwintComponent`](/docs/payment-methods/TWINT.md) instead of `InstantPaymentComponent`. +- For French meal vouchers, the following payment method types are now available: + - Up. Payment method type: **mealVoucher_FR_groupeup**. + - Natixis. Payment method type: **mealVoucher_FR_natixis**. + - Sodexo. Payment method type: **mealVoucher_FR_sodexo**. + - Learn to [configure French meal vouchers](/docs/payment-methods/FRENCH_MEAL_VOUCHER.md). +- For [API-only integrations with encrypted card details](https://docs.adyen.com/payment-methods/cards/custom-card-integration/?tab=candroid_3), you can now use the following classes to validate corresponding fields: + + | Class | Description | + |-----------------------------|------------------------------------| + | `CardNumberValidator` | Validates the card number field. | + | `CardExpiryDateValidator` | Validates the expiry date field. | + | `CardSecurityCodeValidator` | Validates the security code field. | + +- Support for the following locales: + + | Locale | Values | + |------------|-----------| + | Catalan | **ca-ES** | + | Icelandic | **is-IS** | + | Bulgarian | **bg-BG** | + | Estonian | **et-EE** | + | Latvian | **lv-LV** | + | Lithuanian | **lt-lT** | + +## Fixed +- When parsing JSON objects with explicit null values, JSON deserialization no longer returns the coerced `null` string. ## Improved -- For UPI Intent an error message will be shown when "Continue" button is pressed without selecting - any UPI option. -- For drop-in, improved accessibility of back/close button in the navigation bar. +- For UPI Intent, if the shopper selects the **Continue** button without selecting an UPI option, an error message now shows. +- For Drop-in, in the navigation bar, the accessibility of the **Back/Close** button is improved. ## Changed -- For drop-in, headers of preselected stored payment screen and payment methods list screen are - updated. +- For Drop-in, headers of preselected stored payment screen and payment methods list screen are updated. +- When you set `analyticsConfiguration = AnalyticsConfiguration(AnalyticsLevel.NONE)`, only [Drop-in/Components analytics](https://docs.adyen.com/online-payments/analytics-and-data-tracking#data-we-are-collecting) are not sent to Adyen. - Dependency versions: | Name | Version | |--------------------------------------------------------------------------------------------------------|-------------------------------| - | [Adyen 3DS2](https://github.com/Adyen/adyen-3ds2-android/releases/tag/2.2.20) | **2.2.20** | + | [Adyen 3DS2](https://github.com/Adyen/adyen-3ds2-android/releases/tag/2.2.21) | **2.2.21** | + | [Cash App Pay](https://github.com/cashapp/cash-app-pay-android-sdk/releases/tag/v2.5.0) | **2.5.0** | + | [Android Gradle Plugin](https://developer.android.com/build/releases/past-releases/agp-8-5-0-release-notes#android-gradle-plugin-8.5.1) | **8.5.1** | | [AndroidX Fragment](https://developer.android.com/jetpack/androidx/releases/fragment#1.8.3) | **1.8.3** | | [AndroidX Activity](https://developer.android.com/jetpack/androidx/releases/activity#1.9.2) | **1.9.2** | | [AndroidX Compose Activity](https://developer.android.com/jetpack/androidx/releases/activity#1.9.2) | **1.9.2** | - -## Fixed -- JSON deserialization no longer returns the coerced `"null"` string when parsing JSON objects with explicit null values. + | [AndroidX Compose BOM](https://developer.android.com/develop/ui/compose/bom/bom-mapping) | **2024.06.00** | + | [AndroidX Lifecycle](https://developer.android.com/jetpack/androidx/releases/lifecycle#2.8.3) | **2.8.3** | + | [AndroidX Lifecycle ViewModel Compose](https://developer.android.com/jetpack/androidx/releases/lifecycle#2.8.3) | **2.8.3** | + | [AndroidX AppCompat](https://developer.android.com/jetpack/androidx/releases/appcompat#1.7.0) | **1.7.0** | ## Deprecated -- The style for payment method list headers has been changed. - | Previous | Now | - |------------------------------------------|------------------------------------------| - | AdyenCheckout.TextAppearance.HeaderTitle | AdyenCheckout.TextAppearance.HeaderLabel | -- `com.adyen.checkout.instant.ActionHandlingMethod` is moved to `com.adyen.checkout.components.core.ActionHandlingMethod` +- The style for payment method list headers. Use the new style instead. + + | Previous | Now | + |--------------------------------------------|--------------------------------------------| + | `AdyenCheckout.TextAppearance.HeaderTitle` | `AdyenCheckout.TextAppearance.HeaderLabel` | + +- The `com.adyen.checkout.instant.ActionHandlingMethod` method. Use the new method instead. + + | Previous | Now | + |---------------------------------------------------|-----------------------------------------------------------| + | `com.adyen.checkout.instant.ActionHandlingMethod` | `com.adyen.checkout.components.core.ActionHandlingMethod` | diff --git a/dependencies.gradle b/dependencies.gradle index 28aa3cf956..dd9a69ff41 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -16,7 +16,7 @@ ext { // just for example app, don't need to increment version_code = 1 // The version_name format is "major.minor.patch(-(alpha|beta|rc)[0-9]{2}){0,1}" (e.g. 3.0.0, 3.1.1-alpha04 or 3.1.4-rc01 etc). - version_name = "5.6.0" + version_name = "5.7.0" // Build Script android_gradle_plugin_version = '8.5.1' diff --git a/example-app/build.gradle b/example-app/build.gradle index adb589d867..2a4897b808 100644 --- a/example-app/build.gradle +++ b/example-app/build.gradle @@ -71,8 +71,8 @@ dependencies { // Checkout implementation project(':drop-in') implementation project(':components-compose') -// implementation "com.adyen.checkout:drop-in:5.6.0" -// implementation "com.adyen.checkout:components-compose:5.6.0" +// implementation "com.adyen.checkout:drop-in:5.7.0" +// implementation "com.adyen.checkout:components-compose:5.7.0" // Dependencies implementation libraries.kotlinCoroutines From 4aa153156b2bbc3fd188ecf27eb5805e56664c05 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Fri, 11 Oct 2024 14:29:15 +0200 Subject: [PATCH 297/299] Change the order of types of changes --- RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 57c7e04c1f..68c09fc4c1 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,5 @@ [//]: # (This file will be used for the release notes on GitHub when publishing.) -[//]: # (Types of changes: `Breaking changes` `New` `Added` `Improved` `Changed` `Deprecated` `Removed` `Fixed`) +[//]: # (Types of changes: `Breaking changes` `New` `Fixed` `Improved` `Changed` `Deprecated` `Removed`) [//]: # (Example:) [//]: # (## New) [//]: # ( - New payment method) From 7efc97ecc3dba498f3ec5721a9574ed50106dd65 Mon Sep 17 00:00:00 2001 From: Joseph Jreij Date: Mon, 14 Oct 2024 11:41:51 +0200 Subject: [PATCH 298/299] Update drop-in preview screenshots in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21a5822245..b6df76b2bc 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ This repository is available under the [MIT license](LICENSE). [shield.license.image]: https://img.shields.io/github/license/Adyen/adyen-android [shield.license.link]: LICENSE [docs.android]: https://docs.adyen.com/online-payments/build-your-integration/?platform=Android -[header.preview]: https://github.com/Adyen/adyen-android/assets/9079915/b664bce1-ef8e-49be-8cb6-60f291d8061e +[header.preview]: https://github.com/user-attachments/assets/0393e58d-172c-45fb-9e49-3a720fe53c89 [adyen.testAccount]: https://www.adyen.com/signup [docs.apiKey]: https://docs.adyen.com/development-resources/how-to-get-the-api-key [docs.clientKey]: https://docs.adyen.com/development-resources/client-side-authentication#get-your-client-key From 438dffba366929565d182436784c31fc480fd944 Mon Sep 17 00:00:00 2001 From: josephj Date: Mon, 14 Oct 2024 11:45:06 +0200 Subject: [PATCH 299/299] Add link in AnalyticsLevel to docs section explaining the data we are collecting COAND-980 --- .../adyen/checkout/components/core/AnalyticsConfiguration.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/AnalyticsConfiguration.kt b/components-core/src/main/java/com/adyen/checkout/components/core/AnalyticsConfiguration.kt index 573aefdaab..053fefc104 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/AnalyticsConfiguration.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/AnalyticsConfiguration.kt @@ -25,7 +25,8 @@ data class AnalyticsConfiguration( ) : Parcelable /** - * The different configurable levels of analytics. + * The different configurable levels of analytics. Learn more about the + * [data we are collecting](https://docs.adyen.com/online-payments/analytics-and-data-tracking/#data-we-are-collecting). */ enum class AnalyticsLevel { /**