chore+fix+feat: Apply dart fixes after upgrade to flutter 3.10, add permission checks, make most api calls work again

2025-12-09 22:07:53 -06:00 · 2023-05-12 00:16:30 +02:00
parent c8ff261fc7
commit 39342eecf1
114 changed files with 546 additions and 685 deletions
--- a/lib/features/inbox/view/pages/inbox_page.dart
+++ b/lib/features/inbox/view/pages/inbox_page.dart
@@ -3,6 +3,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/exception/server_message_exception.dart';
 import 'package:paperless_mobile/core/widgets/dialog_utils/dialog_cancel_button.dart';
 import 'package:paperless_mobile/core/widgets/dialog_utils/dialog_confirm_button.dart';
 import 'package:paperless_mobile/core/widgets/hint_card.dart';
@@ -10,7 +11,6 @@ import 'package:paperless_mobile/extensions/dart_extensions.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/features/app_drawer/view/app_drawer.dart';
 import 'package:paperless_mobile/features/document_search/view/sliver_search_bar.dart';
-import 'package:paperless_mobile/features/documents/view/widgets/placeholder/documents_list_loading_widget.dart';
 import 'package:paperless_mobile/features/inbox/cubit/inbox_cubit.dart';
 import 'package:paperless_mobile/features/inbox/view/widgets/inbox_empty_widget.dart';
 import 'package:paperless_mobile/features/inbox/view/widgets/inbox_item.dart';
@@ -26,10 +26,8 @@ class InboxPage extends StatefulWidget {
  State<InboxPage> createState() => _InboxPageState();
 }

-class _InboxPageState extends State<InboxPage>
-    with DocumentPagingViewMixin<InboxPage, InboxCubit> {
-  final SliverOverlapAbsorberHandle searchBarHandle =
-      SliverOverlapAbsorberHandle();
+class _InboxPageState extends State<InboxPage> with DocumentPagingViewMixin<InboxPage, InboxCubit> {
+  final SliverOverlapAbsorberHandle searchBarHandle = SliverOverlapAbsorberHandle();

  @override
  final pagingScrollController = ScrollController();
@@ -80,8 +78,7 @@ class _InboxPageState extends State<InboxPage>
                  } else if (state.documents.isEmpty) {
                    return Center(
                      child: InboxEmptyWidget(
-                        emptyStateRefreshIndicatorKey:
-                            _emptyStateRefreshIndicatorKey,
+                        emptyStateRefreshIndicatorKey: _emptyStateRefreshIndicatorKey,
                      ),
                    );
                  } else {
@@ -92,8 +89,7 @@ class _InboxPageState extends State<InboxPage>
                          SliverToBoxAdapter(
                            child: HintCard(
                              show: !state.isHintAcknowledged,
-                              hintText:
-                                  S.of(context)!.swipeLeftToMarkADocumentAsSeen,
+                              hintText: S.of(context)!.swipeLeftToMarkADocumentAsSeen,
                              onHintAcknowledged: () =>
                                  context.read<InboxCubit>().acknowledgeHint(),
                            ),
@@ -108,13 +104,10 @@ class _InboxPageState extends State<InboxPage>
                                    child: Align(
                                      alignment: Alignment.centerLeft,
                                      child: ClipRRect(
-                                        borderRadius:
-                                            BorderRadius.circular(32.0),
+                                        borderRadius: BorderRadius.circular(32.0),
                                        child: Text(
                                          entry.key,
-                                          style: Theme.of(context)
-                                              .textTheme
-                                              .bodySmall,
+                                          style: Theme.of(context).textTheme.bodySmall,
                                          textAlign: TextAlign.center,
                                        ).padded(),
                                      ),
@@ -182,7 +175,7 @@ class _InboxPageState extends State<InboxPage>
        ],
      ).padded(),
      confirmDismiss: (_) => _onItemDismissed(doc),
-      key: UniqueKey(),
+      key: ValueKey(doc.id),
      child: InboxItem(document: doc),
    );
  }
@@ -227,14 +220,15 @@ class _InboxPageState extends State<InboxPage>
      return true;
    } on PaperlessServerException catch (error, stackTrace) {
      showErrorMessage(context, error, stackTrace);
-      return false;
+    } on ServerMessageException catch (error) {
+      showGenericError(context, error.message);
    } catch (error) {
      showErrorMessage(
        context,
        const PaperlessServerException.unknown(),
      );
-      return false;
    }
+    return false;
  }

  Future<void> _onUndoMarkAsSeen(
@@ -242,9 +236,7 @@ class _InboxPageState extends State<InboxPage>
    Iterable<int> removedTags,
  ) async {
    try {
-      await context
-          .read<InboxCubit>()
-          .undoRemoveFromInbox(document, removedTags);
+      await context.read<InboxCubit>().undoRemoveFromInbox(document, removedTags);
    } on PaperlessServerException catch (error, stackTrace) {
      showErrorMessage(context, error, stackTrace);
    }
--- a/lib/features/inbox/view/widgets/inbox_item.dart
+++ b/lib/features/inbox/view/widgets/inbox_item.dart
@@ -2,6 +2,7 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:paperless_api/paperless_api.dart';
+import 'package:paperless_mobile/core/database/tables/local_user_account.dart';
 import 'package:paperless_mobile/core/navigation/push_routes.dart';
 import 'package:paperless_mobile/core/workarounds/colored_chip.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
@@ -12,8 +13,6 @@ import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_widget.d
 import 'package:paperless_mobile/features/labels/view/widgets/label_text.dart';
 import 'package:paperless_mobile/generated/l10n/app_localizations.dart';

-import 'package:paperless_mobile/routes/document_details_route.dart';
-
 class InboxItem extends StatefulWidget {
  static const a4AspectRatio = 1 / 1.4142;

@@ -108,8 +107,8 @@ class _InboxItemState extends State<InboxItem> {
                    ],
                  ),
                ),
-                SizedBox(
-                  height: 56,
+                LimitedBox(
+                  maxHeight: 56,
                  child: _buildActions(context),
                ),
              ],
@@ -121,58 +120,46 @@ class _InboxItemState extends State<InboxItem> {
  }

  Widget _buildActions(BuildContext context) {
+    final canEdit = LocalUserAccount.current.paperlessUser
+        .hasPermission(PermissionAction.change, PermissionTarget.document);
+    final canDelete = LocalUserAccount.current.paperlessUser
+        .hasPermission(PermissionAction.delete, PermissionTarget.document);
    final chipShape = RoundedRectangleBorder(
      borderRadius: BorderRadius.circular(32),
    );
    final actions = [
-      _buildAssignAsnAction(chipShape, context),
-      const SizedBox(width: 8.0),
-      ColoredChipWrapper(
-        child: ActionChip(
-          avatar: const Icon(Icons.delete_outline),
-          shape: chipShape,
-          label: Text(S.of(context)!.deleteDocument),
-          onPressed: () async {
-            final shouldDelete = await showDialog<bool>(
-                  context: context,
-                  builder: (context) => DeleteDocumentConfirmationDialog(document: widget.document),
-                ) ??
-                false;
-            if (shouldDelete) {
-              context.read<InboxCubit>().delete(widget.document);
-            }
-          },
+      if (canEdit) _buildAssignAsnAction(chipShape, context),
+      if (canEdit && canDelete) const SizedBox(width: 8.0),
+      if (canDelete)
+        ColoredChipWrapper(
+          child: ActionChip(
+            avatar: const Icon(Icons.delete_outline),
+            shape: chipShape,
+            label: Text(S.of(context)!.deleteDocument),
+            onPressed: () async {
+              final shouldDelete = await showDialog<bool>(
+                    context: context,
+                    builder: (context) =>
+                        DeleteDocumentConfirmationDialog(document: widget.document),
+                  ) ??
+                  false;
+              if (shouldDelete) {
+                context.read<InboxCubit>().delete(widget.document);
+              }
+            },
+          ),
        ),
-      ),
    ];
-
-    // return FutureBuilder<FieldSuggestions>(
-    //   future: _fieldSuggestions,
-    //   builder: (context, snapshot) {
-    //     List<Widget>? suggestions;
-    //     if (!snapshot.hasData) {
-    //       suggestions = [
-    //         const SizedBox(width: 4),
-    //       ];
-    //     } else {
-    //       if (snapshot.data!.hasSuggestions) {
-    //         suggestions = [
-    //           const SizedBox(width: 4),
-    //           ..._buildSuggestionChips(
-    //             chipShape,
-    //             snapshot.data!,
-    //             context.watch<InboxCubit>().state,
-    //           ),
-    //         ];
-    //       }
-    //     }
+    if (actions.isEmpty) {
+      return const SizedBox.shrink();
+    }

    return Row(
      children: [
        Row(
          mainAxisSize: MainAxisSize.min,
          children: [
-            const Icon(Icons.bolt_outlined),
+            const Icon(Icons.auto_awesome),
            ConstrainedBox(
              constraints: const BoxConstraints(
                maxWidth: 50,
@@ -229,6 +216,7 @@ class _InboxItemState extends State<InboxItem> {
                setState(() {
                  _isAsnAssignLoading = true;
                });
+
                context.read<InboxCubit>().assignAsn(widget.document).whenComplete(
                      () => setState(() => _isAsnAssignLoading = false),
                    );
--- a/lib/features/inbox/view/widgets/inbox_list_loading_widget.dart
+++ b/lib/features/inbox/view/widgets/inbox_list_loading_widget.dart
@@ -3,7 +3,6 @@ import 'package:paperless_mobile/core/widgets/shimmer_placeholder.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/placeholder/tags_placeholder.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/placeholder/text_placeholder.dart';
-import 'package:paperless_mobile/features/inbox/view/widgets/inbox_item.dart';

 class InboxListLoadingWidget extends StatelessWidget {
  const InboxListLoadingWidget({super.key});
@@ -48,10 +47,10 @@ class InboxListLoadingWidget extends StatelessWidget {
                        ),
                      ),
                      const SizedBox(width: 8),
-                      Flexible(
+                      const Flexible(
                        child: Column(
                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: const [
+                          children: [
                            Spacer(),
                            TextPlaceholder(length: 200, fontSize: 14),
                            Spacer(),