🐛 Unify indicators usage (#344)

* ⚡️ Unify indicators usage

* ⬆️ Use latest `photo_manager`

* 🔖 7.3.3

Author: AlexV525

CHANGELOG.md

@@ -4,6 +4,12 @@ that can be found in the LICENSE file. -->
 
 # Changelog
 
+## 7.3.3
+
+### Fixes
+
+- Unify indicators usage to avoid accidentally indicator switching. (#344)
+
 ## 7.3.2
 
 ### Improvements

example/lib/customs/pickers/directory_file_asset_picker.dart

@@ -765,31 +765,6 @@ class FileAssetPickerBuilder
     return RepaintBoundary(child: Image.file(asset, fit: BoxFit.cover));
   }
 
-  @override
-  Widget loadingIndicator(BuildContext context) {
-    return Center(
-      child: Selector<FileAssetPickerProvider, bool>(
-        selector: (_, FileAssetPickerProvider p) => p.isAssetsEmpty,
-        builder: (_, bool isAssetsEmpty, __) {
-          if (isAssetsEmpty) {
-            return Text(textDelegate.emptyList);
-          } else {
-            return Center(
-              child: SizedBox.fromSize(
-                size: Size.square(Screens.width / gridCount / 3),
-                child: CircularProgressIndicator(
-                  valueColor: AlwaysStoppedAnimation<Color>(
-                    theme.iconTheme.color ?? Colors.grey,
-                  ),
-                ),
-              ),
-            );
-          }
-        },
-      ),
-    );
-  }
-
   @override
   Widget pathEntityListBackdrop(BuildContext context) {
     return ValueListenableBuilder<bool>(

lib/src/delegates/asset_picker_builder_delegate.dart

@@ -414,29 +414,30 @@ abstract class AssetPickerBuilderDelegate<Asset, Path> {
     );
   }
 
+  /// Indicator when no assets were found from the current path.
+  /// 当前目录下无资源的显示
+  Widget emptyIndicator(BuildContext context) {
+    return ScaleText(
+      textDelegate.emptyList,
+      maxScaleFactor: 1.5,
+      semanticsLabel: semanticsTextDelegate.emptyList,
+    );
+  }
+
   /// Loading indicator.
   /// 加载指示器
   Widget loadingIndicator(BuildContext context) {
-    return Center(
-      child: Selector<AssetPickerProvider<Asset, Path>, bool>(
-        selector: (_, AssetPickerProvider<Asset, Path> p) => p.isAssetsEmpty,
-        builder: (BuildContext c, bool isAssetsEmpty, Widget? w) {
-          if (loadingIndicatorBuilder != null) {
-            return loadingIndicatorBuilder!(c, isAssetsEmpty);
-          }
-          if (isAssetsEmpty) {
-            return ScaleText(
-              textDelegate.emptyList,
-              maxScaleFactor: 1.5,
-              semanticsLabel: semanticsTextDelegate.emptyList,
-            );
-          }
-          return w!;
-        },
-        child: PlatformProgressIndicator(
-          color: theme.iconTheme.color,
-          size: context.mediaQuery.size.width / gridCount / 3,
-        ),
+    return Selector<AssetPickerProvider<Asset, Path>, bool>(
+      selector: (_, AssetPickerProvider<Asset, Path> p) => p.isAssetsEmpty,
+      builder: (BuildContext context, bool isAssetsEmpty, Widget? w) {
+        if (loadingIndicatorBuilder != null) {
+          return loadingIndicatorBuilder!(context, isAssetsEmpty);
+        }
+        return Center(child: isAssetsEmpty ? emptyIndicator(context) : w);
+      },
+      child: PlatformProgressIndicator(
+        color: theme.iconTheme.color,
+        size: context.mediaQuery.size.width / gridCount / 3,
       ),
     );
   }
@@ -1039,8 +1040,7 @@ class DefaultAssetPickerBuilderDelegate
           specialItem = null;
         }
         if (totalCount == 0 && specialItem == null) {
-          return loadingIndicatorBuilder?.call(context, true) ??
-              Center(child: emptyIndicator(context));
+          return loadingIndicator(context);
         }
         // Then we use the [totalCount] to calculate placeholders we need.
         final int placeholderCount;
@@ -1525,32 +1525,6 @@ class DefaultAssetPickerBuilderDelegate
     );
   }
 
-  Widget emptyIndicator(BuildContext context) {
-    return ScaleText(
-      textDelegate.emptyList,
-      maxScaleFactor: 1.5,
-      semanticsLabel: semanticsTextDelegate.emptyList,
-    );
-  }
-
-  @override
-  Widget loadingIndicator(BuildContext context) {
-    return Center(
-      child: Selector<DefaultAssetPickerProvider, bool>(
-        selector: (_, DefaultAssetPickerProvider p) => p.isAssetsEmpty,
-        builder: (BuildContext context, bool isAssetsEmpty, __) {
-          if (isAssetsEmpty) {
-            return emptyIndicator(context);
-          }
-          return PlatformProgressIndicator(
-            color: theme.iconTheme.color,
-            size: context.mediaQuery.size.width / gridCount / 3,
-          );
-        },
-      ),
-    );
-  }
-
   /// While the picker is switching path, this will displayed.
   /// If the user tapped on it, it'll collapse the list widget.
   ///

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: 7.3.2
+version: 7.3.3
 homepage: https://github.com/fluttercandies/flutter_wechat_assets_picker
 
 environment:
@@ -12,7 +12,7 @@ dependencies:
     sdk: flutter
 
   extended_image: ^6.2.0
-  photo_manager: ^2.1.0+1
+  photo_manager: ^2.1.4
   provider: ^6.0.2
   video_player: ^2.4.0