WIP - More decoupling of data layer from ui layer

lib/features/documents/view/pages/document_edit_page.dart

@@ -7,15 +7,15 @@ import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
 import 'package:intl/intl.dart';
 import 'package:paperless_api/paperless_api.dart';
+import 'package:paperless_mobile/core/repository/label_repository.dart';
 import 'package:paperless_mobile/di_initializer.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
-import 'package:paperless_mobile/features/labels/correspondent/view/pages/add_correspondent_page.dart';
-import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
-import 'package:paperless_mobile/features/labels/document_type/view/pages/add_document_type_page.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/bloc/label_cubit.dart';
+import 'package:paperless_mobile/features/labels/bloc/providers/labels_bloc_provider.dart';
 import 'package:paperless_mobile/features/labels/bloc/label_state.dart';
-import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
-import 'package:paperless_mobile/features/labels/storage_path/view/pages/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.dart';
@@ -57,147 +57,165 @@ class _DocumentEditPageState extends State<DocumentEditPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      resizeToAvoidBottomInset: false,
-      floatingActionButton: FloatingActionButton.extended(
-        onPressed: () async {
-          if (_formKey.currentState?.saveAndValidate() ?? false) {
-            final values = _formKey.currentState!.value;
-            var updatedDocument = widget.document.copyWith(
-              title: values[fkTitle],
-              created: values[fkCreatedDate],
-              overwriteDocumentType: true,
-              documentType: (values[fkDocumentType] as IdQueryParameter).id,
-              overwriteCorrespondent: true,
-              correspondent: (values[fkCorrespondent] as IdQueryParameter).id,
-              overwriteStoragePath: true,
-              storagePath: (values[fkStoragePath] as IdQueryParameter).id,
-              overwriteTags: true,
-              tags: (values[fkTags] as IdsTagsQuery).includedIds,
-            );
-            setState(() {
-              _isSubmitLoading = true;
-            });
-
-            try {
-              await widget.onEdit(updatedDocument);
-              showSnackBar(context, S.of(context).documentUpdateSuccessMessage);
-            } on PaperlessServerException catch (error, stackTrace) {
-              showErrorMessage(context, error, stackTrace);
-            } finally {
-              setState(() {
-                _isSubmitLoading = false;
-              });
-              Navigator.pop(context);
-            }
-          }
-        },
-        icon: const Icon(Icons.save),
-        label: Text(S.of(context).genericActionSaveLabel),
-      ),
-      appBar: AppBar(
-        title: Text(S.of(context).documentEditPageTitle),
-        bottom: _isSubmitLoading
-            ? const PreferredSize(
-                preferredSize: Size.fromHeight(4),
-                child: LinearProgressIndicator(),
-              )
-            : null,
-      ),
-      extendBody: true,
-      body: Padding(
-        padding: EdgeInsets.only(
-          bottom: MediaQuery.of(context).viewInsets.bottom,
-          top: 8,
-          left: 8,
-          right: 8,
+    return LabelsBlocProvider(
+      child: Scaffold(
+        resizeToAvoidBottomInset: false,
+        floatingActionButton: FloatingActionButton.extended(
+          onPressed: _onSubmit,
+          icon: const Icon(Icons.save),
+          label: Text(S.of(context).genericActionSaveLabel),
         ),
-        child: FormBuilder(
-          key: _formKey,
-          child: ListView(children: [
-            _buildTitleFormField().padded(),
-            _buildCreatedAtFormField().padded(),
-            BlocBuilder<DocumentTypeCubit, LabelState<DocumentType>>(
-              builder: (context, state) {
-                return LabelFormField<DocumentType, DocumentTypeQuery>(
-                  notAssignedSelectable: false,
-                  formBuilderState: _formKey.currentState,
-                  labelCreationWidgetBuilder: (currentInput) =>
-                      BlocProvider.value(
-                    value: BlocProvider.of<DocumentTypeCubit>(context),
-                    child: AddDocumentTypePage(
-                      initialName: currentInput,
-                    ),
-                  ),
-                  label: S.of(context).documentDocumentTypePropertyLabel,
-                  initialValue:
-                      DocumentTypeQuery.fromId(widget.document.documentType),
-                  state: state.labels,
-                  name: fkDocumentType,
-                  queryParameterIdBuilder: DocumentTypeQuery.fromId,
-                  queryParameterNotAssignedBuilder:
-                      DocumentTypeQuery.notAssigned,
-                  prefixIcon: const Icon(Icons.description_outlined),
-                );
-              },
-            ).padded(),
-            BlocBuilder<CorrespondentCubit, LabelState<Correspondent>>(
-              builder: (context, state) {
-                return LabelFormField<Correspondent, CorrespondentQuery>(
-                  notAssignedSelectable: false,
-                  formBuilderState: _formKey.currentState,
-                  labelCreationWidgetBuilder: (initialValue) =>
-                      BlocProvider.value(
-                    value: BlocProvider.of<CorrespondentCubit>(context),
-                    child: AddCorrespondentPage(initalValue: initialValue),
-                  ),
-                  label: S.of(context).documentCorrespondentPropertyLabel,
-                  state: state.labels,
-                  initialValue:
-                      CorrespondentQuery.fromId(widget.document.correspondent),
-                  name: fkCorrespondent,
-                  queryParameterIdBuilder: CorrespondentQuery.fromId,
-                  queryParameterNotAssignedBuilder:
-                      CorrespondentQuery.notAssigned,
-                  prefixIcon: const Icon(Icons.person_outlined),
-                );
-              },
-            ).padded(),
-            BlocBuilder<StoragePathCubit, LabelState<StoragePath>>(
-              builder: (context, state) {
-                return LabelFormField<StoragePath, StoragePathQuery>(
-                  notAssignedSelectable: false,
-                  formBuilderState: _formKey.currentState,
-                  labelCreationWidgetBuilder: (initialValue) =>
-                      BlocProvider.value(
-                    value: BlocProvider.of<StoragePathCubit>(context),
-                    child: AddStoragePathPage(initalValue: initialValue),
-                  ),
-                  label: S.of(context).documentStoragePathPropertyLabel,
-                  state: state.labels,
-                  initialValue:
-                      StoragePathQuery.fromId(widget.document.storagePath),
-                  name: fkStoragePath,
-                  queryParameterIdBuilder: StoragePathQuery.fromId,
-                  queryParameterNotAssignedBuilder:
-                      StoragePathQuery.notAssigned,
-                  prefixIcon: const Icon(Icons.folder_outlined),
-                );
-              },
-            ).padded(),
-            TagFormField(
-              initialValue: IdsTagsQuery.included(widget.document.tags),
-              notAssignedSelectable: false,
-              anyAssignedSelectable: false,
-              excludeAllowed: false,
-              name: fkTags,
-            ).padded(),
-          ]),
+        appBar: AppBar(
+          title: Text(S.of(context).documentEditPageTitle),
+          bottom: _isSubmitLoading
+              ? const PreferredSize(
+                  preferredSize: Size.fromHeight(4),
+                  child: LinearProgressIndicator(),
+                )
+              : null,
+        ),
+        extendBody: true,
+        body: Padding(
+          padding: EdgeInsets.only(
+            bottom: MediaQuery.of(context).viewInsets.bottom,
+            top: 8,
+            left: 8,
+            right: 8,
+          ),
+          child: FormBuilder(
+            key: _formKey,
+            child: ListView(children: [
+              _buildTitleFormField().padded(),
+              _buildCreatedAtFormField().padded(),
+              _buildDocumentTypeFormField().padded(),
+              _buildCorrespondentFormField().padded(),
+              _buildStoragePathFormField().padded(),
+              TagFormField(
+                initialValue: IdsTagsQuery.included(widget.document.tags),
+                notAssignedSelectable: false,
+                anyAssignedSelectable: false,
+                excludeAllowed: false,
+                name: fkTags,
+              ).padded(),
+            ]),
+          ),
         ),
       ),
     );
   }
 
+  BlocBuilder<LabelCubit<StoragePath>, LabelState<StoragePath>>
+      _buildStoragePathFormField() {
+    return BlocBuilder<LabelCubit<StoragePath>, LabelState<StoragePath>>(
+      builder: (context, state) {
+        return LabelFormField<StoragePath, StoragePathQuery>(
+          notAssignedSelectable: false,
+          formBuilderState: _formKey.currentState,
+          labelCreationWidgetBuilder: (initialValue) =>
+              RepositoryProvider.value(
+            value: RepositoryProvider.of<LabelRepository<StoragePath>>(context),
+            child: AddStoragePathPage(initalValue: initialValue),
+          ),
+          label: S.of(context).documentStoragePathPropertyLabel,
+          state: state.labels,
+          initialValue: StoragePathQuery.fromId(widget.document.storagePath),
+          name: fkStoragePath,
+          queryParameterIdBuilder: StoragePathQuery.fromId,
+          queryParameterNotAssignedBuilder: StoragePathQuery.notAssigned,
+          prefixIcon: const Icon(Icons.folder_outlined),
+        );
+      },
+    );
+  }
+
+  BlocBuilder<LabelCubit<Correspondent>, LabelState<Correspondent>>
+      _buildCorrespondentFormField() {
+    return BlocBuilder<LabelCubit<Correspondent>, LabelState<Correspondent>>(
+      builder: (context, state) {
+        return LabelFormField<Correspondent, CorrespondentQuery>(
+          notAssignedSelectable: false,
+          formBuilderState: _formKey.currentState,
+          labelCreationWidgetBuilder: (initialValue) =>
+              RepositoryProvider.value(
+            value: RepositoryProvider.of<LabelRepository<Correspondent>>(
+              context,
+            ),
+            child: AddCorrespondentPage(initialName: initialValue),
+          ),
+          label: S.of(context).documentCorrespondentPropertyLabel,
+          state: state.labels,
+          initialValue:
+              CorrespondentQuery.fromId(widget.document.correspondent),
+          name: fkCorrespondent,
+          queryParameterIdBuilder: CorrespondentQuery.fromId,
+          queryParameterNotAssignedBuilder: CorrespondentQuery.notAssigned,
+          prefixIcon: const Icon(Icons.person_outlined),
+        );
+      },
+    );
+  }
+
+  BlocBuilder<LabelCubit<DocumentType>, LabelState<DocumentType>>
+      _buildDocumentTypeFormField() {
+    return BlocBuilder<LabelCubit<DocumentType>, LabelState<DocumentType>>(
+      builder: (context, state) {
+        return LabelFormField<DocumentType, DocumentTypeQuery>(
+          notAssignedSelectable: false,
+          formBuilderState: _formKey.currentState,
+          labelCreationWidgetBuilder: (currentInput) =>
+              RepositoryProvider.value(
+            value: RepositoryProvider.of<LabelRepository<DocumentType>>(
+              context,
+            ),
+            child: AddDocumentTypePage(
+              initialName: currentInput,
+            ),
+          ),
+          label: S.of(context).documentDocumentTypePropertyLabel,
+          initialValue: DocumentTypeQuery.fromId(widget.document.documentType),
+          state: state.labels,
+          name: fkDocumentType,
+          queryParameterIdBuilder: DocumentTypeQuery.fromId,
+          queryParameterNotAssignedBuilder: DocumentTypeQuery.notAssigned,
+          prefixIcon: const Icon(Icons.description_outlined),
+        );
+      },
+    );
+  }
+
+  Future<void> _onSubmit() async {
+    if (_formKey.currentState?.saveAndValidate() ?? false) {
+      final values = _formKey.currentState!.value;
+      var updatedDocument = widget.document.copyWith(
+        title: values[fkTitle],
+        created: values[fkCreatedDate],
+        overwriteDocumentType: true,
+        documentType: (values[fkDocumentType] as IdQueryParameter).id,
+        overwriteCorrespondent: true,
+        correspondent: (values[fkCorrespondent] as IdQueryParameter).id,
+        overwriteStoragePath: true,
+        storagePath: (values[fkStoragePath] as IdQueryParameter).id,
+        overwriteTags: true,
+        tags: (values[fkTags] as IdsTagsQuery).includedIds,
+      );
+      setState(() {
+        _isSubmitLoading = true;
+      });
+
+      try {
+        await widget.onEdit(updatedDocument);
+        showSnackBar(context, S.of(context).documentUpdateSuccessMessage);
+      } on PaperlessServerException catch (error, stackTrace) {
+        showErrorMessage(context, error, stackTrace);
+      } finally {
+        setState(() {
+          _isSubmitLoading = false;
+        });
+        Navigator.pop(context);
+      }
+    }
+  }
+
   Widget _buildTitleFormField() {
     return FormBuilderTextField(
       name: fkTitle,

lib/features/documents/view/pages/documents_page.dart

@@ -3,11 +3,12 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/bloc/connectivity_cubit.dart';
+import 'package:paperless_mobile/core/repository/provider/label_repositories_provider.dart';
+import 'package:paperless_mobile/core/repository/saved_view_repository.dart';
 import 'package:paperless_mobile/di_initializer.dart';
 import 'package:paperless_mobile/features/document_details/bloc/document_details_cubit.dart';
 import 'package:paperless_mobile/features/document_details/view/pages/document_details_page.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/view/widgets/documents_empty_state.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/grid/document_grid.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/list/document_list.dart';
@@ -15,11 +16,10 @@ import 'package:paperless_mobile/features/documents/view/widgets/search/document
 import 'package:paperless_mobile/features/documents/view/widgets/selection/documents_page_app_bar.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/sort_documents_button.dart';
 import 'package:paperless_mobile/features/home/view/widget/info_drawer.dart';
-import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
-import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
-import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
-import 'package:paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
+import 'package:paperless_mobile/features/labels/bloc/providers/labels_bloc_provider.dart';
 import 'package:paperless_mobile/features/login/bloc/authentication_cubit.dart';
+import 'package:paperless_mobile/features/saved_view/cubit/saved_view_cubit.dart';
+import 'package:paperless_mobile/features/saved_view/cubit/saved_view_state.dart';
 import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
 import 'package:paperless_mobile/features/settings/model/application_settings_state.dart';
 import 'package:paperless_mobile/features/settings/model/view_type.dart';
@@ -132,9 +132,20 @@ class _DocumentsPageState extends State<DocumentsPage> {
               ),
               body: _buildBody(connectivityState),
               color: Theme.of(context).scaffoldBackgroundColor,
-              panelBuilder: (scrollController) => DocumentFilterPanel(
-                panelController: _filterPanelController,
-                scrollController: scrollController,
+              panelBuilder: (scrollController) =>
+                  BlocBuilder<DocumentsCubit, DocumentsState>(
+                builder: (context, state) {
+                  return LabelsBlocProvider(
+                    child: DocumentFilterPanel(
+                      panelController: _filterPanelController,
+                      scrollController: scrollController,
+                      initialFilter: state.filter,
+                      onFilterChanged: (filter) =>
+                          BlocProvider.of<DocumentsCubit>(context)
+                              .updateFilter(filter: filter),
+                    ),
+                  );
+                },
               ),
             ),
           );
@@ -192,21 +203,46 @@ class _DocumentsPageState extends State<DocumentsPage> {
               onRefresh: _onRefresh,
               child: CustomScrollView(
                 slivers: [
-                  DocumentsPageAppBar(
-                    actions: [
-                      const SortDocumentsButton(),
-                      IconButton(
-                        icon: Icon(
-                          settings.preferredViewType == ViewType.grid
-                              ? Icons.list
-                              : Icons.grid_view,
-                        ),
-                        onPressed: () =>
-                            BlocProvider.of<ApplicationSettingsCubit>(context)
-                                .setViewType(
-                                    settings.preferredViewType.toggle()),
+                  BlocProvider(
+                    create: (context) => SavedViewCubit(
+                        RepositoryProvider.of<SavedViewRepository>(context)),
+                    child: BlocListener<SavedViewCubit, SavedViewState>(
+                      listener: (context, state) {
+                        final documentsCubit =
+                            BlocProvider.of<DocumentsCubit>(context);
+                        try {
+                          if (state.selectedSavedViewId == null) {
+                            documentsCubit.updateFilter();
+                          } else {
+                            final newFilter = state
+                                .value[state.selectedSavedViewId]
+                                ?.toDocumentFilter();
+                            if (newFilter != null) {
+                              documentsCubit.updateFilter(filter: newFilter);
+                            }
+                          }
+                        } on PaperlessServerException catch (error, stackTrace) {
+                          showErrorMessage(context, error, stackTrace);
+                        }
+                      },
+                      child: DocumentsPageAppBar(
+                        actions: [
+                          const SortDocumentsButton(),
+                          IconButton(
+                            icon: Icon(
+                              settings.preferredViewType == ViewType.grid
+                                  ? Icons.list
+                                  : Icons.grid_view,
+                            ),
+                            onPressed: () =>
+                                BlocProvider.of<ApplicationSettingsCubit>(
+                                        context)
+                                    .setViewType(
+                                        settings.preferredViewType.toggle()),
+                          ),
+                        ],
                       ),
-                    ],
+                    ),
                   ),
                   child,
                   SliverToBoxAdapter(
@@ -233,29 +269,11 @@ class _DocumentsPageState extends State<DocumentsPage> {
   MaterialPageRoute<DocumentModel?> _buildDetailsPageRoute(
       DocumentModel document) {
     return MaterialPageRoute(
-      builder: (_) => MultiBlocProvider(
-        providers: [
-          BlocProvider.value(
-            value: BlocProvider.of<DocumentsCubit>(context),
-          ),
-          BlocProvider.value(
-            value: BlocProvider.of<CorrespondentCubit>(context),
-          ),
-          BlocProvider.value(
-            value: BlocProvider.of<DocumentTypeCubit>(context),
-          ),
-          BlocProvider.value(
-            value: BlocProvider.of<TagCubit>(context),
-          ),
-          BlocProvider.value(
-            value: BlocProvider.of<StoragePathCubit>(context),
-          ),
-          BlocProvider.value(
-            value:
-                DocumentDetailsCubit(getIt<PaperlessDocumentsApi>(), document),
-          ),
-        ],
-        child: const DocumentDetailsPage(),
+      builder: (_) => BlocProvider.value(
+        value: DocumentDetailsCubit(getIt<PaperlessDocumentsApi>(), document),
+        child: const LabelRepositoriesProvider(
+          child: DocumentDetailsPage(),
+        ),
       ),
     );
   }