♻️ Improve the attachment item gesture

lib/widgets/account/account_popover.dart

@@ -60,7 +60,7 @@ class AccountPopoverCard extends StatelessWidget {
             IconButton(
               onPressed: () {
                 Navigator.pop(context);
-                GoRouter.of(context).pushNamed(
+                GoRouter.of(context).pushReplacementNamed(
                   'accountProfilePage',
                   pathParameters: {'name': data.name},
                 );

lib/widgets/attachment/attachment_item.dart

@@ -25,6 +25,7 @@ class AttachmentItem extends StatelessWidget {
   final String? heroTag;
   final BoxFit fit;
   final FilterQuality? filterQuality;
+  final Function? onZoom;
 
   const AttachmentItem({
     super.key,
@@ -32,6 +33,7 @@ class AttachmentItem extends StatelessWidget {
     required this.data,
     required this.heroTag,
     this.filterQuality,
+    this.onZoom,
   });
 
   Widget _buildContent(BuildContext context) {
@@ -94,7 +96,14 @@ class AttachmentItem extends StatelessWidget {
       });
     }
 
-    return _buildContent(context);
+    return GestureDetector(
+      child: _buildContent(context),
+      onTap: () {
+        if (data?.mimetype.startsWith('image') ?? false) {
+          onZoom?.call();
+        }
+      },
+    );
   }
 }
 

lib/widgets/attachment/attachment_list.dart

@@ -74,7 +74,6 @@ class _AttachmentListState extends State<AttachmentList> {
           return Container(
             padding: widget.padding ?? EdgeInsets.zero,
             constraints: constraints,
-            child: GestureDetector(
             child: AspectRatio(
               aspectRatio: singleAspectRatio,
               child: Container(
@@ -90,14 +89,7 @@ class _AttachmentListState extends State<AttachmentList> {
                     heroTag: heroTags[0],
                     fit: widget.fit,
                     filterQuality: widget.filterQuality,
-                    ),
+                    onZoom: () {
-                  ),
-                ),
-              ),
-              onTap: () {
-                if (widget.data.firstOrNull?.mediaType != SnMediaType.image) {
-                  return;
-                }
                       context.pushTransparentRoute(
                         AttachmentZoomView(
                           data: widget.data.where((ele) => ele != null).cast(),
@@ -109,6 +101,9 @@ class _AttachmentListState extends State<AttachmentList> {
                       );
                     },
                   ),
+                ),
+              ),
+            ),
           );
         }
 
@@ -133,21 +128,14 @@ class _AttachmentListState extends State<AttachmentList> {
                 mainAxisSpacing: 4,
                 children: widget.data
                     .mapIndexed(
-                      (idx, ele) => GestureDetector(
+                      (idx, ele) => Container(
-                        child: Container(
                         constraints: constraints,
                         child: AttachmentItem(
                           data: ele,
                           heroTag: heroTags[idx],
                           fit: BoxFit.cover,
                           filterQuality: widget.filterQuality,
-                          ),
+                          onZoom: () {
-                        ),
-                        onTap: () {
-                          if (widget.data[idx]!.mediaType !=
-                              SnMediaType.image) {
-                            return;
-                          }
                             context.pushTransparentRoute(
                               AttachmentZoomView(
                                 data: widget.data
@@ -161,6 +149,7 @@ class _AttachmentListState extends State<AttachmentList> {
                             );
                           },
                         ),
+                      ),
                     )
                     .toList(),
               ),