From 090592e5ae8f571126fb7299a197232eb16f1cb7 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 5 May 2024 13:14:49 -0500 Subject: [PATCH] refactor(mobile): pages (#9246) * refactor(mobile): pages * refactor * album pages * pages * pages * use *.page.dart * representation * put back module --- .../modules/album/ui/album_viewer_appbar.dart | 2 +- .../lib/modules/archive/ui/store_ui_here.txt | 0 .../lib/modules/map/widgets/map_app_bar.dart | 2 +- .../lib/modules/memories/ui/memory_card.dart | 2 +- .../settings/views/settings_sub_page.dart | 22 ---- .../{ui => widgets}/advanced_settings.dart | 8 +- .../asset_list_group_settings.dart | 4 +- .../asset_list_layout_settings.dart | 6 +- .../asset_list_settings.dart | 6 +- .../backup_settings/background_settings.dart | 6 +- .../backup_settings/backup_settings.dart | 10 +- .../backup_settings/foreground_settings.dart | 2 +- .../image_viewer_quality_setting.dart | 4 +- .../{ui => widgets}/language_settings.dart | 0 .../local_storage_settings.dart | 0 .../{ui => widgets}/notification_setting.dart | 8 +- .../preference_settings/haptic_setting.dart | 4 +- .../preference_setting.dart | 6 +- .../preference_settings/theme_setting.dart | 4 +- .../settings_button_list_tile.dart | 0 .../settings_radio_list_tile.dart | 0 .../settings_slider_list_tile.dart | 0 .../settings_sub_page_scaffold.dart | 0 .../{ui => widgets}/settings_sub_title.dart | 0 .../settings_switch_list_tile.dart | 0 .../backup/album_preview.page.dart} | 0 .../backup/backup_album_selection.page.dart} | 0 .../backup/backup_controller.page.dart} | 0 .../backup/backup_options.page.dart} | 2 +- .../backup/failed_backup_status.page.dart} | 0 .../common/activities.page.dart} | 0 ...dditional_shared_user_selection.page.dart} | 7 +- .../common/album_asset_selection.page.dart} | 4 +- .../common/album_options.page.dart} | 2 +- .../album_shared_user_selection.page.dart} | 4 +- .../common/album_viewer.page.dart} | 6 +- .../common/app_log.page.dart} | 0 .../common/app_log_detail.page.dart} | 0 .../common/create_album.page.dart} | 4 +- .../common/gallery_viewer.page.dart} | 2 +- .../common/settings.page.dart} | 32 ++++-- .../common/splash_screen.page.dart} | 0 .../common/tab_controller.page.dart} | 2 +- .../common/video_viewer.page.dart} | 0 .../library/archive.page.dart} | 0 .../library/favorite.page.dart} | 0 .../library/library.page.dart} | 0 .../library/trash.page.dart} | 2 +- .../login/change_password.page.dart} | 0 .../login/login.page.dart} | 0 .../permission_onboarding.page.dart} | 0 .../photos/memory.page.dart} | 0 .../photos/photos.page.dart} | 4 +- .../search/all_motion_videos.page.dart} | 0 .../search/all_people.page.dart} | 0 .../search/all_places.page.dart} | 0 .../search/all_videos.page.dart} | 0 .../search/map/map.page.dart} | 2 +- .../search/map/map_location_picker.page.dart} | 0 .../search/person_result.page.dart} | 0 .../search/recently_added.page.dart} | 0 .../search/search.page.dart} | 0 .../search/search_input.page.dart} | 0 .../sharing/partner/partner.page.dart} | 0 .../sharing/partner/partner_detail.page.dart} | 0 .../shared_link/shared_link.page.dart} | 0 .../shared_link/shared_link_edit.page.dart} | 0 .../sharing/sharing.page.dart} | 0 mobile/lib/routing/router.dart | 102 +++++++++--------- mobile/lib/routing/router.gr.dart | 56 +++++----- .../ui/asset_grid/multiselect_grid.dart | 2 +- .../immich_loading_overlay.dart | 0 .../activity/activities_page_test.dart | 2 +- 73 files changed, 166 insertions(+), 165 deletions(-) delete mode 100644 mobile/lib/modules/archive/ui/store_ui_here.txt delete mode 100644 mobile/lib/modules/settings/views/settings_sub_page.dart rename mobile/lib/modules/settings/{ui => widgets}/advanced_settings.dart (87%) rename mobile/lib/modules/settings/{ui => widgets}/asset_list_settings/asset_list_group_settings.dart (91%) rename mobile/lib/modules/settings/{ui => widgets}/asset_list_settings/asset_list_layout_settings.dart (85%) rename mobile/lib/modules/settings/{ui => widgets}/asset_list_settings/asset_list_settings.dart (79%) rename mobile/lib/modules/settings/{ui => widgets}/backup_settings/background_settings.dart (96%) rename mobile/lib/modules/settings/{ui => widgets}/backup_settings/backup_settings.dart (83%) rename mobile/lib/modules/settings/{ui => widgets}/backup_settings/foreground_settings.dart (93%) rename mobile/lib/modules/settings/{ui => widgets}/image_viewer_quality_setting.dart (88%) rename mobile/lib/modules/settings/{ui => widgets}/language_settings.dart (100%) rename mobile/lib/modules/settings/{ui => widgets}/local_storage_settings.dart (100%) rename mobile/lib/modules/settings/{ui => widgets}/notification_setting.dart (92%) rename mobile/lib/modules/settings/{ui => widgets}/preference_settings/haptic_setting.dart (87%) rename mobile/lib/modules/settings/{ui => widgets}/preference_settings/preference_setting.dart (55%) rename mobile/lib/modules/settings/{ui => widgets}/preference_settings/theme_setting.dart (94%) rename mobile/lib/modules/settings/{ui => widgets}/settings_button_list_tile.dart (100%) rename mobile/lib/modules/settings/{ui => widgets}/settings_radio_list_tile.dart (100%) rename mobile/lib/modules/settings/{ui => widgets}/settings_slider_list_tile.dart (100%) rename mobile/lib/modules/settings/{ui => widgets}/settings_sub_page_scaffold.dart (100%) rename mobile/lib/modules/settings/{ui => widgets}/settings_sub_title.dart (100%) rename mobile/lib/modules/settings/{ui => widgets}/settings_switch_list_tile.dart (100%) rename mobile/lib/{modules/backup/views/album_preview_page.dart => pages/backup/album_preview.page.dart} (100%) rename mobile/lib/{modules/backup/views/backup_album_selection_page.dart => pages/backup/backup_album_selection.page.dart} (100%) rename mobile/lib/{modules/backup/views/backup_controller_page.dart => pages/backup/backup_controller.page.dart} (100%) rename mobile/lib/{modules/backup/views/backup_options_page.dart => pages/backup/backup_options.page.dart} (87%) rename mobile/lib/{modules/backup/views/failed_backup_status_page.dart => pages/backup/failed_backup_status.page.dart} (100%) rename mobile/lib/{modules/activities/views/activities_page.dart => pages/common/activities.page.dart} (100%) rename mobile/lib/{modules/album/views/select_additional_user_for_sharing_page.dart => pages/common/album_additional_shared_user_selection.page.dart} (96%) rename mobile/lib/{modules/album/views/asset_selection_page.dart => pages/common/album_asset_selection.page.dart} (97%) rename mobile/lib/{modules/album/views/album_options_part.dart => pages/common/album_options.page.dart} (98%) rename mobile/lib/{modules/album/views/select_user_for_sharing_page.dart => pages/common/album_shared_user_selection.page.dart} (97%) rename mobile/lib/{modules/album/views/album_viewer_page.dart => pages/common/album_viewer.page.dart} (98%) rename mobile/lib/{shared/views/app_log_page.dart => pages/common/app_log.page.dart} (100%) rename mobile/lib/{shared/views/app_log_detail_page.dart => pages/common/app_log_detail.page.dart} (100%) rename mobile/lib/{modules/album/views/create_album_page.dart => pages/common/create_album.page.dart} (98%) rename mobile/lib/{modules/asset_viewer/views/gallery_viewer.dart => pages/common/gallery_viewer.page.dart} (99%) rename mobile/lib/{modules/settings/views/settings_page.dart => pages/common/settings.page.dart} (78%) rename mobile/lib/{shared/views/splash_screen.dart => pages/common/splash_screen.page.dart} (100%) rename mobile/lib/{shared/views/tab_controller_page.dart => pages/common/tab_controller.page.dart} (99%) rename mobile/lib/{modules/asset_viewer/views/video_viewer_page.dart => pages/common/video_viewer.page.dart} (100%) rename mobile/lib/{modules/archive/views/archive_page.dart => pages/library/archive.page.dart} (100%) rename mobile/lib/{modules/favorite/views/favorites_page.dart => pages/library/favorite.page.dart} (100%) rename mobile/lib/{modules/album/views/library_page.dart => pages/library/library.page.dart} (100%) rename mobile/lib/{modules/trash/views/trash_page.dart => pages/library/trash.page.dart} (99%) rename mobile/lib/{modules/login/views/change_password_page.dart => pages/login/change_password.page.dart} (100%) rename mobile/lib/{modules/login/views/login_page.dart => pages/login/login.page.dart} (100%) rename mobile/lib/{modules/onboarding/views/permission_onboarding_page.dart => pages/onboarding/permission_onboarding.page.dart} (100%) rename mobile/lib/{modules/memories/views/memory_page.dart => pages/photos/memory.page.dart} (100%) rename mobile/lib/{modules/home/views/home_page.dart => pages/photos/photos.page.dart} (98%) rename mobile/lib/{modules/search/views/all_motion_videos_page.dart => pages/search/all_motion_videos.page.dart} (100%) rename mobile/lib/{modules/search/views/all_people_page.dart => pages/search/all_people.page.dart} (100%) rename mobile/lib/{modules/search/views/all_places_page.dart => pages/search/all_places.page.dart} (100%) rename mobile/lib/{modules/search/views/all_videos_page.dart => pages/search/all_videos.page.dart} (100%) rename mobile/lib/{modules/map/views/map_page.dart => pages/search/map/map.page.dart} (99%) rename mobile/lib/{modules/map/views/map_location_picker_page.dart => pages/search/map/map_location_picker.page.dart} (100%) rename mobile/lib/{modules/search/views/person_result_page.dart => pages/search/person_result.page.dart} (100%) rename mobile/lib/{modules/search/views/recently_added_page.dart => pages/search/recently_added.page.dart} (100%) rename mobile/lib/{modules/search/views/search_page.dart => pages/search/search.page.dart} (100%) rename mobile/lib/{modules/search/views/search_input_page.dart => pages/search/search_input.page.dart} (100%) rename mobile/lib/{modules/partner/views/partner_page.dart => pages/sharing/partner/partner.page.dart} (100%) rename mobile/lib/{modules/partner/views/partner_detail_page.dart => pages/sharing/partner/partner_detail.page.dart} (100%) rename mobile/lib/{modules/shared_link/views/shared_link_page.dart => pages/sharing/shared_link/shared_link.page.dart} (100%) rename mobile/lib/{modules/shared_link/views/shared_link_edit_page.dart => pages/sharing/shared_link/shared_link_edit.page.dart} (100%) rename mobile/lib/{modules/album/views/sharing_page.dart => pages/sharing/sharing.page.dart} (100%) rename mobile/lib/{shared/views => utils}/immich_loading_overlay.dart (100%) diff --git a/mobile/lib/modules/album/ui/album_viewer_appbar.dart b/mobile/lib/modules/album/ui/album_viewer_appbar.dart index 366b2543e1..a85674f8f7 100644 --- a/mobile/lib/modules/album/ui/album_viewer_appbar.dart +++ b/mobile/lib/modules/album/ui/album_viewer_appbar.dart @@ -8,10 +8,10 @@ import 'package:immich_mobile/providers/activity_statistics.provider.dart'; import 'package:immich_mobile/providers/album/album.provider.dart'; import 'package:immich_mobile/providers/album/album_viewer.provider.dart'; import 'package:immich_mobile/providers/album/shared_album.provider.dart'; +import 'package:immich_mobile/utils/immich_loading_overlay.dart'; import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; -import 'package:immich_mobile/shared/views/immich_loading_overlay.dart'; class AlbumViewerAppbar extends HookConsumerWidget implements PreferredSizeWidget { diff --git a/mobile/lib/modules/archive/ui/store_ui_here.txt b/mobile/lib/modules/archive/ui/store_ui_here.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mobile/lib/modules/map/widgets/map_app_bar.dart b/mobile/lib/modules/map/widgets/map_app_bar.dart index 0d28356634..dbce81895b 100644 --- a/mobile/lib/modules/map/widgets/map_app_bar.dart +++ b/mobile/lib/modules/map/widgets/map_app_bar.dart @@ -8,7 +8,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/providers/map/map_state.provider.dart'; import 'package:immich_mobile/modules/map/widgets/map_settings_sheet.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; -import 'package:immich_mobile/shared/views/immich_loading_overlay.dart'; +import 'package:immich_mobile/utils/immich_loading_overlay.dart'; import 'package:immich_mobile/utils/selection_handlers.dart'; class MapAppBar extends HookWidget implements PreferredSizeWidget { diff --git a/mobile/lib/modules/memories/ui/memory_card.dart b/mobile/lib/modules/memories/ui/memory_card.dart index 91d83fb683..bc4f3e230d 100644 --- a/mobile/lib/modules/memories/ui/memory_card.dart +++ b/mobile/lib/modules/memories/ui/memory_card.dart @@ -3,8 +3,8 @@ import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/asset_viewer/views/video_viewer_page.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/pages/common/video_viewer.page.dart'; import 'package:immich_mobile/shared/ui/hooks/blurhash_hook.dart'; import 'package:immich_mobile/shared/ui/immich_image.dart'; diff --git a/mobile/lib/modules/settings/views/settings_sub_page.dart b/mobile/lib/modules/settings/views/settings_sub_page.dart deleted file mode 100644 index 582f45a11c..0000000000 --- a/mobile/lib/modules/settings/views/settings_sub_page.dart +++ /dev/null @@ -1,22 +0,0 @@ -import 'package:auto_route/auto_route.dart'; -import 'package:easy_localization/easy_localization.dart'; -import 'package:flutter/material.dart'; -import 'package:immich_mobile/modules/settings/views/settings_page.dart'; - -@RoutePage() -class SettingsSubPage extends StatelessWidget { - const SettingsSubPage(this.section, {super.key}); - - final SettingSection section; - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - centerTitle: false, - title: Text(section.title).tr(), - ), - body: section.widget, - ); - } -} diff --git a/mobile/lib/modules/settings/ui/advanced_settings.dart b/mobile/lib/modules/settings/widgets/advanced_settings.dart similarity index 87% rename from mobile/lib/modules/settings/ui/advanced_settings.dart rename to mobile/lib/modules/settings/widgets/advanced_settings.dart index 5f4e13d422..5866103afc 100644 --- a/mobile/lib/modules/settings/ui/advanced_settings.dart +++ b/mobile/lib/modules/settings/widgets/advanced_settings.dart @@ -2,10 +2,10 @@ import 'dart:io'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart' hide Store; -import 'package:immich_mobile/modules/settings/ui/local_storage_settings.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_slider_list_tile.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_sub_page_scaffold.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_switch_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/local_storage_settings.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_slider_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_sub_page_scaffold.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_switch_list_tile.dart'; import 'package:immich_mobile/modules/settings/utils/app_settings_update_hook.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/services/app_settings.service.dart'; diff --git a/mobile/lib/modules/settings/ui/asset_list_settings/asset_list_group_settings.dart b/mobile/lib/modules/settings/widgets/asset_list_settings/asset_list_group_settings.dart similarity index 91% rename from mobile/lib/modules/settings/ui/asset_list_settings/asset_list_group_settings.dart rename to mobile/lib/modules/settings/widgets/asset_list_settings/asset_list_group_settings.dart index 71cdb58aea..7e079a12ed 100644 --- a/mobile/lib/modules/settings/ui/asset_list_settings/asset_list_group_settings.dart +++ b/mobile/lib/modules/settings/widgets/asset_list_settings/asset_list_group_settings.dart @@ -4,8 +4,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart'; import 'package:immich_mobile/providers/app_settings.provider.dart'; import 'package:immich_mobile/services/app_settings.service.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_radio_list_tile.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_sub_title.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_radio_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_sub_title.dart'; import 'package:immich_mobile/modules/settings/utils/app_settings_update_hook.dart'; class GroupSettings extends HookConsumerWidget { diff --git a/mobile/lib/modules/settings/ui/asset_list_settings/asset_list_layout_settings.dart b/mobile/lib/modules/settings/widgets/asset_list_settings/asset_list_layout_settings.dart similarity index 85% rename from mobile/lib/modules/settings/ui/asset_list_settings/asset_list_layout_settings.dart rename to mobile/lib/modules/settings/widgets/asset_list_settings/asset_list_layout_settings.dart index 49808057e0..dd0cdc2197 100644 --- a/mobile/lib/modules/settings/ui/asset_list_settings/asset_list_layout_settings.dart +++ b/mobile/lib/modules/settings/widgets/asset_list_settings/asset_list_layout_settings.dart @@ -3,9 +3,9 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/providers/app_settings.provider.dart'; import 'package:immich_mobile/services/app_settings.service.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_slider_list_tile.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_sub_title.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_switch_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_slider_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_sub_title.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_switch_list_tile.dart'; import 'package:immich_mobile/modules/settings/utils/app_settings_update_hook.dart'; class LayoutSettings extends HookConsumerWidget { diff --git a/mobile/lib/modules/settings/ui/asset_list_settings/asset_list_settings.dart b/mobile/lib/modules/settings/widgets/asset_list_settings/asset_list_settings.dart similarity index 79% rename from mobile/lib/modules/settings/ui/asset_list_settings/asset_list_settings.dart rename to mobile/lib/modules/settings/widgets/asset_list_settings/asset_list_settings.dart index e62dd455aa..1377a3d3cb 100644 --- a/mobile/lib/modules/settings/ui/asset_list_settings/asset_list_settings.dart +++ b/mobile/lib/modules/settings/widgets/asset_list_settings/asset_list_settings.dart @@ -3,9 +3,9 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/providers/app_settings.provider.dart'; import 'package:immich_mobile/services/app_settings.service.dart'; -import 'package:immich_mobile/modules/settings/ui/asset_list_settings/asset_list_group_settings.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_sub_page_scaffold.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_switch_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/asset_list_settings/asset_list_group_settings.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_sub_page_scaffold.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_switch_list_tile.dart'; import 'package:immich_mobile/modules/settings/utils/app_settings_update_hook.dart'; import 'asset_list_layout_settings.dart'; diff --git a/mobile/lib/modules/settings/ui/backup_settings/background_settings.dart b/mobile/lib/modules/settings/widgets/backup_settings/background_settings.dart similarity index 96% rename from mobile/lib/modules/settings/ui/backup_settings/background_settings.dart rename to mobile/lib/modules/settings/widgets/backup_settings/background_settings.dart index 5dd11cc26e..2d598614cd 100644 --- a/mobile/lib/modules/settings/ui/backup_settings/background_settings.dart +++ b/mobile/lib/modules/settings/widgets/backup_settings/background_settings.dart @@ -8,9 +8,9 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/providers/backup/backup.provider.dart'; import 'package:immich_mobile/providers/backup/ios_background_settings.provider.dart'; import 'package:immich_mobile/modules/backup/ui/ios_debug_info_tile.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_button_list_tile.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_slider_list_tile.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_switch_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_button_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_slider_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_switch_list_tile.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/mobile/lib/modules/settings/ui/backup_settings/backup_settings.dart b/mobile/lib/modules/settings/widgets/backup_settings/backup_settings.dart similarity index 83% rename from mobile/lib/modules/settings/ui/backup_settings/backup_settings.dart rename to mobile/lib/modules/settings/widgets/backup_settings/backup_settings.dart index 2cfdd64ffe..5a1212e280 100644 --- a/mobile/lib/modules/settings/ui/backup_settings/backup_settings.dart +++ b/mobile/lib/modules/settings/widgets/backup_settings/backup_settings.dart @@ -4,11 +4,11 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/providers/backup/backup_verification.provider.dart'; import 'package:immich_mobile/services/app_settings.service.dart'; -import 'package:immich_mobile/modules/settings/ui/backup_settings/background_settings.dart'; -import 'package:immich_mobile/modules/settings/ui/backup_settings/foreground_settings.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_button_list_tile.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_sub_page_scaffold.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_switch_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/backup_settings/background_settings.dart'; +import 'package:immich_mobile/modules/settings/widgets/backup_settings/foreground_settings.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_button_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_sub_page_scaffold.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_switch_list_tile.dart'; import 'package:immich_mobile/modules/settings/utils/app_settings_update_hook.dart'; import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart'; diff --git a/mobile/lib/modules/settings/ui/backup_settings/foreground_settings.dart b/mobile/lib/modules/settings/widgets/backup_settings/foreground_settings.dart similarity index 93% rename from mobile/lib/modules/settings/ui/backup_settings/foreground_settings.dart rename to mobile/lib/modules/settings/widgets/backup_settings/foreground_settings.dart index 8201456015..70fc6f7eb6 100644 --- a/mobile/lib/modules/settings/ui/backup_settings/foreground_settings.dart +++ b/mobile/lib/modules/settings/widgets/backup_settings/foreground_settings.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/providers/backup/backup.provider.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_button_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_button_list_tile.dart'; class ForegroundBackupSettings extends ConsumerWidget { const ForegroundBackupSettings({super.key}); diff --git a/mobile/lib/modules/settings/ui/image_viewer_quality_setting.dart b/mobile/lib/modules/settings/widgets/image_viewer_quality_setting.dart similarity index 88% rename from mobile/lib/modules/settings/ui/image_viewer_quality_setting.dart rename to mobile/lib/modules/settings/widgets/image_viewer_quality_setting.dart index e846aa0368..0e50b1c507 100644 --- a/mobile/lib/modules/settings/ui/image_viewer_quality_setting.dart +++ b/mobile/lib/modules/settings/widgets/image_viewer_quality_setting.dart @@ -3,8 +3,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/services/app_settings.service.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_sub_page_scaffold.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_switch_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_sub_page_scaffold.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_switch_list_tile.dart'; import 'package:immich_mobile/modules/settings/utils/app_settings_update_hook.dart'; class ImageViewerQualitySetting extends HookWidget { diff --git a/mobile/lib/modules/settings/ui/language_settings.dart b/mobile/lib/modules/settings/widgets/language_settings.dart similarity index 100% rename from mobile/lib/modules/settings/ui/language_settings.dart rename to mobile/lib/modules/settings/widgets/language_settings.dart diff --git a/mobile/lib/modules/settings/ui/local_storage_settings.dart b/mobile/lib/modules/settings/widgets/local_storage_settings.dart similarity index 100% rename from mobile/lib/modules/settings/ui/local_storage_settings.dart rename to mobile/lib/modules/settings/widgets/local_storage_settings.dart diff --git a/mobile/lib/modules/settings/ui/notification_setting.dart b/mobile/lib/modules/settings/widgets/notification_setting.dart similarity index 92% rename from mobile/lib/modules/settings/ui/notification_setting.dart rename to mobile/lib/modules/settings/widgets/notification_setting.dart index fec72445c7..379ad50083 100644 --- a/mobile/lib/modules/settings/ui/notification_setting.dart +++ b/mobile/lib/modules/settings/widgets/notification_setting.dart @@ -4,10 +4,10 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/providers/notification_permission.provider.dart'; import 'package:immich_mobile/services/app_settings.service.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_button_list_tile.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_slider_list_tile.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_sub_page_scaffold.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_switch_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_button_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_slider_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_sub_page_scaffold.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_switch_list_tile.dart'; import 'package:immich_mobile/modules/settings/utils/app_settings_update_hook.dart'; import 'package:permission_handler/permission_handler.dart'; diff --git a/mobile/lib/modules/settings/ui/preference_settings/haptic_setting.dart b/mobile/lib/modules/settings/widgets/preference_settings/haptic_setting.dart similarity index 87% rename from mobile/lib/modules/settings/ui/preference_settings/haptic_setting.dart rename to mobile/lib/modules/settings/widgets/preference_settings/haptic_setting.dart index 54e03dd0e1..d66d48f2c2 100644 --- a/mobile/lib/modules/settings/ui/preference_settings/haptic_setting.dart +++ b/mobile/lib/modules/settings/widgets/preference_settings/haptic_setting.dart @@ -3,8 +3,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/services/app_settings.service.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_sub_title.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_switch_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_sub_title.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_switch_list_tile.dart'; import 'package:immich_mobile/modules/settings/utils/app_settings_update_hook.dart'; class HapticSetting extends HookConsumerWidget { diff --git a/mobile/lib/modules/settings/ui/preference_settings/preference_setting.dart b/mobile/lib/modules/settings/widgets/preference_settings/preference_setting.dart similarity index 55% rename from mobile/lib/modules/settings/ui/preference_settings/preference_setting.dart rename to mobile/lib/modules/settings/widgets/preference_settings/preference_setting.dart index ccc0e5b161..c1d9b19460 100644 --- a/mobile/lib/modules/settings/ui/preference_settings/preference_setting.dart +++ b/mobile/lib/modules/settings/widgets/preference_settings/preference_setting.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:immich_mobile/modules/settings/ui/preference_settings/haptic_setting.dart'; -import 'package:immich_mobile/modules/settings/ui/preference_settings/theme_setting.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_sub_page_scaffold.dart'; +import 'package:immich_mobile/modules/settings/widgets/preference_settings/haptic_setting.dart'; +import 'package:immich_mobile/modules/settings/widgets/preference_settings/theme_setting.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_sub_page_scaffold.dart'; class PreferenceSetting extends StatelessWidget { const PreferenceSetting({ diff --git a/mobile/lib/modules/settings/ui/preference_settings/theme_setting.dart b/mobile/lib/modules/settings/widgets/preference_settings/theme_setting.dart similarity index 94% rename from mobile/lib/modules/settings/ui/preference_settings/theme_setting.dart rename to mobile/lib/modules/settings/widgets/preference_settings/theme_setting.dart index 09360694b5..5939c2803f 100644 --- a/mobile/lib/modules/settings/ui/preference_settings/theme_setting.dart +++ b/mobile/lib/modules/settings/widgets/preference_settings/theme_setting.dart @@ -3,8 +3,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/services/app_settings.service.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_sub_title.dart'; -import 'package:immich_mobile/modules/settings/ui/settings_switch_list_tile.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_sub_title.dart'; +import 'package:immich_mobile/modules/settings/widgets/settings_switch_list_tile.dart'; import 'package:immich_mobile/modules/settings/utils/app_settings_update_hook.dart'; import 'package:immich_mobile/utils/immich_app_theme.dart'; diff --git a/mobile/lib/modules/settings/ui/settings_button_list_tile.dart b/mobile/lib/modules/settings/widgets/settings_button_list_tile.dart similarity index 100% rename from mobile/lib/modules/settings/ui/settings_button_list_tile.dart rename to mobile/lib/modules/settings/widgets/settings_button_list_tile.dart diff --git a/mobile/lib/modules/settings/ui/settings_radio_list_tile.dart b/mobile/lib/modules/settings/widgets/settings_radio_list_tile.dart similarity index 100% rename from mobile/lib/modules/settings/ui/settings_radio_list_tile.dart rename to mobile/lib/modules/settings/widgets/settings_radio_list_tile.dart diff --git a/mobile/lib/modules/settings/ui/settings_slider_list_tile.dart b/mobile/lib/modules/settings/widgets/settings_slider_list_tile.dart similarity index 100% rename from mobile/lib/modules/settings/ui/settings_slider_list_tile.dart rename to mobile/lib/modules/settings/widgets/settings_slider_list_tile.dart diff --git a/mobile/lib/modules/settings/ui/settings_sub_page_scaffold.dart b/mobile/lib/modules/settings/widgets/settings_sub_page_scaffold.dart similarity index 100% rename from mobile/lib/modules/settings/ui/settings_sub_page_scaffold.dart rename to mobile/lib/modules/settings/widgets/settings_sub_page_scaffold.dart diff --git a/mobile/lib/modules/settings/ui/settings_sub_title.dart b/mobile/lib/modules/settings/widgets/settings_sub_title.dart similarity index 100% rename from mobile/lib/modules/settings/ui/settings_sub_title.dart rename to mobile/lib/modules/settings/widgets/settings_sub_title.dart diff --git a/mobile/lib/modules/settings/ui/settings_switch_list_tile.dart b/mobile/lib/modules/settings/widgets/settings_switch_list_tile.dart similarity index 100% rename from mobile/lib/modules/settings/ui/settings_switch_list_tile.dart rename to mobile/lib/modules/settings/widgets/settings_switch_list_tile.dart diff --git a/mobile/lib/modules/backup/views/album_preview_page.dart b/mobile/lib/pages/backup/album_preview.page.dart similarity index 100% rename from mobile/lib/modules/backup/views/album_preview_page.dart rename to mobile/lib/pages/backup/album_preview.page.dart diff --git a/mobile/lib/modules/backup/views/backup_album_selection_page.dart b/mobile/lib/pages/backup/backup_album_selection.page.dart similarity index 100% rename from mobile/lib/modules/backup/views/backup_album_selection_page.dart rename to mobile/lib/pages/backup/backup_album_selection.page.dart diff --git a/mobile/lib/modules/backup/views/backup_controller_page.dart b/mobile/lib/pages/backup/backup_controller.page.dart similarity index 100% rename from mobile/lib/modules/backup/views/backup_controller_page.dart rename to mobile/lib/pages/backup/backup_controller.page.dart diff --git a/mobile/lib/modules/backup/views/backup_options_page.dart b/mobile/lib/pages/backup/backup_options.page.dart similarity index 87% rename from mobile/lib/modules/backup/views/backup_options_page.dart rename to mobile/lib/pages/backup/backup_options.page.dart index e8c9e50143..cf8b65c15c 100644 --- a/mobile/lib/modules/backup/views/backup_options_page.dart +++ b/mobile/lib/pages/backup/backup_options.page.dart @@ -1,7 +1,7 @@ import 'package:auto_route/auto_route.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; -import 'package:immich_mobile/modules/settings/ui/backup_settings/backup_settings.dart'; +import 'package:immich_mobile/modules/settings/widgets/backup_settings/backup_settings.dart'; @RoutePage() class BackupOptionsPage extends StatelessWidget { diff --git a/mobile/lib/modules/backup/views/failed_backup_status_page.dart b/mobile/lib/pages/backup/failed_backup_status.page.dart similarity index 100% rename from mobile/lib/modules/backup/views/failed_backup_status_page.dart rename to mobile/lib/pages/backup/failed_backup_status.page.dart diff --git a/mobile/lib/modules/activities/views/activities_page.dart b/mobile/lib/pages/common/activities.page.dart similarity index 100% rename from mobile/lib/modules/activities/views/activities_page.dart rename to mobile/lib/pages/common/activities.page.dart diff --git a/mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart b/mobile/lib/pages/common/album_additional_shared_user_selection.page.dart similarity index 96% rename from mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart rename to mobile/lib/pages/common/album_additional_shared_user_selection.page.dart index c83faa17a6..31426907c1 100644 --- a/mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart +++ b/mobile/lib/pages/common/album_additional_shared_user_selection.page.dart @@ -11,10 +11,13 @@ import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/ui/user_circle_avatar.dart'; @RoutePage?>() -class SelectAdditionalUserForSharingPage extends HookConsumerWidget { +class AlbumAdditionalSharedUserSelectionPage extends HookConsumerWidget { final Album album; - const SelectAdditionalUserForSharingPage({super.key, required this.album}); + const AlbumAdditionalSharedUserSelectionPage({ + super.key, + required this.album, + }); @override Widget build(BuildContext context, WidgetRef ref) { diff --git a/mobile/lib/modules/album/views/asset_selection_page.dart b/mobile/lib/pages/common/album_asset_selection.page.dart similarity index 97% rename from mobile/lib/modules/album/views/asset_selection_page.dart rename to mobile/lib/pages/common/album_asset_selection.page.dart index bcf94e62ae..19e9f705a1 100644 --- a/mobile/lib/modules/album/views/asset_selection_page.dart +++ b/mobile/lib/pages/common/album_asset_selection.page.dart @@ -13,8 +13,8 @@ import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:isar/isar.dart'; @RoutePage() -class AssetSelectionPage extends HookConsumerWidget { - const AssetSelectionPage({ +class AlbumAssetSelectionPage extends HookConsumerWidget { + const AlbumAssetSelectionPage({ super.key, required this.existingAssets, this.canDeselect = false, diff --git a/mobile/lib/modules/album/views/album_options_part.dart b/mobile/lib/pages/common/album_options.page.dart similarity index 98% rename from mobile/lib/modules/album/views/album_options_part.dart rename to mobile/lib/pages/common/album_options.page.dart index e83a0dca67..339fe3922c 100644 --- a/mobile/lib/modules/album/views/album_options_part.dart +++ b/mobile/lib/pages/common/album_options.page.dart @@ -7,12 +7,12 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/providers/album/shared_album.provider.dart'; import 'package:immich_mobile/providers/authentication.provider.dart'; +import 'package:immich_mobile/utils/immich_loading_overlay.dart'; import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; import 'package:immich_mobile/shared/ui/user_circle_avatar.dart'; -import 'package:immich_mobile/shared/views/immich_loading_overlay.dart'; @RoutePage() class AlbumOptionsPage extends HookConsumerWidget { diff --git a/mobile/lib/modules/album/views/select_user_for_sharing_page.dart b/mobile/lib/pages/common/album_shared_user_selection.page.dart similarity index 97% rename from mobile/lib/modules/album/views/select_user_for_sharing_page.dart rename to mobile/lib/pages/common/album_shared_user_selection.page.dart index bb94389466..aff93d9b2d 100644 --- a/mobile/lib/modules/album/views/select_user_for_sharing_page.dart +++ b/mobile/lib/pages/common/album_shared_user_selection.page.dart @@ -14,8 +14,8 @@ import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/ui/user_circle_avatar.dart'; @RoutePage>() -class SelectUserForSharingPage extends HookConsumerWidget { - const SelectUserForSharingPage({super.key, required this.assets}); +class AlbumSharedUserSelectionPage extends HookConsumerWidget { + const AlbumSharedUserSelectionPage({super.key, required this.assets}); final Set assets; diff --git a/mobile/lib/modules/album/views/album_viewer_page.dart b/mobile/lib/pages/common/album_viewer.page.dart similarity index 98% rename from mobile/lib/modules/album/views/album_viewer_page.dart rename to mobile/lib/pages/common/album_viewer.page.dart index 36f9f40ffe..3a2773b584 100644 --- a/mobile/lib/modules/album/views/album_viewer_page.dart +++ b/mobile/lib/pages/common/album_viewer.page.dart @@ -12,6 +12,7 @@ import 'package:immich_mobile/models/albums/asset_selection_page_result.model.da import 'package:immich_mobile/providers/album/album.provider.dart'; import 'package:immich_mobile/providers/album/current_album.provider.dart'; import 'package:immich_mobile/providers/album/shared_album.provider.dart'; +import 'package:immich_mobile/utils/immich_loading_overlay.dart'; import 'package:immich_mobile/services/album.service.dart'; import 'package:immich_mobile/modules/album/ui/album_action_outlined_button.dart'; import 'package:immich_mobile/modules/album/ui/album_viewer_editable_title.dart'; @@ -25,7 +26,6 @@ import 'package:immich_mobile/providers/asset.provider.dart'; import 'package:immich_mobile/shared/ui/asset_grid/multiselect_grid.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; import 'package:immich_mobile/shared/ui/user_circle_avatar.dart'; -import 'package:immich_mobile/shared/views/immich_loading_overlay.dart'; @RoutePage() class AlbumViewerPage extends HookConsumerWidget { @@ -70,7 +70,7 @@ class AlbumViewerPage extends HookConsumerWidget { void onAddPhotosPressed(Album albumInfo) async { AssetSelectionPageResult? returnPayload = await context.pushRoute( - AssetSelectionRoute( + AlbumAssetSelectionRoute( existingAssets: albumInfo.assets, canDeselect: false, query: getRemoteAssetQuery(ref), @@ -92,7 +92,7 @@ class AlbumViewerPage extends HookConsumerWidget { void onAddUsersPressed(Album album) async { List? sharedUserIds = await context.pushRoute?>( - SelectAdditionalUserForSharingRoute(album: album), + AlbumAdditionalSharedUserSelectionRoute(album: album), ); if (sharedUserIds != null) { diff --git a/mobile/lib/shared/views/app_log_page.dart b/mobile/lib/pages/common/app_log.page.dart similarity index 100% rename from mobile/lib/shared/views/app_log_page.dart rename to mobile/lib/pages/common/app_log.page.dart diff --git a/mobile/lib/shared/views/app_log_detail_page.dart b/mobile/lib/pages/common/app_log_detail.page.dart similarity index 100% rename from mobile/lib/shared/views/app_log_detail_page.dart rename to mobile/lib/pages/common/app_log_detail.page.dart diff --git a/mobile/lib/modules/album/views/create_album_page.dart b/mobile/lib/pages/common/create_album.page.dart similarity index 98% rename from mobile/lib/modules/album/views/create_album_page.dart rename to mobile/lib/pages/common/create_album.page.dart index 1329c1e74b..06c30ed2ab 100644 --- a/mobile/lib/modules/album/views/create_album_page.dart +++ b/mobile/lib/pages/common/create_album.page.dart @@ -39,7 +39,7 @@ class CreateAlbumPage extends HookConsumerWidget { showSelectUserPage() async { final bool? ok = await context.pushRoute( - SelectUserForSharingRoute(assets: selectedAssets.value), + AlbumSharedUserSelectionRoute(assets: selectedAssets.value), ); if (ok == true) { selectedAssets.value = {}; @@ -61,7 +61,7 @@ class CreateAlbumPage extends HookConsumerWidget { onSelectPhotosButtonPressed() async { AssetSelectionPageResult? selectedAsset = await context.pushRoute( - AssetSelectionRoute( + AlbumAssetSelectionRoute( existingAssets: selectedAssets.value, canDeselect: true, query: getRemoteAssetQuery(ref), diff --git a/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart b/mobile/lib/pages/common/gallery_viewer.page.dart similarity index 99% rename from mobile/lib/modules/asset_viewer/views/gallery_viewer.dart rename to mobile/lib/pages/common/gallery_viewer.page.dart index 033df23cc1..b71bbbc6fc 100644 --- a/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart +++ b/mobile/lib/pages/common/gallery_viewer.page.dart @@ -17,8 +17,8 @@ import 'package:immich_mobile/modules/asset_viewer/ui/advanced_bottom_sheet.dart import 'package:immich_mobile/modules/asset_viewer/ui/bottom_gallery_bar.dart'; import 'package:immich_mobile/modules/asset_viewer/ui/exif_sheet/exif_bottom_sheet.dart'; import 'package:immich_mobile/modules/asset_viewer/ui/gallery_app_bar.dart'; -import 'package:immich_mobile/modules/asset_viewer/views/video_viewer_page.dart'; import 'package:immich_mobile/providers/app_settings.provider.dart'; +import 'package:immich_mobile/pages/common/video_viewer.page.dart'; import 'package:immich_mobile/services/app_settings.service.dart'; import 'package:immich_mobile/providers/haptic_feedback.provider.dart'; import 'package:immich_mobile/shared/ui/immich_image.dart'; diff --git a/mobile/lib/modules/settings/views/settings_page.dart b/mobile/lib/pages/common/settings.page.dart similarity index 78% rename from mobile/lib/modules/settings/views/settings_page.dart rename to mobile/lib/pages/common/settings.page.dart index 3ca723e921..c5e55a800c 100644 --- a/mobile/lib/modules/settings/views/settings_page.dart +++ b/mobile/lib/pages/common/settings.page.dart @@ -3,13 +3,13 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/settings/ui/advanced_settings.dart'; -import 'package:immich_mobile/modules/settings/ui/asset_list_settings/asset_list_settings.dart'; -import 'package:immich_mobile/modules/settings/ui/backup_settings/backup_settings.dart'; -import 'package:immich_mobile/modules/settings/ui/image_viewer_quality_setting.dart'; -import 'package:immich_mobile/modules/settings/ui/language_settings.dart'; -import 'package:immich_mobile/modules/settings/ui/notification_setting.dart'; -import 'package:immich_mobile/modules/settings/ui/preference_settings/preference_setting.dart'; +import 'package:immich_mobile/modules/settings/widgets/advanced_settings.dart'; +import 'package:immich_mobile/modules/settings/widgets/asset_list_settings/asset_list_settings.dart'; +import 'package:immich_mobile/modules/settings/widgets/backup_settings/backup_settings.dart'; +import 'package:immich_mobile/modules/settings/widgets/image_viewer_quality_setting.dart'; +import 'package:immich_mobile/modules/settings/widgets/language_settings.dart'; +import 'package:immich_mobile/modules/settings/widgets/notification_setting.dart'; +import 'package:immich_mobile/modules/settings/widgets/preference_settings/preference_setting.dart'; import 'package:immich_mobile/routing/router.dart'; enum SettingSection { @@ -119,3 +119,21 @@ class _TabletLayout extends HookWidget { ); } } + +@RoutePage() +class SettingsSubPage extends StatelessWidget { + const SettingsSubPage(this.section, {super.key}); + + final SettingSection section; + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + centerTitle: false, + title: Text(section.title).tr(), + ), + body: section.widget, + ); + } +} diff --git a/mobile/lib/shared/views/splash_screen.dart b/mobile/lib/pages/common/splash_screen.page.dart similarity index 100% rename from mobile/lib/shared/views/splash_screen.dart rename to mobile/lib/pages/common/splash_screen.page.dart diff --git a/mobile/lib/shared/views/tab_controller_page.dart b/mobile/lib/pages/common/tab_controller.page.dart similarity index 99% rename from mobile/lib/shared/views/tab_controller_page.dart rename to mobile/lib/pages/common/tab_controller.page.dart index 084e16d05b..a48e9e92be 100644 --- a/mobile/lib/shared/views/tab_controller_page.dart +++ b/mobile/lib/pages/common/tab_controller.page.dart @@ -163,7 +163,7 @@ class TabControllerPage extends HookConsumerWidget { final multiselectEnabled = ref.watch(multiselectProvider); return AutoTabsRouter( routes: const [ - HomeRoute(), + PhotosRoute(), SearchRoute(), SharingRoute(), LibraryRoute(), diff --git a/mobile/lib/modules/asset_viewer/views/video_viewer_page.dart b/mobile/lib/pages/common/video_viewer.page.dart similarity index 100% rename from mobile/lib/modules/asset_viewer/views/video_viewer_page.dart rename to mobile/lib/pages/common/video_viewer.page.dart diff --git a/mobile/lib/modules/archive/views/archive_page.dart b/mobile/lib/pages/library/archive.page.dart similarity index 100% rename from mobile/lib/modules/archive/views/archive_page.dart rename to mobile/lib/pages/library/archive.page.dart diff --git a/mobile/lib/modules/favorite/views/favorites_page.dart b/mobile/lib/pages/library/favorite.page.dart similarity index 100% rename from mobile/lib/modules/favorite/views/favorites_page.dart rename to mobile/lib/pages/library/favorite.page.dart diff --git a/mobile/lib/modules/album/views/library_page.dart b/mobile/lib/pages/library/library.page.dart similarity index 100% rename from mobile/lib/modules/album/views/library_page.dart rename to mobile/lib/pages/library/library.page.dart diff --git a/mobile/lib/modules/trash/views/trash_page.dart b/mobile/lib/pages/library/trash.page.dart similarity index 99% rename from mobile/lib/modules/trash/views/trash_page.dart rename to mobile/lib/pages/library/trash.page.dart index 8216cfd00e..893e653f39 100644 --- a/mobile/lib/modules/trash/views/trash_page.dart +++ b/mobile/lib/pages/library/trash.page.dart @@ -13,7 +13,7 @@ import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/providers/server_info.provider.dart'; import 'package:immich_mobile/shared/ui/confirm_dialog.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; -import 'package:immich_mobile/shared/views/immich_loading_overlay.dart'; +import 'package:immich_mobile/utils/immich_loading_overlay.dart'; @RoutePage() class TrashPage extends HookConsumerWidget { diff --git a/mobile/lib/modules/login/views/change_password_page.dart b/mobile/lib/pages/login/change_password.page.dart similarity index 100% rename from mobile/lib/modules/login/views/change_password_page.dart rename to mobile/lib/pages/login/change_password.page.dart diff --git a/mobile/lib/modules/login/views/login_page.dart b/mobile/lib/pages/login/login.page.dart similarity index 100% rename from mobile/lib/modules/login/views/login_page.dart rename to mobile/lib/pages/login/login.page.dart diff --git a/mobile/lib/modules/onboarding/views/permission_onboarding_page.dart b/mobile/lib/pages/onboarding/permission_onboarding.page.dart similarity index 100% rename from mobile/lib/modules/onboarding/views/permission_onboarding_page.dart rename to mobile/lib/pages/onboarding/permission_onboarding.page.dart diff --git a/mobile/lib/modules/memories/views/memory_page.dart b/mobile/lib/pages/photos/memory.page.dart similarity index 100% rename from mobile/lib/modules/memories/views/memory_page.dart rename to mobile/lib/pages/photos/memory.page.dart diff --git a/mobile/lib/modules/home/views/home_page.dart b/mobile/lib/pages/photos/photos.page.dart similarity index 98% rename from mobile/lib/modules/home/views/home_page.dart rename to mobile/lib/pages/photos/photos.page.dart index eb74160fad..ed44214fec 100644 --- a/mobile/lib/modules/home/views/home_page.dart +++ b/mobile/lib/pages/photos/photos.page.dart @@ -19,8 +19,8 @@ import 'package:immich_mobile/shared/ui/immich_app_bar.dart'; import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart'; @RoutePage() -class HomePage extends HookConsumerWidget { - const HomePage({super.key}); +class PhotosPage extends HookConsumerWidget { + const PhotosPage({super.key}); @override Widget build(BuildContext context, WidgetRef ref) { diff --git a/mobile/lib/modules/search/views/all_motion_videos_page.dart b/mobile/lib/pages/search/all_motion_videos.page.dart similarity index 100% rename from mobile/lib/modules/search/views/all_motion_videos_page.dart rename to mobile/lib/pages/search/all_motion_videos.page.dart diff --git a/mobile/lib/modules/search/views/all_people_page.dart b/mobile/lib/pages/search/all_people.page.dart similarity index 100% rename from mobile/lib/modules/search/views/all_people_page.dart rename to mobile/lib/pages/search/all_people.page.dart diff --git a/mobile/lib/modules/search/views/all_places_page.dart b/mobile/lib/pages/search/all_places.page.dart similarity index 100% rename from mobile/lib/modules/search/views/all_places_page.dart rename to mobile/lib/pages/search/all_places.page.dart diff --git a/mobile/lib/modules/search/views/all_videos_page.dart b/mobile/lib/pages/search/all_videos.page.dart similarity index 100% rename from mobile/lib/modules/search/views/all_videos_page.dart rename to mobile/lib/pages/search/all_videos.page.dart diff --git a/mobile/lib/modules/map/views/map_page.dart b/mobile/lib/pages/search/map/map.page.dart similarity index 99% rename from mobile/lib/modules/map/views/map_page.dart rename to mobile/lib/pages/search/map/map.page.dart index 383130de64..6ea4fbb669 100644 --- a/mobile/lib/modules/map/views/map_page.dart +++ b/mobile/lib/pages/search/map/map.page.dart @@ -25,7 +25,7 @@ import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/providers/db.provider.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; -import 'package:immich_mobile/shared/views/immich_loading_overlay.dart'; +import 'package:immich_mobile/utils/immich_loading_overlay.dart'; import 'package:immich_mobile/utils/debounce.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; diff --git a/mobile/lib/modules/map/views/map_location_picker_page.dart b/mobile/lib/pages/search/map/map_location_picker.page.dart similarity index 100% rename from mobile/lib/modules/map/views/map_location_picker_page.dart rename to mobile/lib/pages/search/map/map_location_picker.page.dart diff --git a/mobile/lib/modules/search/views/person_result_page.dart b/mobile/lib/pages/search/person_result.page.dart similarity index 100% rename from mobile/lib/modules/search/views/person_result_page.dart rename to mobile/lib/pages/search/person_result.page.dart diff --git a/mobile/lib/modules/search/views/recently_added_page.dart b/mobile/lib/pages/search/recently_added.page.dart similarity index 100% rename from mobile/lib/modules/search/views/recently_added_page.dart rename to mobile/lib/pages/search/recently_added.page.dart diff --git a/mobile/lib/modules/search/views/search_page.dart b/mobile/lib/pages/search/search.page.dart similarity index 100% rename from mobile/lib/modules/search/views/search_page.dart rename to mobile/lib/pages/search/search.page.dart diff --git a/mobile/lib/modules/search/views/search_input_page.dart b/mobile/lib/pages/search/search_input.page.dart similarity index 100% rename from mobile/lib/modules/search/views/search_input_page.dart rename to mobile/lib/pages/search/search_input.page.dart diff --git a/mobile/lib/modules/partner/views/partner_page.dart b/mobile/lib/pages/sharing/partner/partner.page.dart similarity index 100% rename from mobile/lib/modules/partner/views/partner_page.dart rename to mobile/lib/pages/sharing/partner/partner.page.dart diff --git a/mobile/lib/modules/partner/views/partner_detail_page.dart b/mobile/lib/pages/sharing/partner/partner_detail.page.dart similarity index 100% rename from mobile/lib/modules/partner/views/partner_detail_page.dart rename to mobile/lib/pages/sharing/partner/partner_detail.page.dart diff --git a/mobile/lib/modules/shared_link/views/shared_link_page.dart b/mobile/lib/pages/sharing/shared_link/shared_link.page.dart similarity index 100% rename from mobile/lib/modules/shared_link/views/shared_link_page.dart rename to mobile/lib/pages/sharing/shared_link/shared_link.page.dart diff --git a/mobile/lib/modules/shared_link/views/shared_link_edit_page.dart b/mobile/lib/pages/sharing/shared_link/shared_link_edit.page.dart similarity index 100% rename from mobile/lib/modules/shared_link/views/shared_link_edit_page.dart rename to mobile/lib/pages/sharing/shared_link/shared_link_edit.page.dart diff --git a/mobile/lib/modules/album/views/sharing_page.dart b/mobile/lib/pages/sharing/sharing.page.dart similarity index 100% rename from mobile/lib/modules/album/views/sharing_page.dart rename to mobile/lib/pages/sharing/sharing.page.dart diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart index fcf4dcbebf..98c0142452 100644 --- a/mobile/lib/routing/router.dart +++ b/mobile/lib/routing/router.dart @@ -1,51 +1,18 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/activities/views/activities_page.dart'; -import 'package:immich_mobile/models/albums/asset_selection_page_result.model.dart'; -import 'package:immich_mobile/modules/album/views/album_options_part.dart'; -import 'package:immich_mobile/modules/album/views/album_viewer_page.dart'; -import 'package:immich_mobile/modules/album/views/asset_selection_page.dart'; -import 'package:immich_mobile/modules/album/views/create_album_page.dart'; -import 'package:immich_mobile/modules/album/views/library_page.dart'; -import 'package:immich_mobile/modules/backup/views/backup_options_page.dart'; -import 'package:immich_mobile/modules/map/views/map_location_picker_page.dart'; -import 'package:immich_mobile/modules/map/views/map_page.dart'; import 'package:immich_mobile/models/memories/memory.model.dart'; -import 'package:immich_mobile/modules/memories/views/memory_page.dart'; -import 'package:immich_mobile/modules/partner/views/partner_detail_page.dart'; -import 'package:immich_mobile/modules/partner/views/partner_page.dart'; -import 'package:immich_mobile/modules/album/views/select_additional_user_for_sharing_page.dart'; -import 'package:immich_mobile/modules/album/views/select_user_for_sharing_page.dart'; -import 'package:immich_mobile/modules/album/views/sharing_page.dart'; -import 'package:immich_mobile/modules/archive/views/archive_page.dart'; -import 'package:immich_mobile/modules/asset_viewer/views/gallery_viewer.dart'; -import 'package:immich_mobile/modules/asset_viewer/views/video_viewer_page.dart'; -import 'package:immich_mobile/modules/backup/views/album_preview_page.dart'; -import 'package:immich_mobile/modules/backup/views/backup_album_selection_page.dart'; -import 'package:immich_mobile/modules/backup/views/backup_controller_page.dart'; -import 'package:immich_mobile/modules/backup/views/failed_backup_status_page.dart'; -import 'package:immich_mobile/modules/favorite/views/favorites_page.dart'; -import 'package:immich_mobile/modules/home/views/home_page.dart'; -import 'package:immich_mobile/modules/login/views/change_password_page.dart'; -import 'package:immich_mobile/modules/login/views/login_page.dart'; -import 'package:immich_mobile/providers/gallery_permission.provider.dart'; -import 'package:immich_mobile/modules/onboarding/views/permission_onboarding_page.dart'; import 'package:immich_mobile/models/search/search_filter.model.dart'; -import 'package:immich_mobile/modules/settings/views/settings_sub_page.dart'; -import 'package:immich_mobile/modules/search/views/search_input_page.dart'; +import 'package:immich_mobile/pages/common/activities.page.dart'; +import 'package:immich_mobile/models/albums/asset_selection_page_result.model.dart'; +import 'package:immich_mobile/pages/common/album_options.page.dart'; +import 'package:immich_mobile/pages/common/album_viewer.page.dart'; +import 'package:immich_mobile/pages/common/album_asset_selection.page.dart'; +import 'package:immich_mobile/pages/common/create_album.page.dart'; import 'package:immich_mobile/models/shared_link/shared_link.model.dart'; -import 'package:immich_mobile/modules/shared_link/views/shared_link_edit_page.dart'; -import 'package:immich_mobile/modules/shared_link/views/shared_link_page.dart'; -import 'package:immich_mobile/modules/trash/views/trash_page.dart'; -import 'package:immich_mobile/modules/search/views/all_motion_videos_page.dart'; -import 'package:immich_mobile/modules/search/views/all_people_page.dart'; -import 'package:immich_mobile/modules/search/views/all_videos_page.dart'; -import 'package:immich_mobile/modules/search/views/all_places_page.dart'; -import 'package:immich_mobile/modules/search/views/person_result_page.dart'; -import 'package:immich_mobile/modules/search/views/recently_added_page.dart'; -import 'package:immich_mobile/modules/search/views/search_page.dart'; -import 'package:immich_mobile/modules/settings/views/settings_page.dart'; +import 'package:immich_mobile/pages/common/album_additional_shared_user_selection.page.dart'; +import 'package:immich_mobile/pages/common/album_shared_user_selection.page.dart'; +import 'package:immich_mobile/providers/gallery_permission.provider.dart'; import 'package:immich_mobile/routing/auth_guard.dart'; import 'package:immich_mobile/routing/custom_transition_builders.dart'; import 'package:immich_mobile/routing/duplicate_guard.dart'; @@ -55,11 +22,43 @@ import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/logger_message.entity.dart'; import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/providers/api.provider.dart'; +import 'package:immich_mobile/pages/common/app_log_detail.page.dart'; +import 'package:immich_mobile/pages/common/app_log.page.dart'; +import 'package:immich_mobile/pages/backup/album_preview.page.dart'; +import 'package:immich_mobile/pages/backup/backup_album_selection.page.dart'; +import 'package:immich_mobile/pages/backup/backup_controller.page.dart'; +import 'package:immich_mobile/pages/backup/backup_options.page.dart'; +import 'package:immich_mobile/pages/backup/failed_backup_status.page.dart'; +import 'package:immich_mobile/pages/common/gallery_viewer.page.dart'; +import 'package:immich_mobile/pages/library/archive.page.dart'; +import 'package:immich_mobile/pages/library/favorite.page.dart'; +import 'package:immich_mobile/pages/library/library.page.dart'; +import 'package:immich_mobile/pages/library/trash.page.dart'; +import 'package:immich_mobile/pages/login/change_password.page.dart'; +import 'package:immich_mobile/pages/login/login.page.dart'; +import 'package:immich_mobile/pages/onboarding/permission_onboarding.page.dart'; +import 'package:immich_mobile/pages/photos/memory.page.dart'; +import 'package:immich_mobile/pages/photos/photos.page.dart'; +import 'package:immich_mobile/pages/search/all_motion_videos.page.dart'; +import 'package:immich_mobile/pages/search/all_people.page.dart'; +import 'package:immich_mobile/pages/search/all_places.page.dart'; +import 'package:immich_mobile/pages/search/all_videos.page.dart'; +import 'package:immich_mobile/pages/search/map/map_location_picker.page.dart'; +import 'package:immich_mobile/pages/search/map/map.page.dart'; +import 'package:immich_mobile/pages/search/person_result.page.dart'; +import 'package:immich_mobile/pages/search/recently_added.page.dart'; +import 'package:immich_mobile/pages/search/search_input.page.dart'; +import 'package:immich_mobile/pages/search/search.page.dart'; +import 'package:immich_mobile/pages/common/settings.page.dart'; +import 'package:immich_mobile/pages/sharing/partner/partner_detail.page.dart'; +import 'package:immich_mobile/pages/sharing/partner/partner.page.dart'; +import 'package:immich_mobile/pages/sharing/shared_link/shared_link_edit.page.dart'; +import 'package:immich_mobile/pages/sharing/shared_link/shared_link.page.dart'; +import 'package:immich_mobile/pages/sharing/sharing.page.dart'; +import 'package:immich_mobile/pages/common/splash_screen.page.dart'; +import 'package:immich_mobile/pages/common/tab_controller.page.dart'; +import 'package:immich_mobile/pages/common/video_viewer.page.dart'; import 'package:immich_mobile/services/api.service.dart'; -import 'package:immich_mobile/shared/views/app_log_detail_page.dart'; -import 'package:immich_mobile/shared/views/app_log_page.dart'; -import 'package:immich_mobile/shared/views/splash_screen.dart'; -import 'package:immich_mobile/shared/views/tab_controller_page.dart'; import 'package:isar/isar.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; import 'package:photo_manager/photo_manager.dart' hide LatLng; @@ -97,7 +96,10 @@ class AppRouter extends _$AppRouter { page: TabControllerRoute.page, guards: [_authGuard, _duplicateGuard], children: [ - AutoRoute(page: HomeRoute.page, guards: [_authGuard, _duplicateGuard]), + AutoRoute( + page: PhotosRoute.page, + guards: [_authGuard, _duplicateGuard], + ), AutoRoute( page: SearchRoute.page, guards: [_authGuard, _duplicateGuard], @@ -145,12 +147,12 @@ class AppRouter extends _$AppRouter { guards: [_authGuard, _duplicateGuard], ), CustomRoute( - page: AssetSelectionRoute.page, + page: AlbumAssetSelectionRoute.page, guards: [_authGuard, _duplicateGuard], transitionsBuilder: TransitionsBuilders.slideBottom, ), CustomRoute( - page: SelectUserForSharingRoute.page, + page: AlbumSharedUserSelectionRoute.page, guards: [_authGuard, _duplicateGuard], transitionsBuilder: TransitionsBuilders.slideBottom, ), @@ -159,7 +161,7 @@ class AppRouter extends _$AppRouter { guards: [_authGuard, _duplicateGuard], ), CustomRoute( - page: SelectAdditionalUserForSharingRoute.page, + page: AlbumAdditionalSharedUserSelectionRoute.page, guards: [_authGuard, _duplicateGuard], transitionsBuilder: TransitionsBuilders.slideBottom, ), diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart index f17d296128..0c519eb2bc 100644 --- a/mobile/lib/routing/router.gr.dart +++ b/mobile/lib/routing/router.gr.dart @@ -97,11 +97,11 @@ abstract class _$AppRouter extends RootStackRouter { child: const ArchivePage(), ); }, - AssetSelectionRoute.name: (routeData) { + AlbumAssetSelectionRoute.name: (routeData) { final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: AssetSelectionPage( + child: AlbumAssetSelectionPage( key: args.key, existingAssets: args.existingAssets, canDeselect: args.canDeselect, @@ -170,10 +170,10 @@ abstract class _$AppRouter extends RootStackRouter { ), ); }, - HomeRoute.name: (routeData) { + PhotosRoute.name: (routeData) { return AutoRoutePage( routeData: routeData, - child: const HomePage(), + child: const PhotosPage(), ); }, LibraryRoute.name: (routeData) { @@ -272,21 +272,21 @@ abstract class _$AppRouter extends RootStackRouter { child: const SearchPage(), ); }, - SelectAdditionalUserForSharingRoute.name: (routeData) { + AlbumAdditionalSharedUserSelectionRoute.name: (routeData) { final args = routeData.argsAs(); return AutoRoutePage?>( routeData: routeData, - child: SelectAdditionalUserForSharingPage( + child: AlbumAdditionalSharedUserSelectionPage( key: args.key, album: args.album, ), ); }, - SelectUserForSharingRoute.name: (routeData) { + AlbumSharedUserSelectionRoute.name: (routeData) { final args = routeData.argsAs(); return AutoRoutePage>( routeData: routeData, - child: SelectUserForSharingPage( + child: AlbumSharedUserSelectionPage( key: args.key, assets: args.assets, ), @@ -620,16 +620,16 @@ class ArchiveRoute extends PageRouteInfo { } /// generated route for -/// [AssetSelectionPage] -class AssetSelectionRoute extends PageRouteInfo { - AssetSelectionRoute({ +/// [AlbumAssetSelectionPage] +class AlbumAssetSelectionRoute extends PageRouteInfo { + AlbumAssetSelectionRoute({ Key? key, required Set existingAssets, bool canDeselect = false, required QueryBuilder? query, List? children, }) : super( - AssetSelectionRoute.name, + AlbumAssetSelectionRoute.name, args: AssetSelectionRouteArgs( key: key, existingAssets: existingAssets, @@ -639,7 +639,7 @@ class AssetSelectionRoute extends PageRouteInfo { initialChildren: children, ); - static const String name = 'AssetSelectionRoute'; + static const String name = 'AlbumAssetSelectionRoute'; static const PageInfo page = PageInfo(name); @@ -853,15 +853,15 @@ class GalleryViewerRouteArgs { } /// generated route for -/// [HomePage] -class HomeRoute extends PageRouteInfo { - const HomeRoute({List? children}) +/// [PhotosPage] +class PhotosRoute extends PageRouteInfo { + const PhotosRoute({List? children}) : super( - HomeRoute.name, + PhotosRoute.name, initialChildren: children, ); - static const String name = 'HomeRoute'; + static const String name = 'PhotosRoute'; static const PageInfo page = PageInfo(name); } @@ -1164,15 +1164,15 @@ class SearchRoute extends PageRouteInfo { } /// generated route for -/// [SelectAdditionalUserForSharingPage] -class SelectAdditionalUserForSharingRoute +/// [AlbumAdditionalSharedUserSelectionPage] +class AlbumAdditionalSharedUserSelectionRoute extends PageRouteInfo { - SelectAdditionalUserForSharingRoute({ + AlbumAdditionalSharedUserSelectionRoute({ Key? key, required Album album, List? children, }) : super( - SelectAdditionalUserForSharingRoute.name, + AlbumAdditionalSharedUserSelectionRoute.name, args: SelectAdditionalUserForSharingRouteArgs( key: key, album: album, @@ -1180,7 +1180,7 @@ class SelectAdditionalUserForSharingRoute initialChildren: children, ); - static const String name = 'SelectAdditionalUserForSharingRoute'; + static const String name = 'AlbumAdditionalSharedUserSelectionRoute'; static const PageInfo page = PageInfo(name); @@ -1203,15 +1203,15 @@ class SelectAdditionalUserForSharingRouteArgs { } /// generated route for -/// [SelectUserForSharingPage] -class SelectUserForSharingRoute +/// [AlbumSharedUserSelectionPage] +class AlbumSharedUserSelectionRoute extends PageRouteInfo { - SelectUserForSharingRoute({ + AlbumSharedUserSelectionRoute({ Key? key, required Set assets, List? children, }) : super( - SelectUserForSharingRoute.name, + AlbumSharedUserSelectionRoute.name, args: SelectUserForSharingRouteArgs( key: key, assets: assets, @@ -1219,7 +1219,7 @@ class SelectUserForSharingRoute initialChildren: children, ); - static const String name = 'SelectUserForSharingRoute'; + static const String name = 'AlbumSharedUserSelectionRoute'; static const PageInfo page = PageInfo(name); diff --git a/mobile/lib/shared/ui/asset_grid/multiselect_grid.dart b/mobile/lib/shared/ui/asset_grid/multiselect_grid.dart index cf9420b554..beb5712bd2 100644 --- a/mobile/lib/shared/ui/asset_grid/multiselect_grid.dart +++ b/mobile/lib/shared/ui/asset_grid/multiselect_grid.dart @@ -25,7 +25,7 @@ import 'package:immich_mobile/providers/asset.provider.dart'; import 'package:immich_mobile/providers/user.provider.dart'; import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; -import 'package:immich_mobile/shared/views/immich_loading_overlay.dart'; +import 'package:immich_mobile/utils/immich_loading_overlay.dart'; import 'package:immich_mobile/utils/selection_handlers.dart'; class MultiselectGrid extends HookConsumerWidget { diff --git a/mobile/lib/shared/views/immich_loading_overlay.dart b/mobile/lib/utils/immich_loading_overlay.dart similarity index 100% rename from mobile/lib/shared/views/immich_loading_overlay.dart rename to mobile/lib/utils/immich_loading_overlay.dart diff --git a/mobile/test/modules/activity/activities_page_test.dart b/mobile/test/modules/activity/activities_page_test.dart index 4071b2b607..cd227a8075 100644 --- a/mobile/test/modules/activity/activities_page_test.dart +++ b/mobile/test/modules/activity/activities_page_test.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:immich_mobile/models/activities/activity.model.dart'; import 'package:immich_mobile/providers/activity.provider.dart'; -import 'package:immich_mobile/modules/activities/views/activities_page.dart'; +import 'package:immich_mobile/pages/common/activities.page.dart'; import 'package:immich_mobile/modules/activities/widgets/activity_text_field.dart'; import 'package:immich_mobile/modules/activities/widgets/dismissible_activity.dart'; import 'package:immich_mobile/providers/album/current_album.provider.dart';