From 792679c84cf538570609c30547edc223c9d26b8a Mon Sep 17 00:00:00 2001 From: Charlie Cruzan Date: Tue, 2 May 2023 17:44:13 -0400 Subject: [PATCH 1/8] upgrade android to 20.24 --- android/gradle.properties | 2 +- .../AuBECSDebitFormView.kt | 4 +- .../com/reactnativestripesdk/CardFieldView.kt | 4 +- .../com/reactnativestripesdk/CardFormView.kt | 4 +- .../res/drawable/googlepay_button_content.xml | 48 +++++++++++++++++++ 5 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 android/src/main/res/drawable/googlepay_button_content.xml diff --git a/android/gradle.properties b/android/gradle.properties index 5995e7e18..64a420d9c 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,2 +1,2 @@ StripeSdk_kotlinVersion=1.8.0 -StripeSdk_stripeVersion=20.23.+ +StripeSdk_stripeVersion=20.24.+ diff --git a/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt b/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt index f158db3c4..c95177847 100644 --- a/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt +++ b/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt @@ -12,7 +12,7 @@ import com.google.android.material.shape.MaterialShapeDrawable import com.google.android.material.shape.ShapeAppearanceModel import com.reactnativestripesdk.utils.getIntOrNull import com.reactnativestripesdk.utils.getValOr -import com.stripe.android.databinding.BecsDebitWidgetBinding +import com.stripe.android.databinding.StripeBecsDebitWidgetBinding import com.stripe.android.model.PaymentMethodCreateParams import com.stripe.android.view.BecsDebitWidget import com.stripe.android.view.StripeEditText @@ -35,7 +35,7 @@ class AuBECSDebitFormView(private val context: ThemedReactContext) : FrameLayout if (!this::becsDebitWidget.isInitialized || value == null) { return } - val binding = BecsDebitWidgetBinding.bind(becsDebitWidget) + val binding = StripeBecsDebitWidgetBinding.bind(becsDebitWidget) val textColor = getValOr(value, "textColor", null) val textErrorColor = getValOr(value, "textErrorColor", null) val placeholderColor = getValOr(value, "placeholderColor", null) diff --git a/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt b/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt index 224dfdb02..53b7c2063 100644 --- a/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt +++ b/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt @@ -22,7 +22,7 @@ import com.reactnativestripesdk.utils.* import com.reactnativestripesdk.utils.mapCardBrand import com.stripe.android.core.model.CountryCode import com.stripe.android.core.model.CountryUtils -import com.stripe.android.databinding.CardInputWidgetBinding +import com.stripe.android.databinding.StripeCardInputWidgetBinding import com.stripe.android.model.Address import com.stripe.android.model.PaymentMethodCreateParams import com.stripe.android.view.CardInputListener @@ -32,7 +32,7 @@ import com.stripe.android.view.StripeEditText class CardFieldView(context: ThemedReactContext) : FrameLayout(context) { private var mCardWidget: CardInputWidget = CardInputWidget(context) - private val cardInputWidgetBinding = CardInputWidgetBinding.bind(mCardWidget) + private val cardInputWidgetBinding = StripeCardInputWidgetBinding.bind(mCardWidget) val cardDetails: MutableMap = mutableMapOf("brand" to "", "last4" to "", "expiryMonth" to null, "expiryYear" to null, "postalCode" to "", "validNumber" to "Unknown", "validCVC" to "Unknown", "validExpiryDate" to "Unknown") var cardParams: PaymentMethodCreateParams.Card? = null var cardAddress: Address? = null diff --git a/android/src/main/java/com/reactnativestripesdk/CardFormView.kt b/android/src/main/java/com/reactnativestripesdk/CardFormView.kt index a20113f36..6fc3cd4e1 100644 --- a/android/src/main/java/com/reactnativestripesdk/CardFormView.kt +++ b/android/src/main/java/com/reactnativestripesdk/CardFormView.kt @@ -20,7 +20,7 @@ import com.google.android.material.shape.ShapeAppearanceModel import com.reactnativestripesdk.utils.* import com.reactnativestripesdk.utils.mapCardBrand import com.stripe.android.core.model.CountryCode -import com.stripe.android.databinding.CardMultilineWidgetBinding +import com.stripe.android.databinding.StripeCardMultilineWidgetBinding import com.stripe.android.databinding.StripeCardFormViewBinding import com.stripe.android.model.Address import com.stripe.android.model.PaymentMethodCreateParams @@ -35,7 +35,7 @@ class CardFormView(context: ThemedReactContext) : FrameLayout(context) { var cardParams: PaymentMethodCreateParams.Card? = null var cardAddress: Address? = null private val cardFormViewBinding = StripeCardFormViewBinding.bind(cardForm) - private val multilineWidgetBinding = CardMultilineWidgetBinding.bind(cardFormViewBinding.cardMultilineWidget) + private val multilineWidgetBinding = StripeCardMultilineWidgetBinding.bind(cardFormViewBinding.cardMultilineWidget) init { cardFormViewBinding.cardMultilineWidgetContainer.isFocusable = true diff --git a/android/src/main/res/drawable/googlepay_button_content.xml b/android/src/main/res/drawable/googlepay_button_content.xml new file mode 100644 index 000000000..b2cdb1d52 --- /dev/null +++ b/android/src/main/res/drawable/googlepay_button_content.xml @@ -0,0 +1,48 @@ + + + + + + + + + From 13e5f35f0c524f7621132f8a01f2d67bd3b5fd1e Mon Sep 17 00:00:00 2001 From: Charlie Cruzan Date: Tue, 2 May 2023 17:44:30 -0400 Subject: [PATCH 2/8] upgrade ios to 23.7 --- example/ios/Podfile.lock | 102 ++++++++++++++++++------------------ stripe-react-native.podspec | 2 +- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index b26ea4dd3..755c12c62 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -368,50 +368,50 @@ PODS: - React-Core - React-RCTImage - SocketRocket (0.6.0) - - Stripe (23.6.0): - - StripeApplePay (= 23.6.0) - - StripeCore (= 23.6.0) - - StripePayments (= 23.6.0) - - StripePaymentsUI (= 23.6.0) - - StripeUICore (= 23.6.0) - - stripe-react-native (0.26.0): + - Stripe (23.7.0): + - StripeApplePay (= 23.7.0) + - StripeCore (= 23.7.0) + - StripePayments (= 23.7.0) + - StripePaymentsUI (= 23.7.0) + - StripeUICore (= 23.7.0) + - stripe-react-native (0.27.0): - React-Core - - Stripe (= 23.6.0) - - StripeApplePay (= 23.6.0) - - StripeFinancialConnections (= 23.6.0) - - StripePayments (= 23.6.0) - - StripePaymentSheet (= 23.6.0) - - StripePaymentsUI (= 23.6.0) - - stripe-react-native/Tests (0.26.0): + - Stripe (~> 23.7.0) + - StripeApplePay (~> 23.7.0) + - StripeFinancialConnections (~> 23.7.0) + - StripePayments (~> 23.7.0) + - StripePaymentSheet (~> 23.7.0) + - StripePaymentsUI (~> 23.7.0) + - stripe-react-native/Tests (0.27.0): - React-Core - - Stripe (= 23.6.0) - - StripeApplePay (= 23.6.0) - - StripeFinancialConnections (= 23.6.0) - - StripePayments (= 23.6.0) - - StripePaymentSheet (= 23.6.0) - - StripePaymentsUI (= 23.6.0) - - StripeApplePay (23.6.0): - - StripeCore (= 23.6.0) - - StripeCore (23.6.0) - - StripeFinancialConnections (23.6.0): - - StripeCore (= 23.6.0) - - StripeUICore (= 23.6.0) - - StripePayments (23.6.0): - - StripeCore (= 23.6.0) - - StripePayments/Stripe3DS2 (= 23.6.0) - - StripePayments/Stripe3DS2 (23.6.0): - - StripeCore (= 23.6.0) - - StripePaymentSheet (23.6.0): - - StripeApplePay (= 23.6.0) - - StripeCore (= 23.6.0) - - StripePayments (= 23.6.0) - - StripePaymentsUI (= 23.6.0) - - StripePaymentsUI (23.6.0): - - StripeCore (= 23.6.0) - - StripePayments (= 23.6.0) - - StripeUICore (= 23.6.0) - - StripeUICore (23.6.0): - - StripeCore (= 23.6.0) + - Stripe (~> 23.7.0) + - StripeApplePay (~> 23.7.0) + - StripeFinancialConnections (~> 23.7.0) + - StripePayments (~> 23.7.0) + - StripePaymentSheet (~> 23.7.0) + - StripePaymentsUI (~> 23.7.0) + - StripeApplePay (23.7.0): + - StripeCore (= 23.7.0) + - StripeCore (23.7.0) + - StripeFinancialConnections (23.7.0): + - StripeCore (= 23.7.0) + - StripeUICore (= 23.7.0) + - StripePayments (23.7.0): + - StripeCore (= 23.7.0) + - StripePayments/Stripe3DS2 (= 23.7.0) + - StripePayments/Stripe3DS2 (23.7.0): + - StripeCore (= 23.7.0) + - StripePaymentSheet (23.7.0): + - StripeApplePay (= 23.7.0) + - StripeCore (= 23.7.0) + - StripePayments (= 23.7.0) + - StripePaymentsUI (= 23.7.0) + - StripePaymentsUI (23.7.0): + - StripeCore (= 23.7.0) + - StripePayments (= 23.7.0) + - StripeUICore (= 23.7.0) + - StripeUICore (23.7.0): + - StripeCore (= 23.7.0) - Yoga (1.14.0) - YogaKit (1.18.1): - Yoga (~> 1.14) @@ -636,15 +636,15 @@ SPEC CHECKSUMS: RNCPicker: 0bf8ef8f7800524f32d2bb2a8bcadd53eda0ecd1 RNScreens: 34cc502acf1b916c582c60003dc3089fa01dc66d SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 - Stripe: 097f76ce332ff7dcb8a29ec2a8379bb4f34aa14d - stripe-react-native: 331225716a96961089b71ca105847e11f81fc99f - StripeApplePay: 484761d4760ddb8af8c1510b8735cd9aee94515f - StripeCore: 0e83ad26d508e5a8e9eb04d6ddd3cbb08a3f7816 - StripeFinancialConnections: eb303783458a7e5bd4380cbbf0a6cf44246473f4 - StripePayments: cdd5222052d541f4daf1d84515f0b9cd18720534 - StripePaymentSheet: 835aabcac7946d6b6b341055d021428b96894b70 - StripePaymentsUI: 835b9422f86ceb2ca02b4146db9d3f7bf1acb0d9 - StripeUICore: 81bac0f54df659ab7c5dd4f5a57719a5fecdcdc9 + Stripe: 1412a8389885cbeebd752de574419122d52957a9 + stripe-react-native: edb446e3f0e67ef6ad845d2e0d189e431e10c2df + StripeApplePay: b05917d11c0846ca3e2f67e59bf027efd1fe2195 + StripeCore: bec0c90f6e153abeba70f015be25e17fada10084 + StripeFinancialConnections: 2ba1ad658b7ccf7b5f5685f32ce9fef5ae3fe197 + StripePayments: faafc7e868e224aba8ff9d9c3833c17dde909f42 + StripePaymentSheet: 4ae8d6337c2df98396761fd34b5cb20ebd564b45 + StripePaymentsUI: bed5acf82eaa9375553555087bfedc082f43c135 + StripeUICore: f940d7e6908ba241380f25bf7062919890dd81e2 Yoga: 0b84a956f7393ef1f37f3bb213c516184e4a689d YogaKit: f782866e155069a2cca2517aafea43200b01fd5a diff --git a/stripe-react-native.podspec b/stripe-react-native.podspec index a0ed1d9b5..c3f92477e 100644 --- a/stripe-react-native.podspec +++ b/stripe-react-native.podspec @@ -1,7 +1,7 @@ require 'json' package = JSON.parse(File.read(File.join(__dir__, 'package.json'))) -stripe_version = '23.6.0' +stripe_version = '~> 23.7.0' Pod::Spec.new do |s| s.name = 'stripe-react-native' From 12a96723e630c9e604a5acca2d14a4dcdb74b861 Mon Sep 17 00:00:00 2001 From: Charlie Cruzan Date: Tue, 2 May 2023 17:48:40 -0400 Subject: [PATCH 3/8] [skip actions] changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ff01fe47..1da215c10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +> Note: [Xcode 13 is no longer supported by Apple](https://developer.apple.com/news/upcoming-requirements/). Please upgrade to Xcode 14.1 or later. + ## Fixes - Fixed the type of `created` on `Token.Result` on Android (was a number, should be a string). [#1369](https://github.com/stripe/stripe-react-native/pull/1369) From 9a4758690f363a744b1e1fa6f1d8aa0812cbe62a Mon Sep 17 00:00:00 2001 From: Charlie Cruzan Date: Wed, 3 May 2023 09:28:42 -0400 Subject: [PATCH 4/8] comments --- android/gradle.properties | 1 + stripe-react-native.podspec | 1 + 2 files changed, 2 insertions(+) diff --git a/android/gradle.properties b/android/gradle.properties index 64a420d9c..e02fff7d2 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,2 +1,3 @@ StripeSdk_kotlinVersion=1.8.0 +# Keep StripeSdk_stripeVersion in sync with https://github.com/stripe/stripe-identity-react-native/blob/main/android/gradle.properties StripeSdk_stripeVersion=20.24.+ diff --git a/stripe-react-native.podspec b/stripe-react-native.podspec index c3f92477e..fe958e233 100644 --- a/stripe-react-native.podspec +++ b/stripe-react-native.podspec @@ -1,6 +1,7 @@ require 'json' package = JSON.parse(File.read(File.join(__dir__, 'package.json'))) +# Keep stripe_version in sync with https://github.com/stripe/stripe-identity-react-native/blob/main/stripe-identity-react-native.podspec stripe_version = '~> 23.7.0' Pod::Spec.new do |s| From cd16cf246005a7c1ce0f503d66881d895f31f48f Mon Sep 17 00:00:00 2001 From: Charlie Cruzan Date: Wed, 3 May 2023 12:19:12 -0400 Subject: [PATCH 5/8] Revert "upgrade android to 20.24" This reverts commit 792679c84cf538570609c30547edc223c9d26b8a. --- android/gradle.properties | 2 +- .../AuBECSDebitFormView.kt | 4 +- .../com/reactnativestripesdk/CardFieldView.kt | 4 +- .../com/reactnativestripesdk/CardFormView.kt | 4 +- .../res/drawable/googlepay_button_content.xml | 48 ------------------- 5 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 android/src/main/res/drawable/googlepay_button_content.xml diff --git a/android/gradle.properties b/android/gradle.properties index e02fff7d2..087c78559 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,3 +1,3 @@ StripeSdk_kotlinVersion=1.8.0 # Keep StripeSdk_stripeVersion in sync with https://github.com/stripe/stripe-identity-react-native/blob/main/android/gradle.properties -StripeSdk_stripeVersion=20.24.+ +StripeSdk_stripeVersion=20.24.0 diff --git a/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt b/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt index c95177847..f158db3c4 100644 --- a/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt +++ b/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt @@ -12,7 +12,7 @@ import com.google.android.material.shape.MaterialShapeDrawable import com.google.android.material.shape.ShapeAppearanceModel import com.reactnativestripesdk.utils.getIntOrNull import com.reactnativestripesdk.utils.getValOr -import com.stripe.android.databinding.StripeBecsDebitWidgetBinding +import com.stripe.android.databinding.BecsDebitWidgetBinding import com.stripe.android.model.PaymentMethodCreateParams import com.stripe.android.view.BecsDebitWidget import com.stripe.android.view.StripeEditText @@ -35,7 +35,7 @@ class AuBECSDebitFormView(private val context: ThemedReactContext) : FrameLayout if (!this::becsDebitWidget.isInitialized || value == null) { return } - val binding = StripeBecsDebitWidgetBinding.bind(becsDebitWidget) + val binding = BecsDebitWidgetBinding.bind(becsDebitWidget) val textColor = getValOr(value, "textColor", null) val textErrorColor = getValOr(value, "textErrorColor", null) val placeholderColor = getValOr(value, "placeholderColor", null) diff --git a/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt b/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt index 53b7c2063..224dfdb02 100644 --- a/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt +++ b/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt @@ -22,7 +22,7 @@ import com.reactnativestripesdk.utils.* import com.reactnativestripesdk.utils.mapCardBrand import com.stripe.android.core.model.CountryCode import com.stripe.android.core.model.CountryUtils -import com.stripe.android.databinding.StripeCardInputWidgetBinding +import com.stripe.android.databinding.CardInputWidgetBinding import com.stripe.android.model.Address import com.stripe.android.model.PaymentMethodCreateParams import com.stripe.android.view.CardInputListener @@ -32,7 +32,7 @@ import com.stripe.android.view.StripeEditText class CardFieldView(context: ThemedReactContext) : FrameLayout(context) { private var mCardWidget: CardInputWidget = CardInputWidget(context) - private val cardInputWidgetBinding = StripeCardInputWidgetBinding.bind(mCardWidget) + private val cardInputWidgetBinding = CardInputWidgetBinding.bind(mCardWidget) val cardDetails: MutableMap = mutableMapOf("brand" to "", "last4" to "", "expiryMonth" to null, "expiryYear" to null, "postalCode" to "", "validNumber" to "Unknown", "validCVC" to "Unknown", "validExpiryDate" to "Unknown") var cardParams: PaymentMethodCreateParams.Card? = null var cardAddress: Address? = null diff --git a/android/src/main/java/com/reactnativestripesdk/CardFormView.kt b/android/src/main/java/com/reactnativestripesdk/CardFormView.kt index 6fc3cd4e1..a20113f36 100644 --- a/android/src/main/java/com/reactnativestripesdk/CardFormView.kt +++ b/android/src/main/java/com/reactnativestripesdk/CardFormView.kt @@ -20,7 +20,7 @@ import com.google.android.material.shape.ShapeAppearanceModel import com.reactnativestripesdk.utils.* import com.reactnativestripesdk.utils.mapCardBrand import com.stripe.android.core.model.CountryCode -import com.stripe.android.databinding.StripeCardMultilineWidgetBinding +import com.stripe.android.databinding.CardMultilineWidgetBinding import com.stripe.android.databinding.StripeCardFormViewBinding import com.stripe.android.model.Address import com.stripe.android.model.PaymentMethodCreateParams @@ -35,7 +35,7 @@ class CardFormView(context: ThemedReactContext) : FrameLayout(context) { var cardParams: PaymentMethodCreateParams.Card? = null var cardAddress: Address? = null private val cardFormViewBinding = StripeCardFormViewBinding.bind(cardForm) - private val multilineWidgetBinding = StripeCardMultilineWidgetBinding.bind(cardFormViewBinding.cardMultilineWidget) + private val multilineWidgetBinding = CardMultilineWidgetBinding.bind(cardFormViewBinding.cardMultilineWidget) init { cardFormViewBinding.cardMultilineWidgetContainer.isFocusable = true diff --git a/android/src/main/res/drawable/googlepay_button_content.xml b/android/src/main/res/drawable/googlepay_button_content.xml deleted file mode 100644 index b2cdb1d52..000000000 --- a/android/src/main/res/drawable/googlepay_button_content.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - From e5a1b378d62a20611907aec6581bf8de1bf6e422 Mon Sep 17 00:00:00 2001 From: Charlie Cruzan Date: Wed, 3 May 2023 12:57:29 -0400 Subject: [PATCH 6/8] Revert "Revert "upgrade android to 20.24"" This reverts commit cd16cf246005a7c1ce0f503d66881d895f31f48f. --- android/gradle.properties | 2 +- .../AuBECSDebitFormView.kt | 4 +- .../com/reactnativestripesdk/CardFieldView.kt | 4 +- .../com/reactnativestripesdk/CardFormView.kt | 4 +- .../res/drawable/googlepay_button_content.xml | 48 +++++++++++++++++++ 5 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 android/src/main/res/drawable/googlepay_button_content.xml diff --git a/android/gradle.properties b/android/gradle.properties index 087c78559..e02fff7d2 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,3 +1,3 @@ StripeSdk_kotlinVersion=1.8.0 # Keep StripeSdk_stripeVersion in sync with https://github.com/stripe/stripe-identity-react-native/blob/main/android/gradle.properties -StripeSdk_stripeVersion=20.24.0 +StripeSdk_stripeVersion=20.24.+ diff --git a/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt b/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt index f158db3c4..c95177847 100644 --- a/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt +++ b/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt @@ -12,7 +12,7 @@ import com.google.android.material.shape.MaterialShapeDrawable import com.google.android.material.shape.ShapeAppearanceModel import com.reactnativestripesdk.utils.getIntOrNull import com.reactnativestripesdk.utils.getValOr -import com.stripe.android.databinding.BecsDebitWidgetBinding +import com.stripe.android.databinding.StripeBecsDebitWidgetBinding import com.stripe.android.model.PaymentMethodCreateParams import com.stripe.android.view.BecsDebitWidget import com.stripe.android.view.StripeEditText @@ -35,7 +35,7 @@ class AuBECSDebitFormView(private val context: ThemedReactContext) : FrameLayout if (!this::becsDebitWidget.isInitialized || value == null) { return } - val binding = BecsDebitWidgetBinding.bind(becsDebitWidget) + val binding = StripeBecsDebitWidgetBinding.bind(becsDebitWidget) val textColor = getValOr(value, "textColor", null) val textErrorColor = getValOr(value, "textErrorColor", null) val placeholderColor = getValOr(value, "placeholderColor", null) diff --git a/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt b/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt index 224dfdb02..53b7c2063 100644 --- a/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt +++ b/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt @@ -22,7 +22,7 @@ import com.reactnativestripesdk.utils.* import com.reactnativestripesdk.utils.mapCardBrand import com.stripe.android.core.model.CountryCode import com.stripe.android.core.model.CountryUtils -import com.stripe.android.databinding.CardInputWidgetBinding +import com.stripe.android.databinding.StripeCardInputWidgetBinding import com.stripe.android.model.Address import com.stripe.android.model.PaymentMethodCreateParams import com.stripe.android.view.CardInputListener @@ -32,7 +32,7 @@ import com.stripe.android.view.StripeEditText class CardFieldView(context: ThemedReactContext) : FrameLayout(context) { private var mCardWidget: CardInputWidget = CardInputWidget(context) - private val cardInputWidgetBinding = CardInputWidgetBinding.bind(mCardWidget) + private val cardInputWidgetBinding = StripeCardInputWidgetBinding.bind(mCardWidget) val cardDetails: MutableMap = mutableMapOf("brand" to "", "last4" to "", "expiryMonth" to null, "expiryYear" to null, "postalCode" to "", "validNumber" to "Unknown", "validCVC" to "Unknown", "validExpiryDate" to "Unknown") var cardParams: PaymentMethodCreateParams.Card? = null var cardAddress: Address? = null diff --git a/android/src/main/java/com/reactnativestripesdk/CardFormView.kt b/android/src/main/java/com/reactnativestripesdk/CardFormView.kt index a20113f36..6fc3cd4e1 100644 --- a/android/src/main/java/com/reactnativestripesdk/CardFormView.kt +++ b/android/src/main/java/com/reactnativestripesdk/CardFormView.kt @@ -20,7 +20,7 @@ import com.google.android.material.shape.ShapeAppearanceModel import com.reactnativestripesdk.utils.* import com.reactnativestripesdk.utils.mapCardBrand import com.stripe.android.core.model.CountryCode -import com.stripe.android.databinding.CardMultilineWidgetBinding +import com.stripe.android.databinding.StripeCardMultilineWidgetBinding import com.stripe.android.databinding.StripeCardFormViewBinding import com.stripe.android.model.Address import com.stripe.android.model.PaymentMethodCreateParams @@ -35,7 +35,7 @@ class CardFormView(context: ThemedReactContext) : FrameLayout(context) { var cardParams: PaymentMethodCreateParams.Card? = null var cardAddress: Address? = null private val cardFormViewBinding = StripeCardFormViewBinding.bind(cardForm) - private val multilineWidgetBinding = CardMultilineWidgetBinding.bind(cardFormViewBinding.cardMultilineWidget) + private val multilineWidgetBinding = StripeCardMultilineWidgetBinding.bind(cardFormViewBinding.cardMultilineWidget) init { cardFormViewBinding.cardMultilineWidgetContainer.isFocusable = true diff --git a/android/src/main/res/drawable/googlepay_button_content.xml b/android/src/main/res/drawable/googlepay_button_content.xml new file mode 100644 index 000000000..b2cdb1d52 --- /dev/null +++ b/android/src/main/res/drawable/googlepay_button_content.xml @@ -0,0 +1,48 @@ + + + + + + + + + From 41a99ac5b50959f86341d199d8fcd7faf3cb4db0 Mon Sep 17 00:00:00 2001 From: Charlie Cruzan Date: Wed, 3 May 2023 12:57:58 -0400 Subject: [PATCH 7/8] pin 20.24.0 --- android/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/gradle.properties b/android/gradle.properties index e02fff7d2..087c78559 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,3 +1,3 @@ StripeSdk_kotlinVersion=1.8.0 # Keep StripeSdk_stripeVersion in sync with https://github.com/stripe/stripe-identity-react-native/blob/main/android/gradle.properties -StripeSdk_stripeVersion=20.24.+ +StripeSdk_stripeVersion=20.24.0 From 78e17d9e2b9d239e8a1c2c6d8f3ac1b0d5ceeb32 Mon Sep 17 00:00:00 2001 From: Charlie Cruzan Date: Wed, 3 May 2023 13:11:37 -0400 Subject: [PATCH 8/8] remove naming changes --- .../main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt | 4 ++-- .../src/main/java/com/reactnativestripesdk/CardFieldView.kt | 4 ++-- .../src/main/java/com/reactnativestripesdk/CardFormView.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt b/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt index c95177847..f158db3c4 100644 --- a/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt +++ b/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt @@ -12,7 +12,7 @@ import com.google.android.material.shape.MaterialShapeDrawable import com.google.android.material.shape.ShapeAppearanceModel import com.reactnativestripesdk.utils.getIntOrNull import com.reactnativestripesdk.utils.getValOr -import com.stripe.android.databinding.StripeBecsDebitWidgetBinding +import com.stripe.android.databinding.BecsDebitWidgetBinding import com.stripe.android.model.PaymentMethodCreateParams import com.stripe.android.view.BecsDebitWidget import com.stripe.android.view.StripeEditText @@ -35,7 +35,7 @@ class AuBECSDebitFormView(private val context: ThemedReactContext) : FrameLayout if (!this::becsDebitWidget.isInitialized || value == null) { return } - val binding = StripeBecsDebitWidgetBinding.bind(becsDebitWidget) + val binding = BecsDebitWidgetBinding.bind(becsDebitWidget) val textColor = getValOr(value, "textColor", null) val textErrorColor = getValOr(value, "textErrorColor", null) val placeholderColor = getValOr(value, "placeholderColor", null) diff --git a/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt b/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt index 53b7c2063..224dfdb02 100644 --- a/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt +++ b/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt @@ -22,7 +22,7 @@ import com.reactnativestripesdk.utils.* import com.reactnativestripesdk.utils.mapCardBrand import com.stripe.android.core.model.CountryCode import com.stripe.android.core.model.CountryUtils -import com.stripe.android.databinding.StripeCardInputWidgetBinding +import com.stripe.android.databinding.CardInputWidgetBinding import com.stripe.android.model.Address import com.stripe.android.model.PaymentMethodCreateParams import com.stripe.android.view.CardInputListener @@ -32,7 +32,7 @@ import com.stripe.android.view.StripeEditText class CardFieldView(context: ThemedReactContext) : FrameLayout(context) { private var mCardWidget: CardInputWidget = CardInputWidget(context) - private val cardInputWidgetBinding = StripeCardInputWidgetBinding.bind(mCardWidget) + private val cardInputWidgetBinding = CardInputWidgetBinding.bind(mCardWidget) val cardDetails: MutableMap = mutableMapOf("brand" to "", "last4" to "", "expiryMonth" to null, "expiryYear" to null, "postalCode" to "", "validNumber" to "Unknown", "validCVC" to "Unknown", "validExpiryDate" to "Unknown") var cardParams: PaymentMethodCreateParams.Card? = null var cardAddress: Address? = null diff --git a/android/src/main/java/com/reactnativestripesdk/CardFormView.kt b/android/src/main/java/com/reactnativestripesdk/CardFormView.kt index 6fc3cd4e1..a20113f36 100644 --- a/android/src/main/java/com/reactnativestripesdk/CardFormView.kt +++ b/android/src/main/java/com/reactnativestripesdk/CardFormView.kt @@ -20,7 +20,7 @@ import com.google.android.material.shape.ShapeAppearanceModel import com.reactnativestripesdk.utils.* import com.reactnativestripesdk.utils.mapCardBrand import com.stripe.android.core.model.CountryCode -import com.stripe.android.databinding.StripeCardMultilineWidgetBinding +import com.stripe.android.databinding.CardMultilineWidgetBinding import com.stripe.android.databinding.StripeCardFormViewBinding import com.stripe.android.model.Address import com.stripe.android.model.PaymentMethodCreateParams @@ -35,7 +35,7 @@ class CardFormView(context: ThemedReactContext) : FrameLayout(context) { var cardParams: PaymentMethodCreateParams.Card? = null var cardAddress: Address? = null private val cardFormViewBinding = StripeCardFormViewBinding.bind(cardForm) - private val multilineWidgetBinding = StripeCardMultilineWidgetBinding.bind(cardFormViewBinding.cardMultilineWidget) + private val multilineWidgetBinding = CardMultilineWidgetBinding.bind(cardFormViewBinding.cardMultilineWidget) init { cardFormViewBinding.cardMultilineWidgetContainer.isFocusable = true