Merge branch 'release/1.1.0'

Author: iVirn

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.1.0
+* Add convenient `manualTrackPurchase` method to easily track purchases on Android
+
 ## 1.0.1
 * Downgrade Android Qonversion SDK to version 1.0.4 in order to use Android Billing Library ver. 2.2.0 instead of ver. 3.0.0 since Flutter in_app_purchases does not support it.
 

android/build.gradle

@@ -1,5 +1,5 @@
 group 'com.qonversion.flutter.sdk.qonversion_flutter_sdk'
-version '1.0-SNAPSHOT'
+version '1.1.0'
 
 buildscript {
     ext.kotlin_version = '1.3.50'

example/lib/main.dart

@@ -1,6 +1,8 @@
-import 'package:flutter/material.dart';
 import 'dart:async';
 
+import 'package:flutter/material.dart';
+import 'package:in_app_purchase/billing_client_wrappers.dart';
+import 'package:in_app_purchase/in_app_purchase.dart';
 import 'package:qonversion_flutter/qonversion_flutter.dart';
 
 void main() => runApp(MyApp());
@@ -22,7 +24,7 @@ class _MyAppState extends State<MyApp> {
   Future<void> initPlatformState() async {
     String uid;
     try {
-      uid = await Qonversion.launch('');
+      uid = await Qonversion.launch('PV77YHL7qnGvsdmpTs7gimsxUvY-Znl2');
       print(uid);
     } catch (e) {
       print('Failed to obtain uid from Qonversion.');
@@ -42,12 +44,69 @@ class _MyAppState extends State<MyApp> {
           title: const Text('Qonversion example app'),
         ),
         body: Center(
-          child: Text(
-            'Qonversion uid: \n$_uid\n',
-            textAlign: TextAlign.center,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Text(
+                'Qonversion uid: \n$_uid\n',
+                textAlign: TextAlign.center,
+              ),
+              FlatButton(
+                child: Text('Track'),
+                color: Colors.blue,
+                textColor: Colors.white,
+                onPressed: () async {
+                  final uid = await Qonversion.manualTrackPurchase(
+                      getProductDetails(), getPurchaseDetails());
+                  print(uid);
+                },
+              ),
+            ],
           ),
         ),
       ),
     );
   }
+
+  ProductDetails getProductDetails() {
+    // ignore: invalid_use_of_visible_for_testing_member
+    final original = SkuDetailsWrapper(
+      description: 'description',
+      freeTrialPeriod: 'freeTrialPeriod',
+      introductoryPrice: 'introductoryPrice',
+      introductoryPriceMicros: 'introductoryPriceMicros',
+      introductoryPriceCycles: 'introductoryPriceCycles',
+      introductoryPricePeriod: 'introductoryPricePeriod',
+      price: 'price',
+      priceAmountMicros: 1000,
+      priceCurrencyCode: 'priceCurrencyCode',
+      sku: 'sku',
+      subscriptionPeriod: 'subscriptionPeriod',
+      title: 'title',
+      type: SkuType.inapp,
+      isRewarded: true,
+      originalPrice: 'originalPrice',
+      originalPriceAmountMicros: 1000,
+    );
+    return ProductDetails.fromSkuDetails(original);
+  }
+
+  PurchaseDetails getPurchaseDetails() {
+    // ignore: invalid_use_of_visible_for_testing_member
+    final original = PurchaseWrapper(
+      orderId: 'orderId',
+      packageName: 'packageName',
+      purchaseTime: 0,
+      signature: 'signature',
+      sku: 'sku',
+      purchaseToken: 'purchaseToken',
+      isAutoRenewing: false,
+      originalJson: '{}',
+      developerPayload: 'dummyPayload',
+      isAcknowledged: true,
+      purchaseState: PurchaseStateWrapper.purchased,
+    );
+
+    return PurchaseDetails.fromPurchase(original);
+  }
 }

example/pubspec.yaml

@@ -12,6 +12,7 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.2
+  in_app_purchase: ^0.3.4+8
 
 dev_dependencies:
   flutter_test:

ios/qonversion_flutter.podspec

@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'qonversion_flutter'
-  s.version          = '1.0.1'
+  s.version          = '1.1.0'
   s.summary          = 'Flutter Qonversion SDK'
   s.description      = <<-DESC
   Powerful yet simple subscription analytics

lib/qonversion.dart

@@ -1,5 +1,6 @@
 // This file exists to support old way to import package: 'package:qonversion_flutter/qonversion.dart'.
-// Recommended way to import package no: 'package:qonversion_flutter/qonversion_flutter.dart'.
+// Recommended way to import package now is: 'package:qonversion_flutter/qonversion_flutter.dart'.
 
-export 'src/qonversion.dart';
 export 'src/qa_provider.dart';
+export 'src/qonversion.dart';
+export 'src/serializer.dart';

lib/qonversion_flutter.dart

@@ -1,2 +1,3 @@
-export 'src/qonversion.dart';
 export 'src/qa_provider.dart';
+export 'src/qonversion.dart';
+export 'src/serializer.dart';

lib/src/qonversion.dart

@@ -3,6 +3,8 @@ import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
+import 'package:in_app_purchase/in_app_purchase.dart';
+import 'package:qonversion_flutter/src/serializer.dart';
 
 import 'constants.dart';
 import 'qa_provider.dart';
@@ -40,26 +42,45 @@ class Qonversion {
     return uid;
   }
 
+  /// This is a fallback method if you're not using [official in_app_purchase plugin](https://pub.dev/packages/in_app_purchase).
+  ///
+  /// Use it only if you have to build SkuDetails and PurchaseDetails maps manually on your side.
+  ///
   /// Tracks purchases manually on Android.
   ///
   /// Returns `null` if `!Platform.isAndroid`.
-  ///
-  /// You can use [official in_app_purchase package](https://pub.dev/packages/in_app_purchase) and its
-  /// [SkuDetailsWrapper](https://github.com/flutter/plugins/blob/master/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart)
-  /// and [PurchaseWrapper](https://github.com/flutter/plugins/blob/master/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart)
-  /// to pass [details] and [purchase] arguments.
-  Future<String> trackPurchase(
-      Map<String, dynamic> details, Map<String, dynamic> purchase) async {
+  static Future<String> trackPurchase(Map<String, dynamic> skuDetails,
+      Map<String, dynamic> purchaseDetails) async {
     if (!Platform.isAndroid) return null;
 
     final args = {
-      Constants.kDetails: details,
-      Constants.kPurchase: purchase,
+      Constants.kDetails: skuDetails,
+      Constants.kPurchase: purchaseDetails,
     };
 
-    final uid = await _channel.invokeMethod(Constants.mTrackPurchase, args);
+    return _channel.invokeMethod(Constants.mTrackPurchase, args);
+  }
 
-    return uid;
+  /// Tracks purchases manually on Android.
+  ///
+  /// Returns `null` if `!Platform.isAndroid`.
+  ///
+  /// You have to use [official in_app_purchase plugin](https://pub.dev/packages/in_app_purchase) and instances of its
+  /// [ProductDetails] and [PurchaseDetails] classes received on purchase success to track purchase with Qonversion.
+  static Future<String> manualTrackPurchase(
+      ProductDetails productDetails, PurchaseDetails purchaseDetails) async {
+    if (!Platform.isAndroid) return null;
+
+    final skuDetails = QDetailsSerializer.buildSkuMap(productDetails.skuDetail);
+    final billingClientPurchaseDetails = QDetailsSerializer.buildPurchaseMap(
+        purchaseDetails.billingClientPurchase);
+
+    final args = {
+      Constants.kDetails: skuDetails,
+      Constants.kPurchase: billingClientPurchaseDetails,
+    };
+
+    return _channel.invokeMethod(Constants.mTrackPurchase, args);
   }
 
   /// Sends your attribution [data] to the [provider].

lib/src/serializer.dart

@@ -0,0 +1,47 @@
+import 'package:in_app_purchase/billing_client_wrappers.dart';
+
+class QDetailsSerializer {
+  /// Returns [Map] from billing client's [SkuDetailsWrapper]
+  static Map<String, dynamic> buildSkuMap(SkuDetailsWrapper original) {
+    return <String, dynamic>{
+      'description': original.description,
+      'freeTrialPeriod': original.freeTrialPeriod,
+      'introductoryPrice': original.introductoryPrice,
+      'introductoryPriceMicros': original.introductoryPriceMicros,
+      'introductoryPriceCycles': original.introductoryPriceCycles,
+      'introductoryPricePeriod': original.introductoryPricePeriod,
+      'price': original.price,
+      'priceAmountMicros': original.priceAmountMicros,
+      'priceCurrencyCode': original.priceCurrencyCode,
+      'sku': original.sku,
+      'subscriptionPeriod': original.subscriptionPeriod,
+      'title': original.title,
+      'type': original.type.toString().substring(8),
+      'isRewarded': original.isRewarded,
+      'originalPrice': original.originalPrice,
+      'originalPriceAmountMicros': original.originalPriceAmountMicros,
+    };
+  }
+
+  /// Returns [Map] from billing client's [PurchaseWrapper]
+  static Map<String, dynamic> buildPurchaseMap(PurchaseWrapper original) {
+    const _purchaseStateWrapperEnumMap = {
+      PurchaseStateWrapper.unspecified_state: 0,
+      PurchaseStateWrapper.purchased: 1,
+      PurchaseStateWrapper.pending: 2,
+    };
+    return <String, dynamic>{
+      'orderId': original.orderId,
+      'packageName': original.packageName,
+      'purchaseTime': original.purchaseTime,
+      'signature': original.signature,
+      'sku': original.sku,
+      'purchaseToken': original.purchaseToken,
+      'isAutoRenewing': original.isAutoRenewing,
+      'originalJson': original.originalJson,
+      'developerPayload': original.developerPayload,
+      'purchaseState': _purchaseStateWrapperEnumMap[original.purchaseState],
+      'isAcknowledged': original.isAcknowledged,
+    };
+  }
+}

pubspec.lock

@@ -60,6 +60,20 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  in_app_purchase:
+    dependency: "direct main"
+    description:
+      name: in_app_purchase
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.4+8"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.1"
   matcher:
     dependency: transitive
     description:
@@ -144,4 +158,4 @@ packages:
     version: "2.0.8"
 sdks:
   dart: ">=2.9.0-14.0.dev <3.0.0"
-  flutter: ">=1.10.0 <2.0.0"
+  flutter: ">=1.12.13+hotfix.5 <2.0.0"