0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move packages

Browse source
This commit is contained in:
Neeraj Gupta 2023-08-25 10:09:30 +05:30
parent 2714014fd8
commit 3a98af3518
149 changed files with 203 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/core/cache/thumbnail_in_memory_cache.dart vendored
View file

@ -2,7 +2,7 @@ import 'dart:typed_data';
import 'package:photos/core/cache/lru_map.dart';
import 'package:photos/core/constants.dart';
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
class ThumbnailInMemoryLruCache {
static final LRUMap<String, Uint8List?> _map = LRUMap(1000);

2
lib/db/collections_db.dart
View file

@ -5,7 +5,7 @@ import 'package:path/path.dart';
import 'package:path_provider/path_provider.dart';
import "package:photos/models/api/collection/public_url.dart";
import "package:photos/models/api/collection/user.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:sqflite/sqflite.dart';
import 'package:sqflite_migration/sqflite_migration.dart';

2
lib/db/device_files_db.dart
View file

@ -5,7 +5,7 @@ import 'package:photo_manager/photo_manager.dart';
import 'package:photos/db/files_db.dart';
import 'package:photos/models/backup_status.dart';
import 'package:photos/models/device_collection.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/file_load_result.dart';
import 'package:photos/models/upload_strategy.dart';
import 'package:photos/services/local/local_sync_util.dart';

4
lib/db/files_db.dart
View file

@ -6,9 +6,9 @@ import 'package:path/path.dart';
import 'package:path_provider/path_provider.dart';
import "package:photos/extensions/stop_watch.dart";
import 'package:photos/models/backup_status.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/file_load_result.dart';
import 'package:photos/models/file_type.dart';
import 'package:photos/models/file/file_type.dart';
import 'package:photos/models/location/location.dart';
import "package:photos/models/metadata/common_keys.dart";
import "package:photos/services/filter/db_filters.dart";

2
lib/db/trash_db.dart
View file

@ -5,7 +5,7 @@ import 'package:logging/logging.dart';
import 'package:path/path.dart';
import 'package:path_provider/path_provider.dart';
import 'package:photos/models/file_load_result.dart';
import 'package:photos/models/trash_file.dart';
import 'package:photos/models/file/trash_file.dart';
import 'package:sqflite/sqflite.dart';
// The TrashDB doesn't need to flatten and store all attributes of a file.

2
lib/events/collection_updated_event.dart
View file

@ -1,5 +1,5 @@
import 'package:photos/events/files_updated_event.dart';
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
class CollectionUpdatedEvent extends FilesUpdatedEvent {
final int? collectionID;

2
lib/events/files_updated_event.dart
View file

@ -1,5 +1,5 @@
import 'package:photos/events/event.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
class FilesUpdatedEvent extends Event {
final List<EnteFile> updatedFiles;

2
lib/models/api/collection/create_request.dart
View file

@ -1,4 +1,4 @@
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/services/file_magic_service.dart';
class CreateRequest {

0
lib/models/collection.dart → lib/models/collection/collection.dart
View file

0
lib/models/collection_file_item.dart → lib/models/collection/collection_file_item.dart
View file

4
lib/models/collection_items.dart → lib/models/collection/collection_items.dart
View file

@ -1,5 +1,5 @@
import 'package:photos/models/collection.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/file/file.dart';
class CollectionWithThumbnail {
final Collection collection;

2
lib/models/device_collection.dart
View file

@ -1,4 +1,4 @@
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/upload_strategy.dart';
class DeviceCollection {

2
lib/models/duplicate_files.dart
View file

@ -1,6 +1,6 @@
import 'dart:convert';
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/services/collections_service.dart';
class DuplicateFilesResponse {

10
lib/models/file/extensions/file_props.dart Normal file
View file

@ -0,0 +1,10 @@
import "package:photos/models/file/file.dart";
import "package:photos/models/file/file_type.dart";
extension FilePropsExtn on EnteFile {
bool get isLivePhoto => fileType == FileType.livePhoto;
bool get isMotionPhoto => pubMagicMetadata?.mvi != null;
bool get isLiveOrMotionPhoto => isLivePhoto || isMotionPhoto;
}

2
lib/models/file.dart → lib/models/file/file.dart
View file

@ -6,7 +6,7 @@ import 'package:path/path.dart';
import 'package:photo_manager/photo_manager.dart';
import 'package:photos/core/configuration.dart';
import 'package:photos/core/constants.dart';
import 'package:photos/models/file_type.dart';
import 'package:photos/models/file/file_type.dart';
import 'package:photos/models/location/location.dart';
import "package:photos/models/metadata/file_magic.dart";
import 'package:photos/services/feature_flag_service.dart';

0
lib/models/file_type.dart → lib/models/file/file_type.dart
View file

2
lib/models/trash_file.dart → lib/models/file/trash_file.dart
View file

@ -1,4 +1,4 @@
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
class TrashFile extends EnteFile {
// time when file was put in the trash for first time

2
lib/models/file_load_result.dart
View file

@ -1,4 +1,4 @@
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
class FileLoadResult {
final List<EnteFile> files;

2
lib/models/files_split.dart
View file

@ -1,4 +1,4 @@
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
class FilesSplit {
final List<EnteFile> pendingUploads;

2
lib/models/filters/gallery_items_filter.dart
View file

@ -1,4 +1,4 @@
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
class GalleryItemsFilter {
bool shouldInclude(EnteFile file) {

2
lib/models/filters/important_items_filter.dart
View file

@ -2,7 +2,7 @@ import 'dart:io';
import 'package:path/path.dart';
import 'package:photos/core/configuration.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/filters/gallery_items_filter.dart';
class ImportantItemsFilter implements GalleryItemsFilter {

2
lib/models/gallery_type.dart
View file

@ -1,5 +1,5 @@
import "package:flutter/foundation.dart";
import "package:photos/models/collection.dart";
import 'package:photos/models/collection/collection.dart';
enum GalleryType {
homepage,

2
lib/models/ignored_file.dart
View file

@ -1,4 +1,4 @@
import 'package:photos/models/trash_file.dart';
import 'package:photos/models/file/trash_file.dart';
const kIgnoreReasonTrash = "trash";

2
lib/models/memory.dart
View file

@ -1,4 +1,4 @@
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
class Memory {
final EnteFile file;

4
lib/models/search/album_search_result.dart
View file

@ -1,5 +1,5 @@
import 'package:photos/models/collection_items.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/collection/collection_items.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/search/search_result.dart';
class AlbumSearchResult extends SearchResult {

2
lib/models/search/file_search_result.dart
View file

@ -1,4 +1,4 @@
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/search/search_result.dart';
class FileSearchResult extends SearchResult {

2
lib/models/search/generic_search_result.dart
View file

@ -1,5 +1,5 @@
import "package:flutter/cupertino.dart";
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/search/search_result.dart';
class GenericSearchResult extends SearchResult {

2
lib/models/search/search_result.dart
View file

@ -1,4 +1,4 @@
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
abstract class SearchResult {
ResultType type();

2
lib/models/selected_files.dart
View file

@ -2,7 +2,7 @@ import 'package:collection/collection.dart' show IterableExtension;
import 'package:flutter/foundation.dart';
import 'package:photos/core/event_bus.dart';
import 'package:photos/events/clear_selections_event.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
class SelectedFiles extends ChangeNotifier {
final files = <EnteFile>{};

2
lib/models/user_details.dart
View file

@ -2,7 +2,7 @@ import 'dart:convert';
import 'dart:math';
import 'package:collection/collection.dart';
import 'package:photos/models/file_type.dart';
import 'package:photos/models/file/file_type.dart';
import 'package:photos/models/subscription.dart';
class UserDetails {

8
lib/services/collections_service.dart
View file

@ -24,10 +24,10 @@ import 'package:photos/extensions/stop_watch.dart';
import 'package:photos/models/api/collection/create_request.dart';
import "package:photos/models/api/collection/public_url.dart";
import "package:photos/models/api/collection/user.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection_file_item.dart';
import "package:photos/models/collection_items.dart";
import 'package:photos/models/file.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/collection/collection_file_item.dart';
import 'package:photos/models/collection/collection_items.dart';
import 'package:photos/models/file/file.dart';
import "package:photos/models/metadata/collection_magic.dart";
import 'package:photos/services/app_lifecycle_service.dart';
import "package:photos/services/favorites_service.dart";

2
lib/services/deduplication_service.dart
View file

@ -4,7 +4,7 @@ import 'package:photos/core/errors.dart';
import 'package:photos/core/network/network.dart';
import 'package:photos/db/files_db.dart';
import 'package:photos/models/duplicate_files.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import "package:photos/services/collections_service.dart";
import "package:photos/services/files_service.dart";

4
lib/services/favorites_service.dart
View file

@ -9,8 +9,8 @@ import 'package:photos/db/files_db.dart';
import 'package:photos/events/collection_updated_event.dart';
import 'package:photos/events/files_updated_event.dart';
import 'package:photos/models/api/collection/create_request.dart';
import 'package:photos/models/collection.dart';
import 'package:photos/models/file.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/ui/actions/collection/collection_sharing_actions.dart';

2
lib/services/file_magic_service.dart
View file

@ -12,7 +12,7 @@ import 'package:photos/events/files_updated_event.dart';
import 'package:photos/events/force_reload_home_gallery_event.dart';
import 'package:photos/events/local_photos_updated_event.dart';
import 'package:photos/extensions/list.dart';
import 'package:photos/models/file.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';

2
lib/services/files_service.dart
View file

@ -5,7 +5,7 @@ import 'package:photos/core/configuration.dart';
import 'package:photos/core/network/network.dart';
import 'package:photos/db/files_db.dart';
import 'package:photos/extensions/list.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import "package:photos/models/file_load_result.dart";
import "package:photos/models/metadata/file_magic.dart";
import 'package:photos/services/file_magic_service.dart';

2
lib/services/filter/collection_ignore.dart
View file

@ -1,4 +1,4 @@
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/services/filter/filter.dart";
// CollectionsIgnoreFilter will filter out files that are in present in the

2
lib/services/filter/db_filters.dart
View file

@ -1,4 +1,4 @@
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/services/filter/collection_ignore.dart";
import "package:photos/services/filter/dedupe_by_upload_id.dart";
import "package:photos/services/filter/filter.dart";

2
lib/services/filter/dedupe_by_upload_id.dart
View file

@ -1,4 +1,4 @@
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/services/filter/filter.dart";
// DedupeUploadIDFilter will filter out files where were previously filtered

2
lib/services/filter/filter.dart
View file

@ -1,4 +1,4 @@
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
abstract class Filter {
bool filter(EnteFile file);

4
lib/services/filter/type_filter.dart
View file

@ -1,5 +1,5 @@
import "package:photos/models/file.dart";
import "package:photos/models/file_type.dart";
import 'package:photos/models/file/file.dart';
import 'package:photos/models/file/file_type.dart';
import "package:photos/services/filter/filter.dart";
class TypeFilter extends Filter {

2
lib/services/filter/upload_ignore.dart
View file

@ -1,4 +1,4 @@
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/services/filter/filter.dart";
import "package:photos/services/ignored_files_service.dart";

4
lib/services/hidden_service.dart
View file

@ -10,8 +10,8 @@ import "package:photos/db/files_db.dart";
import 'package:photos/events/files_updated_event.dart';
import 'package:photos/events/local_photos_updated_event.dart';
import 'package:photos/models/api/collection/create_request.dart';
import 'package:photos/models/collection.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/file/file.dart';
import "package:photos/models/metadata/collection_magic.dart";
import "package:photos/models/metadata/common_keys.dart";
import 'package:photos/services/collections_service.dart';

2
lib/services/ignored_files_service.dart
View file

@ -3,7 +3,7 @@ import 'dart:io';
import 'package:logging/logging.dart';
import 'package:photos/db/ignored_files_db.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/ignored_file.dart';
class IgnoredFilesService {

2
lib/services/local/local_sync_util.dart
View file

@ -6,7 +6,7 @@ import 'package:logging/logging.dart';
import 'package:photo_manager/photo_manager.dart';
import 'package:photos/core/event_bus.dart';
import 'package:photos/events/local_import_progress.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import 'package:tuple/tuple.dart';
final _logger = Logger("FileSyncUtil");

4
lib/services/local_file_update_service.dart
View file

@ -7,8 +7,8 @@ import "package:photos/core/configuration.dart";
import 'package:photos/core/errors.dart';
import 'package:photos/db/file_updation_db.dart';
import 'package:photos/db/files_db.dart';
import 'package:photos/models/file.dart';
import "package:photos/models/file_type.dart";
import 'package:photos/models/file/file.dart';
import 'package:photos/models/file/file_type.dart';
import 'package:photos/utils/file_uploader_util.dart';
import 'package:photos/utils/file_util.dart';
import 'package:shared_preferences/shared_preferences.dart';

2
lib/services/local_sync_service.dart
View file

@ -14,7 +14,7 @@ import 'package:photos/events/backup_folders_updated_event.dart';
import 'package:photos/events/local_photos_updated_event.dart';
import 'package:photos/events/sync_status_update_event.dart';
import 'package:photos/extensions/stop_watch.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import "package:photos/models/ignored_file.dart";
import 'package:photos/services/app_lifecycle_service.dart';
import "package:photos/services/ignored_files_service.dart";

4
lib/services/remote_sync_service.dart
View file

@ -18,8 +18,8 @@ import 'package:photos/events/force_reload_home_gallery_event.dart';
import 'package:photos/events/local_photos_updated_event.dart';
import 'package:photos/events/sync_status_update_event.dart';
import 'package:photos/models/device_collection.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/file_type.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/file/file_type.dart';
import 'package:photos/models/upload_strategy.dart';
import 'package:photos/services/app_lifecycle_service.dart';
import 'package:photos/services/collections_service.dart';

8
lib/services/search_service.dart
View file

@ -5,10 +5,10 @@ import 'package:photos/data/months.dart';
import 'package:photos/data/years.dart';
import 'package:photos/db/files_db.dart';
import 'package:photos/events/local_photos_updated_event.dart';
import 'package:photos/models/collection.dart';
import "package:photos/models/collection_items.dart";
import 'package:photos/models/file.dart';
import 'package:photos/models/file_type.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/collection/collection_items.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/file/file_type.dart';
import "package:photos/models/local_entity_data.dart";
import "package:photos/models/location_tag/location_tag.dart";
import 'package:photos/models/search/album_search_result.dart';

2
lib/services/sync_service.dart
View file

@ -17,7 +17,7 @@ import 'package:photos/events/subscription_purchased_event.dart';
import 'package:photos/events/sync_status_update_event.dart';
import 'package:photos/events/trigger_logout_event.dart';
import 'package:photos/models/backup_status.dart';
import 'package:photos/models/file_type.dart';
import 'package:photos/models/file/file_type.dart';
import "package:photos/services/files_service.dart";
import 'package:photos/services/local_sync_service.dart';
import 'package:photos/services/notification_service.dart';

4
lib/services/trash_sync_service.dart
View file

@ -10,9 +10,9 @@ import 'package:photos/events/collection_updated_event.dart';
import 'package:photos/events/force_reload_trash_page_event.dart';
import 'package:photos/events/trash_updated_event.dart';
import 'package:photos/extensions/list.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/ignored_file.dart';
import 'package:photos/models/trash_file.dart';
import 'package:photos/models/file/trash_file.dart';
import 'package:photos/models/trash_item_request.dart';
import 'package:photos/services/ignored_files_service.dart';
import 'package:photos/utils/trash_diff_fetcher.dart';

4
lib/ui/actions/collection/collection_file_actions.dart
View file

@ -5,8 +5,8 @@ import "package:photos/core/event_bus.dart";
import "package:photos/db/files_db.dart";
import "package:photos/events/collection_updated_event.dart";
import "package:photos/generated/l10n.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/selected_files.dart';
import "package:photos/services/collections_service.dart";
import 'package:photos/services/favorites_service.dart';

4
lib/ui/actions/collection/collection_sharing_actions.dart
View file

@ -7,8 +7,8 @@ import 'package:photos/ente_theme_data.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/api/collection/create_request.dart';
import "package:photos/models/api/collection/user.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/files_split.dart';
import "package:photos/models/metadata/collection_magic.dart";
import "package:photos/models/metadata/common_keys.dart";

4
lib/ui/actions/file/file_actions.dart
View file

@ -1,8 +1,8 @@
import "package:flutter/cupertino.dart";
import "package:modal_bottom_sheet/modal_bottom_sheet.dart";
import "package:photos/generated/l10n.dart";
import "package:photos/models/file.dart";
import "package:photos/models/file_type.dart";
import 'package:photos/models/file/file.dart';
import 'package:photos/models/file/file_type.dart';
import "package:photos/theme/colors.dart";
import "package:photos/theme/ente_theme.dart";
import "package:photos/ui/components/action_sheet_widget.dart";

4
lib/ui/collections/album/column_item.dart
View file

@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import "package:intl/intl.dart";
import 'package:logging/logging.dart';
import "package:photos/generated/l10n.dart";
import "package:photos/models/collection.dart";
import "package:photos/models/file.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/theme/ente_theme.dart';
import 'package:photos/ui/viewer/file/no_thumbnail_widget.dart';

2
lib/ui/collections/album/horizontal_list.dart
View file

@ -5,7 +5,7 @@ import "package:logging/logging.dart";
import "package:photos/core/event_bus.dart";
import "package:photos/events/collection_updated_event.dart";
import "package:photos/generated/l10n.dart";
import "package:photos/models/collection.dart";
import 'package:photos/models/collection/collection.dart';
import "package:photos/theme/ente_theme.dart";
import "package:photos/ui/collections/album/row_item.dart";
import "package:photos/ui/common/loading_widget.dart";

6
lib/ui/collections/album/row_item.dart
View file

@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import "package:intl/intl.dart";
import "package:photos/core/configuration.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection_items.dart';
import "package:photos/models/file.dart";
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/collection/collection_items.dart';
import 'package:photos/models/file/file.dart';
import "package:photos/services/collections_service.dart";
import "package:photos/theme/colors.dart";
import 'package:photos/theme/ente_theme.dart';

6
lib/ui/collections/album/vertical_list.dart
View file

@ -8,9 +8,9 @@ import "package:photos/core/event_bus.dart";
import 'package:photos/db/files_db.dart';
import "package:photos/events/tab_changed_event.dart";
import "package:photos/generated/l10n.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection_items.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/collection/collection_items.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/selected_files.dart';
import 'package:photos/services/collections_service.dart';
import 'package:photos/services/ignored_files_service.dart';

2
lib/ui/collections/button/uncategorized_button.dart
View file

@ -1,7 +1,7 @@
import 'package:collection/collection.dart';
import 'package:flutter/material.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/services/collections_service.dart';
import 'package:photos/services/hidden_service.dart';
import 'package:photos/ui/viewer/gallery/uncategorized_page.dart';

2
lib/ui/collections/collection_action_sheet.dart
View file

@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
import "package:photos/core/configuration.dart";
import "package:photos/generated/l10n.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/selected_files.dart';
import 'package:photos/services/collections_service.dart';
import 'package:photos/theme/colors.dart';

4
lib/ui/collections/collection_list_page.dart
View file

@ -3,8 +3,8 @@ import "dart:async";
import 'package:flutter/material.dart';
import "package:photos/core/event_bus.dart";
import "package:photos/events/collection_updated_event.dart";
import "package:photos/models/collection.dart";
import "package:photos/models/collection_items.dart";
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/collection/collection_items.dart';
import "package:photos/services/collections_service.dart";
import "package:photos/ui/collections/flex_grid_view.dart";

2
lib/ui/collections/flex_grid_view.dart
View file

@ -1,7 +1,7 @@
import 'dart:math';
import 'package:flutter/material.dart';
import "package:photos/models/collection.dart";
import 'package:photos/models/collection/collection.dart';
import "package:photos/ui/collections/album/row_item.dart";
class CollectionsFlexiGridViewWidget extends StatelessWidget {

4
lib/ui/collections/new_album_icon.dart
View file

@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import "package:logging/logging.dart";
import "package:photos/generated/l10n.dart";
import "package:photos/models/collection.dart";
import "package:photos/models/collection_items.dart";
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/collection/collection_items.dart';
import "package:photos/services/collections_service.dart";
import "package:photos/ui/components/buttons/icon_button_widget.dart";
import "package:photos/ui/viewer/gallery/collection_page.dart";

2
lib/ui/components/bottom_action_bar/bottom_action_bar_widget.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:photos/core/constants.dart';
import "package:photos/models/collection.dart";
import 'package:photos/models/collection/collection.dart';
import "package:photos/models/gallery_type.dart";
import 'package:photos/models/selected_files.dart';
import 'package:photos/theme/ente_theme.dart';

2
lib/ui/home/memories/full_screen_memory.dart
View file

@ -5,7 +5,7 @@ import "package:flutter/cupertino.dart";
import "package:flutter/material.dart";
import "package:intl/intl.dart";
import "package:photos/core/configuration.dart";
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import "package:photos/models/memory.dart";
import "package:photos/services/memories_service.dart";
import "package:photos/theme/text_style.dart";

2
lib/ui/map/image_marker.dart
View file

@ -1,4 +1,4 @@
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
class ImageMarker {
final EnteFile imageFile;

2
lib/ui/map/map_pull_up_gallery.dart
View file

@ -7,7 +7,7 @@ import "package:photos/core/event_bus.dart";
import "package:photos/events/files_updated_event.dart";
import "package:photos/events/local_photos_updated_event.dart";
import "package:photos/generated/l10n.dart";
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/models/file_load_result.dart";
import "package:photos/models/gallery_type.dart";
import "package:photos/models/selected_files.dart";

2
lib/ui/map/map_screen.dart
View file

@ -8,7 +8,7 @@ import 'package:flutter_map/flutter_map.dart';
import "package:latlong2/latlong.dart";
import "package:logging/logging.dart";
import "package:photos/generated/l10n.dart";
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/theme/ente_theme.dart";
import "package:photos/ui/common/loading_widget.dart";
import "package:photos/ui/map/image_marker.dart";

2
lib/ui/map/marker_image.dart
View file

@ -1,5 +1,5 @@
import "package:flutter/material.dart";
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/theme/effects.dart";
import "package:photos/theme/ente_theme.dart";
import "package:photos/ui/viewer/file/thumbnail_widget.dart";

2
lib/ui/settings/backup/backup_folder_selection_page.dart
View file

@ -12,7 +12,7 @@ import 'package:photos/db/files_db.dart';
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.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/services/remote_sync_service.dart';
import 'package:photos/ui/common/loading_widget.dart';
import 'package:photos/ui/viewer/file/thumbnail_widget.dart';

2
lib/ui/sharing/add_partipant_page.dart
View file

@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
import 'package:photos/core/configuration.dart';
import "package:photos/generated/l10n.dart";
import "package:photos/models/api/collection/user.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/services/collections_service.dart';
import "package:photos/services/user_service.dart";
import 'package:photos/theme/ente_theme.dart';

2
lib/ui/sharing/album_participants_page.dart
View file

@ -3,7 +3,7 @@ import 'package:photos/core/configuration.dart';
import 'package:photos/extensions/list.dart';
import "package:photos/generated/l10n.dart";
import "package:photos/models/api/collection/user.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/theme/ente_theme.dart';
import 'package:photos/ui/components/captioned_text_widget.dart';
import 'package:photos/ui/components/divider_widget.dart';

2
lib/ui/sharing/manage_album_participant.dart
View file

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import "package:photos/generated/l10n.dart";
import "package:photos/models/api/collection/user.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/services/collections_service.dart';
import 'package:photos/theme/colors.dart';
import 'package:photos/theme/ente_theme.dart';

2
lib/ui/sharing/manage_links_widget.dart
View file

@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
import "package:flutter/services.dart";
import "package:photos/generated/l10n.dart";
import "package:photos/models/api/collection/public_url.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/services/collections_service.dart';
import 'package:photos/theme/colors.dart';
import 'package:photos/theme/ente_theme.dart';

2
lib/ui/sharing/pickers/device_limit_picker_page.dart
View file

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:photos/core/constants.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/services/collections_service.dart';
import 'package:photos/theme/ente_theme.dart';
import 'package:photos/ui/components/captioned_text_widget.dart';

2
lib/ui/sharing/pickers/link_expiry_picker_page.dart
View file

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import "package:flutter_datetime_picker_bdaya/flutter_datetime_picker_bdaya.dart";
import 'package:photos/ente_theme_data.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/services/collections_service.dart';
import 'package:photos/theme/ente_theme.dart';
import 'package:photos/ui/components/captioned_text_widget.dart';

2
lib/ui/sharing/share_collection_page.dart
View file

@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import "package:photos/generated/l10n.dart";
import "package:photos/models/api/collection/user.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/services/collections_service.dart';
import 'package:photos/theme/ente_theme.dart';
import 'package:photos/ui/actions/collection/collection_sharing_actions.dart';

2
lib/ui/tabs/home_widget.dart
View file

@ -23,7 +23,7 @@ import 'package:photos/events/tab_changed_event.dart';
import 'package:photos/events/trigger_logout_event.dart';
import 'package:photos/events/user_logged_out_event.dart';
import "package:photos/generated/l10n.dart";
import "package:photos/models/collection_items.dart";
import 'package:photos/models/collection/collection_items.dart';
import 'package:photos/models/selected_files.dart';
import 'package:photos/services/app_lifecycle_service.dart';
import 'package:photos/services/collections_service.dart';

6
lib/ui/tabs/shared/quick_link_album_item.dart
View file

@ -1,8 +1,8 @@
import "package:flutter/material.dart";
import "package:photos/generated/l10n.dart";
import "package:photos/models/collection.dart";
import "package:photos/models/collection_items.dart";
import "package:photos/models/file.dart";
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/collection/collection_items.dart';
import 'package:photos/models/file/file.dart';
import "package:photos/services/collections_service.dart";
import "package:photos/theme/colors.dart";
import "package:photos/theme/ente_theme.dart";

2
lib/ui/tabs/shared_collections_tab.dart
View file

@ -7,7 +7,7 @@ import 'package:photos/events/collection_updated_event.dart';
import 'package:photos/events/local_photos_updated_event.dart';
import 'package:photos/events/user_logged_out_event.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/collection_items.dart';
import 'package:photos/models/collection/collection_items.dart';
import 'package:photos/services/collections_service.dart';
import "package:photos/ui/collections/album/row_item.dart";
import "package:photos/ui/collections/collection_list_page.dart";

2
lib/ui/tabs/user_collections_tab.dart
View file

@ -8,7 +8,7 @@ import 'package:photos/events/collection_updated_event.dart';
import 'package:photos/events/local_photos_updated_event.dart';
import 'package:photos/events/user_logged_out_event.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/services/collections_service.dart';
import "package:photos/ui/collections/button/archived_button.dart";
import "package:photos/ui/collections/button/hidden_button.dart";

2
lib/ui/tools/collage/collage_creator_page.dart
View file

@ -1,6 +1,6 @@
import "package:flutter/material.dart";
import "package:photos/generated/l10n.dart";
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/ui/tools/collage/collage_test_grid.dart";
import "package:photos/ui/tools/collage/collage_with_five_items.dart";
import "package:photos/ui/tools/collage/collage_with_four_items.dart";

2
lib/ui/tools/collage/collage_item_widget.dart
View file

@ -1,6 +1,6 @@
import "package:flutter/material.dart";
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/ui/viewer/file/zoomable_image.dart";
class CollageItemWidget extends StatelessWidget {

2
lib/ui/tools/collage/collage_save_button.dart
View file

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

2
lib/ui/tools/collage/collage_with_five_items.dart
View file

@ -1,6 +1,6 @@
import "package:flutter/material.dart";
import "package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart";
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/ui/tools/collage/collage_common_widgets.dart";
import "package:photos/ui/tools/collage/collage_item_icon.dart";
import "package:photos/ui/tools/collage/collage_item_widget.dart";

2
lib/ui/tools/collage/collage_with_four_items.dart
View file

@ -1,6 +1,6 @@
import "package:flutter/material.dart";
import "package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart";
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/ui/tools/collage/collage_common_widgets.dart";
import "package:photos/ui/tools/collage/collage_item_icon.dart";
import "package:photos/ui/tools/collage/collage_item_widget.dart";

2
lib/ui/tools/collage/collage_with_six_items.dart
View file

@ -1,6 +1,6 @@
import "package:flutter/material.dart";
import "package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart";
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/ui/tools/collage/collage_common_widgets.dart";
import "package:photos/ui/tools/collage/collage_item_icon.dart";
import "package:photos/ui/tools/collage/collage_item_widget.dart";

2
lib/ui/tools/collage/collage_with_three_items.dart
View file

@ -1,6 +1,6 @@
import "package:flutter/material.dart";
import "package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart";
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/ui/tools/collage/collage_common_widgets.dart";
import 'package:photos/ui/tools/collage/collage_item_icon.dart';
import "package:photos/ui/tools/collage/collage_item_widget.dart";

2
lib/ui/tools/collage/collage_with_two_items.dart
View file

@ -1,6 +1,6 @@
import "package:flutter/material.dart";
import "package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart";
import "package:photos/models/file.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/ui/tools/collage/collage_common_widgets.dart";
import 'package:photos/ui/tools/collage/collage_item_icon.dart';
import "package:photos/ui/tools/collage/collage_item_widget.dart";

2
lib/ui/tools/deduplicate_page.dart
View file

@ -6,7 +6,7 @@ import 'package:photos/ente_theme_data.dart';
import 'package:photos/events/user_details_changed_event.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/duplicate_files.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/services/collections_service.dart';
import 'package:photos/services/deduplication_service.dart';
import 'package:photos/ui/viewer/file/detail_page.dart';

2
lib/ui/tools/editor/image_editor_page.dart
View file

@ -13,7 +13,7 @@ import 'package:photos/core/event_bus.dart';
import 'package:photos/db/files_db.dart';
import 'package:photos/events/local_photos_updated_event.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/file.dart' as ente;
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/ui/common/loading_widget.dart';

4
lib/ui/viewer/actions/delete_empty_albums.dart
View file

@ -3,8 +3,8 @@ import 'package:photos/core/event_bus.dart';
import "package:photos/db/files_db.dart";
import 'package:photos/events/collection_updated_event.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/file.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/ui/components/action_sheet_widget.dart';

6
lib/ui/viewer/actions/file_selection_actions_widget.dart
View file

@ -3,10 +3,10 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:photos/core/configuration.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/device_collection.dart';
import 'package:photos/models/file.dart';
import "package:photos/models/file_type.dart";
import 'package:photos/models/file/file.dart';
import 'package:photos/models/file/file_type.dart';
import 'package:photos/models/files_split.dart';
import 'package:photos/models/gallery_type.dart';
import "package:photos/models/metadata/common_keys.dart";

2
lib/ui/viewer/actions/file_selection_overlay_bar.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:photos/models/collection.dart';
import 'package:photos/models/collection/collection.dart';
import 'package:photos/models/gallery_type.dart';
import 'package:photos/models/selected_files.dart';
import "package:photos/theme/effects.dart";

2
lib/ui/viewer/file/detail_page.dart
View file

@ -6,7 +6,7 @@ import 'package:photos/core/configuration.dart';
import 'package:photos/core/constants.dart';
import 'package:photos/core/errors.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/ui/tools/editor/image_editor_page.dart';
import "package:photos/ui/viewer/file/file_app_bar.dart";
import "package:photos/ui/viewer/file/file_bottom_bar.dart";

2
lib/ui/viewer/file/exif_info_dialog.dart
View file

@ -2,7 +2,7 @@ import 'dart:ui';
import 'package:flutter/material.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import "package:photos/theme/ente_theme.dart";
import 'package:photos/ui/common/loading_widget.dart';
import 'package:photos/utils/exif_util.dart';

6
lib/ui/viewer/file/file_app_bar.dart
View file

@ -10,12 +10,12 @@ import 'package:photos/core/event_bus.dart';
import 'package:photos/db/files_db.dart';
import 'package:photos/events/local_photos_updated_event.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/file.dart';
import 'package:photos/models/file_type.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/file/file_type.dart';
import 'package:photos/models/ignored_file.dart';
import "package:photos/models/metadata/common_keys.dart";
import 'package:photos/models/selected_files.dart';
import 'package:photos/models/trash_file.dart';
import 'package:photos/models/file/trash_file.dart';
import 'package:photos/services/collections_service.dart';
import 'package:photos/services/hidden_service.dart';
import 'package:photos/services/ignored_files_service.dart';

6
lib/ui/viewer/file/file_bottom_bar.dart
View file

@ -3,10 +3,10 @@ import 'dart:io';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/file.dart';
import 'package:photos/models/file_type.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/models/file/file_type.dart';
import 'package:photos/models/selected_files.dart';
import 'package:photos/models/trash_file.dart';
import 'package:photos/models/file/trash_file.dart';
import 'package:photos/theme/colors.dart';
import 'package:photos/theme/ente_theme.dart';
import "package:photos/ui/actions/file/file_actions.dart";

2
lib/ui/viewer/file/file_caption_widget.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/file.dart';
import 'package:photos/models/file/file.dart';
import 'package:photos/theme/ente_theme.dart';
import 'package:photos/ui/components/keyboard/keybiard_oveylay.dart';
import 'package:photos/ui/components/keyboard/keyboard_top_button.dart';

4
lib/ui/viewer/file/file_details_widget.dart
View file

@ -3,8 +3,8 @@ import "package:flutter/material.dart";
import "package:logging/logging.dart";
import "package:photos/core/configuration.dart";
import "package:photos/generated/l10n.dart";
import "package:photos/models/file.dart";
import "package:photos/models/file_type.dart";
import 'package:photos/models/file/file.dart';
import 'package:photos/models/file/file_type.dart';
import "package:photos/models/metadata/file_magic.dart";
import "package:photos/services/file_magic_service.dart";
import "package:photos/services/update_service.dart";

2
lib/ui/viewer/file/file_icons_widget.dart
View file

@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
import 'package:photos/ente_theme_data.dart';
import "package:photos/generated/l10n.dart";
import "package:photos/models/api/collection/user.dart";
import 'package:photos/models/trash_file.dart';
import 'package:photos/models/file/trash_file.dart';
import 'package:photos/theme/colors.dart';
import 'package:photos/ui/sharing/user_avator_widget.dart';

Some files were not shown because too many files have changed in this diff Show more