feat: Further migrations to go_router, add onclick to document previews

lib/features/document_details/view/pages/document_details_page.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
 import 'package:open_filex/open_filex.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/bloc/connectivity_cubit.dart';
@@ -92,37 +93,43 @@ class _DocumentDetailsPageState extends State<DocumentDetailsPage> {
                               DocumentDetailsState>(
                             builder: (context, state) {
                               return Positioned.fill(
-                                child: DocumentPreview(
-                                  document: state.document,
-                                  fit: BoxFit.cover,
+                                child: GestureDetector(
+                                  onTap: () {
+                                    DocumentPreviewRoute($extra: state.document)
+                                        .push(context);
+                                  },
+                                  child: DocumentPreview(
+                                    document: state.document,
+                                    fit: BoxFit.cover,
+                                  ),
                                 ),
                               );
                             },
                           ),
-                          Positioned.fill(
-                            top: 0,
-                            child: DecoratedBox(
-                              decoration: BoxDecoration(
-                                gradient: LinearGradient(
-                                  colors: [
-                                    Theme.of(context)
-                                        .colorScheme
-                                        .background
-                                        .withOpacity(0.8),
-                                    Theme.of(context)
-                                        .colorScheme
-                                        .background
-                                        .withOpacity(0.5),
-                                    Colors.transparent,
-                                    Colors.transparent,
-                                    Colors.transparent,
-                                  ],
-                                  begin: Alignment.topCenter,
-                                  end: Alignment.bottomCenter,
-                                ),
-                              ),
-                            ),
-                          ),
+                          // Positioned.fill(
+                          //   top: -kToolbarHeight,
+                          //   child: DecoratedBox(
+                          //     decoration: BoxDecoration(
+                          //       gradient: LinearGradient(
+                          //         colors: [
+                          //           Theme.of(context)
+                          //               .colorScheme
+                          //               .background
+                          //               .withOpacity(0.8),
+                          //           Theme.of(context)
+                          //               .colorScheme
+                          //               .background
+                          //               .withOpacity(0.5),
+                          //           Colors.transparent,
+                          //           Colors.transparent,
+                          //           Colors.transparent,
+                          //         ],
+                          //         begin: Alignment.topCenter,
+                          //         end: Alignment.bottomCenter,
+                          //       ),
+                          //     ),
+                          //   ),
+                          // ),
                         ],
                       ),
                     ),
@@ -302,6 +309,7 @@ class _DocumentDetailsPageState extends State<DocumentDetailsPage> {
           preferBelow: false,
           verticalOffset: 40,
           child: FloatingActionButton(
+            heroTag: "fab_document_details",
             child: const Icon(Icons.edit),
             onPressed: () => EditDocumentRoute(state.document).push(context),
           ),
@@ -333,13 +341,13 @@ class _DocumentDetailsPageState extends State<DocumentDetailsPage> {
                     document: state.document,
                     enabled: isConnected,
                   ),
-                  //TODO: Enable again, need new pdf viewer package...
-                  IconButton(
-                    tooltip: S.of(context)!.previewTooltip,
-                    icon: const Icon(Icons.visibility),
-                    onPressed:
-                        (isConnected) ? () => _onOpen(state.document) : null,
-                  ).paddedOnly(right: 4.0),
+                  // //TODO: Enable again, need new pdf viewer package...
+                  // IconButton(
+                  //   tooltip: S.of(context)!.previewTooltip,
+                  //   icon: const Icon(Icons.visibility),
+                  //   onPressed:
+                  //       (isConnected) ? () => _onOpen(state.document) : null,
+                  // ).paddedOnly(right: 4.0),
                   IconButton(
                     tooltip: S.of(context)!.openInSystemViewer,
                     icon: const Icon(Icons.open_in_new),
@@ -391,21 +399,17 @@ class _DocumentDetailsPageState extends State<DocumentDetailsPage> {
       } on PaperlessApiException catch (error, stackTrace) {
         showErrorMessage(context, error, stackTrace);
       } finally {
-        // Document deleted => go back to primary route
-        Navigator.popUntil(context, (route) => route.isFirst);
+        do {
+          context.pop();
+        } while (context.canPop());
       }
     }
   }
 
   Future<void> _onOpen(DocumentModel document) async {
-    Navigator.of(context).push(
-      MaterialPageRoute(
-        builder: (_) => DocumentView(
-          documentBytes:
-              context.read<PaperlessDocumentsApi>().download(document),
-          title: document.title,
-        ),
-      ),
-    );
+    DocumentPreviewRoute(
+      $extra: document,
+      title: document.title,
+    ).push(context);
   }
 }

lib/features/document_details/view/widgets/document_meta_data_widget.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:intl/intl.dart';
 import 'package:paperless_api/paperless_api.dart';
+import 'package:paperless_mobile/core/database/tables/local_user_account.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/features/document_details/cubit/document_details_cubit.dart';
 import 'package:paperless_mobile/features/document_details/view/widgets/archive_serial_number_field.dart';
@@ -25,6 +26,7 @@ class DocumentMetaDataWidget extends StatefulWidget {
 class _DocumentMetaDataWidgetState extends State<DocumentMetaDataWidget> {
   @override
   Widget build(BuildContext context) {
+    final currentUser = context.watch<LocalUserAccount>().paperlessUser;
     return BlocBuilder<DocumentDetailsCubit, DocumentDetailsState>(
       builder: (context, state) {
         if (state.metaData == null) {
@@ -37,9 +39,10 @@ class _DocumentMetaDataWidgetState extends State<DocumentMetaDataWidget> {
         return SliverList(
           delegate: SliverChildListDelegate(
             [
-              ArchiveSerialNumberField(
-                document: widget.document,
-              ).paddedOnly(bottom: widget.itemSpacing),
+              if (currentUser.canEditDocuments)
+                ArchiveSerialNumberField(
+                  document: widget.document,
+                ).paddedOnly(bottom: widget.itemSpacing),
               DetailsItem.text(
                 DateFormat().format(widget.document.modified),
                 context: context,

lib/features/document_details/view/widgets/document_overview_widget.dart

@@ -31,71 +31,66 @@ class DocumentOverviewWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return SliverList(
-      delegate: SliverChildListDelegate(
-        [
+    return SliverList.list(
+      children: [
+        DetailsItem(
+          label: S.of(context)!.title,
+          content: HighlightedText(
+            text: document.title,
+            highlights: queryString?.split(" ") ?? [],
+            style: Theme.of(context).textTheme.bodyLarge,
+          ),
+        ).paddedOnly(bottom: itemSpacing),
+        DetailsItem.text(
+          DateFormat.yMMMMd().format(document.created),
+          context: context,
+          label: S.of(context)!.createdAt,
+        ).paddedOnly(bottom: itemSpacing),
+        if (document.documentType != null &&
+            context
+                .watch<LocalUserAccount>()
+                .paperlessUser
+                .canViewDocumentTypes)
           DetailsItem(
-            label: S.of(context)!.title,
-            content: HighlightedText(
-              text: document.title,
-              highlights: queryString?.split(" ") ?? [],
+            label: S.of(context)!.documentType,
+            content: LabelText<DocumentType>(
               style: Theme.of(context).textTheme.bodyLarge,
+              label: availableDocumentTypes[document.documentType],
             ),
           ).paddedOnly(bottom: itemSpacing),
-          DetailsItem.text(
-            DateFormat.yMMMMd().format(document.created),
-            context: context,
-            label: S.of(context)!.createdAt,
+        if (document.correspondent != null &&
+            context
+                .watch<LocalUserAccount>()
+                .paperlessUser
+                .canViewCorrespondents)
+          DetailsItem(
+            label: S.of(context)!.correspondent,
+            content: LabelText<Correspondent>(
+              style: Theme.of(context).textTheme.bodyLarge,
+              label: availableCorrespondents[document.correspondent],
+            ),
           ).paddedOnly(bottom: itemSpacing),
-          if (document.documentType != null &&
-              context
-                  .watch<LocalUserAccount>()
-                  .paperlessUser
-                  .canViewDocumentTypes)
-            DetailsItem(
-              label: S.of(context)!.documentType,
-              content: LabelText<DocumentType>(
-                style: Theme.of(context).textTheme.bodyLarge,
-                label: availableDocumentTypes[document.documentType],
+        if (document.storagePath != null &&
+            context.watch<LocalUserAccount>().paperlessUser.canViewStoragePaths)
+          DetailsItem(
+            label: S.of(context)!.storagePath,
+            content: LabelText<StoragePath>(
+              label: availableStoragePaths[document.storagePath],
+            ),
+          ).paddedOnly(bottom: itemSpacing),
+        if (document.tags.isNotEmpty &&
+            context.watch<LocalUserAccount>().paperlessUser.canViewTags)
+          DetailsItem(
+            label: S.of(context)!.tags,
+            content: Padding(
+              padding: const EdgeInsets.only(top: 8.0),
+              child: TagsWidget(
+                isClickable: false,
+                tags: document.tags.map((e) => availableTags[e]!).toList(),
               ),
-            ).paddedOnly(bottom: itemSpacing),
-          if (document.correspondent != null &&
-              context
-                  .watch<LocalUserAccount>()
-                  .paperlessUser
-                  .canViewCorrespondents)
-            DetailsItem(
-              label: S.of(context)!.correspondent,
-              content: LabelText<Correspondent>(
-                style: Theme.of(context).textTheme.bodyLarge,
-                label: availableCorrespondents[document.correspondent],
-              ),
-            ).paddedOnly(bottom: itemSpacing),
-          if (document.storagePath != null &&
-              context
-                  .watch<LocalUserAccount>()
-                  .paperlessUser
-                  .canViewStoragePaths)
-            DetailsItem(
-              label: S.of(context)!.storagePath,
-              content: LabelText<StoragePath>(
-                label: availableStoragePaths[document.storagePath],
-              ),
-            ).paddedOnly(bottom: itemSpacing),
-          if (document.tags.isNotEmpty &&
-              context.watch<LocalUserAccount>().paperlessUser.canViewTags)
-            DetailsItem(
-              label: S.of(context)!.tags,
-              content: Padding(
-                padding: const EdgeInsets.only(top: 8.0),
-                child: TagsWidget(
-                  isClickable: false,
-                  tags: document.tags.map((e) => availableTags[e]!).toList(),
-                ),
-              ),
-            ).paddedOnly(bottom: itemSpacing),
-        ],
-      ),
+            ),
+          ).paddedOnly(bottom: itemSpacing),
+      ],
     );
   }
 }