fix bug

lib/photo.dart

@@ -26,6 +26,7 @@ export 'package:photo/src/provider/i18n_provider.dart'
     show I18NCustomProvider, I18nProvider, CNProvider, ENProvider;
 export 'package:photo/src/entity/options.dart' show PickType;
 export 'package:photo/src/delegate/badge_delegate.dart';
+export 'package:photo/src/entity/_theme.dart';
 
 class PhotoPicker {
   static PhotoPicker _instance;
@@ -75,7 +76,8 @@ class PhotoPicker {
     int maxSelected = 9,
     double padding = 1,
     double itemRadio = 1.0,
-    int thumbSize = 64,
+    int thumbSize = 180,
+    PhotoTheme theme,
     I18nProvider provider = I18nProvider.chinese,
     SortDelegate sortDelegate,
     LoadingDelegate loadingDelegate,
@@ -96,7 +98,7 @@ class PhotoPicker {
       maxSelected: maxSelected,
       itemRadio: itemRadio,
       padding: padding,
-      theme: PhotoTheme.fallback(context),
+      theme: theme ?? PhotoTheme.fallback(context),
       thumbSize: thumbSize,
       sortDelegate: sortDelegate,
       checkBoxBuilderDelegate: DefaultCheckBoxBuilderDelegate(),
@@ -135,9 +137,10 @@ class PhotoPicker {
   static Widget buildGallery({
     @required BuildContext context,
     double padding = 1,
-    @required double itemHeight,
+    double itemHeight,
     @required double itemWidth,
-    int thumbSize = 64,
+    int thumbSize = 180,
+    PhotoTheme theme,
     I18nProvider provider = I18nProvider.chinese,
     SortDelegate sortDelegate,
     LoadingDelegate loadingDelegate,
@@ -154,7 +157,7 @@ class PhotoPicker {
       padding: padding,
       itemHeight: itemHeight,
       itemWidth: itemWidth,
-      theme: PhotoTheme.fallback(context),
+      theme: theme ?? PhotoTheme.fallback(context),
       thumbSize: thumbSize,
       sortDelegate: sortDelegate,
       checkBoxBuilderDelegate: DefaultCheckBoxBuilderDelegate(),
@@ -212,7 +215,7 @@ class PhotoPicker {
           ),
           child: PhotoMainPage(
             onClose: (List<AssetEntity> value) {
-              Navigator.pop(context, value);
+              Navigator.pop(ctx, value);
             },
             options: options,
             photoList: photoList,

lib/src/entity/_theme.dart

@@ -14,13 +14,13 @@ class PhotoTheme {
 
   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),
+    return PhotoTheme(
+      primaryColor: Color(0xFF01AAFF),
+      onPrimaryColor: Color(0xFFFFFFFF),
+      surfaceColor: theme.brightness == Brightness.light ? Color(0xFFFFFFFF) : Color(0xFF282828),
+      onSurfaceColor: theme.brightness == Brightness.light ? Color(0xFF8C8C8C) : Color(0xFF696969),
+      backgroundColor: theme.brightness == Brightness.light ? Color(0xFFF8F8F8) : Color(0xFF1F1F1F),
+      onBackgroundColor: 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)),
@@ -32,7 +32,7 @@ class PhotoTheme {
     );
   }
 
-  PhotoTheme._({
+  PhotoTheme({
     @required this.primaryColor,
     @required this.onPrimaryColor,
     @required this.surfaceColor,
@@ -57,7 +57,7 @@ class PhotoTheme {
     Color unselectedColor,
     TextStyle textStyle,
   }) {
-    return PhotoTheme._(
+    return PhotoTheme(
       primaryColor: primaryColor ?? this.primaryColor,
       onPrimaryColor: onPrimaryColor ?? this.onPrimaryColor,
       surfaceColor: surfaceColor ?? this.surfaceColor,

lib/src/entity/options.dart

@@ -52,7 +52,7 @@ class ListOptions extends Options {
   final Axis scrollDirection;
 
   const ListOptions({
-    this.itemHeight,
+    this.itemHeight = double.infinity,
     this.itemWidth,
     this.scrollDirection = Axis.horizontal,
     int maxSelected,

lib/src/ui/page/photo_list_page.dart

@@ -11,7 +11,6 @@ import 'package:provider/provider.dart';
 import 'photo_main_page.dart';
 import 'photo_preview_page.dart';
 
-
 class PhotoListPage extends StatefulWidget {
   final ValueChanged<List<AssetEntity>> onSelected;
   final ListOptions options;
@@ -28,7 +27,8 @@ class PhotoListPage extends StatefulWidget {
 
 class _PhotoListPageState extends State<PhotoListPage>
     with SelectedProvider, GalleryListProvider, WidgetsBindingObserver {
-  PhotoProvider get config => Provider.of<PhotoProvider>(context, listen: false);
+  PhotoProvider get config =>
+      Provider.of<PhotoProvider>(context, listen: false);
   ListOptions get options => widget.options;
   I18nProvider get i18nProvider => config.provider;
   AssetProvider get assetProvider => config.assetProvider;
@@ -42,7 +42,7 @@ class _PhotoListPageState extends State<PhotoListPage>
   bool isPushed = false;
 
   // Throttle _changeThrottle;
-  
+
   @override
   void initState() {
     super.initState();
@@ -91,13 +91,16 @@ class _PhotoListPageState extends State<PhotoListPage>
     List<AssetPathEntity> pathList;
     switch (options.pickType) {
       case PickType.onlyImage:
-        pathList = await PhotoManager.getAssetPathList(type: RequestType.image, onlyAll: true);
+        pathList = await PhotoManager.getAssetPathList(
+            type: RequestType.image, onlyAll: true);
         break;
       case PickType.onlyVideo:
-        pathList = await PhotoManager.getAssetPathList(type: RequestType.video, onlyAll: true);
+        pathList = await PhotoManager.getAssetPathList(
+            type: RequestType.video, onlyAll: true);
         break;
       default:
-        pathList = await PhotoManager.getAssetPathList(type: RequestType.image | RequestType.video, onlyAll: true);
+        pathList = await PhotoManager.getAssetPathList(
+            type: RequestType.image | RequestType.video, onlyAll: true);
     }
 
     return _onRefreshAssetPathList(pathList);
@@ -149,7 +152,8 @@ class _PhotoListPageState extends State<PhotoListPage>
       SnackBar(
         content: Text(
           msg,
-          style: options.theme.textStyle.copyWith(color: options.theme.onPrimaryColor),
+          style: options.theme.textStyle
+              .copyWith(color: options.theme.onPrimaryColor),
         ),
         duration: Duration(milliseconds: 1500),
         backgroundColor: options.theme.primaryColor.withOpacity(0.7),
@@ -189,21 +193,24 @@ class _PhotoListPageState extends State<PhotoListPage>
     }
 
     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),
-          ],
+    return Padding(
+      padding: EdgeInsets.only(left: index != 0 ? options.padding : 0),
+      child: 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),
+            ],
+          ),
         ),
       ),
     );
@@ -247,7 +254,9 @@ class _PhotoListPageState extends State<PhotoListPage>
   Widget _buildText(AssetEntity entity) {
     var isSelected = containsEntity(entity);
     Widget child;
-    BoxDecoration decoration = BoxDecoration(borderRadius: BorderRadius.circular(1.0),);
+    BoxDecoration decoration = BoxDecoration(
+      borderRadius: BorderRadius.circular(1.0),
+    );
     if (isSelected) {
       child = Text(
         (indexOfSelected(entity) + 1).toString(),
@@ -259,9 +268,11 @@ class _PhotoListPageState extends State<PhotoListPage>
       );
       decoration = decoration.copyWith(color: options.theme.primaryColor);
     } else {
-      decoration = decoration.copyWith(border: Border.all(
-        color: options.theme.onPrimaryColor.withAlpha(200),
-      ),);
+      decoration = decoration.copyWith(
+        border: Border.all(
+          color: options.theme.onPrimaryColor.withAlpha(200),
+        ),
+      );
     }
     return Padding(
       padding: const EdgeInsets.all(8.0),
@@ -341,4 +352,4 @@ class _PhotoListPageState extends State<PhotoListPage>
       ),
     );
   }
-}
+}

pubspec.yaml

@@ -1,6 +1,6 @@
 name: photo
 description: image picker, multi picker support video/icloud asset, use flutter as ui, if you want to build custom ui, you just use photo_manager.
-version: 0.5.0-dev.1
+version: 0.5.0-dev.2
 author: caijinglong<cjl_spy@163.com>
 homepage: https://github.com/CaiJingLong/flutter_photo