✨ AssetPickerViewer.pushToViewerWithDelegate

Author: AlexV525

lib/src/widget/asset_picker.dart

@@ -17,7 +17,7 @@ class AssetPicker<A, P> extends StatelessWidget {
 
   final AssetPickerBuilderDelegate<A, P> builder;
 
-  static Future<void> _permissionCheck() async {
+  static Future<void> permissionCheck() async {
     final PermissionState _ps = await PhotoManager.requestPermissionExtend();
     if (_ps != PermissionState.authorized && _ps != PermissionState.limited) {
       throw StateError('Permission state error with $_ps.');
@@ -80,7 +80,7 @@ class AssetPicker<A, P> extends StatelessWidget {
       throw ArgumentError('Custom item did not set properly.');
     }
 
-    await _permissionCheck();
+    await permissionCheck();
 
     final DefaultAssetPickerProvider provider = DefaultAssetPickerProvider(
       maxAssets: maxAssets,
@@ -136,7 +136,7 @@ class AssetPicker<A, P> extends StatelessWidget {
     Curve routeCurve = Curves.easeIn,
     Duration routeDuration = const Duration(milliseconds: 300),
   }) async {
-    await _permissionCheck();
+    await permissionCheck();
 
     final Widget picker =
         ChangeNotifierProvider<AssetPickerProvider<A, P>>.value(

lib/src/widget/asset_picker_viewer.dart

@@ -34,47 +34,52 @@ class AssetPickerViewer<A, P> extends StatefulWidget {
     SpecialPickerType? specialPickerType,
     int? maxAssets,
   }) async {
-    try {
-      final Widget viewer = AssetPickerViewer<AssetEntity, AssetPathEntity>(
-        builder: DefaultAssetPickerViewerBuilderDelegate(
-          currentIndex: currentIndex,
-          previewAssets: previewAssets,
-          provider: selectedAssets != null
-              ? AssetPickerViewerProvider<AssetEntity>(selectedAssets)
-              : null,
-          themeData: themeData,
-          previewThumbSize: previewThumbSize,
-          specialPickerType: specialPickerType,
-          selectedAssets: selectedAssets,
-          selectorProvider: selectorProvider,
-          maxAssets: maxAssets,
-        ),
-      );
-      final PageRouteBuilder<List<AssetEntity>> pageRoute =
-          PageRouteBuilder<List<AssetEntity>>(
-        pageBuilder: (
-          BuildContext context,
-          Animation<double> animation,
-          Animation<double> secondaryAnimation,
-        ) {
-          return viewer;
-        },
-        transitionsBuilder: (
-          BuildContext context,
-          Animation<double> animation,
-          Animation<double> secondaryAnimation,
-          Widget child,
-        ) {
-          return FadeTransition(opacity: animation, child: child);
-        },
-      );
-      final List<AssetEntity>? result =
-          await Navigator.of(context).push<List<AssetEntity>>(pageRoute);
-      return result;
-    } catch (e) {
-      realDebugPrint('Error when calling assets picker viewer: $e');
-      return null;
-    }
+    await AssetPicker.permissionCheck();
+    final Widget viewer = AssetPickerViewer<AssetEntity, AssetPathEntity>(
+      builder: DefaultAssetPickerViewerBuilderDelegate(
+        currentIndex: currentIndex,
+        previewAssets: previewAssets,
+        provider: selectedAssets != null
+            ? AssetPickerViewerProvider<AssetEntity>(selectedAssets)
+            : null,
+        themeData: themeData,
+        previewThumbSize: previewThumbSize,
+        specialPickerType: specialPickerType,
+        selectedAssets: selectedAssets,
+        selectorProvider: selectorProvider,
+        maxAssets: maxAssets,
+      ),
+    );
+    final PageRouteBuilder<List<AssetEntity>> pageRoute =
+        PageRouteBuilder<List<AssetEntity>>(
+      pageBuilder: (_, __, ___) => viewer,
+      transitionsBuilder: (_, Animation<double> animation, __, Widget child) {
+        return FadeTransition(opacity: animation, child: child);
+      },
+    );
+    final List<AssetEntity>? result =
+        await Navigator.of(context).push<List<AssetEntity>>(pageRoute);
+    return result;
+  }
+
+  /// Call the viewer with provided delegate and provider.
+  /// 通过指定的 [delegate] 调用查看器
+  static Future<List<A>?> pushToViewerWithDelegate<A, P>(
+    BuildContext context, {
+    required AssetPickerViewerBuilderDelegate<A, P> delegate,
+  }) async {
+    await AssetPicker.permissionCheck();
+    final Widget viewer = AssetPickerViewer<A, P>(builder: delegate);
+    final PageRouteBuilder<List<A>> pageRoute = PageRouteBuilder<List<A>>(
+      pageBuilder: (_, __, ___) => viewer,
+      transitionsBuilder: (_, Animation<double> animation, __, Widget child) {
+        return FadeTransition(opacity: animation, child: child);
+      },
+    );
+    final List<A>? result = await Navigator.of(context).push<List<A>>(
+      pageRoute,
+    );
+    return result;
   }
 }