Merge pull request #405 from qonversion/tech/sc-40232/sourceAndVersion

Author: SpertsyanKM

android/src/main/kotlin/com/qonversion/flutter/sdk/qonversion_flutter_sdk/NoCodesPlugin.kt

@@ -60,10 +60,17 @@ class NoCodesPlugin(private val messenger: BinaryMessenger, private val context:
         this.screenFailedToLoadEventStreamHandler = screenFailedToLoadListener.eventStreamHandler
     }
 
-    fun initializeNoCodes(projectKey: String, result: Result) {
+    fun initializeNoCodes(args: Map<String, Any>, result: Result) {
+        val projectKey = args["projectKey"] as? String ?: return result.noNecessaryDataError()
+        val version = args["version"] as? String ?: return result.noNecessaryDataError()
+        val source = args["source"] as? String ?: return result.noNecessaryDataError()
+
         if (projectKey.isNotEmpty()) {
             // Initialize NoCodes Sandwich
             noCodesSandwich = NoCodesSandwich()
+
+            noCodesSandwich?.storeSdkInfo(context, source, version)
+
             noCodesSandwich?.initialize(context, projectKey)
             noCodesSandwich?.setDelegate(this)
             result.success(null)

android/src/main/kotlin/com/qonversion/flutter/sdk/qonversion_flutter_sdk/QonversionPlugin.kt

@@ -133,7 +133,7 @@ class QonversionPlugin : MethodCallHandler, FlutterPlugin, ActivityAware {
             "storeSdkInfo" -> storeSdkInfo(args, result)
             "identify" -> identify(args["userId"] as? String, result)
             // NoCodes methods
-            "initializeNoCodes" -> noCodesPlugin?.initializeNoCodes(args["projectKey"] as? String ?: "", result)
+            "initializeNoCodes" -> noCodesPlugin?.initializeNoCodes(args, result)
             "setScreenPresentationConfig" -> noCodesPlugin?.setScreenPresentationConfig(args["config"] as? Map<String, Any>, args["contextKey"] as? String, result)
             "showNoCodesScreen" -> noCodesPlugin?.showNoCodesScreen(args["contextKey"] as? String, result)
             else -> result.notImplemented()

example/.gitignore

@@ -36,6 +36,7 @@ ios/Podfile.lock
 
 # Android related
 android/keystore/
+.cxx/
 
 # Web related
 lib/generated_plugin_registrant.dart

lib/qonversion_flutter.dart

@@ -7,7 +7,9 @@ export 'src/dto/entitlement_source.dart';
 export 'src/dto/entitlements_cache_lifetime.dart';
 export 'src/dto/environment.dart';
 export 'src/dto/launch_mode.dart';
+export 'src/dto/nocodes_events.dart';
 export 'src/dto/offerings.dart';
+export 'src/dto/presentation_config.dart';
 export 'src/dto/product.dart';
 export 'src/dto/product_type.dart';
 export 'src/dto/promotional_offer.dart';
@@ -42,10 +44,9 @@ export 'src/dto/store_product/product_offer_details.dart';
 export 'src/dto/store_product/product_price.dart';
 export 'src/dto/store_product/product_pricing_phase.dart';
 export 'src/dto/store_product/product_store_details.dart';
+export 'src/nocodes.dart';
+export 'src/nocodes_config.dart';
+export 'src/nocodes_config_builder.dart';
 export 'src/qonversion.dart';
 export 'src/qonversion_config.dart';
 export 'src/qonversion_config_builder.dart';
-export 'src/nocodes/nocodes.dart';
-export 'src/nocodes/nocodes_config.dart';
-export 'src/nocodes/nocodes_events.dart';
-export 'src/nocodes/presentation_config.dart';

lib/src/nocodes/nocodes_events.dart renamed to lib/src/dto/nocodes_events.dart

@@ -33,6 +33,8 @@ class Constants {
   static const kDiscountId = 'discountId';
   static const kPromoOffer = 'promoOffer';
   static const kConfig = 'config';
+  static const kVersion = 'version';
+  static const kSource = 'source';
 
   // MethodChannel methods names
   static const mInitialize = 'initialize';
@@ -74,6 +76,7 @@ class Constants {
   static const mShowNoCodesScreen = 'showNoCodesScreen';
   static const mCloseNoCodes = 'closeNoCodes';
 
-  // Numeric constants
+  // Other constants
   static const skuDetailsPriceRatio = 1000000;
+  static const sdkSource = "flutter";
 }

lib/src/nocodes/presentation_config.dart renamed to lib/src/dto/presentation_config.dart

@@ -1,10 +1,11 @@
 import 'dart:async';
 import 'dart:io';
 import 'package:flutter/services.dart';
-import 'nocodes_events.dart';
-import 'nocodes_config.dart';
-import 'nocodes.dart';
-import 'presentation_config.dart';
+import 'package:qonversion_flutter/src/internal/qonversion_internal.dart';
+import '../dto/nocodes_events.dart';
+import '../dto/presentation_config.dart';
+import '../nocodes_config.dart';
+import '../nocodes.dart';
 import 'dart:convert';
 import '../internal/constants.dart';
 
@@ -28,9 +29,11 @@ class NoCodesInternal implements NoCodes {
     if (Platform.isMacOS) {
       return;
     }
-    
+
     final args = {
       Constants.kProjectKey: config.projectKey,
+      Constants.kVersion: QonversionInternal.sdkVersion,
+      Constants.kSource: Constants.sdkSource,
     };
     _channel.invokeMethod(Constants.mInitializeNoCodes, args);
   }
@@ -152,4 +155,4 @@ class NoCodesInternal implements NoCodes {
 
     await _channel.invokeMethod(Constants.mCloseNoCodes);
   }
-} 
+}

lib/src/internal/constants.dart

@@ -11,7 +11,7 @@ import 'package:qonversion_flutter/src/internal/utils/string.dart';
 import 'constants.dart';
 
 class QonversionInternal implements Qonversion {
-  static const String _sdkVersion = "10.0.2";
+  static const String sdkVersion = "10.0.2";
 
   final MethodChannel _channel = MethodChannel('qonversion_plugin');
 
@@ -402,8 +402,8 @@ class QonversionInternal implements Qonversion {
   // Private methods
   Future<void> _storeSdkInfo() =>
       _channel.invokeMethod(Constants.mStoreSdkInfo, {
-        "version": _sdkVersion,
-        "source": "flutter",
+        Constants.kVersion: sdkVersion,
+        Constants.kSource: Constants.sdkSource,
       });
 
   static QPurchaseException _convertPurchaseException(PlatformException error) {

lib/src/nocodes/nocodes_internal.dart renamed to lib/src/internal/nocodes_internal.dart

@@ -1,8 +1,8 @@
 import 'dart:async';
-import 'nocodes_events.dart';
+import 'dto/nocodes_events.dart';
+import 'dto/presentation_config.dart';
 import 'nocodes_config.dart';
-import 'nocodes_internal.dart';
-import 'presentation_config.dart';
+import 'internal/nocodes_internal.dart';
 
 /// Main No-Codes API class
 ///