Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(mobile): pages #9246

Merged
merged 9 commits into from
May 5, 2024
Merged

refactor(mobile): pages #9246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ffc7ef7
refactor(mobile): pages
alextran1502 May 2, 2024
ef4f33e
refactor
alextran1502 May 3, 2024
923d603
album pages
alextran1502 May 3, 2024
e459489
pages
alextran1502 May 3, 2024
28eba82
pages
alextran1502 May 3, 2024
80ca624
use *.page.dart
alextran1502 May 4, 2024
44c8618
Merge branch 'main' of github.com:immich-app/immich into mobile/refac…
alextran1502 May 4, 2024
e6af4e1
representation
alextran1502 May 5, 2024
51f3c82
put back module
alextran1502 May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion mobile/lib/modules/album/ui/album_viewer_appbar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Empty file removed mobile/lib/modules/archive/ui/store_ui_here.txt
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion mobile/lib/modules/map/widgets/map_app_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion mobile/lib/modules/memories/ui/memory_card.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
22 changes: 0 additions & 22 deletions mobile/lib/modules/settings/views/settings_sub_page.dart
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions ...odules/settings/ui/advanced_settings.dart → ...s/settings/widgets/advanced_settings.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions ...t_settings/asset_list_group_settings.dart → ...t_settings/asset_list_group_settings.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions ..._settings/asset_list_layout_settings.dart → ..._settings/asset_list_layout_settings.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions ...et_list_settings/asset_list_settings.dart → ...et_list_settings/asset_list_settings.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 3 additions & 3 deletions .../backup_settings/background_settings.dart → .../backup_settings/background_settings.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
10 changes: 5 additions & 5 deletions ...s/ui/backup_settings/backup_settings.dart → ...gets/backup_settings/backup_settings.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion .../backup_settings/foreground_settings.dart → .../backup_settings/foreground_settings.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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});
Expand Down
4 changes: 2 additions & 2 deletions ...ings/ui/image_viewer_quality_setting.dart → ...widgets/image_viewer_quality_setting.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 ...odules/settings/ui/language_settings.dart → ...s/settings/widgets/language_settings.dart
View file
Open in desktop
File renamed without changes.
0 ...s/settings/ui/local_storage_settings.dart → ...tings/widgets/local_storage_settings.dart
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...les/settings/ui/notification_setting.dart → ...ettings/widgets/notification_setting.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions ...i/preference_settings/haptic_setting.dart → ...s/preference_settings/haptic_setting.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions ...eference_settings/preference_setting.dart → ...eference_settings/preference_setting.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
4 changes: 2 additions & 2 deletions ...ui/preference_settings/theme_setting.dart → ...ts/preference_settings/theme_setting.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
0 ...ettings/ui/settings_button_list_tile.dart → ...gs/widgets/settings_button_list_tile.dart
View file
Open in desktop
File renamed without changes.
0 ...settings/ui/settings_radio_list_tile.dart → ...ngs/widgets/settings_radio_list_tile.dart
View file
Open in desktop
File renamed without changes.
0 ...ettings/ui/settings_slider_list_tile.dart → ...gs/widgets/settings_slider_list_tile.dart
View file
Open in desktop
File renamed without changes.
0 ...ttings/ui/settings_sub_page_scaffold.dart → ...s/widgets/settings_sub_page_scaffold.dart
View file
Open in desktop
File renamed without changes.
0 ...dules/settings/ui/settings_sub_title.dart → .../settings/widgets/settings_sub_title.dart
View file
Open in desktop
File renamed without changes.
0 ...ettings/ui/settings_switch_list_tile.dart → ...gs/widgets/settings_switch_list_tile.dart
View file
Open in desktop
File renamed without changes.
0 ...ules/backup/views/album_preview_page.dart → .../lib/pages/backup/album_preview.page.dart
View file
Open in desktop
File renamed without changes.
0 ...up/views/backup_album_selection_page.dart → ...s/backup/backup_album_selection.page.dart
View file
Open in desktop
File renamed without changes.
0 .../backup/views/backup_controller_page.dart → .../pages/backup/backup_controller.page.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...les/backup/views/backup_options_page.dart → ...lib/pages/backup/backup_options.page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
0 ...ckup/views/failed_backup_status_page.dart → ...ges/backup/failed_backup_status.page.dart
View file
Open in desktop
File renamed without changes.
0 ...les/activities/views/activities_page.dart → mobile/lib/pages/common/activities.page.dart
View file
Open in desktop
File renamed without changes.
7 changes: 5 additions & 2 deletions ...ect_additional_user_for_sharing_page.dart → ...dditional_shared_user_selection.page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions ...les/album/views/asset_selection_page.dart → ...es/common/album_asset_selection.page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ...dules/album/views/album_options_part.dart → .../lib/pages/common/album_options.page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ...m/views/select_user_for_sharing_page.dart → ...mon/album_shared_user_selection.page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions ...odules/album/views/album_viewer_page.dart → ...e/lib/pages/common/album_viewer.page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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 {
Expand Down Expand Up @@ -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),
Expand All @@ -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) {
Expand Down
0 mobile/lib/shared/views/app_log_page.dart → mobile/lib/pages/common/app_log.page.dart
View file
Open in desktop
File renamed without changes.
0 ...lib/shared/views/app_log_detail_page.dart → ...lib/pages/common/app_log_detail.page.dart
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...odules/album/views/create_album_page.dart → ...e/lib/pages/common/create_album.page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};
Expand All @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion ...es/asset_viewer/views/gallery_viewer.dart → ...lib/pages/common/gallery_viewer.page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down