add theme

example/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+platform :ios, '9.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

example/ios/Runner.xcodeproj/project.pbxproj

@@ -9,10 +9,6 @@
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
-		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
-		9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
 		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
 		97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
@@ -29,8 +25,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
-				9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -43,13 +37,11 @@
 		223FFDA7243467D600A654DC /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = "<group>"; };
 		223FFDA8243467D600A654DC /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
-		9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -66,8 +58,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
-				3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
 				F1F41F4DCF67837579E0EB42 /* libPods-Runner.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -87,9 +77,7 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
-				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				9740EEBA1CF902C7004384FC /* Flutter.framework */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
 				9740EEB31CF90195004384FC /* Generated.xcconfig */,
@@ -251,7 +239,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;

example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildSystemType</key>
-	<string>Original</string>
-</dict>
-</plist>

example/lib/main.dart

@@ -18,7 +18,26 @@ class MyApp extends StatelessWidget {
       child: MaterialApp(
         title: 'Pick Image Demo',
         theme: ThemeData(
-          primarySwatch: Colors.lime,
+          primaryColor: Color(0xFF01AAFF),
+          // colorScheme: ColorScheme.light().copyWith(surface: Colors.white, onPrimary: Color(0xFFFFFFFF)),
+          // appBarTheme: AppBarTheme(
+          //   color: Color(0xFFFFFFFF),
+          //   elevation: 0,
+          //   iconTheme: IconThemeData(
+          //     color: Color(0xFF595959),
+          //   ),
+          //   actionsIconTheme: IconThemeData(
+          //     color: Color(0xFF01AAFF),
+          //   ),
+          //   textTheme: TextTheme(
+          //     headline6: TextStyle(
+          //       fontSize: 18,
+          //       fontWeight: FontWeight.w500,
+          //       color: Color(0xFF595959),
+          //     ),
+          //   ),
+          // ),
+          // dividerColor: Color(0xFFF5F5F5),
         ),
         home: MyHomePage(title: 'Pick Image Demo'),
       ),
@@ -101,6 +120,23 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
                 text: "Picked asset example.",
                 onTap: () => routePage(PickedExample()),
               ),
+              Container(
+                height: 210,
+                child: PhotoPicker.buildGallery(
+                  context: context,
+                  padding: 4.0,
+                  itemHeight: 210,
+                  itemWidth: 180,
+                  provider: I18nProvider.chinese,
+                  sortDelegate: SortDelegate.common,
+                  loadingDelegate: this,
+                  pickType: PickType.onlyImage,
+                  photoPathList: null,
+                  onSelected: (List<AssetEntity> value) {
+                    print(value);
+                  }
+                ),
+              )
             ],
           ),
         ),
@@ -123,53 +159,19 @@ class _MyHomePageState extends State<MyHomePage> with LoadingDelegate {
     /// context is required, other params is optional.
     /// context is required, other params is optional.
     /// context is required, other params is optional.
-
+    List<AssetPathEntity> pathList2 = await PhotoManager.getAssetPathList(
+        hasAll: true, type: RequestType.image,);
     List<AssetEntity> imgList = await PhotoPicker.pickAsset(
-      // BuildContext required
       context: context,
-
-      /// The following are optional parameters.
-      themeColor: Colors.green,
-      // the title color and bottom color
-
-      textColor: Colors.white,
-      // text color
-      padding: 1.0,
-      // item padding
-      dividerColor: Colors.grey,
-      // divider color
-      disableColor: Colors.grey.shade300,
-      // the check box disable color
-      itemRadio: 0.88,
-      // the content item radio
+      padding: 4.0,
+      itemRadio: 1,
       maxSelected: 8,
-      // max picker image count
-      // provider: I18nProvider.english,
       provider: I18nProvider.chinese,
-      // i18n provider ,default is chinese. , you can custom I18nProvider or use ENProvider()
-      rowCount: 3,
-      // item row count
-
+      rowCount: 4,
       thumbSize: 150,
-      // preview thumb size , default is 64
       sortDelegate: SortDelegate.common,
-      // default is common ,or you make custom delegate to sort your gallery
-      checkBoxBuilderDelegate: DefaultCheckBoxBuilderDelegate(
-        activeColor: Colors.white,
-        unselectedColor: Colors.white,
-        checkColor: Colors.green,
-      ),
-      // default is DefaultCheckBoxBuilderDelegate ,or you make custom delegate to create checkbox
-
-      loadingDelegate: this,
-      // if you want to build custom loading widget,extends LoadingDelegate, [see example/lib/main.dart]
-
-      badgeDelegate: const DurationBadgeDelegate(),
-      // badgeDelegate to show badge widget
-
-      pickType: type,
-
-      photoPathList: pathList,
+      pickType: PickType.onlyVideo,
+      photoPathList: pathList2,
     );
 
     if (imgList == null || imgList.isEmpty) {

lib/photo.dart

@@ -3,6 +3,8 @@ library photo;
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:photo/src/entity/_theme.dart';
+import 'package:photo/src/ui/page/photo_list_page.dart';
 
 import 'package:photo_manager/photo_manager.dart';
 
@@ -14,6 +16,8 @@ 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 'src/provider/config_provider.dart';
 export 'package:photo/src/delegate/checkbox_builder_delegate.dart';
 export 'package:photo/src/delegate/loading_delegate.dart';
 export 'package:photo/src/delegate/sort_delegate.dart';
@@ -68,19 +72,13 @@ class PhotoPicker {
     @required BuildContext context,
     int rowCount = 4,
     int maxSelected = 9,
-    double padding = 0.5,
+    double padding = 1,
     double itemRadio = 1.0,
-    Color themeColor,
-    Color dividerColor,
-    Color textColor,
-    Color disableColor,
     int thumbSize = 64,
     I18nProvider provider = I18nProvider.chinese,
     SortDelegate sortDelegate,
-    CheckBoxBuilderDelegate checkBoxBuilderDelegate,
     LoadingDelegate loadingDelegate,
     PickType pickType = PickType.all,
-    BadgeDelegate badgeDelegate = const DefaultBadgeDelegate(),
     List<AssetPathEntity> photoPathList,
     List<AssetEntity> pickedAssetList,
   }) {
@@ -88,30 +86,21 @@ class PhotoPicker {
     assert(context != null, "context must be not null");
     assert(pickType != null, "pickType must be not null");
 
-    themeColor ??= Theme.of(context)?.primaryColor ?? Colors.black;
-    dividerColor ??= Theme.of(context)?.dividerColor ?? Colors.grey;
-    disableColor ??= Theme.of(context)?.disabledColor ?? Colors.grey;
-    textColor ??= Colors.white;
-
     sortDelegate ??= SortDelegate.common;
-    checkBoxBuilderDelegate ??= DefaultCheckBoxBuilderDelegate();
 
     loadingDelegate ??= DefaultLoadingDelegate();
 
     var options = Options(
       rowCount: rowCount,
-      dividerColor: dividerColor,
       maxSelected: maxSelected,
       itemRadio: itemRadio,
       padding: padding,
-      disableColor: disableColor,
-      textColor: textColor,
-      themeColor: themeColor,
+      theme: PhotoTheme.fallback(context),
       thumbSize: thumbSize,
       sortDelegate: sortDelegate,
-      checkBoxBuilderDelegate: checkBoxBuilderDelegate,
+      checkBoxBuilderDelegate: DefaultCheckBoxBuilderDelegate(),
       loadingDelegate: loadingDelegate,
-      badgeDelegate: badgeDelegate,
+      badgeDelegate: DefaultBadgeDelegate(),
       pickType: pickType,
     );
 
@@ -131,12 +120,72 @@ class PhotoPicker {
     List<AssetPathEntity> photoList,
     List<AssetEntity> pickedAssetList,
   ) async {
+    await requestPermission(context, provider: provider);
+
+    return _openGalleryContentPage(
+      context,
+      options,
+      provider,
+      photoList,
+      pickedAssetList,
+    );
+  }
+
+  static Widget buildGallery({
+    @required BuildContext context,
+    double padding = 1,
+    @required double itemHeight,
+    @required double itemWidth,
+    int thumbSize = 64,
+    I18nProvider provider = I18nProvider.chinese,
+    SortDelegate sortDelegate,
+    LoadingDelegate loadingDelegate,
+    PickType pickType = PickType.all,
+    List<AssetPathEntity> photoPathList,
+    List<AssetEntity> pickedAssetList,
+    void Function(List<AssetEntity> value) onSelected,
+  }) {
+    sortDelegate ??= SortDelegate.common;
+
+    loadingDelegate ??= DefaultLoadingDelegate();
+
+    var options = ListOptions(
+      padding: padding,
+      itemHeight: itemHeight,
+      itemWidth: itemWidth,
+      theme: PhotoTheme.fallback(context),
+      thumbSize: thumbSize,
+      sortDelegate: sortDelegate,
+      checkBoxBuilderDelegate: DefaultCheckBoxBuilderDelegate(),
+      loadingDelegate: loadingDelegate,
+      badgeDelegate: DefaultBadgeDelegate(),
+      pickType: pickType,
+    );
+    assert(provider != null, "provider must be not null");
+    assert(context != null, "context must be not null");
+    assert(pickType != null, "pickType must be not null");
+
+    final pickerProvider = PhotoPickerProvider(
+      provider: provider,
+      options: options,
+      pickedAssetList: pickedAssetList,
+      child: PhotoListPage(
+        onSelected: onSelected,
+        options: options,
+        photoList: photoPathList,
+      ),
+    );
+
+    return pickerProvider;
+  }
+
+  Future<void> requestPermission(BuildContext context, {@required I18nProvider provider}) async {
     var requestPermission = await PhotoManager.requestPermission();
     if (requestPermission != true) {
       var result = await showDialog(
         context: context,
         builder: (ctx) => NotPermissionDialog(
-          provider.getNotPermissionText(options),
+          provider.getNotPermissionText(),
         ),
       );
       if (result == true) {
@@ -144,14 +193,6 @@ class PhotoPicker {
       }
       return null;
     }
-
-    return _openGalleryContentPage(
-      context,
-      options,
-      provider,
-      photoList,
-      pickedAssetList,
-    );
   }
 
   Future<List<AssetEntity>> _openGalleryContentPage(

lib/src/delegate/checkbox_builder_delegate.dart

@@ -15,13 +15,13 @@ abstract class CheckBoxBuilderDelegate {
 
 class DefaultCheckBoxBuilderDelegate extends CheckBoxBuilderDelegate {
   Color activeColor;
-  Color unselectedColor;
   Color checkColor;
+  Color unselectedColor;
 
   DefaultCheckBoxBuilderDelegate({
-    this.activeColor = Colors.white,
-    this.unselectedColor = Colors.white,
-    this.checkColor = Colors.black,
+    this.activeColor,
+    this.checkColor,
+    this.unselectedColor,
   });
 
   @override
@@ -33,52 +33,79 @@ class DefaultCheckBoxBuilderDelegate extends CheckBoxBuilderDelegate {
     I18nProvider i18nProvider,
   ) {
     return Theme(
-      data: Theme.of(context).copyWith(unselectedWidgetColor: unselectedColor),
-      child: CheckboxListTile(
-        value: checked,
-        onChanged: (bool check) {},
-        activeColor: activeColor,
-        checkColor: checkColor,
-        title: Text(
-          i18nProvider.getSelectedOptionsText(options),
-          textAlign: TextAlign.end,
-          style: TextStyle(color: options.textColor),
+      data: Theme.of(context).copyWith(
+          unselectedWidgetColor:
+              unselectedColor ?? options.theme.unselectedColor),
+      child: Container(
+        child: Row(
+          children: [
+            SizedBox(
+              width: 20,
+              height: 20,
+              child: Checkbox(
+                value: checked,
+                onChanged: (bool check) {},
+                activeColor: activeColor ?? options.theme.primaryColor,
+                checkColor: checkColor ?? options.theme.onPrimaryColor,
+              ),
+            ),
+            SizedBox(
+              width: 6,
+            ),
+            Text(
+              i18nProvider.getSelectedOptionsText(options),
+              textAlign: TextAlign.start,
+              style: options.theme.textStyle,
+            ),
+          ],
         ),
       ),
     );
   }
 }
 
-class RadioCheckBoxBuilderDelegate extends CheckBoxBuilderDelegate {
+class RadioCheckBoxBuilderDelegate {
   Color activeColor;
   Color unselectedColor;
 
   RadioCheckBoxBuilderDelegate({
-    this.activeColor = Colors.white,
-    this.unselectedColor = Colors.white,
+    this.activeColor,
+    this.unselectedColor,
   });
 
-  @override
   Widget buildCheckBox(
     BuildContext context,
     bool checked,
-    int index,
     Options options,
     I18nProvider i18nProvider,
   ) {
     return Theme(
-      data: Theme.of(context).copyWith(unselectedWidgetColor: unselectedColor),
-      child: RadioListTile<bool>(
-        value: true,
-        onChanged: (bool check) {},
-        activeColor: activeColor,
-        title: Text(
-          i18nProvider.getSelectedOptionsText(options),
-          textAlign: TextAlign.end,
-          style: TextStyle(color: options.textColor, fontSize: 14.0),
+      data: Theme.of(context).copyWith(
+          unselectedWidgetColor:
+              unselectedColor ?? options.theme.unselectedColor),
+      child: Container(
+        child: Row(
+          children: [
+            SizedBox(
+              width: 20,
+              height: 20,
+              child: Radio(
+                value: true,
+                groupValue: checked,
+                onChanged: (bool check) {},
+                activeColor: activeColor ?? options.theme.primaryColor,
+              ),
+            ),
+            SizedBox(
+              width: 6,
+            ),
+            Text(
+              i18nProvider.getFullImageText(options),
+              textAlign: TextAlign.start,
+              style: options.theme.textStyle,
+            ),
+          ],
         ),
-        groupValue: checked,
-        controlAffinity: ListTileControlAffinity.trailing,
       ),
     );
   }

lib/src/entity/_theme.dart

@@ -0,0 +1,73 @@
+import 'package:flutter/material.dart';
+
+class PhotoTheme {
+  final Color primaryColor;
+  final Color onPrimaryColor;
+  final Color surfaceColor;
+  final Color onSurfaceColor;
+  final Color backgroundColor;
+  final Color onBackgroundColor;
+  final Color dividerColor;
+  final Color disableColor;
+  final Color unselectedColor;
+  final TextStyle textStyle;
+
+  factory PhotoTheme.fallback(BuildContext context) {
+    final theme = Theme.of(context);
+    return PhotoTheme._(
+      primaryColor: theme.colorScheme?.primary ?? Color(0xFF01AAFF),
+      onPrimaryColor: theme.colorScheme?.onPrimary ?? Color(0xFFFFFFFF),
+      surfaceColor: theme.colorScheme?.surface ?? (theme.brightness == Brightness.light ? Color(0xFFFFFFFF) : Color(0xFF282828)),
+      onSurfaceColor: theme.colorScheme?.onSurface ?? (theme.brightness == Brightness.light ? Color(0xFF8C8C8C) : Color(0xFF696969)),
+      backgroundColor: theme.colorScheme?.background ?? (theme.brightness == Brightness.light ? Color(0xFFF8F8F8) : Color(0xFF1F1F1F)),
+      onBackgroundColor: theme.colorScheme?.onBackground ?? Color(0xFF8C8C8C),
+      dividerColor: theme.dividerColor ?? (theme.brightness == Brightness.light ? Color(0xFFF2F2F2) : Color(0xFF3B3B3B)),
+      disableColor: theme.disabledColor,
+      unselectedColor: theme.unselectedWidgetColor ?? (theme.brightness == Brightness.light ? Color(0xFFBFBFBF) : Color(0xFF696969)),
+      textStyle: TextStyle(
+        color: theme.brightness == Brightness.light ? Color(0xFF595959) : Color(0xFFA8A8A8),
+        fontSize: 16,
+        fontWeight: FontWeight.w400,
+      ), //theme.textTheme?.subtitle2 ?? 
+    );
+  }
+
+  PhotoTheme._({
+    @required this.primaryColor,
+    @required this.onPrimaryColor,
+    @required this.surfaceColor,
+    @required this.onSurfaceColor,
+    @required this.backgroundColor,
+    @required this.onBackgroundColor,
+    @required this.dividerColor,
+    @required this.disableColor,
+    @required this.unselectedColor,
+    @required this.textStyle,
+  });
+
+  PhotoTheme copyWith({
+    Color primaryColor,
+    Color onPrimaryColor,
+    Color surfaceColor,
+    Color onSurfaceColor,
+    Color backgroundColor,
+    Color onBackgroundColor,
+    Color dividerColor,
+    Color disableColor,
+    Color unselectedColor,
+    TextStyle textStyle,
+  }) {
+    return PhotoTheme._(
+      primaryColor: primaryColor ?? this.primaryColor,
+      onPrimaryColor: onPrimaryColor ?? this.onPrimaryColor,
+      surfaceColor: surfaceColor ?? this.surfaceColor,
+      onSurfaceColor: onSurfaceColor ?? this.onSurfaceColor,
+      backgroundColor: backgroundColor ?? this.backgroundColor,
+      onBackgroundColor: onBackgroundColor ?? this.onBackgroundColor,
+      dividerColor: dividerColor ?? this.dividerColor,
+      disableColor: disableColor ?? this.disableColor,
+      unselectedColor: unselectedColor ?? this.unselectedColor,
+      textStyle: textStyle ?? this.textStyle,
+    );
+  }
+}

lib/src/entity/options.dart

@@ -3,6 +3,7 @@ import 'package:photo/src/delegate/badge_delegate.dart';
 import 'package:photo/src/delegate/checkbox_builder_delegate.dart';
 import 'package:photo/src/delegate/loading_delegate.dart';
 import 'package:photo/src/delegate/sort_delegate.dart';
+import 'package:photo/src/entity/_theme.dart';
 
 class Options {
   final int rowCount;
@@ -13,13 +14,7 @@ class Options {
 
   final double itemRadio;
 
-  final Color themeColor;
-
-  final Color dividerColor;
-
-  final Color textColor;
-
-  final Color disableColor;
+  final PhotoTheme theme;
 
   final int thumbSize;
 
@@ -38,10 +33,7 @@ class Options {
     this.maxSelected,
     this.padding,
     this.itemRadio,
-    this.themeColor,
-    this.dividerColor,
-    this.textColor,
-    this.disableColor,
+    this.theme,
     this.thumbSize,
     this.sortDelegate,
     this.checkBoxBuilderDelegate,
@@ -51,6 +43,40 @@ class Options {
   });
 }
 
+class ListOptions extends Options {
+
+  final double itemWidth;
+
+  final double itemHeight;
+
+  final Axis scrollDirection;
+
+  const ListOptions({
+    this.itemHeight,
+    this.itemWidth,
+    this.scrollDirection = Axis.horizontal,
+    int maxSelected,
+    double padding,
+    PhotoTheme theme,
+    int thumbSize,
+    SortDelegate sortDelegate,
+    CheckBoxBuilderDelegate checkBoxBuilderDelegate,
+    LoadingDelegate loadingDelegate,
+    BadgeDelegate badgeDelegate,
+    PickType pickType,
+  }) : super(
+    maxSelected: maxSelected,
+    padding: padding,
+    theme: theme,
+    thumbSize: thumbSize,
+    sortDelegate: sortDelegate,
+    checkBoxBuilderDelegate: checkBoxBuilderDelegate,
+    loadingDelegate: loadingDelegate,
+    badgeDelegate: badgeDelegate,
+    pickType: pickType,
+  );
+}
+
 enum PickType {
   all,
   onlyImage,

lib/src/provider/i18n_provider.dart

@@ -12,6 +12,8 @@ abstract class I18nProvider {
 
   String getSelectedOptionsText(Options options);
 
+  String getFullImageText(Options options);
+
   String getMaxTipText(Options options);
 
   String getAllGalleryText(Options options);
@@ -20,7 +22,7 @@ abstract class I18nProvider {
     return "Loading...";
   }
 
-  I18NPermissionProvider getNotPermissionText(Options options);
+  I18NPermissionProvider getNotPermissionText([Options options]);
 
   static const I18nProvider chinese = CNProvider();
 
@@ -50,6 +52,11 @@ class CNProvider extends I18nProvider {
     return "选择";
   }
 
+  @override
+  String getFullImageText(Options options) {
+    return "原图";
+  }
+
   @override
   String getMaxTipText(Options options) {
     return "您已经选择了${options.maxSelected}张图片";
@@ -66,7 +73,7 @@ class CNProvider extends I18nProvider {
   }
 
   @override
-  I18NPermissionProvider getNotPermissionText(Options options) {
+  I18NPermissionProvider getNotPermissionText([Options options]) {
     return I18NPermissionProvider(
         cancelText: "取消", sureText: "去开启", titleText: "没有访问相册的权限");
   }
@@ -95,6 +102,11 @@ class ENProvider extends I18nProvider {
     return "Selected";
   }
 
+  @override
+  String getFullImageText(Options options) {
+    return "Full Image";
+  }
+
   @override
   String getMaxTipText(Options options) {
     return "Select ${options.maxSelected} pictures at most";
@@ -106,7 +118,7 @@ class ENProvider extends I18nProvider {
   }
 
   @override
-  I18NPermissionProvider getNotPermissionText(Options options) {
+  I18NPermissionProvider getNotPermissionText([Options options]) {
     return I18NPermissionProvider(
         cancelText: "Cancel",
         sureText: "Allow",
@@ -146,7 +158,7 @@ abstract class I18NCustomProvider implements I18nProvider {
   }
 
   @override
-  I18NPermissionProvider getNotPermissionText(Options options) {
+  I18NPermissionProvider getNotPermissionText([Options options]) {
     return notPermissionText;
   }
 }

lib/src/provider/selected_provider.dart

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:photo_manager/photo_manager.dart';
 
 abstract class SelectedProvider {
+  bool isFullImage = false;
   List<AssetEntity> selectedList = [];
 
   int get selectedCount => selectedList.length;

lib/src/ui/dialog/change_gallery_dialog.dart

@@ -4,15 +4,20 @@ import 'package:photo/src/provider/i18n_provider.dart';
 import 'package:photo_manager/photo_manager.dart';
 
 class ChangeGalleryDialog extends StatefulWidget {
+
+  final ValueChanged<AssetPathEntity> onGalleryChange;
   final List<AssetPathEntity> galleryList;
   final I18nProvider i18n;
   final Options options;
+  final AssetPathEntity current;
 
   const ChangeGalleryDialog({
     Key key,
+    this.onGalleryChange,
     this.galleryList,
     this.i18n,
     this.options,
+    this.current,
   }) : super(key: key);
 
   @override
@@ -20,12 +25,19 @@ class ChangeGalleryDialog extends StatefulWidget {
 }
 
 class _ChangeGalleryDialogState extends State<ChangeGalleryDialog> {
+      
   @override
   Widget build(BuildContext context) {
     return Container(
-      child: ListView.builder(
-        itemBuilder: _buildItem,
-        itemCount: widget.galleryList.length,
+      padding: EdgeInsets.symmetric(horizontal: 16),
+      child: MediaQuery.removePadding(
+        context: context,
+        removeTop: true,
+        removeLeft: true,
+        child: ListView.builder(
+          itemBuilder: _buildItem,
+          itemCount: widget.galleryList.length,
+        ),
       ),
     );
   }
@@ -41,11 +53,65 @@ class _ChangeGalleryDialogState extends State<ChangeGalleryDialog> {
     text = text ?? entity.name;
 
     return FlatButton(
-      child: ListTile(
-        title: Text("$text (${entity.assetCount})"),
+      padding: EdgeInsets.zero,
+      child: Container(
+        padding: EdgeInsets.symmetric(vertical: 12),
+        decoration: BoxDecoration(
+          border: Border(
+            top: index == 0 ? BorderSide.none : BorderSide(color: widget.options.theme.dividerColor, width: 1),
+          ),
+        ),
+        child: Row(
+          children: [
+            // ImageItem(),
+            Container(
+              width: 40,
+              height: 40,
+              color: Colors.black,
+            ),
+            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),),
+                      ],
+                    ),
+                  ),
+                  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,
+                  //         ),
+                  //       )
+                  //     ]
+                  //   ),
+                  // )
+                ],
+              )
+            ),
+          ],
+        ),
       ),
       onPressed: () {
-        Navigator.pop(context, entity);
+        widget.onGalleryChange?.call(entity);
       },
     );
   }

lib/src/ui/page/main/bottom_widget.dart

@@ -1,7 +1,6 @@
 part of '../photo_main_page.dart';
 
 class _BottomWidget extends StatefulWidget {
-  final ValueChanged<AssetPathEntity> onGalleryChange;
 
   final Options options;
 
@@ -9,20 +8,18 @@ class _BottomWidget extends StatefulWidget {
 
   final SelectedProvider selectedProvider;
 
-  final String galleryName;
-
   final GalleryListProvider galleryListProvider;
   final VoidCallback onTapPreview;
+  final VoidCallback onTapSure;
 
   const _BottomWidget({
     Key key,
-    this.onGalleryChange,
     this.options,
     this.provider,
     this.selectedProvider,
-    this.galleryName = "",
     this.galleryListProvider,
     this.onTapPreview,
+    this.onTapSure,
   }) : super(key: key);
 
   @override
@@ -34,68 +31,98 @@ class __BottomWidgetState extends State<_BottomWidget> {
 
   I18nProvider get i18nProvider => widget.provider;
 
+  SelectedProvider get selectedProvider => widget.selectedProvider;
+
+  bool get isFullImage => selectedProvider.isFullImage;
+
   @override
   Widget build(BuildContext context) {
-    var textStyle = TextStyle(fontSize: 14.0);
-    const textPadding = const EdgeInsets.symmetric(horizontal: 16.0);
-    return Container(
-      color: options.themeColor,
-      child: SafeArea(
-        bottom: true,
-        top: false,
-        child: Container(
-          height: 52.0,
-          child: Row(
-            children: <Widget>[
-              FlatButton(
-                onPressed: _showGallerySelectDialog,
-                splashColor: Colors.transparent,
-                child: Container(
-                  alignment: Alignment.center,
-                  height: 44.0,
-                  padding: textPadding,
-                  child: Text(
-                    widget.galleryName,
-                    style: textStyle.copyWith(color: options.textColor),
+    return DefaultTextStyle(
+      style: options.theme.textStyle,
+      child: Container(
+        color: options.theme.surfaceColor,
+        padding: EdgeInsets.symmetric(horizontal: 24),
+        child: SafeArea(
+          bottom: true,
+          top: false,
+          child: Container(
+            height: 50.0,
+            child: Row(
+              children: <Widget>[
+                GestureDetector(
+                  onTap: widget.onTapPreview,
+                  child: Container(
+                    alignment: Alignment.center,
+                    height: 30.0,
+                    child: Text(
+                      i18nProvider.getPreviewText(
+                          options, widget.selectedProvider),
+                      style: options.theme.textStyle.copyWith(
+                        color: widget.onTapPreview == null ? options.theme.disableColor : options.theme.textStyle.color,
+                      ),
+                    ),
+                  ),
+                ),
+                SizedBox(width: 24,),
+                Expanded(
+                  child: Container(
+                    child: Stack(
+                      children: <Widget>[
+                        IgnorePointer(
+                          child: RadioCheckBoxBuilderDelegate().buildCheckBox(
+                            context,
+                            isFullImage,
+                            options,
+                            i18nProvider,
+                          ),
+                        ),
+                        Positioned(
+                          top: 0.0,
+                          bottom: 0.0,
+                          left: 0.0,
+                          right: 0.0,
+                          child: GestureDetector(
+                            onTap: () {
+                              selectedProvider.isFullImage = !isFullImage;
+                              setState(() {});
+                            },
+                            behavior: HitTestBehavior.translucent,
+                            child: Container(),
+                          ),
+                        ),
+                      ],
+                    ),
                   ),
                 ),
-              ),
-              Expanded(
-                child: Container(),
-              ),
-              FlatButton(
-                onPressed: widget.onTapPreview,
-                textColor: options.textColor,
-                splashColor: Colors.transparent,
-                disabledTextColor: options.disableColor,
-                child: Container(
-                  height: 44.0,
-                  alignment: Alignment.center,
-                  child: Text(
-                    i18nProvider.getPreviewText(
-                        options, widget.selectedProvider),
-                    style: textStyle,
+                SizedBox(
+                  width: 110,
+                  height: 36.0,
+                  child: FlatButton(
+                    onPressed: widget.onTapSure,
+                    splashColor: Colors.transparent,
+                    color: options.theme.primaryColor,
+                    textColor: options.theme.onPrimaryColor,
+                    disabledColor: options.theme.disableColor,
+                    disabledTextColor: options.theme.disableColor,
+                    shape: StadiumBorder(),
+                    padding: EdgeInsets.zero,
+                    child: Container(
+                      alignment: Alignment.center,
+                      child: Text(
+                        i18nProvider.getSureText(options, selectedProvider.selectedList.length),
+                        style: TextStyle(
+                          fontSize: options.theme.textStyle.fontSize - 2,
+                          fontWeight: options.theme.textStyle.fontWeight,
+                        ),
+                      ),
+                    ),
                   ),
-                  padding: textPadding,
                 ),
-              ),
-            ],
+              ],
+            ),
           ),
         ),
       ),
     );
   }
-
-  void _showGallerySelectDialog() async {
-    var result = await showModalBottomSheet(
-      context: context,
-      builder: (ctx) => ChangeGalleryDialog(
-            galleryList: widget.galleryListProvider.galleryPathList,
-            i18n: i18nProvider,
-            options: options,
-          ),
-    );
-
-    if (result != null) widget.onGalleryChange?.call(result);
-  }
 }

lib/src/ui/page/main/empty_widget.dart

@@ -0,0 +1,20 @@
+import 'package:flutter/material.dart';
+import 'package:photo/src/entity/options.dart';
+
+abstract class EmptyDelegate {
+  const EmptyDelegate();
+
+  Widget buildEmpty(BuildContext context, Options options);
+}
+
+class DefaultEmptyDelegate extends EmptyDelegate {
+  @override
+  Widget buildEmpty(BuildContext context, Options options) {
+    return Material(
+      type: MaterialType.transparency,
+      child: Center(
+        child: Text('暂无数据'),
+      ),
+    );
+  }
+}

lib/src/ui/page/photo_list_page.dart

@@ -0,0 +1,344 @@
+import 'package:flutter/material.dart';
+import 'package:photo/src/entity/options.dart';
+import 'package:photo/src/provider/i18n_provider.dart';
+import 'package:photo_manager/photo_manager.dart';
+import 'package:photo/src/provider/gallery_list_provider.dart';
+import 'package:photo/src/provider/selected_provider.dart';
+import 'package:photo/src/provider/asset_provider.dart';
+import 'package:photo/src/provider/config_provider.dart';
+
+import 'photo_main_page.dart';
+import 'photo_preview_page.dart';
+
+
+class PhotoListPage extends StatefulWidget {
+  final ValueChanged<List<AssetEntity>> onSelected;
+  final ListOptions options;
+  final List<AssetPathEntity> photoList;
+
+  const PhotoListPage({
+    Key key,
+    this.onSelected,
+    this.options,
+    this.photoList,
+  }) : super(key: key);
+
+  @override
+  _PhotoListPageState createState() => _PhotoListPageState();
+}
+
+class _PhotoListPageState extends State<PhotoListPage>
+    with SelectedProvider, GalleryListProvider, WidgetsBindingObserver {
+  ListOptions get options => widget.options;
+  I18nProvider get i18nProvider => PhotoPickerProvider.of(context).provider;
+  AssetProvider get assetProvider => PhotoPickerProvider.of(context).assetProvider;
+  List<AssetEntity> get list => assetProvider.data;
+
+  bool _isInit = false;
+
+  GlobalKey scaffoldKey;
+  ScrollController scrollController;
+
+  bool isPushed = false;
+
+  // Throttle _changeThrottle;
+  
+  @override
+  void initState() {
+    super.initState();
+    scaffoldKey = GlobalKey();
+    scrollController = ScrollController();
+    // WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
+    //   var requestPermission = await PhotoManager.requestPermission();
+    //   if (requestPermission != true) {
+    //     var result = await showDialog(
+    //       context: context,
+    //       builder: (ctx) => NotPermissionDialog(
+    //         provider.getNotPermissionText(),
+    //       ),
+    //     );
+    //     if (result == true) {
+    //       PhotoManager.openSetting();
+    //     }
+    //     return null;
+    //   }
+    // });
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (!_isInit) {
+      final pickedList = PhotoPickerProvider.of(context).pickedAssetList ?? [];
+      addPickedAsset(pickedList.toList());
+      _refreshList();
+    }
+  }
+
+  @override
+  void dispose() {
+    scaffoldKey = null;
+    super.dispose();
+  }
+
+  void _refreshList() async {
+    await Future.delayed(Duration.zero);
+
+    _refreshListFromGallery();
+  }
+
+  Future<void> _refreshListFromGallery() async {
+    List<AssetPathEntity> pathList;
+    switch (options.pickType) {
+      case PickType.onlyImage:
+        pathList = await PhotoManager.getAssetPathList(type: RequestType.image, onlyAll: true);
+        break;
+      case PickType.onlyVideo:
+        pathList = await PhotoManager.getAssetPathList(type: RequestType.video, onlyAll: true);
+        break;
+      default:
+        pathList = await PhotoManager.getAssetPathList(type: RequestType.image | RequestType.video, onlyAll: true);
+    }
+
+    return _onRefreshAssetPathList(pathList);
+  }
+
+  Future<void> _onRefreshAssetPathList(List<AssetPathEntity> pathList) async {
+    if (pathList == null) {
+      return;
+    }
+
+    options.sortDelegate.sort(pathList);
+
+    galleryPathList.clear();
+    galleryPathList.addAll(pathList);
+
+    if (pathList.isNotEmpty) {
+      assetProvider.current = pathList[0];
+      await assetProvider.loadMore();
+    }
+
+    for (var path in pathList) {
+      if (path.isAll) {
+        path.name = i18nProvider.getAllGalleryText(options);
+      }
+    }
+
+    setState(() {
+      _isInit = true;
+    });
+  }
+
+  @override
+  bool isUpperLimit() {
+    var result = selectedCount == options.maxSelected;
+    if (result) _showTip(i18nProvider.getMaxTipText(options));
+    return result;
+  }
+
+  @override
+  void sure() {
+    widget.onSelected?.call(selectedList);
+  }
+
+  void _showTip(String msg) {
+    if (isPushed) {
+      return;
+    }
+    Scaffold.of(scaffoldKey.currentContext).showSnackBar(
+      SnackBar(
+        content: Text(
+          msg,
+          style: options.theme.textStyle.copyWith(color: options.theme.onPrimaryColor),
+        ),
+        duration: Duration(milliseconds: 1500),
+        backgroundColor: options.theme.primaryColor.withOpacity(0.7),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (!_isInit) {
+      return _buildLoading();
+    }
+    final noMore = assetProvider.noMore;
+
+    final count = assetProvider.count + (noMore ? 0 : 1);
+
+    return ListView.builder(
+      scrollDirection: options.scrollDirection,
+      physics: ClampingScrollPhysics(),
+      itemCount: count,
+      itemExtent: options.itemWidth,
+      itemBuilder: _buildItem,
+    );
+  }
+
+  _loadMore() async {
+    await assetProvider.loadMore();
+    setState(() {});
+  }
+
+  Widget _buildItem(BuildContext context, int index) {
+    final noMore = assetProvider.noMore;
+    if (!noMore && index == assetProvider.count) {
+      _loadMore();
+      return _buildLoading();
+    }
+
+    var data = list[index];
+    return RepaintBoundary(
+      child: GestureDetector(
+        onTap: () => _onItemClick(data, index),
+        child: Stack(
+          children: <Widget>[
+            ImageItem(
+              entity: data,
+              themeColor: options.theme.primaryColor,
+              size: options.thumbSize,
+              loadingDelegate: options.loadingDelegate,
+              badgeDelegate: options.badgeDelegate,
+            ),
+            _buildMask(containsEntity(data)),
+            _buildSelected(data),
+          ],
+        ),
+      ),
+    );
+  }
+
+  _buildMask(bool showMask) {
+    return IgnorePointer(
+      child: AnimatedContainer(
+        color: showMask ? Colors.black.withOpacity(0.5) : Colors.transparent,
+        duration: Duration(milliseconds: 300),
+      ),
+    );
+  }
+
+  Widget _buildSelected(AssetEntity entity) {
+    var currentSelected = containsEntity(entity);
+    return Positioned(
+      right: 0.0,
+      width: 36.0,
+      height: 36.0,
+      child: GestureDetector(
+        onTap: () {
+          changeCheck(!currentSelected, entity);
+        },
+        behavior: HitTestBehavior.translucent,
+        child: _buildText(entity),
+      ),
+    );
+  }
+
+  void changeCheck(bool value, AssetEntity entity) {
+    if (value) {
+      addSelectEntity(entity);
+    } else {
+      removeSelectEntity(entity);
+    }
+    sure();
+    setState(() {});
+  }
+
+  Widget _buildText(AssetEntity entity) {
+    var isSelected = containsEntity(entity);
+    Widget child;
+    BoxDecoration decoration = BoxDecoration(borderRadius: BorderRadius.circular(1.0),);
+    if (isSelected) {
+      child = Text(
+        (indexOfSelected(entity) + 1).toString(),
+        textAlign: TextAlign.center,
+        style: options.theme.textStyle.apply(
+          fontSizeDelta: -4,
+          color: options.theme.onPrimaryColor,
+        ),
+      );
+      decoration = decoration.copyWith(color: options.theme.primaryColor);
+    } else {
+      decoration = decoration.copyWith(border: Border.all(
+        color: options.theme.onPrimaryColor.withAlpha(200),
+      ),);
+    }
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: AnimatedContainer(
+        duration: Duration(milliseconds: 300),
+        decoration: decoration,
+        alignment: Alignment.center,
+        child: child,
+      ),
+    );
+  }
+
+  void _onItemClick(AssetEntity data, int index) {
+    var result = PhotoPreviewResult();
+    isPushed = true;
+    Navigator.of(context).push(
+      MaterialPageRoute(
+        builder: (ctx) {
+          return PhotoPickerProvider(
+            provider: PhotoPickerProvider.of(context).provider,
+            options: options,
+            child: PhotoPreviewPage(
+              selectedProvider: this,
+              list: List.of(list),
+              initIndex: index,
+              changeProviderOnCheckChange: true,
+              result: result,
+              isPreview: false,
+              assetProvider: assetProvider,
+            ),
+          );
+        },
+      ),
+    ).then((v) {
+      if (handlePreviewResult(v)) {
+        Navigator.pop(context, v);
+        return;
+      }
+      isPushed = false;
+      setState(() {});
+    });
+  }
+
+  bool handlePreviewResult(List<AssetEntity> v) {
+    if (v == null) {
+      return false;
+    }
+    if (v is List<AssetEntity>) {
+      return true;
+    }
+    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(Colors.black),
+            ),
+          ),
+          Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Text(
+              i18nProvider.loadingText(),
+              style: const TextStyle(
+                fontSize: 12.0,
+              ),
+            ),
+          ),
+        ],
+        crossAxisAlignment: CrossAxisAlignment.center,
+        mainAxisAlignment: MainAxisAlignment.center,
+      ),
+    );
+  }
+}

lib/src/ui/page/photo_main_page.dart

@@ -3,6 +3,7 @@ import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 import 'package:photo/src/delegate/badge_delegate.dart';
+import 'package:photo/src/delegate/checkbox_builder_delegate.dart';
 import 'package:photo/src/delegate/loading_delegate.dart';
 import 'package:photo/src/engine/lru_cache.dart';
 import 'package:photo/src/engine/throttle.dart';
@@ -13,6 +14,7 @@ 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/src/ui/page/main/empty_widget.dart';
 import 'package:photo/src/ui/page/photo_preview_page.dart';
 import 'package:photo_manager/photo_manager.dart';
 
@@ -45,28 +47,13 @@ class _PhotoMainPageState extends State<PhotoMainPage>
 
   List<AssetEntity> get list => assetProvider.data;
 
-  Color get themeColor => options.themeColor;
-
-  AssetPathEntity _currentPath;
-
   bool _isInit = false;
 
-  AssetPathEntity get currentPath {
-    if (_currentPath == null) {
-      return null;
-    }
-    return _currentPath;
-  }
-
-  set currentPath(AssetPathEntity value) {
-    _currentPath = value;
-  }
-
   String get currentGalleryName {
-    if (currentPath?.isAll == true) {
+    if (assetProvider.current?.isAll == true) {
       return i18nProvider.getAllGalleryText(options);
     }
-    return currentPath?.name ?? "Select Folder";
+    return assetProvider.current?.name ?? "Select Folder";
   }
 
   GlobalKey scaffoldKey;
@@ -78,6 +65,8 @@ class _PhotoMainPageState extends State<PhotoMainPage>
 
   Throttle _changeThrottle;
 
+  OverlayEntry overlayEntry;
+
   @override
   void initState() {
     super.initState();
@@ -107,61 +96,106 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     super.dispose();
   }
 
-  @override
-  Widget build(BuildContext context) {
-    var textStyle = TextStyle(
-      color: options.textColor,
-      fontSize: 14.0,
-    );
-    return Theme(
-      data: Theme.of(context).copyWith(primaryColor: options.themeColor),
-      child: DefaultTextStyle(
-        style: textStyle,
-        child: Scaffold(
-          appBar: AppBar(
-            leading: IconButton(
-              icon: Icon(
-                Icons.close,
-                color: options.textColor,
-              ),
-              onPressed: _cancel,
-            ),
-            title: Text(
-              i18nProvider.getTitleText(options),
-              style: TextStyle(
-                color: options.textColor,
+  void _closeGallerySelectDialog() {
+    overlayEntry.remove();
+    overlayEntry = null;
+  }
+
+  void _showGallerySelectDialog() {
+    if (overlayEntry != null) {
+      _closeGallerySelectDialog();
+      return;
+    }
+    overlayEntry = OverlayEntry(builder: (context) {
+      return Positioned(
+        top: kToolbarHeight + MediaQuery.of(context).padding.top,
+        right: 0,
+        left: 0,
+        bottom: 0,
+        child: WillPopScope(
+          onWillPop: () async {
+            _closeGallerySelectDialog();
+            return false;
+          },
+          child: Stack(
+            children: <Widget>[
+              GestureDetector(
+                onTap: _closeGallerySelectDialog,
+                child: Container(
+                  height: double.infinity,
+                  color: Color(0x66000000),
+                ),
               ),
-            ),
-            actions: <Widget>[
-              FlatButton(
-                splashColor: Colors.transparent,
-                child: Text(
-                  i18nProvider.getSureText(options, selectedCount),
-                  style: selectedCount == 0
-                      ? textStyle.copyWith(color: options.disableColor)
-                      : textStyle,
+              Material(
+                color: options.theme.surfaceColor,
+                child: Container(
+                  height: MediaQuery.of(context).size.height * 0.5 - MediaQuery.of(context).padding.top,
+                  child: ChangeGalleryDialog(
+                    galleryList: galleryPathList,
+                    i18n: i18nProvider,
+                    options: options,
+                    current: assetProvider.current,
+                    onGalleryChange: (AssetPathEntity result) {
+                      _onGalleryChange?.call(result);
+                    }
+                  ),
                 ),
-                onPressed: selectedCount == 0 ? null : sure,
               ),
             ],
           ),
-          body: _buildBody(),
-          bottomNavigationBar: _BottomWidget(
-            key: scaffoldKey,
-            provider: i18nProvider,
-            options: options,
-            galleryName: currentGalleryName,
-            onGalleryChange: _onGalleryChange,
-            onTapPreview: selectedList.isEmpty ? null : _onTapPreview,
-            selectedProvider: this,
-            galleryListProvider: this,
+        ),
+      );
+    });
+    Overlay.of(context).insert(overlayEntry);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return DefaultTextStyle(
+      style: options.theme.textStyle,
+      child: Scaffold(
+        appBar: AppBar(
+          backgroundColor: options.theme.surfaceColor,
+          leading: IconButton(
+            icon: Text('取消', style: options.theme.textStyle),
+            onPressed: _cancel,
+          ),
+          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: Text(currentGalleryName, style: options.theme.textStyle.apply(
+                fontSizeDelta: 2.0,
+                fontWeightDelta: 1,
+              ),),
+            ),
           ),
         ),
+        body: _buildBody(),
+        bottomNavigationBar: _BottomWidget(
+          key: scaffoldKey,
+          provider: i18nProvider,
+          options: options,
+          onTapPreview: selectedList.isEmpty ? null : _onTapPreview,
+          onTapSure: selectedList.isEmpty ? null : sure,
+          selectedProvider: this,
+          galleryListProvider: this,
+        ),
       ),
     );
   }
 
   void _cancel() {
+    if (overlayEntry != null) {
+      _closeGallerySelectDialog();
+      return;
+    }
     selectedList.clear();
     widget.onClose(selectedList);
   }
@@ -185,19 +219,17 @@ class _PhotoMainPageState extends State<PhotoMainPage>
       SnackBar(
         content: Text(
           msg,
-          style: TextStyle(
-            color: options.textColor,
-            fontSize: 14.0,
-          ),
+          style: options.theme.textStyle.copyWith(color: options.theme.onPrimaryColor),
         ),
         duration: Duration(milliseconds: 1500),
-        backgroundColor: themeColor.withOpacity(0.7),
+        backgroundColor: options.theme.primaryColor.withOpacity(0.7),
       ),
     );
   }
 
   void _refreshList() async {
     await Future.delayed(Duration.zero);
+    print(useAlbum);
     if (!useAlbum) {
       _refreshListFromWidget();
       return;
@@ -217,7 +249,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
         pathList = await PhotoManager.getAssetPathList(type: RequestType.image);
         break;
       case PickType.onlyVideo:
-        pathList = await PhotoManager.getAssetPathList(type: RequestType.image);
+        pathList = await PhotoManager.getAssetPathList(type: RequestType.video);
         break;
       default:
         pathList = await PhotoManager.getAssetPathList(
@@ -263,8 +295,9 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     final count = assetProvider.count + (noMore ? 0 : 1);
 
     return Container(
-      color: options.dividerColor,
-      child: GridView.builder(
+      color: options.theme.backgroundColor,
+      padding: EdgeInsets.all(5),
+      child: assetProvider.count == 0 ? DefaultEmptyDelegate().buildEmpty(context, options) : GridView.builder(
         controller: scrollController,
         gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
           crossAxisCount: options.rowCount,
@@ -293,7 +326,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
           children: <Widget>[
             ImageItem(
               entity: data,
-              themeColor: themeColor,
+              themeColor: options.theme.primaryColor,
               size: options.thumbSize,
               loadingDelegate: options.loadingDelegate,
               badgeDelegate: options.badgeDelegate,
@@ -339,24 +372,21 @@ class _PhotoMainPageState extends State<PhotoMainPage>
   Widget _buildText(AssetEntity entity) {
     var isSelected = containsEntity(entity);
     Widget child;
-    BoxDecoration decoration;
+    BoxDecoration decoration = BoxDecoration(borderRadius: BorderRadius.circular(1.0),);
     if (isSelected) {
       child = Text(
         (indexOfSelected(entity) + 1).toString(),
         textAlign: TextAlign.center,
-        style: TextStyle(
-          fontSize: 12.0,
-          color: options.textColor,
+        style: options.theme.textStyle.apply(
+          fontSizeDelta: -4,
+          color: options.theme.onPrimaryColor,
         ),
       );
-      decoration = BoxDecoration(color: themeColor);
+      decoration = decoration.copyWith(color: options.theme.primaryColor);
     } else {
-      decoration = BoxDecoration(
-        borderRadius: BorderRadius.circular(1.0),
-        border: Border.all(
-          color: themeColor,
-        ),
-      );
+      decoration = decoration.copyWith(border: Border.all(
+        color: options.theme.onPrimaryColor.withAlpha(200),
+      ),);
     }
     return Padding(
       padding: const EdgeInsets.all(8.0),
@@ -379,16 +409,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
   }
 
   void _onGalleryChange(AssetPathEntity assetPathEntity) async {
-    // _currentPath = assetPathEntity;
-
-    // _currentPath.assetList.then((v) async {
-    //   _sortAssetList(v);
-    //   list.clear();
-    //   list.addAll(v);
-    //   scrollController.jumpTo(0.0);
-    //   await checkPickImageEntity();
-    //   setState(() {});
-    // });
+    _closeGallerySelectDialog();
     if (assetPathEntity != assetProvider.current) {
       assetProvider.current = assetPathEntity;
       await assetProvider.loadMore();
@@ -453,6 +474,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     }
     isPushed = false;
     compareAndRemoveEntities(result.previewSelectedList);
+    setState(() {});
   }
 
   bool handlePreviewResult(List<AssetEntity> v) {
@@ -474,7 +496,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
             height: 40.0,
             padding: const EdgeInsets.all(5.0),
             child: CircularProgressIndicator(
-              valueColor: AlwaysStoppedAnimation(themeColor),
+              valueColor: AlwaysStoppedAnimation(options.theme.primaryColor),
             ),
           ),
           Padding(
@@ -519,7 +541,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     this.galleryPathList.clear();
     this.galleryPathList.addAll(pathList);
 
-    if (!this.galleryPathList.contains(this.currentPath)) {
+    if (!this.galleryPathList.contains(assetProvider.current)) {
       // current path is deleted , 当前的相册被删除, 应该提示刷新
       if (this.galleryPathList.length > 0) {
         _onGalleryChange(this.galleryPathList[0]);
@@ -527,6 +549,6 @@ class _PhotoMainPageState extends State<PhotoMainPage>
       return;
     }
     // Not deleted
-    _onGalleryChange(this.currentPath);
+    _onGalleryChange(assetProvider.current);
   }
 }

lib/src/ui/page/photo_preview_page.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
+import 'package:photo/src/delegate/checkbox_builder_delegate.dart';
 import 'package:photo/src/entity/options.dart';
 import 'package:photo/src/provider/asset_provider.dart';
 import 'package:photo/src/provider/config_provider.dart';
@@ -48,10 +49,6 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
 
   Options get options => config.options;
 
-  Color get themeColor => options.themeColor;
-
-  Color get textColor => options.textColor;
-
   SelectedProvider get selectedProvider => widget.selectedProvider;
 
   List<AssetEntity> get list {
@@ -63,8 +60,12 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
 
   StreamController<int> pageChangeController = StreamController.broadcast();
 
+  StreamController<bool> isFullChangeController = StreamController.broadcast();
+
   Stream<int> get pageStream => pageChangeController.stream;
 
+  Stream<bool> get isFullStream => isFullChangeController.stream;
+
   bool get changeProviderOnCheckChange => widget.changeProviderOnCheckChange;
 
   PhotoPreviewResult get result => widget.result;
@@ -116,72 +117,68 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
     } else {
       totalCount = list.length;
     }
-
-    var data = Theme.of(context);
-    var textStyle = TextStyle(
-      color: options.textColor,
-      fontSize: 14.0,
-    );
-    return Theme(
-      data: data.copyWith(
-        primaryColor: options.themeColor,
-      ),
-      child: Scaffold(
-        appBar: AppBar(
-          backgroundColor: config.options.themeColor,
-          leading: BackButton(
-            color: options.textColor,
-          ),
-          title: StreamBuilder(
+    return Scaffold(
+      backgroundColor: options.theme.backgroundColor,
+      appBar: AppBar(
+        backgroundColor: options.theme.surfaceColor,
+        leading: BackButton(
+          color: options.theme.textStyle.color,
+        ),
+        title: StreamBuilder(
+          stream: pageStream,
+          initialData: widget.initIndex,
+          builder: (ctx, snap) {
+            return Text(
+              "${snap.data + 1}/$totalCount",
+              style: options.theme.textStyle.apply(
+                fontSizeDelta: 2,
+                fontWeightDelta: 1,
+              ),
+            );
+          },
+        ),
+        actions: <Widget>[
+          StreamBuilder(
             stream: pageStream,
-            initialData: widget.initIndex,
-            builder: (ctx, snap) {
-              return Text(
-                "${snap.data + 1}/$totalCount",
+            builder: (ctx, s) => FlatButton(
+              splashColor: Colors.transparent,
+              onPressed: selectedList.length == 0 ? null : sure,
+              disabledTextColor: options.theme.disableColor,
+              textColor: options.theme.textStyle.color,
+              child: Text(
+                config.provider.getSureText(options, selectedList.length),
                 style: TextStyle(
-                  color: options.textColor,
-                ),
-              );
-            },
-          ),
-          actions: <Widget>[
-            StreamBuilder(
-              stream: pageStream,
-              builder: (ctx, s) => FlatButton(
-                splashColor: Colors.transparent,
-                onPressed: selectedList.length == 0 ? null : sure,
-                child: Text(
-                  config.provider.getSureText(options, selectedList.length),
-                  style: selectedList.length == 0
-                      ? textStyle.copyWith(color: options.disableColor)
-                      : textStyle,
+                  fontSize: options.theme.textStyle.fontSize,
+                  fontWeight: options.theme.textStyle.fontWeight,
                 ),
               ),
             ),
-          ],
-        ),
-        body: PageView.builder(
-          controller: pageController,
-          itemBuilder: _buildItem,
-          itemCount: totalCount,
-          onPageChanged: _onPageChanged,
-        ),
-        bottomSheet: _buildThumb(),
-        bottomNavigationBar: _buildBottom(),
+          ),
+        ],
       ),
+      body: PageView.builder(
+        controller: pageController,
+        itemBuilder: _buildItem,
+        itemCount: totalCount,
+        onPageChanged: _onPageChanged,
+      ),
+      bottomSheet: _buildThumb(),
+      bottomNavigationBar: _buildBottom(),
     );
   }
 
   Widget _buildBottom() {
     return Container(
-      color: themeColor,
+      color: options.theme.surfaceColor,
       child: SafeArea(
         child: Container(
-          height: 52.0,
+          height: 50.0,
+          padding: EdgeInsets.symmetric(horizontal: 24),
           child: Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
             children: <Widget>[
               Expanded(
-                child: Container(),
+                child: _buildOriginalRadio(),
               ),
               _buildCheckbox(),
             ],
@@ -193,9 +190,6 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
 
   Container _buildCheckbox() {
     return Container(
-      constraints: BoxConstraints(
-        maxWidth: 150.0,
-      ),
       child: StreamBuilder<int>(
         builder: (ctx, snapshot) {
           var index = snapshot.data;
@@ -226,6 +220,47 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
     );
   }
 
+  Widget _buildOriginalRadio() {
+    return Container(
+      child: StreamBuilder<bool>(
+        builder: (ctx, snapshot) {
+          return Stack(
+            children: <Widget>[
+              IgnorePointer(
+                child: _buildOriginalRadioContent(snapshot.data),
+              ),
+              Positioned(
+                top: 0.0,
+                bottom: 0.0,
+                left: 0.0,
+                right: 0.0,
+                child: GestureDetector(
+                  onTap: () {
+                    widget.selectedProvider.isFullImage = !snapshot.data;
+                    isFullChangeController.add(selectedProvider.isFullImage);
+                  },
+                  behavior: HitTestBehavior.translucent,
+                  child: Container(),
+                ),
+              ),
+            ],
+          );
+        },
+        initialData: selectedProvider.isFullImage,
+        stream: isFullStream,
+      ),
+    );
+  }
+
+  Widget _buildOriginalRadioContent(bool checked) {
+    return RadioCheckBoxBuilderDelegate().buildCheckBox(
+      context,
+      checked,
+      options,
+      config.provider,
+    );
+  }
+
   Widget _buildCheckboxContent(bool checked, int index) {
     return options.checkBoxBuilderDelegate.buildCheckBox(
       context,
@@ -284,7 +319,7 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
 
   Widget _buildLoadingWidget(AssetEntity entity) {
     return options.loadingDelegate
-        .buildBigImageLoading(context, entity, themeColor);
+        .buildBigImageLoading(context, entity, options.theme.primaryColor);
   }
 
   void _onPageChanged(int value) {
@@ -315,7 +350,7 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
           child: Stack(
             children: <Widget>[
               ImageItem(
-                themeColor: themeColor,
+                themeColor: options.theme.primaryColor,
                 entity: item,
                 size: options.thumbSize,
                 loadingDelegate: options.loadingDelegate,

pubspec.lock

@@ -5,58 +5,58 @@ packages:
     dependency: transitive
     description:
       name: archive
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.11"
+    version: "2.0.13"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.5.2"
+    version: "1.6.0"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.5"
+    version: "2.0.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.3"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.14.11"
+    version: "1.14.12"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -71,58 +71,51 @@ packages:
     dependency: transitive
     description:
       name: image
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.12"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.12.6"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.8"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.6.4"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.8.0+1"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.4.0"
   photo_manager:
     dependency: "direct main"
     description:
       name: photo_manager
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.5.1-dev.2"
+    version: "0.5.1-dev.4"
   quiver:
     dependency: transitive
     description:
       name: quiver
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.5"
+    version: "2.1.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -132,64 +125,64 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.5.5"
+    version: "1.7.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.9.3"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.5"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.11"
+    version: "0.2.15"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.6"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.8"
   xml:
     dependency: transitive
     description:
       name: xml
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.5.0"
+    version: "3.6.1"
 sdks:
-  dart: ">=2.4.0 <3.0.0"
+  dart: ">=2.7.0 <3.0.0"

pubspec.yaml

@@ -5,7 +5,7 @@ author: caijinglong<cjl_spy@163.com>
 homepage: https://github.com/CaiJingLong/flutter_photo
 
 environment:
-  sdk: ">=2.0.0-dev.68.0 <3.0.0"
+  sdk: ">=2.7.0 <3.0.0"
 
 dependencies:
   flutter: