Merge pull request #30 from CaiJingLong/sort-asset

Sort asset

example/android/app/build.gradle

@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -35,7 +35,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.example"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -56,6 +56,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+//    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+//    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }

example/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.3.1'
     }
 }
 

example/android/gradle.properties

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

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

lib/src/delegate/sort_asset_delegate.dart

@@ -0,0 +1,18 @@
+part of './sort_delegate.dart';
+
+abstract class SortAssetDelegate {
+  const SortAssetDelegate();
+
+  void sort(List<AssetEntity> list);
+}
+
+class DefaultAssetDelegate extends SortAssetDelegate {
+  const DefaultAssetDelegate();
+
+  @override
+  void sort(List<AssetEntity> list) {
+    list.sort((entity1, entity2) {
+      return entity2.createTime.compareTo(entity1.createTime);
+    });
+  }
+}

lib/src/delegate/sort_delegate.dart

@@ -1,7 +1,14 @@
 import 'package:photo_manager/photo_manager.dart';
 
+part './sort_asset_delegate.dart';
+
+/// SortPathDelegate
 abstract class SortDelegate {
-  const SortDelegate();
+  final SortAssetDelegate assetDelegate;
+
+  const SortDelegate({
+    this.assetDelegate = const DefaultAssetDelegate(),
+  });
 
   void sort(List<AssetPathEntity> list);
 
@@ -11,14 +18,18 @@ abstract class SortDelegate {
 }
 
 class DefaultSortDelegate extends SortDelegate {
-  const DefaultSortDelegate();
+  const DefaultSortDelegate({
+    SortAssetDelegate assetDelegate = const DefaultAssetDelegate(),
+  }) : super(assetDelegate: assetDelegate);
 
   @override
   void sort(List<AssetPathEntity> list) {}
 }
 
 class CommonSortDelegate extends SortDelegate {
-  const CommonSortDelegate();
+  const CommonSortDelegate({
+    SortAssetDelegate assetDelegate = const DefaultAssetDelegate(),
+  }) : super(assetDelegate: assetDelegate);
 
   @override
   void sort(List<AssetPathEntity> list) {

lib/src/ui/page/photo_main_page.dart

@@ -178,6 +178,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     galleryPathList.addAll(widget.photoList);
     this.list.clear();
     var assetList = await galleryPathList[0].assetList;
+    _sortAssetList(assetList);
     this.list.addAll(assetList);
     setState(() {
       _isInit = true;
@@ -210,6 +211,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
 
     if (pathList.isNotEmpty) {
       imageList = await pathList[0].assetList;
+      _sortAssetList(imageList);
       _currentPath = pathList[0];
     }
 
@@ -228,6 +230,10 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     });
   }
 
+  void _sortAssetList(List<AssetEntity> assetList) {
+    options?.sortDelegate?.assetDelegate?.sort(assetList);
+  }
+
   Widget _buildBody() {
     if (!_isInit) {
       return _buildLoading();
@@ -342,6 +348,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     _currentPath = value;
 
     _currentPath.assetList.then((v) {
+      _sortAssetList(v);
       list.clear();
       list.addAll(v);
       scrollController.jumpTo(0.0);

pubspec.lock

@@ -70,10 +70,12 @@ packages:
   photo_manager:
     dependency: "direct main"
     description:
-      name: photo_manager
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.2.1"
+      path: "."
+      ref: "8ef0bf9047cdd86e2331f0db8d15c4c50f35610d"
+      resolved-ref: "8ef0bf9047cdd86e2331f0db8d15c4c50f35610d"
+      url: "https://github.com/CaiJingLong/flutter_photo_manager.git"
+    source: git
+    version: "0.3.0"
   quiver:
     dependency: transitive
     description:

pubspec.yaml

@@ -11,11 +11,11 @@ dependencies:
   flutter:
     sdk: flutter
 
-  photo_manager: ^0.2.1
-  # photo_manager:
-  #   git:
-  #     url: https://github.com/CaiJingLong/flutter_photo_manager.git
-  #     ref: 29d844b2c4594d7e524d0169658bc4f3b9ef2ddc
+  # photo_manager: ^0.2.1
+  photo_manager:
+    git:
+      url: https://github.com/CaiJingLong/flutter_photo_manager.git
+      ref: 8ef0bf9047cdd86e2331f0db8d15c4c50f35610d
   # photo_manager:
   #   path: ../flutter_photo_manager