diff --git a/mobile/integration_test/test_utils/general_helper.dart b/mobile/integration_test/test_utils/general_helper.dart index 8daa08d70d..50900cd874 100644 --- a/mobile/integration_test/test_utils/general_helper.dart +++ b/mobile/integration_test/test_utils/general_helper.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:integration_test/integration_test.dart'; import 'package:isar/isar.dart'; diff --git a/mobile/lib/entities/README.md b/mobile/lib/entities/README.md new file mode 100644 index 0000000000..c2ad4876e3 --- /dev/null +++ b/mobile/lib/entities/README.md @@ -0,0 +1 @@ +This directory contains entity that is stored in the local storage. \ No newline at end of file diff --git a/mobile/lib/shared/models/album.dart b/mobile/lib/entities/album.entity.dart similarity index 96% rename from mobile/lib/shared/models/album.dart rename to mobile/lib/entities/album.entity.dart index 55c105c74b..49a38322ee 100644 --- a/mobile/lib/shared/models/album.dart +++ b/mobile/lib/entities/album.entity.dart @@ -1,13 +1,13 @@ import 'package:flutter/foundation.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/utils/datetime_comparison.dart'; import 'package:isar/isar.dart'; import 'package:openapi/api.dart'; import 'package:photo_manager/photo_manager.dart'; -part 'album.g.dart'; +part 'album.entity.g.dart'; @Collection(inheritance: false) class Album { diff --git a/mobile/lib/shared/models/album.g.dart b/mobile/lib/entities/album.entity.g.dart similarity index 99% rename from mobile/lib/shared/models/album.g.dart rename to mobile/lib/entities/album.entity.g.dart index e9fcc49aac..11046ec1e0 100644 --- a/mobile/lib/shared/models/album.g.dart +++ b/mobile/lib/entities/album.entity.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'album.dart'; +part of 'album.entity.dart'; // ************************************************************************** // IsarCollectionGenerator diff --git a/mobile/lib/shared/models/android_device_asset.dart b/mobile/lib/entities/android_device_asset.entity.dart similarity index 60% rename from mobile/lib/shared/models/android_device_asset.dart rename to mobile/lib/entities/android_device_asset.entity.dart index b6b2663fd7..792de346b9 100644 --- a/mobile/lib/shared/models/android_device_asset.dart +++ b/mobile/lib/entities/android_device_asset.entity.dart @@ -1,7 +1,7 @@ -import 'package:immich_mobile/shared/models/device_asset.dart'; +import 'package:immich_mobile/entities/device_asset.entity.dart'; import 'package:isar/isar.dart'; -part 'android_device_asset.g.dart'; +part 'android_device_asset.entity.g.dart'; @Collection() class AndroidDeviceAsset extends DeviceAsset { diff --git a/mobile/lib/shared/models/android_device_asset.g.dart b/mobile/lib/entities/android_device_asset.entity.g.dart similarity index 99% rename from mobile/lib/shared/models/android_device_asset.g.dart rename to mobile/lib/entities/android_device_asset.entity.g.dart index ca7c822ba0..9b1eef0ae5 100644 --- a/mobile/lib/shared/models/android_device_asset.g.dart +++ b/mobile/lib/entities/android_device_asset.entity.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'android_device_asset.dart'; +part of 'android_device_asset.entity.dart'; // ************************************************************************** // IsarCollectionGenerator diff --git a/mobile/lib/shared/models/asset.dart b/mobile/lib/entities/asset.entity.dart similarity index 97% rename from mobile/lib/shared/models/asset.dart rename to mobile/lib/entities/asset.entity.dart index ea49d0202d..a5849e9812 100644 --- a/mobile/lib/shared/models/asset.dart +++ b/mobile/lib/entities/asset.entity.dart @@ -1,7 +1,7 @@ import 'dart:convert'; -import 'package:immich_mobile/shared/models/exif_info.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/exif_info.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/utils/hash.dart'; import 'package:isar/isar.dart'; import 'package:openapi/api.dart'; @@ -9,7 +9,7 @@ import 'package:photo_manager/photo_manager.dart'; import 'package:immich_mobile/extensions/string_extensions.dart'; import 'package:path/path.dart' as p; -part 'asset.g.dart'; +part 'asset.entity.g.dart'; /// Asset (online or local) @Collection(inheritance: false) @@ -432,7 +432,10 @@ class Asset { return compareByChecksum(a, b); } - static int compareByOwnerChecksumCreatedModified(Asset a, Asset b) { + static int compareByOwnerChecksumCreatedModified( + Asset a, + Asset b, + ) { final int ownerIdOrder = a.ownerId.compareTo(b.ownerId); if (ownerIdOrder != 0) return ownerIdOrder; final int checksumOrder = compareByChecksum(a, b); @@ -517,9 +520,13 @@ extension AssetsHelper on IsarCollection { Future getByRemoteId(String id) => where().remoteIdEqualTo(id).findFirst(); - QueryBuilder remote(Iterable ids) => + QueryBuilder remote( + Iterable ids, + ) => where().anyOf(ids, (q, String e) => q.remoteIdEqualTo(e)); - QueryBuilder local(Iterable ids) { + QueryBuilder local( + Iterable ids, + ) { return where().anyOf(ids, (q, String e) => q.localIdEqualTo(e)); } } diff --git a/mobile/lib/shared/models/asset.g.dart b/mobile/lib/entities/asset.entity.g.dart similarity index 99% rename from mobile/lib/shared/models/asset.g.dart rename to mobile/lib/entities/asset.entity.g.dart index 5912f291b5..00cb80a1af 100644 --- a/mobile/lib/shared/models/asset.g.dart +++ b/mobile/lib/entities/asset.entity.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'asset.dart'; +part of 'asset.entity.dart'; // ************************************************************************** // IsarCollectionGenerator diff --git a/mobile/lib/modules/backup/models/backup_album.model.dart b/mobile/lib/entities/backup_album.entity.dart similarity index 91% rename from mobile/lib/modules/backup/models/backup_album.model.dart rename to mobile/lib/entities/backup_album.entity.dart index 57bcde77fc..4d4d7b3aa3 100644 --- a/mobile/lib/modules/backup/models/backup_album.model.dart +++ b/mobile/lib/entities/backup_album.entity.dart @@ -1,7 +1,7 @@ import 'package:immich_mobile/utils/hash.dart'; import 'package:isar/isar.dart'; -part 'backup_album.model.g.dart'; +part 'backup_album.entity.g.dart'; @Collection(inheritance: false) class BackupAlbum { diff --git a/mobile/lib/modules/backup/models/backup_album.model.g.dart b/mobile/lib/entities/backup_album.entity.g.dart similarity index 99% rename from mobile/lib/modules/backup/models/backup_album.model.g.dart rename to mobile/lib/entities/backup_album.entity.g.dart index 0f8f07bcba..7fb6c0e03b 100644 --- a/mobile/lib/modules/backup/models/backup_album.model.g.dart +++ b/mobile/lib/entities/backup_album.entity.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'backup_album.model.dart'; +part of 'backup_album.entity.dart'; // ************************************************************************** // IsarCollectionGenerator diff --git a/mobile/lib/shared/models/device_asset.dart b/mobile/lib/entities/device_asset.entity.dart similarity index 100% rename from mobile/lib/shared/models/device_asset.dart rename to mobile/lib/entities/device_asset.entity.dart diff --git a/mobile/lib/modules/backup/models/duplicated_asset.model.dart b/mobile/lib/entities/duplicated_asset.entity.dart similarity index 84% rename from mobile/lib/modules/backup/models/duplicated_asset.model.dart rename to mobile/lib/entities/duplicated_asset.entity.dart index bc0302ed55..9368dc1a52 100644 --- a/mobile/lib/modules/backup/models/duplicated_asset.model.dart +++ b/mobile/lib/entities/duplicated_asset.entity.dart @@ -1,7 +1,7 @@ import 'package:immich_mobile/utils/hash.dart'; import 'package:isar/isar.dart'; -part 'duplicated_asset.model.g.dart'; +part 'duplicated_asset.entity.g.dart'; @Collection(inheritance: false) class DuplicatedAsset { diff --git a/mobile/lib/modules/backup/models/duplicated_asset.model.g.dart b/mobile/lib/entities/duplicated_asset.entity.g.dart similarity index 99% rename from mobile/lib/modules/backup/models/duplicated_asset.model.g.dart rename to mobile/lib/entities/duplicated_asset.entity.g.dart index a1950bbe12..28faa05b6d 100644 --- a/mobile/lib/modules/backup/models/duplicated_asset.model.g.dart +++ b/mobile/lib/entities/duplicated_asset.entity.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'duplicated_asset.model.dart'; +part of 'duplicated_asset.entity.dart'; // ************************************************************************** // IsarCollectionGenerator diff --git a/mobile/lib/shared/models/etag.dart b/mobile/lib/entities/etag.entity.dart similarity index 92% rename from mobile/lib/shared/models/etag.dart rename to mobile/lib/entities/etag.entity.dart index 2128b8fb5b..3b8ef39c61 100644 --- a/mobile/lib/shared/models/etag.dart +++ b/mobile/lib/entities/etag.entity.dart @@ -1,7 +1,7 @@ import 'package:immich_mobile/utils/hash.dart'; import 'package:isar/isar.dart'; -part 'etag.g.dart'; +part 'etag.entity.g.dart'; @Collection(inheritance: false) class ETag { diff --git a/mobile/lib/shared/models/etag.g.dart b/mobile/lib/entities/etag.entity.g.dart similarity index 99% rename from mobile/lib/shared/models/etag.g.dart rename to mobile/lib/entities/etag.entity.g.dart index f1415f4408..5327f6041a 100644 --- a/mobile/lib/shared/models/etag.g.dart +++ b/mobile/lib/entities/etag.entity.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'etag.dart'; +part of 'etag.entity.dart'; // ************************************************************************** // IsarCollectionGenerator diff --git a/mobile/lib/shared/models/exif_info.dart b/mobile/lib/entities/exif_info.entity.dart similarity index 99% rename from mobile/lib/shared/models/exif_info.dart rename to mobile/lib/entities/exif_info.entity.dart index f2bd02375c..c03c410f69 100644 --- a/mobile/lib/shared/models/exif_info.dart +++ b/mobile/lib/entities/exif_info.entity.dart @@ -1,7 +1,7 @@ import 'package:isar/isar.dart'; import 'package:openapi/api.dart'; -part 'exif_info.g.dart'; +part 'exif_info.entity.g.dart'; /// Exif information 1:1 relation with Asset @Collection(inheritance: false) diff --git a/mobile/lib/shared/models/exif_info.g.dart b/mobile/lib/entities/exif_info.entity.g.dart similarity index 99% rename from mobile/lib/shared/models/exif_info.g.dart rename to mobile/lib/entities/exif_info.entity.g.dart index 138e386c79..016f6d7126 100644 --- a/mobile/lib/shared/models/exif_info.g.dart +++ b/mobile/lib/entities/exif_info.entity.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'exif_info.dart'; +part of 'exif_info.entity.dart'; // ************************************************************************** // IsarCollectionGenerator diff --git a/mobile/lib/shared/models/ios_device_asset.dart b/mobile/lib/entities/ios_device_asset.entity.dart similarity index 74% rename from mobile/lib/shared/models/ios_device_asset.dart rename to mobile/lib/entities/ios_device_asset.entity.dart index 0c55c74eb9..dfd0a660f8 100644 --- a/mobile/lib/shared/models/ios_device_asset.dart +++ b/mobile/lib/entities/ios_device_asset.entity.dart @@ -1,8 +1,8 @@ -import 'package:immich_mobile/shared/models/device_asset.dart'; +import 'package:immich_mobile/entities/device_asset.entity.dart'; import 'package:immich_mobile/utils/hash.dart'; import 'package:isar/isar.dart'; -part 'ios_device_asset.g.dart'; +part 'ios_device_asset.entity.g.dart'; @Collection() class IOSDeviceAsset extends DeviceAsset { diff --git a/mobile/lib/shared/models/ios_device_asset.g.dart b/mobile/lib/entities/ios_device_asset.entity.g.dart similarity index 99% rename from mobile/lib/shared/models/ios_device_asset.g.dart rename to mobile/lib/entities/ios_device_asset.entity.g.dart index f10c3decda..6ecf9f0b73 100644 --- a/mobile/lib/shared/models/ios_device_asset.g.dart +++ b/mobile/lib/entities/ios_device_asset.entity.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'ios_device_asset.dart'; +part of 'ios_device_asset.entity.dart'; // ************************************************************************** // IsarCollectionGenerator diff --git a/mobile/lib/shared/models/logger_message.model.dart b/mobile/lib/entities/logger_message.entity.dart similarity index 96% rename from mobile/lib/shared/models/logger_message.model.dart rename to mobile/lib/entities/logger_message.entity.dart index f657257eab..d904e19e7a 100644 --- a/mobile/lib/shared/models/logger_message.model.dart +++ b/mobile/lib/entities/logger_message.entity.dart @@ -3,7 +3,7 @@ import 'package:isar/isar.dart'; import 'package:logging/logging.dart'; -part 'logger_message.model.g.dart'; +part 'logger_message.entity.g.dart'; @Collection(inheritance: false) class LoggerMessage { diff --git a/mobile/lib/shared/models/logger_message.model.g.dart b/mobile/lib/entities/logger_message.entity.g.dart similarity index 99% rename from mobile/lib/shared/models/logger_message.model.g.dart rename to mobile/lib/entities/logger_message.entity.g.dart index 76c823704c..50c7fcf8ed 100644 --- a/mobile/lib/shared/models/logger_message.model.g.dart +++ b/mobile/lib/entities/logger_message.entity.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'logger_message.model.dart'; +part of 'logger_message.entity.dart'; // ************************************************************************** // IsarCollectionGenerator diff --git a/mobile/lib/shared/models/store.dart b/mobile/lib/entities/store.entity.dart similarity index 98% rename from mobile/lib/shared/models/store.dart rename to mobile/lib/entities/store.entity.dart index 233f6231af..053fdc4e3c 100644 --- a/mobile/lib/shared/models/store.dart +++ b/mobile/lib/entities/store.entity.dart @@ -1,9 +1,9 @@ import 'package:collection/collection.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:isar/isar.dart'; import 'package:logging/logging.dart'; -part 'store.g.dart'; +part 'store.entity.g.dart'; /// Key-value store for individual items enumerated in StoreKey. /// Supports String, int and JSON-serializable Objects diff --git a/mobile/lib/shared/models/store.g.dart b/mobile/lib/entities/store.entity.g.dart similarity index 99% rename from mobile/lib/shared/models/store.g.dart rename to mobile/lib/entities/store.entity.g.dart index 00f8ea0bf4..eb8fa62f40 100644 --- a/mobile/lib/shared/models/store.g.dart +++ b/mobile/lib/entities/store.entity.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'store.dart'; +part of 'store.entity.dart'; // ************************************************************************** // IsarCollectionGenerator diff --git a/mobile/lib/shared/models/user.dart b/mobile/lib/entities/user.entity.dart similarity index 98% rename from mobile/lib/shared/models/user.dart rename to mobile/lib/entities/user.entity.dart index 614250bdf6..d02be2f30a 100644 --- a/mobile/lib/shared/models/user.dart +++ b/mobile/lib/entities/user.entity.dart @@ -1,11 +1,11 @@ import 'dart:ui'; -import 'package:immich_mobile/shared/models/album.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/utils/hash.dart'; import 'package:isar/isar.dart'; import 'package:openapi/api.dart'; -part 'user.g.dart'; +part 'user.entity.g.dart'; @Collection(inheritance: false) class User { diff --git a/mobile/lib/shared/models/user.g.dart b/mobile/lib/entities/user.entity.g.dart similarity index 99% rename from mobile/lib/shared/models/user.g.dart rename to mobile/lib/entities/user.entity.g.dart index 489d011c2c..a0ecc4705c 100644 --- a/mobile/lib/shared/models/user.g.dart +++ b/mobile/lib/entities/user.entity.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'user.dart'; +part of 'user.entity.dart'; // ************************************************************************** // IsarCollectionGenerator diff --git a/mobile/lib/extensions/asset_extensions.dart b/mobile/lib/extensions/asset_extensions.dart index a755792bc9..a5fa50983a 100644 --- a/mobile/lib/extensions/asset_extensions.dart +++ b/mobile/lib/extensions/asset_extensions.dart @@ -1,4 +1,4 @@ -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:timezone/timezone.dart'; extension TZExtension on Asset { diff --git a/mobile/lib/extensions/collection_extensions.dart b/mobile/lib/extensions/collection_extensions.dart index c03477cf43..8e79394340 100644 --- a/mobile/lib/extensions/collection_extensions.dart +++ b/mobile/lib/extensions/collection_extensions.dart @@ -1,8 +1,8 @@ import 'dart:typed_data'; import 'package:collection/collection.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; extension ListExtension on List { List uniqueConsecutive({ diff --git a/mobile/lib/extensions/maplibrecontroller_extensions.dart b/mobile/lib/extensions/maplibrecontroller_extensions.dart index e01655b3a8..4a2c0341f0 100644 --- a/mobile/lib/extensions/maplibrecontroller_extensions.dart +++ b/mobile/lib/extensions/maplibrecontroller_extensions.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:math'; import 'package:flutter/services.dart'; -import 'package:immich_mobile/modules/map/models/map_marker.dart'; +import 'package:immich_mobile/models/map/map_marker.model.dart'; import 'package:immich_mobile/modules/map/utils/map_utils.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart index 48cac8f7d1..6ecf7e43a9 100644 --- a/mobile/lib/main.dart +++ b/mobile/lib/main.dart @@ -12,20 +12,20 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:timezone/data/latest.dart'; import 'package:immich_mobile/constants/locales.dart'; import 'package:immich_mobile/modules/backup/background_service/background.service.dart'; -import 'package:immich_mobile/modules/backup/models/backup_album.model.dart'; -import 'package:immich_mobile/modules/backup/models/duplicated_asset.model.dart'; +import 'package:immich_mobile/entities/backup_album.entity.dart'; +import 'package:immich_mobile/entities/duplicated_asset.entity.dart'; import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/routing/tab_navigation_observer.dart'; import 'package:immich_mobile/shared/cache/widgets_binding.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/android_device_asset.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/etag.dart'; -import 'package:immich_mobile/shared/models/exif_info.dart'; -import 'package:immich_mobile/shared/models/ios_device_asset.dart'; -import 'package:immich_mobile/shared/models/logger_message.model.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/android_device_asset.entity.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/etag.entity.dart'; +import 'package:immich_mobile/entities/exif_info.entity.dart'; +import 'package:immich_mobile/entities/ios_device_asset.entity.dart'; +import 'package:immich_mobile/entities/logger_message.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/app_state.provider.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/services/immich_logger.service.dart'; diff --git a/mobile/lib/modules/activities/models/activity.model.dart b/mobile/lib/models/activities/activity.model.dart similarity index 96% rename from mobile/lib/modules/activities/models/activity.model.dart rename to mobile/lib/models/activities/activity.model.dart index 8ac23975af..9cb3d0790c 100644 --- a/mobile/lib/modules/activities/models/activity.model.dart +++ b/mobile/lib/models/activities/activity.model.dart @@ -1,4 +1,4 @@ -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:openapi/api.dart'; enum ActivityType { comment, like } diff --git a/mobile/lib/modules/album/models/add_asset_response.model.dart b/mobile/lib/models/albums/album_add_asset_response.model.dart similarity index 85% rename from mobile/lib/modules/album/models/add_asset_response.model.dart rename to mobile/lib/models/albums/album_add_asset_response.model.dart index 11efd36f84..26168c957c 100644 --- a/mobile/lib/modules/album/models/add_asset_response.model.dart +++ b/mobile/lib/models/albums/album_add_asset_response.model.dart @@ -3,20 +3,20 @@ import 'dart:convert'; import 'package:collection/collection.dart'; -class AddAssetsResponse { +class AlbumAddAssetsResponse { List alreadyInAlbum; int successfullyAdded; - AddAssetsResponse({ + AlbumAddAssetsResponse({ required this.alreadyInAlbum, required this.successfullyAdded, }); - AddAssetsResponse copyWith({ + AlbumAddAssetsResponse copyWith({ List? alreadyInAlbum, int? successfullyAdded, }) { - return AddAssetsResponse( + return AlbumAddAssetsResponse( alreadyInAlbum: alreadyInAlbum ?? this.alreadyInAlbum, successfullyAdded: successfullyAdded ?? this.successfullyAdded, ); @@ -36,7 +36,7 @@ class AddAssetsResponse { 'AddAssetsResponse(alreadyInAlbum: $alreadyInAlbum, successfullyAdded: $successfullyAdded)'; @override - bool operator ==(covariant AddAssetsResponse other) { + bool operator ==(covariant AlbumAddAssetsResponse other) { if (identical(this, other)) return true; final listEquals = const DeepCollectionEquality().equals; diff --git a/mobile/lib/modules/album/models/album_viewer_page_state.model.dart b/mobile/lib/models/albums/album_viewer_page_state.model.dart similarity index 100% rename from mobile/lib/modules/album/models/album_viewer_page_state.model.dart rename to mobile/lib/models/albums/album_viewer_page_state.model.dart diff --git a/mobile/lib/modules/album/models/asset_selection_page_result.model.dart b/mobile/lib/models/albums/asset_selection_page_result.model.dart similarity index 89% rename from mobile/lib/modules/album/models/asset_selection_page_result.model.dart rename to mobile/lib/models/albums/asset_selection_page_result.model.dart index 8d8ff5a84b..04934f7a72 100644 --- a/mobile/lib/modules/album/models/asset_selection_page_result.model.dart +++ b/mobile/lib/models/albums/asset_selection_page_result.model.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; class AssetSelectionPageResult { final Set selectedAssets; diff --git a/mobile/lib/modules/home/models/selection_state.dart b/mobile/lib/models/asset_selection_state.dart similarity index 81% rename from mobile/lib/modules/home/models/selection_state.dart rename to mobile/lib/models/asset_selection_state.dart index e5a7b60a3c..b8a38ecee1 100644 --- a/mobile/lib/modules/home/models/selection_state.dart +++ b/mobile/lib/models/asset_selection_state.dart @@ -1,25 +1,25 @@ -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; -class SelectionAssetState { +class AssetSelectionState { final bool hasRemote; final bool hasLocal; final bool hasMerged; final int selectedCount; - const SelectionAssetState({ + const AssetSelectionState({ this.hasRemote = false, this.hasLocal = false, this.hasMerged = false, this.selectedCount = 0, }); - SelectionAssetState copyWith({ + AssetSelectionState copyWith({ bool? hasRemote, bool? hasLocal, bool? hasMerged, int? selectedCount, }) { - return SelectionAssetState( + return AssetSelectionState( hasRemote: hasRemote ?? this.hasRemote, hasLocal: hasLocal ?? this.hasLocal, hasMerged: hasMerged ?? this.hasMerged, @@ -27,7 +27,7 @@ class SelectionAssetState { ); } - SelectionAssetState.fromSelection(Set selection) + AssetSelectionState.fromSelection(Set selection) : hasLocal = selection.any((e) => e.storage == AssetState.local), hasMerged = selection.any((e) => e.storage == AssetState.merged), hasRemote = selection.any((e) => e.storage == AssetState.remote), @@ -38,7 +38,7 @@ class SelectionAssetState { 'SelectionAssetState(hasRemote: $hasRemote, hasMerged: $hasMerged, hasMerged: $hasMerged, selectedCount: $selectedCount)'; @override - bool operator ==(covariant SelectionAssetState other) { + bool operator ==(covariant AssetSelectionState other) { if (identical(this, other)) return true; return other.hasRemote == hasRemote && diff --git a/mobile/lib/modules/asset_viewer/models/image_viewer_page_state.model.dart b/mobile/lib/models/asset_viewer/asset_viewer_page_state.model.dart similarity index 69% rename from mobile/lib/modules/asset_viewer/models/image_viewer_page_state.model.dart rename to mobile/lib/models/asset_viewer/asset_viewer_page_state.model.dart index 144e4b0cf7..0a354781f8 100644 --- a/mobile/lib/modules/asset_viewer/models/image_viewer_page_state.model.dart +++ b/mobile/lib/models/asset_viewer/asset_viewer_page_state.model.dart @@ -2,18 +2,18 @@ import 'dart:convert'; enum DownloadAssetStatus { idle, loading, success, error } -class ImageViewerPageState { +class AssetViewerPageState { // enum final DownloadAssetStatus downloadAssetStatus; - ImageViewerPageState({ + AssetViewerPageState({ required this.downloadAssetStatus, }); - ImageViewerPageState copyWith({ + AssetViewerPageState copyWith({ DownloadAssetStatus? downloadAssetStatus, }) { - return ImageViewerPageState( + return AssetViewerPageState( downloadAssetStatus: downloadAssetStatus ?? this.downloadAssetStatus, ); } @@ -26,8 +26,8 @@ class ImageViewerPageState { return result; } - factory ImageViewerPageState.fromMap(Map map) { - return ImageViewerPageState( + factory AssetViewerPageState.fromMap(Map map) { + return AssetViewerPageState( downloadAssetStatus: DownloadAssetStatus.values[map['downloadAssetStatus'] ?? 0], ); @@ -35,8 +35,8 @@ class ImageViewerPageState { String toJson() => json.encode(toMap()); - factory ImageViewerPageState.fromJson(String source) => - ImageViewerPageState.fromMap(json.decode(source)); + factory AssetViewerPageState.fromJson(String source) => + AssetViewerPageState.fromMap(json.decode(source)); @override String toString() => @@ -46,7 +46,7 @@ class ImageViewerPageState { bool operator ==(Object other) { if (identical(this, other)) return true; - return other is ImageViewerPageState && + return other is AssetViewerPageState && other.downloadAssetStatus == downloadAssetStatus; } diff --git a/mobile/lib/modules/login/models/authentication_state.model.dart b/mobile/lib/models/authentication/authentication_state.model.dart similarity index 100% rename from mobile/lib/modules/login/models/authentication_state.model.dart rename to mobile/lib/models/authentication/authentication_state.model.dart diff --git a/mobile/lib/modules/backup/models/available_album.model.dart b/mobile/lib/models/backup/available_album.model.dart similarity index 100% rename from mobile/lib/modules/backup/models/available_album.model.dart rename to mobile/lib/models/backup/available_album.model.dart diff --git a/mobile/lib/modules/backup/models/backup_state.model.dart b/mobile/lib/models/backup/backup_state.model.dart similarity index 97% rename from mobile/lib/modules/backup/models/backup_state.model.dart rename to mobile/lib/models/backup/backup_state.model.dart index 3a9003731c..bb693a5b75 100644 --- a/mobile/lib/modules/backup/models/backup_state.model.dart +++ b/mobile/lib/models/backup/backup_state.model.dart @@ -4,9 +4,9 @@ import 'package:cancellation_token_http/http.dart'; import 'package:collection/collection.dart'; import 'package:photo_manager/photo_manager.dart'; -import 'package:immich_mobile/modules/backup/models/available_album.model.dart'; -import 'package:immich_mobile/modules/backup/models/current_upload_asset.model.dart'; -import 'package:immich_mobile/shared/models/server_info/server_disk_info.model.dart'; +import 'package:immich_mobile/models/backup/available_album.model.dart'; +import 'package:immich_mobile/models/backup/current_upload_asset.model.dart'; +import 'package:immich_mobile/models/server_info/server_disk_info.model.dart'; enum BackUpProgressEnum { idle, diff --git a/mobile/lib/modules/backup/models/current_upload_asset.model.dart b/mobile/lib/models/backup/current_upload_asset.model.dart similarity index 100% rename from mobile/lib/modules/backup/models/current_upload_asset.model.dart rename to mobile/lib/models/backup/current_upload_asset.model.dart diff --git a/mobile/lib/modules/backup/models/error_upload_asset.model.dart b/mobile/lib/models/backup/error_upload_asset.model.dart similarity index 100% rename from mobile/lib/modules/backup/models/error_upload_asset.model.dart rename to mobile/lib/models/backup/error_upload_asset.model.dart diff --git a/mobile/lib/modules/backup/models/manual_upload_state.model.dart b/mobile/lib/models/backup/manual_upload_state.model.dart similarity index 98% rename from mobile/lib/modules/backup/models/manual_upload_state.model.dart rename to mobile/lib/models/backup/manual_upload_state.model.dart index 3b56672cf8..a2d84fbef3 100644 --- a/mobile/lib/modules/backup/models/manual_upload_state.model.dart +++ b/mobile/lib/models/backup/manual_upload_state.model.dart @@ -1,7 +1,7 @@ import 'package:cancellation_token_http/http.dart'; import 'package:collection/collection.dart'; -import 'package:immich_mobile/modules/backup/models/current_upload_asset.model.dart'; +import 'package:immich_mobile/models/backup/current_upload_asset.model.dart'; class ManualUploadState { final CancellationToken cancelToken; diff --git a/mobile/lib/modules/map/models/map_event.model.dart b/mobile/lib/models/map/map_event.model.dart similarity index 100% rename from mobile/lib/modules/map/models/map_event.model.dart rename to mobile/lib/models/map/map_event.model.dart diff --git a/mobile/lib/modules/map/models/map_marker.dart b/mobile/lib/models/map/map_marker.model.dart similarity index 100% rename from mobile/lib/modules/map/models/map_marker.dart rename to mobile/lib/models/map/map_marker.model.dart diff --git a/mobile/lib/modules/map/models/map_state.model.dart b/mobile/lib/models/map/map_state.model.dart similarity index 100% rename from mobile/lib/modules/map/models/map_state.model.dart rename to mobile/lib/models/map/map_state.model.dart diff --git a/mobile/lib/modules/memories/models/memory.dart b/mobile/lib/models/memories/memory.model.dart similarity index 93% rename from mobile/lib/modules/memories/models/memory.dart rename to mobile/lib/models/memories/memory.model.dart index 60e44edf6c..34691d3b55 100644 --- a/mobile/lib/modules/memories/models/memory.dart +++ b/mobile/lib/models/memories/memory.model.dart @@ -2,7 +2,7 @@ import 'package:collection/collection.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; class Memory { final String title; diff --git a/mobile/lib/modules/search/models/curated_content.dart b/mobile/lib/models/search/search_curated_content.model.dart similarity index 68% rename from mobile/lib/modules/search/models/curated_content.dart rename to mobile/lib/models/search/search_curated_content.model.dart index 87e98bb751..af660bad9d 100644 --- a/mobile/lib/modules/search/models/curated_content.dart +++ b/mobile/lib/models/search/search_curated_content.model.dart @@ -4,23 +4,23 @@ import 'dart:convert'; /// A wrapper for [CuratedLocationsResponseDto] objects /// and [CuratedObjectsResponseDto] to be displayed in /// a view -class CuratedContent { +class SearchCuratedContent { /// The label to show associated with this curated object final String label; /// The id to lookup the asset from the server final String id; - CuratedContent({ + SearchCuratedContent({ required this.label, required this.id, }); - CuratedContent copyWith({ + SearchCuratedContent copyWith({ String? label, String? id, }) { - return CuratedContent( + return SearchCuratedContent( label: label ?? this.label, id: id ?? this.id, ); @@ -33,8 +33,8 @@ class CuratedContent { }; } - factory CuratedContent.fromMap(Map map) { - return CuratedContent( + factory SearchCuratedContent.fromMap(Map map) { + return SearchCuratedContent( label: map['label'] as String, id: map['id'] as String, ); @@ -42,14 +42,14 @@ class CuratedContent { String toJson() => json.encode(toMap()); - factory CuratedContent.fromJson(String source) => - CuratedContent.fromMap(json.decode(source) as Map); + factory SearchCuratedContent.fromJson(String source) => + SearchCuratedContent.fromMap(json.decode(source) as Map); @override String toString() => 'CuratedContent(label: $label, id: $id)'; @override - bool operator ==(covariant CuratedContent other) { + bool operator ==(covariant SearchCuratedContent other) { if (identical(this, other)) return true; return other.label == label && other.id == id; diff --git a/mobile/lib/modules/search/models/search_filter.dart b/mobile/lib/models/search/search_filter.model.dart similarity index 99% rename from mobile/lib/modules/search/models/search_filter.dart rename to mobile/lib/models/search/search_filter.model.dart index 337da9266f..6a7c612b15 100644 --- a/mobile/lib/modules/search/models/search_filter.dart +++ b/mobile/lib/models/search/search_filter.model.dart @@ -1,7 +1,7 @@ // ignore_for_file: public_member_api_docs, sort_constructors_first import 'dart:convert'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:openapi/api.dart'; class SearchLocationFilter { diff --git a/mobile/lib/modules/search/models/search_result_page_state.model.dart b/mobile/lib/models/search/search_result_page_state.model.dart similarity index 96% rename from mobile/lib/modules/search/models/search_result_page_state.model.dart rename to mobile/lib/models/search/search_result_page_state.model.dart index f42f2e9cb6..00895c4586 100644 --- a/mobile/lib/modules/search/models/search_result_page_state.model.dart +++ b/mobile/lib/models/search/search_result_page_state.model.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; class SearchResultPageState { final bool isLoading; diff --git a/mobile/lib/shared/models/server_info/server_config.model.dart b/mobile/lib/models/server_info/server_config.model.dart similarity index 100% rename from mobile/lib/shared/models/server_info/server_config.model.dart rename to mobile/lib/models/server_info/server_config.model.dart diff --git a/mobile/lib/shared/models/server_info/server_disk_info.model.dart b/mobile/lib/models/server_info/server_disk_info.model.dart similarity index 100% rename from mobile/lib/shared/models/server_info/server_disk_info.model.dart rename to mobile/lib/models/server_info/server_disk_info.model.dart diff --git a/mobile/lib/shared/models/server_info/server_features.model.dart b/mobile/lib/models/server_info/server_features.model.dart similarity index 100% rename from mobile/lib/shared/models/server_info/server_features.model.dart rename to mobile/lib/models/server_info/server_features.model.dart diff --git a/mobile/lib/shared/models/server_info/server_info.model.dart b/mobile/lib/models/server_info/server_info.model.dart similarity index 89% rename from mobile/lib/shared/models/server_info/server_info.model.dart rename to mobile/lib/models/server_info/server_info.model.dart index b423f598c3..8a70e13883 100644 --- a/mobile/lib/shared/models/server_info/server_info.model.dart +++ b/mobile/lib/models/server_info/server_info.model.dart @@ -1,7 +1,7 @@ -import 'package:immich_mobile/shared/models/server_info/server_config.model.dart'; -import 'package:immich_mobile/shared/models/server_info/server_disk_info.model.dart'; -import 'package:immich_mobile/shared/models/server_info/server_features.model.dart'; -import 'package:immich_mobile/shared/models/server_info/server_version.model.dart'; +import 'package:immich_mobile/models/server_info/server_config.model.dart'; +import 'package:immich_mobile/models/server_info/server_disk_info.model.dart'; +import 'package:immich_mobile/models/server_info/server_features.model.dart'; +import 'package:immich_mobile/models/server_info/server_version.model.dart'; class ServerInfo { final ServerVersion serverVersion; diff --git a/mobile/lib/shared/models/server_info/server_version.model.dart b/mobile/lib/models/server_info/server_version.model.dart similarity index 100% rename from mobile/lib/shared/models/server_info/server_version.model.dart rename to mobile/lib/models/server_info/server_version.model.dart diff --git a/mobile/lib/modules/shared_link/models/shared_link.dart b/mobile/lib/models/shared_link/shared_link.model.dart similarity index 100% rename from mobile/lib/modules/shared_link/models/shared_link.dart rename to mobile/lib/models/shared_link/shared_link.model.dart diff --git a/mobile/lib/modules/activities/providers/activity.provider.dart b/mobile/lib/modules/activities/providers/activity.provider.dart index 0eb174969a..124f035a4e 100644 --- a/mobile/lib/modules/activities/providers/activity.provider.dart +++ b/mobile/lib/modules/activities/providers/activity.provider.dart @@ -1,4 +1,4 @@ -import 'package:immich_mobile/modules/activities/models/activity.model.dart'; +import 'package:immich_mobile/models/activities/activity.model.dart'; import 'package:immich_mobile/modules/activities/providers/activity_service.provider.dart'; import 'package:immich_mobile/modules/activities/providers/activity_statistics.provider.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/mobile/lib/modules/activities/services/activity.service.dart b/mobile/lib/modules/activities/services/activity.service.dart index cde98f73ae..620aed7f7f 100644 --- a/mobile/lib/modules/activities/services/activity.service.dart +++ b/mobile/lib/modules/activities/services/activity.service.dart @@ -1,6 +1,6 @@ import 'package:immich_mobile/constants/errors.dart'; import 'package:immich_mobile/mixins/error_logger.mixin.dart'; -import 'package:immich_mobile/modules/activities/models/activity.model.dart'; +import 'package:immich_mobile/models/activities/activity.model.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; import 'package:logging/logging.dart'; import 'package:openapi/api.dart'; diff --git a/mobile/lib/modules/activities/views/activities_page.dart b/mobile/lib/modules/activities/views/activities_page.dart index 0510a72c7c..d861afec7f 100644 --- a/mobile/lib/modules/activities/views/activities_page.dart +++ b/mobile/lib/modules/activities/views/activities_page.dart @@ -5,7 +5,7 @@ import 'package:flutter_hooks/flutter_hooks.dart' hide Store; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/activities/models/activity.model.dart'; +import 'package:immich_mobile/models/activities/activity.model.dart'; import 'package:immich_mobile/modules/activities/providers/activity.provider.dart'; import 'package:immich_mobile/modules/activities/widgets/activity_text_field.dart'; import 'package:immich_mobile/modules/activities/widgets/activity_tile.dart'; diff --git a/mobile/lib/modules/activities/widgets/activity_tile.dart b/mobile/lib/modules/activities/widgets/activity_tile.dart index 77dcb98922..963d3295ad 100644 --- a/mobile/lib/modules/activities/widgets/activity_tile.dart +++ b/mobile/lib/modules/activities/widgets/activity_tile.dart @@ -2,7 +2,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/extensions/datetime_extensions.dart'; -import 'package:immich_mobile/modules/activities/models/activity.model.dart'; +import 'package:immich_mobile/models/activities/activity.model.dart'; import 'package:immich_mobile/modules/asset_viewer/image_providers/immich_remote_thumbnail_provider.dart'; import 'package:immich_mobile/modules/asset_viewer/providers/current_asset.provider.dart'; import 'package:immich_mobile/shared/ui/user_circle_avatar.dart'; diff --git a/mobile/lib/modules/album/providers/album.provider.dart b/mobile/lib/modules/album/providers/album.provider.dart index 2522e97bcc..3a12913184 100644 --- a/mobile/lib/modules/album/providers/album.provider.dart +++ b/mobile/lib/modules/album/providers/album.provider.dart @@ -3,10 +3,10 @@ import 'dart:async'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/album/services/album.service.dart'; import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/utils/renderlist_generator.dart'; import 'package:isar/isar.dart'; diff --git a/mobile/lib/modules/album/providers/album_sort_by_options.provider.dart b/mobile/lib/modules/album/providers/album_sort_by_options.provider.dart index 6d1622a481..95794e57ea 100644 --- a/mobile/lib/modules/album/providers/album_sort_by_options.provider.dart +++ b/mobile/lib/modules/album/providers/album_sort_by_options.provider.dart @@ -1,7 +1,7 @@ import 'package:collection/collection.dart'; import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart'; import 'package:immich_mobile/modules/settings/services/app_settings.service.dart'; -import 'package:immich_mobile/shared/models/album.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'album_sort_by_options.provider.g.dart'; diff --git a/mobile/lib/modules/album/providers/album_viewer.provider.dart b/mobile/lib/modules/album/providers/album_viewer.provider.dart index b427e0248e..be66fa4fc9 100644 --- a/mobile/lib/modules/album/providers/album_viewer.provider.dart +++ b/mobile/lib/modules/album/providers/album_viewer.provider.dart @@ -1,8 +1,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/album/models/album_viewer_page_state.model.dart'; +import 'package:immich_mobile/models/albums/album_viewer_page_state.model.dart'; import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart'; import 'package:immich_mobile/modules/album/services/album.service.dart'; -import 'package:immich_mobile/shared/models/album.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; class AlbumViewerNotifier extends StateNotifier { AlbumViewerNotifier(this.ref) diff --git a/mobile/lib/modules/album/providers/current_album.provider.dart b/mobile/lib/modules/album/providers/current_album.provider.dart index 30e75cda5c..bd22c7a7cd 100644 --- a/mobile/lib/modules/album/providers/current_album.provider.dart +++ b/mobile/lib/modules/album/providers/current_album.provider.dart @@ -1,4 +1,4 @@ -import 'package:immich_mobile/shared/models/album.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'current_album.provider.g.dart'; diff --git a/mobile/lib/modules/album/providers/shared_album.provider.dart b/mobile/lib/modules/album/providers/shared_album.provider.dart index 83eed53010..b1fe296385 100644 --- a/mobile/lib/modules/album/providers/shared_album.provider.dart +++ b/mobile/lib/modules/album/providers/shared_album.provider.dart @@ -3,9 +3,9 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/album/services/album.service.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:isar/isar.dart'; diff --git a/mobile/lib/modules/album/providers/suggested_shared_users.provider.dart b/mobile/lib/modules/album/providers/suggested_shared_users.provider.dart index a928ae73c8..c553ce6826 100644 --- a/mobile/lib/modules/album/providers/suggested_shared_users.provider.dart +++ b/mobile/lib/modules/album/providers/suggested_shared_users.provider.dart @@ -1,5 +1,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/services/user.service.dart'; final otherUsersProvider = FutureProvider.autoDispose>((ref) { diff --git a/mobile/lib/modules/album/services/album.service.dart b/mobile/lib/modules/album/services/album.service.dart index a72620b863..0bbadad6bb 100644 --- a/mobile/lib/modules/album/services/album.service.dart +++ b/mobile/lib/modules/album/services/album.service.dart @@ -5,13 +5,13 @@ import 'dart:io'; import 'package:collection/collection.dart'; import 'package:flutter/foundation.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/album/models/add_asset_response.model.dart'; -import 'package:immich_mobile/modules/backup/models/backup_album.model.dart'; +import 'package:immich_mobile/models/albums/album_add_asset_response.model.dart'; +import 'package:immich_mobile/entities/backup_album.entity.dart'; import 'package:immich_mobile/modules/backup/services/backup.service.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; @@ -219,7 +219,7 @@ class AlbumService { ); } - Future addAdditionalAssetToAlbum( + Future addAdditionalAssetToAlbum( Iterable assets, Album album, ) async { @@ -245,7 +245,7 @@ class AlbumService { await _updateAssets(album.id, add: successAssets); - return AddAssetsResponse( + return AlbumAddAssetsResponse( alreadyInAlbum: duplicatedAssets, successfullyAdded: successAssets.length, ); diff --git a/mobile/lib/modules/album/ui/add_to_album_bottom_sheet.dart b/mobile/lib/modules/album/ui/add_to_album_bottom_sheet.dart index a3e6aca95d..046648f822 100644 --- a/mobile/lib/modules/album/ui/add_to_album_bottom_sheet.dart +++ b/mobile/lib/modules/album/ui/add_to_album_bottom_sheet.dart @@ -9,8 +9,8 @@ import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart import 'package:immich_mobile/modules/album/services/album.service.dart'; import 'package:immich_mobile/modules/album/ui/add_to_album_sliverlist.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/ui/drag_sheet.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; diff --git a/mobile/lib/modules/album/ui/add_to_album_sliverlist.dart b/mobile/lib/modules/album/ui/add_to_album_sliverlist.dart index 73aabbc66d..0af5ac7408 100644 --- a/mobile/lib/modules/album/ui/add_to_album_sliverlist.dart +++ b/mobile/lib/modules/album/ui/add_to_album_sliverlist.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/album/providers/album_sort_by_options.provider.dart'; import 'package:immich_mobile/modules/album/ui/album_thumbnail_listtile.dart'; -import 'package:immich_mobile/shared/models/album.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; class AddToAlbumSliverList extends HookConsumerWidget { /// The asset to add to an album diff --git a/mobile/lib/modules/album/ui/album_thumbnail_card.dart b/mobile/lib/modules/album/ui/album_thumbnail_card.dart index 1da284572b..9287db9e77 100644 --- a/mobile/lib/modules/album/ui/album_thumbnail_card.dart +++ b/mobile/lib/modules/album/ui/album_thumbnail_card.dart @@ -1,8 +1,8 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/shared/ui/immich_thumbnail.dart'; class AlbumThumbnailCard extends StatelessWidget { diff --git a/mobile/lib/modules/album/ui/album_thumbnail_listtile.dart b/mobile/lib/modules/album/ui/album_thumbnail_listtile.dart index f2f465f29e..6107428e07 100644 --- a/mobile/lib/modules/album/ui/album_thumbnail_listtile.dart +++ b/mobile/lib/modules/album/ui/album_thumbnail_listtile.dart @@ -4,8 +4,8 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/utils/image_url_builder.dart'; import 'package:openapi/api.dart'; diff --git a/mobile/lib/modules/album/ui/album_viewer_appbar.dart b/mobile/lib/modules/album/ui/album_viewer_appbar.dart index eaf5cbc961..98b14a2fd9 100644 --- a/mobile/lib/modules/album/ui/album_viewer_appbar.dart +++ b/mobile/lib/modules/album/ui/album_viewer_appbar.dart @@ -9,7 +9,7 @@ import 'package:immich_mobile/modules/album/providers/album.provider.dart'; import 'package:immich_mobile/modules/album/providers/album_viewer.provider.dart'; import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/album.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'; diff --git a/mobile/lib/modules/album/ui/album_viewer_editable_title.dart b/mobile/lib/modules/album/ui/album_viewer_editable_title.dart index 89c72e3e80..6f8df81a2e 100644 --- a/mobile/lib/modules/album/ui/album_viewer_editable_title.dart +++ b/mobile/lib/modules/album/ui/album_viewer_editable_title.dart @@ -4,7 +4,7 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/album/providers/album_viewer.provider.dart'; -import 'package:immich_mobile/shared/models/album.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; class AlbumViewerEditableTitle extends HookConsumerWidget { final Album album; diff --git a/mobile/lib/modules/album/ui/shared_album_thumbnail_image.dart b/mobile/lib/modules/album/ui/shared_album_thumbnail_image.dart index 5a27def4c9..d6ee6beeea 100644 --- a/mobile/lib/modules/album/ui/shared_album_thumbnail_image.dart +++ b/mobile/lib/modules/album/ui/shared_album_thumbnail_image.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/ui/immich_thumbnail.dart'; class SharedAlbumThumbnailImage extends HookConsumerWidget { diff --git a/mobile/lib/modules/album/views/album_options_part.dart b/mobile/lib/modules/album/views/album_options_part.dart index 2f831e4308..a3106e8e5a 100644 --- a/mobile/lib/modules/album/views/album_options_part.dart +++ b/mobile/lib/modules/album/views/album_options_part.dart @@ -8,8 +8,8 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart'; import 'package:immich_mobile/modules/login/providers/authentication.provider.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/user.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'; diff --git a/mobile/lib/modules/album/views/album_viewer_page.dart b/mobile/lib/modules/album/views/album_viewer_page.dart index 5d3f075644..57fb1603d3 100644 --- a/mobile/lib/modules/album/views/album_viewer_page.dart +++ b/mobile/lib/modules/album/views/album_viewer_page.dart @@ -8,7 +8,7 @@ import 'package:fluttertoast/fluttertoast.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/album/models/asset_selection_page_result.model.dart'; +import 'package:immich_mobile/models/albums/asset_selection_page_result.model.dart'; import 'package:immich_mobile/modules/album/providers/album.provider.dart'; import 'package:immich_mobile/modules/album/providers/current_album.provider.dart'; import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart'; @@ -19,8 +19,8 @@ import 'package:immich_mobile/modules/home/providers/multiselect.provider.dart'; import 'package:immich_mobile/modules/login/providers/authentication.provider.dart'; import 'package:immich_mobile/modules/album/ui/album_viewer_appbar.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/asset.provider.dart'; import 'package:immich_mobile/shared/ui/asset_grid/multiselect_grid.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; diff --git a/mobile/lib/modules/album/views/asset_selection_page.dart b/mobile/lib/modules/album/views/asset_selection_page.dart index 1da0ebd742..2a37f12d5a 100644 --- a/mobile/lib/modules/album/views/asset_selection_page.dart +++ b/mobile/lib/modules/album/views/asset_selection_page.dart @@ -5,11 +5,11 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/album/models/asset_selection_page_result.model.dart'; +import 'package:immich_mobile/models/albums/asset_selection_page_result.model.dart'; import 'package:immich_mobile/modules/asset_viewer/providers/render_list.provider.dart'; import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart'; import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:isar/isar.dart'; @RoutePage() diff --git a/mobile/lib/modules/album/views/create_album_page.dart b/mobile/lib/modules/album/views/create_album_page.dart index e8514873e8..58620d8fb5 100644 --- a/mobile/lib/modules/album/views/create_album_page.dart +++ b/mobile/lib/modules/album/views/create_album_page.dart @@ -4,14 +4,14 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/album/models/asset_selection_page_result.model.dart'; +import 'package:immich_mobile/models/albums/asset_selection_page_result.model.dart'; import 'package:immich_mobile/modules/album/providers/album.provider.dart'; import 'package:immich_mobile/modules/album/providers/album_title.provider.dart'; import 'package:immich_mobile/modules/album/ui/album_action_outlined_button.dart'; import 'package:immich_mobile/modules/album/ui/album_title_text_field.dart'; import 'package:immich_mobile/modules/album/ui/shared_album_thumbnail_image.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/asset.provider.dart'; @RoutePage() diff --git a/mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart b/mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart index 0a883791ac..d1532cde02 100644 --- a/mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart +++ b/mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart @@ -6,8 +6,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/album/providers/suggested_shared_users.provider.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/ui/user_circle_avatar.dart'; @RoutePage?>() diff --git a/mobile/lib/modules/album/views/select_user_for_sharing_page.dart b/mobile/lib/modules/album/views/select_user_for_sharing_page.dart index 763f53c659..b2b16b4552 100644 --- a/mobile/lib/modules/album/views/select_user_for_sharing_page.dart +++ b/mobile/lib/modules/album/views/select_user_for_sharing_page.dart @@ -9,8 +9,8 @@ import 'package:immich_mobile/modules/album/providers/album_title.provider.dart' import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart'; import 'package:immich_mobile/modules/album/providers/suggested_shared_users.provider.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/ui/user_circle_avatar.dart'; @RoutePage>() diff --git a/mobile/lib/modules/archive/models/store_model_here.txt b/mobile/lib/modules/archive/models/store_model_here.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mobile/lib/modules/archive/providers/archive_asset_provider.dart b/mobile/lib/modules/archive/providers/archive_asset_provider.dart index 5441293f77..6118f2a316 100644 --- a/mobile/lib/modules/archive/providers/archive_asset_provider.dart +++ b/mobile/lib/modules/archive/providers/archive_asset_provider.dart @@ -1,6 +1,6 @@ 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/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/providers/user.provider.dart'; import 'package:immich_mobile/utils/renderlist_generator.dart'; diff --git a/mobile/lib/modules/asset_viewer/image_providers/cache/image_loader.dart b/mobile/lib/modules/asset_viewer/image_providers/cache/image_loader.dart index f2b53733d2..afa964b66d 100644 --- a/mobile/lib/modules/asset_viewer/image_providers/cache/image_loader.dart +++ b/mobile/lib/modules/asset_viewer/image_providers/cache/image_loader.dart @@ -4,7 +4,7 @@ import 'dart:ui' as ui; import 'package:flutter/material.dart'; import 'package:flutter_cache_manager/flutter_cache_manager.dart'; import 'package:immich_mobile/modules/asset_viewer/image_providers/exceptions/image_loading_exception.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; /// Loads the codec from the URI and sends the events to the [chunkEvents] stream /// diff --git a/mobile/lib/modules/asset_viewer/image_providers/immich_local_image_provider.dart b/mobile/lib/modules/asset_viewer/image_providers/immich_local_image_provider.dart index d1e154e368..cf9cf86090 100644 --- a/mobile/lib/modules/asset_viewer/image_providers/immich_local_image_provider.dart +++ b/mobile/lib/modules/asset_viewer/image_providers/immich_local_image_provider.dart @@ -6,7 +6,7 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/painting.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:photo_manager/photo_manager.dart'; /// The local image provider for an asset diff --git a/mobile/lib/modules/asset_viewer/image_providers/immich_local_thumbnail_provider.dart b/mobile/lib/modules/asset_viewer/image_providers/immich_local_thumbnail_provider.dart index 0c97ab01cc..28e78ae762 100644 --- a/mobile/lib/modules/asset_viewer/image_providers/immich_local_thumbnail_provider.dart +++ b/mobile/lib/modules/asset_viewer/image_providers/immich_local_thumbnail_provider.dart @@ -5,7 +5,7 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/painting.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:photo_manager/photo_manager.dart'; /// The local image provider for an asset diff --git a/mobile/lib/modules/asset_viewer/image_providers/immich_remote_image_provider.dart b/mobile/lib/modules/asset_viewer/image_providers/immich_remote_image_provider.dart index dc26c06acb..eda6873b28 100644 --- a/mobile/lib/modules/asset_viewer/image_providers/immich_remote_image_provider.dart +++ b/mobile/lib/modules/asset_viewer/image_providers/immich_remote_image_provider.dart @@ -10,8 +10,8 @@ import 'package:openapi/api.dart' as api; import 'package:flutter/foundation.dart'; import 'package:flutter/painting.dart'; import 'package:immich_mobile/modules/settings/services/app_settings.service.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/utils/image_url_builder.dart'; /// The remote image provider for full size remote images diff --git a/mobile/lib/modules/asset_viewer/image_providers/immich_remote_thumbnail_provider.dart b/mobile/lib/modules/asset_viewer/image_providers/immich_remote_thumbnail_provider.dart index dac196af05..8db0771c7c 100644 --- a/mobile/lib/modules/asset_viewer/image_providers/immich_remote_thumbnail_provider.dart +++ b/mobile/lib/modules/asset_viewer/image_providers/immich_remote_thumbnail_provider.dart @@ -9,7 +9,7 @@ import 'package:openapi/api.dart' as api; import 'package:flutter/foundation.dart'; import 'package:flutter/painting.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/utils/image_url_builder.dart'; /// The remote image provider diff --git a/mobile/lib/modules/asset_viewer/providers/asset_description.provider.dart b/mobile/lib/modules/asset_viewer/providers/asset_description.provider.dart index c38b886e44..af5a1a44ef 100644 --- a/mobile/lib/modules/asset_viewer/providers/asset_description.provider.dart +++ b/mobile/lib/modules/asset_viewer/providers/asset_description.provider.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/asset_viewer/services/asset_description.service.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/exif_info.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/exif_info.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:isar/isar.dart'; diff --git a/mobile/lib/modules/asset_viewer/providers/asset_people.provider.dart b/mobile/lib/modules/asset_viewer/providers/asset_people.provider.dart index a856a00140..a80a95e414 100644 --- a/mobile/lib/modules/asset_viewer/providers/asset_people.provider.dart +++ b/mobile/lib/modules/asset_viewer/providers/asset_people.provider.dart @@ -1,4 +1,4 @@ -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/services/asset.service.dart'; import 'package:logging/logging.dart'; import 'package:openapi/api.dart'; diff --git a/mobile/lib/modules/asset_viewer/providers/asset_stack.provider.dart b/mobile/lib/modules/asset_viewer/providers/asset_stack.provider.dart index b6928c6ba8..4638c40f29 100644 --- a/mobile/lib/modules/asset_viewer/providers/asset_stack.provider.dart +++ b/mobile/lib/modules/asset_viewer/providers/asset_stack.provider.dart @@ -1,5 +1,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:isar/isar.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/mobile/lib/modules/asset_viewer/providers/current_asset.provider.dart b/mobile/lib/modules/asset_viewer/providers/current_asset.provider.dart index 1f6166826c..0e25660ab0 100644 --- a/mobile/lib/modules/asset_viewer/providers/current_asset.provider.dart +++ b/mobile/lib/modules/asset_viewer/providers/current_asset.provider.dart @@ -1,4 +1,4 @@ -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'current_asset.provider.g.dart'; diff --git a/mobile/lib/modules/asset_viewer/providers/image_viewer_page_state.provider.dart b/mobile/lib/modules/asset_viewer/providers/image_viewer_page_state.provider.dart index 7e1d3fa586..f51ab3c615 100644 --- a/mobile/lib/modules/asset_viewer/providers/image_viewer_page_state.provider.dart +++ b/mobile/lib/modules/asset_viewer/providers/image_viewer_page_state.provider.dart @@ -4,14 +4,14 @@ import 'package:fluttertoast/fluttertoast.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/album/services/album.service.dart'; -import 'package:immich_mobile/modules/asset_viewer/models/image_viewer_page_state.model.dart'; +import 'package:immich_mobile/models/asset_viewer/asset_viewer_page_state.model.dart'; import 'package:immich_mobile/modules/asset_viewer/services/image_viewer.service.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/services/share.service.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; import 'package:immich_mobile/shared/ui/share_dialog.dart'; -class ImageViewerStateNotifier extends StateNotifier { +class ImageViewerStateNotifier extends StateNotifier { final ImageViewerService _imageViewerService; final ShareService _shareService; final AlbumService _albumService; @@ -21,7 +21,7 @@ class ImageViewerStateNotifier extends StateNotifier { this._shareService, this._albumService, ) : super( - ImageViewerPageState( + AssetViewerPageState( downloadAssetStatus: DownloadAssetStatus.idle, ), ); @@ -86,7 +86,7 @@ class ImageViewerStateNotifier extends StateNotifier { } final imageViewerStateProvider = - StateNotifierProvider( + StateNotifierProvider( ((ref) => ImageViewerStateNotifier( ref.watch(imageViewerServiceProvider), ref.watch(shareServiceProvider), diff --git a/mobile/lib/modules/asset_viewer/providers/render_list.provider.dart b/mobile/lib/modules/asset_viewer/providers/render_list.provider.dart index ec568425b8..753ed66198 100644 --- a/mobile/lib/modules/asset_viewer/providers/render_list.provider.dart +++ b/mobile/lib/modules/asset_viewer/providers/render_list.provider.dart @@ -2,7 +2,7 @@ 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/modules/settings/providers/app_settings.provider.dart'; import 'package:immich_mobile/modules/settings/services/app_settings.service.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/utils/renderlist_generator.dart'; import 'package:isar/isar.dart'; diff --git a/mobile/lib/modules/asset_viewer/providers/video_player_controller_provider.dart b/mobile/lib/modules/asset_viewer/providers/video_player_controller_provider.dart index 714c38e2ab..23a237448e 100644 --- a/mobile/lib/modules/asset_viewer/providers/video_player_controller_provider.dart +++ b/mobile/lib/modules/asset_viewer/providers/video_player_controller_provider.dart @@ -1,5 +1,5 @@ -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:video_player/video_player.dart'; diff --git a/mobile/lib/modules/asset_viewer/services/asset_description.service.dart b/mobile/lib/modules/asset_viewer/services/asset_description.service.dart index 09de411e5d..e7d6d2d9ab 100644 --- a/mobile/lib/modules/asset_viewer/services/asset_description.service.dart +++ b/mobile/lib/modules/asset_viewer/services/asset_description.service.dart @@ -1,5 +1,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/exif_info.dart'; +import 'package:immich_mobile/entities/exif_info.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; diff --git a/mobile/lib/modules/asset_viewer/services/asset_stack.service.dart b/mobile/lib/modules/asset_viewer/services/asset_stack.service.dart index 0f9c864c2e..eb13002f96 100644 --- a/mobile/lib/modules/asset_viewer/services/asset_stack.service.dart +++ b/mobile/lib/modules/asset_viewer/services/asset_stack.service.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; import 'package:openapi/api.dart'; diff --git a/mobile/lib/modules/asset_viewer/services/image_viewer.service.dart b/mobile/lib/modules/asset_viewer/services/image_viewer.service.dart index 54682fdeeb..afeb045ac4 100644 --- a/mobile/lib/modules/asset_viewer/services/image_viewer.service.dart +++ b/mobile/lib/modules/asset_viewer/services/image_viewer.service.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/response_extensions.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; import 'package:logging/logging.dart'; diff --git a/mobile/lib/modules/asset_viewer/ui/advanced_bottom_sheet.dart b/mobile/lib/modules/asset_viewer/ui/advanced_bottom_sheet.dart index 9425aa303b..c63d98fb59 100644 --- a/mobile/lib/modules/asset_viewer/ui/advanced_bottom_sheet.dart +++ b/mobile/lib/modules/asset_viewer/ui/advanced_bottom_sheet.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; class AdvancedBottomSheet extends HookConsumerWidget { final Asset assetDetail; diff --git a/mobile/lib/modules/asset_viewer/ui/bottom_gallery_bar.dart b/mobile/lib/modules/asset_viewer/ui/bottom_gallery_bar.dart index a7d5e4e71c..691d6ac958 100644 --- a/mobile/lib/modules/asset_viewer/ui/bottom_gallery_bar.dart +++ b/mobile/lib/modules/asset_viewer/ui/bottom_gallery_bar.dart @@ -13,7 +13,7 @@ import 'package:immich_mobile/modules/asset_viewer/services/asset_stack.service. import 'package:immich_mobile/modules/asset_viewer/ui/video_controls.dart'; import 'package:immich_mobile/modules/home/ui/delete_dialog.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/asset.provider.dart'; import 'package:immich_mobile/shared/providers/server_info.provider.dart'; import 'package:immich_mobile/shared/providers/user.provider.dart'; diff --git a/mobile/lib/modules/asset_viewer/ui/description_input.dart b/mobile/lib/modules/asset_viewer/ui/description_input.dart index c5bae07cde..cee4237751 100644 --- a/mobile/lib/modules/asset_viewer/ui/description_input.dart +++ b/mobile/lib/modules/asset_viewer/ui/description_input.dart @@ -4,7 +4,7 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/asset_viewer/providers/asset_description.provider.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/user.provider.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; import 'package:logging/logging.dart'; diff --git a/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_bottom_sheet.dart b/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_bottom_sheet.dart index 00d5a1ae6b..1b03997b04 100644 --- a/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_bottom_sheet.dart +++ b/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_bottom_sheet.dart @@ -9,8 +9,8 @@ import 'package:immich_mobile/modules/asset_viewer/ui/exif_sheet/exif_detail.dar import 'package:immich_mobile/modules/asset_viewer/ui/exif_sheet/exif_image_properties.dart'; import 'package:immich_mobile/modules/asset_viewer/ui/exif_sheet/exif_location.dart'; import 'package:immich_mobile/modules/asset_viewer/ui/exif_sheet/exif_people.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/exif_info.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/exif_info.entity.dart'; import 'package:immich_mobile/shared/providers/asset.provider.dart'; import 'package:immich_mobile/utils/selection_handlers.dart'; diff --git a/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_detail.dart b/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_detail.dart index 4f49066206..5caa672c84 100644 --- a/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_detail.dart +++ b/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_detail.dart @@ -2,8 +2,8 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/asset_viewer/ui/exif_sheet/exif_image_properties.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/exif_info.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/exif_info.entity.dart'; class ExifDetail extends StatelessWidget { final Asset asset; diff --git a/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_image_properties.dart b/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_image_properties.dart index 4f584d1c9c..6f268c3d71 100644 --- a/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_image_properties.dart +++ b/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_image_properties.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/utils/bytes_units.dart'; diff --git a/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_location.dart b/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_location.dart index c4a8b9d508..6acfb2efa0 100644 --- a/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_location.dart +++ b/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_location.dart @@ -2,8 +2,8 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/asset_viewer/ui/exif_sheet/exif_map.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/exif_info.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/exif_info.entity.dart'; class ExifLocation extends StatelessWidget { final Asset asset; diff --git a/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_map.dart b/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_map.dart index 6c0050aeea..5a6e4960ea 100644 --- a/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_map.dart +++ b/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_map.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:immich_mobile/modules/map/widgets/map_thumbnail.dart'; -import 'package:immich_mobile/shared/models/exif_info.dart'; +import 'package:immich_mobile/entities/exif_info.entity.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_people.dart b/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_people.dart index b0dd65371e..c7920355c6 100644 --- a/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_people.dart +++ b/mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_people.dart @@ -6,11 +6,11 @@ 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/modules/asset_viewer/providers/asset_people.provider.dart'; -import 'package:immich_mobile/modules/search/models/curated_content.dart'; +import 'package:immich_mobile/models/search/search_curated_content.model.dart'; import 'package:immich_mobile/modules/search/ui/curated_people_row.dart'; import 'package:immich_mobile/modules/search/ui/person_name_edit_form.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; class ExifPeople extends ConsumerWidget { final Asset asset; @@ -48,9 +48,10 @@ class ExifPeople extends ConsumerWidget { return Container(); } - final curatedPeople = - people?.map((p) => CuratedContent(id: p.id, label: p.name)).toList() ?? - []; + final curatedPeople = people + ?.map((p) => SearchCuratedContent(id: p.id, label: p.name)) + .toList() ?? + []; return Column( children: [ diff --git a/mobile/lib/modules/asset_viewer/ui/gallery_app_bar.dart b/mobile/lib/modules/asset_viewer/ui/gallery_app_bar.dart index 31ba06d31b..73582b9616 100644 --- a/mobile/lib/modules/asset_viewer/ui/gallery_app_bar.dart +++ b/mobile/lib/modules/asset_viewer/ui/gallery_app_bar.dart @@ -12,7 +12,7 @@ import 'package:immich_mobile/modules/trash/providers/trashed_asset.provider.dar import 'package:immich_mobile/modules/home/ui/upload_dialog.dart'; import 'package:immich_mobile/modules/partner/providers/partner.provider.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/asset.provider.dart'; import 'package:immich_mobile/shared/providers/user.provider.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; diff --git a/mobile/lib/modules/asset_viewer/ui/top_control_app_bar.dart b/mobile/lib/modules/asset_viewer/ui/top_control_app_bar.dart index be4a3c8b82..db3da0b173 100644 --- a/mobile/lib/modules/asset_viewer/ui/top_control_app_bar.dart +++ b/mobile/lib/modules/asset_viewer/ui/top_control_app_bar.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/activities/providers/activity_statistics.provider.dart'; import 'package:immich_mobile/modules/album/providers/current_album.provider.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/asset.provider.dart'; class TopControlAppBar extends HookConsumerWidget { diff --git a/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart b/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart index 33de70d757..4e4b7878a6 100644 --- a/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart +++ b/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart @@ -27,7 +27,7 @@ import 'package:immich_mobile/shared/ui/photo_view/photo_view_gallery.dart'; import 'package:immich_mobile/shared/ui/photo_view/src/photo_view_computed_scale.dart'; import 'package:immich_mobile/shared/ui/photo_view/src/photo_view_scale_state.dart'; import 'package:immich_mobile/shared/ui/photo_view/src/utils/photo_view_hero_attributes.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:isar/isar.dart'; import 'package:openapi/api.dart' show ThumbnailFormat; diff --git a/mobile/lib/modules/asset_viewer/views/video_viewer_page.dart b/mobile/lib/modules/asset_viewer/views/video_viewer_page.dart index 22f00c001d..7f76a81995 100644 --- a/mobile/lib/modules/asset_viewer/views/video_viewer_page.dart +++ b/mobile/lib/modules/asset_viewer/views/video_viewer_page.dart @@ -7,7 +7,7 @@ import 'package:immich_mobile/modules/asset_viewer/providers/video_player_contro import 'package:immich_mobile/modules/asset_viewer/providers/video_player_controls_provider.dart'; import 'package:immich_mobile/modules/asset_viewer/providers/video_player_value_provider.dart'; import 'package:immich_mobile/modules/asset_viewer/ui/video_player.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/ui/delayed_loading_indicator.dart'; import 'package:wakelock_plus/wakelock_plus.dart'; diff --git a/mobile/lib/modules/backup/background_service/background.service.dart b/mobile/lib/modules/backup/background_service/background.service.dart index 8358043894..4ebc3c32ff 100644 --- a/mobile/lib/modules/backup/background_service/background.service.dart +++ b/mobile/lib/modules/backup/background_service/background.service.dart @@ -11,12 +11,12 @@ import 'package:flutter/widgets.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/main.dart'; import 'package:immich_mobile/modules/backup/background_service/localization.dart'; -import 'package:immich_mobile/modules/backup/models/backup_album.model.dart'; -import 'package:immich_mobile/modules/backup/models/current_upload_asset.model.dart'; -import 'package:immich_mobile/modules/backup/models/error_upload_asset.model.dart'; +import 'package:immich_mobile/entities/backup_album.entity.dart'; +import 'package:immich_mobile/models/backup/current_upload_asset.model.dart'; +import 'package:immich_mobile/models/backup/error_upload_asset.model.dart'; import 'package:immich_mobile/modules/backup/services/backup.service.dart'; import 'package:immich_mobile/modules/settings/services/app_settings.service.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; import 'package:immich_mobile/utils/backup_progress.dart'; import 'package:immich_mobile/utils/diff.dart'; diff --git a/mobile/lib/modules/backup/providers/backup.provider.dart b/mobile/lib/modules/backup/providers/backup.provider.dart index a2de92d6d7..da222e2afd 100644 --- a/mobile/lib/modules/backup/providers/backup.provider.dart +++ b/mobile/lib/modules/backup/providers/backup.provider.dart @@ -4,19 +4,19 @@ import 'package:cancellation_token_http/http.dart'; import 'package:collection/collection.dart'; import 'package:flutter/widgets.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/backup/models/available_album.model.dart'; -import 'package:immich_mobile/modules/backup/models/backup_album.model.dart'; -import 'package:immich_mobile/modules/backup/models/backup_state.model.dart'; -import 'package:immich_mobile/modules/backup/models/current_upload_asset.model.dart'; -import 'package:immich_mobile/modules/backup/models/error_upload_asset.model.dart'; +import 'package:immich_mobile/models/backup/available_album.model.dart'; +import 'package:immich_mobile/entities/backup_album.entity.dart'; +import 'package:immich_mobile/models/backup/backup_state.model.dart'; +import 'package:immich_mobile/models/backup/current_upload_asset.model.dart'; +import 'package:immich_mobile/models/backup/error_upload_asset.model.dart'; import 'package:immich_mobile/modules/backup/providers/error_backup_list.provider.dart'; import 'package:immich_mobile/modules/backup/background_service/background.service.dart'; import 'package:immich_mobile/modules/backup/services/backup.service.dart'; -import 'package:immich_mobile/modules/login/models/authentication_state.model.dart'; +import 'package:immich_mobile/models/authentication/authentication_state.model.dart'; import 'package:immich_mobile/modules/login/providers/authentication.provider.dart'; import 'package:immich_mobile/modules/onboarding/providers/gallery_permission.provider.dart'; -import 'package:immich_mobile/shared/models/server_info/server_disk_info.model.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/models/server_info/server_disk_info.model.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/shared/providers/app_state.provider.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/services/server_info.service.dart'; diff --git a/mobile/lib/modules/backup/providers/backup_verification.provider.dart b/mobile/lib/modules/backup/providers/backup_verification.provider.dart index 1cc5379131..65b82428e7 100644 --- a/mobile/lib/modules/backup/providers/backup_verification.provider.dart +++ b/mobile/lib/modules/backup/providers/backup_verification.provider.dart @@ -4,7 +4,7 @@ import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:flutter/material.dart'; import 'package:immich_mobile/modules/backup/providers/backup.provider.dart'; import 'package:immich_mobile/modules/backup/services/backup_verification.service.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/asset.provider.dart'; import 'package:immich_mobile/shared/ui/confirm_dialog.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; diff --git a/mobile/lib/modules/backup/providers/error_backup_list.provider.dart b/mobile/lib/modules/backup/providers/error_backup_list.provider.dart index 213027dba0..22ff995905 100644 --- a/mobile/lib/modules/backup/providers/error_backup_list.provider.dart +++ b/mobile/lib/modules/backup/providers/error_backup_list.provider.dart @@ -1,5 +1,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/backup/models/error_upload_asset.model.dart'; +import 'package:immich_mobile/models/backup/error_upload_asset.model.dart'; class ErrorBackupListNotifier extends StateNotifier> { ErrorBackupListNotifier() : super({}); diff --git a/mobile/lib/modules/backup/providers/manual_upload.provider.dart b/mobile/lib/modules/backup/providers/manual_upload.provider.dart index 6d9ecbd206..74114dfd93 100644 --- a/mobile/lib/modules/backup/providers/manual_upload.provider.dart +++ b/mobile/lib/modules/backup/providers/manual_upload.provider.dart @@ -7,17 +7,17 @@ import 'package:flutter/widgets.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/backup/background_service/background.service.dart'; -import 'package:immich_mobile/modules/backup/models/backup_state.model.dart'; -import 'package:immich_mobile/modules/backup/models/current_upload_asset.model.dart'; -import 'package:immich_mobile/modules/backup/models/error_upload_asset.model.dart'; -import 'package:immich_mobile/modules/backup/models/manual_upload_state.model.dart'; +import 'package:immich_mobile/models/backup/backup_state.model.dart'; +import 'package:immich_mobile/models/backup/current_upload_asset.model.dart'; +import 'package:immich_mobile/models/backup/error_upload_asset.model.dart'; +import 'package:immich_mobile/models/backup/manual_upload_state.model.dart'; import 'package:immich_mobile/modules/backup/providers/backup.provider.dart'; import 'package:immich_mobile/modules/backup/providers/error_backup_list.provider.dart'; import 'package:immich_mobile/modules/backup/services/backup.service.dart'; import 'package:immich_mobile/modules/onboarding/providers/gallery_permission.provider.dart'; import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart'; import 'package:immich_mobile/modules/settings/services/app_settings.service.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/app_state.provider.dart'; import 'package:immich_mobile/shared/services/local_notification.service.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; diff --git a/mobile/lib/modules/backup/services/backup.service.dart b/mobile/lib/modules/backup/services/backup.service.dart index d4277a822e..fa0f49947c 100644 --- a/mobile/lib/modules/backup/services/backup.service.dart +++ b/mobile/lib/modules/backup/services/backup.service.dart @@ -5,13 +5,13 @@ import 'dart:io'; import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/backup/models/backup_album.model.dart'; -import 'package:immich_mobile/modules/backup/models/current_upload_asset.model.dart'; -import 'package:immich_mobile/modules/backup/models/duplicated_asset.model.dart'; -import 'package:immich_mobile/modules/backup/models/error_upload_asset.model.dart'; +import 'package:immich_mobile/entities/backup_album.entity.dart'; +import 'package:immich_mobile/models/backup/current_upload_asset.model.dart'; +import 'package:immich_mobile/entities/duplicated_asset.entity.dart'; +import 'package:immich_mobile/models/backup/error_upload_asset.model.dart'; import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart'; import 'package:immich_mobile/modules/settings/services/app_settings.service.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; diff --git a/mobile/lib/modules/backup/services/backup_verification.service.dart b/mobile/lib/modules/backup/services/backup_verification.service.dart index 95e3a8d58b..5eed9be11c 100644 --- a/mobile/lib/modules/backup/services/backup_verification.service.dart +++ b/mobile/lib/modules/backup/services/backup_verification.service.dart @@ -5,9 +5,9 @@ import 'package:collection/collection.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/exif_info.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/exif_info.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; import 'package:immich_mobile/utils/diff.dart'; diff --git a/mobile/lib/modules/backup/ui/album_info_card.dart b/mobile/lib/modules/backup/ui/album_info_card.dart index a274f1c5e8..bf41bf1b6d 100644 --- a/mobile/lib/modules/backup/ui/album_info_card.dart +++ b/mobile/lib/modules/backup/ui/album_info_card.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/backup/models/available_album.model.dart'; +import 'package:immich_mobile/models/backup/available_album.model.dart'; import 'package:immich_mobile/modules/backup/providers/backup.provider.dart'; import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/shared/providers/haptic_feedback.provider.dart'; diff --git a/mobile/lib/modules/backup/ui/album_info_list_tile.dart b/mobile/lib/modules/backup/ui/album_info_list_tile.dart index 40fdfa8897..02c54a84ba 100644 --- a/mobile/lib/modules/backup/ui/album_info_list_tile.dart +++ b/mobile/lib/modules/backup/ui/album_info_list_tile.dart @@ -4,7 +4,7 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/backup/models/available_album.model.dart'; +import 'package:immich_mobile/models/backup/available_album.model.dart'; import 'package:immich_mobile/modules/backup/providers/backup.provider.dart'; import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/shared/providers/haptic_feedback.provider.dart'; diff --git a/mobile/lib/modules/backup/ui/current_backup_asset_info_box.dart b/mobile/lib/modules/backup/ui/current_backup_asset_info_box.dart index 35bee2f8d1..ffd26ddf1e 100644 --- a/mobile/lib/modules/backup/ui/current_backup_asset_info_box.dart +++ b/mobile/lib/modules/backup/ui/current_backup_asset_info_box.dart @@ -7,7 +7,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/backup/models/backup_state.model.dart'; +import 'package:immich_mobile/models/backup/backup_state.model.dart'; import 'package:immich_mobile/modules/backup/providers/backup.provider.dart'; import 'package:immich_mobile/modules/backup/providers/error_backup_list.provider.dart'; import 'package:immich_mobile/modules/backup/providers/manual_upload.provider.dart'; diff --git a/mobile/lib/modules/backup/views/backup_controller_page.dart b/mobile/lib/modules/backup/views/backup_controller_page.dart index 0e22adeb97..0278284ea1 100644 --- a/mobile/lib/modules/backup/views/backup_controller_page.dart +++ b/mobile/lib/modules/backup/views/backup_controller_page.dart @@ -12,7 +12,7 @@ import 'package:immich_mobile/modules/backup/providers/error_backup_list.provide import 'package:immich_mobile/modules/backup/providers/ios_background_settings.provider.dart'; import 'package:immich_mobile/modules/backup/providers/manual_upload.provider.dart'; import 'package:immich_mobile/modules/backup/ui/current_backup_asset_info_box.dart'; -import 'package:immich_mobile/modules/backup/models/backup_state.model.dart'; +import 'package:immich_mobile/models/backup/backup_state.model.dart'; import 'package:immich_mobile/modules/backup/providers/backup.provider.dart'; import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/shared/providers/websocket.provider.dart'; diff --git a/mobile/lib/modules/favorite/providers/favorite_provider.dart b/mobile/lib/modules/favorite/providers/favorite_provider.dart index bdaa2761a1..eec58a8482 100644 --- a/mobile/lib/modules/favorite/providers/favorite_provider.dart +++ b/mobile/lib/modules/favorite/providers/favorite_provider.dart @@ -1,6 +1,6 @@ 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/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/providers/user.provider.dart'; import 'package:immich_mobile/utils/renderlist_generator.dart'; diff --git a/mobile/lib/modules/home/ui/asset_grid/asset_grid_data_structure.dart b/mobile/lib/modules/home/ui/asset_grid/asset_grid_data_structure.dart index 9e5f77caf6..71a375565f 100644 --- a/mobile/lib/modules/home/ui/asset_grid/asset_grid_data_structure.dart +++ b/mobile/lib/modules/home/ui/asset_grid/asset_grid_data_structure.dart @@ -2,7 +2,7 @@ import 'dart:math'; import 'package:collection/collection.dart'; import 'package:easy_localization/easy_localization.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:isar/isar.dart'; import 'package:logging/logging.dart'; diff --git a/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid.dart b/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid.dart index f075280aee..04505dc67b 100644 --- a/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid.dart +++ b/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid.dart @@ -11,7 +11,7 @@ import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structu import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid_view.dart'; import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart'; import 'package:immich_mobile/modules/settings/services/app_settings.service.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; class ImmichAssetGrid extends HookConsumerWidget { diff --git a/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid_view.dart b/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid_view.dart index 9392a244bf..c7f3a2ab6c 100644 --- a/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid_view.dart +++ b/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid_view.dart @@ -17,7 +17,7 @@ import 'package:immich_mobile/shared/ui/immich_toast.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:immich_mobile/modules/home/ui/control_bottom_app_bar.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/modules/asset_viewer/providers/scroll_to_date_notifier.provider.dart'; import 'package:immich_mobile/shared/providers/haptic_feedback.provider.dart'; import 'package:immich_mobile/shared/providers/tab.provider.dart'; diff --git a/mobile/lib/modules/home/ui/asset_grid/thumbnail_image.dart b/mobile/lib/modules/home/ui/asset_grid/thumbnail_image.dart index f06be0289b..51e386098e 100644 --- a/mobile/lib/modules/home/ui/asset_grid/thumbnail_image.dart +++ b/mobile/lib/modules/home/ui/asset_grid/thumbnail_image.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/haptic_feedback.provider.dart'; import 'package:immich_mobile/shared/ui/immich_thumbnail.dart'; import 'package:immich_mobile/utils/storage_indicator.dart'; diff --git a/mobile/lib/modules/home/ui/control_bottom_app_bar.dart b/mobile/lib/modules/home/ui/control_bottom_app_bar.dart index 23bb2ed61e..19f93f0963 100644 --- a/mobile/lib/modules/home/ui/control_bottom_app_bar.dart +++ b/mobile/lib/modules/home/ui/control_bottom_app_bar.dart @@ -6,12 +6,12 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/album/providers/album.provider.dart'; import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart'; import 'package:immich_mobile/modules/album/ui/add_to_album_sliverlist.dart'; -import 'package:immich_mobile/modules/home/models/selection_state.dart'; +import 'package:immich_mobile/models/asset_selection_state.dart'; import 'package:immich_mobile/modules/home/ui/delete_dialog.dart'; import 'package:immich_mobile/modules/home/ui/upload_dialog.dart'; import 'package:immich_mobile/shared/providers/server_info.provider.dart'; import 'package:immich_mobile/shared/ui/drag_sheet.dart'; -import 'package:immich_mobile/shared/models/album.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/utils/draggable_scroll_controller.dart'; final controlBottomAppBarNotifier = ControlBottomAppBarNotifier(); @@ -40,7 +40,7 @@ class ControlBottomAppBar extends HookConsumerWidget { final bool enabled; final bool unfavorite; final bool unarchive; - final SelectionAssetState selectionAssetState; + final AssetSelectionState selectionAssetState; const ControlBottomAppBar({ super.key, @@ -57,7 +57,7 @@ class ControlBottomAppBar extends HookConsumerWidget { this.onEditTime, this.onEditLocation, this.onRemoveFromAlbum, - this.selectionAssetState = const SelectionAssetState(), + this.selectionAssetState = const AssetSelectionState(), this.enabled = true, this.unarchive = false, this.unfavorite = false, diff --git a/mobile/lib/modules/login/providers/authentication.provider.dart b/mobile/lib/modules/login/providers/authentication.provider.dart index 02d10c7674..5673184996 100644 --- a/mobile/lib/modules/login/providers/authentication.provider.dart +++ b/mobile/lib/modules/login/providers/authentication.provider.dart @@ -6,9 +6,9 @@ import 'package:flutter_udid/flutter_udid.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/album/providers/album.provider.dart'; import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/modules/login/models/authentication_state.model.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/models/authentication/authentication_state.model.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; diff --git a/mobile/lib/modules/login/ui/login_form.dart b/mobile/lib/modules/login/ui/login_form.dart index 284e14276a..57dc5c58cb 100644 --- a/mobile/lib/modules/login/ui/login_form.dart +++ b/mobile/lib/modules/login/ui/login_form.dart @@ -9,7 +9,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/login/providers/oauth.provider.dart'; import 'package:immich_mobile/modules/onboarding/providers/gallery_permission.provider.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/providers/asset.provider.dart'; import 'package:immich_mobile/modules/login/providers/authentication.provider.dart'; diff --git a/mobile/lib/modules/map/providers/map_marker.provider.dart b/mobile/lib/modules/map/providers/map_marker.provider.dart index 469e827cda..ddd325f9a1 100644 --- a/mobile/lib/modules/map/providers/map_marker.provider.dart +++ b/mobile/lib/modules/map/providers/map_marker.provider.dart @@ -1,4 +1,4 @@ -import 'package:immich_mobile/modules/map/models/map_marker.dart'; +import 'package:immich_mobile/models/map/map_marker.model.dart'; import 'package:immich_mobile/modules/map/providers/map_service.provider.dart'; import 'package:immich_mobile/modules/map/providers/map_state.provider.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/mobile/lib/modules/map/providers/map_marker.provider.g.dart b/mobile/lib/modules/map/providers/map_marker.provider.g.dart index 7df6adea99..ce11b4ebff 100644 --- a/mobile/lib/modules/map/providers/map_marker.provider.g.dart +++ b/mobile/lib/modules/map/providers/map_marker.provider.g.dart @@ -6,7 +6,7 @@ part of 'map_marker.provider.dart'; // RiverpodGenerator // ************************************************************************** -String _$mapMarkersHash() => r'90b00b7f85c54b19f56c7d55d3ad8575c09dab3c'; +String _$mapMarkersHash() => r'737d52f3d02e6a458b11d730f2fe522c39ee1ebf'; /// See also [mapMarkers]. @ProviderFor(mapMarkers) diff --git a/mobile/lib/modules/map/providers/map_state.provider.dart b/mobile/lib/modules/map/providers/map_state.provider.dart index e44e7f80b4..47ada0adf4 100644 --- a/mobile/lib/modules/map/providers/map_state.provider.dart +++ b/mobile/lib/modules/map/providers/map_state.provider.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:immich_mobile/extensions/response_extensions.dart'; -import 'package:immich_mobile/modules/map/models/map_state.model.dart'; +import 'package:immich_mobile/models/map/map_state.model.dart'; import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart'; import 'package:immich_mobile/modules/settings/services/app_settings.service.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; diff --git a/mobile/lib/modules/map/providers/map_state.provider.g.dart b/mobile/lib/modules/map/providers/map_state.provider.g.dart index d1b3e54b71..e12c69d717 100644 --- a/mobile/lib/modules/map/providers/map_state.provider.g.dart +++ b/mobile/lib/modules/map/providers/map_state.provider.g.dart @@ -6,7 +6,7 @@ part of 'map_state.provider.dart'; // RiverpodGenerator // ************************************************************************** -String _$mapStateNotifierHash() => r'6408d616ec9fc0d1ff26e25692417c43504ff754'; +String _$mapStateNotifierHash() => r'87a8623f726d438d115d5a15609c71372726ee2f'; /// See also [MapStateNotifier]. @ProviderFor(MapStateNotifier) diff --git a/mobile/lib/modules/map/services/map.service.dart b/mobile/lib/modules/map/services/map.service.dart index 3e24f0f020..df650c6e2d 100644 --- a/mobile/lib/modules/map/services/map.service.dart +++ b/mobile/lib/modules/map/services/map.service.dart @@ -1,5 +1,5 @@ import 'package:immich_mobile/mixins/error_logger.mixin.dart'; -import 'package:immich_mobile/modules/map/models/map_marker.dart'; +import 'package:immich_mobile/models/map/map_marker.model.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; import 'package:logging/logging.dart'; diff --git a/mobile/lib/modules/map/utils/map_utils.dart b/mobile/lib/modules/map/utils/map_utils.dart index f6e8349f51..d11e3b22d2 100644 --- a/mobile/lib/modules/map/utils/map_utils.dart +++ b/mobile/lib/modules/map/utils/map_utils.dart @@ -1,6 +1,6 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; -import 'package:immich_mobile/modules/map/models/map_marker.dart'; +import 'package:immich_mobile/models/map/map_marker.model.dart'; import 'package:immich_mobile/shared/ui/confirm_dialog.dart'; import 'package:geolocator/geolocator.dart'; import 'package:logging/logging.dart'; diff --git a/mobile/lib/modules/map/views/map_page.dart b/mobile/lib/modules/map/views/map_page.dart index f1b9addb13..d414f5c5c1 100644 --- a/mobile/lib/modules/map/views/map_page.dart +++ b/mobile/lib/modules/map/views/map_page.dart @@ -11,8 +11,8 @@ import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/extensions/latlngbounds_extension.dart'; import 'package:immich_mobile/extensions/maplibrecontroller_extensions.dart'; -import 'package:immich_mobile/modules/map/models/map_event.model.dart'; -import 'package:immich_mobile/modules/map/models/map_marker.dart'; +import 'package:immich_mobile/models/map/map_event.model.dart'; +import 'package:immich_mobile/models/map/map_marker.model.dart'; import 'package:immich_mobile/modules/map/providers/map_marker.provider.dart'; import 'package:immich_mobile/modules/map/providers/map_state.provider.dart'; import 'package:immich_mobile/modules/map/utils/map_utils.dart'; @@ -22,7 +22,7 @@ import 'package:immich_mobile/modules/map/widgets/map_bottom_sheet.dart'; import 'package:immich_mobile/modules/map/widgets/map_theme_override.dart'; import 'package:immich_mobile/modules/map/widgets/positioned_asset_marker_icon.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; import 'package:immich_mobile/shared/views/immich_loading_overlay.dart'; diff --git a/mobile/lib/modules/map/widgets/map_app_bar.dart b/mobile/lib/modules/map/widgets/map_app_bar.dart index ea73319c4b..ecc73d1a5e 100644 --- a/mobile/lib/modules/map/widgets/map_app_bar.dart +++ b/mobile/lib/modules/map/widgets/map_app_bar.dart @@ -7,7 +7,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/map/providers/map_state.provider.dart'; import 'package:immich_mobile/modules/map/widgets/map_settings_sheet.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/views/immich_loading_overlay.dart'; import 'package:immich_mobile/utils/selection_handlers.dart'; diff --git a/mobile/lib/modules/map/widgets/map_asset_grid.dart b/mobile/lib/modules/map/widgets/map_asset_grid.dart index ad90d36ed1..6981178963 100644 --- a/mobile/lib/modules/map/widgets/map_asset_grid.dart +++ b/mobile/lib/modules/map/widgets/map_asset_grid.dart @@ -9,8 +9,8 @@ import 'package:immich_mobile/extensions/collection_extensions.dart'; import 'package:immich_mobile/modules/asset_viewer/providers/render_list.provider.dart'; import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart'; import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart'; -import 'package:immich_mobile/modules/map/models/map_event.model.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/models/map/map_event.model.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/ui/drag_sheet.dart'; import 'package:immich_mobile/utils/color_filter_generator.dart'; diff --git a/mobile/lib/modules/map/widgets/map_bottom_sheet.dart b/mobile/lib/modules/map/widgets/map_bottom_sheet.dart index 7bef846c96..ca35115162 100644 --- a/mobile/lib/modules/map/widgets/map_bottom_sheet.dart +++ b/mobile/lib/modules/map/widgets/map_bottom_sheet.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/map/models/map_event.model.dart'; +import 'package:immich_mobile/models/map/map_event.model.dart'; import 'package:immich_mobile/modules/map/widgets/map_asset_grid.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/utils/draggable_scroll_controller.dart'; class MapBottomSheet extends HookConsumerWidget { diff --git a/mobile/lib/modules/map/widgets/positioned_asset_marker_icon.dart b/mobile/lib/modules/map/widgets/positioned_asset_marker_icon.dart index e7cd6f6227..4002c371cd 100644 --- a/mobile/lib/modules/map/widgets/positioned_asset_marker_icon.dart +++ b/mobile/lib/modules/map/widgets/positioned_asset_marker_icon.dart @@ -4,7 +4,7 @@ import 'dart:math'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/utils/image_url_builder.dart'; class PositionedAssetMarkerIcon extends StatelessWidget { diff --git a/mobile/lib/modules/memories/providers/memory.provider.dart b/mobile/lib/modules/memories/providers/memory.provider.dart index 2552b243de..5478970749 100644 --- a/mobile/lib/modules/memories/providers/memory.provider.dart +++ b/mobile/lib/modules/memories/providers/memory.provider.dart @@ -1,5 +1,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/memories/models/memory.dart'; +import 'package:immich_mobile/models/memories/memory.model.dart'; import 'package:immich_mobile/modules/memories/services/memory.service.dart'; final memoryFutureProvider = diff --git a/mobile/lib/modules/memories/services/memory.service.dart b/mobile/lib/modules/memories/services/memory.service.dart index 8ee203e6c9..a3960e6af1 100644 --- a/mobile/lib/modules/memories/services/memory.service.dart +++ b/mobile/lib/modules/memories/services/memory.service.dart @@ -1,6 +1,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/modules/memories/models/memory.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/models/memories/memory.model.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; diff --git a/mobile/lib/modules/memories/ui/memory_bottom_info.dart b/mobile/lib/modules/memories/ui/memory_bottom_info.dart index 54086291fa..eb4d600fae 100644 --- a/mobile/lib/modules/memories/ui/memory_bottom_info.dart +++ b/mobile/lib/modules/memories/ui/memory_bottom_info.dart @@ -3,7 +3,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/memories/models/memory.dart'; +import 'package:immich_mobile/models/memories/memory.model.dart'; import 'package:immich_mobile/modules/asset_viewer/providers/scroll_to_date_notifier.provider.dart'; class MemoryBottomInfo extends StatelessWidget { diff --git a/mobile/lib/modules/memories/ui/memory_card.dart b/mobile/lib/modules/memories/ui/memory_card.dart index 5a316db279..91d83fb683 100644 --- a/mobile/lib/modules/memories/ui/memory_card.dart +++ b/mobile/lib/modules/memories/ui/memory_card.dart @@ -4,7 +4,7 @@ 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/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/ui/hooks/blurhash_hook.dart'; import 'package:immich_mobile/shared/ui/immich_image.dart'; diff --git a/mobile/lib/modules/memories/views/memory_page.dart b/mobile/lib/modules/memories/views/memory_page.dart index 9a7032f828..afc7befd7a 100644 --- a/mobile/lib/modules/memories/views/memory_page.dart +++ b/mobile/lib/modules/memories/views/memory_page.dart @@ -3,12 +3,12 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/memories/models/memory.dart'; +import 'package:immich_mobile/models/memories/memory.model.dart'; import 'package:immich_mobile/modules/memories/ui/memory_bottom_info.dart'; import 'package:immich_mobile/modules/memories/ui/memory_card.dart'; import 'package:immich_mobile/modules/memories/ui/memory_epilogue.dart'; import 'package:immich_mobile/modules/memories/ui/memory_progress_indicator.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/haptic_feedback.provider.dart'; import 'package:immich_mobile/shared/ui/immich_image.dart'; diff --git a/mobile/lib/modules/partner/providers/partner.provider.dart b/mobile/lib/modules/partner/providers/partner.provider.dart index 3123382bb2..d5ca948d10 100644 --- a/mobile/lib/modules/partner/providers/partner.provider.dart +++ b/mobile/lib/modules/partner/providers/partner.provider.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/album/providers/suggested_shared_users.provider.dart'; import 'package:immich_mobile/modules/partner/services/partner.service.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:isar/isar.dart'; diff --git a/mobile/lib/modules/partner/services/partner.service.dart b/mobile/lib/modules/partner/services/partner.service.dart index d1e40076c7..7571e1d27f 100644 --- a/mobile/lib/modules/partner/services/partner.service.dart +++ b/mobile/lib/modules/partner/services/partner.service.dart @@ -1,5 +1,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; diff --git a/mobile/lib/modules/partner/ui/partner_list.dart b/mobile/lib/modules/partner/ui/partner_list.dart index 2b4aef04f1..e6c8ab82d5 100644 --- a/mobile/lib/modules/partner/ui/partner_list.dart +++ b/mobile/lib/modules/partner/ui/partner_list.dart @@ -4,7 +4,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/routing/router.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/ui/user_avatar.dart'; class PartnerList extends HookConsumerWidget { diff --git a/mobile/lib/modules/partner/views/partner_detail_page.dart b/mobile/lib/modules/partner/views/partner_detail_page.dart index 0c681162e1..0e563dce45 100644 --- a/mobile/lib/modules/partner/views/partner_detail_page.dart +++ b/mobile/lib/modules/partner/views/partner_detail_page.dart @@ -4,7 +4,7 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/home/providers/multiselect.provider.dart'; import 'package:immich_mobile/modules/partner/providers/partner.provider.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/asset.provider.dart'; import 'package:immich_mobile/shared/ui/asset_grid/multiselect_grid.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; diff --git a/mobile/lib/modules/partner/views/partner_page.dart b/mobile/lib/modules/partner/views/partner_page.dart index 6fc34345f6..89ba55290f 100644 --- a/mobile/lib/modules/partner/views/partner_page.dart +++ b/mobile/lib/modules/partner/views/partner_page.dart @@ -5,7 +5,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/partner/providers/partner.provider.dart'; import 'package:immich_mobile/modules/partner/services/partner.service.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/ui/confirm_dialog.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; import 'package:immich_mobile/shared/ui/user_avatar.dart'; diff --git a/mobile/lib/modules/search/providers/all_motion_photos.provider.dart b/mobile/lib/modules/search/providers/all_motion_photos.provider.dart index 09aae142f7..5b2819832c 100644 --- a/mobile/lib/modules/search/providers/all_motion_photos.provider.dart +++ b/mobile/lib/modules/search/providers/all_motion_photos.provider.dart @@ -1,5 +1,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:isar/isar.dart'; diff --git a/mobile/lib/modules/search/providers/all_video_assets.provider.dart b/mobile/lib/modules/search/providers/all_video_assets.provider.dart index 3a3c9e6fa1..2ad57d4c06 100644 --- a/mobile/lib/modules/search/providers/all_video_assets.provider.dart +++ b/mobile/lib/modules/search/providers/all_video_assets.provider.dart @@ -1,6 +1,6 @@ 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/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/utils/renderlist_generator.dart'; diff --git a/mobile/lib/modules/search/providers/paginated_search.provider.dart b/mobile/lib/modules/search/providers/paginated_search.provider.dart index e20e37c529..28d108da0d 100644 --- a/mobile/lib/modules/search/providers/paginated_search.provider.dart +++ b/mobile/lib/modules/search/providers/paginated_search.provider.dart @@ -1,8 +1,8 @@ import 'package:immich_mobile/modules/asset_viewer/providers/render_list.provider.dart'; import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart'; -import 'package:immich_mobile/modules/search/models/search_filter.dart'; +import 'package:immich_mobile/models/search/search_filter.model.dart'; import 'package:immich_mobile/modules/search/services/search.service.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'paginated_search.provider.g.dart'; diff --git a/mobile/lib/modules/search/providers/recently_added.provider.dart b/mobile/lib/modules/search/providers/recently_added.provider.dart index 4e6d2c1562..0af3adad9e 100644 --- a/mobile/lib/modules/search/providers/recently_added.provider.dart +++ b/mobile/lib/modules/search/providers/recently_added.provider.dart @@ -1,5 +1,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/providers/user.provider.dart'; import 'package:isar/isar.dart'; diff --git a/mobile/lib/modules/search/providers/search_page_state.provider.dart b/mobile/lib/modules/search/providers/search_page_state.provider.dart index 3bd346ab2d..f1637c8b58 100644 --- a/mobile/lib/modules/search/providers/search_page_state.provider.dart +++ b/mobile/lib/modules/search/providers/search_page_state.provider.dart @@ -1,10 +1,10 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/search/models/curated_content.dart'; +import 'package:immich_mobile/models/search/search_curated_content.model.dart'; import 'package:immich_mobile/modules/search/services/search.service.dart'; final getPlacesProvider = - FutureProvider.autoDispose>((ref) async { + FutureProvider.autoDispose>((ref) async { final SearchService searchService = ref.watch(searchServiceProvider); final exploreData = await searchService.getExploreData(); @@ -18,7 +18,7 @@ final getPlacesProvider = final curatedContent = locations .map( - (l) => CuratedContent( + (l) => SearchCuratedContent( label: l.value, id: l.data.id, ), diff --git a/mobile/lib/modules/search/services/person.service.dart b/mobile/lib/modules/search/services/person.service.dart index 884a01c9fe..2506e548c6 100644 --- a/mobile/lib/modules/search/services/person.service.dart +++ b/mobile/lib/modules/search/services/person.service.dart @@ -1,4 +1,4 @@ -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; diff --git a/mobile/lib/modules/search/services/search.service.dart b/mobile/lib/modules/search/services/search.service.dart index c1c6493c02..fc06a21bf7 100644 --- a/mobile/lib/modules/search/services/search.service.dart +++ b/mobile/lib/modules/search/services/search.service.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/search/models/search_filter.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/models/search/search_filter.model.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; diff --git a/mobile/lib/modules/search/ui/curated_people_row.dart b/mobile/lib/modules/search/ui/curated_people_row.dart index a712c69293..9d7e11f15f 100644 --- a/mobile/lib/modules/search/ui/curated_people_row.dart +++ b/mobile/lib/modules/search/ui/curated_people_row.dart @@ -1,18 +1,18 @@ import 'package:flutter/material.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/search/models/curated_content.dart'; +import 'package:immich_mobile/models/search/search_curated_content.model.dart'; import 'package:immich_mobile/modules/search/ui/thumbnail_with_info.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/utils/image_url_builder.dart'; class CuratedPeopleRow extends StatelessWidget { - final List content; + final List content; final EdgeInsets? padding; /// Callback with the content and the index when tapped - final Function(CuratedContent, int)? onTap; - final Function(CuratedContent, int)? onNameTap; + final Function(SearchCuratedContent, int)? onTap; + final Function(SearchCuratedContent, int)? onNameTap; const CuratedPeopleRow({ super.key, diff --git a/mobile/lib/modules/search/ui/curated_places_row.dart b/mobile/lib/modules/search/ui/curated_places_row.dart index 9078e4192a..1b70434f80 100644 --- a/mobile/lib/modules/search/ui/curated_places_row.dart +++ b/mobile/lib/modules/search/ui/curated_places_row.dart @@ -5,7 +5,7 @@ import 'package:immich_mobile/modules/map/widgets/map_thumbnail.dart'; import 'package:immich_mobile/modules/search/ui/curated_row.dart'; import 'package:immich_mobile/modules/search/ui/thumbnail_with_info.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; class CuratedPlacesRow extends CuratedRow { diff --git a/mobile/lib/modules/search/ui/curated_row.dart b/mobile/lib/modules/search/ui/curated_row.dart index 9f5130764f..5ab682cc46 100644 --- a/mobile/lib/modules/search/ui/curated_row.dart +++ b/mobile/lib/modules/search/ui/curated_row.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; -import 'package:immich_mobile/modules/search/models/curated_content.dart'; +import 'package:immich_mobile/models/search/search_curated_content.model.dart'; import 'package:immich_mobile/modules/search/ui/thumbnail_with_info.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; class CuratedRow extends StatelessWidget { - final List content; + final List content; final double imageSize; /// Callback with the content and the index when tapped - final Function(CuratedContent, int)? onTap; + final Function(SearchCuratedContent, int)? onTap; const CuratedRow({ super.key, diff --git a/mobile/lib/modules/search/ui/explore_grid.dart b/mobile/lib/modules/search/ui/explore_grid.dart index ba55b55813..9b5850de45 100644 --- a/mobile/lib/modules/search/ui/explore_grid.dart +++ b/mobile/lib/modules/search/ui/explore_grid.dart @@ -1,15 +1,15 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; -import 'package:immich_mobile/modules/search/models/curated_content.dart'; -import 'package:immich_mobile/modules/search/models/search_filter.dart'; +import 'package:immich_mobile/models/search/search_curated_content.model.dart'; +import 'package:immich_mobile/models/search/search_filter.model.dart'; import 'package:immich_mobile/modules/search/ui/thumbnail_with_info.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/utils/image_url_builder.dart'; class ExploreGrid extends StatelessWidget { - final List curatedContent; + final List curatedContent; final bool isPeople; const ExploreGrid({ diff --git a/mobile/lib/modules/search/ui/search_filter/camera_picker.dart b/mobile/lib/modules/search/ui/search_filter/camera_picker.dart index 17de9d8c2f..01d871817b 100644 --- a/mobile/lib/modules/search/ui/search_filter/camera_picker.dart +++ b/mobile/lib/modules/search/ui/search_filter/camera_picker.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/search/models/search_filter.dart'; +import 'package:immich_mobile/models/search/search_filter.model.dart'; import 'package:immich_mobile/modules/search/providers/search_filter.provider.dart'; import 'package:openapi/api.dart'; diff --git a/mobile/lib/modules/search/ui/search_filter/display_option_picker.dart b/mobile/lib/modules/search/ui/search_filter/display_option_picker.dart index 7f0357f635..6acdb9c2d3 100644 --- a/mobile/lib/modules/search/ui/search_filter/display_option_picker.dart +++ b/mobile/lib/modules/search/ui/search_filter/display_option_picker.dart @@ -1,7 +1,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; -import 'package:immich_mobile/modules/search/models/search_filter.dart'; +import 'package:immich_mobile/models/search/search_filter.model.dart'; enum DisplayOption { notInAlbum, diff --git a/mobile/lib/modules/search/ui/search_filter/location_picker.dart b/mobile/lib/modules/search/ui/search_filter/location_picker.dart index fe2e3ab374..94cfbc5cde 100644 --- a/mobile/lib/modules/search/ui/search_filter/location_picker.dart +++ b/mobile/lib/modules/search/ui/search_filter/location_picker.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/search/models/search_filter.dart'; +import 'package:immich_mobile/models/search/search_filter.model.dart'; import 'package:immich_mobile/modules/search/providers/search_filter.provider.dart'; import 'package:openapi/api.dart'; diff --git a/mobile/lib/modules/search/ui/search_filter/media_type_picker.dart b/mobile/lib/modules/search/ui/search_filter/media_type_picker.dart index 61206b7a17..350fce155d 100644 --- a/mobile/lib/modules/search/ui/search_filter/media_type_picker.dart +++ b/mobile/lib/modules/search/ui/search_filter/media_type_picker.dart @@ -1,7 +1,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; class MediaTypePicker extends HookWidget { const MediaTypePicker({super.key, required this.onSelect, this.filter}); diff --git a/mobile/lib/modules/search/ui/search_filter/people_picker.dart b/mobile/lib/modules/search/ui/search_filter/people_picker.dart index 74aad06b84..f00bd18304 100644 --- a/mobile/lib/modules/search/ui/search_filter/people_picker.dart +++ b/mobile/lib/modules/search/ui/search_filter/people_picker.dart @@ -4,7 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/search/providers/people.provider.dart'; -import 'package:immich_mobile/shared/models/store.dart' as local_store; +import 'package:immich_mobile/entities/store.entity.dart' as local_store; import 'package:immich_mobile/utils/image_url_builder.dart'; import 'package:openapi/api.dart'; diff --git a/mobile/lib/modules/search/ui/thumbnail_with_info.dart b/mobile/lib/modules/search/ui/thumbnail_with_info.dart index 6d447526ce..d2925e6e30 100644 --- a/mobile/lib/modules/search/ui/thumbnail_with_info.dart +++ b/mobile/lib/modules/search/ui/thumbnail_with_info.dart @@ -1,7 +1,7 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/extensions/string_extensions.dart'; // ignore: must_be_immutable diff --git a/mobile/lib/modules/search/views/all_people_page.dart b/mobile/lib/modules/search/views/all_people_page.dart index 3414edc051..bbd7137f9b 100644 --- a/mobile/lib/modules/search/views/all_people_page.dart +++ b/mobile/lib/modules/search/views/all_people_page.dart @@ -3,7 +3,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; -import 'package:immich_mobile/modules/search/models/curated_content.dart'; +import 'package:immich_mobile/models/search/search_curated_content.model.dart'; import 'package:immich_mobile/modules/search/providers/people.provider.dart'; import 'package:immich_mobile/modules/search/ui/explore_grid.dart'; @@ -29,7 +29,7 @@ class AllPeoplePage extends HookConsumerWidget { onData: (people) => ExploreGrid( isPeople: true, curatedContent: people - .map((e) => CuratedContent(label: e.name, id: e.id)) + .map((e) => SearchCuratedContent(label: e.name, id: e.id)) .toList(), ), ), diff --git a/mobile/lib/modules/search/views/curated_location_page.dart b/mobile/lib/modules/search/views/curated_location_page.dart index 45067dc406..dce5de183d 100644 --- a/mobile/lib/modules/search/views/curated_location_page.dart +++ b/mobile/lib/modules/search/views/curated_location_page.dart @@ -3,7 +3,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; -import 'package:immich_mobile/modules/search/models/curated_content.dart'; +import 'package:immich_mobile/models/search/search_curated_content.model.dart'; import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart'; import 'package:immich_mobile/modules/search/ui/explore_grid.dart'; @@ -13,7 +13,8 @@ class CuratedLocationPage extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - AsyncValue> places = ref.watch(getPlacesProvider); + AsyncValue> places = + ref.watch(getPlacesProvider); return Scaffold( appBar: AppBar( diff --git a/mobile/lib/modules/search/views/person_result_page.dart b/mobile/lib/modules/search/views/person_result_page.dart index 0b7eeea51d..553ab158f3 100644 --- a/mobile/lib/modules/search/views/person_result_page.dart +++ b/mobile/lib/modules/search/views/person_result_page.dart @@ -6,7 +6,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/search/providers/people.provider.dart'; import 'package:immich_mobile/modules/search/ui/person_name_edit_form.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/shared/ui/asset_grid/multiselect_grid.dart'; import 'package:immich_mobile/utils/image_url_builder.dart'; diff --git a/mobile/lib/modules/search/views/search_input_page.dart b/mobile/lib/modules/search/views/search_input_page.dart index a35341606a..580a05e8a0 100644 --- a/mobile/lib/modules/search/views/search_input_page.dart +++ b/mobile/lib/modules/search/views/search_input_page.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/search/models/search_filter.dart'; +import 'package:immich_mobile/models/search/search_filter.model.dart'; import 'package:immich_mobile/modules/search/providers/paginated_search.provider.dart'; import 'package:immich_mobile/modules/search/ui/search_filter/camera_picker.dart'; import 'package:immich_mobile/modules/search/ui/search_filter/display_option_picker.dart'; @@ -15,7 +15,7 @@ import 'package:immich_mobile/modules/search/ui/search_filter/media_type_picker. import 'package:immich_mobile/modules/search/ui/search_filter/people_picker.dart'; import 'package:immich_mobile/modules/search/ui/search_filter/search_filter_chip.dart'; import 'package:immich_mobile/modules/search/ui/search_filter/search_filter_utils.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/ui/asset_grid/multiselect_grid.dart'; import 'package:openapi/api.dart'; diff --git a/mobile/lib/modules/search/views/search_page.dart b/mobile/lib/modules/search/views/search_page.dart index 3df614292c..1650d1839c 100644 --- a/mobile/lib/modules/search/views/search_page.dart +++ b/mobile/lib/modules/search/views/search_page.dart @@ -6,8 +6,8 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/search/models/curated_content.dart'; -import 'package:immich_mobile/modules/search/models/search_filter.dart'; +import 'package:immich_mobile/models/search/search_curated_content.model.dart'; +import 'package:immich_mobile/models/search/search_filter.model.dart'; import 'package:immich_mobile/modules/search/providers/people.provider.dart'; import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart'; import 'package:immich_mobile/modules/search/ui/curated_people_row.dart'; @@ -15,7 +15,7 @@ import 'package:immich_mobile/modules/search/ui/curated_places_row.dart'; import 'package:immich_mobile/modules/search/ui/person_name_edit_form.dart'; import 'package:immich_mobile/modules/search/ui/search_row_title.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/server_info.provider.dart'; import 'package:immich_mobile/shared/ui/immich_app_bar.dart'; import 'package:immich_mobile/shared/ui/scaffold_error_body.dart'; @@ -64,7 +64,7 @@ class SearchPage extends HookConsumerWidget { ), child: CuratedPeopleRow( content: people - .map((e) => CuratedContent(label: e.name, id: e.id)) + .map((e) => SearchCuratedContent(label: e.name, id: e.id)) .take(12) .toList(), onTap: (content, index) { diff --git a/mobile/lib/modules/settings/services/app_settings.service.dart b/mobile/lib/modules/settings/services/app_settings.service.dart index b7be3ca5e3..a803a6807f 100644 --- a/mobile/lib/modules/settings/services/app_settings.service.dart +++ b/mobile/lib/modules/settings/services/app_settings.service.dart @@ -1,4 +1,4 @@ -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; enum AppSettingsEnum { loadPreview(StoreKey.loadPreview, "loadPreview", true), diff --git a/mobile/lib/modules/settings/ui/local_storage_settings.dart b/mobile/lib/modules/settings/ui/local_storage_settings.dart index 1547ce35ef..119979662c 100644 --- a/mobile/lib/modules/settings/ui/local_storage_settings.dart +++ b/mobile/lib/modules/settings/ui/local_storage_settings.dart @@ -2,7 +2,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart' show useEffect, useState; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/backup/models/duplicated_asset.model.dart'; +import 'package:immich_mobile/entities/duplicated_asset.entity.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; diff --git a/mobile/lib/modules/settings/utils/app_settings_update_hook.dart b/mobile/lib/modules/settings/utils/app_settings_update_hook.dart index 85ffeda236..6df27b8c33 100644 --- a/mobile/lib/modules/settings/utils/app_settings_update_hook.dart +++ b/mobile/lib/modules/settings/utils/app_settings_update_hook.dart @@ -1,7 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_hooks/flutter_hooks.dart' hide Store; import 'package:immich_mobile/modules/settings/services/app_settings.service.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; ValueNotifier useAppSettingsState( AppSettingsEnum key, diff --git a/mobile/lib/modules/shared_link/providers/shared_link.provider.dart b/mobile/lib/modules/shared_link/providers/shared_link.provider.dart index d72b88dd87..28cc61c5a3 100644 --- a/mobile/lib/modules/shared_link/providers/shared_link.provider.dart +++ b/mobile/lib/modules/shared_link/providers/shared_link.provider.dart @@ -1,5 +1,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/shared_link/models/shared_link.dart'; +import 'package:immich_mobile/models/shared_link/shared_link.model.dart'; import 'package:immich_mobile/modules/shared_link/services/shared_link.service.dart'; class SharedLinksNotifier extends StateNotifier>> { diff --git a/mobile/lib/modules/shared_link/services/shared_link.service.dart b/mobile/lib/modules/shared_link/services/shared_link.service.dart index 62f431580c..ef97ddde43 100644 --- a/mobile/lib/modules/shared_link/services/shared_link.service.dart +++ b/mobile/lib/modules/shared_link/services/shared_link.service.dart @@ -1,5 +1,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/shared_link/models/shared_link.dart'; +import 'package:immich_mobile/models/shared_link/shared_link.model.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; import 'package:logging/logging.dart'; diff --git a/mobile/lib/modules/shared_link/ui/shared_link_item.dart b/mobile/lib/modules/shared_link/ui/shared_link_item.dart index dfbf3e421b..b6e5e72a14 100644 --- a/mobile/lib/modules/shared_link/ui/shared_link_item.dart +++ b/mobile/lib/modules/shared_link/ui/shared_link_item.dart @@ -7,7 +7,7 @@ import 'package:fluttertoast/fluttertoast.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/search/ui/thumbnail_with_info.dart'; -import 'package:immich_mobile/modules/shared_link/models/shared_link.dart'; +import 'package:immich_mobile/models/shared_link/shared_link.model.dart'; import 'package:immich_mobile/modules/shared_link/providers/shared_link.provider.dart'; import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/shared/providers/server_info.provider.dart'; diff --git a/mobile/lib/modules/shared_link/views/shared_link_edit_page.dart b/mobile/lib/modules/shared_link/views/shared_link_edit_page.dart index ec80ed80ea..c1233d63b9 100644 --- a/mobile/lib/modules/shared_link/views/shared_link_edit_page.dart +++ b/mobile/lib/modules/shared_link/views/shared_link_edit_page.dart @@ -6,7 +6,7 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/shared_link/models/shared_link.dart'; +import 'package:immich_mobile/models/shared_link/shared_link.model.dart'; import 'package:immich_mobile/modules/shared_link/providers/shared_link.provider.dart'; import 'package:immich_mobile/modules/shared_link/services/shared_link.service.dart'; import 'package:immich_mobile/shared/providers/server_info.provider.dart'; diff --git a/mobile/lib/modules/shared_link/views/shared_link_page.dart b/mobile/lib/modules/shared_link/views/shared_link_page.dart index ec0643058d..855b3b3e6d 100644 --- a/mobile/lib/modules/shared_link/views/shared_link_page.dart +++ b/mobile/lib/modules/shared_link/views/shared_link_page.dart @@ -5,7 +5,7 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/shared_link/models/shared_link.dart'; +import 'package:immich_mobile/models/shared_link/shared_link.model.dart'; import 'package:immich_mobile/modules/shared_link/providers/shared_link.provider.dart'; import 'package:immich_mobile/modules/shared_link/ui/shared_link_item.dart'; diff --git a/mobile/lib/modules/trash/providers/trashed_asset.provider.dart b/mobile/lib/modules/trash/providers/trashed_asset.provider.dart index 6d842a286b..a6603d2956 100644 --- a/mobile/lib/modules/trash/providers/trashed_asset.provider.dart +++ b/mobile/lib/modules/trash/providers/trashed_asset.provider.dart @@ -1,7 +1,7 @@ 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/modules/trash/services/trash.service.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/asset.provider.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/providers/user.provider.dart'; diff --git a/mobile/lib/modules/trash/services/trash.service.dart b/mobile/lib/modules/trash/services/trash.service.dart index a5ee055efa..2bcfd38051 100644 --- a/mobile/lib/modules/trash/services/trash.service.dart +++ b/mobile/lib/modules/trash/services/trash.service.dart @@ -1,5 +1,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; import 'package:logging/logging.dart'; diff --git a/mobile/lib/modules/trash/views/trash_page.dart b/mobile/lib/modules/trash/views/trash_page.dart index 1ec9825603..83b5db65c0 100644 --- a/mobile/lib/modules/trash/views/trash_page.dart +++ b/mobile/lib/modules/trash/views/trash_page.dart @@ -9,7 +9,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart'; import 'package:immich_mobile/modules/home/ui/delete_dialog.dart'; import 'package:immich_mobile/modules/trash/providers/trashed_asset.provider.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/server_info.provider.dart'; import 'package:immich_mobile/shared/ui/confirm_dialog.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; diff --git a/mobile/lib/routing/auth_guard.dart b/mobile/lib/routing/auth_guard.dart index fe212c4ca9..b76fb63123 100644 --- a/mobile/lib/routing/auth_guard.dart +++ b/mobile/lib/routing/auth_guard.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:auto_route/auto_route.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; import 'package:logging/logging.dart'; import 'package:openapi/api.dart'; diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart index 46cd7522d6..19fae27c5f 100644 --- a/mobile/lib/routing/router.dart +++ b/mobile/lib/routing/router.dart @@ -2,7 +2,7 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/activities/views/activities_page.dart'; -import 'package:immich_mobile/modules/album/models/asset_selection_page_result.model.dart'; +import 'package:immich_mobile/models/albums/asset_selection_page_result.model.dart'; import 'package:immich_mobile/modules/album/views/album_options_part.dart'; import 'package:immich_mobile/modules/album/views/album_viewer_page.dart'; import 'package:immich_mobile/modules/album/views/asset_selection_page.dart'; @@ -11,7 +11,7 @@ import 'package:immich_mobile/modules/album/views/library_page.dart'; import 'package:immich_mobile/modules/backup/views/backup_options_page.dart'; import 'package:immich_mobile/modules/map/views/map_location_picker_page.dart'; import 'package:immich_mobile/modules/map/views/map_page.dart'; -import 'package:immich_mobile/modules/memories/models/memory.dart'; +import 'package:immich_mobile/models/memories/memory.model.dart'; import 'package:immich_mobile/modules/memories/views/memory_page.dart'; import 'package:immich_mobile/modules/partner/views/partner_detail_page.dart'; import 'package:immich_mobile/modules/partner/views/partner_page.dart'; @@ -31,10 +31,10 @@ import 'package:immich_mobile/modules/login/views/change_password_page.dart'; import 'package:immich_mobile/modules/login/views/login_page.dart'; import 'package:immich_mobile/modules/onboarding/providers/gallery_permission.provider.dart'; import 'package:immich_mobile/modules/onboarding/views/permission_onboarding_page.dart'; -import 'package:immich_mobile/modules/search/models/search_filter.dart'; +import 'package:immich_mobile/models/search/search_filter.model.dart'; import 'package:immich_mobile/modules/settings/views/settings_sub_page.dart'; import 'package:immich_mobile/modules/search/views/search_input_page.dart'; -import 'package:immich_mobile/modules/shared_link/models/shared_link.dart'; +import 'package:immich_mobile/models/shared_link/shared_link.model.dart'; import 'package:immich_mobile/modules/shared_link/views/shared_link_edit_page.dart'; import 'package:immich_mobile/modules/shared_link/views/shared_link_page.dart'; import 'package:immich_mobile/modules/trash/views/trash_page.dart'; @@ -50,10 +50,10 @@ import 'package:immich_mobile/routing/auth_guard.dart'; import 'package:immich_mobile/routing/custom_transition_builders.dart'; import 'package:immich_mobile/routing/duplicate_guard.dart'; import 'package:immich_mobile/routing/backup_permission_guard.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/logger_message.model.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/logger_message.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; import 'package:immich_mobile/shared/views/app_log_detail_page.dart'; diff --git a/mobile/lib/routing/tab_navigation_observer.dart b/mobile/lib/routing/tab_navigation_observer.dart index 196cab1db9..a5ea99da80 100644 --- a/mobile/lib/routing/tab_navigation_observer.dart +++ b/mobile/lib/routing/tab_navigation_observer.dart @@ -7,8 +7,8 @@ import 'package:immich_mobile/modules/search/providers/people.provider.dart'; import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart'; import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/providers/asset.provider.dart'; import 'package:immich_mobile/shared/providers/server_info.provider.dart'; diff --git a/mobile/lib/shared/providers/app_state.provider.dart b/mobile/lib/shared/providers/app_state.provider.dart index 0ded4d79d2..c5ee79adee 100644 --- a/mobile/lib/shared/providers/app_state.provider.dart +++ b/mobile/lib/shared/providers/app_state.provider.dart @@ -2,7 +2,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/album/providers/album.provider.dart'; import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart'; import 'package:immich_mobile/modules/backup/background_service/background.service.dart'; -import 'package:immich_mobile/modules/backup/models/backup_state.model.dart'; +import 'package:immich_mobile/models/backup/backup_state.model.dart'; import 'package:immich_mobile/modules/backup/providers/backup.provider.dart'; import 'package:immich_mobile/modules/backup/providers/ios_background_settings.provider.dart'; import 'package:immich_mobile/modules/backup/providers/manual_upload.provider.dart'; diff --git a/mobile/lib/shared/providers/asset.provider.dart b/mobile/lib/shared/providers/asset.provider.dart index bbe3cefc0b..2d046eaefc 100644 --- a/mobile/lib/shared/providers/asset.provider.dart +++ b/mobile/lib/shared/providers/asset.provider.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/album/services/album.service.dart'; -import 'package:immich_mobile/shared/models/exif_info.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/exif_info.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/providers/user.provider.dart'; import 'package:immich_mobile/shared/services/asset.service.dart'; import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/services/sync.service.dart'; import 'package:immich_mobile/shared/services/user.service.dart'; import 'package:immich_mobile/utils/db.dart'; diff --git a/mobile/lib/shared/providers/server_info.provider.dart b/mobile/lib/shared/providers/server_info.provider.dart index 9593f03555..d7836d58fd 100644 --- a/mobile/lib/shared/providers/server_info.provider.dart +++ b/mobile/lib/shared/providers/server_info.provider.dart @@ -1,12 +1,12 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/server_info/server_disk_info.model.dart'; +import 'package:immich_mobile/models/server_info/server_disk_info.model.dart'; -import 'package:immich_mobile/shared/models/server_info/server_info.model.dart'; +import 'package:immich_mobile/models/server_info/server_info.model.dart'; import 'package:immich_mobile/shared/services/server_info.service.dart'; -import 'package:immich_mobile/shared/models/server_info/server_config.model.dart'; -import 'package:immich_mobile/shared/models/server_info/server_features.model.dart'; -import 'package:immich_mobile/shared/models/server_info/server_version.model.dart'; +import 'package:immich_mobile/models/server_info/server_config.model.dart'; +import 'package:immich_mobile/models/server_info/server_features.model.dart'; +import 'package:immich_mobile/models/server_info/server_version.model.dart'; import 'package:logging/logging.dart'; import 'package:package_info_plus/package_info_plus.dart'; diff --git a/mobile/lib/shared/providers/user.provider.dart b/mobile/lib/shared/providers/user.provider.dart index fbbc399957..50f0194791 100644 --- a/mobile/lib/shared/providers/user.provider.dart +++ b/mobile/lib/shared/providers/user.provider.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; diff --git a/mobile/lib/shared/providers/websocket.provider.dart b/mobile/lib/shared/providers/websocket.provider.dart index 89f99dc6df..f3db430cd4 100644 --- a/mobile/lib/shared/providers/websocket.provider.dart +++ b/mobile/lib/shared/providers/websocket.provider.dart @@ -5,9 +5,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/login/providers/authentication.provider.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/server_info/server_version.model.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/models/server_info/server_version.model.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/shared/providers/asset.provider.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/providers/server_info.provider.dart'; diff --git a/mobile/lib/shared/services/api.service.dart b/mobile/lib/shared/services/api.service.dart index fad5a110e4..cc57d6b26e 100644 --- a/mobile/lib/shared/services/api.service.dart +++ b/mobile/lib/shared/services/api.service.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/utils/url_helper.dart'; import 'package:logging/logging.dart'; import 'package:openapi/api.dart'; diff --git a/mobile/lib/shared/services/asset.service.dart b/mobile/lib/shared/services/asset.service.dart index eaad5e5f01..3344e8898f 100644 --- a/mobile/lib/shared/services/asset.service.dart +++ b/mobile/lib/shared/services/asset.service.dart @@ -4,10 +4,10 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/exif_info.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/exif_info.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; diff --git a/mobile/lib/shared/services/hash.service.dart b/mobile/lib/shared/services/hash.service.dart index dd3280ccf8..fcb970b83f 100644 --- a/mobile/lib/shared/services/hash.service.dart +++ b/mobile/lib/shared/services/hash.service.dart @@ -3,10 +3,10 @@ import 'dart:io'; import 'package:flutter/foundation.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/backup/background_service/background.service.dart'; -import 'package:immich_mobile/shared/models/android_device_asset.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/device_asset.dart'; -import 'package:immich_mobile/shared/models/ios_device_asset.dart'; +import 'package:immich_mobile/entities/android_device_asset.entity.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/device_asset.entity.dart'; +import 'package:immich_mobile/entities/ios_device_asset.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/extensions/string_extensions.dart'; import 'package:isar/isar.dart'; diff --git a/mobile/lib/shared/services/immich_logger.service.dart b/mobile/lib/shared/services/immich_logger.service.dart index 2cdc71c4e9..5db14ece3b 100644 --- a/mobile/lib/shared/services/immich_logger.service.dart +++ b/mobile/lib/shared/services/immich_logger.service.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'dart:io'; import 'package:flutter/widgets.dart'; -import 'package:immich_mobile/shared/models/logger_message.model.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/logger_message.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:isar/isar.dart'; import 'package:logging/logging.dart'; import 'package:path_provider/path_provider.dart'; diff --git a/mobile/lib/shared/services/server_info.service.dart b/mobile/lib/shared/services/server_info.service.dart index 10cb1eb0d8..19ec7caa0b 100644 --- a/mobile/lib/shared/services/server_info.service.dart +++ b/mobile/lib/shared/services/server_info.service.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/server_info/server_config.model.dart'; -import 'package:immich_mobile/shared/models/server_info/server_disk_info.model.dart'; -import 'package:immich_mobile/shared/models/server_info/server_features.model.dart'; -import 'package:immich_mobile/shared/models/server_info/server_version.model.dart'; +import 'package:immich_mobile/models/server_info/server_config.model.dart'; +import 'package:immich_mobile/models/server_info/server_disk_info.model.dart'; +import 'package:immich_mobile/models/server_info/server_features.model.dart'; +import 'package:immich_mobile/models/server_info/server_version.model.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; diff --git a/mobile/lib/shared/services/share.service.dart b/mobile/lib/shared/services/share.service.dart index be7c0c168d..71aba7e5e0 100644 --- a/mobile/lib/shared/services/share.service.dart +++ b/mobile/lib/shared/services/share.service.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/response_extensions.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:logging/logging.dart'; import 'package:path_provider/path_provider.dart'; diff --git a/mobile/lib/shared/services/sync.service.dart b/mobile/lib/shared/services/sync.service.dart index e547eb012d..15b1b864b1 100644 --- a/mobile/lib/shared/services/sync.service.dart +++ b/mobile/lib/shared/services/sync.service.dart @@ -2,12 +2,12 @@ import 'dart:async'; import 'package:collection/collection.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/etag.dart'; -import 'package:immich_mobile/shared/models/exif_info.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/etag.entity.dart'; +import 'package:immich_mobile/entities/exif_info.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/services/hash.service.dart'; import 'package:immich_mobile/utils/async_mutex.dart'; diff --git a/mobile/lib/shared/services/user.service.dart b/mobile/lib/shared/services/user.service.dart index ae65ed31db..c1706a485b 100644 --- a/mobile/lib/shared/services/user.service.dart +++ b/mobile/lib/shared/services/user.service.dart @@ -3,8 +3,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:http/http.dart'; import 'package:image_picker/image_picker.dart'; import 'package:immich_mobile/modules/partner/services/partner.service.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:immich_mobile/shared/providers/db.provider.dart'; import 'package:immich_mobile/shared/services/api.service.dart'; diff --git a/mobile/lib/shared/ui/app_bar_dialog/app_bar_dialog.dart b/mobile/lib/shared/ui/app_bar_dialog/app_bar_dialog.dart index 40a3cf96c7..9420b7b3b6 100644 --- a/mobile/lib/shared/ui/app_bar_dialog/app_bar_dialog.dart +++ b/mobile/lib/shared/ui/app_bar_dialog/app_bar_dialog.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/modules/backup/models/backup_state.model.dart'; +import 'package:immich_mobile/models/backup/backup_state.model.dart'; import 'package:immich_mobile/modules/backup/providers/backup.provider.dart'; import 'package:immich_mobile/modules/backup/providers/manual_upload.provider.dart'; import 'package:immich_mobile/modules/login/providers/authentication.provider.dart'; diff --git a/mobile/lib/shared/ui/app_bar_dialog/app_bar_profile_info.dart b/mobile/lib/shared/ui/app_bar_dialog/app_bar_profile_info.dart index f68537034d..54f10ac2ca 100644 --- a/mobile/lib/shared/ui/app_bar_dialog/app_bar_profile_info.dart +++ b/mobile/lib/shared/ui/app_bar_dialog/app_bar_profile_info.dart @@ -3,10 +3,10 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:image_picker/image_picker.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/home/providers/upload_profile_image.provider.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/shared/providers/user.provider.dart'; import 'package:immich_mobile/shared/ui/user_circle_avatar.dart'; -import 'package:immich_mobile/modules/login/models/authentication_state.model.dart'; +import 'package:immich_mobile/models/authentication/authentication_state.model.dart'; import 'package:immich_mobile/modules/login/providers/authentication.provider.dart'; import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart'; diff --git a/mobile/lib/shared/ui/app_bar_dialog/app_bar_server_info.dart b/mobile/lib/shared/ui/app_bar_dialog/app_bar_server_info.dart index e36a887d44..5860ef6234 100644 --- a/mobile/lib/shared/ui/app_bar_dialog/app_bar_server_info.dart +++ b/mobile/lib/shared/ui/app_bar_dialog/app_bar_server_info.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart' hide Store; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/shared/models/server_info/server_info.model.dart'; +import 'package:immich_mobile/models/server_info/server_info.model.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:immich_mobile/shared/providers/server_info.provider.dart'; import 'package:immich_mobile/utils/url_helper.dart'; diff --git a/mobile/lib/shared/ui/asset_grid/multiselect_grid.dart b/mobile/lib/shared/ui/asset_grid/multiselect_grid.dart index 482f1efc4f..68027049d4 100644 --- a/mobile/lib/shared/ui/asset_grid/multiselect_grid.dart +++ b/mobile/lib/shared/ui/asset_grid/multiselect_grid.dart @@ -13,14 +13,14 @@ import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart import 'package:immich_mobile/modules/album/services/album.service.dart'; import 'package:immich_mobile/modules/asset_viewer/services/asset_stack.service.dart'; import 'package:immich_mobile/modules/backup/providers/manual_upload.provider.dart'; -import 'package:immich_mobile/modules/home/models/selection_state.dart'; +import 'package:immich_mobile/models/asset_selection_state.dart'; import 'package:immich_mobile/modules/home/providers/multiselect.provider.dart'; import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart'; import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart'; import 'package:immich_mobile/modules/home/ui/control_bottom_app_bar.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/asset.provider.dart'; import 'package:immich_mobile/shared/providers/user.provider.dart'; import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart'; @@ -69,7 +69,7 @@ class MultiselectGrid extends HookConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { final multiselectEnabled = ref.watch(multiselectProvider.notifier); final selectionEnabledHook = useState(false); - final selectionAssetState = useState(const SelectionAssetState()); + final selectionAssetState = useState(const AssetSelectionState()); final selection = useState({}); final currentUser = ref.watch(currentUserProvider); @@ -98,7 +98,7 @@ class MultiselectGrid extends HookConsumerWidget { selectionEnabledHook.value = multiselect; selection.value = selectedAssets; selectionAssetState.value = - SelectionAssetState.fromSelection(selectedAssets); + AssetSelectionState.fromSelection(selectedAssets); } errorBuilder(String? msg) => msg != null && msg.isNotEmpty diff --git a/mobile/lib/shared/ui/hooks/blurhash_hook.dart b/mobile/lib/shared/ui/hooks/blurhash_hook.dart index 24b3c25e13..9231e2d972 100644 --- a/mobile/lib/shared/ui/hooks/blurhash_hook.dart +++ b/mobile/lib/shared/ui/hooks/blurhash_hook.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'dart:typed_data'; import 'package:flutter_hooks/flutter_hooks.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:thumbhash/thumbhash.dart' as thumbhash; ObjectRef useBlurHashRef(Asset? asset) { diff --git a/mobile/lib/shared/ui/immich_app_bar.dart b/mobile/lib/shared/ui/immich_app_bar.dart index 678302dd99..ebb399ac1a 100644 --- a/mobile/lib/shared/ui/immich_app_bar.dart +++ b/mobile/lib/shared/ui/immich_app_bar.dart @@ -4,14 +4,14 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/shared/providers/immich_logo_provider.dart'; import 'package:immich_mobile/shared/ui/app_bar_dialog/app_bar_dialog.dart'; import 'package:immich_mobile/shared/ui/user_circle_avatar.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/modules/backup/models/backup_state.model.dart'; -import 'package:immich_mobile/shared/models/server_info/server_info.model.dart'; +import 'package:immich_mobile/models/backup/backup_state.model.dart'; +import 'package:immich_mobile/models/server_info/server_info.model.dart'; import 'package:immich_mobile/modules/backup/providers/backup.provider.dart'; import 'package:immich_mobile/shared/providers/server_info.provider.dart'; diff --git a/mobile/lib/shared/ui/immich_image.dart b/mobile/lib/shared/ui/immich_image.dart index 2e25a67b02..1fd888e65e 100644 --- a/mobile/lib/shared/ui/immich_image.dart +++ b/mobile/lib/shared/ui/immich_image.dart @@ -4,8 +4,8 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/modules/asset_viewer/image_providers/immich_local_image_provider.dart'; import 'package:immich_mobile/modules/asset_viewer/image_providers/immich_remote_image_provider.dart'; import 'package:immich_mobile/modules/home/ui/asset_grid/thumbnail_placeholder.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:octo_image/octo_image.dart'; class ImmichImage extends StatelessWidget { diff --git a/mobile/lib/shared/ui/immich_thumbnail.dart b/mobile/lib/shared/ui/immich_thumbnail.dart index 3bfd164251..07c3141f64 100644 --- a/mobile/lib/shared/ui/immich_thumbnail.dart +++ b/mobile/lib/shared/ui/immich_thumbnail.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:immich_mobile/modules/asset_viewer/image_providers/immich_local_thumbnail_provider.dart'; import 'package:immich_mobile/modules/asset_viewer/image_providers/immich_remote_thumbnail_provider.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/ui/hooks/blurhash_hook.dart'; import 'package:immich_mobile/shared/ui/immich_image.dart'; import 'package:immich_mobile/shared/ui/thumbhash_placeholder.dart'; diff --git a/mobile/lib/shared/ui/user_avatar.dart b/mobile/lib/shared/ui/user_avatar.dart index 68ed2edbdc..c61a3adbeb 100644 --- a/mobile/lib/shared/ui/user_avatar.dart +++ b/mobile/lib/shared/ui/user_avatar.dart @@ -1,8 +1,8 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; Widget userAvatar(BuildContext context, User u, {double? radius}) { final url = diff --git a/mobile/lib/shared/ui/user_circle_avatar.dart b/mobile/lib/shared/ui/user_circle_avatar.dart index 103d8970e3..4656271741 100644 --- a/mobile/lib/shared/ui/user_circle_avatar.dart +++ b/mobile/lib/shared/ui/user_circle_avatar.dart @@ -3,8 +3,8 @@ import 'dart:math'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/ui/transparent_image.dart'; // ignore: must_be_immutable diff --git a/mobile/lib/shared/views/app_log_detail_page.dart b/mobile/lib/shared/views/app_log_detail_page.dart index 6b99d7f0af..61f510c0de 100644 --- a/mobile/lib/shared/views/app_log_detail_page.dart +++ b/mobile/lib/shared/views/app_log_detail_page.dart @@ -2,7 +2,7 @@ import 'package:auto_route/auto_route.dart'; 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/shared/models/logger_message.model.dart'; +import 'package:immich_mobile/entities/logger_message.entity.dart'; import 'package:flutter/services.dart'; @RoutePage() diff --git a/mobile/lib/shared/views/app_log_page.dart b/mobile/lib/shared/views/app_log_page.dart index 993b25c7cf..9351dbfe8e 100644 --- a/mobile/lib/shared/views/app_log_page.dart +++ b/mobile/lib/shared/views/app_log_page.dart @@ -4,7 +4,7 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/logger_message.model.dart'; +import 'package:immich_mobile/entities/logger_message.entity.dart'; import 'package:immich_mobile/shared/services/immich_logger.service.dart'; import 'package:intl/intl.dart'; diff --git a/mobile/lib/shared/views/splash_screen.dart b/mobile/lib/shared/views/splash_screen.dart index 62f1dbe8f6..e9708ecbf2 100644 --- a/mobile/lib/shared/views/splash_screen.dart +++ b/mobile/lib/shared/views/splash_screen.dart @@ -6,7 +6,7 @@ import 'package:immich_mobile/modules/backup/providers/backup.provider.dart'; import 'package:immich_mobile/modules/login/providers/authentication.provider.dart'; import 'package:immich_mobile/modules/onboarding/providers/gallery_permission.provider.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/shared/providers/api.provider.dart'; import 'package:logging/logging.dart'; import 'package:openapi/api.dart'; diff --git a/mobile/lib/utils/db.dart b/mobile/lib/utils/db.dart index 354fc08ca9..4d405468fa 100644 --- a/mobile/lib/utils/db.dart +++ b/mobile/lib/utils/db.dart @@ -1,9 +1,9 @@ -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/etag.dart'; -import 'package:immich_mobile/shared/models/exif_info.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/etag.entity.dart'; +import 'package:immich_mobile/entities/exif_info.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:isar/isar.dart'; Future clearAssetsAndAlbums(Isar db) async { diff --git a/mobile/lib/utils/http_ssl_cert_override.dart b/mobile/lib/utils/http_ssl_cert_override.dart index 607de561cd..182c85922a 100644 --- a/mobile/lib/utils/http_ssl_cert_override.dart +++ b/mobile/lib/utils/http_ssl_cert_override.dart @@ -1,6 +1,6 @@ import 'dart:io'; import 'package:immich_mobile/modules/settings/services/app_settings.service.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:logging/logging.dart'; class HttpSSLCertOverride extends HttpOverrides { diff --git a/mobile/lib/utils/image_url_builder.dart b/mobile/lib/utils/image_url_builder.dart index 9f783c80d8..f830aa39e2 100644 --- a/mobile/lib/utils/image_url_builder.dart +++ b/mobile/lib/utils/image_url_builder.dart @@ -1,6 +1,6 @@ -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:isar/isar.dart'; import 'package:openapi/api.dart'; diff --git a/mobile/lib/utils/migration.dart b/mobile/lib/utils/migration.dart index 695f936bee..d73a4cd317 100644 --- a/mobile/lib/utils/migration.dart +++ b/mobile/lib/utils/migration.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/utils/db.dart'; import 'package:isar/isar.dart'; diff --git a/mobile/lib/utils/renderlist_generator.dart b/mobile/lib/utils/renderlist_generator.dart index c68957a2a1..39da2aea94 100644 --- a/mobile/lib/utils/renderlist_generator.dart +++ b/mobile/lib/utils/renderlist_generator.dart @@ -2,7 +2,7 @@ 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/modules/settings/providers/app_settings.provider.dart'; import 'package:immich_mobile/modules/settings/services/app_settings.service.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:isar/isar.dart'; Stream renderListGenerator( diff --git a/mobile/lib/utils/selection_handlers.dart b/mobile/lib/utils/selection_handlers.dart index 9ad6773870..765d7a44f8 100644 --- a/mobile/lib/utils/selection_handlers.dart +++ b/mobile/lib/utils/selection_handlers.dart @@ -4,7 +4,7 @@ import 'package:fluttertoast/fluttertoast.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/asset_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/shared/providers/asset.provider.dart'; import 'package:immich_mobile/shared/services/asset.service.dart'; import 'package:immich_mobile/shared/services/share.service.dart'; diff --git a/mobile/lib/utils/storage_indicator.dart b/mobile/lib/utils/storage_indicator.dart index 590605c2ec..4764c45385 100644 --- a/mobile/lib/utils/storage_indicator.dart +++ b/mobile/lib/utils/storage_indicator.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; /// Returns the suitable [IconData] to represent an [Asset]s storage location IconData storageIcon(Asset asset) { diff --git a/mobile/lib/utils/url_helper.dart b/mobile/lib/utils/url_helper.dart index 95fcd80786..d351cb5816 100644 --- a/mobile/lib/utils/url_helper.dart +++ b/mobile/lib/utils/url_helper.dart @@ -1,4 +1,4 @@ -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; String sanitizeUrl(String url) { // Add schema if none is set diff --git a/mobile/test/fixtures/album.stub.dart b/mobile/test/fixtures/album.stub.dart index 663faca39d..4fa0dac1d2 100644 --- a/mobile/test/fixtures/album.stub.dart +++ b/mobile/test/fixtures/album.stub.dart @@ -1,4 +1,4 @@ -import 'package:immich_mobile/shared/models/album.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; import 'asset.stub.dart'; import 'user.stub.dart'; diff --git a/mobile/test/fixtures/asset.stub.dart b/mobile/test/fixtures/asset.stub.dart index 2c5106bb4c..b173dd2ac5 100644 --- a/mobile/test/fixtures/asset.stub.dart +++ b/mobile/test/fixtures/asset.stub.dart @@ -1,4 +1,4 @@ -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; final class AssetStub { const AssetStub._(); diff --git a/mobile/test/fixtures/user.stub.dart b/mobile/test/fixtures/user.stub.dart index 4e92bffa72..38524f782c 100644 --- a/mobile/test/fixtures/user.stub.dart +++ b/mobile/test/fixtures/user.stub.dart @@ -1,4 +1,4 @@ -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; final class UserStub { const UserStub._(); diff --git a/mobile/test/modules/activity/activities_page_test.dart b/mobile/test/modules/activity/activities_page_test.dart index ed0b12bfb3..9a5f755a7b 100644 --- a/mobile/test/modules/activity/activities_page_test.dart +++ b/mobile/test/modules/activity/activities_page_test.dart @@ -3,17 +3,17 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:immich_mobile/modules/activities/models/activity.model.dart'; +import 'package:immich_mobile/models/activities/activity.model.dart'; import 'package:immich_mobile/modules/activities/providers/activity.provider.dart'; import 'package:immich_mobile/modules/activities/views/activities_page.dart'; import 'package:immich_mobile/modules/activities/widgets/activity_text_field.dart'; import 'package:immich_mobile/modules/activities/widgets/dismissible_activity.dart'; import 'package:immich_mobile/modules/album/providers/current_album.provider.dart'; import 'package:immich_mobile/modules/asset_viewer/providers/current_asset.provider.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/user.provider.dart'; import 'package:isar/isar.dart'; import 'package:mocktail/mocktail.dart'; diff --git a/mobile/test/modules/activity/activity_mocks.dart b/mobile/test/modules/activity/activity_mocks.dart index 0a3e37216d..83086021ae 100644 --- a/mobile/test/modules/activity/activity_mocks.dart +++ b/mobile/test/modules/activity/activity_mocks.dart @@ -1,4 +1,4 @@ -import 'package:immich_mobile/modules/activities/models/activity.model.dart'; +import 'package:immich_mobile/models/activities/activity.model.dart'; import 'package:immich_mobile/modules/activities/providers/activity.provider.dart'; import 'package:immich_mobile/modules/activities/providers/activity_statistics.provider.dart'; import 'package:immich_mobile/modules/activities/services/activity.service.dart'; diff --git a/mobile/test/modules/activity/activity_provider_test.dart b/mobile/test/modules/activity/activity_provider_test.dart index c9d6267b92..6e7a1daf4e 100644 --- a/mobile/test/modules/activity/activity_provider_test.dart +++ b/mobile/test/modules/activity/activity_provider_test.dart @@ -1,6 +1,6 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/activities/models/activity.model.dart'; +import 'package:immich_mobile/models/activities/activity.model.dart'; import 'package:immich_mobile/modules/activities/providers/activity.provider.dart'; import 'package:immich_mobile/modules/activities/providers/activity_service.provider.dart'; import 'package:immich_mobile/modules/activities/providers/activity_statistics.provider.dart'; diff --git a/mobile/test/modules/activity/activity_text_field_test.dart b/mobile/test/modules/activity/activity_text_field_test.dart index 6eae2330c8..627d7b7a65 100644 --- a/mobile/test/modules/activity/activity_text_field_test.dart +++ b/mobile/test/modules/activity/activity_text_field_test.dart @@ -6,7 +6,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:immich_mobile/modules/activities/providers/activity.provider.dart'; import 'package:immich_mobile/modules/activities/widgets/activity_text_field.dart'; import 'package:immich_mobile/modules/album/providers/current_album.provider.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/shared/providers/user.provider.dart'; import 'package:immich_mobile/shared/ui/user_circle_avatar.dart'; import 'package:isar/isar.dart'; diff --git a/mobile/test/modules/activity/activity_tile_test.dart b/mobile/test/modules/activity/activity_tile_test.dart index 760d7bedaf..05f4637ab9 100644 --- a/mobile/test/modules/activity/activity_tile_test.dart +++ b/mobile/test/modules/activity/activity_tile_test.dart @@ -4,10 +4,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/activities/models/activity.model.dart'; +import 'package:immich_mobile/models/activities/activity.model.dart'; import 'package:immich_mobile/modules/activities/widgets/activity_tile.dart'; import 'package:immich_mobile/modules/asset_viewer/providers/current_asset.provider.dart'; -import 'package:immich_mobile/shared/models/store.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/shared/ui/user_circle_avatar.dart'; import 'package:isar/isar.dart'; diff --git a/mobile/test/modules/activity/dismissible_activity_test.dart b/mobile/test/modules/activity/dismissible_activity_test.dart index 0ce204a648..23156de0ea 100644 --- a/mobile/test/modules/activity/dismissible_activity_test.dart +++ b/mobile/test/modules/activity/dismissible_activity_test.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:immich_mobile/modules/activities/models/activity.model.dart'; +import 'package:immich_mobile/models/activities/activity.model.dart'; import 'package:immich_mobile/modules/activities/widgets/activity_tile.dart'; import 'package:immich_mobile/modules/activities/widgets/dismissible_activity.dart'; import 'package:immich_mobile/modules/asset_viewer/providers/current_asset.provider.dart'; diff --git a/mobile/test/modules/album/album_mocks.dart b/mobile/test/modules/album/album_mocks.dart index c8218e50df..a36ea14bfc 100644 --- a/mobile/test/modules/album/album_mocks.dart +++ b/mobile/test/modules/album/album_mocks.dart @@ -1,5 +1,5 @@ import 'package:immich_mobile/modules/album/providers/current_album.provider.dart'; -import 'package:immich_mobile/shared/models/album.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; import 'package:mocktail/mocktail.dart'; class MockCurrentAlbumProvider extends CurrentAlbum diff --git a/mobile/test/modules/album/album_sort_by_options_provider_test.dart b/mobile/test/modules/album/album_sort_by_options_provider_test.dart index d7e28da3d9..f5cb89f619 100644 --- a/mobile/test/modules/album/album_sort_by_options_provider_test.dart +++ b/mobile/test/modules/album/album_sort_by_options_provider_test.dart @@ -3,8 +3,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/album/providers/album_sort_by_options.provider.dart'; import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart'; import 'package:immich_mobile/modules/settings/services/app_settings.service.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:isar/isar.dart'; import 'package:mocktail/mocktail.dart'; diff --git a/mobile/test/modules/asset_viewer/asset_viewer_mocks.dart b/mobile/test/modules/asset_viewer/asset_viewer_mocks.dart index 5a4bbd8be1..495bc264ca 100644 --- a/mobile/test/modules/asset_viewer/asset_viewer_mocks.dart +++ b/mobile/test/modules/asset_viewer/asset_viewer_mocks.dart @@ -1,5 +1,5 @@ import 'package:immich_mobile/modules/asset_viewer/providers/current_asset.provider.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:mocktail/mocktail.dart'; class MockCurrentAssetProvider extends CurrentAssetInternal diff --git a/mobile/test/modules/extensions/asset_extensions_test.dart b/mobile/test/modules/extensions/asset_extensions_test.dart index 15aab38fdb..b90879acc7 100644 --- a/mobile/test/modules/extensions/asset_extensions_test.dart +++ b/mobile/test/modules/extensions/asset_extensions_test.dart @@ -1,7 +1,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:immich_mobile/extensions/asset_extensions.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/exif_info.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/exif_info.entity.dart'; import 'package:timezone/data/latest.dart'; import 'package:timezone/timezone.dart'; diff --git a/mobile/test/modules/home/asset_grid_data_structure_test.dart b/mobile/test/modules/home/asset_grid_data_structure_test.dart index 86433768ac..e4f0948f5e 100644 --- a/mobile/test/modules/home/asset_grid_data_structure_test.dart +++ b/mobile/test/modules/home/asset_grid_data_structure_test.dart @@ -1,6 +1,6 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; void main() { final List testAssets = []; diff --git a/mobile/test/modules/map/map_mocks.dart b/mobile/test/modules/map/map_mocks.dart index e5000a8382..29c84794b0 100644 --- a/mobile/test/modules/map/map_mocks.dart +++ b/mobile/test/modules/map/map_mocks.dart @@ -1,5 +1,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/map/models/map_state.model.dart'; +import 'package:immich_mobile/models/map/map_state.model.dart'; import 'package:immich_mobile/modules/map/providers/map_state.provider.dart'; import 'package:mocktail/mocktail.dart'; diff --git a/mobile/test/modules/map/map_theme_override_test.dart b/mobile/test/modules/map/map_theme_override_test.dart index 94c5087cdd..9b0c2fa32f 100644 --- a/mobile/test/modules/map/map_theme_override_test.dart +++ b/mobile/test/modules/map/map_theme_override_test.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/map/models/map_state.model.dart'; +import 'package:immich_mobile/models/map/map_state.model.dart'; import 'package:immich_mobile/modules/map/providers/map_state.provider.dart'; import 'package:immich_mobile/modules/map/widgets/map_theme_override.dart'; diff --git a/mobile/test/modules/shared/shared_mocks.dart b/mobile/test/modules/shared/shared_mocks.dart index af88a93eaa..ae57a1de5e 100644 --- a/mobile/test/modules/shared/shared_mocks.dart +++ b/mobile/test/modules/shared/shared_mocks.dart @@ -1,5 +1,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/providers/user.provider.dart'; import 'package:immich_mobile/shared/services/hash.service.dart'; import 'package:mocktail/mocktail.dart'; diff --git a/mobile/test/modules/shared/sync_service_test.dart b/mobile/test/modules/shared/sync_service_test.dart index f5caedfd06..33a8148ff2 100644 --- a/mobile/test/modules/shared/sync_service_test.dart +++ b/mobile/test/modules/shared/sync_service_test.dart @@ -1,8 +1,8 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/shared/services/immich_logger.service.dart'; import 'package:immich_mobile/shared/services/sync.service.dart'; import 'package:isar/isar.dart'; diff --git a/mobile/test/test_utils.dart b/mobile/test/test_utils.dart index bd359d0400..49e32c13ad 100644 --- a/mobile/test/test_utils.dart +++ b/mobile/test/test_utils.dart @@ -3,17 +3,17 @@ import 'dart:io'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/modules/backup/models/backup_album.model.dart'; -import 'package:immich_mobile/modules/backup/models/duplicated_asset.model.dart'; -import 'package:immich_mobile/shared/models/album.dart'; -import 'package:immich_mobile/shared/models/android_device_asset.dart'; -import 'package:immich_mobile/shared/models/asset.dart'; -import 'package:immich_mobile/shared/models/etag.dart'; -import 'package:immich_mobile/shared/models/exif_info.dart'; -import 'package:immich_mobile/shared/models/ios_device_asset.dart'; -import 'package:immich_mobile/shared/models/logger_message.model.dart'; -import 'package:immich_mobile/shared/models/store.dart'; -import 'package:immich_mobile/shared/models/user.dart'; +import 'package:immich_mobile/entities/backup_album.entity.dart'; +import 'package:immich_mobile/entities/duplicated_asset.entity.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/android_device_asset.entity.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/entities/etag.entity.dart'; +import 'package:immich_mobile/entities/exif_info.entity.dart'; +import 'package:immich_mobile/entities/ios_device_asset.entity.dart'; +import 'package:immich_mobile/entities/logger_message.entity.dart'; +import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/entities/user.entity.dart'; import 'package:isar/isar.dart'; import 'package:mocktail/mocktail.dart';