format

flutter · Feb 18, 2021 · 3c77357 · 3c77357
1 parent cfc0d04
commit 3c77357
Show file tree

Hide file tree

Showing 10 changed files with 119 additions and 63 deletions.
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
@@ -108,12 +108,13 @@ class BillingClient {
         _callbacks[_kOnBillingServiceDisconnected] ??= [];
     disconnectCallbacks.add(onBillingServiceDisconnected);
     return BillingResultWrapper.fromJson((await channel
-        .invokeMapMethod<String, dynamic>(
-            "BillingClient#startConnection(BillingClientStateListener)",
-            <String, dynamic>{
-          'handle': disconnectCallbacks.length - 1,
-          'enablePendingPurchases': _enablePendingPurchases
-        })) ?? <String, dynamic>{});
+            .invokeMapMethod<String, dynamic>(
+                "BillingClient#startConnection(BillingClientStateListener)",
+                <String, dynamic>{
+              'handle': disconnectCallbacks.length - 1,
+              'enablePendingPurchases': _enablePendingPurchases
+            })) ??
+        <String, dynamic>{});
   }
 
   /// Calls
@@ -143,9 +144,10 @@ class BillingClient {
       'skusList': skusList
     };
     return SkuDetailsResponseWrapper.fromJson((await channel.invokeMapMethod<
-            String, dynamic>(
-        'BillingClient#querySkuDetailsAsync(SkuDetailsParams, SkuDetailsResponseListener)',
-        arguments)) ?? <String, dynamic>{});
+                String, dynamic>(
+            'BillingClient#querySkuDetailsAsync(SkuDetailsParams, SkuDetailsResponseListener)',
+            arguments)) ??
+        <String, dynamic>{});
   }
 
   /// Attempt to launch the Play Billing Flow for a given [skuDetails].
@@ -180,8 +182,9 @@ class BillingClient {
     };
     return BillingResultWrapper.fromJson(
         (await channel.invokeMapMethod<String, dynamic>(
-            'BillingClient#launchBillingFlow(Activity, BillingFlowParams)',
-            arguments)) ?? <String, dynamic>{});
+                'BillingClient#launchBillingFlow(Activity, BillingFlowParams)',
+                arguments)) ??
+            <String, dynamic>{});
   }
 
   /// Fetches recent purchases for the given [SkuType].
@@ -198,10 +201,11 @@ class BillingClient {
   Future<PurchasesResultWrapper> queryPurchases(SkuType skuType) async {
     assert(skuType != null);
     return PurchasesResultWrapper.fromJson((await channel
-        .invokeMapMethod<String, dynamic>(
-            'BillingClient#queryPurchases(String)', <String, dynamic>{
-      'skuType': SkuTypeConverter().toJson(skuType)
-    })) ?? <String, dynamic>{});
+            .invokeMapMethod<String, dynamic>(
+                'BillingClient#queryPurchases(String)', <String, dynamic>{
+          'skuType': SkuTypeConverter().toJson(skuType)
+        })) ??
+        <String, dynamic>{});
   }
 
   /// Fetches purchase history for the given [SkuType].
@@ -220,9 +224,12 @@ class BillingClient {
   Future<PurchasesHistoryResult> queryPurchaseHistory(SkuType skuType) async {
     assert(skuType != null);
     return PurchasesHistoryResult.fromJson((await channel.invokeMapMethod<
-            String, dynamic>(
-        'BillingClient#queryPurchaseHistoryAsync(String, PurchaseHistoryResponseListener)',
-        <String, dynamic>{'skuType': SkuTypeConverter().toJson(skuType)})) ?? <String, dynamic>{});
+                String, dynamic>(
+            'BillingClient#queryPurchaseHistoryAsync(String, PurchaseHistoryResponseListener)',
+            <String, dynamic>{
+              'skuType': SkuTypeConverter().toJson(skuType)
+            })) ??
+        <String, dynamic>{});
   }
 
   /// Consumes a given in-app product.
@@ -237,12 +244,13 @@ class BillingClient {
       {String? developerPayload}) async {
     assert(purchaseToken != null);
     return BillingResultWrapper.fromJson((await channel
-        .invokeMapMethod<String, dynamic>(
-            'BillingClient#consumeAsync(String, ConsumeResponseListener)',
-            <String, dynamic>{
-          'purchaseToken': purchaseToken,
-          'developerPayload': developerPayload,
-        }))??<String, dynamic>{});
+            .invokeMapMethod<String, dynamic>(
+                'BillingClient#consumeAsync(String, ConsumeResponseListener)',
+                <String, dynamic>{
+              'purchaseToken': purchaseToken,
+              'developerPayload': developerPayload,
+            })) ??
+        <String, dynamic>{});
   }
 
   /// Acknowledge an in-app purchase.
@@ -268,12 +276,13 @@ class BillingClient {
       {String? developerPayload}) async {
     assert(purchaseToken != null);
     return BillingResultWrapper.fromJson((await channel.invokeMapMethod<String,
-            dynamic>(
-        'BillingClient#(AcknowledgePurchaseParams params, (AcknowledgePurchaseParams, AcknowledgePurchaseResponseListener)',
-        <String, dynamic>{
-          'purchaseToken': purchaseToken,
-          'developerPayload': developerPayload,
-        }))??<String, dynamic>{});
+                dynamic>(
+            'BillingClient#(AcknowledgePurchaseParams params, (AcknowledgePurchaseParams, AcknowledgePurchaseResponseListener)',
+            <String, dynamic>{
+              'purchaseToken': purchaseToken,
+              'developerPayload': developerPayload,
+            })) ??
+        <String, dynamic>{});
   }
 
   /// The method call handler for [channel].

diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
@@ -16,7 +16,8 @@ part 'sku_details_wrapper.g.dart';
 /// The error message shown when the map represents billing result is invalid from method channel.
 ///
 /// This usually indicates a series underlining code issue in the plugin.
-const kInvalidBillingResultErrorMessage = 'Invalid billing result map from method channel.';
+const kInvalidBillingResultErrorMessage =
+    'Invalid billing result map from method channel.';
 
 /// Dart wrapper around [`com.android.billingclient.api.SkuDetails`](https://developer.android.com/reference/com/android/billingclient/api/SkuDetails).
 ///
@@ -214,10 +215,12 @@ class BillingResultWrapper {
   /// The map needs to have named string keys with values matching the names and
   /// types of all of the members on this class.
   factory BillingResultWrapper.fromJson(Map<String, dynamic>? map) {
-      if (map == null || map.isEmpty) {
-        return BillingResultWrapper(responseCode: BillingResponse.error, debugMessage: kInvalidBillingResultErrorMessage);
-      }
-      return _$BillingResultWrapperFromJson(map);
+    if (map == null || map.isEmpty) {
+      return BillingResultWrapper(
+          responseCode: BillingResponse.error,
+          debugMessage: kInvalidBillingResultErrorMessage);
+    }
+    return _$BillingResultWrapperFromJson(map);
   }
 
   /// Response code returned in the Play Billing API calls.

diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.dart
@@ -63,7 +63,8 @@ class SKSubscriptionPeriodUnitConverter
       return SKSubscriptionPeriodUnit.day;
     }
     return _$enumDecode<SKSubscriptionPeriodUnit, dynamic>(
-        _$SKSubscriptionPeriodUnitEnumMap.cast<SKSubscriptionPeriodUnit, dynamic>(),
+        _$SKSubscriptionPeriodUnitEnumMap
+            .cast<SKSubscriptionPeriodUnit, dynamic>(),
         json);
   }
 
@@ -87,7 +88,8 @@ class SKProductDiscountPaymentModeConverter
       return SKProductDiscountPaymentMode.payAsYouGo;
     }
     return _$enumDecode<SKProductDiscountPaymentMode, dynamic>(
-        _$SKProductDiscountPaymentModeEnumMap.cast<SKProductDiscountPaymentMode, dynamic>(),
+        _$SKProductDiscountPaymentModeEnumMap
+            .cast<SKProductDiscountPaymentMode, dynamic>(),
         json);
   }
 

diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
@@ -46,7 +46,9 @@ class SKPaymentQueueWrapper {
 
   /// Calls [`-[SKPaymentQueue canMakePayments:]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1506139-canmakepayments?language=objc).
   static Future<bool> canMakePayments() async =>
-      (await channel.invokeMethod<bool>('-[SKPaymentQueue canMakePayments:]')) ?? false;
+      (await channel
+          .invokeMethod<bool>('-[SKPaymentQueue canMakePayments:]')) ??
+      false;
 
   /// Sets an observer to listen to all incoming transaction events.
   ///
@@ -321,7 +323,7 @@ class SKPaymentWrapper {
   ///
   /// The default is 1. The minimum is 1. The maximum is 10.
   ///
-  /// If the object is invalid, the value could be 0. 
+  /// If the object is invalid, the value could be 0.
   @JsonKey(defaultValue: 0)
   final int quantity;
 

diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
@@ -104,7 +104,8 @@ class SKProductSubscriptionPeriodWrapper {
   factory SKProductSubscriptionPeriodWrapper.fromJson(
       Map<String, dynamic>? map) {
     if (map == null) {
-      return SKProductSubscriptionPeriodWrapper(numberOfUnits: 0, unit: SKSubscriptionPeriodUnit.day);
+      return SKProductSubscriptionPeriodWrapper(
+          numberOfUnits: 0, unit: SKSubscriptionPeriodUnit.day);
     }
     return _$SKProductSubscriptionPeriodWrapperFromJson(map);
   }

diff --git a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
@@ -107,7 +107,8 @@ void main() {
           await billingClient.startConnection(
               onBillingServiceDisconnected: () {}),
           equals(BillingResultWrapper(
-          responseCode: BillingResponse.error, debugMessage: kInvalidBillingResultErrorMessage)));
+              responseCode: BillingResponse.error,
+              debugMessage: kInvalidBillingResultErrorMessage)));
     });
   });
 
@@ -173,7 +174,8 @@ void main() {
               skuType: SkuType.inapp, skusList: <String>['invalid']);
 
       BillingResultWrapper billingResult = BillingResultWrapper(
-          responseCode: BillingResponse.error, debugMessage: kInvalidBillingResultErrorMessage);
+          responseCode: BillingResponse.error,
+          debugMessage: kInvalidBillingResultErrorMessage);
       expect(response.billingResult, equals(billingResult));
       expect(response.skuDetailsList, isEmpty);
     });
@@ -233,7 +235,8 @@ void main() {
       expect(
           await billingClient.launchBillingFlow(sku: skuDetails.sku),
           equals(BillingResultWrapper(
-          responseCode: BillingResponse.error, debugMessage: kInvalidBillingResultErrorMessage)));
+              responseCode: BillingResponse.error,
+              debugMessage: kInvalidBillingResultErrorMessage)));
     });
   });
 
@@ -294,7 +297,11 @@ void main() {
       final PurchasesResultWrapper response =
           await billingClient.queryPurchases(SkuType.inapp);
 
-      expect(response.billingResult, equals(BillingResultWrapper(responseCode: BillingResponse.error, debugMessage: kInvalidBillingResultErrorMessage)));
+      expect(
+          response.billingResult,
+          equals(BillingResultWrapper(
+              responseCode: BillingResponse.error,
+              debugMessage: kInvalidBillingResultErrorMessage)));
       expect(response.responseCode, BillingResponse.error);
       expect(response.purchasesList, isEmpty);
     });
@@ -354,7 +361,11 @@ void main() {
       final PurchasesHistoryResult response =
           await billingClient.queryPurchaseHistory(SkuType.inapp);
 
-      expect(response.billingResult, equals(BillingResultWrapper(responseCode: BillingResponse.error, debugMessage: kInvalidBillingResultErrorMessage)));
+      expect(
+          response.billingResult,
+          equals(BillingResultWrapper(
+              responseCode: BillingResponse.error,
+              debugMessage: kInvalidBillingResultErrorMessage)));
       expect(response.purchaseHistoryRecordList, isEmpty);
     });
   });
@@ -385,7 +396,11 @@ void main() {
       final BillingResultWrapper billingResult = await billingClient
           .consumeAsync('dummy token', developerPayload: 'dummy payload');
 
-      expect(billingResult, equals(BillingResultWrapper(responseCode: BillingResponse.error, debugMessage: kInvalidBillingResultErrorMessage)));
+      expect(
+          billingResult,
+          equals(BillingResultWrapper(
+              responseCode: BillingResponse.error,
+              debugMessage: kInvalidBillingResultErrorMessage)));
     });
   });
 
@@ -416,7 +431,11 @@ void main() {
           await billingClient.acknowledgePurchase('dummy token',
               developerPayload: 'dummy payload');
 
-      expect(billingResult, equals(BillingResultWrapper(responseCode: BillingResponse.error, debugMessage: kInvalidBillingResultErrorMessage)));
+      expect(
+          billingResult,
+          equals(BillingResultWrapper(
+              responseCode: BillingResponse.error,
+              debugMessage: kInvalidBillingResultErrorMessage)));
     });
   });
 }
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart
@@ -116,7 +116,11 @@ void main() {
     test('parsed from empty map', () {
       final PurchasesResultWrapper parsed =
           PurchasesResultWrapper.fromJson(<String, dynamic>{});
-      expect(parsed.billingResult, equals(BillingResultWrapper(responseCode: BillingResponse.error, debugMessage: kInvalidBillingResultErrorMessage)));
+      expect(
+          parsed.billingResult,
+          equals(BillingResultWrapper(
+              responseCode: BillingResponse.error,
+              debugMessage: kInvalidBillingResultErrorMessage)));
       expect(parsed.responseCode, BillingResponse.error);
       expect(parsed.purchasesList, isEmpty);
     });
@@ -152,7 +156,11 @@ void main() {
     test('parsed from empty map', () {
       final PurchasesHistoryResult parsed =
           PurchasesHistoryResult.fromJson(<String, dynamic>{});
-      expect(parsed.billingResult, equals(BillingResultWrapper(responseCode: BillingResponse.error, debugMessage: kInvalidBillingResultErrorMessage)));
+      expect(
+          parsed.billingResult,
+          equals(BillingResultWrapper(
+              responseCode: BillingResponse.error,
+              debugMessage: kInvalidBillingResultErrorMessage)));
       expect(parsed.purchaseHistoryRecordList, isEmpty);
     });
   });

diff --git a/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
@@ -100,23 +100,29 @@ void main() {
       expect(parsed.skuDetailsList, containsAll(expected.skuDetailsList));
     });
 
-    test('fromJson creates an object with default values', (){
+    test('fromJson creates an object with default values', () {
       final SkuDetailsResponseWrapper skuDetails =
           SkuDetailsResponseWrapper.fromJson(<String, dynamic>{});
-      expect(skuDetails.billingResult, equals(BillingResultWrapper(responseCode: BillingResponse.error, debugMessage: kInvalidBillingResultErrorMessage)));
+      expect(
+          skuDetails.billingResult,
+          equals(BillingResultWrapper(
+              responseCode: BillingResponse.error,
+              debugMessage: kInvalidBillingResultErrorMessage)));
       expect(skuDetails.skuDetailsList, isEmpty);
     });
   });
 
   group('BillingResultWrapper', () {
-    test('fromJson on empty map creates an object with default values', (){
-      final BillingResultWrapper billingResult = BillingResultWrapper.fromJson(<String, dynamic>{});
+    test('fromJson on empty map creates an object with default values', () {
+      final BillingResultWrapper billingResult =
+          BillingResultWrapper.fromJson(<String, dynamic>{});
       expect(billingResult.debugMessage, kInvalidBillingResultErrorMessage);
       expect(billingResult.responseCode, BillingResponse.error);
     });
 
-    test('fromJson on null creates an object with default values', (){
-      final BillingResultWrapper billingResult = BillingResultWrapper.fromJson(null);
+    test('fromJson on null creates an object with default values', () {
+      final BillingResultWrapper billingResult =
+          BillingResultWrapper.fromJson(null);
       expect(billingResult.debugMessage, kInvalidBillingResultErrorMessage);
       expect(billingResult.responseCode, BillingResponse.error);
     });

diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_methodchannel_apis_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_methodchannel_apis_test.dart
@@ -88,7 +88,8 @@ void main() {
       expect(await SKPaymentQueueWrapper.canMakePayments(), true);
     });
 
-    test('canMakePayment returns false if method channel returns null', () async {
+    test('canMakePayment returns false if method channel returns null',
+        () async {
       fakeIOSPlatform.testReturnNull = true;
       expect(await SKPaymentQueueWrapper.canMakePayments(), false);
     });