Add version 2.3.0

Author: leontobias

CHANGELOG.md

@@ -1,3 +1,20 @@
+## [2.3.0]
+
+### Changed
+
+* [imgly_sdk] Removed `WRITE_EXTERNAL_STORAGE` permission request when opening the editor on Android.
+* [imgly_sdk] Aligned emoji support for iOS and Android. Emoji support is not optimized for cross-platform use and disabled by default. Added option `TextOptions.allowEmojis`.
+* [imgly_sdk] Updated documentation for remote resources used in the editor. Remote resources are usable but not optimized and therefore should be downloaded in advance and then passed to the editor as local resources.
+
+### Added
+
+* [imgly_sdk] Added integration and documentation for custom watermark. Use `Configuration.watermark` to add a custom watermark to the image/video.
+
+### Fixed
+
+* Fixed unexpected behavior when invoking multiple requests.
+* [imgly_sdk] Fixed `CompositionOptions.personalVideoClips` would not be resolved correctly on Android.
+
 ## [2.2.0]
 
 ### Changed

LICENSE

@@ -4,7 +4,7 @@ In order to run any samples or use any wrapper without a watermark,
 you'll have to purchase a commercial PhotoEditor SDK or VideoEditor SDK 
 license. Visit https://img.ly for more details.
 
-Copyright (c) 2014-2021, img.ly GmbH
+Copyright (c) 2014-2022, img.ly GmbH
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -23,7 +23,7 @@ Add the plugin package to the `pubspec.yaml` file in your project:
 
 ```yaml
 dependencies:
-  video_editor_sdk: ^2.2.0
+  video_editor_sdk: ^2.3.0
 ```
 
 Install the new dependency:
@@ -57,11 +57,11 @@ flutter pub get
        }
        dependencies {
            classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10"
-           classpath 'ly.img.android.sdk:plugin:9.1.0'
+           classpath 'ly.img.android.sdk:plugin:9.2.0'
        }
    }
    ```
-   In order to update VideoEditor SDK for Android replace the version string `9.1.0` with a [newer release](https://github.com/imgly/pesdk-android-demo/releases).
+   In order to update VideoEditor SDK for Android replace the version string `9.2.0` with a [newer release](https://github.com/imgly/pesdk-android-demo/releases).
 
 3. Still in the `android/build.gradle` file (**not** `android/app/build.gradle`), add these lines at the bottom:
 

android/build.gradle

@@ -39,7 +39,7 @@ imglyConfig {
     }
 }
 
-def MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION = "9.1.0"
+def MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION = "9.2.0"
 
 task checkVersion {
     if (imglyConfig.convertToVersionNumber(imglyConfig.getVersion()) < imglyConfig.convertToVersionNumber(MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION)) {

android/gradle.properties

@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
-android.enableJetifier=true

android/src/main/kotlin/ly/img/flutter/video_editor_sdk/FlutterVESDK.kt

@@ -29,6 +29,7 @@ import org.json.JSONObject
 import java.io.File
 
 import ly.img.flutter.imgly_sdk.FlutterIMGLY
+import java.util.UUID
 
 /** FlutterVESDK */
 class FlutterVESDK: FlutterIMGLY() {
@@ -48,6 +49,11 @@ class FlutterVESDK: FlutterIMGLY() {
   }
 
   override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
+    if (this.result != null) {
+      result?.error("Multiple requests.", "Cancelled due to multiple requests.", null)
+      return
+    }
+
     if (call.method == "openEditor") {
       var config = call.argument<MutableMap<String, Any>>("configuration")
       val serialization = call.argument<String>("serialization")
@@ -109,6 +115,7 @@ class FlutterVESDK: FlutterIMGLY() {
       startEditor(settingsList, EDITOR_RESULT_ID)
     } else {
       result?.error("VESDK", "The video editor is only available in Android 4.3 and later.", null)
+      this.result = null
     }
   }
 
@@ -133,6 +140,7 @@ class FlutterVESDK: FlutterIMGLY() {
         if (source == null) {
           if (size != null) {
             result?.error("VESDK", "Invalid video size: width and height must be greater than zero.", null)
+            this.result = null
             return
           }
           val video = videos.first()
@@ -148,6 +156,7 @@ class FlutterVESDK: FlutterIMGLY() {
       } else {
         if (source == null) {
           result?.error("VESDK", "A video composition without assets must have a specific size.", null)
+          this.result = null
           return
         }
       }
@@ -160,6 +169,7 @@ class FlutterVESDK: FlutterIMGLY() {
       startEditor(settingsList, EDITOR_RESULT_ID)
     } else {
       result?.error("VESDK", "The video editor is only available in Android 4.3 and later.", null)
+      this.result = null
       return
     }
   }
@@ -196,8 +206,10 @@ class FlutterVESDK: FlutterIMGLY() {
       VESDK.initSDKWithLicenseData(license)
       IMGLY.authorize()
       this.result?.success(null)
+      this.result = null
     } catch (e: AuthorizationException) {
       this.result?.error("Invalid license", "The license must be valid.", e.message)
+      this.result = null
     }
   }
 
@@ -211,6 +223,7 @@ class FlutterVESDK: FlutterIMGLY() {
     if (resultCode == Activity.RESULT_CANCELED && requestCode == EDITOR_RESULT_ID) {
       currentActivity?.runOnUiThread {
         this.result?.success(null)
+        this.result = null
       }
       return true
     } else if (resultCode == Activity.RESULT_OK && requestCode == EDITOR_RESULT_ID) {
@@ -228,8 +241,8 @@ class FlutterVESDK: FlutterIMGLY() {
             when (serializationConfig.exportType) {
               SerializationExportType.FILE_URL -> {
                 val uri = serializationConfig.filename?.let {
-                  Uri.parse(it)
-                } ?: Uri.fromFile(File.createTempFile("serialization", ".json"))
+                  Uri.parse("$it.json")
+                } ?: Uri.fromFile(File.createTempFile("serialization-" + UUID.randomUUID().toString(), ".json"))
                 Encoder.createOutputStream(uri).use { outputStream ->
                   IMGLYFileWriter(settingsList).writeJson(outputStream)
                 }
@@ -254,6 +267,7 @@ class FlutterVESDK: FlutterIMGLY() {
       map["serialization"] = serialization
       currentActivity?.runOnUiThread {
         this.result?.success(map)
+        this.result = null
       }
       return true
     }

example/android/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext.kotlin_version = '1.4.10'
-    ext.vesdk_version = '9.1.0'
+    ext.vesdk_version = '9.2.0'
 
     repositories {
         google()

example/ios/Podfile.lock

@@ -1,10 +1,10 @@
 PODS:
   - Flutter (1.0.0)
-  - imgly_sdk (2.2.0):
+  - imgly_sdk (2.3.0):
     - Flutter
-    - imglyKit (~> 10.28)
-  - imglyKit (10.28.0)
-  - video_editor_sdk (2.2.0):
+    - imglyKit (~> 10.29)
+  - imglyKit (10.29.0)
+  - video_editor_sdk (2.3.0):
     - Flutter
     - imgly_sdk
 
@@ -27,9 +27,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  imgly_sdk: 6cfbf5f5f6cb930894cba52eddccb4f5053f1fc1
-  imglyKit: bfeea206adebae46df97ba75880e743df8c40653
-  video_editor_sdk: 1d15b32379538515cd124e00f6da034e5a249280
+  imgly_sdk: eb837fc720405caf0a7c436418017f074a612ba3
+  imglyKit: 26b2761be3d790354b9a5ffb0c066b320318027c
+  video_editor_sdk: d41316090df87c37e701cb2331f81dbd6ca738d2
 
 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
 

ios/Classes/FlutterVESDK.swift

@@ -37,8 +37,8 @@ public class FlutterVESDK: FlutterIMGLY, FlutterPlugin, VideoEditViewControllerD
         guard let arguments = call.arguments as? IMGLYDictionary else { return }
 
         if self.result != nil {
-            self.result?(FlutterError(code: "multiple_requests", message: "Cancelled due to multiple requests.", details: nil))
-            self.result = nil
+            result(FlutterError(code: "Multiple requests.", message: "Cancelled due to multiple requests.", details: nil))
+            return
         }
 
         if call.method == "openEditor" {
@@ -183,26 +183,30 @@ extension FlutterVESDK {
             if self.serializationType == IMGLYConstants.kExportTypeFileURL {
                 guard let exportURL = self.serializationFile else {
                     self.result?(FlutterError(code: "Serialization failed.", message: "The URL must not be nil.", details: nil))
+                    self.result = nil
                     return
                 }
                 do {
                     try serializationData.IMGLYwriteToUrl(exportURL, andCreateDirectoryIfNeeded: true)
                     serialization = self.serializationFile?.absoluteString
                 } catch let error {
                     self.result?(FlutterError(code: "Serialization failed.", message: error.localizedDescription, details: error))
+                    self.result = nil
                 }
             } else if self.serializationType == IMGLYConstants.kExportTypeObject {
                 do {
                     serialization = try JSONSerialization.jsonObject(with: serializationData, options: .init(rawValue: 0))
                 } catch let error {
                     self.result?(FlutterError(code: "Serialization failed.", message: error.localizedDescription, details: error))
+                    self.result = nil
                 }
             }
         }
 
         self.dismiss(mediaEditViewController: videoEditViewController, animated: true) {
             let res: [String: Any?] = ["video": url?.absoluteString, "hasChanges": videoEditViewController.hasChanges, "serialization": serialization]
             self.result?(res)
+            self.result = nil
         }
     }
 
@@ -211,6 +215,7 @@ extension FlutterVESDK {
     public func videoEditViewControllerDidFailToGenerateVideo(_ videoEditViewController: VideoEditViewController) {
         self.dismiss(mediaEditViewController: videoEditViewController, animated: true) {
             self.result?(FlutterError(code: "editor_failed", message: "The editor did fail to generate the video.", details: nil))
+            self.result = nil
         }
     }
 
@@ -219,6 +224,7 @@ extension FlutterVESDK {
     public func videoEditViewControllerDidCancel(_ videoEditViewController: VideoEditViewController) {
         self.dismiss(mediaEditViewController: videoEditViewController, animated: true) {
             self.result?(nil)
+            self.result = nil
         }
     }
 }

lib/video_editor_sdk.dart

@@ -54,12 +54,19 @@ class Video {
   /// The [video] source should either be a full path, an URI
   /// or if it is an asset the relative path as specified in
   /// your `pubspec.yaml` file.
+  /// Remote resources are not optimized and therefore should be downloaded
+  /// in advance and then passed to the editor as local resources.
   Video(String video)
       : _video = video,
         _videos = null,
         _size = null;
 
   /// Creates a new video composition with multiple videos.
+  /// The [videos] each should either be a full path, an URI
+  /// or if it is an asset the relative path as specified in
+  /// your `pubspec.yaml` file.
+  /// Remote resources are not optimized and therefore should be downloaded
+  /// in advance and then passed to the editor as local resources.
   /// The [size] overrides the natural dimensions of the video(s) passed to the
   /// editor. All videos will be fitted to the [size] aspect by adding
   /// black bars on the left and right side or top and bottom.
@@ -75,9 +82,19 @@ class Video {
         _video = null;
 
   /// The video source.
+  /// The source should either be a full path, an URI
+  /// or if it is an asset the relative path as specified in
+  /// your `pubspec.yaml` file.
+  /// Remote resources are not optimized and therefore should be downloaded
+  /// in advance and then passed to the editor as local resources.
   final String? _video;
 
   /// The sources for the video composition.
+  /// The sources should each either be a full path, an URI
+  /// or if it is an asset the relative path as specified in
+  /// your `pubspec.yaml` file.
+  /// Remote resources are not optimized and therefore should be downloaded
+  /// in advance and then passed to the editor as local resources.
   final List<String>? _videos;
 
   /// The [Size] of the composition.

pubspec.yaml

@@ -1,6 +1,6 @@
 name: video_editor_sdk
 description: The official Flutter plugin for VideoEditor SDK. Integrate the video editor into your own iOS or Android app - in minutes!
-version: 2.2.0
+version: 2.3.0
 homepage: https://www.videoeditorsdk.com
 repository: https://github.com/imgly/vesdk-flutter
 
@@ -11,7 +11,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  imgly_sdk: 2.2.0
+  imgly_sdk: 2.3.0
 
 dev_dependencies:
   flutter_test: