Merge branch 'main' into fix/map-unresponsive

mobile/lib/constants/aspect_ratios.dart

@@ -0,0 +1,19 @@
+import 'package:flutter/material.dart';
+
+enum AspectRatioPreset {
+  free(ratio: null, label: 'Free', icon: Icons.crop_free_rounded),
+  square(ratio: 1.0, label: '1:1', icon: Icons.crop_square_rounded),
+  ratio16x9(ratio: 16 / 9, label: '16:9', icon: Icons.crop_16_9_rounded),
+  ratio3x2(ratio: 3 / 2, label: '3:2', icon: Icons.crop_3_2_rounded),
+  ratio7x5(ratio: 7 / 5, label: '7:5', icon: Icons.crop_7_5_rounded),
+  ratio9x16(ratio: 9 / 16, label: '9:16', icon: Icons.crop_16_9_rounded, iconRotated: true),
+  ratio2x3(ratio: 2 / 3, label: '2:3', icon: Icons.crop_3_2_rounded, iconRotated: true),
+  ratio5x7(ratio: 5 / 7, label: '5:7', icon: Icons.crop_7_5_rounded, iconRotated: true);
+
+  final double? ratio;
+  final String label;
+  final IconData icon;
+  final bool iconRotated;
+
+  const AspectRatioPreset({required this.ratio, required this.label, required this.icon, this.iconRotated = false});
+}

mobile/lib/constants/constants.dart

@@ -1,9 +1,5 @@
 import 'dart:io';
 
-const int noDbId = -9223372036854775808; // from Isar
-const double downloadCompleted = -1;
-const double downloadFailed = -2;
-
 const String kMobileMetadataKey = "mobile-app";
 
 // Number of log entries to retain on app start
@@ -47,9 +43,6 @@ const List<(String, String)> kWidgetNames = [
   ('com.immich.widget.memory', 'app.alextran.immich.widget.MemoryReceiver'),
 ];
 
-const double kUploadStatusFailed = -1.0;
-const double kUploadStatusCanceled = -2.0;
-
 const int kMinMonthsToEnableScrubberSnap = 12;
 
 const String kImmichAppStoreLink = "https://apps.apple.com/app/immich/id1613945652";

mobile/lib/constants/enums.dart

@@ -11,8 +11,6 @@ enum TextSearchType { context, filename, description, ocr }
 
 enum AssetVisibilityEnum { timeline, hidden, archive, locked }
 
-enum SortUserBy { id }
-
 enum ActionSource { timeline, viewer }
 
 enum CleanupStep { selectDate, scan, delete }

mobile/lib/constants/locales.dart

@@ -7,7 +7,7 @@ const Map<String, Locale> locales = {
   'Arabic (ar)': Locale('ar'),
   'Bulgarian (bg)': Locale('bg'),
   'Catalan (ca)': Locale('ca'),
-  'Chinese Simplified (zh_CN)': Locale.fromSubtags(languageCode: 'zh', scriptCode: 'SIMPLIFIED'),
+  'Chinese Simplified (zh_CN)': Locale.fromSubtags(languageCode: 'zh', scriptCode: 'Hans'),
   'Chinese Traditional (zh_TW)': Locale.fromSubtags(languageCode: 'zh', scriptCode: 'Hant'),
   'Croatian (hr)': Locale('hr'),
   'Czech (cs)': Locale('cs'),

mobile/lib/domain/interfaces/db.interface.dart

@@ -1,3 +0,0 @@
-abstract interface class IDatabaseRepository {
-  Future<T> transaction<T>(Future<T> Function() callback);
-}

mobile/lib/domain/models/asset/base_asset.model.dart

@@ -1,3 +1,5 @@
+import 'package:immich_mobile/domain/models/exif.model.dart';
+
 part 'local_asset.model.dart';
 part 'remote_asset.model.dart';
 
@@ -69,6 +71,8 @@ sealed class BaseAsset {
   bool get isLocalOnly => storage == AssetState.local;
   bool get isRemoteOnly => storage == AssetState.remote;
 
+  bool get isEditable => false;
+
   // Overridden in subclasses
   AssetState get storage;
   String? get localId;

mobile/lib/domain/models/asset/remote_asset.model.dart

@@ -43,6 +43,9 @@ class RemoteAsset extends BaseAsset {
   @override
   String get heroTag => '${localId ?? checksum}_$id';
 
+  @override
+  bool get isEditable => isImage && !isMotionPhoto && !isAnimatedImage;
+
   @override
   String toString() {
     return '''Asset {
@@ -128,3 +131,81 @@ class RemoteAsset extends BaseAsset {
     );
   }
 }
+
+class RemoteAssetExif extends RemoteAsset {
+  final ExifInfo exifInfo;
+
+  const RemoteAssetExif({
+    required super.id,
+    super.localId,
+    required super.name,
+    required super.ownerId,
+    required super.checksum,
+    required super.type,
+    required super.createdAt,
+    required super.updatedAt,
+    super.width,
+    super.height,
+    super.durationInSeconds,
+    super.isFavorite = false,
+    super.thumbHash,
+    super.visibility = AssetVisibility.timeline,
+    super.livePhotoVideoId,
+    super.stackId,
+    super.isEdited = false,
+    this.exifInfo = const ExifInfo(),
+  });
+
+  @override
+  bool operator ==(Object other) {
+    if (other is! RemoteAssetExif) return false;
+    if (identical(this, other)) return true;
+    return super == other && exifInfo == other.exifInfo;
+  }
+
+  @override
+  int get hashCode => super.hashCode ^ exifInfo.hashCode;
+
+  @override
+  RemoteAssetExif copyWith({
+    String? id,
+    String? localId,
+    String? name,
+    String? ownerId,
+    String? checksum,
+    AssetType? type,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    int? width,
+    int? height,
+    int? durationInSeconds,
+    bool? isFavorite,
+    String? thumbHash,
+    AssetVisibility? visibility,
+    String? livePhotoVideoId,
+    String? stackId,
+    bool? isEdited,
+    ExifInfo? exifInfo,
+  }) {
+    return RemoteAssetExif(
+      id: id ?? this.id,
+      localId: localId ?? this.localId,
+      name: name ?? this.name,
+      ownerId: ownerId ?? this.ownerId,
+      checksum: checksum ?? this.checksum,
+      type: type ?? this.type,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      width: width ?? this.width,
+      height: height ?? this.height,
+      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
+      isFavorite: isFavorite ?? this.isFavorite,
+      thumbHash: thumbHash ?? this.thumbHash,
+      visibility: visibility ?? this.visibility,
+      livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
+      stackId: stackId ?? this.stackId,
+      isEdited: isEdited ?? this.isEdited,
+      exifInfo: exifInfo ?? this.exifInfo, // Use the new parameter
+    );
+  }
+}

mobile/lib/domain/models/asset_edit.model.dart

@@ -1,21 +1,25 @@
-import "package:openapi/api.dart" as api show AssetEditAction;
+import "package:openapi/api.dart" show CropParameters, RotateParameters, MirrorParameters;
 
 enum AssetEditAction { rotate, crop, mirror, other }
 
-extension AssetEditActionExtension on AssetEditAction {
-  api.AssetEditAction? toDto() {
-    return switch (this) {
-      AssetEditAction.rotate => api.AssetEditAction.rotate,
-      AssetEditAction.crop => api.AssetEditAction.crop,
-      AssetEditAction.mirror => api.AssetEditAction.mirror,
-      AssetEditAction.other => null,
-    };
-  }
+sealed class AssetEdit {
+  const AssetEdit();
 }
 
-class AssetEdit {
-  final AssetEditAction action;
-  final Map<String, dynamic> parameters;
+class CropEdit extends AssetEdit {
+  final CropParameters parameters;
 
-  const AssetEdit({required this.action, required this.parameters});
+  const CropEdit(this.parameters);
+}
+
+class RotateEdit extends AssetEdit {
+  final RotateParameters parameters;
+
+  const RotateEdit(this.parameters);
+}
+
+class MirrorEdit extends AssetEdit {
+  final MirrorParameters parameters;
+
+  const MirrorEdit(this.parameters);
 }

mobile/lib/domain/models/device_asset.model.dart

@@ -1,34 +0,0 @@
-import 'dart:typed_data';
-
-class DeviceAsset {
-  final String assetId;
-  final Uint8List hash;
-  final DateTime modifiedTime;
-
-  const DeviceAsset({required this.assetId, required this.hash, required this.modifiedTime});
-
-  @override
-  bool operator ==(covariant DeviceAsset other) {
-    if (identical(this, other)) return true;
-
-    return other.assetId == assetId && other.hash == hash && other.modifiedTime == modifiedTime;
-  }
-
-  @override
-  int get hashCode {
-    return assetId.hashCode ^ hash.hashCode ^ modifiedTime.hashCode;
-  }
-
-  @override
-  String toString() {
-    return 'DeviceAsset(assetId: $assetId, hash: $hash, modifiedTime: $modifiedTime)';
-  }
-
-  DeviceAsset copyWith({String? assetId, Uint8List? hash, DateTime? modifiedTime}) {
-    return DeviceAsset(
-      assetId: assetId ?? this.assetId,
-      hash: hash ?? this.hash,
-      modifiedTime: modifiedTime ?? this.modifiedTime,
-    );
-  }
-}

mobile/lib/domain/models/exif.model.dart

@@ -7,6 +7,8 @@ class ExifInfo {
   final String? timeZone;
   final DateTime? dateTimeOriginal;
   final int? rating;
+  final int? width;
+  final int? height;
 
   // GPS
   final double? latitude;
@@ -48,6 +50,8 @@ class ExifInfo {
     this.timeZone,
     this.dateTimeOriginal,
     this.rating,
+    this.width,
+    this.height,
     this.isFlipped = false,
     this.latitude,
     this.longitude,
@@ -74,6 +78,8 @@ class ExifInfo {
         other.timeZone == timeZone &&
         other.dateTimeOriginal == dateTimeOriginal &&
         other.rating == rating &&
+        other.width == width &&
+        other.height == height &&
         other.latitude == latitude &&
         other.longitude == longitude &&
         other.city == city &&
@@ -98,6 +104,8 @@ class ExifInfo {
         timeZone.hashCode ^
         dateTimeOriginal.hashCode ^
         rating.hashCode ^
+        width.hashCode ^
+        height.hashCode ^
         latitude.hashCode ^
         longitude.hashCode ^
         city.hashCode ^
@@ -123,6 +131,8 @@ isFlipped: $isFlipped,
 timeZone: ${timeZone ?? 'NA'},
 dateTimeOriginal: ${dateTimeOriginal ?? 'NA'},
 rating: ${rating ?? 'NA'},
+width: ${width ?? 'NA'},
+height: ${height ?? 'NA'},
 latitude: ${latitude ?? 'NA'},
 longitude: ${longitude ?? 'NA'},
 city: ${city ?? 'NA'},
@@ -146,6 +156,8 @@ exposureSeconds: ${exposureSeconds ?? 'NA'},
     String? timeZone,
     DateTime? dateTimeOriginal,
     int? rating,
+    int? width,
+    int? height,
     double? latitude,
     double? longitude,
     String? city,
@@ -168,6 +180,8 @@ exposureSeconds: ${exposureSeconds ?? 'NA'},
       timeZone: timeZone ?? this.timeZone,
       dateTimeOriginal: dateTimeOriginal ?? this.dateTimeOriginal,
       rating: rating ?? this.rating,
+      width: width ?? this.width,
+      height: height ?? this.height,
       isFlipped: isFlipped ?? this.isFlipped,
       latitude: latitude ?? this.latitude,
       longitude: longitude ?? this.longitude,

mobile/lib/domain/services/asset.service.dart

@@ -1,12 +1,9 @@
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
-import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
 
-typedef _AssetVideoDimension = ({double? width, double? height, bool isFlipped});
-
 class AssetService {
   final RemoteAssetRepository _remoteAssetRepository;
   final DriftLocalAssetRepository _localAssetRepository;
@@ -58,49 +55,6 @@ class AssetService {
     return _remoteAssetRepository.getExif(id);
   }
 
-  Future<double> getAspectRatio(BaseAsset asset) async {
-    final dimension = asset is LocalAsset
-        ? await _getLocalAssetDimensions(asset)
-        : await _getRemoteAssetDimensions(asset as RemoteAsset);
-
-    if (dimension.width == null || dimension.height == null || dimension.height == 0) {
-      return 1.0;
-    }
-
-    return dimension.isFlipped ? dimension.height! / dimension.width! : dimension.width! / dimension.height!;
-  }
-
-  Future<_AssetVideoDimension> _getLocalAssetDimensions(LocalAsset asset) async {
-    double? width = asset.width?.toDouble();
-    double? height = asset.height?.toDouble();
-    int orientation = asset.orientation;
-
-    if (width == null || height == null) {
-      final fetched = await _localAssetRepository.get(asset.id);
-      width = fetched?.width?.toDouble();
-      height = fetched?.height?.toDouble();
-      orientation = fetched?.orientation ?? 0;
-    }
-
-    // On Android, local assets need orientation correction for 90°/270° rotations
-    // On iOS, the Photos framework pre-corrects dimensions
-    final isFlipped = CurrentPlatform.isAndroid && (orientation == 90 || orientation == 270);
-    return (width: width, height: height, isFlipped: isFlipped);
-  }
-
-  Future<_AssetVideoDimension> _getRemoteAssetDimensions(RemoteAsset asset) async {
-    double? width = asset.width?.toDouble();
-    double? height = asset.height?.toDouble();
-
-    if (width == null || height == null) {
-      final fetched = await _remoteAssetRepository.get(asset.id);
-      width = fetched?.width?.toDouble();
-      height = fetched?.height?.toDouble();
-    }
-
-    return (width: width, height: height, isFlipped: false);
-  }
-
   Future<List<(String, String)>> getPlaces(String userId) {
     return _remoteAssetRepository.getPlaces(userId);
   }

mobile/lib/domain/services/background_worker.service.dart

@@ -16,19 +16,16 @@ import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart' show nativeSyncApiProvider;
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
-import 'package:immich_mobile/services/localization.service.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
+import 'package:immich_mobile/services/localization.service.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/wm_executor.dart';
-import 'package:isar/isar.dart';
 import 'package:logging/logging.dart';
 
 class BackgroundWorkerFgService {
@@ -58,7 +55,6 @@ class BackgroundWorkerFgService {
 
 class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
   ProviderContainer? _ref;
-  final Isar _isar;
   final Drift _drift;
   final DriftLogger _driftLogger;
   final BackgroundWorkerBgHostApi _backgroundHostApi;
@@ -67,18 +63,11 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
 
   bool _isCleanedUp = false;
 
-  BackgroundWorkerBgService({required Isar isar, required Drift drift, required DriftLogger driftLogger})
-    : _isar = isar,
-      _drift = drift,
+  BackgroundWorkerBgService({required Drift drift, required DriftLogger driftLogger})
+    : _drift = drift,
       _driftLogger = driftLogger,
       _backgroundHostApi = BackgroundWorkerBgHostApi() {
-    _ref = ProviderContainer(
-      overrides: [
-        dbProvider.overrideWithValue(isar),
-        isarProvider.overrideWithValue(isar),
-        driftProvider.overrideWith(driftOverride(drift)),
-      ],
-    );
+    _ref = ProviderContainer(overrides: [driftProvider.overrideWith(driftOverride(drift))]);
     BackgroundWorkerFlutterApi.setUp(this);
   }
 
@@ -102,7 +91,6 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
           ),
           FileDownloader().trackTasksInGroup(kDownloadGroupLivePhoto, markDownloadedComplete: false),
           FileDownloader().trackTasks(),
-          _ref?.read(fileMediaRepositoryProvider).enableBackgroundAccess(),
         ].nonNulls,
       );
 
@@ -209,9 +197,6 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
         backgroundSyncManager?.cancel(),
       ];
 
-      if (_isar.isOpen) {
-        cleanupFutures.add(_isar.close());
-      }
       await Future.wait(cleanupFutures.nonNulls);
       _logger.info("Background worker resources cleaned up");
     } catch (error, stack) {
@@ -301,7 +286,6 @@ Future<void> backgroundSyncNativeEntrypoint() async {
   WidgetsFlutterBinding.ensureInitialized();
   DartPluginRegistrant.ensureInitialized();
 
-  final (isar, drift, logDB) = await Bootstrap.initDB();
-  await Bootstrap.initDomain(isar, drift, logDB, shouldBufferLogs: false, listenStoreUpdates: false);
-  await BackgroundWorkerBgService(isar: isar, drift: drift, driftLogger: logDB).init();
+  final (drift, logDB) = await Bootstrap.initDomain(shouldBufferLogs: false, listenStoreUpdates: false);
+  await BackgroundWorkerBgService(drift: drift, driftLogger: logDB).init();
 }

mobile/lib/domain/services/log.service.dart

@@ -15,7 +15,7 @@ import 'package:logging/logging.dart';
 /// via [IStoreRepository]
 class LogService {
   final LogRepository _logRepository;
-  final IStoreRepository _storeRepository;
+  final DriftStoreRepository _storeRepository;
 
   final List<LogMessage> _msgBuffer = [];
 
@@ -38,7 +38,7 @@ class LogService {
 
   static Future<LogService> init({
     required LogRepository logRepository,
-    required IStoreRepository storeRepository,
+    required DriftStoreRepository storeRepository,
     bool shouldBuffer = true,
   }) async {
     _instance ??= await create(
@@ -51,7 +51,7 @@ class LogService {
 
   static Future<LogService> create({
     required LogRepository logRepository,
-    required IStoreRepository storeRepository,
+    required DriftStoreRepository storeRepository,
     bool shouldBuffer = true,
   }) async {
     final instance = LogService._(logRepository, storeRepository, shouldBuffer);

mobile/lib/domain/services/search.service.dart

@@ -1,10 +1,9 @@
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/search_result.model.dart';
+import 'package:immich_mobile/extensions/asset_extensions.dart';
 import 'package:immich_mobile/extensions/string_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/search_api.repository.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
 import 'package:logging/logging.dart';
-import 'package:openapi/api.dart' as api show AssetVisibility;
 import 'package:openapi/api.dart' hide AssetVisibility;
 
 class SearchService {
@@ -52,43 +51,3 @@ class SearchService {
     return null;
   }
 }
-
-extension on AssetResponseDto {
-  RemoteAsset toDto() {
-    return RemoteAsset(
-      id: id,
-      name: originalFileName,
-      checksum: checksum,
-      createdAt: fileCreatedAt,
-      updatedAt: updatedAt,
-      ownerId: ownerId,
-      visibility: switch (visibility) {
-        api.AssetVisibility.timeline => AssetVisibility.timeline,
-        api.AssetVisibility.hidden => AssetVisibility.hidden,
-        api.AssetVisibility.archive => AssetVisibility.archive,
-        api.AssetVisibility.locked => AssetVisibility.locked,
-        _ => AssetVisibility.timeline,
-      },
-      durationInSeconds: duration.toDuration()?.inSeconds ?? 0,
-      height: height?.toInt(),
-      width: width?.toInt(),
-      isFavorite: isFavorite,
-      livePhotoVideoId: livePhotoVideoId,
-      thumbHash: thumbhash,
-      localId: null,
-      type: type.toAssetType(),
-      stackId: stack?.id,
-      isEdited: isEdited,
-    );
-  }
-}
-
-extension on AssetTypeEnum {
-  AssetType toAssetType() => switch (this) {
-    AssetTypeEnum.IMAGE => AssetType.image,
-    AssetTypeEnum.VIDEO => AssetType.video,
-    AssetTypeEnum.AUDIO => AssetType.audio,
-    AssetTypeEnum.OTHER => AssetType.other,
-    _ => throw Exception('Unknown AssetType value: $this'),
-  };
-}

mobile/lib/domain/services/store.service.dart

@@ -6,13 +6,13 @@ import 'package:immich_mobile/infrastructure/repositories/store.repository.dart'
 /// Provides access to a persistent key-value store with an in-memory cache.
 /// Listens for repository changes to keep the cache updated.
 class StoreService {
-  final IStoreRepository _storeRepository;
+  final DriftStoreRepository _storeRepository;
 
   /// In-memory cache. Keys are [StoreKey.id]
   final Map<int, Object?> _cache = {};
   StreamSubscription<List<StoreDto>>? _storeUpdateSubscription;
 
-  StoreService._({required IStoreRepository isarStoreRepository}) : _storeRepository = isarStoreRepository;
+  StoreService._({required DriftStoreRepository isarStoreRepository}) : _storeRepository = isarStoreRepository;
 
   // TODO: Temporary typedef to make minimal changes. Remove this and make the presentation layer access store through a provider
   static StoreService? _instance;
@@ -24,12 +24,12 @@ class StoreService {
   }
 
   // TODO: Replace the implementation with the one from create after removing the typedef
-  static Future<StoreService> init({required IStoreRepository storeRepository, bool listenUpdates = true}) async {
+  static Future<StoreService> init({required DriftStoreRepository storeRepository, bool listenUpdates = true}) async {
     _instance ??= await create(storeRepository: storeRepository, listenUpdates: listenUpdates);
     return _instance!;
   }
 
-  static Future<StoreService> create({required IStoreRepository storeRepository, bool listenUpdates = true}) async {
+  static Future<StoreService> create({required DriftStoreRepository storeRepository, bool listenUpdates = true}) async {
     final instance = StoreService._(isarStoreRepository: storeRepository);
     await instance.populateCache();
     if (listenUpdates) {
@@ -91,8 +91,6 @@ class StoreService {
     await _storeRepository.deleteAll();
     _cache.clear();
   }
-
-  bool get isBetaTimelineEnabled => tryGet(StoreKey.betaTimeline) ?? true;
 }
 
 class StoreKeyNotFoundException implements Exception {

mobile/lib/domain/services/timeline.service.dart

@@ -34,6 +34,7 @@ enum TimelineOrigin {
   search,
   deepLink,
   albumActivities,
+  folder,
 }
 
 class TimelineFactory {

mobile/lib/domain/services/user.service.dart

@@ -4,23 +4,17 @@ import 'dart:typed_data';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
-import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart';
 import 'package:logging/logging.dart';
 
 class UserService {
   final Logger _log = Logger("UserService");
-  final IsarUserRepository _isarUserRepository;
   final UserApiRepository _userApiRepository;
   final StoreService _storeService;
 
-  UserService({
-    required IsarUserRepository isarUserRepository,
-    required UserApiRepository userApiRepository,
-    required StoreService storeService,
-  }) : _isarUserRepository = isarUserRepository,
-       _userApiRepository = userApiRepository,
-       _storeService = storeService;
+  UserService({required UserApiRepository userApiRepository, required StoreService storeService})
+    : _userApiRepository = userApiRepository,
+      _storeService = storeService;
 
   UserDto getMyUser() {
     return _storeService.get(StoreKey.currentUser);
@@ -38,7 +32,6 @@ class UserService {
     final user = await _userApiRepository.getMyUser();
     if (user == null) return null;
     await _storeService.put(StoreKey.currentUser, user);
-    await _isarUserRepository.update(user);
     return user;
   }
 
@@ -47,19 +40,10 @@ class UserService {
       final path = await _userApiRepository.createProfileImage(name: name, data: image);
       final updatedUser = getMyUser();
       await _storeService.put(StoreKey.currentUser, updatedUser);
-      await _isarUserRepository.update(updatedUser);
       return path;
     } catch (e) {
       _log.warning("Failed to upload profile image", e);
       return null;
     }
   }
-
-  Future<List<UserDto>> getAll() async {
-    return await _isarUserRepository.getAll();
-  }
-
-  Future<void> deleteAll() {
-    return _isarUserRepository.deleteAll();
-  }
 }

mobile/lib/domain/utils/migrate_cloud_ids.dart

@@ -80,12 +80,14 @@ Future<void> _processCloudIdMappingsInBatches(
           AssetMetadataBulkUpsertItemDto(
             assetId: mapping.remoteAssetId,
             key: kMobileMetadataKey,
-            value: RemoteAssetMobileAppMetadata(
-              cloudId: mapping.localAsset.cloudId,
-              createdAt: mapping.localAsset.createdAt.toIso8601String(),
-              adjustmentTime: mapping.localAsset.adjustmentTime?.toIso8601String(),
-              latitude: mapping.localAsset.latitude?.toString(),
-              longitude: mapping.localAsset.longitude?.toString(),
+            value: Map<String, Object>.from(
+              RemoteAssetMobileAppMetadata(
+                cloudId: mapping.localAsset.cloudId,
+                createdAt: mapping.localAsset.createdAt.toIso8601String(),
+                adjustmentTime: mapping.localAsset.adjustmentTime?.toIso8601String(),
+                latitude: mapping.localAsset.latitude?.toString(),
+                longitude: mapping.localAsset.longitude?.toString(),
+              ).toJson(),
             ),
           ),
         );

mobile/lib/entities/README.md

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

mobile/lib/entities/album.entity.dart

@@ -1,192 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
-import 'package:immich_mobile/utils/datetime_comparison.dart';
-import 'package:isar/isar.dart';
-// ignore: implementation_imports
-import 'package:isar/src/common/isar_links_common.dart';
-import 'package:openapi/api.dart';
-
-part 'album.entity.g.dart';
-
-@Collection(inheritance: false)
-class Album {
-  @protected
-  Album({
-    this.remoteId,
-    this.localId,
-    required this.name,
-    required this.createdAt,
-    required this.modifiedAt,
-    this.description,
-    this.startDate,
-    this.endDate,
-    this.lastModifiedAssetTimestamp,
-    required this.shared,
-    required this.activityEnabled,
-    this.sortOrder = SortOrder.desc,
-  });
-
-  // fields stored in DB
-  Id id = Isar.autoIncrement;
-  @Index(unique: false, replace: false, type: IndexType.hash)
-  String? remoteId;
-  @Index(unique: false, replace: false, type: IndexType.hash)
-  String? localId;
-  String name;
-  String? description;
-  DateTime createdAt;
-  DateTime modifiedAt;
-  DateTime? startDate;
-  DateTime? endDate;
-  DateTime? lastModifiedAssetTimestamp;
-  bool shared;
-  bool activityEnabled;
-  @enumerated
-  SortOrder sortOrder;
-  final IsarLink<User> owner = IsarLink<User>();
-  final IsarLink<Asset> thumbnail = IsarLink<Asset>();
-  final IsarLinks<User> sharedUsers = IsarLinks<User>();
-  final IsarLinks<Asset> assets = IsarLinks<Asset>();
-
-  // transient fields
-  @ignore
-  bool isAll = false;
-
-  @ignore
-  String? remoteThumbnailAssetId;
-
-  @ignore
-  int remoteAssetCount = 0;
-
-  // getters
-  @ignore
-  bool get isRemote => remoteId != null;
-
-  @ignore
-  bool get isLocal => localId != null;
-
-  @ignore
-  int get assetCount => assets.length;
-
-  @ignore
-  String? get ownerId => owner.value?.id;
-
-  @ignore
-  String? get ownerName {
-    // Guard null owner
-    if (owner.value == null) {
-      return null;
-    }
-
-    final name = <String>[];
-    if (owner.value?.name != null) {
-      name.add(owner.value!.name);
-    }
-
-    return name.join(' ');
-  }
-
-  @ignore
-  String get eTagKeyAssetCount => "device-album-$localId-asset-count";
-
-  // the following getter are needed because Isar links do not make data
-  // accessible in an object freshly created (not loaded from DB)
-
-  @ignore
-  Iterable<User> get remoteUsers =>
-      sharedUsers.isEmpty ? (sharedUsers as IsarLinksCommon<User>).addedObjects : sharedUsers;
-
-  @ignore
-  Iterable<Asset> get remoteAssets => assets.isEmpty ? (assets as IsarLinksCommon<Asset>).addedObjects : assets;
-
-  @override
-  bool operator ==(other) {
-    if (other is! Album) return false;
-    return id == other.id &&
-        remoteId == other.remoteId &&
-        localId == other.localId &&
-        name == other.name &&
-        description == other.description &&
-        createdAt.isAtSameMomentAs(other.createdAt) &&
-        modifiedAt.isAtSameMomentAs(other.modifiedAt) &&
-        isAtSameMomentAs(startDate, other.startDate) &&
-        isAtSameMomentAs(endDate, other.endDate) &&
-        isAtSameMomentAs(lastModifiedAssetTimestamp, other.lastModifiedAssetTimestamp) &&
-        shared == other.shared &&
-        activityEnabled == other.activityEnabled &&
-        owner.value == other.owner.value &&
-        thumbnail.value == other.thumbnail.value &&
-        sharedUsers.length == other.sharedUsers.length &&
-        assets.length == other.assets.length;
-  }
-
-  @override
-  @ignore
-  int get hashCode =>
-      id.hashCode ^
-      remoteId.hashCode ^
-      localId.hashCode ^
-      name.hashCode ^
-      createdAt.hashCode ^
-      modifiedAt.hashCode ^
-      startDate.hashCode ^
-      endDate.hashCode ^
-      description.hashCode ^
-      lastModifiedAssetTimestamp.hashCode ^
-      shared.hashCode ^
-      activityEnabled.hashCode ^
-      owner.value.hashCode ^
-      thumbnail.value.hashCode ^
-      sharedUsers.length.hashCode ^
-      assets.length.hashCode;
-
-  static Future<Album> remote(AlbumResponseDto dto) async {
-    final Isar db = Isar.getInstance()!;
-    final Album a = Album(
-      remoteId: dto.id,
-      name: dto.albumName,
-      createdAt: dto.createdAt,
-      modifiedAt: dto.updatedAt,
-      description: dto.description,
-      lastModifiedAssetTimestamp: dto.lastModifiedAssetTimestamp,
-      shared: dto.shared,
-      startDate: dto.startDate,
-      endDate: dto.endDate,
-      activityEnabled: dto.isActivityEnabled,
-    );
-    a.remoteAssetCount = dto.assetCount;
-    a.owner.value = await db.users.getById(dto.ownerId);
-    if (dto.order != null) {
-      a.sortOrder = dto.order == AssetOrder.asc ? SortOrder.asc : SortOrder.desc;
-    }
-
-    if (dto.albumThumbnailAssetId != null) {
-      a.thumbnail.value = await db.assets.where().remoteIdEqualTo(dto.albumThumbnailAssetId).findFirst();
-    }
-    if (dto.albumUsers.isNotEmpty) {
-      final users = await db.users.getAllById(dto.albumUsers.map((e) => e.user.id).toList(growable: false));
-      a.sharedUsers.addAll(users.cast());
-    }
-    if (dto.assets.isNotEmpty) {
-      final assets = await db.assets.getAllByRemoteId(dto.assets.map((e) => e.id));
-      a.assets.addAll(assets);
-    }
-    return a;
-  }
-
-  @override
-  String toString() => 'remoteId: $remoteId name: $name description: $description';
-}
-
-extension AssetsHelper on IsarCollection<Album> {
-  Future<Album> store(Album a) async {
-    await put(a);
-    await a.owner.save();
-    await a.thumbnail.save();
-    await a.sharedUsers.save();
-    await a.assets.save();
-    return a;
-  }
-}

mobile/lib/entities/android_device_asset.entity.dart

@@ -1,10 +0,0 @@
-import 'package:immich_mobile/entities/device_asset.entity.dart';
-import 'package:isar/isar.dart';
-
-part 'android_device_asset.entity.g.dart';
-
-@Collection()
-class AndroidDeviceAsset extends DeviceAsset {
-  AndroidDeviceAsset({required this.id, required super.hash});
-  Id id;
-}

mobile/lib/entities/android_device_asset.entity.g.dart

@@ -1,463 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'android_device_asset.entity.dart';
-
-// **************************************************************************
-// IsarCollectionGenerator
-// **************************************************************************
-
-// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
-
-extension GetAndroidDeviceAssetCollection on Isar {
-  IsarCollection<AndroidDeviceAsset> get androidDeviceAssets =>
-      this.collection();
-}
-
-const AndroidDeviceAssetSchema = CollectionSchema(
-  name: r'AndroidDeviceAsset',
-  id: -6758387181232899335,
-  properties: {
-    r'hash': PropertySchema(id: 0, name: r'hash', type: IsarType.byteList),
-  },
-
-  estimateSize: _androidDeviceAssetEstimateSize,
-  serialize: _androidDeviceAssetSerialize,
-  deserialize: _androidDeviceAssetDeserialize,
-  deserializeProp: _androidDeviceAssetDeserializeProp,
-  idName: r'id',
-  indexes: {
-    r'hash': IndexSchema(
-      id: -7973251393006690288,
-      name: r'hash',
-      unique: false,
-      replace: false,
-      properties: [
-        IndexPropertySchema(
-          name: r'hash',
-          type: IndexType.hash,
-          caseSensitive: false,
-        ),
-      ],
-    ),
-  },
-  links: {},
-  embeddedSchemas: {},
-
-  getId: _androidDeviceAssetGetId,
-  getLinks: _androidDeviceAssetGetLinks,
-  attach: _androidDeviceAssetAttach,
-  version: '3.3.0-dev.3',
-);
-
-int _androidDeviceAssetEstimateSize(
-  AndroidDeviceAsset object,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  var bytesCount = offsets.last;
-  bytesCount += 3 + object.hash.length;
-  return bytesCount;
-}
-
-void _androidDeviceAssetSerialize(
-  AndroidDeviceAsset object,
-  IsarWriter writer,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  writer.writeByteList(offsets[0], object.hash);
-}
-
-AndroidDeviceAsset _androidDeviceAssetDeserialize(
-  Id id,
-  IsarReader reader,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  final object = AndroidDeviceAsset(
-    hash: reader.readByteList(offsets[0]) ?? [],
-    id: id,
-  );
-  return object;
-}
-
-P _androidDeviceAssetDeserializeProp<P>(
-  IsarReader reader,
-  int propertyId,
-  int offset,
-  Map<Type, List<int>> allOffsets,
-) {
-  switch (propertyId) {
-    case 0:
-      return (reader.readByteList(offset) ?? []) as P;
-    default:
-      throw IsarError('Unknown property with id $propertyId');
-  }
-}
-
-Id _androidDeviceAssetGetId(AndroidDeviceAsset object) {
-  return object.id;
-}
-
-List<IsarLinkBase<dynamic>> _androidDeviceAssetGetLinks(
-  AndroidDeviceAsset object,
-) {
-  return [];
-}
-
-void _androidDeviceAssetAttach(
-  IsarCollection<dynamic> col,
-  Id id,
-  AndroidDeviceAsset object,
-) {
-  object.id = id;
-}
-
-extension AndroidDeviceAssetQueryWhereSort
-    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QWhere> {
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhere> anyId() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(const IdWhereClause.any());
-    });
-  }
-}
-
-extension AndroidDeviceAssetQueryWhere
-    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QWhereClause> {
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhereClause>
-  idEqualTo(Id id) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(IdWhereClause.between(lower: id, upper: id));
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhereClause>
-  idNotEqualTo(Id id) {
-    return QueryBuilder.apply(this, (query) {
-      if (query.whereSort == Sort.asc) {
-        return query
-            .addWhereClause(
-              IdWhereClause.lessThan(upper: id, includeUpper: false),
-            )
-            .addWhereClause(
-              IdWhereClause.greaterThan(lower: id, includeLower: false),
-            );
-      } else {
-        return query
-            .addWhereClause(
-              IdWhereClause.greaterThan(lower: id, includeLower: false),
-            )
-            .addWhereClause(
-              IdWhereClause.lessThan(upper: id, includeUpper: false),
-            );
-      }
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhereClause>
-  idGreaterThan(Id id, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.greaterThan(lower: id, includeLower: include),
-      );
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhereClause>
-  idLessThan(Id id, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.lessThan(upper: id, includeUpper: include),
-      );
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhereClause>
-  idBetween(
-    Id lowerId,
-    Id upperId, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.between(
-          lower: lowerId,
-          includeLower: includeLower,
-          upper: upperId,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhereClause>
-  hashEqualTo(List<int> hash) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IndexWhereClause.equalTo(indexName: r'hash', value: [hash]),
-      );
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhereClause>
-  hashNotEqualTo(List<int> hash) {
-    return QueryBuilder.apply(this, (query) {
-      if (query.whereSort == Sort.asc) {
-        return query
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'hash',
-                lower: [],
-                upper: [hash],
-                includeUpper: false,
-              ),
-            )
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'hash',
-                lower: [hash],
-                includeLower: false,
-                upper: [],
-              ),
-            );
-      } else {
-        return query
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'hash',
-                lower: [hash],
-                includeLower: false,
-                upper: [],
-              ),
-            )
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'hash',
-                lower: [],
-                upper: [hash],
-                includeUpper: false,
-              ),
-            );
-      }
-    });
-  }
-}
-
-extension AndroidDeviceAssetQueryFilter
-    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QFilterCondition> {
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
-  hashElementEqualTo(int value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'hash', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
-  hashElementGreaterThan(int value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'hash',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
-  hashElementLessThan(int value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'hash',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
-  hashElementBetween(
-    int lower,
-    int upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'hash',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
-  hashLengthEqualTo(int length) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(r'hash', length, true, length, true);
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
-  hashIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(r'hash', 0, true, 0, true);
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
-  hashIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(r'hash', 0, false, 999999, true);
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
-  hashLengthLessThan(int length, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(r'hash', 0, true, length, include);
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
-  hashLengthGreaterThan(int length, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(r'hash', length, include, 999999, true);
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
-  hashLengthBetween(
-    int lower,
-    int upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(
-        r'hash',
-        lower,
-        includeLower,
-        upper,
-        includeUpper,
-      );
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
-  idEqualTo(Id value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'id', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
-  idGreaterThan(Id value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'id',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
-  idLessThan(Id value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'id',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
-  idBetween(
-    Id lower,
-    Id upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'id',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-}
-
-extension AndroidDeviceAssetQueryObject
-    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QFilterCondition> {}
-
-extension AndroidDeviceAssetQueryLinks
-    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QFilterCondition> {}
-
-extension AndroidDeviceAssetQuerySortBy
-    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QSortBy> {}
-
-extension AndroidDeviceAssetQuerySortThenBy
-    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QSortThenBy> {
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterSortBy>
-  thenById() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.asc);
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterSortBy>
-  thenByIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.desc);
-    });
-  }
-}
-
-extension AndroidDeviceAssetQueryWhereDistinct
-    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QDistinct> {
-  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QDistinct>
-  distinctByHash() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'hash');
-    });
-  }
-}
-
-extension AndroidDeviceAssetQueryProperty
-    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QQueryProperty> {
-  QueryBuilder<AndroidDeviceAsset, int, QQueryOperations> idProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'id');
-    });
-  }
-
-  QueryBuilder<AndroidDeviceAsset, List<int>, QQueryOperations> hashProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'hash');
-    });
-  }
-}

mobile/lib/entities/asset.entity.dart

@@ -1,575 +0,0 @@
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/exif.model.dart';
-import 'package:immich_mobile/extensions/string_extensions.dart';
-import 'package:immich_mobile/infrastructure/entities/exif.entity.dart' as entity;
-import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
-import 'package:immich_mobile/utils/diff.dart';
-import 'package:immich_mobile/utils/hash.dart';
-import 'package:isar/isar.dart';
-import 'package:openapi/api.dart';
-import 'package:path/path.dart' as p;
-import 'package:photo_manager/photo_manager.dart' show AssetEntity;
-
-part 'asset.entity.g.dart';
-
-/// Asset (online or local)
-@Collection(inheritance: false)
-class Asset {
-  Asset.remote(AssetResponseDto remote)
-    : remoteId = remote.id,
-      checksum = remote.checksum,
-      fileCreatedAt = remote.fileCreatedAt,
-      fileModifiedAt = remote.fileModifiedAt,
-      updatedAt = remote.updatedAt,
-      durationInSeconds = remote.duration.toDuration()?.inSeconds ?? 0,
-      type = remote.type.toAssetType(),
-      fileName = remote.originalFileName,
-      height = remote.exifInfo?.exifImageHeight?.toInt(),
-      width = remote.exifInfo?.exifImageWidth?.toInt(),
-      livePhotoVideoId = remote.livePhotoVideoId,
-      ownerId = fastHash(remote.ownerId),
-      exifInfo = remote.exifInfo == null ? null : ExifDtoConverter.fromDto(remote.exifInfo!),
-      isFavorite = remote.isFavorite,
-      isArchived = remote.isArchived,
-      isTrashed = remote.isTrashed,
-      isOffline = remote.isOffline,
-      // workaround to nullify stackPrimaryAssetId for the parent asset until we refactor the mobile app
-      // stack handling to properly handle it
-      stackPrimaryAssetId = remote.stack?.primaryAssetId == remote.id ? null : remote.stack?.primaryAssetId,
-      stackCount = remote.stack?.assetCount ?? 0,
-      stackId = remote.stack?.id,
-      thumbhash = remote.thumbhash,
-      visibility = getVisibility(remote.visibility);
-
-  Asset({
-    this.id = Isar.autoIncrement,
-    required this.checksum,
-    this.remoteId,
-    required this.localId,
-    required this.ownerId,
-    required this.fileCreatedAt,
-    required this.fileModifiedAt,
-    required this.updatedAt,
-    required this.durationInSeconds,
-    required this.type,
-    this.width,
-    this.height,
-    required this.fileName,
-    this.livePhotoVideoId,
-    this.exifInfo,
-    this.isFavorite = false,
-    this.isArchived = false,
-    this.isTrashed = false,
-    this.stackId,
-    this.stackPrimaryAssetId,
-    this.stackCount = 0,
-    this.isOffline = false,
-    this.thumbhash,
-    this.visibility = AssetVisibilityEnum.timeline,
-  });
-
-  @ignore
-  AssetEntity? _local;
-
-  @ignore
-  AssetEntity? get local {
-    if (isLocal && _local == null) {
-      _local = AssetEntity(
-        id: localId!,
-        typeInt: isImage ? 1 : 2,
-        width: width ?? 0,
-        height: height ?? 0,
-        duration: durationInSeconds,
-        createDateSecond: fileCreatedAt.millisecondsSinceEpoch ~/ 1000,
-        modifiedDateSecond: fileModifiedAt.millisecondsSinceEpoch ~/ 1000,
-        title: fileName,
-      );
-    }
-    return _local;
-  }
-
-  set local(AssetEntity? assetEntity) => _local = assetEntity;
-
-  @ignore
-  bool _didUpdateLocal = false;
-
-  @ignore
-  Future<AssetEntity> get localAsync async {
-    final local = this.local;
-    if (local == null) {
-      throw Exception('Asset $fileName has no local data');
-    }
-
-    final updatedLocal = _didUpdateLocal ? local : await local.obtainForNewProperties();
-    if (updatedLocal == null) {
-      throw Exception('Could not fetch local data for $fileName');
-    }
-
-    this.local = updatedLocal;
-    _didUpdateLocal = true;
-    return updatedLocal;
-  }
-
-  Id id = Isar.autoIncrement;
-
-  /// stores the raw SHA1 bytes as a base64 String
-  /// because Isar cannot sort lists of byte arrays
-  String checksum;
-
-  String? thumbhash;
-
-  @Index(unique: false, replace: false, type: IndexType.hash)
-  String? remoteId;
-
-  @Index(unique: false, replace: false, type: IndexType.hash)
-  String? localId;
-
-  @Index(unique: true, replace: false, composite: [CompositeIndex("checksum", type: IndexType.hash)])
-  int ownerId;
-
-  DateTime fileCreatedAt;
-
-  DateTime fileModifiedAt;
-
-  DateTime updatedAt;
-
-  int durationInSeconds;
-
-  @Enumerated(EnumType.ordinal)
-  AssetType type;
-
-  short? width;
-
-  short? height;
-
-  String fileName;
-
-  String? livePhotoVideoId;
-
-  bool isFavorite;
-
-  bool isArchived;
-
-  bool isTrashed;
-
-  bool isOffline;
-
-  @ignore
-  ExifInfo? exifInfo;
-
-  String? stackId;
-
-  String? stackPrimaryAssetId;
-
-  int stackCount;
-
-  @Enumerated(EnumType.ordinal)
-  AssetVisibilityEnum visibility;
-
-  /// Returns null if the asset has no sync access to the exif info
-  @ignore
-  double? get aspectRatio {
-    final orientatedWidth = this.orientatedWidth;
-    final orientatedHeight = this.orientatedHeight;
-
-    if (orientatedWidth != null && orientatedHeight != null && orientatedWidth > 0 && orientatedHeight > 0) {
-      return orientatedWidth.toDouble() / orientatedHeight.toDouble();
-    }
-
-    return null;
-  }
-
-  /// `true` if this [Asset] is present on the device
-  @ignore
-  bool get isLocal => localId != null;
-
-  @ignore
-  bool get isInDb => id != Isar.autoIncrement;
-
-  @ignore
-  String get name => p.withoutExtension(fileName);
-
-  /// `true` if this [Asset] is present on the server
-  @ignore
-  bool get isRemote => remoteId != null;
-
-  @ignore
-  bool get isImage => type == AssetType.image;
-
-  @ignore
-  bool get isVideo => type == AssetType.video;
-
-  @ignore
-  bool get isMotionPhoto => livePhotoVideoId != null;
-
-  @ignore
-  AssetState get storage {
-    if (isRemote && isLocal) {
-      return AssetState.merged;
-    } else if (isRemote) {
-      return AssetState.remote;
-    } else if (isLocal) {
-      return AssetState.local;
-    } else {
-      throw Exception("Asset has illegal state: $this");
-    }
-  }
-
-  @ignore
-  Duration get duration => Duration(seconds: durationInSeconds);
-
-  // ignore: invalid_annotation_target
-  @ignore
-  set byteHash(List<int> hash) => checksum = base64.encode(hash);
-
-  /// Returns null if the asset has no sync access to the exif info
-  @ignore
-  @pragma('vm:prefer-inline')
-  bool? get isFlipped {
-    final exifInfo = this.exifInfo;
-    if (exifInfo != null) {
-      return exifInfo.isFlipped;
-    }
-
-    if (_didUpdateLocal && Platform.isAndroid) {
-      final local = this.local;
-      if (local == null) {
-        throw Exception('Asset $fileName has no local data');
-      }
-      return local.orientation == 90 || local.orientation == 270;
-    }
-
-    return null;
-  }
-
-  /// Returns null if the asset has no sync access to the exif info
-  @ignore
-  @pragma('vm:prefer-inline')
-  int? get orientatedHeight {
-    final isFlipped = this.isFlipped;
-    if (isFlipped == null) {
-      return null;
-    }
-
-    return isFlipped ? width : height;
-  }
-
-  /// Returns null if the asset has no sync access to the exif info
-  @ignore
-  @pragma('vm:prefer-inline')
-  int? get orientatedWidth {
-    final isFlipped = this.isFlipped;
-    if (isFlipped == null) {
-      return null;
-    }
-
-    return isFlipped ? height : width;
-  }
-
-  @override
-  bool operator ==(other) {
-    if (other is! Asset) return false;
-    if (identical(this, other)) return true;
-    return id == other.id &&
-        checksum == other.checksum &&
-        remoteId == other.remoteId &&
-        localId == other.localId &&
-        ownerId == other.ownerId &&
-        fileCreatedAt.isAtSameMomentAs(other.fileCreatedAt) &&
-        fileModifiedAt.isAtSameMomentAs(other.fileModifiedAt) &&
-        updatedAt.isAtSameMomentAs(other.updatedAt) &&
-        durationInSeconds == other.durationInSeconds &&
-        type == other.type &&
-        width == other.width &&
-        height == other.height &&
-        fileName == other.fileName &&
-        livePhotoVideoId == other.livePhotoVideoId &&
-        isFavorite == other.isFavorite &&
-        isLocal == other.isLocal &&
-        isArchived == other.isArchived &&
-        isTrashed == other.isTrashed &&
-        stackCount == other.stackCount &&
-        stackPrimaryAssetId == other.stackPrimaryAssetId &&
-        stackId == other.stackId;
-  }
-
-  @override
-  @ignore
-  int get hashCode =>
-      id.hashCode ^
-      checksum.hashCode ^
-      remoteId.hashCode ^
-      localId.hashCode ^
-      ownerId.hashCode ^
-      fileCreatedAt.hashCode ^
-      fileModifiedAt.hashCode ^
-      updatedAt.hashCode ^
-      durationInSeconds.hashCode ^
-      type.hashCode ^
-      width.hashCode ^
-      height.hashCode ^
-      fileName.hashCode ^
-      livePhotoVideoId.hashCode ^
-      isFavorite.hashCode ^
-      isLocal.hashCode ^
-      isArchived.hashCode ^
-      isTrashed.hashCode ^
-      stackCount.hashCode ^
-      stackPrimaryAssetId.hashCode ^
-      stackId.hashCode;
-
-  /// Returns `true` if this [Asset] can updated with values from parameter [a]
-  bool canUpdate(Asset a) {
-    assert(isInDb);
-    assert(checksum == a.checksum);
-    assert(a.storage != AssetState.merged);
-    return a.updatedAt.isAfter(updatedAt) ||
-        a.isRemote && !isRemote ||
-        a.isLocal && !isLocal ||
-        width == null && a.width != null ||
-        height == null && a.height != null ||
-        livePhotoVideoId == null && a.livePhotoVideoId != null ||
-        isFavorite != a.isFavorite ||
-        isArchived != a.isArchived ||
-        isTrashed != a.isTrashed ||
-        isOffline != a.isOffline ||
-        a.exifInfo?.latitude != exifInfo?.latitude ||
-        a.exifInfo?.longitude != exifInfo?.longitude ||
-        // no local stack count or different count from remote
-        a.thumbhash != thumbhash ||
-        stackId != a.stackId ||
-        stackCount != a.stackCount ||
-        stackPrimaryAssetId == null && a.stackPrimaryAssetId != null ||
-        visibility != a.visibility;
-  }
-
-  /// Returns a new [Asset] with values from this and merged & updated with [a]
-  Asset updatedCopy(Asset a) {
-    assert(canUpdate(a));
-    if (a.updatedAt.isAfter(updatedAt)) {
-      // take most values from newer asset
-      // keep vales that can never be set by the asset not in DB
-      if (a.isRemote) {
-        return a.copyWith(
-          id: id,
-          localId: localId,
-          width: a.width ?? width,
-          height: a.height ?? height,
-          exifInfo: a.exifInfo?.copyWith(assetId: id) ?? exifInfo,
-        );
-      } else if (isRemote) {
-        return copyWith(
-          localId: localId ?? a.localId,
-          width: width ?? a.width,
-          height: height ?? a.height,
-          exifInfo: exifInfo ?? a.exifInfo?.copyWith(assetId: id),
-        );
-      } else {
-        // TODO: Revisit this and remove all bool field assignments
-        return a.copyWith(
-          id: id,
-          remoteId: remoteId,
-          livePhotoVideoId: livePhotoVideoId,
-          // workaround to nullify stackPrimaryAssetId for the parent asset until we refactor the mobile app
-          // stack handling to properly handle it
-          stackId: stackId,
-          stackPrimaryAssetId: stackPrimaryAssetId == remoteId ? null : stackPrimaryAssetId,
-          stackCount: stackCount,
-          isFavorite: isFavorite,
-          isArchived: isArchived,
-          isTrashed: isTrashed,
-          isOffline: isOffline,
-        );
-      }
-    } else {
-      // fill in potentially missing values, i.e. merge assets
-      if (a.isRemote) {
-        // values from remote take precedence
-        return copyWith(
-          remoteId: a.remoteId,
-          width: a.width,
-          height: a.height,
-          livePhotoVideoId: a.livePhotoVideoId,
-          // workaround to nullify stackPrimaryAssetId for the parent asset until we refactor the mobile app
-          // stack handling to properly handle it
-          stackId: a.stackId,
-          stackPrimaryAssetId: a.stackPrimaryAssetId == a.remoteId ? null : a.stackPrimaryAssetId,
-          stackCount: a.stackCount,
-          // isFavorite + isArchived are not set by device-only assets
-          isFavorite: a.isFavorite,
-          isArchived: a.isArchived,
-          isTrashed: a.isTrashed,
-          isOffline: a.isOffline,
-          exifInfo: a.exifInfo?.copyWith(assetId: id) ?? exifInfo,
-          thumbhash: a.thumbhash,
-        );
-      } else {
-        // add only missing values (and set isLocal to true)
-        return copyWith(
-          localId: localId ?? a.localId,
-          width: width ?? a.width,
-          height: height ?? a.height,
-          exifInfo: exifInfo ?? a.exifInfo?.copyWith(assetId: id), // updated to use assetId
-        );
-      }
-    }
-  }
-
-  Asset copyWith({
-    Id? id,
-    String? checksum,
-    String? remoteId,
-    String? localId,
-    int? ownerId,
-    DateTime? fileCreatedAt,
-    DateTime? fileModifiedAt,
-    DateTime? updatedAt,
-    int? durationInSeconds,
-    AssetType? type,
-    short? width,
-    short? height,
-    String? fileName,
-    String? livePhotoVideoId,
-    bool? isFavorite,
-    bool? isArchived,
-    bool? isTrashed,
-    bool? isOffline,
-    ExifInfo? exifInfo,
-    String? stackId,
-    String? stackPrimaryAssetId,
-    int? stackCount,
-    String? thumbhash,
-    AssetVisibilityEnum? visibility,
-  }) => Asset(
-    id: id ?? this.id,
-    checksum: checksum ?? this.checksum,
-    remoteId: remoteId ?? this.remoteId,
-    localId: localId ?? this.localId,
-    ownerId: ownerId ?? this.ownerId,
-    fileCreatedAt: fileCreatedAt ?? this.fileCreatedAt,
-    fileModifiedAt: fileModifiedAt ?? this.fileModifiedAt,
-    updatedAt: updatedAt ?? this.updatedAt,
-    durationInSeconds: durationInSeconds ?? this.durationInSeconds,
-    type: type ?? this.type,
-    width: width ?? this.width,
-    height: height ?? this.height,
-    fileName: fileName ?? this.fileName,
-    livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
-    isFavorite: isFavorite ?? this.isFavorite,
-    isArchived: isArchived ?? this.isArchived,
-    isTrashed: isTrashed ?? this.isTrashed,
-    isOffline: isOffline ?? this.isOffline,
-    exifInfo: exifInfo ?? this.exifInfo,
-    stackId: stackId ?? this.stackId,
-    stackPrimaryAssetId: stackPrimaryAssetId ?? this.stackPrimaryAssetId,
-    stackCount: stackCount ?? this.stackCount,
-    thumbhash: thumbhash ?? this.thumbhash,
-    visibility: visibility ?? this.visibility,
-  );
-
-  Future<void> put(Isar db) async {
-    await db.assets.put(this);
-    if (exifInfo != null) {
-      await db.exifInfos.put(entity.ExifInfo.fromDto(exifInfo!.copyWith(assetId: id)));
-    }
-  }
-
-  static int compareById(Asset a, Asset b) => a.id.compareTo(b.id);
-
-  static int compareByLocalId(Asset a, Asset b) => compareToNullable(a.localId, b.localId);
-
-  static int compareByChecksum(Asset a, Asset b) => a.checksum.compareTo(b.checksum);
-
-  static int compareByOwnerChecksum(Asset a, Asset b) {
-    final int ownerIdOrder = a.ownerId.compareTo(b.ownerId);
-    if (ownerIdOrder != 0) return ownerIdOrder;
-    return compareByChecksum(a, 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);
-    if (checksumOrder != 0) return checksumOrder;
-    final int createdOrder = a.fileCreatedAt.compareTo(b.fileCreatedAt);
-    if (createdOrder != 0) return createdOrder;
-    return a.fileModifiedAt.compareTo(b.fileModifiedAt);
-  }
-
-  @override
-  String toString() {
-    return """
-{
-  "id": ${id == Isar.autoIncrement ? '"N/A"' : id},
-  "remoteId": "${remoteId ?? "N/A"}",
-  "localId": "${localId ?? "N/A"}",
-  "checksum": "$checksum",
-  "ownerId": $ownerId,
-  "livePhotoVideoId": "${livePhotoVideoId ?? "N/A"}",
-  "stackId": "${stackId ?? "N/A"}",
-  "stackPrimaryAssetId": "${stackPrimaryAssetId ?? "N/A"}",
-  "stackCount": "$stackCount",
-  "fileCreatedAt": "$fileCreatedAt",
-  "fileModifiedAt": "$fileModifiedAt",
-  "updatedAt": "$updatedAt",
-  "durationInSeconds": $durationInSeconds,
-  "type": "$type",
-  "fileName": "$fileName",
-  "isFavorite": $isFavorite,
-  "isRemote": $isRemote,
-  "storage": "$storage",
-  "width": ${width ?? "N/A"},
-  "height": ${height ?? "N/A"},
-  "isArchived": $isArchived,
-  "isTrashed": $isTrashed,
-  "isOffline": $isOffline,
-  "visibility": "$visibility",
-}""";
-  }
-
-  static getVisibility(AssetVisibility visibility) => switch (visibility) {
-    AssetVisibility.archive => AssetVisibilityEnum.archive,
-    AssetVisibility.hidden => AssetVisibilityEnum.hidden,
-    AssetVisibility.locked => AssetVisibilityEnum.locked,
-    AssetVisibility.timeline || _ => AssetVisibilityEnum.timeline,
-  };
-}
-
-enum AssetType {
-  // do not change this order!
-  other,
-  image,
-  video,
-  audio,
-}
-
-extension AssetTypeEnumHelper on AssetTypeEnum {
-  AssetType toAssetType() => switch (this) {
-    AssetTypeEnum.IMAGE => AssetType.image,
-    AssetTypeEnum.VIDEO => AssetType.video,
-    AssetTypeEnum.AUDIO => AssetType.audio,
-    AssetTypeEnum.OTHER => AssetType.other,
-    _ => throw Exception(),
-  };
-}
-
-/// Describes where the information of this asset came from:
-/// only from the local device, only from the remote server or merged from both
-enum AssetState { local, remote, merged }
-
-extension AssetsHelper on IsarCollection<Asset> {
-  Future<int> deleteAllByRemoteId(Iterable<String> ids) => ids.isEmpty ? Future.value(0) : remote(ids).deleteAll();
-  Future<int> deleteAllByLocalId(Iterable<String> ids) => ids.isEmpty ? Future.value(0) : local(ids).deleteAll();
-  Future<List<Asset>> getAllByRemoteId(Iterable<String> ids) => ids.isEmpty ? Future.value([]) : remote(ids).findAll();
-  Future<List<Asset>> getAllByLocalId(Iterable<String> ids) => ids.isEmpty ? Future.value([]) : local(ids).findAll();
-  Future<Asset?> getByRemoteId(String id) => where().remoteIdEqualTo(id).findFirst();
-
-  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) {
-    return where().anyOf(ids, (q, String e) => q.localIdEqualTo(e));
-  }
-}

mobile/lib/entities/backup_album.entity.dart

@@ -1,22 +0,0 @@
-import 'package:immich_mobile/utils/hash.dart';
-import 'package:isar/isar.dart';
-
-part 'backup_album.entity.g.dart';
-
-@Collection(inheritance: false)
-class BackupAlbum {
-  String id;
-  DateTime lastBackup;
-  @Enumerated(EnumType.ordinal)
-  BackupSelection selection;
-
-  BackupAlbum(this.id, this.lastBackup, this.selection);
-
-  Id get isarId => fastHash(id);
-
-  BackupAlbum copyWith({String? id, DateTime? lastBackup, BackupSelection? selection}) {
-    return BackupAlbum(id ?? this.id, lastBackup ?? this.lastBackup, selection ?? this.selection);
-  }
-}
-
-enum BackupSelection { none, select, exclude }

mobile/lib/entities/backup_album.entity.g.dart

@@ -1,679 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'backup_album.entity.dart';
-
-// **************************************************************************
-// IsarCollectionGenerator
-// **************************************************************************
-
-// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
-
-extension GetBackupAlbumCollection on Isar {
-  IsarCollection<BackupAlbum> get backupAlbums => this.collection();
-}
-
-const BackupAlbumSchema = CollectionSchema(
-  name: r'BackupAlbum',
-  id: 8308487201128361847,
-  properties: {
-    r'id': PropertySchema(id: 0, name: r'id', type: IsarType.string),
-    r'lastBackup': PropertySchema(
-      id: 1,
-      name: r'lastBackup',
-      type: IsarType.dateTime,
-    ),
-    r'selection': PropertySchema(
-      id: 2,
-      name: r'selection',
-      type: IsarType.byte,
-      enumMap: _BackupAlbumselectionEnumValueMap,
-    ),
-  },
-
-  estimateSize: _backupAlbumEstimateSize,
-  serialize: _backupAlbumSerialize,
-  deserialize: _backupAlbumDeserialize,
-  deserializeProp: _backupAlbumDeserializeProp,
-  idName: r'isarId',
-  indexes: {},
-  links: {},
-  embeddedSchemas: {},
-
-  getId: _backupAlbumGetId,
-  getLinks: _backupAlbumGetLinks,
-  attach: _backupAlbumAttach,
-  version: '3.3.0-dev.3',
-);
-
-int _backupAlbumEstimateSize(
-  BackupAlbum object,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  var bytesCount = offsets.last;
-  bytesCount += 3 + object.id.length * 3;
-  return bytesCount;
-}
-
-void _backupAlbumSerialize(
-  BackupAlbum object,
-  IsarWriter writer,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  writer.writeString(offsets[0], object.id);
-  writer.writeDateTime(offsets[1], object.lastBackup);
-  writer.writeByte(offsets[2], object.selection.index);
-}
-
-BackupAlbum _backupAlbumDeserialize(
-  Id id,
-  IsarReader reader,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  final object = BackupAlbum(
-    reader.readString(offsets[0]),
-    reader.readDateTime(offsets[1]),
-    _BackupAlbumselectionValueEnumMap[reader.readByteOrNull(offsets[2])] ??
-        BackupSelection.none,
-  );
-  return object;
-}
-
-P _backupAlbumDeserializeProp<P>(
-  IsarReader reader,
-  int propertyId,
-  int offset,
-  Map<Type, List<int>> allOffsets,
-) {
-  switch (propertyId) {
-    case 0:
-      return (reader.readString(offset)) as P;
-    case 1:
-      return (reader.readDateTime(offset)) as P;
-    case 2:
-      return (_BackupAlbumselectionValueEnumMap[reader.readByteOrNull(
-                offset,
-              )] ??
-              BackupSelection.none)
-          as P;
-    default:
-      throw IsarError('Unknown property with id $propertyId');
-  }
-}
-
-const _BackupAlbumselectionEnumValueMap = {
-  'none': 0,
-  'select': 1,
-  'exclude': 2,
-};
-const _BackupAlbumselectionValueEnumMap = {
-  0: BackupSelection.none,
-  1: BackupSelection.select,
-  2: BackupSelection.exclude,
-};
-
-Id _backupAlbumGetId(BackupAlbum object) {
-  return object.isarId;
-}
-
-List<IsarLinkBase<dynamic>> _backupAlbumGetLinks(BackupAlbum object) {
-  return [];
-}
-
-void _backupAlbumAttach(
-  IsarCollection<dynamic> col,
-  Id id,
-  BackupAlbum object,
-) {}
-
-extension BackupAlbumQueryWhereSort
-    on QueryBuilder<BackupAlbum, BackupAlbum, QWhere> {
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterWhere> anyIsarId() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(const IdWhereClause.any());
-    });
-  }
-}
-
-extension BackupAlbumQueryWhere
-    on QueryBuilder<BackupAlbum, BackupAlbum, QWhereClause> {
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterWhereClause> isarIdEqualTo(
-    Id isarId,
-  ) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.between(lower: isarId, upper: isarId),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterWhereClause> isarIdNotEqualTo(
-    Id isarId,
-  ) {
-    return QueryBuilder.apply(this, (query) {
-      if (query.whereSort == Sort.asc) {
-        return query
-            .addWhereClause(
-              IdWhereClause.lessThan(upper: isarId, includeUpper: false),
-            )
-            .addWhereClause(
-              IdWhereClause.greaterThan(lower: isarId, includeLower: false),
-            );
-      } else {
-        return query
-            .addWhereClause(
-              IdWhereClause.greaterThan(lower: isarId, includeLower: false),
-            )
-            .addWhereClause(
-              IdWhereClause.lessThan(upper: isarId, includeUpper: false),
-            );
-      }
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterWhereClause> isarIdGreaterThan(
-    Id isarId, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.greaterThan(lower: isarId, includeLower: include),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterWhereClause> isarIdLessThan(
-    Id isarId, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.lessThan(upper: isarId, includeUpper: include),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterWhereClause> isarIdBetween(
-    Id lowerIsarId,
-    Id upperIsarId, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.between(
-          lower: lowerIsarId,
-          includeLower: includeLower,
-          upper: upperIsarId,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-}
-
-extension BackupAlbumQueryFilter
-    on QueryBuilder<BackupAlbum, BackupAlbum, QFilterCondition> {
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition> idEqualTo(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition> idGreaterThan(
-    String value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition> idLessThan(
-    String value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition> idBetween(
-    String lower,
-    String upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'id',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition> idStartsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.startsWith(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition> idEndsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.endsWith(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition> idContains(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.contains(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition> idMatches(
-    String pattern, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.matches(
-          property: r'id',
-          wildcard: pattern,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition> idIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'id', value: ''),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition> idIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(property: r'id', value: ''),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition> isarIdEqualTo(
-    Id value,
-  ) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'isarId', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition>
-  isarIdGreaterThan(Id value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'isarId',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition> isarIdLessThan(
-    Id value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'isarId',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition> isarIdBetween(
-    Id lower,
-    Id upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'isarId',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition>
-  lastBackupEqualTo(DateTime value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'lastBackup', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition>
-  lastBackupGreaterThan(DateTime value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'lastBackup',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition>
-  lastBackupLessThan(DateTime value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'lastBackup',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition>
-  lastBackupBetween(
-    DateTime lower,
-    DateTime upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'lastBackup',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition>
-  selectionEqualTo(BackupSelection value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'selection', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition>
-  selectionGreaterThan(BackupSelection value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'selection',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition>
-  selectionLessThan(BackupSelection value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'selection',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition>
-  selectionBetween(
-    BackupSelection lower,
-    BackupSelection upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'selection',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-}
-
-extension BackupAlbumQueryObject
-    on QueryBuilder<BackupAlbum, BackupAlbum, QFilterCondition> {}
-
-extension BackupAlbumQueryLinks
-    on QueryBuilder<BackupAlbum, BackupAlbum, QFilterCondition> {}
-
-extension BackupAlbumQuerySortBy
-    on QueryBuilder<BackupAlbum, BackupAlbum, QSortBy> {
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> sortById() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.asc);
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> sortByIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.desc);
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> sortByLastBackup() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'lastBackup', Sort.asc);
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> sortByLastBackupDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'lastBackup', Sort.desc);
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> sortBySelection() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'selection', Sort.asc);
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> sortBySelectionDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'selection', Sort.desc);
-    });
-  }
-}
-
-extension BackupAlbumQuerySortThenBy
-    on QueryBuilder<BackupAlbum, BackupAlbum, QSortThenBy> {
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> thenById() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.asc);
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> thenByIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.desc);
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> thenByIsarId() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'isarId', Sort.asc);
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> thenByIsarIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'isarId', Sort.desc);
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> thenByLastBackup() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'lastBackup', Sort.asc);
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> thenByLastBackupDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'lastBackup', Sort.desc);
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> thenBySelection() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'selection', Sort.asc);
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> thenBySelectionDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'selection', Sort.desc);
-    });
-  }
-}
-
-extension BackupAlbumQueryWhereDistinct
-    on QueryBuilder<BackupAlbum, BackupAlbum, QDistinct> {
-  QueryBuilder<BackupAlbum, BackupAlbum, QDistinct> distinctById({
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'id', caseSensitive: caseSensitive);
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QDistinct> distinctByLastBackup() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'lastBackup');
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupAlbum, QDistinct> distinctBySelection() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'selection');
-    });
-  }
-}
-
-extension BackupAlbumQueryProperty
-    on QueryBuilder<BackupAlbum, BackupAlbum, QQueryProperty> {
-  QueryBuilder<BackupAlbum, int, QQueryOperations> isarIdProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'isarId');
-    });
-  }
-
-  QueryBuilder<BackupAlbum, String, QQueryOperations> idProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'id');
-    });
-  }
-
-  QueryBuilder<BackupAlbum, DateTime, QQueryOperations> lastBackupProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'lastBackup');
-    });
-  }
-
-  QueryBuilder<BackupAlbum, BackupSelection, QQueryOperations>
-  selectionProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'selection');
-    });
-  }
-}

mobile/lib/entities/device_asset.entity.dart

@@ -1,8 +0,0 @@
-import 'package:isar/isar.dart';
-
-class DeviceAsset {
-  DeviceAsset({required this.hash});
-
-  @Index(unique: false, type: IndexType.hash)
-  List<byte> hash;
-}

mobile/lib/entities/duplicated_asset.entity.dart

@@ -1,11 +0,0 @@
-import 'package:immich_mobile/utils/hash.dart';
-import 'package:isar/isar.dart';
-
-part 'duplicated_asset.entity.g.dart';
-
-@Collection(inheritance: false)
-class DuplicatedAsset {
-  String id;
-  DuplicatedAsset(this.id);
-  Id get isarId => fastHash(id);
-}

mobile/lib/entities/duplicated_asset.entity.g.dart

@@ -1,444 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'duplicated_asset.entity.dart';
-
-// **************************************************************************
-// IsarCollectionGenerator
-// **************************************************************************
-
-// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
-
-extension GetDuplicatedAssetCollection on Isar {
-  IsarCollection<DuplicatedAsset> get duplicatedAssets => this.collection();
-}
-
-const DuplicatedAssetSchema = CollectionSchema(
-  name: r'DuplicatedAsset',
-  id: -2679334728174694496,
-  properties: {
-    r'id': PropertySchema(id: 0, name: r'id', type: IsarType.string),
-  },
-
-  estimateSize: _duplicatedAssetEstimateSize,
-  serialize: _duplicatedAssetSerialize,
-  deserialize: _duplicatedAssetDeserialize,
-  deserializeProp: _duplicatedAssetDeserializeProp,
-  idName: r'isarId',
-  indexes: {},
-  links: {},
-  embeddedSchemas: {},
-
-  getId: _duplicatedAssetGetId,
-  getLinks: _duplicatedAssetGetLinks,
-  attach: _duplicatedAssetAttach,
-  version: '3.3.0-dev.3',
-);
-
-int _duplicatedAssetEstimateSize(
-  DuplicatedAsset object,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  var bytesCount = offsets.last;
-  bytesCount += 3 + object.id.length * 3;
-  return bytesCount;
-}
-
-void _duplicatedAssetSerialize(
-  DuplicatedAsset object,
-  IsarWriter writer,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  writer.writeString(offsets[0], object.id);
-}
-
-DuplicatedAsset _duplicatedAssetDeserialize(
-  Id id,
-  IsarReader reader,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  final object = DuplicatedAsset(reader.readString(offsets[0]));
-  return object;
-}
-
-P _duplicatedAssetDeserializeProp<P>(
-  IsarReader reader,
-  int propertyId,
-  int offset,
-  Map<Type, List<int>> allOffsets,
-) {
-  switch (propertyId) {
-    case 0:
-      return (reader.readString(offset)) as P;
-    default:
-      throw IsarError('Unknown property with id $propertyId');
-  }
-}
-
-Id _duplicatedAssetGetId(DuplicatedAsset object) {
-  return object.isarId;
-}
-
-List<IsarLinkBase<dynamic>> _duplicatedAssetGetLinks(DuplicatedAsset object) {
-  return [];
-}
-
-void _duplicatedAssetAttach(
-  IsarCollection<dynamic> col,
-  Id id,
-  DuplicatedAsset object,
-) {}
-
-extension DuplicatedAssetQueryWhereSort
-    on QueryBuilder<DuplicatedAsset, DuplicatedAsset, QWhere> {
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterWhere> anyIsarId() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(const IdWhereClause.any());
-    });
-  }
-}
-
-extension DuplicatedAssetQueryWhere
-    on QueryBuilder<DuplicatedAsset, DuplicatedAsset, QWhereClause> {
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterWhereClause>
-  isarIdEqualTo(Id isarId) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.between(lower: isarId, upper: isarId),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterWhereClause>
-  isarIdNotEqualTo(Id isarId) {
-    return QueryBuilder.apply(this, (query) {
-      if (query.whereSort == Sort.asc) {
-        return query
-            .addWhereClause(
-              IdWhereClause.lessThan(upper: isarId, includeUpper: false),
-            )
-            .addWhereClause(
-              IdWhereClause.greaterThan(lower: isarId, includeLower: false),
-            );
-      } else {
-        return query
-            .addWhereClause(
-              IdWhereClause.greaterThan(lower: isarId, includeLower: false),
-            )
-            .addWhereClause(
-              IdWhereClause.lessThan(upper: isarId, includeUpper: false),
-            );
-      }
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterWhereClause>
-  isarIdGreaterThan(Id isarId, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.greaterThan(lower: isarId, includeLower: include),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterWhereClause>
-  isarIdLessThan(Id isarId, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.lessThan(upper: isarId, includeUpper: include),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterWhereClause>
-  isarIdBetween(
-    Id lowerIsarId,
-    Id upperIsarId, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.between(
-          lower: lowerIsarId,
-          includeLower: includeLower,
-          upper: upperIsarId,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-}
-
-extension DuplicatedAssetQueryFilter
-    on QueryBuilder<DuplicatedAsset, DuplicatedAsset, QFilterCondition> {
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterFilterCondition>
-  idEqualTo(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterFilterCondition>
-  idGreaterThan(
-    String value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterFilterCondition>
-  idLessThan(String value, {bool include = false, bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterFilterCondition>
-  idBetween(
-    String lower,
-    String upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'id',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterFilterCondition>
-  idStartsWith(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.startsWith(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterFilterCondition>
-  idEndsWith(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.endsWith(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterFilterCondition>
-  idContains(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.contains(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterFilterCondition>
-  idMatches(String pattern, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.matches(
-          property: r'id',
-          wildcard: pattern,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterFilterCondition>
-  idIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'id', value: ''),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterFilterCondition>
-  idIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(property: r'id', value: ''),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterFilterCondition>
-  isarIdEqualTo(Id value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'isarId', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterFilterCondition>
-  isarIdGreaterThan(Id value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'isarId',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterFilterCondition>
-  isarIdLessThan(Id value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'isarId',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterFilterCondition>
-  isarIdBetween(
-    Id lower,
-    Id upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'isarId',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-}
-
-extension DuplicatedAssetQueryObject
-    on QueryBuilder<DuplicatedAsset, DuplicatedAsset, QFilterCondition> {}
-
-extension DuplicatedAssetQueryLinks
-    on QueryBuilder<DuplicatedAsset, DuplicatedAsset, QFilterCondition> {}
-
-extension DuplicatedAssetQuerySortBy
-    on QueryBuilder<DuplicatedAsset, DuplicatedAsset, QSortBy> {
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterSortBy> sortById() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.asc);
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterSortBy> sortByIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.desc);
-    });
-  }
-}
-
-extension DuplicatedAssetQuerySortThenBy
-    on QueryBuilder<DuplicatedAsset, DuplicatedAsset, QSortThenBy> {
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterSortBy> thenById() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.asc);
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterSortBy> thenByIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.desc);
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterSortBy> thenByIsarId() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'isarId', Sort.asc);
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QAfterSortBy>
-  thenByIsarIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'isarId', Sort.desc);
-    });
-  }
-}
-
-extension DuplicatedAssetQueryWhereDistinct
-    on QueryBuilder<DuplicatedAsset, DuplicatedAsset, QDistinct> {
-  QueryBuilder<DuplicatedAsset, DuplicatedAsset, QDistinct> distinctById({
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'id', caseSensitive: caseSensitive);
-    });
-  }
-}
-
-extension DuplicatedAssetQueryProperty
-    on QueryBuilder<DuplicatedAsset, DuplicatedAsset, QQueryProperty> {
-  QueryBuilder<DuplicatedAsset, int, QQueryOperations> isarIdProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'isarId');
-    });
-  }
-
-  QueryBuilder<DuplicatedAsset, String, QQueryOperations> idProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'id');
-    });
-  }
-}

mobile/lib/entities/etag.entity.dart

@@ -1,14 +0,0 @@
-import 'package:immich_mobile/utils/hash.dart';
-import 'package:isar/isar.dart';
-
-part 'etag.entity.g.dart';
-
-@Collection(inheritance: false)
-class ETag {
-  ETag({required this.id, this.assetCount, this.time});
-  Id get isarId => fastHash(id);
-  @Index(unique: true, replace: true, type: IndexType.hash)
-  String id;
-  int? assetCount;
-  DateTime? time;
-}

mobile/lib/entities/etag.entity.g.dart

@@ -1,796 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'etag.entity.dart';
-
-// **************************************************************************
-// IsarCollectionGenerator
-// **************************************************************************
-
-// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
-
-extension GetETagCollection on Isar {
-  IsarCollection<ETag> get eTags => this.collection();
-}
-
-const ETagSchema = CollectionSchema(
-  name: r'ETag',
-  id: -644290296585643859,
-  properties: {
-    r'assetCount': PropertySchema(
-      id: 0,
-      name: r'assetCount',
-      type: IsarType.long,
-    ),
-    r'id': PropertySchema(id: 1, name: r'id', type: IsarType.string),
-    r'time': PropertySchema(id: 2, name: r'time', type: IsarType.dateTime),
-  },
-
-  estimateSize: _eTagEstimateSize,
-  serialize: _eTagSerialize,
-  deserialize: _eTagDeserialize,
-  deserializeProp: _eTagDeserializeProp,
-  idName: r'isarId',
-  indexes: {
-    r'id': IndexSchema(
-      id: -3268401673993471357,
-      name: r'id',
-      unique: true,
-      replace: true,
-      properties: [
-        IndexPropertySchema(
-          name: r'id',
-          type: IndexType.hash,
-          caseSensitive: true,
-        ),
-      ],
-    ),
-  },
-  links: {},
-  embeddedSchemas: {},
-
-  getId: _eTagGetId,
-  getLinks: _eTagGetLinks,
-  attach: _eTagAttach,
-  version: '3.3.0-dev.3',
-);
-
-int _eTagEstimateSize(
-  ETag object,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  var bytesCount = offsets.last;
-  bytesCount += 3 + object.id.length * 3;
-  return bytesCount;
-}
-
-void _eTagSerialize(
-  ETag object,
-  IsarWriter writer,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  writer.writeLong(offsets[0], object.assetCount);
-  writer.writeString(offsets[1], object.id);
-  writer.writeDateTime(offsets[2], object.time);
-}
-
-ETag _eTagDeserialize(
-  Id id,
-  IsarReader reader,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  final object = ETag(
-    assetCount: reader.readLongOrNull(offsets[0]),
-    id: reader.readString(offsets[1]),
-    time: reader.readDateTimeOrNull(offsets[2]),
-  );
-  return object;
-}
-
-P _eTagDeserializeProp<P>(
-  IsarReader reader,
-  int propertyId,
-  int offset,
-  Map<Type, List<int>> allOffsets,
-) {
-  switch (propertyId) {
-    case 0:
-      return (reader.readLongOrNull(offset)) as P;
-    case 1:
-      return (reader.readString(offset)) as P;
-    case 2:
-      return (reader.readDateTimeOrNull(offset)) as P;
-    default:
-      throw IsarError('Unknown property with id $propertyId');
-  }
-}
-
-Id _eTagGetId(ETag object) {
-  return object.isarId;
-}
-
-List<IsarLinkBase<dynamic>> _eTagGetLinks(ETag object) {
-  return [];
-}
-
-void _eTagAttach(IsarCollection<dynamic> col, Id id, ETag object) {}
-
-extension ETagByIndex on IsarCollection<ETag> {
-  Future<ETag?> getById(String id) {
-    return getByIndex(r'id', [id]);
-  }
-
-  ETag? getByIdSync(String id) {
-    return getByIndexSync(r'id', [id]);
-  }
-
-  Future<bool> deleteById(String id) {
-    return deleteByIndex(r'id', [id]);
-  }
-
-  bool deleteByIdSync(String id) {
-    return deleteByIndexSync(r'id', [id]);
-  }
-
-  Future<List<ETag?>> getAllById(List<String> idValues) {
-    final values = idValues.map((e) => [e]).toList();
-    return getAllByIndex(r'id', values);
-  }
-
-  List<ETag?> getAllByIdSync(List<String> idValues) {
-    final values = idValues.map((e) => [e]).toList();
-    return getAllByIndexSync(r'id', values);
-  }
-
-  Future<int> deleteAllById(List<String> idValues) {
-    final values = idValues.map((e) => [e]).toList();
-    return deleteAllByIndex(r'id', values);
-  }
-
-  int deleteAllByIdSync(List<String> idValues) {
-    final values = idValues.map((e) => [e]).toList();
-    return deleteAllByIndexSync(r'id', values);
-  }
-
-  Future<Id> putById(ETag object) {
-    return putByIndex(r'id', object);
-  }
-
-  Id putByIdSync(ETag object, {bool saveLinks = true}) {
-    return putByIndexSync(r'id', object, saveLinks: saveLinks);
-  }
-
-  Future<List<Id>> putAllById(List<ETag> objects) {
-    return putAllByIndex(r'id', objects);
-  }
-
-  List<Id> putAllByIdSync(List<ETag> objects, {bool saveLinks = true}) {
-    return putAllByIndexSync(r'id', objects, saveLinks: saveLinks);
-  }
-}
-
-extension ETagQueryWhereSort on QueryBuilder<ETag, ETag, QWhere> {
-  QueryBuilder<ETag, ETag, QAfterWhere> anyIsarId() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(const IdWhereClause.any());
-    });
-  }
-}
-
-extension ETagQueryWhere on QueryBuilder<ETag, ETag, QWhereClause> {
-  QueryBuilder<ETag, ETag, QAfterWhereClause> isarIdEqualTo(Id isarId) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.between(lower: isarId, upper: isarId),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterWhereClause> isarIdNotEqualTo(Id isarId) {
-    return QueryBuilder.apply(this, (query) {
-      if (query.whereSort == Sort.asc) {
-        return query
-            .addWhereClause(
-              IdWhereClause.lessThan(upper: isarId, includeUpper: false),
-            )
-            .addWhereClause(
-              IdWhereClause.greaterThan(lower: isarId, includeLower: false),
-            );
-      } else {
-        return query
-            .addWhereClause(
-              IdWhereClause.greaterThan(lower: isarId, includeLower: false),
-            )
-            .addWhereClause(
-              IdWhereClause.lessThan(upper: isarId, includeUpper: false),
-            );
-      }
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterWhereClause> isarIdGreaterThan(
-    Id isarId, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.greaterThan(lower: isarId, includeLower: include),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterWhereClause> isarIdLessThan(
-    Id isarId, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.lessThan(upper: isarId, includeUpper: include),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterWhereClause> isarIdBetween(
-    Id lowerIsarId,
-    Id upperIsarId, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.between(
-          lower: lowerIsarId,
-          includeLower: includeLower,
-          upper: upperIsarId,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterWhereClause> idEqualTo(String id) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IndexWhereClause.equalTo(indexName: r'id', value: [id]),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterWhereClause> idNotEqualTo(String id) {
-    return QueryBuilder.apply(this, (query) {
-      if (query.whereSort == Sort.asc) {
-        return query
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'id',
-                lower: [],
-                upper: [id],
-                includeUpper: false,
-              ),
-            )
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'id',
-                lower: [id],
-                includeLower: false,
-                upper: [],
-              ),
-            );
-      } else {
-        return query
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'id',
-                lower: [id],
-                includeLower: false,
-                upper: [],
-              ),
-            )
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'id',
-                lower: [],
-                upper: [id],
-                includeUpper: false,
-              ),
-            );
-      }
-    });
-  }
-}
-
-extension ETagQueryFilter on QueryBuilder<ETag, ETag, QFilterCondition> {
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> assetCountIsNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        const FilterCondition.isNull(property: r'assetCount'),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> assetCountIsNotNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        const FilterCondition.isNotNull(property: r'assetCount'),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> assetCountEqualTo(
-    int? value,
-  ) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'assetCount', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> assetCountGreaterThan(
-    int? value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'assetCount',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> assetCountLessThan(
-    int? value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'assetCount',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> assetCountBetween(
-    int? lower,
-    int? upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'assetCount',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> idEqualTo(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> idGreaterThan(
-    String value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> idLessThan(
-    String value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> idBetween(
-    String lower,
-    String upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'id',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> idStartsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.startsWith(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> idEndsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.endsWith(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> idContains(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.contains(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> idMatches(
-    String pattern, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.matches(
-          property: r'id',
-          wildcard: pattern,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> idIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'id', value: ''),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> idIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(property: r'id', value: ''),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> isarIdEqualTo(Id value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'isarId', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> isarIdGreaterThan(
-    Id value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'isarId',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> isarIdLessThan(
-    Id value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'isarId',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> isarIdBetween(
-    Id lower,
-    Id upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'isarId',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> timeIsNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        const FilterCondition.isNull(property: r'time'),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> timeIsNotNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        const FilterCondition.isNotNull(property: r'time'),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> timeEqualTo(DateTime? value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'time', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> timeGreaterThan(
-    DateTime? value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'time',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> timeLessThan(
-    DateTime? value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'time',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterFilterCondition> timeBetween(
-    DateTime? lower,
-    DateTime? upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'time',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-}
-
-extension ETagQueryObject on QueryBuilder<ETag, ETag, QFilterCondition> {}
-
-extension ETagQueryLinks on QueryBuilder<ETag, ETag, QFilterCondition> {}
-
-extension ETagQuerySortBy on QueryBuilder<ETag, ETag, QSortBy> {
-  QueryBuilder<ETag, ETag, QAfterSortBy> sortByAssetCount() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'assetCount', Sort.asc);
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterSortBy> sortByAssetCountDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'assetCount', Sort.desc);
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterSortBy> sortById() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.asc);
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterSortBy> sortByIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.desc);
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterSortBy> sortByTime() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'time', Sort.asc);
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterSortBy> sortByTimeDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'time', Sort.desc);
-    });
-  }
-}
-
-extension ETagQuerySortThenBy on QueryBuilder<ETag, ETag, QSortThenBy> {
-  QueryBuilder<ETag, ETag, QAfterSortBy> thenByAssetCount() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'assetCount', Sort.asc);
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterSortBy> thenByAssetCountDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'assetCount', Sort.desc);
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterSortBy> thenById() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.asc);
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterSortBy> thenByIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.desc);
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterSortBy> thenByIsarId() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'isarId', Sort.asc);
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterSortBy> thenByIsarIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'isarId', Sort.desc);
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterSortBy> thenByTime() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'time', Sort.asc);
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QAfterSortBy> thenByTimeDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'time', Sort.desc);
-    });
-  }
-}
-
-extension ETagQueryWhereDistinct on QueryBuilder<ETag, ETag, QDistinct> {
-  QueryBuilder<ETag, ETag, QDistinct> distinctByAssetCount() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'assetCount');
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QDistinct> distinctById({
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'id', caseSensitive: caseSensitive);
-    });
-  }
-
-  QueryBuilder<ETag, ETag, QDistinct> distinctByTime() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'time');
-    });
-  }
-}
-
-extension ETagQueryProperty on QueryBuilder<ETag, ETag, QQueryProperty> {
-  QueryBuilder<ETag, int, QQueryOperations> isarIdProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'isarId');
-    });
-  }
-
-  QueryBuilder<ETag, int?, QQueryOperations> assetCountProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'assetCount');
-    });
-  }
-
-  QueryBuilder<ETag, String, QQueryOperations> idProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'id');
-    });
-  }
-
-  QueryBuilder<ETag, DateTime?, QQueryOperations> timeProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'time');
-    });
-  }
-}

mobile/lib/entities/ios_device_asset.entity.dart

@@ -1,14 +0,0 @@
-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.entity.g.dart';
-
-@Collection()
-class IOSDeviceAsset extends DeviceAsset {
-  IOSDeviceAsset({required this.id, required super.hash});
-
-  @Index(replace: true, unique: true, type: IndexType.hash)
-  String id;
-  Id get isarId => fastHash(id);
-}

mobile/lib/entities/ios_device_asset.entity.g.dart

@@ -1,766 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'ios_device_asset.entity.dart';
-
-// **************************************************************************
-// IsarCollectionGenerator
-// **************************************************************************
-
-// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
-
-extension GetIOSDeviceAssetCollection on Isar {
-  IsarCollection<IOSDeviceAsset> get iOSDeviceAssets => this.collection();
-}
-
-const IOSDeviceAssetSchema = CollectionSchema(
-  name: r'IOSDeviceAsset',
-  id: -1671546753821948030,
-  properties: {
-    r'hash': PropertySchema(id: 0, name: r'hash', type: IsarType.byteList),
-    r'id': PropertySchema(id: 1, name: r'id', type: IsarType.string),
-  },
-
-  estimateSize: _iOSDeviceAssetEstimateSize,
-  serialize: _iOSDeviceAssetSerialize,
-  deserialize: _iOSDeviceAssetDeserialize,
-  deserializeProp: _iOSDeviceAssetDeserializeProp,
-  idName: r'isarId',
-  indexes: {
-    r'id': IndexSchema(
-      id: -3268401673993471357,
-      name: r'id',
-      unique: true,
-      replace: true,
-      properties: [
-        IndexPropertySchema(
-          name: r'id',
-          type: IndexType.hash,
-          caseSensitive: true,
-        ),
-      ],
-    ),
-    r'hash': IndexSchema(
-      id: -7973251393006690288,
-      name: r'hash',
-      unique: false,
-      replace: false,
-      properties: [
-        IndexPropertySchema(
-          name: r'hash',
-          type: IndexType.hash,
-          caseSensitive: false,
-        ),
-      ],
-    ),
-  },
-  links: {},
-  embeddedSchemas: {},
-
-  getId: _iOSDeviceAssetGetId,
-  getLinks: _iOSDeviceAssetGetLinks,
-  attach: _iOSDeviceAssetAttach,
-  version: '3.3.0-dev.3',
-);
-
-int _iOSDeviceAssetEstimateSize(
-  IOSDeviceAsset object,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  var bytesCount = offsets.last;
-  bytesCount += 3 + object.hash.length;
-  bytesCount += 3 + object.id.length * 3;
-  return bytesCount;
-}
-
-void _iOSDeviceAssetSerialize(
-  IOSDeviceAsset object,
-  IsarWriter writer,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  writer.writeByteList(offsets[0], object.hash);
-  writer.writeString(offsets[1], object.id);
-}
-
-IOSDeviceAsset _iOSDeviceAssetDeserialize(
-  Id id,
-  IsarReader reader,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  final object = IOSDeviceAsset(
-    hash: reader.readByteList(offsets[0]) ?? [],
-    id: reader.readString(offsets[1]),
-  );
-  return object;
-}
-
-P _iOSDeviceAssetDeserializeProp<P>(
-  IsarReader reader,
-  int propertyId,
-  int offset,
-  Map<Type, List<int>> allOffsets,
-) {
-  switch (propertyId) {
-    case 0:
-      return (reader.readByteList(offset) ?? []) as P;
-    case 1:
-      return (reader.readString(offset)) as P;
-    default:
-      throw IsarError('Unknown property with id $propertyId');
-  }
-}
-
-Id _iOSDeviceAssetGetId(IOSDeviceAsset object) {
-  return object.isarId;
-}
-
-List<IsarLinkBase<dynamic>> _iOSDeviceAssetGetLinks(IOSDeviceAsset object) {
-  return [];
-}
-
-void _iOSDeviceAssetAttach(
-  IsarCollection<dynamic> col,
-  Id id,
-  IOSDeviceAsset object,
-) {}
-
-extension IOSDeviceAssetByIndex on IsarCollection<IOSDeviceAsset> {
-  Future<IOSDeviceAsset?> getById(String id) {
-    return getByIndex(r'id', [id]);
-  }
-
-  IOSDeviceAsset? getByIdSync(String id) {
-    return getByIndexSync(r'id', [id]);
-  }
-
-  Future<bool> deleteById(String id) {
-    return deleteByIndex(r'id', [id]);
-  }
-
-  bool deleteByIdSync(String id) {
-    return deleteByIndexSync(r'id', [id]);
-  }
-
-  Future<List<IOSDeviceAsset?>> getAllById(List<String> idValues) {
-    final values = idValues.map((e) => [e]).toList();
-    return getAllByIndex(r'id', values);
-  }
-
-  List<IOSDeviceAsset?> getAllByIdSync(List<String> idValues) {
-    final values = idValues.map((e) => [e]).toList();
-    return getAllByIndexSync(r'id', values);
-  }
-
-  Future<int> deleteAllById(List<String> idValues) {
-    final values = idValues.map((e) => [e]).toList();
-    return deleteAllByIndex(r'id', values);
-  }
-
-  int deleteAllByIdSync(List<String> idValues) {
-    final values = idValues.map((e) => [e]).toList();
-    return deleteAllByIndexSync(r'id', values);
-  }
-
-  Future<Id> putById(IOSDeviceAsset object) {
-    return putByIndex(r'id', object);
-  }
-
-  Id putByIdSync(IOSDeviceAsset object, {bool saveLinks = true}) {
-    return putByIndexSync(r'id', object, saveLinks: saveLinks);
-  }
-
-  Future<List<Id>> putAllById(List<IOSDeviceAsset> objects) {
-    return putAllByIndex(r'id', objects);
-  }
-
-  List<Id> putAllByIdSync(
-    List<IOSDeviceAsset> objects, {
-    bool saveLinks = true,
-  }) {
-    return putAllByIndexSync(r'id', objects, saveLinks: saveLinks);
-  }
-}
-
-extension IOSDeviceAssetQueryWhereSort
-    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QWhere> {
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhere> anyIsarId() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(const IdWhereClause.any());
-    });
-  }
-}
-
-extension IOSDeviceAssetQueryWhere
-    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QWhereClause> {
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause> isarIdEqualTo(
-    Id isarId,
-  ) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.between(lower: isarId, upper: isarId),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause>
-  isarIdNotEqualTo(Id isarId) {
-    return QueryBuilder.apply(this, (query) {
-      if (query.whereSort == Sort.asc) {
-        return query
-            .addWhereClause(
-              IdWhereClause.lessThan(upper: isarId, includeUpper: false),
-            )
-            .addWhereClause(
-              IdWhereClause.greaterThan(lower: isarId, includeLower: false),
-            );
-      } else {
-        return query
-            .addWhereClause(
-              IdWhereClause.greaterThan(lower: isarId, includeLower: false),
-            )
-            .addWhereClause(
-              IdWhereClause.lessThan(upper: isarId, includeUpper: false),
-            );
-      }
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause>
-  isarIdGreaterThan(Id isarId, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.greaterThan(lower: isarId, includeLower: include),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause>
-  isarIdLessThan(Id isarId, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.lessThan(upper: isarId, includeUpper: include),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause> isarIdBetween(
-    Id lowerIsarId,
-    Id upperIsarId, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.between(
-          lower: lowerIsarId,
-          includeLower: includeLower,
-          upper: upperIsarId,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause> idEqualTo(
-    String id,
-  ) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IndexWhereClause.equalTo(indexName: r'id', value: [id]),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause> idNotEqualTo(
-    String id,
-  ) {
-    return QueryBuilder.apply(this, (query) {
-      if (query.whereSort == Sort.asc) {
-        return query
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'id',
-                lower: [],
-                upper: [id],
-                includeUpper: false,
-              ),
-            )
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'id',
-                lower: [id],
-                includeLower: false,
-                upper: [],
-              ),
-            );
-      } else {
-        return query
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'id',
-                lower: [id],
-                includeLower: false,
-                upper: [],
-              ),
-            )
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'id',
-                lower: [],
-                upper: [id],
-                includeUpper: false,
-              ),
-            );
-      }
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause> hashEqualTo(
-    List<int> hash,
-  ) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IndexWhereClause.equalTo(indexName: r'hash', value: [hash]),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause>
-  hashNotEqualTo(List<int> hash) {
-    return QueryBuilder.apply(this, (query) {
-      if (query.whereSort == Sort.asc) {
-        return query
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'hash',
-                lower: [],
-                upper: [hash],
-                includeUpper: false,
-              ),
-            )
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'hash',
-                lower: [hash],
-                includeLower: false,
-                upper: [],
-              ),
-            );
-      } else {
-        return query
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'hash',
-                lower: [hash],
-                includeLower: false,
-                upper: [],
-              ),
-            )
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'hash',
-                lower: [],
-                upper: [hash],
-                includeUpper: false,
-              ),
-            );
-      }
-    });
-  }
-}
-
-extension IOSDeviceAssetQueryFilter
-    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QFilterCondition> {
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  hashElementEqualTo(int value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'hash', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  hashElementGreaterThan(int value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'hash',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  hashElementLessThan(int value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'hash',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  hashElementBetween(
-    int lower,
-    int upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'hash',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  hashLengthEqualTo(int length) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(r'hash', length, true, length, true);
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  hashIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(r'hash', 0, true, 0, true);
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  hashIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(r'hash', 0, false, 999999, true);
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  hashLengthLessThan(int length, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(r'hash', 0, true, length, include);
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  hashLengthGreaterThan(int length, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(r'hash', length, include, 999999, true);
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  hashLengthBetween(
-    int lower,
-    int upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(
-        r'hash',
-        lower,
-        includeLower,
-        upper,
-        includeUpper,
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition> idEqualTo(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  idGreaterThan(
-    String value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  idLessThan(String value, {bool include = false, bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition> idBetween(
-    String lower,
-    String upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'id',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  idStartsWith(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.startsWith(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  idEndsWith(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.endsWith(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  idContains(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.contains(
-          property: r'id',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition> idMatches(
-    String pattern, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.matches(
-          property: r'id',
-          wildcard: pattern,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  idIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'id', value: ''),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  idIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(property: r'id', value: ''),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  isarIdEqualTo(Id value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'isarId', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  isarIdGreaterThan(Id value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'isarId',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  isarIdLessThan(Id value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'isarId',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
-  isarIdBetween(
-    Id lower,
-    Id upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'isarId',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-}
-
-extension IOSDeviceAssetQueryObject
-    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QFilterCondition> {}
-
-extension IOSDeviceAssetQueryLinks
-    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QFilterCondition> {}
-
-extension IOSDeviceAssetQuerySortBy
-    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QSortBy> {
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterSortBy> sortById() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.asc);
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterSortBy> sortByIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.desc);
-    });
-  }
-}
-
-extension IOSDeviceAssetQuerySortThenBy
-    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QSortThenBy> {
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterSortBy> thenById() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.asc);
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterSortBy> thenByIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.desc);
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterSortBy> thenByIsarId() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'isarId', Sort.asc);
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterSortBy>
-  thenByIsarIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'isarId', Sort.desc);
-    });
-  }
-}
-
-extension IOSDeviceAssetQueryWhereDistinct
-    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QDistinct> {
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QDistinct> distinctByHash() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'hash');
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QDistinct> distinctById({
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'id', caseSensitive: caseSensitive);
-    });
-  }
-}
-
-extension IOSDeviceAssetQueryProperty
-    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QQueryProperty> {
-  QueryBuilder<IOSDeviceAsset, int, QQueryOperations> isarIdProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'isarId');
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, List<int>, QQueryOperations> hashProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'hash');
-    });
-  }
-
-  QueryBuilder<IOSDeviceAsset, String, QQueryOperations> idProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'id');
-    });
-  }
-}

mobile/lib/entities/store.entity.dart

@@ -1,38 +1,4 @@
-import 'dart:convert';
-import 'dart:typed_data';
-
-import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
 
 // ignore: non_constant_identifier_names
 final Store = StoreService.I;
-
-class SSLClientCertStoreVal {
-  final Uint8List data;
-  final String? password;
-
-  const SSLClientCertStoreVal(this.data, this.password);
-
-  Future<void> save() async {
-    final b64Str = base64Encode(data);
-    await Store.put(StoreKey.sslClientCertData, b64Str);
-    if (password != null) {
-      await Store.put(StoreKey.sslClientPasswd, password!);
-    }
-  }
-
-  static SSLClientCertStoreVal? load() {
-    final b64Str = Store.tryGet<String>(StoreKey.sslClientCertData);
-    if (b64Str == null) {
-      return null;
-    }
-    final Uint8List certData = base64Decode(b64Str);
-    final passwd = Store.tryGet<String>(StoreKey.sslClientPasswd);
-    return SSLClientCertStoreVal(certData, passwd);
-  }
-
-  static Future<void> delete() async {
-    await Store.delete(StoreKey.sslClientCertData);
-    await Store.delete(StoreKey.sslClientPasswd);
-  }
-}

mobile/lib/extensions/asset_extensions.dart

@@ -1,17 +1,72 @@
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/utils/timezone.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/exif.model.dart';
+import 'package:immich_mobile/extensions/string_extensions.dart';
+import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
+import 'package:openapi/api.dart' as api;
 
-extension TZExtension on Asset {
-  /// Returns the created time of the asset from the exif info (if available) or from
-  /// the fileCreatedAt field, adjusted to the timezone value from the exif info along with
-  /// the timezone offset in [Duration]
-  (DateTime, Duration) getTZAdjustedTimeAndOffset() {
-    DateTime dt = fileCreatedAt.toLocal();
+extension DTOToAsset on api.AssetResponseDto {
+  RemoteAsset toDto() {
+    return RemoteAsset(
+      id: id,
+      name: originalFileName,
+      checksum: checksum,
+      createdAt: fileCreatedAt,
+      updatedAt: updatedAt,
+      ownerId: ownerId,
+      visibility: visibility.toAssetVisibility(),
+      durationInSeconds: duration?.toDuration()?.inSeconds ?? 0,
+      height: height?.toInt(),
+      width: width?.toInt(),
+      isFavorite: isFavorite,
+      livePhotoVideoId: livePhotoVideoId,
+      thumbHash: thumbhash,
+      localId: null,
+      type: type.toAssetType(),
+      stackId: stack?.id,
+      isEdited: isEdited,
+    );
+  }
 
-    if (exifInfo?.dateTimeOriginal != null) {
-      return applyTimezoneOffset(dateTime: exifInfo!.dateTimeOriginal!, timeZone: exifInfo?.timeZone);
-    }
-
-    return (dt, dt.timeZoneOffset);
+  RemoteAssetExif toDtoWithExif() {
+    return RemoteAssetExif(
+      id: id,
+      name: originalFileName,
+      checksum: checksum,
+      createdAt: fileCreatedAt,
+      updatedAt: updatedAt,
+      ownerId: ownerId,
+      visibility: visibility.toAssetVisibility(),
+      durationInSeconds: duration?.toDuration()?.inSeconds ?? 0,
+      height: height?.toInt(),
+      width: width?.toInt(),
+      isFavorite: isFavorite,
+      livePhotoVideoId: livePhotoVideoId,
+      thumbHash: thumbhash,
+      localId: null,
+      type: type.toAssetType(),
+      stackId: stack?.id,
+      isEdited: isEdited,
+      exifInfo: exifInfo != null ? ExifDtoConverter.fromDto(exifInfo!) : const ExifInfo(),
+    );
   }
 }
+
+extension on api.AssetVisibility {
+  AssetVisibility toAssetVisibility() => switch (this) {
+    api.AssetVisibility.timeline => AssetVisibility.timeline,
+    api.AssetVisibility.hidden => AssetVisibility.hidden,
+    api.AssetVisibility.archive => AssetVisibility.archive,
+    api.AssetVisibility.locked => AssetVisibility.locked,
+    _ => AssetVisibility.timeline,
+  };
+}
+
+extension on api.AssetTypeEnum {
+  AssetType toAssetType() => switch (this) {
+    api.AssetTypeEnum.IMAGE => AssetType.image,
+    api.AssetTypeEnum.VIDEO => AssetType.video,
+    api.AssetTypeEnum.AUDIO => AssetType.audio,
+    api.AssetTypeEnum.OTHER => AssetType.other,
+    _ => throw Exception('Unknown AssetType value: $this'),
+  };
+}

mobile/lib/extensions/collection_extensions.dart

@@ -1,9 +1,6 @@
 import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
-import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/utils/hash.dart';
 
 extension ListExtension<E> on List<E> {
   List<E> uniqueConsecutive({int Function(E a, E b)? compare, void Function(E a, E b)? onDuplicate}) {
@@ -40,31 +37,6 @@ extension IntListExtension on Iterable<int> {
   }
 }
 
-extension AssetListExtension on Iterable<Asset> {
-  /// Returns the assets that are already available in the Immich server
-  Iterable<Asset> remoteOnly({void Function()? errorCallback}) {
-    final bool onlyRemote = every((e) => e.isRemote);
-    if (!onlyRemote) {
-      if (errorCallback != null) errorCallback();
-      return where((a) => a.isRemote);
-    }
-    return this;
-  }
-
-  /// Returns the assets that are owned by the user passed to the [owner] param
-  /// If [owner] is null, an empty list is returned
-  Iterable<Asset> ownedOnly(UserDto? owner, {void Function()? errorCallback}) {
-    if (owner == null) return [];
-    final isarUserId = fastHash(owner.id);
-    final bool onlyOwned = every((e) => e.ownerId == isarUserId);
-    if (!onlyOwned) {
-      if (errorCallback != null) errorCallback();
-      return where((a) => a.ownerId == isarUserId);
-    }
-    return this;
-  }
-}
-
 extension SortedByProperty<T> on Iterable<T> {
   Iterable<T> sortedByField(Comparable Function(T e) key) {
     return sorted((a, b) => key(a).compareTo(key(b)));

mobile/lib/extensions/object_extensions.dart

@@ -0,0 +1,3 @@
+extension Let<T extends Object> on T {
+  R let<R>(R Function(T) transform) => transform(this);
+}

mobile/lib/extensions/translate_extensions.dart

@@ -1,7 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
-import 'package:intl/message_format.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
+import 'package:intl/message_format.dart';
 
 extension StringTranslateExtension on String {
   String t({BuildContext? context, Map<String, Object>? args}) {

mobile/lib/infrastructure/entities/asset_edit.entity.dart

@@ -1,8 +1,10 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/asset_edit.model.dart';
+import 'package:immich_mobile/extensions/object_extensions.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+import 'package:openapi/api.dart' hide AssetEditAction;
 
 @TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)')
 class AssetEditEntity extends Table with DriftDefaultsMixin {
@@ -27,7 +29,12 @@ final JsonTypeConverter2<Map<String, Object?>, Uint8List, Object?> editParameter
 );
 
 extension AssetEditEntityDataDomainEx on AssetEditEntityData {
-  AssetEdit toDto() {
-    return AssetEdit(action: action, parameters: parameters);
+  AssetEdit? toDto() {
+    return switch (action) {
+      AssetEditAction.crop => CropParameters.fromJson(parameters)?.let(CropEdit.new),
+      AssetEditAction.rotate => RotateParameters.fromJson(parameters)?.let(RotateEdit.new),
+      AssetEditAction.mirror => MirrorParameters.fromJson(parameters)?.let(MirrorEdit.new),
+      AssetEditAction.other => null,
+    };
   }
 }

mobile/lib/infrastructure/entities/device_asset.entity.dart

@@ -1,25 +0,0 @@
-import 'dart:typed_data';
-
-import 'package:immich_mobile/domain/models/device_asset.model.dart';
-import 'package:immich_mobile/utils/hash.dart';
-import 'package:isar/isar.dart';
-
-part 'device_asset.entity.g.dart';
-
-@Collection(inheritance: false)
-class DeviceAssetEntity {
-  Id get id => fastHash(assetId);
-
-  @Index(replace: true, unique: true, type: IndexType.hash)
-  final String assetId;
-  @Index(unique: false, type: IndexType.hash)
-  final List<byte> hash;
-  final DateTime modifiedTime;
-
-  const DeviceAssetEntity({required this.assetId, required this.hash, required this.modifiedTime});
-
-  DeviceAsset toModel() => DeviceAsset(assetId: assetId, hash: Uint8List.fromList(hash), modifiedTime: modifiedTime);
-
-  static DeviceAssetEntity fromDto(DeviceAsset dto) =>
-      DeviceAssetEntity(assetId: dto.assetId, hash: dto.hash, modifiedTime: dto.modifiedTime);
-}

mobile/lib/infrastructure/entities/device_asset.entity.g.dart

@@ -1,874 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'device_asset.entity.dart';
-
-// **************************************************************************
-// IsarCollectionGenerator
-// **************************************************************************
-
-// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
-
-extension GetDeviceAssetEntityCollection on Isar {
-  IsarCollection<DeviceAssetEntity> get deviceAssetEntitys => this.collection();
-}
-
-const DeviceAssetEntitySchema = CollectionSchema(
-  name: r'DeviceAssetEntity',
-  id: 6967030785073446271,
-  properties: {
-    r'assetId': PropertySchema(id: 0, name: r'assetId', type: IsarType.string),
-    r'hash': PropertySchema(id: 1, name: r'hash', type: IsarType.byteList),
-    r'modifiedTime': PropertySchema(
-      id: 2,
-      name: r'modifiedTime',
-      type: IsarType.dateTime,
-    ),
-  },
-
-  estimateSize: _deviceAssetEntityEstimateSize,
-  serialize: _deviceAssetEntitySerialize,
-  deserialize: _deviceAssetEntityDeserialize,
-  deserializeProp: _deviceAssetEntityDeserializeProp,
-  idName: r'id',
-  indexes: {
-    r'assetId': IndexSchema(
-      id: 174362542210192109,
-      name: r'assetId',
-      unique: true,
-      replace: true,
-      properties: [
-        IndexPropertySchema(
-          name: r'assetId',
-          type: IndexType.hash,
-          caseSensitive: true,
-        ),
-      ],
-    ),
-    r'hash': IndexSchema(
-      id: -7973251393006690288,
-      name: r'hash',
-      unique: false,
-      replace: false,
-      properties: [
-        IndexPropertySchema(
-          name: r'hash',
-          type: IndexType.hash,
-          caseSensitive: false,
-        ),
-      ],
-    ),
-  },
-  links: {},
-  embeddedSchemas: {},
-
-  getId: _deviceAssetEntityGetId,
-  getLinks: _deviceAssetEntityGetLinks,
-  attach: _deviceAssetEntityAttach,
-  version: '3.3.0-dev.3',
-);
-
-int _deviceAssetEntityEstimateSize(
-  DeviceAssetEntity object,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  var bytesCount = offsets.last;
-  bytesCount += 3 + object.assetId.length * 3;
-  bytesCount += 3 + object.hash.length;
-  return bytesCount;
-}
-
-void _deviceAssetEntitySerialize(
-  DeviceAssetEntity object,
-  IsarWriter writer,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  writer.writeString(offsets[0], object.assetId);
-  writer.writeByteList(offsets[1], object.hash);
-  writer.writeDateTime(offsets[2], object.modifiedTime);
-}
-
-DeviceAssetEntity _deviceAssetEntityDeserialize(
-  Id id,
-  IsarReader reader,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  final object = DeviceAssetEntity(
-    assetId: reader.readString(offsets[0]),
-    hash: reader.readByteList(offsets[1]) ?? [],
-    modifiedTime: reader.readDateTime(offsets[2]),
-  );
-  return object;
-}
-
-P _deviceAssetEntityDeserializeProp<P>(
-  IsarReader reader,
-  int propertyId,
-  int offset,
-  Map<Type, List<int>> allOffsets,
-) {
-  switch (propertyId) {
-    case 0:
-      return (reader.readString(offset)) as P;
-    case 1:
-      return (reader.readByteList(offset) ?? []) as P;
-    case 2:
-      return (reader.readDateTime(offset)) as P;
-    default:
-      throw IsarError('Unknown property with id $propertyId');
-  }
-}
-
-Id _deviceAssetEntityGetId(DeviceAssetEntity object) {
-  return object.id;
-}
-
-List<IsarLinkBase<dynamic>> _deviceAssetEntityGetLinks(
-  DeviceAssetEntity object,
-) {
-  return [];
-}
-
-void _deviceAssetEntityAttach(
-  IsarCollection<dynamic> col,
-  Id id,
-  DeviceAssetEntity object,
-) {}
-
-extension DeviceAssetEntityByIndex on IsarCollection<DeviceAssetEntity> {
-  Future<DeviceAssetEntity?> getByAssetId(String assetId) {
-    return getByIndex(r'assetId', [assetId]);
-  }
-
-  DeviceAssetEntity? getByAssetIdSync(String assetId) {
-    return getByIndexSync(r'assetId', [assetId]);
-  }
-
-  Future<bool> deleteByAssetId(String assetId) {
-    return deleteByIndex(r'assetId', [assetId]);
-  }
-
-  bool deleteByAssetIdSync(String assetId) {
-    return deleteByIndexSync(r'assetId', [assetId]);
-  }
-
-  Future<List<DeviceAssetEntity?>> getAllByAssetId(List<String> assetIdValues) {
-    final values = assetIdValues.map((e) => [e]).toList();
-    return getAllByIndex(r'assetId', values);
-  }
-
-  List<DeviceAssetEntity?> getAllByAssetIdSync(List<String> assetIdValues) {
-    final values = assetIdValues.map((e) => [e]).toList();
-    return getAllByIndexSync(r'assetId', values);
-  }
-
-  Future<int> deleteAllByAssetId(List<String> assetIdValues) {
-    final values = assetIdValues.map((e) => [e]).toList();
-    return deleteAllByIndex(r'assetId', values);
-  }
-
-  int deleteAllByAssetIdSync(List<String> assetIdValues) {
-    final values = assetIdValues.map((e) => [e]).toList();
-    return deleteAllByIndexSync(r'assetId', values);
-  }
-
-  Future<Id> putByAssetId(DeviceAssetEntity object) {
-    return putByIndex(r'assetId', object);
-  }
-
-  Id putByAssetIdSync(DeviceAssetEntity object, {bool saveLinks = true}) {
-    return putByIndexSync(r'assetId', object, saveLinks: saveLinks);
-  }
-
-  Future<List<Id>> putAllByAssetId(List<DeviceAssetEntity> objects) {
-    return putAllByIndex(r'assetId', objects);
-  }
-
-  List<Id> putAllByAssetIdSync(
-    List<DeviceAssetEntity> objects, {
-    bool saveLinks = true,
-  }) {
-    return putAllByIndexSync(r'assetId', objects, saveLinks: saveLinks);
-  }
-}
-
-extension DeviceAssetEntityQueryWhereSort
-    on QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QWhere> {
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterWhere> anyId() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(const IdWhereClause.any());
-    });
-  }
-}
-
-extension DeviceAssetEntityQueryWhere
-    on QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QWhereClause> {
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterWhereClause>
-  idEqualTo(Id id) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(IdWhereClause.between(lower: id, upper: id));
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterWhereClause>
-  idNotEqualTo(Id id) {
-    return QueryBuilder.apply(this, (query) {
-      if (query.whereSort == Sort.asc) {
-        return query
-            .addWhereClause(
-              IdWhereClause.lessThan(upper: id, includeUpper: false),
-            )
-            .addWhereClause(
-              IdWhereClause.greaterThan(lower: id, includeLower: false),
-            );
-      } else {
-        return query
-            .addWhereClause(
-              IdWhereClause.greaterThan(lower: id, includeLower: false),
-            )
-            .addWhereClause(
-              IdWhereClause.lessThan(upper: id, includeUpper: false),
-            );
-      }
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterWhereClause>
-  idGreaterThan(Id id, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.greaterThan(lower: id, includeLower: include),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterWhereClause>
-  idLessThan(Id id, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.lessThan(upper: id, includeUpper: include),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterWhereClause>
-  idBetween(
-    Id lowerId,
-    Id upperId, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.between(
-          lower: lowerId,
-          includeLower: includeLower,
-          upper: upperId,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterWhereClause>
-  assetIdEqualTo(String assetId) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IndexWhereClause.equalTo(indexName: r'assetId', value: [assetId]),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterWhereClause>
-  assetIdNotEqualTo(String assetId) {
-    return QueryBuilder.apply(this, (query) {
-      if (query.whereSort == Sort.asc) {
-        return query
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'assetId',
-                lower: [],
-                upper: [assetId],
-                includeUpper: false,
-              ),
-            )
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'assetId',
-                lower: [assetId],
-                includeLower: false,
-                upper: [],
-              ),
-            );
-      } else {
-        return query
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'assetId',
-                lower: [assetId],
-                includeLower: false,
-                upper: [],
-              ),
-            )
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'assetId',
-                lower: [],
-                upper: [assetId],
-                includeUpper: false,
-              ),
-            );
-      }
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterWhereClause>
-  hashEqualTo(List<int> hash) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IndexWhereClause.equalTo(indexName: r'hash', value: [hash]),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterWhereClause>
-  hashNotEqualTo(List<int> hash) {
-    return QueryBuilder.apply(this, (query) {
-      if (query.whereSort == Sort.asc) {
-        return query
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'hash',
-                lower: [],
-                upper: [hash],
-                includeUpper: false,
-              ),
-            )
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'hash',
-                lower: [hash],
-                includeLower: false,
-                upper: [],
-              ),
-            );
-      } else {
-        return query
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'hash',
-                lower: [hash],
-                includeLower: false,
-                upper: [],
-              ),
-            )
-            .addWhereClause(
-              IndexWhereClause.between(
-                indexName: r'hash',
-                lower: [],
-                upper: [hash],
-                includeUpper: false,
-              ),
-            );
-      }
-    });
-  }
-}
-
-extension DeviceAssetEntityQueryFilter
-    on QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QFilterCondition> {
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  assetIdEqualTo(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(
-          property: r'assetId',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  assetIdGreaterThan(
-    String value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'assetId',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  assetIdLessThan(
-    String value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'assetId',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  assetIdBetween(
-    String lower,
-    String upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'assetId',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  assetIdStartsWith(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.startsWith(
-          property: r'assetId',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  assetIdEndsWith(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.endsWith(
-          property: r'assetId',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  assetIdContains(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.contains(
-          property: r'assetId',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  assetIdMatches(String pattern, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.matches(
-          property: r'assetId',
-          wildcard: pattern,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  assetIdIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'assetId', value: ''),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  assetIdIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(property: r'assetId', value: ''),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  hashElementEqualTo(int value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'hash', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  hashElementGreaterThan(int value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'hash',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  hashElementLessThan(int value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'hash',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  hashElementBetween(
-    int lower,
-    int upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'hash',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  hashLengthEqualTo(int length) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(r'hash', length, true, length, true);
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  hashIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(r'hash', 0, true, 0, true);
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  hashIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(r'hash', 0, false, 999999, true);
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  hashLengthLessThan(int length, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(r'hash', 0, true, length, include);
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  hashLengthGreaterThan(int length, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(r'hash', length, include, 999999, true);
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  hashLengthBetween(
-    int lower,
-    int upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(
-        r'hash',
-        lower,
-        includeLower,
-        upper,
-        includeUpper,
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  idEqualTo(Id value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'id', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  idGreaterThan(Id value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'id',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  idLessThan(Id value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'id',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  idBetween(
-    Id lower,
-    Id upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'id',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  modifiedTimeEqualTo(DateTime value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'modifiedTime', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  modifiedTimeGreaterThan(DateTime value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'modifiedTime',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  modifiedTimeLessThan(DateTime value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'modifiedTime',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterFilterCondition>
-  modifiedTimeBetween(
-    DateTime lower,
-    DateTime upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'modifiedTime',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-}
-
-extension DeviceAssetEntityQueryObject
-    on QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QFilterCondition> {}
-
-extension DeviceAssetEntityQueryLinks
-    on QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QFilterCondition> {}
-
-extension DeviceAssetEntityQuerySortBy
-    on QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QSortBy> {
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterSortBy>
-  sortByAssetId() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'assetId', Sort.asc);
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterSortBy>
-  sortByAssetIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'assetId', Sort.desc);
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterSortBy>
-  sortByModifiedTime() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'modifiedTime', Sort.asc);
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterSortBy>
-  sortByModifiedTimeDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'modifiedTime', Sort.desc);
-    });
-  }
-}
-
-extension DeviceAssetEntityQuerySortThenBy
-    on QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QSortThenBy> {
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterSortBy>
-  thenByAssetId() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'assetId', Sort.asc);
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterSortBy>
-  thenByAssetIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'assetId', Sort.desc);
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterSortBy> thenById() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.asc);
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterSortBy>
-  thenByIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.desc);
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterSortBy>
-  thenByModifiedTime() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'modifiedTime', Sort.asc);
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QAfterSortBy>
-  thenByModifiedTimeDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'modifiedTime', Sort.desc);
-    });
-  }
-}
-
-extension DeviceAssetEntityQueryWhereDistinct
-    on QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QDistinct> {
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QDistinct>
-  distinctByAssetId({bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'assetId', caseSensitive: caseSensitive);
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QDistinct>
-  distinctByHash() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'hash');
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QDistinct>
-  distinctByModifiedTime() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'modifiedTime');
-    });
-  }
-}
-
-extension DeviceAssetEntityQueryProperty
-    on QueryBuilder<DeviceAssetEntity, DeviceAssetEntity, QQueryProperty> {
-  QueryBuilder<DeviceAssetEntity, int, QQueryOperations> idProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'id');
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, String, QQueryOperations> assetIdProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'assetId');
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, List<int>, QQueryOperations> hashProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'hash');
-    });
-  }
-
-  QueryBuilder<DeviceAssetEntity, DateTime, QQueryOperations>
-  modifiedTimeProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'modifiedTime');
-    });
-  }
-}

mobile/lib/infrastructure/entities/exif.entity.dart

@@ -4,96 +4,6 @@ import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
-import 'package:isar/isar.dart';
-
-part 'exif.entity.g.dart';
-
-/// Exif information 1:1 relation with Asset
-@Collection(inheritance: false)
-class ExifInfo {
-  final Id? id;
-  final int? fileSize;
-  final DateTime? dateTimeOriginal;
-  final String? timeZone;
-  final String? make;
-  final String? model;
-  final String? lens;
-  final float? f;
-  final float? mm;
-  final short? iso;
-  final float? exposureSeconds;
-  final float? lat;
-  final float? long;
-  final String? city;
-  final String? state;
-  final String? country;
-  final String? description;
-  final String? orientation;
-
-  const ExifInfo({
-    this.id,
-    this.fileSize,
-    this.dateTimeOriginal,
-    this.timeZone,
-    this.make,
-    this.model,
-    this.lens,
-    this.f,
-    this.mm,
-    this.iso,
-    this.exposureSeconds,
-    this.lat,
-    this.long,
-    this.city,
-    this.state,
-    this.country,
-    this.description,
-    this.orientation,
-  });
-
-  static ExifInfo fromDto(domain.ExifInfo dto) => ExifInfo(
-    id: dto.assetId,
-    fileSize: dto.fileSize,
-    dateTimeOriginal: dto.dateTimeOriginal,
-    timeZone: dto.timeZone,
-    make: dto.make,
-    model: dto.model,
-    lens: dto.lens,
-    f: dto.f,
-    mm: dto.mm,
-    iso: dto.iso?.toInt(),
-    exposureSeconds: dto.exposureSeconds,
-    lat: dto.latitude,
-    long: dto.longitude,
-    city: dto.city,
-    state: dto.state,
-    country: dto.country,
-    description: dto.description,
-    orientation: dto.orientation,
-  );
-
-  domain.ExifInfo toDto() => domain.ExifInfo(
-    assetId: id,
-    fileSize: fileSize,
-    description: description,
-    orientation: orientation,
-    timeZone: timeZone,
-    dateTimeOriginal: dateTimeOriginal,
-    isFlipped: ExifDtoConverter.isOrientationFlipped(orientation),
-    latitude: lat,
-    longitude: long,
-    city: city,
-    state: state,
-    country: country,
-    make: make,
-    model: model,
-    lens: lens,
-    f: f,
-    mm: mm,
-    iso: iso?.toInt(),
-    exposureSeconds: exposureSeconds,
-  );
-}
 
 @TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)')
 class RemoteExifEntity extends Table with DriftDefaultsMixin {
@@ -152,6 +62,8 @@ extension RemoteExifEntityDataDomainEx on RemoteExifEntityData {
     fileSize: fileSize,
     dateTimeOriginal: dateTimeOriginal,
     rating: rating,
+    width: width,
+    height: height,
     timeZone: timeZone,
     make: make,
     model: model,

mobile/lib/infrastructure/entities/store.entity.dart

@@ -1,18 +1,5 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
-import 'package:isar/isar.dart';
-
-part 'store.entity.g.dart';
-
-/// Internal class for `Store`, do not use elsewhere.
-@Collection(inheritance: false)
-class StoreValue {
-  final Id id;
-  final int? intValue;
-  final String? strValue;
-
-  const StoreValue(this.id, {this.intValue, this.strValue});
-}
 
 class StoreEntity extends Table with DriftDefaultsMixin {
   IntColumn get id => integer()();

mobile/lib/infrastructure/entities/store.entity.g.dart

@@ -1,596 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'store.entity.dart';
-
-// **************************************************************************
-// IsarCollectionGenerator
-// **************************************************************************
-
-// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
-
-extension GetStoreValueCollection on Isar {
-  IsarCollection<StoreValue> get storeValues => this.collection();
-}
-
-const StoreValueSchema = CollectionSchema(
-  name: r'StoreValue',
-  id: 902899285492123510,
-  properties: {
-    r'intValue': PropertySchema(id: 0, name: r'intValue', type: IsarType.long),
-    r'strValue': PropertySchema(
-      id: 1,
-      name: r'strValue',
-      type: IsarType.string,
-    ),
-  },
-
-  estimateSize: _storeValueEstimateSize,
-  serialize: _storeValueSerialize,
-  deserialize: _storeValueDeserialize,
-  deserializeProp: _storeValueDeserializeProp,
-  idName: r'id',
-  indexes: {},
-  links: {},
-  embeddedSchemas: {},
-
-  getId: _storeValueGetId,
-  getLinks: _storeValueGetLinks,
-  attach: _storeValueAttach,
-  version: '3.3.0-dev.3',
-);
-
-int _storeValueEstimateSize(
-  StoreValue object,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  var bytesCount = offsets.last;
-  {
-    final value = object.strValue;
-    if (value != null) {
-      bytesCount += 3 + value.length * 3;
-    }
-  }
-  return bytesCount;
-}
-
-void _storeValueSerialize(
-  StoreValue object,
-  IsarWriter writer,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  writer.writeLong(offsets[0], object.intValue);
-  writer.writeString(offsets[1], object.strValue);
-}
-
-StoreValue _storeValueDeserialize(
-  Id id,
-  IsarReader reader,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  final object = StoreValue(
-    id,
-    intValue: reader.readLongOrNull(offsets[0]),
-    strValue: reader.readStringOrNull(offsets[1]),
-  );
-  return object;
-}
-
-P _storeValueDeserializeProp<P>(
-  IsarReader reader,
-  int propertyId,
-  int offset,
-  Map<Type, List<int>> allOffsets,
-) {
-  switch (propertyId) {
-    case 0:
-      return (reader.readLongOrNull(offset)) as P;
-    case 1:
-      return (reader.readStringOrNull(offset)) as P;
-    default:
-      throw IsarError('Unknown property with id $propertyId');
-  }
-}
-
-Id _storeValueGetId(StoreValue object) {
-  return object.id;
-}
-
-List<IsarLinkBase<dynamic>> _storeValueGetLinks(StoreValue object) {
-  return [];
-}
-
-void _storeValueAttach(IsarCollection<dynamic> col, Id id, StoreValue object) {}
-
-extension StoreValueQueryWhereSort
-    on QueryBuilder<StoreValue, StoreValue, QWhere> {
-  QueryBuilder<StoreValue, StoreValue, QAfterWhere> anyId() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(const IdWhereClause.any());
-    });
-  }
-}
-
-extension StoreValueQueryWhere
-    on QueryBuilder<StoreValue, StoreValue, QWhereClause> {
-  QueryBuilder<StoreValue, StoreValue, QAfterWhereClause> idEqualTo(Id id) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(IdWhereClause.between(lower: id, upper: id));
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterWhereClause> idNotEqualTo(Id id) {
-    return QueryBuilder.apply(this, (query) {
-      if (query.whereSort == Sort.asc) {
-        return query
-            .addWhereClause(
-              IdWhereClause.lessThan(upper: id, includeUpper: false),
-            )
-            .addWhereClause(
-              IdWhereClause.greaterThan(lower: id, includeLower: false),
-            );
-      } else {
-        return query
-            .addWhereClause(
-              IdWhereClause.greaterThan(lower: id, includeLower: false),
-            )
-            .addWhereClause(
-              IdWhereClause.lessThan(upper: id, includeUpper: false),
-            );
-      }
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterWhereClause> idGreaterThan(
-    Id id, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.greaterThan(lower: id, includeLower: include),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterWhereClause> idLessThan(
-    Id id, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.lessThan(upper: id, includeUpper: include),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterWhereClause> idBetween(
-    Id lowerId,
-    Id upperId, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.between(
-          lower: lowerId,
-          includeLower: includeLower,
-          upper: upperId,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-}
-
-extension StoreValueQueryFilter
-    on QueryBuilder<StoreValue, StoreValue, QFilterCondition> {
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition> idEqualTo(
-    Id value,
-  ) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'id', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition> idGreaterThan(
-    Id value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'id',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition> idLessThan(
-    Id value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'id',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition> idBetween(
-    Id lower,
-    Id upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'id',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition> intValueIsNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        const FilterCondition.isNull(property: r'intValue'),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition>
-  intValueIsNotNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        const FilterCondition.isNotNull(property: r'intValue'),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition> intValueEqualTo(
-    int? value,
-  ) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'intValue', value: value),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition>
-  intValueGreaterThan(int? value, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'intValue',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition> intValueLessThan(
-    int? value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'intValue',
-          value: value,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition> intValueBetween(
-    int? lower,
-    int? upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'intValue',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition> strValueIsNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        const FilterCondition.isNull(property: r'strValue'),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition>
-  strValueIsNotNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        const FilterCondition.isNotNull(property: r'strValue'),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition> strValueEqualTo(
-    String? value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(
-          property: r'strValue',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition>
-  strValueGreaterThan(
-    String? value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(
-          include: include,
-          property: r'strValue',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition> strValueLessThan(
-    String? value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.lessThan(
-          include: include,
-          property: r'strValue',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition> strValueBetween(
-    String? lower,
-    String? upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.between(
-          property: r'strValue',
-          lower: lower,
-          includeLower: includeLower,
-          upper: upper,
-          includeUpper: includeUpper,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition>
-  strValueStartsWith(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.startsWith(
-          property: r'strValue',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition> strValueEndsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.endsWith(
-          property: r'strValue',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition> strValueContains(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.contains(
-          property: r'strValue',
-          value: value,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition> strValueMatches(
-    String pattern, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.matches(
-          property: r'strValue',
-          wildcard: pattern,
-          caseSensitive: caseSensitive,
-        ),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition>
-  strValueIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.equalTo(property: r'strValue', value: ''),
-      );
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterFilterCondition>
-  strValueIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(
-        FilterCondition.greaterThan(property: r'strValue', value: ''),
-      );
-    });
-  }
-}
-
-extension StoreValueQueryObject
-    on QueryBuilder<StoreValue, StoreValue, QFilterCondition> {}
-
-extension StoreValueQueryLinks
-    on QueryBuilder<StoreValue, StoreValue, QFilterCondition> {}
-
-extension StoreValueQuerySortBy
-    on QueryBuilder<StoreValue, StoreValue, QSortBy> {
-  QueryBuilder<StoreValue, StoreValue, QAfterSortBy> sortByIntValue() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'intValue', Sort.asc);
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterSortBy> sortByIntValueDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'intValue', Sort.desc);
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterSortBy> sortByStrValue() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'strValue', Sort.asc);
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterSortBy> sortByStrValueDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'strValue', Sort.desc);
-    });
-  }
-}
-
-extension StoreValueQuerySortThenBy
-    on QueryBuilder<StoreValue, StoreValue, QSortThenBy> {
-  QueryBuilder<StoreValue, StoreValue, QAfterSortBy> thenById() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.asc);
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterSortBy> thenByIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.desc);
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterSortBy> thenByIntValue() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'intValue', Sort.asc);
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterSortBy> thenByIntValueDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'intValue', Sort.desc);
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterSortBy> thenByStrValue() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'strValue', Sort.asc);
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QAfterSortBy> thenByStrValueDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'strValue', Sort.desc);
-    });
-  }
-}
-
-extension StoreValueQueryWhereDistinct
-    on QueryBuilder<StoreValue, StoreValue, QDistinct> {
-  QueryBuilder<StoreValue, StoreValue, QDistinct> distinctByIntValue() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'intValue');
-    });
-  }
-
-  QueryBuilder<StoreValue, StoreValue, QDistinct> distinctByStrValue({
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'strValue', caseSensitive: caseSensitive);
-    });
-  }
-}
-
-extension StoreValueQueryProperty
-    on QueryBuilder<StoreValue, StoreValue, QQueryProperty> {
-  QueryBuilder<StoreValue, int, QQueryOperations> idProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'id');
-    });
-  }
-
-  QueryBuilder<StoreValue, int?, QQueryOperations> intValueProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'intValue');
-    });
-  }
-
-  QueryBuilder<StoreValue, String?, QQueryOperations> strValueProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'strValue');
-    });
-  }
-}

mobile/lib/infrastructure/entities/user.entity.dart

@@ -1,79 +1,6 @@
 import 'package:drift/drift.dart' hide Index;
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
-import 'package:immich_mobile/utils/hash.dart';
-import 'package:isar/isar.dart';
-
-part 'user.entity.g.dart';
-
-@Collection(inheritance: false)
-class User {
-  Id get isarId => fastHash(id);
-  @Index(unique: true, replace: false, type: IndexType.hash)
-  final String id;
-  final DateTime updatedAt;
-  final String email;
-  final String name;
-  final bool isPartnerSharedBy;
-  final bool isPartnerSharedWith;
-  final bool isAdmin;
-  final String profileImagePath;
-  @Enumerated(EnumType.ordinal)
-  final AvatarColor avatarColor;
-  final bool memoryEnabled;
-  final bool inTimeline;
-  final int quotaUsageInBytes;
-  final int quotaSizeInBytes;
-
-  const User({
-    required this.id,
-    required this.updatedAt,
-    required this.email,
-    required this.name,
-    required this.isAdmin,
-    this.isPartnerSharedBy = false,
-    this.isPartnerSharedWith = false,
-    this.profileImagePath = '',
-    this.avatarColor = AvatarColor.primary,
-    this.memoryEnabled = true,
-    this.inTimeline = false,
-    this.quotaUsageInBytes = 0,
-    this.quotaSizeInBytes = 0,
-  });
-
-  static User fromDto(UserDto dto) => User(
-    id: dto.id,
-    updatedAt: dto.updatedAt ?? DateTime(2025),
-    email: dto.email,
-    name: dto.name,
-    isAdmin: dto.isAdmin,
-    isPartnerSharedBy: dto.isPartnerSharedBy,
-    isPartnerSharedWith: dto.isPartnerSharedWith,
-    profileImagePath: dto.hasProfileImage ? "HAS_PROFILE_IMAGE" : "",
-    avatarColor: dto.avatarColor,
-    memoryEnabled: dto.memoryEnabled,
-    inTimeline: dto.inTimeline,
-    quotaUsageInBytes: dto.quotaUsageInBytes,
-    quotaSizeInBytes: dto.quotaSizeInBytes,
-  );
-
-  UserDto toDto() => UserDto(
-    id: id,
-    email: email,
-    name: name,
-    isAdmin: isAdmin,
-    updatedAt: updatedAt,
-    avatarColor: avatarColor,
-    memoryEnabled: memoryEnabled,
-    inTimeline: inTimeline,
-    isPartnerSharedBy: isPartnerSharedBy,
-    isPartnerSharedWith: isPartnerSharedWith,
-    hasProfileImage: profileImagePath.isNotEmpty,
-    profileChangedAt: updatedAt,
-    quotaUsageInBytes: quotaUsageInBytes,
-    quotaSizeInBytes: quotaSizeInBytes,
-  );
-}
 
 class UserEntity extends Table with DriftDefaultsMixin {
   const UserEntity();

mobile/lib/infrastructure/repositories/db.repository.dart

@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
 import 'package:flutter/foundation.dart';
-import 'package:immich_mobile/domain/interfaces/db.interface.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/auth_user.entity.dart';
@@ -27,22 +26,6 @@ import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.steps.dart';
-import 'package:isar/isar.dart' hide Index;
-
-// #zoneTxn is the symbol used by Isar to mark a transaction within the current zone
-// ref: isar/isar_common.dart
-const Symbol _kzoneTxn = #zoneTxn;
-
-class IsarDatabaseRepository implements IDatabaseRepository {
-  final Isar _db;
-  const IsarDatabaseRepository(Isar db) : _db = db;
-
-  // Isar do not support nested transactions. This is a workaround to prevent us from making nested transactions
-  // Reuse the current transaction if it is already active, else start a new transaction
-  @override
-  Future<T> transaction<T>(Future<T> Function() callback) =>
-      Zone.current[_kzoneTxn] == null ? _db.writeTxn(callback) : callback();
-}
 
 @DriftDatabase(
   tables: [
@@ -70,7 +53,7 @@ class IsarDatabaseRepository implements IDatabaseRepository {
   ],
   include: {'package:immich_mobile/infrastructure/entities/merged_asset.drift'},
 )
-class Drift extends $Drift implements IDatabaseRepository {
+class Drift extends $Drift {
   Drift([QueryExecutor? executor])
     : super(executor ?? driftDatabase(name: 'immich', native: const DriftNativeOptions(shareAcrossIsolates: true)));
 
@@ -261,10 +244,9 @@ class Drift extends $Drift implements IDatabaseRepository {
   );
 }
 
-class DriftDatabaseRepository implements IDatabaseRepository {
+class DriftDatabaseRepository {
   final Drift _db;
   const DriftDatabaseRepository(this._db);
 
-  @override
   Future<T> transaction<T>(Future<T> Function() callback) => _db.transaction(callback);
 }

mobile/lib/infrastructure/repositories/device_asset.repository.dart

@@ -1,31 +0,0 @@
-import 'package:immich_mobile/domain/models/device_asset.model.dart';
-import 'package:immich_mobile/infrastructure/entities/device_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:isar/isar.dart';
-
-class IsarDeviceAssetRepository extends IsarDatabaseRepository {
-  final Isar _db;
-
-  const IsarDeviceAssetRepository(this._db) : super(_db);
-
-  Future<void> deleteIds(List<String> ids) {
-    return transaction(() async {
-      await _db.deviceAssetEntitys.deleteAllByAssetId(ids.toList());
-    });
-  }
-
-  Future<List<DeviceAsset>> getByIds(List<String> localIds) {
-    return _db.deviceAssetEntitys
-        .where()
-        .anyOf(localIds, (query, id) => query.assetIdEqualTo(id))
-        .findAll()
-        .then((value) => value.map((e) => e.toModel()).toList());
-  }
-
-  Future<bool> updateAll(List<DeviceAsset> assetHash) {
-    return transaction(() async {
-      await _db.deviceAssetEntitys.putAll(assetHash.map(DeviceAssetEntity.fromDto).toList());
-      return true;
-    });
-  }
-}

mobile/lib/infrastructure/repositories/exif.repository.dart

@@ -1,40 +0,0 @@
-import 'package:immich_mobile/domain/models/exif.model.dart';
-import 'package:immich_mobile/infrastructure/entities/exif.entity.dart' as entity;
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:isar/isar.dart';
-
-class IsarExifRepository extends IsarDatabaseRepository {
-  final Isar _db;
-
-  const IsarExifRepository(this._db) : super(_db);
-
-  Future<void> delete(int assetId) async {
-    await transaction(() async {
-      await _db.exifInfos.delete(assetId);
-    });
-  }
-
-  Future<void> deleteAll() async {
-    await transaction(() async {
-      await _db.exifInfos.clear();
-    });
-  }
-
-  Future<ExifInfo?> get(int assetId) async {
-    return (await _db.exifInfos.get(assetId))?.toDto();
-  }
-
-  Future<ExifInfo> update(ExifInfo exifInfo) {
-    return transaction(() async {
-      await _db.exifInfos.put(entity.ExifInfo.fromDto(exifInfo));
-      return exifInfo;
-    });
-  }
-
-  Future<List<ExifInfo>> updateAll(List<ExifInfo> exifInfos) {
-    return transaction(() async {
-      await _db.exifInfos.putAll(exifInfos.map(entity.ExifInfo.fromDto).toList());
-      return exifInfos;
-    });
-  }
-}

mobile/lib/infrastructure/repositories/logger_db.repository.dart

@@ -1,11 +1,10 @@
 import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
-import 'package:immich_mobile/domain/interfaces/db.interface.dart';
 import 'package:immich_mobile/infrastructure/entities/log.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.drift.dart';
 
 @DriftDatabase(tables: [LogMessageEntity])
-class DriftLogger extends $DriftLogger implements IDatabaseRepository {
+class DriftLogger extends $DriftLogger {
   DriftLogger([QueryExecutor? executor])
     : super(
         executor ?? driftDatabase(name: 'immich_logs', native: const DriftNativeOptions(shareAcrossIsolates: true)),

mobile/lib/infrastructure/repositories/network.repository.dart

@@ -22,7 +22,14 @@ class NetworkRepository {
       final session = URLSession.fromRawPointer(clientPointer.cast());
       _client = CupertinoClient.fromSharedSession(session);
     } else {
-      _client = OkHttpClient.fromJniGlobalRef(clientPointer);
+      _client = OkHttpClient.fromJniGlobalRef(
+        clientPointer,
+        configuration: const OkHttpClientConfiguration(
+          connectTimeout: Duration(seconds: 30),
+          readTimeout: Duration(seconds: 60),
+          writeTimeout: Duration(seconds: 60),
+        ),
+      );
     }
   }
 

mobile/lib/infrastructure/repositories/remote_asset.repository.dart

@@ -1,8 +1,10 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/asset_edit.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/domain/models/stack.model.dart';
-import 'package:immich_mobile/infrastructure/entities/exif.entity.dart' hide ExifInfo;
+import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
@@ -264,4 +266,11 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
   Future<int> getCount() {
     return _db.managers.remoteAssetEntity.count();
   }
+
+  Future<List<AssetEdit>> getAssetEdits(String assetId) {
+    final query = _db.assetEditEntity.select()
+      ..where((row) => row.assetId.equals(assetId) & row.action.equals(AssetEditAction.other.index).not())
+      ..orderBy([(row) => OrderingTerm.asc(row.sequence)]);
+    return query.map((row) => row.toDto()!).get();
+  }
 }

mobile/lib/infrastructure/repositories/store.repository.dart

@@ -1,150 +1,42 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
-import 'package:isar/isar.dart';
 
-// Temporary interface until Isar is removed to make the service work with both Isar and Sqlite
-abstract class IStoreRepository {
-  Future<bool> deleteAll();
-  Stream<List<StoreDto<Object>>> watchAll();
-  Future<void> delete<T>(StoreKey<T> key);
-  Future<bool> upsert<T>(StoreKey<T> key, T value);
-  Future<T?> tryGet<T>(StoreKey<T> key);
-  Stream<T?> watch<T>(StoreKey<T> key);
-  Future<List<StoreDto<Object>>> getAll();
-}
-
-class IsarStoreRepository extends IsarDatabaseRepository implements IStoreRepository {
-  final Isar _db;
-  final validStoreKeys = StoreKey.values.map((e) => e.id).toSet();
-
-  IsarStoreRepository(super.db) : _db = db;
-
-  @override
-  Future<bool> deleteAll() async {
-    return await transaction(() async {
-      await _db.storeValues.clear();
-      return true;
-    });
-  }
-
-  @override
-  Stream<List<StoreDto<Object>>> watchAll() {
-    return _db.storeValues
-        .filter()
-        .anyOf(validStoreKeys, (query, id) => query.idEqualTo(id))
-        .watch(fireImmediately: true)
-        .asyncMap((entities) => Future.wait(entities.map((entity) => _toUpdateEvent(entity))));
-  }
-
-  @override
-  Future<void> delete<T>(StoreKey<T> key) async {
-    return await transaction(() async => await _db.storeValues.delete(key.id));
-  }
-
-  @override
-  Future<bool> upsert<T>(StoreKey<T> key, T value) async {
-    return await transaction(() async {
-      await _db.storeValues.put(await _fromValue(key, value));
-      return true;
-    });
-  }
-
-  @override
-  Future<T?> tryGet<T>(StoreKey<T> key) async {
-    final entity = (await _db.storeValues.get(key.id));
-    if (entity == null) {
-      return null;
-    }
-    return await _toValue(key, entity);
-  }
-
-  @override
-  Stream<T?> watch<T>(StoreKey<T> key) async* {
-    yield* _db.storeValues
-        .watchObject(key.id, fireImmediately: true)
-        .asyncMap((e) async => e == null ? null : await _toValue(key, e));
-  }
-
-  Future<StoreDto<Object>> _toUpdateEvent(StoreValue entity) async {
-    final key = StoreKey.values.firstWhere((e) => e.id == entity.id) as StoreKey<Object>;
-    final value = await _toValue(key, entity);
-    return StoreDto(key, value);
-  }
-
-  Future<T?> _toValue<T>(StoreKey<T> key, StoreValue entity) async =>
-      switch (key.type) {
-            const (int) => entity.intValue,
-            const (String) => entity.strValue,
-            const (bool) => entity.intValue == 1,
-            const (DateTime) => entity.intValue == null ? null : DateTime.fromMillisecondsSinceEpoch(entity.intValue!),
-            const (UserDto) =>
-              entity.strValue == null ? null : await IsarUserRepository(_db).getByUserId(entity.strValue!),
-            _ => null,
-          }
-          as T?;
-
-  Future<StoreValue> _fromValue<T>(StoreKey<T> key, T value) async {
-    final (int? intValue, String? strValue) = switch (key.type) {
-      const (int) => (value as int, null),
-      const (String) => (null, value as String),
-      const (bool) => ((value as bool) ? 1 : 0, null),
-      const (DateTime) => ((value as DateTime).millisecondsSinceEpoch, null),
-      const (UserDto) => (null, (await IsarUserRepository(_db).update(value as UserDto)).id),
-      _ => throw UnsupportedError("Unsupported primitive type: ${key.type} for key: ${key.name}"),
-    };
-    return StoreValue(key.id, intValue: intValue, strValue: strValue);
-  }
-
-  @override
-  Future<List<StoreDto<Object>>> getAll() async {
-    final entities = await _db.storeValues.filter().anyOf(validStoreKeys, (query, id) => query.idEqualTo(id)).findAll();
-    return Future.wait(entities.map((e) => _toUpdateEvent(e)).toList());
-  }
-}
-
-class DriftStoreRepository extends DriftDatabaseRepository implements IStoreRepository {
+class DriftStoreRepository extends DriftDatabaseRepository {
   final Drift _db;
   final validStoreKeys = StoreKey.values.map((e) => e.id).toSet();
 
   DriftStoreRepository(super.db) : _db = db;
 
-  @override
   Future<bool> deleteAll() async {
     await _db.storeEntity.deleteAll();
     return true;
   }
 
-  @override
   Future<List<StoreDto<Object>>> getAll() async {
     final query = _db.storeEntity.select()..where((entity) => entity.id.isIn(validStoreKeys));
     return query.asyncMap((entity) => _toUpdateEvent(entity)).get();
   }
 
-  @override
   Stream<List<StoreDto<Object>>> watchAll() {
     final query = _db.storeEntity.select()..where((entity) => entity.id.isIn(validStoreKeys));
 
     return query.asyncMap((entity) => _toUpdateEvent(entity)).watch();
   }
 
-  @override
   Future<void> delete<T>(StoreKey<T> key) async {
     await _db.storeEntity.deleteWhere((entity) => entity.id.equals(key.id));
     return;
   }
 
-  @override
   Future<bool> upsert<T>(StoreKey<T> key, T value) async {
     await _db.storeEntity.insertOnConflictUpdate(await _fromValue(key, value));
     return true;
   }
 
-  @override
   Future<T?> tryGet<T>(StoreKey<T> key) async {
     final entity = await _db.managers.storeEntity.filter((entity) => entity.id.equals(key.id)).getSingleOrNull();
     if (entity == null) {
@@ -153,7 +45,6 @@ class DriftStoreRepository extends DriftDatabaseRepository implements IStoreRepo
     return await _toValue(key, entity);
   }
 
-  @override
   Stream<T?> watch<T>(StoreKey<T> key) async* {
     final query = _db.storeEntity.select()..where((entity) => entity.id.equals(key.id));
 

mobile/lib/infrastructure/repositories/user.repository.dart

@@ -1,72 +1,9 @@
 import 'package:drift/drift.dart';
-import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/models/user_metadata.model.dart';
 import 'package:immich_mobile/infrastructure/entities/auth_user.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/user.entity.dart' as entity;
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_metadata.repository.dart';
-import 'package:isar/isar.dart';
-
-class IsarUserRepository extends IsarDatabaseRepository {
-  final Isar _db;
-  const IsarUserRepository(super.db) : _db = db;
-
-  Future<void> delete(List<String> ids) async {
-    await transaction(() async {
-      await _db.users.deleteAllById(ids);
-    });
-  }
-
-  Future<void> deleteAll() async {
-    await transaction(() async {
-      await _db.users.clear();
-    });
-  }
-
-  Future<List<UserDto>> getAll({SortUserBy? sortBy}) async {
-    return (await _db.users
-            .where()
-            .optional(
-              sortBy != null,
-              (query) => switch (sortBy!) {
-                SortUserBy.id => query.sortById(),
-              },
-            )
-            .findAll())
-        .map((u) => u.toDto())
-        .toList();
-  }
-
-  Future<UserDto?> getByUserId(String id) async {
-    return (await _db.users.getById(id))?.toDto();
-  }
-
-  Future<List<UserDto?>> getByUserIds(List<String> ids) async {
-    return (await _db.users.getAllById(ids)).map((u) => u?.toDto()).toList();
-  }
-
-  Future<bool> insert(UserDto user) async {
-    await transaction(() async {
-      await _db.users.put(entity.User.fromDto(user));
-    });
-    return true;
-  }
-
-  Future<UserDto> update(UserDto user) async {
-    await transaction(() async {
-      await _db.users.put(entity.User.fromDto(user));
-    });
-    return user;
-  }
-
-  Future<bool> updateAll(List<UserDto> users) async {
-    await transaction(() async {
-      await _db.users.putAll(users.map(entity.User.fromDto).toList());
-    });
-    return true;
-  }
-}
 
 class DriftAuthUserRepository extends DriftDatabaseRepository {
   final Drift _db;
@@ -117,6 +54,7 @@ extension on AuthUserEntityData {
       id: id,
       email: email,
       name: name,
+      updatedAt: profileChangedAt,
       profileChangedAt: profileChangedAt,
       hasProfileImage: hasProfileImage,
       avatarColor: avatarColor,

mobile/lib/main.dart

@@ -14,7 +14,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/constants/locales.dart';
 import 'package:immich_mobile/domain/services/background_worker.service.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
@@ -24,7 +23,6 @@ import 'package:immich_mobile/pages/common/splash_screen.page.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/providers/app_life_cycle.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provider.dart';
-import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/locale_provider.dart';
@@ -32,9 +30,7 @@ import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/theme.provider.dart';
 import 'package:immich_mobile/routing/app_navigation_observer.dart';
 import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/services/background.service.dart';
 import 'package:immich_mobile/services/deep_link.service.dart';
-import 'package:immich_mobile/services/local_notification.service.dart';
 import 'package:immich_mobile/theme/dynamic_theme.dart';
 import 'package:immich_mobile/theme/theme_data.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
@@ -53,23 +49,13 @@ void main() async {
     ImmichWidgetsBinding();
     unawaited(BackgroundWorkerLockService(BackgroundWorkerLockApi()).lock());
     await EasyLocalization.ensureInitialized();
-    final (isar, drift, logDb) = await Bootstrap.initDB();
-    await Bootstrap.initDomain(isar, drift, logDb);
+    final (drift, _) = await Bootstrap.initDomain();
     await initApp();
     // Warm-up isolate pool for worker manager
     await workerManagerPatch.init(dynamicSpawning: true, isolatesCount: max(Platform.numberOfProcessors - 1, 5));
-    await migrateDatabaseIfNeeded(isar, drift);
+    await migrateDatabaseIfNeeded();
 
-    runApp(
-      ProviderScope(
-        overrides: [
-          dbProvider.overrideWithValue(isar),
-          isarProvider.overrideWithValue(isar),
-          driftProvider.overrideWith(driftOverride(drift)),
-        ],
-        child: const MainWidget(),
-      ),
-    );
+    runApp(ProviderScope(overrides: [driftProvider.overrideWith(driftOverride(drift))], child: const MainWidget()));
   } catch (error, stack) {
     runApp(BootstrapErrorWidget(error: error.toString(), stack: stack.toString()));
   }
@@ -176,7 +162,6 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
       }
     }
     SystemChrome.setSystemUIOverlayStyle(overlayStyle);
-    await ref.read(localNotificationService).setup();
   }
 
   Future<DeepLink> _deepLinkBuilder(PlatformDeepLink deepLink) async {
@@ -215,20 +200,14 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
     initApp().then((_) => dPrint(() => "App Init Completed"));
     WidgetsBinding.instance.addPostFrameCallback((_) {
       // needs to be delayed so that EasyLocalization is working
-      if (Store.isBetaTimelineEnabled) {
-        ref.read(backgroundServiceProvider).disableService();
-        ref.read(backgroundWorkerFgServiceProvider).enable();
-        if (Platform.isAndroid) {
-          ref
-              .read(backgroundWorkerFgServiceProvider)
-              .saveNotificationMessage(
-                StaticTranslations.instance.uploading_media,
-                StaticTranslations.instance.backup_background_service_default_notification,
-              );
-        }
-      } else {
-        ref.read(backgroundWorkerFgServiceProvider).disable();
-        ref.read(backgroundServiceProvider).resumeServiceIfEnabled();
+      ref.read(backgroundWorkerFgServiceProvider).enable();
+      if (Platform.isAndroid) {
+        ref
+            .read(backgroundWorkerFgServiceProvider)
+            .saveNotificationMessage(
+              StaticTranslations.instance.uploading_media,
+              StaticTranslations.instance.backup_background_service_default_notification,
+            );
       }
     });
 

mobile/lib/models/albums/album_add_asset_response.model.dart

@@ -1,38 +0,0 @@
-// ignore_for_file: public_member_api_docs, sort_constructors_first
-import 'dart:convert';
-
-import 'package:collection/collection.dart';
-
-class AlbumAddAssetsResponse {
-  List<String> alreadyInAlbum;
-  int successfullyAdded;
-
-  AlbumAddAssetsResponse({required this.alreadyInAlbum, required this.successfullyAdded});
-
-  AlbumAddAssetsResponse copyWith({List<String>? alreadyInAlbum, int? successfullyAdded}) {
-    return AlbumAddAssetsResponse(
-      alreadyInAlbum: alreadyInAlbum ?? this.alreadyInAlbum,
-      successfullyAdded: successfullyAdded ?? this.successfullyAdded,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{'alreadyInAlbum': alreadyInAlbum, 'successfullyAdded': successfullyAdded};
-  }
-
-  String toJson() => json.encode(toMap());
-
-  @override
-  String toString() => 'AddAssetsResponse(alreadyInAlbum: $alreadyInAlbum, successfullyAdded: $successfullyAdded)';
-
-  @override
-  bool operator ==(covariant AlbumAddAssetsResponse other) {
-    if (identical(this, other)) return true;
-    final listEquals = const DeepCollectionEquality().equals;
-
-    return listEquals(other.alreadyInAlbum, alreadyInAlbum) && other.successfullyAdded == successfullyAdded;
-  }
-
-  @override
-  int get hashCode => alreadyInAlbum.hashCode ^ successfullyAdded.hashCode;
-}

mobile/lib/models/albums/album_viewer_page_state.model.dart

@@ -1,60 +0,0 @@
-import 'dart:convert';
-
-class AlbumViewerPageState {
-  final bool isEditAlbum;
-  final String editTitleText;
-  final String editDescriptionText;
-
-  const AlbumViewerPageState({
-    required this.isEditAlbum,
-    required this.editTitleText,
-    required this.editDescriptionText,
-  });
-
-  AlbumViewerPageState copyWith({bool? isEditAlbum, String? editTitleText, String? editDescriptionText}) {
-    return AlbumViewerPageState(
-      isEditAlbum: isEditAlbum ?? this.isEditAlbum,
-      editTitleText: editTitleText ?? this.editTitleText,
-      editDescriptionText: editDescriptionText ?? this.editDescriptionText,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    final result = <String, dynamic>{};
-
-    result.addAll({'isEditAlbum': isEditAlbum});
-    result.addAll({'editTitleText': editTitleText});
-    result.addAll({'editDescriptionText': editDescriptionText});
-
-    return result;
-  }
-
-  factory AlbumViewerPageState.fromMap(Map<String, dynamic> map) {
-    return AlbumViewerPageState(
-      isEditAlbum: map['isEditAlbum'] ?? false,
-      editTitleText: map['editTitleText'] ?? '',
-      editDescriptionText: map['editDescriptionText'] ?? '',
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory AlbumViewerPageState.fromJson(String source) => AlbumViewerPageState.fromMap(json.decode(source));
-
-  @override
-  String toString() =>
-      'AlbumViewerPageState(isEditAlbum: $isEditAlbum, editTitleText: $editTitleText, editDescriptionText: $editDescriptionText)';
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-
-    return other is AlbumViewerPageState &&
-        other.isEditAlbum == isEditAlbum &&
-        other.editTitleText == editTitleText &&
-        other.editDescriptionText == editDescriptionText;
-  }
-
-  @override
-  int get hashCode => isEditAlbum.hashCode ^ editTitleText.hashCode ^ editDescriptionText.hashCode;
-}

mobile/lib/models/albums/asset_selection_page_result.model.dart

@@ -1,18 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-
-class AssetSelectionPageResult {
-  final Set<Asset> selectedAssets;
-
-  const AssetSelectionPageResult({required this.selectedAssets});
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-    final setEquals = const DeepCollectionEquality().equals;
-
-    return other is AssetSelectionPageResult && setEquals(other.selectedAssets, selectedAssets);
-  }
-
-  @override
-  int get hashCode => selectedAssets.hashCode;
-}

mobile/lib/models/asset_selection_state.dart

@@ -1,47 +0,0 @@
-import 'package:immich_mobile/entities/asset.entity.dart';
-
-class AssetSelectionState {
-  final bool hasRemote;
-  final bool hasLocal;
-  final bool hasMerged;
-  final int selectedCount;
-
-  const AssetSelectionState({
-    this.hasRemote = false,
-    this.hasLocal = false,
-    this.hasMerged = false,
-    this.selectedCount = 0,
-  });
-
-  AssetSelectionState copyWith({bool? hasRemote, bool? hasLocal, bool? hasMerged, int? selectedCount}) {
-    return AssetSelectionState(
-      hasRemote: hasRemote ?? this.hasRemote,
-      hasLocal: hasLocal ?? this.hasLocal,
-      hasMerged: hasMerged ?? this.hasMerged,
-      selectedCount: selectedCount ?? this.selectedCount,
-    );
-  }
-
-  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),
-      selectedCount = selection.length;
-
-  @override
-  String toString() =>
-      'SelectionAssetState(hasRemote: $hasRemote, hasLocal: $hasLocal, hasMerged: $hasMerged, selectedCount: $selectedCount)';
-
-  @override
-  bool operator ==(covariant AssetSelectionState other) {
-    if (identical(this, other)) return true;
-
-    return other.hasRemote == hasRemote &&
-        other.hasLocal == hasLocal &&
-        other.hasMerged == hasMerged &&
-        other.selectedCount == selectedCount;
-  }
-
-  @override
-  int get hashCode => hasRemote.hashCode ^ hasLocal.hashCode ^ hasMerged.hashCode ^ selectedCount.hashCode;
-}

mobile/lib/models/backup/available_album.model.dart

@@ -1,35 +0,0 @@
-import 'package:immich_mobile/entities/album.entity.dart';
-
-class AvailableAlbum {
-  final Album album;
-  final int assetCount;
-  final DateTime? lastBackup;
-  const AvailableAlbum({required this.album, required this.assetCount, this.lastBackup});
-
-  AvailableAlbum copyWith({Album? album, int? assetCount, DateTime? lastBackup}) {
-    return AvailableAlbum(
-      album: album ?? this.album,
-      assetCount: assetCount ?? this.assetCount,
-      lastBackup: lastBackup ?? this.lastBackup,
-    );
-  }
-
-  String get name => album.name;
-
-  String get id => album.localId!;
-
-  bool get isAll => album.isAll;
-
-  @override
-  String toString() => 'AvailableAlbum(albumEntity: $album, lastBackup: $lastBackup)';
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-
-    return other is AvailableAlbum && other.album == album;
-  }
-
-  @override
-  int get hashCode => album.hashCode;
-}

mobile/lib/models/backup/backup_candidate.model.dart

@@ -1,19 +0,0 @@
-import 'package:immich_mobile/entities/asset.entity.dart';
-
-class BackupCandidate {
-  BackupCandidate({required this.asset, required this.albumNames});
-
-  Asset asset;
-  List<String> albumNames;
-
-  @override
-  int get hashCode => asset.hashCode;
-
-  @override
-  bool operator ==(Object other) {
-    if (other is! BackupCandidate) {
-      return false;
-    }
-    return asset == other.asset;
-  }
-}

mobile/lib/models/backup/backup_state.model.dart

@@ -1,173 +0,0 @@
-// ignore_for_file: public_member_api_docs, sort_constructors_first
-
-import 'package:collection/collection.dart';
-import 'package:immich_mobile/models/backup/backup_candidate.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, inProgress, manualInProgress, inBackground, done }
-
-class BackUpState {
-  // enum
-  final BackUpProgressEnum backupProgress;
-  final List<String> allAssetsInDatabase;
-  final double progressInPercentage;
-  final String progressInFileSize;
-  final double progressInFileSpeed;
-  final List<double> progressInFileSpeeds;
-  final DateTime progressInFileSpeedUpdateTime;
-  final int progressInFileSpeedUpdateSentBytes;
-  final double iCloudDownloadProgress;
-  final ServerDiskInfo serverInfo;
-  final bool autoBackup;
-  final bool backgroundBackup;
-  final bool backupRequireWifi;
-  final bool backupRequireCharging;
-  final int backupTriggerDelay;
-
-  /// All available albums on the device
-  final List<AvailableAlbum> availableAlbums;
-  final Set<AvailableAlbum> selectedBackupAlbums;
-  final Set<AvailableAlbum> excludedBackupAlbums;
-
-  /// Assets that are not overlapping in selected backup albums and excluded backup albums
-  final Set<BackupCandidate> allUniqueAssets;
-
-  /// All assets from the selected albums that have been backup
-  final Set<String> selectedAlbumsBackupAssetsIds;
-
-  // Current Backup Asset
-  final CurrentUploadAsset currentUploadAsset;
-
-  const BackUpState({
-    required this.backupProgress,
-    required this.allAssetsInDatabase,
-    required this.progressInPercentage,
-    required this.progressInFileSize,
-    required this.progressInFileSpeed,
-    required this.progressInFileSpeeds,
-    required this.progressInFileSpeedUpdateTime,
-    required this.progressInFileSpeedUpdateSentBytes,
-    required this.iCloudDownloadProgress,
-    required this.serverInfo,
-    required this.autoBackup,
-    required this.backgroundBackup,
-    required this.backupRequireWifi,
-    required this.backupRequireCharging,
-    required this.backupTriggerDelay,
-    required this.availableAlbums,
-    required this.selectedBackupAlbums,
-    required this.excludedBackupAlbums,
-    required this.allUniqueAssets,
-    required this.selectedAlbumsBackupAssetsIds,
-    required this.currentUploadAsset,
-  });
-
-  BackUpState copyWith({
-    BackUpProgressEnum? backupProgress,
-    List<String>? allAssetsInDatabase,
-    double? progressInPercentage,
-    String? progressInFileSize,
-    double? progressInFileSpeed,
-    List<double>? progressInFileSpeeds,
-    DateTime? progressInFileSpeedUpdateTime,
-    int? progressInFileSpeedUpdateSentBytes,
-    double? iCloudDownloadProgress,
-    ServerDiskInfo? serverInfo,
-    bool? autoBackup,
-    bool? backgroundBackup,
-    bool? backupRequireWifi,
-    bool? backupRequireCharging,
-    int? backupTriggerDelay,
-    List<AvailableAlbum>? availableAlbums,
-    Set<AvailableAlbum>? selectedBackupAlbums,
-    Set<AvailableAlbum>? excludedBackupAlbums,
-    Set<BackupCandidate>? allUniqueAssets,
-    Set<String>? selectedAlbumsBackupAssetsIds,
-    CurrentUploadAsset? currentUploadAsset,
-  }) {
-    return BackUpState(
-      backupProgress: backupProgress ?? this.backupProgress,
-      allAssetsInDatabase: allAssetsInDatabase ?? this.allAssetsInDatabase,
-      progressInPercentage: progressInPercentage ?? this.progressInPercentage,
-      progressInFileSize: progressInFileSize ?? this.progressInFileSize,
-      progressInFileSpeed: progressInFileSpeed ?? this.progressInFileSpeed,
-      progressInFileSpeeds: progressInFileSpeeds ?? this.progressInFileSpeeds,
-      progressInFileSpeedUpdateTime: progressInFileSpeedUpdateTime ?? this.progressInFileSpeedUpdateTime,
-      progressInFileSpeedUpdateSentBytes: progressInFileSpeedUpdateSentBytes ?? this.progressInFileSpeedUpdateSentBytes,
-      iCloudDownloadProgress: iCloudDownloadProgress ?? this.iCloudDownloadProgress,
-      serverInfo: serverInfo ?? this.serverInfo,
-      autoBackup: autoBackup ?? this.autoBackup,
-      backgroundBackup: backgroundBackup ?? this.backgroundBackup,
-      backupRequireWifi: backupRequireWifi ?? this.backupRequireWifi,
-      backupRequireCharging: backupRequireCharging ?? this.backupRequireCharging,
-      backupTriggerDelay: backupTriggerDelay ?? this.backupTriggerDelay,
-      availableAlbums: availableAlbums ?? this.availableAlbums,
-      selectedBackupAlbums: selectedBackupAlbums ?? this.selectedBackupAlbums,
-      excludedBackupAlbums: excludedBackupAlbums ?? this.excludedBackupAlbums,
-      allUniqueAssets: allUniqueAssets ?? this.allUniqueAssets,
-      selectedAlbumsBackupAssetsIds: selectedAlbumsBackupAssetsIds ?? this.selectedAlbumsBackupAssetsIds,
-      currentUploadAsset: currentUploadAsset ?? this.currentUploadAsset,
-    );
-  }
-
-  @override
-  String toString() {
-    return 'BackUpState(backupProgress: $backupProgress, allAssetsInDatabase: $allAssetsInDatabase, progressInPercentage: $progressInPercentage, progressInFileSize: $progressInFileSize, progressInFileSpeed: $progressInFileSpeed, progressInFileSpeeds: $progressInFileSpeeds, progressInFileSpeedUpdateTime: $progressInFileSpeedUpdateTime, progressInFileSpeedUpdateSentBytes: $progressInFileSpeedUpdateSentBytes, iCloudDownloadProgress: $iCloudDownloadProgress, serverInfo: $serverInfo, autoBackup: $autoBackup, backgroundBackup: $backgroundBackup, backupRequireWifi: $backupRequireWifi, backupRequireCharging: $backupRequireCharging, backupTriggerDelay: $backupTriggerDelay, availableAlbums: $availableAlbums, selectedBackupAlbums: $selectedBackupAlbums, excludedBackupAlbums: $excludedBackupAlbums, allUniqueAssets: $allUniqueAssets, selectedAlbumsBackupAssetsIds: $selectedAlbumsBackupAssetsIds, currentUploadAsset: $currentUploadAsset)';
-  }
-
-  @override
-  bool operator ==(covariant BackUpState other) {
-    if (identical(this, other)) return true;
-    final collectionEquals = const DeepCollectionEquality().equals;
-
-    return other.backupProgress == backupProgress &&
-        collectionEquals(other.allAssetsInDatabase, allAssetsInDatabase) &&
-        other.progressInPercentage == progressInPercentage &&
-        other.progressInFileSize == progressInFileSize &&
-        other.progressInFileSpeed == progressInFileSpeed &&
-        collectionEquals(other.progressInFileSpeeds, progressInFileSpeeds) &&
-        other.progressInFileSpeedUpdateTime == progressInFileSpeedUpdateTime &&
-        other.progressInFileSpeedUpdateSentBytes == progressInFileSpeedUpdateSentBytes &&
-        other.iCloudDownloadProgress == iCloudDownloadProgress &&
-        other.serverInfo == serverInfo &&
-        other.autoBackup == autoBackup &&
-        other.backgroundBackup == backgroundBackup &&
-        other.backupRequireWifi == backupRequireWifi &&
-        other.backupRequireCharging == backupRequireCharging &&
-        other.backupTriggerDelay == backupTriggerDelay &&
-        collectionEquals(other.availableAlbums, availableAlbums) &&
-        collectionEquals(other.selectedBackupAlbums, selectedBackupAlbums) &&
-        collectionEquals(other.excludedBackupAlbums, excludedBackupAlbums) &&
-        collectionEquals(other.allUniqueAssets, allUniqueAssets) &&
-        collectionEquals(other.selectedAlbumsBackupAssetsIds, selectedAlbumsBackupAssetsIds) &&
-        other.currentUploadAsset == currentUploadAsset;
-  }
-
-  @override
-  int get hashCode {
-    return backupProgress.hashCode ^
-        allAssetsInDatabase.hashCode ^
-        progressInPercentage.hashCode ^
-        progressInFileSize.hashCode ^
-        progressInFileSpeed.hashCode ^
-        progressInFileSpeeds.hashCode ^
-        progressInFileSpeedUpdateTime.hashCode ^
-        progressInFileSpeedUpdateSentBytes.hashCode ^
-        iCloudDownloadProgress.hashCode ^
-        serverInfo.hashCode ^
-        autoBackup.hashCode ^
-        backgroundBackup.hashCode ^
-        backupRequireWifi.hashCode ^
-        backupRequireCharging.hashCode ^
-        backupTriggerDelay.hashCode ^
-        availableAlbums.hashCode ^
-        selectedBackupAlbums.hashCode ^
-        excludedBackupAlbums.hashCode ^
-        allUniqueAssets.hashCode ^
-        selectedAlbumsBackupAssetsIds.hashCode ^
-        currentUploadAsset.hashCode;
-  }
-}

mobile/lib/models/backup/current_upload_asset.model.dart

@@ -1,95 +0,0 @@
-// ignore_for_file: public_member_api_docs, sort_constructors_first
-import 'dart:convert';
-
-class CurrentUploadAsset {
-  final String id;
-  final DateTime fileCreatedAt;
-  final String fileName;
-  final String fileType;
-  final int? fileSize;
-  final bool? iCloudAsset;
-
-  const CurrentUploadAsset({
-    required this.id,
-    required this.fileCreatedAt,
-    required this.fileName,
-    required this.fileType,
-    this.fileSize,
-    this.iCloudAsset,
-  });
-
-  @pragma('vm:prefer-inline')
-  bool get isIcloudAsset => iCloudAsset != null && iCloudAsset!;
-
-  CurrentUploadAsset copyWith({
-    String? id,
-    DateTime? fileCreatedAt,
-    String? fileName,
-    String? fileType,
-    int? fileSize,
-    bool? iCloudAsset,
-  }) {
-    return CurrentUploadAsset(
-      id: id ?? this.id,
-      fileCreatedAt: fileCreatedAt ?? this.fileCreatedAt,
-      fileName: fileName ?? this.fileName,
-      fileType: fileType ?? this.fileType,
-      fileSize: fileSize ?? this.fileSize,
-      iCloudAsset: iCloudAsset ?? this.iCloudAsset,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'id': id,
-      'fileCreatedAt': fileCreatedAt.millisecondsSinceEpoch,
-      'fileName': fileName,
-      'fileType': fileType,
-      'fileSize': fileSize,
-      'iCloudAsset': iCloudAsset,
-    };
-  }
-
-  factory CurrentUploadAsset.fromMap(Map<String, dynamic> map) {
-    return CurrentUploadAsset(
-      id: map['id'] as String,
-      fileCreatedAt: DateTime.fromMillisecondsSinceEpoch(map['fileCreatedAt'] as int),
-      fileName: map['fileName'] as String,
-      fileType: map['fileType'] as String,
-      fileSize: map['fileSize'] as int,
-      iCloudAsset: map['iCloudAsset'] != null ? map['iCloudAsset'] as bool : null,
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory CurrentUploadAsset.fromJson(String source) =>
-      CurrentUploadAsset.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() {
-    return 'CurrentUploadAsset(id: $id, fileCreatedAt: $fileCreatedAt, fileName: $fileName, fileType: $fileType, fileSize: $fileSize, iCloudAsset: $iCloudAsset)';
-  }
-
-  @override
-  bool operator ==(covariant CurrentUploadAsset other) {
-    if (identical(this, other)) return true;
-
-    return other.id == id &&
-        other.fileCreatedAt == fileCreatedAt &&
-        other.fileName == fileName &&
-        other.fileType == fileType &&
-        other.fileSize == fileSize &&
-        other.iCloudAsset == iCloudAsset;
-  }
-
-  @override
-  int get hashCode {
-    return id.hashCode ^
-        fileCreatedAt.hashCode ^
-        fileName.hashCode ^
-        fileType.hashCode ^
-        fileSize.hashCode ^
-        iCloudAsset.hashCode;
-  }
-}

mobile/lib/models/backup/error_upload_asset.model.dart

@@ -1,65 +0,0 @@
-import 'package:immich_mobile/entities/asset.entity.dart';
-
-class ErrorUploadAsset {
-  final String id;
-  final DateTime fileCreatedAt;
-  final String fileName;
-  final String fileType;
-  final Asset asset;
-  final String errorMessage;
-
-  const ErrorUploadAsset({
-    required this.id,
-    required this.fileCreatedAt,
-    required this.fileName,
-    required this.fileType,
-    required this.asset,
-    required this.errorMessage,
-  });
-
-  ErrorUploadAsset copyWith({
-    String? id,
-    DateTime? fileCreatedAt,
-    String? fileName,
-    String? fileType,
-    Asset? asset,
-    String? errorMessage,
-  }) {
-    return ErrorUploadAsset(
-      id: id ?? this.id,
-      fileCreatedAt: fileCreatedAt ?? this.fileCreatedAt,
-      fileName: fileName ?? this.fileName,
-      fileType: fileType ?? this.fileType,
-      asset: asset ?? this.asset,
-      errorMessage: errorMessage ?? this.errorMessage,
-    );
-  }
-
-  @override
-  String toString() {
-    return 'ErrorUploadAsset(id: $id, fileCreatedAt: $fileCreatedAt, fileName: $fileName, fileType: $fileType, asset: $asset, errorMessage: $errorMessage)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-
-    return other is ErrorUploadAsset &&
-        other.id == id &&
-        other.fileCreatedAt == fileCreatedAt &&
-        other.fileName == fileName &&
-        other.fileType == fileType &&
-        other.asset == asset &&
-        other.errorMessage == errorMessage;
-  }
-
-  @override
-  int get hashCode {
-    return id.hashCode ^
-        fileCreatedAt.hashCode ^
-        fileName.hashCode ^
-        fileType.hashCode ^
-        asset.hashCode ^
-        errorMessage.hashCode;
-  }
-}

mobile/lib/models/backup/manual_upload_state.model.dart

@@ -1,102 +0,0 @@
-import 'package:collection/collection.dart';
-
-import 'package:immich_mobile/models/backup/current_upload_asset.model.dart';
-
-class ManualUploadState {
-  // Current Backup Asset
-  final CurrentUploadAsset currentUploadAsset;
-  final int currentAssetIndex;
-
-  final bool showDetailedNotification;
-
-  /// Manual Upload Stats
-  final int totalAssetsToUpload;
-  final int successfulUploads;
-  final double progressInPercentage;
-  final String progressInFileSize;
-  final double progressInFileSpeed;
-  final List<double> progressInFileSpeeds;
-  final DateTime progressInFileSpeedUpdateTime;
-  final int progressInFileSpeedUpdateSentBytes;
-
-  const ManualUploadState({
-    required this.progressInPercentage,
-    required this.progressInFileSize,
-    required this.progressInFileSpeed,
-    required this.progressInFileSpeeds,
-    required this.progressInFileSpeedUpdateTime,
-    required this.progressInFileSpeedUpdateSentBytes,
-    required this.currentUploadAsset,
-    required this.totalAssetsToUpload,
-    required this.currentAssetIndex,
-    required this.successfulUploads,
-    required this.showDetailedNotification,
-  });
-
-  ManualUploadState copyWith({
-    double? progressInPercentage,
-    String? progressInFileSize,
-    double? progressInFileSpeed,
-    List<double>? progressInFileSpeeds,
-    DateTime? progressInFileSpeedUpdateTime,
-    int? progressInFileSpeedUpdateSentBytes,
-    CurrentUploadAsset? currentUploadAsset,
-    int? totalAssetsToUpload,
-    int? successfulUploads,
-    int? currentAssetIndex,
-    bool? showDetailedNotification,
-  }) {
-    return ManualUploadState(
-      progressInPercentage: progressInPercentage ?? this.progressInPercentage,
-      progressInFileSize: progressInFileSize ?? this.progressInFileSize,
-      progressInFileSpeed: progressInFileSpeed ?? this.progressInFileSpeed,
-      progressInFileSpeeds: progressInFileSpeeds ?? this.progressInFileSpeeds,
-      progressInFileSpeedUpdateTime: progressInFileSpeedUpdateTime ?? this.progressInFileSpeedUpdateTime,
-      progressInFileSpeedUpdateSentBytes: progressInFileSpeedUpdateSentBytes ?? this.progressInFileSpeedUpdateSentBytes,
-      currentUploadAsset: currentUploadAsset ?? this.currentUploadAsset,
-      totalAssetsToUpload: totalAssetsToUpload ?? this.totalAssetsToUpload,
-      currentAssetIndex: currentAssetIndex ?? this.currentAssetIndex,
-      successfulUploads: successfulUploads ?? this.successfulUploads,
-      showDetailedNotification: showDetailedNotification ?? this.showDetailedNotification,
-    );
-  }
-
-  @override
-  String toString() {
-    return 'ManualUploadState(progressInPercentage: $progressInPercentage, progressInFileSize: $progressInFileSize, progressInFileSpeed: $progressInFileSpeed, progressInFileSpeeds: $progressInFileSpeeds, progressInFileSpeedUpdateTime: $progressInFileSpeedUpdateTime, progressInFileSpeedUpdateSentBytes: $progressInFileSpeedUpdateSentBytes, currentUploadAsset: $currentUploadAsset, totalAssetsToUpload: $totalAssetsToUpload, successfulUploads: $successfulUploads, currentAssetIndex: $currentAssetIndex, showDetailedNotification: $showDetailedNotification)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-    final collectionEquals = const DeepCollectionEquality().equals;
-
-    return other is ManualUploadState &&
-        other.progressInPercentage == progressInPercentage &&
-        other.progressInFileSize == progressInFileSize &&
-        other.progressInFileSpeed == progressInFileSpeed &&
-        collectionEquals(other.progressInFileSpeeds, progressInFileSpeeds) &&
-        other.progressInFileSpeedUpdateTime == progressInFileSpeedUpdateTime &&
-        other.progressInFileSpeedUpdateSentBytes == progressInFileSpeedUpdateSentBytes &&
-        other.currentUploadAsset == currentUploadAsset &&
-        other.totalAssetsToUpload == totalAssetsToUpload &&
-        other.currentAssetIndex == currentAssetIndex &&
-        other.successfulUploads == successfulUploads &&
-        other.showDetailedNotification == showDetailedNotification;
-  }
-
-  @override
-  int get hashCode {
-    return progressInPercentage.hashCode ^
-        progressInFileSize.hashCode ^
-        progressInFileSpeed.hashCode ^
-        progressInFileSpeeds.hashCode ^
-        progressInFileSpeedUpdateTime.hashCode ^
-        progressInFileSpeedUpdateSentBytes.hashCode ^
-        currentUploadAsset.hashCode ^
-        totalAssetsToUpload.hashCode ^
-        currentAssetIndex.hashCode ^
-        successfulUploads.hashCode ^
-        showDetailedNotification.hashCode;
-  }
-}

mobile/lib/models/backup/success_upload_asset.model.dart

@@ -1,31 +0,0 @@
-import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
-
-class SuccessUploadAsset {
-  final BackupCandidate candidate;
-  final String remoteAssetId;
-  final bool isDuplicate;
-
-  const SuccessUploadAsset({required this.candidate, required this.remoteAssetId, required this.isDuplicate});
-
-  SuccessUploadAsset copyWith({BackupCandidate? candidate, String? remoteAssetId, bool? isDuplicate}) {
-    return SuccessUploadAsset(
-      candidate: candidate ?? this.candidate,
-      remoteAssetId: remoteAssetId ?? this.remoteAssetId,
-      isDuplicate: isDuplicate ?? this.isDuplicate,
-    );
-  }
-
-  @override
-  String toString() =>
-      'SuccessUploadAsset(asset: $candidate, remoteAssetId: $remoteAssetId, isDuplicate: $isDuplicate)';
-
-  @override
-  bool operator ==(covariant SuccessUploadAsset other) {
-    if (identical(this, other)) return true;
-
-    return other.candidate == candidate && other.remoteAssetId == remoteAssetId && other.isDuplicate == isDuplicate;
-  }
-
-  @override
-  int get hashCode => candidate.hashCode ^ remoteAssetId.hashCode ^ isDuplicate.hashCode;
-}

mobile/lib/models/memories/memory.model.dart

@@ -1,29 +0,0 @@
-// ignore_for_file: public_member_api_docs, sort_constructors_first
-
-import 'package:collection/collection.dart';
-
-import 'package:immich_mobile/entities/asset.entity.dart';
-
-class Memory {
-  final String title;
-  final List<Asset> assets;
-  const Memory({required this.title, required this.assets});
-
-  Memory copyWith({String? title, List<Asset>? assets}) {
-    return Memory(title: title ?? this.title, assets: assets ?? this.assets);
-  }
-
-  @override
-  String toString() => 'Memory(title: $title, assets: $assets)';
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-    final listEquals = const DeepCollectionEquality().equals;
-
-    return other is Memory && other.title == title && listEquals(other.assets, assets);
-  }
-
-  @override
-  int get hashCode => title.hashCode ^ assets.hashCode;
-}

mobile/lib/models/search/search_filter.model.dart

@@ -1,8 +1,8 @@
 // ignore_for_file: public_member_api_docs, sort_constructors_first
 import 'dart:convert';
 
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/person.model.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
 
 class SearchLocationFilter {
   String? country;

mobile/lib/models/search/search_result.model.dart

@@ -1,28 +0,0 @@
-import 'package:collection/collection.dart';
-
-import 'package:immich_mobile/entities/asset.entity.dart';
-
-class SearchResult {
-  final List<Asset> assets;
-  final int? nextPage;
-
-  const SearchResult({required this.assets, this.nextPage});
-
-  SearchResult copyWith({List<Asset>? assets, int? nextPage}) {
-    return SearchResult(assets: assets ?? this.assets, nextPage: nextPage ?? this.nextPage);
-  }
-
-  @override
-  String toString() => 'SearchResult(assets: $assets, nextPage: $nextPage)';
-
-  @override
-  bool operator ==(covariant SearchResult other) {
-    if (identical(this, other)) return true;
-    final listEquals = const DeepCollectionEquality().equals;
-
-    return listEquals(other.assets, assets) && other.nextPage == nextPage;
-  }
-
-  @override
-  int get hashCode => assets.hashCode ^ nextPage.hashCode;
-}

mobile/lib/models/search/search_result_page_state.model.dart

@@ -1,57 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-
-class SearchResultPageState {
-  final bool isLoading;
-  final bool isSuccess;
-  final bool isError;
-  final bool isSmart;
-  final List<Asset> searchResult;
-
-  const SearchResultPageState({
-    required this.isLoading,
-    required this.isSuccess,
-    required this.isError,
-    required this.isSmart,
-    required this.searchResult,
-  });
-
-  SearchResultPageState copyWith({
-    bool? isLoading,
-    bool? isSuccess,
-    bool? isError,
-    bool? isSmart,
-    List<Asset>? searchResult,
-  }) {
-    return SearchResultPageState(
-      isLoading: isLoading ?? this.isLoading,
-      isSuccess: isSuccess ?? this.isSuccess,
-      isError: isError ?? this.isError,
-      isSmart: isSmart ?? this.isSmart,
-      searchResult: searchResult ?? this.searchResult,
-    );
-  }
-
-  @override
-  String toString() {
-    return 'SearchresultPageState(isLoading: $isLoading, isSuccess: $isSuccess, isError: $isError, isSmart: $isSmart, searchResult: $searchResult)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-    final listEquals = const DeepCollectionEquality().equals;
-
-    return other is SearchResultPageState &&
-        other.isLoading == isLoading &&
-        other.isSuccess == isSuccess &&
-        other.isError == isError &&
-        other.isSmart == isSmart &&
-        listEquals(other.searchResult, searchResult);
-  }
-
-  @override
-  int get hashCode {
-    return isLoading.hashCode ^ isSuccess.hashCode ^ isError.hashCode ^ isSmart.hashCode ^ searchResult.hashCode;
-  }
-}

mobile/lib/pages/album/album_additional_shared_user_selection.page.dart

@@ -1,115 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/entities/album.entity.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/providers/album/suggested_shared_users.provider.dart';
-import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
-
-@RoutePage()
-class AlbumAdditionalSharedUserSelectionPage extends HookConsumerWidget {
-  final Album album;
-
-  const AlbumAdditionalSharedUserSelectionPage({super.key, required this.album});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final AsyncValue<List<UserDto>> suggestedShareUsers = ref.watch(otherUsersProvider);
-    final sharedUsersList = useState<Set<UserDto>>({});
-
-    addNewUsersHandler() {
-      context.maybePop(sharedUsersList.value.map((e) => e.id).toList());
-    }
-
-    buildTileIcon(UserDto user) {
-      if (sharedUsersList.value.contains(user)) {
-        return CircleAvatar(backgroundColor: context.primaryColor, child: const Icon(Icons.check_rounded, size: 25));
-      } else {
-        return UserCircleAvatar(user: user);
-      }
-    }
-
-    buildUserList(List<UserDto> users) {
-      List<Widget> usersChip = [];
-
-      for (var user in sharedUsersList.value) {
-        usersChip.add(
-          Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 8.0),
-            child: Chip(
-              backgroundColor: context.primaryColor.withValues(alpha: 0.15),
-              label: Text(user.name, style: const TextStyle(fontSize: 12, fontWeight: FontWeight.bold)),
-            ),
-          ),
-        );
-      }
-      return ListView(
-        children: [
-          Wrap(children: [...usersChip]),
-          Padding(
-            padding: const EdgeInsets.all(16.0),
-            child: Text(
-              'suggestions'.tr(),
-              style: const TextStyle(fontSize: 14, color: Colors.grey, fontWeight: FontWeight.bold),
-            ),
-          ),
-          ListView.builder(
-            primary: false,
-            shrinkWrap: true,
-            itemBuilder: ((context, index) {
-              return ListTile(
-                leading: buildTileIcon(users[index]),
-                dense: true,
-                title: Text(users[index].name, style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
-                subtitle: Text(users[index].email, style: const TextStyle(fontSize: 12)),
-                onTap: () {
-                  if (sharedUsersList.value.contains(users[index])) {
-                    sharedUsersList.value = sharedUsersList.value
-                        .where((selectedUser) => selectedUser.id != users[index].id)
-                        .toSet();
-                  } else {
-                    sharedUsersList.value = {...sharedUsersList.value, users[index]};
-                  }
-                },
-              );
-            }),
-            itemCount: users.length,
-          ),
-        ],
-      );
-    }
-
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('invite_to_album').tr(),
-        elevation: 0,
-        centerTitle: false,
-        leading: IconButton(
-          icon: const Icon(Icons.close_rounded),
-          onPressed: () {
-            context.maybePop(null);
-          },
-        ),
-        actions: [
-          TextButton(
-            onPressed: sharedUsersList.value.isEmpty ? null : addNewUsersHandler,
-            child: const Text("add", style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold)).tr(),
-          ),
-        ],
-      ),
-      body: suggestedShareUsers.widgetWhen(
-        onData: (users) {
-          for (var sharedUsers in album.sharedUsers) {
-            users.removeWhere((u) => u.id == sharedUsers.id || u.id == album.ownerId);
-          }
-
-          return buildUserList(users);
-        },
-      ),
-    );
-  }
-}

mobile/lib/pages/album/album_asset_selection.page.dart

@@ -1,74 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/models/albums/asset_selection_page_result.model.dart';
-import 'package:immich_mobile/providers/timeline.provider.dart';
-import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';
-import 'package:immich_mobile/widgets/asset_grid/immich_asset_grid.dart';
-
-@RoutePage()
-class AlbumAssetSelectionPage extends HookConsumerWidget {
-  const AlbumAssetSelectionPage({super.key, required this.existingAssets, this.canDeselect = false});
-
-  final Set<Asset> existingAssets;
-  final bool canDeselect;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final assetSelectionRenderList = ref.watch(assetSelectionTimelineProvider);
-    final selected = useState<Set<Asset>>(existingAssets);
-    final selectionEnabledHook = useState(true);
-
-    Widget buildBody(RenderList renderList) {
-      return ImmichAssetGrid(
-        renderList: renderList,
-        listener: (active, assets) {
-          selectionEnabledHook.value = active;
-          selected.value = assets;
-        },
-        selectionActive: true,
-        preselectedAssets: existingAssets,
-        canDeselect: canDeselect,
-        showMultiSelectIndicator: false,
-      );
-    }
-
-    return Scaffold(
-      appBar: AppBar(
-        elevation: 0,
-        leading: IconButton(
-          icon: const Icon(Icons.close_rounded),
-          onPressed: () {
-            AutoRouter.of(context).popForced(null);
-          },
-        ),
-        title: selected.value.isEmpty
-            ? const Text('add_photos', style: TextStyle(fontSize: 18)).tr()
-            : const Text(
-                'share_assets_selected',
-                style: TextStyle(fontSize: 18),
-              ).tr(namedArgs: {'count': selected.value.length.toString()}),
-        centerTitle: false,
-        actions: [
-          if (selected.value.isNotEmpty || canDeselect)
-            TextButton(
-              onPressed: () {
-                var payload = AssetSelectionPageResult(selectedAssets: selected.value);
-                AutoRouter.of(context).popForced<AssetSelectionPageResult>(payload);
-              },
-              child: Text(
-                canDeselect ? "done" : "add",
-                style: TextStyle(fontWeight: FontWeight.bold, color: context.primaryColor),
-              ).tr(),
-            ),
-        ],
-      ),
-      body: assetSelectionRenderList.widgetWhen(onData: (data) => buildBody(data)),
-    );
-  }
-}

mobile/lib/pages/album/album_control_button.dart

@@ -1,37 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/widgets/album/album_action_filled_button.dart';
-
-class AlbumControlButton extends ConsumerWidget {
-  final void Function()? onAddPhotosPressed;
-  final void Function()? onAddUsersPressed;
-
-  const AlbumControlButton({super.key, this.onAddPhotosPressed, this.onAddUsersPressed});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return SizedBox(
-      height: 36,
-      child: ListView(
-        scrollDirection: Axis.horizontal,
-        children: [
-          if (onAddPhotosPressed != null)
-            AlbumActionFilledButton(
-              key: const ValueKey('add_photos_button'),
-              iconData: Icons.add_photo_alternate_outlined,
-              onPressed: onAddPhotosPressed,
-              labelText: "add_photos".tr(),
-            ),
-          if (onAddUsersPressed != null)
-            AlbumActionFilledButton(
-              key: const ValueKey('add_users_button'),
-              iconData: Icons.person_add_alt_rounded,
-              onPressed: onAddUsersPressed,
-              labelText: "album_viewer_page_share_add_users".tr(),
-            ),
-        ],
-      ),
-    );
-  }
-}

mobile/lib/pages/album/album_date_range.dart

@@ -1,53 +0,0 @@
-import 'package:easy_localization/easy_localization.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/providers/album/current_album.provider.dart';
-
-class AlbumDateRange extends ConsumerWidget {
-  const AlbumDateRange({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final data = ref.watch(
-      currentAlbumProvider.select((album) {
-        if (album == null || album.assets.isEmpty) {
-          return null;
-        }
-
-        final startDate = album.startDate;
-        final endDate = album.endDate;
-        if (startDate == null || endDate == null) {
-          return null;
-        }
-        return (startDate, endDate, album.shared);
-      }),
-    );
-
-    if (data == null) {
-      return const SizedBox();
-    }
-    final (startDate, endDate, shared) = data;
-
-    return Padding(
-      padding: const EdgeInsets.only(left: 16.0),
-      child: Text(
-        _getDateRangeText(startDate, endDate),
-        style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceVariant),
-      ),
-    );
-  }
-
-  @pragma('vm:prefer-inline')
-  String _getDateRangeText(DateTime startDate, DateTime endDate) {
-    if (startDate.day == endDate.day && startDate.month == endDate.month && startDate.year == endDate.year) {
-      return DateFormat.yMMMd().format(startDate);
-    }
-
-    final String startDateText = (startDate.year == endDate.year ? DateFormat.MMMd() : DateFormat.yMMMd()).format(
-      startDate,
-    );
-    final String endDateText = DateFormat.yMMMd().format(endDate);
-    return "$startDateText - $endDateText";
-  }
-}

mobile/lib/pages/album/album_description.dart

@@ -1,42 +0,0 @@
-import 'package:easy_localization/easy_localization.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/providers/album/current_album.provider.dart';
-import 'package:immich_mobile/widgets/album/album_viewer_editable_description.dart';
-import 'package:immich_mobile/providers/auth.provider.dart';
-
-class AlbumDescription extends ConsumerWidget {
-  const AlbumDescription({super.key, required this.descriptionFocusNode});
-
-  final FocusNode descriptionFocusNode;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final userId = ref.watch(authProvider).userId;
-    final (isOwner, isRemote, albumDescription) = ref.watch(
-      currentAlbumProvider.select((album) {
-        if (album == null) {
-          return const (false, false, '');
-        }
-
-        return (album.ownerId == userId, album.isRemote, album.description);
-      }),
-    );
-
-    if (isOwner && isRemote) {
-      return Padding(
-        padding: const EdgeInsets.only(left: 8, right: 8),
-        child: AlbumViewerEditableDescription(
-          albumDescription: albumDescription ?? 'add_a_description'.tr(),
-          descriptionFocusNode: descriptionFocusNode,
-        ),
-      );
-    }
-
-    return Padding(
-      padding: const EdgeInsets.only(left: 16, right: 8),
-      child: Text(albumDescription ?? 'add_a_description'.tr(), style: context.textTheme.bodyLarge),
-    );
-  }
-}

mobile/lib/pages/album/album_options.page.dart

@@ -1,192 +0,0 @@
-import 'dart:async';
-
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
-import 'package:immich_mobile/infrastructure/entities/user.entity.dart' as entity;
-import 'package:immich_mobile/providers/album/album.provider.dart';
-import 'package:immich_mobile/providers/album/current_album.provider.dart';
-import 'package:immich_mobile/providers/auth.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/utils/immich_loading_overlay.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
-import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
-
-@RoutePage()
-class AlbumOptionsPage extends HookConsumerWidget {
-  const AlbumOptionsPage({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final album = ref.watch(currentAlbumProvider);
-    if (album == null) {
-      return const SizedBox();
-    }
-
-    final sharedUsers = useState(album.sharedUsers.map((u) => u.toDto()).toList());
-    final owner = album.owner.value;
-    final userId = ref.watch(authProvider).userId;
-    final activityEnabled = useState(album.activityEnabled);
-    final isProcessing = useProcessingOverlay();
-    final isOwner = owner?.id == userId;
-
-    void showErrorMessage() {
-      context.pop();
-      ImmichToast.show(
-        context: context,
-        msg: "shared_album_section_people_action_error".tr(),
-        toastType: ToastType.error,
-        gravity: ToastGravity.BOTTOM,
-      );
-    }
-
-    void leaveAlbum() async {
-      isProcessing.value = true;
-
-      try {
-        final isSuccess = await ref.read(albumProvider.notifier).leaveAlbum(album);
-
-        if (isSuccess) {
-          unawaited(context.navigateTo(const TabControllerRoute(children: [AlbumsRoute()])));
-        } else {
-          showErrorMessage();
-        }
-      } catch (_) {
-        showErrorMessage();
-      }
-
-      isProcessing.value = false;
-    }
-
-    void removeUserFromAlbum(UserDto user) async {
-      isProcessing.value = true;
-
-      try {
-        await ref.read(albumProvider.notifier).removeUser(album, user);
-        album.sharedUsers.remove(entity.User.fromDto(user));
-        sharedUsers.value = album.sharedUsers.map((u) => u.toDto()).toList();
-      } catch (error) {
-        showErrorMessage();
-      }
-
-      context.pop();
-      isProcessing.value = false;
-    }
-
-    void handleUserClick(UserDto user) {
-      var actions = [];
-
-      if (user.id == userId) {
-        actions = [
-          ListTile(
-            leading: const Icon(Icons.exit_to_app_rounded),
-            title: const Text("shared_album_section_people_action_leave").tr(),
-            onTap: leaveAlbum,
-          ),
-        ];
-      }
-
-      if (isOwner) {
-        actions = [
-          ListTile(
-            leading: const Icon(Icons.person_remove_rounded),
-            title: const Text("shared_album_section_people_action_remove_user").tr(),
-            onTap: () => removeUserFromAlbum(user),
-          ),
-        ];
-      }
-
-      showModalBottomSheet(
-        backgroundColor: context.colorScheme.surfaceContainer,
-        isScrollControlled: false,
-        context: context,
-        builder: (context) {
-          return SafeArea(
-            child: Padding(
-              padding: const EdgeInsets.only(top: 24.0),
-              child: Column(mainAxisSize: MainAxisSize.min, children: [...actions]),
-            ),
-          );
-        },
-      );
-    }
-
-    buildOwnerInfo() {
-      return ListTile(
-        leading: owner != null ? UserCircleAvatar(user: owner.toDto()) : const SizedBox(),
-        title: Text(album.owner.value?.name ?? "", style: const TextStyle(fontWeight: FontWeight.w500)),
-        subtitle: Text(album.owner.value?.email ?? "", style: TextStyle(color: context.colorScheme.onSurfaceSecondary)),
-        trailing: Text("owner", style: context.textTheme.labelLarge).tr(),
-      );
-    }
-
-    buildSharedUsersList() {
-      return ListView.builder(
-        primary: false,
-        shrinkWrap: true,
-        itemCount: sharedUsers.value.length,
-        itemBuilder: (context, index) {
-          final user = sharedUsers.value[index];
-          return ListTile(
-            leading: UserCircleAvatar(user: user),
-            title: Text(user.name, style: const TextStyle(fontWeight: FontWeight.w500)),
-            subtitle: Text(user.email, style: TextStyle(color: context.colorScheme.onSurfaceSecondary)),
-            trailing: userId == user.id || isOwner ? const Icon(Icons.more_horiz_rounded) : const SizedBox(),
-            onTap: userId == user.id || isOwner ? () => handleUserClick(user) : null,
-          );
-        },
-      );
-    }
-
-    buildSectionTitle(String text) {
-      return Padding(
-        padding: const EdgeInsets.all(16.0),
-        child: Text(text, style: context.textTheme.bodySmall),
-      );
-    }
-
-    return Scaffold(
-      appBar: AppBar(
-        leading: IconButton(
-          icon: const Icon(Icons.arrow_back_ios_new_rounded),
-          onPressed: () => context.maybePop(null),
-        ),
-        centerTitle: true,
-        title: Text("options".tr()),
-      ),
-      body: ListView(
-        children: [
-          if (isOwner && album.shared)
-            SwitchListTile.adaptive(
-              value: activityEnabled.value,
-              onChanged: (bool value) async {
-                activityEnabled.value = value;
-                if (await ref.read(albumProvider.notifier).setActivitystatus(album, value)) {
-                  album.activityEnabled = value;
-                }
-              },
-              activeThumbColor: activityEnabled.value ? context.primaryColor : context.themeData.disabledColor,
-              dense: true,
-              title: Text(
-                "comments_and_likes",
-                style: context.textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w500),
-              ).tr(),
-              subtitle: Text(
-                "let_others_respond",
-                style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
-              ).tr(),
-            ),
-          buildSectionTitle("shared_album_section_people_title".tr()),
-          buildOwnerInfo(),
-          buildSharedUsersList(),
-        ],
-      ),
-    );
-  }
-}

mobile/lib/pages/album/album_shared_user_icons.dart

@@ -1,52 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/providers/album/current_album.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
-
-class AlbumSharedUserIcons extends HookConsumerWidget {
-  const AlbumSharedUserIcons({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final sharedUsers = useRef<List<UserDto>>(const []);
-    sharedUsers.value = ref.watch(
-      currentAlbumProvider.select((album) {
-        if (album == null) {
-          return const [];
-        }
-
-        if (album.sharedUsers.length == sharedUsers.value.length) {
-          return sharedUsers.value;
-        }
-
-        return album.sharedUsers.map((u) => u.toDto()).toList(growable: false);
-      }),
-    );
-
-    if (sharedUsers.value.isEmpty) {
-      return const SizedBox();
-    }
-
-    return GestureDetector(
-      onTap: () => context.pushRoute(const AlbumOptionsRoute()),
-      child: SizedBox(
-        height: 50,
-        child: ListView.builder(
-          padding: const EdgeInsets.only(left: 16, bottom: 8),
-          scrollDirection: Axis.horizontal,
-          itemBuilder: ((context, index) {
-            return Padding(
-              padding: const EdgeInsets.only(right: 8.0),
-              child: UserCircleAvatar(user: sharedUsers.value[index], size: 36),
-            );
-          }),
-          itemCount: sharedUsers.value.length,
-        ),
-      ),
-    );
-  }
-}

mobile/lib/pages/album/album_shared_user_selection.page.dart

@@ -1,140 +0,0 @@
-import 'dart:async';
-
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/providers/album/album.provider.dart';
-import 'package:immich_mobile/providers/album/album_title.provider.dart';
-import 'package:immich_mobile/providers/album/suggested_shared_users.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
-
-@RoutePage()
-class AlbumSharedUserSelectionPage extends HookConsumerWidget {
-  const AlbumSharedUserSelectionPage({super.key, required this.assets});
-
-  final Set<Asset> assets;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final sharedUsersList = useState<Set<UserDto>>({});
-    final suggestedShareUsers = ref.watch(otherUsersProvider);
-
-    createSharedAlbum() async {
-      var newAlbum = await ref.watch(albumProvider.notifier).createAlbum(ref.watch(albumTitleProvider), assets);
-
-      if (newAlbum != null) {
-        ref.watch(albumTitleProvider.notifier).clearAlbumTitle();
-        unawaited(context.maybePop(true));
-        unawaited(context.navigateTo(const TabControllerRoute(children: [AlbumsRoute()])));
-      }
-
-      ScaffoldMessenger(
-        child: SnackBar(
-          content: Text(
-            'select_user_for_sharing_page_err_album',
-            style: context.textTheme.bodyLarge?.copyWith(color: context.primaryColor),
-          ).tr(),
-        ),
-      );
-    }
-
-    buildTileIcon(UserDto user) {
-      if (sharedUsersList.value.contains(user)) {
-        return CircleAvatar(backgroundColor: context.primaryColor, child: const Icon(Icons.check_rounded, size: 25));
-      } else {
-        return UserCircleAvatar(user: user);
-      }
-    }
-
-    buildUserList(List<UserDto> users) {
-      List<Widget> usersChip = [];
-
-      for (var user in sharedUsersList.value) {
-        usersChip.add(
-          Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 8.0),
-            child: Chip(
-              backgroundColor: context.primaryColor.withValues(alpha: 0.15),
-              label: Text(
-                user.email,
-                style: const TextStyle(fontSize: 12, color: Colors.black87, fontWeight: FontWeight.bold),
-              ),
-            ),
-          ),
-        );
-      }
-      return ListView(
-        children: [
-          Wrap(children: [...usersChip]),
-          Padding(
-            padding: const EdgeInsets.all(16.0),
-            child: const Text(
-              'suggestions',
-              style: TextStyle(fontSize: 14, color: Colors.grey, fontWeight: FontWeight.bold),
-            ).tr(),
-          ),
-          ListView.builder(
-            primary: false,
-            shrinkWrap: true,
-            itemBuilder: ((context, index) {
-              return ListTile(
-                leading: buildTileIcon(users[index]),
-                title: Text(users[index].email, style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
-                onTap: () {
-                  if (sharedUsersList.value.contains(users[index])) {
-                    sharedUsersList.value = sharedUsersList.value
-                        .where((selectedUser) => selectedUser.id != users[index].id)
-                        .toSet();
-                  } else {
-                    sharedUsersList.value = {...sharedUsersList.value, users[index]};
-                  }
-                },
-              );
-            }),
-            itemCount: users.length,
-          ),
-        ],
-      );
-    }
-
-    return Scaffold(
-      appBar: AppBar(
-        title: Text('invite_to_album', style: TextStyle(color: context.primaryColor)).tr(),
-        elevation: 0,
-        centerTitle: false,
-        leading: IconButton(
-          icon: const Icon(Icons.close_rounded),
-          onPressed: () {
-            unawaited(context.maybePop());
-          },
-        ),
-        actions: [
-          TextButton(
-            style: TextButton.styleFrom(foregroundColor: context.primaryColor),
-            onPressed: sharedUsersList.value.isEmpty ? null : createSharedAlbum,
-            child: const Text(
-              "create_album",
-              style: TextStyle(
-                fontSize: 14,
-                fontWeight: FontWeight.bold,
-                // color: context.primaryColor,
-              ),
-            ).tr(),
-          ),
-        ],
-      ),
-      body: suggestedShareUsers.widgetWhen(
-        onData: (users) {
-          return buildUserList(users);
-        },
-      ),
-    );
-  }
-}

mobile/lib/pages/album/album_title.dart

@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/providers/album/current_album.provider.dart';
-import 'package:immich_mobile/widgets/album/album_viewer_editable_title.dart';
-import 'package:immich_mobile/providers/auth.provider.dart';
-
-class AlbumTitle extends ConsumerWidget {
-  const AlbumTitle({super.key, required this.titleFocusNode});
-
-  final FocusNode titleFocusNode;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final userId = ref.watch(authProvider).userId;
-    final (isOwner, isRemote, albumName) = ref.watch(
-      currentAlbumProvider.select((album) {
-        if (album == null) {
-          return const (false, false, '');
-        }
-
-        return (album.ownerId == userId, album.isRemote, album.name);
-      }),
-    );
-
-    if (isOwner && isRemote) {
-      return Padding(
-        padding: const EdgeInsets.only(left: 8, right: 8),
-        child: AlbumViewerEditableTitle(albumName: albumName, titleFocusNode: titleFocusNode),
-      );
-    }
-
-    return Padding(
-      padding: const EdgeInsets.only(left: 16, right: 8),
-      child: Text(albumName, style: context.textTheme.headlineLarge?.copyWith(fontWeight: FontWeight.w700)),
-    );
-  }
-}

mobile/lib/pages/album/album_viewer.dart

@@ -1,165 +0,0 @@
-import 'dart:async';
-
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-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/models/albums/asset_selection_page_result.model.dart';
-import 'package:immich_mobile/pages/album/album_control_button.dart';
-import 'package:immich_mobile/pages/album/album_date_range.dart';
-import 'package:immich_mobile/pages/album/album_description.dart';
-import 'package:immich_mobile/pages/album/album_shared_user_icons.dart';
-import 'package:immich_mobile/pages/album/album_title.dart';
-import 'package:immich_mobile/providers/album/album.provider.dart';
-import 'package:immich_mobile/providers/album/current_album.provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart';
-import 'package:immich_mobile/providers/timeline.provider.dart';
-import 'package:immich_mobile/utils/immich_loading_overlay.dart';
-import 'package:immich_mobile/providers/multiselect.provider.dart';
-import 'package:immich_mobile/providers/auth.provider.dart';
-import 'package:immich_mobile/widgets/album/album_viewer_appbar.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/widgets/asset_grid/multiselect_grid.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
-
-class AlbumViewer extends HookConsumerWidget {
-  const AlbumViewer({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final album = ref.watch(currentAlbumProvider);
-    if (album == null) {
-      return const SizedBox();
-    }
-
-    final titleFocusNode = useFocusNode();
-    final descriptionFocusNode = useFocusNode();
-    final userId = ref.watch(authProvider).userId;
-    final isMultiselecting = ref.watch(multiselectProvider);
-    final isProcessing = useProcessingOverlay();
-    final isOwner = ref.watch(
-      currentAlbumProvider.select((album) {
-        return album?.ownerId == userId;
-      }),
-    );
-
-    Future<bool> onRemoveFromAlbumPressed(Iterable<Asset> assets) async {
-      final bool isSuccess = await ref.read(albumProvider.notifier).removeAsset(album, assets);
-
-      if (!isSuccess) {
-        ImmichToast.show(
-          context: context,
-          msg: "album_viewer_appbar_share_err_remove".tr(),
-          toastType: ToastType.error,
-          gravity: ToastGravity.BOTTOM,
-        );
-      }
-      return isSuccess;
-    }
-
-    /// Find out if the assets in album exist on the device
-    /// If they exist, add to selected asset state to show they are already selected.
-    void onAddPhotosPressed() async {
-      AssetSelectionPageResult? returnPayload = await context.pushRoute<AssetSelectionPageResult?>(
-        AlbumAssetSelectionRoute(existingAssets: album.assets, canDeselect: false),
-      );
-
-      if (returnPayload != null && returnPayload.selectedAssets.isNotEmpty) {
-        // Check if there is new assets add
-        isProcessing.value = true;
-
-        await ref.watch(albumProvider.notifier).addAssets(album, returnPayload.selectedAssets);
-
-        isProcessing.value = false;
-      }
-    }
-
-    void onAddUsersPressed() async {
-      List<String>? sharedUserIds = await context.pushRoute<List<String>?>(
-        AlbumAdditionalSharedUserSelectionRoute(album: album),
-      );
-
-      if (sharedUserIds != null) {
-        isProcessing.value = true;
-
-        await ref.watch(albumProvider.notifier).addUsers(album, sharedUserIds);
-
-        isProcessing.value = false;
-      }
-    }
-
-    onActivitiesPressed() {
-      if (album.remoteId != null) {
-        ref.read(currentAssetProvider.notifier).set(null);
-        context.pushRoute(const ActivitiesRoute());
-      }
-    }
-
-    return Stack(
-      children: [
-        MultiselectGrid(
-          key: const ValueKey("albumViewerMultiselectGrid"),
-          renderListProvider: albumTimelineProvider(album.id),
-          topWidget: Container(
-            decoration: BoxDecoration(
-              gradient: LinearGradient(
-                begin: Alignment.topCenter,
-                end: Alignment.bottomCenter,
-                colors: [
-                  context.primaryColor.withValues(alpha: 0.06),
-                  context.primaryColor.withValues(alpha: 0.04),
-                  Colors.indigo.withValues(alpha: 0.02),
-                  Colors.transparent,
-                ],
-                stops: const [0.0, 0.3, 0.7, 1.0],
-              ),
-            ),
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.end,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                const SizedBox(height: 32),
-                const AlbumDateRange(),
-                AlbumTitle(key: const ValueKey("albumTitle"), titleFocusNode: titleFocusNode),
-                AlbumDescription(key: const ValueKey("albumDescription"), descriptionFocusNode: descriptionFocusNode),
-                const AlbumSharedUserIcons(),
-                if (album.isRemote)
-                  Padding(
-                    padding: const EdgeInsets.only(left: 16.0),
-                    child: AlbumControlButton(
-                      key: const ValueKey("albumControlButton"),
-                      onAddPhotosPressed: onAddPhotosPressed,
-                      onAddUsersPressed: isOwner ? onAddUsersPressed : null,
-                    ),
-                  ),
-                const SizedBox(height: 8),
-              ],
-            ),
-          ),
-          onRemoveFromAlbum: onRemoveFromAlbumPressed,
-          editEnabled: album.ownerId == userId,
-        ),
-        AnimatedPositioned(
-          key: const ValueKey("albumViewerAppbarPositioned"),
-          duration: const Duration(milliseconds: 300),
-          top: isMultiselecting ? -(kToolbarHeight + context.padding.top) : 0,
-          left: 0,
-          right: 0,
-          child: AlbumViewerAppbar(
-            key: const ValueKey("albumViewerAppbar"),
-            titleFocusNode: titleFocusNode,
-            descriptionFocusNode: descriptionFocusNode,
-            userId: userId,
-            onAddPhotos: onAddPhotosPressed,
-            onAddUsers: onAddUsersPressed,
-            onActivities: onActivitiesPressed,
-          ),
-        ),
-      ],
-    );
-  }
-}

mobile/lib/pages/album/album_viewer.page.dart

@@ -1,29 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/pages/album/album_viewer.dart';
-import 'package:immich_mobile/providers/album/album.provider.dart';
-import 'package:immich_mobile/providers/album/current_album.provider.dart';
-import 'package:immich_mobile/providers/timeline.provider.dart';
-
-@RoutePage()
-class AlbumViewerPage extends HookConsumerWidget {
-  final int albumId;
-
-  const AlbumViewerPage({super.key, required this.albumId});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    // Listen provider to prevent autoDispose when navigating to other routes from within the viewer page
-    ref.listen(currentAlbumProvider, (_, __) {});
-
-    // This call helps rendering the asset selection instantly
-    ref.listen(assetSelectionTimelineProvider, (_, __) {});
-
-    ref.listen(albumWatcher(albumId), (_, albumFuture) {
-      albumFuture.whenData((value) => ref.read(currentAlbumProvider.notifier).set(value));
-    });
-
-    return const Scaffold(body: AlbumViewer());
-  }
-}

mobile/lib/pages/albums/albums.page.dart

@@ -1,359 +0,0 @@
-import 'dart:async';
-import 'dart:math';
-
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-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/extensions/theme_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/models/albums/album_search.model.dart';
-import 'package:immich_mobile/pages/common/large_leading_tile.dart';
-import 'package:immich_mobile/providers/album/album.provider.dart';
-import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/widgets/album/album_thumbnail_card.dart';
-import 'package:immich_mobile/widgets/common/immich_app_bar.dart';
-import 'package:immich_mobile/widgets/common/immich_thumbnail.dart';
-import 'package:immich_mobile/widgets/common/search_field.dart';
-
-@RoutePage()
-class AlbumsPage extends HookConsumerWidget {
-  const AlbumsPage({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final albums = ref.watch(albumProvider).where((album) => album.isRemote).toList();
-    final albumSortOption = ref.watch(albumSortByOptionsProvider);
-    final albumSortIsReverse = ref.watch(albumSortOrderProvider);
-    final sorted = albumSortOption.sortFn(albums, albumSortIsReverse);
-    final isGrid = useState(false);
-    final searchController = useTextEditingController();
-    final debounceTimer = useRef<Timer?>(null);
-    final filterMode = useState(QuickFilterMode.all);
-    final userId = ref.watch(currentUserProvider)?.id;
-    final searchFocusNode = useFocusNode();
-
-    toggleViewMode() {
-      isGrid.value = !isGrid.value;
-    }
-
-    onSearch(String searchTerm, QuickFilterMode mode) {
-      debounceTimer.value?.cancel();
-      debounceTimer.value = Timer(const Duration(milliseconds: 300), () {
-        ref.read(albumProvider.notifier).searchAlbums(searchTerm, mode);
-      });
-    }
-
-    changeFilter(QuickFilterMode mode) {
-      filterMode.value = mode;
-    }
-
-    useEffect(() {
-      searchController.addListener(() {
-        onSearch(searchController.text, filterMode.value);
-      });
-
-      return () {
-        searchController.removeListener(() {
-          onSearch(searchController.text, filterMode.value);
-        });
-        debounceTimer.value?.cancel();
-      };
-    }, []);
-
-    clearSearch() {
-      filterMode.value = QuickFilterMode.all;
-      searchController.clear();
-      onSearch('', QuickFilterMode.all);
-    }
-
-    return Scaffold(
-      appBar: ImmichAppBar(
-        showUploadButton: false,
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.add_rounded, size: 28),
-            onPressed: () => context.pushRoute(CreateAlbumRoute()),
-          ),
-        ],
-      ),
-      body: RefreshIndicator(
-        displacement: 70,
-        onRefresh: () async {
-          await ref.read(albumProvider.notifier).refreshRemoteAlbums();
-        },
-        child: ListView(
-          shrinkWrap: true,
-          padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12),
-          children: [
-            Container(
-              decoration: BoxDecoration(
-                border: Border.all(color: context.colorScheme.onSurface.withAlpha(0), width: 0),
-                borderRadius: const BorderRadius.all(Radius.circular(24)),
-                gradient: LinearGradient(
-                  colors: [
-                    context.colorScheme.primary.withValues(alpha: 0.075),
-                    context.colorScheme.primary.withValues(alpha: 0.09),
-                    context.colorScheme.primary.withValues(alpha: 0.075),
-                  ],
-                  begin: Alignment.topLeft,
-                  end: Alignment.bottomRight,
-                  transform: const GradientRotation(0.5 * pi),
-                ),
-              ),
-              child: SearchField(
-                autofocus: false,
-                contentPadding: const EdgeInsets.all(16),
-                hintText: 'search_albums'.tr(),
-                prefixIcon: const Icon(Icons.search_rounded),
-                suffixIcon: searchController.text.isNotEmpty
-                    ? IconButton(icon: const Icon(Icons.clear_rounded), onPressed: clearSearch)
-                    : null,
-                controller: searchController,
-                onChanged: (_) => onSearch(searchController.text, filterMode.value),
-                focusNode: searchFocusNode,
-                onTapOutside: (_) => searchFocusNode.unfocus(),
-              ),
-            ),
-            const SizedBox(height: 8),
-            Wrap(
-              spacing: 4,
-              runSpacing: 4,
-              children: [
-                QuickFilterButton(
-                  label: 'all'.tr(),
-                  isSelected: filterMode.value == QuickFilterMode.all,
-                  onTap: () {
-                    changeFilter(QuickFilterMode.all);
-                    onSearch(searchController.text, QuickFilterMode.all);
-                  },
-                ),
-                QuickFilterButton(
-                  label: 'shared_with_me'.tr(),
-                  isSelected: filterMode.value == QuickFilterMode.sharedWithMe,
-                  onTap: () {
-                    changeFilter(QuickFilterMode.sharedWithMe);
-                    onSearch(searchController.text, QuickFilterMode.sharedWithMe);
-                  },
-                ),
-                QuickFilterButton(
-                  label: 'my_albums'.tr(),
-                  isSelected: filterMode.value == QuickFilterMode.myAlbums,
-                  onTap: () {
-                    changeFilter(QuickFilterMode.myAlbums);
-                    onSearch(searchController.text, QuickFilterMode.myAlbums);
-                  },
-                ),
-              ],
-            ),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                const SortButton(),
-                IconButton(
-                  icon: Icon(isGrid.value ? Icons.view_list_outlined : Icons.grid_view_outlined, size: 24),
-                  onPressed: toggleViewMode,
-                ),
-              ],
-            ),
-            const SizedBox(height: 5),
-            AnimatedSwitcher(
-              duration: const Duration(milliseconds: 500),
-              child: isGrid.value
-                  ? GridView.builder(
-                      shrinkWrap: true,
-                      physics: const ClampingScrollPhysics(),
-                      gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
-                        maxCrossAxisExtent: 250,
-                        mainAxisSpacing: 12,
-                        crossAxisSpacing: 12,
-                        childAspectRatio: .7,
-                      ),
-                      itemBuilder: (context, index) {
-                        return AlbumThumbnailCard(
-                          album: sorted[index],
-                          onTap: () => context.pushRoute(AlbumViewerRoute(albumId: sorted[index].id)),
-                          showOwner: true,
-                        );
-                      },
-                      itemCount: sorted.length,
-                    )
-                  : ListView.builder(
-                      shrinkWrap: true,
-                      physics: const NeverScrollableScrollPhysics(),
-                      itemCount: sorted.length,
-                      itemBuilder: (context, index) {
-                        return Padding(
-                          padding: const EdgeInsets.only(bottom: 8.0),
-                          child: LargeLeadingTile(
-                            title: Text(
-                              sorted[index].name,
-                              maxLines: 2,
-                              overflow: TextOverflow.ellipsis,
-                              style: context.textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w600),
-                            ),
-                            subtitle: sorted[index].ownerId != null
-                                ? Text(
-                                    '${'items_count'.t(context: context, args: {'count': sorted[index].assetCount})} • ${sorted[index].ownerId != userId ? 'shared_by_user'.t(context: context, args: {'user': sorted[index].ownerName!}) : 'owned'.t(context: context)}',
-                                    overflow: TextOverflow.ellipsis,
-                                    style: context.textTheme.bodyMedium?.copyWith(
-                                      color: context.colorScheme.onSurfaceSecondary,
-                                    ),
-                                  )
-                                : null,
-                            onTap: () => context.pushRoute(AlbumViewerRoute(albumId: sorted[index].id)),
-                            leadingPadding: const EdgeInsets.only(right: 16),
-                            leading: ClipRRect(
-                              borderRadius: const BorderRadius.all(Radius.circular(15)),
-                              child: ImmichThumbnail(asset: sorted[index].thumbnail.value, width: 80, height: 80),
-                            ),
-                            // minVerticalPadding: 1,
-                          ),
-                        );
-                      },
-                    ),
-            ),
-          ],
-        ),
-      ),
-      resizeToAvoidBottomInset: false,
-    );
-  }
-}
-
-class QuickFilterButton extends StatelessWidget {
-  const QuickFilterButton({super.key, required this.isSelected, required this.onTap, required this.label});
-
-  final bool isSelected;
-  final VoidCallback onTap;
-  final String label;
-
-  @override
-  Widget build(BuildContext context) {
-    return TextButton(
-      onPressed: onTap,
-      style: ButtonStyle(
-        backgroundColor: WidgetStateProperty.all(isSelected ? context.colorScheme.primary : Colors.transparent),
-        shape: WidgetStateProperty.all(
-          RoundedRectangleBorder(
-            borderRadius: const BorderRadius.all(Radius.circular(20)),
-            side: BorderSide(color: context.colorScheme.onSurface.withAlpha(25), width: 1),
-          ),
-        ),
-      ),
-      child: Text(
-        label,
-        style: TextStyle(
-          color: isSelected ? context.colorScheme.onPrimary : context.colorScheme.onSurface,
-          fontSize: 14,
-        ),
-      ),
-    );
-  }
-}
-
-class SortButton extends ConsumerWidget {
-  const SortButton({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final albumSortOption = ref.watch(albumSortByOptionsProvider);
-    final albumSortIsReverse = ref.watch(albumSortOrderProvider);
-
-    return MenuAnchor(
-      style: MenuStyle(
-        elevation: const WidgetStatePropertyAll(1),
-        shape: WidgetStateProperty.all(
-          const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(24))),
-        ),
-        padding: const WidgetStatePropertyAll(EdgeInsets.all(4)),
-      ),
-      consumeOutsideTap: true,
-      menuChildren: AlbumSortMode.values
-          .map(
-            (mode) => MenuItemButton(
-              leadingIcon: albumSortOption == mode
-                  ? albumSortIsReverse
-                        ? Icon(
-                            Icons.keyboard_arrow_down,
-                            color: albumSortOption == mode
-                                ? context.colorScheme.onPrimary
-                                : context.colorScheme.onSurface,
-                          )
-                        : Icon(
-                            Icons.keyboard_arrow_up_rounded,
-                            color: albumSortOption == mode
-                                ? context.colorScheme.onPrimary
-                                : context.colorScheme.onSurface,
-                          )
-                  : const Icon(Icons.abc, color: Colors.transparent),
-              onPressed: () {
-                final selected = albumSortOption == mode;
-                // Switch direction
-                if (selected) {
-                  ref.read(albumSortOrderProvider.notifier).changeSortDirection(!albumSortIsReverse);
-                } else {
-                  ref.read(albumSortByOptionsProvider.notifier).changeSortMode(mode);
-                }
-              },
-              style: ButtonStyle(
-                padding: WidgetStateProperty.all(const EdgeInsets.fromLTRB(16, 16, 32, 16)),
-                backgroundColor: WidgetStateProperty.all(
-                  albumSortOption == mode ? context.colorScheme.primary : Colors.transparent,
-                ),
-                shape: WidgetStateProperty.all(
-                  const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(24))),
-                ),
-              ),
-              child: Text(
-                mode.label.tr(),
-                style: context.textTheme.titleSmall?.copyWith(
-                  fontWeight: FontWeight.w600,
-                  color: albumSortOption == mode
-                      ? context.colorScheme.onPrimary
-                      : context.colorScheme.onSurface.withAlpha(185),
-                ),
-              ),
-            ),
-          )
-          .toList(),
-      builder: (context, controller, child) {
-        return GestureDetector(
-          onTap: () {
-            if (controller.isOpen) {
-              controller.close();
-            } else {
-              controller.open();
-            }
-          },
-          child: Row(
-            children: [
-              Padding(
-                padding: const EdgeInsets.only(right: 5),
-                child: Transform.rotate(
-                  angle: 90 * pi / 180,
-                  child: Icon(
-                    Icons.compare_arrows_rounded,
-                    size: 18,
-                    color: context.colorScheme.onSurface.withAlpha(225),
-                  ),
-                ),
-              ),
-              Text(
-                albumSortOption.label.tr(),
-                style: context.textTheme.bodyLarge?.copyWith(
-                  fontWeight: FontWeight.w500,
-                  color: context.colorScheme.onSurface.withAlpha(225),
-                ),
-              ),
-            ],
-          ),
-        );
-      },
-    );
-  }
-}

mobile/lib/pages/backup/album_preview.page.dart

@@ -1,64 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/entities/album.entity.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
-import 'package:immich_mobile/repositories/album_media.repository.dart';
-import 'package:immich_mobile/widgets/common/immich_thumbnail.dart';
-
-@RoutePage()
-class AlbumPreviewPage extends HookConsumerWidget {
-  final Album album;
-  const AlbumPreviewPage({super.key, required this.album});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final assets = useState<List<Asset>>([]);
-
-    getAssetsInAlbum() async {
-      assets.value = await ref.read(albumMediaRepositoryProvider).getAssets(album.localId!);
-    }
-
-    useEffect(() {
-      getAssetsInAlbum();
-      return null;
-    }, []);
-
-    return Scaffold(
-      appBar: AppBar(
-        elevation: 0,
-        title: Column(
-          children: [
-            Text(album.name, style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
-            Padding(
-              padding: const EdgeInsets.only(top: 4.0),
-              child: Text(
-                "ID ${album.id}",
-                style: TextStyle(
-                  fontSize: 10,
-                  color: context.colorScheme.onSurfaceSecondary,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-            ),
-          ],
-        ),
-        leading: IconButton(onPressed: () => context.maybePop(), icon: const Icon(Icons.arrow_back_ios_new_rounded)),
-      ),
-      body: GridView.builder(
-        gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-          crossAxisCount: 5,
-          crossAxisSpacing: 2,
-          mainAxisSpacing: 2,
-        ),
-        itemCount: assets.value.length,
-        itemBuilder: (context, index) {
-          return ImmichThumbnail(asset: assets.value[index], width: 100, height: 100);
-        },
-      ),
-    );
-  }
-}

mobile/lib/pages/backup/backup_album_selection.page.dart

@@ -1,225 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-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/providers/album/album.provider.dart';
-import 'package:immich_mobile/providers/backup/backup.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
-import 'package:immich_mobile/widgets/backup/album_info_card.dart';
-import 'package:immich_mobile/widgets/backup/album_info_list_tile.dart';
-import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
-
-@RoutePage()
-class BackupAlbumSelectionPage extends HookConsumerWidget {
-  const BackupAlbumSelectionPage({super.key});
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final selectedBackupAlbums = ref.watch(backupProvider).selectedBackupAlbums;
-    final excludedBackupAlbums = ref.watch(backupProvider).excludedBackupAlbums;
-    final enableSyncUploadAlbum = useAppSettingsState(AppSettingsEnum.syncAlbums);
-    final isDarkTheme = context.isDarkTheme;
-    final albums = ref.watch(backupProvider).availableAlbums;
-
-    useEffect(() {
-      ref.watch(backupProvider.notifier).getBackupInfo();
-      return null;
-    }, []);
-
-    buildAlbumSelectionList() {
-      if (albums.isEmpty) {
-        return const SliverToBoxAdapter(child: Center(child: CircularProgressIndicator()));
-      }
-
-      return SliverPadding(
-        padding: const EdgeInsets.symmetric(vertical: 12.0),
-        sliver: SliverList(
-          delegate: SliverChildBuilderDelegate(((context, index) {
-            return AlbumInfoListTile(album: albums[index]);
-          }), childCount: albums.length),
-        ),
-      );
-    }
-
-    buildAlbumSelectionGrid() {
-      if (albums.isEmpty) {
-        return const SliverToBoxAdapter(child: Center(child: CircularProgressIndicator()));
-      }
-
-      return SliverPadding(
-        padding: const EdgeInsets.all(12.0),
-        sliver: SliverGrid.builder(
-          gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
-            maxCrossAxisExtent: 300,
-            mainAxisSpacing: 12,
-            crossAxisSpacing: 12,
-          ),
-          itemCount: albums.length,
-          itemBuilder: ((context, index) {
-            return AlbumInfoCard(album: albums[index]);
-          }),
-        ),
-      );
-    }
-
-    buildSelectedAlbumNameChip() {
-      return selectedBackupAlbums.map((album) {
-        void removeSelection() => ref.read(backupProvider.notifier).removeAlbumForBackup(album);
-
-        return Padding(
-          padding: const EdgeInsets.only(right: 8.0),
-          child: GestureDetector(
-            onTap: removeSelection,
-            child: Chip(
-              label: Text(
-                album.name,
-                style: TextStyle(
-                  fontSize: 12,
-                  color: isDarkTheme ? Colors.black : Colors.white,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              backgroundColor: context.primaryColor,
-              deleteIconColor: isDarkTheme ? Colors.black : Colors.white,
-              deleteIcon: const Icon(Icons.cancel_rounded, size: 15),
-              onDeleted: removeSelection,
-            ),
-          ),
-        );
-      }).toSet();
-    }
-
-    buildExcludedAlbumNameChip() {
-      return excludedBackupAlbums.map((album) {
-        void removeSelection() {
-          ref.watch(backupProvider.notifier).removeExcludedAlbumForBackup(album);
-        }
-
-        return GestureDetector(
-          onTap: removeSelection,
-          child: Padding(
-            padding: const EdgeInsets.only(right: 8.0),
-            child: Chip(
-              label: Text(
-                album.name,
-                style: TextStyle(fontSize: 12, color: context.scaffoldBackgroundColor, fontWeight: FontWeight.bold),
-              ),
-              backgroundColor: Colors.red[300],
-              deleteIconColor: context.scaffoldBackgroundColor,
-              deleteIcon: const Icon(Icons.cancel_rounded, size: 15),
-              onDeleted: removeSelection,
-            ),
-          ),
-        );
-      }).toSet();
-    }
-
-    handleSyncAlbumToggle(bool isEnable) async {
-      if (isEnable) {
-        await ref.read(albumProvider.notifier).refreshRemoteAlbums();
-        for (final album in selectedBackupAlbums) {
-          await ref.read(albumProvider.notifier).createSyncAlbum(album.name);
-        }
-      }
-    }
-
-    return Scaffold(
-      appBar: AppBar(
-        leading: IconButton(onPressed: () => context.maybePop(), icon: const Icon(Icons.arrow_back_ios_rounded)),
-        title: const Text("backup_album_selection_page_select_albums").tr(),
-        elevation: 0,
-      ),
-      body: CustomScrollView(
-        physics: const ClampingScrollPhysics(),
-        slivers: [
-          SliverToBoxAdapter(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Padding(
-                  padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
-                  child: Text("backup_album_selection_page_selection_info", style: context.textTheme.titleSmall).tr(),
-                ),
-
-                // Selected Album Chips
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                  child: Wrap(children: [...buildSelectedAlbumNameChip(), ...buildExcludedAlbumNameChip()]),
-                ),
-
-                SettingsSwitchListTile(
-                  valueNotifier: enableSyncUploadAlbum,
-                  title: "sync_albums".tr(),
-                  subtitle: "sync_upload_album_setting_subtitle".tr(),
-                  contentPadding: const EdgeInsets.symmetric(horizontal: 16),
-                  titleStyle: context.textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.bold),
-                  subtitleStyle: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.primary),
-                  onChanged: handleSyncAlbumToggle,
-                ),
-
-                ListTile(
-                  title: Text(
-                    "backup_album_selection_page_albums_device".tr(
-                      namedArgs: {'count': ref.watch(backupProvider).availableAlbums.length.toString()},
-                    ),
-                    style: context.textTheme.titleSmall,
-                  ),
-                  subtitle: Padding(
-                    padding: const EdgeInsets.symmetric(vertical: 8.0),
-                    child: Text(
-                      "backup_album_selection_page_albums_tap",
-                      style: context.textTheme.labelLarge?.copyWith(color: context.primaryColor),
-                    ).tr(),
-                  ),
-                  trailing: IconButton(
-                    splashRadius: 16,
-                    icon: Icon(Icons.info, size: 20, color: context.primaryColor),
-                    onPressed: () {
-                      // show the dialog
-                      showDialog(
-                        context: context,
-                        builder: (BuildContext context) {
-                          return AlertDialog(
-                            shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(10))),
-                            elevation: 5,
-                            title: Text(
-                              'backup_album_selection_page_selection_info',
-                              style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color: context.primaryColor),
-                            ).tr(),
-                            content: SingleChildScrollView(
-                              child: ListBody(
-                                children: [
-                                  const Text(
-                                    'backup_album_selection_page_assets_scatter',
-                                    style: TextStyle(fontSize: 14),
-                                  ).tr(),
-                                ],
-                              ),
-                            ),
-                          );
-                        },
-                      );
-                    },
-                  ),
-                ),
-
-                // buildSearchBar(),
-              ],
-            ),
-          ),
-          SliverLayoutBuilder(
-            builder: (context, constraints) {
-              if (constraints.crossAxisExtent > 600) {
-                return buildAlbumSelectionGrid();
-              } else {
-                return buildAlbumSelectionList();
-              }
-            },
-          ),
-        ],
-      ),
-    );
-  }
-}

mobile/lib/pages/backup/backup_controller.page.dart

@@ -1,286 +0,0 @@
-import 'dart:io';
-import 'dart:math';
-
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-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/extensions/theme_extensions.dart';
-import 'package:immich_mobile/models/backup/backup_state.model.dart';
-import 'package:immich_mobile/providers/album/album.provider.dart';
-import 'package:immich_mobile/providers/backup/backup.provider.dart';
-import 'package:immich_mobile/providers/backup/error_backup_list.provider.dart';
-import 'package:immich_mobile/providers/backup/ios_background_settings.provider.dart';
-import 'package:immich_mobile/providers/backup/manual_upload.provider.dart';
-import 'package:immich_mobile/providers/websocket.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/widgets/backup/backup_info_card.dart';
-import 'package:immich_mobile/widgets/backup/current_backup_asset_info_box.dart';
-import 'package:wakelock_plus/wakelock_plus.dart';
-
-@RoutePage()
-class BackupControllerPage extends HookConsumerWidget {
-  const BackupControllerPage({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    BackUpState backupState = ref.watch(backupProvider);
-    final hasAnyAlbum = backupState.selectedBackupAlbums.isNotEmpty;
-    final didGetBackupInfo = useState(false);
-
-    bool hasExclusiveAccess = backupState.backupProgress != BackUpProgressEnum.inBackground;
-    bool shouldBackup =
-        backupState.allUniqueAssets.length - backupState.selectedAlbumsBackupAssetsIds.length == 0 ||
-            !hasExclusiveAccess
-        ? false
-        : true;
-
-    useEffect(() {
-      // Update the background settings information just to make sure we
-      // have the latest, since the platform channel will not update
-      // automatically
-      if (Platform.isIOS) {
-        ref.watch(iOSBackgroundSettingsProvider.notifier).refresh();
-      }
-
-      ref.watch(websocketProvider.notifier).stopListenToEvent('on_upload_success');
-
-      return () {
-        WakelockPlus.disable();
-      };
-    }, []);
-
-    useEffect(() {
-      if (backupState.backupProgress == BackUpProgressEnum.idle && !didGetBackupInfo.value) {
-        ref.watch(backupProvider.notifier).getBackupInfo();
-        didGetBackupInfo.value = true;
-      }
-      return null;
-    }, [backupState.backupProgress]);
-
-    useEffect(() {
-      if (backupState.backupProgress == BackUpProgressEnum.inProgress) {
-        WakelockPlus.enable();
-      } else {
-        WakelockPlus.disable();
-      }
-
-      return null;
-    }, [backupState.backupProgress]);
-
-    Widget buildSelectedAlbumName() {
-      var text = "backup_controller_page_backup_selected".tr();
-      var albums = ref.watch(backupProvider).selectedBackupAlbums;
-
-      if (albums.isNotEmpty) {
-        for (var album in albums) {
-          if (album.name == "Recent" || album.name == "Recents") {
-            text += "${album.name} (${'all'.tr()}), ";
-          } else {
-            text += "${album.name}, ";
-          }
-        }
-
-        return Padding(
-          padding: const EdgeInsets.only(top: 8.0),
-          child: Text(
-            text.trim().substring(0, text.length - 2),
-            style: context.textTheme.labelLarge?.copyWith(color: context.primaryColor),
-          ),
-        );
-      } else {
-        return Padding(
-          padding: const EdgeInsets.only(top: 8.0),
-          child: Text(
-            "backup_controller_page_none_selected".tr(),
-            style: context.textTheme.labelLarge?.copyWith(color: context.primaryColor),
-          ),
-        );
-      }
-    }
-
-    Widget buildExcludedAlbumName() {
-      var text = "backup_controller_page_excluded".tr();
-      var albums = ref.watch(backupProvider).excludedBackupAlbums;
-
-      if (albums.isNotEmpty) {
-        for (var album in albums) {
-          text += "${album.name}, ";
-        }
-
-        return Padding(
-          padding: const EdgeInsets.only(top: 8.0),
-          child: Text(
-            text.trim().substring(0, text.length - 2),
-            style: context.textTheme.labelLarge?.copyWith(color: Colors.red[300]),
-          ),
-        );
-      } else {
-        return const SizedBox();
-      }
-    }
-
-    buildFolderSelectionTile() {
-      return Padding(
-        padding: const EdgeInsets.only(top: 8.0),
-        child: Card(
-          shape: RoundedRectangleBorder(
-            borderRadius: const BorderRadius.all(Radius.circular(20)),
-            side: BorderSide(color: context.colorScheme.outlineVariant, width: 1),
-          ),
-          elevation: 0,
-          borderOnForeground: false,
-          child: ListTile(
-            minVerticalPadding: 18,
-            title: Text("backup_controller_page_albums", style: context.textTheme.titleMedium).tr(),
-            subtitle: Padding(
-              padding: const EdgeInsets.only(top: 8.0),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    "backup_controller_page_to_backup",
-                    style: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
-                  ).tr(),
-                  buildSelectedAlbumName(),
-                  buildExcludedAlbumName(),
-                ],
-              ),
-            ),
-            trailing: ElevatedButton(
-              onPressed: () async {
-                await context.pushRoute(const BackupAlbumSelectionRoute());
-                // waited until returning from selection
-                await ref.read(backupProvider.notifier).backupAlbumSelectionDone();
-                // waited until backup albums are stored in DB
-                await ref.read(albumProvider.notifier).refreshDeviceAlbums();
-              },
-              child: const Text("select", style: TextStyle(fontWeight: FontWeight.bold)).tr(),
-            ),
-          ),
-        ),
-      );
-    }
-
-    void startBackup() {
-      ref.watch(errorBackupListProvider.notifier).empty();
-      if (ref.watch(backupProvider).backupProgress != BackUpProgressEnum.inBackground) {
-        ref.watch(backupProvider.notifier).startBackupProcess();
-      }
-    }
-
-    Widget buildBackupButton() {
-      return Padding(
-        padding: const EdgeInsets.only(top: 24),
-        child: Container(
-          child:
-              backupState.backupProgress == BackUpProgressEnum.inProgress ||
-                  backupState.backupProgress == BackUpProgressEnum.manualInProgress
-              ? ElevatedButton(
-                  style: ElevatedButton.styleFrom(
-                    foregroundColor: Colors.grey[50],
-                    backgroundColor: Colors.red[300],
-                    // padding: const EdgeInsets.all(14),
-                  ),
-                  onPressed: () {
-                    if (backupState.backupProgress == BackUpProgressEnum.manualInProgress) {
-                      ref.read(manualUploadProvider.notifier).cancelBackup();
-                    } else {
-                      ref.read(backupProvider.notifier).cancelBackup();
-                    }
-                  },
-                  child: const Text("cancel", style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold)).tr(),
-                )
-              : ElevatedButton(
-                  onPressed: shouldBackup ? startBackup : null,
-                  child: const Text(
-                    "backup_controller_page_start_backup",
-                    style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
-                  ).tr(),
-                ),
-        ),
-      );
-    }
-
-    buildBackgroundBackupInfo() {
-      return ListTile(
-        leading: const Icon(Icons.info_outline_rounded),
-        title: Text('background_backup_running_error'.tr()),
-      );
-    }
-
-    buildLoadingIndicator() {
-      return const Padding(
-        padding: EdgeInsets.only(top: 42.0),
-        child: Center(child: CircularProgressIndicator()),
-      );
-    }
-
-    return Scaffold(
-      appBar: AppBar(
-        elevation: 0,
-        title: const Text("backup_controller_page_backup").tr(),
-        leading: IconButton(
-          onPressed: () {
-            ref.watch(websocketProvider.notifier).listenUploadEvent();
-            context.maybePop(true);
-          },
-          splashRadius: 24,
-          icon: const Icon(Icons.arrow_back_ios_rounded),
-        ),
-        actions: [
-          Padding(
-            padding: const EdgeInsets.only(right: 8.0),
-            child: IconButton(
-              onPressed: () => context.pushRoute(const BackupOptionsRoute()),
-              splashRadius: 24,
-              icon: const Icon(Icons.settings_outlined),
-            ),
-          ),
-        ],
-      ),
-      body: Stack(
-        children: [
-          Padding(
-            padding: const EdgeInsets.only(left: 16.0, right: 16, bottom: 32),
-            child: ListView(
-              // crossAxisAlignment: CrossAxisAlignment.start,
-              children: hasAnyAlbum
-                  ? [
-                      buildFolderSelectionTile(),
-                      BackupInfoCard(
-                        title: "total".tr(),
-                        subtitle: "backup_controller_page_total_sub".tr(),
-                        info: ref.watch(backupProvider).availableAlbums.isEmpty
-                            ? "..."
-                            : "${backupState.allUniqueAssets.length}",
-                      ),
-                      BackupInfoCard(
-                        title: "backup_controller_page_backup".tr(),
-                        subtitle: "backup_controller_page_backup_sub".tr(),
-                        info: ref.watch(backupProvider).availableAlbums.isEmpty
-                            ? "..."
-                            : "${backupState.selectedAlbumsBackupAssetsIds.length}",
-                      ),
-                      BackupInfoCard(
-                        title: "backup_controller_page_remainder".tr(),
-                        subtitle: "backup_controller_page_remainder_sub".tr(),
-                        info: ref.watch(backupProvider).availableAlbums.isEmpty
-                            ? "..."
-                            : "${max(0, backupState.allUniqueAssets.length - backupState.selectedAlbumsBackupAssetsIds.length)}",
-                      ),
-                      const Divider(),
-                      const CurrentUploadingAssetInfoBox(),
-                      if (!hasExclusiveAccess) buildBackgroundBackupInfo(),
-                      buildBackupButton(),
-                    ]
-                  : [buildFolderSelectionTile(), if (!didGetBackupInfo.value) buildLoadingIndicator()],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

mobile/lib/pages/backup/backup_options.page.dart

@@ -1,24 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/widgets/settings/backup_settings/backup_settings.dart';
-
-@RoutePage()
-class BackupOptionsPage extends StatelessWidget {
-  const BackupOptionsPage({super.key});
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        elevation: 0,
-        title: const Text("backup_options_page_title").tr(),
-        leading: IconButton(
-          onPressed: () => context.maybePop(true),
-          splashRadius: 24,
-          icon: const Icon(Icons.arrow_back_ios_rounded),
-        ),
-      ),
-      body: const BackupSettings(),
-    );
-  }
-}

mobile/lib/pages/backup/drift_backup.page.dart

@@ -45,14 +45,17 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
     }
 
     WidgetsBinding.instance.addPostFrameCallback((_) async {
-      await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
+      final backupNotifier = ref.read(driftBackupProvider.notifier);
+      final syncManager = ref.read(backgroundSyncProvider);
 
-      ref.read(driftBackupProvider.notifier).updateSyncing(true);
-      syncSuccess = await ref.read(backgroundSyncProvider).syncRemote();
-      ref.read(driftBackupProvider.notifier).updateSyncing(false);
+      await backupNotifier.getBackupStatus(currentUser.id);
+
+      backupNotifier.updateSyncing(true);
+      syncSuccess = await syncManager.syncRemote();
+      backupNotifier.updateSyncing(false);
 
       if (mounted) {
-        await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
+        await backupNotifier.getBackupStatus(currentUser.id);
       }
     });
   }
@@ -82,9 +85,9 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
       }
 
       if (syncSuccess == null) {
-        ref.read(driftBackupProvider.notifier).updateSyncing(true);
+        backupNotifier.updateSyncing(true);
         syncSuccess = await backupSyncManager.syncRemote();
-        ref.read(driftBackupProvider.notifier).updateSyncing(false);
+        backupNotifier.updateSyncing(false);
       }
 
       await backupNotifier.getBackupStatus(currentUser.id);

mobile/lib/pages/backup/failed_backup_status.page.dart

@@ -1,116 +0,0 @@
-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/presentation/widgets/images/local_image_provider.dart';
-import 'package:immich_mobile/providers/backup/error_backup_list.provider.dart';
-import 'package:intl/intl.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart' as base_asset;
-
-@RoutePage()
-class FailedBackupStatusPage extends HookConsumerWidget {
-  const FailedBackupStatusPage({super.key});
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final errorBackupList = ref.watch(errorBackupListProvider);
-
-    return Scaffold(
-      appBar: AppBar(
-        elevation: 0,
-        title: Text(
-          "Failed Backup (${errorBackupList.length})",
-          style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
-        ),
-        leading: IconButton(
-          onPressed: () {
-            context.maybePop(true);
-          },
-          splashRadius: 24,
-          icon: const Icon(Icons.arrow_back_ios_rounded),
-        ),
-      ),
-      body: ListView.builder(
-        shrinkWrap: true,
-        itemCount: errorBackupList.length,
-        itemBuilder: ((context, index) {
-          var errorAsset = errorBackupList.elementAt(index);
-
-          return Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 4),
-            child: Card(
-              shape: const RoundedRectangleBorder(
-                borderRadius: BorderRadius.all(
-                  Radius.circular(15), // if you need this
-                ),
-                side: BorderSide(color: Colors.black12, width: 1),
-              ),
-              elevation: 0,
-              child: Row(
-                crossAxisAlignment: CrossAxisAlignment.center,
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  ConstrainedBox(
-                    constraints: const BoxConstraints(minWidth: 100, minHeight: 100, maxWidth: 100, maxHeight: 150),
-                    child: ClipRRect(
-                      borderRadius: const BorderRadius.only(
-                        bottomLeft: Radius.circular(15),
-                        topLeft: Radius.circular(15),
-                      ),
-                      clipBehavior: Clip.hardEdge,
-                      child: Image(
-                        fit: BoxFit.cover,
-                        image: LocalThumbProvider(id: errorAsset.asset.localId!, assetType: base_asset.AssetType.video),
-                      ),
-                    ),
-                  ),
-                  Expanded(
-                    child: Padding(
-                      padding: const EdgeInsets.all(16.0),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                        children: [
-                          Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            children: [
-                              Text(
-                                DateFormat.yMMMMd().format(
-                                  DateTime.parse(errorAsset.fileCreatedAt.toString()).toLocal(),
-                                ),
-                                style: TextStyle(
-                                  fontWeight: FontWeight.w600,
-                                  color: context.isDarkTheme ? Colors.white70 : Colors.grey[800],
-                                ),
-                              ),
-                              Icon(Icons.error, color: Colors.red.withAlpha(200), size: 18),
-                            ],
-                          ),
-                          Padding(
-                            padding: const EdgeInsets.symmetric(vertical: 8.0),
-                            child: Text(
-                              errorAsset.fileName,
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                              style: TextStyle(fontWeight: FontWeight.bold, color: context.primaryColor),
-                            ),
-                          ),
-                          Text(
-                            errorAsset.errorMessage,
-                            style: TextStyle(
-                              fontWeight: FontWeight.w500,
-                              color: context.isDarkTheme ? Colors.white70 : Colors.grey[800],
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          );
-        }),
-      ),
-    );
-  }
-}

mobile/lib/pages/common/activities.page.dart

@@ -1,97 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:collection/collection.dart';
-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/asyncvalue_extensions.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/models/activities/activity.model.dart';
-import 'package:immich_mobile/providers/activity.provider.dart';
-import 'package:immich_mobile/providers/album/current_album.provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/widgets/activities/activity_text_field.dart';
-import 'package:immich_mobile/widgets/activities/activity_tile.dart';
-import 'package:immich_mobile/widgets/activities/dismissible_activity.dart';
-
-@RoutePage()
-class ActivitiesPage extends HookConsumerWidget {
-  const ActivitiesPage({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    // Album has to be set in the provider before reaching this page
-    final album = ref.watch(currentAlbumProvider)!;
-    final asset = ref.watch(currentAssetProvider);
-    final user = ref.watch(currentUserProvider);
-
-    final activityNotifier = ref.read(albumActivityProvider(album.remoteId!, asset?.remoteId).notifier);
-    final activities = ref.watch(albumActivityProvider(album.remoteId!, asset?.remoteId));
-
-    final listViewScrollController = useScrollController();
-
-    Future<void> onAddComment(String comment) async {
-      await activityNotifier.addComment(comment);
-      // Scroll to the end of the list to show the newly added activity
-      await listViewScrollController.animateTo(
-        listViewScrollController.position.maxScrollExtent + 200,
-        duration: const Duration(milliseconds: 600),
-        curve: Curves.fastOutSlowIn,
-      );
-    }
-
-    return Scaffold(
-      appBar: AppBar(title: asset == null ? Text(album.name) : null),
-      body: activities.widgetWhen(
-        onData: (data) {
-          final liked = data.firstWhereOrNull(
-            (a) => a.type == ActivityType.like && a.user.id == user?.id && a.assetId == asset?.remoteId,
-          );
-
-          return SafeArea(
-            child: Stack(
-              children: [
-                ListView.builder(
-                  controller: listViewScrollController,
-                  // +1 to display an additional over-scroll space after the last element
-                  itemCount: data.length + 1,
-                  itemBuilder: (context, index) {
-                    // Additional vertical gap after the last element
-                    if (index == data.length) {
-                      return const SizedBox(height: 80);
-                    }
-
-                    final activity = data[index];
-                    final canDelete = activity.user.id == user?.id || album.ownerId == user?.id;
-
-                    return Padding(
-                      padding: const EdgeInsets.all(5),
-                      child: DismissibleActivity(
-                        activity.id,
-                        ActivityTile(activity),
-                        onDismiss: canDelete
-                            ? (activityId) async => await activityNotifier.removeActivity(activity.id)
-                            : null,
-                      ),
-                    );
-                  },
-                ),
-                Align(
-                  alignment: Alignment.bottomCenter,
-                  child: Container(
-                    color: context.scaffoldBackgroundColor,
-                    child: ActivityTextField(
-                      isEnabled: album.activityEnabled,
-                      likeId: liked?.id,
-                      onSubmit: onAddComment,
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          );
-        },
-      ),
-    );
-  }
-}

mobile/lib/pages/common/change_experience.page.dart

@@ -1,168 +0,0 @@
-import 'dart:async';
-
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
-import 'package:immich_mobile/providers/album/album.provider.dart';
-import 'package:immich_mobile/providers/asset.provider.dart';
-import 'package:immich_mobile/providers/background_sync.provider.dart';
-import 'package:immich_mobile/providers/backup/backup.provider.dart';
-import 'package:immich_mobile/providers/backup/manual_upload.provider.dart';
-import 'package:immich_mobile/providers/gallery_permission.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
-import 'package:immich_mobile/providers/websocket.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/services/background.service.dart';
-import 'package:immich_mobile/utils/migration.dart';
-import 'package:logging/logging.dart';
-import 'package:permission_handler/permission_handler.dart';
-
-@RoutePage()
-class ChangeExperiencePage extends ConsumerStatefulWidget {
-  final bool switchingToBeta;
-
-  const ChangeExperiencePage({super.key, required this.switchingToBeta});
-
-  @override
-  ConsumerState createState() => _ChangeExperiencePageState();
-}
-
-class _ChangeExperiencePageState extends ConsumerState<ChangeExperiencePage> {
-  AsyncValue<bool> hasMigrated = const AsyncValue.loading();
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) => _handleMigration());
-  }
-
-  Future<void> _handleMigration() async {
-    try {
-      await _performMigrationLogic().timeout(
-        const Duration(minutes: 3),
-        onTimeout: () async {
-          await IsarStoreRepository(ref.read(isarProvider)).upsert(StoreKey.betaTimeline, widget.switchingToBeta);
-          await DriftStoreRepository(ref.read(driftProvider)).upsert(StoreKey.betaTimeline, widget.switchingToBeta);
-        },
-      );
-
-      if (mounted) {
-        setState(() {
-          HapticFeedback.heavyImpact();
-          hasMigrated = const AsyncValue.data(true);
-        });
-      }
-    } catch (e, s) {
-      Logger("ChangeExperiencePage").severe("Error during migration", e, s);
-      if (mounted) {
-        setState(() {
-          hasMigrated = AsyncValue.error(e, s);
-        });
-      }
-    }
-  }
-
-  Future<void> _performMigrationLogic() async {
-    if (widget.switchingToBeta) {
-      final assetNotifier = ref.read(assetProvider.notifier);
-      if (assetNotifier.mounted) {
-        assetNotifier.dispose();
-      }
-      final albumNotifier = ref.read(albumProvider.notifier);
-      if (albumNotifier.mounted) {
-        albumNotifier.dispose();
-      }
-
-      // Cancel uploads
-      await Store.put(StoreKey.backgroundBackup, false);
-      ref
-          .read(backupProvider.notifier)
-          .configureBackgroundBackup(enabled: false, onBatteryInfo: () {}, onError: (_) {});
-      ref.read(backupProvider.notifier).setAutoBackup(false);
-      ref.read(backupProvider.notifier).cancelBackup();
-      ref.read(manualUploadProvider.notifier).cancelBackup();
-      // Start listening to new websocket events
-      ref.read(websocketProvider.notifier).stopListenToOldEvents();
-      ref.read(websocketProvider.notifier).startListeningToBetaEvents();
-
-      await ref.read(driftProvider).reset();
-      await Store.put(StoreKey.shouldResetSync, true);
-      final delay = Store.get(StoreKey.backupTriggerDelay, AppSettingsEnum.backupTriggerDelay.defaultValue);
-      if (delay >= 1000) {
-        await Store.put(StoreKey.backupTriggerDelay, (delay / 1000).toInt());
-      }
-      final permission = await ref.read(galleryPermissionNotifier.notifier).requestGalleryPermission();
-
-      if (permission.isGranted) {
-        await ref.read(backgroundSyncProvider).syncLocal(full: true);
-        await migrateDeviceAssetToSqlite(ref.read(isarProvider), ref.read(driftProvider));
-        await migrateBackupAlbumsToSqlite(ref.read(isarProvider), ref.read(driftProvider));
-        await migrateStoreToSqlite(ref.read(isarProvider), ref.read(driftProvider));
-        await ref.read(backgroundServiceProvider).disableService();
-      }
-    } else {
-      await ref.read(backgroundSyncProvider).cancel();
-      ref.read(websocketProvider.notifier).stopListeningToBetaEvents();
-      ref.read(websocketProvider.notifier).startListeningToOldEvents();
-      ref.read(readonlyModeProvider.notifier).setReadonlyMode(false);
-      await migrateStoreToIsar(ref.read(isarProvider), ref.read(driftProvider));
-      await ref.read(backgroundServiceProvider).resumeServiceIfEnabled();
-      await ref.read(backgroundWorkerFgServiceProvider).disable();
-    }
-
-    await IsarStoreRepository(ref.read(isarProvider)).upsert(StoreKey.betaTimeline, widget.switchingToBeta);
-    await DriftStoreRepository(ref.read(driftProvider)).upsert(StoreKey.betaTimeline, widget.switchingToBeta);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Center(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            AnimatedSwitcher(
-              duration: Durations.long4,
-              child: hasMigrated.when(
-                data: (data) => const Icon(Icons.check_circle_rounded, color: Colors.green, size: 48.0),
-                error: (error, stackTrace) => const Icon(Icons.error, color: Colors.red, size: 48.0),
-                loading: () => const SizedBox(width: 50.0, height: 50.0, child: CircularProgressIndicator()),
-              ),
-            ),
-            const SizedBox(height: 16.0),
-            SizedBox(
-              width: 300.0,
-              child: AnimatedSwitcher(
-                duration: Durations.long4,
-                child: hasMigrated.when(
-                  data: (data) => Text(
-                    "Migration success!\nPlease close and reopen the app to apply changes",
-                    style: context.textTheme.titleMedium,
-                    textAlign: TextAlign.center,
-                  ),
-                  error: (error, stackTrace) => Text(
-                    "Migration failed!\nError: $error",
-                    style: context.textTheme.titleMedium,
-                    textAlign: TextAlign.center,
-                  ),
-                  loading: () => Text(
-                    "Data migration in progress...\nPlease wait and don't close this page",
-                    style: context.textTheme.titleMedium,
-                    textAlign: TextAlign.center,
-                  ),
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

mobile/lib/pages/common/create_album.page.dart

@@ -1,238 +0,0 @@
-import 'dart:async';
-
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/models/albums/asset_selection_page_result.model.dart';
-import 'package:immich_mobile/providers/album/album.provider.dart';
-import 'package:immich_mobile/providers/album/album_title.provider.dart';
-import 'package:immich_mobile/providers/album/album_viewer.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/widgets/album/album_action_filled_button.dart';
-import 'package:immich_mobile/widgets/album/album_title_text_field.dart';
-import 'package:immich_mobile/widgets/album/album_viewer_editable_description.dart';
-import 'package:immich_mobile/widgets/album/shared_album_thumbnail_image.dart';
-
-@RoutePage()
-// ignore: must_be_immutable
-class CreateAlbumPage extends HookConsumerWidget {
-  final List<Asset>? assets;
-
-  const CreateAlbumPage({super.key, this.assets});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final albumTitleController = useTextEditingController.fromValue(TextEditingValue.empty);
-    final albumTitleTextFieldFocusNode = useFocusNode();
-    final albumDescriptionTextFieldFocusNode = useFocusNode();
-    final isAlbumTitleTextFieldFocus = useState(false);
-    final isAlbumTitleEmpty = useState(true);
-    final selectedAssets = useState<Set<Asset>>(assets != null ? Set.from(assets!) : const {});
-
-    void onBackgroundTapped() {
-      albumTitleTextFieldFocusNode.unfocus();
-      albumDescriptionTextFieldFocusNode.unfocus();
-      isAlbumTitleTextFieldFocus.value = false;
-
-      if (albumTitleController.text.isEmpty) {
-        albumTitleController.text = 'create_album_page_untitled'.tr();
-        isAlbumTitleEmpty.value = false;
-        ref.watch(albumTitleProvider.notifier).setAlbumTitle('create_album_page_untitled'.tr());
-      }
-    }
-
-    onSelectPhotosButtonPressed() async {
-      AssetSelectionPageResult? selectedAsset = await context.pushRoute<AssetSelectionPageResult?>(
-        AlbumAssetSelectionRoute(existingAssets: selectedAssets.value, canDeselect: true),
-      );
-      if (selectedAsset == null) {
-        selectedAssets.value = const {};
-      } else {
-        selectedAssets.value = selectedAsset.selectedAssets;
-      }
-    }
-
-    buildTitleInputField() {
-      return Padding(
-        padding: const EdgeInsets.only(right: 10, left: 10),
-        child: AlbumTitleTextField(
-          isAlbumTitleEmpty: isAlbumTitleEmpty,
-          albumTitleTextFieldFocusNode: albumTitleTextFieldFocusNode,
-          albumTitleController: albumTitleController,
-          isAlbumTitleTextFieldFocus: isAlbumTitleTextFieldFocus,
-        ),
-      );
-    }
-
-    buildDescriptionInputField() {
-      return Padding(
-        padding: const EdgeInsets.only(right: 10, left: 10),
-        child: AlbumViewerEditableDescription(
-          albumDescription: '',
-          descriptionFocusNode: albumDescriptionTextFieldFocusNode,
-        ),
-      );
-    }
-
-    buildTitle() {
-      if (selectedAssets.value.isEmpty) {
-        return SliverToBoxAdapter(
-          child: Padding(
-            padding: const EdgeInsets.only(top: 200, left: 18),
-            child: Text('create_shared_album_page_share_add_assets', style: context.textTheme.labelLarge).tr(),
-          ),
-        );
-      }
-
-      return const SliverToBoxAdapter();
-    }
-
-    buildSelectPhotosButton() {
-      if (selectedAssets.value.isEmpty) {
-        return SliverToBoxAdapter(
-          child: Padding(
-            padding: const EdgeInsets.only(top: 16, left: 16, right: 16),
-            child: FilledButton.icon(
-              style: FilledButton.styleFrom(
-                alignment: Alignment.centerLeft,
-                padding: const EdgeInsets.symmetric(vertical: 24, horizontal: 16),
-                shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(10))),
-                backgroundColor: context.colorScheme.surfaceContainerHigh,
-              ),
-              onPressed: onSelectPhotosButtonPressed,
-              icon: Icon(Icons.add_rounded, color: context.primaryColor),
-              label: Padding(
-                padding: const EdgeInsets.only(left: 8.0),
-                child: Text(
-                  'create_shared_album_page_share_select_photos',
-                  style: context.textTheme.titleMedium?.copyWith(
-                    fontWeight: FontWeight.w600,
-                    color: context.primaryColor,
-                  ),
-                ).tr(),
-              ),
-            ),
-          ),
-        );
-      }
-
-      return const SliverToBoxAdapter();
-    }
-
-    buildControlButton() {
-      return Padding(
-        padding: const EdgeInsets.only(left: 12.0, top: 16, bottom: 16),
-        child: SizedBox(
-          height: 42,
-          child: ListView(
-            scrollDirection: Axis.horizontal,
-            children: [
-              AlbumActionFilledButton(
-                iconData: Icons.add_photo_alternate_outlined,
-                onPressed: onSelectPhotosButtonPressed,
-                labelText: "add_photos".tr(),
-              ),
-            ],
-          ),
-        ),
-      );
-    }
-
-    buildSelectedImageGrid() {
-      if (selectedAssets.value.isNotEmpty) {
-        return SliverPadding(
-          padding: const EdgeInsets.only(top: 16),
-          sliver: SliverGrid(
-            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-              crossAxisCount: 3,
-              crossAxisSpacing: 5.0,
-              mainAxisSpacing: 5,
-            ),
-            delegate: SliverChildBuilderDelegate((BuildContext context, int index) {
-              return GestureDetector(
-                onTap: onBackgroundTapped,
-                child: SharedAlbumThumbnailImage(asset: selectedAssets.value.elementAt(index)),
-              );
-            }, childCount: selectedAssets.value.length),
-          ),
-        );
-      }
-
-      return const SliverToBoxAdapter();
-    }
-
-    Future<void> createAlbum() async {
-      onBackgroundTapped();
-      var newAlbum = await ref
-          .watch(albumProvider.notifier)
-          .createAlbum(ref.read(albumTitleProvider), selectedAssets.value);
-
-      if (newAlbum != null) {
-        await ref.read(albumProvider.notifier).refreshRemoteAlbums();
-        selectedAssets.value = {};
-        ref.read(albumTitleProvider.notifier).clearAlbumTitle();
-        ref.read(albumViewerProvider.notifier).disableEditAlbum();
-        unawaited(context.replaceRoute(AlbumViewerRoute(albumId: newAlbum.id)));
-      }
-    }
-
-    return Scaffold(
-      appBar: AppBar(
-        elevation: 0,
-        centerTitle: false,
-        backgroundColor: context.scaffoldBackgroundColor,
-        leading: IconButton(
-          onPressed: () {
-            selectedAssets.value = {};
-            context.maybePop();
-          },
-          icon: const Icon(Icons.close_rounded),
-        ),
-        title: const Text('create_album').tr(),
-        actions: [
-          TextButton(
-            onPressed: albumTitleController.text.isNotEmpty ? createAlbum : null,
-            child: Text(
-              'create'.tr(),
-              style: TextStyle(
-                fontWeight: FontWeight.bold,
-                color: albumTitleController.text.isNotEmpty ? context.primaryColor : context.themeData.disabledColor,
-              ),
-            ),
-          ),
-        ],
-      ),
-      body: GestureDetector(
-        onTap: onBackgroundTapped,
-        child: CustomScrollView(
-          slivers: [
-            SliverAppBar(
-              backgroundColor: context.scaffoldBackgroundColor,
-              elevation: 5,
-              automaticallyImplyLeading: false,
-              pinned: true,
-              floating: false,
-              bottom: PreferredSize(
-                preferredSize: const Size.fromHeight(125.0),
-                child: Column(
-                  children: [
-                    buildTitleInputField(),
-                    buildDescriptionInputField(),
-                    if (selectedAssets.value.isNotEmpty) buildControlButton(),
-                  ],
-                ),
-              ),
-            ),
-            buildTitle(),
-            buildSelectPhotosButton(),
-            buildSelectedImageGrid(),
-          ],
-        ),
-      ),
-    );
-  }
-}

mobile/lib/pages/common/gallery_stacked_children.dart

@@ -1,85 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/asset_stack.provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/show_controls.provider.dart';
-
-class GalleryStackedChildren extends HookConsumerWidget {
-  final ValueNotifier<int> stackIndex;
-
-  const GalleryStackedChildren(this.stackIndex, {super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final asset = ref.watch(currentAssetProvider);
-    if (asset == null) {
-      return const SizedBox();
-    }
-
-    final stackId = asset.stackId;
-    if (stackId == null) {
-      return const SizedBox();
-    }
-
-    final stackElements = ref.watch(assetStackStateProvider(stackId));
-    final showControls = ref.watch(showControlsProvider);
-
-    return IgnorePointer(
-      ignoring: !showControls,
-      child: AnimatedOpacity(
-        duration: const Duration(milliseconds: 100),
-        opacity: showControls ? 1.0 : 0.0,
-        child: SizedBox(
-          height: 80,
-          child: ListView.builder(
-            shrinkWrap: true,
-            scrollDirection: Axis.horizontal,
-            itemCount: stackElements.length,
-            padding: const EdgeInsets.only(left: 5, right: 5, bottom: 30),
-            itemBuilder: (context, index) {
-              final currentAsset = stackElements.elementAt(index);
-              final assetId = currentAsset.remoteId;
-              if (assetId == null) {
-                return const SizedBox();
-              }
-
-              return Padding(
-                key: ValueKey(currentAsset.id),
-                padding: const EdgeInsets.only(right: 5),
-                child: GestureDetector(
-                  onTap: () {
-                    stackIndex.value = index;
-                    ref.read(currentAssetProvider.notifier).set(currentAsset);
-                  },
-                  child: Container(
-                    width: 60,
-                    height: 60,
-                    decoration: index == stackIndex.value
-                        ? const BoxDecoration(
-                            color: Colors.white,
-                            borderRadius: BorderRadius.all(Radius.circular(6)),
-                            border: Border.fromBorderSide(BorderSide(color: Colors.white, width: 2)),
-                          )
-                        : const BoxDecoration(
-                            color: Colors.white,
-                            borderRadius: BorderRadius.all(Radius.circular(6)),
-                            border: null,
-                          ),
-                    child: ClipRRect(
-                      borderRadius: const BorderRadius.all(Radius.circular(4)),
-                      child: Image(
-                        fit: BoxFit.cover,
-                        image: RemoteImageProvider.thumbnail(assetId: assetId, thumbhash: asset.thumbhash ?? ""),
-                      ),
-                    ),
-                  ),
-                ),
-              );
-            },
-          ),
-        ),
-      ),
-    );
-  }
-}

mobile/lib/pages/common/gallery_viewer.page.dart

@@ -1,438 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-import 'dart:math';
-import 'dart:ui' as ui;
-
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/scroll_extensions.dart';
-import 'package:immich_mobile/pages/common/download_panel.dart';
-import 'package:immich_mobile/pages/common/gallery_stacked_children.dart';
-import 'package:immich_mobile/pages/common/native_video_viewer.page.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/asset_stack.provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/show_controls.provider.dart';
-import 'package:immich_mobile/providers/cast.provider.dart';
-import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';
-import 'package:immich_mobile/widgets/asset_viewer/advanced_bottom_sheet.dart';
-import 'package:immich_mobile/widgets/asset_viewer/bottom_gallery_bar.dart';
-import 'package:immich_mobile/widgets/asset_viewer/detail_panel/detail_panel.dart';
-import 'package:immich_mobile/widgets/asset_viewer/gallery_app_bar.dart';
-import 'package:immich_mobile/widgets/common/immich_image.dart';
-import 'package:immich_mobile/widgets/common/immich_thumbnail.dart';
-import 'package:immich_mobile/widgets/photo_view/photo_view_gallery.dart';
-import 'package:immich_mobile/widgets/photo_view/src/photo_view_computed_scale.dart';
-import 'package:immich_mobile/widgets/photo_view/src/photo_view_scale_state.dart';
-import 'package:immich_mobile/widgets/photo_view/src/utils/photo_view_hero_attributes.dart';
-
-@RoutePage()
-// ignore: must_be_immutable
-/// Expects [currentAssetProvider] to be set before navigating to this page
-class GalleryViewerPage extends HookConsumerWidget {
-  final int initialIndex;
-  final int heroOffset;
-  final bool showStack;
-  final RenderList renderList;
-
-  GalleryViewerPage({
-    super.key,
-    required this.renderList,
-    this.initialIndex = 0,
-    this.heroOffset = 0,
-    this.showStack = false,
-  }) : controller = PageController(initialPage: initialIndex);
-
-  final PageController controller;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final totalAssets = useState(renderList.totalAssets);
-    final isZoomed = useState(false);
-    final stackIndex = useState(0);
-    final localPosition = useRef<Offset?>(null);
-    final currentIndex = useValueNotifier(initialIndex);
-    final loadAsset = renderList.loadAsset;
-    final isPlayingMotionVideo = ref.watch(isPlayingMotionVideoProvider);
-    final isCasting = ref.watch(castProvider.select((c) => c.isCasting));
-
-    final videoPlayerKeys = useRef<Map<int, GlobalKey>>({});
-
-    GlobalKey getVideoPlayerKey(int id) {
-      videoPlayerKeys.value.putIfAbsent(id, () => GlobalKey());
-      return videoPlayerKeys.value[id]!;
-    }
-
-    Future<void> precacheNextImage(int index) async {
-      if (!context.mounted) {
-        return;
-      }
-
-      void onError(Object exception, StackTrace? stackTrace) {
-        // swallow error silently
-        log.severe('Error precaching next image: $exception, $stackTrace');
-      }
-
-      try {
-        if (index < totalAssets.value && index >= 0) {
-          final asset = loadAsset(index);
-          await precacheImage(
-            ImmichImage.imageProvider(asset: asset, width: context.width, height: context.height),
-            context,
-            onError: onError,
-          );
-        }
-      } catch (e) {
-        // swallow error silently
-        log.severe('Error precaching next image: $e');
-        await context.maybePop();
-      }
-    }
-
-    useEffect(() {
-      if (ref.read(showControlsProvider)) {
-        SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-      } else {
-        SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
-      }
-
-      // Delay this a bit so we can finish loading the page
-      Timer(const Duration(milliseconds: 400), () {
-        precacheNextImage(currentIndex.value + 1);
-      });
-
-      return null;
-    }, const []);
-
-    useEffect(() {
-      final asset = loadAsset(currentIndex.value);
-
-      if (asset.isRemote) {
-        ref.read(castProvider.notifier).loadMediaOld(asset, false);
-      } else {
-        if (isCasting) {
-          WidgetsBinding.instance.addPostFrameCallback((_) {
-            if (context.mounted) {
-              ref.read(castProvider.notifier).stop();
-              context.scaffoldMessenger.showSnackBar(
-                SnackBar(
-                  duration: const Duration(seconds: 1),
-                  content: Text(
-                    "local_asset_cast_failed".tr(),
-                    style: context.textTheme.bodyLarge?.copyWith(color: context.primaryColor),
-                  ),
-                ),
-              );
-            }
-          });
-        }
-      }
-      return null;
-    }, [ref.watch(castProvider).isCasting]);
-
-    void showInfo() {
-      final asset = ref.read(currentAssetProvider);
-      if (asset == null) {
-        return;
-      }
-      showModalBottomSheet(
-        shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(15.0))),
-        barrierColor: Colors.transparent,
-        isScrollControlled: true,
-        showDragHandle: true,
-        enableDrag: true,
-        context: context,
-        useSafeArea: true,
-        builder: (context) {
-          return DraggableScrollableSheet(
-            minChildSize: 0.5,
-            maxChildSize: 1,
-            initialChildSize: 0.75,
-            expand: false,
-            builder: (context, scrollController) {
-              return Padding(
-                padding: EdgeInsets.only(bottom: context.viewInsets.bottom),
-                child: ref.watch(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.advancedTroubleshooting)
-                    ? AdvancedBottomSheet(assetDetail: asset, scrollController: scrollController)
-                    : DetailPanel(asset: asset, scrollController: scrollController),
-              );
-            },
-          );
-        },
-      );
-    }
-
-    void handleSwipeUpDown(DragUpdateDetails details) {
-      const int sensitivity = 15;
-      const int dxThreshold = 50;
-      const double ratioThreshold = 3.0;
-
-      if (isZoomed.value) {
-        return;
-      }
-
-      // Guard [localPosition] null
-      if (localPosition.value == null) {
-        return;
-      }
-
-      // Check for delta from initial down point
-      final d = details.localPosition - localPosition.value!;
-      // If the magnitude of the dx swipe is large, we probably didn't mean to go down
-      if (d.dx.abs() > dxThreshold) {
-        return;
-      }
-
-      final ratio = d.dy / max(d.dx.abs(), 1);
-      if (d.dy > sensitivity && ratio > ratioThreshold) {
-        context.maybePop();
-      } else if (d.dy < -sensitivity && ratio < -ratioThreshold) {
-        showInfo();
-      }
-    }
-
-    ref.listen(showControlsProvider, (_, show) {
-      if (show || Platform.isIOS) {
-        SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-        return;
-      }
-
-      // This prevents the bottom bar from "dropping" while the controls are being hidden
-      Timer(const Duration(milliseconds: 100), () {
-        SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
-      });
-    });
-
-    PhotoViewGalleryPageOptions buildImage(Asset asset) {
-      return PhotoViewGalleryPageOptions(
-        onDragStart: (_, details, __, ___) {
-          localPosition.value = details.localPosition;
-        },
-        onDragUpdate: (_, details, __) {
-          handleSwipeUpDown(details);
-        },
-        onTapDown: (ctx, tapDownDetails, _) {
-          final tapToNavigate = ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.tapToNavigate);
-          if (!tapToNavigate) {
-            ref.read(showControlsProvider.notifier).toggle();
-            return;
-          }
-
-          double tapX = tapDownDetails.globalPosition.dx;
-          double screenWidth = ctx.width;
-
-          // We want to change images if the user taps in the leftmost or
-          // rightmost quarter of the screen
-          bool tappedLeftSide = tapX < screenWidth / 4;
-          bool tappedRightSide = tapX > screenWidth * (3 / 4);
-
-          int? currentPage = controller.page?.toInt();
-          int maxPage = renderList.totalAssets - 1;
-
-          if (tappedLeftSide && currentPage != null) {
-            // Nested if because we don't want to fallback to show/hide controls
-            if (currentPage != 0) {
-              controller.jumpToPage(currentPage - 1);
-            }
-          } else if (tappedRightSide && currentPage != null) {
-            // Nested if because we don't want to fallback to show/hide controls
-            if (currentPage != maxPage) {
-              controller.jumpToPage(currentPage + 1);
-            }
-          } else {
-            ref.read(showControlsProvider.notifier).toggle();
-          }
-        },
-        onLongPressStart: asset.isMotionPhoto
-            ? (_, __, ___) {
-                ref.read(isPlayingMotionVideoProvider.notifier).playing = true;
-              }
-            : null,
-        imageProvider: ImmichImage.imageProvider(asset: asset),
-        heroAttributes: _getHeroAttributes(asset),
-        filterQuality: FilterQuality.high,
-        tightMode: true,
-        initialScale: PhotoViewComputedScale.contained * 0.99,
-        minScale: PhotoViewComputedScale.contained * 0.99,
-        errorBuilder: (context, error, stackTrace) => ImmichImage(asset, fit: BoxFit.contain),
-      );
-    }
-
-    PhotoViewGalleryPageOptions buildVideo(BuildContext context, Asset asset) {
-      return PhotoViewGalleryPageOptions.customChild(
-        onDragStart: (_, details, __, ___) => localPosition.value = details.localPosition,
-        onDragUpdate: (_, details, __) => handleSwipeUpDown(details),
-        heroAttributes: _getHeroAttributes(asset),
-        filterQuality: FilterQuality.high,
-        initialScale: PhotoViewComputedScale.contained * 0.99,
-        maxScale: 1.0,
-        minScale: PhotoViewComputedScale.contained * 0.99,
-        basePosition: Alignment.center,
-        child: SizedBox(
-          width: context.width,
-          height: context.height,
-          child: NativeVideoViewerPage(
-            key: getVideoPlayerKey(asset.id),
-            asset: asset,
-            image: Image(
-              key: ValueKey(asset),
-              image: ImmichImage.imageProvider(asset: asset, width: context.width, height: context.height),
-              fit: BoxFit.contain,
-              height: context.height,
-              width: context.width,
-              alignment: Alignment.center,
-            ),
-          ),
-        ),
-      );
-    }
-
-    PhotoViewGalleryPageOptions buildAsset(BuildContext context, int index) {
-      var newAsset = loadAsset(index);
-
-      final stackId = newAsset.stackId;
-      if (stackId != null && currentIndex.value == index) {
-        final stackElements = ref.read(assetStackStateProvider(newAsset.stackId!));
-        if (stackIndex.value < stackElements.length) {
-          newAsset = stackElements.elementAt(stackIndex.value);
-        }
-      }
-
-      if (newAsset.isImage && !isPlayingMotionVideo) {
-        return buildImage(newAsset);
-      }
-      return buildVideo(context, newAsset);
-    }
-
-    return PopScope(
-      // Change immersive mode back to normal "edgeToEdge" mode
-      onPopInvokedWithResult: (didPop, _) => SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge),
-      child: Scaffold(
-        backgroundColor: Colors.black,
-        body: Stack(
-          children: [
-            PhotoViewGallery.builder(
-              key: const ValueKey('gallery'),
-              scaleStateChangedCallback: (state) {
-                final asset = ref.read(currentAssetProvider);
-                if (asset == null) {
-                  return;
-                }
-
-                if (asset.isImage && !ref.read(isPlayingMotionVideoProvider)) {
-                  isZoomed.value = state != PhotoViewScaleState.initial;
-                  ref.read(showControlsProvider.notifier).show = !isZoomed.value;
-                }
-              },
-              gaplessPlayback: true,
-              loadingBuilder: (context, event, index) {
-                final asset = loadAsset(index);
-                return ClipRect(
-                  child: Stack(
-                    fit: StackFit.expand,
-                    children: [
-                      BackdropFilter(filter: ui.ImageFilter.blur(sigmaX: 10, sigmaY: 10)),
-                      ImmichThumbnail(key: ValueKey(asset), asset: asset, fit: BoxFit.contain),
-                    ],
-                  ),
-                );
-              },
-              pageController: controller,
-              scrollPhysics: isZoomed.value
-                  ? const NeverScrollableScrollPhysics() // Don't allow paging while scrolled in
-                  : (Platform.isIOS
-                        ? const FastScrollPhysics() // Use bouncing physics for iOS
-                        : const FastClampingScrollPhysics() // Use heavy physics for Android
-                          ),
-              itemCount: totalAssets.value,
-              scrollDirection: Axis.horizontal,
-              onPageChanged: (value, _) {
-                final next = currentIndex.value < value ? value + 1 : value - 1;
-
-                ref.read(hapticFeedbackProvider.notifier).selectionClick();
-
-                final newAsset = loadAsset(value);
-
-                currentIndex.value = value;
-                stackIndex.value = 0;
-
-                ref.read(currentAssetProvider.notifier).set(newAsset);
-
-                // Wait for page change animation to finish, then precache the next image
-                Timer(const Duration(milliseconds: 400), () {
-                  precacheNextImage(next);
-                });
-
-                context.scaffoldMessenger.hideCurrentSnackBar();
-
-                // send image to casting if the server has it
-                if (newAsset.isRemote) {
-                  ref.read(castProvider.notifier).loadMediaOld(newAsset, false);
-                } else {
-                  context.scaffoldMessenger.clearSnackBars();
-
-                  if (isCasting) {
-                    ref.read(castProvider.notifier).stop();
-                    context.scaffoldMessenger.showSnackBar(
-                      SnackBar(
-                        duration: const Duration(seconds: 2),
-                        content: Text(
-                          "local_asset_cast_failed".tr(),
-                          style: context.textTheme.bodyLarge?.copyWith(color: context.primaryColor),
-                        ),
-                      ),
-                    );
-                  }
-                }
-              },
-              builder: buildAsset,
-            ),
-            Positioned(
-              top: 0,
-              left: 0,
-              right: 0,
-              child: GalleryAppBar(key: const ValueKey('app-bar'), showInfo: showInfo),
-            ),
-            Positioned(
-              bottom: 0,
-              left: 0,
-              right: 0,
-              child: Column(
-                children: [
-                  GalleryStackedChildren(stackIndex),
-                  BottomGalleryBar(
-                    key: const ValueKey('bottom-bar'),
-                    renderList: renderList,
-                    totalAssets: totalAssets,
-                    controller: controller,
-                    showStack: showStack,
-                    stackIndex: stackIndex,
-                    assetIndex: currentIndex,
-                  ),
-                ],
-              ),
-            ),
-            const DownloadPanel(),
-          ],
-        ),
-      ),
-    );
-  }
-
-  @pragma('vm:prefer-inline')
-  PhotoViewHeroAttributes _getHeroAttributes(Asset asset) {
-    return PhotoViewHeroAttributes(
-      tag: asset.isInDb ? asset.id + heroOffset : '${asset.remoteId}-$heroOffset',
-      transitionOnUserGestures: true,
-    );
-  }
-}

mobile/lib/pages/common/native_video_viewer.page.dart

@@ -1,282 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-
-import 'package:auto_route/auto_route.dart';
-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/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/video_player_provider.dart';
-import 'package:immich_mobile/providers/cast.provider.dart';
-import 'package:immich_mobile/services/api.service.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/services/asset.service.dart';
-import 'package:immich_mobile/widgets/asset_viewer/custom_video_player_controls.dart';
-import 'package:logging/logging.dart';
-import 'package:native_video_player/native_video_player.dart';
-
-@RoutePage()
-class NativeVideoViewerPage extends HookConsumerWidget {
-  static final log = Logger('NativeVideoViewer');
-  final Asset asset;
-  final bool showControls;
-  final int playbackDelayFactor;
-  final Widget image;
-
-  const NativeVideoViewerPage({
-    super.key,
-    required this.asset,
-    required this.image,
-    this.showControls = true,
-    this.playbackDelayFactor = 1,
-  });
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final videoId = asset.id.toString();
-    final controller = useState<NativeVideoPlayerController?>(null);
-    final shouldPlayOnForeground = useRef(true);
-
-    final currentAsset = useState(ref.read(currentAssetProvider));
-    final isCurrent = currentAsset.value == asset;
-
-    // Used to show the placeholder during hero animations for remote videos to avoid a stutter
-    final isVisible = useState(Platform.isIOS && asset.isLocal);
-
-    final isCasting = ref.watch(castProvider.select((c) => c.isCasting));
-
-    final isVideoReady = useState(false);
-
-    Future<VideoSource?> createSource() async {
-      if (!context.mounted) {
-        return null;
-      }
-
-      try {
-        final local = asset.local;
-        if (local != null && asset.livePhotoVideoId == null) {
-          final file = await local.file;
-          if (file == null) {
-            throw Exception('No file found for the video');
-          }
-
-          final source = await VideoSource.init(path: file.path, type: VideoSourceType.file);
-          return source;
-        }
-
-        // Use a network URL for the video player controller
-        final serverEndpoint = Store.get(StoreKey.serverEndpoint);
-        final isOriginalVideo = ref
-            .read(appSettingsServiceProvider)
-            .getSetting<bool>(AppSettingsEnum.loadOriginalVideo);
-        final String postfixUrl = isOriginalVideo ? 'original' : 'video/playback';
-        final String videoUrl = asset.livePhotoVideoId != null
-            ? '$serverEndpoint/assets/${asset.livePhotoVideoId}/$postfixUrl'
-            : '$serverEndpoint/assets/${asset.remoteId}/$postfixUrl';
-
-        final source = await VideoSource.init(
-          path: videoUrl,
-          type: VideoSourceType.network,
-          headers: ApiService.getRequestHeaders(),
-        );
-        return source;
-      } catch (error) {
-        log.severe('Error creating video source for asset ${asset.fileName}: $error');
-        return null;
-      }
-    }
-
-    final videoSource = useMemoized<Future<VideoSource?>>(() => createSource());
-    final aspectRatio = useState<double?>(asset.aspectRatio);
-    useMemoized(() async {
-      if (!context.mounted || aspectRatio.value != null) {
-        return null;
-      }
-
-      try {
-        aspectRatio.value = await ref.read(assetServiceProvider).getAspectRatio(asset);
-      } catch (error) {
-        log.severe('Error getting aspect ratio for asset ${asset.fileName}: $error');
-      }
-    });
-
-    void onPlaybackReady() async {
-      final videoController = controller.value;
-      if (videoController == null || !isCurrent || !context.mounted) {
-        return;
-      }
-
-      final notifier = ref.read(videoPlayerProvider(videoId).notifier);
-      notifier.onNativePlaybackReady();
-
-      isVideoReady.value = true;
-
-      try {
-        final autoPlayVideo = ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.autoPlayVideo);
-        if (autoPlayVideo) {
-          await notifier.play();
-        }
-        await notifier.setVolume(1);
-      } catch (error) {
-        log.severe('Error playing video: $error');
-      }
-    }
-
-    void onPlaybackStatusChanged() {
-      if (!context.mounted) return;
-      ref.read(videoPlayerProvider(videoId).notifier).onNativeStatusChanged();
-    }
-
-    void onPlaybackPositionChanged() {
-      if (!context.mounted) return;
-      ref.read(videoPlayerProvider(videoId).notifier).onNativePositionChanged();
-    }
-
-    void onPlaybackEnded() {
-      if (!context.mounted) return;
-
-      ref.read(videoPlayerProvider(videoId).notifier).onNativePlaybackEnded();
-
-      final videoController = controller.value;
-      if (videoController?.playbackInfo?.status == PlaybackStatus.stopped &&
-          !ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.loopVideo)) {
-        ref.read(isPlayingMotionVideoProvider.notifier).playing = false;
-      }
-    }
-
-    void removeListeners(NativeVideoPlayerController controller) {
-      controller.onPlaybackPositionChanged.removeListener(onPlaybackPositionChanged);
-      controller.onPlaybackStatusChanged.removeListener(onPlaybackStatusChanged);
-      controller.onPlaybackReady.removeListener(onPlaybackReady);
-      controller.onPlaybackEnded.removeListener(onPlaybackEnded);
-    }
-
-    void initController(NativeVideoPlayerController nc) async {
-      if (controller.value != null || !context.mounted) {
-        return;
-      }
-
-      final source = await videoSource;
-      if (source == null) {
-        return;
-      }
-
-      final notifier = ref.read(videoPlayerProvider(videoId).notifier);
-      notifier.attachController(nc);
-
-      nc.onPlaybackPositionChanged.addListener(onPlaybackPositionChanged);
-      nc.onPlaybackStatusChanged.addListener(onPlaybackStatusChanged);
-      nc.onPlaybackReady.addListener(onPlaybackReady);
-      nc.onPlaybackEnded.addListener(onPlaybackEnded);
-
-      unawaited(
-        nc.loadVideoSource(source).catchError((error) {
-          log.severe('Error loading video source: $error');
-        }),
-      );
-      final loopVideo = ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.loopVideo);
-      await notifier.setLoop(loopVideo);
-
-      controller.value = nc;
-    }
-
-    ref.listen(currentAssetProvider, (_, value) {
-      final playerController = controller.value;
-      if (playerController != null && value != asset) {
-        removeListeners(playerController);
-      }
-
-      final curAsset = currentAsset.value;
-      if (curAsset == asset) {
-        return;
-      }
-
-      final imageToVideo = curAsset != null && !curAsset.isVideo;
-
-      // No need to delay video playback when swiping from an image to a video
-      if (imageToVideo && Platform.isIOS) {
-        currentAsset.value = value;
-        onPlaybackReady();
-        return;
-      }
-
-      // Delay the video playback to avoid a stutter in the swipe animation
-      Timer(
-        Platform.isIOS
-            ? Duration(milliseconds: 300 * playbackDelayFactor)
-            : imageToVideo
-            ? Duration(milliseconds: 200 * playbackDelayFactor)
-            : Duration(milliseconds: 400 * playbackDelayFactor),
-        () {
-          if (!context.mounted) {
-            return;
-          }
-
-          currentAsset.value = value;
-          if (currentAsset.value == asset) {
-            onPlaybackReady();
-          }
-        },
-      );
-    });
-
-    useEffect(() {
-      // If opening a remote video from a hero animation, delay visibility to avoid a stutter
-      final timer = isVisible.value ? null : Timer(const Duration(milliseconds: 300), () => isVisible.value = true);
-
-      return () {
-        timer?.cancel();
-        final playerController = controller.value;
-        if (playerController == null) {
-          return;
-        }
-        removeListeners(playerController);
-        playerController.stop().catchError((error) {
-          log.fine('Error stopping video: $error');
-        });
-      };
-    }, const []);
-
-    useOnAppLifecycleStateChange((_, state) async {
-      final notifier = ref.read(videoPlayerProvider(videoId).notifier);
-      if (state == AppLifecycleState.resumed && shouldPlayOnForeground.value) {
-        await notifier.play();
-      } else if (state == AppLifecycleState.paused) {
-        final videoPlaying = await controller.value?.isPlaying();
-        if (videoPlaying ?? true) {
-          shouldPlayOnForeground.value = true;
-          await notifier.pause();
-        } else {
-          shouldPlayOnForeground.value = false;
-        }
-      }
-    });
-
-    return Stack(
-      children: [
-        // This remains under the video to avoid flickering
-        // For motion videos, this is the image portion of the asset
-        if (!isVideoReady.value || asset.isMotionPhoto) Center(key: ValueKey(asset.id), child: image),
-        if (aspectRatio.value != null && !isCasting)
-          Visibility.maintain(
-            key: ValueKey(asset),
-            visible: isVisible.value,
-            child: Center(
-              key: ValueKey(asset),
-              child: AspectRatio(
-                key: ValueKey(asset),
-                aspectRatio: aspectRatio.value!,
-                child: isCurrent ? NativeVideoPlayerView(key: ValueKey(asset), onViewReady: initController) : null,
-              ),
-            ),
-          ),
-        if (showControls) Center(child: CustomVideoPlayerControls(videoId: videoId)),
-      ],
-    );
-  }
-}

mobile/lib/pages/common/settings.page.dart

@@ -2,14 +2,11 @@ import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/settings/advanced_settings.dart';
 import 'package:immich_mobile/widgets/settings/asset_list_settings/asset_list_settings.dart';
 import 'package:immich_mobile/widgets/settings/asset_viewer_settings/asset_viewer_settings.dart';
-import 'package:immich_mobile/widgets/settings/backup_settings/backup_settings.dart';
 import 'package:immich_mobile/widgets/settings/backup_settings/drift_backup_settings.dart';
 import 'package:immich_mobile/widgets/settings/beta_sync_settings/sync_status_and_actions.dart';
 import 'package:immich_mobile/widgets/settings/free_up_space_settings.dart';
@@ -38,8 +35,7 @@ enum SettingSection {
   Widget get widget => switch (this) {
     SettingSection.advanced => const AdvancedSettings(),
     SettingSection.assetViewer => const AssetViewerSettings(),
-    SettingSection.backup =>
-      Store.tryGet(StoreKey.betaTimeline) ?? false ? const DriftBackupSettings() : const BackupSettings(),
+    SettingSection.backup => const DriftBackupSettings(),
     SettingSection.freeUpSpace => const FreeUpSpaceSettings(),
     SettingSection.languages => const LanguageSettings(),
     SettingSection.networking => const NetworkingSettings(),
@@ -74,13 +70,12 @@ class _MobileLayout extends StatelessWidget {
         .expand(
           (setting) => setting == SettingSection.beta
               ? [
-                  if (Store.isBetaTimelineEnabled)
-                    SettingsCard(
-                      icon: Icons.sync_outlined,
-                      title: 'sync_status'.tr(),
-                      subtitle: 'sync_status_subtitle'.tr(),
-                      settingRoute: const SyncStatusRoute(),
-                    ),
+                  SettingsCard(
+                    icon: Icons.sync_outlined,
+                    title: 'sync_status'.tr(),
+                    subtitle: 'sync_status_subtitle'.tr(),
+                    settingRoute: const SyncStatusRoute(),
+                  ),
                 ]
               : [
                   SettingsCard(

mobile/lib/pages/common/splash_screen.page.dart

@@ -12,13 +12,9 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:path/path.dart' as path;
-import 'package:path_provider/path_provider.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
-import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -27,6 +23,8 @@ import 'package:immich_mobile/theme/theme_data.dart';
 import 'package:immich_mobile/widgets/common/immich_logo.dart';
 import 'package:immich_mobile/widgets/common/immich_title_text.dart';
 import 'package:logging/logging.dart';
+import 'package:path/path.dart' as path;
+import 'package:path_provider/path_provider.dart';
 import 'package:url_launcher/url_launcher.dart' show launchUrl, LaunchMode;
 
 class BootstrapErrorWidget extends StatelessWidget {
@@ -323,29 +321,27 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
               wsProvider.connect();
               unawaited(infoProvider.getServerInfo());
 
-              if (Store.isBetaTimelineEnabled) {
-                bool syncSuccess = false;
+              bool syncSuccess = false;
+              await Future.wait([
+                backgroundManager.syncLocal(full: true),
+                backgroundManager.syncRemote().then((success) => syncSuccess = success),
+              ]);
+
+              if (syncSuccess) {
                 await Future.wait([
-                  backgroundManager.syncLocal(full: true),
-                  backgroundManager.syncRemote().then((success) => syncSuccess = success),
+                  backgroundManager.hashAssets().then((_) {
+                    _resumeBackup(backupProvider);
+                  }),
+                  _resumeBackup(backupProvider),
+                  // TODO: Bring back when the soft freeze issue is addressed
+                  // backgroundManager.syncCloudIds(),
                 ]);
+              } else {
+                await backgroundManager.hashAssets();
+              }
 
-                if (syncSuccess) {
-                  await Future.wait([
-                    backgroundManager.hashAssets().then((_) {
-                      _resumeBackup(backupProvider);
-                    }),
-                    _resumeBackup(backupProvider),
-                    // TODO: Bring back when the soft freeze issue is addressed
-                    // backgroundManager.syncCloudIds(),
-                  ]);
-                } else {
-                  await backgroundManager.hashAssets();
-                }
-
-                if (Store.get(StoreKey.syncAlbums, false)) {
-                  await backgroundManager.syncLinkedAlbum();
-                }
+              if (Store.get(StoreKey.syncAlbums, false)) {
+                await backgroundManager.syncLinkedAlbum();
               }
             } catch (e) {
               log.severe('Failed establishing connection to the server: $e');
@@ -368,58 +364,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
     // clean install - change the default of the flag
     // current install not using beta timeline
     if (context.router.current.name == SplashScreenRoute.name) {
-      final needBetaMigration = Store.get(StoreKey.needBetaMigration, false);
-      if (needBetaMigration) {
-        bool migrate =
-            (await showDialog<bool>(
-              context: context,
-              builder: (ctx) => AlertDialog(
-                title: const Text("New Timeline Experience"),
-                content: const Text(
-                  "The old timeline has been deprecated and will be removed in an upcoming release. Would you like to switch to the new timeline now?",
-                ),
-                actions: [
-                  TextButton(onPressed: () => Navigator.of(ctx).pop(false), child: const Text("No")),
-                  ElevatedButton(onPressed: () => Navigator.of(ctx).pop(true), child: const Text("Yes")),
-                ],
-              ),
-            )) ??
-            false;
-        if (migrate != true) {
-          migrate =
-              (await showDialog<bool>(
-                context: context,
-                builder: (ctx) => AlertDialog(
-                  title: const Text("Are you sure?"),
-                  content: const Text(
-                    "If you choose to remain on the old timeline, you will be automatically migrated to the new timeline in an upcoming release. Would you like to switch now?",
-                  ),
-                  actions: [
-                    TextButton(onPressed: () => Navigator.of(ctx).pop(false), child: const Text("No")),
-                    ElevatedButton(onPressed: () => Navigator.of(ctx).pop(true), child: const Text("Yes")),
-                  ],
-                ),
-              )) ??
-              false;
-        }
-        await Store.put(StoreKey.needBetaMigration, false);
-        if (migrate) {
-          unawaited(context.router.replaceAll([ChangeExperienceRoute(switchingToBeta: true)]));
-          return;
-        }
-      }
-
-      unawaited(context.replaceRoute(Store.isBetaTimelineEnabled ? const TabShellRoute() : const TabControllerRoute()));
-    }
-
-    if (Store.isBetaTimelineEnabled) {
-      return;
-    }
-
-    final hasPermission = await ref.read(galleryPermissionNotifier.notifier).hasPermission;
-    if (hasPermission) {
-      // Resume backup (if enable) then navigate
-      await ref.watch(backupProvider.notifier).resumeBackup();
+      unawaited(context.replaceRoute(const TabShellRoute()));
     }
   }
 

mobile/lib/pages/common/tab_controller.page.dart

@@ -1,142 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.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/providers/album/album.provider.dart';
-import 'package:immich_mobile/providers/asset.provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/scroll_notifier.provider.dart';
-import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
-import 'package:immich_mobile/providers/multiselect.provider.dart';
-import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
-import 'package:immich_mobile/providers/tab.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-
-@RoutePage()
-class TabControllerPage extends HookConsumerWidget {
-  const TabControllerPage({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final isRefreshingAssets = ref.watch(assetProvider);
-    final isRefreshingRemoteAlbums = ref.watch(isRefreshingRemoteAlbumProvider);
-    final isScreenLandscape = MediaQuery.orientationOf(context) == Orientation.landscape;
-
-    Widget buildIcon({required Widget icon, required bool isProcessing}) {
-      if (!isProcessing) return icon;
-      return Stack(
-        alignment: Alignment.center,
-        clipBehavior: Clip.none,
-        children: [
-          icon,
-          Positioned(
-            right: -18,
-            child: SizedBox(
-              height: 20,
-              width: 20,
-              child: CircularProgressIndicator(
-                strokeWidth: 2,
-                valueColor: AlwaysStoppedAnimation<Color>(context.primaryColor),
-              ),
-            ),
-          ),
-        ],
-      );
-    }
-
-    void onNavigationSelected(TabsRouter router, int index) {
-      // On Photos page menu tapped
-      if (router.activeIndex == 0 && index == 0) {
-        scrollToTopNotifierProvider.scrollToTop();
-      }
-
-      // On Search page tapped
-      if (router.activeIndex == 1 && index == 1) {
-        ref.read(searchInputFocusProvider).requestFocus();
-      }
-
-      ref.read(hapticFeedbackProvider.notifier).selectionClick();
-      router.setActiveIndex(index);
-      ref.read(tabProvider.notifier).state = TabEnum.values[index];
-    }
-
-    final navigationDestinations = [
-      NavigationDestination(
-        label: 'photos'.tr(),
-        icon: const Icon(Icons.photo_library_outlined),
-        selectedIcon: buildIcon(
-          isProcessing: isRefreshingAssets,
-          icon: Icon(Icons.photo_library, color: context.primaryColor),
-        ),
-      ),
-      NavigationDestination(
-        label: 'search'.tr(),
-        icon: const Icon(Icons.search_rounded),
-        selectedIcon: Icon(Icons.search, color: context.primaryColor),
-      ),
-      NavigationDestination(
-        label: 'albums'.tr(),
-        icon: const Icon(Icons.photo_album_outlined),
-        selectedIcon: buildIcon(
-          isProcessing: isRefreshingRemoteAlbums,
-          icon: Icon(Icons.photo_album_rounded, color: context.primaryColor),
-        ),
-      ),
-      NavigationDestination(
-        label: 'library'.tr(),
-        icon: const Icon(Icons.space_dashboard_outlined),
-        selectedIcon: buildIcon(
-          isProcessing: isRefreshingAssets,
-          icon: Icon(Icons.space_dashboard_rounded, color: context.primaryColor),
-        ),
-      ),
-    ];
-
-    Widget bottomNavigationBar(TabsRouter tabsRouter) {
-      return NavigationBar(
-        selectedIndex: tabsRouter.activeIndex,
-        onDestinationSelected: (index) => onNavigationSelected(tabsRouter, index),
-        destinations: navigationDestinations,
-      );
-    }
-
-    Widget navigationRail(TabsRouter tabsRouter) {
-      return NavigationRail(
-        destinations: navigationDestinations
-            .map((e) => NavigationRailDestination(icon: e.icon, label: Text(e.label), selectedIcon: e.selectedIcon))
-            .toList(),
-        onDestinationSelected: (index) => onNavigationSelected(tabsRouter, index),
-        selectedIndex: tabsRouter.activeIndex,
-        labelType: NavigationRailLabelType.all,
-        groupAlignment: 0.0,
-      );
-    }
-
-    final multiselectEnabled = ref.watch(multiselectProvider);
-    return AutoTabsRouter(
-      routes: [const PhotosRoute(), SearchRoute(), const AlbumsRoute(), const LibraryRoute()],
-      duration: const Duration(milliseconds: 600),
-      transitionBuilder: (context, child, animation) => FadeTransition(opacity: animation, child: child),
-      builder: (context, child) {
-        final tabsRouter = AutoTabsRouter.of(context);
-        return PopScope(
-          canPop: tabsRouter.activeIndex == 0,
-          onPopInvokedWithResult: (didPop, _) => !didPop ? tabsRouter.setActiveIndex(0) : null,
-          child: Scaffold(
-            resizeToAvoidBottomInset: false,
-            body: isScreenLandscape
-                ? Row(
-                    children: [
-                      navigationRail(tabsRouter),
-                      const VerticalDivider(),
-                      Expanded(child: child),
-                    ],
-                  )
-                : child,
-            bottomNavigationBar: multiselectEnabled || isScreenLandscape ? null : bottomNavigationBar(tabsRouter),
-          ),
-        );
-      },
-    );
-  }
-}

mobile/lib/pages/editing/crop.page.dart

@@ -1,177 +0,0 @@
-import 'dart:async';
-
-import 'package:auto_route/auto_route.dart';
-import 'package:crop_image/crop_image.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/pages/editing/edit.page.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/utils/hooks/crop_controller_hook.dart';
-
-/// A widget for cropping an image.
-/// This widget uses [HookWidget] to manage its lifecycle and state. It allows
-/// users to crop an image and then navigate to the [EditImagePage] with the
-/// cropped image.
-
-@RoutePage()
-class CropImagePage extends HookWidget {
-  final Image image;
-  final Asset asset;
-  const CropImagePage({super.key, required this.image, required this.asset});
-
-  @override
-  Widget build(BuildContext context) {
-    final cropController = useCropController();
-    final aspectRatio = useState<double?>(null);
-
-    return Scaffold(
-      appBar: AppBar(
-        backgroundColor: context.scaffoldBackgroundColor,
-        title: Text("crop".tr()),
-        leading: CloseButton(color: context.primaryColor),
-        actions: [
-          IconButton(
-            icon: Icon(Icons.done_rounded, color: context.primaryColor, size: 24),
-            onPressed: () async {
-              final croppedImage = await cropController.croppedImage();
-              unawaited(context.pushRoute(EditImageRoute(asset: asset, image: croppedImage, isEdited: true)));
-            },
-          ),
-        ],
-      ),
-      backgroundColor: context.scaffoldBackgroundColor,
-      body: SafeArea(
-        child: LayoutBuilder(
-          builder: (BuildContext context, BoxConstraints constraints) {
-            return Column(
-              children: [
-                Container(
-                  padding: const EdgeInsets.only(top: 20),
-                  width: constraints.maxWidth * 0.9,
-                  height: constraints.maxHeight * 0.6,
-                  child: CropImage(controller: cropController, image: image, gridColor: Colors.white),
-                ),
-                Expanded(
-                  child: Container(
-                    width: double.infinity,
-                    decoration: BoxDecoration(
-                      color: context.scaffoldBackgroundColor,
-                      borderRadius: const BorderRadius.only(
-                        topLeft: Radius.circular(20),
-                        topRight: Radius.circular(20),
-                      ),
-                    ),
-                    child: Center(
-                      child: Column(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Padding(
-                            padding: const EdgeInsets.only(left: 20, right: 20, bottom: 10),
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children: [
-                                IconButton(
-                                  icon: Icon(Icons.rotate_left, color: context.themeData.iconTheme.color),
-                                  onPressed: () {
-                                    cropController.rotateLeft();
-                                  },
-                                ),
-                                IconButton(
-                                  icon: Icon(Icons.rotate_right, color: context.themeData.iconTheme.color),
-                                  onPressed: () {
-                                    cropController.rotateRight();
-                                  },
-                                ),
-                              ],
-                            ),
-                          ),
-                          Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                            children: <Widget>[
-                              _AspectRatioButton(
-                                cropController: cropController,
-                                aspectRatio: aspectRatio,
-                                ratio: null,
-                                label: 'Free',
-                              ),
-                              _AspectRatioButton(
-                                cropController: cropController,
-                                aspectRatio: aspectRatio,
-                                ratio: 1.0,
-                                label: '1:1',
-                              ),
-                              _AspectRatioButton(
-                                cropController: cropController,
-                                aspectRatio: aspectRatio,
-                                ratio: 16.0 / 9.0,
-                                label: '16:9',
-                              ),
-                              _AspectRatioButton(
-                                cropController: cropController,
-                                aspectRatio: aspectRatio,
-                                ratio: 3.0 / 2.0,
-                                label: '3:2',
-                              ),
-                              _AspectRatioButton(
-                                cropController: cropController,
-                                aspectRatio: aspectRatio,
-                                ratio: 7.0 / 5.0,
-                                label: '7:5',
-                              ),
-                            ],
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                ),
-              ],
-            );
-          },
-        ),
-      ),
-    );
-  }
-}
-
-class _AspectRatioButton extends StatelessWidget {
-  final CropController cropController;
-  final ValueNotifier<double?> aspectRatio;
-  final double? ratio;
-  final String label;
-
-  const _AspectRatioButton({
-    required this.cropController,
-    required this.aspectRatio,
-    required this.ratio,
-    required this.label,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        IconButton(
-          icon: Icon(switch (label) {
-            'Free' => Icons.crop_free_rounded,
-            '1:1' => Icons.crop_square_rounded,
-            '16:9' => Icons.crop_16_9_rounded,
-            '3:2' => Icons.crop_3_2_rounded,
-            '7:5' => Icons.crop_7_5_rounded,
-            _ => Icons.crop_free_rounded,
-          }, color: aspectRatio.value == ratio ? context.primaryColor : context.themeData.iconTheme.color),
-          onPressed: () {
-            cropController.crop = const Rect.fromLTRB(0.1, 0.1, 0.9, 0.9);
-            aspectRatio.value = ratio;
-            cropController.aspectRatio = ratio;
-          },
-        ),
-        Text(label, style: context.textTheme.displayMedium),
-      ],
-    );
-  }
-}