Merge pull request #32 from CaiJingLong/auto-refresh

Auto refresh when the asset changes

CHANGELOG.md

@@ -1,6 +1,13 @@
 # CHANGELOG
 
-## [0.2.1] add params photoList
+## [0.3.0] add params photoList
+
+**Breaking change**. Migrate from the deprecated original Android Support Library to AndroidX. This shouldn't result in any functional changes, but it requires any Android apps using this plugin to also migrate if they're using the original support library.
+
+fix:
+
+- duration badge
+- sort image
 
 ## [0.2.0]
 

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

@@ -0,0 +1,102 @@
+
+part of '../photo_main_page.dart';
+
+class _BottomWidget extends StatefulWidget {
+  final ValueChanged<AssetPathEntity> onGalleryChange;
+
+  final Options options;
+
+  final I18nProvider provider;
+
+  final SelectedProvider selectedProvider;
+
+  final String galleryName;
+
+  final GalleryListProvider galleryListProvider;
+  final VoidCallback onTapPreview;
+
+  const _BottomWidget({
+    Key key,
+    this.onGalleryChange,
+    this.options,
+    this.provider,
+    this.selectedProvider,
+    this.galleryName = "",
+    this.galleryListProvider,
+    this.onTapPreview,
+  }) : super(key: key);
+
+  @override
+  __BottomWidgetState createState() => __BottomWidgetState();
+}
+
+class __BottomWidgetState extends State<_BottomWidget> {
+  Options get options => widget.options;
+
+  I18nProvider get i18nProvider => widget.provider;
+
+  @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),
+                  ),
+                ),
+              ),
+              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,
+                  ),
+                  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/image_item.dart

@@ -0,0 +1,85 @@
+part of '../photo_main_page.dart';
+
+
+class ImageItem extends StatelessWidget {
+  final AssetEntity entity;
+
+  final Color themeColor;
+
+  final int size;
+
+  final LoadingDelegate loadingDelegate;
+
+  final BadgeDelegate badgeDelegate;
+
+  const ImageItem({
+    Key key,
+    this.entity,
+    this.themeColor,
+    this.size = 64,
+    this.loadingDelegate,
+    this.badgeDelegate,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    var thumb = ImageLruCache.getData(entity, size);
+    if (thumb != null) {
+      return _buildImageItem(context, thumb);
+    }
+
+    return FutureBuilder<Uint8List>(
+      future: entity.thumbDataWithSize(size, size),
+      builder: (BuildContext context, AsyncSnapshot<Uint8List> snapshot) {
+        var futureData = snapshot.data;
+        if (snapshot.connectionState == ConnectionState.done &&
+            futureData != null) {
+          ImageLruCache.setData(entity, size, futureData);
+          return _buildImageItem(context, futureData);
+        }
+        return Center(
+          child: loadingDelegate.buildPreviewLoading(
+            context,
+            entity,
+            themeColor,
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _buildImageItem(BuildContext context, Uint8List data) {
+    var image = Image.memory(
+      data,
+      width: double.infinity,
+      height: double.infinity,
+      fit: BoxFit.cover,
+    );
+    // FutureBuilder()
+    var badge = FutureBuilder<Duration>(
+      future: entity.videoDuration,
+      builder: (ctx, snapshot) {
+        if (snapshot.hasData && snapshot != null) {
+          var buildBadge =
+              badgeDelegate?.buildBadge(context, entity.type, snapshot.data);
+          if (buildBadge == null) {
+            return Container();
+          } else {
+            return buildBadge;
+          }
+        } else {
+          return Container();
+        }
+      },
+    );
+
+    return Stack(
+      children: <Widget>[
+        image,
+        IgnorePointer(
+          child: badge,
+        ),
+      ],
+    );
+  }
+}

lib/src/ui/page/photo_main_page.dart

@@ -14,6 +14,9 @@ import 'package:photo/src/ui/dialog/change_gallery_dialog.dart';
 import 'package:photo/src/ui/page/photo_preview_page.dart';
 import 'package:photo_manager/photo_manager.dart';
 
+part './main/bottom_widget.dart';
+part './main/image_item.dart';
+
 class PhotoMainPage extends StatefulWidget {
   final ValueChanged<List<AssetEntity>> onClose;
   final Options options;
@@ -67,16 +70,22 @@ class _PhotoMainPageState extends State<PhotoMainPage>
 
   bool isPushed = false;
 
+  bool get useAlbum => widget.photoList == null || widget.photoList.isEmpty;
+
   @override
   void initState() {
     super.initState();
     _refreshList();
     scaffoldKey = GlobalKey();
     scrollController = ScrollController();
+    PhotoManager.addChangeCallback(_onAssetChange);
+    PhotoManager.startChangeNotify();
   }
 
   @override
   void dispose() {
+    PhotoManager.removeChangeCallback(_onAssetChange);
+    PhotoManager.stopChangeNotify();
     scaffoldKey = null;
     super.dispose();
   }
@@ -165,7 +174,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
   }
 
   void _refreshList() {
-    if (widget.photoList != null && widget.photoList.isNotEmpty) {
+    if (!useAlbum) {
       _refreshListFromWidget();
       return;
     }
@@ -448,187 +457,11 @@ class _PhotoMainPageState extends State<PhotoMainPage>
       ),
     );
   }
-}
-
-class _BottomWidget extends StatefulWidget {
-  final ValueChanged<AssetPathEntity> onGalleryChange;
-
-  final Options options;
-
-  final I18nProvider provider;
-
-  final SelectedProvider selectedProvider;
-
-  final String galleryName;
-
-  final GalleryListProvider galleryListProvider;
-  final VoidCallback onTapPreview;
-
-  const _BottomWidget({
-    Key key,
-    this.onGalleryChange,
-    this.options,
-    this.provider,
-    this.selectedProvider,
-    this.galleryName = "",
-    this.galleryListProvider,
-    this.onTapPreview,
-  }) : super(key: key);
-
-  @override
-  __BottomWidgetState createState() => __BottomWidgetState();
-}
-
-class __BottomWidgetState extends State<_BottomWidget> {
-  Options get options => widget.options;
-
-  I18nProvider get i18nProvider => widget.provider;
-
-  @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),
-                  ),
-                ),
-              ),
-              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,
-                  ),
-                  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);
-  }
-}
-
-class ImageItem extends StatelessWidget {
-  final AssetEntity entity;
-
-  final Color themeColor;
-
-  final int size;
-
-  final LoadingDelegate loadingDelegate;
 
-  final BadgeDelegate badgeDelegate;
-
-  const ImageItem({
-    Key key,
-    this.entity,
-    this.themeColor,
-    this.size = 64,
-    this.loadingDelegate,
-    this.badgeDelegate,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    var thumb = ImageLruCache.getData(entity, size);
-    if (thumb != null) {
-      return _buildImageItem(context, thumb);
+  void _onAssetChange() {
+    if (useAlbum) {
+      _refreshList();
     }
-
-    return FutureBuilder<Uint8List>(
-      future: entity.thumbDataWithSize(size, size),
-      builder: (BuildContext context, AsyncSnapshot<Uint8List> snapshot) {
-        var futureData = snapshot.data;
-        if (snapshot.connectionState == ConnectionState.done &&
-            futureData != null) {
-          ImageLruCache.setData(entity, size, futureData);
-          return _buildImageItem(context, futureData);
-        }
-        return Center(
-          child: loadingDelegate.buildPreviewLoading(
-            context,
-            entity,
-            themeColor,
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildImageItem(BuildContext context, Uint8List data) {
-    var image = Image.memory(
-      data,
-      width: double.infinity,
-      height: double.infinity,
-      fit: BoxFit.cover,
-    );
-    // FutureBuilder()
-    var badge = FutureBuilder<Duration>(
-      future: entity.videoDuration,
-      builder: (ctx, snapshot) {
-        if (snapshot.hasData && snapshot != null) {
-          var buildBadge =
-              badgeDelegate?.buildBadge(context, entity.type, snapshot.data);
-          if (buildBadge == null) {
-            return Container();
-          } else {
-            return buildBadge;
-          }
-        } else {
-          return Container();
-        }
-      },
-    );
-
-    return Stack(
-      children: <Widget>[
-        image,
-        IgnorePointer(
-          child: badge,
-        ),
-      ],
-    );
   }
+  
 }

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.2.1
+version: 0.3.0
 author: caijinglong<cjl_spy@163.com>
 homepage: https://github.com/CaiJingLong/flutter_photo