From 2d0f41000ed81194468a41b44e5970eb9fcd487f Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Sat, 13 Jun 2026 20:49:45 -0400
Subject: [PATCH] improve expandable image viewer

---
 lib/widgets/expandable_image.dart | 36 ++++++++++++++++---------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/lib/widgets/expandable_image.dart b/lib/widgets/expandable_image.dart
index ee230b1..fdfabff 100644
--- a/lib/widgets/expandable_image.dart
+++ b/lib/widgets/expandable_image.dart
@@ -20,6 +20,25 @@ class ExpandableImage extends ConsumerWidget {
             builder: (_) => SafeArea(
               child: Stack(
                 children: [
+                  Positioned.fill(
+                    child: GestureDetector(
+                      onTap: Navigator.of(context).pop,
+                      child: InteractiveViewer(
+                        maxScale: 10,
+                        child: Image(
+                          errorBuilder: (_, error, stackTrace) => ErrorDialog(
+                            "Loading failed for $source\nError: $error",
+                            stackTrace,
+                          ),
+                          image: CachedNetworkImage(
+                            source!,
+                            ref.watch(CrossCacheController.provider),
+                            headers: ref.headers,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
                   Align(
                     alignment: .topRight,
                     child: Padding(
@@ -30,23 +49,6 @@ class ExpandableImage extends ConsumerWidget {
                       ),
                     ),
                   ),
-                  Center(
-                    child: InteractiveViewer(
-                      maxScale: 10,
-                      child: Image(
-                        fit: .contain,
-                        errorBuilder: (_, error, stackTrace) => ErrorDialog(
-                          "Loading failed for $source\nError: $error",
-                          stackTrace,
-                        ),
-                        image: CachedNetworkImage(
-                          source!,
-                          ref.watch(CrossCacheController.provider),
-                          headers: ref.headers,
-                        ),
-                      ),
-                    ),
-                  ),
                 ],
               ),
             ),