Add version 3.0.0

leontobias · leontobias · commit 83fd896249fe · 2023-04-27T23:41:50.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## [3.0.0]
+
+### Changed
+
+* Changed and aligned the error codes for the plugins.
+* [imgly_sdk] Removed custom `Color` class and replaced its usage with the `dart:ui` `Color` class.
+* [video_editor_sdk] Unlocking the license via `VESDK.unlockWithLicense` is now executing asynchronously.
+* [photo_editor_sdk] Unlocking the license via `PESDK.unlockWithLicense` is now executing asynchronously.
+
+### Fixed
+
+* [video_editor_sdk] Fixed tint color of the toolbar would not be applied correctly in the trim tool on iOS.
+
 ## [2.9.0]
 
 ### Added
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ Add the plugin package to the `pubspec.yaml` file in your project:
 
 ```yaml
 dependencies:
-  video_editor_sdk: ^2.9.0
+  video_editor_sdk: ^3.0.0
 ```
 
 Install the new dependency:
diff --git a/android/src/main/kotlin/ly/img/flutter/video_editor_sdk/FlutterVESDK.kt b/android/src/main/kotlin/ly/img/flutter/video_editor_sdk/FlutterVESDK.kt
@@ -66,7 +66,7 @@ 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)
+      result.error(IMGLYConstants.K_ERROR_MULTIPLE_REQUESTS, "Cancelled due to multiple requests.", null)
       return
     }
 
@@ -97,7 +97,7 @@ class FlutterVESDK: FlutterIMGLY() {
           this.present(videoSegments, config, serialization, size)
         }
       } else {
-        result.error("VE.SDK", "The video must not be null", null)
+        result.error(IMGLYConstants.K_ERROR_UNABLE_TO_LOAD, "The video must not be null", null)
       }
     } else if (call.method == "unlock") {
       val license = call.argument<String>("license")
@@ -106,7 +106,7 @@ class FlutterVESDK: FlutterIMGLY() {
     } else if (call.method == "release") {
       val identifier = call.argument<String>("identifier")
       if (identifier == null) {
-        result.error("VE.SDK", "The identifier must not be null", null)
+        result.error(IMGLYConstants.K_ERROR_UNABLE_TO_RELEASE, "The identifier must not be null", null)
       } else {
         this.result = result
         this.releaseTemporaryData(identifier)
@@ -170,7 +170,7 @@ class FlutterVESDK: FlutterIMGLY() {
     if (videoArray.isNotEmpty()) {
       if (source == null) {
         if (size != null) {
-          result?.error("VE.SDK", "Invalid video size: width and height must be greater than zero.", null)
+          result?.error(IMGLYConstants.K_ERROR_UNABLE_TO_LOAD, "Invalid video size: width and height must be greater than zero.", null)
           return
         }
         val video = videoArray.first()
@@ -184,7 +184,7 @@ class FlutterVESDK: FlutterIMGLY() {
       }
     } else {
       if (source == null) {
-        result?.error("VE.SDK", "A video composition without assets must have a specific size.", null)
+        result?.error(IMGLYConstants.K_ERROR_UNABLE_TO_LOAD, "A video composition without assets must have a specific size.", null)
         this.result = null
         return
       }
@@ -288,7 +288,7 @@ class FlutterVESDK: FlutterIMGLY() {
       this.result?.success(null)
       this.result = null
     } catch (e: AuthorizationException) {
-      this.result?.error("VE.SDK", "The license is invalid.", e.message)
+      this.result?.error(IMGLYConstants.K_ERROR_UNABLE_TO_UNLOCK, "The license is invalid.", e.message)
       this.result = null
     }
   }
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1,12 +1,12 @@
 PODS:
   - Flutter (1.0.0)
-  - imgly_sdk (2.9.0):
+  - imgly_sdk (3.0.0):
     - Flutter
     - imglyKit (~> 11.4)
   - imglyKit (11.5.1)
-  - video_editor_sdk (2.9.0):
+  - video_editor_sdk (3.0.0):
     - Flutter
-    - imgly_sdk (= 2.9.0)
+    - imgly_sdk (= 3.0.0)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
@@ -27,9 +27,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  imgly_sdk: a1937f3cd410756297d87d15086a37f24466d288
+  imgly_sdk: a114555e1d98e4a4fa5cc8f2b258353198c64e8b
   imglyKit: b1b3b827799a50b090433ca7c61f90b078944898
-  video_editor_sdk: 2e3a8cbe6f1f09a8e12ba7cbac6f2bd7793bada5
+  video_editor_sdk: f113d4a2fc8838fdeee99a8461fb4c55ba6b9e3f
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
diff --git a/ios/Classes/FlutterVESDK.swift b/ios/Classes/FlutterVESDK.swift
@@ -40,7 +40,7 @@ public class FlutterVESDK: FlutterIMGLY, FlutterPlugin, VideoEditViewControllerD
         guard let arguments = call.arguments as? IMGLYDictionary else { return }
 
         if self.result != nil {
-            result(FlutterError(code: "Multiple requests.", message: "Cancelled due to multiple requests.", details: nil))
+            result(FlutterError(code: IMGLYConstants.kErrorMultipleRequests, message: "Cancelled due to multiple requests.", details: nil))
             return
         }
 
@@ -84,15 +84,15 @@ public class FlutterVESDK: FlutterIMGLY, FlutterPlugin, VideoEditViewControllerD
                         if valid == true {
                             video = Video(segments: assets)
                         } else {
-                            result(FlutterError(code: "Invalid video size: width and height must be greater than zero.", message: nil, details: nil))
+                            result(FlutterError(code: IMGLYConstants.kErrorUnableToLoad, message: "Invalid video size: width and height must be greater than zero.", details: nil))
                             return
                         }
                     }
                 } else {
                     if let videoSize = size {
                         video = Video(size: videoSize)
                     } else {
-                        result(FlutterError(code: "A video composition without assets must have a specific size.", message: nil, details: nil))
+                        result(FlutterError(code: IMGLYConstants.kErrorUnableToLoad, message: "A video composition without assets must have a specific size.", details: nil))
                         return
                     }
                 }
@@ -113,15 +113,15 @@ public class FlutterVESDK: FlutterIMGLY, FlutterPlugin, VideoEditViewControllerD
                         if valid == true {
                             video = Video(segments: resolvedSegments)
                         } else {
-                            result(FlutterError(code: "Invalid video size: width and height must be greater than zero.", message: nil, details: nil))
+                            result(FlutterError(code: IMGLYConstants.kErrorUnableToLoad, message: "Invalid video size: width and height must be greater than zero.", details: nil))
                             return
                         }
                     }
                 } else {
                     if let videoSize = size {
                         video = Video(size: videoSize)
                     } else {
-                        result(FlutterError(code: "A video composition without assets must have a specific size.", message: nil, details: nil))
+                        result(FlutterError(code: IMGLYConstants.kErrorUnableToLoad, message: "A video composition without assets must have a specific size.", details: nil))
                         return
                     }
                 }
@@ -134,13 +134,13 @@ public class FlutterVESDK: FlutterIMGLY, FlutterPlugin, VideoEditViewControllerD
                 video = Video(size: videoSize)
             }
             guard let finalVideo = video else {
-                result(FlutterError(code: "Could not load video.", message: nil, details: nil))
+                result(FlutterError(code: IMGLYConstants.kErrorUnableToLoad, message: "Could not load video.", details: nil))
                 return
             }
 
             self.present(video: finalVideo, configuration: configuration, serialization: serialization)
         } else {
-            result(FlutterError(code: "The video must not be null.", message: nil, details: nil))
+            result(FlutterError(code: IMGLYConstants.kErrorUnableToLoad, message: "The video must not be null.", details: nil))
             return
         }
     }
@@ -185,9 +185,11 @@ public class FlutterVESDK: FlutterIMGLY, FlutterPlugin, VideoEditViewControllerD
         DispatchQueue.main.async {
             do {
                 try VESDK.unlockWithLicense(from: url)
+                self.result?(nil)
                 self.result = nil
             } catch let error {
-                self.handleLicenseError(with: error as NSError)
+                self.result?(FlutterError(code: IMGLYConstants.kErrorUnableToUnlock, message: "Unlocking the SDK failed due to:", details: error.localizedDescription))
+                self.result = nil
             }
         }
     }
@@ -253,26 +255,26 @@ extension FlutterVESDK {
 
         if self.serializationEnabled == true {
             guard let serializationData = videoEditViewController.serializedSettings else {
-                self.handleError(videoEditViewController, code: "Serialization failed.", message: "No serialization data found.", details: nil)
+                self.handleError(videoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: "No serialization data found.", details: nil)
                 return
             }
             if self.serializationType == IMGLYConstants.kExportTypeFileURL {
                 guard let exportURL = self.serializationFile else {
-                    self.handleError(videoEditViewController, code: "Serialization failed.", message: "The URL must not be nil.", details: nil)
+                    self.handleError(videoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: "The URL must not be nil.", details: nil)
                     return
                 }
                 do {
                     try serializationData.IMGLYwriteToUrl(exportURL, andCreateDirectoryIfNeeded: true)
                     serialization = self.serializationFile?.absoluteString
                 } catch let error {
-                  self.handleError(videoEditViewController, code: "Serialization failed.", message: error.localizedDescription, details: error.localizedDescription)
+                  self.handleError(videoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: error.localizedDescription, details: error.localizedDescription)
                     return
                 }
             } else if self.serializationType == IMGLYConstants.kExportTypeObject {
                 do {
                     serialization = try JSONSerialization.jsonObject(with: serializationData, options: .init(rawValue: 0))
                 } catch let error {
-                  self.handleError(videoEditViewController, code: "Serialization failed.", message: error.localizedDescription, details: error.localizedDescription)
+                  self.handleError(videoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: error.localizedDescription, details: error.localizedDescription)
                     return
                 }
             }
@@ -294,7 +296,7 @@ extension FlutterVESDK {
     /// - Parameter videoEditViewController: The `VideoEditViewController` that failed to export the video.
     /// - Parameter error: The `VideoEditorError` that caused the failure.
     public func videoEditViewControllerDidFail(_ videoEditViewController: VideoEditViewController, error: VideoEditorError) {
-      self.handleError(videoEditViewController, code: "Editor failed", message: "The editor did fail to generate the video.", details: error.localizedDescription)
+      self.handleError(videoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: "The editor did fail to generate the video.", details: error.localizedDescription)
     }
 
     /// Called if the `VideoEditViewController` was cancelled.
diff --git a/lib/video_editor_sdk.dart b/lib/video_editor_sdk.dart
@@ -17,8 +17,8 @@ class VESDK {
   /// to include one license for each platform with the same name, but where
   /// the iOS license has `.ios` as its file extension and the
   /// Android license has `.android` as its file extension.
-  static void unlockWithLicense(String path) async {
-    await _channel.invokeMethod('unlock', <String, dynamic>{'license': path});
+  static Future<void> unlockWithLicense(String path) async {
+    return _channel.invokeMethod('unlock', <String, dynamic>{'license': path});
   }
 
   /// Opens a new video editor.
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 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.9.0
-homepage: https://www.videoeditorsdk.com
+version: 3.0.0
+homepage: https://img.ly/products/video-sdk
 repository: https://github.com/imgly/vesdk-flutter
 
 environment:
@@ -11,7 +11,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  imgly_sdk: 2.9.0
+  imgly_sdk: 3.0.0
 
 dev_dependencies:
   flutter_test:
diff --git a/test/video_editor_sdk_test.dart b/test/video_editor_sdk_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
-  const MethodChannel channel = MethodChannel('video_editor_sdk');
+  const channel = MethodChannel('video_editor_sdk');
 
   TestWidgetsFlutterBinding.ensureInitialized();
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public class FlutterVESDK: FlutterIMGLY, FlutterPlugin, VideoEditViewControllerD`
`40`	`40`	`guard let arguments = call.arguments as? IMGLYDictionary else { return }`
`41`	`41`
`42`	`42`	`if self.result != nil {`
`43`		`- result(FlutterError(code: "Multiple requests.", message: "Cancelled due to multiple requests.", details: nil))`
	`43`	`+ result(FlutterError(code: IMGLYConstants.kErrorMultipleRequests, message: "Cancelled due to multiple requests.", details: nil))`
`44`	`44`	`return`
`45`	`45`	`}`
`46`	`46`
`@@ -84,15 +84,15 @@ public class FlutterVESDK: FlutterIMGLY, FlutterPlugin, VideoEditViewControllerD`
`84`	`84`	`if valid == true {`
`85`	`85`	`video = Video(segments: assets)`
`86`	`86`	`} else {`
`87`		`- result(FlutterError(code: "Invalid video size: width and height must be greater than zero.", message: nil, details: nil))`
	`87`	`+ result(FlutterError(code: IMGLYConstants.kErrorUnableToLoad, message: "Invalid video size: width and height must be greater than zero.", details: nil))`
`88`	`88`	`return`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`} else {`
`92`	`92`	`if let videoSize = size {`
`93`	`93`	`video = Video(size: videoSize)`
`94`	`94`	`} else {`
`95`		`- result(FlutterError(code: "A video composition without assets must have a specific size.", message: nil, details: nil))`
	`95`	`+ result(FlutterError(code: IMGLYConstants.kErrorUnableToLoad, message: "A video composition without assets must have a specific size.", details: nil))`
`96`	`96`	`return`
`97`	`97`	`}`
`98`	`98`	`}`
`@@ -113,15 +113,15 @@ public class FlutterVESDK: FlutterIMGLY, FlutterPlugin, VideoEditViewControllerD`
`113`	`113`	`if valid == true {`
`114`	`114`	`video = Video(segments: resolvedSegments)`
`115`	`115`	`} else {`
`116`		`- result(FlutterError(code: "Invalid video size: width and height must be greater than zero.", message: nil, details: nil))`
	`116`	`+ result(FlutterError(code: IMGLYConstants.kErrorUnableToLoad, message: "Invalid video size: width and height must be greater than zero.", details: nil))`
`117`	`117`	`return`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`} else {`
`121`	`121`	`if let videoSize = size {`
`122`	`122`	`video = Video(size: videoSize)`
`123`	`123`	`} else {`
`124`		`- result(FlutterError(code: "A video composition without assets must have a specific size.", message: nil, details: nil))`
	`124`	`+ result(FlutterError(code: IMGLYConstants.kErrorUnableToLoad, message: "A video composition without assets must have a specific size.", details: nil))`
`125`	`125`	`return`
`126`	`126`	`}`
`127`	`127`	`}`
`@@ -134,13 +134,13 @@ public class FlutterVESDK: FlutterIMGLY, FlutterPlugin, VideoEditViewControllerD`
`134`	`134`	`video = Video(size: videoSize)`
`135`	`135`	`}`
`136`	`136`	`guard let finalVideo = video else {`
`137`		`- result(FlutterError(code: "Could not load video.", message: nil, details: nil))`
	`137`	`+ result(FlutterError(code: IMGLYConstants.kErrorUnableToLoad, message: "Could not load video.", details: nil))`
`138`	`138`	`return`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`self.present(video: finalVideo, configuration: configuration, serialization: serialization)`
`142`	`142`	`} else {`
`143`		`- result(FlutterError(code: "The video must not be null.", message: nil, details: nil))`
	`143`	`+ result(FlutterError(code: IMGLYConstants.kErrorUnableToLoad, message: "The video must not be null.", details: nil))`
`144`	`144`	`return`
`145`	`145`	`}`
`146`	`146`	`}`
`@@ -185,9 +185,11 @@ public class FlutterVESDK: FlutterIMGLY, FlutterPlugin, VideoEditViewControllerD`
`185`	`185`	`DispatchQueue.main.async {`
`186`	`186`	`do {`
`187`	`187`	`try VESDK.unlockWithLicense(from: url)`
	`188`	`+ self.result?(nil)`
`188`	`189`	`self.result = nil`
`189`	`190`	`} catch let error {`
`190`		`- self.handleLicenseError(with: error as NSError)`
	`191`	`+ self.result?(FlutterError(code: IMGLYConstants.kErrorUnableToUnlock, message: "Unlocking the SDK failed due to:", details: error.localizedDescription))`
	`192`	`+ self.result = nil`
`191`	`193`	`}`
`192`	`194`	`}`
`193`	`195`	`}`
`@@ -253,26 +255,26 @@ extension FlutterVESDK {`
`253`	`255`
`254`	`256`	`if self.serializationEnabled == true {`
`255`	`257`	`guard let serializationData = videoEditViewController.serializedSettings else {`
`256`		`- self.handleError(videoEditViewController, code: "Serialization failed.", message: "No serialization data found.", details: nil)`
	`258`	`+ self.handleError(videoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: "No serialization data found.", details: nil)`
`257`	`259`	`return`
`258`	`260`	`}`
`259`	`261`	`if self.serializationType == IMGLYConstants.kExportTypeFileURL {`
`260`	`262`	`guard let exportURL = self.serializationFile else {`
`261`		`- self.handleError(videoEditViewController, code: "Serialization failed.", message: "The URL must not be nil.", details: nil)`
	`263`	`+ self.handleError(videoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: "The URL must not be nil.", details: nil)`
`262`	`264`	`return`
`263`	`265`	`}`
`264`	`266`	`do {`
`265`	`267`	`try serializationData.IMGLYwriteToUrl(exportURL, andCreateDirectoryIfNeeded: true)`
`266`	`268`	`serialization = self.serializationFile?.absoluteString`
`267`	`269`	`} catch let error {`
`268`		`- self.handleError(videoEditViewController, code: "Serialization failed.", message: error.localizedDescription, details: error.localizedDescription)`
	`270`	`+ self.handleError(videoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: error.localizedDescription, details: error.localizedDescription)`
`269`	`271`	`return`
`270`	`272`	`}`
`271`	`273`	`} else if self.serializationType == IMGLYConstants.kExportTypeObject {`
`272`	`274`	`do {`
`273`	`275`	`serialization = try JSONSerialization.jsonObject(with: serializationData, options: .init(rawValue: 0))`
`274`	`276`	`} catch let error {`
`275`		`- self.handleError(videoEditViewController, code: "Serialization failed.", message: error.localizedDescription, details: error.localizedDescription)`
	`277`	`+ self.handleError(videoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: error.localizedDescription, details: error.localizedDescription)`
`276`	`278`	`return`
`277`	`279`	`}`
`278`	`280`	`}`
`@@ -294,7 +296,7 @@ extension FlutterVESDK {`
`294`	`296`	/// - Parameter videoEditViewController: The `VideoEditViewController` that failed to export the video.
`295`	`297`	/// - Parameter error: The `VideoEditorError` that caused the failure.
`296`	`298`	`public func videoEditViewControllerDidFail(_ videoEditViewController: VideoEditViewController, error: VideoEditorError) {`
`297`		`- self.handleError(videoEditViewController, code: "Editor failed", message: "The editor did fail to generate the video.", details: error.localizedDescription)`
	`299`	`+ self.handleError(videoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: "The editor did fail to generate the video.", details: error.localizedDescription)`
`298`	`300`	`}`
`299`	`301`
`300`	`302`	/// Called if the `VideoEditViewController` was cancelled.