Sync (#1491)

* Sync Android with v0.35

* Sync iOS to v0.35

* chore: upgrade to latest flutter version

* fix: sync with stripe 0.35 sdk

* fix: add revolut pay screen

* revert stripe checkout fix

* fix: several bugfixes

---------

Co-authored-by: Jonas Bark <[email protected]>
Co-authored-by: Remon <[email protected]>

Author: remonh87

example/assets/revolut.png

@@ -0,0 +1,90 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_stripe/flutter_stripe.dart';
+import 'package:http/http.dart' as http;
+import 'package:stripe_example/widgets/example_scaffold.dart';
+import 'package:stripe_example/widgets/loading_button.dart';
+
+import '../../config.dart';
+
+class RevolutPayScreen extends StatelessWidget {
+  const RevolutPayScreen({Key? key}) : super(key: key);
+
+  Future<Map<String, dynamic>> _createPaymentIntent() async {
+    final url = Uri.parse('$kApiUrl/create-payment-intent');
+    final response = await http.post(
+      url,
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: json.encode({
+        'currency': 'eur',
+        'payment_method_types': ['revolut_pay'],
+        'amount': 1099
+      }),
+    );
+
+    return json.decode(response.body);
+  }
+
+  Future<void> _pay(BuildContext context) async {
+    // Precondition:
+    //Make sure to have set a custom URI scheme in your app and add it to Stripe SDK
+    // see file main.dart in this example app.
+    // 1. on the backend create a payment intent for payment method and save the
+    // client secret.
+    final result = await _createPaymentIntent();
+    print('blaat $result');
+    final clientSecret = await result['clientSecret'];
+
+    // 2. use the client secret to confirm the payment and handle the result.
+    try {
+      await Stripe.instance.confirmPayment(
+        paymentIntentClientSecret: clientSecret,
+        data: PaymentMethodParams.revolutPay(
+          paymentMethodData: PaymentMethodData(),
+        ),
+      );
+
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text('Payment succesfully completed'),
+        ),
+      );
+    } on Exception catch (e, s) {
+      throw e;
+      if (e is StripeException) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+                'Error from Stripe: ${e.error.localizedMessage ?? e.error.code}'),
+          ),
+        );
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Unforeseen error: ${e}'),
+          ),
+        );
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ExampleScaffold(
+      title: 'RevolutPay',
+      tags: ['Payment method'],
+      padding: EdgeInsets.all(16),
+      children: [
+        LoadingButton(
+          onPressed: () async {
+            await _pay(context);
+          },
+          text: 'Pay',
+        ),
+      ],
+    );
+  }
+}

example/lib/screens/regional_payment_methods/revolutpay_screen.dart

@@ -12,6 +12,7 @@ import 'package:stripe_example/screens/regional_payment_methods/fpx_screen.dart'
 import 'package:stripe_example/screens/regional_payment_methods/ideal_screen.dart';
 import 'package:stripe_example/screens/regional_payment_methods/klarna_screen.dart';
 import 'package:stripe_example/screens/regional_payment_methods/paypal_screen.dart';
+import 'package:stripe_example/screens/regional_payment_methods/revolutpay_screen.dart';
 import 'package:stripe_example/screens/regional_payment_methods/sofort_screen.dart';
 import 'package:stripe_example/screens/regional_payment_methods/us_bank_account.dart';
 import 'package:stripe_example/screens/wallets/apple_pay_screen.dart';
@@ -296,6 +297,15 @@ class Example extends StatelessWidget {
         builder: (contex) => PayPalScreen(),
         platformsSupported: [DevicePlatform.android, DevicePlatform.ios],
       ),
+      Example(
+        title: 'RevolutPay',
+        leading: Image.asset(
+          'assets/revolut.png',
+          width: 48,
+        ),
+        builder: (context) => RevolutPayScreen(),
+        platformsSupported: [DevicePlatform.android, DevicePlatform.ios],
+      ),
       Example(
         title: 'Us bank accounts (ACH)',
         builder: (contex) => UsBankAccountScreen(),

example/lib/screens/screens.dart

@@ -17,7 +17,7 @@ class ApplePayButton extends StatelessWidget {
     Key? key,
     this.style = PlatformButtonStyle.automatic,
     this.type = PlatformButtonType.plain,
-    this.cornerRadius = 4.0,
+    this.cornerRadius=4,
     this.onPressed,
     double? width,
     double? height = _kApplePayButtonDefaultHeight,
@@ -50,7 +50,7 @@ class ApplePayButton extends StatelessWidget {
   /// Modifies the **corner radius** of the payment button.
   /// To remove the rounded courners, set this value to 0.0.
   /// The default value is set to 4.0
-  final double cornerRadius;
+  final int cornerRadius;
 
   /// Callback that is executed when the button is pressed.
   final VoidCallback? onPressed;
@@ -116,7 +116,7 @@ class _UiKitApplePayButton extends StatefulWidget {
     Key? key,
     required this.style,
     required this.type,
-    this.cornerRadius = 4.0,
+    this.cornerRadius = 4,
     this.onPressed,
     this.onShippingContactSelected,
     this.onCouponCodeEntered,
@@ -126,7 +126,7 @@ class _UiKitApplePayButton extends StatefulWidget {
 
   final PlatformButtonStyle style;
   final PlatformButtonType type;
-  final double cornerRadius;
+  final int cornerRadius;
   final VoidCallback? onPressed;
   final OnDidSetShippingContact? onShippingContactSelected;
   final OnDidSetShippingMethod? onShippingMethodSelected;

packages/stripe/lib/src/widgets/apple_pay_button.dart

@@ -10,6 +10,8 @@ class GooglePayButton extends StatefulWidget {
     required this.onTap,
     this.type = GooglePayButtonType.pay,
     this.buttonType = PlatformButtonType.pay,
+    this.borderRadius,
+    this.appearance = PlatformButtonStyle.automatic,
     Key? key,
   }) : super(key: key);
 
@@ -22,6 +24,8 @@ class GooglePayButton extends StatefulWidget {
   @Deprecated('Use [buttonType] instead')
   final GooglePayButtonType type;
 
+  final int? borderRadius;
+  final PlatformButtonStyle appearance;
   final PlatformButtonType buttonType;
   final VoidCallback onTap;
 }
@@ -35,7 +39,8 @@ class _GooglePayButtonState extends State<GooglePayButton> {
     // ignore: deprecated_member_use_from_same_package
     _creationParams['buttonType'] = widget.type.name;
     _creationParams['type'] = widget.buttonType.id;
-
+    _creationParams['appearance'] = widget.appearance.id;
+    _creationParams['borderRadius'] = widget.borderRadius;
     super.initState();
   }
 

packages/stripe/lib/src/widgets/google_pay_button.dart

@@ -16,7 +16,7 @@ class PlatformPayButton extends StatelessWidget {
     super.key,
     this.type = PlatformButtonType.plain,
     this.appearance = PlatformButtonStyle.automatic,
-    this.borderRadius = 4.0,
+    this.borderRadius = 4,
     this.constraints,
     this.onShippingContactSelected,
     this.onCouponCodeEntered,
@@ -27,11 +27,11 @@ class PlatformPayButton extends StatelessWidget {
   /// Defines the displayed text on the button.
   final PlatformButtonType type;
 
-  /// iOS only, defines the color and border radius of the button
+  /// Defines the coloring of the button
   final PlatformButtonStyle appearance;
 
-  /// iOS only, sets the border radius of the corners.
-  final double borderRadius;
+  /// Sets the border radius of the corners.
+  final int borderRadius;
 
   /// ios only, execute a callback when shipping
 
@@ -72,6 +72,7 @@ class PlatformPayButton extends StatelessWidget {
       return GooglePayButton(
         onTap: onPressed,
         buttonType: type,
+        borderRadius: borderRadius,
       );
     } else if (Platform.isIOS) {
       return ApplePayButton(

packages/stripe/lib/src/widgets/platform_pay_button.dart

@@ -3,7 +3,7 @@ version '1.0-SNAPSHOT'
 
 buildscript {
     ext.kotlin_version = '1.8.0'
-    ext.stripe_version = '20.31.+'
+    ext.stripe_version = '20.34.+'
 
     repositories {
         google()
@@ -48,15 +48,19 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.12.0'
 
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.1"
-    implementation "com.stripe:stripe-android:$stripe_version"
-    implementation "com.stripe:financial-connections:$stripe_version"
+    implementation("com.stripe:stripe-android:$stripe_version") {
+        exclude group: 'androidx.emoji2', module: 'emoji2'
+    }
+    implementation ("com.stripe:financial-connections:$stripe_version") {
+        exclude group: 'androidx.emoji2', module: 'emoji2'
+    }
     implementation 'com.google.android.material:material:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
 
     // play-services-wallet is already included in stripe-android
-    compileOnly "com.google.android.gms:play-services-wallet:19.1.0"
+    compileOnly "com.google.android.gms:play-services-wallet:19.2.0"
 
     // Users need to declare this dependency on their own, otherwise all methods are a no-op
     compileOnly 'com.stripe:stripe-android-issuing-push-provisioning:1.1.0'

packages/stripe_android/android/build.gradle

@@ -31,6 +31,12 @@ class StripeSdkGooglePayButtonPlatformView(
         if (creationParams?.containsKey("type") == true) {
             googlePayButtonManager.type(payButton, creationParams["type"] as Int)
         }
+        if (creationParams?.containsKey("appearance") == true) {
+            googlePayButtonManager.appearance(payButton, creationParams["appearance"] as Int)
+        }
+        if (creationParams?.containsKey("borderRadius") == true) {
+            googlePayButtonManager.borderRadius(payButton, creationParams["borderRadius"] as Int)
+        }
         payButton.initialize()
         payButton.getChildAt(0).setOnClickListener {
             channel.invokeMethod("onPressed", null)

packages/stripe_android/android/src/main/kotlin/com/flutter/stripe/StripeSdkGooglePayButtonPlatformView.kt

@@ -20,6 +20,16 @@ class GooglePayButtonManager : SimpleViewManager<GooglePayButtonView?>() {
     view.setType(buttonType)
   }
 
+  @ReactProp(name = "appearance")
+  fun appearance(view: GooglePayButtonView, appearance: Int) {
+    view.setAppearance(appearance)
+  }
+
+  @ReactProp(name = "borderRadius")
+  fun borderRadius(view: GooglePayButtonView, borderRadius: Int) {
+    view.setBorderRadius(borderRadius)
+  }
+
   override fun createViewInstance(reactContext: ThemedReactContext): GooglePayButtonView {
     return GooglePayButtonView(reactContext)
   }