Fix #14 (#144)

* Fix #14

* update readmes, fix typo

Author: jonasbark

README.md

@@ -172,8 +172,8 @@ Future<void> onGooglePayResult(paymentResult) async {
 
 ## Known issues
 
-- The Card field on Android has focus issues - it's being tracked in [#14](https://github.com/flutter-stripe/flutter_stripe/issues/14) and related to issues in the Flutter framework. If this is a
-  blocker for your project consider using the PaymentSheet alternative
+- The Card field on Android has focus issues on older Flutter versions - it has been fixed by the Flutter framework in
+  the master branch. The issue is being tracked in [#14](https://github.com/flutter-stripe/flutter_stripe/issues/14).
 
 ## Contributing
 

packages/stripe/README.md

@@ -1,14 +1,19 @@
+
 <img src="https://user-images.githubusercontent.com/19904063/116995247-20519e80-acda-11eb-8e1b-7d0efbd193ad.png" height="36" />
 
 
 # Flutter Stripe
+
 [![pub package](https://img.shields.io/pub/v/flutter_stripe.svg)](https://pub.dev/packages/flutter_stripe) ![build](https://img.shields.io/github/workflow/status/flutter-stripe/flutter_stripe/all_plugins?logo=github)
 
 > 🚨 flutter_stripe is in beta - please provide feedback (and/or contribute) if you find issues 💙️
 
+
 The Stripe Flutter SDK allows you to build delightful payment experiences in your native Android and iOS apps using Flutter. We provide powerful and customizable UI screens and elements that can be used out-of-the-box to collect your users' payment details.
 
-![payment_sheet](https://user-images.githubusercontent.com/19904063/119301240-6d35ee80-bc62-11eb-98ea-f71d2d1949bb.png)
+
+![stripe-flutter_cover](https://user-images.githubusercontent.com/19904063/121511757-48bf6d80-c9e9-11eb-9674-0fec35e26ef5.png)
+
 
 
 ## Features
@@ -17,13 +22,19 @@ The Stripe Flutter SDK allows you to build delightful payment experiences in you
 
 **Apple Pay**: We provide a [seamless integration with Apple Pay](https://stripe.com/docs/apple-pay).
 
+**Google Pay**: The plugin can easily act as payment provider for the [Pay plugin](#Pay-Plugin-support) that enables you to seamlessly integrate Google Pay or Apple Pay. All you need to do is add your stripe publishable key to the payment profile.
+
 **Payment methods**: Accepting more [payment methods](https://stripe.com/docs/payments/payment-methods/overview) helps your business expand its global reach and improve checkout conversion.
 
 **SCA-Ready**: The SDK automatically performs native [3D Secure authentication](https://stripe.com/docs/payments/3d-secure) if needed to comply with [Strong Customer Authentication](https://stripe.com/docs/strong-customer-authentication) regulation in Europe.
 
 **Native UI**: We provide native screens and elements to securely collect payment details on Android and iOS.
 
-**Pre-built payments UI**: Learn how to integrate Payment Sheet, the new pre-built payments UI for mobile apps. This pre-built UI lets you accept cards, Apple Pay, and Google Pay out of the box, and includes support for saving & reusing cards. 
+**Pre-built payments UI**: Learn how to integrate Payment Sheet, the new pre-built payments UI for mobile apps. This pre-built UI lets you accept cards, Apple Pay, and Google Pay out of the box, and includes support for saving & reusing cards.
+
+#### Recommended usage
+
+If you're selling digital products or services within your app, (e.g. subscriptions, in-game currencies, game levels, access to premium content, or unlocking a full version), you must use the app store's in-app purchase APIs. See [Apple's](https://developer.apple.com/app-store/review/guidelines/#payments) and [Google's](https://support.google.com/googleplay/android-developer/answer/9858738?hl=en&ref_topic=9857752) guidelines for more information. For all other scenarios you can use this SDK to process payments via Stripe.
 
 ## Installation
 
@@ -35,7 +46,12 @@ dart pub add flutter_stripe
 
 #### Android
 
-Android 5.0 (API level 21) and above
+- Android 5.0 (API level 21) and above
+- Kotlin version 1.5.0 and above: [example](https://github.com/flutter-stripe/flutter_stripe/blob/79b201a2e9b827196d6a97bb41e1d0e526632a5a/example/android/build.gradle#L2)
+- Using a descendant of `Theme.AppCompact` for your activity: [example](https://github.com/flutter-stripe/flutter_stripe/blob/384d390c8a90d19dc62c73faa5226fa931fd6d44/example/android/app/src/main/res/values/styles.xml#L15)
+- Using `FlutterFragmentActivity` instead of `FlutterActivity` in `MainActivity.kt`: [example](https://github.com/flutter-stripe/flutter_stripe/blob/79b201a2e9b827196d6a97bb41e1d0e526632a5a/example/android/app/src/main/kotlin/com/flutter/stripe/example/MainActivity.kt#L6)
+
+This is caused by the Stripe SDK requires the use of the AppCompact theme for their UI components and the Support Fragment Manager for the Payment Sheets
 
 #### iOS
 
@@ -49,27 +65,35 @@ import 'package:flutter_stripe/flutter_stripe.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  
+
   // set the publishable key for Stripe - this is mandatory
   Stripe.publishableKey = stripePublishableKey;
-  runApp(App());
+  runApp(PaymentScreen());
 }
 
 // payment_screen.dart
 class PaymentScreen extends StatelessWidget {
-  
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(),
-      body: Container(
-        alignment: Alignment.center,
-        padding: EdgeInsets.all(16),
-        child: CardField(
-          onCardChanged: (card) {
-            print(card);
-          },
-        ),
+      body: Column(
+        children: [
+          CardField(
+            onCardChanged: (card) {
+              print(card);
+            },
+          ),
+          TextButton(
+            onPressed: () async {
+              // create payment method
+              final paymentMethod =
+                  await Stripe.instance.createPaymentMethod(PaymentMethodParams.card());
+            },
+            child: Text('pay'),
+          )
+        ],
       ),
     );
   }
@@ -83,7 +107,9 @@ To initialize Stripe in your Flutter app, use the `Stripe` base class.
 `Stripe` offers `publishableKey`, `stripeAccountId`, `threeDSecureParams` and `merchantIdentifier`. Only `publishableKey` is required.
 
 ## Dart API
+
 The library offers several methods to handle stripe related actions:
+
 ```dart
 Future<PaymentMethod> createPaymentMethod(...);
 Future<PaymentIntent> handleCardAction(...);
@@ -100,19 +126,44 @@ Future<void> initPaymentSheet(...);
 Future<void> presentPaymentSheet(...);
 Future<void> confirmPaymentSheetPayment()
 ```
+
 The example app offers examples on how to use these methods.
 
+## Pay Plugin support
+
+flutter_stripe fully supports the [Pay plugin](https://pub.dev/packages/pay) from the Google Pay team. By including a few lines you can integrate Stripe as a payment processor for Google / Apple Pay:
+
+```dart
+Future<void> onGooglePayResult(paymentResult) async {
+    final response = await fetchPaymentIntentClientSecret();
+    final clientSecret = response['clientSecret'];
+    final token = paymentResult['paymentMethodData']['tokenizationData']['token'];
+    final tokenJson = Map.castFrom(json.decode(token));
+
+    final params = PaymentMethodParams.cardFromToken(
+      token: tokenJson['id'],
+    );
+    // Confirm Google pay payment method
+    await Stripe.instance.confirmPaymentMethod(
+      clientSecret,
+      params,
+    );
+}
+```
+
 ## Run the example app
 
+- Navigate to the example folder `cd example`
 - Install the dependencies
-    - `flutter pub get`
-- Set up env vars for the flutter app and a local backend. 
-    -  [Get your test Stripe API keys](https://stripe.com/docs/keys)
-    - `cp lib/.env.dart lib/.env.dart` and set your Stripe publishable key.
-    - `cp server/.env.example server/.env` and set the variable values in your newly created `.env` file.
+  - `flutter pub get`
+- Set up env vars for the flutter app and a local backend.
+  - [Get your test Stripe API keys](https://stripe.com/docs/keys)
+  - `cp lib/.env.example.dart lib/.env.dart` and set your Stripe publishable key.
+  - `cp server/.env.example server/.env` and set the variable values in your newly created `.env` file.
+- Install the server dependencies: `yarn --cwd "server"`
 - Start the example
-    - Terminal 1: `cd server && yarn example start:server`
-    - Terminal 2: `flutter run`
+  - Terminal 1: `yarn --cwd "server" start`
+  - Terminal 2: `flutter run`
 
 ##### Additional steps for webhook forwarding
 
@@ -121,5 +172,27 @@ The example app offers examples on how to use these methods.
 
 ## Known issues
 
-- the Card field on Android has focus issues - it's being tracked in [#14](https://github.com/flutter-stripe/flutter_stripe/issues/14) and related to issues in the Flutter framework. If this is a 
-blocker for your project consider using the PaymentSheet alternative
+- The Card field on Android has focus issues on older Flutter versions - it has been fixed by the Flutter framework in
+  the master branch. The issue is being tracked in [#14](https://github.com/flutter-stripe/flutter_stripe/issues/14).
+
+## Contributing
+
+You can help us make this project better, feel free to open an new issue or a pull request.
+
+##### Setup
+
+This project uses [melos](https://github.com/invertase/melos) to manage all the packages inside this repo.
+
+- Install melos: `dart pub global activate melos`
+- Setup melos in your local folder: `melos bootstrap`
+
+##### Useful commands
+
+- Format `melos run format`
+- Analyze `melos run analyze`
+- Test `melos run test`
+- Pub get `melos run get`
+
+##### Publishing
+
+- Use `melos version` and `melos publish` to keep all the repositories in sync

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

@@ -2,6 +2,7 @@ package com.flutter.stripe
 
 import android.content.Context
 import android.text.InputType
+import android.util.Log
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import androidx.annotation.NonNull
@@ -40,11 +41,28 @@ class StripeSdkCardPlatformView(
         if (creationParams?.containsKey("postalCodeEnabled") == true) {
             stripeSdkCardViewManager.setPostalCodeEnabled(cardView, creationParams["postalCodeEnabled"] as Boolean)
         }
-        // Temporal fix to https://github.com/flutter/flutter/issues/81029
-        val binding = CardInputWidgetBinding.bind(cardView.mCardWidget)
-        binding.cardNumberEditText.inputType = InputType.TYPE_CLASS_TEXT
-        binding.cvcEditText.inputType = InputType.TYPE_CLASS_TEXT
-        binding.expiryDateEditText.inputType = InputType.TYPE_CLASS_TEXT
+        applyFocusFix()
+    }
+
+    /**
+     * https://github.com/flutter-stripe/flutter_stripe/issues/14
+     * https://github.com/flutter/engine/pull/26602 HC_PLATFORM_VIEW was introduced in
+     * that PR - we're checking for its availability and apply the old fix accordingly
+     */
+    private fun applyFocusFix() {
+        try {
+            val enumConstants = Class.forName("io.flutter.plugin.editing.TextInputPlugin\$InputTarget\$Type").enumConstants as Array<Enum<*>>
+            val shouldApplyFix = enumConstants.none { it.name == "HC_PLATFORM_VIEW" }
+            if (shouldApplyFix) {
+                // Temporal fix to https://github.com/flutter/flutter/issues/81029
+                val binding = CardInputWidgetBinding.bind(cardView.mCardWidget)
+                binding.cardNumberEditText.inputType = InputType.TYPE_CLASS_TEXT
+                binding.cvcEditText.inputType = InputType.TYPE_CLASS_TEXT
+                binding.expiryDateEditText.inputType = InputType.TYPE_CLASS_TEXT
+            }
+        } catch (e: Exception) {
+            Log.e("Stripe Plugin", "Error", e)
+        }
     }
 
     override fun getView(): View {