refactor(mobile): pages (#9246)

* refactor(mobile): pages

* refactor

* album pages

* pages

* pages

* use *.page.dart

* representation

* put back module

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 {

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 {

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';
 

mobile/lib/modules/settings/ui/advanced_settings.dart → 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';

mobile/lib/modules/settings/ui/asset_list_settings/asset_list_group_settings.dart → 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 {

mobile/lib/modules/settings/ui/asset_list_settings/asset_list_layout_settings.dart → 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 {

mobile/lib/modules/settings/ui/asset_list_settings/asset_list_settings.dart → 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';
 

mobile/lib/modules/settings/ui/backup_settings/background_settings.dart → 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';
 

mobile/lib/modules/settings/ui/backup_settings/backup_settings.dart → 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';
 

mobile/lib/modules/settings/ui/backup_settings/foreground_settings.dart → 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});

mobile/lib/modules/settings/ui/image_viewer_quality_setting.dart → 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 {

mobile/lib/modules/settings/ui/notification_setting.dart → 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';
 

mobile/lib/modules/settings/ui/preference_settings/haptic_setting.dart → 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 {

mobile/lib/modules/settings/ui/preference_settings/preference_setting.dart → 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({

mobile/lib/modules/settings/ui/preference_settings/theme_setting.dart → 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';
 

mobile/lib/modules/backup/views/backup_options_page.dart → 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 {

mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart → 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<List<String>?>()
-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) {

mobile/lib/modules/album/views/asset_selection_page.dart → 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<AssetSelectionPageResult?>()
-class AssetSelectionPage extends HookConsumerWidget {
-  const AssetSelectionPage({
+class AlbumAssetSelectionPage extends HookConsumerWidget {
+  const AlbumAssetSelectionPage({
     super.key,
     required this.existingAssets,
     this.canDeselect = false,

mobile/lib/modules/album/views/album_options_part.dart → 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 {

mobile/lib/modules/album/views/select_user_for_sharing_page.dart → 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<List<String>>()
-class SelectUserForSharingPage extends HookConsumerWidget {
-  const SelectUserForSharingPage({super.key, required this.assets});
+class AlbumSharedUserSelectionPage extends HookConsumerWidget {
+  const AlbumSharedUserSelectionPage({super.key, required this.assets});
 
   final Set<Asset> assets;
 

mobile/lib/modules/album/views/album_viewer_page.dart → 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<AssetSelectionPageResult?>(
-        AssetSelectionRoute(
+        AlbumAssetSelectionRoute(
           existingAssets: albumInfo.assets,
           canDeselect: false,
           query: getRemoteAssetQuery(ref),
@@ -92,7 +92,7 @@ class AlbumViewerPage extends HookConsumerWidget {
 
     void onAddUsersPressed(Album album) async {
       List<String>? sharedUserIds = await context.pushRoute<List<String>?>(
-        SelectAdditionalUserForSharingRoute(album: album),
+        AlbumAdditionalSharedUserSelectionRoute(album: album),
       );
 
       if (sharedUserIds != null) {

mobile/lib/modules/album/views/create_album_page.dart → mobile/lib/pages/common/create_album.page.dart

@@ -39,7 +39,7 @@ class CreateAlbumPage extends HookConsumerWidget {
 
     showSelectUserPage() async {
       final bool? ok = await context.pushRoute<bool?>(
-        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<AssetSelectionPageResult?>(
-        AssetSelectionRoute(
+        AlbumAssetSelectionRoute(
           existingAssets: selectedAssets.value,
           canDeselect: true,
           query: getRemoteAssetQuery(ref),

mobile/lib/modules/asset_viewer/views/gallery_viewer.dart → 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';