feat:Update search

2025-12-09 10:08:00 -06:00 · 2023-05-18 18:23:47 +02:00
parent 062c46ccd3
commit c9a6bc64b8
21 changed files with 385 additions and 210 deletions
--- a/lib/features/documents/view/pages/documents_page.dart
+++ b/lib/features/documents/view/pages/documents_page.dart
@@ -333,10 +333,6 @@ class _DocumentsPageState extends State<DocumentsPage> with SingleTickerProvider
                  isLabelClickable: true,
                  isLoading: state.isLoading,
                  selectedDocumentIds: state.selectedIds,
-                  correspondents: state.correspondents,
-                  documentTypes: state.documentTypes,
-                  tags: state.tags,
-                  storagePaths: state.storagePaths,
                );
              },
            ),
--- a/lib/features/documents/view/widgets/adaptive_documents_view.dart
+++ b/lib/features/documents/view/widgets/adaptive_documents_view.dart
@@ -24,11 +24,6 @@ abstract class AdaptiveDocumentsView extends StatelessWidget {
  final void Function(int? id)? onDocumentTypeSelected;
  final void Function(int? id)? onStoragePathSelected;

-  final Map<int, Correspondent> correspondents;
-  final Map<int, DocumentType> documentTypes;
-  final Map<int, Tag> tags;
-  final Map<int, StoragePath> storagePaths;
-
  bool get showLoadingPlaceholder => !hasLoaded && isLoading;

  const AdaptiveDocumentsView({
@@ -47,10 +42,6 @@ abstract class AdaptiveDocumentsView extends StatelessWidget {
    required this.isLoading,
    required this.hasLoaded,
    this.enableHeroAnimation = true,
-    required this.correspondents,
-    required this.documentTypes,
-    required this.tags,
-    required this.storagePaths,
  });

  AdaptiveDocumentsView.fromPagedState(
@@ -67,10 +58,6 @@ abstract class AdaptiveDocumentsView extends StatelessWidget {
    required this.hasInternetConnection,
    this.viewType = ViewType.list,
    this.selectedDocumentIds = const [],
-    required this.correspondents,
-    required this.documentTypes,
-    required this.tags,
-    required this.storagePaths,
  })  : documents = state.documents,
        isLoading = state.isLoading,
        hasLoaded = state.hasLoaded;
@@ -93,10 +80,6 @@ class SliverAdaptiveDocumentsView extends AdaptiveDocumentsView {
    super.enableHeroAnimation,
    required super.isLoading,
    required super.hasLoaded,
-    required super.correspondents,
-    required super.documentTypes,
-    required super.tags,
-    required super.storagePaths,
  });

  @override
@@ -132,10 +115,6 @@ class SliverAdaptiveDocumentsView extends AdaptiveDocumentsView {
            onDocumentTypeSelected: onDocumentTypeSelected,
            onStoragePathSelected: onStoragePathSelected,
            enableHeroAnimation: enableHeroAnimation,
-            correspondents: correspondents,
-            documentTypes: documentTypes,
-            storagePaths: storagePaths,
-            tags: tags,
          );
        },
      ),
@@ -165,10 +144,6 @@ class SliverAdaptiveDocumentsView extends AdaptiveDocumentsView {
            onStoragePathSelected: onStoragePathSelected,
            enableHeroAnimation: enableHeroAnimation,
            highlights: document.searchHit?.highlights,
-            correspondents: correspondents,
-            documentTypes: documentTypes,
-            storagePaths: storagePaths,
-            tags: tags,
          );
        },
      ),
@@ -201,10 +176,6 @@ class SliverAdaptiveDocumentsView extends AdaptiveDocumentsView {
          onDocumentTypeSelected: onDocumentTypeSelected,
          onStoragePathSelected: onStoragePathSelected,
          enableHeroAnimation: enableHeroAnimation,
-          correspondents: correspondents,
-          documentTypes: documentTypes,
-          storagePaths: storagePaths,
-          tags: tags,
        );
      },
    );
@@ -230,10 +201,6 @@ class DefaultAdaptiveDocumentsView extends AdaptiveDocumentsView {
    super.selectedDocumentIds,
    super.viewType,
    super.enableHeroAnimation = true,
-    required super.correspondents,
-    required super.documentTypes,
-    required super.tags,
-    required super.storagePaths,
  });

  @override
@@ -272,10 +239,6 @@ class DefaultAdaptiveDocumentsView extends AdaptiveDocumentsView {
          onDocumentTypeSelected: onDocumentTypeSelected,
          onStoragePathSelected: onStoragePathSelected,
          enableHeroAnimation: enableHeroAnimation,
-          correspondents: correspondents,
-          documentTypes: documentTypes,
-          storagePaths: storagePaths,
-          tags: tags,
        );
      },
    );
@@ -306,10 +269,6 @@ class DefaultAdaptiveDocumentsView extends AdaptiveDocumentsView {
          onDocumentTypeSelected: onDocumentTypeSelected,
          onStoragePathSelected: onStoragePathSelected,
          enableHeroAnimation: enableHeroAnimation,
-          correspondents: correspondents,
-          documentTypes: documentTypes,
-          storagePaths: storagePaths,
-          tags: tags,
        );
      },
    );
@@ -344,10 +303,6 @@ class DefaultAdaptiveDocumentsView extends AdaptiveDocumentsView {
          onDocumentTypeSelected: onDocumentTypeSelected,
          onStoragePathSelected: onStoragePathSelected,
          enableHeroAnimation: enableHeroAnimation,
-          correspondents: correspondents,
-          documentTypes: documentTypes,
-          storagePaths: storagePaths,
-          tags: tags,
        );
      },
    );
--- a/lib/features/documents/view/widgets/items/document_detailed_item.dart
+++ b/lib/features/documents/view/widgets/items/document_detailed_item.dart
@@ -3,12 +3,14 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:intl/intl.dart';
+import 'package:paperless_mobile/core/repository/label_repository.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/document_preview.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/items/document_item.dart';
 import 'package:paperless_mobile/features/labels/correspondent/view/widgets/correspondent_widget.dart';
 import 'package:paperless_mobile/features/labels/document_type/view/widgets/document_type_widget.dart';
 import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_widget.dart';
+import 'package:provider/provider.dart';

 class DocumentDetailedItem extends DocumentItem {
  final String? highlights;
@@ -26,10 +28,6 @@ class DocumentDetailedItem extends DocumentItem {
    super.onStoragePathSelected,
    super.onTagSelected,
    super.onTap,
-    required super.tags,
-    required super.correspondents,
-    required super.documentTypes,
-    required super.storagePaths,
  });

  @override
@@ -116,7 +114,8 @@ class DocumentDetailedItem extends DocumentItem {
                  textStyle: Theme.of(context).textTheme.titleSmall?.apply(
                        color: Theme.of(context).colorScheme.onSurfaceVariant,
                      ),
-                  correspondent: correspondents[document.correspondent],
+                  correspondent:
+                      context.watch<LabelRepository>().state.correspondents[document.correspondent],
                ),
              ],
            ).paddedLTRB(8, 0, 8, 4),
@@ -131,13 +130,16 @@ class DocumentDetailedItem extends DocumentItem {
                  textStyle: Theme.of(context).textTheme.titleSmall?.apply(
                        color: Theme.of(context).colorScheme.onSurfaceVariant,
                      ),
-                  documentType: documentTypes[document.documentType],
+                  documentType:
+                      context.watch<LabelRepository>().state.documentTypes[document.documentType],
                ),
              ],
            ).paddedLTRB(8, 0, 8, 4),
            TagsWidget(
              isMultiLine: false,
-              tags: document.tags.map((e) => tags[e]!).toList(),
+              tags: document.tags
+                  .map((e) => context.watch<LabelRepository>().state.tags[e]!)
+                  .toList(),
            ).padded(),
            if (highlights != null)
              Html(
--- a/lib/features/documents/view/widgets/items/document_grid_item.dart
+++ b/lib/features/documents/view/widgets/items/document_grid_item.dart
@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:paperless_mobile/core/repository/label_repository.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/document_preview.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/items/document_item.dart';
 import 'package:paperless_mobile/features/labels/correspondent/view/widgets/correspondent_widget.dart';
 import 'package:paperless_mobile/features/labels/document_type/view/widgets/document_type_widget.dart';
 import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_widget.dart';
 import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';

 class DocumentGridItem extends DocumentItem {
  const DocumentGridItem({
@@ -20,10 +22,6 @@ class DocumentGridItem extends DocumentItem {
    super.onTagSelected,
    super.onTap,
    required super.enableHeroAnimation,
-    required super.tags,
-    required super.correspondents,
-    required super.documentTypes,
-    required super.storagePaths,
  });

  @override
@@ -32,9 +30,8 @@ class DocumentGridItem extends DocumentItem {
      padding: const EdgeInsets.all(8.0),
      child: Card(
        elevation: 1.0,
-        color: isSelected
-            ? Theme.of(context).colorScheme.inversePrimary
-            : Theme.of(context).cardColor,
+        color:
+            isSelected ? Theme.of(context).colorScheme.inversePrimary : Theme.of(context).cardColor,
        child: InkWell(
          borderRadius: BorderRadius.circular(12),
          onTap: _onTap,
@@ -57,10 +54,16 @@ class DocumentGridItem extends DocumentItem {
                    crossAxisAlignment: CrossAxisAlignment.start,
                    children: [
                      CorrespondentWidget(
-                        correspondent: correspondents[document.correspondent],
+                        correspondent: context
+                            .watch<LabelRepository>()
+                            .state
+                            .correspondents[document.correspondent],
                      ),
                      DocumentTypeWidget(
-                        documentType: documentTypes[document.documentType],
+                        documentType: context
+                            .watch<LabelRepository>()
+                            .state
+                            .documentTypes[document.documentType],
                      ),
                      Text(
                        document.title,
@@ -70,7 +73,9 @@ class DocumentGridItem extends DocumentItem {
                      ),
                      const Spacer(),
                      TagsWidget(
-                        tags: document.tags.map((e) => tags[e]!).toList(),
+                        tags: document.tags
+                            .map((e) => context.watch<LabelRepository>().state.tags[e]!)
+                            .toList(),
                        isMultiLine: false,
                        onTagSelected: onTagSelected,
                      ),
--- a/lib/features/documents/view/widgets/items/document_item.dart
+++ b/lib/features/documents/view/widgets/items/document_item.dart
@@ -10,11 +10,6 @@ abstract class DocumentItem extends StatelessWidget {
  final bool isLabelClickable;
  final bool enableHeroAnimation;

-  final Map<int, Tag> tags;
-  final Map<int, Correspondent> correspondents;
-  final Map<int, DocumentType> documentTypes;
-  final Map<int, StoragePath> storagePaths;
-
  final void Function(int tagId)? onTagSelected;
  final void Function(int? correspondentId)? onCorrespondentSelected;
  final void Function(int? documentTypeId)? onDocumentTypeSelected;
@@ -33,9 +28,5 @@ abstract class DocumentItem extends StatelessWidget {
    this.onDocumentTypeSelected,
    this.onStoragePathSelected,
    required this.enableHeroAnimation,
-    required this.tags,
-    required this.correspondents,
-    required this.documentTypes,
-    required this.storagePaths,
  });
 }
--- a/lib/features/documents/view/widgets/items/document_list_item.dart
+++ b/lib/features/documents/view/widgets/items/document_list_item.dart
@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
+import 'package:paperless_mobile/core/repository/label_repository.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/document_preview.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/items/document_item.dart';
 import 'package:paperless_mobile/features/labels/correspondent/view/widgets/correspondent_widget.dart';
 import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_widget.dart';
+import 'package:provider/provider.dart';

 class DocumentListItem extends DocumentItem {
  static const _a4AspectRatio = 1 / 1.4142;
@@ -21,14 +23,11 @@ class DocumentListItem extends DocumentItem {
    super.onTagSelected,
    super.onTap,
    super.enableHeroAnimation = true,
-    required super.tags,
-    required super.correspondents,
-    required super.documentTypes,
-    required super.storagePaths,
  });

  @override
  Widget build(BuildContext context) {
+    final labels = context.watch<LabelRepository>().state;
    return Material(
      child: ListTile(
        dense: true,
@@ -46,7 +45,10 @@ class DocumentListItem extends DocumentItem {
                  absorbing: isSelectionActive,
                  child: CorrespondentWidget(
                    isClickable: isLabelClickable,
-                    correspondent: correspondents[document.correspondent],
+                    correspondent: context
+                        .watch<LabelRepository>()
+                        .state
+                        .correspondents[document.correspondent],
                    onSelected: onCorrespondentSelected,
                  ),
                ),
@@ -62,8 +64,8 @@ class DocumentListItem extends DocumentItem {
              child: TagsWidget(
                isClickable: isLabelClickable,
                tags: document.tags
-                    .where((e) => tags.containsKey(e))
-                    .map((e) => tags[e]!)
+                    .where((e) => labels.tags.containsKey(e))
+                    .map((e) => labels.tags[e]!)
                    .toList(),
                isMultiLine: false,
                onTagSelected: (id) => onTagSelected?.call(id),
@@ -78,15 +80,12 @@ class DocumentListItem extends DocumentItem {
            overflow: TextOverflow.ellipsis,
            text: TextSpan(
              text: DateFormat.yMMMd().format(document.created),
-              style: Theme.of(context)
-                  .textTheme
-                  .labelSmall
-                  ?.apply(color: Colors.grey),
+              style: Theme.of(context).textTheme.labelSmall?.apply(color: Colors.grey),
              children: document.documentType != null
                  ? [
                      const TextSpan(text: '\u30FB'),
                      TextSpan(
-                        text: documentTypes[document.documentType]?.name,
+                        text: labels.documentTypes[document.documentType]?.name,
                      ),
                    ]
                  : null,