Merge branch 'master' into fix-number

.vscode/launch.json

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

README.md

@@ -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
 

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,13 @@ 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]
+      badgeDelegate: const DurationBadgeDelegate(),
     );
 
     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';
@@ -17,6 +18,7 @@ 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/badge_delegate.dart';
 
 class PhotoPicker {
   static PhotoPicker _instance;
@@ -30,25 +32,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 +107,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 +135,7 @@ class PhotoPicker {
       sortDelegate: sortDelegate,
       checkBoxBuilderDelegate: checkBoxBuilderDelegate,
       loadingDelegate: loadingDelegate,
+      badgeDelegate: badgeDelegate,
     );
 
     return PhotoPicker()._pickImage(

lib/src/delegate/badge_delegate.dart

@@ -0,0 +1,83 @@
+import 'package:flutter/material.dart';
+import 'package:photo_manager/photo_manager.dart';
+
+abstract class BadgeDelegate {
+  const BadgeDelegate();
+
+  Widget buildBadge(BuildContext context, AssetType type, Duration duration);
+}
+
+class DefaultBadgeDelegate extends BadgeDelegate {
+  final AlignmentGeometry alignment;
+
+  const DefaultBadgeDelegate({
+    this.alignment = Alignment.topLeft,
+  });
+
+  @override
+  Widget buildBadge(BuildContext context, AssetType type, Duration duration) {
+    if (type == AssetType.video) {
+      return Padding(
+        padding: const EdgeInsets.all(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();
+  }
+}
+
+class DurationBadgeDelegate extends BadgeDelegate {
+  final AlignmentGeometry alignment;
+  const DurationBadgeDelegate({this.alignment = Alignment.bottomRight});
+
+  @override
+  Widget buildBadge(BuildContext context, AssetType type, Duration duration) {
+    if (type == AssetType.video) {
+      var s = duration.inSeconds;
+      var m = duration.inMinutes;
+      var h = duration.inHours;
+
+      String text =
+          "$h:${m.toString().padLeft(2, '0')}:${s.toString().padLeft(2, '0')}";
+
+      return Padding(
+        padding: const EdgeInsets.all(2.0),
+        child: Align(
+          alignment: alignment,
+          child: Container(
+            decoration: BoxDecoration(
+              color: Theme.of(context).primaryColor.withOpacity(0.65),
+            ),
+            child: Text(
+              text,
+              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,51 @@ 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,
     );
+    // 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();
+        }
+      },
+    );
+
+    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),
+                    );
+                  },
+                ),
+              ),
+            ],
+          ),
         ),
       ),
     );