Started removing tight coupling

lib/features/labels/bloc/global_state_bloc_provider.dart

@@ -7,9 +7,14 @@ import 'package:paperless_mobile/features/labels/document_type/bloc/document_typ
 import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
 import 'package:paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
 
-class LabelBlocProvider extends StatelessWidget {
+class GlobalStateBlocProvider extends StatelessWidget {
+  final List<BlocProvider> additionalProviders;
   final Widget child;
-  const LabelBlocProvider({super.key, required this.child});
+  const GlobalStateBlocProvider({
+    super.key,
+    this.additionalProviders = const [],
+    required this.child,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -20,6 +25,7 @@ class LabelBlocProvider extends StatelessWidget {
         BlocProvider.value(value: getIt<TagCubit>()),
         BlocProvider.value(value: getIt<StoragePathCubit>()),
         BlocProvider.value(value: getIt<SavedViewCubit>()),
+        ...additionalProviders,
       ],
       child: child,
     );

lib/features/labels/tags/view/pages/edit_tag_page.dart

@@ -24,7 +24,7 @@ class EditTagPage extends StatelessWidget {
       label: tag,
       onSubmit: (tag) async {
         await BlocProvider.of<TagCubit>(context).replace(tag);
-        //If inbox property was added/removed from tag, the number of documetns in inbox may increase/decrease.
+        //If inbox property was added/removed from tag, the number of documents in inbox may increase/decrease.
         BlocProvider.of<PaperlessStatisticsCubit>(context).updateStatistics();
       },
       onDelete: (tag) => _onDelete(tag, context),

lib/features/labels/view/pages/labels_page.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:paperless_mobile/core/bloc/paperless_statistics_cubit.dart';
-import 'package:paperless_mobile/features/labels/bloc/label_bloc_provider.dart';
+import 'package:paperless_mobile/features/labels/bloc/global_state_bloc_provider.dart';
 import 'package:paperless_mobile/di_initializer.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
 import 'package:paperless_mobile/features/documents/model/document_filter.dart';
@@ -54,135 +54,130 @@ class _LabelsPageState extends State<LabelsPage>
 
   @override
   Widget build(BuildContext context) {
-    return BlocProvider.value(
-      value: getIt<DocumentsCubit>(),
-      child: DefaultTabController(
-        length: 3,
-        child: Scaffold(
-          drawer: const InfoDrawer(),
-          appBar: AppBar(
-            title: Text(
-              [
-                S.of(context).labelsPageCorrespondentsTitleText,
-                S.of(context).labelsPageDocumentTypesTitleText,
-                S.of(context).labelsPageTagsTitleText,
-                S.of(context).labelsPageStoragePathTitleText
-              ][_currentIndex],
-            ),
-            actions: [
-              IconButton(
-                onPressed: _onAddPressed,
-                icon: const Icon(Icons.add),
-              )
-            ],
-            bottom: PreferredSize(
-              preferredSize: const Size.fromHeight(kToolbarHeight),
-              child: ColoredBox(
-                color: Theme.of(context).bottomAppBarColor,
-                child: TabBar(
-                  indicatorColor: Theme.of(context).colorScheme.primary,
-                  controller: _tabController,
-                  tabs: [
-                    Tab(
-                      icon: Icon(
-                        Icons.person_outline,
-                        color: Theme.of(context).colorScheme.onPrimaryContainer,
-                      ),
+    return DefaultTabController(
+      length: 3,
+      child: Scaffold(
+        drawer: const InfoDrawer(),
+        appBar: AppBar(
+          title: Text(
+            [
+              S.of(context).labelsPageCorrespondentsTitleText,
+              S.of(context).labelsPageDocumentTypesTitleText,
+              S.of(context).labelsPageTagsTitleText,
+              S.of(context).labelsPageStoragePathTitleText
+            ][_currentIndex],
+          ),
+          actions: [
+            IconButton(
+              onPressed: _onAddPressed,
+              icon: const Icon(Icons.add),
+            )
+          ],
+          bottom: PreferredSize(
+            preferredSize: const Size.fromHeight(kToolbarHeight),
+            child: ColoredBox(
+              color: Theme.of(context).bottomAppBarColor,
+              child: TabBar(
+                indicatorColor: Theme.of(context).colorScheme.primary,
+                controller: _tabController,
+                tabs: [
+                  Tab(
+                    icon: Icon(
+                      Icons.person_outline,
+                      color: Theme.of(context).colorScheme.onPrimaryContainer,
                     ),
-                    Tab(
-                      icon: Icon(
-                        Icons.description_outlined,
-                        color: Theme.of(context).colorScheme.onPrimaryContainer,
-                      ),
+                  ),
+                  Tab(
+                    icon: Icon(
+                      Icons.description_outlined,
+                      color: Theme.of(context).colorScheme.onPrimaryContainer,
                     ),
-                    Tab(
-                      icon: Icon(
-                        Icons.label_outline,
-                        color: Theme.of(context).colorScheme.onPrimaryContainer,
-                      ),
+                  ),
+                  Tab(
+                    icon: Icon(
+                      Icons.label_outline,
+                      color: Theme.of(context).colorScheme.onPrimaryContainer,
                     ),
-                    Tab(
-                      icon: Icon(
-                        Icons.folder_open,
-                        color: Theme.of(context).colorScheme.onPrimaryContainer,
-                      ),
-                    )
-                  ],
-                ),
+                  ),
+                  Tab(
+                    icon: Icon(
+                      Icons.folder_open,
+                      color: Theme.of(context).colorScheme.onPrimaryContainer,
+                    ),
+                  )
+                ],
               ),
             ),
           ),
-          body: TabBarView(
-            controller: _tabController,
-            children: [
-              LabelTabView<Correspondent>(
-                cubit: BlocProvider.of<CorrespondentCubit>(context),
-                filterBuilder: (label) => DocumentFilter(
-                  correspondent: CorrespondentQuery.fromId(label.id),
-                  pageSize: label.documentCount ?? 0,
-                ),
-                onOpenEditPage: _openEditCorrespondentPage,
-                emptyStateActionButtonLabel:
-                    S.of(context).labelsPageCorrespondentEmptyStateAddNewLabel,
-                emptyStateDescription: S
-                    .of(context)
-                    .labelsPageCorrespondentEmptyStateDescriptionText,
-                onOpenAddNewPage: _onAddPressed,
+        ),
+        body: TabBarView(
+          controller: _tabController,
+          children: [
+            LabelTabView<Correspondent>(
+              cubit: BlocProvider.of<CorrespondentCubit>(context),
+              filterBuilder: (label) => DocumentFilter(
+                correspondent: CorrespondentQuery.fromId(label.id),
+                pageSize: label.documentCount ?? 0,
               ),
-              LabelTabView<DocumentType>(
-                cubit: BlocProvider.of<DocumentTypeCubit>(context),
-                filterBuilder: (label) => DocumentFilter(
-                  documentType: DocumentTypeQuery.fromId(label.id),
-                  pageSize: label.documentCount ?? 0,
-                ),
-                onOpenEditPage: _openEditDocumentTypePage,
-                emptyStateActionButtonLabel:
-                    S.of(context).labelsPageDocumentTypeEmptyStateAddNewLabel,
-                emptyStateDescription: S
-                    .of(context)
-                    .labelsPageDocumentTypeEmptyStateDescriptionText,
-                onOpenAddNewPage: _onAddPressed,
+              onOpenEditPage: _openEditCorrespondentPage,
+              emptyStateActionButtonLabel:
+                  S.of(context).labelsPageCorrespondentEmptyStateAddNewLabel,
+              emptyStateDescription: S
+                  .of(context)
+                  .labelsPageCorrespondentEmptyStateDescriptionText,
+              onOpenAddNewPage: _onAddPressed,
+            ),
+            LabelTabView<DocumentType>(
+              cubit: BlocProvider.of<DocumentTypeCubit>(context),
+              filterBuilder: (label) => DocumentFilter(
+                documentType: DocumentTypeQuery.fromId(label.id),
+                pageSize: label.documentCount ?? 0,
               ),
-              LabelTabView<Tag>(
-                cubit: BlocProvider.of<TagCubit>(context),
-                filterBuilder: (label) => DocumentFilter(
-                  tags: IdsTagsQuery.fromIds([label.id!]),
-                  pageSize: label.documentCount ?? 0,
-                ),
-                onOpenEditPage: _openEditTagPage,
-                leadingBuilder: (t) => CircleAvatar(
-                  backgroundColor: t.color,
-                  child: t.isInboxTag ?? false
-                      ? Icon(
-                          Icons.inbox,
-                          color: t.textColor,
-                        )
-                      : null,
-                ),
-                contentBuilder: (t) => Text(t.match ?? ''),
-                emptyStateActionButtonLabel:
-                    S.of(context).labelsPageTagsEmptyStateAddNewLabel,
-                emptyStateDescription:
-                    S.of(context).labelsPageTagsEmptyStateDescriptionText,
-                onOpenAddNewPage: _onAddPressed,
+              onOpenEditPage: _openEditDocumentTypePage,
+              emptyStateActionButtonLabel:
+                  S.of(context).labelsPageDocumentTypeEmptyStateAddNewLabel,
+              emptyStateDescription:
+                  S.of(context).labelsPageDocumentTypeEmptyStateDescriptionText,
+              onOpenAddNewPage: _onAddPressed,
+            ),
+            LabelTabView<Tag>(
+              cubit: BlocProvider.of<TagCubit>(context),
+              filterBuilder: (label) => DocumentFilter(
+                tags: IdsTagsQuery.fromIds([label.id!]),
+                pageSize: label.documentCount ?? 0,
               ),
-              LabelTabView<StoragePath>(
-                cubit: BlocProvider.of<StoragePathCubit>(context),
-                onOpenEditPage: _openEditStoragePathPage,
-                filterBuilder: (label) => DocumentFilter(
-                  storagePath: StoragePathQuery.fromId(label.id),
-                  pageSize: label.documentCount ?? 0,
-                ),
-                contentBuilder: (path) => Text(path.path ?? ""),
-                emptyStateActionButtonLabel:
-                    S.of(context).labelsPageStoragePathEmptyStateAddNewLabel,
-                emptyStateDescription: S
-                    .of(context)
-                    .labelsPageStoragePathEmptyStateDescriptionText,
-                onOpenAddNewPage: _onAddPressed,
+              onOpenEditPage: _openEditTagPage,
+              leadingBuilder: (t) => CircleAvatar(
+                backgroundColor: t.color,
+                child: t.isInboxTag ?? false
+                    ? Icon(
+                        Icons.inbox,
+                        color: t.textColor,
+                      )
+                    : null,
               ),
-            ],
-          ),
+              contentBuilder: (t) => Text(t.match ?? ''),
+              emptyStateActionButtonLabel:
+                  S.of(context).labelsPageTagsEmptyStateAddNewLabel,
+              emptyStateDescription:
+                  S.of(context).labelsPageTagsEmptyStateDescriptionText,
+              onOpenAddNewPage: _onAddPressed,
+            ),
+            LabelTabView<StoragePath>(
+              cubit: BlocProvider.of<StoragePathCubit>(context),
+              onOpenEditPage: _openEditStoragePathPage,
+              filterBuilder: (label) => DocumentFilter(
+                storagePath: StoragePathQuery.fromId(label.id),
+                pageSize: label.documentCount ?? 0,
+              ),
+              contentBuilder: (path) => Text(path.path ?? ""),
+              emptyStateActionButtonLabel:
+                  S.of(context).labelsPageStoragePathEmptyStateAddNewLabel,
+              emptyStateDescription:
+                  S.of(context).labelsPageStoragePathEmptyStateDescriptionText,
+              onOpenAddNewPage: _onAddPressed,
+            ),
+          ],
         ),
       ),
     );
@@ -192,11 +187,9 @@ class _LabelsPageState extends State<LabelsPage>
     Navigator.push(
       context,
       MaterialPageRoute(
-        builder: (_) => MultiBlocProvider(
-          providers: [
-            BlocProvider.value(value: getIt<DocumentsCubit>()),
-            BlocProvider.value(
-                value: BlocProvider.of<CorrespondentCubit>(context)),
+        builder: (_) => GlobalStateBlocProvider(
+          additionalProviders: [
+            BlocProvider.value(value: BlocProvider.of<DocumentsCubit>(context)),
           ],
           child: EditCorrespondentPage(correspondent: correspondent),
         ),
@@ -208,11 +201,9 @@ class _LabelsPageState extends State<LabelsPage>
     Navigator.push(
       context,
       MaterialPageRoute(
-        builder: (_) => MultiBlocProvider(
-          providers: [
-            BlocProvider.value(value: getIt<DocumentsCubit>()),
-            BlocProvider.value(
-                value: BlocProvider.of<DocumentTypeCubit>(context)),
+        builder: (_) => GlobalStateBlocProvider(
+          additionalProviders: [
+            BlocProvider.value(value: BlocProvider.of<DocumentsCubit>(context)),
           ],
           child: EditDocumentTypePage(documentType: docType),
         ),
@@ -224,10 +215,9 @@ class _LabelsPageState extends State<LabelsPage>
     Navigator.push(
       context,
       MaterialPageRoute(
-        builder: (_) => MultiBlocProvider(
-          providers: [
-            BlocProvider.value(value: getIt<DocumentsCubit>()),
-            BlocProvider.value(value: BlocProvider.of<TagCubit>(context)),
+        builder: (_) => GlobalStateBlocProvider(
+          additionalProviders: [
+            BlocProvider.value(value: BlocProvider.of<DocumentsCubit>(context)),
             BlocProvider.value(value: getIt<PaperlessStatisticsCubit>()),
           ],
           child: EditTagPage(tag: tag),
@@ -240,11 +230,9 @@ class _LabelsPageState extends State<LabelsPage>
     Navigator.push(
       context,
       MaterialPageRoute(
-        builder: (_) => MultiBlocProvider(
-          providers: [
+        builder: (_) => GlobalStateBlocProvider(
+          additionalProviders: [
             BlocProvider.value(value: getIt<DocumentsCubit>()),
-            BlocProvider.value(
-                value: BlocProvider.of<StoragePathCubit>(context)),
           ],
           child: EditStoragePathPage(storagePath: path),
         ),
@@ -269,7 +257,7 @@ class _LabelsPageState extends State<LabelsPage>
           case 3:
             page = const AddStoragePathPage();
         }
-        return LabelBlocProvider(child: page);
+        return GlobalStateBlocProvider(child: page);
       },
     ));
   }

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

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:paperless_mobile/features/labels/bloc/label_bloc_provider.dart';
+import 'package:paperless_mobile/features/labels/bloc/global_state_bloc_provider.dart';
 import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart';
 import 'package:paperless_mobile/core/model/error_message.dart';
 import 'package:paperless_mobile/di_initializer.dart';
@@ -8,7 +8,8 @@ import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
 import 'package:paperless_mobile/features/documents/model/document_filter.dart';
 import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
 import 'package:paperless_mobile/features/labels/model/label.model.dart';
-import 'package:paperless_mobile/features/labels/view/widgets/linked_documents_preview.dart';
+import 'package:paperless_mobile/features/linked_documents_preview/bloc/linked_documents_cubit.dart';
+import 'package:paperless_mobile/features/linked_documents_preview/view/pages/linked_documents_page.dart';
 
 class LabelItem<T extends Label> extends StatelessWidget {
   final T label;
@@ -50,13 +51,13 @@ class LabelItem<T extends Label> extends StatelessWidget {
               Navigator.push(
                 context,
                 MaterialPageRoute(
-                  builder: (context) => LabelBlocProvider(
-                    child: BlocProvider(
-                      create: (context) =>
-                          DocumentsCubit(getIt<DocumentRepository>())
-                            ..updateFilter(filter: filter),
-                      child: LinkedDocumentsPreview(filter: filter),
-                    ),
+                  builder: (context) => GlobalStateBlocProvider(
+                    additionalProviders: [
+                      BlocProvider.value(
+                          value: getIt<LinkedDocumentsCubit>()
+                            ..initialize(filter)),
+                    ],
+                    child: const LinkedDocumentsPage(),
                   ),
                 ),
               );

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

@@ -1,85 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:paperless_mobile/features/labels/bloc/label_bloc_provider.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/model/document.model.dart';
-import 'package:paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:paperless_mobile/features/documents/view/pages/document_details_page.dart';
-import 'package:paperless_mobile/features/documents/view/widgets/list/document_list.dart';
-import 'package:paperless_mobile/generated/l10n.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
-
-class LinkedDocumentsPreview extends StatefulWidget {
-  final DocumentFilter filter;
-
-  const LinkedDocumentsPreview({super.key, required this.filter});
-
-  @override
-  State<LinkedDocumentsPreview> createState() => _LinkedDocumentsPreviewState();
-}
-
-class _LinkedDocumentsPreviewState extends State<LinkedDocumentsPreview> {
-  final _pagingController =
-      PagingController<int, DocumentModel>(firstPageKey: 1);
-
-  @override
-  void initState() {
-    super.initState();
-    _pagingController.nextPageKey = null;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(S.of(context).linkedDocumentsPageTitle),
-      ),
-      body: BlocBuilder<DocumentsCubit, DocumentsState>(
-        builder: (context, state) {
-          _pagingController.itemList = state.documents;
-          return Column(
-            children: [
-              Text(
-                S.of(context).referencedDocumentsReadOnlyHintText,
-                textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.caption,
-              ),
-              Expanded(
-                child: CustomScrollView(
-                  slivers: [
-                    DocumentListView(
-                      isLabelClickable: false,
-                      onTap: (doc) {
-                        Navigator.push(
-                          context,
-                          MaterialPageRoute(
-                            builder: (ctxt) => LabelBlocProvider(
-                              child: BlocProvider.value(
-                                value: BlocProvider.of<DocumentsCubit>(context),
-                                child: DocumentDetailsPage(
-                                  documentId: doc.id,
-                                  allowEdit: false,
-                                  isLabelClickable: false,
-                                ),
-                              ),
-                            ),
-                          ),
-                        );
-                      },
-                      pagingController: _pagingController,
-                      state: state,
-                      onSelected: BlocProvider.of<DocumentsCubit>(context)
-                          .toggleDocumentSelection,
-                      hasInternetConnection: true,
-                    ),
-                  ],
-                ),
-              ),
-            ],
-          );
-        },
-      ),
-    );
-  }
-}