Skip to content

Commit 67365c1

Browse files
leontobiasleontobias
committed
Add version 3.0.0
1 parent 19d8382 commit 67365c1

File tree

8 files changed

+46
-29
lines changed

8 files changed

+46
-29
lines changed

‎CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
## [3.0.0]
2+
3+
### Changed
4+
5+
* Changed and aligned the error codes for the plugins.
6+
* [imgly_sdk] Removed custom `Color` class and replaced its usage with the `dart:ui` `Color` class.
7+
* [video_editor_sdk] Unlocking the license via `VESDK.unlockWithLicense` is now executing asynchronously.
8+
* [photo_editor_sdk] Unlocking the license via `PESDK.unlockWithLicense` is now executing asynchronously.
9+
10+
### Fixed
11+
12+
* [video_editor_sdk] Fixed tint color of the toolbar would not be applied correctly in the trim tool on iOS.
13+
114
## [2.9.0]
215

316
### Added

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Add the plugin package to the `pubspec.yaml` file in your project:
3030

3131
```yaml
3232
dependencies:
33-
photo_editor_sdk: ^2.9.0
33+
photo_editor_sdk: ^3.0.0
3434
```
3535
3636
Install the new dependency:

‎android/src/main/kotlin/ly/img/flutter/photo_editor_sdk/FlutterPESDK.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class FlutterPESDK: FlutterIMGLY() {
6161

6262
override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
6363
if (this.result != null) {
64-
result.error("Multiple requests.", "Cancelled due to multiple requests.", null)
64+
result.error(IMGLYConstants.K_ERROR_MULTIPLE_REQUESTS, "Cancelled due to multiple requests.", null)
6565
return
6666
}
6767

@@ -93,11 +93,11 @@ class FlutterPESDK: FlutterIMGLY() {
9393
this.result = result
9494
this.present(imageData, config, serialization)
9595
} else {
96-
result.error("PE.SDK", "The specified serialization did not include a photo.", null)
96+
result.error(IMGLYConstants.K_ERROR_UNABLE_TO_LOAD, "The specified serialization did not include a photo.", null)
9797
return
9898
}
9999
} else {
100-
result.error("PE.SDK", "No image has been specified or included in the serialization.", null)
100+
result.error(IMGLYConstants.K_ERROR_UNABLE_TO_LOAD, "No image has been specified or included in the serialization.", null)
101101
return
102102
}
103103
}
@@ -156,7 +156,7 @@ class FlutterPESDK: FlutterIMGLY() {
156156
this.result?.success(null)
157157
this.result = null
158158
} catch (e: AuthorizationException) {
159-
this.result?.error("PE.SDK", "The license is invalid.", e.message)
159+
this.result?.error(IMGLYConstants.K_ERROR_UNABLE_TO_UNLOCK, "The license is invalid.", e.message)
160160
this.result = null
161161
}
162162
}

‎example/ios/Podfile.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
PODS:
22
- Flutter (1.0.0)
3-
- imgly_sdk (2.9.0):
3+
- imgly_sdk (3.0.0):
44
- Flutter
55
- imglyKit (~> 11.4)
66
- imglyKit (11.5.1)
7-
- photo_editor_sdk (2.9.0):
7+
- photo_editor_sdk (3.0.0):
88
- Flutter
9-
- imgly_sdk (= 2.9.0)
9+
- imgly_sdk (= 3.0.0)
1010

1111
DEPENDENCIES:
1212
- Flutter (from `Flutter`)
@@ -27,9 +27,9 @@ EXTERNAL SOURCES:
2727

2828
SPEC CHECKSUMS:
2929
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
30-
imgly_sdk: a1937f3cd410756297d87d15086a37f24466d288
30+
imgly_sdk: a114555e1d98e4a4fa5cc8f2b258353198c64e8b
3131
imglyKit: b1b3b827799a50b090433ca7c61f90b078944898
32-
photo_editor_sdk: 5e72294f9947007ff0918717f74a1186c1210f6d
32+
photo_editor_sdk: d5eea1abfd23930ec45163f95d92e2570434e4cc
3333

3434
PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
3535

‎ios/Classes/FlutterPESDK.swift

+14-12
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class FlutterPESDK: FlutterIMGLY, FlutterPlugin, PhotoEditViewControllerD
3737
guard let arguments = call.arguments as? IMGLYDictionary else { return }
3838

3939
if self.result != nil {
40-
result(FlutterError(code: "Multiple requests.", message: "Cancelled due to multiple requests.", details: nil))
40+
result(FlutterError(code: IMGLYConstants.kErrorMultipleRequests, message: "Cancelled due to multiple requests.", details: nil))
4141
return
4242
}
4343

@@ -83,7 +83,7 @@ public class FlutterPESDK: FlutterIMGLY, FlutterPlugin, PhotoEditViewControllerD
8383
if let serializationPhoto = deserializationResult?.photo {
8484
finalPhotoAsset = Photo.from(photoRepresentation: serializationPhoto)
8585
} else {
86-
self.result?(FlutterError(code: "Photo must not be nil.", message: "The specified serialization did not include a photo.", details: nil))
86+
self.result?(FlutterError(code: IMGLYConstants.kErrorUnableToLoad, message: "The specified serialization did not include a photo.", details: nil))
8787
self.result = nil
8888
return nil
8989
}
@@ -92,7 +92,7 @@ public class FlutterPESDK: FlutterIMGLY, FlutterPlugin, PhotoEditViewControllerD
9292
}
9393

9494
guard let finalPhoto = finalPhotoAsset else {
95-
self.result?(FlutterError(code: "Photo must not be nil.", message: "No image has been specified or included in the serialization.", details: nil))
95+
self.result?(FlutterError(code: IMGLYConstants.kErrorUnableToLoad, message: "No image has been specified or included in the serialization.", details: nil))
9696
self.result = nil
9797
return nil
9898
}
@@ -121,9 +121,11 @@ public class FlutterPESDK: FlutterIMGLY, FlutterPlugin, PhotoEditViewControllerD
121121
DispatchQueue.main.async {
122122
do {
123123
try PESDK.unlockWithLicense(from: url)
124+
self.result?(nil)
124125
self.result = nil
125126
} catch let error {
126-
self.handleLicenseError(with: error as NSError)
127+
self.result?(FlutterError(code: IMGLYConstants.kErrorUnableToUnlock, message: "Unlocking the SDK failed due to:", details: error.localizedDescription))
128+
self.result = nil
127129
}
128130
}
129131
}
@@ -153,7 +155,7 @@ extension FlutterPESDK {
153155
/// - Parameter result: The `PhotoEditorResult` from the editor.
154156
public func photoEditViewControllerDidFinish(_ photoEditViewController: PhotoEditViewController, result: PhotoEditorResult) {
155157
guard let uti = result.output.uti else {
156-
self.handleError(photoEditViewController, code: "Image could not be saved.", message: nil, details: nil)
158+
self.handleError(photoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: "Failed to retrieve the output UTI.", details: nil)
157159
return
158160
}
159161

@@ -164,21 +166,21 @@ extension FlutterPESDK {
164166
if imageData.isEmpty == false {
165167
if self.exportType == IMGLYConstants.kExportTypeFileURL {
166168
guard let fileURL = self.exportFile else {
167-
self.handleError(photoEditViewController, code: "Export type must not be nil.", message: "No valid export type has been specified.", details: self.exportFile?.absoluteString)
169+
self.handleError(photoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: "No valid export type has been specified.", details: self.exportFile?.absoluteString)
168170
return
169171
}
170172
do {
171173
try imageData.IMGLYwriteToUrl(fileURL, andCreateDirectoryIfNeeded: true)
172174
imageString = fileURL.absoluteString
173175
} catch let error {
174-
self.handleError(photoEditViewController, code: "Image could not be saved.", message: "Error message: \(error.localizedDescription)", details: error.localizedDescription)
176+
self.handleError(photoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: error.localizedDescription, details: error.localizedDescription)
175177
return
176178
}
177179
} else if self.exportType == IMGLYConstants.kExportTypeDataURL {
178180
if let mediaType = UTTypeCopyPreferredTagWithClass(uti as CFString, kUTTagClassMIMEType)?.takeRetainedValue() as? NSString {
179181
imageString = String(format: "data:%@;base64,%@", mediaType, imageData.base64EncodedString())
180182
} else {
181-
self.handleError(photoEditViewController, code: "Image could not be saved.", message: "The output UTI could not be read.", details: nil)
183+
self.handleError(photoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: "The output UTI could not be read.", details: nil)
182184
return
183185
}
184186
}
@@ -190,21 +192,21 @@ extension FlutterPESDK {
190192
}
191193
if self.serializationType == IMGLYConstants.kExportTypeFileURL {
192194
guard let exportURL = self.serializationFile else {
193-
self.handleError(photoEditViewController, code: "Serialization failed.", message: "The URL must not be nil.", details: nil)
195+
self.handleError(photoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: "The URL must not be nil.", details: nil)
194196
return
195197
}
196198
do {
197199
try serializationData.IMGLYwriteToUrl(exportURL, andCreateDirectoryIfNeeded: true)
198200
serialization = self.serializationFile?.absoluteString
199201
} catch let error {
200-
self.handleError(photoEditViewController, code: "Serialization failed.", message: error.localizedDescription, details: error.localizedDescription)
202+
self.handleError(photoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: error.localizedDescription, details: error.localizedDescription)
201203
return
202204
}
203205
} else if self.serializationType == IMGLYConstants.kExportTypeObject {
204206
do {
205207
serialization = try JSONSerialization.jsonObject(with: serializationData, options: .init(rawValue: 0))
206208
} catch let error {
207-
self.handleError(photoEditViewController, code: "Serialization failed.", message: error.localizedDescription, details: error.localizedDescription)
209+
self.handleError(photoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: error.localizedDescription, details: error.localizedDescription)
208210
return
209211
}
210212
}
@@ -223,7 +225,7 @@ extension FlutterPESDK {
223225
/// - Parameter photoEditViewController: The editor that failed to export.
224226
/// - Parameter error: The `PhotoEditorError` that caused the failure.
225227
public func photoEditViewControllerDidFail(_ photoEditViewController: PhotoEditViewController, error: PhotoEditorError) {
226-
self.handleError(photoEditViewController, code: "Editor failed", message: "The editor did fail to generate the image.", details: error.localizedDescription)
228+
self.handleError(photoEditViewController, code: IMGLYConstants.kErrorUnableToExport, message: "The editor did fail to generate the image.", details: error.localizedDescription)
227229
}
228230

229231
/// Delegate function that is called if the `PhotoEditViewController` has

‎lib/photo_editor_sdk.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class PESDK {
1717
/// to include one license for each platform with the same name, but where
1818
/// the iOS license has `.ios` as its file extension and the
1919
/// Android license has `.android` as its file extension.
20-
static void unlockWithLicense(String path) async {
21-
await _channel.invokeMethod('unlock', <String, dynamic>{'license': path});
20+
static Future<void> unlockWithLicense(String path) async {
21+
return _channel.invokeMethod('unlock', <String, dynamic>{'license': path});
2222
}
2323

2424
/// Opens a new photo editor.

‎pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: photo_editor_sdk
22
description: The official Flutter plugin for PhotoEditor SDK. Integrate the photo editor into your own iOS or Android app - in minutes!
3-
version: 2.9.0
4-
homepage: https://www.photoeditorsdk.com
3+
version: 3.0.0
4+
homepage: https://img.ly/products/photo-sdk
55
repository: https://github.com/imgly/pesdk-flutter
66

77
environment:
@@ -11,7 +11,7 @@ environment:
1111
dependencies:
1212
flutter:
1313
sdk: flutter
14-
imgly_sdk: 2.9.0
14+
imgly_sdk: 3.0.0
1515

1616
dev_dependencies:
1717
flutter_test:

‎test/photo_editor_sdk_test.dart

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ import 'package:flutter/services.dart';
22
import 'package:flutter_test/flutter_test.dart';
33

44
void main() {
5-
const MethodChannel channel = MethodChannel('photo_editor_sdk');
5+
const channel = MethodChannel('photo_editor_sdk');
66

77
TestWidgetsFlutterBinding.ensureInitialized();
88

99
setUp(() {});
1010

11-
tearDown(() {});
11+
tearDown(() {
12+
channel.setMockMethodCallHandler(null);
13+
});
1214
}

0 commit comments

Comments
 (0)