Merge pull request #41 from mindbox-cloud/release/2.5.0-rc

Release/2.5.0 rc

Author: sergeysozinov

mindbox/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.5.0-rc
+
+This version of the SDK includes support for in-app messages. You will now be able to personalize your app by showing users appropriate campaigns based on their actions in the app, on the website, or purchases in retail stores.
+You can now launch in-app notifications for users from a certain city, region, or country or exclude the segment of users who should not see the in-app notification.
+You can also display in-app notifications when an API is called in your app. Display the message in a specific place in the app or when a user performs a specific action. Learn more in the guide.
+
+Also in this release we added logging of important events in the sdk.
+
 ## 2.2.0
 
 * Fix issue when using Firebase onBackgroundMessage handler breaks android part of plugin

mindbox/lib/mindbox.dart

@@ -10,7 +10,7 @@ export 'package:mindbox_platform_interface/mindbox_platform_interface.dart'
         MindboxNetworkError,
         MindboxInternalError,
         MindboxValidationError,
-        MindboxServerError;
+        MindboxServerError, LogLevel;
 
 /// Basic Mindbox API.
 class Mindbox {
@@ -64,11 +64,30 @@ class Mindbox {
     MindboxPlatform.instance.getToken(callback: callback);
   }
 
+  /// Method for managing sdk logging
+  void setLogLevel({required LogLevel logLevel}) {
+    MindboxPlatform.instance.setLogLevel(logLevel: logLevel);
+  }
+
   /// Method for handling push-notification click.
   ///
   /// Returns link from push-notification to callback.
-  void onPushClickReceived(Function(String link, String payload) callback) {
-    MindboxPlatform.instance.onPushClickReceived(callback: callback);
+  void onPushClickReceived(PushClickHandler handler) {
+    MindboxPlatform.instance.onPushClickReceived(handler: handler);
+  }
+
+  /// Method for handling In-app click.
+  ///
+  /// Returns id, redirectUrl and payload from In-app to callback.
+  void onInAppClickRecieved(InAppClickHandler handler) {
+    MindboxPlatform.instance.onInAppClickRecieved(handler: handler);
+  }
+
+  /// Method for handling In-app dismiss.
+  ///
+  /// Returns id when In-app dismiss to callback.
+  void onInAppDismissed(InAppDismissedHandler handler) {
+    MindboxPlatform.instance.onInAppismissed(handler: handler);
   }
 
   /// Method for register a custom event.

mindbox/pubspec.yaml

@@ -1,8 +1,9 @@
 name: mindbox
 description: Flutter Mindbox SDK. Plugin wrapper over of Mindbox iOS/Android SDK.
-version: 2.2.0
+version: 2.5.0-rc
 homepage: https://mindbox.cloud/
-repository: https://github.com/mindbox-moscow/flutter-sdk/tree/master/mindbox
+repository: https://github.com/mindbox-cloud/flutter-sdk/tree/master/mindbox
+documentation: https://developers.mindbox.ru/docs/flutter-sdk-integration
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
@@ -19,11 +20,11 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  mindbox_android: ^2.2.0
-  mindbox_ios: ^2.1.3
-  mindbox_platform_interface: ^2.1.1
+  mindbox_android: ^2.5.0-rc
+  mindbox_ios: ^2.5.0-rc
+  mindbox_platform_interface: ^2.2.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^2.0.1
+  flutter_lints: ^2.0.1

mindbox/test/mindbox_test.dart

@@ -103,8 +103,8 @@ class StubMindboxPlatform extends MindboxPlatform {
 
   @override
   void onPushClickReceived({
-    required Function(String url, String payload) callback,
+    required PushClickHandler handler,
   }) {
-    callback('dummy-url', 'dummy-payload');
+    handler('dummy-url', 'dummy-payload');
   }
 }

mindbox_android/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.5.0-rc
+
+* Upgrade native SDK dependency to v2.5.0.
+* Add new methods for In-app functionality support
+
 ## 2.2.0
 
 * Fix issue when using Firebase onBackgroundMessage handler breaks plugin

mindbox_android/android/build.gradle

@@ -49,5 +49,5 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'cloud.mindbox:mobile-sdk:2.1.10'
+    implementation 'cloud.mindbox:mobile-sdk:2.5.0'
 }

mindbox_android/android/src/main/kotlin/cloud/mindbox/mindbox_android/MindboxAndroidPlugin.kt

@@ -7,6 +7,8 @@ import android.os.Looper
 import androidx.annotation.NonNull
 import cloud.mindbox.mobile_sdk.Mindbox
 import cloud.mindbox.mobile_sdk.MindboxConfiguration
+import cloud.mindbox.mobile_sdk.inapp.presentation.InAppCallback
+import cloud.mindbox.mobile_sdk.logger.Level
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.embedding.engine.plugins.activity.ActivityAware
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
@@ -22,24 +24,28 @@ class MindboxAndroidPlugin : FlutterPlugin, MethodCallHandler, ActivityAware, Ne
     private var binding: ActivityPluginBinding? = null
     private var deviceUuidSubscription: String? = null
     private var tokenSubscription: String? = null
-    lateinit var channel: MethodChannel
+    private lateinit var channel: MethodChannel
 
-    companion object {
-        @Deprecated(
-            "Push clicks are processed inside the library now. This method will be removed in future release." +
-                    " Please abort changes you make following points 3.3 and 5 of Mindbox API intructions",
-            level = DeprecationLevel.WARNING
-        )
-        fun pushClicked(link: String, payload: String) {
+    inner class InAppCallbackImpl : InAppCallback {
+        override fun onInAppClick(id: String, redirectUrl: String, payload: String) {
+            Handler(Looper.getMainLooper()).post {
+                channel.invokeMethod("onInAppClick", listOf(id, redirectUrl, payload))
+            }
+        }
+
+        override fun onInAppDismissed(id: String) {
+            Handler(Looper.getMainLooper()).post {
+                channel.invokeMethod("onInAppDismissed", id)
+            }
         }
     }
 
-    override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+    override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
         channel = MethodChannel(flutterPluginBinding.binaryMessenger, "mindbox.cloud/flutter-sdk")
         channel.setMethodCallHandler(this)
     }
 
-    override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
+    override fun onMethodCall(call: MethodCall, result: Result) {
         when (call.method) {
             "getSdkVersion" -> {
                 result.success(Mindbox.getSdkVersion())
@@ -60,6 +66,7 @@ class MindboxAndroidPlugin : FlutterPlugin, MethodCallHandler, ActivityAware, Ne
                         .shouldCreateCustomer(shouldCreateCustomer)
                         .build()
                     Mindbox.init(context, config, listOf())
+                    Mindbox.registerInAppCallback(InAppCallbackImpl())
                     result.success("initialized")
                 } else {
                     result.error("-1", "Initialization error", "Wrong argument type")
@@ -107,13 +114,24 @@ class MindboxAndroidPlugin : FlutterPlugin, MethodCallHandler, ActivityAware, Ne
                         })
                 }
             }
+            "setLogLevel" -> {
+                if(call.arguments is Int)
+                {
+                    val logIndex: Int = call.arguments as Int
+                    val logLevel : Level = Level.values()[logIndex]
+                    Mindbox.setLogLevel(logLevel)
+                    result.success(0)
+                } else {
+                     result.error("-1", "Initialization error", "Wrong argument type")
+                }
+            }
             else -> {
                 result.notImplemented()
             }
         }
     }
 
-    override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) {
+    override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
         channel.setMethodCallHandler(null)
     }
 

mindbox_android/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

mindbox_android/lib/src/mindbox_android_platform.dart

@@ -37,12 +37,30 @@ class MindboxAndroidPlatform extends MindboxPlatform {
     _methodHandler.getToken(callback: callback);
   }
 
+  /// Method for managing sdk logging
+  @override
+  void setLogLevel({required LogLevel logLevel}) {
+    _methodHandler.setLogLevel(logLevel: logLevel);
+  }
+
   /// Returns link from push to callback.
   @override
   void onPushClickReceived({
-    required Function(String link, String payload) callback,
+    required PushClickHandler handler,
   }) {
-    _methodHandler.handlePushClick(callback: callback);
+    _methodHandler.handlePushClick(handler: handler);
+  }
+
+  /// Returns id, redirectUrl and payload from In-app to callback.
+  @override
+  void onInAppClickRecieved({required InAppClickHandler handler}) {
+    _methodHandler.handleInAppClick(handler: handler);
+  }
+
+  /// Returns id from In-app to callback.
+  @override
+  void onInAppismissed({required InAppDismissedHandler handler}) {
+    _methodHandler.handleInAppDismiss(handler: handler);
   }
 
   /// Method for register a custom event.

mindbox_android/pubspec.yaml

@@ -1,8 +1,8 @@
 name: mindbox_android
 description: The implementation of 'mindbox' plugin for the Android platform.
-version: 2.2.0
+version: 2.5.0-rc
 homepage: https://mindbox.cloud/
-repository: https://github.com/mindbox-moscow/flutter-sdk/tree/master/mindbox_android
+repository: https://github.com/mindbox-cloud/flutter-sdk/tree/master/mindbox_android
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
@@ -19,9 +19,9 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  mindbox_platform_interface: ^2.1.1
+  mindbox_platform_interface: ^2.2.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^2.0.1
+  flutter_lints: ^2.0.1