fix: decrease datetime max ms since epoch limit

.gitattributes

@@ -15,9 +15,6 @@ mobile/ios/**/*.g.swift linguist-generated=true
 mobile/lib/**/*.drift.dart -diff -merge
 mobile/lib/**/*.drift.dart linguist-generated=true
 
-mobile/lib/**/*.freezed.dart -diff -merge
-mobile/lib/**/*.freezed.dart linguist-generated=true
-
 mobile/drift_schemas/main/drift_schema_*.json -diff -merge
 mobile/drift_schemas/main/drift_schema_*.json linguist-generated=true
 

i18n/en.json

@@ -1524,7 +1524,6 @@
   "not_available": "N/A",
   "not_in_any_album": "Not in any album",
   "not_selected": "Not selected",
-  "not_set": "Not set",
   "notes": "Notes",
   "nothing_here_yet": "Nothing here yet",
   "notification_backup_reliability": "Enable notifications to improve background backup reliability",

mobile/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -140,8 +140,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-structured-queries",
       "state" : {
-        "revision" : "dafddd843f10630aa6b5be47c1b6a59cc4ab6586",
-        "version" : "0.34.0"
+        "revision" : "8da8818fccd9959bd683934ddc62cf45bb65b3c8",
+        "version" : "0.31.1"
       }
     },
     {

mobile/lib/domain/models/config/app_config.dart

@@ -153,8 +153,6 @@ class AppConfig {
             .timelineStorageIndicator => timeline.storageIndicator,
             .mapShowFavoriteOnly => map.favoritesOnly,
             .mapRelativeDate => map.relativeDays,
-            .mapCustomFrom => map.customFrom,
-            .mapCustomTo => map.customTo,
             .mapIncludeArchived => map.includeArchived,
             .mapThemeMode => map.themeMode,
             .mapWithPartners => map.withPartners,
@@ -209,8 +207,6 @@ class AppConfig {
       .timelineStorageIndicator => copyWith(timeline: timeline.copyWith(storageIndicator: value as bool)),
       .mapShowFavoriteOnly => copyWith(map: map.copyWith(favoritesOnly: value as bool)),
       .mapRelativeDate => copyWith(map: map.copyWith(relativeDays: value as int)),
-      .mapCustomFrom => copyWith(map: map.copyWith(customFrom: .fromNullable(value as DateTime?))),
-      .mapCustomTo => copyWith(map: map.copyWith(customTo: .fromNullable(value as DateTime?))),
       .mapIncludeArchived => copyWith(map: map.copyWith(includeArchived: value as bool)),
       .mapThemeMode => copyWith(map: map.copyWith(themeMode: value as ThemeMode)),
       .mapWithPartners => copyWith(map: map.copyWith(withPartners: value as bool)),

mobile/lib/domain/models/config/map_config.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:immich_mobile/utils/option.dart';
 
 class MapConfig {
   final int relativeDays;
@@ -7,17 +6,13 @@ class MapConfig {
   final bool includeArchived;
   final ThemeMode themeMode;
   final bool withPartners;
-  final DateTime? customFrom;
-  final DateTime? customTo;
 
   const MapConfig({
     this.relativeDays = 0,
     this.favoritesOnly = false,
     this.includeArchived = false,
-    this.themeMode = .system,
+    this.themeMode = ThemeMode.system,
     this.withPartners = false,
-    this.customFrom,
-    this.customTo,
   });
 
   MapConfig copyWith({
@@ -26,16 +21,12 @@ class MapConfig {
     bool? includeArchived,
     ThemeMode? themeMode,
     bool? withPartners,
-    Option<DateTime>? customFrom,
-    Option<DateTime>? customTo,
   }) => MapConfig(
     relativeDays: relativeDays ?? this.relativeDays,
     favoritesOnly: favoritesOnly ?? this.favoritesOnly,
     includeArchived: includeArchived ?? this.includeArchived,
     themeMode: themeMode ?? this.themeMode,
     withPartners: withPartners ?? this.withPartners,
-    customFrom: customFrom.patch(this.customFrom),
-    customTo: customTo.patch(this.customTo),
   );
 
   @override
@@ -46,15 +37,12 @@ class MapConfig {
           other.favoritesOnly == favoritesOnly &&
           other.includeArchived == includeArchived &&
           other.themeMode == themeMode &&
-          other.withPartners == withPartners &&
-          other.customFrom == customFrom &&
-          other.customTo == customTo);
+          other.withPartners == withPartners);
 
   @override
-  int get hashCode =>
-      Object.hash(relativeDays, favoritesOnly, includeArchived, themeMode, withPartners, customFrom, customTo);
+  int get hashCode => Object.hash(relativeDays, favoritesOnly, includeArchived, themeMode, withPartners);
 
   @override
   String toString() =>
-      'MapConfig(relativeDays: $relativeDays, favoritesOnly: $favoritesOnly, includeArchived: $includeArchived, themeMode: $themeMode, withPartners: $withPartners, customFrom: $customFrom, customTo: $customTo)';
+      'MapConfig(relativeDays: $relativeDays, favoritesOnly: $favoritesOnly, includeArchived: $includeArchived, themeMode: $themeMode, withPartners: $withPartners)';
 }

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

@@ -1,39 +1,30 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
+class ExifInfo {
+  final int? assetId;
+  final int? fileSize;
+  final String? description;
+  final bool isFlipped;
+  final String? orientation;
+  final String? timeZone;
+  final DateTime? dateTimeOriginal;
+  final int? rating;
+  final int? width;
+  final int? height;
 
-part 'exif.model.freezed.dart';
+  // GPS
+  final double? latitude;
+  final double? longitude;
+  final String? city;
+  final String? state;
+  final String? country;
 
-@freezed
-abstract class ExifInfo with _$ExifInfo {
-  const ExifInfo._();
-
-  const factory ExifInfo({
-    int? assetId,
-    int? fileSize,
-    String? description,
-    @Default(false) bool isFlipped,
-    String? orientation,
-    String? timeZone,
-    DateTime? dateTimeOriginal,
-    int? rating,
-    int? width,
-    int? height,
-
-    // GPS
-    double? latitude,
-    double? longitude,
-    String? city,
-    String? state,
-    String? country,
-
-    // Camera related
-    String? make,
-    String? model,
-    String? lens,
-    double? f,
-    double? mm,
-    int? iso,
-    double? exposureSeconds,
-  }) = _ExifInfo;
+  // Camera related
+  final String? make;
+  final String? model;
+  final String? lens;
+  final double? f;
+  final double? mm;
+  final int? iso;
+  final double? exposureSeconds;
 
   bool get hasCoordinates => latitude != null && longitude != null && latitude != 0 && longitude != 0;
 
@@ -50,4 +41,162 @@ abstract class ExifInfo with _$ExifInfo {
   String get fNumber => f == null ? "" : f!.toStringAsFixed(1);
 
   String get focalLength => mm == null ? "" : mm!.toStringAsFixed(3);
+
+  const ExifInfo({
+    this.assetId,
+    this.fileSize,
+    this.description,
+    this.orientation,
+    this.timeZone,
+    this.dateTimeOriginal,
+    this.rating,
+    this.width,
+    this.height,
+    this.isFlipped = false,
+    this.latitude,
+    this.longitude,
+    this.city,
+    this.state,
+    this.country,
+    this.make,
+    this.model,
+    this.lens,
+    this.f,
+    this.mm,
+    this.iso,
+    this.exposureSeconds,
+  });
+
+  @override
+  bool operator ==(covariant ExifInfo other) {
+    if (identical(this, other)) {
+      return true;
+    }
+
+    return other.fileSize == fileSize &&
+        other.description == description &&
+        other.isFlipped == isFlipped &&
+        other.orientation == orientation &&
+        other.timeZone == timeZone &&
+        other.dateTimeOriginal == dateTimeOriginal &&
+        other.rating == rating &&
+        other.width == width &&
+        other.height == height &&
+        other.latitude == latitude &&
+        other.longitude == longitude &&
+        other.city == city &&
+        other.state == state &&
+        other.country == country &&
+        other.make == make &&
+        other.model == model &&
+        other.lens == lens &&
+        other.f == f &&
+        other.mm == mm &&
+        other.iso == iso &&
+        other.exposureSeconds == exposureSeconds &&
+        other.assetId == assetId;
+  }
+
+  @override
+  int get hashCode {
+    return fileSize.hashCode ^
+        description.hashCode ^
+        orientation.hashCode ^
+        isFlipped.hashCode ^
+        timeZone.hashCode ^
+        dateTimeOriginal.hashCode ^
+        rating.hashCode ^
+        width.hashCode ^
+        height.hashCode ^
+        latitude.hashCode ^
+        longitude.hashCode ^
+        city.hashCode ^
+        state.hashCode ^
+        country.hashCode ^
+        make.hashCode ^
+        model.hashCode ^
+        lens.hashCode ^
+        f.hashCode ^
+        mm.hashCode ^
+        iso.hashCode ^
+        exposureSeconds.hashCode ^
+        assetId.hashCode;
+  }
+
+  @override
+  String toString() {
+    return '''{
+fileSize: ${fileSize ?? 'NA'},
+description: ${description ?? 'NA'},
+orientation: ${orientation ?? 'NA'},
+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'},
+state: ${state ?? 'NA'},
+country: ${country ?? '<NA>'},
+make: ${make ?? 'NA'},
+model: ${model ?? 'NA'},
+lens: ${lens ?? 'NA'},
+f: ${f ?? 'NA'},
+mm: ${mm ?? '<NA>'},
+iso: ${iso ?? 'NA'},
+exposureSeconds: ${exposureSeconds ?? 'NA'},
+}''';
+  }
+
+  ExifInfo copyWith({
+    int? assetId,
+    int? fileSize,
+    String? description,
+    String? orientation,
+    String? timeZone,
+    DateTime? dateTimeOriginal,
+    int? rating,
+    int? width,
+    int? height,
+    double? latitude,
+    double? longitude,
+    String? city,
+    String? state,
+    String? country,
+    bool? isFlipped,
+    String? make,
+    String? model,
+    String? lens,
+    double? f,
+    double? mm,
+    int? iso,
+    double? exposureSeconds,
+  }) {
+    return ExifInfo(
+      assetId: assetId ?? this.assetId,
+      fileSize: fileSize ?? this.fileSize,
+      description: description ?? this.description,
+      orientation: orientation ?? this.orientation,
+      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,
+      city: city ?? this.city,
+      state: state ?? this.state,
+      country: country ?? this.country,
+      make: make ?? this.make,
+      model: model ?? this.model,
+      lens: lens ?? this.lens,
+      f: f ?? this.f,
+      mm: mm ?? this.mm,
+      iso: iso ?? this.iso,
+      exposureSeconds: exposureSeconds ?? this.exposureSeconds,
+    );
+  }
 }

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

@@ -1,338 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-// coverage:ignore-file
-// ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
-
-part of 'exif.model.dart';
-
-// **************************************************************************
-// FreezedGenerator
-// **************************************************************************
-
-// dart format off
-T _$identity<T>(T value) => value;
-/// @nodoc
-mixin _$ExifInfo {
-
- int? get assetId; int? get fileSize; String? get description; bool get isFlipped; String? get orientation; String? get timeZone; DateTime? get dateTimeOriginal; int? get rating; int? get width; int? get height;// GPS
- double? get latitude; double? get longitude; String? get city; String? get state; String? get country;// Camera related
- String? get make; String? get model; String? get lens; double? get f; double? get mm; int? get iso; double? get exposureSeconds;
-/// Create a copy of ExifInfo
-/// with the given fields replaced by the non-null parameter values.
-@JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-$ExifInfoCopyWith<ExifInfo> get copyWith => _$ExifInfoCopyWithImpl<ExifInfo>(this as ExifInfo, _$identity);
-
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is ExifInfo&&(identical(other.assetId, assetId) || other.assetId == assetId)&&(identical(other.fileSize, fileSize) || other.fileSize == fileSize)&&(identical(other.description, description) || other.description == description)&&(identical(other.isFlipped, isFlipped) || other.isFlipped == isFlipped)&&(identical(other.orientation, orientation) || other.orientation == orientation)&&(identical(other.timeZone, timeZone) || other.timeZone == timeZone)&&(identical(other.dateTimeOriginal, dateTimeOriginal) || other.dateTimeOriginal == dateTimeOriginal)&&(identical(other.rating, rating) || other.rating == rating)&&(identical(other.width, width) || other.width == width)&&(identical(other.height, height) || other.height == height)&&(identical(other.latitude, latitude) || other.latitude == latitude)&&(identical(other.longitude, longitude) || other.longitude == longitude)&&(identical(other.city, city) || other.city == city)&&(identical(other.state, state) || other.state == state)&&(identical(other.country, country) || other.country == country)&&(identical(other.make, make) || other.make == make)&&(identical(other.model, model) || other.model == model)&&(identical(other.lens, lens) || other.lens == lens)&&(identical(other.f, f) || other.f == f)&&(identical(other.mm, mm) || other.mm == mm)&&(identical(other.iso, iso) || other.iso == iso)&&(identical(other.exposureSeconds, exposureSeconds) || other.exposureSeconds == exposureSeconds));
-}
-
-
-@override
-int get hashCode => Object.hashAll([runtimeType,assetId,fileSize,description,isFlipped,orientation,timeZone,dateTimeOriginal,rating,width,height,latitude,longitude,city,state,country,make,model,lens,f,mm,iso,exposureSeconds]);
-
-@override
-String toString() {
-  return 'ExifInfo(assetId: $assetId, fileSize: $fileSize, description: $description, isFlipped: $isFlipped, orientation: $orientation, timeZone: $timeZone, dateTimeOriginal: $dateTimeOriginal, rating: $rating, width: $width, height: $height, latitude: $latitude, longitude: $longitude, city: $city, state: $state, country: $country, make: $make, model: $model, lens: $lens, f: $f, mm: $mm, iso: $iso, exposureSeconds: $exposureSeconds)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class $ExifInfoCopyWith<$Res>  {
-  factory $ExifInfoCopyWith(ExifInfo value, $Res Function(ExifInfo) _then) = _$ExifInfoCopyWithImpl;
-@useResult
-$Res call({
- int? assetId, int? fileSize, String? description, bool isFlipped, String? orientation, String? timeZone, DateTime? dateTimeOriginal, int? rating, int? width, int? height, double? latitude, double? longitude, String? city, String? state, String? country, String? make, String? model, String? lens, double? f, double? mm, int? iso, double? exposureSeconds
-});
-
-
-
-
-}
-/// @nodoc
-class _$ExifInfoCopyWithImpl<$Res>
-    implements $ExifInfoCopyWith<$Res> {
-  _$ExifInfoCopyWithImpl(this._self, this._then);
-
-  final ExifInfo _self;
-  final $Res Function(ExifInfo) _then;
-
-/// Create a copy of ExifInfo
-/// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? assetId = freezed,Object? fileSize = freezed,Object? description = freezed,Object? isFlipped = null,Object? orientation = freezed,Object? timeZone = freezed,Object? dateTimeOriginal = freezed,Object? rating = freezed,Object? width = freezed,Object? height = freezed,Object? latitude = freezed,Object? longitude = freezed,Object? city = freezed,Object? state = freezed,Object? country = freezed,Object? make = freezed,Object? model = freezed,Object? lens = freezed,Object? f = freezed,Object? mm = freezed,Object? iso = freezed,Object? exposureSeconds = freezed,}) {
-  return _then(_self.copyWith(
-assetId: freezed == assetId ? _self.assetId : assetId // ignore: cast_nullable_to_non_nullable
-as int?,fileSize: freezed == fileSize ? _self.fileSize : fileSize // ignore: cast_nullable_to_non_nullable
-as int?,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
-as String?,isFlipped: null == isFlipped ? _self.isFlipped : isFlipped // ignore: cast_nullable_to_non_nullable
-as bool,orientation: freezed == orientation ? _self.orientation : orientation // ignore: cast_nullable_to_non_nullable
-as String?,timeZone: freezed == timeZone ? _self.timeZone : timeZone // ignore: cast_nullable_to_non_nullable
-as String?,dateTimeOriginal: freezed == dateTimeOriginal ? _self.dateTimeOriginal : dateTimeOriginal // ignore: cast_nullable_to_non_nullable
-as DateTime?,rating: freezed == rating ? _self.rating : rating // ignore: cast_nullable_to_non_nullable
-as int?,width: freezed == width ? _self.width : width // ignore: cast_nullable_to_non_nullable
-as int?,height: freezed == height ? _self.height : height // ignore: cast_nullable_to_non_nullable
-as int?,latitude: freezed == latitude ? _self.latitude : latitude // ignore: cast_nullable_to_non_nullable
-as double?,longitude: freezed == longitude ? _self.longitude : longitude // ignore: cast_nullable_to_non_nullable
-as double?,city: freezed == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
-as String?,state: freezed == state ? _self.state : state // ignore: cast_nullable_to_non_nullable
-as String?,country: freezed == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
-as String?,make: freezed == make ? _self.make : make // ignore: cast_nullable_to_non_nullable
-as String?,model: freezed == model ? _self.model : model // ignore: cast_nullable_to_non_nullable
-as String?,lens: freezed == lens ? _self.lens : lens // ignore: cast_nullable_to_non_nullable
-as String?,f: freezed == f ? _self.f : f // ignore: cast_nullable_to_non_nullable
-as double?,mm: freezed == mm ? _self.mm : mm // ignore: cast_nullable_to_non_nullable
-as double?,iso: freezed == iso ? _self.iso : iso // ignore: cast_nullable_to_non_nullable
-as int?,exposureSeconds: freezed == exposureSeconds ? _self.exposureSeconds : exposureSeconds // ignore: cast_nullable_to_non_nullable
-as double?,
-  ));
-}
-
-}
-
-
-/// Adds pattern-matching-related methods to [ExifInfo].
-extension ExifInfoPatterns on ExifInfo {
-/// A variant of `map` that fallback to returning `orElse`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _ExifInfo value)?  $default,{required TResult orElse(),}){
-final _that = this;
-switch (_that) {
-case _ExifInfo() when $default != null:
-return $default(_that);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// Callbacks receives the raw object, upcasted.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case final Subclass2 value:
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _ExifInfo value)  $default,){
-final _that = this;
-switch (_that) {
-case _ExifInfo():
-return $default(_that);case _:
-  throw StateError('Unexpected subclass');
-
-}
-}
-/// A variant of `map` that fallback to returning `null`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _ExifInfo value)?  $default,){
-final _that = this;
-switch (_that) {
-case _ExifInfo() when $default != null:
-return $default(_that);case _:
-  return null;
-
-}
-}
-/// A variant of `when` that fallback to an `orElse` callback.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( int? assetId,  int? fileSize,  String? description,  bool isFlipped,  String? orientation,  String? timeZone,  DateTime? dateTimeOriginal,  int? rating,  int? width,  int? height,  double? latitude,  double? longitude,  String? city,  String? state,  String? country,  String? make,  String? model,  String? lens,  double? f,  double? mm,  int? iso,  double? exposureSeconds)?  $default,{required TResult orElse(),}) {final _that = this;
-switch (_that) {
-case _ExifInfo() when $default != null:
-return $default(_that.assetId,_that.fileSize,_that.description,_that.isFlipped,_that.orientation,_that.timeZone,_that.dateTimeOriginal,_that.rating,_that.width,_that.height,_that.latitude,_that.longitude,_that.city,_that.state,_that.country,_that.make,_that.model,_that.lens,_that.f,_that.mm,_that.iso,_that.exposureSeconds);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// As opposed to `map`, this offers destructuring.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case Subclass2(:final field2):
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( int? assetId,  int? fileSize,  String? description,  bool isFlipped,  String? orientation,  String? timeZone,  DateTime? dateTimeOriginal,  int? rating,  int? width,  int? height,  double? latitude,  double? longitude,  String? city,  String? state,  String? country,  String? make,  String? model,  String? lens,  double? f,  double? mm,  int? iso,  double? exposureSeconds)  $default,) {final _that = this;
-switch (_that) {
-case _ExifInfo():
-return $default(_that.assetId,_that.fileSize,_that.description,_that.isFlipped,_that.orientation,_that.timeZone,_that.dateTimeOriginal,_that.rating,_that.width,_that.height,_that.latitude,_that.longitude,_that.city,_that.state,_that.country,_that.make,_that.model,_that.lens,_that.f,_that.mm,_that.iso,_that.exposureSeconds);case _:
-  throw StateError('Unexpected subclass');
-
-}
-}
-/// A variant of `when` that fallback to returning `null`
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( int? assetId,  int? fileSize,  String? description,  bool isFlipped,  String? orientation,  String? timeZone,  DateTime? dateTimeOriginal,  int? rating,  int? width,  int? height,  double? latitude,  double? longitude,  String? city,  String? state,  String? country,  String? make,  String? model,  String? lens,  double? f,  double? mm,  int? iso,  double? exposureSeconds)?  $default,) {final _that = this;
-switch (_that) {
-case _ExifInfo() when $default != null:
-return $default(_that.assetId,_that.fileSize,_that.description,_that.isFlipped,_that.orientation,_that.timeZone,_that.dateTimeOriginal,_that.rating,_that.width,_that.height,_that.latitude,_that.longitude,_that.city,_that.state,_that.country,_that.make,_that.model,_that.lens,_that.f,_that.mm,_that.iso,_that.exposureSeconds);case _:
-  return null;
-
-}
-}
-
-}
-
-/// @nodoc
-
-
-class _ExifInfo extends ExifInfo {
-  const _ExifInfo({this.assetId, this.fileSize, this.description, this.isFlipped = false, this.orientation, this.timeZone, this.dateTimeOriginal, this.rating, this.width, this.height, this.latitude, this.longitude, this.city, this.state, this.country, this.make, this.model, this.lens, this.f, this.mm, this.iso, this.exposureSeconds}): super._();
-  
-
-@override final  int? assetId;
-@override final  int? fileSize;
-@override final  String? description;
-@override@JsonKey() final  bool isFlipped;
-@override final  String? orientation;
-@override final  String? timeZone;
-@override final  DateTime? dateTimeOriginal;
-@override final  int? rating;
-@override final  int? width;
-@override final  int? height;
-// GPS
-@override final  double? latitude;
-@override final  double? longitude;
-@override final  String? city;
-@override final  String? state;
-@override final  String? country;
-// Camera related
-@override final  String? make;
-@override final  String? model;
-@override final  String? lens;
-@override final  double? f;
-@override final  double? mm;
-@override final  int? iso;
-@override final  double? exposureSeconds;
-
-/// Create a copy of ExifInfo
-/// with the given fields replaced by the non-null parameter values.
-@override @JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-_$ExifInfoCopyWith<_ExifInfo> get copyWith => __$ExifInfoCopyWithImpl<_ExifInfo>(this, _$identity);
-
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _ExifInfo&&(identical(other.assetId, assetId) || other.assetId == assetId)&&(identical(other.fileSize, fileSize) || other.fileSize == fileSize)&&(identical(other.description, description) || other.description == description)&&(identical(other.isFlipped, isFlipped) || other.isFlipped == isFlipped)&&(identical(other.orientation, orientation) || other.orientation == orientation)&&(identical(other.timeZone, timeZone) || other.timeZone == timeZone)&&(identical(other.dateTimeOriginal, dateTimeOriginal) || other.dateTimeOriginal == dateTimeOriginal)&&(identical(other.rating, rating) || other.rating == rating)&&(identical(other.width, width) || other.width == width)&&(identical(other.height, height) || other.height == height)&&(identical(other.latitude, latitude) || other.latitude == latitude)&&(identical(other.longitude, longitude) || other.longitude == longitude)&&(identical(other.city, city) || other.city == city)&&(identical(other.state, state) || other.state == state)&&(identical(other.country, country) || other.country == country)&&(identical(other.make, make) || other.make == make)&&(identical(other.model, model) || other.model == model)&&(identical(other.lens, lens) || other.lens == lens)&&(identical(other.f, f) || other.f == f)&&(identical(other.mm, mm) || other.mm == mm)&&(identical(other.iso, iso) || other.iso == iso)&&(identical(other.exposureSeconds, exposureSeconds) || other.exposureSeconds == exposureSeconds));
-}
-
-
-@override
-int get hashCode => Object.hashAll([runtimeType,assetId,fileSize,description,isFlipped,orientation,timeZone,dateTimeOriginal,rating,width,height,latitude,longitude,city,state,country,make,model,lens,f,mm,iso,exposureSeconds]);
-
-@override
-String toString() {
-  return 'ExifInfo(assetId: $assetId, fileSize: $fileSize, description: $description, isFlipped: $isFlipped, orientation: $orientation, timeZone: $timeZone, dateTimeOriginal: $dateTimeOriginal, rating: $rating, width: $width, height: $height, latitude: $latitude, longitude: $longitude, city: $city, state: $state, country: $country, make: $make, model: $model, lens: $lens, f: $f, mm: $mm, iso: $iso, exposureSeconds: $exposureSeconds)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class _$ExifInfoCopyWith<$Res> implements $ExifInfoCopyWith<$Res> {
-  factory _$ExifInfoCopyWith(_ExifInfo value, $Res Function(_ExifInfo) _then) = __$ExifInfoCopyWithImpl;
-@override @useResult
-$Res call({
- int? assetId, int? fileSize, String? description, bool isFlipped, String? orientation, String? timeZone, DateTime? dateTimeOriginal, int? rating, int? width, int? height, double? latitude, double? longitude, String? city, String? state, String? country, String? make, String? model, String? lens, double? f, double? mm, int? iso, double? exposureSeconds
-});
-
-
-
-
-}
-/// @nodoc
-class __$ExifInfoCopyWithImpl<$Res>
-    implements _$ExifInfoCopyWith<$Res> {
-  __$ExifInfoCopyWithImpl(this._self, this._then);
-
-  final _ExifInfo _self;
-  final $Res Function(_ExifInfo) _then;
-
-/// Create a copy of ExifInfo
-/// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? assetId = freezed,Object? fileSize = freezed,Object? description = freezed,Object? isFlipped = null,Object? orientation = freezed,Object? timeZone = freezed,Object? dateTimeOriginal = freezed,Object? rating = freezed,Object? width = freezed,Object? height = freezed,Object? latitude = freezed,Object? longitude = freezed,Object? city = freezed,Object? state = freezed,Object? country = freezed,Object? make = freezed,Object? model = freezed,Object? lens = freezed,Object? f = freezed,Object? mm = freezed,Object? iso = freezed,Object? exposureSeconds = freezed,}) {
-  return _then(_ExifInfo(
-assetId: freezed == assetId ? _self.assetId : assetId // ignore: cast_nullable_to_non_nullable
-as int?,fileSize: freezed == fileSize ? _self.fileSize : fileSize // ignore: cast_nullable_to_non_nullable
-as int?,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
-as String?,isFlipped: null == isFlipped ? _self.isFlipped : isFlipped // ignore: cast_nullable_to_non_nullable
-as bool,orientation: freezed == orientation ? _self.orientation : orientation // ignore: cast_nullable_to_non_nullable
-as String?,timeZone: freezed == timeZone ? _self.timeZone : timeZone // ignore: cast_nullable_to_non_nullable
-as String?,dateTimeOriginal: freezed == dateTimeOriginal ? _self.dateTimeOriginal : dateTimeOriginal // ignore: cast_nullable_to_non_nullable
-as DateTime?,rating: freezed == rating ? _self.rating : rating // ignore: cast_nullable_to_non_nullable
-as int?,width: freezed == width ? _self.width : width // ignore: cast_nullable_to_non_nullable
-as int?,height: freezed == height ? _self.height : height // ignore: cast_nullable_to_non_nullable
-as int?,latitude: freezed == latitude ? _self.latitude : latitude // ignore: cast_nullable_to_non_nullable
-as double?,longitude: freezed == longitude ? _self.longitude : longitude // ignore: cast_nullable_to_non_nullable
-as double?,city: freezed == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
-as String?,state: freezed == state ? _self.state : state // ignore: cast_nullable_to_non_nullable
-as String?,country: freezed == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
-as String?,make: freezed == make ? _self.make : make // ignore: cast_nullable_to_non_nullable
-as String?,model: freezed == model ? _self.model : model // ignore: cast_nullable_to_non_nullable
-as String?,lens: freezed == lens ? _self.lens : lens // ignore: cast_nullable_to_non_nullable
-as String?,f: freezed == f ? _self.f : f // ignore: cast_nullable_to_non_nullable
-as double?,mm: freezed == mm ? _self.mm : mm // ignore: cast_nullable_to_non_nullable
-as double?,iso: freezed == iso ? _self.iso : iso // ignore: cast_nullable_to_non_nullable
-as int?,exposureSeconds: freezed == exposureSeconds ? _self.exposureSeconds : exposureSeconds // ignore: cast_nullable_to_non_nullable
-as double?,
-  ));
-}
-
-
-}
-
-// dart format on

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

@@ -1,23 +1,128 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
+class Ocr {
+  final String id;
+  final String assetId;
+  final double x1;
+  final double y1;
+  final double x2;
+  final double y2;
+  final double x3;
+  final double y3;
+  final double x4;
+  final double y4;
+  final double boxScore;
+  final double textScore;
+  final String text;
+  final bool isVisible;
 
-part 'ocr.model.freezed.dart';
+  const Ocr({
+    required this.id,
+    required this.assetId,
+    required this.x1,
+    required this.y1,
+    required this.x2,
+    required this.y2,
+    required this.x3,
+    required this.y3,
+    required this.x4,
+    required this.y4,
+    required this.boxScore,
+    required this.textScore,
+    required this.text,
+    required this.isVisible,
+  });
 
-@freezed
-abstract class Ocr with _$Ocr {
-  const factory Ocr({
-    required String id,
-    required String assetId,
-    required double x1,
-    required double y1,
-    required double x2,
-    required double y2,
-    required double x3,
-    required double y3,
-    required double x4,
-    required double y4,
-    required double boxScore,
-    required double textScore,
-    required String text,
-    required bool isVisible,
-  }) = _Ocr;
+  Ocr copyWith({
+    String? id,
+    String? assetId,
+    double? x1,
+    double? y1,
+    double? x2,
+    double? y2,
+    double? x3,
+    double? y3,
+    double? x4,
+    double? y4,
+    double? boxScore,
+    double? textScore,
+    String? text,
+    bool? isVisible,
+  }) {
+    return Ocr(
+      id: id ?? this.id,
+      assetId: assetId ?? this.assetId,
+      x1: x1 ?? this.x1,
+      y1: y1 ?? this.y1,
+      x2: x2 ?? this.x2,
+      y2: y2 ?? this.y2,
+      x3: x3 ?? this.x3,
+      y3: y3 ?? this.y3,
+      x4: x4 ?? this.x4,
+      y4: y4 ?? this.y4,
+      boxScore: boxScore ?? this.boxScore,
+      textScore: textScore ?? this.textScore,
+      text: text ?? this.text,
+      isVisible: isVisible ?? this.isVisible,
+    );
+  }
+
+  @override
+  String toString() {
+    return '''Ocr {
+    id: $id,
+    assetId: $assetId,
+    x1: $x1,
+    y1: $y1,
+    x2: $x2,
+    y2: $y2,
+    x3: $x3,
+    y3: $y3,
+    x4: $x4,
+    y4: $y4,
+    boxScore: $boxScore,
+    textScore: $textScore,
+    text: $text,
+    isVisible: $isVisible
+  }''';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) {
+      return true;
+    }
+
+    return other is Ocr &&
+        other.id == id &&
+        other.assetId == assetId &&
+        other.x1 == x1 &&
+        other.y1 == y1 &&
+        other.x2 == x2 &&
+        other.y2 == y2 &&
+        other.x3 == x3 &&
+        other.y3 == y3 &&
+        other.x4 == x4 &&
+        other.y4 == y4 &&
+        other.boxScore == boxScore &&
+        other.textScore == textScore &&
+        other.text == text &&
+        other.isVisible == isVisible;
+  }
+
+  @override
+  int get hashCode {
+    return id.hashCode ^
+        assetId.hashCode ^
+        x1.hashCode ^
+        y1.hashCode ^
+        x2.hashCode ^
+        y2.hashCode ^
+        x3.hashCode ^
+        y3.hashCode ^
+        x4.hashCode ^
+        y4.hashCode ^
+        boxScore.hashCode ^
+        textScore.hashCode ^
+        text.hashCode ^
+        isVisible.hashCode;
+  }
 }

mobile/lib/domain/models/ocr.model.freezed.dart

@@ -1,310 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-// coverage:ignore-file
-// ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
-
-part of 'ocr.model.dart';
-
-// **************************************************************************
-// FreezedGenerator
-// **************************************************************************
-
-// dart format off
-T _$identity<T>(T value) => value;
-/// @nodoc
-mixin _$Ocr {
-
- String get id; String get assetId; double get x1; double get y1; double get x2; double get y2; double get x3; double get y3; double get x4; double get y4; double get boxScore; double get textScore; String get text; bool get isVisible;
-/// Create a copy of Ocr
-/// with the given fields replaced by the non-null parameter values.
-@JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-$OcrCopyWith<Ocr> get copyWith => _$OcrCopyWithImpl<Ocr>(this as Ocr, _$identity);
-
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is Ocr&&(identical(other.id, id) || other.id == id)&&(identical(other.assetId, assetId) || other.assetId == assetId)&&(identical(other.x1, x1) || other.x1 == x1)&&(identical(other.y1, y1) || other.y1 == y1)&&(identical(other.x2, x2) || other.x2 == x2)&&(identical(other.y2, y2) || other.y2 == y2)&&(identical(other.x3, x3) || other.x3 == x3)&&(identical(other.y3, y3) || other.y3 == y3)&&(identical(other.x4, x4) || other.x4 == x4)&&(identical(other.y4, y4) || other.y4 == y4)&&(identical(other.boxScore, boxScore) || other.boxScore == boxScore)&&(identical(other.textScore, textScore) || other.textScore == textScore)&&(identical(other.text, text) || other.text == text)&&(identical(other.isVisible, isVisible) || other.isVisible == isVisible));
-}
-
-
-@override
-int get hashCode => Object.hash(runtimeType,id,assetId,x1,y1,x2,y2,x3,y3,x4,y4,boxScore,textScore,text,isVisible);
-
-@override
-String toString() {
-  return 'Ocr(id: $id, assetId: $assetId, x1: $x1, y1: $y1, x2: $x2, y2: $y2, x3: $x3, y3: $y3, x4: $x4, y4: $y4, boxScore: $boxScore, textScore: $textScore, text: $text, isVisible: $isVisible)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class $OcrCopyWith<$Res>  {
-  factory $OcrCopyWith(Ocr value, $Res Function(Ocr) _then) = _$OcrCopyWithImpl;
-@useResult
-$Res call({
- String id, String assetId, double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double boxScore, double textScore, String text, bool isVisible
-});
-
-
-
-
-}
-/// @nodoc
-class _$OcrCopyWithImpl<$Res>
-    implements $OcrCopyWith<$Res> {
-  _$OcrCopyWithImpl(this._self, this._then);
-
-  final Ocr _self;
-  final $Res Function(Ocr) _then;
-
-/// Create a copy of Ocr
-/// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? assetId = null,Object? x1 = null,Object? y1 = null,Object? x2 = null,Object? y2 = null,Object? x3 = null,Object? y3 = null,Object? x4 = null,Object? y4 = null,Object? boxScore = null,Object? textScore = null,Object? text = null,Object? isVisible = null,}) {
-  return _then(_self.copyWith(
-id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
-as String,assetId: null == assetId ? _self.assetId : assetId // ignore: cast_nullable_to_non_nullable
-as String,x1: null == x1 ? _self.x1 : x1 // ignore: cast_nullable_to_non_nullable
-as double,y1: null == y1 ? _self.y1 : y1 // ignore: cast_nullable_to_non_nullable
-as double,x2: null == x2 ? _self.x2 : x2 // ignore: cast_nullable_to_non_nullable
-as double,y2: null == y2 ? _self.y2 : y2 // ignore: cast_nullable_to_non_nullable
-as double,x3: null == x3 ? _self.x3 : x3 // ignore: cast_nullable_to_non_nullable
-as double,y3: null == y3 ? _self.y3 : y3 // ignore: cast_nullable_to_non_nullable
-as double,x4: null == x4 ? _self.x4 : x4 // ignore: cast_nullable_to_non_nullable
-as double,y4: null == y4 ? _self.y4 : y4 // ignore: cast_nullable_to_non_nullable
-as double,boxScore: null == boxScore ? _self.boxScore : boxScore // ignore: cast_nullable_to_non_nullable
-as double,textScore: null == textScore ? _self.textScore : textScore // ignore: cast_nullable_to_non_nullable
-as double,text: null == text ? _self.text : text // ignore: cast_nullable_to_non_nullable
-as String,isVisible: null == isVisible ? _self.isVisible : isVisible // ignore: cast_nullable_to_non_nullable
-as bool,
-  ));
-}
-
-}
-
-
-/// Adds pattern-matching-related methods to [Ocr].
-extension OcrPatterns on Ocr {
-/// A variant of `map` that fallback to returning `orElse`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _Ocr value)?  $default,{required TResult orElse(),}){
-final _that = this;
-switch (_that) {
-case _Ocr() when $default != null:
-return $default(_that);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// Callbacks receives the raw object, upcasted.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case final Subclass2 value:
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _Ocr value)  $default,){
-final _that = this;
-switch (_that) {
-case _Ocr():
-return $default(_that);case _:
-  throw StateError('Unexpected subclass');
-
-}
-}
-/// A variant of `map` that fallback to returning `null`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _Ocr value)?  $default,){
-final _that = this;
-switch (_that) {
-case _Ocr() when $default != null:
-return $default(_that);case _:
-  return null;
-
-}
-}
-/// A variant of `when` that fallback to an `orElse` callback.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String assetId,  double x1,  double y1,  double x2,  double y2,  double x3,  double y3,  double x4,  double y4,  double boxScore,  double textScore,  String text,  bool isVisible)?  $default,{required TResult orElse(),}) {final _that = this;
-switch (_that) {
-case _Ocr() when $default != null:
-return $default(_that.id,_that.assetId,_that.x1,_that.y1,_that.x2,_that.y2,_that.x3,_that.y3,_that.x4,_that.y4,_that.boxScore,_that.textScore,_that.text,_that.isVisible);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// As opposed to `map`, this offers destructuring.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case Subclass2(:final field2):
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String assetId,  double x1,  double y1,  double x2,  double y2,  double x3,  double y3,  double x4,  double y4,  double boxScore,  double textScore,  String text,  bool isVisible)  $default,) {final _that = this;
-switch (_that) {
-case _Ocr():
-return $default(_that.id,_that.assetId,_that.x1,_that.y1,_that.x2,_that.y2,_that.x3,_that.y3,_that.x4,_that.y4,_that.boxScore,_that.textScore,_that.text,_that.isVisible);case _:
-  throw StateError('Unexpected subclass');
-
-}
-}
-/// A variant of `when` that fallback to returning `null`
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String assetId,  double x1,  double y1,  double x2,  double y2,  double x3,  double y3,  double x4,  double y4,  double boxScore,  double textScore,  String text,  bool isVisible)?  $default,) {final _that = this;
-switch (_that) {
-case _Ocr() when $default != null:
-return $default(_that.id,_that.assetId,_that.x1,_that.y1,_that.x2,_that.y2,_that.x3,_that.y3,_that.x4,_that.y4,_that.boxScore,_that.textScore,_that.text,_that.isVisible);case _:
-  return null;
-
-}
-}
-
-}
-
-/// @nodoc
-
-
-class _Ocr implements Ocr {
-  const _Ocr({required this.id, required this.assetId, required this.x1, required this.y1, required this.x2, required this.y2, required this.x3, required this.y3, required this.x4, required this.y4, required this.boxScore, required this.textScore, required this.text, required this.isVisible});
-  
-
-@override final  String id;
-@override final  String assetId;
-@override final  double x1;
-@override final  double y1;
-@override final  double x2;
-@override final  double y2;
-@override final  double x3;
-@override final  double y3;
-@override final  double x4;
-@override final  double y4;
-@override final  double boxScore;
-@override final  double textScore;
-@override final  String text;
-@override final  bool isVisible;
-
-/// Create a copy of Ocr
-/// with the given fields replaced by the non-null parameter values.
-@override @JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-_$OcrCopyWith<_Ocr> get copyWith => __$OcrCopyWithImpl<_Ocr>(this, _$identity);
-
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _Ocr&&(identical(other.id, id) || other.id == id)&&(identical(other.assetId, assetId) || other.assetId == assetId)&&(identical(other.x1, x1) || other.x1 == x1)&&(identical(other.y1, y1) || other.y1 == y1)&&(identical(other.x2, x2) || other.x2 == x2)&&(identical(other.y2, y2) || other.y2 == y2)&&(identical(other.x3, x3) || other.x3 == x3)&&(identical(other.y3, y3) || other.y3 == y3)&&(identical(other.x4, x4) || other.x4 == x4)&&(identical(other.y4, y4) || other.y4 == y4)&&(identical(other.boxScore, boxScore) || other.boxScore == boxScore)&&(identical(other.textScore, textScore) || other.textScore == textScore)&&(identical(other.text, text) || other.text == text)&&(identical(other.isVisible, isVisible) || other.isVisible == isVisible));
-}
-
-
-@override
-int get hashCode => Object.hash(runtimeType,id,assetId,x1,y1,x2,y2,x3,y3,x4,y4,boxScore,textScore,text,isVisible);
-
-@override
-String toString() {
-  return 'Ocr(id: $id, assetId: $assetId, x1: $x1, y1: $y1, x2: $x2, y2: $y2, x3: $x3, y3: $y3, x4: $x4, y4: $y4, boxScore: $boxScore, textScore: $textScore, text: $text, isVisible: $isVisible)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class _$OcrCopyWith<$Res> implements $OcrCopyWith<$Res> {
-  factory _$OcrCopyWith(_Ocr value, $Res Function(_Ocr) _then) = __$OcrCopyWithImpl;
-@override @useResult
-$Res call({
- String id, String assetId, double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double boxScore, double textScore, String text, bool isVisible
-});
-
-
-
-
-}
-/// @nodoc
-class __$OcrCopyWithImpl<$Res>
-    implements _$OcrCopyWith<$Res> {
-  __$OcrCopyWithImpl(this._self, this._then);
-
-  final _Ocr _self;
-  final $Res Function(_Ocr) _then;
-
-/// Create a copy of Ocr
-/// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? assetId = null,Object? x1 = null,Object? y1 = null,Object? x2 = null,Object? y2 = null,Object? x3 = null,Object? y3 = null,Object? x4 = null,Object? y4 = null,Object? boxScore = null,Object? textScore = null,Object? text = null,Object? isVisible = null,}) {
-  return _then(_Ocr(
-id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
-as String,assetId: null == assetId ? _self.assetId : assetId // ignore: cast_nullable_to_non_nullable
-as String,x1: null == x1 ? _self.x1 : x1 // ignore: cast_nullable_to_non_nullable
-as double,y1: null == y1 ? _self.y1 : y1 // ignore: cast_nullable_to_non_nullable
-as double,x2: null == x2 ? _self.x2 : x2 // ignore: cast_nullable_to_non_nullable
-as double,y2: null == y2 ? _self.y2 : y2 // ignore: cast_nullable_to_non_nullable
-as double,x3: null == x3 ? _self.x3 : x3 // ignore: cast_nullable_to_non_nullable
-as double,y3: null == y3 ? _self.y3 : y3 // ignore: cast_nullable_to_non_nullable
-as double,x4: null == x4 ? _self.x4 : x4 // ignore: cast_nullable_to_non_nullable
-as double,y4: null == y4 ? _self.y4 : y4 // ignore: cast_nullable_to_non_nullable
-as double,boxScore: null == boxScore ? _self.boxScore : boxScore // ignore: cast_nullable_to_non_nullable
-as double,textScore: null == textScore ? _self.textScore : textScore // ignore: cast_nullable_to_non_nullable
-as double,text: null == text ? _self.text : text // ignore: cast_nullable_to_non_nullable
-as String,isVisible: null == isVisible ? _self.isVisible : isVisible // ignore: cast_nullable_to_non_nullable
-as bool,
-  ));
-}
-
-
-}
-
-// dart format on

mobile/lib/domain/models/settings_key.dart

@@ -55,8 +55,6 @@ enum SettingsKey<T> {
   // Map
   mapShowFavoriteOnly<bool>(),
   mapRelativeDate<int>(),
-  mapCustomFrom<DateTime?>(),
-  mapCustomTo<DateTime?>(),
   mapIncludeArchived<bool>(),
   mapThemeMode<ThemeMode>(codec: EnumCodec(ThemeMode.values)),
   mapWithPartners<bool>(),

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

@@ -1,15 +0,0 @@
-import 'package:immich_mobile/utils/option.dart';
-
-class TimeRange {
-  final DateTime? from;
-  final DateTime? to;
-
-  const TimeRange({this.from, this.to});
-
-  TimeRange copyWith({Option<DateTime>? from, Option<DateTime>? to}) {
-    return TimeRange(from: from.patch(this.from), to: to.patch(this.to));
-  }
-
-  TimeRange clearFrom() => TimeRange(to: to);
-  TimeRange clearTo() => TimeRange(from: from);
-}

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

@@ -6,10 +6,7 @@ import 'package:background_downloader/background_downloader.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/services/hash.service.dart';
-import 'package:immich_mobile/domain/services/local_sync.service.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
-import 'package:immich_mobile/domain/services/sync_stream.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
@@ -17,16 +14,11 @@ import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.d
 import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/platform/background_worker_api.g.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
-import 'package:immich_mobile/providers/api.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/infrastructure/album.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.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/sync.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/asset_media.repository.dart';
-import 'package:immich_mobile/repositories/permission.repository.dart';
 import 'package:immich_mobile/services/auth.service.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:immich_mobile/services/localization.service.dart';
@@ -66,43 +58,12 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
   final BackgroundWorkerBgHostApi _backgroundHostApi;
   final _cancellationToken = Completer<void>();
   final Logger _logger = Logger('BackgroundWorkerBgService');
-  late LocalSyncService _localSyncService;
-  late SyncStreamService _remoteSyncService;
-  late HashService _hashService;
 
   bool _isCleanedUp = false;
 
   BackgroundWorkerBgService({required this._drift, required this._driftLogger})
     : _backgroundHostApi = BackgroundWorkerBgHostApi() {
-    final ref = ProviderContainer(overrides: [driftProvider.overrideWith(driftOverride(_drift))]);
-    _ref = ref;
-    _localSyncService = LocalSyncService(
-      localAlbumRepository: ref.read(localAlbumRepository),
-      localAssetRepository: ref.read(localAssetRepository),
-      nativeSyncApi: ref.read(nativeSyncApiProvider),
-      trashedLocalAssetRepository: ref.read(trashedLocalAssetRepository),
-      assetMediaRepository: ref.read(assetMediaRepositoryProvider),
-      permissionRepository: ref.read(permissionRepositoryProvider),
-      cancellation: _cancellationToken,
-    );
-    _remoteSyncService = SyncStreamService(
-      syncApiRepository: ref.read(syncApiRepositoryProvider),
-      syncStreamRepository: ref.read(syncStreamRepositoryProvider),
-      localAssetRepository: ref.read(localAssetRepository),
-      trashedLocalAssetRepository: ref.read(trashedLocalAssetRepository),
-      assetMediaRepository: ref.read(assetMediaRepositoryProvider),
-      permissionRepository: ref.read(permissionRepositoryProvider),
-      syncMigrationRepository: ref.read(syncMigrationRepositoryProvider),
-      api: ref.read(apiServiceProvider),
-      cancellation: _cancellationToken,
-    );
-    _hashService = HashService(
-      localAlbumRepository: ref.read(localAlbumRepository),
-      localAssetRepository: ref.read(localAssetRepository),
-      nativeSyncApi: ref.read(nativeSyncApiProvider),
-      trashedLocalAssetRepository: ref.read(trashedLocalAssetRepository),
-      cancellation: _cancellationToken,
-    );
+    _ref = ProviderContainer(overrides: [driftProvider.overrideWith(driftOverride(_drift))]);
     BackgroundWorkerFlutterApi.setUp(this);
   }
 
@@ -158,6 +119,11 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
     try {
       final budget = maxSeconds != null ? Duration(seconds: maxSeconds - 1) : null;
 
+      final sync = _ref?.read(backgroundSyncProvider);
+      if (sync == null) {
+        return;
+      }
+
       // Only for Background Processing tasks
       if (maxSeconds == null) {
         await _optimizeDB();
@@ -169,23 +135,9 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
       // hash and handle_backup read drift state and tolerate stale reads
       // (server-side dedup catches the rare race). The single budget caps the
       // whole batch; no phase needs its own timeout.
-      final all = Future.wait<dynamic>([
-        _localSyncService.sync(),
-        _remoteSyncService.sync(),
-        _hashService.hashAssets(),
-        _handleBackup(),
-      ]);
+      final all = Future.wait<dynamic>([sync.syncLocal(), sync.syncRemote(), sync.hashAssets(), _handleBackup()]);
       if (budget != null) {
-        await all.timeout(
-          budget,
-          onTimeout: () {
-            if (!_cancellationToken.isCompleted) {
-              _logger.warning("iOS background upload timed out after ${budget.inSeconds}s, cancelling tasks");
-              _cancellationToken.complete();
-            }
-            return <dynamic>[];
-          },
-        );
+        await all.timeout(budget, onTimeout: () => <dynamic>[]);
       } else {
         await all;
       }
@@ -269,6 +221,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
 
     try {
       _isCleanedUp = true;
+      final backgroundSyncManager = _ref?.read(backgroundSyncProvider);
       final nativeSyncApi = _ref?.read(nativeSyncApiProvider);
 
       _logger.info("Cleaning up background worker");
@@ -277,7 +230,10 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
       }
 
       // Workers share one sqlite connection, so DB teardown must wait until every worker has stopped using it.
-      await Future.wait([if (nativeSyncApi != null) nativeSyncApi.cancelHashing()]);
+      await Future.wait([
+        if (backgroundSyncManager != null) backgroundSyncManager.cancel(),
+        if (nativeSyncApi != null) nativeSyncApi.cancelHashing(),
+      ]);
       await workerManagerPatch.dispose().catchError((_) async {});
       await Future.wait([LogService.I.dispose(), Store.dispose()]);
       await _drift.close();
@@ -323,18 +279,18 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
   }
 
   Future<bool> _syncAssets({Duration? hashTimeout}) async {
-    await _localSyncService.sync();
+    await _ref?.read(backgroundSyncProvider).syncLocal();
     if (_isCleanedUp) {
       return false;
     }
 
-    final isSuccess = await _remoteSyncService.sync();
+    final isSuccess = await _ref?.read(backgroundSyncProvider).syncRemote() ?? false;
     if (_isCleanedUp) {
       return isSuccess;
     }
 
-    var hashFuture = _hashService.hashAssets();
-    if (hashTimeout != null) {
+    var hashFuture = _ref?.read(backgroundSyncProvider).hashAssets();
+    if (hashTimeout != null && hashFuture != null) {
       hashFuture = hashFuture.timeout(
         hashTimeout,
         onTimeout: () {

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

@@ -120,7 +120,7 @@ class Drift extends $Drift {
   }
 
   @override
-  int get schemaVersion => 31;
+  int get schemaVersion => 32;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -318,6 +318,26 @@ class Drift extends $Drift {
               from30To31: (m, v31) async {
                 await m.createIndex(v31.idxRemoteAssetUploaded);
               },
+              from31To32: (m, v32) async {
+                const minDateTime = '0001-01-01T00:00:00.000Z';
+                const maxDateTime = '9999-12-31T00:00:00.000Z';
+                const timestampColumns = {
+                  'local_asset_entity': ['created_at', 'updated_at'],
+                  'local_album_entity': ['updated_at'],
+                  'trashed_local_asset_entity': ['created_at', 'updated_at'],
+                };
+
+                for (final entry in timestampColumns.entries) {
+                  final table = entry.key;
+                  for (final column in entry.value) {
+                    await customStatement("UPDATE $table SET $column = '$maxDateTime' WHERE $column LIKE '+%'");
+                    await customStatement("UPDATE $table SET $column = '$minDateTime' WHERE $column LIKE '-%'");
+                  }
+                }
+                await customStatement(
+                  "UPDATE local_asset_entity SET adjustment_time = NULL WHERE adjustment_time LIKE '+%' OR adjustment_time LIKE '-%'",
+                );
+              },
             ),
           ),
         );

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

@@ -16506,6 +16506,591 @@ final class Schema31 extends i0.VersionedSchema {
   );
 }
 
+final class Schema32 extends i0.VersionedSchema {
+  Schema32({required super.database}) : super(version: 32);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    userEntity,
+    remoteAssetEntity,
+    stackEntity,
+    localAssetEntity,
+    remoteAlbumEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    idxLocalAlbumAssetAlbumAsset,
+    idxLocalAssetChecksum,
+    idxLocalAssetCloudId,
+    idxLocalAssetCreatedAt,
+    idxStackPrimaryAssetId,
+    uQRemoteAssetsOwnerChecksum,
+    uQRemoteAssetsOwnerLibraryChecksum,
+    idxRemoteAssetChecksum,
+    idxRemoteAssetStackId,
+    idxRemoteAssetOwnerVisibilityDeletedCreated,
+    idxRemoteAssetUploaded,
+    authUserEntity,
+    userMetadataEntity,
+    partnerEntity,
+    remoteExifEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    remoteAssetCloudIdEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    personEntity,
+    assetFaceEntity,
+    storeEntity,
+    trashedLocalAssetEntity,
+    assetEditEntity,
+    settings,
+    assetOcrEntity,
+    idxPartnerSharedWithId,
+    idxLatLng,
+    idxRemoteExifCity,
+    idxRemoteAlbumAssetAlbumAsset,
+    idxRemoteAssetCloudId,
+    idxPersonOwnerId,
+    idxAssetFacePersonId,
+    idxAssetFaceAssetId,
+    idxAssetFaceVisiblePerson,
+    idxTrashedLocalAssetChecksum,
+    idxTrashedLocalAssetAlbum,
+    idxAssetEditAssetId,
+    idxAssetOcrAssetId,
+  ];
+  late final Shape33 userEntity = Shape33(
+    source: i0.VersionedTable(
+      entityName: 'user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_109,
+        _column_110,
+        _column_111,
+        _column_112,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape50 remoteAssetEntity = Shape50(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_108,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_107,
+        _column_119,
+        _column_120,
+        _column_121,
+        _column_122,
+        _column_123,
+        _column_124,
+        _column_212,
+        _column_125,
+        _column_126,
+        _column_127,
+        _column_128,
+        _column_129,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape35 stackEntity = Shape35(
+    source: i0.VersionedTable(
+      entityName: 'stack_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_114,
+        _column_115,
+        _column_121,
+        _column_130,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape36 localAssetEntity = Shape36(
+    source: i0.VersionedTable(
+      entityName: 'local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_108,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_107,
+        _column_131,
+        _column_120,
+        _column_132,
+        _column_133,
+        _column_134,
+        _column_135,
+        _column_136,
+        _column_137,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape48 remoteAlbumEntity = Shape48(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_138,
+        _column_114,
+        _column_115,
+        _column_139,
+        _column_140,
+        _column_141,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape38 localAlbumEntity = Shape38(
+    source: i0.VersionedTable(
+      entityName: 'local_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_115,
+        _column_142,
+        _column_143,
+        _column_144,
+        _column_145,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape39 localAlbumAssetEntity = Shape39(
+    source: i0.VersionedTable(
+      entityName: 'local_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_146, _column_147, _column_145],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLocalAlbumAssetAlbumAsset = i1.Index(
+    'idx_local_album_asset_album_asset',
+    'CREATE INDEX IF NOT EXISTS idx_local_album_asset_album_asset ON local_album_asset_entity (album_id, asset_id)',
+  );
+  final i1.Index idxLocalAssetChecksum = i1.Index(
+    'idx_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
+  );
+  final i1.Index idxLocalAssetCloudId = i1.Index(
+    'idx_local_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
+  );
+  final i1.Index idxLocalAssetCreatedAt = i1.Index(
+    'idx_local_asset_created_at',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_created_at ON local_asset_entity (created_at)',
+  );
+  final i1.Index idxStackPrimaryAssetId = i1.Index(
+    'idx_stack_primary_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_stack_primary_asset_id ON stack_entity (primary_asset_id)',
+  );
+  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
+    'UQ_remote_assets_owner_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
+  );
+  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
+    'UQ_remote_assets_owner_library_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
+  );
+  final i1.Index idxRemoteAssetChecksum = i1.Index(
+    'idx_remote_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
+  );
+  final i1.Index idxRemoteAssetStackId = i1.Index(
+    'idx_remote_asset_stack_id',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
+  );
+  final i1.Index idxRemoteAssetOwnerVisibilityDeletedCreated = i1.Index(
+    'idx_remote_asset_owner_visibility_deleted_created',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)',
+  );
+  final i1.Index idxRemoteAssetUploaded = i1.Index(
+    'idx_remote_asset_uploaded',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_uploaded ON remote_asset_entity (uploaded_at)',
+  );
+  late final Shape40 authUserEntity = Shape40(
+    source: i0.VersionedTable(
+      entityName: 'auth_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_109,
+        _column_148,
+        _column_110,
+        _column_111,
+        _column_149,
+        _column_150,
+        _column_151,
+        _column_152,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape4 userMetadataEntity = Shape4(
+    source: i0.VersionedTable(
+      entityName: 'user_metadata_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
+      columns: [_column_153, _column_154, _column_155],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape41 partnerEntity = Shape41(
+    source: i0.VersionedTable(
+      entityName: 'partner_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
+      columns: [_column_156, _column_157, _column_158],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape42 remoteExifEntity = Shape42(
+    source: i0.VersionedTable(
+      entityName: 'remote_exif_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_159,
+        _column_160,
+        _column_161,
+        _column_162,
+        _column_163,
+        _column_164,
+        _column_117,
+        _column_116,
+        _column_165,
+        _column_166,
+        _column_167,
+        _column_168,
+        _column_135,
+        _column_136,
+        _column_169,
+        _column_170,
+        _column_171,
+        _column_172,
+        _column_173,
+        _column_174,
+        _column_175,
+        _column_176,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape7 remoteAlbumAssetEntity = Shape7(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_159, _column_177],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape10 remoteAlbumUserEntity = Shape10(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
+      columns: [_column_177, _column_153, _column_178],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape43 remoteAssetCloudIdEntity = Shape43(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_cloud_id_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_159,
+        _column_179,
+        _column_180,
+        _column_134,
+        _column_135,
+        _column_136,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape44 memoryEntity = Shape44(
+    source: i0.VersionedTable(
+      entityName: 'memory_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_114,
+        _column_115,
+        _column_124,
+        _column_121,
+        _column_113,
+        _column_181,
+        _column_182,
+        _column_183,
+        _column_184,
+        _column_185,
+        _column_186,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape12 memoryAssetEntity = Shape12(
+    source: i0.VersionedTable(
+      entityName: 'memory_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
+      columns: [_column_159, _column_187],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape45 personEntity = Shape45(
+    source: i0.VersionedTable(
+      entityName: 'person_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_114,
+        _column_115,
+        _column_121,
+        _column_108,
+        _column_188,
+        _column_189,
+        _column_190,
+        _column_191,
+        _column_192,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape46 assetFaceEntity = Shape46(
+    source: i0.VersionedTable(
+      entityName: 'asset_face_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_159,
+        _column_193,
+        _column_194,
+        _column_195,
+        _column_196,
+        _column_197,
+        _column_198,
+        _column_199,
+        _column_200,
+        _column_201,
+        _column_124,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape18 storeEntity = Shape18(
+    source: i0.VersionedTable(
+      entityName: 'store_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_202, _column_203, _column_204],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape47 trashedLocalAssetEntity = Shape47(
+    source: i0.VersionedTable(
+      entityName: 'trashed_local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id, album_id)'],
+      columns: [
+        _column_108,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_107,
+        _column_205,
+        _column_131,
+        _column_120,
+        _column_132,
+        _column_206,
+        _column_137,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape32 assetEditEntity = Shape32(
+    source: i0.VersionedTable(
+      entityName: 'asset_edit_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_159,
+        _column_207,
+        _column_208,
+        _column_209,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape49 settings = Shape49(
+    source: i0.VersionedTable(
+      entityName: 'settings',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY("key")'],
+      columns: [_column_210, _column_224, _column_115],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape51 assetOcrEntity = Shape51(
+    source: i0.VersionedTable(
+      entityName: 'asset_ocr_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_159,
+        _column_213,
+        _column_214,
+        _column_215,
+        _column_216,
+        _column_217,
+        _column_218,
+        _column_219,
+        _column_220,
+        _column_221,
+        _column_222,
+        _column_223,
+        _column_201,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxPartnerSharedWithId = i1.Index(
+    'idx_partner_shared_with_id',
+    'CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)',
+  );
+  final i1.Index idxLatLng = i1.Index(
+    'idx_lat_lng',
+    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
+  );
+  final i1.Index idxRemoteExifCity = i1.Index(
+    'idx_remote_exif_city',
+    'CREATE INDEX IF NOT EXISTS idx_remote_exif_city ON remote_exif_entity (city) WHERE city IS NOT NULL',
+  );
+  final i1.Index idxRemoteAlbumAssetAlbumAsset = i1.Index(
+    'idx_remote_album_asset_album_asset',
+    'CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)',
+  );
+  final i1.Index idxRemoteAssetCloudId = i1.Index(
+    'idx_remote_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
+  );
+  final i1.Index idxPersonOwnerId = i1.Index(
+    'idx_person_owner_id',
+    'CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)',
+  );
+  final i1.Index idxAssetFacePersonId = i1.Index(
+    'idx_asset_face_person_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)',
+  );
+  final i1.Index idxAssetFaceAssetId = i1.Index(
+    'idx_asset_face_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
+  );
+  final i1.Index idxAssetFaceVisiblePerson = i1.Index(
+    'idx_asset_face_visible_person',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person ON asset_face_entity (person_id, asset_id) WHERE is_visible = 1 AND deleted_at IS NULL',
+  );
+  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
+    'idx_trashed_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
+  );
+  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
+    'idx_trashed_local_asset_album',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
+  );
+  final i1.Index idxAssetEditAssetId = i1.Index(
+    'idx_asset_edit_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)',
+  );
+  final i1.Index idxAssetOcrAssetId = i1.Index(
+    'idx_asset_ocr_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_ocr_asset_id ON asset_ocr_entity (asset_id)',
+  );
+}
+
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -16537,6 +17122,7 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema29 schema) from28To29,
   required Future<void> Function(i1.Migrator m, Schema30 schema) from29To30,
   required Future<void> Function(i1.Migrator m, Schema31 schema) from30To31,
+  required Future<void> Function(i1.Migrator m, Schema32 schema) from31To32,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -16690,6 +17276,11 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from30To31(migrator, schema);
         return 31;
+      case 31:
+        final schema = Schema32(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from31To32(migrator, schema);
+        return 32;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -16727,6 +17318,7 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema29 schema) from28To29,
   required Future<void> Function(i1.Migrator m, Schema30 schema) from29To30,
   required Future<void> Function(i1.Migrator m, Schema31 schema) from30To31,
+  required Future<void> Function(i1.Migrator m, Schema32 schema) from31To32,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -16759,5 +17351,6 @@ i1.OnUpgrade stepByStep({
     from28To29: from28To29,
     from29To30: from29To30,
     from30To31: from30To31,
+    from31To32: from31To32,
   ),
 );

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

@@ -27,18 +27,7 @@ class DriftMapRepository extends DriftDatabaseRepository {
         condition = condition & _db.remoteAssetEntity.isFavorite.equals(true);
       }
 
-      final timeRange = options.timeRange;
-      final hasCustomRange = timeRange.from != null || timeRange.to != null;
-
-      if (hasCustomRange) {
-        if (timeRange.from != null) {
-          condition = condition & _db.remoteAssetEntity.createdAt.isBiggerOrEqualValue(timeRange.from!);
-        }
-
-        if (timeRange.to != null) {
-          condition = condition & _db.remoteAssetEntity.createdAt.isSmallerOrEqualValue(timeRange.to!);
-        }
-      } else if (options.relativeDays > 0) {
+      if (options.relativeDays != 0) {
         final cutoffDate = DateTime.now().toUtc().subtract(Duration(days: options.relativeDays));
         condition = condition & _db.remoteAssetEntity.createdAt.isBiggerOrEqualValue(cutoffDate);
       }

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

@@ -4,7 +4,6 @@ import 'package:drift/drift.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/time_range.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
@@ -21,7 +20,6 @@ class TimelineMapOptions {
   final bool includeArchived;
   final bool withPartners;
   final int relativeDays;
-  final TimeRange timeRange;
 
   const TimelineMapOptions({
     required this.bounds,
@@ -29,7 +27,6 @@ class TimelineMapOptions {
     this.includeArchived = false,
     this.withPartners = false,
     this.relativeDays = 0,
-    this.timeRange = const TimeRange(),
   });
 }
 
@@ -555,21 +552,8 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
       query.where(_db.remoteAssetEntity.isFavorite.equals(true));
     }
 
-    final timeRange = options.timeRange;
-
-    final hasCustomRange = timeRange.from != null || timeRange.to != null;
-
-    if (hasCustomRange) {
-      if (timeRange.from != null) {
-        query.where(_db.remoteAssetEntity.createdAt.isBiggerOrEqualValue(timeRange.from!));
-      }
-
-      if (timeRange.to != null) {
-        query.where(_db.remoteAssetEntity.createdAt.isSmallerOrEqualValue(timeRange.to!));
-      }
-    } else if (options.relativeDays > 0) {
+    if (options.relativeDays != 0) {
       final cutoffDate = DateTime.now().toUtc().subtract(Duration(days: options.relativeDays));
-
       query.where(_db.remoteAssetEntity.createdAt.isBiggerOrEqualValue(cutoffDate));
     }
 
@@ -610,21 +594,8 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
       query.where(_db.remoteAssetEntity.isFavorite.equals(true));
     }
 
-    final timeRange = options.timeRange;
-
-    final hasCustomRange = timeRange.from != null || timeRange.to != null;
-
-    if (hasCustomRange) {
-      if (timeRange.from != null) {
-        query.where(_db.remoteAssetEntity.createdAt.isBiggerOrEqualValue(timeRange.from!));
-      }
-
-      if (timeRange.to != null) {
-        query.where(_db.remoteAssetEntity.createdAt.isSmallerOrEqualValue(timeRange.to!));
-      }
-    } else if (options.relativeDays > 0) {
+    if (options.relativeDays != 0) {
       final cutoffDate = DateTime.now().toUtc().subtract(Duration(days: options.relativeDays));
-
       query.where(_db.remoteAssetEntity.createdAt.isBiggerOrEqualValue(cutoffDate));
     }
 

mobile/lib/presentation/widgets/map/map.state.dart

@@ -1,13 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
-import 'package:immich_mobile/domain/models/time_range.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/map.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/map/map_state.provider.dart';
-import 'package:immich_mobile/utils/option.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 class MapState {
@@ -17,7 +15,6 @@ class MapState {
   final bool includeArchived;
   final bool withPartners;
   final int relativeDays;
-  final TimeRange timeRange;
 
   const MapState({
     this.themeMode = ThemeMode.system,
@@ -26,7 +23,6 @@ class MapState {
     this.includeArchived = false,
     this.withPartners = false,
     this.relativeDays = 0,
-    this.timeRange = const TimeRange(),
   });
 
   @override
@@ -44,7 +40,6 @@ class MapState {
     bool? includeArchived,
     bool? withPartners,
     int? relativeDays,
-    TimeRange? timeRange,
   }) {
     return MapState(
       bounds: bounds ?? this.bounds,
@@ -53,7 +48,6 @@ class MapState {
       includeArchived: includeArchived ?? this.includeArchived,
       withPartners: withPartners ?? this.withPartners,
       relativeDays: relativeDays ?? this.relativeDays,
-      timeRange: timeRange ?? this.timeRange,
     );
   }
 
@@ -63,7 +57,6 @@ class MapState {
     includeArchived: includeArchived,
     withPartners: withPartners,
     relativeDays: relativeDays,
-    timeRange: timeRange,
   );
 }
 
@@ -110,24 +103,6 @@ class MapStateNotifier extends Notifier<MapState> {
     EventStream.shared.emit(const MapMarkerReloadEvent());
   }
 
-  void setCustomTimeRange(TimeRange range) {
-    ref.read(settingsProvider).write(.mapCustomFrom, range.from);
-    ref.read(settingsProvider).write(.mapCustomTo, range.to);
-    state = state.copyWith(timeRange: range);
-    EventStream.shared.emit(const MapMarkerReloadEvent());
-  }
-
-  Option<DateTime> parseDateOption(String s) {
-    try {
-      if (s.trim().isEmpty) {
-        return const Option.none();
-      }
-      return Option.some(DateTime.parse(s));
-    } catch (_) {
-      return const Option.none();
-    }
-  }
-
   @override
   MapState build() {
     final mapConfig = ref.read(appConfigProvider.select((config) => config.map));
@@ -138,7 +113,6 @@ class MapStateNotifier extends Notifier<MapState> {
       withPartners: mapConfig.withPartners,
       relativeDays: mapConfig.relativeDays,
       bounds: LatLngBounds(northeast: const LatLng(0, 0), southwest: const LatLng(0, 0)),
-      timeRange: TimeRange(from: mapConfig.customFrom, to: mapConfig.customTo),
     );
   }
 }

mobile/lib/presentation/widgets/map/map_settings_sheet.dart

@@ -1,39 +1,21 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/time_range.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/widgets/map/map.state.dart';
-import 'package:immich_mobile/widgets/map/map_settings/map_custom_time_range.dart';
 import 'package:immich_mobile/widgets/map/map_settings/map_settings_list_tile.dart';
 import 'package:immich_mobile/widgets/map/map_settings/map_settings_time_dropdown.dart';
 import 'package:immich_mobile/widgets/map/map_settings/map_theme_picker.dart';
 
-class DriftMapSettingsSheet extends ConsumerStatefulWidget {
+class DriftMapSettingsSheet extends HookConsumerWidget {
   const DriftMapSettingsSheet({super.key});
 
   @override
-  ConsumerState<DriftMapSettingsSheet> createState() => _DriftMapSettingsSheetState();
-}
-
-class _DriftMapSettingsSheetState extends ConsumerState<DriftMapSettingsSheet> {
-  late bool useCustomRange;
-
-  @override
-  void initState() {
-    super.initState();
-    final mapState = ref.read(mapStateProvider);
-    final timeRange = mapState.timeRange;
-    useCustomRange = timeRange.from != null || timeRange.to != null;
-  }
-
-  @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     final mapState = ref.watch(mapStateProvider);
 
     return DraggableScrollableSheet(
       expand: false,
-      initialChildSize: useCustomRange ? 0.7 : 0.6,
+      initialChildSize: 0.6,
       builder: (ctx, scrollController) => SingleChildScrollView(
         controller: scrollController,
         child: Card(
@@ -65,41 +47,10 @@ class _DriftMapSettingsSheetState extends ConsumerState<DriftMapSettingsSheet> {
                 selected: mapState.withPartners,
                 onChanged: (withPartners) => ref.read(mapStateProvider.notifier).switchWithPartners(withPartners),
               ),
-              if (useCustomRange) ...[
-                MapTimeRange(
-                  timeRange: mapState.timeRange,
-                  onChanged: (range) {
-                    ref.read(mapStateProvider.notifier).setCustomTimeRange(range);
-                  },
-                ),
-                Align(
-                  alignment: Alignment.centerLeft,
-                  child: TextButton(
-                    onPressed: () => setState(() {
-                      useCustomRange = false;
-                      ref.read(mapStateProvider.notifier).setRelativeTime(0);
-                      ref.read(mapStateProvider.notifier).setCustomTimeRange(const TimeRange());
-                    }),
-                    child: Text(context.t.remove_custom_date_range),
-                  ),
-                ),
-              ] else ...[
-                MapTimeDropDown(
-                  relativeTime: mapState.relativeDays,
-                  onTimeChange: (time) => ref.read(mapStateProvider.notifier).setRelativeTime(time),
-                ),
-                Align(
-                  alignment: Alignment.centerLeft,
-                  child: TextButton(
-                    onPressed: () => setState(() {
-                      useCustomRange = true;
-                      ref.read(mapStateProvider.notifier).setRelativeTime(0);
-                      ref.read(mapStateProvider.notifier).setCustomTimeRange(const TimeRange());
-                    }),
-                    child: Text(context.t.use_custom_date_range),
-                  ),
-                ),
-              ],
+              MapTimeDropDown(
+                relativeTime: mapState.relativeDays,
+                onTimeChange: (time) => ref.read(mapStateProvider.notifier).setRelativeTime(time),
+              ),
               const SizedBox(height: 20),
             ],
           ),

mobile/lib/utils/datetime_helpers.dart

@@ -1,4 +1,4 @@
-const int _maxMillisecondsSinceEpoch = 8640000000000000; // 275760-09-13
+const int _maxMillisecondsSinceEpoch = 253402214400000; // 9999-12-31
 const int _minMillisecondsSinceEpoch = -62135596800000; // 0001-01-01
 
 DateTime? tryFromSecondsSinceEpoch(int? secondsSinceEpoch, {bool isUtc = false}) {

mobile/lib/utils/option.dart

@@ -32,17 +32,6 @@ sealed class Option<T> {
     None() => onNone(),
   };
 
-  Option<U> flatMap<U>(Option<U> Function(T value) f) => switch (this) {
-    Some(:final value) => f(value),
-    None() => const Option.none(),
-  };
-
-  void ifPresent(void Function(T value) f) {
-    if (this case Some(:final value)) {
-      f(value);
-    }
-  }
-
   @override
   String toString() => switch (this) {
     Some(:final value) => 'Some($value)',

mobile/lib/widgets/map/map_settings/map_custom_time_range.dart

@@ -1,73 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/models/time_range.model.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/utils/option.dart';
-
-class MapTimeRange extends StatelessWidget {
-  const MapTimeRange({super.key, required this.timeRange, required this.onChanged});
-
-  final TimeRange timeRange;
-  final Function(TimeRange) onChanged;
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        ListTile(
-          title: Text(context.t.date_after),
-          subtitle: Text(
-            timeRange.from != null
-                ? DateFormat.yMMMd(context.locale.toLanguageTag()).add_jm().format(timeRange.from!)
-                : context.t.not_set,
-          ),
-          trailing: timeRange.from != null
-              ? IconButton(icon: const Icon(Icons.close), onPressed: () => onChanged(timeRange.clearFrom()))
-              : null,
-          onTap: () async {
-            final initial = timeRange.from ?? DateTime.now();
-            final currentTo = timeRange.to;
-
-            final picked = await showDatePicker(
-              context: context,
-              initialDate: currentTo != null && initial.isAfter(currentTo) ? currentTo : initial,
-              firstDate: DateTime(1970),
-              lastDate: currentTo ?? DateTime.now(),
-            );
-
-            if (picked != null) {
-              onChanged(timeRange.copyWith(from: Option.some(picked)));
-            }
-          },
-        ),
-        ListTile(
-          title: Text(context.t.date_before),
-          subtitle: Text(
-            timeRange.to != null
-                ? DateFormat.yMMMd(context.locale.toLanguageTag()).add_jm().format(timeRange.to!)
-                : context.t.not_set,
-          ),
-          trailing: timeRange.to != null
-              ? IconButton(icon: const Icon(Icons.close), onPressed: () => onChanged(timeRange.clearTo()))
-              : null,
-          onTap: () async {
-            final initial = timeRange.to ?? DateTime.now();
-            final currentFrom = timeRange.from;
-
-            final picked = await showDatePicker(
-              context: context,
-              initialDate: currentFrom != null && initial.isBefore(currentFrom) ? currentFrom : initial,
-              firstDate: currentFrom ?? DateTime(1970),
-              lastDate: DateTime.now(),
-            );
-
-            if (picked != null) {
-              onChanged(timeRange.copyWith(to: Option.some(picked)));
-            }
-          },
-        ),
-      ],
-    );
-  }
-}

mobile/pubspec.lock

@@ -667,22 +667,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "8.2.14"
-  freezed:
-    dependency: "direct dev"
-    description:
-      name: freezed
-      sha256: f23ea33b3863f119b58ed1b586e881a46bd28715ddcc4dbc33104524e3434131
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.5"
-  freezed_annotation:
-    dependency: "direct main"
-    description:
-      name: freezed_annotation
-      sha256: "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.0"
   frontend_server_client:
     dependency: transitive
     description:

mobile/pubspec.yaml

@@ -91,7 +91,6 @@ dependencies:
       url: https://github.com/mertalev/http
       ref: '549c24b0a4d3881a9a44b70f4873450d43c1c4af' # https://github.com/dart-lang/http/pull/1877
       path: pkgs/ok_http/
-  freezed_annotation: ^3.1.0
 
 dev_dependencies:
   auto_route_generator: ^10.5.0
@@ -105,7 +104,6 @@ dev_dependencies:
   flutter_native_splash: ^2.4.7
   flutter_test:
     sdk: flutter
-  freezed: ^3.2.5
   integration_test:
     sdk: flutter
   mocktail: ^1.0.5

mobile/test/drift/main/generated/schema.dart

@@ -35,6 +35,7 @@ import 'schema_v28.dart' as v28;
 import 'schema_v29.dart' as v29;
 import 'schema_v30.dart' as v30;
 import 'schema_v31.dart' as v31;
+import 'schema_v32.dart' as v32;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -102,6 +103,8 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v30.DatabaseAtV30(db);
       case 31:
         return v31.DatabaseAtV31(db);
+      case 32:
+        return v32.DatabaseAtV32(db);
       default:
         throw MissingSchemaException(version, versions);
     }
@@ -139,5 +142,6 @@ class GeneratedHelper implements SchemaInstantiationHelper {
     29,
     30,
     31,
+    32,
   ];
 }

mobile/test/drift/main/migration_test.dart

@@ -8,6 +8,7 @@ import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'generated/schema.dart';
 import 'generated/schema_v1.dart' as v1;
 import 'generated/schema_v2.dart' as v2;
+import 'generated/schema_v31.dart' as v31;
 
 void main() {
   driftRuntimeOptions.dontWarnAboutMultipleDatabases = true;
@@ -35,4 +36,55 @@ void main() {
       });
     }
   });
+
+  group('migration from v31 to v32', () {
+    test('clamps timestamps outside the SQLite-supported range', () async {
+      final schema = await verifier.schemaAt(31);
+
+      final oldDb = v31.DatabaseAtV31(schema.newConnection());
+      await oldDb.customStatement(
+        "INSERT INTO local_asset_entity (id, name, type, created_at, updated_at, adjustment_time) "
+        "VALUES ('asset-1', 'a.jpg', 0, '+275760-09-13T00:00:00.000Z', '-000001-01-01T00:00:00.000Z', '+275760-09-13T00:00:00.000Z'), "
+        "('asset-2', 'b.jpg', 0, '2025-01-01T00:00:00.000Z', '2025-01-01T00:00:00.000Z', '2025-01-01T00:00:00.000Z')",
+      );
+      await oldDb.customStatement(
+        "INSERT INTO local_album_entity (id, name, updated_at, backup_selection) "
+        "VALUES ('album-1', 'album', '+275760-09-13T00:00:00.000Z', 0)",
+      );
+      await oldDb.close();
+
+      final db = Drift(schema.newConnection());
+      await verifier.migrateAndValidate(db, 32);
+
+      final clamped = await db
+          .customSelect(
+            "SELECT created_at, updated_at, adjustment_time FROM local_asset_entity WHERE id = 'asset-1'",
+          )
+          .getSingle();
+      expect(clamped.read<String>('created_at'), '9999-12-31T00:00:00.000Z');
+      expect(clamped.read<String>('updated_at'), '0001-01-01T00:00:00.000Z');
+      expect(clamped.readNullable<String>('adjustment_time'), null);
+
+      final untouched = await db
+          .customSelect(
+            "SELECT created_at, updated_at, adjustment_time FROM local_asset_entity WHERE id = 'asset-2'",
+          )
+          .getSingle();
+      expect(untouched.read<String>('created_at'), '2025-01-01T00:00:00.000Z');
+      expect(untouched.read<String>('updated_at'), '2025-01-01T00:00:00.000Z');
+      expect(
+        untouched.readNullable<String>('adjustment_time'),
+        '2025-01-01T00:00:00.000Z',
+      );
+
+      final album = await db
+          .customSelect(
+            "SELECT updated_at FROM local_album_entity WHERE id = 'album-1'",
+          )
+          .getSingle();
+      expect(album.read<String>('updated_at'), '9999-12-31T00:00:00.000Z');
+
+      await db.close();
+    });
+  });
 }

mobile/test/modules/utils/datetime_helpers_test.dart

@@ -16,8 +16,8 @@ void main() {
     });
 
     test('returns null for value above maximum allowed range', () {
-      // _maxMillisecondsSinceEpoch = 8640000000000000
-      final seconds = 8640000000000000 ~/ 1000 + 1; // One second after max allowed
+      // _maxMillisecondsSinceEpoch = 253402214400000
+      final seconds = 253402214400000 ~/ 1000 + 1; // One second after max allowed
       final result = tryFromSecondsSinceEpoch(seconds);
       expect(result, isNull);
     });
@@ -29,9 +29,15 @@ void main() {
     });
 
     test('returns correct DateTime for maximum allowed value', () {
-      final seconds = 8640000000000000 ~/ 1000; // Maximum allowed timestamp
+      final seconds = 253402214400000 ~/ 1000; // Maximum allowed timestamp
       final result = tryFromSecondsSinceEpoch(seconds);
-      expect(result, DateTime.fromMillisecondsSinceEpoch(8640000000000000));
+      expect(result, DateTime.fromMillisecondsSinceEpoch(253402214400000));
+    });
+
+    test('returns null for value within Dart range but beyond SQLite range', () {
+      final seconds = 8640000000000; // Dart's maximum DateTime (year 275760)
+      final result = tryFromSecondsSinceEpoch(seconds);
+      expect(result, isNull);
     });
 
     test('returns correct DateTime for negative timestamp', () {

mobile/test/presentation/widgets/timeline/timeline_args_test.dart

@@ -25,8 +25,6 @@ class _FrozenBucketService implements TimelineService {
 }
 
 class _EmptyBucketService implements TimelineService {
-  const _EmptyBucketService();
-
   @override
   Stream<List<Bucket>> Function() get watchBuckets =>
       () => Stream.value(const []);
@@ -111,7 +109,7 @@ void main() {
     await tester.pumpWidget(
       ProviderScope(
         overrides: [
-          timelineServiceProvider.overrideWithValue(const _EmptyBucketService()),
+          timelineServiceProvider.overrideWithValue(_EmptyBucketService()),
           appConfigProvider.overrideWithValue(const AppConfig()),
         ],
         child: MaterialApp(

mobile/test/unit/utils/value_codec_test.dart

@@ -1,99 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/models/value_codec.dart';
-
-enum _Fruit { apple, banana, cherry }
-
-void main() {
-  group('MapCodec', () {
-    group('encode', () {
-      test('serializes an empty map to an empty JSON object', () {
-        const codec = MapCodec<String, String>(PrimitiveCodec.string, PrimitiveCodec.string);
-        expect(codec.encode({}), '{}');
-      });
-
-      test('encodes a string-to-string map as a JSON object', () {
-        const codec = MapCodec<String, String>(PrimitiveCodec.string, PrimitiveCodec.string);
-        expect(codec.encode({'a': '1', 'b': '2'}), '{"a":"1","b":"2"}');
-      });
-
-      test('stringifies non-string values via the value codec', () {
-        const codec = MapCodec<String, int>(PrimitiveCodec.string, PrimitiveCodec.integer);
-        expect(codec.encode({'x': 10, 'y': 20}), '{"x":"10","y":"20"}');
-      });
-
-      test('stringifies non-string keys via the key codec', () {
-        const codec = MapCodec<int, String>(PrimitiveCodec.integer, PrimitiveCodec.string);
-        expect(codec.encode({1: 'one', 2: 'two'}), '{"1":"one","2":"two"}');
-      });
-    });
-
-    group('decode', () {
-      test('reconstructs a string-to-string map', () {
-        const codec = MapCodec<String, String>(PrimitiveCodec.string, PrimitiveCodec.string);
-        expect(codec.decode('{"a":"1","b":"2"}'), {'a': '1', 'b': '2'});
-      });
-
-      test('parses values back to their domain type', () {
-        const codec = MapCodec<String, int>(PrimitiveCodec.string, PrimitiveCodec.integer);
-        expect(codec.decode('{"x":"10","y":"20"}'), {'x': 10, 'y': 20});
-      });
-
-      test('parses keys back to their domain type', () {
-        const codec = MapCodec<int, String>(PrimitiveCodec.integer, PrimitiveCodec.string);
-        expect(codec.decode('{"1":"one","2":"two"}'), {1: 'one', 2: 'two'});
-      });
-
-      test('returns an empty map for an empty JSON object', () {
-        const codec = MapCodec<String, String>(PrimitiveCodec.string, PrimitiveCodec.string);
-        expect(codec.decode('{}'), isEmpty);
-      });
-
-      test('returns an empty map when the payload is not valid JSON', () {
-        const codec = MapCodec<String, String>(PrimitiveCodec.string, PrimitiveCodec.string);
-        expect(codec.decode('not json'), isEmpty);
-      });
-
-      test('returns an empty map when the JSON root is not an object', () {
-        const codec = MapCodec<String, String>(PrimitiveCodec.string, PrimitiveCodec.string);
-        expect(codec.decode('[]'), isEmpty);
-        expect(codec.decode('"a string"'), isEmpty);
-        expect(codec.decode('42'), isEmpty);
-      });
-
-      test('skips entries whose value is not a JSON string, keeping the rest', () {
-        const codec = MapCodec<String, int>(PrimitiveCodec.string, PrimitiveCodec.integer);
-        expect(codec.decode('{"x":1,"y":"20"}'), {'y': 20});
-      });
-
-      test('skips entries whose value is a nested object, keeping the rest', () {
-        const codec = MapCodec<String, String>(PrimitiveCodec.string, PrimitiveCodec.string);
-        expect(codec.decode('{"a":{"nested":"value"},"b":"ok"}'), {'b': 'ok'});
-      });
-
-      test('returns an empty map when every entry is malformed', () {
-        const codec = MapCodec<String, int>(PrimitiveCodec.string, PrimitiveCodec.integer);
-        expect(codec.decode('{"x":1,"y":2}'), isEmpty);
-      });
-    });
-
-    group('round trip', () {
-      test('preserves a primitive map through encode then decode', () {
-        const codec = MapCodec<String, int>(PrimitiveCodec.string, PrimitiveCodec.integer);
-        const original = {'one': 1, 'two': 2, 'three': 3};
-        expect(codec.decode(codec.encode(original)), original);
-      });
-
-      test('preserves an enum-valued map by composing with EnumCodec', () {
-        const codec = MapCodec<String, _Fruit>(PrimitiveCodec.string, EnumCodec(_Fruit.values));
-        const original = {'breakfast': _Fruit.banana, 'snack': _Fruit.apple};
-        expect(codec.decode(codec.encode(original)), original);
-      });
-
-      test('preserves a DateTime-valued map by composing with DateTimeCodec', () {
-        const codec = MapCodec<String, DateTime>(PrimitiveCodec.string, DateTimeCodec());
-        final original = {'created': DateTime.utc(2024, 1, 1, 12, 30)};
-        expect(codec.decode(codec.encode(original)), original);
-      });
-    });
-  });
-}

web/src/routes/auth/onboarding/OnboardingCard.svelte

@@ -1,5 +1,4 @@
 <script lang="ts">
-  import { languageManager } from '$lib/managers/language-manager.svelte';
   import { Button, Icon } from '@immich/ui';
   import { mdiArrowLeft, mdiArrowRight, mdiCheck } from '@mdi/js';
   import type { Snippet } from 'svelte';
@@ -53,7 +52,7 @@
       <div class="flex w-full place-content-start">
         <Button
           shape="round"
-          leadingIcon={languageManager.rtl ? mdiArrowRight : mdiArrowLeft}
+          leadingIcon={mdiArrowLeft}
           class="flex place-content-center gap-2"
           onclick={() => {
             onLeave?.();
@@ -68,7 +67,7 @@
     <div class="flex w-full place-content-end">
       <Button
         shape="round"
-        trailingIcon={nextTitle ? (languageManager.rtl ? mdiArrowLeft : mdiArrowRight) : mdiCheck}
+        trailingIcon={nextTitle ? mdiArrowRight : mdiCheck}
         onclick={() => {
           onLeave?.();
           onNext?.();