add pick type params

.vscode/launch.json

@@ -1,13 +1,14 @@
 {
-    // 使用 IntelliSense 了解相关属性。 
-    // 悬停以查看现有属性的描述。
-    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Flutter",
-            "request": "launch",
-            "type": "dart"
-        }
-    ]
-}
+  // 使用 IntelliSense 了解相关属性。
+  // 悬停以查看现有属性的描述。
+  // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Flutter",
+      "request": "launch",
+      "type": "dart",
+      "program": "example/lib/main.dart"
+    }
+  ]
+}

example/ios/Runner.xcodeproj/project.pbxproj

@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
 		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -41,7 +40,6 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -83,7 +81,6 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
-				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
 				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEBA1CF902C7004384FC /* Flutter.framework */,
@@ -211,7 +208,6 @@
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
-				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

example/lib/main.dart

@@ -30,7 +30,7 @@ class MyHomePage extends StatefulWidget {
 class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
   String currentSelected = "";
 
-  void _pickImage() async {
+  void _pickAsset(PickType type) async {
     List<AssetEntity> imgList = await PhotoPicker.pickAsset(
       // BuildContext required
       context: context,
@@ -48,8 +48,8 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
       // the content item radio
       maxSelected: 8,
       // max picker image count
-      provider: I18nProvider.english,
-      // provider: I18nProvider.chinese,
+      // provider: I18nProvider.english,
+      provider: I18nProvider.chinese,
       // i18n provider ,default is chinese. , you can custom I18nProvider or use ENProvider()
       rowCount: 3,
       // item row count
@@ -69,6 +69,9 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
       // if you want to build custom loading widget,extends LoadingDelegate, [see example/lib/main.dart]
 
       badgeDelegate: const DurationBadgeDelegate(),
+      // badgeDelegate to show badge widget
+
+      pickType: type,
     );
 
     if (imgList == null) {
@@ -85,8 +88,7 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
   }
 
   @override
-  Widget buildBigImageLoading(
-      BuildContext context, AssetEntity entity, Color themeColor) {
+  Widget buildBigImageLoading(BuildContext context, AssetEntity entity, Color themeColor) {
     return Center(
       child: Container(
         width: 50.0,
@@ -99,8 +101,7 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
   }
 
   @override
-  Widget buildPreviewLoading(
-      BuildContext context, AssetEntity entity, Color themeColor) {
+  Widget buildPreviewLoading(BuildContext context, AssetEntity entity, Color themeColor) {
     return Center(
       child: Container(
         width: 50.0,
@@ -119,18 +120,46 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
         title: new Text(widget.title),
       ),
       body: Container(
-        child: Center(
-          child: Text(
-            '$currentSelected',
-            textAlign: TextAlign.center,
+        child: SingleChildScrollView(
+          child: Column(
+            children: <Widget>[
+              IconTextButton(icon: Icons.photo, text: "photo", onTap: () => _pickAsset(PickType.onlyImage)),
+              IconTextButton(icon: Icons.videocam, text: "video", onTap: () => _pickAsset(PickType.onlyVideo)),
+              IconTextButton(icon: Icons.album, text: "all", onTap: () => _pickAsset(PickType.all)),
+              Text(
+                '$currentSelected',
+                textAlign: TextAlign.center,
+              ),
+            ],
           ),
         ),
       ),
       floatingActionButton: new FloatingActionButton(
-        onPressed: _pickImage,
+        onPressed: () => _pickAsset(PickType.all),
         tooltip: 'pickImage',
         child: new Icon(Icons.add),
       ),
     );
   }
 }
+
+class IconTextButton extends StatelessWidget {
+  final IconData icon;
+  final String text;
+  final Function onTap;
+
+  const IconTextButton({Key key, this.icon, this.text, this.onTap}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: onTap,
+      child: Container(
+        child: ListTile(
+          leading: Icon(icon ?? Icons.device_unknown),
+          title: Text(text ?? ""),
+        ),
+      ),
+    );
+  }
+}

lib/photo.dart

@@ -16,8 +16,8 @@ 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/provider/i18n_provider.dart' show I18NCustomProvider, I18nProvider, CNProvider, ENProvider;
+export 'package:photo/src/entity/options.dart' show PickType;
 export 'package:photo/src/delegate/badge_delegate.dart';
 
 class PhotoPicker {
@@ -32,44 +32,6 @@ class PhotoPicker {
 
   static const String rootRouteName = "photo_picker_image";
 
-  /// use new method [pickAsset]
-  ///
-  /// This method will be removed in the future.
-  @deprecated
-  static Future<List<AssetEntity>> pickImage({
-    @required BuildContext context,
-    int rowCount = 4,
-    int maxSelected = 9,
-    double padding = 0.5,
-    double itemRadio = 1.0,
-    Color themeColor,
-    Color dividerColor,
-    Color textColor,
-    Color disableColor,
-    int thumbSize = 64,
-    I18nProvider provider = I18nProvider.chinese,
-    SortDelegate sortDelegate,
-    CheckBoxBuilderDelegate checkBoxBuilderDelegate,
-    LoadingDelegate loadingDelegate,
-  }) {
-    return pickAsset(
-      context: context,
-      rowCount: rowCount,
-      maxSelected: maxSelected,
-      padding: padding,
-      itemRadio: itemRadio,
-      themeColor: themeColor,
-      dividerColor: dividerColor,
-      textColor: textColor,
-      disableColor: disableColor,
-      thumbSize: thumbSize,
-      provider: provider,
-      sortDelegate: sortDelegate,
-      checkBoxBuilderDelegate: checkBoxBuilderDelegate,
-      loadingDelegate: loadingDelegate,
-    );
-  }
-
   /// 没有授予权限的时候,会开启一个dialog去帮助用户去应用设置页面开启权限
   /// 确定开启设置页面,取消关闭弹窗,无论选择什么,返回值都是null
   ///
@@ -107,10 +69,12 @@ class PhotoPicker {
     SortDelegate sortDelegate,
     CheckBoxBuilderDelegate checkBoxBuilderDelegate,
     LoadingDelegate loadingDelegate,
+    PickType pickType = PickType.all,
     BadgeDelegate badgeDelegate = const DefaultBadgeDelegate(),
   }) {
     assert(provider != null, "provider must be not null");
     assert(context != null, "context must be not null");
+    assert(pickType != null, "pickType must be not null");
 
     themeColor ??= Theme.of(context)?.primaryColor ?? Colors.black;
     dividerColor ??= Theme.of(context)?.dividerColor ?? Colors.grey;
@@ -136,16 +100,17 @@ class PhotoPicker {
       checkBoxBuilderDelegate: checkBoxBuilderDelegate,
       loadingDelegate: loadingDelegate,
       badgeDelegate: badgeDelegate,
+      pickType: pickType,
     );
 
-    return PhotoPicker()._pickImage(
+    return PhotoPicker()._pickAsset(
       context,
       options,
       provider,
     );
   }
 
-  Future<List<AssetEntity>> _pickImage(
+  Future<List<AssetEntity>> _pickAsset(
     BuildContext context,
     Options options,
     I18nProvider provider,
@@ -167,8 +132,7 @@ class PhotoPicker {
     return _openGalleryContentPage(context, options, provider);
   }
 
-  Future<List<AssetEntity>> _openGalleryContentPage(
-      BuildContext context, Options options, I18nProvider provider) async {
+  Future<List<AssetEntity>> _openGalleryContentPage(BuildContext context, Options options, I18nProvider provider) async {
     return Navigator.of(context).push(
       MaterialPageRoute(
         builder: (ctx) => PhotoApp(

lib/src/delegate/sort_delegate.dart

@@ -23,11 +23,11 @@ class CommonSortDelegate extends SortDelegate {
   @override
   void sort(List<AssetPathEntity> list) {
     list.sort((path1, path2) {
-      if (path1 == AssetPathEntity.all) {
+      if (path1.isAll) {
         return -1;
       }
 
-      if (path2 == AssetPathEntity.all) {
+      if (path2.isAll) {
         return 1;
       }
 
@@ -60,7 +60,6 @@ class CommonSortDelegate extends SortDelegate {
   }
 
   bool _isScreenShot(AssetPathEntity entity) {
-    return entity.name.toUpperCase() == "screenshots".toUpperCase() ||
-        entity.name.toUpperCase() == "screenshot".toUpperCase();
+    return entity.name.toUpperCase() == "screenshots".toUpperCase() || entity.name.toUpperCase() == "screenshot".toUpperCase();
   }
 }

lib/src/entity/options.dart

@@ -31,6 +31,8 @@ class Options {
 
   final BadgeDelegate badgeDelegate;
 
+  final PickType pickType;
+
   const Options({
     this.rowCount,
     this.maxSelected,
@@ -45,5 +47,12 @@ class Options {
     this.checkBoxBuilderDelegate,
     this.loadingDelegate,
     this.badgeDelegate,
+    this.pickType,
   });
 }
+
+enum PickType {
+  all,
+  onlyImage,
+  onlyVideo,
+}

lib/src/provider/config_provider.dart

@@ -18,6 +18,5 @@ class ConfigProvider extends InheritedWidget {
     return true;
   }
 
-  static ConfigProvider of(BuildContext context) =>
-      context.inheritFromWidgetOfExactType(ConfigProvider);
+  static ConfigProvider of(BuildContext context) => context.inheritFromWidgetOfExactType(ConfigProvider);
 }

lib/src/ui/page/photo_main_page.dart

@@ -16,19 +16,20 @@ import 'package:photo_manager/photo_manager.dart';
 
 class PhotoMainPage extends StatefulWidget {
   final ValueChanged<List<AssetEntity>> onClose;
+  final Options options;
 
   const PhotoMainPage({
     Key key,
     this.onClose,
+    this.options,
   }) : super(key: key);
 
   @override
   _PhotoMainPageState createState() => _PhotoMainPageState();
 }
 
-class _PhotoMainPageState extends State<PhotoMainPage>
-    with SelectedProvider, GalleryListProvider {
-  Options get options => ConfigProvider.of(context).options;
+class _PhotoMainPageState extends State<PhotoMainPage> with SelectedProvider, GalleryListProvider {
+  Options get options => widget.options;
 
   I18nProvider get i18nProvider => ConfigProvider.of(context).provider;
 
@@ -94,9 +95,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
                 splashColor: Colors.transparent,
                 child: Text(
                   i18nProvider.getSureText(options, selectedCount),
-                  style: selectedCount == 0
-                      ? textStyle.copyWith(color: options.disableColor)
-                      : textStyle,
+                  style: selectedCount == 0 ? textStyle.copyWith(color: options.disableColor) : textStyle,
                 ),
                 onPressed: selectedCount == 0 ? null : sure,
               ),
@@ -154,17 +153,44 @@ class _PhotoMainPageState extends State<PhotoMainPage>
   }
 
   Future<void> _refreshList() async {
-    var pathList = await PhotoManager.getAssetPathList();
+    List<AssetPathEntity> pathList;
+    switch (options.pickType) {
+      case PickType.onlyImage:
+        pathList = await PhotoManager.getImageAsset();
+        break;
+      case PickType.onlyVideo:
+        pathList = await PhotoManager.getVideoAsset();
+        break;
+      default:
+        pathList = await PhotoManager.getAssetPathList();
+    }
+
+    if (pathList == null) {
+      return;
+    }
 
     options.sortDelegate.sort(pathList);
 
     galleryPathList.clear();
     galleryPathList.addAll(pathList);
 
-    var imageList = await currentPath.assetList;
-    AssetPathEntity.all.name = i18nProvider.getAllGalleryText(options);
+    List<AssetEntity> imageList;
+
+    if (pathList.isNotEmpty) {
+      imageList = await pathList[0].assetList;
+      _currentPath = pathList[0];
+    }
+
+    for (var path in pathList) {
+      if (path.isAll) {
+        path.name = i18nProvider.getAllGalleryText(options);
+      }
+    }
+
     this.list.clear();
-    this.list.addAll(imageList);
+    if (imageList != null) {
+      this.list.addAll(imageList);
+    }
     setState(() {
       _isInit = true;
     });
@@ -320,11 +346,10 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     });
   }
 
-  void _onTapPreview() {
+  void _onTapPreview() async {
     var result = new PhotoPreviewResult();
     isPushed = true;
-    Navigator.of(context)
-        .push(
+    var v = await Navigator.of(context).push(
       MaterialPageRoute(
         builder: (ctx) => ConfigProvider(
               provider: ConfigProvider.of(context).provider,
@@ -337,18 +362,14 @@ class _PhotoMainPageState extends State<PhotoMainPage>
               ),
             ),
       ),
-    )
-        .then(
-      (v) {
-        if (handlePreviewResult(v)) {
-          print(v);
-          Navigator.pop(context, v);
-          return;
-        }
-        isPushed = false;
-        compareAndRemoveEntities(result.previewSelectedList);
-      },
     );
+    if (handlePreviewResult(v)) {
+      // print(v);
+      Navigator.pop(context, v);
+      return;
+    }
+    isPushed = false;
+    compareAndRemoveEntities(result.previewSelectedList);
   }
 
   bool handlePreviewResult(List<AssetEntity> v) {
@@ -462,8 +483,7 @@ class __BottomWidgetState extends State<_BottomWidget> {
                   height: 44.0,
                   alignment: Alignment.center,
                   child: Text(
-                    i18nProvider.getPreviewText(
-                        options, widget.selectedProvider),
+                    i18nProvider.getPreviewText(options, widget.selectedProvider),
                     style: textStyle,
                   ),
                   padding: textPadding,
@@ -519,8 +539,7 @@ class ImageItem extends StatelessWidget {
       future: entity.thumbDataWithSize(size, size),
       builder: (BuildContext context, AsyncSnapshot<Uint8List> snapshot) {
         var futureData = snapshot.data;
-        if (snapshot.connectionState == ConnectionState.done &&
-            futureData != null) {
+        if (snapshot.connectionState == ConnectionState.done && futureData != null) {
           ImageLruCache.setData(entity, size, futureData);
           return _buildImageItem(context, futureData);
         }
@@ -547,8 +566,7 @@ class ImageItem extends StatelessWidget {
       future: entity.videoDuration,
       builder: (ctx, snapshot) {
         if (snapshot.hasData && snapshot != null) {
-          var buildBadge =
-              badgeDelegate?.buildBadge(context, entity.type, snapshot.data);
+          var buildBadge = badgeDelegate?.buildBadge(context, entity.type, snapshot.data);
           if (buildBadge == null) {
             return Container();
           } else {

lib/src/ui/photo_app.dart

@@ -20,6 +20,7 @@ class PhotoApp extends StatelessWidget {
         onClose: (List<AssetEntity> value) {
           Navigator.pop(context, value);
         },
+        options: options,
       ),
     );
   }

pubspec.lock

@@ -60,13 +60,20 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.6.2"
-  photo_manager:
-    dependency: "direct main"
+  pedantic:
+    dependency: transitive
     description:
-      name: photo_manager
+      name: pedantic
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.10"
+    version: "1.4.0"
+  photo_manager:
+    dependency: "direct main"
+    description:
+      path: "../flutter_photo_manager"
+      relative: true
+    source: path
+    version: "0.2.0"
   quiver:
     dependency: transitive
     description:
@@ -85,7 +92,7 @@ packages:
       name: source_span
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.4.1"
+    version: "1.5.4"
   stack_trace:
     dependency: transitive
     description:
@@ -113,14 +120,14 @@ packages:
       name: term_glyph
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.1"
+    version: "0.2.2"
   typed_data:
     dependency: transitive
     description:
@@ -136,4 +143,4 @@ packages:
     source: hosted
     version: "2.0.8"
 sdks:
-  dart: ">=2.0.0 <3.0.0"
+  dart: ">=2.1.0 <3.0.0"

pubspec.yaml

@@ -11,13 +11,13 @@ dependencies:
   flutter:
     sdk: flutter
 
-  photo_manager: ^0.1.10
+  # photo_manager: ^0.1.10
   # photo_manager:
   #   git:
   #     url: https://github.com/CaiJingLong/flutter_photo_manager.git
-  #     ref: 11705633cbd01724af6aaa6aa8c8b9ca86ea385c
-#  photo_manager:
-#    path: /Users/caijinglong/code/flutter/plugin/flutter_photo_manager
+  #     ref: 29d844b2c4594d7e524d0169658bc4f3b9ef2ddc
+  photo_manager:
+    path: ../flutter_photo_manager
 
 dev_dependencies:
   flutter_test: