Merge pull request #60 from CaiJingLong/photo-manager-0.4.0

photo manager to 0.4.0
version 0.4.0.
Use paging loading to optimize performance.

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.4.0
+
+roolback `photo_manager` to `0.4.0`
+
+- support androidQ.
+
 ## 0.3.4+1
 
 fix:

example/lib/asset_image.dart

@@ -22,34 +22,29 @@ class AssetImageWidget extends StatelessWidget {
     if (assetEntity == null) {
       return _buildContainer();
     }
-    return FutureBuilder<Size>(
-      builder: (c, s) {
-        if (!s.hasData) {
-          return Container();
+
+    print(
+        "assetEntity.width = ${assetEntity.width} , assetEntity.height = ${assetEntity.height}");
+
+    return FutureBuilder<Uint8List>(
+      builder: (BuildContext context, snapshot) {
+        if (snapshot.hasData) {
+          return _buildContainer(
+            child: Image.memory(
+              snapshot.data,
+              width: width,
+              height: height,
+              fit: boxFit,
+            ),
+          );
+        } else {
+          return _buildContainer();
         }
-        var size = s.data;
-        return FutureBuilder<Uint8List>(
-          builder: (BuildContext context, snapshot) {
-            if (snapshot.hasData) {
-              return _buildContainer(
-                child: Image.memory(
-                  snapshot.data,
-                  width: width,
-                  height: height,
-                  fit: boxFit,
-                ),
-              );
-            } else {
-              return _buildContainer();
-            }
-          },
-          future: assetEntity.thumbDataWithSize(
-            size.width.toInt(),
-            size.height.toInt(),
-          ),
-        );
       },
-      future: assetEntity.size,
+      future: assetEntity.thumbDataWithSize(
+        width.toInt(),
+        height.toInt(),
+      ),
     );
   }
 

lib/src/engine/throttle.dart

@@ -21,7 +21,7 @@ class Throttle {
     this.duration = const Duration(seconds: 2),
   });
 
-  void call() {
+  void call(call) {
     if (!_isRunning) {
       _startTimer();
       onCall?.call();

lib/src/provider/asset_provider.dart

@@ -0,0 +1,60 @@
+import 'dart:async';
+
+import 'package:photo_manager/photo_manager.dart';
+
+class AssetProvider {
+  Map<AssetPathEntity, AssetPaging> _dataMap = {};
+
+  AssetPathEntity _current;
+
+  AssetPathEntity get current => _current;
+
+  set current(AssetPathEntity current) {
+    _current = current;
+    if (_dataMap[current] == null) {
+      final paging = AssetPaging(current);
+      _dataMap[current] = paging;
+    }
+  }
+
+  List<AssetEntity> get data => _dataMap[current]?.data ?? [];
+
+  Future<void> loadMore() async {
+    final paging = getPaging();
+    if (paging != null) {
+      await paging.loadMore();
+    }
+  }
+
+  AssetPaging getPaging() => _dataMap[current];
+
+  bool get noMore => getPaging()?.noMore ?? false;
+
+  int get count => data?.length ?? 0;
+}
+
+class AssetPaging {
+  int page = 0;
+
+  List<AssetEntity> data = [];
+
+  final AssetPathEntity path;
+
+  final int pageCount;
+
+  bool noMore = false;
+
+  AssetPaging(this.path, {this.pageCount = 50});
+
+  Future<void> loadMore() async {
+    if (noMore == true) {
+      return;
+    }
+    var data = await path.getAssetListPaged(page, pageCount);
+    if (data.length == 0) {
+      noMore = true;
+    }
+    page++;
+    this.data.addAll(data);
+  }
+}

lib/src/provider/config_provider.dart

@@ -1,12 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:photo/src/entity/options.dart';
+import 'package:photo/src/provider/asset_provider.dart';
 import 'package:photo/src/provider/i18n_provider.dart';
 
-class ConfigProvider extends InheritedWidget {
+class PhotoPickerProvider extends InheritedWidget {
   final Options options;
   final I18nProvider provider;
+  final AssetProvider assetProvider = AssetProvider();
 
-  ConfigProvider({
+  PhotoPickerProvider({
     @required this.options,
     @required this.provider,
     @required Widget child,
@@ -18,6 +20,9 @@ class ConfigProvider extends InheritedWidget {
     return true;
   }
 
-  static ConfigProvider of(BuildContext context) =>
-      context.inheritFromWidgetOfExactType(ConfigProvider);
+  static PhotoPickerProvider of(BuildContext context) =>
+      context.inheritFromWidgetOfExactType(PhotoPickerProvider);
+
+  static AssetProvider assetProviderOf(BuildContext context) =>
+      of(context).assetProvider;
 }

lib/src/ui/dialog/change_gallery_dialog.dart

@@ -42,7 +42,7 @@ class _ChangeGalleryDialogState extends State<ChangeGalleryDialog> {
 
     return FlatButton(
       child: ListTile(
-        title: Text(text),
+        title: Text("$text (${entity.assetCount})"),
       ),
       onPressed: () {
         Navigator.pop(context, entity);

lib/src/ui/page/main/image_item.dart

@@ -54,23 +54,14 @@ class ImageItem extends StatelessWidget {
       height: double.infinity,
       fit: BoxFit.cover,
     );
-    // FutureBuilder()
-    var badge = FutureBuilder<Duration>(
-      future: entity.videoDuration,
-      builder: (ctx, snapshot) {
-        if (snapshot.hasData && snapshot != null) {
-          var buildBadge =
-              badgeDelegate?.buildBadge(context, entity.type, snapshot.data);
-          if (buildBadge == null) {
-            return Container();
-          } else {
-            return buildBadge;
-          }
-        } else {
-          return Container();
-        }
-      },
-    );
+    var badge;
+    final badgeBuilder =
+        badgeDelegate?.buildBadge(context, entity.type, entity.videoDuration);
+    if (badgeBuilder == null) {
+      badge = Container();
+    } else {
+      badge = badgeBuilder;
+    }
 
     return Stack(
       children: <Widget>[

lib/src/ui/page/photo_main_page.dart

@@ -7,6 +7,7 @@ import 'package:photo/src/delegate/loading_delegate.dart';
 import 'package:photo/src/engine/lru_cache.dart';
 import 'package:photo/src/engine/throttle.dart';
 import 'package:photo/src/entity/options.dart';
+import 'package:photo/src/provider/asset_provider.dart';
 import 'package:photo/src/provider/config_provider.dart';
 import 'package:photo/src/provider/gallery_list_provider.dart';
 import 'package:photo/src/provider/i18n_provider.dart';
@@ -38,13 +39,15 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     with SelectedProvider, GalleryListProvider {
   Options get options => widget.options;
 
-  I18nProvider get i18nProvider => ConfigProvider.of(context).provider;
+  I18nProvider get i18nProvider => PhotoPickerProvider.of(context).provider;
+  AssetProvider get assetProvider =>
+      PhotoPickerProvider.of(context).assetProvider;
 
-  List<AssetEntity> list = [];
+  List<AssetEntity> get list => assetProvider.data;
 
   Color get themeColor => options.themeColor;
 
-  AssetPathEntity _currentPath = AssetPathEntity.all;
+  AssetPathEntity _currentPath;
 
   bool _isInit = false;
 
@@ -60,10 +63,10 @@ class _PhotoMainPageState extends State<PhotoMainPage>
   }
 
   String get currentGalleryName {
-    if (currentPath.isAll) {
+    if (currentPath?.isAll == true) {
       return i18nProvider.getAllGalleryText(options);
     }
-    return currentPath.name;
+    return currentPath?.name ?? "";
   }
 
   GlobalKey scaffoldKey;
@@ -227,12 +230,9 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     galleryPathList.clear();
     galleryPathList.addAll(pathList);
 
-    List<AssetEntity> imageList;
-
     if (pathList.isNotEmpty) {
-      imageList = await pathList[0].assetList;
-      _sortAssetList(imageList);
-      _currentPath = pathList[0];
+      assetProvider.current = pathList[0];
+      await assetProvider.loadMore();
     }
 
     for (var path in pathList) {
@@ -241,10 +241,6 @@ class _PhotoMainPageState extends State<PhotoMainPage>
       }
     }
 
-    this.list.clear();
-    if (imageList != null) {
-      this.list.addAll(imageList);
-    }
     setState(() {
       _isInit = true;
     });
@@ -259,6 +255,10 @@ class _PhotoMainPageState extends State<PhotoMainPage>
       return _buildLoading();
     }
 
+    final noMore = assetProvider.noMore;
+
+    final count = assetProvider.count + (noMore ? 0 : 1);
+
     return Container(
       color: options.dividerColor,
       child: GridView.builder(
@@ -270,12 +270,18 @@ class _PhotoMainPageState extends State<PhotoMainPage>
           mainAxisSpacing: options.padding,
         ),
         itemBuilder: _buildItem,
-        itemCount: list.length,
+        itemCount: count,
       ),
     );
   }
 
   Widget _buildItem(BuildContext context, int index) {
+    final noMore = assetProvider.noMore;
+    if (!noMore && index == assetProvider.count) {
+      _loadMore();
+      return _buildLoading();
+    }
+
     var data = list[index];
     return RepaintBoundary(
       child: GestureDetector(
@@ -297,6 +303,11 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     );
   }
 
+  _loadMore() async {
+    await assetProvider.loadMore();
+    setState(() {});
+  }
+
   _buildMask(bool showMask) {
     return IgnorePointer(
       child: AnimatedContainer(
@@ -364,17 +375,22 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     setState(() {});
   }
 
-  void _onGalleryChange(AssetPathEntity assetPathEntity) {
-    _currentPath = assetPathEntity;
-
-    _currentPath.assetList.then((v) async {
-      _sortAssetList(v);
-      list.clear();
-      list.addAll(v);
-      scrollController.jumpTo(0.0);
-      await checkPickImageEntity();
+  void _onGalleryChange(AssetPathEntity assetPathEntity) async {
+    // _currentPath = assetPathEntity;
+
+    // _currentPath.assetList.then((v) async {
+    //   _sortAssetList(v);
+    //   list.clear();
+    //   list.addAll(v);
+    //   scrollController.jumpTo(0.0);
+    //   await checkPickImageEntity();
+    //   setState(() {});
+    // });
+    if (assetPathEntity != assetProvider.current) {
+      assetProvider.current = assetPathEntity;
+      await assetProvider.loadMore();
       setState(() {});
-    });
+    }
   }
 
   void _onItemClick(AssetEntity data, int index) {
@@ -383,8 +399,8 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     Navigator.of(context).push(
       MaterialPageRoute(
         builder: (ctx) {
-          return ConfigProvider(
-            provider: ConfigProvider.of(context).provider,
+          return PhotoPickerProvider(
+            provider: PhotoPickerProvider.of(context).provider,
             options: options,
             child: PhotoPreviewPage(
               selectedProvider: this,
@@ -392,6 +408,8 @@ class _PhotoMainPageState extends State<PhotoMainPage>
               initIndex: index,
               changeProviderOnCheckChange: true,
               result: result,
+              isPreview: false,
+              assetProvider: assetProvider,
             ),
           );
         },
@@ -411,16 +429,18 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     isPushed = true;
     var v = await Navigator.of(context).push(
       MaterialPageRoute(
-        builder: (ctx) => ConfigProvider(
-              provider: ConfigProvider.of(context).provider,
-              options: options,
-              child: PhotoPreviewPage(
-                selectedProvider: this,
-                list: List.of(selectedList),
-                changeProviderOnCheckChange: false,
-                result: result,
-              ),
-            ),
+        builder: (ctx) => PhotoPickerProvider(
+          provider: PhotoPickerProvider.of(context).provider,
+          options: options,
+          child: PhotoPreviewPage(
+            selectedProvider: this,
+            list: List.of(selectedList),
+            changeProviderOnCheckChange: false,
+            result: result,
+            isPreview: true,
+            assetProvider: assetProvider,
+          ),
+        ),
       ),
     );
     if (handlePreviewResult(v)) {

lib/src/ui/page/photo_preview_page.dart

@@ -3,6 +3,7 @@ import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 import 'package:photo/src/entity/options.dart';
+import 'package:photo/src/provider/asset_provider.dart';
 import 'package:photo/src/provider/config_provider.dart';
 import 'package:photo/src/provider/selected_provider.dart';
 import 'package:photo/src/ui/page/photo_main_page.dart';
@@ -18,16 +19,23 @@ class PhotoPreviewPage extends StatefulWidget {
   /// 这个参数是控制在内部点击check后是否实时修改provider状态
   final bool changeProviderOnCheckChange;
 
+  /// 是否通过预览进来的
+  final bool isPreview;
+
   /// 这里封装了结果
   final PhotoPreviewResult result;
 
+  final AssetProvider assetProvider;
+
   const PhotoPreviewPage({
     Key key,
     @required this.selectedProvider,
     @required this.list,
     @required this.changeProviderOnCheckChange,
     @required this.result,
+    @required this.assetProvider,
     this.initIndex = 0,
+    this.isPreview = false,
   }) : super(key: key);
 
   @override
@@ -35,7 +43,8 @@ class PhotoPreviewPage extends StatefulWidget {
 }
 
 class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
-  ConfigProvider get config => ConfigProvider.of(context);
+  PhotoPickerProvider get config => PhotoPickerProvider.of(context);
+  AssetProvider get assetProvider => widget.assetProvider;
 
   Options get options => config.options;
 
@@ -45,7 +54,12 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
 
   SelectedProvider get selectedProvider => widget.selectedProvider;
 
-  List<AssetEntity> get list => widget.list;
+  List<AssetEntity> get list {
+    if (!widget.isPreview) {
+      return assetProvider.data;
+    }
+    return widget.list;
+  }
 
   StreamController<int> pageChangeController = StreamController.broadcast();
 
@@ -96,6 +110,13 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
 
   @override
   Widget build(BuildContext context) {
+    int totalCount = assetProvider.current.assetCount ?? 0;
+    if (!widget.isPreview) {
+      totalCount = assetProvider.current.assetCount;
+    } else {
+      totalCount = list.length;
+    }
+
     var data = Theme.of(context);
     var textStyle = TextStyle(
       color: options.textColor,
@@ -114,33 +135,35 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
           title: StreamBuilder(
             stream: pageStream,
             initialData: widget.initIndex,
-            builder: (ctx, snap) => Text(
-                  "${snap.data + 1}/${widget.list.length}",
-                  style: TextStyle(
-                    color: options.textColor,
-                  ),
+            builder: (ctx, snap) {
+              return Text(
+                "${snap.data + 1}/$totalCount",
+                style: TextStyle(
+                  color: options.textColor,
                 ),
+              );
+            },
           ),
           actions: <Widget>[
             StreamBuilder(
               stream: pageStream,
               builder: (ctx, s) => FlatButton(
-                    splashColor: Colors.transparent,
-                    onPressed: selectedList.length == 0 ? null : sure,
-                    child: Text(
-                      config.provider.getSureText(options, selectedList.length),
-                      style: selectedList.length == 0
-                          ? textStyle.copyWith(color: options.disableColor)
-                          : textStyle,
-                    ),
-                  ),
+                splashColor: Colors.transparent,
+                onPressed: selectedList.length == 0 ? null : sure,
+                child: Text(
+                  config.provider.getSureText(options, selectedList.length),
+                  style: selectedList.length == 0
+                      ? textStyle.copyWith(color: options.disableColor)
+                      : textStyle,
+                ),
+              ),
             ),
           ],
         ),
         body: PageView.builder(
           controller: pageController,
           itemBuilder: _buildItem,
-          itemCount: list.length,
+          itemCount: totalCount,
           onPageChanged: _onPageChanged,
         ),
         bottomSheet: _buildThumb(),
@@ -244,6 +267,10 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
   }
 
   Widget _buildItem(BuildContext context, int index) {
+    if (!widget.isPreview && index >= list.length - 5) {
+      _loadMore();
+    }
+
     var data = list[index];
     return BigPhotoImage(
       assetEntity: data,
@@ -251,6 +278,10 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
     );
   }
 
+  Future<void> _loadMore() async {
+    assetProvider.loadMore();
+  }
+
   Widget _buildLoadingWidget(AssetEntity entity) {
     return options.loadingDelegate
         .buildBigImageLoading(context, entity, themeColor);
@@ -263,13 +294,13 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
   Widget _buildThumb() {
     return StreamBuilder(
       builder: (ctx, snapshot) => Container(
-            height: 80.0,
-            child: ListView.builder(
-              itemBuilder: _buildThumbItem,
-              itemCount: previewList.length,
-              scrollDirection: Axis.horizontal,
-            ),
-          ),
+        height: 80.0,
+        child: ListView.builder(
+          itemBuilder: _buildThumbItem,
+          itemCount: previewList.length,
+          scrollDirection: Axis.horizontal,
+        ),
+      ),
       stream: pageStream,
     );
   }

lib/src/ui/photo_app.dart

@@ -20,7 +20,7 @@ class PhotoApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ConfigProvider(
+    return PhotoPickerProvider(
       provider: provider,
       options: options,
       child: PhotoMainPage(

pubspec.lock

@@ -1,5 +1,5 @@
 # Generated by pub
-# See https://www.dartlang.org/tools/pub/glossary#lockfile
+# See https://dart.dev/tools/pub/glossary#lockfile
 packages:
   async:
     dependency: transitive
@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -66,21 +66,21 @@ packages:
       name: pedantic
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.5.0"
+    version: "1.7.0"
   photo_manager:
     dependency: "direct main"
     description:
       name: photo_manager
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.3.4"
+    version: "0.4.0"
   quiver:
     dependency: transitive
     description:
       name: quiver
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -127,7 +127,7 @@ packages:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.4"
+    version: "0.2.5"
   typed_data:
     dependency: transitive
     description:
@@ -143,4 +143,4 @@ packages:
     source: hosted
     version: "2.0.8"
 sdks:
-  dart: ">=2.2.0 <3.0.0"
+  dart: ">=2.2.2 <3.0.0"

pubspec.yaml

@@ -1,6 +1,6 @@
 name: photo
 description: image picker, multi picker support video/icloud asset, use flutter as ui, if you want to build custom ui, you just use photo_manager.
-version: 0.3.4+1
+version: 0.4.0
 author: caijinglong<cjl_spy@163.com>
 homepage: https://github.com/CaiJingLong/flutter_photo
 
@@ -11,11 +11,11 @@ dependencies:
   flutter:
     sdk: flutter
 
-  photo_manager: ^0.3.4
+  photo_manager: ^0.4.0
   # photo_manager:
   #   git:
   #     url: https://github.com/CaiJingLong/flutter_photo_manager.git
-  #     ref: 2e4821c1fa797272e4c454366b4fb264e8a054d6
+  #     ref: ffaa6e8470708e63c3456837c8bd6eef7b0d42df
   # photo_manager:
   #   path: ../flutter_photo_manager