refactor(mobile): entities and models (#9182)

* refactor(mobile): entities

* store entity

* refactor: models

* remove domain

* save all

* bad refactor

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

mobile/lib/entities/README.md

@@ -0,0 +1 @@
+This directory contains entity that is stored in the local storage.

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 {

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

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 {

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

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<Asset> {
   Future<Asset?> getByRemoteId(String id) =>
       where().remoteIdEqualTo(id).findFirst();
 
-  QueryBuilder<Asset, Asset, QAfterWhereClause> remote(Iterable<String> ids) =>
+  QueryBuilder<Asset, Asset, QAfterWhereClause> remote(
+    Iterable<String> ids,
+  ) =>
       where().anyOf(ids, (q, String e) => q.remoteIdEqualTo(e));
-  QueryBuilder<Asset, Asset, QAfterWhereClause> local(Iterable<String> ids) {
+  QueryBuilder<Asset, Asset, QAfterWhereClause> local(
+    Iterable<String> ids,
+  ) {
     return where().anyOf(ids, (q, String e) => q.localIdEqualTo(e));
   }
 }

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

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 {

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

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 {

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

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 {

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

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)

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

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 {

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

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 {

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

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

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

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 {

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

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 {

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<E> on List<E> {
   List<E> uniqueConsecutive({

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

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

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 }

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<String> alreadyInAlbum;
   int successfullyAdded;
 
-  AddAssetsResponse({
+  AlbumAddAssetsResponse({
     required this.alreadyInAlbum,
     required this.successfullyAdded,
   });
 
-  AddAssetsResponse copyWith({
+  AlbumAddAssetsResponse copyWith({
     List<String>? 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;
 

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<Asset> selectedAssets;

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<Asset> selection)
+  AssetSelectionState.fromSelection(Set<Asset> 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 &&

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<String, dynamic> map) {
-    return ImageViewerPageState(
+  factory AssetViewerPageState.fromMap(Map<String, dynamic> 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;
   }
 

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,

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;

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;

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<String, dynamic> map) {
-    return CuratedContent(
+  factory SearchCuratedContent.fromMap(Map<String, dynamic> 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<String, dynamic>);
+  factory SearchCuratedContent.fromJson(String source) =>
+      SearchCuratedContent.fromMap(json.decode(source) as Map<String, dynamic>);
 
   @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;

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 {

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;

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;

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

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

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

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

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

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

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<AlbumViewerPageState> {
   AlbumViewerNotifier(this.ref)

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

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

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<List<User>>((ref) {

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<AddAssetsResponse?> addAdditionalAssetToAlbum(
+  Future<AlbumAddAssetsResponse?> addAdditionalAssetToAlbum(
     Iterable<Asset> 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,
         );

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

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

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 {

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

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

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;

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 {

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

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

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<AssetSelectionPageResult?>()

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()

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<List<String>?>()

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<List<String>>()

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

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
 ///

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

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

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

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

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

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

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

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

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<ImageViewerPageState> {
+class ImageViewerStateNotifier extends StateNotifier<AssetViewerPageState> {
   final ImageViewerService _imageViewerService;
   final ShareService _shareService;
   final AlbumService _albumService;
@@ -21,7 +21,7 @@ class ImageViewerStateNotifier extends StateNotifier<ImageViewerPageState> {
     this._shareService,
     this._albumService,
   ) : super(
-          ImageViewerPageState(
+          AssetViewerPageState(
             downloadAssetStatus: DownloadAssetStatus.idle,
           ),
         );
@@ -86,7 +86,7 @@ class ImageViewerStateNotifier extends StateNotifier<ImageViewerPageState> {
 }
 
 final imageViewerStateProvider =
-    StateNotifierProvider<ImageViewerStateNotifier, ImageViewerPageState>(
+    StateNotifierProvider<ImageViewerStateNotifier, AssetViewerPageState>(
   ((ref) => ImageViewerStateNotifier(
         ref.watch(imageViewerServiceProvider),
         ref.watch(shareServiceProvider),

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

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

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

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

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

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;

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

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

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

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;