Merge pull request #273 from astubenbord/feat/less-restrictive-label-inputs-and-document-edit-improvements

feat: Make label fields less restrictive, improve change detection in document edit page

lib/core/widgets/dialog_utils/unsaved_changes_warning_dialog.dart

@@ -9,14 +9,12 @@ class UnsavedChangesWarningDialog extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return AlertDialog(
-      title: Text("Discard changes?"),
+      title: Text(S.of(context)!.discardChanges),
-      content: Text(
+      content: Text(S.of(context)!.discardChangesWarning),
-        "You have unsaved changes. Do you want to continue without saving? Your changes will be discarded.",
-      ),
       actions: [
-        DialogCancelButton(),
+        const DialogCancelButton(),
         DialogConfirmButton(
-          label: S.of(context)!.continueLabel,
+          label: S.of(context)!.discard,
         ),
       ],
     );

lib/features/document_details/cubit/document_details_cubit.dart

@@ -44,7 +44,6 @@ class DocumentDetailsCubit extends Cubit<DocumentDetailsState> {
         ),
       ),
     );
-    loadMetaData();
   }
 
   Future<void> delete(DocumentModel document) async {
@@ -60,13 +59,10 @@ class DocumentDetailsCubit extends Cubit<DocumentDetailsState> {
   }
 
   Future<void> loadFullContent() async {
+    await Future.delayed(const Duration(seconds: 5));
     final doc = await _api.find(state.document.id);
-    emit(
+    _notifier.notifyUpdated(doc);
-      state.copyWith(
+    emit(state.copyWith(isFullContentLoaded: true));
-        isFullContentLoaded: true,
-        fullContent: doc.content,
-      ),
-    );
   }
 
   Future<void> assignAsn(

lib/features/document_details/cubit/document_details_state.dart

@@ -6,7 +6,6 @@ class DocumentDetailsState with _$DocumentDetailsState {
     required DocumentModel document,
     DocumentMetaData? metaData,
     @Default(false) bool isFullContentLoaded,
-    String? fullContent,
     @Default({}) Map<int, Correspondent> correspondents,
     @Default({}) Map<int, DocumentType> documentTypes,
     @Default({}) Map<int, Tag> tags,

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

@@ -239,7 +239,6 @@ class _DocumentDetailsPageState extends State<DocumentDetailsPage> {
                               DocumentContentWidget(
                                 isFullContentLoaded: state.isFullContentLoaded,
                                 document: state.document,
-                                fullContent: state.fullContent,
                                 queryString: widget.titleAndContentQueryString,
                               ),
                             ],
@@ -302,22 +301,16 @@ class _DocumentDetailsPageState extends State<DocumentDetailsPage> {
     if (!canEdit) {
       return const SizedBox.shrink();
     }
-    return BlocBuilder<DocumentDetailsCubit, DocumentDetailsState>(
+    final document = context.read<DocumentDetailsCubit>().state.document;
-      builder: (context, state) {
+    return Tooltip(
-        // final _filteredSuggestions =
+      message: S.of(context)!.editDocumentTooltip,
-        //     state.suggestions?.documentDifference(state.document);
+      preferBelow: false,
-
+      verticalOffset: 40,
-        return Tooltip(
+      child: FloatingActionButton(
-          message: S.of(context)!.editDocumentTooltip,
+        heroTag: "fab_document_details",
-          preferBelow: false,
+        child: const Icon(Icons.edit),
-          verticalOffset: 40,
+        onPressed: () => EditDocumentRoute(document).push(context),
-          child: FloatingActionButton(
+      ),
-            heroTag: "fab_document_details",
-            child: const Icon(Icons.edit),
-            onPressed: () => EditDocumentRoute(state.document).push(context),
-          ),
-        );
-      },
     );
   }
 

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

@@ -2,44 +2,50 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/widgets/highlighted_text.dart';
+import 'package:paperless_mobile/core/widgets/shimmer_placeholder.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/generated/l10n/app_localizations.dart';
 
 class DocumentContentWidget extends StatelessWidget {
   final bool isFullContentLoaded;
-  final String? fullContent;
   final String? queryString;
   final DocumentModel document;
   const DocumentContentWidget({
     super.key,
     required this.isFullContentLoaded,
-    this.fullContent,
     required this.document,
     this.queryString,
   });
 
   @override
   Widget build(BuildContext context) {
+    final screenWidth = MediaQuery.sizeOf(context).width;
     return SliverToBoxAdapter(
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           HighlightedText(
-            text: (isFullContentLoaded ? fullContent : document.content) ?? "",
+            text: document.content ?? '',
             highlights: queryString != null ? queryString!.split(" ") : [],
             style: Theme.of(context).textTheme.bodyMedium,
             caseSensitive: false,
           ),
-          if (!isFullContentLoaded && (document.content ?? '').isNotEmpty)
+          if (!isFullContentLoaded)
-            Align(
+            ShimmerPlaceholder(
-              alignment: Alignment.bottomCenter,
+              child: Column(
-              child: TextButton(
+                crossAxisAlignment: CrossAxisAlignment.start,
-                child: Text(S.of(context)!.loadFullContent),
+                children: [
-                onPressed: () {
+                  for (var scale in [0.5, 0.9, 0.5, 0.8, 0.9, 0.9])
-                  context.read<DocumentDetailsCubit>().loadFullContent();
+                    Container(
-                },
+                      margin: const EdgeInsets.symmetric(vertical: 4),
+                      width: screenWidth * scale,
+                      height: 14,
+                      color: Colors.white,
+                    ),
+                ],
               ),
-            ),
+            ).paddedOnly(top: 4),
         ],
       ),
     );

lib/features/document_edit/cubit/document_edit_cubit.dart

@@ -25,12 +25,19 @@ class DocumentEditCubit extends Cubit<DocumentEditState> {
     _notifier.addListener(this, onUpdated: replace);
     _labelRepository.addListener(
       this,
-      onChanged: (labels) => emit(state.copyWith(
+      onChanged: (labels) {
-        correspondents: labels.correspondents,
+        if (isClosed) {
-        documentTypes: labels.documentTypes,
+          return;
-        storagePaths: labels.storagePaths,
+        }
-        tags: labels.tags,
+        emit(
-      )),
+          state.copyWith(
+            correspondents: labels.correspondents,
+            documentTypes: labels.documentTypes,
+            storagePaths: labels.storagePaths,
+            tags: labels.tags,
+          ),
+        );
+      },
     );
   }
 

lib/features/document_edit/view/document_edit_page.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
@@ -8,18 +9,18 @@ import 'package:go_router/go_router.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/core/repository/label_repository.dart';
+import 'package:paperless_mobile/core/notifier/document_changed_notifier.dart';
+import 'package:paperless_mobile/core/widgets/dialog_utils/dialog_cancel_button.dart';
 import 'package:paperless_mobile/core/widgets/dialog_utils/pop_with_unsaved_changes.dart';
 import 'package:paperless_mobile/core/workarounds/colored_chip.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/features/document_edit/cubit/document_edit_cubit.dart';
-import 'package:paperless_mobile/features/edit_label/view/impl/add_correspondent_page.dart';
-import 'package:paperless_mobile/features/edit_label/view/impl/add_document_type_page.dart';
-import 'package:paperless_mobile/features/edit_label/view/impl/add_storage_path_page.dart';
 import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_form_field.dart';
 import 'package:paperless_mobile/features/labels/view/widgets/label_form_field.dart';
 import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
 import 'package:paperless_mobile/helpers/message_helpers.dart';
+import 'package:paperless_mobile/routes/typed/branches/labels_route.dart';
+import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart';
 
 class DocumentEditPage extends StatefulWidget {
   const DocumentEditPage({
@@ -39,18 +40,79 @@ class _DocumentEditPageState extends State<DocumentEditPage> {
   static const fkStoragePath = 'storagePath';
   static const fkContent = 'content';
 
-  final GlobalKey<FormBuilderState> _formKey = GlobalKey();
+  final _formKey = GlobalKey<FormBuilderState>();
+
+  @override
+  void didUpdateWidget(covariant DocumentEditPage oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    print("WIDGET CONFIGURATION CHANGED?!?!?");
+  }
 
   @override
   Widget build(BuildContext context) {
     final currentUser = context.watch<LocalUserAccount>().paperlessUser;
-    return PopWithUnsavedChanges(
+    return BlocConsumer<DocumentEditCubit, DocumentEditState>(
-      hasChangesPredicate: () => _formKey.currentState?.isDirty ?? false,
+      listenWhen: (previous, current) =>
-      child: BlocBuilder<DocumentEditCubit, DocumentEditState>(
+          previous.document.content != current.document.content,
-        builder: (context, state) {
+      listener: (context, state) {
-          final filteredSuggestions = state.suggestions?.documentDifference(
+        final contentField = _formKey.currentState?.fields[fkContent];
-              context.read<DocumentEditCubit>().state.document);
+        if (contentField == null) {
-          return DefaultTabController(
+          return;
+        }
+        if (contentField.isDirty) {
+          showDialog(
+            context: context,
+            builder: (context) => AlertDialog(
+              //TODO: INTL
+              title: Text("Content has changed!"),
+              content: Text(
+                "The content of this document has changed. This can happen if the full content was not yet loaded. By accepting the incoming changes, your changes will be overwritten and therefore lost! Do you want to discard your changes in favor of the full content?",
+              ),
+              actions: [
+                DialogCancelButton(),
+                ElevatedButton(
+                  onPressed: () {
+                    contentField.didChange(state.document.content);
+                    Navigator.of(context).pop();
+                  },
+                  child: Text(S.of(context)!.discard),
+                ),
+              ],
+            ),
+          );
+        } else {
+          contentField.didChange(state.document.content);
+        }
+      },
+      builder: (context, state) {
+        final filteredSuggestions = state.suggestions;
+        return PopWithUnsavedChanges(
+          hasChangesPredicate: () {
+            final fkState = _formKey.currentState;
+            if (fkState == null) {
+              return false;
+            }
+            final doc = state.document;
+            final (
+              title,
+              correspondent,
+              documentType,
+              storagePath,
+              tags,
+              createdAt,
+              content
+            ) = _currentValues;
+            final isContentTouched =
+                _formKey.currentState?.fields[fkContent]?.isDirty ?? false;
+            return doc.title != title ||
+                doc.correspondent != correspondent ||
+                doc.documentType != documentType ||
+                doc.storagePath != storagePath ||
+                !const UnorderedIterableEquality().equals(doc.tags, tags) ||
+                doc.created != createdAt ||
+                (doc.content != content && isContentTouched);
+          },
+          child: DefaultTabController(
             length: 2,
             child: Scaffold(
                 resizeToAvoidBottomInset: false,
@@ -95,13 +157,11 @@ class _DocumentEditPageState extends State<DocumentEditPage> {
                                   LabelFormField<Correspondent>(
                                     showAnyAssignedOption: false,
                                     showNotAssignedOption: false,
-                                    addLabelPageBuilder: (initialValue) =>
+                                    onAddLabel: (currentInput) =>
-                                        RepositoryProvider.value(
+                                        CreateLabelRoute(
-                                      value: context.read<LabelRepository>(),
+                                      LabelType.correspondent,
-                                      child: AddCorrespondentPage(
+                                      name: currentInput,
-                                        initialName: initialValue,
+                                    ).push<Correspondent>(context),
-                                      ),
-                                    ),
                                     addLabelText:
                                         S.of(context)!.addCorrespondent,
                                     labelText: S.of(context)!.correspondent,
@@ -121,26 +181,10 @@ class _DocumentEditPageState extends State<DocumentEditPage> {
                                     allowSelectUnassigned: true,
                                     canCreateNewLabel:
                                         currentUser.canCreateCorrespondents,
+                                    suggestions:
+                                        filteredSuggestions?.correspondents ??
+                                            [],
                                   ),
-                                  if (filteredSuggestions
-                                          ?.hasSuggestedCorrespondents ??
-                                      false)
-                                    _buildSuggestionsSkeleton<int>(
-                                      suggestions:
-                                          filteredSuggestions!.correspondents,
-                                      itemBuilder: (context, itemData) =>
-                                          ActionChip(
-                                        label: Text(state
-                                            .correspondents[itemData]!.name),
-                                        onPressed: () {
-                                          _formKey.currentState
-                                              ?.fields[fkCorrespondent]
-                                              ?.didChange(
-                                            SetIdQueryParameter(id: itemData),
-                                          );
-                                        },
-                                      ),
-                                    ),
                                 ],
                               ).padded(),
                             // DocumentType form field
@@ -150,13 +194,11 @@ class _DocumentEditPageState extends State<DocumentEditPage> {
                                   LabelFormField<DocumentType>(
                                     showAnyAssignedOption: false,
                                     showNotAssignedOption: false,
-                                    addLabelPageBuilder: (currentInput) =>
+                                    onAddLabel: (currentInput) =>
-                                        RepositoryProvider.value(
+                                        CreateLabelRoute(
-                                      value: context.read<LabelRepository>(),
+                                      LabelType.documentType,
-                                      child: AddDocumentTypePage(
+                                      name: currentInput,
-                                        initialName: currentInput,
+                                    ).push<DocumentType>(context),
-                                      ),
-                                    ),
                                     canCreateNewLabel:
                                         currentUser.canCreateDocumentTypes,
                                     addLabelText:
@@ -172,24 +214,10 @@ class _DocumentEditPageState extends State<DocumentEditPage> {
                                     prefixIcon:
                                         const Icon(Icons.description_outlined),
                                     allowSelectUnassigned: true,
+                                    suggestions:
+                                        filteredSuggestions?.documentTypes ??
+                                            [],
                                   ),
-                                  if (filteredSuggestions
-                                          ?.hasSuggestedDocumentTypes ??
-                                      false)
-                                    _buildSuggestionsSkeleton<int>(
-                                      suggestions:
-                                          filteredSuggestions!.documentTypes,
-                                      itemBuilder: (context, itemData) =>
-                                          ActionChip(
-                                        label: Text(state
-                                            .documentTypes[itemData]!.name),
-                                        onPressed: () => _formKey.currentState
-                                            ?.fields[fkDocumentType]
-                                            ?.didChange(
-                                          SetIdQueryParameter(id: itemData),
-                                        ),
-                                      ),
-                                    ),
                                 ],
                               ).padded(),
                             // StoragePath form field
@@ -199,12 +227,11 @@ class _DocumentEditPageState extends State<DocumentEditPage> {
                                   LabelFormField<StoragePath>(
                                     showAnyAssignedOption: false,
                                     showNotAssignedOption: false,
-                                    addLabelPageBuilder: (initialValue) =>
+                                    onAddLabel: (currentInput) =>
-                                        RepositoryProvider.value(
+                                        CreateLabelRoute(
-                                      value: context.read<LabelRepository>(),
+                                      LabelType.storagePath,
-                                      child: AddStoragePathPage(
+                                      name: currentInput,
-                                          initialName: initialValue),
+                                    ).push<StoragePath>(context),
-                                    ),
                                     canCreateNewLabel:
                                         currentUser.canCreateStoragePaths,
                                     addLabelText: S.of(context)!.addStoragePath,
@@ -230,6 +257,7 @@ class _DocumentEditPageState extends State<DocumentEditPage> {
                                 allowOnlySelection: true,
                                 allowCreation: true,
                                 allowExclude: false,
+                                suggestions: filteredSuggestions?.tags ?? [],
                                 initialValue: IdsTagsQuery(
                                   include: state.document.tags.toList(),
                                 ),
@@ -239,40 +267,7 @@ class _DocumentEditPageState extends State<DocumentEditPage> {
                                     .difference(state.document.tags.toSet())
                                     .isNotEmpty ??
                                 false)
-                              _buildSuggestionsSkeleton<int>(
+                              const SizedBox(height: 64),
-                                suggestions:
-                                    (filteredSuggestions?.tags.toSet() ?? {}),
-                                itemBuilder: (context, itemData) {
-                                  final tag = state.tags[itemData]!;
-                                  return ActionChip(
-                                    label: Text(
-                                      tag.name,
-                                      style: TextStyle(color: tag.textColor),
-                                    ),
-                                    backgroundColor: tag.color,
-                                    onPressed: () {
-                                      final currentTags = _formKey.currentState
-                                          ?.fields[fkTags]?.value as TagsQuery;
-                                      _formKey.currentState?.fields[fkTags]
-                                          ?.didChange(
-                                        switch (currentTags) {
-                                          IdsTagsQuery(
-                                            include: var i,
-                                            exclude: var e
-                                          ) =>
-                                            IdsTagsQuery(
-                                              include: [...i, itemData],
-                                              exclude: e,
-                                            ),
-                                          _ => IdsTagsQuery(include: [itemData])
-                                        },
-                                      );
-                                    },
-                                  );
-                                },
-                              ),
-                            // Prevent tags from being hidden by fab
-                            const SizedBox(height: 64),
                           ],
                         ),
                         SingleChildScrollView(
@@ -295,45 +290,104 @@ class _DocumentEditPageState extends State<DocumentEditPage> {
                     ),
                   ),
                 )),
-          );
+          ),
-        },
+        );
-      ),
+      },
+    );
+  }
+
+  bool _isFieldDirty(DocumentModel document) {
+    final fkState = _formKey.currentState;
+    if (fkState == null) {
+      return false;
+    }
+    fkState.save();
+    final (
+      title,
+      correspondent,
+      documentType,
+      storagePath,
+      tags,
+      createdAt,
+      content
+    ) = _currentValues;
+    return document.title != title ||
+        document.correspondent != correspondent ||
+        document.documentType != documentType ||
+        document.storagePath != storagePath ||
+        const UnorderedIterableEquality().equals(document.tags, tags) ||
+        document.created != createdAt ||
+        document.content != content;
+  }
+
+  (
+    String? title,
+    int? correspondent,
+    int? documentType,
+    int? storagePath,
+    List<int>? tags,
+    DateTime? createdAt,
+    String? content,
+  ) get _currentValues {
+    final fkState = _formKey.currentState!;
+
+    final correspondentParam =
+        fkState.getRawValue<IdQueryParameter?>(fkCorrespondent);
+    final documentTypeParam =
+        fkState.getRawValue<IdQueryParameter?>(fkDocumentType);
+    final storagePathParam =
+        fkState.getRawValue<IdQueryParameter?>(fkStoragePath);
+    final tagsParam = fkState.getRawValue<TagsQuery?>(fkTags);
+    final title = fkState.getRawValue<String?>(fkTitle);
+    final created = fkState.getRawValue<DateTime?>(fkCreatedDate);
+    final correspondent = switch (correspondentParam) {
+      SetIdQueryParameter(id: var id) => id,
+      _ => null,
+    };
+    final documentType = switch (documentTypeParam) {
+      SetIdQueryParameter(id: var id) => id,
+      _ => null,
+    };
+    final storagePath = switch (storagePathParam) {
+      SetIdQueryParameter(id: var id) => id,
+      _ => null,
+    };
+    final tags = switch (tagsParam) {
+      IdsTagsQuery(include: var i) => i,
+      _ => null,
+    };
+    final content = fkState.getRawValue<String?>(fkContent);
+
+    return (
+      title,
+      correspondent,
+      documentType,
+      storagePath,
+      tags,
+      created,
+      content
     );
   }
 
   Future<void> _onSubmit(DocumentModel document) async {
     if (_formKey.currentState?.saveAndValidate() ?? false) {
-      final values = _formKey.currentState!.value;
+      final (
-
+        title,
-      final correspondentParam = values[fkCorrespondent] as IdQueryParameter?;
+        correspondent,
-      final documentTypeParam = values[fkDocumentType] as IdQueryParameter?;
+        documentType,
-      final storagePathParam = values[fkStoragePath] as IdQueryParameter?;
+        storagePath,
-      final tagsParam = values[fkTags] as TagsQuery?;
+        tags,
-
+        createdAt,
-      final correspondent = switch (correspondentParam) {
+        content
-        SetIdQueryParameter(id: var id) => id,
+      ) = _currentValues;
-        _ => null,
-      };
-      final documentType = switch (documentTypeParam) {
-        SetIdQueryParameter(id: var id) => id,
-        _ => null,
-      };
-      final storagePath = switch (storagePathParam) {
-        SetIdQueryParameter(id: var id) => id,
-        _ => null,
-      };
-      final tags = switch (tagsParam) {
-        IdsTagsQuery(include: var i) => i,
-        _ => null,
-      };
       var mergedDocument = document.copyWith(
-        title: values[fkTitle],
+        title: title,
-        created: values[fkCreatedDate],
+        created: createdAt,
         correspondent: () => correspondent,
         documentType: () => documentType,
         storagePath: () => storagePath,
         tags: tags,
-        content: values[fkContent],
+        content: content,
       );
 
       try {

lib/features/document_upload/view/document_upload_preparation_page.dart

@@ -24,6 +24,8 @@ import 'package:paperless_mobile/features/labels/view/widgets/label_form_field.d
 import 'package:paperless_mobile/features/sharing/view/widgets/file_thumbnail.dart';
 import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
 import 'package:paperless_mobile/helpers/message_helpers.dart';
+import 'package:paperless_mobile/routes/typed/branches/labels_route.dart';
+import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart';
 import 'package:provider/provider.dart';
 
 class DocumentUploadResult {
@@ -251,19 +253,10 @@ class _DocumentUploadPreparationPageState
                               LabelFormField<Correspondent>(
                                 showAnyAssignedOption: false,
                                 showNotAssignedOption: false,
-                                addLabelPageBuilder: (initialName) =>
+                                onAddLabel: (initialName) => CreateLabelRoute(
-                                    MultiProvider(
+                                  LabelType.correspondent,
-                                  providers: [
+                                  name: initialName,
-                                    Provider.value(
+                                ).push<Correspondent>(context),
-                                      value: context.read<LabelRepository>(),
-                                    ),
-                                    Provider.value(
-                                      value: context.read<ApiVersion>(),
-                                    )
-                                  ],
-                                  child: AddCorrespondentPage(
-                                      initialName: initialName),
-                                ),
                                 addLabelText: S.of(context)!.addCorrespondent,
                                 labelText: S.of(context)!.correspondent + " *",
                                 name: DocumentModel.correspondentKey,
@@ -283,19 +276,10 @@ class _DocumentUploadPreparationPageState
                               LabelFormField<DocumentType>(
                                 showAnyAssignedOption: false,
                                 showNotAssignedOption: false,
-                                addLabelPageBuilder: (initialName) =>
+                                onAddLabel: (initialName) => CreateLabelRoute(
-                                    MultiProvider(
+                                  LabelType.documentType,
-                                  providers: [
+                                  name: initialName,
-                                    Provider.value(
+                                ).push<DocumentType>(context),
-                                      value: context.read<LabelRepository>(),
-                                    ),
-                                    Provider.value(
-                                      value: context.read<ApiVersion>(),
-                                    )
-                                  ],
-                                  child: AddDocumentTypePage(
-                                      initialName: initialName),
-                                ),
                                 addLabelText: S.of(context)!.addDocumentType,
                                 labelText: S.of(context)!.documentType + " *",
                                 name: DocumentModel.documentTypeKey,

lib/features/labels/tags/view/widgets/fullscreen_tags_form.dart

@@ -1,8 +1,11 @@
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/features/edit_label/view/impl/add_tag_page.dart';
 import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
+import 'package:paperless_mobile/routes/typed/branches/labels_route.dart';
+import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart';
 
 class FullscreenTagsForm extends StatefulWidget {
   final TagsQuery? initialValue;
@@ -46,7 +49,7 @@ class _FullscreenTagsFormState extends State<FullscreenTagsForm> {
     final value = widget.initialValue;
     if (value is IdsTagsQuery) {
       _include = value.include.toList();
-      _exclude = value.include.toList();
+      _exclude = value.exclude.toList();
     } else if (value is AnyAssignedTagsQuery) {
       _include = value.tagIds.toList();
       _anyAssigned = true;
@@ -116,16 +119,26 @@ class _FullscreenTagsFormState extends State<FullscreenTagsForm> {
             icon: const Icon(Icons.done),
             onPressed: () {
               if (widget.allowOnlySelection) {
-                widget.onSubmit(returnValue: IdsTagsQuery(include: _include));
+                widget.onSubmit(
+                  returnValue: IdsTagsQuery(
+                    include:
+                        _include.sortedBy((id) => widget.options[id]!.name),
+                  ),
+                );
                 return;
               }
               late final TagsQuery query;
               if (_notAssigned) {
                 query = const NotAssignedTagsQuery();
               } else if (_anyAssigned) {
-                query = AnyAssignedTagsQuery(tagIds: _include);
+                query = AnyAssignedTagsQuery(
+                  tagIds: _include.sortedBy((id) => widget.options[id]!.name),
+                );
               } else {
-                query = IdsTagsQuery(include: _include, exclude: _exclude);
+                query = IdsTagsQuery(
+                  include: _include.sortedBy((id) => widget.options[id]!.name),
+                  exclude: _exclude.sortedBy((id) => widget.options[id]!.name),
+                );
               }
               widget.onSubmit(returnValue: query);
             },
@@ -191,13 +204,9 @@ class _FullscreenTagsFormState extends State<FullscreenTagsForm> {
   }
 
   void _onAddTag() async {
-    final createdTag = await Navigator.of(context).push<Tag?>(
+    final createdTag =
-      MaterialPageRoute(
+        await CreateLabelRoute(LabelType.tag, name: _textEditingController.text)
-        builder: (context) => AddTagPage(
+            .push<Tag>(context);
-          initialName: _textEditingController.text,
-        ),
-      ),
-    );
     _textEditingController.clear();
     if (createdTag != null) {
       setState(() {
@@ -308,21 +317,21 @@ class SelectableTagWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final includeColor = Colors.green.withOpacity(0.3);
+    final excludeColor = Colors.red.withOpacity(0.3);
     return ListTile(
       title: Text(tag.name),
-      trailing: excluded
+      trailing: Text(S.of(context)!.documentsAssigned(tag.documentCount ?? 0)),
-          ? const Icon(Icons.close)
-          : (selected ? const Icon(Icons.done) : null),
       leading: CircleAvatar(
         backgroundColor: tag.color,
-        child: (tag.isInboxTag)
+        child: tag.isInboxTag ? Icon(Icons.inbox, color: tag.textColor) : null,
-            ? Icon(
-                Icons.inbox,
-                color: tag.textColor,
-              )
-            : null,
       ),
       onTap: onTap,
+      tileColor: excluded
+          ? excludeColor
+          : selected
+              ? includeColor
+              : null,
     );
   }
 }

lib/features/labels/tags/view/widgets/tags_form_field.dart

@@ -6,6 +6,7 @@ import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/database/tables/local_user_account.dart';
 import 'package:paperless_mobile/core/workarounds/colored_chip.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/features/labels/tags/view/widgets/fullscreen_tags_form.dart';
 import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
 
@@ -16,6 +17,7 @@ class TagsFormField extends StatelessWidget {
   final bool allowOnlySelection;
   final bool allowCreation;
   final bool allowExclude;
+  final Iterable<int> suggestions;
 
   const TagsFormField({
     super.key,
@@ -25,63 +27,120 @@ class TagsFormField extends StatelessWidget {
     required this.allowOnlySelection,
     required this.allowCreation,
     required this.allowExclude,
+    this.suggestions = const [],
   });
 
   @override
   Widget build(BuildContext context) {
+    final enabled = options.values.isNotEmpty || allowCreation;
+
     return FormBuilderField<TagsQuery?>(
       initialValue: initialValue,
+      enabled: enabled,
       builder: (field) {
         final values = _generateOptions(context, field.value, field).toList();
         final isEmpty = (field.value is IdsTagsQuery &&
                 (field.value as IdsTagsQuery).include.isEmpty) ||
             field.value == null;
         bool anyAssigned = field.value is AnyAssignedTagsQuery;
-        return OpenContainer<TagsQuery>(
+
-          middleColor: Theme.of(context).colorScheme.background,
+        final displayedSuggestions = switch (field.value) {
-          closedColor: Theme.of(context).colorScheme.background,
+          IdsTagsQuery(include: var include) =>
-          openColor: Theme.of(context).colorScheme.background,
+            suggestions.toSet().difference(include.toSet()).toList(),
-          closedShape: InputBorder.none,
+          _ => <int>[],
-          openElevation: 0,
+        };
-          closedElevation: 0,
+        return Column(
-          closedBuilder: (context, openForm) => Container(
+          children: [
-              margin: const EdgeInsets.only(top: 6),
+            OpenContainer<TagsQuery>(
-              child: GestureDetector(
+              middleColor: Theme.of(context).colorScheme.background,
-                onTap: openForm,
+              closedColor: Theme.of(context).colorScheme.background,
-                child: InputDecorator(
+              openColor: Theme.of(context).colorScheme.background,
-                  isEmpty: isEmpty,
+              closedShape: InputBorder.none,
-                  decoration: InputDecoration(
+              openElevation: 0,
-                    contentPadding: const EdgeInsets.all(12),
+              closedElevation: 0,
-                    labelText:
+              tappable: enabled,
-                        '${S.of(context)!.tags}${anyAssigned ? ' (${S.of(context)!.anyAssigned})' : ''}',
+              closedBuilder: (context, openForm) => Container(
-                    prefixIcon: const Icon(Icons.label_outline),
+                margin: const EdgeInsets.only(top: 6),
-                  ),
+                child: GestureDetector(
-                  child: SizedBox(
+                  onTap: openForm,
-                    height: 32,
+                  child: InputDecorator(
-                    child: ListView.separated(
+                    isEmpty: isEmpty,
-                      scrollDirection: Axis.horizontal,
+                    decoration: InputDecoration(
-                      separatorBuilder: (context, index) =>
+                      contentPadding: const EdgeInsets.all(12),
-                          const SizedBox(width: 4),
+                      labelText:
-                      itemBuilder: (context, index) => values[index],
+                          '${S.of(context)!.tags}${anyAssigned ? ' (${S.of(context)!.anyAssigned})' : ''}',
-                      itemCount: values.length,
+                      prefixIcon: const Icon(Icons.label_outline),
+                      enabled: enabled,
+                    ),
+                    child: SizedBox(
+                      height: 32,
+                      child: ListView.separated(
+                        scrollDirection: Axis.horizontal,
+                        separatorBuilder: (context, index) =>
+                            const SizedBox(width: 4),
+                        itemBuilder: (context, index) => values[index],
+                        itemCount: values.length,
+                      ),
                     ),
                   ),
                 ),
-              )),
+              ),
-          openBuilder: (context, closeForm) => FullscreenTagsForm(
+              openBuilder: (context, closeForm) => FullscreenTagsForm(
-            options: options,
+                options: options,
-            onSubmit: closeForm,
+                onSubmit: closeForm,
-            initialValue: field.value,
+                initialValue: field.value,
-            allowOnlySelection: allowOnlySelection,
+                allowOnlySelection: allowOnlySelection,
-            allowCreation: allowCreation &&
+                allowCreation: allowCreation &&
-                context.watch<LocalUserAccount>().paperlessUser.canCreateTags,
+                    context
-            allowExclude: allowExclude,
+                        .watch<LocalUserAccount>()
-          ),
+                        .paperlessUser
-          onClosed: (data) {
+                        .canCreateTags,
-            if (data != null) {
+                allowExclude: allowExclude,
-              field.didChange(data);
+              ),
-            }
+              onClosed: (data) {
-          },
+                if (data != null) {
+                  field.didChange(data);
+                }
+              },
+            ),
+            if (displayedSuggestions.isNotEmpty)
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    S.of(context)!.suggestions,
+                    style: Theme.of(context).textTheme.bodySmall,
+                  ),
+                  SizedBox(
+                    height: kMinInteractiveDimension,
+                    child: ListView.separated(
+                      scrollDirection: Axis.horizontal,
+                      itemCount: displayedSuggestions.length,
+                      itemBuilder: (context, index) {
+                        final suggestion =
+                            options[displayedSuggestions.elementAt(index)]!;
+                        return ColoredChipWrapper(
+                          child: ActionChip(
+                            label: Text(suggestion.name),
+                            onPressed: () {
+                              field.didChange(switch (field.value) {
+                                IdsTagsQuery(include: var include) =>
+                                  IdsTagsQuery(
+                                    include: [...include, suggestion.id!],
+                                  ),
+                                _ => IdsTagsQuery(include: [suggestion.id!]),
+                              });
+                            },
+                          ),
+                        );
+                      },
+                      separatorBuilder: (BuildContext context, int index) =>
+                          const SizedBox(width: 4.0),
+                    ),
+                  ),
+                ],
+              ).padded(),
+          ],
         );
       },
       name: name,

lib/features/labels/view/widgets/fullscreen_label_form.dart

@@ -5,7 +5,8 @@ import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
 
 class FullscreenLabelForm<T extends Label> extends StatefulWidget {
-  final IdQueryParameter? initialValue;
+  /// If null, this will resolve to [UnsetIdQueryParameter].
+  final IdQueryParameter initialValue;
 
   final Map<int, T> options;
   final Future<T?> Function(String? initialName)? onCreateNewLabel;
@@ -20,7 +21,7 @@ class FullscreenLabelForm<T extends Label> extends StatefulWidget {
 
   FullscreenLabelForm({
     super.key,
-    this.initialValue,
+    this.initialValue = const UnsetIdQueryParameter(),
     required this.options,
     required this.onCreateNewLabel,
     this.showNotAssignedOption = true,
@@ -31,12 +32,8 @@ class FullscreenLabelForm<T extends Label> extends StatefulWidget {
     this.autofocus = true,
     this.allowSelectUnassigned = true,
     required this.canCreateNewLabel,
-  })  : assert(
+  })  : assert(!(initialValue.isOnlyAssigned) || showAnyAssignedOption),
-          !(initialValue?.isOnlyAssigned ?? false) || showAnyAssignedOption,
+        assert(!(initialValue.isOnlyNotAssigned) || showNotAssignedOption),
-        ),
-        assert(
-          !(initialValue?.isOnlyNotAssigned ?? false) || showNotAssignedOption,
-        ),
         assert((addNewLabelText != null) == (onCreateNewLabel != null));
 
   @override
@@ -52,9 +49,9 @@ class _FullscreenLabelFormState<T extends Label>
   @override
   void initState() {
     super.initState();
-    _textEditingController.addListener(() => setState(() {
+    _textEditingController.addListener(() {
-          _showClearIcon = _textEditingController.text.isNotEmpty;
+      setState(() => _showClearIcon = _textEditingController.text.isNotEmpty);
-        }));
+    });
     if (widget.autofocus) {
       WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
         //Delay keyboard popup to ensure open animation is finished before.
@@ -130,36 +127,42 @@ class _FullscreenLabelFormState<T extends Label>
               child: const Icon(Icons.add),
             )
           : null,
-      body: Builder(
+      body: Builder(builder: (context) {
-        builder: (context) {
+        return Column(
-          return Column(
+          children: [
-            children: [
+            Expanded(
-              Expanded(
+              child: ListView.builder(
-                child: ListView.builder(
+                padding: EdgeInsets.zero,
-                  padding: EdgeInsets.zero,
+                shrinkWrap: true,
-                  shrinkWrap: true,
+                itemCount: options.length,
-                  itemCount: options.length,
+                itemBuilder: (BuildContext context, int index) {
-                  itemBuilder: (BuildContext context, int index) {
+                  final option = options.elementAt(index);
-                    final option = options.elementAt(index);
+                  final shouldHighlight = switch (option) {
-                    final highlight =
+                    NotAssignedIdQueryParameter() => true,
-                        AutocompleteHighlightedOption.of(context) == index;
+                    AnyAssignedIdQueryParameter() => true,
-                    if (highlight) {
+                    SetIdQueryParameter(id: var id) =>
-                      SchedulerBinding.instance
+                      (widget.options[id]?.documentCount ?? 0) > 0,
-                          .addPostFrameCallback((Duration timeStamp) {
+                    _ => false,
-                        Scrollable.ensureVisible(
+                  };
-                          context,
+                  final highlight =
-                          alignment: 0,
+                      AutocompleteHighlightedOption.of(context) == index;
-                        );
+                  if (highlight && shouldHighlight) {
-                      });
+                    SchedulerBinding.instance
-                    }
+                        .addPostFrameCallback((Duration timeStamp) {
-                    return _buildOptionWidget(option, highlight);
+                      Scrollable.ensureVisible(
-                  },
+                        context,
-                ),
+                        alignment: 0,
+                      );
+                    });
+                  }
+                  return _buildOptionWidget(
+                      option, highlight && shouldHighlight);
+                },
               ),
-            ],
+            ),
-          );
+          ],
-        },
+        );
-      ),
+      }),
     );
   }
 
@@ -179,8 +182,12 @@ class _FullscreenLabelFormState<T extends Label>
   Iterable<IdQueryParameter> _filterOptionsByQuery(String query) sync* {
     final normalizedQuery = query.trim().toLowerCase();
     if (normalizedQuery.isEmpty) {
-      if (widget.initialValue == null) {
+      if ((widget.initialValue.isUnset)) {
-        // If nothing is selected yet, show all options first.
+        if (widget.options.isEmpty) {
+          yield const UnsetIdQueryParameter();
+          return;
+        }
+        // If nothing is selected yet (==> UnsetIdQueryParameter), show all options first.
         for (final option in widget.options.values) {
           yield SetIdQueryParameter(id: option.id!);
         }
@@ -243,12 +250,17 @@ class _FullscreenLabelFormState<T extends Label>
       AnyAssignedIdQueryParameter() => S.of(context)!.anyAssigned,
       SetIdQueryParameter(id: var id) =>
         widget.options[id]?.name ?? S.of(context)!.startTyping,
-      _ => null,
     };
   }
 
   Widget _buildOptionWidget(IdQueryParameter option, bool highlight) {
     void onTap() => widget.onSubmit(returnValue: option);
+    final hasNoAssignedDocumentsTextStyle = Theme.of(context)
+        .textTheme
+        .labelMedium
+        ?.apply(color: Theme.of(context).disabledColor);
+    final hasAssignedDocumentsTextStyle =
+        Theme.of(context).textTheme.labelMedium;
 
     return switch (option) {
       NotAssignedIdQueryParameter() => ListTile(
@@ -266,11 +278,20 @@ class _FullscreenLabelFormState<T extends Label>
       SetIdQueryParameter(id: var id) => ListTile(
           selected: highlight,
           selectedTileColor: Theme.of(context).focusColor,
-          title: Text(widget.options[id]!.name),
+          title: Text(
+            widget.options[id]!.name,
+            maxLines: 2,
+            overflow: TextOverflow.ellipsis,
+          ),
           onTap: onTap,
-          enabled: widget.allowSelectUnassigned
+          trailing: Text(
-              ? true
+            S
-              : widget.options[id]!.documentCount != 0,
+                .of(context)!
+                .documentsAssigned(widget.options[id]!.documentCount ?? 0),
+            style: (widget.options[id]!.documentCount ?? 0) > 0
+                ? hasAssignedDocumentsTextStyle
+                : hasNoAssignedDocumentsTextStyle,
+          ),
         ),
       UnsetIdQueryParameter() => Center(
           child: Column(

lib/features/labels/view/widgets/label_form_field.dart

@@ -19,11 +19,11 @@ class LabelFormField<T extends Label> extends StatelessWidget {
   final String name;
   final String labelText;
   final FormFieldValidator? validator;
-  final Widget Function(String? initialName)? addLabelPageBuilder;
+  final Future<T?> Function(String? initialName)? onAddLabel;
   final void Function(IdQueryParameter?)? onChanged;
   final bool showNotAssignedOption;
   final bool showAnyAssignedOption;
-  final List<T> suggestions;
+  final Iterable<int> suggestions;
   final String? addLabelText;
   final bool allowSelectUnassigned;
   final bool canCreateNewLabel;
@@ -36,7 +36,7 @@ class LabelFormField<T extends Label> extends StatelessWidget {
     required this.prefixIcon,
     this.initialValue,
     this.validator,
-    this.addLabelPageBuilder,
+    this.onAddLabel,
     this.onChanged,
     this.showNotAssignedOption = true,
     this.showAnyAssignedOption = true,
@@ -58,21 +58,21 @@ class LabelFormField<T extends Label> extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final isEnabled = options.values.any((e) => (e.documentCount ?? 0) > 0) ||
+    final enabled = options.values.isNotEmpty || onAddLabel != null;
-        addLabelPageBuilder != null;
+
     return FormBuilderField<IdQueryParameter>(
       name: name,
       initialValue: initialValue,
       onChanged: onChanged,
-      enabled: isEnabled,
+      enabled: enabled,
       builder: (field) {
         final controller = TextEditingController(
           text: _buildText(context, field.value),
         );
         final displayedSuggestions = suggestions
             .whereNot(
-              (e) =>
+              (id) =>
-                  e.id ==
+                  id ==
                   switch (field.value) {
                     SetIdQueryParameter(id: var id) => id,
                     _ => -1,
@@ -89,13 +89,14 @@ class LabelFormField<T extends Label> extends StatelessWidget {
               closedShape: InputBorder.none,
               openElevation: 0,
               closedElevation: 0,
+              tappable: enabled,
               closedBuilder: (context, openForm) => Container(
                 margin: const EdgeInsets.only(top: 6),
                 child: TextField(
                   controller: controller,
                   onTap: openForm,
                   readOnly: true,
-                  enabled: isEnabled,
+                  enabled: enabled,
                   decoration: InputDecoration(
                     prefixIcon: prefixIcon,
                     labelText: labelText,
@@ -114,19 +115,10 @@ class LabelFormField<T extends Label> extends StatelessWidget {
                 canCreateNewLabel: canCreateNewLabel,
                 addNewLabelText: addLabelText,
                 leadingIcon: prefixIcon,
-                onCreateNewLabel: addLabelPageBuilder != null
+                onCreateNewLabel: onAddLabel,
-                    ? (initialName) {
-                        return Navigator.of(context).push<T>(
-                          MaterialPageRoute(
-                            builder: (context) =>
-                                addLabelPageBuilder!(initialName),
-                          ),
-                        );
-                      }
-                    : null,
                 options: options,
                 onSubmit: closeForm,
-                initialValue: field.value,
+                initialValue: field.value ?? const UnsetIdQueryParameter(),
                 showAnyAssignedOption: showAnyAssignedOption,
                 showNotAssignedOption: showNotAssignedOption,
               ),
@@ -151,7 +143,8 @@ class LabelFormField<T extends Label> extends StatelessWidget {
                       itemCount: displayedSuggestions.length,
                       itemBuilder: (context, index) {
                         final suggestion =
-                            displayedSuggestions.elementAt(index);
+                            options[displayedSuggestions.elementAt(index)]!;
+
                         return ColoredChipWrapper(
                           child: ActionChip(
                             label: Text(suggestion.name),

lib/l10n/intl_ca.arb

@@ -996,5 +996,13 @@
   "restoringSession": "Restoring session...",
   "@restoringSession": {
     "description": "Message shown when the user opens the app and the previous user is tried to be authenticated and logged in"
+  },
+  "documentsAssigned": "{count, plural, zero{No documents} one{1 document} other{{count} documents}}",
+  "@documentsAssigned": {
+    "description": "Text shown with a correspondent, document type etc. to indicate the number of documents this filter will maximally yield."
+  },
+  "discardChangesWarning": "You have unsaved changes. By continuing, all changes will be lost. Do you want to discard these changes?",
+  "@discardChangesWarning": {
+    "description": "Warning message shown when the user tries to close a route without saving the changes."
   }
 }

lib/l10n/intl_cs.arb

@@ -996,5 +996,13 @@
   "restoringSession": "Restoring session...",
   "@restoringSession": {
     "description": "Message shown when the user opens the app and the previous user is tried to be authenticated and logged in"
+  },
+  "documentsAssigned": "{count, plural, zero{No documents} one{1 document} other{{count} documents}}",
+  "@documentsAssigned": {
+    "description": "Text shown with a correspondent, document type etc. to indicate the number of documents this filter will maximally yield."
+  },
+  "discardChangesWarning": "You have unsaved changes. By continuing, all changes will be lost. Do you want to discard these changes?",
+  "@discardChangesWarning": {
+    "description": "Warning message shown when the user tries to close a route without saving the changes."
   }
 }

lib/l10n/intl_de.arb

@@ -996,5 +996,13 @@
   "restoringSession": "Sitzung wird wiederhergestellt...",
   "@restoringSession": {
     "description": "Message shown when the user opens the app and the previous user is tried to be authenticated and logged in"
+  },
+  "documentsAssigned": "{count, plural, zero{Keine Dokumente} one{1 Dokument} other{{count} Dokumente}}",
+  "@documentsAssigned": {
+    "description": "Text shown with a correspondent, document type etc. to indicate the number of documents this filter will maximally yield."
+  },
+  "discardChangesWarning": "Du hast ungespeicherte Änderungen. Diese gehen verloren, falls du fortfährst. Möchtest du die Änderungen verwerfen?",
+  "@discardChangesWarning": {
+    "description": "Warning message shown when the user tries to close a route without saving the changes."
   }
 }

lib/l10n/intl_en.arb

@@ -348,49 +348,49 @@
   "@after": {},
   "before": "Before",
   "@before": {},
-  "days": "{count, plural, one{day} other{days}}",
+  "days": "{count, plural, zero{days} one{day} other{days}}",
   "@days": {
     "placeholders": {
       "count": {}
     }
   },
-  "lastNDays": "{count, plural, one{Yesterday} other{Last {count} days}}",
+  "lastNDays": "{count, plural, zero{} one{Yesterday} other{Last {count} days}}",
   "@lastNDays": {
     "placeholders": {
       "count": {}
     }
   },
-  "lastNMonths": "{count, plural, one{Last month} other{Last {count} months}}",
+  "lastNMonths": "{count, plural, zero{} one{Last month} other{Last {count} months}}",
   "@lastNMonths": {
     "placeholders": {
       "count": {}
     }
   },
-  "lastNWeeks": "{count, plural, one{Last week} other{Last {count} weeks}}",
+  "lastNWeeks": "{count, plural, zero{} one{Last week} other{Last {count} weeks}}",
   "@lastNWeeks": {
     "placeholders": {
       "count": {}
     }
   },
-  "lastNYears": "{count, plural, one{Last year} other{Last {count} years}}",
+  "lastNYears": "{count, plural, zero{} one{Last year} other{Last {count} years}}",
   "@lastNYears": {
     "placeholders": {
       "count": {}
     }
   },
-  "months": "{count, plural, one{month} other{months}}",
+  "months": "{count, plural, zero{} one{month} other{months}}",
   "@months": {
     "placeholders": {
       "count": {}
     }
   },
-  "weeks": "{count, plural, one{week} other{weeks}}",
+  "weeks": "{count, plural, zero{} one{week} other{weeks}}",
   "@weeks": {
     "placeholders": {
       "count": {}
     }
   },
-  "years": "{count, plural, one{year} other{years}}",
+  "years": "{count, plural, zero{} one{year} other{years}}",
   "@years": {
     "placeholders": {
       "count": {}
@@ -588,7 +588,7 @@
   "@createsASavedViewBasedOnTheCurrentFilterCriteria": {},
   "createViewsToQuicklyFilterYourDocuments": "Create views to quickly filter your documents.",
   "@createViewsToQuicklyFilterYourDocuments": {},
-  "nFiltersSet": "{count, plural, one{{count} filter set} other{{count} filters set}}",
+  "nFiltersSet": "{count, plural, zero{{count} filters set} one{{count} filter set} other{{count} filters set}}",
   "@nFiltersSet": {
     "placeholders": {
       "count": {}
@@ -996,5 +996,13 @@
   "restoringSession": "Restoring session...",
   "@restoringSession": {
     "description": "Message shown when the user opens the app and the previous user is tried to be authenticated and logged in"
+  },
+  "documentsAssigned": "{count, plural, zero{No documents} one{1 document} other{{count} documents}}",
+  "@documentsAssigned": {
+    "description": "Text shown with a correspondent, document type etc. to indicate the number of documents this filter will maximally yield."
+  },
+  "discardChangesWarning": "You have unsaved changes. By continuing, all changes will be lost. Do you want to discard these changes?",
+  "@discardChangesWarning": {
+    "description": "Warning message shown when the user tries to close a route without saving the changes."
   }
 }

lib/l10n/intl_es.arb

@@ -865,7 +865,7 @@
   "@missingPermissions": {
     "description": "Message shown in a snackbar when a user without the reequired permissions performs an action."
   },
-  "editView": "Edit View",
+  "editView": "Editar Vista",
   "@editView": {
     "description": "Title of the edit saved view page"
   },
@@ -873,128 +873,136 @@
   "@donate": {
     "description": "Label of the in-app donate button"
   },
-  "donationDialogContent": "Thank you for considering to support this app! Due to both Google's and Apple's Payment Policies, no links leading to donations may be displayed in-app. Not even linking to the project's repository page appears to be allowed in this context. Therefore, maybe have a look at the 'Donations' section in the project's README. Your support is much appreciated and keeps the development of this app alive. Thanks!",
+  "donationDialogContent": "¡Gracias por querer apoyar esta aplicación!\nDebido a las políticas de pago, tanto de Google como de Apple, no se puede mostrar ningún enlace que lo dirija a las donaciones. En este contexto, ni siquiera es posible enlazar la página del repositorio del proyecto. Por lo tanto, puedes visitar la sección \"Donations\" en el archivo README de este proyecto. Tu apoyo es valorado gratamente y ayuda a mantener con vida el desarrollo de esta aplicación.\n¡Muchas gracias!",
   "@donationDialogContent": {
     "description": "Text displayed in the donation dialog"
   },
-  "noDocumentsFound": "No documents found.",
+  "noDocumentsFound": "No se han encontrado documentos.",
   "@noDocumentsFound": {
     "description": "Message shown when no documents were found."
   },
-  "couldNotDeleteCorrespondent": "Could not delete correspondent, please try again.",
+  "couldNotDeleteCorrespondent": "No se pudo remover el interlocutor, intente nuevamente.",
   "@couldNotDeleteCorrespondent": {
     "description": "Message shown in snackbar when a correspondent could not be deleted."
   },
-  "couldNotDeleteDocumentType": "Could not delete document type, please try again.",
+  "couldNotDeleteDocumentType": "No se pudo remover el tipo de documento, intente nuevamente.",
   "@couldNotDeleteDocumentType": {
     "description": "Message shown when a document type could not be deleted"
   },
-  "couldNotDeleteTag": "Could not delete tag, please try again.",
+  "couldNotDeleteTag": "No se pudo borrar la etiqueta, intente nuevamente.",
   "@couldNotDeleteTag": {
     "description": "Message shown when a tag could not be deleted"
   },
-  "couldNotDeleteStoragePath": "Could not delete storage path, please try again.",
+  "couldNotDeleteStoragePath": "No se pudo remover la ruta de almacenamiento, intente nuevamente.",
   "@couldNotDeleteStoragePath": {
     "description": "Message shown when a storage path could not be deleted"
   },
-  "couldNotUpdateCorrespondent": "Could not update correspondent, please try again.",
+  "couldNotUpdateCorrespondent": "No se pudo actualizar el interlocutor, intente nuevamente.",
   "@couldNotUpdateCorrespondent": {
     "description": "Message shown when a correspondent could not be updated"
   },
-  "couldNotUpdateDocumentType": "Could not update document type, please try again.",
+  "couldNotUpdateDocumentType": "No se pudo actualizar el tipo de documento, intente nuevamente.",
   "@couldNotUpdateDocumentType": {
     "description": "Message shown when a document type could not be updated"
   },
-  "couldNotUpdateTag": "Could not update tag, please try again.",
+  "couldNotUpdateTag": "No se pudo actualizar la etiqueta, intente nuevamente.",
   "@couldNotUpdateTag": {
     "description": "Message shown when a tag could not be updated"
   },
-  "couldNotLoadServerInformation": "Could not load server information.",
+  "couldNotLoadServerInformation": "No se pudo cargar la información del servidor.",
   "@couldNotLoadServerInformation": {
     "description": "Message shown when the server information could not be loaded"
   },
-  "couldNotLoadStatistics": "Could not load server statistics.",
+  "couldNotLoadStatistics": "No se pudieron cargar las estadísticas del servidor.",
   "@couldNotLoadStatistics": {
     "description": "Message shown when the server statistics could not be loaded"
   },
-  "couldNotLoadUISettings": "Could not load UI settings.",
+  "couldNotLoadUISettings": "No se pudieron cargar los ajustes de UI.",
   "@couldNotLoadUISettings": {
     "description": "Message shown when the UI settings could not be loaded"
   },
-  "couldNotLoadTasks": "Could not load tasks.",
+  "couldNotLoadTasks": "No se pudieron cargar tareas.",
   "@couldNotLoadTasks": {
     "description": "Message shown when the tasks (e.g. document consumed) could not be loaded"
   },
-  "userNotFound": "User could not be found.",
+  "userNotFound": "Usuario no encontrado.",
   "@userNotFound": {
     "description": "Message shown when the specified user (e.g. by id) could not be found"
   },
-  "couldNotUpdateSavedView": "Could not update saved view, please try again.",
+  "couldNotUpdateSavedView": "No se pudo actualizar la vista guardada, intente nuevamente.",
   "@couldNotUpdateSavedView": {
     "description": "Message shown when a saved view could not be updated"
   },
-  "couldNotUpdateStoragePath": "Could not update storage path, please try again.",
+  "couldNotUpdateStoragePath": "No se pudo actualizar la ruta de almacenamiento, intente nuevamente.",
-  "savedViewSuccessfullyUpdated": "Saved view successfully updated.",
+  "savedViewSuccessfullyUpdated": "La vista guardada se actualizó correctamente.",
   "@savedViewSuccessfullyUpdated": {
     "description": "Message shown when a saved view was successfully updated."
   },
-  "discardChanges": "Discard changes?",
+  "discardChanges": "¿Descartar cambios?",
   "@discardChanges": {
     "description": "Title of the alert dialog shown when a user tries to close a view with unsaved changes."
   },
-  "savedViewChangedDialogContent": "The filter conditions of the active view have changed. By resetting the filter, these changes will be lost. Do you still wish to continue?",
+  "savedViewChangedDialogContent": "Han cambiado las condiciones de filtrado de la vista activa. Al reiniciar el filtro se perderán estos cambios. ¿Desea continuar?",
   "@savedViewChangedDialogContent": {
     "description": "Content of the alert dialog shown when all of the following applies:\r\n* User has saved view selected\r\n* User has performed changes to the current document filter\r\n* User now tries to reset this filter without having saved the changes to the view."
   },
-  "createFromCurrentFilter": "Create from current filter",
+  "createFromCurrentFilter": "Crear desde el filtro actual",
   "@createFromCurrentFilter": {
     "description": "Tooltip of the \"New saved view\" button"
   },
-  "home": "Home",
+  "home": "Inicio",
   "@home": {
     "description": "Label of the \"Home\" route"
   },
-  "welcomeUser": "Welcome, {name}!",
+  "welcomeUser": "¡Bienvenido, {name}!",
   "@welcomeUser": {
     "description": "Top message shown on the home page"
   },
-  "noSavedViewOnHomepageHint": "Configure a saved view to be displayed on your home page and it will show up here.",
+  "noSavedViewOnHomepageHint": "Configure una vista guardada para que sea mostrada en su página de inicio y aparecerá aquí.",
   "@noSavedViewOnHomepageHint": {
     "description": "Message shown when there is no saved view to display on the home page."
   },
-  "statistics": "Statistics",
+  "statistics": "Estadísticas",
-  "documentsInInbox": "Documents in inbox",
+  "documentsInInbox": "Documentos en el buzón",
-  "totalDocuments": "Total documents",
+  "totalDocuments": "Total de documentos",
-  "totalCharacters": "Total characters",
+  "totalCharacters": "Total de caracteres",
-  "showAll": "Show all",
+  "showAll": "Mostrar todo",
   "@showAll": {
     "description": "Button label shown on a saved view preview to open this view in the documents page"
   },
-  "userAlreadyExists": "This user already exists.",
+  "userAlreadyExists": "Este usuario ya existe.",
   "@userAlreadyExists": {
     "description": "Error message shown when the user tries to add an already existing account."
   },
-  "youDidNotSaveAnyViewsYet": "You did not save any views yet, create one and it will be shown here.",
+  "youDidNotSaveAnyViewsYet": "Aún no guardaste ninguna vista, crea una y aparecerá aquí.",
   "@youDidNotSaveAnyViewsYet": {
     "description": "Message shown when there are no saved views yet."
   },
-  "tryAgain": "Try again",
+  "tryAgain": "Intente nuevamente",
-  "discardFile": "Discard file?",
+  "discardFile": "¿Descartar archivo?",
-  "discard": "Discard",
+  "discard": "Descartar",
-  "backToLogin": "Back to login",
+  "backToLogin": "Volver al inicio de sesión",
-  "skipEditingReceivedFiles": "Skip editing received files",
+  "skipEditingReceivedFiles": "Omitir edición de archivos recibidos",
-  "uploadWithoutPromptingUploadForm": "Always upload without prompting the upload form when sharing files with the app.",
+  "uploadWithoutPromptingUploadForm": "Subir automáticamente sin mostrar el formulario de subida al compartir archivos con la app.",
-  "authenticatingDots": "Authenticating...",
+  "authenticatingDots": "Autenticando...",
   "@authenticatingDots": {
     "description": "Message shown when the app is authenticating the user"
   },
-  "persistingUserInformation": "Persisting user information...",
+  "persistingUserInformation": "Manteniendo información del usuario...",
-  "fetchingUserInformation": "Fetching user information...",
+  "fetchingUserInformation": "Obteniendo información del usuario...",
   "@fetchingUserInformation": {
     "description": "Message shown when the app loads user data from the server"
   },
-  "restoringSession": "Restoring session...",
+  "restoringSession": "Restaurando sesión...",
   "@restoringSession": {
     "description": "Message shown when the user opens the app and the previous user is tried to be authenticated and logged in"
+  },
+  "documentsAssigned": "{count, plural, zero{No documents} one{1 document} other{{count} documents}}",
+  "@documentsAssigned": {
+    "description": "Text shown with a correspondent, document type etc. to indicate the number of documents this filter will maximally yield."
+  },
+  "discardChangesWarning": "You have unsaved changes. By continuing, all changes will be lost. Do you want to discard these changes?",
+  "@discardChangesWarning": {
+    "description": "Warning message shown when the user tries to close a route without saving the changes."
   }
 }

lib/l10n/intl_fr.arb

@@ -996,5 +996,13 @@
   "restoringSession": "Restoring session...",
   "@restoringSession": {
     "description": "Message shown when the user opens the app and the previous user is tried to be authenticated and logged in"
+  },
+  "documentsAssigned": "{count, plural, zero{No documents} one{1 document} other{{count} documents}}",
+  "@documentsAssigned": {
+    "description": "Text shown with a correspondent, document type etc. to indicate the number of documents this filter will maximally yield."
+  },
+  "discardChangesWarning": "You have unsaved changes. By continuing, all changes will be lost. Do you want to discard these changes?",
+  "@discardChangesWarning": {
+    "description": "Warning message shown when the user tries to close a route without saving the changes."
   }
 }

lib/l10n/intl_pl.arb

@@ -996,5 +996,13 @@
   "restoringSession": "Restoring session...",
   "@restoringSession": {
     "description": "Message shown when the user opens the app and the previous user is tried to be authenticated and logged in"
+  },
+  "documentsAssigned": "{count, plural, zero{No documents} one{1 document} other{{count} documents}}",
+  "@documentsAssigned": {
+    "description": "Text shown with a correspondent, document type etc. to indicate the number of documents this filter will maximally yield."
+  },
+  "discardChangesWarning": "You have unsaved changes. By continuing, all changes will be lost. Do you want to discard these changes?",
+  "@discardChangesWarning": {
+    "description": "Warning message shown when the user tries to close a route without saving the changes."
   }
 }

lib/l10n/intl_ru.arb

@@ -996,5 +996,13 @@
   "restoringSession": "Restoring session...",
   "@restoringSession": {
     "description": "Message shown when the user opens the app and the previous user is tried to be authenticated and logged in"
+  },
+  "documentsAssigned": "{count, plural, zero{No documents} one{1 document} other{{count} documents}}",
+  "@documentsAssigned": {
+    "description": "Text shown with a correspondent, document type etc. to indicate the number of documents this filter will maximally yield."
+  },
+  "discardChangesWarning": "You have unsaved changes. By continuing, all changes will be lost. Do you want to discard these changes?",
+  "@discardChangesWarning": {
+    "description": "Warning message shown when the user tries to close a route without saving the changes."
   }
 }

lib/l10n/intl_tr.arb

@@ -996,5 +996,13 @@
   "restoringSession": "Restoring session...",
   "@restoringSession": {
     "description": "Message shown when the user opens the app and the previous user is tried to be authenticated and logged in"
+  },
+  "documentsAssigned": "{count, plural, zero{No documents} one{1 document} other{{count} documents}}",
+  "@documentsAssigned": {
+    "description": "Text shown with a correspondent, document type etc. to indicate the number of documents this filter will maximally yield."
+  },
+  "discardChangesWarning": "You have unsaved changes. By continuing, all changes will be lost. Do you want to discard these changes?",
+  "@discardChangesWarning": {
+    "description": "Warning message shown when the user tries to close a route without saving the changes."
   }
 }

lib/routes/typed/branches/documents_route.dart

@@ -52,7 +52,9 @@ class DocumentDetailsRoute extends GoRouteData {
         context.read(),
         context.read(),
         initialDocument: $extra,
-      ),
+      )
+        ..loadFullContent()
+        ..loadMetaData(),
       lazy: false,
       child: DocumentDetailsPage(
         isLabelClickable: isLabelClickable,

packages/paperless_api/lib/src/models/field_suggestions.dart

@@ -1,3 +1,4 @@
+import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:paperless_api/src/converters/local_date_time_json_converter.dart';
 import 'package:paperless_api/src/models/document_model.dart';
@@ -6,7 +7,7 @@ part 'field_suggestions.g.dart';
 
 @LocalDateTimeJsonConverter()
 @JsonSerializable(fieldRename: FieldRename.snake)
-class FieldSuggestions {
+class FieldSuggestions with EquatableMixin {
   final int? documentId;
   final Iterable<int> correspondents;
   final Iterable<int> tags;
@@ -95,4 +96,13 @@ class FieldSuggestions {
       _$FieldSuggestionsFromJson(json);
 
   Map<String, dynamic> toJson() => _$FieldSuggestionsToJson(this);
+
+  @override
+  List<Object?> get props => [
+        documentId,
+        correspondents,
+        tags,
+        documentTypes,
+        dates,
+      ];
 }

packages/paperless_api/lib/src/models/labels/label_model.dart

@@ -203,7 +203,7 @@ class StoragePath extends Label {
   const StoragePath({
     super.id,
     required super.name,
-    required this.path,
+    this.path = '',
     super.slug,
     super.match,
     super.matchingAlgorithm,

scripts/update_translations.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 echo "Updating source language..."
-crowdin download sources --identity=../crowdin_credentials.yml --config ../crowdin.yml --no-preserve-hierarchy
+crowdin download sources --identity=../crowdin_credentials.yml --config ../crowdin.yml --preserve-hierarchy
 echo "Updating translations..."
-crowdin download --identity=../crowdin_credentials.yml --config ../crowdin.yml
+crowdin download --identity=../crowdin_credentials.yml --config ../crowdin.yml
+pushd ..
+flutter gen-l10n
+popd