修改了lru cache

现在的lru cache和图片尺寸相关联

初始化时的loading

排序的delegate

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## [0.0.5] add a params
+
+add the sort delegate to help user sort gallery
+
+Optimized LruCache
+
+add a loading refresh indicator in the gallery
+
 ## [0.0.4] fix #1
 
 fix request other permission will crash bug

README.md

@@ -13,7 +13,7 @@ if you want to build custom ui, you just need api to make custom ui. to use [pho
 
 ```yaml
 dependencies:
-  photo: ^0.0.4
+  photo: ^0.0.5
 ```
 
 ## import
@@ -26,26 +26,27 @@ import 'package:photo_manager/photo_manager.dart';
 ## use
 
 ```dart
-  void _pickImage(BuildContext context) async {
-    List<ImageEntity> imgList = await PhotoPicker.pickImage(
-      context: context, // BuildContext requied
-
-      /// The following are optional parameters.
-      themeColor: Colors.green, // the title color and bottom color
-      padding: 5.0, // item padding
-      dividerColor: Colors.deepOrange, // divider color
-      disableColor: Colors.grey.shade300, // the check box disable color
-      itemRadio: 0.88, // the content item radio
-      maxSelected: 8, // max picker image count
-      provider: CNProvider(), // i18n provider ,default is chinese. , you can custom I18nProvider or use ENProvider()
-      rowCount: 5,  // item row count
-      textColor: Colors.white, // text color
-      thumbSize: 150, // preview thumb size, optional, default is 64
-    );
-
-    imgList.forEach((e) async {
-      print(e.id);
-    });
+  void _pickImage() async {
+      List<ImageEntity> imgList = await PhotoPicker.pickImage(
+        context: context, // BuildContext requied
+
+        /// The following are optional parameters.
+        themeColor: Colors.green, // the title color and bottom color
+        padding: 5.0, // item padding
+        dividerColor: Colors.deepOrange, // divider color
+        disableColor: Colors.grey.shade300, // the check box disable color
+        itemRadio: 0.88, // the content item radio
+        maxSelected: 8, // max picker image count
+        provider: CNProvider(), // i18n provider ,default is chinese. , you can custom I18nProvider or use ENProvider()
+        rowCount: 5,  // item row count
+        textColor: Colors.white, // text color
+        thumbSize: 150, // preview thumb size , default is 64
+        sortDelegate: SortDelegate.common, // default is common ,or you make custom delegate
+      );
+
+      imgList.forEach((e) async {
+          print(e.id);
+      });
   }
 ```
 
@@ -77,3 +78,19 @@ rootProject.allprojects {
 if you use the proguard
 
 see the [github](https://github.com/bumptech/glide#proguard)
+
+
+## about ios
+
+Because the album is a privacy privilege, you need user permission to access it. You must to modify the `Info.plist` file in Runner project.
+
+
+like next
+
+```plist
+	<key>NSPhotoLibraryUsageDescription</key>
+    <string>App需要您的同意,才能访问相册</string>
+```
+
+xcode like image
+![in xcode](https://github.com/CaiJingLong/some_asset/blob/master/flutter_photo2.png)

example/lib/main.dart

@@ -31,28 +31,32 @@ class _MyHomePageState extends State<MyHomePage> {
 
   void _pickImage() async {
     List<ImageEntity> imgList = await PhotoPicker.pickImage(
-      context: context,
-      themeColor: Colors.green,
-      padding: 5.0,
-      dividerColor: Colors.deepOrange,
-      disableColor: Colors.grey.shade300,
-      itemRadio: 0.88,
-      maxSelected: 8,
-      provider: CNProvider(),
-      rowCount: 5,
-      textColor: Colors.white,
-      thumbSize: 250,
-    );
+      context: context, // BuildContext requied
 
-    List<String> r = [];
+      /// The following are optional parameters.
+      themeColor: Colors.green, // the title color and bottom color
+      padding: 5.0, // item padding
+      dividerColor: Colors.deepOrange, // divider color
+      disableColor: Colors.grey.shade300, // the check box disable color
+      itemRadio: 0.88, // the content item radio
+      maxSelected: 8, // max picker image count
+      provider: CNProvider(), // i18n provider ,default is chinese. , you can custom I18nProvider or use ENProvider()
+      rowCount: 5,  // item row count
+      textColor: Colors.white, // text color
+      thumbSize: 150, // preview thumb size , default is 64
+      sortDelegate: SortDelegate.common, // default is common ,or you make custom delegate to sort your gallery
+    );
 
-    for(var e in imgList){
-      var file = await e.file;
-      r.add(file.absolute.path);
+    if (imgList == null) {
+      currentSelected = "not select item";
+    } else {
+      List<String> r = [];
+      for (var e in imgList) {
+        var file = await e.file;
+        r.add(file.absolute.path);
+      }
+      currentSelected = r.join("\n\n");
     }
-
-    currentSelected = r.join("\n\n");
-
     setState(() {});
   }
 
@@ -64,7 +68,10 @@ class _MyHomePageState extends State<MyHomePage> {
       ),
       body: Container(
         child: Center(
-          child: Text('$currentSelected'),
+          child: Text(
+            '$currentSelected',
+            textAlign: TextAlign.center,
+          ),
         ),
       ),
       floatingActionButton: new FloatingActionButton(

lib/photo.dart

@@ -3,13 +3,17 @@ library photo;
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:photo_manager/photo_manager.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:photo/src/ui/photo_app.dart';
-import 'package:photo_manager/photo_manager.dart';
+import '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/delegate/sort_delegate.dart';
 
 class PhotoPicker {
   static PhotoPicker _instance;
@@ -53,6 +57,7 @@ class PhotoPicker {
     Color disableColor,
     int thumbSize = 64,
     I18nProvider provider = I18nProvider.chinese,
+    SortDelegate sortDelegate,
   }) {
     assert(provider != null, "provider must be not null");
     assert(context != null, "context must be not null");
@@ -62,6 +67,8 @@ class PhotoPicker {
     disableColor ??= Theme.of(context)?.disabledColor ?? Colors.grey;
     textColor ??= Colors.white;
 
+    sortDelegate ??= SortDelegate.common;
+
     var options = Options(
       rowCount: rowCount,
       dividerColor: dividerColor,
@@ -72,9 +79,14 @@ class PhotoPicker {
       textColor: textColor,
       themeColor: themeColor,
       thumbSize: thumbSize,
+      sortDelegate: sortDelegate,
     );
 
-    return PhotoPicker()._pickImage(context, options, provider);
+    return PhotoPicker()._pickImage(
+      context,
+      options,
+      provider,
+    );
   }
 
   Future<List<ImageEntity>> _pickImage(
@@ -100,13 +112,13 @@ class PhotoPicker {
   }
 
   Future<List<ImageEntity>> _openGalleryContentPage(
-      BuildContext context, Options options, I18nProvider provider)async{
+      BuildContext context, Options options, I18nProvider provider) async {
     return Navigator.of(context).push(
       MaterialPageRoute(
         builder: (ctx) => PhotoApp(
-          options: options,
-          provider: provider,
-        ),
+              options: options,
+              provider: provider,
+            ),
       ),
     );
   }

lib/src/delegate/sort_delegate.dart

@@ -0,0 +1,66 @@
+import 'package:photo_manager/photo_manager.dart';
+
+abstract class SortDelegate {
+  const SortDelegate();
+
+  void sort(List<ImagePathEntity> list);
+
+  static const none = DefaultSortDelegate();
+
+  static const common = CommonSortDelegate();
+}
+
+class DefaultSortDelegate extends SortDelegate {
+  const DefaultSortDelegate();
+
+  @override
+  void sort(List<ImagePathEntity> list) {}
+}
+
+class CommonSortDelegate extends SortDelegate {
+  const CommonSortDelegate();
+
+  @override
+  void sort(List<ImagePathEntity> list) {
+    list.sort((path1, path2) {
+      if (path1 == ImagePathEntity.all) {
+        return -1;
+      }
+
+      if (path2 == ImagePathEntity.all) {
+        return 1;
+      }
+
+      if (_isCamera(path1)) {
+        return -1;
+      }
+
+      if (_isCamera(path2)) {
+        return 1;
+      }
+
+      if (_isScreenShot(path1)) {
+        return -1;
+      }
+
+      if (_isScreenShot(path2)) {
+        return 1;
+      }
+
+      return otherSort(path1, path2);
+    });
+  }
+
+  int otherSort(ImagePathEntity path1, ImagePathEntity path2) {
+    return path1.name.compareTo(path2.name);
+  }
+
+  bool _isCamera(ImagePathEntity entity) {
+    return entity.name.toUpperCase() == "camera".toUpperCase();
+  }
+
+  bool _isScreenShot(ImagePathEntity entity) {
+    return entity.name.toUpperCase() == "screenshots".toUpperCase() ||
+        entity.name.toUpperCase() == "screenshot".toUpperCase();
+  }
+}

lib/src/engine/lru_cache.dart

@@ -4,17 +4,35 @@ import 'dart:typed_data';
 import 'package:photo_manager/photo_manager.dart';
 
 class ImageLruCache {
-  static LRUMap<ImageEntity, Uint8List> _map = LRUMap(500);
+  static LRUMap<_ImageCacheEntity, Uint8List> _map = LRUMap(500);
 
-  static Uint8List getData(ImageEntity entity) {
-    return _map.get(entity);
+  static Uint8List getData(ImageEntity entity, [int size = 64]) {
+    return _map.get(_ImageCacheEntity(entity, size));
   }
 
-  static void setData(ImageEntity entity, Uint8List list) {
-    _map.put(entity, list);
+  static void setData(ImageEntity entity, int size, Uint8List list) {
+    _map.put(_ImageCacheEntity(entity,size), list);
   }
 }
 
+class _ImageCacheEntity {
+  ImageEntity entity;
+  int size;
+
+  _ImageCacheEntity(this.entity, this.size);
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is _ImageCacheEntity &&
+          runtimeType == other.runtimeType &&
+          entity == other.entity &&
+          size == other.size;
+
+  @override
+  int get hashCode => entity.hashCode ^ size.hashCode;
+}
+
 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.

lib/src/entity/options.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:photo/src/delegate/sort_delegate.dart';
 
 class Options {
   final int rowCount;
@@ -19,6 +20,8 @@ class Options {
 
   final int thumbSize;
 
+  final SortDelegate sortDelegate;
+
   const Options({
     this.rowCount,
     this.maxSelected,
@@ -29,5 +32,6 @@ class Options {
     this.textColor,
     this.disableColor,
     this.thumbSize,
+    this.sortDelegate,
   });
 }

lib/src/provider/i18n_provider.dart

@@ -16,6 +16,10 @@ abstract class I18nProvider {
 
   String getAllGalleryText(Options options);
 
+  String loadingText(){
+    return "loading...";
+  }
+
   I18NPermissionProvider getNotPermissionText(Options options);
 
   static const I18nProvider chinese = CNProvider();
@@ -56,6 +60,11 @@ class CNProvider extends I18nProvider {
     return "全部图片";
   }
 
+  @override
+  String loadingText() {
+    return "加载中...";
+  }
+
   @override
   I18NPermissionProvider getNotPermissionText(Options options) {
     return I18NPermissionProvider(

lib/src/ui/page/photo_main_page.dart

@@ -35,6 +35,8 @@ class _PhotoMainPageState extends State<PhotoMainPage>
 
   ImagePathEntity _currentPath = ImagePathEntity.all;
 
+  bool _isInit = false;
+
   ImagePathEntity get currentPath {
     if (_currentPath == null) {
       return null;
@@ -150,16 +152,25 @@ class _PhotoMainPageState extends State<PhotoMainPage>
 
   void _refreshList() async {
     var pathList = await PhotoManager.getImagePathList();
+
+    options.sortDelegate.sort(pathList);
+
     galleryPathList.clear();
     galleryPathList.addAll(pathList);
 
     var imageList = await currentPath.imageList;
     this.list.clear();
     this.list.addAll(imageList);
-    setState(() {});
+    setState(() {
+      _isInit = true;
+    });
   }
 
   Widget _buildBody() {
+    if (!_isInit) {
+      return _buildLoading();
+    }
+
     return Container(
       color: options.disableColor,
       child: GridView.builder(
@@ -341,6 +352,34 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     }
     return false;
   }
+
+  Widget _buildLoading() {
+    return Center(
+      child: Column(
+        children: <Widget>[
+          Container(
+            width: 40.0,
+            height: 40.0,
+            padding: const EdgeInsets.all(5.0),
+            child: CircularProgressIndicator(
+              valueColor: AlwaysStoppedAnimation(themeColor),
+            ),
+          ),
+          Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Text(
+              i18nProvider.loadingText(),
+              style: const TextStyle(
+                fontSize: 12.0,
+              ),
+            ),
+          ),
+        ],
+        crossAxisAlignment: CrossAxisAlignment.center,
+        mainAxisAlignment: MainAxisAlignment.center,
+      ),
+    );
+  }
 }
 
 class _BottomWidget extends StatefulWidget {
@@ -457,7 +496,7 @@ class ImageItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    var thumb = ImageLruCache.getData(entity);
+    var thumb = ImageLruCache.getData(entity, size);
     if (thumb != null) {
       return _buildImageItem(thumb);
     }
@@ -468,7 +507,7 @@ class ImageItem extends StatelessWidget {
         var futureData = snapshot.data;
         if (snapshot.connectionState == ConnectionState.done &&
             futureData != null) {
-          ImageLruCache.setData(entity, futureData);
+          ImageLruCache.setData(entity, size, futureData);
           return _buildImageItem(futureData);
         }
         return Center(

pubspec.yaml

@@ -1,6 +1,6 @@
 name: photo
 description: image picker, multi picker,use flutter as ui, if you want to build custom ui,you just use photo_manager.
-version: 0.0.4
+version: 0.0.5
 author: caijinglong<cjl_spy@163.com>
 homepage: https://github.com/CaiJingLong/flutter_photo