Merge pull request #449 from qonversion/release/11.7.0

Release 11.7.0

Author: suriksarkisyan

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 11.7.0
+* // Update changelog here
+
 ## 11.6.0
 * // Update changelog here
 

android/build.gradle

@@ -51,6 +51,6 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "io.qonversion:sandwich:7.8.0"
+    implementation "io.qonversion:sandwich:7.9.0"
     implementation 'com.google.code.gson:gson:2.9.0'
 }

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

@@ -106,9 +106,9 @@ class NoCodesPlugin(private val messenger: BinaryMessenger, private val context:
         }
     }
 
-    fun showNoCodesScreen(contextKey: String?, result: Result) {
+    fun showNoCodesScreen(contextKey: String?, customVariables: Map<String, String>?, result: Result) {
         if (contextKey != null) {
-            noCodesSandwich?.showScreen(contextKey)
+            noCodesSandwich?.showScreen(contextKey, customVariables)
             result.success(null)
         } else {
             result.noNecessaryDataError()

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

@@ -105,6 +105,9 @@ class QonversionPlugin : MethodCallHandler, FlutterPlugin, ActivityAware {
             "userProperties" -> {
                 return userProperties(result)
             }
+            "forceSendProperties" -> {
+                return forceSendProperties(result)
+            }
             "logout" -> {
                 qonversionSandwich.logout()
                 return result.success(null)
@@ -159,7 +162,7 @@ class QonversionPlugin : MethodCallHandler, FlutterPlugin, ActivityAware {
             // NoCodes methods
             "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)
+            "showNoCodesScreen" -> noCodesPlugin?.showNoCodesScreen(args["contextKey"] as? String, args["customVariables"] as? Map<String, String>, result)
             "setNoCodesLocale" -> noCodesPlugin?.setLocale(args["locale"] as? String, result)
             "setNoCodesTheme" -> noCodesPlugin?.setTheme(args["theme"] as? String, result)
             // NoCodes Purchase Delegate methods
@@ -252,6 +255,12 @@ class QonversionPlugin : MethodCallHandler, FlutterPlugin, ActivityAware {
         qonversionSandwich.userProperties(result.toJsonResultListener())
     }
 
+    private fun forceSendProperties(result: Result) {
+        qonversionSandwich.forceSendProperties {
+            result.success(null)
+        }
+    }
+
     private fun isFallbackFileAccessible(result: Result) {
         qonversionSandwich.isFallbackFileAccessible(result.toJsonResultListener())
     }

ios/Classes/NoCodesPlugin.swift

@@ -112,8 +112,10 @@ public class NoCodesPlugin: NSObject {
               let contextKey = args["contextKey"] as? String else {
             return result(FlutterError.noNecessaryData)
         }
-        
-        noCodesSandwich?.showScreen(contextKey)
+
+        let customVariables = args["customVariables"] as? [String: String]
+
+        noCodesSandwich?.showScreen(contextKey, customVariables: customVariables)
         result(nil)
     }
 

ios/Classes/SwiftQonversionPlugin.swift

@@ -84,6 +84,9 @@ public class SwiftQonversionPlugin: NSObject, FlutterPlugin {
     case "userProperties":
       return userProperties(result)
 
+    case "forceSendProperties":
+      return forceSendProperties(result)
+
     case "presentCodeRedemptionSheet":
       return presentCodeRedemptionSheet(result)
 
@@ -312,6 +315,12 @@ public class SwiftQonversionPlugin: NSObject, FlutterPlugin {
   private func userProperties(_ result: @escaping FlutterResult) {
     qonversionSandwich?.userProperties(getJsonCompletion(result))
   }
+
+  private func forceSendProperties(_ result: @escaping FlutterResult) {
+    qonversionSandwich?.forceSendProperties {
+      result(nil)
+    }
+  }
 
   private func restore(_ result: @escaping FlutterResult) {
     qonversionSandwich?.restore(getJsonCompletion(result))

ios/qonversion_flutter.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
   s.platform = :ios, '13.0'
-  s.dependency "QonversionSandwich", "7.8.0"
+  s.dependency "QonversionSandwich", "7.9.0"
 
   # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }

lib/src/internal/constants.dart

@@ -38,6 +38,7 @@ class Constants {
   static const kSource = 'source';
   static const kLocale = 'locale';
   static const kTheme = 'theme';
+  static const kCustomVariables = 'customVariables';
 
   // MethodChannel methods names
   static const mInitialize = 'initialize';
@@ -54,6 +55,7 @@ class Constants {
   static const mSetDefinedUserProperty = 'setDefinedUserProperty';
   static const mSetCustomUserProperty = 'setCustomUserProperty';
   static const mUserProperties = 'userProperties';
+  static const mForceSendProperties = 'forceSendProperties';
   static const mSetEntitlementsCacheLifetime = 'setEntitlementsCacheLifetime';
   static const mSyncPurchases = 'syncPurchases';
   static const mAddAttributionData = 'addAttributionData';

lib/src/internal/nocodes_internal.dart

@@ -167,12 +167,16 @@ class NoCodesInternal implements NoCodes {
   }
 
   @override
-  Future<void> showScreen(String contextKey) async {
+  Future<void> showScreen(String contextKey, {Map<String, String>? customVariables}) async {
     if (Platform.isMacOS) {
       return;
     }
-    
-    await _invokeMethod(Constants.mShowNoCodesScreen, {Constants.kContextKey: contextKey});
+
+    final args = <String, dynamic>{
+      Constants.kContextKey: contextKey,
+      if (customVariables != null) Constants.kCustomVariables: customVariables,
+    };
+    await _invokeMethod(Constants.mShowNoCodesScreen, args);
   }
 
   @override

lib/src/internal/qonversion_internal.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 = "11.6.0";
+  static const String sdkVersion = "11.7.0";
 
   final MethodChannel _channel = MethodChannel('qonversion_plugin');
 
@@ -420,6 +420,11 @@ class QonversionInternal implements Qonversion {
     });
   }
 
+  @override
+  Future<void> forceSendProperties() async {
+    await _invokeMethod(Constants.mForceSendProperties);
+  }
+
   @override
   Future<QUserProperties> userProperties() async {
     final rawResult = await _invokeMethod(Constants.mUserProperties);