Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 13.1.0
- **CHORE**(android): Migrate the Android module to Flutter's built-in Kotlin (drop the manual Kotlin Gradle Plugin apply) so the plugin no longer triggers the KGP deprecation warning and stays AGP 9+ compatible. Now requires Flutter 3.44+.

## 13.0.0
- **FEAT**(tune): Replace the `luminance` control (which only desaturated) with a real `tint` green–magenta adjustment, the natural complement to `temperature`.
- **FIX**(filter): Fix `colorOverlay` tinting towards the complementary color instead of the overlay color (inverted sign), and rebuild `fade` as a proper fade (lower contrast + lifted black point) instead of a desaturation.
Expand Down
13 changes: 6 additions & 7 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ group = "ch.waio.pro_image_editor"
version = "1.0-SNAPSHOT"

buildscript {
ext.kotlin_version = "2.1.0"
repositories {
google()
mavenCentral()
}

dependencies {
classpath("com.android.tools.build:gradle:8.13.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
}
}

Expand All @@ -22,7 +20,6 @@ allprojects {
}

apply plugin: "com.android.library"
apply plugin: "kotlin-android"

android {
namespace = "ch.waio.pro_image_editor"
Expand All @@ -34,10 +31,6 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17
}

sourceSets {
main.java.srcDirs += "src/main/kotlin"
test.java.srcDirs += "src/test/kotlin"
Expand All @@ -64,3 +57,9 @@ android {
}
}
}

kotlin {
compilerOptions {
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
}
}
11 changes: 6 additions & 5 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id "com.android.application"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}

Expand Down Expand Up @@ -31,10 +30,6 @@ android {
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = '17'
}

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
Expand All @@ -59,6 +54,12 @@ android {
}
}

kotlin {
compilerOptions {
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
}
}

flutter {
source '../..'
}
Expand Down
44 changes: 0 additions & 44 deletions example/android/app/build.gradle.kts

This file was deleted.

21 changes: 0 additions & 21 deletions example/android/build.gradle.kts

This file was deleted.

4 changes: 4 additions & 0 deletions example/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
# This builtInKotlin flag was added automatically by Flutter migrator
android.builtInKotlin=false
# This newDsl flag was added automatically by Flutter migrator
android.newDsl=false
4 changes: 3 additions & 1 deletion example/android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ pluginManagement {
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.12.2" apply false
id "org.jetbrains.kotlin.android" version "2.2.10" apply false
// Kept for third-party plugins that still apply KGP (device_info_plus, audioplayers_android, ...).
// The example app itself uses Flutter's built-in Kotlin (no kotlin-android in app/build.gradle).
id "org.jetbrains.kotlin.android" version "2.2.20" apply false
}

include ":app"
25 changes: 0 additions & 25 deletions example/android/settings.gradle.kts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,13 @@ class OutsideRenderSemanticsGestureHandler
/// Creates a render object that listens for specific semantic gestures.
OutsideRenderSemanticsGestureHandler({
super.child,
GestureTapCallback? onTap,
GestureLongPressCallback? onLongPress,
GestureDragUpdateCallback? onHorizontalDragUpdate,
GestureDragUpdateCallback? onVerticalDragUpdate,
this._onTap,
this._onLongPress,
this._onHorizontalDragUpdate,
this._onVerticalDragUpdate,
this.scrollFactor = 0.8,
super.behavior,
}) : _onTap = onTap,
_onLongPress = onLongPress,
_onHorizontalDragUpdate = onHorizontalDragUpdate,
_onVerticalDragUpdate = onVerticalDragUpdate;
});

/// If non-null, the set of actions to allow. Other actions will be omitted,
/// even if their callback is provided.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ class ContentRecorderController {
/// Initializes the controller with the specified configuration.
/// Optionally enables thumbnail generation and skips initialization.
ContentRecorderController({
required ImageGenerationConfigs configs,
required this._configs,
required this.isVideoEditor,
this.enableThumbnailGeneration = false,
bool ignoreGeneration = false,
}) : _configs = configs {
}) {
containerKey = GlobalKey();
recorderKey = GlobalKey();
recorderStream = StreamController();
Expand Down
22 changes: 8 additions & 14 deletions lib/shared/services/import_export/export_state_history.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,14 @@ import 'utils/key_minifier.dart';
class ExportStateHistory {
/// Constructs an [ExportStateHistory] object with the given parameters.
ExportStateHistory({
required ProImageEditorConfigs editorConfigs,
required List<EditorStateHistory> stateHistory,
required ImageInfos imageInfos,
required int editorPosition,
required ContentRecorderController contentRecorderCtrl,
required BuildContext context,
ExportEditorConfigs configs = const ExportEditorConfigs(),
}) : _configs = configs,
_editorConfigs = editorConfigs,
_stateHistory = stateHistory,
_imageInfos = imageInfos,
_contentRecorderCtrl = contentRecorderCtrl,
_context = context,
_editorPosition = editorPosition;
required this._editorConfigs,
required this._stateHistory,
required this._imageInfos,
required this._editorPosition,
required this._contentRecorderCtrl,
required this._context,
this._configs = const ExportEditorConfigs(),
});

/// The current position of the editor in the state history.
///
Expand Down
6 changes: 3 additions & 3 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: pro_image_editor
description: "A Flutter image editor: Seamlessly enhance your images with user-friendly editing features."
version: 13.0.0
version: 13.1.0
homepage: https://github.com/hm21/pro_image_editor/
repository: https://github.com/hm21/pro_image_editor/
documentation: https://github.com/hm21/pro_image_editor/
Expand Down Expand Up @@ -31,8 +31,8 @@ platforms:
windows:

environment:
sdk: '>=3.11.0 <4.0.0'
flutter: ">=3.41.0"
sdk: '>=3.12.0 <4.0.0'
flutter: ">=3.44.0"

dependencies:
flutter:
Expand Down
Loading