feat: Migrate to go_router

lib/features/labels/tags/view/widgets/fullscreen_tags_form.dart

@@ -191,7 +191,7 @@ class _FullscreenTagsFormState extends State<FullscreenTagsForm> {
     final createdTag = await Navigator.of(context).push<Tag?>(
       MaterialPageRoute(
         builder: (context) => AddTagPage(
-          initialValue: _textEditingController.text,
+          initialName: _textEditingController.text,
         ),
       ),
     );

lib/features/labels/tags/view/widgets/tags_form_field.dart

@@ -1,6 +1,7 @@
 import 'package:animations/animations.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/database/tables/local_user_account.dart';
@@ -73,7 +74,7 @@ class TagsFormField extends StatelessWidget {
             initialValue: field.value,
             allowOnlySelection: allowOnlySelection,
             allowCreation: allowCreation &&
-                LocalUserAccount.current.paperlessUser.canCreateTags,
+                context.watch<LocalUserAccount>().paperlessUser.canCreateTags,
             allowExclude: allowExclude,
           ),
           onClosed: (data) {

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

@@ -7,23 +7,13 @@ import 'package:paperless_mobile/core/config/hive/hive_config.dart';
 import 'package:paperless_mobile/core/database/tables/global_settings.dart';
 import 'package:paperless_mobile/core/database/tables/local_user_account.dart';
 import 'package:paperless_mobile/core/delegate/customizable_sliver_persistent_header_delegate.dart';
-import 'package:paperless_mobile/core/repository/label_repository.dart';
 import 'package:paperless_mobile/core/widgets/material/colored_tab_bar.dart';
 import 'package:paperless_mobile/features/app_drawer/view/app_drawer.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';
-import 'package:paperless_mobile/features/edit_label/view/impl/add_storage_path_page.dart';
-import 'package:paperless_mobile/features/edit_label/view/impl/add_tag_page.dart';
-import 'package:paperless_mobile/features/edit_label/view/impl/edit_correspondent_page.dart';
-import 'package:paperless_mobile/features/edit_label/view/impl/edit_document_type_page.dart';
-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/home/view/model/api_version.dart';
 import 'package:paperless_mobile/features/labels/cubit/label_cubit.dart';
 import 'package:paperless_mobile/features/labels/view/widgets/label_tab_view.dart';
 import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
-import 'package:provider/provider.dart';
+import 'package:paperless_mobile/routes/typed/branches/labels_route.dart';
 
 class LabelsPage extends StatefulWidget {
   const LabelsPage({Key? key}) : super(key: key);
@@ -52,7 +42,7 @@ class _LabelsPageState extends State<LabelsPage>
   @override
   void initState() {
     super.initState();
-    final user = LocalUserAccount.current.paperlessUser;
+    final user = context.read<LocalUserAccount>().paperlessUser;
     _tabController = TabController(
         length: _calculateTabCount(user), vsync: this)
       ..addListener(() => setState(() => _currentIndex = _tabController.index));
@@ -67,7 +57,7 @@ class _LabelsPageState extends State<LabelsPage>
           final currentUserId =
               Hive.box<GlobalSettings>(HiveBoxes.globalSettings)
                   .getValue()!
-                  .currentLoggedInUser;
+                  .loggedInUserId;
           final user = box.get(currentUserId)!.paperlessUser;
 
           return BlocBuilder<ConnectivityCubit, ConnectivityState>(
@@ -77,10 +67,14 @@ class _LabelsPageState extends State<LabelsPage>
                   drawer: const AppDrawer(),
                   floatingActionButton: FloatingActionButton(
                     onPressed: [
-                      if (user.canViewCorrespondents) _openAddCorrespondentPage,
-                      if (user.canViewDocumentTypes) _openAddDocumentTypePage,
-                      if (user.canViewTags) _openAddTagPage,
-                      if (user.canViewStoragePaths) _openAddStoragePathPage,
+                      if (user.canViewCorrespondents)
+                        () => CreateLabelRoute<Correspondent>().push(context),
+                      if (user.canViewDocumentTypes)
+                        () => CreateLabelRoute<DocumentType>().push(context),
+                      if (user.canViewTags)
+                        () => CreateLabelRoute<Tag>().push(context),
+                      if (user.canViewStoragePaths)
+                        () => CreateLabelRoute<StoragePath>().push(context),
                     ][_currentIndex],
                     child: const Icon(Icons.add),
                   ),
@@ -213,144 +207,13 @@ class _LabelsPageState extends State<LabelsPage>
                               controller: _tabController,
                               children: [
                                 if (user.canViewCorrespondents)
-                                  Builder(
-                                    builder: (context) {
-                                      return CustomScrollView(
-                                        slivers: [
-                                          SliverOverlapInjector(
-                                              handle: searchBarHandle),
-                                          SliverOverlapInjector(
-                                              handle: tabBarHandle),
-                                          LabelTabView<Correspondent>(
-                                            labels: state.correspondents,
-                                            filterBuilder: (label) =>
-                                                DocumentFilter(
-                                              correspondent:
-                                                  IdQueryParameter.fromId(
-                                                      label.id!),
-                                            ),
-                                            canEdit: user.canEditCorrespondents,
-                                            canAddNew:
-                                                user.canCreateCorrespondents,
-                                            onEdit: _openEditCorrespondentPage,
-                                            emptyStateActionButtonLabel: S
-                                                .of(context)!
-                                                .addNewCorrespondent,
-                                            emptyStateDescription: S
-                                                .of(context)!
-                                                .noCorrespondentsSetUp,
-                                            onAddNew: _openAddCorrespondentPage,
-                                          ),
-                                        ],
-                                      );
-                                    },
-                                  ),
+                                  _buildCorrespondentsView(state, user),
                                 if (user.canViewDocumentTypes)
-                                  Builder(
-                                    builder: (context) {
-                                      return CustomScrollView(
-                                        slivers: [
-                                          SliverOverlapInjector(
-                                              handle: searchBarHandle),
-                                          SliverOverlapInjector(
-                                              handle: tabBarHandle),
-                                          LabelTabView<DocumentType>(
-                                            labels: state.documentTypes,
-                                            filterBuilder: (label) =>
-                                                DocumentFilter(
-                                              documentType:
-                                                  IdQueryParameter.fromId(
-                                                      label.id!),
-                                            ),
-                                            canEdit: user.canEditDocumentTypes,
-                                            canAddNew:
-                                                user.canCreateDocumentTypes,
-                                            onEdit: _openEditDocumentTypePage,
-                                            emptyStateActionButtonLabel: S
-                                                .of(context)!
-                                                .addNewDocumentType,
-                                            emptyStateDescription: S
-                                                .of(context)!
-                                                .noDocumentTypesSetUp,
-                                            onAddNew: _openAddDocumentTypePage,
-                                          ),
-                                        ],
-                                      );
-                                    },
-                                  ),
+                                  _buildDocumentTypesView(state, user),
                                 if (user.canViewTags)
-                                  Builder(
-                                    builder: (context) {
-                                      return CustomScrollView(
-                                        slivers: [
-                                          SliverOverlapInjector(
-                                              handle: searchBarHandle),
-                                          SliverOverlapInjector(
-                                              handle: tabBarHandle),
-                                          LabelTabView<Tag>(
-                                            labels: state.tags,
-                                            filterBuilder: (label) =>
-                                                DocumentFilter(
-                                              tags: TagsQuery.ids(
-                                                  include: [label.id!]),
-                                            ),
-                                            canEdit: user.canEditTags,
-                                            canAddNew: user.canCreateTags,
-                                            onEdit: _openEditTagPage,
-                                            leadingBuilder: (t) => CircleAvatar(
-                                              backgroundColor: t.color,
-                                              child: t.isInboxTag
-                                                  ? Icon(
-                                                      Icons.inbox,
-                                                      color: t.textColor,
-                                                    )
-                                                  : null,
-                                            ),
-                                            emptyStateActionButtonLabel:
-                                                S.of(context)!.addNewTag,
-                                            emptyStateDescription:
-                                                S.of(context)!.noTagsSetUp,
-                                            onAddNew: _openAddTagPage,
-                                          ),
-                                        ],
-                                      );
-                                    },
-                                  ),
+                                  _buildTagsView(state, user),
                                 if (user.canViewStoragePaths)
-                                  Builder(
-                                    builder: (context) {
-                                      return CustomScrollView(
-                                        slivers: [
-                                          SliverOverlapInjector(
-                                              handle: searchBarHandle),
-                                          SliverOverlapInjector(
-                                              handle: tabBarHandle),
-                                          LabelTabView<StoragePath>(
-                                            labels: state.storagePaths,
-                                            onEdit: _openEditStoragePathPage,
-                                            filterBuilder: (label) =>
-                                                DocumentFilter(
-                                              storagePath:
-                                                  IdQueryParameter.fromId(
-                                                      label.id!),
-                                            ),
-                                            canEdit: user.canEditStoragePaths,
-                                            canAddNew:
-                                                user.canCreateStoragePaths,
-                                            contentBuilder: (path) =>
-                                                Text(path.path),
-                                            emptyStateActionButtonLabel: S
-                                                .of(context)!
-                                                .addNewStoragePath,
-                                            emptyStateDescription: S
-                                                .of(context)!
-                                                .noStoragePathsSetUp,
-                                            onAddNew: _openAddStoragePathPage,
-                                          ),
-                                        ],
-                                      );
-                                    },
-                                  ),
+                                  _buildStoragePathView(state, user),
                               ],
                             ),
                           ),
@@ -365,73 +228,121 @@ class _LabelsPageState extends State<LabelsPage>
         });
   }
 
-  void _openEditCorrespondentPage(Correspondent correspondent) {
-    Navigator.push(
-      context,
-      _buildLabelPageRoute(EditCorrespondentPage(correspondent: correspondent)),
+  Widget _buildCorrespondentsView(LabelState state, UserModel user) {
+    return Builder(
+      builder: (context) {
+        return CustomScrollView(
+          slivers: [
+            SliverOverlapInjector(handle: searchBarHandle),
+            SliverOverlapInjector(handle: tabBarHandle),
+            LabelTabView<Correspondent>(
+              labels: state.correspondents,
+              filterBuilder: (label) => DocumentFilter(
+                correspondent: IdQueryParameter.fromId(label.id!),
+              ),
+              canEdit: user.canEditCorrespondents,
+              canAddNew: user.canCreateCorrespondents,
+              onEdit: (correspondent) {
+                EditLabelRoute(correspondent).push(context);
+              },
+              emptyStateActionButtonLabel: S.of(context)!.addNewCorrespondent,
+              emptyStateDescription: S.of(context)!.noCorrespondentsSetUp,
+              onAddNew: () => CreateLabelRoute<Correspondent>().push(context),
+            ),
+          ],
+        );
+      },
     );
   }
 
-  void _openEditDocumentTypePage(DocumentType docType) {
-    Navigator.push(
-      context,
-      _buildLabelPageRoute(EditDocumentTypePage(documentType: docType)),
+  Widget _buildDocumentTypesView(LabelState state, UserModel user) {
+    return Builder(
+      builder: (context) {
+        return CustomScrollView(
+          slivers: [
+            SliverOverlapInjector(handle: searchBarHandle),
+            SliverOverlapInjector(handle: tabBarHandle),
+            LabelTabView<DocumentType>(
+              labels: state.documentTypes,
+              filterBuilder: (label) => DocumentFilter(
+                documentType: IdQueryParameter.fromId(label.id!),
+              ),
+              canEdit: user.canEditDocumentTypes,
+              canAddNew: user.canCreateDocumentTypes,
+              onEdit: (label) {
+                EditLabelRoute(label).push(context);
+              },
+              emptyStateActionButtonLabel: S.of(context)!.addNewDocumentType,
+              emptyStateDescription: S.of(context)!.noDocumentTypesSetUp,
+              onAddNew: () => CreateLabelRoute<DocumentType>().push(context),
+            ),
+          ],
+        );
+      },
     );
   }
 
-  void _openEditTagPage(Tag tag) {
-    Navigator.push(
-      context,
-      _buildLabelPageRoute(EditTagPage(tag: tag)),
+  Widget _buildTagsView(LabelState state, UserModel user) {
+    return Builder(
+      builder: (context) {
+        return CustomScrollView(
+          slivers: [
+            SliverOverlapInjector(handle: searchBarHandle),
+            SliverOverlapInjector(handle: tabBarHandle),
+            LabelTabView<Tag>(
+              labels: state.tags,
+              filterBuilder: (label) => DocumentFilter(
+                tags: TagsQuery.ids(include: [label.id!]),
+              ),
+              canEdit: user.canEditTags,
+              canAddNew: user.canCreateTags,
+              onEdit: (label) {
+                EditLabelRoute(label).push(context);
+              },
+              leadingBuilder: (t) => CircleAvatar(
+                backgroundColor: t.color,
+                child: t.isInboxTag
+                    ? Icon(
+                        Icons.inbox,
+                        color: t.textColor,
+                      )
+                    : null,
+              ),
+              emptyStateActionButtonLabel: S.of(context)!.addNewTag,
+              emptyStateDescription: S.of(context)!.noTagsSetUp,
+              onAddNew: () => CreateLabelRoute<Tag>().push(context),
+            ),
+          ],
+        );
+      },
     );
   }
 
-  void _openEditStoragePathPage(StoragePath path) {
-    Navigator.push(
-      context,
-      _buildLabelPageRoute(EditStoragePathPage(
-        storagePath: path,
-      )),
-    );
-  }
-
-  void _openAddCorrespondentPage() {
-    Navigator.push(
-      context,
-      _buildLabelPageRoute(const AddCorrespondentPage()),
-    );
-  }
-
-  void _openAddDocumentTypePage() {
-    Navigator.push(
-      context,
-      _buildLabelPageRoute(const AddDocumentTypePage()),
-    );
-  }
-
-  void _openAddTagPage() {
-    Navigator.push(
-      context,
-      _buildLabelPageRoute(const AddTagPage()),
-    );
-  }
-
-  void _openAddStoragePathPage() {
-    Navigator.push(
-      context,
-      _buildLabelPageRoute(const AddStoragePathPage()),
-    );
-  }
-
-  MaterialPageRoute<dynamic> _buildLabelPageRoute(Widget page) {
-    return MaterialPageRoute(
-      builder: (_) => MultiProvider(
-        providers: [
-          Provider.value(value: context.read<LabelRepository>()),
-          Provider.value(value: context.read<ApiVersion>())
-        ],
-        child: page,
-      ),
+  Widget _buildStoragePathView(LabelState state, UserModel user) {
+    return Builder(
+      builder: (context) {
+        return CustomScrollView(
+          slivers: [
+            SliverOverlapInjector(handle: searchBarHandle),
+            SliverOverlapInjector(handle: tabBarHandle),
+            LabelTabView<StoragePath>(
+              labels: state.storagePaths,
+              onEdit: (label) {
+                EditLabelRoute(label).push(context);
+              },
+              filterBuilder: (label) => DocumentFilter(
+                storagePath: IdQueryParameter.fromId(label.id!),
+              ),
+              canEdit: user.canEditStoragePaths,
+              canAddNew: user.canCreateStoragePaths,
+              contentBuilder: (path) => Text(path.path),
+              emptyStateActionButtonLabel: S.of(context)!.addNewStoragePath,
+              emptyStateDescription: S.of(context)!.noStoragePathsSetUp,
+              onAddNew: () => CreateLabelRoute<StoragePath>().push(context),
+            ),
+          ],
+        );
+      },
     );
   }
 }

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

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/database/tables/local_user_account.dart';
 import 'package:paperless_mobile/core/navigation/push_routes.dart';
@@ -36,7 +37,7 @@ class LabelItem<T extends Label> extends StatelessWidget {
 
   Widget _buildReferencedDocumentsWidget(BuildContext context) {
     final canOpen = (label.documentCount ?? 0) > 0 &&
-        LocalUserAccount.current.paperlessUser.canViewDocuments;
+        context.watch<LocalUserAccount>().paperlessUser.canViewDocuments;
     return TextButton.icon(
       label: const Icon(Icons.link),
       icon: Text(formatMaxCount(label.documentCount)),