Cached images thumbnails

ReightI · ReightI · commit c9058f9e3635 · 2023-02-21T09:46:35.000+01:00
Removed examples
diff --git a/lib/components/cards/album_card.dart b/lib/components/cards/album_card.dart
@@ -14,13 +14,11 @@ class AlbumCard extends StatelessWidget {
     required this.album,
     this.onTap,
     this.showActions = true,
-    this.example = false,
     this.onDelete,
     this.onEdit,
     this.onMove,
   }) : super(key: key);
 
-  final bool example;
   final AlbumModel album;
   final Function()? onTap;
   final Function()? onDelete;
@@ -126,7 +124,6 @@ class AlbumCard extends StatelessWidget {
               ),
               child: AlbumCardContent(
                 album: album,
-                example: example,
               ),
             ),
           ),
@@ -151,7 +148,6 @@ class AlbumCard extends StatelessWidget {
           ),
           child: AlbumCardContent(
             album: album,
-            example: example,
           ),
         ),
       );
@@ -163,11 +159,9 @@ class AlbumCardContent extends StatelessWidget {
   const AlbumCardContent({
     Key? key,
     required this.album,
-    this.example = false,
   }) : super(key: key);
 
   final AlbumModel album;
-  final bool example;
 
   @override
   Widget build(BuildContext context) {
@@ -201,33 +195,25 @@ class AlbumCardContent extends StatelessWidget {
                 ),
               );
             }
-            if (example) {
-              return Image.asset(
-                album.urlRepresentative!,
-                fit: BoxFit.cover,
-                errorBuilder: (context, o, s) {
-                  debugPrint("$o");
-                  return Center(child: Icon(Icons.image_not_supported));
-                },
-              );
-            }
             return CachedNetworkImage(
               imageUrl: album.urlRepresentative!,
-              imageBuilder: (context, provider) => Image(
-                image: provider,
-                fit: BoxFit.cover,
-              ),
-              progressIndicatorBuilder: (context, url, download) => Center(
-                child: CircularProgressIndicator(
-                  value: download.progress,
-                ),
-              ),
+              fit: BoxFit.cover,
+              progressIndicatorBuilder: (context, url, download) {
+                if (download.downloaded >= (download.totalSize ?? 0)) {
+                  return const SizedBox();
+                }
+                return Center(
+                  child: CircularProgressIndicator(
+                    value: download.progress,
+                  ),
+                );
+              },
               errorWidget: (context, url, error) {
                 debugPrint("[$url] $error");
                 return FittedBox(
                   fit: BoxFit.cover,
                   child: Container(
-                    padding: const EdgeInsets.all(16),
+                    padding: const EdgeInsets.all(16.0),
                     decoration: BoxDecoration(
                       color: Theme.of(context).scaffoldBackgroundColor,
                     ),
diff --git a/lib/components/cards/image_card.dart b/lib/components/cards/image_card.dart
@@ -1,4 +1,5 @@
 import 'package:auto_size_text/auto_size_text.dart';
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:piwigo_ng/models/image_model.dart';
 import 'package:piwigo_ng/services/preferences_service.dart';
@@ -11,16 +12,12 @@ class ImageCard extends StatelessWidget {
     this.selected,
     required this.image,
     this.onLongPress,
-    this.example = false,
-    this.derivative,
   }) : super(key: key);
 
   final Function()? onPressed;
   final Function()? onLongPress;
   final bool? selected;
-  final bool example;
   final ImageModel image;
-  final String? derivative;
 
   final Duration selectDuration = const Duration(milliseconds: 200);
   final Curve selectCurve = Curves.easeInOut;
@@ -34,31 +31,49 @@ class ImageCard extends StatelessWidget {
         fit: StackFit.expand,
         children: [
           Builder(builder: (context) {
-            final String? imageUrl = image.getDerivativeFromString(derivative ?? Preferences.getImageThumbnailSize)?.url;
-            if (example) {
-              return Image.asset(
-                imageUrl ?? '',
-                fit: BoxFit.cover,
-                errorBuilder: (context, o, s) {
-                  debugPrint("$o\n$s");
-                  return Center(child: Icon(Icons.image_not_supported));
-                },
-              );
-            }
-            return Image.network(
-              imageUrl ?? '',
-              fit: BoxFit.cover,
-              errorBuilder: (context, o, s) {
-                debugPrint("$o\n$s");
-                return Center(child: Icon(Icons.image_not_supported));
-              },
-              loadingBuilder: (BuildContext context, Widget child, ImageChunkEvent? loadingProgress) {
-                if (loadingProgress == null) return child;
+            final String? imageUrl = image.getDerivativeFromString(Preferences.getImageThumbnailSize)?.url;
+            return CachedNetworkImage(
+              imageUrl: imageUrl ?? '',
+              imageBuilder: (context, provider) => Hero(
+                tag: "<hero image ${image.id}>",
+                child: Image(
+                  image: provider,
+                  fit: BoxFit.cover,
+                  errorBuilder: (context, o, s) {
+                    debugPrint("$o\n$s");
+                    return FittedBox(
+                      fit: BoxFit.cover,
+                      child: Container(
+                        padding: const EdgeInsets.all(16.0),
+                        decoration: BoxDecoration(
+                          color: Theme.of(context).scaffoldBackgroundColor,
+                        ),
+                        child: const Icon(Icons.broken_image_outlined),
+                      ),
+                    );
+                  },
+                ),
+              ),
+              progressIndicatorBuilder: (context, url, download) {
+                if (download.downloaded >= (download.totalSize ?? 0)) {
+                  return const SizedBox();
+                }
                 return Center(
                   child: CircularProgressIndicator(
-                    value: loadingProgress.expectedTotalBytes != null
-                        ? loadingProgress.cumulativeBytesLoaded / loadingProgress.expectedTotalBytes!
-                        : null,
+                    value: download.progress,
+                  ),
+                );
+              },
+              errorWidget: (context, url, error) {
+                debugPrint("[$url] $error");
+                return FittedBox(
+                  fit: BoxFit.cover,
+                  child: Container(
+                    padding: const EdgeInsets.all(16.0),
+                    decoration: BoxDecoration(
+                      color: Theme.of(context).scaffoldBackgroundColor,
+                    ),
+                    child: const Icon(Icons.broken_image_outlined),
                   ),
                 );
               },
diff --git a/lib/components/scroll_widgets/album_grid_view.dart b/lib/components/scroll_widgets/album_grid_view.dart
@@ -1,9 +1,6 @@
-import 'dart:math';
-
 import 'package:flutter/material.dart';
 import 'package:piwigo_ng/components/cards/album_card.dart';
 import 'package:piwigo_ng/models/album_model.dart';
-import 'package:piwigo_ng/utils/localizations.dart';
 import 'package:piwigo_ng/utils/settings.dart';
 
 class AlbumGridView extends StatelessWidget {
@@ -53,69 +50,3 @@ class AlbumGridView extends StatelessWidget {
     );
   }
 }
-
-class ExampleAlbumGridView extends StatelessWidget {
-  const ExampleAlbumGridView({
-    Key? key,
-    this.albumThumbnailSize = Settings.defaultAlbumThumbnailSize,
-  }) : super(key: key);
-
-  final String albumThumbnailSize;
-
-  List<AlbumModel> get _exampleAlbumList {
-    return [
-      AlbumModel(
-        id: 0,
-        name: 'weird_cat',
-        comment: appStrings.createNewAlbumDescription_noDescription,
-        urlRepresentative: 'assets/example/weird_cat/$albumThumbnailSize.jpg',
-      ),
-      AlbumModel(
-        id: 0,
-        name: 'weird_cat',
-        comment: appStrings.createNewAlbumDescription_noDescription,
-        urlRepresentative: 'assets/example/weird_cat/$albumThumbnailSize.jpg',
-      ),
-      AlbumModel(
-        id: 0,
-        name: 'weird_cat',
-        comment: appStrings.createNewAlbumDescription_noDescription,
-        urlRepresentative: 'assets/example/weird_cat/$albumThumbnailSize.jpg',
-      ),
-      AlbumModel(
-        id: 0,
-        name: 'weird_cat',
-        comment: appStrings.createNewAlbumDescription_noDescription,
-        urlRepresentative: 'assets/example/weird_cat/$albumThumbnailSize.jpg',
-      ),
-    ];
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return LayoutBuilder(builder: (context, constraints) {
-      final double nbPerRow = constraints.maxWidth / Settings.defaultAlbumGridSize;
-      final int nbAlbums = max(nbPerRow.ceil(), 1);
-      return GridView.builder(
-        padding: const EdgeInsets.symmetric(vertical: 8.0),
-        gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
-          maxCrossAxisExtent: Settings.defaultAlbumGridSize,
-          mainAxisSpacing: 8.0,
-          crossAxisSpacing: 8.0,
-          childAspectRatio: AlbumCard.kAlbumRatio,
-        ),
-        shrinkWrap: true,
-        physics: const NeverScrollableScrollPhysics(),
-        itemCount: nbAlbums,
-        itemBuilder: (context, index) {
-          AlbumModel album = _exampleAlbumList[index];
-          return AlbumCard(
-            album: album,
-            example: true,
-            showActions: false,
-          );
-        },
-      );
-    });
-  }
-}
diff --git a/lib/components/scroll_widgets/image_grid_view.dart b/lib/components/scroll_widgets/image_grid_view.dart
@@ -70,40 +70,3 @@ class _ImageGridViewState extends State<ImageGridView> {
     );
   }
 }
-
-class ExampleImageGridView extends StatelessWidget {
-  const ExampleImageGridView({
-    Key? key,
-    this.nbImageRow,
-    this.imageThumbnailSize,
-  }) : super(key: key);
-
-  final int? nbImageRow;
-  final String? imageThumbnailSize;
-
-  @override
-  Widget build(BuildContext context) {
-    return Builder(builder: (context) {
-      final int crossAxisCount = Settings.getImageCrossAxisCount(context, nbImageRow);
-      return GridView.builder(
-        padding: const EdgeInsets.symmetric(vertical: 8.0),
-        gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-          crossAxisCount: crossAxisCount,
-          mainAxisSpacing: 4.0,
-          crossAxisSpacing: 4.0,
-        ),
-        shrinkWrap: true,
-        physics: const NeverScrollableScrollPhysics(),
-        itemCount: crossAxisCount,
-        itemBuilder: (context, index) {
-          return const SizedBox();
-          // return ImageCard(
-          //   image: image,
-          //   example: true,
-          //   derivative: imageThumbnailSize,
-          // );
-        },
-      );
-    });
-  }
-}
diff --git a/lib/views/image/image_view_page.dart b/lib/views/image/image_view_page.dart
@@ -360,6 +360,9 @@ class _ImageViewPageState extends State<ImageViewPage> {
 
             // Default behavior: Zoomable image
             return PhotoViewGalleryPageOptions(
+              heroAttributes: PhotoViewHeroAttributes(
+                tag: "<hero image ${image.id}>",
+              ),
               imageProvider: NetworkImage(
                 image.getDerivativeFromString(Preferences.getImageFullScreenSize)?.url ?? '',
               ),
