[2.2.0]

* The library has been split into modules

* Added buttons: `AdaptivePayButton`, `ApplePayButton`, `GooglePayButton`

* Changed `processingPayment`, it now accepts a `PaymentRequest` model

* Support iOS 14.0

Author: mit-73

example/lib/main.dart

@@ -147,6 +147,7 @@ class _MyAppState extends State<MyApp> {
                   },
                 ),
                 googlePayButton: GooglePayButton(
+                  type: GooglePayButtonType.plain,
                   request: PaymentRequest.google(
                     google: googleParameters,
                     currencyCode: 'USD',

example/pubspec.lock

@@ -92,27 +92,27 @@ packages:
       path: "../packages/mad_pay"
       relative: true
     source: path
-    version: "2.2.0-beta.1"
+    version: "2.2.0-beta.6"
   mad_pay_android:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "../packages/mad_pay_android"
-      relative: true
-    source: path
-    version: "2.2.0-beta.1"
+      name: mad_pay_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.0-beta.3"
   mad_pay_ios:
     dependency: "direct overridden"
     description:
       path: "../packages/mad_pay_ios"
       relative: true
     source: path
-    version: "2.2.0-beta.1"
+    version: "2.2.0-beta.2"
   mad_pay_platform_interface:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "../packages/mad_pay_platform_interface"
-      relative: true
-    source: path
+      name: mad_pay_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
     version: "2.2.0-beta.1"
   matcher:
     dependency: transitive

packages/mad_pay/lib/mad_pay.dart

@@ -1,16 +1,25 @@
 library mad_pay;
 
-export 'src/mad_pay.dart';
+import 'dart:async';
 
-export 'src/widgets/adaptive_pay_button.dart';
+import 'package:flutter/foundation.dart'
+    show TargetPlatform, defaultTargetPlatform;
 
-export 'src/widgets/pay_button.dart'
-    show ApplePayButton, GooglePayButton, PaymentCallback, ErrorCallback;
+import 'package:flutter/material.dart';
 
-export 'package:mad_pay_platform_interface/mad_pay_platform_interface.dart';
+import 'package:mad_pay_ios/mad_pay_ios.dart';
+import 'package:mad_pay_android/mad_pay_android.dart';
+import 'package:mad_pay_platform_interface/mad_pay_platform_interface.dart';
+import 'package:mad_pay_platform_interface/mad_pay_platform_interface_private.dart';
+
+import 'package:mad_pay/src/utils/debouncer.dart';
 
-export 'package:mad_pay_android/mad_pay_android.dart'
-    show GooglePayButtonStyle, GooglePayButtonType;
+export 'package:mad_pay_platform_interface/mad_pay_platform_interface.dart';
+export 'package:mad_pay_android/mad_pay_android.dart';
+export 'package:mad_pay_ios/mad_pay_ios.dart';
 
-export 'package:mad_pay_ios/mad_pay_ios.dart'
-    show ApplePayButtonStyle, ApplePayButtonType;
+part 'src/mad_pay.dart';
+part 'src/widgets/pay_button.dart';
+part 'src/widgets/apple_pay_button.dart';
+part 'src/widgets/google_pay_button.dart';
+part 'src/widgets/adaptive_pay_button.dart';

packages/mad_pay/lib/src/mad_pay.dart

@@ -1,9 +1,4 @@
-import 'dart:async';
-
-import 'package:flutter/foundation.dart'
-    show TargetPlatform, defaultTargetPlatform;
-import 'package:mad_pay_platform_interface/mad_pay_platform_interface.dart';
-import 'package:mad_pay_platform_interface/mad_pay_platform_interface_private.dart';
+part of mad_pay;
 
 /// {@macro mad_pay}
 class MadPay {

packages/mad_pay/lib/src/utils/debouncer.dart

@@ -0,0 +1,23 @@
+import 'dart:async';
+
+/// {@macro debouncer}
+class Debouncer {
+  /// {@template debouncer}
+  /// Сlass for handling method call debouncing.
+  /// {@endtemplate}
+  Debouncer(this._milliseconds);
+  final int _milliseconds;
+  late void Function() _action;
+  bool _block = false;
+
+  /// Run action and blocks execution of other actions for a specified time
+  Future<void> run(void Function() action) async {
+    _action = action;
+    if (!_block) {
+      _block = true;
+      _action();
+      await Future<void>.delayed(Duration(milliseconds: _milliseconds));
+      _block = false;
+    }
+  }
+}

packages/mad_pay/lib/src/widgets/adaptive_pay_button.dart

@@ -1,7 +1,4 @@
-import 'package:flutter/foundation.dart';
-import 'package:flutter/widgets.dart';
-
-import 'package:mad_pay/src/widgets/pay_button.dart';
+part of mad_pay;
 
 /// {@macro adaptive_pay_button}
 class AdaptivePayButton extends StatelessWidget {

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

@@ -1,4 +1,4 @@
-part of 'pay_button.dart';
+part of mad_pay;
 
 /// {@macro apple_pay_button}
 class ApplePayButton extends _PayButton {

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

@@ -1,4 +1,4 @@
-part of 'pay_button.dart';
+part of mad_pay;
 
 /// {@macro google_pay_button}
 class GooglePayButton extends _PayButton {

packages/mad_pay/lib/src/widgets/pay_button.dart

@@ -1,17 +1,4 @@
-import 'dart:async';
-
-import 'package:flutter/foundation.dart' show defaultTargetPlatform;
-
-import 'package:flutter/material.dart';
-
-import 'package:mad_pay_platform_interface/mad_pay_platform_interface.dart';
-import 'package:mad_pay_ios/mad_pay_ios.dart';
-import 'package:mad_pay_android/mad_pay_android.dart';
-
-import '../mad_pay.dart';
-
-part 'apple_pay_button.dart';
-part 'google_pay_button.dart';
+part of mad_pay;
 
 /// On Payment Callback
 typedef PaymentCallback = void Function(PaymentResponse? result);
@@ -49,18 +36,22 @@ abstract class _PayButton extends StatefulWidget {
   final Widget? childIfUnavailable;
   final Widget? loadingIndicator;
 
+  final Debouncer debouncer = Debouncer(300);
+
   VoidCallback _defaultOnPressed(
       VoidCallback? onPressed, PaymentRequest request) {
-    return () async {
-      onPressed?.call();
-
-      try {
-        final PaymentResponse? result =
-            await _payClient.processingPayment(request);
-        onPaymentResult(result);
-      } catch (error) {
-        onError?.call(error);
-      }
+    return () {
+      debouncer.run(() async {
+        onPressed?.call();
+
+        try {
+          final PaymentResponse? result =
+              await _payClient.processingPayment(request);
+          onPaymentResult(result);
+        } catch (error) {
+          onError?.call(error);
+        }
+      });
     };
   }
 
@@ -78,6 +69,8 @@ class _PayButtonState extends State<_PayButton> with WidgetsBindingObserver {
   final StreamController<bool> availablePaymentsStatus =
       StreamController<bool>();
 
+  AppLifecycleState? _lastState;
+
   @override
   void initState() {
     super.initState();
@@ -93,10 +86,12 @@ class _PayButtonState extends State<_PayButton> with WidgetsBindingObserver {
 
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
-    if (state == AppLifecycleState.resumed) {
+    if (_lastState == AppLifecycleState.paused &&
+        state == AppLifecycleState.resumed) {
       availablePaymentsStatus
           .addStream(Stream<bool>.fromFuture(checkPayments()));
     }
+    _lastState = state;
   }
 
   Future<bool> checkPayments() async {

packages/mad_pay/pubspec.yaml

@@ -1,6 +1,6 @@
 name: mad_pay
 description: Mad Pay will help you make payments through Apple Pay and Google Pay
-version: 2.2.0-beta.1
+version: 2.2.0
 repository: https://github.com/MadBrains/Mad-Pay-Flutter
 issue_tracker: https://github.com/MadBrains/Mad-Pay-Flutter/issues
 homepage: https://madbrains.ru/
@@ -12,9 +12,9 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  mad_pay_platform_interface: 2.2.0-beta.1
-  mad_pay_android: 2.2.0-beta.1
-  mad_pay_ios: 2.2.0-beta.1
+  mad_pay_platform_interface: ^2.2.0
+  mad_pay_android: ^2.2.0
+  mad_pay_ios: ^2.2.0
 
 # For development. Remove/comment before publishing to pub.
 # dependency_overrides:
@@ -27,4 +27,12 @@ dependencies:
 
 dev_dependencies:
   flutter_test:
-    sdk: flutter
+    sdk: flutter
+
+flutter:
+  plugin:
+    platforms:
+      android:
+        default_package: mad_pay_android
+      ios:
+        default_package: mad_pay_ios