More work on inbox, refactorings (bloc separation of concerns), fixed saved views wrong sort order

2025-12-09 12:08:05 -06:00 · 2022-11-29 01:09:36 +01:00
parent 5edbdabf26
commit 50190f035e
43 changed files with 605 additions and 463 deletions
--- a/lib/features/documents/view/widgets/documents_empty_state.dart
+++ b/lib/features/documents/view/widgets/documents_empty_state.dart
@@ -4,8 +4,8 @@ import 'package:paperless_mobile/core/widgets/empty_state.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
 import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/saved_view/bloc/saved_view_cubit.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:paperless_mobile/util.dart';

@@ -23,7 +23,7 @@ class DocumentsEmptyState extends StatelessWidget {
        title: S.of(context).documentsPageEmptyStateOopsText,
        subtitle: S.of(context).documentsPageEmptyStateNothingHereText,
        bottomChild: state.filter != DocumentFilter.initial
-            ? ElevatedButton(
+            ? TextButton(
                onPressed: () async {
                  await BlocProvider.of<DocumentsCubit>(context).updateFilter();
                  BlocProvider.of<SavedViewCubit>(context).resetSelection();
--- a/lib/features/documents/view/widgets/grid/document_grid.dart
+++ b/lib/features/documents/view/widgets/grid/document_grid.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:paperless_mobile/core/widgets/documents_list_loading_widget.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
 import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/grid/document_grid_item.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';

@@ -11,6 +12,7 @@ class DocumentGridView extends StatelessWidget {
  final PagingController<int, DocumentModel> pagingController;
  final DocumentsState state;
  final bool hasInternetConnection;
+  final void Function(int tagId) onTagSelected;

  const DocumentGridView({
    super.key,
@@ -19,6 +21,7 @@ class DocumentGridView extends StatelessWidget {
    required this.state,
    required this.onSelected,
    required this.hasInternetConnection,
+    required this.onTagSelected,
  });
  @override
  Widget build(BuildContext context) {
@@ -38,6 +41,14 @@ class DocumentGridView extends StatelessWidget {
            isSelected: state.selection.contains(item),
            onSelected: onSelected,
            isAtLeastOneSelected: state.selection.isNotEmpty,
+            isTagSelectedPredicate: (int tagId) {
+              return state.filter.tags is IdsTagsQuery
+                  ? (state.filter.tags as IdsTagsQuery)
+                      .includedIds
+                      .contains(tagId)
+                  : false;
+            },
+            onTagSelected: onTagSelected,
          );
        },
        noItemsFoundIndicatorBuilder: (context) =>
--- a/lib/features/documents/view/widgets/grid/document_grid_item.dart
+++ b/lib/features/documents/view/widgets/grid/document_grid_item.dart
@@ -12,6 +12,8 @@ class DocumentGridItem extends StatelessWidget {
  final void Function(DocumentModel) onTap;
  final void Function(DocumentModel) onSelected;
  final bool isAtLeastOneSelected;
+  final bool Function(int tagId) isTagSelectedPredicate;
+  final void Function(int tagId) onTagSelected;

  const DocumentGridItem({
    Key? key,
@@ -20,6 +22,8 @@ class DocumentGridItem extends StatelessWidget {
    required this.onSelected,
    required this.isSelected,
    required this.isAtLeastOneSelected,
+    required this.isTagSelectedPredicate,
+    required this.onTagSelected,
  }) : super(key: key);

  @override
@@ -65,6 +69,8 @@ class DocumentGridItem extends StatelessWidget {
                        TagsWidget(
                          tagIds: document.tags,
                          isMultiLine: false,
+                          isSelectedPredicate: isTagSelectedPredicate,
+                          onTagSelected: onTagSelected,
                        ),
                        const Spacer(),
                        Text(
--- a/lib/features/documents/view/widgets/list/document_list.dart
+++ b/lib/features/documents/view/widgets/list/document_list.dart
@@ -3,8 +3,10 @@ import 'package:paperless_mobile/core/widgets/documents_list_loading_widget.dart
 import 'package:paperless_mobile/core/widgets/offline_widget.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
 import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/list/document_list_item.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
+import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';

 class DocumentListView extends StatelessWidget {
  final void Function(DocumentModel) onTap;
@@ -14,6 +16,8 @@ class DocumentListView extends StatelessWidget {
  final DocumentsState state;
  final bool hasInternetConnection;
  final bool isLabelClickable;
+  final void Function(int tagId) onTagSelected;
+
  const DocumentListView({
    super.key,
    required this.onTap,
@@ -22,6 +26,7 @@ class DocumentListView extends StatelessWidget {
    required this.onSelected,
    required this.hasInternetConnection,
    this.isLabelClickable = true,
+    required this.onTagSelected,
  });

  @override
@@ -38,6 +43,14 @@ class DocumentListView extends StatelessWidget {
            isSelected: state.selection.contains(document),
            onSelected: onSelected,
            isAtLeastOneSelected: state.selection.isNotEmpty,
+            isTagSelectedPredicate: (int tagId) {
+              return state.filter.tags is IdsTagsQuery
+                  ? (state.filter.tags as IdsTagsQuery)
+                      .includedIds
+                      .contains(tagId)
+                  : false;
+            },
+            onTagSelected: onTagSelected,
          );
        },
        noItemsFoundIndicatorBuilder: (context) => hasInternetConnection
--- a/lib/features/documents/view/widgets/list/document_list_item.dart
+++ b/lib/features/documents/view/widgets/list/document_list_item.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:paperless_mobile/features/documents/model/document.model.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/document_preview.dart';
 import 'package:paperless_mobile/features/labels/correspondent/view/widgets/correspondent_widget.dart';
+import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';
 import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_widget.dart';

 class DocumentListItem extends StatelessWidget {
@@ -12,6 +13,9 @@ class DocumentListItem extends StatelessWidget {
  final bool isSelected;
  final bool isAtLeastOneSelected;
  final bool isLabelClickable;
+  final bool Function(int tagId) isTagSelectedPredicate;
+
+  final void Function(int tagId) onTagSelected;

  const DocumentListItem({
    Key? key,
@@ -21,6 +25,8 @@ class DocumentListItem extends StatelessWidget {
    required this.isSelected,
    required this.isAtLeastOneSelected,
    this.isLabelClickable = true,
+    required this.isTagSelectedPredicate,
+    required this.onTagSelected,
  }) : super(key: key);

  @override
@@ -62,6 +68,8 @@ class DocumentListItem extends StatelessWidget {
              isClickable: isLabelClickable,
              tagIds: document.tags,
              isMultiLine: false,
+              isSelectedPredicate: isTagSelectedPredicate,
+              onTagSelected: onTagSelected,
            ),
          ),
        ),
--- a/lib/features/documents/view/widgets/search/document_filter_panel.dart
+++ b/lib/features/documents/view/widgets/search/document_filter_panel.dart
@@ -5,7 +5,6 @@ import 'package:paperless_mobile/core/model/error_message.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
 import 'package:paperless_mobile/features/documents/model/document.model.dart';
 import 'package:paperless_mobile/features/documents/model/document_filter.dart';
 import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
@@ -23,6 +22,7 @@ import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_
 import 'package:paperless_mobile/features/labels/storage_path/model/storage_path.model.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/features/saved_view/bloc/saved_view_cubit.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:intl/intl.dart';
 import 'package:paperless_mobile/util.dart';
--- a/lib/features/documents/view/widgets/selection/confirm_delete_saved_view_dialog.dart
+++ b/lib/features/documents/view/widgets/selection/confirm_delete_saved_view_dialog.dart
@@ -1,10 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:paperless_mobile/core/model/error_message.dart';
-import 'package:paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
 import 'package:paperless_mobile/features/documents/model/saved_view.model.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
-import 'package:paperless_mobile/util.dart';

 class ConfirmDeleteSavedViewDialog extends StatelessWidget {
  const ConfirmDeleteSavedViewDialog({
--- a/lib/features/documents/view/widgets/selection/saved_view_selection_widget.dart
+++ b/lib/features/documents/view/widgets/selection/saved_view_selection_widget.dart
@@ -3,11 +3,11 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:paperless_mobile/core/model/error_message.dart';
 import 'package:paperless_mobile/di_initializer.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
-import 'package:paperless_mobile/features/documents/bloc/saved_view_state.dart';
 import 'package:paperless_mobile/features/documents/model/saved_view.model.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/selection/add_saved_view_page.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/selection/confirm_delete_saved_view_dialog.dart';
+import 'package:paperless_mobile/features/saved_view/bloc/saved_view_cubit.dart';
+import 'package:paperless_mobile/features/saved_view/bloc/saved_view_state.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:paperless_mobile/util.dart';