add type badge for item

README.md

@@ -24,7 +24,7 @@ API incompatibility
 
 because support video, so the ImagePathEntity and ImageEntity rename to AssetPathEntity and AssetEntity.
 
-so PhotoPicker.pickImage return type will change to List<AssetEntity>
+so PhotoPicker.pickImage return type will change to `List<AssetEntity>`
 
 ## install
 
@@ -44,7 +44,7 @@ import 'package:photo_manager/photo_manager.dart';
 
 ```dart
 void _pickImage() async {
-    List<AssetEntity> imgList = await PhotoPicker.pickImage(
+    List<AssetEntity> imgList = await PhotoPicker.pickAsset(
       context: context,
       // BuildContext requied
 
@@ -121,8 +121,8 @@ Because the album is a privacy privilege, you need user permission to access it.
 like next
 
 ```plist
-	<key>NSPhotoLibraryUsageDescription</key>
-    <string>App need your agree, can visit your album</string>
+<key>NSPhotoLibraryUsageDescription</key>
+<string>App need your agree, can visit your album</string>
 ```
 
 xcode like image

example/lib/main.dart

@@ -31,9 +31,9 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
   String currentSelected = "";
 
   void _pickImage() async {
-    List<AssetEntity> imgList = await PhotoPicker.pickImage(
+    List<AssetEntity> imgList = await PhotoPicker.pickAsset(
+      // BuildContext required
       context: context,
-      // BuildContext requied
 
       /// The following are optional parameters.
       themeColor: Colors.green,
@@ -50,7 +50,7 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
       // max picker image count
       provider: I18nProvider.chinese,
       // i18n provider ,default is chinese. , you can custom I18nProvider or use ENProvider()
-      rowCount: 5,
+      rowCount: 3,
       // item row count
       textColor: Colors.white,
       // text color
@@ -61,10 +61,11 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
       checkBoxBuilderDelegate: DefaultCheckBoxBuilderDelegate(
         activeColor: Colors.white,
         unselectedColor: Colors.white,
-      ), // default is DefaultCheckBoxBuilderDelegate ,or you make custom delegate to create checkbox
+      ),
+      // default is DefaultCheckBoxBuilderDelegate ,or you make custom delegate to create checkbox
 
-      loadingDelegate:
-          this, // if you want to build custom loading widget,extends LoadingDelegate, [see example/lib/main.dart]
+      loadingDelegate: this,
+      // if you want to build custom loading widget,extends LoadingDelegate, [see example/lib/main.dart]
     );
 
     if (imgList == null) {

lib/photo.dart

@@ -3,6 +3,7 @@ library photo;
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:photo/src/delegate/badge_delegate.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';
@@ -30,25 +31,67 @@ 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
   ///
   ///
   /// 当用户给予权限后
   ///
   ///   当用户确定时,返回一个图片[AssetEntity]列表
   ///
-  ///   当用户取消时
+  ///   当用户取消时返回一个空数组
+  ///
+  /// 关于参数可以查看readme文档介绍
   ///
   /// if user not grand permission, then return null and show a dialog to help user open setting.
-  /// sure is open setting cancel ,cancel to dismiss dialog
+  /// sure is open setting cancel ,cancel to dismiss dialog, return null
   ///
   /// when user give permission.
   ///
   ///   when user sure , return a [AssetEntity] of [List]
   ///
   ///   when user cancel selected,result is empty list
-  static Future<List<AssetEntity>> pickImage({
+  ///
+  /// params see readme.md
+  static Future<List<AssetEntity>> pickAsset({
     @required BuildContext context,
     int rowCount = 4,
     int maxSelected = 9,
@@ -63,6 +106,7 @@ class PhotoPicker {
     SortDelegate sortDelegate,
     CheckBoxBuilderDelegate checkBoxBuilderDelegate,
     LoadingDelegate loadingDelegate,
+    BadgeDelegate badgeDelegate = const DefaultBadgeDelegate(),
   }) {
     assert(provider != null, "provider must be not null");
     assert(context != null, "context must be not null");
@@ -90,6 +134,7 @@ class PhotoPicker {
       sortDelegate: sortDelegate,
       checkBoxBuilderDelegate: checkBoxBuilderDelegate,
       loadingDelegate: loadingDelegate,
+      badgeDelegate: badgeDelegate,
     );
 
     return PhotoPicker()._pickImage(

lib/src/delegate/badge_delegate.dart

@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:photo_manager/photo_manager.dart';
+
+abstract class BadgeDelegate {
+  const BadgeDelegate();
+
+  Widget buildBadge(BuildContext context, AssetType type);
+}
+
+class DefaultBadgeDelegate extends BadgeDelegate {
+  final AlignmentGeometry alignment;
+
+  const DefaultBadgeDelegate({
+    this.alignment = Alignment.topLeft,
+  });
+
+  @override
+  Widget buildBadge(BuildContext context, AssetType type) {
+    if (type == AssetType.video) {
+      return Padding(
+        padding: const EdgeInsets.only(
+          top: 2.0,
+          left: 2.0,
+        ),
+        child: Align(
+          alignment: alignment,
+          child: Container(
+            decoration: BoxDecoration(
+              color: Theme.of(context).primaryColor,
+              borderRadius: BorderRadius.circular(3.0),
+            ),
+            child: Text(
+              "video",
+              style: const TextStyle(
+                fontSize: 12.0,
+                color: Colors.white,
+              ),
+            ),
+            padding: const EdgeInsets.all(4.0),
+          ),
+        ),
+      );
+    }
+
+    return Container();
+  }
+}

lib/src/entity/options.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:photo/src/delegate/badge_delegate.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';
@@ -28,6 +29,8 @@ class Options {
 
   final LoadingDelegate loadingDelegate;
 
+  final BadgeDelegate badgeDelegate;
+
   const Options({
     this.rowCount,
     this.maxSelected,
@@ -41,5 +44,6 @@ class Options {
     this.sortDelegate,
     this.checkBoxBuilderDelegate,
     this.loadingDelegate,
+    this.badgeDelegate,
   });
 }

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/badge_delegate.dart';
 import 'package:photo/src/delegate/loading_delegate.dart';
 import 'package:photo/src/engine/lru_cache.dart';
 import 'package:photo/src/entity/options.dart';
@@ -190,19 +191,22 @@ class _PhotoMainPageState extends State<PhotoMainPage>
 
   Widget _buildItem(BuildContext context, int index) {
     var data = list[index];
-    return GestureDetector(
-      onTap: () => _onItemClick(data, index),
-      child: Stack(
-        children: <Widget>[
-          ImageItem(
-            entity: data,
-            themeColor: themeColor,
-            size: options.thumbSize,
-            loadingDelegate: options.loadingDelegate,
-          ),
-          _buildMask(containsEntity(data)),
-          _buildSelected(data),
-        ],
+    return RepaintBoundary(
+      child: GestureDetector(
+        onTap: () => _onItemClick(data, index),
+        child: Stack(
+          children: <Widget>[
+            ImageItem(
+              entity: data,
+              themeColor: themeColor,
+              size: options.thumbSize,
+              loadingDelegate: options.loadingDelegate,
+              badgeDelegate: options.badgeDelegate,
+            ),
+            _buildMask(containsEntity(data)),
+            _buildSelected(data),
+          ],
+        ),
       ),
     );
   }
@@ -491,19 +495,22 @@ class ImageItem extends StatelessWidget {
 
   final LoadingDelegate loadingDelegate;
 
+  final BadgeDelegate badgeDelegate;
+
   const ImageItem({
     Key key,
     this.entity,
     this.themeColor,
     this.size = 64,
     this.loadingDelegate,
+    this.badgeDelegate,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     var thumb = ImageLruCache.getData(entity, size);
     if (thumb != null) {
-      return _buildImageItem(thumb);
+      return _buildImageItem(context, thumb);
     }
 
     return FutureBuilder<Uint8List>(
@@ -513,22 +520,37 @@ class ImageItem extends StatelessWidget {
         if (snapshot.connectionState == ConnectionState.done &&
             futureData != null) {
           ImageLruCache.setData(entity, size, futureData);
-          return _buildImageItem(futureData);
+          return _buildImageItem(context, futureData);
         }
         return Center(
-          child:
-              loadingDelegate.buildPreviewLoading(context, entity, themeColor),
+          child: loadingDelegate.buildPreviewLoading(
+            context,
+            entity,
+            themeColor,
+          ),
         );
       },
     );
   }
 
-  Widget _buildImageItem(Uint8List data) {
-    return Image.memory(
+  Widget _buildImageItem(BuildContext context, Uint8List data) {
+    var image = Image.memory(
       data,
       width: double.infinity,
       height: double.infinity,
       fit: BoxFit.cover,
     );
+    var badge = badgeDelegate?.buildBadge(context, entity.type);
+    if (badge == null) {
+      return image;
+    }
+    return Stack(
+      children: <Widget>[
+        image,
+        IgnorePointer(
+          child: badge,
+        ),
+      ],
+    );
   }
 }

lib/src/ui/page/photo_preview_page.dart

@@ -267,32 +267,34 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
 
   Widget _buildThumbItem(BuildContext context, int index) {
     var item = previewList[index];
-    return GestureDetector(
-      onTap: () => changeSelected(item, index),
-      child: Container(
-        width: 80.0,
-        child: Stack(
-          children: <Widget>[
-            ImageItem(
-              themeColor: themeColor,
-              entity: item,
-              size: options.thumbSize,
-              loadingDelegate: options.loadingDelegate,
-            ),
-            IgnorePointer(
-              child: StreamBuilder(
-                stream: pageStream,
-                builder: (BuildContext context, AsyncSnapshot snapshot) {
-                  if (selectedList.contains(item)) {
-                    return Container();
-                  }
-                  return Container(
-                    color: Colors.white.withOpacity(0.5),
-                  );
-                },
+    return RepaintBoundary(
+      child: GestureDetector(
+        onTap: () => changeSelected(item, index),
+        child: Container(
+          width: 80.0,
+          child: Stack(
+            children: <Widget>[
+              ImageItem(
+                themeColor: themeColor,
+                entity: item,
+                size: options.thumbSize,
+                loadingDelegate: options.loadingDelegate,
               ),
-            ),
-          ],
+              IgnorePointer(
+                child: StreamBuilder(
+                  stream: pageStream,
+                  builder: (BuildContext context, AsyncSnapshot snapshot) {
+                    if (selectedList.contains(item)) {
+                      return Container();
+                    }
+                    return Container(
+                      color: Colors.white.withOpacity(0.5),
+                    );
+                  },
+                ),
+              ),
+            ],
+          ),
         ),
       ),
     );

pubspec.lock

@@ -1,6 +1,20 @@
 # Generated by pub
 # See https://www.dartlang.org/tools/pub/glossary#lockfile
 packages:
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.32.4"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.5.0"
   async:
     dependency: transitive
     description:
@@ -29,6 +43,27 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.2"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.6"
+  csslib:
+    dependency: transitive
+    description:
+      name: csslib
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.14.5"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -39,6 +74,83 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  front_end:
+    dependency: transitive
+    description:
+      name: front_end
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.1.4"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.1.7"
+  html:
+    dependency: transitive
+    description:
+      name: html
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.13.3+3"
+  http:
+    dependency: transitive
+    description:
+      name: http
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.11.3+17"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.5"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.1.3"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.3.3"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.6.1+1"
+  json_rpc_2:
+    dependency: transitive
+    description:
+      name: json_rpc_2
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.9"
+  kernel:
+    dependency: transitive
+    description:
+      name: kernel
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.3.4"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.11.3+2"
   matcher:
     dependency: transitive
     description:
@@ -53,6 +165,41 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.6"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.9.6+2"
+  multi_server_socket:
+    dependency: transitive
+    description:
+      name: multi_server_socket
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.2"
+  node_preamble:
+    dependency: transitive
+    description:
+      name: node_preamble
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.4.4"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.5"
+  package_resolver:
+    dependency: transitive
+    description:
+      name: package_resolver
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.4"
   path:
     dependency: transitive
     description:
@@ -67,18 +214,81 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.8"
+  plugin:
+    dependency: transitive
+    description:
+      name: plugin
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.2.0+3"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.3.6"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.4.2"
   quiver:
     dependency: transitive
     description:
       name: quiver
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.0+1"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.7.3+3"
+  shelf_packages_handler:
+    dependency: transitive
+    description:
+      name: shelf_packages_handler
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.4"
+  shelf_static:
+    dependency: transitive
+    description:
+      name: shelf_static
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.2.8"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.2.2+4"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.99"
+  source_map_stack_trace:
+    dependency: transitive
+    description:
+      name: source_map_stack_trace
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.1.5"
+  source_maps:
+    dependency: transitive
+    description:
+      name: source_maps
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.10.7"
   source_span:
     dependency: transitive
     description:
@@ -114,13 +324,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.1"
-  test_api:
+  test:
     dependency: transitive
     description:
-      name: test_api
+      name: test
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.1"
+    version: "1.3.0"
   typed_data:
     dependency: transitive
     description:
@@ -128,6 +338,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.6"
+  utf:
+    dependency: transitive
+    description:
+      name: utf
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.9.0+5"
   vector_math:
     dependency: transitive
     description:
@@ -135,5 +352,33 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.8"
+  vm_service_client:
+    dependency: transitive
+    description:
+      name: vm_service_client
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.2.6"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.9.7+10"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.9"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.1.15"
 sdks:
-  dart: ">=2.0.0 <3.0.0"
+  dart: ">=2.0.0-dev.68.0 <3.0.0"