Merge branch 'feature' of https://git.links123.net/cloudteam/image_picker

example/ios/Flutter/.last_build_id

@@ -1 +1 @@
-894f424b8531a69bd75214bc0c525b8a
+627ffd90bffd0082b3a38187f39f4b86

example/lib/main.dart

@@ -171,8 +171,8 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
     /// context is required, other params is optional.
     /// context is required, other params is optional.
     /// context is required, other params is optional.
-    List<AssetPathEntity> pathList2 = await PhotoManager.getAssetPathList(
-        hasAll: true, type: RequestType.image,);
+    // List<AssetPathEntity> pathList2 = await PhotoManager.getAssetPathList(
+    //     hasAll: true, type: RequestType.image,);
         if (!single) {
           PickedEntity entity = await PhotoPicker.pickAsset(
       context: context,
@@ -184,7 +184,7 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
       thumbSize: 150,
       sortDelegate: SortDelegate.common,
       pickType: type,
-      photoPathList: pathList2,
+      //photoPathList: pathList2,
     );
 
     if (entity == null || entity.asset.isEmpty) {
@@ -213,7 +213,7 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
             thumbSize: 150,
             sortDelegate: SortDelegate.common,
             pickType: type,
-            photoPathList: pathList2,
+            // photoPathList: pathList2,
           );
           print(asset);
         }

lib/photo.dart

@@ -1,11 +1,11 @@
 library photo;
 
 import 'dart:async';
-import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:photo/src/entity/_theme.dart';
+import 'package:photo/src/permission_utils.dart';
 import 'package:photo/src/ui/page/photo_list_page.dart';
 import 'package:photo/src/ui/page/photo_main_page.dart';
 
@@ -17,7 +17,6 @@ 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:provider/provider.dart';
 
 import 'src/provider/config_provider.dart';
@@ -29,8 +28,8 @@ export 'package:photo/src/provider/i18n_provider.dart'
 export 'package:photo/src/entity/options.dart' show PickType, PickedEntity;
 export 'package:photo/src/delegate/badge_delegate.dart';
 export 'package:photo/src/entity/_theme.dart';
-export 'package:image_picker/image_picker.dart' show CameraDevice;
-export 'package:photo_manager/photo_manager.dart' show AssetEntity;
+export 'package:image_picker/image_picker.dart' show CameraDevice, PickedFile;
+export 'package:photo_manager/photo_manager.dart' show AssetEntity, AssetType;
 
 class PhotoPicker {
   static PhotoPicker _instance;
@@ -61,7 +60,7 @@ class PhotoPicker {
     @required BuildContext context,
     int rowCount = 4,
     int maxSelected = 9,
-    double padding = 1,
+    double padding = 0.5,
     double itemRadio = 1.0,
     int thumbSize = 180,
     PhotoTheme theme,
@@ -91,7 +90,7 @@ class PhotoPicker {
       sortDelegate: sortDelegate,
       checkBoxBuilderDelegate: DefaultCheckBoxBuilderDelegate(),
       loadingDelegate: loadingDelegate,
-      badgeDelegate: DefaultBadgeDelegate(),
+      badgeDelegate: DurationBadgeDelegate(),
       pickType: pickType,
     );
 
@@ -104,11 +103,10 @@ class PhotoPicker {
     );
   }
 
-
   static Future<AssetEntity> pickSingleAsset({
     @required BuildContext context,
     int rowCount = 4,
-    double padding = 1,
+    double padding = 0.5,
     double itemRadio = 1.0,
     int thumbSize = 180,
     PhotoTheme theme,
@@ -139,19 +137,24 @@ class PhotoPicker {
     return null;
   }
 
-  static Future<File> pickCamera({
+  static Future<PickedFile> pickCamera({
     double maxWidth,
     double maxHeight,
     int imageQuality,
     CameraDevice preferredCameraDevice = CameraDevice.rear,
   }) async {
-    return ImagePicker.pickImage(
-      source: ImageSource.camera,
-      maxWidth: maxWidth,
-      maxHeight: maxHeight,
-      imageQuality: imageQuality,
-      preferredCameraDevice: preferredCameraDevice,
-    );
+    final bool status = await PermissionUtils.canPermission(Permission.camera);
+    if (!status) {
+      throw 'permission denied';
+    } else {
+      return ImagePicker().getImage(
+        source: ImageSource.camera,
+        maxWidth: maxWidth,
+        maxHeight: maxHeight,
+        imageQuality: imageQuality,
+        preferredCameraDevice: preferredCameraDevice,
+      );
+    }
   }
 
   Future<PickedEntity> _pickAsset(
@@ -161,15 +164,18 @@ class PhotoPicker {
     List<AssetPathEntity> photoList,
     List<AssetEntity> pickedAssetList,
   ) async {
-    await requestPermission(context, provider: provider);
-
-    return _openGalleryContentPage(
-      context,
-      options,
-      provider,
-      photoList,
-      pickedAssetList,
-    );
+    final bool status = await PermissionUtils.canMultiplePermission([Permission.photos, Permission.storage]);
+    if (!status) {
+      throw 'permission denied';
+    } else {
+      return _openGalleryContentPage(
+        context,
+        options,
+        provider,
+        photoList,
+        pickedAssetList,
+      );
+    }
   }
 
   static Widget buildGallery({
@@ -201,7 +207,7 @@ class PhotoPicker {
       sortDelegate: sortDelegate,
       checkBoxBuilderDelegate: DefaultCheckBoxBuilderDelegate(),
       loadingDelegate: loadingDelegate,
-      badgeDelegate: DefaultBadgeDelegate(),
+      badgeDelegate: DurationBadgeDelegate(),
       pickType: pickType,
     );
     assert(provider != null, "provider must be not null");
@@ -222,21 +228,22 @@ class PhotoPicker {
     );
   }
 
-  Future<void> requestPermission(BuildContext context,
-      {@required I18nProvider provider}) async {
-    var requestPermission = await PhotoManager.requestPermission();
-    if (requestPermission != true) {
-      var result = await showDialog(
-        context: context,
-        builder: (ctx) => NotPermissionDialog(
-          provider.getNotPermissionText(),
-        ),
-      );
-      if (result == true) {
-        PhotoManager.openSetting();
-      }
-      return null;
-    }
+  Future<bool> requestPermission({@required I18nProvider provider, @required List<Permission> permissions}) async {
+    final bool status =
+        await PermissionUtils.canMultiplePermission(permissions);
+    // if (!status) {
+    //   var result = await showDialog(
+    //     context: context,
+    //     builder: (ctx) => NotPermissionDialog(
+    //       provider.getNotPermissionText(),
+    //     ),
+    //   );
+    //   if (result == true) {
+    //     PhotoManager.openSetting();
+    //   }
+    //   return false;
+    // }
+    return status;
   }
 
   Future<PickedEntity> _openGalleryContentPage(

lib/src/delegate/badge_delegate.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:photo/src/engine/iconfont.dart';
 import 'package:photo_manager/photo_manager.dart';
 
 abstract class BadgeDelegate {
@@ -51,28 +52,33 @@ class DurationBadgeDelegate extends BadgeDelegate {
   Widget buildBadge(BuildContext context, AssetType type, Duration duration) {
     if (type == AssetType.video) {
       var s = duration.inSeconds % 60;
-      var m = duration.inMinutes % 60;
-      var h = duration.inHours;
+      var m = duration.inMinutes;
 
-      String text =
-          "$h:${m.toString().padLeft(2, '0')}:${s.toString().padLeft(2, '0')}";
+      String text = "${m.toString().padLeft(2, '0')}:${s.toString().padLeft(2, '0')}";
 
       return Padding(
-        padding: const EdgeInsets.all(2.0),
+        padding: const EdgeInsets.all(4.0),
         child: Align(
           alignment: alignment,
           child: Container(
-            decoration: BoxDecoration(
-              color: Theme.of(context).primaryColor.withOpacity(0.65),
+            child: Row(
+              children: [
+                Icon(MutliImagePickerFont.video, size: 20, color: Colors.white,),
+                Padding(
+                  padding: EdgeInsets.only(left: 6.0),
+                  child: Text(
+                    text,
+                    style: const TextStyle(
+                      fontSize: 14.0,
+                      color: Colors.white,
+                    ),
+                  ),
+                ),
+              ],
             ),
-            child: Text(
-              text,
-              style: const TextStyle(
-                fontSize: 12.0,
-                color: Colors.white,
-              ),
+            padding: EdgeInsets.symmetric(
+              horizontal: 2,
             ),
-            padding: const EdgeInsets.all(4.0),
           ),
         ),
       );

lib/src/engine/iconfont.dart

@@ -0,0 +1,10 @@
+
+import 'package:flutter/material.dart';
+
+class MutliImagePickerFont {
+  MutliImagePickerFont._();
+  static const String _family = 'PhotoFont';
+  static const String _fontPackage = 'photo';
+
+  static const IconData video = IconData(0xe6bd, fontFamily: _family, fontPackage: _fontPackage);
+}

lib/src/permission_utils.dart

@@ -0,0 +1,38 @@
+import 'dart:io';
+
+import 'package:permission_handler/permission_handler.dart';
+
+export 'package:permission_handler/permission_handler.dart';
+
+class PermissionUtils {
+  static Future<bool> canPermission(Permission permission, [bool request = true]) async {
+    if (permission == Permission.storage && Platform.isIOS) {
+      return true;
+    }
+    if (permission == Permission.photos && Platform.isAndroid) {
+      return true;
+    }
+    if (!await permission.status.isGranted) {
+      if (request) {
+        final PermissionStatus status =  await permission.request();
+        if (status.isDenied) {
+          openAppSettings();
+        }
+        return status.isGranted;
+      }
+      return false;
+    } else {
+      return true;
+    }
+  }
+
+  static Future<bool> canMultiplePermission(List<Permission> list, [bool request = true]) async {
+    for (final Permission permission in list) {
+      if (!await canPermission(permission, request)) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+}

pubspec.lock

@@ -123,6 +123,20 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.9.0"
+  permission_handler:
+    dependency: "direct main"
+    description:
+      name: permission_handler
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "5.0.1+1"
+  permission_handler_platform_interface:
+    dependency: transitive
+    description:
+      name: permission_handler_platform_interface
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.1"
   photo_manager:
     dependency: "direct main"
     description:

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.5.2
+version: 0.5.3
 author: caijinglong<cjl_spy@163.com>
 homepage: https://github.com/CaiJingLong/flutter_photo
 
@@ -14,6 +14,7 @@ dependencies:
   photo_manager: 0.5.1
   provider: ^4.0.5
   image_picker: ^0.6.5
+  permission_handler: ^5.0.0+hotfix.8
 
 dev_dependencies:
   flutter_test:
@@ -24,6 +25,11 @@ dev_dependencies:
 
 # The following section is specific to Flutter.
 flutter:
+  uses-material-design: true
+  fonts:
+    - family: PhotoFont
+      fonts:
+        - asset: lib/fonts/iconfont.ttf
   # To add assets to your package, add an assets section, like this:
   # assets:
   #  - images/a_dot_burr.jpeg