From af4359c38d66b4d3335d1445d59dacd4aed28050 Mon Sep 17 00:00:00 2001 From: Anton Stubenbord Date: Fri, 27 Oct 2023 12:28:26 +0200 Subject: [PATCH] chore: Cleanup project structure, add debug output to build.gradle --- android/app/build.gradle | 4 +++- lib/features/app_drawer/view/app_drawer.dart | 13 +++++------ .../view/pages/document_details_page.dart | 4 ++-- .../view/document_edit_page.dart | 4 ++-- .../document_scan/view/scanner_page.dart | 4 ++-- .../view/document_search_page.dart | 4 ++-- .../document_upload_preparation_page.dart | 4 ++-- .../documents/view/pages/documents_page.dart | 4 ++-- .../view/widgets/document_preview.dart | 4 ++-- .../widgets/saved_views/saved_view_chip.dart | 4 ++-- .../saved_views/saved_views_widget.dart | 4 ++-- .../document_selection_sliver_app_bar.dart | 4 ++-- .../inbox/view/widgets/inbox_item.dart | 4 ++-- .../view/widgets/fullscreen_tags_form.dart | 4 ++-- .../labels/view/pages/labels_page.dart | 4 ++-- .../labels/view/widgets/label_item.dart | 4 ++-- lib/features/landing/view/landing_page.dart | 10 ++++----- .../view/linked_documents_page.dart | 4 ++-- lib/features/login/view/login_page.dart | 2 +- .../view/login_to_existing_account_page.dart | 4 ++-- .../login/view/verify_identity_page.dart | 4 ++-- .../view/saved_view_preview.dart | 4 ++-- .../settings/view/manage_accounts_page.dart | 4 ++-- .../settings/view/widgets/app_logs_tile.dart | 2 +- .../view/widgets/changelogs_tile.dart | 2 +- .../view/widgets/event_listener_shell.dart | 4 ++-- .../view/similar_documents_view.dart | 4 ++-- lib/main.dart | 17 +++++++------- lib/{routes => routing}/navigation_keys.dart | 0 lib/{routes => routing}/routes.dart | 0 .../routes}/add_account_route.dart | 4 ++-- .../routes}/app_logs_route.dart | 2 +- .../routes}/changelog_route.dart | 4 ++-- .../routes}/documents_route.dart | 2 +- .../routes}/inbox_route.dart | 2 +- .../routes}/labels_route.dart | 3 +-- .../routes}/landing_route.dart | 3 +-- .../routes}/logging_out_route.dart | 4 ++-- .../routes}/login_route.dart | 4 ++-- .../routes}/saved_views_route.dart | 0 .../routes}/scanner_route.dart | 4 ++-- .../routes}/settings_route.dart | 4 ++-- .../routes}/shells/authenticated_route.dart | 22 +++++++++---------- .../routes}/shells/scaffold_shell_route.dart | 0 .../routes}/upload_queue_route.dart | 4 ++-- .../utils/dialog_page.dart | 0 46 files changed, 96 insertions(+), 100 deletions(-) rename lib/{routes => routing}/navigation_keys.dart (100%) rename lib/{routes => routing}/routes.dart (100%) rename lib/{routes/typed/top_level => routing/routes}/add_account_route.dart (96%) rename lib/{routes/typed/top_level => routing/routes}/app_logs_route.dart (93%) rename lib/{routes/typed/top_level => routing/routes}/changelog_route.dart (79%) rename lib/{routes/typed/branches => routing/routes}/documents_route.dart (99%) rename lib/{routes/typed/branches => routing/routes}/inbox_route.dart (87%) rename lib/{routes/typed/branches => routing/routes}/labels_route.dart (98%) rename lib/{routes/typed/branches => routing/routes}/landing_route.dart (80%) rename lib/{routes/typed/top_level => routing/routes}/logging_out_route.dart (84%) rename lib/{routes/typed/top_level => routing/routes}/login_route.dart (97%) rename lib/{routes/typed/branches => routing/routes}/saved_views_route.dart (100%) rename lib/{routes/typed/branches => routing/routes}/scanner_route.dart (93%) rename lib/{routes/typed/top_level => routing/routes}/settings_route.dart (85%) rename lib/{routes/typed => routing/routes}/shells/authenticated_route.dart (85%) rename lib/{routes/typed => routing/routes}/shells/scaffold_shell_route.dart (100%) rename lib/{routes/typed/branches => routing/routes}/upload_queue_route.dart (78%) rename lib/{routes => routing}/utils/dialog_page.dart (100%) diff --git a/android/app/build.gradle b/android/app/build.gradle index a192381..60f1407 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -100,9 +100,11 @@ ext.abiCodes = ["x86_64": 1, "armeabi-v7a": 2, "arm64-v8a": 3] import com.android.build.OutputFile android.applicationVariants.all { variant -> variant.outputs.each { output -> - def abiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI)) + def abiName = output.getFilter(OutputFile.ABI) + def abiVersionCode = project.ext.abiCodes.get(abiName) if (abiVersionCode != null) { output.versionCodeOverride = variant.versionCode * 10 + abiVersionCode + println "Mapping " + abiName + " to " + output.versionCodeOverride } } } \ No newline at end of file diff --git a/lib/features/app_drawer/view/app_drawer.dart b/lib/features/app_drawer/view/app_drawer.dart index 28e3877..9f5e047 100644 --- a/lib/features/app_drawer/view/app_drawer.dart +++ b/lib/features/app_drawer/view/app_drawer.dart @@ -4,20 +4,17 @@ import 'package:flutter_animate/flutter_animate.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:paperless_mobile/constants.dart'; import 'package:paperless_mobile/core/database/tables/local_user_account.dart'; -import 'package:paperless_mobile/features/logging/view/app_logs_page.dart'; import 'package:paperless_mobile/core/extensions/flutter_extensions.dart'; import 'package:paperless_mobile/features/documents/cubit/documents_cubit.dart'; import 'package:paperless_mobile/features/saved_view/cubit/saved_view_cubit.dart'; import 'package:paperless_mobile/features/sharing/cubit/receive_share_cubit.dart'; import 'package:paperless_mobile/generated/assets.gen.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; -import 'package:paperless_mobile/routes/typed/branches/documents_route.dart'; -import 'package:paperless_mobile/routes/typed/branches/saved_views_route.dart'; -import 'package:paperless_mobile/routes/typed/branches/upload_queue_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; -import 'package:paperless_mobile/routes/typed/top_level/app_logs_route.dart'; -import 'package:paperless_mobile/routes/typed/top_level/changelog_route.dart'; -import 'package:paperless_mobile/routes/typed/top_level/settings_route.dart'; +import 'package:paperless_mobile/routing/routes/documents_route.dart'; +import 'package:paperless_mobile/routing/routes/saved_views_route.dart'; +import 'package:paperless_mobile/routing/routes/settings_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/upload_queue_route.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher_string.dart'; diff --git a/lib/features/document_details/view/pages/document_details_page.dart b/lib/features/document_details/view/pages/document_details_page.dart index fff3bbe..fa483d1 100644 --- a/lib/features/document_details/view/pages/document_details_page.dart +++ b/lib/features/document_details/view/pages/document_details_page.dart @@ -22,8 +22,8 @@ import 'package:paperless_mobile/features/similar_documents/view/similar_documen import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; import 'package:paperless_mobile/helpers/connectivity_aware_action_wrapper.dart'; import 'package:paperless_mobile/helpers/message_helpers.dart'; -import 'package:paperless_mobile/routes/typed/branches/documents_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/documents_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; import 'package:paperless_mobile/theme.dart'; class DocumentDetailsPage extends StatefulWidget { diff --git a/lib/features/document_edit/view/document_edit_page.dart b/lib/features/document_edit/view/document_edit_page.dart index 18a7e32..3821cd9 100644 --- a/lib/features/document_edit/view/document_edit_page.dart +++ b/lib/features/document_edit/view/document_edit_page.dart @@ -20,8 +20,8 @@ import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_form_fie import 'package:paperless_mobile/features/labels/view/widgets/label_form_field.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; import 'package:paperless_mobile/helpers/message_helpers.dart'; -import 'package:paperless_mobile/routes/typed/branches/labels_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/labels_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; class DocumentEditPage extends StatefulWidget { const DocumentEditPage({ diff --git a/lib/features/document_scan/view/scanner_page.dart b/lib/features/document_scan/view/scanner_page.dart index a0317be..8cfb32b 100644 --- a/lib/features/document_scan/view/scanner_page.dart +++ b/lib/features/document_scan/view/scanner_page.dart @@ -25,8 +25,8 @@ import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; import 'package:paperless_mobile/helpers/connectivity_aware_action_wrapper.dart'; import 'package:paperless_mobile/helpers/message_helpers.dart'; import 'package:paperless_mobile/helpers/permission_helpers.dart'; -import 'package:paperless_mobile/routes/typed/branches/scanner_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/scanner_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; import 'package:path/path.dart' as p; import 'package:pdf/pdf.dart'; import 'package:pdf/widgets.dart' as pw; diff --git a/lib/features/document_search/view/document_search_page.dart b/lib/features/document_search/view/document_search_page.dart index 83b96dc..d555189 100644 --- a/lib/features/document_search/view/document_search_page.dart +++ b/lib/features/document_search/view/document_search_page.dart @@ -11,8 +11,8 @@ import 'package:paperless_mobile/features/document_search/view/remove_history_en import 'package:paperless_mobile/features/documents/view/widgets/adaptive_documents_view.dart'; import 'package:paperless_mobile/features/documents/view/widgets/selection/view_type_selection_widget.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; -import 'package:paperless_mobile/routes/typed/branches/documents_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/documents_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; class DocumentSearchPage extends StatefulWidget { const DocumentSearchPage({super.key}); diff --git a/lib/features/document_upload/view/document_upload_preparation_page.dart b/lib/features/document_upload/view/document_upload_preparation_page.dart index 07f4c41..8791c07 100644 --- a/lib/features/document_upload/view/document_upload_preparation_page.dart +++ b/lib/features/document_upload/view/document_upload_preparation_page.dart @@ -22,8 +22,8 @@ import 'package:paperless_mobile/features/logging/data/logger.dart'; import 'package:paperless_mobile/features/sharing/view/widgets/file_thumbnail.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; import 'package:paperless_mobile/helpers/message_helpers.dart'; -import 'package:paperless_mobile/routes/typed/branches/labels_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/labels_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; class DocumentUploadResult { final bool success; diff --git a/lib/features/documents/view/pages/documents_page.dart b/lib/features/documents/view/pages/documents_page.dart index addcfad..ea519a6 100644 --- a/lib/features/documents/view/pages/documents_page.dart +++ b/lib/features/documents/view/pages/documents_page.dart @@ -25,8 +25,8 @@ import 'package:paperless_mobile/features/saved_view/cubit/saved_view_cubit.dart import 'package:paperless_mobile/features/tasks/model/pending_tasks_notifier.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; import 'package:paperless_mobile/helpers/message_helpers.dart'; -import 'package:paperless_mobile/routes/typed/branches/documents_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/documents_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; import 'package:sliver_tools/sliver_tools.dart'; class DocumentFilterIntent { diff --git a/lib/features/documents/view/widgets/document_preview.dart b/lib/features/documents/view/widgets/document_preview.dart index c3633b5..cd260d3 100644 --- a/lib/features/documents/view/widgets/document_preview.dart +++ b/lib/features/documents/view/widgets/document_preview.dart @@ -3,8 +3,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_cache_manager/flutter_cache_manager.dart'; import 'package:paperless_api/paperless_api.dart'; import 'package:paperless_mobile/helpers/connectivity_aware_action_wrapper.dart'; -import 'package:paperless_mobile/routes/typed/branches/documents_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/documents_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; import 'package:provider/provider.dart'; import 'package:shimmer/shimmer.dart'; diff --git a/lib/features/documents/view/widgets/saved_views/saved_view_chip.dart b/lib/features/documents/view/widgets/saved_views/saved_view_chip.dart index 56f4dea..08103b6 100644 --- a/lib/features/documents/view/widgets/saved_views/saved_view_chip.dart +++ b/lib/features/documents/view/widgets/saved_views/saved_view_chip.dart @@ -3,8 +3,8 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:paperless_api/paperless_api.dart'; import 'package:paperless_mobile/core/extensions/flutter_extensions.dart'; -import 'package:paperless_mobile/routes/typed/branches/saved_views_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/saved_views_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; class SavedViewChip extends StatefulWidget { final SavedView view; diff --git a/lib/features/documents/view/widgets/saved_views/saved_views_widget.dart b/lib/features/documents/view/widgets/saved_views/saved_views_widget.dart index 8df1074..aae2c33 100644 --- a/lib/features/documents/view/widgets/saved_views/saved_views_widget.dart +++ b/lib/features/documents/view/widgets/saved_views/saved_views_widget.dart @@ -7,8 +7,8 @@ import 'package:paperless_mobile/features/documents/view/widgets/saved_views/sav import 'package:paperless_mobile/features/saved_view/cubit/saved_view_cubit.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; import 'package:paperless_mobile/helpers/connectivity_aware_action_wrapper.dart'; -import 'package:paperless_mobile/routes/typed/branches/saved_views_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/saved_views_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; class SavedViewsWidget extends StatefulWidget { final void Function(SavedView view) onViewSelected; diff --git a/lib/features/documents/view/widgets/selection/document_selection_sliver_app_bar.dart b/lib/features/documents/view/widgets/selection/document_selection_sliver_app_bar.dart index 4f5457c..f06af49 100644 --- a/lib/features/documents/view/widgets/selection/document_selection_sliver_app_bar.dart +++ b/lib/features/documents/view/widgets/selection/document_selection_sliver_app_bar.dart @@ -6,8 +6,8 @@ import 'package:paperless_mobile/features/documents/cubit/documents_cubit.dart'; import 'package:paperless_mobile/features/documents/view/widgets/selection/bulk_delete_confirmation_dialog.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; import 'package:paperless_mobile/helpers/message_helpers.dart'; -import 'package:paperless_mobile/routes/typed/branches/documents_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/documents_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; class DocumentSelectionSliverAppBar extends StatelessWidget { final DocumentsState state; diff --git a/lib/features/inbox/view/widgets/inbox_item.dart b/lib/features/inbox/view/widgets/inbox_item.dart index 3b4c569..1b74cc9 100644 --- a/lib/features/inbox/view/widgets/inbox_item.dart +++ b/lib/features/inbox/view/widgets/inbox_item.dart @@ -16,8 +16,8 @@ import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_widget.d import 'package:paperless_mobile/features/labels/view/widgets/label_text.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; import 'package:paperless_mobile/helpers/connectivity_aware_action_wrapper.dart'; -import 'package:paperless_mobile/routes/typed/branches/documents_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/documents_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; class InboxItemPlaceholder extends StatelessWidget { const InboxItemPlaceholder({super.key}); diff --git a/lib/features/labels/tags/view/widgets/fullscreen_tags_form.dart b/lib/features/labels/tags/view/widgets/fullscreen_tags_form.dart index 40d0c1c..e8af438 100644 --- a/lib/features/labels/tags/view/widgets/fullscreen_tags_form.dart +++ b/lib/features/labels/tags/view/widgets/fullscreen_tags_form.dart @@ -4,8 +4,8 @@ import 'package:paperless_api/paperless_api.dart'; import 'package:paperless_mobile/core/extensions/flutter_extensions.dart'; import 'package:paperless_mobile/features/edit_label/view/impl/add_tag_page.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; -import 'package:paperless_mobile/routes/typed/branches/labels_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/labels_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; class FullscreenTagsForm extends StatefulWidget { final TagsQuery? initialValue; diff --git a/lib/features/labels/view/pages/labels_page.dart b/lib/features/labels/view/pages/labels_page.dart index 1fbcdf3..0c644ed 100644 --- a/lib/features/labels/view/pages/labels_page.dart +++ b/lib/features/labels/view/pages/labels_page.dart @@ -15,8 +15,8 @@ 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:paperless_mobile/helpers/connectivity_aware_action_wrapper.dart'; -import 'package:paperless_mobile/routes/typed/branches/labels_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/labels_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; class LabelsPage extends StatefulWidget { const LabelsPage({Key? key}) : super(key: key); diff --git a/lib/features/labels/view/widgets/label_item.dart b/lib/features/labels/view/widgets/label_item.dart index edc2214..76f2a36 100644 --- a/lib/features/labels/view/widgets/label_item.dart +++ b/lib/features/labels/view/widgets/label_item.dart @@ -3,8 +3,8 @@ 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/helpers/format_helpers.dart'; -import 'package:paperless_mobile/routes/typed/branches/labels_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/labels_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; class LabelItem extends StatelessWidget { final T label; diff --git a/lib/features/landing/view/landing_page.dart b/lib/features/landing/view/landing_page.dart index 4df3007..f3d4b4d 100644 --- a/lib/features/landing/view/landing_page.dart +++ b/lib/features/landing/view/landing_page.dart @@ -11,11 +11,11 @@ import 'package:paperless_mobile/features/landing/view/widgets/mime_types_pie_ch import 'package:paperless_mobile/features/saved_view/cubit/saved_view_cubit.dart'; import 'package:paperless_mobile/features/saved_view_details/view/saved_view_preview.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; -import 'package:paperless_mobile/routes/typed/branches/documents_route.dart'; -import 'package:paperless_mobile/routes/typed/branches/inbox_route.dart'; -import 'package:paperless_mobile/routes/typed/branches/saved_views_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; -import 'package:paperless_mobile/routes/typed/top_level/changelog_route.dart'; +import 'package:paperless_mobile/routing/routes/documents_route.dart'; +import 'package:paperless_mobile/routing/routes/inbox_route.dart'; +import 'package:paperless_mobile/routing/routes/saved_views_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/changelog_route.dart'; import 'package:shared_preferences/shared_preferences.dart'; class LandingPage extends StatefulWidget { diff --git a/lib/features/linked_documents/view/linked_documents_page.dart b/lib/features/linked_documents/view/linked_documents_page.dart index 4068b13..84368fe 100644 --- a/lib/features/linked_documents/view/linked_documents_page.dart +++ b/lib/features/linked_documents/view/linked_documents_page.dart @@ -7,8 +7,8 @@ import 'package:paperless_mobile/features/documents/view/widgets/selection/view_ import 'package:paperless_mobile/features/linked_documents/cubit/linked_documents_cubit.dart'; import 'package:paperless_mobile/features/paged_document_view/view/document_paging_view_mixin.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; -import 'package:paperless_mobile/routes/typed/branches/documents_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/documents_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; class LinkedDocumentsPage extends StatefulWidget { const LinkedDocumentsPage({super.key}); diff --git a/lib/features/login/view/login_page.dart b/lib/features/login/view/login_page.dart index 2e63026..020ce8f 100644 --- a/lib/features/login/view/login_page.dart +++ b/lib/features/login/view/login_page.dart @@ -10,7 +10,7 @@ import 'package:paperless_mobile/features/login/model/login_form_credentials.dar import 'package:paperless_mobile/features/login/view/add_account_page.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; import 'package:paperless_mobile/helpers/message_helpers.dart'; -import 'package:paperless_mobile/routes/typed/top_level/login_route.dart'; +import 'package:paperless_mobile/routing/routes/login_route.dart'; class LoginPage extends StatelessWidget { final String? initialServerUrl; diff --git a/lib/features/login/view/login_to_existing_account_page.dart b/lib/features/login/view/login_to_existing_account_page.dart index c4aa7de..17984bd 100644 --- a/lib/features/login/view/login_to_existing_account_page.dart +++ b/lib/features/login/view/login_to_existing_account_page.dart @@ -5,8 +5,8 @@ import 'package:paperless_mobile/core/database/hive/hive_extensions.dart'; import 'package:paperless_mobile/features/login/cubit/authentication_cubit.dart'; import 'package:paperless_mobile/features/users/view/widgets/user_account_list_tile.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; -import 'package:paperless_mobile/routes/typed/top_level/login_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/login_route.dart'; class LoginToExistingAccountPage extends StatelessWidget { const LoginToExistingAccountPage({super.key}); diff --git a/lib/features/login/view/verify_identity_page.dart b/lib/features/login/view/verify_identity_page.dart index 00ed75c..c9e5295 100644 --- a/lib/features/login/view/verify_identity_page.dart +++ b/lib/features/login/view/verify_identity_page.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:paperless_mobile/core/extensions/flutter_extensions.dart'; import 'package:paperless_mobile/features/login/cubit/authentication_cubit.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; -import 'package:paperless_mobile/routes/typed/top_level/login_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/login_route.dart'; import 'package:provider/provider.dart'; class VerifyIdentityPage extends StatelessWidget { diff --git a/lib/features/saved_view_details/view/saved_view_preview.dart b/lib/features/saved_view_details/view/saved_view_preview.dart index 324a15b..c10bf66 100644 --- a/lib/features/saved_view_details/view/saved_view_preview.dart +++ b/lib/features/saved_view_details/view/saved_view_preview.dart @@ -8,8 +8,8 @@ import 'package:paperless_mobile/features/documents/view/widgets/items/document_ import 'package:paperless_mobile/features/landing/view/widgets/expansion_card.dart'; import 'package:paperless_mobile/features/saved_view_details/cubit/saved_view_preview_cubit.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; -import 'package:paperless_mobile/routes/typed/branches/documents_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/documents_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; import 'package:provider/provider.dart'; class SavedViewPreview extends StatelessWidget { diff --git a/lib/features/settings/view/manage_accounts_page.dart b/lib/features/settings/view/manage_accounts_page.dart index 1c0ac86..c34474b 100644 --- a/lib/features/settings/view/manage_accounts_page.dart +++ b/lib/features/settings/view/manage_accounts_page.dart @@ -7,8 +7,8 @@ import 'package:paperless_mobile/features/settings/view/dialogs/switch_account_d import 'package:paperless_mobile/features/settings/view/widgets/global_settings_builder.dart'; import 'package:paperless_mobile/features/users/view/widgets/user_account_list_tile.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; -import 'package:paperless_mobile/routes/typed/top_level/add_account_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/add_account_route.dart'; import 'package:provider/provider.dart'; class ManageAccountsPage extends StatelessWidget { diff --git a/lib/features/settings/view/widgets/app_logs_tile.dart b/lib/features/settings/view/widgets/app_logs_tile.dart index aee7d55..928a353 100644 --- a/lib/features/settings/view/widgets/app_logs_tile.dart +++ b/lib/features/settings/view/widgets/app_logs_tile.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; -import 'package:paperless_mobile/routes/typed/top_level/app_logs_route.dart'; +import 'package:paperless_mobile/routing/routes/app_logs_route.dart'; class AppLogsTile extends StatelessWidget { const AppLogsTile({super.key}); diff --git a/lib/features/settings/view/widgets/changelogs_tile.dart b/lib/features/settings/view/widgets/changelogs_tile.dart index 747b530..b0da22e 100644 --- a/lib/features/settings/view/widgets/changelogs_tile.dart +++ b/lib/features/settings/view/widgets/changelogs_tile.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; -import 'package:paperless_mobile/routes/typed/top_level/changelog_route.dart'; +import 'package:paperless_mobile/routing/routes/changelog_route.dart'; class ChangelogsTile extends StatelessWidget { const ChangelogsTile({super.key}); diff --git a/lib/features/sharing/view/widgets/event_listener_shell.dart b/lib/features/sharing/view/widgets/event_listener_shell.dart index 1566e76..19f1aed 100644 --- a/lib/features/sharing/view/widgets/event_listener_shell.dart +++ b/lib/features/sharing/view/widgets/event_listener_shell.dart @@ -22,8 +22,8 @@ import 'package:paperless_mobile/features/sharing/view/dialog/discard_shared_fil import 'package:paperless_mobile/features/tasks/model/pending_tasks_notifier.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; import 'package:paperless_mobile/helpers/message_helpers.dart'; -import 'package:paperless_mobile/routes/typed/branches/scanner_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/scanner_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; import 'package:path/path.dart' as p; import 'package:receive_sharing_intent/receive_sharing_intent.dart'; diff --git a/lib/features/similar_documents/view/similar_documents_view.dart b/lib/features/similar_documents/view/similar_documents_view.dart index 4f9c14b..21ccd2c 100644 --- a/lib/features/similar_documents/view/similar_documents_view.dart +++ b/lib/features/similar_documents/view/similar_documents_view.dart @@ -9,8 +9,8 @@ import 'package:paperless_mobile/features/paged_document_view/view/document_pagi import 'package:paperless_mobile/features/similar_documents/cubit/similar_documents_cubit.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; import 'package:paperless_mobile/helpers/message_helpers.dart'; -import 'package:paperless_mobile/routes/typed/branches/documents_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/documents_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; class SimilarDocumentsView extends StatefulWidget { final ScrollController pagingScrollController; diff --git a/lib/main.dart b/lib/main.dart index ce8b75b..e657389 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -41,14 +41,14 @@ import 'package:paperless_mobile/features/login/services/authentication_service. import 'package:paperless_mobile/features/notifications/services/local_notification_service.dart'; import 'package:paperless_mobile/features/settings/view/widgets/global_settings_builder.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; -import 'package:paperless_mobile/routes/navigation_keys.dart'; -import 'package:paperless_mobile/routes/typed/branches/landing_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart'; -import 'package:paperless_mobile/routes/typed/top_level/add_account_route.dart'; -import 'package:paperless_mobile/routes/typed/top_level/app_logs_route.dart'; -import 'package:paperless_mobile/routes/typed/top_level/changelog_route.dart'; -import 'package:paperless_mobile/routes/typed/top_level/logging_out_route.dart'; -import 'package:paperless_mobile/routes/typed/top_level/login_route.dart'; +import 'package:paperless_mobile/routing/navigation_keys.dart'; +import 'package:paperless_mobile/routing/routes/landing_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/authenticated_route.dart'; +import 'package:paperless_mobile/routing/routes/add_account_route.dart'; +import 'package:paperless_mobile/routing/routes/app_logs_route.dart'; +import 'package:paperless_mobile/routing/routes/changelog_route.dart'; +import 'package:paperless_mobile/routing/routes/logging_out_route.dart'; +import 'package:paperless_mobile/routing/routes/login_route.dart'; import 'package:paperless_mobile/theme.dart'; import 'package:path_provider/path_provider.dart'; import 'package:pretty_dio_logger/pretty_dio_logger.dart'; @@ -104,7 +104,6 @@ Future performMigrations() async { Future _initHive() async { await Hive.initFlutter(); - await performMigrations(); registerHiveAdapters(); await Hive.openBox(HiveBoxes.localUserAccount); diff --git a/lib/routes/navigation_keys.dart b/lib/routing/navigation_keys.dart similarity index 100% rename from lib/routes/navigation_keys.dart rename to lib/routing/navigation_keys.dart diff --git a/lib/routes/routes.dart b/lib/routing/routes.dart similarity index 100% rename from lib/routes/routes.dart rename to lib/routing/routes.dart diff --git a/lib/routes/typed/top_level/add_account_route.dart b/lib/routing/routes/add_account_route.dart similarity index 96% rename from lib/routes/typed/top_level/add_account_route.dart rename to lib/routing/routes/add_account_route.dart index 335e6b8..9f7d700 100644 --- a/lib/routes/typed/top_level/add_account_route.dart +++ b/lib/routing/routes/add_account_route.dart @@ -10,8 +10,8 @@ import 'package:paperless_mobile/features/login/view/add_account_page.dart'; import 'package:paperless_mobile/features/settings/view/dialogs/switch_account_dialog.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; import 'package:paperless_mobile/helpers/message_helpers.dart'; -import 'package:paperless_mobile/routes/navigation_keys.dart'; -import 'package:paperless_mobile/routes/routes.dart'; +import 'package:paperless_mobile/routing/navigation_keys.dart'; +import 'package:paperless_mobile/routing/routes.dart'; part 'add_account_route.g.dart'; diff --git a/lib/routes/typed/top_level/app_logs_route.dart b/lib/routing/routes/app_logs_route.dart similarity index 93% rename from lib/routes/typed/top_level/app_logs_route.dart rename to lib/routing/routes/app_logs_route.dart index 75121ad..1a614f1 100644 --- a/lib/routes/typed/top_level/app_logs_route.dart +++ b/lib/routing/routes/app_logs_route.dart @@ -3,7 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; import 'package:paperless_mobile/features/logging/cubit/app_logs_cubit.dart'; import 'package:paperless_mobile/features/logging/view/app_logs_page.dart'; -import 'package:paperless_mobile/routes/navigation_keys.dart'; +import 'package:paperless_mobile/routing/navigation_keys.dart'; import 'package:paperless_mobile/theme.dart'; part 'app_logs_route.g.dart'; diff --git a/lib/routes/typed/top_level/changelog_route.dart b/lib/routing/routes/changelog_route.dart similarity index 79% rename from lib/routes/typed/top_level/changelog_route.dart rename to lib/routing/routes/changelog_route.dart index ad56cf5..cb91225 100644 --- a/lib/routes/typed/top_level/changelog_route.dart +++ b/lib/routing/routes/changelog_route.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:paperless_mobile/features/changelogs/view/changelog_dialog.dart'; -import 'package:paperless_mobile/routes/navigation_keys.dart'; -import 'package:paperless_mobile/routes/utils/dialog_page.dart'; +import 'package:paperless_mobile/routing/navigation_keys.dart'; +import 'package:paperless_mobile/routing/utils/dialog_page.dart'; part 'changelog_route.g.dart'; diff --git a/lib/routes/typed/branches/documents_route.dart b/lib/routing/routes/documents_route.dart similarity index 99% rename from lib/routes/typed/branches/documents_route.dart rename to lib/routing/routes/documents_route.dart index 755bc25..1de12b6 100644 --- a/lib/routes/typed/branches/documents_route.dart +++ b/lib/routing/routes/documents_route.dart @@ -13,7 +13,7 @@ import 'package:paperless_mobile/features/document_edit/view/document_edit_page. import 'package:paperless_mobile/features/documents/view/pages/document_view.dart'; import 'package:paperless_mobile/features/documents/view/pages/documents_page.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; -import 'package:paperless_mobile/routes/navigation_keys.dart'; +import 'package:paperless_mobile/routing/navigation_keys.dart'; import 'package:paperless_mobile/theme.dart'; class DocumentsBranch extends StatefulShellBranchData { diff --git a/lib/routes/typed/branches/inbox_route.dart b/lib/routing/routes/inbox_route.dart similarity index 87% rename from lib/routes/typed/branches/inbox_route.dart rename to lib/routing/routes/inbox_route.dart index 9eb1f3c..600b73f 100644 --- a/lib/routes/typed/branches/inbox_route.dart +++ b/lib/routing/routes/inbox_route.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:paperless_mobile/features/inbox/view/pages/inbox_page.dart'; -import 'package:paperless_mobile/routes/navigation_keys.dart'; +import 'package:paperless_mobile/routing/navigation_keys.dart'; class InboxBranch extends StatefulShellBranchData { static final GlobalKey $navigatorKey = inboxNavigatorKey; diff --git a/lib/routes/typed/branches/labels_route.dart b/lib/routing/routes/labels_route.dart similarity index 98% rename from lib/routes/typed/branches/labels_route.dart rename to lib/routing/routes/labels_route.dart index c42b04f..b931d2a 100644 --- a/lib/routes/typed/branches/labels_route.dart +++ b/lib/routing/routes/labels_route.dart @@ -13,8 +13,7 @@ import 'package:paperless_mobile/features/edit_label/view/impl/edit_tag_page.dar import 'package:paperless_mobile/features/labels/view/pages/labels_page.dart'; import 'package:paperless_mobile/features/linked_documents/cubit/linked_documents_cubit.dart'; import 'package:paperless_mobile/features/linked_documents/view/linked_documents_page.dart'; -import 'package:paperless_mobile/routes/navigation_keys.dart'; - +import 'package:paperless_mobile/routing/navigation_keys.dart'; class LabelsBranch extends StatefulShellBranchData { static final GlobalKey $navigatorKey = labelsNavigatorKey; const LabelsBranch(); diff --git a/lib/routes/typed/branches/landing_route.dart b/lib/routing/routes/landing_route.dart similarity index 80% rename from lib/routes/typed/branches/landing_route.dart rename to lib/routing/routes/landing_route.dart index 1411760..4ded8c1 100644 --- a/lib/routes/typed/branches/landing_route.dart +++ b/lib/routing/routes/landing_route.dart @@ -1,8 +1,7 @@ import 'package:flutter/widgets.dart'; import 'package:go_router/go_router.dart'; import 'package:paperless_mobile/features/landing/view/landing_page.dart'; -import 'package:paperless_mobile/routes/navigation_keys.dart'; -import 'package:paperless_mobile/routes/routes.dart'; +import 'package:paperless_mobile/routing/navigation_keys.dart'; class LandingBranch extends StatefulShellBranchData { static final GlobalKey $navigatorKey = landingNavigatorKey; diff --git a/lib/routes/typed/top_level/logging_out_route.dart b/lib/routing/routes/logging_out_route.dart similarity index 84% rename from lib/routes/typed/top_level/logging_out_route.dart rename to lib/routing/routes/logging_out_route.dart index d2151cd..077a8a9 100644 --- a/lib/routes/typed/top_level/logging_out_route.dart +++ b/lib/routing/routes/logging_out_route.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; -import 'package:paperless_mobile/routes/navigation_keys.dart'; -import 'package:paperless_mobile/routes/routes.dart'; +import 'package:paperless_mobile/routing/navigation_keys.dart'; +import 'package:paperless_mobile/routing/routes.dart'; part 'logging_out_route.g.dart'; diff --git a/lib/routes/typed/top_level/login_route.dart b/lib/routing/routes/login_route.dart similarity index 97% rename from lib/routes/typed/top_level/login_route.dart rename to lib/routing/routes/login_route.dart index 5da96da..835ba58 100644 --- a/lib/routes/typed/top_level/login_route.dart +++ b/lib/routing/routes/login_route.dart @@ -12,8 +12,8 @@ import 'package:paperless_mobile/features/login/view/login_to_existing_account_p import 'package:paperless_mobile/features/login/view/verify_identity_page.dart'; import 'package:paperless_mobile/features/login/view/widgets/login_transition_page.dart'; import 'package:paperless_mobile/generated/l10n/app_localizations.dart'; -import 'package:paperless_mobile/routes/navigation_keys.dart'; -import 'package:paperless_mobile/routes/routes.dart'; +import 'package:paperless_mobile/routing/navigation_keys.dart'; +import 'package:paperless_mobile/routing/routes.dart'; part 'login_route.g.dart'; @TypedGoRoute( diff --git a/lib/routes/typed/branches/saved_views_route.dart b/lib/routing/routes/saved_views_route.dart similarity index 100% rename from lib/routes/typed/branches/saved_views_route.dart rename to lib/routing/routes/saved_views_route.dart diff --git a/lib/routes/typed/branches/scanner_route.dart b/lib/routing/routes/scanner_route.dart similarity index 93% rename from lib/routes/typed/branches/scanner_route.dart rename to lib/routing/routes/scanner_route.dart index be7f59e..c2f3dde 100644 --- a/lib/routes/typed/branches/scanner_route.dart +++ b/lib/routing/routes/scanner_route.dart @@ -7,8 +7,8 @@ import 'package:go_router/go_router.dart'; import 'package:paperless_mobile/features/document_scan/view/scanner_page.dart'; import 'package:paperless_mobile/features/document_upload/cubit/document_upload_cubit.dart'; import 'package:paperless_mobile/features/document_upload/view/document_upload_preparation_page.dart'; -import 'package:paperless_mobile/routes/navigation_keys.dart'; -import 'package:paperless_mobile/routes/routes.dart'; +import 'package:paperless_mobile/routing/navigation_keys.dart'; +import 'package:paperless_mobile/routing/routes.dart'; class ScannerBranch extends StatefulShellBranchData { static final GlobalKey $navigatorKey = scannerNavigatorKey; diff --git a/lib/routes/typed/top_level/settings_route.dart b/lib/routing/routes/settings_route.dart similarity index 85% rename from lib/routes/typed/top_level/settings_route.dart rename to lib/routing/routes/settings_route.dart index c992695..7f2b79c 100644 --- a/lib/routes/typed/top_level/settings_route.dart +++ b/lib/routing/routes/settings_route.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:go_router/go_router.dart'; import 'package:paperless_mobile/features/settings/view/settings_page.dart'; -import 'package:paperless_mobile/routes/navigation_keys.dart'; -import 'package:paperless_mobile/routes/routes.dart'; +import 'package:paperless_mobile/routing/navigation_keys.dart'; +import 'package:paperless_mobile/routing/routes.dart'; import 'package:paperless_mobile/theme.dart'; class SettingsRoute extends GoRouteData { diff --git a/lib/routes/typed/shells/authenticated_route.dart b/lib/routing/routes/shells/authenticated_route.dart similarity index 85% rename from lib/routes/typed/shells/authenticated_route.dart rename to lib/routing/routes/shells/authenticated_route.dart index 3762cbe..136932f 100644 --- a/lib/routes/typed/shells/authenticated_route.dart +++ b/lib/routing/routes/shells/authenticated_route.dart @@ -12,17 +12,17 @@ import 'package:paperless_mobile/core/factory/paperless_api_factory.dart'; import 'package:paperless_mobile/features/home/view/home_shell_widget.dart'; import 'package:paperless_mobile/features/sharing/cubit/receive_share_cubit.dart'; import 'package:paperless_mobile/features/sharing/view/widgets/event_listener_shell.dart'; -import 'package:paperless_mobile/routes/navigation_keys.dart'; -import 'package:paperless_mobile/routes/routes.dart'; -import 'package:paperless_mobile/routes/typed/branches/documents_route.dart'; -import 'package:paperless_mobile/routes/typed/branches/inbox_route.dart'; -import 'package:paperless_mobile/routes/typed/branches/labels_route.dart'; -import 'package:paperless_mobile/routes/typed/branches/landing_route.dart'; -import 'package:paperless_mobile/routes/typed/branches/saved_views_route.dart'; -import 'package:paperless_mobile/routes/typed/branches/scanner_route.dart'; -import 'package:paperless_mobile/routes/typed/branches/upload_queue_route.dart'; -import 'package:paperless_mobile/routes/typed/shells/scaffold_shell_route.dart'; -import 'package:paperless_mobile/routes/typed/top_level/settings_route.dart'; +import 'package:paperless_mobile/routing/navigation_keys.dart'; +import 'package:paperless_mobile/routing/routes.dart'; +import 'package:paperless_mobile/routing/routes/documents_route.dart'; +import 'package:paperless_mobile/routing/routes/inbox_route.dart'; +import 'package:paperless_mobile/routing/routes/labels_route.dart'; +import 'package:paperless_mobile/routing/routes/landing_route.dart'; +import 'package:paperless_mobile/routing/routes/saved_views_route.dart'; +import 'package:paperless_mobile/routing/routes/scanner_route.dart'; +import 'package:paperless_mobile/routing/routes/upload_queue_route.dart'; +import 'package:paperless_mobile/routing/routes/shells/scaffold_shell_route.dart'; +import 'package:paperless_mobile/routing/routes/settings_route.dart'; import 'package:provider/provider.dart'; /// Key used to access diff --git a/lib/routes/typed/shells/scaffold_shell_route.dart b/lib/routing/routes/shells/scaffold_shell_route.dart similarity index 100% rename from lib/routes/typed/shells/scaffold_shell_route.dart rename to lib/routing/routes/shells/scaffold_shell_route.dart diff --git a/lib/routes/typed/branches/upload_queue_route.dart b/lib/routing/routes/upload_queue_route.dart similarity index 78% rename from lib/routes/typed/branches/upload_queue_route.dart rename to lib/routing/routes/upload_queue_route.dart index 0c3ebb2..05b5980 100644 --- a/lib/routes/typed/branches/upload_queue_route.dart +++ b/lib/routing/routes/upload_queue_route.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:paperless_mobile/features/sharing/view/consumption_queue_view.dart'; -import 'package:paperless_mobile/routes/navigation_keys.dart'; -import 'package:paperless_mobile/routes/routes.dart'; +import 'package:paperless_mobile/routing/navigation_keys.dart'; +import 'package:paperless_mobile/routing/routes.dart'; class UploadQueueRoute extends GoRouteData { static final GlobalKey $parentNavigatorKey = diff --git a/lib/routes/utils/dialog_page.dart b/lib/routing/utils/dialog_page.dart similarity index 100% rename from lib/routes/utils/dialog_page.dart rename to lib/routing/utils/dialog_page.dart