add album cover && i18n

example/ios/Flutter/.last_build_id

@@ -0,0 +1 @@
+e66d98e32fcb326d739aa957c5133ebc

example/ios/Runner.xcodeproj/project.pbxproj

@@ -316,7 +316,6 @@
 /* Begin XCBuildConfiguration section */
 		97C147031CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -370,7 +369,6 @@
 		};
 		97C147041CF9000F007C117D /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;

example/lib/main.dart

@@ -161,12 +161,12 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
     /// context is required, other params is optional.
     List<AssetPathEntity> pathList2 = await PhotoManager.getAssetPathList(
         hasAll: true, type: RequestType.image,);
-    List<AssetEntity> imgList = await PhotoPicker.pickAsset(
+    PickedEntity entity = await PhotoPicker.pickAsset(
       context: context,
       padding: 4.0,
       itemRadio: 1,
-      maxSelected: 8,
-      provider: I18nProvider.chinese,
+      maxSelected: 2,
+      provider: I18nProvider.english,
       rowCount: 4,
       thumbSize: 150,
       sortDelegate: SortDelegate.common,
@@ -174,19 +174,19 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
       photoPathList: pathList2,
     );
 
-    if (imgList == null || imgList.isEmpty) {
+    if (entity == null || entity.asset.isEmpty) {
       showToast("No pick item.");
       return;
     } else {
       List<String> r = [];
-      for (var e in imgList) {
+      for (var e in entity.asset) {
         var file = await e.file;
         r.add(file.absolute.path);
       }
       currentSelected = r.join("\n\n");
 
       List<AssetEntity> preview = [];
-      preview.addAll(imgList);
+      preview.addAll(entity.asset);
       Navigator.push(context,
           MaterialPageRoute(builder: (_) => PreviewPage(list: preview)));
     }

example/lib/picked_example.dart

@@ -35,13 +35,13 @@ class _PickedExampleState extends State<PickedExample> {
   }
 
   void _pickAsset() async {
-    final result = await PhotoPicker.pickAsset(
+    final entity = await PhotoPicker.pickAsset(
       context: context,
       pickedAssetList: picked,
     );
-    if (result != null && result.isNotEmpty) {
+    if (entity != null && entity.asset.isNotEmpty) {
       picked.clear();
-      picked.addAll(result);
+      picked.addAll(entity.asset);
       setState(() {});
     }
   }

lib/src/provider/i18n_provider.dart

@@ -6,6 +6,8 @@ abstract class I18nProvider {
 
   String getTitleText(Options options);
 
+  String getCancelText(Options options);
+
   String getSureText(Options options, int currentCount);
 
   String getPreviewText(Options options, SelectedProvider selectedProvider);
@@ -42,6 +44,11 @@ class CNProvider extends I18nProvider {
     return "预览(${selectedProvider.selectedCount})";
   }
 
+  @override
+  String getCancelText(Options options) {
+    return "取消";
+  }
+
   @override
   String getSureText(Options options, int currentCount) {
     return "确定($currentCount/${options.maxSelected})";
@@ -92,9 +99,14 @@ class ENProvider extends I18nProvider {
     return "Preview (${selectedProvider.selectedCount})";
   }
 
+  @override
+  String getCancelText(Options options) {
+    return "Cancel";
+  }
+
   @override
   String getSureText(Options options, int currentCount) {
-    return "Save ($currentCount/${options.maxSelected})";
+    return "Confirm ($currentCount/${options.maxSelected})";
   }
 
   @override
@@ -104,7 +116,7 @@ class ENProvider extends I18nProvider {
 
   @override
   String getFullImageText(Options options) {
-    return "Full Image";
+    return "Full image";
   }
 
   @override
@@ -114,7 +126,7 @@ class ENProvider extends I18nProvider {
 
   @override
   String getAllGalleryText(Options options) {
-    return "Recent";
+    return "All";
   }
 
   @override

lib/src/ui/dialog/change_gallery_dialog.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:photo/src/entity/options.dart';
 import 'package:photo/src/provider/i18n_provider.dart';
+import 'package:photo/src/ui/page/photo_main_page.dart';
 import 'package:photo_manager/photo_manager.dart';
 
 class ChangeGalleryDialog extends StatefulWidget {
-
   final ValueChanged<AssetPathEntity> onGalleryChange;
   final List<AssetPathEntity> galleryList;
   final I18nProvider i18n;
@@ -25,7 +25,6 @@ class ChangeGalleryDialog extends StatefulWidget {
 }
 
 class _ChangeGalleryDialogState extends State<ChangeGalleryDialog> {
-      
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -42,6 +41,15 @@ class _ChangeGalleryDialogState extends State<ChangeGalleryDialog> {
     );
   }
 
+  Future<AssetEntity> getCoverForGallery(AssetPathEntity gallery) async {
+    List<AssetEntity> assets =
+        await gallery.getAssetListRange(start: 0, end: 1);
+    if (assets.isNotEmpty) {
+      return assets[0];
+    }
+    return null;
+  }
+
   Widget _buildItem(BuildContext context, int index) {
     var entity = widget.galleryList[index];
     String text;
@@ -58,55 +66,83 @@ class _ChangeGalleryDialogState extends State<ChangeGalleryDialog> {
         padding: EdgeInsets.symmetric(vertical: 12),
         decoration: BoxDecoration(
           border: Border(
-            top: index == 0 ? BorderSide.none : BorderSide(color: widget.options.theme.dividerColor, width: 1),
+            top: index == 0
+                ? BorderSide.none
+                : BorderSide(
+                    color: widget.options.theme.dividerColor, width: 1),
           ),
         ),
         child: Row(
           children: [
             // ImageItem(),
-            Container(
+            SizedBox(
               width: 40,
               height: 40,
-              color: Colors.black,
+              child: FutureBuilder(
+                future: getCoverForGallery(entity),
+                initialData: null,
+                builder: (BuildContext context,
+                    AsyncSnapshot<AssetEntity> snapshot) {
+                  if (snapshot.data != null) {
+                    return ImageItem(
+                      entity: snapshot.data,
+                      size: widget.options.thumbSize,
+                      themeColor: widget.options.theme.primaryColor,
+                      loadingDelegate: widget.options.loadingDelegate,
+                      badgeDelegate: widget.options.badgeDelegate,
+                    );
+                  } else {
+                    return Container();
+                  }
+                },
+              ),
+            ),
+            SizedBox(
+              width: 16,
             ),
-            SizedBox(width: 16,),
             Expanded(
-              child: Row(
-                children: [
-                  Expanded(
-                    child: Row(
-                      children: <Widget>[
-                        Text('$text ', style: widget.options.theme.textStyle,),
-                        Text('(${entity.assetCount})', style: widget.options.theme.textStyle.copyWith(fontSize: 14),),
-                      ],
-                    ),
+                child: Row(
+              children: [
+                Expanded(
+                  child: Row(
+                    children: <Widget>[
+                      Text(
+                        '$text ',
+                        style: widget.options.theme.textStyle,
+                      ),
+                      Text(
+                        '(${entity.assetCount})',
+                        style: widget.options.theme.textStyle
+                            .copyWith(fontSize: 14),
+                      ),
+                    ],
                   ),
-                  if (widget.current.id == entity.id)
+                ),
+                if (widget.current.id == entity.id)
                   Icon(
                     Icons.check_circle,
                     size: 20,
                     color: widget.options.theme.primaryColor,
                   ),
-                  // RichText(
-                  //   text: TextSpan(
-                  //     text: '$text ',
-                  //     style: widget.options.theme.textStyle.copyWith(
-                  //       height: 1.4,
-                  //     ),
-                  //     children: [
-                  //       TextSpan(
-                  //         text: '(${entity.assetCount})',
-                  //         style: widget.options.theme.textStyle.copyWith(
-                  //           fontSize: 14,
-                  //           height: 1.6,
-                  //         ),
-                  //       )
-                  //     ]
-                  //   ),
-                  // )
-                ],
-              )
-            ),
+                // RichText(
+                //   text: TextSpan(
+                //     text: '$text ',
+                //     style: widget.options.theme.textStyle.copyWith(
+                //       height: 1.4,
+                //     ),
+                //     children: [
+                //       TextSpan(
+                //         text: '(${entity.assetCount})',
+                //         style: widget.options.theme.textStyle.copyWith(
+                //           fontSize: 14,
+                //           height: 1.6,
+                //         ),
+                //       )
+                //     ]
+                //   ),
+                // )
+              ],
+            )),
           ],
         ),
       ),

lib/src/ui/page/photo_main_page.dart

@@ -160,59 +160,84 @@ class _PhotoMainPageState extends State<PhotoMainPage>
       style: options.theme.textStyle,
       child: Scaffold(
         appBar: AppBar(
+          titleSpacing: 0.0,
           backgroundColor: options.theme.surfaceColor,
-          leading: IconButton(
-            icon: Text('取消', style: options.theme.textStyle),
-            onPressed: _cancel,
-          ),
+          automaticallyImplyLeading: false,
           centerTitle: true,
-          title: FlatButton(
-            padding: EdgeInsets.zero,
-            onPressed: _showGallerySelectDialog,
-            splashColor: Colors.transparent,
-            highlightColor: Colors.transparent,
-            child: Container(
-                alignment: Alignment.center,
-                height: 44.0,
-                padding: EdgeInsets.zero.copyWith(right: kToolbarHeight),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Text(
-                      currentGalleryName,
-                      style: options.theme.textStyle.apply(
-                        fontSizeDelta: 2.0,
-                        fontWeightDelta: 1,
-                      ),
-                    ),
-                    Container(
-                      width: 18,
-                      height: 18,
-                      margin: EdgeInsets.only(left: 8),
-                      decoration: ShapeDecoration(
-                          shape: CircleBorder(
-                        side: BorderSide(
-                            color: options.theme.onSurfaceColor, width: 1.5),
-                      )),
-                      child: AnimatedSwitcher(
-                        transitionBuilder: (child, animation) {
-                          final Tween<double> tween = overlayEntry != null
-                              ? Tween(begin: -0.25, end: 0.25)
-                              : Tween(begin: 0.25, end: 0.75);
-                          //var tween = Tween(begin: -0.5, end: 0.0);
-                          return RotationTransition(
-                              child: child, turns: tween.animate(animation));
-                        },
-                        duration: Duration(milliseconds: 200),
-                        reverseDuration: Duration(milliseconds: 0),
-                        child: Icon(Icons.chevron_left,
-                            key: ValueKey(overlayEntry == null ? 0 : 1),
-                            size: 14,
-                            color: options.theme.onSurfaceColor),
-                      ),
-                    ),
-                  ],
-                )),
+          title: Row(
+              mainAxisAlignment: MainAxisAlignment.start,
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                GestureDetector(
+                  behavior: HitTestBehavior.opaque,
+                  onTap: _cancel,
+                  child: Container(
+                    height: kToolbarHeight,
+                    padding: kTabLabelPadding,
+                    alignment: Alignment.center,
+                    child: Text(i18nProvider.getCancelText(options), style: options.theme.textStyle),
+                  ),
+                ),
+                Expanded(
+                  child: FlatButton(
+                    padding: EdgeInsets.zero,
+                    onPressed: _showGallerySelectDialog,
+                    splashColor: Colors.transparent,
+                    highlightColor: Colors.transparent,
+                    child: Container(
+                        alignment: Alignment.center,
+                        height: 44.0,
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            Text(
+                              currentGalleryName,
+                              style: options.theme.textStyle.apply(
+                                fontSizeDelta: 2.0,
+                                fontWeightDelta: 1,
+                              ),
+                            ),
+                            Container(
+                              width: 18,
+                              height: 18,
+                              margin: EdgeInsets.only(left: 8),
+                              decoration: ShapeDecoration(
+                                  shape: CircleBorder(
+                                side: BorderSide(
+                                    color: options.theme.onSurfaceColor,
+                                    width: 1.5),
+                              )),
+                              child: AnimatedSwitcher(
+                                transitionBuilder: (child, animation) {
+                                  final Tween<double> tween = overlayEntry != null
+                                      ? Tween(begin: -0.25, end: 0.25)
+                                      : Tween(begin: 0.25, end: 0.75);
+                                  //var tween = Tween(begin: -0.5, end: 0.0);
+                                  return RotationTransition(
+                                      child: child,
+                                      turns: tween.animate(animation));
+                                },
+                                duration: Duration(milliseconds: 200),
+                                reverseDuration: Duration(milliseconds: 0),
+                                child: Icon(Icons.chevron_left,
+                                    key: ValueKey(overlayEntry == null ? 0 : 1),
+                                    size: 14,
+                                    color: options.theme.onSurfaceColor),
+                              ),
+                            ),
+                          ],
+                        )),
+                  ),
+                ),
+                Container(
+                  height: kToolbarHeight,
+                  padding: kTabLabelPadding,
+                  alignment: Alignment.center,
+                  child: Text(i18nProvider.getCancelText(options), style: options.theme.textStyle.copyWith(
+                    color: Colors.transparent,
+                  )),
+                ),
+              ],
           ),
         ),
         body: _buildBody(),
@@ -267,7 +292,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
               .copyWith(color: options.theme.onPrimaryColor),
         ),
         duration: Duration(milliseconds: 1500),
-        backgroundColor: options.theme.primaryColor.withOpacity(0.7),
+        backgroundColor: options.theme.primaryColor,
       ),
     );
   }