Merge branch 'master' into 6.0

# Conflicts:
#	pubspec.yaml

Author: AlexV525

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 5.5.7
+
+- Make `switchPath` method in `AssetPickerProvider` async.
+
 ## 5.5.6
 
 - Add Japanese language text delegate. (Thanks to @KosukeSaigusa)

example/lib/constants/picker_method.dart

@@ -99,6 +99,47 @@ class PickMethod {
     );
   }
 
+  factory PickMethod.cameraAndStay({required int maxAssetsCount}) {
+    return PickMethod(
+      icon: '📸',
+      name: 'Pick from camera and stay',
+      description: 'Take a photo or video with the camera picker, '
+          'select the result and stay in the entities list.',
+      method: (BuildContext context, List<AssetEntity> assets) {
+        return AssetPicker.pickAssets(
+          context,
+          maxAssets: maxAssetsCount,
+          selectedAssets: assets,
+          requestType: RequestType.common,
+          specialItemPosition: SpecialItemPosition.prepend,
+          specialItemBuilder: (BuildContext context) {
+            return GestureDetector(
+              behavior: HitTestBehavior.opaque,
+              onTap: () async {
+                final AssetEntity? result = await CameraPicker.pickFromCamera(
+                  context,
+                  enableRecording: true,
+                );
+                if (result != null) {
+                  final AssetPicker<AssetEntity, AssetPathEntity> picker =
+                      context.findAncestorWidgetOfExactType()!;
+                  final DefaultAssetPickerProvider p =
+                      picker.builder.provider as DefaultAssetPickerProvider;
+                  await p.currentPathEntity!.refreshPathProperties();
+                  await p.switchPath(p.currentPathEntity!);
+                  p.selectAsset(result);
+                }
+              },
+              child: const Center(
+                child: Icon(Icons.camera_enhance, size: 42.0),
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+
   factory PickMethod.common(int maxAssetsCount) {
     return PickMethod(
       icon: '📹',

example/lib/pages/multi_assets_page.dart

@@ -37,6 +37,7 @@ class _MultiAssetsPageState extends State<MultiAssetsPage>
         handleResult: (BuildContext context, AssetEntity result) =>
             Navigator.of(context).pop(<AssetEntity>[...assets, result]),
       ),
+      PickMethod.cameraAndStay(maxAssetsCount: maxAssetsCount),
       PickMethod.common(maxAssetsCount),
       PickMethod.threeItemsGrid(maxAssetsCount),
       PickMethod.customFilterOptions(maxAssetsCount),

example/lib/pages/single_assets_page.dart

@@ -37,6 +37,7 @@ class _SingleAssetPageState extends State<SingleAssetPage>
         handleResult: (BuildContext context, AssetEntity result) =>
             Navigator.of(context).pop(<AssetEntity>[result]),
       ),
+      PickMethod.cameraAndStay(maxAssetsCount: maxAssetsCount),
       PickMethod.common(maxAssetsCount),
       PickMethod.threeItemsGrid(maxAssetsCount),
       PickMethod.customFilterOptions(maxAssetsCount),

lib/src/provider/asset_picker_provider.dart

@@ -366,12 +366,12 @@ class DefaultAssetPickerProvider
   }
 
   @override
-  void switchPath(AssetPathEntity pathEntity) {
+  Future<void> switchPath(AssetPathEntity pathEntity) async {
     _isSwitchingPath = false;
     _currentPathEntity = pathEntity;
     _totalAssetsCount = pathEntity.assetCount;
     notifyListeners();
-    getAssetsFromEntity(0, currentPathEntity!);
+    await getAssetsFromEntity(0, currentPathEntity!);
   }
 
   @override

pubspec.yaml

@@ -1,6 +1,6 @@
 name: wechat_assets_picker
 description: An audio/video/image picker in pure Dart which is the same with WeChat, support multi picking.
-version: 5.5.6
+version: 5.5.7
 homepage: https://github.com/fluttercandies/flutter_wechat_assets_picker
 
 environment: