Merge v10 changes

.github/workflows/runnable.yml

@@ -13,7 +13,7 @@ on:
       - main
 
 env:
-  MINIMUM_FLUTTER_VERSION: '3.22.3'
+  MINIMUM_FLUTTER_VERSION: '3.27.4'
 
 jobs:
   analyze:
@@ -48,7 +48,9 @@ jobs:
         run: flutter test
       - name: Publish dry-run
         if: matrix.flutter-version != 'min'
-        run: dart pub publish --dry-run
+        run: |
+          git --no-pager diff
+          dart pub publish --dry-run
       - name: Generate docs
         if: matrix.flutter-version != 'min'
         run: |

CHANGELOG.md

@@ -9,7 +9,40 @@ that can be found in the LICENSE file. -->
 
 ## Unreleased
 
-*None.*
+*None*.
+
+## 10.0.0
+
+**Breaking changes**
+
+- Migrate to Flutter 3.27 and drop support for previous Flutter versions.
+- Make delegate respect generic types as much as possible.
+  This is a breaking change for users who use custom delegates and providers.
+  See the migration guide for more details.
+- Remove deprecated methods.
+
+**New features**
+
+- Support multiple append/prepend specials items.
+
+## 9.8.0
+
+> [!NOTE]
+> Be aware of potential minor theme changes since the base theme has taken place in the picker's theme.
+
+**Improvements**
+
+- Improve themes by inheriting the base theme rather than standalone constructors.
+
+**Fixes**
+
+- Enabling using the package on Flutter 3.35.
+
+## 9.7.0
+
+**Improvements**
+
+- Allows specifying the fallback text delegate through `assetPickerTextDelegateFromLocale`.
 
 ## 9.8.0
 

README-ZH.md

@@ -34,13 +34,13 @@ Language: [English](README.md) | 中文
 该插件仅保证能与 **stable 渠道的 Flutter SDK** 配合使用。
 我们不会为其他渠道的 Flutter SDK 做实时支持。
 
-|        | 3.7 | 3.10 | 3.13 | 3.16 | 3.22 |
-|--------|:---:|:----:|:----:|:----:|:----:|
-| 9.5.0+ |  ❌  |  ❌   |  ❌   |  ❌   |  ✅   |
-| 8.9.0+ |  ❌  |  ❌   |  ❌   |  ✅   |  ❌   |
-| 8.7.0+ |  ❌  |  ❌   |  ✅   |  ❌   |  ❌   |
-| 8.5.0+ |  ❌  |  ✅   |  ❌   |  ❌   |  ❌   |
-| 8.4.0+ |  ✅  |  ❌   |  ❌   |  ❌   |  ❌   |
+|         | 3.10 | 3.13 | 3.16 | 3.22 | 3.27 |
+|---------|:----:|:----:|:----:|:----:|:----:|
+| 10.0.0+ |  ❌   |  ❌   |  ❌   |  ❌   |  ✅   |
+| 9.5.0+  |  ❌   |  ❌   |  ❌   |  ✅   |  ✅   |
+| 8.9.0+  |  ❌   |  ❌   |  ✅   |  ❌   |  ❌   |
+| 8.7.0+  |  ❌   |  ✅   |  ❌   |  ❌   |  ❌   |
+| 8.5.0+  |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |
 
 如果在 `flutter pub get` 时遇到了 `resolve conflict` 失败问题，
 请使用 `dependency_overrides` 解决。
@@ -294,8 +294,7 @@ final List<AssetEntity>? result = await AssetPicker.pickAssets(
 | themeColor                        | `Color?`                                         | 选择器的主题色                                              | `Color(0xff00bc56)`         |
 | pickerTheme                       | `ThemeData?`                                     | 选择器的主题提供，包括查看器                                       | `null`                      |
 | textDelegate                      | `AssetPickerTextDelegate?`                       | 选择器的文本代理构建，用于自定义文本                                   | `AssetPickerTextDelegate()` |
-| specialItemPosition               | `SpecialItemPosition`                            | 允许用户在选择器中添加一个自定义item，并指定位置。                          | `SpecialPosition.none`      |
-| specialItemBuilder                | `SpecialItemBuilder?`                            | 自定义item的构造方法                                         | `null`                      |
+| specialItems                      | `List<SpecialItem>`                              | 自定义item列表                                            | `const <SpecialItem>[]`     |
 | loadingIndicatorBuilder           | `IndicatorBuilder?`                              | 加载器的实现                                               | `null`                      |
 | selectPredicate                   | `AssetSelectPredicate`                           | 判断资源可否被选择                                            | `null`                      |
 | shouldRevertGrid                  | `bool?`                                          | 判断资源网格是否需要倒序排列                                       | `null`                      |
@@ -305,6 +304,7 @@ final List<AssetEntity>? result = await AssetPicker.pickAssets(
 | assetsChangeRefreshPredicate      | `AssetsChangeRefreshPredicate<AssetPathEntity>?` | 判断资源变化是否根据 call 和当前选中的路径进行更新                         | `null`                      |
 | shouldAutoplayPreview             | `bool`                                           | 预览是否应自动播放                                            | `false`                     |
 | dragToSelect                      | `bool`                                           | 是否开启拖拽选择                                             | `true`                      |
+| enableLivePhoto                   | `bool`                                           | 是否启用实况图片的功能                                          | `true`                      |
 
 - 当 `maxAssets` 等于 `1`（即单选模式），搭配
   `SpecialPickerType.noPreview` 使用会在用户点选资源换时立刻选中并返回。

README.md

@@ -36,13 +36,13 @@ See the [Migration Guide][] to learn how to migrate between breaking changes.
 The package only guarantees to be working on **the stable version of Flutter**.
 We won't update it in real-time to align with other channels of Flutter.
 
-|        | 3.7 | 3.10 | 3.13 | 3.16 | 3.22 |
-|--------|:---:|:----:|:----:|:----:|:----:|
-| 9.5.0+ |  ❌  |  ❌   |  ❌   |  ❌   |  ✅   |
-| 8.9.0+ |  ❌  |  ❌   |  ❌   |  ✅   |  ❌   |
-| 8.7.0+ |  ❌  |  ❌   |  ✅   |  ❌   |  ❌   |
-| 8.5.0+ |  ❌  |  ✅   |  ❌   |  ❌   |  ❌   |
-| 8.4.0+ |  ✅  |  ❌   |  ❌   |  ❌   |  ❌   |
+|         | 3.10 | 3.13 | 3.16 | 3.22 | 3.27 |
+|---------|:----:|:----:|:----:|:----:|:----:|
+| 10.0.0+ |  ❌   |  ❌   |  ❌   |  ❌   |  ✅   |
+| 9.5.0+  |  ❌   |  ❌   |  ❌   |  ✅   |  ✅   |
+| 8.9.0+  |  ❌   |  ❌   |  ✅   |  ❌   |  ❌   |
+| 8.7.0+  |  ❌   |  ✅   |  ❌   |  ❌   |  ❌   |
+| 8.5.0+  |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |
 
 If you got a `resolve conflict` error when running `flutter pub get`,
 please use `dependency_overrides` to fix it.
@@ -303,8 +303,7 @@ Fields in `AssetPickerConfig`:
 | themeColor                        | `Color?`                                         | Main theme color for the picker.                                                               | `Color(0xff00bc56)`         |
 | pickerTheme                       | `ThemeData?`                                     | Theme data provider for the picker and the viewer.                                             | `null`                      |
 | textDelegate                      | `AssetPickerTextDelegate?`                       | Text delegate for the picker, for customize the texts.                                         | `AssetPickerTextDelegate()` |
-| specialItemPosition               | `SpecialItemPosition`                            | Allow users set a special item in the picker with several positions.                           | `SpecialItemPosition.none`  |
-| specialItemBuilder                | `SpecialItemBuilder?`                            | The widget builder for the special item.                                                       | `null`                      |
+| specialItems                      | `List<SpecialItem>`                              | List of special items.                                                                         | `const <SpecialItem>[]`     |
 | loadingIndicatorBuilder           | `IndicatorBuilder?`                              | Indicates the loading status for the builder.                                                  | `null`                      |
 | selectPredicate                   | `AssetSelectPredicate`                           | Predicate whether an asset can be selected or unselected.                                      | `null`                      |
 | shouldRevertGrid                  | `bool?`                                          | Whether the assets grid should revert.                                                         | `null`                      |
@@ -314,6 +313,7 @@ Fields in `AssetPickerConfig`:
 | assetsChangeRefreshPredicate      | `AssetsChangeRefreshPredicate<AssetPathEntity>?` | Whether assets changing should call refresh with the given call and the current selected path. | `null`                      |
 | shouldAutoPlayPreview             | `bool`                                           | Whether the preview should auto play.                                                          | `false`                     |
 | dragToSelect                      | `bool`                                           | Whether assets selection can be done with drag gestures.                                       | `true`                      |
+| enableLivePhoto                   | `bool`                                           | Whether to enable Live-Photo functionality in the picker.                                      | `true`                      |
 
 - When `maxAssets` equals to `1` (a.k.a. single picking mode),
   use `SpecialPickerType.noPreview` will immediately select asset

example/android/.gitignore

@@ -1,5 +1,7 @@
 gradle-wrapper.jar
 /.gradle
+/.kotlin
+/app/.cxx
 /captures/
 /gradlew
 /gradlew.bat

example/android/app/build.gradle.kts

@@ -0,0 +1,97 @@
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    id("kotlin-kapt")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+fun Any.safeGetVersionProperty(name: String): Any? {
+    val klass = this::class.java
+    runCatching {
+        return klass.getMethod(name).invoke(this)
+    }
+    runCatching {
+        val getterName = "get" + name.capitalize()
+        return klass.getMethod(getterName).invoke(this)
+    }
+    runCatching {
+        return klass.getField(name).get(this)
+    }
+    return null
+}
+
+val packageName = "com.fluttercandies.wechatAssetsPickerExample"
+
+android {
+    namespace = packageName
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = "27.0.12077973"
+
+    defaultConfig {
+        applicationId = packageName
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.safeGetVersionProperty("versionCode") as Int?
+        versionName = flutter.safeGetVersionProperty("versionName") as String?
+    }
+
+    compileOptions {
+        // Sets Java compatibility to Java 17
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    sourceSets {
+        getByName("main") {
+            java.srcDirs("src/main/kotlin")
+        }
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
+    packaging {
+        dex {
+            useLegacyPackaging = true
+        }
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
+
+    signingConfigs {
+        create("forAll") {
+            storeFile = file("${rootDir.absolutePath}/key.jks")
+            storePassword = "picker"
+            keyAlias = "picker"
+            keyPassword = "picker"
+            enableV1Signing = true
+            enableV2Signing = true
+            enableV3Signing = true
+            enableV4Signing = true
+        }
+    }
+
+    buildTypes {
+        getByName("debug") {
+            signingConfig = signingConfigs.getByName("forAll")
+        }
+        getByName("profile") {
+            signingConfig = signingConfigs.getByName("forAll")
+        }
+        getByName("release") {
+            signingConfig = signingConfigs.getByName("forAll")
+        }
+    }
+}
+
+flutter {
+    source = "../.."
+}
+
+dependencies {
+    implementation("com.github.bumptech.glide:glide:4.15.0")
+    kapt("com.github.bumptech.glide:compiler:4.15.0")
+}

example/android/build.gradle.kts

@@ -0,0 +1,24 @@
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory =
+    rootProject.layout.buildDirectory
+        .dir("../../build")
+        .get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}

example/android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip