support custom loading widget delegate

CHANGELOG.md

@@ -1,17 +1,21 @@
 # CHANGELOG
 
 ## [0.1.0] support video
+
 API incompatibility
 
 ImageXXX rename AssetXXX
 
 ## [0.0.8] fix bug
+
 DefaultCheckBoxBuilderDelegate params checkColor not valid bug
 
 ## [0.0.7] fix bug
+
 fix dividerColor not valid bug
 
 ## [0.0.6] add checkbox delegate
+
 users can use CheckBoxDelegate to custom preview right bottom widget
 
 ## [0.0.5] add a params

README.md

@@ -3,7 +3,6 @@
 [![pub package](https://img.shields.io/pub/v/photo.svg)](https://pub.dartlang.org/packages/photo)
 ![Hex.pm](https://img.shields.io/hexpm/l/plug.svg)
 
-
 image picker, multi picker
 use flutter as ui
 
@@ -14,6 +13,7 @@ if you want to build custom ui, you just need api to make custom ui. to use [pho
 ![image](https://github.com/CaiJingLong/some_asset/blob/master/image_picker1.gif)
 
 ## API incompatibility
+
 API incompatibility
 
 because support video, so the ImagePathEntity and ImageEntity rename to AssetPathEntity and AssetEntity.
@@ -68,12 +68,11 @@ import 'package:photo_manager/photo_manager.dart';
     }
     setState(() {});
   }
-
 ```
 
 ## whole example
 
-you can see [github](https://github.com/caijinglong/flutter_photo/blob/master/example/)  [main.dart](https://github.com/caijinglong/flutter_photo/blob/master/example/lib/main.dart)
+you can see [github](https://github.com/caijinglong/flutter_photo/blob/master/example/) [main.dart](https://github.com/caijinglong/flutter_photo/blob/master/example/lib/main.dart)
 
 ## about android
 
@@ -104,12 +103,10 @@ if you use the proguard
 
 see the [github](https://github.com/bumptech/glide#proguard)
 
-
 ## about ios
 
 Because the album is a privacy privilege, you need user permission to access it. You must to modify the `Info.plist` file in Runner project.
 
-
 like next
 
 ```plist
@@ -118,4 +115,4 @@ like next
 ```
 
 xcode like image
-![in xcode](https://github.com/CaiJingLong/some_asset/blob/master/flutter_photo2.png)
+![in xcode](https://github.com/CaiJingLong/some_asset/blob/master/flutter_photo2.png)

lib/photo.dart

@@ -3,19 +3,20 @@ library photo;
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:photo_manager/photo_manager.dart';
-
+import 'package:photo/src/delegate/checkbox_builder_delegate.dart';
+import 'package:photo/src/delegate/loading_delegate.dart';
+import 'package:photo/src/delegate/sort_delegate.dart';
 import 'package:photo/src/entity/options.dart';
 import 'package:photo/src/provider/i18n_provider.dart';
 import 'package:photo/src/ui/dialog/not_permission_dialog.dart';
 import 'package:photo/src/ui/photo_app.dart';
-import 'package:photo/src/delegate/sort_delegate.dart';
-import 'package:photo/src/delegate/checkbox_builder_delegate.dart';
+import 'package:photo_manager/photo_manager.dart';
 
+export 'package:photo/src/delegate/checkbox_builder_delegate.dart';
+export 'package:photo/src/delegate/loading_delegate.dart';
+export 'package:photo/src/delegate/sort_delegate.dart';
 export 'package:photo/src/provider/i18n_provider.dart'
     show I18NCustomProvider, I18nProvider, CNProvider, ENProvider;
-export 'package:photo/src/delegate/sort_delegate.dart';
-export 'package:photo/src/delegate/checkbox_builder_delegate.dart';
 
 class PhotoPicker {
   static PhotoPicker _instance;
@@ -61,6 +62,7 @@ class PhotoPicker {
     I18nProvider provider = I18nProvider.chinese,
     SortDelegate sortDelegate,
     CheckBoxBuilderDelegate checkBoxBuilderDelegate,
+    LoadingDelegate loadingDelegate,
   }) {
     assert(provider != null, "provider must be not null");
     assert(context != null, "context must be not null");
@@ -73,6 +75,8 @@ class PhotoPicker {
     sortDelegate ??= SortDelegate.common;
     checkBoxBuilderDelegate ??= DefaultCheckBoxBuilderDelegate();
 
+    loadingDelegate ??= DefaultLoadingDelegate();
+
     var options = Options(
       rowCount: rowCount,
       dividerColor: dividerColor,
@@ -85,6 +89,7 @@ class PhotoPicker {
       thumbSize: thumbSize,
       sortDelegate: sortDelegate,
       checkBoxBuilderDelegate: checkBoxBuilderDelegate,
+      loadingDelegate: loadingDelegate,
     );
 
     return PhotoPicker()._pickImage(

lib/src/delegate/loading_delegate.dart

@@ -0,0 +1,40 @@
+import 'package:flutter/material.dart';
+import 'package:photo_manager/photo_manager.dart';
+
+abstract class LoadingDelegate {
+  Widget buildBigImageLoading(
+      BuildContext context, AssetEntity entity, Color themeColor);
+
+  Widget buildPreviewLoading(
+      BuildContext context, AssetEntity entity, Color themeColor);
+}
+
+class DefaultLoadingDelegate extends LoadingDelegate {
+  @override
+  Widget buildBigImageLoading(
+      BuildContext context, AssetEntity entity, Color themeColor) {
+    return Center(
+      child: Container(
+        width: 30.0,
+        height: 30.0,
+        child: CircularProgressIndicator(
+          valueColor: AlwaysStoppedAnimation(themeColor),
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget buildPreviewLoading(
+      BuildContext context, AssetEntity entity, Color themeColor) {
+    return Center(
+      child: Container(
+        width: 30.0,
+        height: 30.0,
+        child: CircularProgressIndicator(
+          valueColor: AlwaysStoppedAnimation(themeColor),
+        ),
+      ),
+    );
+  }
+}

lib/src/entity/options.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:photo/src/delegate/checkbox_builder_delegate.dart';
+import 'package:photo/src/delegate/loading_delegate.dart';
 import 'package:photo/src/delegate/sort_delegate.dart';
 
 class Options {
@@ -25,6 +26,8 @@ class Options {
 
   final CheckBoxBuilderDelegate checkBoxBuilderDelegate;
 
+  final LoadingDelegate loadingDelegate;
+
   const Options({
     this.rowCount,
     this.maxSelected,
@@ -37,5 +40,6 @@ class Options {
     this.thumbSize,
     this.sortDelegate,
     this.checkBoxBuilderDelegate,
+    this.loadingDelegate,
   });
 }

lib/src/ui/page/photo_main_page.dart

@@ -1,6 +1,7 @@
 import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
+import 'package:photo/src/delegate/loading_delegate.dart';
 import 'package:photo/src/engine/lru_cache.dart';
 import 'package:photo/src/entity/options.dart';
 import 'package:photo/src/provider/config_provider.dart';
@@ -197,6 +198,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
             entity: data,
             themeColor: themeColor,
             size: options.thumbSize,
+            loadingDelegate: options.loadingDelegate,
           ),
           _buildMask(containsEntity(data)),
           _buildSelected(data),
@@ -487,11 +489,14 @@ class ImageItem extends StatelessWidget {
 
   final int size;
 
+  final LoadingDelegate loadingDelegate;
+
   const ImageItem({
     Key key,
     this.entity,
     this.themeColor,
     this.size = 64,
+    this.loadingDelegate,
   }) : super(key: key);
 
   @override
@@ -511,13 +516,8 @@ class ImageItem extends StatelessWidget {
           return _buildImageItem(futureData);
         }
         return Center(
-          child: Container(
-            width: 20.0,
-            height: 20.0,
-            child: CircularProgressIndicator(
-              valueColor: AlwaysStoppedAnimation(themeColor),
-            ),
-          ),
+          child:
+              loadingDelegate.buildPreviewLoading(context, entity, themeColor),
         );
       },
     );

lib/src/ui/page/photo_preview_page.dart

@@ -238,9 +238,14 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
     var data = list[index];
     return BigPhotoImage(
       assetEntity: data,
+      loadingWidget: _buildLoadingWidget(data),
     );
   }
 
+  Widget _buildLoadingWidget(AssetEntity entity) {
+    return options.loadingDelegate.buildBigImageLoading(context, entity, themeColor);
+  }
+
   void _onPageChanged(int value) {
     pageChangeController.add(value);
   }
@@ -271,6 +276,7 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
               themeColor: themeColor,
               entity: item,
               size: options.thumbSize,
+              loadingDelegate: options.loadingDelegate,
             ),
             IgnorePointer(
               child: StreamBuilder(
@@ -317,8 +323,7 @@ class BigPhotoImage extends StatefulWidget {
 
 class _BigPhotoImageState extends State<BigPhotoImage>
     with AutomaticKeepAliveClientMixin {
-
-  Widget get loadingWidget{
+  Widget get loadingWidget {
     return widget.loadingWidget ?? Container();
   }