TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move

Browse Source
This commit is contained in:
Neeraj Gupta
2025-03-03 17:29:03 +05:30
parent be6ca79c2d
commit 73efdbbf4d
33 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/lib/app.dart
View File

@@ -16,7 +16,7 @@ import "package:photos/l10n/l10n.dart";
import "package:photos/service_locator.dart";
import 'package:photos/services/app_lifecycle_service.dart';
import "package:photos/services/home_widget_service.dart";
import 'package:photos/services/sync_service.dart';
import 'package:photos/services/sync/sync_service.dart';
import 'package:photos/ui/tabs/home_widget.dart';
import "package:photos/ui/viewer/actions/file_viewer.dart";
import "package:photos/utils/intent_util.dart";

2
mobile/lib/core/configuration.dart
View File

@@ -30,7 +30,7 @@ import 'package:photos/services/ignored_files_service.dart';
import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
import 'package:photos/services/memories_service.dart';
import 'package:photos/services/search_service.dart';
import 'package:photos/services/sync_service.dart';
import 'package:photos/services/sync/sync_service.dart';
import 'package:photos/utils/file_uploader.dart';
import "package:photos/utils/lock_screen_settings.dart";
import 'package:photos/utils/validator_util.dart';

6
mobile/lib/main.dart
View File

@@ -35,7 +35,6 @@ import 'package:photos/services/favorites_service.dart';
import "package:photos/services/filedata/filedata_service.dart";
import 'package:photos/services/home_widget_service.dart';
import 'package:photos/services/local_file_update_service.dart';
import 'package:photos/services/local_sync_service.dart';
import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
import 'package:photos/services/machine_learning/ml_service.dart';
import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
@@ -43,9 +42,10 @@ import 'package:photos/services/memories_service.dart';
import "package:photos/services/notification_service.dart";
import "package:photos/services/preview_video_store.dart";
import 'package:photos/services/push_service.dart';
import 'package:photos/services/remote_sync_service.dart';
import 'package:photos/services/search_service.dart';
import "package:photos/services/sync_service.dart";
import 'package:photos/services/sync/local_sync_service.dart';
import 'package:photos/services/sync/remote_sync_service.dart';
import "package:photos/services/sync/sync_service.dart";
import 'package:photos/ui/tools/app_lock.dart';
import 'package:photos/ui/tools/lock_screen.dart';
import "package:photos/utils/email_util.dart";

2
mobile/lib/service_locator.dart
View File

@@ -11,7 +11,7 @@ import "package:photos/services/machine_learning/face_ml/face_recognition_servic
import "package:photos/services/machine_learning/machine_learning_controller.dart";
import "package:photos/services/magic_cache_service.dart";
import "package:photos/services/storage_bonus_service.dart";
import "package:photos/services/trash_sync_service.dart";
import "package:photos/services/sync/trash_sync_service.dart";
import "package:photos/services/update_service.dart";
import "package:photos/utils/local_settings.dart";
import "package:shared_preferences/shared_preferences.dart";

4
mobile/lib/services/collections_service.dart
View File

@@ -38,8 +38,8 @@ import "package:photos/models/metadata/collection_magic.dart";
import "package:photos/service_locator.dart";
import 'package:photos/services/app_lifecycle_service.dart';
import "package:photos/services/favorites_service.dart";
import 'package:photos/services/local_sync_service.dart';
import 'package:photos/services/remote_sync_service.dart';
import 'package:photos/services/sync/local_sync_service.dart';
import 'package:photos/services/sync/remote_sync_service.dart';
import "package:photos/utils/dialog_util.dart";
import "package:photos/utils/file_key.dart";
import "package:photos/utils/local_settings.dart";

2
mobile/lib/services/favorites_service.dart
View File

@@ -13,7 +13,7 @@ import 'package:photos/models/api/collection/create_request.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/services/collections_service.dart';
import 'package:photos/services/remote_sync_service.dart';
import 'package:photos/services/sync/remote_sync_service.dart';
import 'package:photos/ui/actions/collection/collection_sharing_actions.dart';
class FavoritesService {

2
mobile/lib/services/file_magic_service.dart
View File

@@ -16,7 +16,7 @@ import "package:photos/models/api/metadata.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/models/metadata/common_keys.dart";
import "package:photos/models/metadata/file_magic.dart";
import 'package:photos/services/remote_sync_service.dart';
import 'package:photos/services/sync/remote_sync_service.dart';
import "package:photos/utils/file_key.dart";
class FileMagicService {

2
mobile/lib/services/notification_service.dart
View File

@@ -2,7 +2,7 @@ import 'dart:io';
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import "package:logging/logging.dart";
import "package:photos/services/remote_sync_service.dart";
import "package:photos/services/sync/remote_sync_service.dart";
import "package:shared_preferences/shared_preferences.dart";
class NotificationService {

2
mobile/lib/services/push_service.dart
View File

@@ -6,7 +6,7 @@ import 'package:photos/core/constants.dart';
import 'package:photos/core/event_bus.dart';
import 'package:photos/core/network/network.dart';
import 'package:photos/events/signed_in_event.dart';
import 'package:photos/services/sync_service.dart';
import 'package:photos/services/sync/sync_service.dart';
import 'package:shared_preferences/shared_preferences.dart';
class PushService {

0
mobile/lib/services/local_sync_service.dart → mobile/lib/services/sync/local_sync_service.dart
View File

3
mobile/lib/services/remote_sync_service.dart → mobile/lib/services/sync/remote_sync_service.dart
View File

@@ -28,7 +28,7 @@ import 'package:photos/services/collections_service.dart';
import 'package:photos/services/ignored_files_service.dart';
import 'package:photos/services/local_file_update_service.dart';
import "package:photos/services/notification_service.dart";
import 'package:photos/services/sync_service.dart';
import 'package:photos/services/sync/sync_service.dart';
import 'package:photos/utils/diff_fetcher.dart';
import 'package:photos/utils/file_uploader.dart';
import 'package:photos/utils/file_util.dart';
@@ -308,7 +308,6 @@ class RemoteSyncService {
Future<void> joinAndSyncCollection(
BuildContext context,
int collectionID,
) async {
await _collectionsService.joinPublicCollection(context, collectionID);
await _collectionsService.sync();

4
mobile/lib/services/sync_service.dart → mobile/lib/services/sync/sync_service.dart
View File

@@ -15,9 +15,9 @@ import 'package:photos/events/sync_status_update_event.dart';
import 'package:photos/events/trigger_logout_event.dart';
import 'package:photos/models/file/file_type.dart';
import "package:photos/services/filedata/filedata_service.dart";
import 'package:photos/services/local_sync_service.dart';
import 'package:photos/services/notification_service.dart';
import 'package:photos/services/remote_sync_service.dart';
import 'package:photos/services/sync/local_sync_service.dart';
import 'package:photos/services/sync/remote_sync_service.dart';
import 'package:photos/utils/file_uploader.dart';
import 'package:shared_preferences/shared_preferences.dart';

0
mobile/lib/services/trash_sync_service.dart → mobile/lib/services/sync/trash_sync_service.dart
View File

2
mobile/lib/ui/actions/collection/collection_file_actions.dart
View File

@@ -14,7 +14,7 @@ import "package:photos/services/collections_service.dart";
import 'package:photos/services/favorites_service.dart';
import "package:photos/services/hidden_service.dart";
import "package:photos/services/ignored_files_service.dart";
import "package:photos/services/remote_sync_service.dart";
import "package:photos/services/sync/remote_sync_service.dart";
import 'package:photos/ui/actions/collection/collection_sharing_actions.dart';
import 'package:photos/ui/common/progress_dialog.dart';
import 'package:photos/ui/components/action_sheet_widget.dart';

2
mobile/lib/ui/collections/album/vertical_list.dart
View File

@@ -11,7 +11,7 @@ import 'package:photos/models/collection/collection_items.dart';
import 'package:photos/models/selected_files.dart';
import 'package:photos/services/collections_service.dart';
import "package:photos/services/hidden_service.dart";
import 'package:photos/services/remote_sync_service.dart';
import 'package:photos/services/sync/remote_sync_service.dart';
import "package:photos/ui/actions/collection/collection_file_actions.dart";
import "package:photos/ui/actions/collection/collection_sharing_actions.dart";
import "package:photos/ui/collections/album/column_item.dart";

2
mobile/lib/ui/components/home_header_widget.dart
View File

@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
import "package:logging/logging.dart";
import "package:photo_manager/photo_manager.dart";
import "package:photos/generated/l10n.dart";
import "package:photos/services/local_sync_service.dart";
import "package:photos/services/sync/local_sync_service.dart";
import 'package:photos/ui/components/buttons/icon_button_widget.dart';
import "package:photos/ui/settings/backup/backup_folder_selection_page.dart";
import "package:photos/utils/dialog_util.dart";

2
mobile/lib/ui/home/grant_permissions_widget.dart
View File

@@ -6,7 +6,7 @@ import "package:logging/logging.dart";
import 'package:photo_manager/photo_manager.dart';
import "package:photos/generated/l10n.dart";
import "package:photos/l10n/l10n.dart";
import 'package:photos/services/sync_service.dart';
import 'package:photos/services/sync/sync_service.dart';
import "package:photos/theme/ente_theme.dart";
import "package:photos/utils/dialog_util.dart";
import "package:photos/utils/photo_manager_util.dart";

2
mobile/lib/ui/home/loading_photos_widget.dart
View File

@@ -7,7 +7,7 @@ import 'package:photos/ente_theme_data.dart';
import 'package:photos/events/local_import_progress.dart';
import 'package:photos/events/sync_status_update_event.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/services/local_sync_service.dart';
import 'package:photos/services/sync/local_sync_service.dart';
import 'package:photos/ui/common/bottom_shadow.dart';
import "package:photos/ui/components/buttons/button_widget.dart";
import "package:photos/ui/components/dialog_widget.dart";

2
mobile/lib/ui/home/start_backup_hook_widget.dart
View File

@@ -3,7 +3,7 @@ import "dart:async";
import 'package:flutter/material.dart';
import 'package:photo_manager/photo_manager.dart';
import 'package:photos/generated/l10n.dart';
import 'package:photos/services/local_sync_service.dart';
import 'package:photos/services/sync/local_sync_service.dart';
import 'package:photos/ui/common/gradient_button.dart';
import 'package:photos/ui/settings/backup/backup_folder_selection_page.dart';
import 'package:photos/utils/navigation_util.dart';

2
mobile/lib/ui/home/status_bar_widget.dart
View File

@@ -12,7 +12,7 @@ import "package:photos/generated/l10n.dart";
import "package:photos/models/preview/preview_item_status.dart";
import "package:photos/service_locator.dart";
import "package:photos/services/preview_video_store.dart";
import 'package:photos/services/sync_service.dart';
import 'package:photos/services/sync/sync_service.dart';
import "package:photos/theme/ente_theme.dart";
import 'package:photos/theme/text_style.dart';
import 'package:photos/ui/account/verify_recovery_page.dart';

2
mobile/lib/ui/settings/backup/backup_folder_selection_page.dart
View File

@@ -12,7 +12,7 @@ import 'package:photos/ente_theme_data.dart';
import 'package:photos/generated/l10n.dart';
import 'package:photos/models/device_collection.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/services/remote_sync_service.dart';
import 'package:photos/services/sync/remote_sync_service.dart';
import "package:photos/theme/ente_theme.dart";
import 'package:photos/ui/common/loading_widget.dart';
import 'package:photos/ui/viewer/file/thumbnail_widget.dart';

4
mobile/lib/ui/settings/debug/debug_section_widget.dart
View File

@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
import 'package:photos/core/configuration.dart';
import "package:photos/service_locator.dart";
import 'package:photos/services/ignored_files_service.dart';
import 'package:photos/services/local_sync_service.dart';
import 'package:photos/services/sync_service.dart';
import 'package:photos/services/sync/local_sync_service.dart';
import 'package:photos/services/sync/sync_service.dart';
import 'package:photos/theme/ente_theme.dart';
import 'package:photos/ui/components/captioned_text_widget.dart';
import 'package:photos/ui/components/expandable_menu_item_widget.dart';

4
mobile/lib/ui/tabs/home_widget.dart
View File

@@ -37,10 +37,10 @@ import "package:photos/service_locator.dart";
import 'package:photos/services/account/user_service.dart';
import 'package:photos/services/app_lifecycle_service.dart';
import 'package:photos/services/collections_service.dart';
import 'package:photos/services/local_sync_service.dart';
import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
import "package:photos/services/notification_service.dart";
import "package:photos/services/remote_sync_service.dart";
import 'package:photos/services/sync/local_sync_service.dart';
import "package:photos/services/sync/remote_sync_service.dart";
import 'package:photos/states/user_details_state.dart';
import 'package:photos/theme/colors.dart';
import "package:photos/theme/effects.dart";

2
mobile/lib/ui/tools/collage/collage_save_button.dart
View File

@@ -4,7 +4,7 @@ import "package:logging/logging.dart";
import "package:photo_manager/photo_manager.dart";
import "package:photos/generated/l10n.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/services/sync_service.dart";
import "package:photos/services/sync/sync_service.dart";
import "package:photos/ui/components/buttons/button_widget.dart";
import "package:photos/ui/components/models/button_type.dart";
import "package:photos/ui/viewer/file/detail_page.dart";

2
mobile/lib/ui/tools/editor/image_editor_page.dart
View File

@@ -17,7 +17,7 @@ import 'package:photos/events/local_photos_updated_event.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/file/file.dart' as ente;
import 'package:photos/models/location/location.dart';
import 'package:photos/services/sync_service.dart';
import 'package:photos/services/sync/sync_service.dart';
import 'package:photos/ui/common/loading_widget.dart';
import 'package:photos/ui/components/action_sheet_widget.dart';
import 'package:photos/ui/components/buttons/button_widget.dart';

2
mobile/lib/ui/tools/editor/video_editor_page.dart
View File

@@ -12,7 +12,7 @@ import "package:photos/events/local_photos_updated_event.dart";
import "package:photos/generated/l10n.dart";
import "package:photos/models/file/file.dart";
import "package:photos/models/location/location.dart";
import "package:photos/services/sync_service.dart";
import "package:photos/services/sync/sync_service.dart";
import "package:photos/ui/tools/editor/export_video_service.dart";
import 'package:photos/ui/tools/editor/video_crop_page.dart';
import "package:photos/ui/tools/editor/video_editor/video_editor_bottom_action.dart";

2
mobile/lib/ui/viewer/actions/delete_empty_albums.dart
View File

@@ -6,7 +6,7 @@ import "package:photos/generated/l10n.dart";
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/services/collections_service.dart';
import "package:photos/services/remote_sync_service.dart";
import "package:photos/services/sync/remote_sync_service.dart";
import 'package:photos/ui/components/action_sheet_widget.dart';
import 'package:photos/ui/components/buttons/button_widget.dart';
import 'package:photos/ui/components/models/button_type.dart';

4
mobile/lib/ui/viewer/file_details/upload_icon_widget.dart
View File

@@ -13,8 +13,8 @@ import "package:photos/models/ignored_file.dart";
import "package:photos/services/collections_service.dart";
import "package:photos/services/hidden_service.dart";
import "package:photos/services/ignored_files_service.dart";
import "package:photos/services/remote_sync_service.dart";
import "package:photos/services/sync_service.dart";
import "package:photos/services/sync/remote_sync_service.dart";
import "package:photos/services/sync/sync_service.dart";
import "package:photos/ui/common/loading_widget.dart";
import "package:photos/utils/toast_util.dart";

2
mobile/lib/ui/viewer/gallery/device_folder_page.dart
View File

@@ -13,7 +13,7 @@ import 'package:photos/models/file/file.dart';
import 'package:photos/models/gallery_type.dart';
import 'package:photos/models/selected_files.dart';
import 'package:photos/services/ignored_files_service.dart';
import 'package:photos/services/remote_sync_service.dart';
import 'package:photos/services/sync/remote_sync_service.dart';
import 'package:photos/theme/ente_theme.dart';
import 'package:photos/ui/components/captioned_text_widget.dart';
import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';

2
mobile/lib/ui/viewer/gallery/shared_public_collection_page.dart
View File

@@ -13,7 +13,7 @@ import "package:photos/models/file_load_result.dart";
import "package:photos/models/gallery_type.dart";
import "package:photos/models/selected_files.dart";
import "package:photos/services/collections_service.dart";
import "package:photos/services/remote_sync_service.dart";
import "package:photos/services/sync/remote_sync_service.dart";
import "package:photos/ui/components/buttons/button_widget.dart";
import "package:photos/ui/components/end_to_end_banner.dart";
import "package:photos/ui/components/models/button_type.dart";

4
mobile/lib/utils/delete_file_util.dart
View File

@@ -18,8 +18,8 @@ import 'package:photos/models/file/file.dart';
import "package:photos/models/files_split.dart";
import 'package:photos/models/selected_files.dart';
import "package:photos/service_locator.dart";
import 'package:photos/services/remote_sync_service.dart';
import 'package:photos/services/sync_service.dart';
import 'package:photos/services/sync/remote_sync_service.dart';
import 'package:photos/services/sync/sync_service.dart';
import 'package:photos/ui/common/linear_progress_dialog.dart';
import 'package:photos/ui/components/action_sheet_widget.dart';
import 'package:photos/ui/components/buttons/button_widget.dart';

2
mobile/lib/utils/file_download_util.dart
View File

@@ -18,7 +18,7 @@ import "package:photos/models/file/file_type.dart";
import "package:photos/models/ignored_file.dart";
import "package:photos/services/collections_service.dart";
import "package:photos/services/ignored_files_service.dart";
import "package:photos/services/local_sync_service.dart";
import "package:photos/services/sync/local_sync_service.dart";
import "package:photos/utils/data_util.dart";
import "package:photos/utils/fake_progress.dart";
import "package:photos/utils/file_key.dart";

4
mobile/lib/utils/file_uploader.dart
View File

@@ -36,9 +36,9 @@ import "package:photos/module/upload/service/multipart.dart";
import "package:photos/service_locator.dart";
import "package:photos/services/account/user_service.dart";
import 'package:photos/services/collections_service.dart';
import 'package:photos/services/local_sync_service.dart';
import "package:photos/services/preview_video_store.dart";
import 'package:photos/services/sync_service.dart';
import 'package:photos/services/sync/local_sync_service.dart';
import 'package:photos/services/sync/sync_service.dart';
import 'package:photos/utils/data_util.dart';
import "package:photos/utils/exif_util.dart";
import "package:photos/utils/file_key.dart";