Refactor: decouple image viewer and image source

app/lib/widget/image_viewer.dart

@@ -10,8 +10,8 @@ import 'package:nc_photos/entity/file.dart';
 import 'package:nc_photos/k.dart' as k;
 import 'package:nc_photos/widget/cached_network_image_mod.dart' as mod;
 
-class ImageViewer extends StatefulWidget {
+class RemoteImageViewer extends StatefulWidget {
-  const ImageViewer({
+  const RemoteImageViewer({
     Key? key,
     required this.account,
     required this.file,
@@ -23,7 +23,7 @@ class ImageViewer extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  createState() => _ImageViewerState();
+  createState() => _RemoteImageViewerState();
 
   static void preloadImage(Account account, File file) {
     LargeImageCacheManager.inst.getFileStream(
@@ -43,7 +43,67 @@ class ImageViewer extends StatefulWidget {
   final VoidCallback? onZoomEnded;
 }
 
-class _ImageViewerState extends State<ImageViewer>
+class _RemoteImageViewerState extends State<RemoteImageViewer> {
+  @override
+  build(BuildContext context) => _ImageViewer(
+        canZoom: widget.canZoom,
+        onHeightChanged: widget.onHeightChanged,
+        onZoomStarted: widget.onZoomStarted,
+        onZoomEnded: widget.onZoomEnded,
+        child: mod.CachedNetworkImage(
+          cacheManager: LargeImageCacheManager.inst,
+          imageUrl: _getImageUrl(widget.account, widget.file),
+          httpHeaders: {
+            "Authorization": Api.getAuthorizationHeaderValue(widget.account),
+          },
+          fit: BoxFit.contain,
+          fadeInDuration: const Duration(),
+          filterQuality: FilterQuality.high,
+          imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
+          imageBuilder: (context, child, imageProvider) {
+            WidgetsBinding.instance!.addPostFrameCallback((_) {
+              _onItemLoaded();
+            });
+            SizeChangedLayoutNotification().dispatch(context);
+            return child;
+          },
+        ),
+      );
+
+  void _onItemLoaded() {
+    if (!_isLoaded) {
+      _log.info("[_onItemLoaded]");
+      _isLoaded = true;
+      widget.onLoaded?.call();
+    }
+  }
+
+  var _isLoaded = false;
+
+  static final _log = Logger("widget.image_viewer._RemoteImageViewerState");
+}
+
+class _ImageViewer extends StatefulWidget {
+  const _ImageViewer({
+    Key? key,
+    required this.child,
+    required this.canZoom,
+    this.onHeightChanged,
+    this.onZoomStarted,
+    this.onZoomEnded,
+  }) : super(key: key);
+
+  @override
+  createState() => _ImageViewerState();
+
+  final Widget child;
+  final bool canZoom;
+  final ValueChanged<double>? onHeightChanged;
+  final VoidCallback? onZoomStarted;
+  final VoidCallback? onZoomEnded;
+}
+
+class _ImageViewerState extends State<_ImageViewer>
     with TickerProviderStateMixin {
   @override
   build(BuildContext context) {
@@ -68,26 +128,8 @@ class _ImageViewerState extends State<ImageViewer>
             return false;
           },
           child: SizeChangedLayoutNotifier(
-            child: mod.CachedNetworkImage(
+            key: _key,
-              key: _key,
+            child: widget.child,
-              cacheManager: LargeImageCacheManager.inst,
-              imageUrl: _getImageUrl(widget.account, widget.file),
-              httpHeaders: {
-                "Authorization":
-                    Api.getAuthorizationHeaderValue(widget.account),
-              },
-              fit: BoxFit.contain,
-              fadeInDuration: const Duration(),
-              filterQuality: FilterQuality.high,
-              imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
-              imageBuilder: (context, child, imageProvider) {
-                WidgetsBinding.instance!.addPostFrameCallback((_) {
-                  _onItemLoaded();
-                });
-                SizeChangedLayoutNotification().dispatch(context);
-                return child;
-              },
-            ),
           ),
         ),
       ),
@@ -148,14 +190,6 @@ class _ImageViewerState extends State<ImageViewer>
     _transformationController.dispose();
   }
 
-  void _onItemLoaded() {
-    if (!_isLoaded) {
-      _log.info("[_onItemLoaded]");
-      _isLoaded = true;
-      widget.onLoaded?.call();
-    }
-  }
-
   void _setIsZooming(bool flag) {
     _isZooming = flag;
     final next = _isZoomed;
@@ -221,7 +255,6 @@ class _ImageViewerState extends State<ImageViewer>
   final _key = GlobalKey();
   final _transformationController = TransformationController();
 
-  var _isLoaded = false;
   var _isZooming = false;
   var _wasZoomed = false;
 

app/lib/widget/slideshow_viewer.dart

@@ -189,7 +189,7 @@ class _SlideshowViewerState extends State<SlideshowViewer>
   }
 
   Widget _buildImageView(BuildContext context, int index) {
-    return ImageViewer(
+    return RemoteImageViewer(
       account: widget.account,
       file: widget.streamFiles[index],
       canZoom: false,
@@ -221,13 +221,13 @@ class _SlideshowViewerState extends State<SlideshowViewer>
       if (index > 0) {
         final prevFile = widget.streamFiles[index - 1];
         if (file_util.isSupportedImageFormat(prevFile)) {
-          ImageViewer.preloadImage(widget.account, prevFile);
+          RemoteImageViewer.preloadImage(widget.account, prevFile);
         }
       }
       if (index + 1 < widget.streamFiles.length) {
         final nextFile = widget.streamFiles[index + 1];
         if (file_util.isSupportedImageFormat(nextFile)) {
-          ImageViewer.preloadImage(widget.account, nextFile);
+          RemoteImageViewer.preloadImage(widget.account, nextFile);
         }
       }
     }

app/lib/widget/trashbin_viewer.dart

@@ -229,7 +229,7 @@ class _TrashbinViewerState extends State<TrashbinViewer> {
   }
 
   Widget _buildImageView(BuildContext context, int index) {
-    return ImageViewer(
+    return RemoteImageViewer(
       account: widget.account,
       file: widget.streamFiles[index],
       canZoom: true,
@@ -267,13 +267,13 @@ class _TrashbinViewerState extends State<TrashbinViewer> {
       if (index > 0) {
         final prevFile = widget.streamFiles[index - 1];
         if (file_util.isSupportedImageFormat(prevFile)) {
-          ImageViewer.preloadImage(widget.account, prevFile);
+          RemoteImageViewer.preloadImage(widget.account, prevFile);
         }
       }
       if (index + 1 < widget.streamFiles.length) {
         final nextFile = widget.streamFiles[index + 1];
         if (file_util.isSupportedImageFormat(nextFile)) {
-          ImageViewer.preloadImage(widget.account, nextFile);
+          RemoteImageViewer.preloadImage(widget.account, nextFile);
         }
       }
       setState(() {

app/lib/widget/viewer.dart

@@ -314,7 +314,7 @@ class _ViewerState extends State<Viewer>
   }
 
   Widget _buildImageView(BuildContext context, int index) {
-    return ImageViewer(
+    return RemoteImageViewer(
       account: widget.account,
       file: widget.streamFiles[index],
       canZoom: _canZoom(),
@@ -414,13 +414,13 @@ class _ViewerState extends State<Viewer>
       if (index > 0) {
         final prevFile = widget.streamFiles[index - 1];
         if (file_util.isSupportedImageFormat(prevFile)) {
-          ImageViewer.preloadImage(widget.account, prevFile);
+          RemoteImageViewer.preloadImage(widget.account, prevFile);
         }
       }
       if (index + 1 < widget.streamFiles.length) {
         final nextFile = widget.streamFiles[index + 1];
         if (file_util.isSupportedImageFormat(nextFile)) {
-          ImageViewer.preloadImage(widget.account, nextFile);
+          RemoteImageViewer.preloadImage(widget.account, nextFile);
         }
       }
     }