diff --git a/android/build.gradle b/android/build.gradle index 29926c0..9bd5b4b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -23,6 +23,7 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { + namespace "com.loichamdi.multipleimagespicker" compileSdkVersion 29 defaultConfig { @@ -36,6 +37,6 @@ android { dependencies { implementation 'androidx.exifinterface:exifinterface:1.3.1' - implementation 'com.sangcomz:FishBun:0.11.2' + implementation 'io.github.sangcomz:fishbun:1.1.1' implementation 'com.github.bumptech.glide:glide:4.11.0' } diff --git a/android/src/main/java/com/loichamdi/multipleimagespicker/MultipleImagesPickerPlugin.java b/android/src/main/java/com/loichamdi/multipleimagespicker/MultipleImagesPickerPlugin.java index 7effc55..1c76643 100644 --- a/android/src/main/java/com/loichamdi/multipleimagespicker/MultipleImagesPickerPlugin.java +++ b/android/src/main/java/com/loichamdi/multipleimagespicker/MultipleImagesPickerPlugin.java @@ -23,7 +23,6 @@ import com.sangcomz.fishbun.FishBun; import com.sangcomz.fishbun.FishBunCreator; import com.sangcomz.fishbun.adapter.image.impl.GlideAdapter; -import com.sangcomz.fishbun.define.Define; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -611,7 +610,7 @@ public boolean onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == REQUEST_CODE_CHOOSE && resultCode == Activity.RESULT_CANCELED) { finishWithError("CANCELLED", "The user has cancelled the selection"); } else if (requestCode == REQUEST_CODE_CHOOSE && resultCode == Activity.RESULT_OK) { - List photos = data.getParcelableArrayListExtra(Define.INTENT_PATH); + List photos = data.getParcelableArrayListExtra(FishBun.INTENT_PATH); if (photos == null) { clearMethodCallAndResult(); return false; diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 51f4f5d..32f1220 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -7,7 +7,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^0.1.2 + cupertino_icons: ^1.0.6 dev_dependencies: flutter_test: diff --git a/lib/src/asset_thumb_provider.dart b/lib/src/asset_thumb_provider.dart index 2462398..85a4b5d 100644 --- a/lib/src/asset_thumb_provider.dart +++ b/lib/src/asset_thumb_provider.dart @@ -26,7 +26,7 @@ class AssetThumbImageProvider extends ImageProvider { }); @override - ImageStreamCompleter load(AssetThumbImageProvider key, DecoderCallback decode) { + ImageStreamCompleter loadImage(AssetThumbImageProvider key, ImageDecoderCallback decode) { return new MultiFrameImageStreamCompleter( codec: _loadAsync(key), scale: key.scale, diff --git a/pubspec.yaml b/pubspec.yaml index 4d655ae..5771eea 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,12 +1,12 @@ name: multiple_images_picker description: Pick multiple images on iOS and Android. -version: 1.0.1 +version: 1.1.0 homepage: https://github.com/loic-hamdi/multiple_images_picker dependencies: flutter: sdk: flutter - meta: ^1.8.0 + meta: ^1.10.0 dev_dependencies: flutter_test: @@ -23,7 +23,5 @@ flutter: pluginClass: MultipleImagesPickerPlugin environment: - sdk: '>=2.18.1 <3.0.0' - flutter: ">=1.17.0" - # sdk: ">=2.12.0 <3.0.0" - # flutter: ">=1.12.13" + sdk: '>=3.2.0' + flutter: ">=3.16.0"