选择相册修改完毕

lib/photo.dart

@@ -4,9 +4,9 @@ import 'package:flutter/material.dart';
 import 'dart:async';
 
 import 'package:photo/src/entity/options.dart';
-import 'package:photo/src/page/not_permission_dialog.dart';
-import 'package:photo/src/page/photo_main_page.dart';
 import 'package:photo/src/provider/i18n_provider.dart';
+import 'package:photo/src/ui/dialog/not_permission_dialog.dart';
+import 'package:photo/src/ui/page/photo_main_page.dart';
 import 'package:photo_manager/photo_manager.dart';
 
 /// A Calculator.

lib/src/provider/gallery_list_provider.dart

@@ -0,0 +1,5 @@
+import 'package:photo_manager/photo_manager.dart';
+
+abstract class GalleryListProvider {
+  List<ImagePathEntity> galleryPathList = [];
+}

lib/src/provider/selected_provider.dart

@@ -1,12 +1,34 @@
 import 'package:photo_manager/photo_manager.dart';
 
 abstract class SelectedProvider {
+  List<ImageEntity> selectedList = [];
 
-  int get selectedCount;
+  int get selectedCount => selectedList.length;
 
-  bool containsEntity(ImageEntity entity);
+  bool containsEntity(ImageEntity entity) {
+    return selectedList.contains(entity);
+  }
 
-  int indexOfSelected(ImageEntity entity);
+  int indexOfSelected(ImageEntity entity) {
+    return selectedList.indexOf(entity);
+  }
+
+  bool isUpperLimit();
+
+  bool addSelectEntity(ImageEntity entity) {
+    if (containsEntity(entity)) {
+      return false;
+    }
+    if (isUpperLimit() == true) {
+      return false;
+    }
+    selectedList.add(entity);
+    return true;
+  }
+
+  bool removeSelectEntity(ImageEntity entity) {
+    return selectedList.remove(entity);
+  }
 
   void sure();
 }

lib/src/ui/dialog/change_gallery_dialog.dart

@@ -0,0 +1,35 @@
+import 'package:flutter/material.dart';
+import 'package:photo_manager/photo_manager.dart';
+
+class ChangeGalleryDialog extends StatefulWidget {
+  final List<ImagePathEntity> galleryList;
+
+  const ChangeGalleryDialog({Key key, this.galleryList}) : super(key: key);
+
+  @override
+  _ChangeGalleryDialogState createState() => _ChangeGalleryDialogState();
+}
+
+class _ChangeGalleryDialogState extends State<ChangeGalleryDialog> {
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      child: ListView.builder(
+        itemBuilder: _buildItem,
+        itemCount: widget.galleryList.length,
+      ),
+    );
+  }
+
+  Widget _buildItem(BuildContext context, int index) {
+    var entity = widget.galleryList[index];
+    return FlatButton(
+      child: ListTile(
+        title: Text(entity.name),
+      ),
+      onPressed: () {
+        Navigator.pop(context, entity);
+      },
+    );
+  }
+}

lib/src/page/photo_main_page.dart → lib/src/ui/page/photo_main_page.dart

@@ -3,8 +3,10 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:photo/src/engine/lru_cache.dart';
 import 'package:photo/src/entity/options.dart';
+import 'package:photo/src/provider/gallery_list_provider.dart';
 import 'package:photo/src/provider/i18n_provider.dart';
 import 'package:photo/src/provider/selected_provider.dart';
+import 'package:photo/src/ui/dialog/change_gallery_dialog.dart';
 import 'package:photo_manager/photo_manager.dart';
 
 class PhotoMainPage extends StatefulWidget {
@@ -17,35 +19,44 @@ class PhotoMainPage extends StatefulWidget {
   _PhotoMainPageState createState() => _PhotoMainPageState();
 }
 
-class _PhotoMainPageState extends State<PhotoMainPage> with SelectedProvider {
+class _PhotoMainPageState extends State<PhotoMainPage>
+    with SelectedProvider, GalleryListProvider {
   Options get options => widget.options;
 
   I18nProvider get i18nProvider => widget.provider;
 
-  List<ImageEntity> selectedList = [];
-  List<ImageParentPath> pathList = [];
-
   List<ImageEntity> list = [];
 
   Color get themeColor => options.themeColor;
 
-  ImageParentPath _currentPath;
+  ImagePathEntity _currentPath = ImagePathEntity.all;
 
-  ImageParentPath get currentPath {
+  ImagePathEntity get currentPath {
     if (_currentPath == null) {
       return null;
     }
     return _currentPath;
   }
 
-  set currentPath(ImageParentPath value) {
+  set currentPath(ImagePathEntity value) {
     _currentPath = value;
   }
 
+  GlobalKey scaffoldKey;
+  ScrollController scrollController;
+
   @override
   void initState() {
     super.initState();
     _refreshList();
+    scaffoldKey = GlobalKey();
+    scrollController = ScrollController();
+  }
+
+  @override
+  void dispose() {
+    scaffoldKey = null;
+    super.dispose();
   }
 
   @override
@@ -77,10 +88,13 @@ class _PhotoMainPageState extends State<PhotoMainPage> with SelectedProvider {
           ),
           body: _buildBody(),
           bottomNavigationBar: _BottomWidget(
+            key: scaffoldKey,
             provider: i18nProvider,
             options: options,
+            galleryName: currentPath.name,
             onGalleryChange: _onGalleryChange,
             selectedProvider: this,
+            galleryListProvider: this,
           ),
         ),
       ),
@@ -92,10 +106,39 @@ class _PhotoMainPageState extends State<PhotoMainPage> with SelectedProvider {
     );
   }
 
+  @override
+  bool isUpperLimit() {
+    var result = selectedCount == options.maxSelected;
+    if (result) _showTip(i18nProvider.getMaxTipText(options));
+    return result;
+  }
+
+  void sure() {
+    Navigator.pop(context, selectedList);
+  }
+
+  void _showTip(String msg) {
+    Scaffold.of(scaffoldKey.currentContext).showSnackBar(
+      SnackBar(
+        content: Text(
+          msg,
+          style: TextStyle(
+            color: options.textColor,
+            fontSize: 14.0,
+          ),
+        ),
+        duration: Duration(milliseconds: 1500),
+        backgroundColor: themeColor.withOpacity(0.7),
+      ),
+    );
+  }
+
   void _refreshList() async {
-    pathList = await ImageScanner.getImagePathList();
-    var path = pathList[0];
-    var imageList = await path.imageList;
+    var pathList = await ImageScanner.getImagePathList();
+    galleryPathList.clear();
+    galleryPathList.addAll(pathList);
+
+    var imageList = await currentPath.imageList;
     this.list.clear();
     this.list.addAll(imageList);
     print(list);
@@ -106,6 +149,7 @@ class _PhotoMainPageState extends State<PhotoMainPage> with SelectedProvider {
     return Container(
       color: options.disableColor,
       child: GridView.builder(
+        controller: scrollController,
         gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
           crossAxisCount: options.rowCount,
           childAspectRatio: options.itemRadio,
@@ -118,19 +162,6 @@ class _PhotoMainPageState extends State<PhotoMainPage> with SelectedProvider {
     );
   }
 
-  @override
-  int get selectedCount => selectedList.length;
-
-  @override
-  bool containsEntity(ImageEntity entity) {
-    return selectedList.contains(entity);
-  }
-
-  @override
-  int indexOfSelected(ImageEntity entity) {
-    return selectedList.indexOf(entity);
-  }
-
   Widget _buildItem(BuildContext context, int index) {
     var data = list[index];
     return GestureDetector(
@@ -208,24 +239,29 @@ class _PhotoMainPageState extends State<PhotoMainPage> with SelectedProvider {
 
   void changeCheck(bool value, ImageEntity entity) {
     if (value) {
-      selectedList.add(entity);
+      addSelectEntity(entity);
     } else {
-      selectedList.remove(entity);
+      removeSelectEntity(entity);
     }
     setState(() {});
   }
 
-  void sure() {
-    Navigator.pop(context, selectedList);
-  }
-
   void _onItemClick(ImageEntity data) {}
 
-  void _onGalleryChange(ImageParentPath value) {}
+  void _onGalleryChange(ImagePathEntity value) {
+    _currentPath = value;
+
+    _currentPath.imageList.then((v) {
+      list.clear();
+      list.addAll(v);
+      scrollController.jumpTo(0.0);
+      setState(() {});
+    });
+  }
 }
 
 class _BottomWidget extends StatefulWidget {
-  final ValueChanged<ImageParentPath> onGalleryChange;
+  final ValueChanged<ImagePathEntity> onGalleryChange;
 
   final Options options;
 
@@ -235,6 +271,8 @@ class _BottomWidget extends StatefulWidget {
 
   final String galleryName;
 
+  final GalleryListProvider galleryListProvider;
+
   const _BottomWidget({
     Key key,
     this.onGalleryChange,
@@ -242,6 +280,7 @@ class _BottomWidget extends StatefulWidget {
     this.provider,
     this.selectedProvider,
     this.galleryName = "",
+    this.galleryListProvider,
   }) : super(key: key);
 
   @override
@@ -257,6 +296,7 @@ class __BottomWidgetState extends State<_BottomWidget> {
   Widget build(BuildContext context) {
     var textStyle = TextStyle(fontSize: 14.0, color: options.textColor);
     print(MediaQuery.of(context).padding.bottom);
+    const textPadding = const EdgeInsets.symmetric(horizontal: 16.0);
     return Container(
       color: options.themeColor,
       child: SafeArea(
@@ -265,9 +305,18 @@ class __BottomWidgetState extends State<_BottomWidget> {
           height: 44.0,
           child: Row(
             children: <Widget>[
-              Text(
-                widget.galleryName,
-                style: textStyle,
+              GestureDetector(
+                behavior: HitTestBehavior.translucent,
+                onTap: _showGallerySelectDialog,
+                child: Container(
+                  alignment: Alignment.center,
+                  height: 44.0,
+                  padding: textPadding,
+                  child: Text(
+                    widget.galleryName,
+                    style: textStyle,
+                  ),
+                ),
               ),
               Expanded(
                 child: Container(),
@@ -279,7 +328,7 @@ class __BottomWidgetState extends State<_BottomWidget> {
                   i18nProvider.getPreviewText(options, widget.selectedProvider),
                   style: textStyle,
                 ),
-                padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                padding: textPadding,
               ),
             ],
           ),
@@ -287,6 +336,17 @@ class __BottomWidgetState extends State<_BottomWidget> {
       ),
     );
   }
+
+  void _showGallerySelectDialog() async {
+    var result = await showModalBottomSheet(
+      context: context,
+      builder: (ctx) => ChangeGalleryDialog(
+            galleryList: widget.galleryListProvider.galleryPathList,
+          ),
+    );
+
+    if (result != null) widget.onGalleryChange?.call(result);
+  }
 }
 
 class ImageItem extends StatelessWidget {

pubspec.lock

@@ -211,8 +211,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "0a808b0a537e5203095a6b70aa5c42ca4d5a9c9a"
-      resolved-ref: "0a808b0a537e5203095a6b70aa5c42ca4d5a9c9a"
+      ref: "2a7004e5de7a50f4a4178d3bb8599bdcfb4c6da4"
+      resolved-ref: "2a7004e5de7a50f4a4178d3bb8599bdcfb4c6da4"
       url: "https://github.com/CaiJingLong/flutter_photo_manager"
     source: git
     version: "0.0.1"

pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   photo_manager:
     git:
       url: https://github.com/CaiJingLong/flutter_photo_manager
-      ref: 0a808b0a537e5203095a6b70aa5c42ca4d5a9c9a
+      ref: 2a7004e5de7a50f4a4178d3bb8599bdcfb4c6da4
 
 dev_dependencies:
   flutter_test: