🚀 Expand FilterOptionGroup to PMFilter (#436)

Author: AlexV525

CHANGELOG.md

@@ -4,11 +4,15 @@ that can be found in the LICENSE file. -->
 
 # Changelog
 
-## 8.4.2+1
+## 8.4.3
+
+### New features
+
+- Add Vietnamese language text delegate. (#424).
 
 ### Improvements
 
-- Support semantics with Vietnamese text delegates. (#424).
+- Expand `FilterOptionGroup` to `PMFilter`. (#436)
 
 ## 8.4.2
 

README-ZH.md

@@ -272,7 +272,7 @@ final List<AssetEntity>? result = await AssetPicker.pickAssets(
 | keepScrollOffset                  | `bool`                               | 选择器是否可以从同样的位置开始选择                                    | `null`                      |
 | sortPathDelegate                  | `SortPathDelegate<AssetPathEntity>?` | 资源路径的排序实现，可自定义路径排序方法                                 | `CommonSortPathDelegate`    |
 | sortPathsByModifiedDate           | `bool`                               | 是否结合 `FilterOptionGroup.containsPathModified` 进行路径排序 | `false`                     |
-| filterOptions                     | `FilterOptionGroup?`                 | 允许用户自定义资源过滤条件                                        | `null`                      |
+| filterOptions                     | `PMFilter?`                          | 允许用户自定义资源过滤条件                                        | `null`                      |
 | gridCount                         | `int`                                | 选择器网格数量                                              | 4                           |
 | themeColor                        | `Color?`                             | 选择器的主题色                                              | `Color(0xff00bc56)`         |
 | pickerTheme                       | `ThemeData?`                         | 选择器的主题提供，包括查看器                                       | `null`                      |

README.md

@@ -282,7 +282,7 @@ Fields in `AssetPickerConfig`:
 | keepScrollOffset                  | `bool`                               | Whether the picker should save the scroll offset between pushes and pops.                    | `null`                      |
 | sortPathDelegate                  | `SortPathDelegate<AssetPathEntity>?` | Path entities sort delegate for the picker, sort paths as you want.                          | `CommonSortPathDelegate`    |
 | sortPathsByModifiedDate           | `bool`                               | Whether to allow sort delegates to sort paths with `FilterOptionGroup.containsPathModified`. | `false`                     |
-| filterOptions                     | `FilterOptionGroup?`                 | Allow users to customize assets filter options.                                              | `null`                      |
+| filterOptions                     | `PMFilter?`                          | Allow users to customize assets filter options.                                              | `null`                      |
 | gridCount                         | `int`                                | Grid count in picker.                                                                        | 4                           |
 | themeColor                        | `Color?`                             | Main theme color for the picker.                                                             | `Color(0xff00bc56)`         |
 | pickerTheme                       | `ThemeData?`                         | Theme data provider for the picker and the viewer.                                           | `null`                      |

example/lib/constants/picker_method.dart

@@ -235,15 +235,13 @@ class PickMethod {
             maxAssets: maxAssetsCount,
             selectedAssets: assets,
             requestType: RequestType.video,
-            filterOptions: FilterOptionGroup()
-              ..setOption(
-                AssetType.video,
-                const FilterOption(
-                  durationConstraint: DurationConstraint(
-                    max: Duration(minutes: 1),
-                  ),
+            filterOptions: FilterOptionGroup(
+              videoOption: const FilterOption(
+                durationConstraint: DurationConstraint(
+                  max: Duration(minutes: 1),
                 ),
               ),
+            ),
           ),
         );
       },

example/pubspec.yaml

@@ -1,6 +1,6 @@
 name: wechat_assets_picker_demo
 description: The demo project for the wechat_assets_picker package.
-version: 8.4.2+36
+version: 8.4.3+37
 publish_to: none
 
 environment:

lib/src/constants/config.dart

@@ -143,7 +143,7 @@ class AssetPickerConfig {
   ///
   /// Will be merged into the base configuration.
   /// 将会与基础条件进行合并。
-  final FilterOptionGroup? filterOptions;
+  final PMFilter? filterOptions;
 
   /// Assets count for the picker.
   /// 资源网格数

lib/src/provider/asset_picker_provider.dart

@@ -277,7 +277,7 @@ class DefaultAssetPickerProvider
   ///
   /// Will be merged into the base configuration.
   /// 将会与基础条件进行合并。
-  final FilterOptionGroup? filterOptions;
+  final PMFilter? filterOptions;
 
   @override
   set currentPath(PathWrapper<AssetPathEntity>? value) {
@@ -316,8 +316,8 @@ class DefaultAssetPickerProvider
     );
 
     // Merge user's filter option into base options if it's not null.
-    if (filterOptions != null) {
-      options.merge(filterOptions!);
+    if (filterOptions is FilterOptionGroup) {
+      options.merge(filterOptions as FilterOptionGroup);
     }
 
     final List<AssetPathEntity> list = await PhotoManager.getAssetPathList(

pubspec.yaml

@@ -1,5 +1,5 @@
 name: wechat_assets_picker
-version: 8.4.2+1
+version: 8.4.3
 description: |
   An image picker (also with videos and audio)
   for Flutter projects based on WeChat's UI,
@@ -17,7 +17,7 @@ dependencies:
     sdk: flutter
 
   extended_image: ^7.0.0
-  photo_manager: ^2.4.0
+  photo_manager: ^2.6.0
   provider: ^6.0.2
   video_player: ^2.4.0