fix: Add labels to each cubit using repositories and state properties, remove label cubits

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

@@ -6,7 +6,6 @@ import 'package:paperless_mobile/core/delegate/customizable_sliver_persistent_he
 import 'package:paperless_mobile/core/repository/label_repository.dart';
 import 'package:paperless_mobile/core/widgets/material/search/colored_tab_bar.dart';
 import 'package:paperless_mobile/features/app_drawer/view/app_drawer.dart';
-import 'package:paperless_mobile/features/document_details/view/pages/document_details_page.dart';
 import 'package:paperless_mobile/features/document_search/view/sliver_search_bar.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';
@@ -17,6 +16,7 @@ import 'package:paperless_mobile/features/edit_label/view/impl/edit_document_typ
 import 'package:paperless_mobile/features/edit_label/view/impl/edit_storage_path_page.dart';
 import 'package:paperless_mobile/features/edit_label/view/impl/edit_tag_page.dart';
 import 'package:paperless_mobile/features/labels/cubit/label_cubit.dart';
+import 'package:paperless_mobile/features/labels/cubit/label_cubit_mixin.dart';
 import 'package:paperless_mobile/features/labels/view/widgets/label_tab_view.dart';
 import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
 
@@ -141,12 +141,12 @@ class _LabelsPageState extends State<LabelsPage>
                     notificationPredicate: (notification) =>
                         connectedState.isConnected,
                     onRefresh: () => [
-                      context.read<LabelCubit<Correspondent>>(),
-                      context.read<LabelCubit<DocumentType>>(),
-                      context.read<LabelCubit<Tag>>(),
-                      context.read<LabelCubit<StoragePath>>(),
+                      context.read<LabelCubit>().reloadCorrespondents,
+                      context.read<LabelCubit>().reloadDocumentTypes,
+                      context.read<LabelCubit>().reloadTags,
+                      context.read<LabelCubit>().reloadStoragePaths,
                     ][_currentIndex]
-                        .reload(),
+                        .call(),
                     child: TabBarView(
                       controller: _tabController,
                       children: [
@@ -157,6 +157,10 @@ class _LabelsPageState extends State<LabelsPage>
                                 SliverOverlapInjector(handle: searchBarHandle),
                                 SliverOverlapInjector(handle: tabBarHandle),
                                 LabelTabView<Correspondent>(
+                                  labels: context
+                                      .watch<LabelCubit>()
+                                      .state
+                                      .correspondents,
                                   filterBuilder: (label) => DocumentFilter(
                                     correspondent:
                                         IdQueryParameter.fromId(label.id),
@@ -180,6 +184,10 @@ class _LabelsPageState extends State<LabelsPage>
                                 SliverOverlapInjector(handle: searchBarHandle),
                                 SliverOverlapInjector(handle: tabBarHandle),
                                 LabelTabView<DocumentType>(
+                                  labels: context
+                                      .watch<LabelCubit>()
+                                      .state
+                                      .documentTypes,
                                   filterBuilder: (label) => DocumentFilter(
                                     documentType:
                                         IdQueryParameter.fromId(label.id),
@@ -203,6 +211,8 @@ class _LabelsPageState extends State<LabelsPage>
                                 SliverOverlapInjector(handle: searchBarHandle),
                                 SliverOverlapInjector(handle: tabBarHandle),
                                 LabelTabView<Tag>(
+                                  labels:
+                                      context.watch<LabelCubit>().state.tags,
                                   filterBuilder: (label) => DocumentFilter(
                                     tags: IdsTagsQuery.fromIds([label.id!]),
                                     pageSize: label.documentCount ?? 0,
@@ -234,6 +244,10 @@ class _LabelsPageState extends State<LabelsPage>
                                 SliverOverlapInjector(handle: searchBarHandle),
                                 SliverOverlapInjector(handle: tabBarHandle),
                                 LabelTabView<StoragePath>(
+                                  labels: context
+                                      .watch<LabelCubit>()
+                                      .state
+                                      .storagePaths,
                                   onEdit: _openEditStoragePathPage,
                                   filterBuilder: (label) => DocumentFilter(
                                     storagePath:
@@ -267,8 +281,8 @@ class _LabelsPageState extends State<LabelsPage>
     Navigator.push(
       context,
       MaterialPageRoute(
-        builder: (_) => RepositoryProvider(
-          create: (context) => context.read<LabelRepository<Correspondent>>(),
+        builder: (_) => RepositoryProvider.value(
+          value: context.read<LabelRepository>(),
           child: EditCorrespondentPage(correspondent: correspondent),
         ),
       ),
@@ -279,8 +293,8 @@ class _LabelsPageState extends State<LabelsPage>
     Navigator.push(
       context,
       MaterialPageRoute(
-        builder: (_) => RepositoryProvider(
-          create: (context) => context.read<LabelRepository<DocumentType>>(),
+        builder: (_) => RepositoryProvider.value(
+          value: context.read<LabelRepository>(),
           child: EditDocumentTypePage(documentType: docType),
         ),
       ),
@@ -291,8 +305,8 @@ class _LabelsPageState extends State<LabelsPage>
     Navigator.push(
       context,
       MaterialPageRoute(
-        builder: (_) => RepositoryProvider(
-          create: (context) => context.read<LabelRepository<Tag>>(),
+        builder: (_) => RepositoryProvider.value(
+          value: context.read<LabelRepository>(),
           child: EditTagPage(tag: tag),
         ),
       ),
@@ -303,8 +317,8 @@ class _LabelsPageState extends State<LabelsPage>
     Navigator.push(
       context,
       MaterialPageRoute(
-        builder: (_) => RepositoryProvider(
-          create: (context) => context.read<LabelRepository<StoragePath>>(),
+        builder: (_) => RepositoryProvider.value(
+          value: context.read<LabelRepository>(),
           child: EditStoragePathPage(
             storagePath: path,
           ),
@@ -317,8 +331,8 @@ class _LabelsPageState extends State<LabelsPage>
     Navigator.push(
       context,
       MaterialPageRoute(
-        builder: (_) => RepositoryProvider(
-          create: (context) => context.read<LabelRepository<Correspondent>>(),
+        builder: (_) => RepositoryProvider.value(
+          value: context.read<LabelRepository>(),
           child: const AddCorrespondentPage(),
         ),
       ),
@@ -329,8 +343,8 @@ class _LabelsPageState extends State<LabelsPage>
     Navigator.push(
       context,
       MaterialPageRoute(
-        builder: (_) => RepositoryProvider(
-          create: (context) => context.read<LabelRepository<DocumentType>>(),
+        builder: (_) => RepositoryProvider.value(
+          value: context.read<LabelRepository>(),
           child: const AddDocumentTypePage(),
         ),
       ),
@@ -341,8 +355,8 @@ class _LabelsPageState extends State<LabelsPage>
     Navigator.push(
       context,
       MaterialPageRoute(
-        builder: (_) => RepositoryProvider(
-          create: (context) => context.read<LabelRepository<Tag>>(),
+        builder: (_) => RepositoryProvider.value(
+          value: context.read<LabelRepository>(),
           child: const AddTagPage(),
         ),
       ),
@@ -353,8 +367,8 @@ class _LabelsPageState extends State<LabelsPage>
     Navigator.push(
       context,
       MaterialPageRoute(
-        builder: (_) => RepositoryProvider(
-          create: (context) => context.read<LabelRepository<StoragePath>>(),
+        builder: (_) => RepositoryProvider.value(
+          value: context.read<LabelRepository>(),
           child: const AddStoragePathPage(),
         ),
       ),

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

@@ -51,6 +51,7 @@ class LabelItem<T extends Label> extends StatelessWidget {
                       filter,
                       context.read(),
                       context.read(),
+                      context.read(),
                     ),
                     child: const LinkedDocumentsPage(),
                   ),

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

@@ -3,12 +3,12 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/bloc/connectivity_cubit.dart';
 import 'package:paperless_mobile/core/translation/matching_algorithm_localization_mapper.dart';
-import 'package:paperless_mobile/features/labels/cubit/label_cubit.dart';
 import 'package:paperless_mobile/core/widgets/offline_widget.dart';
 import 'package:paperless_mobile/features/labels/view/widgets/label_item.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 
 class LabelTabView<T extends Label> extends StatelessWidget {
+  final Map<int, T> labels;
   final DocumentFilter Function(Label) filterBuilder;
   final void Function(T) onEdit;
   final void Function() onAddNew;
@@ -32,69 +32,61 @@ class LabelTabView<T extends Label> extends StatelessWidget {
     required this.emptyStateDescription,
     required this.onAddNew,
     required this.emptyStateActionButtonLabel,
+    required this.labels,
   });
 
   @override
   Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => LabelCubit<T>(
-        context.read(),
-      ),
-      child: BlocBuilder<ConnectivityCubit, ConnectivityState>(
-        builder: (context, connectivityState) {
-          return BlocBuilder<LabelCubit<T>, LabelState<T>>(
-            builder: (context, state) {
-              if (!state.isLoaded && !connectivityState.isConnected) {
-                return const OfflineWidget();
-              }
-              final labels = state.labels.values.toList()..sort();
-              if (labels.isEmpty) {
-                return SliverFillRemaining(
-                  child: Center(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.center,
-                      children: [
-                        Text(
-                          emptyStateDescription,
-                          textAlign: TextAlign.center,
-                        ),
-                        TextButton(
-                          onPressed: onAddNew,
-                          child: Text(emptyStateActionButtonLabel),
-                        ),
-                      ].padded(),
-                    ),
+    return BlocBuilder<ConnectivityCubit, ConnectivityState>(
+      builder: (context, connectivityState) {
+        if (!connectivityState.isConnected) {
+          return const OfflineWidget();
+        }
+        final sortedLabels = labels.values.toList()..sort();
+        if (labels.isEmpty) {
+          return SliverFillRemaining(
+            child: Center(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  Text(
+                    emptyStateDescription,
+                    textAlign: TextAlign.center,
                   ),
-                );
-              }
-              return SliverList(
-                delegate: SliverChildBuilderDelegate(
-                  (context, index) {
-                    final l = labels.elementAt(index);
-                    return LabelItem<T>(
-                      name: l.name,
-                      content: contentBuilder?.call(l) ??
-                          Text(
-                            translateMatchingAlgorithmName(
-                                    context, l.matchingAlgorithm) +
-                                ((l.match?.isNotEmpty ?? false)
-                                    ? ": ${l.match}"
-                                    : ""),
-                            maxLines: 2,
-                          ),
-                      onOpenEditPage: onEdit,
-                      filterBuilder: filterBuilder,
-                      leading: leadingBuilder?.call(l),
-                      label: l,
-                    );
-                  },
-                  childCount: labels.length,
-                ),
+                  TextButton(
+                    onPressed: onAddNew,
+                    child: Text(emptyStateActionButtonLabel),
+                  ),
+                ].padded(),
+              ),
+            ),
+          );
+        }
+        return SliverList(
+          delegate: SliverChildBuilderDelegate(
+            (context, index) {
+              final l = sortedLabels.elementAt(index);
+              return LabelItem<T>(
+                name: l.name,
+                content: contentBuilder?.call(l) ??
+                    Text(
+                      translateMatchingAlgorithmName(
+                              context, l.matchingAlgorithm) +
+                          ((l.match?.isNotEmpty ?? false)
+                              ? ": ${l.match}"
+                              : ""),
+                      maxLines: 2,
+                    ),
+                onOpenEditPage: onEdit,
+                filterBuilder: filterBuilder,
+                leading: leadingBuilder?.call(l),
+                label: l,
               );
             },
-          );
-        },
-      ),
+            childCount: labels.length,
+          ),
+        );
+      },
     );
   }
 }

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

@@ -1,37 +1,24 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:paperless_api/paperless_api.dart';
-import 'package:paperless_mobile/core/repository/label_repository.dart';
-import 'package:paperless_mobile/features/labels/cubit/label_cubit.dart';
 
 class LabelText<T extends Label> extends StatelessWidget {
-  final int? id;
+  final T? label;
   final String placeholder;
   final TextStyle? style;
-
   const LabelText({
     super.key,
     this.style,
-    this.id,
     this.placeholder = "",
+    required this.label,
   });
 
   @override
   Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => LabelCubit<T>(
-        context.read<LabelRepository<T>>(),
-      ),
-      child: BlocBuilder<LabelCubit<T>, LabelState<T>>(
-        builder: (context, state) {
-          return Text(
-            state.labels[id]?.toString() ?? placeholder,
-            style: style,
-            maxLines: 1,
-            overflow: TextOverflow.ellipsis,
-          );
-        },
-      ),
+    return Text(
+      label?.toString() ?? placeholder,
+      style: style,
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
     );
     ;
   }