add provider

lib/photo.dart

@@ -5,6 +5,7 @@ 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/src/ui/page/photo_main_page.dart';
 
 import 'package:photo_manager/photo_manager.dart';
 
@@ -15,7 +16,7 @@ import 'package:photo/src/delegate/sort_delegate.dart';
 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 'package:provider/provider.dart';
 
 import 'src/provider/config_provider.dart';
 export 'package:photo/src/delegate/checkbox_builder_delegate.dart';
@@ -165,18 +166,17 @@ class PhotoPicker {
     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,
+    return ChangeNotifierProvider(
+      create: (_) => PhotoProvider(
+        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 {
@@ -204,11 +204,19 @@ class PhotoPicker {
   ) async {
     return Navigator.of(context, rootNavigator: true).push(
       MaterialPageRoute(
-        builder: (ctx) => PhotoApp(
-          options: options,
-          provider: provider,
-          photoList: photoList,
-          pickedAssetList: pickedAssetList,
+        builder: (ctx) => ChangeNotifierProvider(
+          create: (_) => PhotoProvider(
+            provider: provider,
+            options: options,
+            pickedAssetList: pickedAssetList,
+          ),
+          child: PhotoMainPage(
+            onClose: (List<AssetEntity> value) {
+              Navigator.pop(context, value);
+            },
+            options: options,
+            photoList: photoList,
+          ),
         ),
       ),
     );

lib/src/provider/config_provider.dart

@@ -5,27 +5,21 @@ import 'package:photo/src/provider/i18n_provider.dart';
 import 'package:photo_manager/photo_manager.dart';
 
 // ignore_for_file: deprecated_member_use
-class PhotoPickerProvider extends InheritedWidget {
+
+class PhotoProvider extends ChangeNotifier {
   final Options options;
   final I18nProvider provider;
   final AssetProvider assetProvider = AssetProvider();
   final List<AssetEntity> pickedAssetList;
-  PhotoPickerProvider({
+  PhotoProvider({
     @required this.options,
     @required this.provider,
-    @required Widget child,
-    this.pickedAssetList,
-    Key key,
-  }) : super(key: key, child: child);
+    List<AssetEntity> pickedAssetList,
+  }) : this.pickedAssetList = pickedAssetList ?? [];
+  
 
   @override
-  bool updateShouldNotify(InheritedWidget oldWidget) {
-    return true;
+  void notifyListeners() {
+    super.notifyListeners();
   }
-
-  static PhotoPickerProvider of(BuildContext context) =>
-      context.inheritFromWidgetOfExactType(PhotoPickerProvider);
-
-  static AssetProvider assetProviderOf(BuildContext context) =>
-      of(context).assetProvider;
 }

lib/src/ui/page/photo_list_page.dart

@@ -6,6 +6,7 @@ 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 'package:provider/provider.dart';
 
 import 'photo_main_page.dart';
 import 'photo_preview_page.dart';
@@ -14,13 +15,11 @@ 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
@@ -29,9 +28,10 @@ class PhotoListPage extends StatefulWidget {
 
 class _PhotoListPageState extends State<PhotoListPage>
     with SelectedProvider, GalleryListProvider, WidgetsBindingObserver {
+  PhotoProvider get config => Provider.of<PhotoProvider>(context, listen: false);
   ListOptions get options => widget.options;
-  I18nProvider get i18nProvider => PhotoPickerProvider.of(context).provider;
-  AssetProvider get assetProvider => PhotoPickerProvider.of(context).assetProvider;
+  I18nProvider get i18nProvider => config.provider;
+  AssetProvider get assetProvider => config.assetProvider;
   List<AssetEntity> get list => assetProvider.data;
 
   bool _isInit = false;
@@ -48,31 +48,31 @@ class _PhotoListPageState extends State<PhotoListPage>
     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;
-    //   }
-    // });
+    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;
+      // }
+      if (!_isInit) {
+        final pickedList = config.pickedAssetList ?? [];
+        addPickedAsset(pickedList.toList());
+        _refreshList();
+      }
+    });
   }
 
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    if (!_isInit) {
-      final pickedList = PhotoPickerProvider.of(context).pickedAssetList ?? [];
-      addPickedAsset(pickedList.toList());
-      _refreshList();
-    }
   }
 
   @override
@@ -160,7 +160,8 @@ class _PhotoListPageState extends State<PhotoListPage>
   @override
   Widget build(BuildContext context) {
     if (!_isInit) {
-      return _buildLoading();
+      return Container();
+      // return _buildLoading();
     }
     final noMore = assetProvider.noMore;
 
@@ -279,9 +280,8 @@ class _PhotoListPageState extends State<PhotoListPage>
     Navigator.of(context).push(
       MaterialPageRoute(
         builder: (ctx) {
-          return PhotoPickerProvider(
-            provider: PhotoPickerProvider.of(context).provider,
-            options: options,
+          return ChangeNotifierProvider.value(
+            value: config,
             child: PhotoPreviewPage(
               selectedProvider: this,
               list: List.of(list),

lib/src/ui/page/photo_main_page.dart

@@ -17,6 +17,7 @@ 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';
+import 'package:provider/provider.dart';
 
 part './main/bottom_widget.dart';
 part './main/image_item.dart';
@@ -39,11 +40,11 @@ class PhotoMainPage extends StatefulWidget {
 
 class _PhotoMainPageState extends State<PhotoMainPage>
     with SelectedProvider, GalleryListProvider {
+  PhotoProvider get config =>
+      Provider.of<PhotoProvider>(context, listen: false);
   Options get options => widget.options;
-
-  I18nProvider get i18nProvider => PhotoPickerProvider.of(context).provider;
-  AssetProvider get assetProvider =>
-      PhotoPickerProvider.of(context).assetProvider;
+  I18nProvider get i18nProvider => config.provider;
+  AssetProvider get assetProvider => config.assetProvider;
 
   List<AssetEntity> get list => assetProvider.data;
 
@@ -81,7 +82,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
   void didChangeDependencies() {
     super.didChangeDependencies();
     if (!_isInit) {
-      final pickedList = PhotoPickerProvider.of(context).pickedAssetList ?? [];
+      final pickedList = config.pickedAssetList ?? [];
       addPickedAsset(pickedList.toList());
       _refreshList();
     }
@@ -130,16 +131,16 @@ class _PhotoMainPageState extends State<PhotoMainPage>
               Material(
                 color: options.theme.surfaceColor,
                 child: Container(
-                  height: MediaQuery.of(context).size.height * 0.5 - MediaQuery.of(context).padding.top,
+                  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);
-                    }
-                  ),
+                      galleryList: galleryPathList,
+                      i18n: i18nProvider,
+                      options: options,
+                      current: assetProvider.current,
+                      onGalleryChange: (AssetPathEntity result) {
+                        _onGalleryChange?.call(result);
+                      }),
                 ),
               ),
             ],
@@ -169,41 +170,47 @@ class _PhotoMainPageState extends State<PhotoMainPage>
             splashColor: Colors.transparent,
             highlightColor: Colors.transparent,
             child: Container(
-              alignment: Alignment.center,
-              height: 44.0,
-              padding: EdgeInsets.zero.copyWith(right: kToolbarHeight),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  Text(currentGalleryName, style: options.theme.textStyle.apply(
-                    fontSizeDelta: 2.0,
-                    fontWeightDelta: 1,
-                  ),),
-                  Container(
-                    width: 18,
-                    height: 18,
-                    margin: EdgeInsets.only(left: 8),
-                    decoration: ShapeDecoration(shape: CircleBorder(
-                      side: BorderSide(
-                        color: options.theme.onSurfaceColor,
-                        width: 1.5
+                alignment: Alignment.center,
+                height: 44.0,
+                padding: EdgeInsets.zero.copyWith(right: kToolbarHeight),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Text(
+                      currentGalleryName,
+                      style: options.theme.textStyle.apply(
+                        fontSizeDelta: 2.0,
+                        fontWeightDelta: 1,
                       ),
-                    )),
-                    child: AnimatedSwitcher(
-                      transitionBuilder: (child, animation){
-                        final Tween<double> tween = overlayEntry != null ? Tween(begin: -0.25, end: 0.25) : Tween(begin: 0.25, end: 0.75);
-                        //var tween = Tween(begin: -0.5, end: 0.0);
-                        return RotationTransition(child: child, turns: tween.animate(animation));
-                      },
-                      duration: Duration(milliseconds: 200),
-                      reverseDuration: Duration(milliseconds: 0),
-                      child: Icon(Icons.chevron_left, key: ValueKey(overlayEntry == null ? 0 : 1),  size: 14, color: options.theme.onSurfaceColor),
                     ),
-                  ),
-                ],
-              )
-              
-            ),
+                    Container(
+                      width: 18,
+                      height: 18,
+                      margin: EdgeInsets.only(left: 8),
+                      decoration: ShapeDecoration(
+                          shape: CircleBorder(
+                        side: BorderSide(
+                            color: options.theme.onSurfaceColor, width: 1.5),
+                      )),
+                      child: AnimatedSwitcher(
+                        transitionBuilder: (child, animation) {
+                          final Tween<double> tween = overlayEntry != null
+                              ? Tween(begin: -0.25, end: 0.25)
+                              : Tween(begin: 0.25, end: 0.75);
+                          //var tween = Tween(begin: -0.5, end: 0.0);
+                          return RotationTransition(
+                              child: child, turns: tween.animate(animation));
+                        },
+                        duration: Duration(milliseconds: 200),
+                        reverseDuration: Duration(milliseconds: 0),
+                        child: Icon(Icons.chevron_left,
+                            key: ValueKey(overlayEntry == null ? 0 : 1),
+                            size: 14,
+                            color: options.theme.onSurfaceColor),
+                      ),
+                    ),
+                  ],
+                )),
           ),
         ),
         body: _buildBody(),
@@ -248,7 +255,8 @@ class _PhotoMainPageState extends State<PhotoMainPage>
       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),
@@ -326,17 +334,19 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     return Container(
       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,
-          childAspectRatio: options.itemRadio,
-          crossAxisSpacing: options.padding,
-          mainAxisSpacing: options.padding,
-        ),
-        itemBuilder: _buildItem,
-        itemCount: count,
-      ),
+      child: assetProvider.count == 0
+          ? DefaultEmptyDelegate().buildEmpty(context, options)
+          : GridView.builder(
+              controller: scrollController,
+              gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                crossAxisCount: options.rowCount,
+                childAspectRatio: options.itemRadio,
+                crossAxisSpacing: options.padding,
+                mainAxisSpacing: options.padding,
+              ),
+              itemBuilder: _buildItem,
+              itemCount: count,
+            ),
     );
   }
 
@@ -401,7 +411,9 @@ class _PhotoMainPageState extends State<PhotoMainPage>
   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(),
@@ -413,9 +425,11 @@ class _PhotoMainPageState extends State<PhotoMainPage>
       );
       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),
@@ -452,9 +466,8 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     Navigator.of(context).push(
       MaterialPageRoute(
         builder: (ctx) {
-          return PhotoPickerProvider(
-            provider: PhotoPickerProvider.of(context).provider,
-            options: options,
+          return ChangeNotifierProvider.value(
+            value: config,
             child: PhotoPreviewPage(
               selectedProvider: this,
               list: List.of(list),
@@ -482,9 +495,8 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     isPushed = true;
     var v = await Navigator.of(context).push(
       MaterialPageRoute(
-        builder: (ctx) => PhotoPickerProvider(
-          provider: PhotoPickerProvider.of(context).provider,
-          options: options,
+        builder: (ctx) => ChangeNotifierProvider.value(
+          value: config,
           child: PhotoPreviewPage(
             selectedProvider: this,
             list: List.of(selectedList),

lib/src/ui/page/photo_preview_page.dart

@@ -9,6 +9,7 @@ import 'package:photo/src/provider/config_provider.dart';
 import 'package:photo/src/provider/selected_provider.dart';
 import 'package:photo/src/ui/page/photo_main_page.dart';
 import 'package:photo_manager/photo_manager.dart';
+import 'package:provider/provider.dart';
 
 class PhotoPreviewPage extends StatefulWidget {
   final SelectedProvider selectedProvider;
@@ -44,7 +45,7 @@ class PhotoPreviewPage extends StatefulWidget {
 }
 
 class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
-  PhotoPickerProvider get config => PhotoPickerProvider.of(context);
+  PhotoProvider get config => Provider.of<PhotoProvider>(context, listen: false);
   AssetProvider get assetProvider => widget.assetProvider;
 
   Options get options => config.options;

lib/src/ui/photo_app.dart

@@ -1,40 +0,0 @@
-import 'package:flutter/material.dart';
-
-import 'package:photo_manager/photo_manager.dart';
-
-import 'package:photo/src/entity/options.dart';
-import 'package:photo/src/provider/config_provider.dart';
-import 'package:photo/src/provider/i18n_provider.dart';
-import 'package:photo/src/ui/page/photo_main_page.dart';
-
-class PhotoApp extends StatelessWidget {
-  final Options options;
-  final I18nProvider provider;
-  final List<AssetPathEntity> photoList;
-  final List<AssetEntity> pickedAssetList;
-  const PhotoApp({
-    Key key,
-    this.options,
-    this.provider,
-    this.photoList,
-    this.pickedAssetList,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    final pickerProvider = PhotoPickerProvider(
-      provider: provider,
-      options: options,
-      pickedAssetList: pickedAssetList,
-      child: PhotoMainPage(
-        onClose: (List<AssetEntity> value) {
-          Navigator.pop(context, value);
-        },
-        options: options,
-        photoList: photoList,
-      ),
-    );
-
-    return pickerProvider;
-  }
-}

pubspec.lock

@@ -88,6 +88,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.8"
+  nested:
+    dependency: transitive
+    description:
+      name: nested
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.0.4"
   path:
     dependency: transitive
     description:
@@ -109,6 +116,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.5.1-dev.4"
+  provider:
+    dependency: "direct main"
+    description:
+      name: provider
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "4.0.5"
   quiver:
     dependency: transitive
     description:
@@ -186,3 +200,4 @@ packages:
     version: "3.6.1"
 sdks:
   dart: ">=2.7.0 <3.0.0"
+  flutter: ">=1.12.1"

pubspec.yaml

@@ -12,6 +12,7 @@ dependencies:
     sdk: flutter
 
   photo_manager: ^0.5.1-dev.2
+  provider: ^4.0.5
   # photo_manager:
   #   git:
   #     url: https://github.com/CaiJingLong/flutter_photo_manager.git