Merge pull request #89 from CaiJingLong/fix-refresh-for-asset-list

Fix: refresh from assetPathList.

example/android/gradle.properties

@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.enableJetifier=true
-android.useAndroidX=true
+android.useAndroidX=true
+android.enableR8=true

example/lib/main.dart

@@ -1,22 +1,25 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:oktoast/oktoast.dart';
 import 'package:photo/photo.dart';
 import 'package:photo_manager/photo_manager.dart';
 
 import './preview.dart';
 
-void main() => runApp(new MyApp());
+void main() => runApp(MyApp());
 
 class MyApp extends StatelessWidget {
   // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
-    return new MaterialApp(
-      title: 'Pick Image Demo',
-      theme: new ThemeData(
-        primarySwatch: Colors.blue,
+    return OKToast(
+      child: MaterialApp(
+        title: 'Pick Image Demo',
+        theme: ThemeData(
+          primarySwatch: Colors.blue,
+        ),
+        home: MyHomePage(title: 'Pick Image Demo'),
       ),
-      home: new MyHomePage(title: 'Pick Image Demo'),
     );
   }
 }
@@ -26,7 +29,7 @@ class MyHomePage extends StatefulWidget {
   final String title;
 
   @override
-  _MyHomePageState createState() => new _MyHomePageState();
+  _MyHomePageState createState() => _MyHomePageState();
 }
 
 class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
@@ -62,9 +65,9 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
 
   @override
   Widget build(BuildContext context) {
-    return new Scaffold(
-      appBar: new AppBar(
-        title: new Text(widget.title),
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(widget.title),
         actions: <Widget>[
           FlatButton(
             child: Icon(Icons.image),
@@ -96,10 +99,10 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
           ),
         ),
       ),
-      floatingActionButton: new FloatingActionButton(
+      floatingActionButton: FloatingActionButton(
         onPressed: () => _pickAsset(PickType.all),
         tooltip: 'pickImage',
-        child: new Icon(Icons.add),
+        child: Icon(Icons.add),
       ),
     );
   }
@@ -158,8 +161,8 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
       photoPathList: pathList,
     );
 
-    if (imgList == null) {
-      currentSelected = "not select item";
+    if (imgList == null || imgList.isEmpty) {
+      showToast("No pick item.");
     } else {
       List<String> r = [];
       for (var e in imgList) {

example/pubspec.yaml

@@ -23,33 +23,29 @@ dependencies:
   photo:
     path: ../
 
+  oktoast: ^2.0.0
+
 dev_dependencies:
   flutter_test:
     sdk: flutter
 
-
 # For information on the generic Dart part of this file, see the
 # following page: https://www.dartlang.org/tools/pub/pubspec
 
 # The following section is specific to Flutter.
 flutter:
-
   # The following line ensures that the Material Icons font is
   # included with your application, so that you can use the icons in
   # the material Icons class.
   uses-material-design: true
-
   # To add assets to your application, add an assets section, like this:
   # assets:
   #  - images/a_dot_burr.jpeg
   #  - images/a_dot_ham.jpeg
-
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.io/assets-and-images/#resolution-aware.
-
   # For details regarding adding assets from package dependencies, see
   # https://flutter.io/assets-and-images/#from-packages
-
   # To add custom fonts to your application, add a fonts section here,
   # in this "flutter" section. Each entry in this list should have a
   # "family" key with the font family name, and a "fonts" key with a

example/test/widget_test.dart

@@ -12,7 +12,7 @@ import '../lib/main.dart';
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(new MyApp());
+    await tester.pumpWidget(MyApp());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);

lib/src/engine/lru_cache.dart

@@ -40,7 +40,7 @@ class _ImageCacheEntity {
 typedef EvictionHandler<K, V>(K key, V value);
 
 class LRUMap<K, V> {
-  final LinkedHashMap<K, V> _map = new LinkedHashMap<K, V>();
+  final LinkedHashMap<K, V> _map = LinkedHashMap<K, V>();
   final int _maxSize;
   final EvictionHandler<K, V> _handler;
 

lib/src/ui/page/photo_main_page.dart

@@ -81,7 +81,6 @@ class _PhotoMainPageState extends State<PhotoMainPage>
   @override
   void initState() {
     super.initState();
-    _refreshList();
     scaffoldKey = GlobalKey();
     scrollController = ScrollController();
     _changeThrottle = Throttle(onCall: _onAssetChange);
@@ -89,6 +88,14 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     PhotoManager.startChangeNotify();
   }
 
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (!_isInit) {
+      _refreshList();
+    }
+  }
+
   @override
   void dispose() {
     PhotoManager.removeChangeCallback(_changeThrottle.call);
@@ -187,7 +194,8 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     );
   }
 
-  void _refreshList() {
+  void _refreshList() async {
+    await Future.delayed(Duration.zero);
     if (!useAlbum) {
       _refreshListFromWidget();
       return;
@@ -197,15 +205,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
   }
 
   Future<void> _refreshListFromWidget() async {
-    galleryPathList.clear();
-    galleryPathList.addAll(widget.photoList);
-    this.list.clear();
-    var assetList = await galleryPathList[0].assetList;
-    _sortAssetList(assetList);
-    this.list.addAll(assetList);
-    setState(() {
-      _isInit = true;
-    });
+    _onRefreshAssetPathList(widget.photoList);
   }
 
   Future<void> _refreshListFromGallery() async {
@@ -221,6 +221,10 @@ class _PhotoMainPageState extends State<PhotoMainPage>
         pathList = await PhotoManager.getAssetPathList();
     }
 
+    _onRefreshAssetPathList(pathList);
+  }
+
+  Future<void> _onRefreshAssetPathList(List<AssetPathEntity> pathList) async {
     if (pathList == null) {
       return;
     }
@@ -246,10 +250,6 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     });
   }
 
-  void _sortAssetList(List<AssetEntity> assetList) {
-    options?.sortDelegate?.assetDelegate?.sort(assetList);
-  }
-
   Widget _buildBody() {
     if (!_isInit) {
       return _buildLoading();
@@ -394,7 +394,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
   }
 
   void _onItemClick(AssetEntity data, int index) {
-    var result = new PhotoPreviewResult();
+    var result = PhotoPreviewResult();
     isPushed = true;
     Navigator.of(context).push(
       MaterialPageRoute(
@@ -425,7 +425,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
   }
 
   void _onTapPreview() async {
-    var result = new PhotoPreviewResult();
+    var result = PhotoPreviewResult();
     isPushed = true;
     var v = await Navigator.of(context).push(
       MaterialPageRoute(