merge: remote-tracking branch 'origin/main' into feat/integrity-checks-izzy

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

@@ -4,7 +4,6 @@ import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
-import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
 
 typedef _AssetVideoDimension = ({double? width, double? height, bool isFlipped});
 
@@ -99,9 +98,7 @@ class AssetService {
       height = fetched?.height?.toDouble();
     }
 
-    final exif = await getExif(asset);
-    final isFlipped = ExifDtoConverter.isOrientationFlipped(exif?.orientation);
-    return (width: width, height: height, isFlipped: isFlipped);
+    return (width: width, height: height, isFlipped: false);
   }
 
   Future<List<(String, String)>> getPlaces(String userId) {

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

@@ -4,6 +4,13 @@ import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity
 import 'package:immich_mobile/infrastructure/utils/asset.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 
+enum TrashOrigin {
+  // do not change this order!
+  localSync,
+  remoteSync,
+  localUser,
+}
+
 @TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)')
 @TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)')
 class TrashedLocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
@@ -19,6 +26,8 @@ class TrashedLocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntity
 
   IntColumn get orientation => integer().withDefault(const Constant(0))();
 
+  IntColumn get source => intEnum<TrashOrigin>()();
+
   @override
   Set<Column> get primaryKey => {id, albumId};
 }

mobile/lib/infrastructure/entities/trashed_local_asset.entity.drift.dart

@@ -22,6 +22,7 @@ typedef $$TrashedLocalAssetEntityTableCreateCompanionBuilder =
       i0.Value<String?> checksum,
       i0.Value<bool> isFavorite,
       i0.Value<int> orientation,
+      required i3.TrashOrigin source,
     });
 typedef $$TrashedLocalAssetEntityTableUpdateCompanionBuilder =
     i1.TrashedLocalAssetEntityCompanion Function({
@@ -37,6 +38,7 @@ typedef $$TrashedLocalAssetEntityTableUpdateCompanionBuilder =
       i0.Value<String?> checksum,
       i0.Value<bool> isFavorite,
       i0.Value<int> orientation,
+      i0.Value<i3.TrashOrigin> source,
     });
 
 class $$TrashedLocalAssetEntityTableFilterComposer
@@ -109,6 +111,12 @@ class $$TrashedLocalAssetEntityTableFilterComposer
     column: $table.orientation,
     builder: (column) => i0.ColumnFilters(column),
   );
+
+  i0.ColumnWithTypeConverterFilters<i3.TrashOrigin, i3.TrashOrigin, int>
+  get source => $composableBuilder(
+    column: $table.source,
+    builder: (column) => i0.ColumnWithTypeConverterFilters(column),
+  );
 }
 
 class $$TrashedLocalAssetEntityTableOrderingComposer
@@ -180,6 +188,11 @@ class $$TrashedLocalAssetEntityTableOrderingComposer
     column: $table.orientation,
     builder: (column) => i0.ColumnOrderings(column),
   );
+
+  i0.ColumnOrderings<int> get source => $composableBuilder(
+    column: $table.source,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
 }
 
 class $$TrashedLocalAssetEntityTableAnnotationComposer
@@ -233,6 +246,9 @@ class $$TrashedLocalAssetEntityTableAnnotationComposer
     column: $table.orientation,
     builder: (column) => column,
   );
+
+  i0.GeneratedColumnWithTypeConverter<i3.TrashOrigin, int> get source =>
+      $composableBuilder(column: $table.source, builder: (column) => column);
 }
 
 class $$TrashedLocalAssetEntityTableTableManager
@@ -293,6 +309,7 @@ class $$TrashedLocalAssetEntityTableTableManager
                 i0.Value<String?> checksum = const i0.Value.absent(),
                 i0.Value<bool> isFavorite = const i0.Value.absent(),
                 i0.Value<int> orientation = const i0.Value.absent(),
+                i0.Value<i3.TrashOrigin> source = const i0.Value.absent(),
               }) => i1.TrashedLocalAssetEntityCompanion(
                 name: name,
                 type: type,
@@ -306,6 +323,7 @@ class $$TrashedLocalAssetEntityTableTableManager
                 checksum: checksum,
                 isFavorite: isFavorite,
                 orientation: orientation,
+                source: source,
               ),
           createCompanionCallback:
               ({
@@ -321,6 +339,7 @@ class $$TrashedLocalAssetEntityTableTableManager
                 i0.Value<String?> checksum = const i0.Value.absent(),
                 i0.Value<bool> isFavorite = const i0.Value.absent(),
                 i0.Value<int> orientation = const i0.Value.absent(),
+                required i3.TrashOrigin source,
               }) => i1.TrashedLocalAssetEntityCompanion.insert(
                 name: name,
                 type: type,
@@ -334,6 +353,7 @@ class $$TrashedLocalAssetEntityTableTableManager
                 checksum: checksum,
                 isFavorite: isFavorite,
                 orientation: orientation,
+                source: source,
               ),
           withReferenceMapper: (p0) => p0
               .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
@@ -519,6 +539,17 @@ class $TrashedLocalAssetEntityTable extends i3.TrashedLocalAssetEntity
     defaultValue: const i4.Constant(0),
   );
   @override
+  late final i0.GeneratedColumnWithTypeConverter<i3.TrashOrigin, int> source =
+      i0.GeneratedColumn<int>(
+        'source',
+        aliasedName,
+        false,
+        type: i0.DriftSqlType.int,
+        requiredDuringInsert: true,
+      ).withConverter<i3.TrashOrigin>(
+        i1.$TrashedLocalAssetEntityTable.$convertersource,
+      );
+  @override
   List<i0.GeneratedColumn> get $columns => [
     name,
     type,
@@ -532,6 +563,7 @@ class $TrashedLocalAssetEntityTable extends i3.TrashedLocalAssetEntity
     checksum,
     isFavorite,
     orientation,
+    source,
   ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -682,6 +714,12 @@ class $TrashedLocalAssetEntityTable extends i3.TrashedLocalAssetEntity
         i0.DriftSqlType.int,
         data['${effectivePrefix}orientation'],
       )!,
+      source: i1.$TrashedLocalAssetEntityTable.$convertersource.fromSql(
+        attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.int,
+          data['${effectivePrefix}source'],
+        )!,
+      ),
     );
   }
 
@@ -692,6 +730,8 @@ class $TrashedLocalAssetEntityTable extends i3.TrashedLocalAssetEntity
 
   static i0.JsonTypeConverter2<i2.AssetType, int, int> $convertertype =
       const i0.EnumIndexConverter<i2.AssetType>(i2.AssetType.values);
+  static i0.JsonTypeConverter2<i3.TrashOrigin, int, int> $convertersource =
+      const i0.EnumIndexConverter<i3.TrashOrigin>(i3.TrashOrigin.values);
   @override
   bool get withoutRowId => true;
   @override
@@ -712,6 +752,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
   final String? checksum;
   final bool isFavorite;
   final int orientation;
+  final i3.TrashOrigin source;
   const TrashedLocalAssetEntityData({
     required this.name,
     required this.type,
@@ -725,6 +766,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
     this.checksum,
     required this.isFavorite,
     required this.orientation,
+    required this.source,
   });
   @override
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
@@ -753,6 +795,11 @@ class TrashedLocalAssetEntityData extends i0.DataClass
     }
     map['is_favorite'] = i0.Variable<bool>(isFavorite);
     map['orientation'] = i0.Variable<int>(orientation);
+    {
+      map['source'] = i0.Variable<int>(
+        i1.$TrashedLocalAssetEntityTable.$convertersource.toSql(source),
+      );
+    }
     return map;
   }
 
@@ -776,6 +823,9 @@ class TrashedLocalAssetEntityData extends i0.DataClass
       checksum: serializer.fromJson<String?>(json['checksum']),
       isFavorite: serializer.fromJson<bool>(json['isFavorite']),
       orientation: serializer.fromJson<int>(json['orientation']),
+      source: i1.$TrashedLocalAssetEntityTable.$convertersource.fromJson(
+        serializer.fromJson<int>(json['source']),
+      ),
     );
   }
   @override
@@ -796,6 +846,9 @@ class TrashedLocalAssetEntityData extends i0.DataClass
       'checksum': serializer.toJson<String?>(checksum),
       'isFavorite': serializer.toJson<bool>(isFavorite),
       'orientation': serializer.toJson<int>(orientation),
+      'source': serializer.toJson<int>(
+        i1.$TrashedLocalAssetEntityTable.$convertersource.toJson(source),
+      ),
     };
   }
 
@@ -812,6 +865,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
     i0.Value<String?> checksum = const i0.Value.absent(),
     bool? isFavorite,
     int? orientation,
+    i3.TrashOrigin? source,
   }) => i1.TrashedLocalAssetEntityData(
     name: name ?? this.name,
     type: type ?? this.type,
@@ -827,6 +881,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
     checksum: checksum.present ? checksum.value : this.checksum,
     isFavorite: isFavorite ?? this.isFavorite,
     orientation: orientation ?? this.orientation,
+    source: source ?? this.source,
   );
   TrashedLocalAssetEntityData copyWithCompanion(
     i1.TrashedLocalAssetEntityCompanion data,
@@ -850,6 +905,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
       orientation: data.orientation.present
           ? data.orientation.value
           : this.orientation,
+      source: data.source.present ? data.source.value : this.source,
     );
   }
 
@@ -867,7 +923,8 @@ class TrashedLocalAssetEntityData extends i0.DataClass
           ..write('albumId: $albumId, ')
           ..write('checksum: $checksum, ')
           ..write('isFavorite: $isFavorite, ')
-          ..write('orientation: $orientation')
+          ..write('orientation: $orientation, ')
+          ..write('source: $source')
           ..write(')'))
         .toString();
   }
@@ -886,6 +943,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
     checksum,
     isFavorite,
     orientation,
+    source,
   );
   @override
   bool operator ==(Object other) =>
@@ -902,7 +960,8 @@ class TrashedLocalAssetEntityData extends i0.DataClass
           other.albumId == this.albumId &&
           other.checksum == this.checksum &&
           other.isFavorite == this.isFavorite &&
-          other.orientation == this.orientation);
+          other.orientation == this.orientation &&
+          other.source == this.source);
 }
 
 class TrashedLocalAssetEntityCompanion
@@ -919,6 +978,7 @@ class TrashedLocalAssetEntityCompanion
   final i0.Value<String?> checksum;
   final i0.Value<bool> isFavorite;
   final i0.Value<int> orientation;
+  final i0.Value<i3.TrashOrigin> source;
   const TrashedLocalAssetEntityCompanion({
     this.name = const i0.Value.absent(),
     this.type = const i0.Value.absent(),
@@ -932,6 +992,7 @@ class TrashedLocalAssetEntityCompanion
     this.checksum = const i0.Value.absent(),
     this.isFavorite = const i0.Value.absent(),
     this.orientation = const i0.Value.absent(),
+    this.source = const i0.Value.absent(),
   });
   TrashedLocalAssetEntityCompanion.insert({
     required String name,
@@ -946,10 +1007,12 @@ class TrashedLocalAssetEntityCompanion
     this.checksum = const i0.Value.absent(),
     this.isFavorite = const i0.Value.absent(),
     this.orientation = const i0.Value.absent(),
+    required i3.TrashOrigin source,
   }) : name = i0.Value(name),
        type = i0.Value(type),
        id = i0.Value(id),
-       albumId = i0.Value(albumId);
+       albumId = i0.Value(albumId),
+       source = i0.Value(source);
   static i0.Insertable<i1.TrashedLocalAssetEntityData> custom({
     i0.Expression<String>? name,
     i0.Expression<int>? type,
@@ -963,6 +1026,7 @@ class TrashedLocalAssetEntityCompanion
     i0.Expression<String>? checksum,
     i0.Expression<bool>? isFavorite,
     i0.Expression<int>? orientation,
+    i0.Expression<int>? source,
   }) {
     return i0.RawValuesInsertable({
       if (name != null) 'name': name,
@@ -977,6 +1041,7 @@ class TrashedLocalAssetEntityCompanion
       if (checksum != null) 'checksum': checksum,
       if (isFavorite != null) 'is_favorite': isFavorite,
       if (orientation != null) 'orientation': orientation,
+      if (source != null) 'source': source,
     });
   }
 
@@ -993,6 +1058,7 @@ class TrashedLocalAssetEntityCompanion
     i0.Value<String?>? checksum,
     i0.Value<bool>? isFavorite,
     i0.Value<int>? orientation,
+    i0.Value<i3.TrashOrigin>? source,
   }) {
     return i1.TrashedLocalAssetEntityCompanion(
       name: name ?? this.name,
@@ -1007,6 +1073,7 @@ class TrashedLocalAssetEntityCompanion
       checksum: checksum ?? this.checksum,
       isFavorite: isFavorite ?? this.isFavorite,
       orientation: orientation ?? this.orientation,
+      source: source ?? this.source,
     );
   }
 
@@ -1051,6 +1118,11 @@ class TrashedLocalAssetEntityCompanion
     if (orientation.present) {
       map['orientation'] = i0.Variable<int>(orientation.value);
     }
+    if (source.present) {
+      map['source'] = i0.Variable<int>(
+        i1.$TrashedLocalAssetEntityTable.$convertersource.toSql(source.value),
+      );
+    }
     return map;
   }
 
@@ -1068,7 +1140,8 @@ class TrashedLocalAssetEntityCompanion
           ..write('albumId: $albumId, ')
           ..write('checksum: $checksum, ')
           ..write('isFavorite: $isFavorite, ')
-          ..write('orientation: $orientation')
+          ..write('orientation: $orientation, ')
+          ..write('source: $source')
           ..write(')'))
         .toString();
   }

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

@@ -95,7 +95,7 @@ class Drift extends $Drift implements IDatabaseRepository {
   }
 
   @override
-  int get schemaVersion => 14;
+  int get schemaVersion => 15;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -190,6 +190,9 @@ class Drift extends $Drift implements IDatabaseRepository {
             await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.latitude);
             await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.longitude);
           },
+          from14To15: (m, v15) async {
+            await m.addColumn(v15.trashedLocalAssetEntity, v15.trashedLocalAssetEntity.source);
+          },
         ),
       );
 

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

@@ -5941,6 +5941,461 @@ i1.GeneratedColumn<DateTime> _column_96(String aliasedName) =>
       true,
       type: i1.DriftSqlType.dateTime,
     );
+
+final class Schema15 extends i0.VersionedSchema {
+  Schema15({required super.database}) : super(version: 15);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    userEntity,
+    remoteAssetEntity,
+    stackEntity,
+    localAssetEntity,
+    remoteAlbumEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    idxLocalAssetChecksum,
+    idxRemoteAssetOwnerChecksum,
+    uQRemoteAssetsOwnerChecksum,
+    uQRemoteAssetsOwnerLibraryChecksum,
+    idxRemoteAssetChecksum,
+    authUserEntity,
+    userMetadataEntity,
+    partnerEntity,
+    remoteExifEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    personEntity,
+    assetFaceEntity,
+    storeEntity,
+    trashedLocalAssetEntity,
+    idxLatLng,
+    idxTrashedLocalAssetChecksum,
+    idxTrashedLocalAssetAlbum,
+  ];
+  late final Shape20 userEntity = Shape20(
+    source: i0.VersionedTable(
+      entityName: 'user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_3,
+        _column_84,
+        _column_85,
+        _column_91,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape17 remoteAssetEntity = Shape17(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_13,
+        _column_14,
+        _column_15,
+        _column_16,
+        _column_17,
+        _column_18,
+        _column_19,
+        _column_20,
+        _column_21,
+        _column_86,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape3 stackEntity = Shape3(
+    source: i0.VersionedTable(
+      entityName: 'stack_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_0, _column_9, _column_5, _column_15, _column_75],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape24 localAssetEntity = Shape24(
+    source: i0.VersionedTable(
+      entityName: 'local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_22,
+        _column_14,
+        _column_23,
+        _column_96,
+        _column_46,
+        _column_47,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape9 remoteAlbumEntity = Shape9(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_56,
+        _column_9,
+        _column_5,
+        _column_15,
+        _column_57,
+        _column_58,
+        _column_59,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape19 localAlbumEntity = Shape19(
+    source: i0.VersionedTable(
+      entityName: 'local_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_5,
+        _column_31,
+        _column_32,
+        _column_90,
+        _column_33,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape22 localAlbumAssetEntity = Shape22(
+    source: i0.VersionedTable(
+      entityName: 'local_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_34, _column_35, _column_33],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  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 idxRemoteAssetOwnerChecksum = i1.Index(
+    'idx_remote_asset_owner_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
+  );
+  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)',
+  );
+  late final Shape21 authUserEntity = Shape21(
+    source: i0.VersionedTable(
+      entityName: 'auth_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_3,
+        _column_2,
+        _column_84,
+        _column_85,
+        _column_92,
+        _column_93,
+        _column_7,
+        _column_94,
+      ],
+      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_25, _column_26, _column_27],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape5 partnerEntity = Shape5(
+    source: i0.VersionedTable(
+      entityName: 'partner_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
+      columns: [_column_28, _column_29, _column_30],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape8 remoteExifEntity = Shape8(
+    source: i0.VersionedTable(
+      entityName: 'remote_exif_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_36,
+        _column_37,
+        _column_38,
+        _column_39,
+        _column_40,
+        _column_41,
+        _column_11,
+        _column_10,
+        _column_42,
+        _column_43,
+        _column_44,
+        _column_45,
+        _column_46,
+        _column_47,
+        _column_48,
+        _column_49,
+        _column_50,
+        _column_51,
+        _column_52,
+        _column_53,
+        _column_54,
+        _column_55,
+      ],
+      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_36, _column_60],
+      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_60, _column_25, _column_61],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape11 memoryEntity = Shape11(
+    source: i0.VersionedTable(
+      entityName: 'memory_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_9,
+        _column_5,
+        _column_18,
+        _column_15,
+        _column_8,
+        _column_62,
+        _column_63,
+        _column_64,
+        _column_65,
+        _column_66,
+        _column_67,
+      ],
+      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_36, _column_68],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape14 personEntity = Shape14(
+    source: i0.VersionedTable(
+      entityName: 'person_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_9,
+        _column_5,
+        _column_15,
+        _column_1,
+        _column_69,
+        _column_71,
+        _column_72,
+        _column_73,
+        _column_74,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape15 assetFaceEntity = Shape15(
+    source: i0.VersionedTable(
+      entityName: 'asset_face_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_36,
+        _column_76,
+        _column_77,
+        _column_78,
+        _column_79,
+        _column_80,
+        _column_81,
+        _column_82,
+        _column_83,
+      ],
+      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_87, _column_88, _column_89],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape25 trashedLocalAssetEntity = Shape25(
+    source: i0.VersionedTable(
+      entityName: 'trashed_local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id, album_id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_95,
+        _column_22,
+        _column_14,
+        _column_23,
+        _column_97,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  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 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)',
+  );
+}
+
+class Shape25 extends i0.VersionedTable {
+  Shape25({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get name =>
+      columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get type =>
+      columnsByName['type']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<DateTime> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<DateTime> get updatedAt =>
+      columnsByName['updated_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<int> get width =>
+      columnsByName['width']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get height =>
+      columnsByName['height']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get durationInSeconds =>
+      columnsByName['duration_in_seconds']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get albumId =>
+      columnsByName['album_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get checksum =>
+      columnsByName['checksum']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isFavorite =>
+      columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<int> get orientation =>
+      columnsByName['orientation']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get source =>
+      columnsByName['source']! as i1.GeneratedColumn<int>;
+}
+
+i1.GeneratedColumn<int> _column_97(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'source',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.int,
+    );
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -5955,6 +6410,7 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema12 schema) from11To12,
   required Future<void> Function(i1.Migrator m, Schema13 schema) from12To13,
   required Future<void> Function(i1.Migrator m, Schema14 schema) from13To14,
+  required Future<void> Function(i1.Migrator m, Schema15 schema) from14To15,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -6023,6 +6479,11 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from13To14(migrator, schema);
         return 14;
+      case 14:
+        final schema = Schema15(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from14To15(migrator, schema);
+        return 15;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -6043,6 +6504,7 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema12 schema) from11To12,
   required Future<void> Function(i1.Migrator m, Schema13 schema) from12To13,
   required Future<void> Function(i1.Migrator m, Schema14 schema) from13To14,
+  required Future<void> Function(i1.Migrator m, Schema15 schema) from14To15,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -6058,5 +6520,6 @@ i1.OnUpgrade stepByStep({
     from11To12: from11To12,
     from12To13: from12To13,
     from13To14: from13To14,
+    from14To15: from14To15,
   ),
 );

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

@@ -22,6 +22,7 @@ import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart' as api show AssetVisibility, AlbumUserRole, UserMetadataKey;
 import 'package:openapi/api.dart' hide AssetVisibility, AlbumUserRole, UserMetadataKey;
@@ -194,6 +195,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
             livePhotoVideoId: Value(asset.livePhotoVideoId),
             stackId: Value(asset.stackId),
             libraryId: Value(asset.libraryId),
+            width: Value(asset.width),
+            height: Value(asset.height),
           );
 
           batch.insert(
@@ -245,10 +248,21 @@ class SyncStreamRepository extends DriftDatabaseRepository {
 
       await _db.batch((batch) {
         for (final exif in data) {
+          int? width;
+          int? height;
+
+          if (ExifDtoConverter.isOrientationFlipped(exif.orientation)) {
+            width = exif.exifImageHeight;
+            height = exif.exifImageWidth;
+          } else {
+            width = exif.exifImageWidth;
+            height = exif.exifImageHeight;
+          }
+
           batch.update(
             _db.remoteAssetEntity,
-            RemoteAssetEntityCompanion(width: Value(exif.exifImageWidth), height: Value(exif.exifImageHeight)),
-            where: (row) => row.id.equals(exif.assetId),
+            RemoteAssetEntityCompanion(width: Value(width), height: Value(height)),
+            where: (row) => row.id.equals(exif.assetId) & row.width.isNull() & row.height.isNull(),
           );
         }
       });

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

@@ -48,7 +48,8 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
                 _db.remoteAssetEntity.checksum.equalsExp(_db.trashedLocalAssetEntity.checksum),
               ),
             ])..where(
-              _db.trashedLocalAssetEntity.albumId.isInQuery(selectedAlbumIds) &
+              _db.trashedLocalAssetEntity.source.equalsValue(TrashOrigin.remoteSync) &
+                  _db.trashedLocalAssetEntity.albumId.isInQuery(selectedAlbumIds) &
                   _db.remoteAssetEntity.deletedAt.isNull(),
             ))
             .get();
@@ -84,6 +85,7 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
             durationInSeconds: Value(item.asset.durationInSeconds),
             isFavorite: Value(item.asset.isFavorite),
             orientation: Value(item.asset.orientation),
+            source: TrashOrigin.localSync,
           );
 
           batch.insert<$TrashedLocalAssetEntityTable, TrashedLocalAssetEntityData>(
@@ -124,7 +126,7 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
 
   Future<void> trashLocalAsset(Map<String, List<LocalAsset>> assetsByAlbums) async {
     if (assetsByAlbums.isEmpty) {
-      return;
+      return Future.value();
     }
 
     final companions = <TrashedLocalAssetEntityCompanion>[];
@@ -147,6 +149,7 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
             orientation: Value(asset.orientation),
             createdAt: Value(asset.createdAt),
             updatedAt: Value(asset.updatedAt),
+            source: const Value(TrashOrigin.remoteSync),
           ),
         );
       }
@@ -165,7 +168,7 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
 
   Future<void> applyRestoredAssets(List<String> idList) async {
     if (idList.isEmpty) {
-      return;
+      return Future.value();
     }
 
     final trashedAssets = <TrashedLocalAssetEntityData>[];
@@ -205,6 +208,58 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
     });
   }
 
+  Future<void> applyTrashedAssets(List<String> idList) async {
+    if (idList.isEmpty) {
+      return Future.value();
+    }
+
+    final trashedAssets = <({LocalAssetEntityData asset, String albumId})>[];
+
+    for (final slice in idList.slices(kDriftMaxChunk)) {
+      final rows = await (_db.select(_db.localAlbumAssetEntity).join([
+        innerJoin(_db.localAssetEntity, _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id)),
+      ])..where(_db.localAlbumAssetEntity.assetId.isIn(slice))).get();
+
+      final assetsWithAlbum = rows.map(
+        (row) =>
+            (albumId: row.readTable(_db.localAlbumAssetEntity).albumId, asset: row.readTable(_db.localAssetEntity)),
+      );
+
+      trashedAssets.addAll(assetsWithAlbum);
+    }
+
+    if (trashedAssets.isEmpty) {
+      return;
+    }
+
+    final companions = trashedAssets.map((e) {
+      return TrashedLocalAssetEntityCompanion.insert(
+        id: e.asset.id,
+        name: e.asset.name,
+        type: e.asset.type,
+        createdAt: Value(e.asset.createdAt),
+        updatedAt: Value(e.asset.updatedAt),
+        width: Value(e.asset.width),
+        height: Value(e.asset.height),
+        durationInSeconds: Value(e.asset.durationInSeconds),
+        checksum: Value(e.asset.checksum),
+        isFavorite: Value(e.asset.isFavorite),
+        orientation: Value(e.asset.orientation),
+        source: TrashOrigin.localUser,
+        albumId: e.albumId,
+      );
+    });
+
+    await _db.transaction(() async {
+      for (final companion in companions) {
+        await _db.into(_db.trashedLocalAssetEntity).insertOnConflictUpdate(companion);
+      }
+      for (final slice in idList.slices(kDriftMaxChunk)) {
+        await (_db.delete(_db.localAssetEntity)..where((t) => t.id.isIn(slice))).go();
+      }
+    });
+  }
+
   Future<Map<String, List<LocalAsset>>> getToTrash() async {
     final result = <String, List<LocalAsset>>{};
 

mobile/lib/main.dart

@@ -42,6 +42,7 @@ import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:immich_mobile/utils/licenses.dart';
 import 'package:immich_mobile/utils/migration.dart';
 import 'package:immich_mobile/wm_executor.dart';
+import 'package:immich_ui/immich_ui.dart';
 import 'package:intl/date_symbol_data_local.dart';
 import 'package:logging/logging.dart';
 import 'package:timezone/data/latest.dart';
@@ -252,6 +253,13 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
         themeMode: ref.watch(immichThemeModeProvider),
         darkTheme: getThemeData(colorScheme: immichTheme.dark, locale: context.locale),
         theme: getThemeData(colorScheme: immichTheme.light, locale: context.locale),
+        builder: (context, child) => ImmichTranslationProvider(
+          translations: ImmichTranslations(
+            submit: "submit".t(context: context),
+            password: "password".t(context: context),
+          ),
+          child: ImmichThemeProvider(colorScheme: context.colorScheme, child: child!),
+        ),
         routerConfig: router.config(
           deepLinkBuilder: _deepLinkBuilder,
           navigatorObservers: () => [AppNavigationObserver(ref: ref)],

mobile/lib/pages/search/map/map.page.dart

@@ -370,6 +370,7 @@ class _MapWithMarker extends StatelessWidget {
                   ? PositionedAssetMarkerIcon(
                       point: value.point,
                       assetRemoteId: value.marker.assetRemoteId,
+                      assetThumbhash: '',
                       durationInMilliseconds: value.shouldAnimate ? 100 : 0,
                       onTap: onMarkerTapped,
                     )

mobile/lib/presentation/pages/dev/ui_showcase.page.dart

@@ -19,6 +19,17 @@ List<Widget> _showcaseBuilder(Function(ImmichVariant variant, ImmichColor color)
   return children;
 }
 
+class _ComponentTitle extends StatelessWidget {
+  final String title;
+
+  const _ComponentTitle(this.title);
+
+  @override
+  Widget build(BuildContext context) {
+    return Text(title, style: context.textTheme.titleLarge);
+  }
+}
+
 @RoutePage()
 class ImmichUIShowcasePage extends StatelessWidget {
   const ImmichUIShowcasePage({super.key});
@@ -35,13 +46,51 @@ class ImmichUIShowcasePage extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Text("IconButton", style: context.textTheme.titleLarge),
+              const _ComponentTitle("IconButton"),
               ..._showcaseBuilder(
                 (variant, color) =>
-                    ImmichIconButton(icon: Icons.favorite, color: color, variant: variant, onTap: () {}),
+                    ImmichIconButton(icon: Icons.favorite, color: color, variant: variant, onPressed: () {}),
+              ),
+              const _ComponentTitle("CloseButton"),
+              ..._showcaseBuilder(
+                (variant, color) => ImmichCloseButton(color: color, variant: variant, onPressed: () {}),
+              ),
+              const _ComponentTitle("TextButton"),
+
+              ImmichTextButton(
+                labelText: "Text Button",
+                onPressed: () {},
+                variant: ImmichVariant.filled,
+                color: ImmichColor.primary,
+              ),
+              ImmichTextButton(
+                labelText: "Text Button",
+                onPressed: () {},
+                variant: ImmichVariant.filled,
+                color: ImmichColor.primary,
+                loading: true,
+              ),
+              ImmichTextButton(
+                labelText: "Text Button",
+                onPressed: () {},
+                variant: ImmichVariant.ghost,
+                color: ImmichColor.primary,
+              ),
+              ImmichTextButton(
+                labelText: "Text Button",
+                onPressed: () {},
+                variant: ImmichVariant.ghost,
+                color: ImmichColor.primary,
+                loading: true,
+              ),
+              const _ComponentTitle("Form"),
+              ImmichForm(
+                onSubmit: () {},
+                child: const Column(
+                  spacing: 10,
+                  children: [ImmichTextInput(label: "Title", hintText: "Enter a title")],
+                ),
               ),
-              Text("CloseButton", style: context.textTheme.titleLarge),
-              ..._showcaseBuilder((variant, color) => ImmichCloseButton(color: color, variant: variant, onTap: () {})),
             ],
           ),
         ),

mobile/lib/presentation/pages/editing/drift_crop.page.dart

@@ -37,7 +37,7 @@ class DriftCropImagePage extends HookWidget {
             icon: Icons.done_rounded,
             color: ImmichColor.primary,
             variant: ImmichVariant.ghost,
-            onTap: () async {
+            onPressed: () async {
               final croppedImage = await cropController.croppedImage();
               unawaited(context.pushRoute(DriftEditImageRoute(asset: asset, image: croppedImage, isEdited: true)));
             },
@@ -79,13 +79,13 @@ class DriftCropImagePage extends HookWidget {
                                   icon: Icons.rotate_left,
                                   variant: ImmichVariant.ghost,
                                   color: ImmichColor.secondary,
-                                  onTap: () => cropController.rotateLeft(),
+                                  onPressed: () => cropController.rotateLeft(),
                                 ),
                                 ImmichIconButton(
                                   icon: Icons.rotate_right,
                                   variant: ImmichVariant.ghost,
                                   color: ImmichColor.secondary,
-                                  onTap: () => cropController.rotateRight(),
+                                  onPressed: () => cropController.rotateRight(),
                                 ),
                               ],
                             ),

mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart

@@ -611,6 +611,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       filterQuality: FilterQuality.high,
       maxScale: 1.0,
       basePosition: Alignment.center,
+      disableScaleGestures: true,
       child: SizedBox(
         width: ctx.width,
         height: ctx.height,

mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/sheet_location_details.widget.dart

@@ -64,11 +64,10 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
     final hasCoordinates = exifInfo?.hasCoordinates ?? false;
 
     // Guard local assets
-    if (asset != null && asset is LocalAsset && asset.hasRemote) {
+    if (asset is! RemoteAsset) {
       return const SizedBox.shrink();
     }
 
-    final remoteId = asset is LocalAsset ? asset.remoteId : (asset as RemoteAsset).id;
     final locationName = _getLocationName(exifInfo);
     final coordinates = "${exifInfo?.latitude?.toStringAsFixed(4)}, ${exifInfo?.longitude?.toStringAsFixed(4)}";
 
@@ -92,7 +91,12 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  ExifMap(exifInfo: exifInfo!, markerId: remoteId, onMapCreated: _onMapCreated),
+                  ExifMap(
+                    exifInfo: exifInfo!,
+                    markerId: asset.id,
+                    markerAssetThumbhash: asset.thumbHash,
+                    onMapCreated: _onMapCreated,
+                  ),
                   const SizedBox(height: 16),
                   if (locationName != null)
                     Padding(

mobile/lib/presentation/widgets/images/remote_image_provider.dart

@@ -10,6 +10,7 @@ import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_
 import 'package:immich_mobile/providers/image/cache/remote_image_cache_manager.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
+import 'package:openapi/api.dart';
 
 class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
     with CancellableImageProviderMixin<RemoteThumbProvider> {
@@ -93,7 +94,7 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
 
     final headers = ApiService.getRequestHeaders();
     final request = this.request = RemoteImageRequest(
-      uri: getPreviewUrlForRemoteId(key.assetId),
+      uri: getThumbnailUrlForRemoteId(key.assetId, type: AssetMediaSize.preview),
       headers: headers,
       cacheManager: cacheManager,
     );

mobile/lib/repositories/local_files_manager.repository.dart

@@ -10,7 +10,7 @@ final localFilesManagerRepositoryProvider = Provider(
 class LocalFilesManagerRepository {
   LocalFilesManagerRepository(this._service);
 
-  final Logger _logger = Logger('SyncStreamService');
+  final Logger _logger = Logger('LocalFilesManagerRepo');
   final LocalFilesManagerService _service;
 
   Future<bool> moveToTrash(List<String> mediaUrls) async {
@@ -38,8 +38,10 @@ class LocalFilesManagerRepository {
     for (final asset in assets) {
       _logger.info("Restoring from trash, localId: ${asset.id}, remoteId: ${asset.checksum}");
       try {
-        await _service.restoreFromTrashById(asset.id, asset.type.index);
-        restoredIds.add(asset.id);
+        final result = await _service.restoreFromTrashById(asset.id, asset.type.index);
+        if (result) {
+          restoredIds.add(asset.id);
+        }
       } catch (e) {
         _logger.warning("Restoring failure: $e");
       }

mobile/lib/services/action.service.dart

@@ -5,9 +5,13 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
@@ -28,6 +32,7 @@ final actionServiceProvider = Provider<ActionService>(
     ref.watch(localAssetRepository),
     ref.watch(driftAlbumApiRepositoryProvider),
     ref.watch(remoteAlbumRepository),
+    ref.watch(trashedLocalAssetRepository),
     ref.watch(assetMediaRepositoryProvider),
     ref.watch(downloadRepositoryProvider),
   ),
@@ -39,6 +44,7 @@ class ActionService {
   final DriftLocalAssetRepository _localAssetRepository;
   final DriftAlbumApiRepository _albumApiRepository;
   final DriftRemoteAlbumRepository _remoteAlbumRepository;
+  final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
   final AssetMediaRepository _assetMediaRepository;
   final DownloadRepository _downloadRepository;
 
@@ -48,6 +54,7 @@ class ActionService {
     this._localAssetRepository,
     this._albumApiRepository,
     this._remoteAlbumRepository,
+    this._trashedLocalAssetRepository,
     this._assetMediaRepository,
     this._downloadRepository,
   );
@@ -82,11 +89,7 @@ class ActionService {
 
     // Ask user if they want to delete local copies
     if (localIds.isNotEmpty) {
-      final deletedIds = await _assetMediaRepository.deleteAll(localIds);
-
-      if (deletedIds.isNotEmpty) {
-        await _localAssetRepository.delete(deletedIds);
-      }
+      await _deleteLocalAssets(localIds);
     }
   }
 
@@ -110,11 +113,7 @@ class ActionService {
     await _remoteAssetRepository.trash(remoteIds);
 
     if (localIds.isNotEmpty) {
-      final deletedIds = await _assetMediaRepository.deleteAll(localIds);
-
-      if (deletedIds.isNotEmpty) {
-        await _localAssetRepository.delete(deletedIds);
-      }
+      await _deleteLocalAssets(localIds);
     }
   }
 
@@ -123,22 +122,12 @@ class ActionService {
     await _remoteAssetRepository.delete(remoteIds);
 
     if (localIds.isNotEmpty) {
-      final deletedIds = await _assetMediaRepository.deleteAll(localIds);
-
-      if (deletedIds.isNotEmpty) {
-        await _localAssetRepository.delete(deletedIds);
-      }
+      await _deleteLocalAssets(localIds);
     }
   }
 
   Future<int> deleteLocal(List<String> localIds) async {
-    final deletedIds = await _assetMediaRepository.deleteAll(localIds);
-    if (deletedIds.isNotEmpty) {
-      await _localAssetRepository.delete(deletedIds);
-      return deletedIds.length;
-    }
-
-    return 0;
+    return await _deleteLocalAssets(localIds);
   }
 
   Future<bool> editLocation(List<String> remoteIds, BuildContext context) async {
@@ -242,4 +231,17 @@ class ActionService {
   Future<List<bool>> downloadAll(List<RemoteAsset> assets) {
     return _downloadRepository.downloadAllAssets(assets);
   }
+
+  Future<int> _deleteLocalAssets(List<String> localIds) async {
+    final deletedIds = await _assetMediaRepository.deleteAll(localIds);
+    if (deletedIds.isEmpty) {
+      return 0;
+    }
+    if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
+      await _trashedLocalAssetRepository.applyTrashedAssets(deletedIds);
+    } else {
+      await _localAssetRepository.delete(deletedIds);
+    }
+    return deletedIds.length;
+  }
 }

mobile/lib/utils/image_url_builder.dart

@@ -1,4 +1,3 @@
-import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
@@ -10,14 +9,18 @@ String getThumbnailUrl(final Asset asset, {AssetMediaSize type = AssetMediaSize.
 }
 
 String getThumbnailCacheKey(final Asset asset, {AssetMediaSize type = AssetMediaSize.thumbnail}) {
-  return getThumbnailCacheKeyForRemoteId(asset.remoteId!, type: type);
+  return getThumbnailCacheKeyForRemoteId(asset.remoteId!, asset.thumbhash!, type: type);
 }
 
-String getThumbnailCacheKeyForRemoteId(final String id, {AssetMediaSize type = AssetMediaSize.thumbnail}) {
+String getThumbnailCacheKeyForRemoteId(
+  final String id,
+  final String thumbhash, {
+  AssetMediaSize type = AssetMediaSize.thumbnail,
+}) {
   if (type == AssetMediaSize.thumbnail) {
-    return 'thumbnail-image-$id';
+    return 'thumbnail-image-$id-$thumbhash';
   } else {
-    return '${id}_previewStage';
+    return '${id}_${thumbhash}_previewStage';
   }
 }
 
@@ -32,26 +35,25 @@ String getAlbumThumbNailCacheKey(final Album album, {AssetMediaSize type = Asset
   if (album.thumbnail.value?.remoteId == null) {
     return '';
   }
-  return getThumbnailCacheKeyForRemoteId(album.thumbnail.value!.remoteId!, type: type);
+  return getThumbnailCacheKeyForRemoteId(
+    album.thumbnail.value!.remoteId!,
+    album.thumbnail.value!.thumbhash!,
+    type: type,
+  );
 }
 
-String getOriginalUrlForRemoteId(final String id) {
-  return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/original';
+String getOriginalUrlForRemoteId(final String id, {bool edited = true}) {
+  return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/original?edited=$edited';
 }
 
-String getImageCacheKey(final Asset asset) {
-  // Assets from response DTOs do not have an isar id, querying which would give us the default autoIncrement id
-  final isFromDto = asset.id == noDbId;
-  return '${isFromDto ? asset.remoteId : asset.id}_fullStage';
+String getThumbnailUrlForRemoteId(
+  final String id, {
+  AssetMediaSize type = AssetMediaSize.thumbnail,
+  bool edited = true,
+}) {
+  return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${type.value}&edited=$edited';
 }
 
-String getThumbnailUrlForRemoteId(final String id, {AssetMediaSize type = AssetMediaSize.thumbnail}) {
-  return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${type.value}';
-}
-
-String getPreviewUrlForRemoteId(final String id) =>
-    '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${AssetMediaSize.preview}';
-
 String getPlaybackUrlForRemoteId(final String id) {
   return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/video/playback?';
 }

mobile/lib/widgets/asset_viewer/detail_panel/asset_location.dart

@@ -74,7 +74,7 @@ class AssetLocation extends HookConsumerWidget {
             ],
           ),
           asset.isRemote ? const SizedBox.shrink() : const SizedBox(height: 16),
-          ExifMap(exifInfo: exifInfo!, markerId: asset.remoteId),
+          ExifMap(exifInfo: exifInfo!, markerId: asset.remoteId, markerAssetThumbhash: asset.thumbhash),
           const SizedBox(height: 16),
           getLocationName(),
           Text(

mobile/lib/widgets/asset_viewer/detail_panel/exif_map.dart

@@ -10,10 +10,20 @@ import 'package:url_launcher/url_launcher.dart';
 
 class ExifMap extends StatelessWidget {
   final ExifInfo exifInfo;
+  // TODO: Pass in a BaseAsset instead of the ID and thumbhash when removing old timeline
+  // This is currently structured this way because of the old timeline implementation
+  // reusing this component
   final String? markerId;
+  final String? markerAssetThumbhash;
   final MapCreatedCallback? onMapCreated;
 
-  const ExifMap({super.key, required this.exifInfo, this.markerId = 'marker', this.onMapCreated});
+  const ExifMap({
+    super.key,
+    required this.exifInfo,
+    this.markerAssetThumbhash,
+    this.markerId = 'marker',
+    this.onMapCreated,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -61,6 +71,7 @@ class ExifMap extends StatelessWidget {
           width: constraints.maxWidth,
           zoom: 12.0,
           assetMarkerRemoteId: markerId,
+          assetThumbhash: markerAssetThumbhash,
           onTap: (tapPosition, latLong) async {
             Uri? uri = await createCoordinatesUri();
 

mobile/lib/widgets/forms/login/login_form.dart

@@ -14,6 +14,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
@@ -29,12 +30,7 @@ import 'package:immich_mobile/utils/version_compatibility.dart';
 import 'package:immich_mobile/widgets/common/immich_logo.dart';
 import 'package:immich_mobile/widgets/common/immich_title_text.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
-import 'package:immich_mobile/widgets/forms/login/email_input.dart';
-import 'package:immich_mobile/widgets/forms/login/loading_icon.dart';
-import 'package:immich_mobile/widgets/forms/login/login_button.dart';
-import 'package:immich_mobile/widgets/forms/login/o_auth_login_button.dart';
-import 'package:immich_mobile/widgets/forms/login/password_input.dart';
-import 'package:immich_mobile/widgets/forms/login/server_endpoint_input.dart';
+import 'package:immich_ui/immich_ui.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -45,16 +41,33 @@ class LoginForm extends HookConsumerWidget {
 
   final log = Logger('LoginForm');
 
+  String? _validateUrl(String? url) {
+    if (url == null || url.isEmpty) return null;
+
+    final parsedUrl = Uri.tryParse(url);
+    if (parsedUrl == null || !parsedUrl.isAbsolute || !parsedUrl.scheme.startsWith("http") || parsedUrl.host.isEmpty) {
+      return 'login_form_err_invalid_url'.tr();
+    }
+
+    return null;
+  }
+
+  String? _validateEmail(String? email) {
+    if (email == null || email == '') return null;
+    if (email.endsWith(' ')) return 'login_form_err_trailing_whitespace'.tr();
+    if (email.startsWith(' ')) return 'login_form_err_leading_whitespace'.tr();
+    if (email.contains(' ') || !email.contains('@')) {
+      return 'login_form_err_invalid_email'.tr();
+    }
+    return null;
+  }
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final emailController = useTextEditingController.fromValue(TextEditingValue.empty);
     final passwordController = useTextEditingController.fromValue(TextEditingValue.empty);
     final serverEndpointController = useTextEditingController.fromValue(TextEditingValue.empty);
-    final emailFocusNode = useFocusNode();
     final passwordFocusNode = useFocusNode();
-    final serverEndpointFocusNode = useFocusNode();
-    final isLoading = useState<bool>(false);
-    final isLoadingServer = useState<bool>(false);
     final isOauthEnable = useState<bool>(false);
     final isPasswordLoginEnable = useState<bool>(false);
     final oAuthButtonLabel = useState<String>('OAuth');
@@ -96,7 +109,6 @@ class LoginForm extends HookConsumerWidget {
       }
 
       try {
-        isLoadingServer.value = true;
         final endpoint = await ref.read(authProvider.notifier).validateServerUrl(serverUrl);
 
         // Fetch and load server config and features
@@ -120,7 +132,6 @@ class LoginForm extends HookConsumerWidget {
         );
         isOauthEnable.value = false;
         isPasswordLoginEnable.value = true;
-        isLoadingServer.value = false;
       } on HandshakeException {
         ImmichToast.show(
           context: context,
@@ -130,7 +141,6 @@ class LoginForm extends HookConsumerWidget {
         );
         isOauthEnable.value = false;
         isPasswordLoginEnable.value = true;
-        isLoadingServer.value = false;
       } catch (e) {
         ImmichToast.show(
           context: context,
@@ -140,10 +150,7 @@ class LoginForm extends HookConsumerWidget {
         );
         isOauthEnable.value = false;
         isPasswordLoginEnable.value = true;
-        isLoadingServer.value = false;
       }
-
-      isLoadingServer.value = false;
     }
 
     useEffect(() {
@@ -230,8 +237,6 @@ class LoginForm extends HookConsumerWidget {
     login() async {
       TextInput.finishAutofillContext();
 
-      isLoading.value = true;
-
       // Invalidate all api repository provider instance to take into account new access token
       invalidateAllApiRepositoryProviders(ref);
 
@@ -261,8 +266,6 @@ class LoginForm extends HookConsumerWidget {
           toastType: ToastType.error,
           gravity: ToastGravity.TOP,
         );
-      } finally {
-        isLoading.value = false;
       }
     }
 
@@ -306,8 +309,6 @@ class LoginForm extends HookConsumerWidget {
           codeChallenge,
         );
 
-        isLoading.value = true;
-
         // Invalidate all api repository provider instance to take into account new access token
         invalidateAllApiRepositoryProviders(ref);
       } catch (error, stack) {
@@ -319,7 +320,6 @@ class LoginForm extends HookConsumerWidget {
           toastType: ToastType.error,
           gravity: ToastGravity.TOP,
         );
-        isLoading.value = false;
         return;
       }
 
@@ -338,7 +338,6 @@ class LoginForm extends HookConsumerWidget {
               .saveAuthInfo(accessToken: loginResponseDto.accessToken);
 
           if (isSuccess) {
-            isLoading.value = false;
             final permission = ref.watch(galleryPermissionNotifier);
             final isBeta = Store.isBetaTimelineEnabled;
             if (!isBeta && (permission.isGranted || permission.isLimited)) {
@@ -364,9 +363,7 @@ class LoginForm extends HookConsumerWidget {
             toastType: ToastType.error,
             gravity: ToastGravity.TOP,
           );
-        } finally {
-          isLoading.value = false;
-        }
+        } finally {}
       } else {
         ImmichToast.show(
           context: context,
@@ -374,66 +371,10 @@ class LoginForm extends HookConsumerWidget {
           toastType: ToastType.info,
           gravity: ToastGravity.TOP,
         );
-        isLoading.value = false;
         return;
       }
     }
 
-    buildSelectServer() {
-      const buttonRadius = 25.0;
-      return Column(
-        crossAxisAlignment: CrossAxisAlignment.stretch,
-        children: [
-          ServerEndpointInput(
-            controller: serverEndpointController,
-            focusNode: serverEndpointFocusNode,
-            onSubmit: getServerAuthSettings,
-          ),
-          const SizedBox(height: 18),
-          Row(
-            children: [
-              Expanded(
-                child: ElevatedButton.icon(
-                  style: ElevatedButton.styleFrom(
-                    padding: const EdgeInsets.symmetric(vertical: 12),
-                    shape: const RoundedRectangleBorder(
-                      borderRadius: BorderRadius.only(
-                        topLeft: Radius.circular(buttonRadius),
-                        bottomLeft: Radius.circular(buttonRadius),
-                      ),
-                    ),
-                  ),
-                  onPressed: () => context.pushRoute(const SettingsRoute()),
-                  icon: const Icon(Icons.settings_rounded),
-                  label: const Text(""),
-                ),
-              ),
-              const SizedBox(width: 1),
-              Expanded(
-                flex: 3,
-                child: ElevatedButton.icon(
-                  style: ElevatedButton.styleFrom(
-                    padding: const EdgeInsets.symmetric(vertical: 12),
-                    shape: const RoundedRectangleBorder(
-                      borderRadius: BorderRadius.only(
-                        topRight: Radius.circular(buttonRadius),
-                        bottomRight: Radius.circular(buttonRadius),
-                      ),
-                    ),
-                  ),
-                  onPressed: isLoadingServer.value ? null : getServerAuthSettings,
-                  icon: const Icon(Icons.arrow_forward_rounded),
-                  label: const Text('next', style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold)).tr(),
-                ),
-              ),
-            ],
-          ),
-          const SizedBox(height: 18),
-          if (isLoadingServer.value) const LoadingIcon(),
-        ],
-      );
-    }
-
     buildVersionCompatWarning() {
       checkVersionMismatch();
 
@@ -455,66 +396,102 @@ class LoginForm extends HookConsumerWidget {
       );
     }
 
-    buildLogin() {
-      return AutofillGroup(
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            buildVersionCompatWarning(),
-            Text(
-              sanitizeUrl(serverEndpointController.text),
-              style: context.textTheme.displaySmall,
-              textAlign: TextAlign.center,
+    final serverSelectionOrLogin = serverEndpoint.value == null
+        ? Padding(
+            padding: const EdgeInsets.only(top: ImmichSpacing.md),
+            child: Column(
+              mainAxisSize: MainAxisSize.max,
+              children: [
+                ImmichForm(
+                  submitText: 'next'.t(context: context),
+                  submitIcon: Icons.arrow_forward_rounded,
+                  onSubmit: getServerAuthSettings,
+                  child: ImmichTextInput(
+                    controller: serverEndpointController,
+                    label: 'login_form_endpoint_url'.t(context: context),
+                    hintText: 'login_form_endpoint_hint'.t(context: context),
+                    validator: _validateUrl,
+                    keyboardAction: TextInputAction.next,
+                    keyboardType: TextInputType.url,
+                    autofillHints: const [AutofillHints.url],
+                    onSubmit: (ctx, _) => ImmichForm.of(ctx).submit(),
+                  ),
+                ),
+                ImmichTextButton(
+                  labelText: 'settings'.t(context: context),
+                  icon: Icons.settings,
+                  variant: ImmichVariant.ghost,
+                  onPressed: () => context.pushRoute(const SettingsRoute()),
+                ),
+              ],
             ),
-            if (isPasswordLoginEnable.value) ...[
-              const SizedBox(height: 18),
-              EmailInput(
-                controller: emailController,
-                focusNode: emailFocusNode,
-                onSubmit: passwordFocusNode.requestFocus,
-              ),
-              const SizedBox(height: 8),
-              PasswordInput(controller: passwordController, focusNode: passwordFocusNode, onSubmit: login),
-            ],
-
-            // Note: This used to have an AnimatedSwitcher, but was removed
-            // because of https://github.com/flutter/flutter/issues/120874
-            isLoading.value
-                ? const LoadingIcon()
-                : Column(
-                    crossAxisAlignment: CrossAxisAlignment.stretch,
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      const SizedBox(height: 18),
-                      if (isPasswordLoginEnable.value) LoginButton(onPressed: login),
-                      if (isOauthEnable.value) ...[
-                        if (isPasswordLoginEnable.value)
-                          Padding(
-                            padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                            child: Divider(color: context.isDarkTheme ? Colors.white : Colors.black),
-                          ),
-                        OAuthLoginButton(
-                          serverEndpointController: serverEndpointController,
-                          buttonLabel: oAuthButtonLabel.value,
-                          isLoading: isLoading,
-                          onPressed: oAuthLogin,
+          )
+        : AutofillGroup(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              mainAxisSize: MainAxisSize.max,
+              children: [
+                buildVersionCompatWarning(),
+                Padding(
+                  padding: const EdgeInsets.only(bottom: ImmichSpacing.md),
+                  child: Text(
+                    sanitizeUrl(serverEndpointController.text),
+                    style: context.textTheme.displaySmall,
+                    textAlign: TextAlign.center,
+                  ),
+                ),
+                if (isPasswordLoginEnable.value)
+                  ImmichForm(
+                    submitText: 'login'.t(context: context),
+                    submitIcon: Icons.login_rounded,
+                    onSubmit: login,
+                    child: Column(
+                      spacing: ImmichSpacing.md,
+                      children: [
+                        ImmichTextInput(
+                          controller: emailController,
+                          label: 'email'.t(context: context),
+                          hintText: 'login_form_email_hint'.t(context: context),
+                          validator: _validateEmail,
+                          keyboardAction: TextInputAction.next,
+                          keyboardType: TextInputType.emailAddress,
+                          autofillHints: const [AutofillHints.email],
+                          onSubmit: (_, _) => passwordFocusNode.requestFocus(),
+                        ),
+                        ImmichPasswordInput(
+                          controller: passwordController,
+                          focusNode: passwordFocusNode,
+                          label: 'password'.t(context: context),
+                          hintText: 'login_form_password_hint'.t(context: context),
+                          keyboardAction: TextInputAction.go,
+                          onSubmit: (ctx, _) => ImmichForm.of(ctx).submit(),
                         ),
                       ],
-                    ],
+                    ),
                   ),
-            if (!isOauthEnable.value && !isPasswordLoginEnable.value) Center(child: const Text('login_disabled').tr()),
-            const SizedBox(height: 12),
-            TextButton.icon(
-              icon: const Icon(Icons.arrow_back),
-              onPressed: () => serverEndpoint.value = null,
-              label: const Text('back').tr(),
+                if (isOauthEnable.value)
+                  ImmichForm(
+                    submitText: oAuthButtonLabel.value,
+                    submitIcon: Icons.pin_outlined,
+                    onSubmit: oAuthLogin,
+                    child: isPasswordLoginEnable.value
+                        ? Padding(
+                            padding: const EdgeInsets.only(left: 18.0, right: 18.0, top: 12.0),
+                            child: Divider(color: context.isDarkTheme ? Colors.white : Colors.black, height: 5),
+                          )
+                        : const SizedBox.shrink(),
+                  ),
+                if (!isOauthEnable.value && !isPasswordLoginEnable.value)
+                  Center(child: const Text('login_disabled').tr()),
+                ImmichTextButton(
+                  labelText: 'back'.t(context: context),
+                  icon: Icons.arrow_back,
+                  variant: ImmichVariant.ghost,
+                  onPressed: () => serverEndpoint.value = null,
+                ),
+              ],
             ),
-          ],
-        ),
-      );
-    }
-
-    final serverSelectionOrLogin = serverEndpoint.value == null ? buildSelectServer() : buildLogin();
+          );
 
     return LayoutBuilder(
       builder: (context, constraints) {

mobile/lib/widgets/forms/login/o_auth_login_button.dart

@@ -1,31 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-
-class OAuthLoginButton extends ConsumerWidget {
-  final TextEditingController serverEndpointController;
-  final ValueNotifier<bool> isLoading;
-  final String buttonLabel;
-  final Function() onPressed;
-
-  const OAuthLoginButton({
-    super.key,
-    required this.serverEndpointController,
-    required this.isLoading,
-    required this.buttonLabel,
-    required this.onPressed,
-  });
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return ElevatedButton.icon(
-      style: ElevatedButton.styleFrom(
-        backgroundColor: context.primaryColor.withAlpha(230),
-        padding: const EdgeInsets.symmetric(vertical: 12),
-      ),
-      onPressed: onPressed,
-      icon: const Icon(Icons.pin_rounded),
-      label: Text(buttonLabel, style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
-    );
-  }
-}

mobile/lib/widgets/forms/login/password_input.dart

@@ -1,37 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-
-class PasswordInput extends HookConsumerWidget {
-  final TextEditingController controller;
-  final FocusNode? focusNode;
-  final Function()? onSubmit;
-
-  const PasswordInput({super.key, required this.controller, this.focusNode, this.onSubmit});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final isPasswordVisible = useState<bool>(false);
-
-    return TextFormField(
-      obscureText: !isPasswordVisible.value,
-      controller: controller,
-      decoration: InputDecoration(
-        labelText: 'password'.tr(),
-        border: const OutlineInputBorder(),
-        hintText: 'login_form_password_hint'.tr(),
-        hintStyle: const TextStyle(fontWeight: FontWeight.normal, fontSize: 14),
-        suffixIcon: IconButton(
-          onPressed: () => isPasswordVisible.value = !isPasswordVisible.value,
-          icon: Icon(isPasswordVisible.value ? Icons.visibility_off_sharp : Icons.visibility_sharp),
-        ),
-      ),
-      autofillHints: const [AutofillHints.password],
-      keyboardType: TextInputType.text,
-      onFieldSubmitted: (_) => onSubmit?.call(),
-      focusNode: focusNode,
-      textInputAction: TextInputAction.go,
-    );
-  }
-}

mobile/lib/widgets/forms/login/server_endpoint_input.dart

@@ -1,46 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/utils/url_helper.dart';
-
-class ServerEndpointInput extends StatelessWidget {
-  final TextEditingController controller;
-  final FocusNode focusNode;
-  final Function()? onSubmit;
-
-  const ServerEndpointInput({super.key, required this.controller, required this.focusNode, this.onSubmit});
-
-  String? _validateInput(String? url) {
-    if (url == null || url.isEmpty) return null;
-
-    final parsedUrl = Uri.tryParse(sanitizeUrl(url));
-    if (parsedUrl == null || !parsedUrl.isAbsolute || !parsedUrl.scheme.startsWith("http") || parsedUrl.host.isEmpty) {
-      return 'login_form_err_invalid_url'.tr();
-    }
-
-    return null;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(top: 16.0),
-      child: TextFormField(
-        controller: controller,
-        decoration: InputDecoration(
-          labelText: 'login_form_endpoint_url'.tr(),
-          border: const OutlineInputBorder(),
-          hintText: 'login_form_endpoint_hint'.tr(),
-          errorMaxLines: 4,
-        ),
-        validator: _validateInput,
-        autovalidateMode: AutovalidateMode.always,
-        focusNode: focusNode,
-        autofillHints: const [AutofillHints.url],
-        keyboardType: TextInputType.url,
-        autocorrect: false,
-        onFieldSubmitted: (_) => onSubmit?.call(),
-        textInputAction: TextInputAction.go,
-      ),
-    );
-  }
-}

mobile/lib/widgets/map/map_thumbnail.dart

@@ -19,6 +19,7 @@ class MapThumbnail extends HookConsumerWidget {
   final Function(Point<double>, LatLng)? onTap;
   final LatLng centre;
   final String? assetMarkerRemoteId;
+  final String? assetThumbhash;
   final bool showMarkerPin;
   final double zoom;
   final double height;
@@ -35,6 +36,7 @@ class MapThumbnail extends HookConsumerWidget {
     this.onTap,
     this.zoom = 8,
     this.assetMarkerRemoteId,
+    this.assetThumbhash,
     this.showMarkerPin = false,
     this.themeMode,
     this.showAttribution = true,
@@ -109,8 +111,13 @@ class MapThumbnail extends HookConsumerWidget {
               ),
               ValueListenableBuilder(
                 valueListenable: position,
-                builder: (_, value, __) => value != null && assetMarkerRemoteId != null
-                    ? PositionedAssetMarkerIcon(size: height / 2, point: value, assetRemoteId: assetMarkerRemoteId!)
+                builder: (_, value, __) => value != null && assetMarkerRemoteId != null && assetThumbhash != null
+                    ? PositionedAssetMarkerIcon(
+                        size: height / 2,
+                        point: value,
+                        assetRemoteId: assetMarkerRemoteId!,
+                        assetThumbhash: assetThumbhash!,
+                      )
                     : const SizedBox.shrink(),
               ),
             ],

mobile/lib/widgets/map/positioned_asset_marker_icon.dart

@@ -10,6 +10,7 @@ import 'package:immich_mobile/utils/image_url_builder.dart';
 class PositionedAssetMarkerIcon extends StatelessWidget {
   final Point<num> point;
   final String assetRemoteId;
+  final String assetThumbhash;
   final double size;
   final int durationInMilliseconds;
 
@@ -18,6 +19,7 @@ class PositionedAssetMarkerIcon extends StatelessWidget {
   const PositionedAssetMarkerIcon({
     required this.point,
     required this.assetRemoteId,
+    required this.assetThumbhash,
     this.size = 100,
     this.durationInMilliseconds = 100,
     this.onTap,
@@ -35,7 +37,7 @@ class PositionedAssetMarkerIcon extends StatelessWidget {
         onTap: () => onTap?.call(),
         child: SizedBox.square(
           dimension: size,
-          child: _AssetMarkerIcon(id: assetRemoteId, key: Key(assetRemoteId)),
+          child: _AssetMarkerIcon(id: assetRemoteId, thumbhash: assetThumbhash, key: Key(assetRemoteId)),
         ),
       ),
     );
@@ -43,14 +45,15 @@ class PositionedAssetMarkerIcon extends StatelessWidget {
 }
 
 class _AssetMarkerIcon extends StatelessWidget {
-  const _AssetMarkerIcon({required this.id, super.key});
+  const _AssetMarkerIcon({required this.id, required this.thumbhash, super.key});
 
   final String id;
+  final String thumbhash;
 
   @override
   Widget build(BuildContext context) {
     final imageUrl = getThumbnailUrlForRemoteId(id);
-    final cacheKey = getThumbnailCacheKeyForRemoteId(id);
+    final cacheKey = getThumbnailCacheKeyForRemoteId(id, thumbhash);
     return LayoutBuilder(
       builder: (context, constraints) {
         return Stack(

mobile/openapi/lib/api/assets_api.dart

@@ -186,12 +186,12 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
-  /// * [AssetMetadataKey] key (required):
-  Future<Response> deleteAssetMetadataWithHttpInfo(String id, AssetMetadataKey key,) async {
+  /// * [String] key (required):
+  Future<Response> deleteAssetMetadataWithHttpInfo(String id, String key,) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/assets/{id}/metadata/{key}'
       .replaceAll('{id}', id)
-      .replaceAll('{key}', key.toString());
+      .replaceAll('{key}', key);
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -222,8 +222,8 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
-  /// * [AssetMetadataKey] key (required):
-  Future<void> deleteAssetMetadata(String id, AssetMetadataKey key,) async {
+  /// * [String] key (required):
+  Future<void> deleteAssetMetadata(String id, String key,) async {
     final response = await deleteAssetMetadataWithHttpInfo(id, key,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -278,6 +278,54 @@ class AssetsApi {
     }
   }
 
+  /// Delete asset metadata
+  ///
+  /// Delete metadata key-value pairs for multiple assets.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
+  /// * [AssetMetadataBulkDeleteDto] assetMetadataBulkDeleteDto (required):
+  Future<Response> deleteBulkAssetMetadataWithHttpInfo(AssetMetadataBulkDeleteDto assetMetadataBulkDeleteDto,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/assets/metadata';
+
+    // ignore: prefer_final_locals
+    Object? postBody = assetMetadataBulkDeleteDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'DELETE',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Delete asset metadata
+  ///
+  /// Delete metadata key-value pairs for multiple assets.
+  ///
+  /// Parameters:
+  ///
+  /// * [AssetMetadataBulkDeleteDto] assetMetadataBulkDeleteDto (required):
+  Future<void> deleteBulkAssetMetadata(AssetMetadataBulkDeleteDto assetMetadataBulkDeleteDto,) async {
+    final response = await deleteBulkAssetMetadataWithHttpInfo(assetMetadataBulkDeleteDto,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+  }
+
   /// Download original asset
   ///
   /// Downloads the original file of the specified asset.
@@ -288,10 +336,12 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
+  /// * [bool] edited:
+  ///
   /// * [String] key:
   ///
   /// * [String] slug:
-  Future<Response> downloadAssetWithHttpInfo(String id, { String? key, String? slug, }) async {
+  Future<Response> downloadAssetWithHttpInfo(String id, { bool? edited, String? key, String? slug, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/assets/{id}/original'
       .replaceAll('{id}', id);
@@ -303,6 +353,9 @@ class AssetsApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (edited != null) {
+      queryParams.addAll(_queryParams('', 'edited', edited));
+    }
     if (key != null) {
       queryParams.addAll(_queryParams('', 'key', key));
     }
@@ -332,11 +385,13 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
+  /// * [bool] edited:
+  ///
   /// * [String] key:
   ///
   /// * [String] slug:
-  Future<MultipartFile?> downloadAsset(String id, { String? key, String? slug, }) async {
-    final response = await downloadAssetWithHttpInfo(id,  key: key, slug: slug, );
+  Future<MultipartFile?> downloadAsset(String id, { bool? edited, String? key, String? slug, }) async {
+    final response = await downloadAssetWithHttpInfo(id,  edited: edited, key: key, slug: slug, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -350,6 +405,67 @@ class AssetsApi {
     return null;
   }
 
+  /// Apply edits to an existing asset
+  ///
+  /// Apply a series of edit actions (crop, rotate, mirror) to the specified asset.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  ///
+  /// * [AssetEditActionListDto] assetEditActionListDto (required):
+  Future<Response> editAssetWithHttpInfo(String id, AssetEditActionListDto assetEditActionListDto,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/assets/{id}/edits'
+      .replaceAll('{id}', id);
+
+    // ignore: prefer_final_locals
+    Object? postBody = assetEditActionListDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'PUT',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Apply edits to an existing asset
+  ///
+  /// Apply a series of edit actions (crop, rotate, mirror) to the specified asset.
+  ///
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  ///
+  /// * [AssetEditActionListDto] assetEditActionListDto (required):
+  Future<AssetEditsDto?> editAsset(String id, AssetEditActionListDto assetEditActionListDto,) async {
+    final response = await editAssetWithHttpInfo(id, assetEditActionListDto,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AssetEditsDto',) as AssetEditsDto;
+    
+    }
+    return null;
+  }
+
   /// Retrieve assets by device ID
   ///
   /// Get all asset of a device that are in the database, ID only.
@@ -410,6 +526,63 @@ class AssetsApi {
     return null;
   }
 
+  /// Retrieve edits for an existing asset
+  ///
+  /// Retrieve a series of edit actions (crop, rotate, mirror) associated with the specified asset.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  Future<Response> getAssetEditsWithHttpInfo(String id,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/assets/{id}/edits'
+      .replaceAll('{id}', id);
+
+    // ignore: prefer_final_locals
+    Object? postBody;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>[];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'GET',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Retrieve edits for an existing asset
+  ///
+  /// Retrieve a series of edit actions (crop, rotate, mirror) associated with the specified asset.
+  ///
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  Future<AssetEditsDto?> getAssetEdits(String id,) async {
+    final response = await getAssetEditsWithHttpInfo(id,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AssetEditsDto',) as AssetEditsDto;
+    
+    }
+    return null;
+  }
+
   /// Retrieve an asset
   ///
   /// Retrieve detailed information about a specific asset.
@@ -552,12 +725,12 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
-  /// * [AssetMetadataKey] key (required):
-  Future<Response> getAssetMetadataByKeyWithHttpInfo(String id, AssetMetadataKey key,) async {
+  /// * [String] key (required):
+  Future<Response> getAssetMetadataByKeyWithHttpInfo(String id, String key,) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/assets/{id}/metadata/{key}'
       .replaceAll('{id}', id)
-      .replaceAll('{key}', key.toString());
+      .replaceAll('{key}', key);
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -588,8 +761,8 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
-  /// * [AssetMetadataKey] key (required):
-  Future<AssetMetadataResponseDto?> getAssetMetadataByKey(String id, AssetMetadataKey key,) async {
+  /// * [String] key (required):
+  Future<AssetMetadataResponseDto?> getAssetMetadataByKey(String id, String key,) async {
     final response = await getAssetMetadataByKeyWithHttpInfo(id, key,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -873,6 +1046,55 @@ class AssetsApi {
     return null;
   }
 
+  /// Remove edits from an existing asset
+  ///
+  /// Removes all edit actions (crop, rotate, mirror) associated with the specified asset.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  Future<Response> removeAssetEditsWithHttpInfo(String id,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/assets/{id}/edits'
+      .replaceAll('{id}', id);
+
+    // ignore: prefer_final_locals
+    Object? postBody;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>[];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'DELETE',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Remove edits from an existing asset
+  ///
+  /// Removes all edit actions (crop, rotate, mirror) associated with the specified asset.
+  ///
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  Future<void> removeAssetEdits(String id,) async {
+    final response = await removeAssetEditsWithHttpInfo(id,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+  }
+
   /// Replace asset
   ///
   /// Replace the asset with new file, without changing its id.
@@ -1228,6 +1450,65 @@ class AssetsApi {
     }
   }
 
+  /// Upsert asset metadata
+  ///
+  /// Upsert metadata key-value pairs for multiple assets.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
+  /// * [AssetMetadataBulkUpsertDto] assetMetadataBulkUpsertDto (required):
+  Future<Response> updateBulkAssetMetadataWithHttpInfo(AssetMetadataBulkUpsertDto assetMetadataBulkUpsertDto,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/assets/metadata';
+
+    // ignore: prefer_final_locals
+    Object? postBody = assetMetadataBulkUpsertDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'PUT',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Upsert asset metadata
+  ///
+  /// Upsert metadata key-value pairs for multiple assets.
+  ///
+  /// Parameters:
+  ///
+  /// * [AssetMetadataBulkUpsertDto] assetMetadataBulkUpsertDto (required):
+  Future<List<AssetMetadataBulkResponseDto>?> updateBulkAssetMetadata(AssetMetadataBulkUpsertDto assetMetadataBulkUpsertDto,) async {
+    final response = await updateBulkAssetMetadataWithHttpInfo(assetMetadataBulkUpsertDto,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      final responseBody = await _decodeBodyBytes(response);
+      return (await apiClient.deserializeAsync(responseBody, 'List<AssetMetadataBulkResponseDto>') as List)
+        .cast<AssetMetadataBulkResponseDto>()
+        .toList(growable: false);
+
+    }
+    return null;
+  }
+
   /// Upload asset
   ///
   /// Uploads a new asset to the server.
@@ -1246,8 +1527,6 @@ class AssetsApi {
   ///
   /// * [DateTime] fileModifiedAt (required):
   ///
-  /// * [List<AssetMetadataUpsertItemDto>] metadata (required):
-  ///
   /// * [String] key:
   ///
   /// * [String] slug:
@@ -1263,10 +1542,12 @@ class AssetsApi {
   ///
   /// * [String] livePhotoVideoId:
   ///
+  /// * [List<AssetMetadataUpsertItemDto>] metadata:
+  ///
   /// * [MultipartFile] sidecarData:
   ///
   /// * [AssetVisibility] visibility:
-  Future<Response> uploadAssetWithHttpInfo(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, List<AssetMetadataUpsertItemDto> metadata, { String? key, String? slug, String? xImmichChecksum, String? duration, String? filename, bool? isFavorite, String? livePhotoVideoId, MultipartFile? sidecarData, AssetVisibility? visibility, }) async {
+  Future<Response> uploadAssetWithHttpInfo(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? slug, String? xImmichChecksum, String? duration, String? filename, bool? isFavorite, String? livePhotoVideoId, List<AssetMetadataUpsertItemDto>? metadata, MultipartFile? sidecarData, AssetVisibility? visibility, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/assets';
 
@@ -1373,8 +1654,6 @@ class AssetsApi {
   ///
   /// * [DateTime] fileModifiedAt (required):
   ///
-  /// * [List<AssetMetadataUpsertItemDto>] metadata (required):
-  ///
   /// * [String] key:
   ///
   /// * [String] slug:
@@ -1390,11 +1669,13 @@ class AssetsApi {
   ///
   /// * [String] livePhotoVideoId:
   ///
+  /// * [List<AssetMetadataUpsertItemDto>] metadata:
+  ///
   /// * [MultipartFile] sidecarData:
   ///
   /// * [AssetVisibility] visibility:
-  Future<AssetMediaResponseDto?> uploadAsset(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, List<AssetMetadataUpsertItemDto> metadata, { String? key, String? slug, String? xImmichChecksum, String? duration, String? filename, bool? isFavorite, String? livePhotoVideoId, MultipartFile? sidecarData, AssetVisibility? visibility, }) async {
-    final response = await uploadAssetWithHttpInfo(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, metadata,  key: key, slug: slug, xImmichChecksum: xImmichChecksum, duration: duration, filename: filename, isFavorite: isFavorite, livePhotoVideoId: livePhotoVideoId, sidecarData: sidecarData, visibility: visibility, );
+  Future<AssetMediaResponseDto?> uploadAsset(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? slug, String? xImmichChecksum, String? duration, String? filename, bool? isFavorite, String? livePhotoVideoId, List<AssetMetadataUpsertItemDto>? metadata, MultipartFile? sidecarData, AssetVisibility? visibility, }) async {
+    final response = await uploadAssetWithHttpInfo(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt,  key: key, slug: slug, xImmichChecksum: xImmichChecksum, duration: duration, filename: filename, isFavorite: isFavorite, livePhotoVideoId: livePhotoVideoId, metadata: metadata, sidecarData: sidecarData, visibility: visibility, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1418,12 +1699,14 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
+  /// * [bool] edited:
+  ///
   /// * [String] key:
   ///
   /// * [AssetMediaSize] size:
   ///
   /// * [String] slug:
-  Future<Response> viewAssetWithHttpInfo(String id, { String? key, AssetMediaSize? size, String? slug, }) async {
+  Future<Response> viewAssetWithHttpInfo(String id, { bool? edited, String? key, AssetMediaSize? size, String? slug, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/assets/{id}/thumbnail'
       .replaceAll('{id}', id);
@@ -1435,6 +1718,9 @@ class AssetsApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (edited != null) {
+      queryParams.addAll(_queryParams('', 'edited', edited));
+    }
     if (key != null) {
       queryParams.addAll(_queryParams('', 'key', key));
     }
@@ -1467,13 +1753,15 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
+  /// * [bool] edited:
+  ///
   /// * [String] key:
   ///
   /// * [AssetMediaSize] size:
   ///
   /// * [String] slug:
-  Future<MultipartFile?> viewAsset(String id, { String? key, AssetMediaSize? size, String? slug, }) async {
-    final response = await viewAssetWithHttpInfo(id,  key: key, size: size, slug: slug, );
+  Future<MultipartFile?> viewAsset(String id, { bool? edited, String? key, AssetMediaSize? size, String? slug, }) async {
+    final response = await viewAssetWithHttpInfo(id,  edited: edited, key: key, size: size, slug: slug, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/model/asset_edit_action.dart

@@ -0,0 +1,88 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+
+class AssetEditAction {
+  /// Instantiate a new enum with the provided [value].
+  const AssetEditAction._(this.value);
+
+  /// The underlying value of this enum member.
+  final String value;
+
+  @override
+  String toString() => value;
+
+  String toJson() => value;
+
+  static const crop = AssetEditAction._(r'crop');
+  static const rotate = AssetEditAction._(r'rotate');
+  static const mirror = AssetEditAction._(r'mirror');
+
+  /// List of all possible values in this [enum][AssetEditAction].
+  static const values = <AssetEditAction>[
+    crop,
+    rotate,
+    mirror,
+  ];
+
+  static AssetEditAction? fromJson(dynamic value) => AssetEditActionTypeTransformer().decode(value);
+
+  static List<AssetEditAction> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetEditAction>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetEditAction.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+}
+
+/// Transformation class that can [encode] an instance of [AssetEditAction] to String,
+/// and [decode] dynamic data back to [AssetEditAction].
+class AssetEditActionTypeTransformer {
+  factory AssetEditActionTypeTransformer() => _instance ??= const AssetEditActionTypeTransformer._();
+
+  const AssetEditActionTypeTransformer._();
+
+  String encode(AssetEditAction data) => data.value;
+
+  /// Decodes a [dynamic value][data] to a AssetEditAction.
+  ///
+  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
+  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
+  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
+  ///
+  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
+  /// and users are still using an old app with the old code.
+  AssetEditAction? decode(dynamic data, {bool allowNull = true}) {
+    if (data != null) {
+      switch (data) {
+        case r'crop': return AssetEditAction.crop;
+        case r'rotate': return AssetEditAction.rotate;
+        case r'mirror': return AssetEditAction.mirror;
+        default:
+          if (!allowNull) {
+            throw ArgumentError('Unknown enum value to decode: $data');
+          }
+      }
+    }
+    return null;
+  }
+
+  /// Singleton [AssetEditActionTypeTransformer] instance.
+  static AssetEditActionTypeTransformer? _instance;
+}
+

mobile/openapi/lib/model/asset_edit_action_crop.dart

@@ -0,0 +1,107 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class AssetEditActionCrop {
+  /// Returns a new [AssetEditActionCrop] instance.
+  AssetEditActionCrop({
+    required this.action,
+    required this.parameters,
+  });
+
+  AssetEditAction action;
+
+  CropParameters parameters;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AssetEditActionCrop &&
+    other.action == action &&
+    other.parameters == parameters;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (action.hashCode) +
+    (parameters.hashCode);
+
+  @override
+  String toString() => 'AssetEditActionCrop[action=$action, parameters=$parameters]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'action'] = this.action;
+      json[r'parameters'] = this.parameters;
+    return json;
+  }
+
+  /// Returns a new [AssetEditActionCrop] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AssetEditActionCrop? fromJson(dynamic value) {
+    upgradeDto(value, "AssetEditActionCrop");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return AssetEditActionCrop(
+        action: AssetEditAction.fromJson(json[r'action'])!,
+        parameters: CropParameters.fromJson(json[r'parameters'])!,
+      );
+    }
+    return null;
+  }
+
+  static List<AssetEditActionCrop> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetEditActionCrop>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetEditActionCrop.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AssetEditActionCrop> mapFromJson(dynamic json) {
+    final map = <String, AssetEditActionCrop>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetEditActionCrop.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AssetEditActionCrop-objects as value to a dart map
+  static Map<String, List<AssetEditActionCrop>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetEditActionCrop>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = AssetEditActionCrop.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'action',
+    'parameters',
+  };
+}
+

mobile/openapi/lib/model/asset_edit_action_list_dto.dart

@@ -0,0 +1,100 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class AssetEditActionListDto {
+  /// Returns a new [AssetEditActionListDto] instance.
+  AssetEditActionListDto({
+    this.edits = const [],
+  });
+
+  /// list of edits
+  List<AssetEditActionListDtoEditsInner> edits;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AssetEditActionListDto &&
+    _deepEquality.equals(other.edits, edits);
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (edits.hashCode);
+
+  @override
+  String toString() => 'AssetEditActionListDto[edits=$edits]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'edits'] = this.edits;
+    return json;
+  }
+
+  /// Returns a new [AssetEditActionListDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AssetEditActionListDto? fromJson(dynamic value) {
+    upgradeDto(value, "AssetEditActionListDto");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return AssetEditActionListDto(
+        edits: AssetEditActionListDtoEditsInner.listFromJson(json[r'edits']),
+      );
+    }
+    return null;
+  }
+
+  static List<AssetEditActionListDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetEditActionListDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetEditActionListDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AssetEditActionListDto> mapFromJson(dynamic json) {
+    final map = <String, AssetEditActionListDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetEditActionListDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AssetEditActionListDto-objects as value to a dart map
+  static Map<String, List<AssetEditActionListDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetEditActionListDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = AssetEditActionListDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'edits',
+  };
+}
+

mobile/openapi/lib/model/asset_edit_action_list_dto_edits_inner.dart

@@ -0,0 +1,107 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class AssetEditActionListDtoEditsInner {
+  /// Returns a new [AssetEditActionListDtoEditsInner] instance.
+  AssetEditActionListDtoEditsInner({
+    required this.action,
+    required this.parameters,
+  });
+
+  AssetEditAction action;
+
+  MirrorParameters parameters;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AssetEditActionListDtoEditsInner &&
+    other.action == action &&
+    other.parameters == parameters;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (action.hashCode) +
+    (parameters.hashCode);
+
+  @override
+  String toString() => 'AssetEditActionListDtoEditsInner[action=$action, parameters=$parameters]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'action'] = this.action;
+      json[r'parameters'] = this.parameters;
+    return json;
+  }
+
+  /// Returns a new [AssetEditActionListDtoEditsInner] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AssetEditActionListDtoEditsInner? fromJson(dynamic value) {
+    upgradeDto(value, "AssetEditActionListDtoEditsInner");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return AssetEditActionListDtoEditsInner(
+        action: AssetEditAction.fromJson(json[r'action'])!,
+        parameters: MirrorParameters.fromJson(json[r'parameters'])!,
+      );
+    }
+    return null;
+  }
+
+  static List<AssetEditActionListDtoEditsInner> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetEditActionListDtoEditsInner>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetEditActionListDtoEditsInner.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AssetEditActionListDtoEditsInner> mapFromJson(dynamic json) {
+    final map = <String, AssetEditActionListDtoEditsInner>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetEditActionListDtoEditsInner.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AssetEditActionListDtoEditsInner-objects as value to a dart map
+  static Map<String, List<AssetEditActionListDtoEditsInner>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetEditActionListDtoEditsInner>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = AssetEditActionListDtoEditsInner.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'action',
+    'parameters',
+  };
+}
+

mobile/openapi/lib/model/asset_edit_action_mirror.dart

@@ -0,0 +1,107 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class AssetEditActionMirror {
+  /// Returns a new [AssetEditActionMirror] instance.
+  AssetEditActionMirror({
+    required this.action,
+    required this.parameters,
+  });
+
+  AssetEditAction action;
+
+  MirrorParameters parameters;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AssetEditActionMirror &&
+    other.action == action &&
+    other.parameters == parameters;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (action.hashCode) +
+    (parameters.hashCode);
+
+  @override
+  String toString() => 'AssetEditActionMirror[action=$action, parameters=$parameters]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'action'] = this.action;
+      json[r'parameters'] = this.parameters;
+    return json;
+  }
+
+  /// Returns a new [AssetEditActionMirror] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AssetEditActionMirror? fromJson(dynamic value) {
+    upgradeDto(value, "AssetEditActionMirror");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return AssetEditActionMirror(
+        action: AssetEditAction.fromJson(json[r'action'])!,
+        parameters: MirrorParameters.fromJson(json[r'parameters'])!,
+      );
+    }
+    return null;
+  }
+
+  static List<AssetEditActionMirror> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetEditActionMirror>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetEditActionMirror.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AssetEditActionMirror> mapFromJson(dynamic json) {
+    final map = <String, AssetEditActionMirror>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetEditActionMirror.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AssetEditActionMirror-objects as value to a dart map
+  static Map<String, List<AssetEditActionMirror>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetEditActionMirror>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = AssetEditActionMirror.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'action',
+    'parameters',
+  };
+}
+

mobile/openapi/lib/model/asset_edit_action_rotate.dart

@@ -0,0 +1,107 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class AssetEditActionRotate {
+  /// Returns a new [AssetEditActionRotate] instance.
+  AssetEditActionRotate({
+    required this.action,
+    required this.parameters,
+  });
+
+  AssetEditAction action;
+
+  RotateParameters parameters;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AssetEditActionRotate &&
+    other.action == action &&
+    other.parameters == parameters;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (action.hashCode) +
+    (parameters.hashCode);
+
+  @override
+  String toString() => 'AssetEditActionRotate[action=$action, parameters=$parameters]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'action'] = this.action;
+      json[r'parameters'] = this.parameters;
+    return json;
+  }
+
+  /// Returns a new [AssetEditActionRotate] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AssetEditActionRotate? fromJson(dynamic value) {
+    upgradeDto(value, "AssetEditActionRotate");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return AssetEditActionRotate(
+        action: AssetEditAction.fromJson(json[r'action'])!,
+        parameters: RotateParameters.fromJson(json[r'parameters'])!,
+      );
+    }
+    return null;
+  }
+
+  static List<AssetEditActionRotate> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetEditActionRotate>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetEditActionRotate.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AssetEditActionRotate> mapFromJson(dynamic json) {
+    final map = <String, AssetEditActionRotate>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetEditActionRotate.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AssetEditActionRotate-objects as value to a dart map
+  static Map<String, List<AssetEditActionRotate>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetEditActionRotate>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = AssetEditActionRotate.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'action',
+    'parameters',
+  };
+}
+

mobile/openapi/lib/model/asset_edits_dto.dart

@@ -0,0 +1,108 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class AssetEditsDto {
+  /// Returns a new [AssetEditsDto] instance.
+  AssetEditsDto({
+    required this.assetId,
+    this.edits = const [],
+  });
+
+  String assetId;
+
+  /// list of edits
+  List<AssetEditActionListDtoEditsInner> edits;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AssetEditsDto &&
+    other.assetId == assetId &&
+    _deepEquality.equals(other.edits, edits);
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (assetId.hashCode) +
+    (edits.hashCode);
+
+  @override
+  String toString() => 'AssetEditsDto[assetId=$assetId, edits=$edits]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'assetId'] = this.assetId;
+      json[r'edits'] = this.edits;
+    return json;
+  }
+
+  /// Returns a new [AssetEditsDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AssetEditsDto? fromJson(dynamic value) {
+    upgradeDto(value, "AssetEditsDto");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return AssetEditsDto(
+        assetId: mapValueOfType<String>(json, r'assetId')!,
+        edits: AssetEditActionListDtoEditsInner.listFromJson(json[r'edits']),
+      );
+    }
+    return null;
+  }
+
+  static List<AssetEditsDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetEditsDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetEditsDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AssetEditsDto> mapFromJson(dynamic json) {
+    final map = <String, AssetEditsDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetEditsDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AssetEditsDto-objects as value to a dart map
+  static Map<String, List<AssetEditsDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetEditsDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = AssetEditsDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'assetId',
+    'edits',
+  };
+}
+

mobile/openapi/lib/model/asset_metadata_bulk_delete_dto.dart

@@ -0,0 +1,99 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class AssetMetadataBulkDeleteDto {
+  /// Returns a new [AssetMetadataBulkDeleteDto] instance.
+  AssetMetadataBulkDeleteDto({
+    this.items = const [],
+  });
+
+  List<AssetMetadataBulkDeleteItemDto> items;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AssetMetadataBulkDeleteDto &&
+    _deepEquality.equals(other.items, items);
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (items.hashCode);
+
+  @override
+  String toString() => 'AssetMetadataBulkDeleteDto[items=$items]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'items'] = this.items;
+    return json;
+  }
+
+  /// Returns a new [AssetMetadataBulkDeleteDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AssetMetadataBulkDeleteDto? fromJson(dynamic value) {
+    upgradeDto(value, "AssetMetadataBulkDeleteDto");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return AssetMetadataBulkDeleteDto(
+        items: AssetMetadataBulkDeleteItemDto.listFromJson(json[r'items']),
+      );
+    }
+    return null;
+  }
+
+  static List<AssetMetadataBulkDeleteDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetMetadataBulkDeleteDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetMetadataBulkDeleteDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AssetMetadataBulkDeleteDto> mapFromJson(dynamic json) {
+    final map = <String, AssetMetadataBulkDeleteDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetMetadataBulkDeleteDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AssetMetadataBulkDeleteDto-objects as value to a dart map
+  static Map<String, List<AssetMetadataBulkDeleteDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetMetadataBulkDeleteDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = AssetMetadataBulkDeleteDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'items',
+  };
+}
+

mobile/openapi/lib/model/asset_metadata_bulk_delete_item_dto.dart

@@ -0,0 +1,107 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class AssetMetadataBulkDeleteItemDto {
+  /// Returns a new [AssetMetadataBulkDeleteItemDto] instance.
+  AssetMetadataBulkDeleteItemDto({
+    required this.assetId,
+    required this.key,
+  });
+
+  String assetId;
+
+  String key;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AssetMetadataBulkDeleteItemDto &&
+    other.assetId == assetId &&
+    other.key == key;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (assetId.hashCode) +
+    (key.hashCode);
+
+  @override
+  String toString() => 'AssetMetadataBulkDeleteItemDto[assetId=$assetId, key=$key]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'assetId'] = this.assetId;
+      json[r'key'] = this.key;
+    return json;
+  }
+
+  /// Returns a new [AssetMetadataBulkDeleteItemDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AssetMetadataBulkDeleteItemDto? fromJson(dynamic value) {
+    upgradeDto(value, "AssetMetadataBulkDeleteItemDto");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return AssetMetadataBulkDeleteItemDto(
+        assetId: mapValueOfType<String>(json, r'assetId')!,
+        key: mapValueOfType<String>(json, r'key')!,
+      );
+    }
+    return null;
+  }
+
+  static List<AssetMetadataBulkDeleteItemDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetMetadataBulkDeleteItemDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetMetadataBulkDeleteItemDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AssetMetadataBulkDeleteItemDto> mapFromJson(dynamic json) {
+    final map = <String, AssetMetadataBulkDeleteItemDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetMetadataBulkDeleteItemDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AssetMetadataBulkDeleteItemDto-objects as value to a dart map
+  static Map<String, List<AssetMetadataBulkDeleteItemDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetMetadataBulkDeleteItemDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = AssetMetadataBulkDeleteItemDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'assetId',
+    'key',
+  };
+}
+

mobile/openapi/lib/model/asset_metadata_bulk_response_dto.dart

@@ -0,0 +1,123 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class AssetMetadataBulkResponseDto {
+  /// Returns a new [AssetMetadataBulkResponseDto] instance.
+  AssetMetadataBulkResponseDto({
+    required this.assetId,
+    required this.key,
+    required this.updatedAt,
+    required this.value,
+  });
+
+  String assetId;
+
+  String key;
+
+  DateTime updatedAt;
+
+  Object value;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AssetMetadataBulkResponseDto &&
+    other.assetId == assetId &&
+    other.key == key &&
+    other.updatedAt == updatedAt &&
+    other.value == value;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (assetId.hashCode) +
+    (key.hashCode) +
+    (updatedAt.hashCode) +
+    (value.hashCode);
+
+  @override
+  String toString() => 'AssetMetadataBulkResponseDto[assetId=$assetId, key=$key, updatedAt=$updatedAt, value=$value]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'assetId'] = this.assetId;
+      json[r'key'] = this.key;
+      json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String();
+      json[r'value'] = this.value;
+    return json;
+  }
+
+  /// Returns a new [AssetMetadataBulkResponseDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AssetMetadataBulkResponseDto? fromJson(dynamic value) {
+    upgradeDto(value, "AssetMetadataBulkResponseDto");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return AssetMetadataBulkResponseDto(
+        assetId: mapValueOfType<String>(json, r'assetId')!,
+        key: mapValueOfType<String>(json, r'key')!,
+        updatedAt: mapDateTime(json, r'updatedAt', r'')!,
+        value: mapValueOfType<Object>(json, r'value')!,
+      );
+    }
+    return null;
+  }
+
+  static List<AssetMetadataBulkResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetMetadataBulkResponseDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetMetadataBulkResponseDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AssetMetadataBulkResponseDto> mapFromJson(dynamic json) {
+    final map = <String, AssetMetadataBulkResponseDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetMetadataBulkResponseDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AssetMetadataBulkResponseDto-objects as value to a dart map
+  static Map<String, List<AssetMetadataBulkResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetMetadataBulkResponseDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = AssetMetadataBulkResponseDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'assetId',
+    'key',
+    'updatedAt',
+    'value',
+  };
+}
+

mobile/openapi/lib/model/asset_metadata_bulk_upsert_dto.dart

@@ -0,0 +1,99 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class AssetMetadataBulkUpsertDto {
+  /// Returns a new [AssetMetadataBulkUpsertDto] instance.
+  AssetMetadataBulkUpsertDto({
+    this.items = const [],
+  });
+
+  List<AssetMetadataBulkUpsertItemDto> items;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AssetMetadataBulkUpsertDto &&
+    _deepEquality.equals(other.items, items);
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (items.hashCode);
+
+  @override
+  String toString() => 'AssetMetadataBulkUpsertDto[items=$items]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'items'] = this.items;
+    return json;
+  }
+
+  /// Returns a new [AssetMetadataBulkUpsertDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AssetMetadataBulkUpsertDto? fromJson(dynamic value) {
+    upgradeDto(value, "AssetMetadataBulkUpsertDto");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return AssetMetadataBulkUpsertDto(
+        items: AssetMetadataBulkUpsertItemDto.listFromJson(json[r'items']),
+      );
+    }
+    return null;
+  }
+
+  static List<AssetMetadataBulkUpsertDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetMetadataBulkUpsertDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetMetadataBulkUpsertDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AssetMetadataBulkUpsertDto> mapFromJson(dynamic json) {
+    final map = <String, AssetMetadataBulkUpsertDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetMetadataBulkUpsertDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AssetMetadataBulkUpsertDto-objects as value to a dart map
+  static Map<String, List<AssetMetadataBulkUpsertDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetMetadataBulkUpsertDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = AssetMetadataBulkUpsertDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'items',
+  };
+}
+

mobile/openapi/lib/model/asset_metadata_bulk_upsert_item_dto.dart

@@ -0,0 +1,115 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class AssetMetadataBulkUpsertItemDto {
+  /// Returns a new [AssetMetadataBulkUpsertItemDto] instance.
+  AssetMetadataBulkUpsertItemDto({
+    required this.assetId,
+    required this.key,
+    required this.value,
+  });
+
+  String assetId;
+
+  String key;
+
+  Object value;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AssetMetadataBulkUpsertItemDto &&
+    other.assetId == assetId &&
+    other.key == key &&
+    other.value == value;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (assetId.hashCode) +
+    (key.hashCode) +
+    (value.hashCode);
+
+  @override
+  String toString() => 'AssetMetadataBulkUpsertItemDto[assetId=$assetId, key=$key, value=$value]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'assetId'] = this.assetId;
+      json[r'key'] = this.key;
+      json[r'value'] = this.value;
+    return json;
+  }
+
+  /// Returns a new [AssetMetadataBulkUpsertItemDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AssetMetadataBulkUpsertItemDto? fromJson(dynamic value) {
+    upgradeDto(value, "AssetMetadataBulkUpsertItemDto");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return AssetMetadataBulkUpsertItemDto(
+        assetId: mapValueOfType<String>(json, r'assetId')!,
+        key: mapValueOfType<String>(json, r'key')!,
+        value: mapValueOfType<Object>(json, r'value')!,
+      );
+    }
+    return null;
+  }
+
+  static List<AssetMetadataBulkUpsertItemDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetMetadataBulkUpsertItemDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetMetadataBulkUpsertItemDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AssetMetadataBulkUpsertItemDto> mapFromJson(dynamic json) {
+    final map = <String, AssetMetadataBulkUpsertItemDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetMetadataBulkUpsertItemDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AssetMetadataBulkUpsertItemDto-objects as value to a dart map
+  static Map<String, List<AssetMetadataBulkUpsertItemDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetMetadataBulkUpsertItemDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = AssetMetadataBulkUpsertItemDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'assetId',
+    'key',
+    'value',
+  };
+}
+

mobile/openapi/lib/model/asset_metadata_response_dto.dart

@@ -18,7 +18,7 @@ class AssetMetadataResponseDto {
     required this.value,
   });
 
-  AssetMetadataKey key;
+  String key;
 
   DateTime updatedAt;
 
@@ -57,7 +57,7 @@ class AssetMetadataResponseDto {
       final json = value.cast<String, dynamic>();
 
       return AssetMetadataResponseDto(
-        key: AssetMetadataKey.fromJson(json[r'key'])!,
+        key: mapValueOfType<String>(json, r'key')!,
         updatedAt: mapDateTime(json, r'updatedAt', r'')!,
         value: mapValueOfType<Object>(json, r'value')!,
       );

mobile/openapi/lib/model/asset_metadata_upsert_item_dto.dart

@@ -17,7 +17,7 @@ class AssetMetadataUpsertItemDto {
     required this.value,
   });
 
-  AssetMetadataKey key;
+  String key;
 
   Object value;
 
@@ -51,7 +51,7 @@ class AssetMetadataUpsertItemDto {
       final json = value.cast<String, dynamic>();
 
       return AssetMetadataUpsertItemDto(
-        key: AssetMetadataKey.fromJson(json[r'key'])!,
+        key: mapValueOfType<String>(json, r'key')!,
         value: mapValueOfType<Object>(json, r'value')!,
       );
     }

mobile/openapi/lib/model/asset_response_dto.dart

@@ -23,6 +23,7 @@ class AssetResponseDto {
     required this.fileCreatedAt,
     required this.fileModifiedAt,
     required this.hasMetadata,
+    required this.height,
     required this.id,
     required this.isArchived,
     required this.isFavorite,
@@ -45,6 +46,7 @@ class AssetResponseDto {
     this.unassignedFaces = const [],
     required this.updatedAt,
     required this.visibility,
+    required this.width,
   });
 
   /// base64 encoded sha1 hash
@@ -77,6 +79,8 @@ class AssetResponseDto {
 
   bool hasMetadata;
 
+  num? height;
+
   String id;
 
   bool isArchived;
@@ -141,6 +145,8 @@ class AssetResponseDto {
 
   AssetVisibility visibility;
 
+  num? width;
+
   @override
   bool operator ==(Object other) => identical(this, other) || other is AssetResponseDto &&
     other.checksum == checksum &&
@@ -153,6 +159,7 @@ class AssetResponseDto {
     other.fileCreatedAt == fileCreatedAt &&
     other.fileModifiedAt == fileModifiedAt &&
     other.hasMetadata == hasMetadata &&
+    other.height == height &&
     other.id == id &&
     other.isArchived == isArchived &&
     other.isFavorite == isFavorite &&
@@ -174,7 +181,8 @@ class AssetResponseDto {
     other.type == type &&
     _deepEquality.equals(other.unassignedFaces, unassignedFaces) &&
     other.updatedAt == updatedAt &&
-    other.visibility == visibility;
+    other.visibility == visibility &&
+    other.width == width;
 
   @override
   int get hashCode =>
@@ -189,6 +197,7 @@ class AssetResponseDto {
     (fileCreatedAt.hashCode) +
     (fileModifiedAt.hashCode) +
     (hasMetadata.hashCode) +
+    (height == null ? 0 : height!.hashCode) +
     (id.hashCode) +
     (isArchived.hashCode) +
     (isFavorite.hashCode) +
@@ -210,10 +219,11 @@ class AssetResponseDto {
     (type.hashCode) +
     (unassignedFaces.hashCode) +
     (updatedAt.hashCode) +
-    (visibility.hashCode);
+    (visibility.hashCode) +
+    (width == null ? 0 : width!.hashCode);
 
   @override
-  String toString() => 'AssetResponseDto[checksum=$checksum, createdAt=$createdAt, deviceAssetId=$deviceAssetId, deviceId=$deviceId, duplicateId=$duplicateId, duration=$duration, exifInfo=$exifInfo, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, hasMetadata=$hasMetadata, id=$id, isArchived=$isArchived, isFavorite=$isFavorite, isOffline=$isOffline, isTrashed=$isTrashed, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, originalMimeType=$originalMimeType, originalPath=$originalPath, owner=$owner, ownerId=$ownerId, people=$people, resized=$resized, stack=$stack, tags=$tags, thumbhash=$thumbhash, type=$type, unassignedFaces=$unassignedFaces, updatedAt=$updatedAt, visibility=$visibility]';
+  String toString() => 'AssetResponseDto[checksum=$checksum, createdAt=$createdAt, deviceAssetId=$deviceAssetId, deviceId=$deviceId, duplicateId=$duplicateId, duration=$duration, exifInfo=$exifInfo, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, hasMetadata=$hasMetadata, height=$height, id=$id, isArchived=$isArchived, isFavorite=$isFavorite, isOffline=$isOffline, isTrashed=$isTrashed, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, originalMimeType=$originalMimeType, originalPath=$originalPath, owner=$owner, ownerId=$ownerId, people=$people, resized=$resized, stack=$stack, tags=$tags, thumbhash=$thumbhash, type=$type, unassignedFaces=$unassignedFaces, updatedAt=$updatedAt, visibility=$visibility, width=$width]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -235,6 +245,11 @@ class AssetResponseDto {
       json[r'fileCreatedAt'] = this.fileCreatedAt.toUtc().toIso8601String();
       json[r'fileModifiedAt'] = this.fileModifiedAt.toUtc().toIso8601String();
       json[r'hasMetadata'] = this.hasMetadata;
+    if (this.height != null) {
+      json[r'height'] = this.height;
+    } else {
+    //  json[r'height'] = null;
+    }
       json[r'id'] = this.id;
       json[r'isArchived'] = this.isArchived;
       json[r'isFavorite'] = this.isFavorite;
@@ -285,6 +300,11 @@ class AssetResponseDto {
       json[r'unassignedFaces'] = this.unassignedFaces;
       json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String();
       json[r'visibility'] = this.visibility;
+    if (this.width != null) {
+      json[r'width'] = this.width;
+    } else {
+    //  json[r'width'] = null;
+    }
     return json;
   }
 
@@ -307,6 +327,9 @@ class AssetResponseDto {
         fileCreatedAt: mapDateTime(json, r'fileCreatedAt', r'')!,
         fileModifiedAt: mapDateTime(json, r'fileModifiedAt', r'')!,
         hasMetadata: mapValueOfType<bool>(json, r'hasMetadata')!,
+        height: json[r'height'] == null
+            ? null
+            : num.parse('${json[r'height']}'),
         id: mapValueOfType<String>(json, r'id')!,
         isArchived: mapValueOfType<bool>(json, r'isArchived')!,
         isFavorite: mapValueOfType<bool>(json, r'isFavorite')!,
@@ -329,6 +352,9 @@ class AssetResponseDto {
         unassignedFaces: AssetFaceWithoutPersonResponseDto.listFromJson(json[r'unassignedFaces']),
         updatedAt: mapDateTime(json, r'updatedAt', r'')!,
         visibility: AssetVisibility.fromJson(json[r'visibility'])!,
+        width: json[r'width'] == null
+            ? null
+            : num.parse('${json[r'width']}'),
       );
     }
     return null;
@@ -384,6 +410,7 @@ class AssetResponseDto {
     'fileCreatedAt',
     'fileModifiedAt',
     'hasMetadata',
+    'height',
     'id',
     'isArchived',
     'isFavorite',
@@ -397,6 +424,7 @@ class AssetResponseDto {
     'type',
     'updatedAt',
     'visibility',
+    'width',
   };
 }
 

mobile/openapi/lib/model/crop_parameters.dart

@@ -0,0 +1,135 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class CropParameters {
+  /// Returns a new [CropParameters] instance.
+  CropParameters({
+    required this.height,
+    required this.width,
+    required this.x,
+    required this.y,
+  });
+
+  /// Height of the crop
+  ///
+  /// Minimum value: 1
+  num height;
+
+  /// Width of the crop
+  ///
+  /// Minimum value: 1
+  num width;
+
+  /// Top-Left X coordinate of crop
+  ///
+  /// Minimum value: 0
+  num x;
+
+  /// Top-Left Y coordinate of crop
+  ///
+  /// Minimum value: 0
+  num y;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is CropParameters &&
+    other.height == height &&
+    other.width == width &&
+    other.x == x &&
+    other.y == y;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (height.hashCode) +
+    (width.hashCode) +
+    (x.hashCode) +
+    (y.hashCode);
+
+  @override
+  String toString() => 'CropParameters[height=$height, width=$width, x=$x, y=$y]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'height'] = this.height;
+      json[r'width'] = this.width;
+      json[r'x'] = this.x;
+      json[r'y'] = this.y;
+    return json;
+  }
+
+  /// Returns a new [CropParameters] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static CropParameters? fromJson(dynamic value) {
+    upgradeDto(value, "CropParameters");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return CropParameters(
+        height: num.parse('${json[r'height']}'),
+        width: num.parse('${json[r'width']}'),
+        x: num.parse('${json[r'x']}'),
+        y: num.parse('${json[r'y']}'),
+      );
+    }
+    return null;
+  }
+
+  static List<CropParameters> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <CropParameters>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = CropParameters.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, CropParameters> mapFromJson(dynamic json) {
+    final map = <String, CropParameters>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = CropParameters.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of CropParameters-objects as value to a dart map
+  static Map<String, List<CropParameters>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<CropParameters>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = CropParameters.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'height',
+    'width',
+    'x',
+    'y',
+  };
+}
+

mobile/openapi/lib/model/mirror_axis.dart

@@ -10,10 +10,10 @@
 
 part of openapi.api;
 
-
-class AssetMetadataKey {
+/// Axis to mirror along
+class MirrorAxis {
   /// Instantiate a new enum with the provided [value].
-  const AssetMetadataKey._(this.value);
+  const MirrorAxis._(this.value);
 
   /// The underlying value of this enum member.
   final String value;
@@ -23,20 +23,22 @@ class AssetMetadataKey {
 
   String toJson() => value;
 
-  static const mobileApp = AssetMetadataKey._(r'mobile-app');
+  static const horizontal = MirrorAxis._(r'horizontal');
+  static const vertical = MirrorAxis._(r'vertical');
 
-  /// List of all possible values in this [enum][AssetMetadataKey].
-  static const values = <AssetMetadataKey>[
-    mobileApp,
+  /// List of all possible values in this [enum][MirrorAxis].
+  static const values = <MirrorAxis>[
+    horizontal,
+    vertical,
   ];
 
-  static AssetMetadataKey? fromJson(dynamic value) => AssetMetadataKeyTypeTransformer().decode(value);
+  static MirrorAxis? fromJson(dynamic value) => MirrorAxisTypeTransformer().decode(value);
 
-  static List<AssetMetadataKey> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <AssetMetadataKey>[];
+  static List<MirrorAxis> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <MirrorAxis>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
-        final value = AssetMetadataKey.fromJson(row);
+        final value = MirrorAxis.fromJson(row);
         if (value != null) {
           result.add(value);
         }
@@ -46,16 +48,16 @@ class AssetMetadataKey {
   }
 }
 
-/// Transformation class that can [encode] an instance of [AssetMetadataKey] to String,
-/// and [decode] dynamic data back to [AssetMetadataKey].
-class AssetMetadataKeyTypeTransformer {
-  factory AssetMetadataKeyTypeTransformer() => _instance ??= const AssetMetadataKeyTypeTransformer._();
+/// Transformation class that can [encode] an instance of [MirrorAxis] to String,
+/// and [decode] dynamic data back to [MirrorAxis].
+class MirrorAxisTypeTransformer {
+  factory MirrorAxisTypeTransformer() => _instance ??= const MirrorAxisTypeTransformer._();
 
-  const AssetMetadataKeyTypeTransformer._();
+  const MirrorAxisTypeTransformer._();
 
-  String encode(AssetMetadataKey data) => data.value;
+  String encode(MirrorAxis data) => data.value;
 
-  /// Decodes a [dynamic value][data] to a AssetMetadataKey.
+  /// Decodes a [dynamic value][data] to a MirrorAxis.
   ///
   /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
   /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
@@ -63,10 +65,11 @@ class AssetMetadataKeyTypeTransformer {
   ///
   /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
   /// and users are still using an old app with the old code.
-  AssetMetadataKey? decode(dynamic data, {bool allowNull = true}) {
+  MirrorAxis? decode(dynamic data, {bool allowNull = true}) {
     if (data != null) {
       switch (data) {
-        case r'mobile-app': return AssetMetadataKey.mobileApp;
+        case r'horizontal': return MirrorAxis.horizontal;
+        case r'vertical': return MirrorAxis.vertical;
         default:
           if (!allowNull) {
             throw ArgumentError('Unknown enum value to decode: $data');
@@ -76,7 +79,7 @@ class AssetMetadataKeyTypeTransformer {
     return null;
   }
 
-  /// Singleton [AssetMetadataKeyTypeTransformer] instance.
-  static AssetMetadataKeyTypeTransformer? _instance;
+  /// Singleton [MirrorAxisTypeTransformer] instance.
+  static MirrorAxisTypeTransformer? _instance;
 }
 

mobile/openapi/lib/model/mirror_parameters.dart

@@ -0,0 +1,100 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class MirrorParameters {
+  /// Returns a new [MirrorParameters] instance.
+  MirrorParameters({
+    required this.axis,
+  });
+
+  /// Axis to mirror along
+  MirrorAxis axis;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is MirrorParameters &&
+    other.axis == axis;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (axis.hashCode);
+
+  @override
+  String toString() => 'MirrorParameters[axis=$axis]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'axis'] = this.axis;
+    return json;
+  }
+
+  /// Returns a new [MirrorParameters] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static MirrorParameters? fromJson(dynamic value) {
+    upgradeDto(value, "MirrorParameters");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return MirrorParameters(
+        axis: MirrorAxis.fromJson(json[r'axis'])!,
+      );
+    }
+    return null;
+  }
+
+  static List<MirrorParameters> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <MirrorParameters>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = MirrorParameters.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, MirrorParameters> mapFromJson(dynamic json) {
+    final map = <String, MirrorParameters>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = MirrorParameters.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of MirrorParameters-objects as value to a dart map
+  static Map<String, List<MirrorParameters>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<MirrorParameters>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = MirrorParameters.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'axis',
+  };
+}
+

mobile/openapi/lib/model/permission.dart

@@ -43,6 +43,10 @@ class Permission {
   static const assetPeriodUpload = Permission._(r'asset.upload');
   static const assetPeriodReplace = Permission._(r'asset.replace');
   static const assetPeriodCopy = Permission._(r'asset.copy');
+  static const assetPeriodDerive = Permission._(r'asset.derive');
+  static const assetPeriodEditPeriodGet = Permission._(r'asset.edit.get');
+  static const assetPeriodEditPeriodCreate = Permission._(r'asset.edit.create');
+  static const assetPeriodEditPeriodDelete = Permission._(r'asset.edit.delete');
   static const albumPeriodCreate = Permission._(r'album.create');
   static const albumPeriodRead = Permission._(r'album.read');
   static const albumPeriodUpdate = Permission._(r'album.update');
@@ -191,6 +195,10 @@ class Permission {
     assetPeriodUpload,
     assetPeriodReplace,
     assetPeriodCopy,
+    assetPeriodDerive,
+    assetPeriodEditPeriodGet,
+    assetPeriodEditPeriodCreate,
+    assetPeriodEditPeriodDelete,
     albumPeriodCreate,
     albumPeriodRead,
     albumPeriodUpdate,
@@ -374,6 +382,10 @@ class PermissionTypeTransformer {
         case r'asset.upload': return Permission.assetPeriodUpload;
         case r'asset.replace': return Permission.assetPeriodReplace;
         case r'asset.copy': return Permission.assetPeriodCopy;
+        case r'asset.derive': return Permission.assetPeriodDerive;
+        case r'asset.edit.get': return Permission.assetPeriodEditPeriodGet;
+        case r'asset.edit.create': return Permission.assetPeriodEditPeriodCreate;
+        case r'asset.edit.delete': return Permission.assetPeriodEditPeriodDelete;
         case r'album.create': return Permission.albumPeriodCreate;
         case r'album.read': return Permission.albumPeriodRead;
         case r'album.update': return Permission.albumPeriodUpdate;

mobile/openapi/lib/model/rotate_parameters.dart

@@ -0,0 +1,100 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class RotateParameters {
+  /// Returns a new [RotateParameters] instance.
+  RotateParameters({
+    required this.angle,
+  });
+
+  /// Rotation angle in degrees
+  num angle;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is RotateParameters &&
+    other.angle == angle;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (angle.hashCode);
+
+  @override
+  String toString() => 'RotateParameters[angle=$angle]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'angle'] = this.angle;
+    return json;
+  }
+
+  /// Returns a new [RotateParameters] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static RotateParameters? fromJson(dynamic value) {
+    upgradeDto(value, "RotateParameters");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return RotateParameters(
+        angle: num.parse('${json[r'angle']}'),
+      );
+    }
+    return null;
+  }
+
+  static List<RotateParameters> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <RotateParameters>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = RotateParameters.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, RotateParameters> mapFromJson(dynamic json) {
+    final map = <String, RotateParameters>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = RotateParameters.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of RotateParameters-objects as value to a dart map
+  static Map<String, List<RotateParameters>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<RotateParameters>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = RotateParameters.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'angle',
+  };
+}
+

mobile/openapi/lib/model/sync_asset_metadata_delete_v1.dart

@@ -19,7 +19,7 @@ class SyncAssetMetadataDeleteV1 {
 
   String assetId;
 
-  AssetMetadataKey key;
+  String key;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is SyncAssetMetadataDeleteV1 &&
@@ -52,7 +52,7 @@ class SyncAssetMetadataDeleteV1 {
 
       return SyncAssetMetadataDeleteV1(
         assetId: mapValueOfType<String>(json, r'assetId')!,
-        key: AssetMetadataKey.fromJson(json[r'key'])!,
+        key: mapValueOfType<String>(json, r'key')!,
       );
     }
     return null;

mobile/openapi/lib/model/sync_asset_metadata_v1.dart

@@ -20,7 +20,7 @@ class SyncAssetMetadataV1 {
 
   String assetId;
 
-  AssetMetadataKey key;
+  String key;
 
   Object value;
 
@@ -58,7 +58,7 @@ class SyncAssetMetadataV1 {
 
       return SyncAssetMetadataV1(
         assetId: mapValueOfType<String>(json, r'assetId')!,
-        key: AssetMetadataKey.fromJson(json[r'key'])!,
+        key: mapValueOfType<String>(json, r'key')!,
         value: mapValueOfType<Object>(json, r'value')!,
       );
     }

mobile/openapi/lib/model/sync_asset_v1.dart

@@ -18,6 +18,7 @@ class SyncAssetV1 {
     required this.duration,
     required this.fileCreatedAt,
     required this.fileModifiedAt,
+    required this.height,
     required this.id,
     required this.isFavorite,
     required this.libraryId,
@@ -29,6 +30,7 @@ class SyncAssetV1 {
     required this.thumbhash,
     required this.type,
     required this.visibility,
+    required this.width,
   });
 
   String checksum;
@@ -41,6 +43,8 @@ class SyncAssetV1 {
 
   DateTime? fileModifiedAt;
 
+  int? height;
+
   String id;
 
   bool isFavorite;
@@ -63,6 +67,8 @@ class SyncAssetV1 {
 
   AssetVisibility visibility;
 
+  int? width;
+
   @override
   bool operator ==(Object other) => identical(this, other) || other is SyncAssetV1 &&
     other.checksum == checksum &&
@@ -70,6 +76,7 @@ class SyncAssetV1 {
     other.duration == duration &&
     other.fileCreatedAt == fileCreatedAt &&
     other.fileModifiedAt == fileModifiedAt &&
+    other.height == height &&
     other.id == id &&
     other.isFavorite == isFavorite &&
     other.libraryId == libraryId &&
@@ -80,7 +87,8 @@ class SyncAssetV1 {
     other.stackId == stackId &&
     other.thumbhash == thumbhash &&
     other.type == type &&
-    other.visibility == visibility;
+    other.visibility == visibility &&
+    other.width == width;
 
   @override
   int get hashCode =>
@@ -90,6 +98,7 @@ class SyncAssetV1 {
     (duration == null ? 0 : duration!.hashCode) +
     (fileCreatedAt == null ? 0 : fileCreatedAt!.hashCode) +
     (fileModifiedAt == null ? 0 : fileModifiedAt!.hashCode) +
+    (height == null ? 0 : height!.hashCode) +
     (id.hashCode) +
     (isFavorite.hashCode) +
     (libraryId == null ? 0 : libraryId!.hashCode) +
@@ -100,10 +109,11 @@ class SyncAssetV1 {
     (stackId == null ? 0 : stackId!.hashCode) +
     (thumbhash == null ? 0 : thumbhash!.hashCode) +
     (type.hashCode) +
-    (visibility.hashCode);
+    (visibility.hashCode) +
+    (width == null ? 0 : width!.hashCode);
 
   @override
-  String toString() => 'SyncAssetV1[checksum=$checksum, deletedAt=$deletedAt, duration=$duration, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, id=$id, isFavorite=$isFavorite, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, ownerId=$ownerId, stackId=$stackId, thumbhash=$thumbhash, type=$type, visibility=$visibility]';
+  String toString() => 'SyncAssetV1[checksum=$checksum, deletedAt=$deletedAt, duration=$duration, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, height=$height, id=$id, isFavorite=$isFavorite, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, ownerId=$ownerId, stackId=$stackId, thumbhash=$thumbhash, type=$type, visibility=$visibility, width=$width]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -127,6 +137,11 @@ class SyncAssetV1 {
       json[r'fileModifiedAt'] = this.fileModifiedAt!.toUtc().toIso8601String();
     } else {
     //  json[r'fileModifiedAt'] = null;
+    }
+    if (this.height != null) {
+      json[r'height'] = this.height;
+    } else {
+    //  json[r'height'] = null;
     }
       json[r'id'] = this.id;
       json[r'isFavorite'] = this.isFavorite;
@@ -159,6 +174,11 @@ class SyncAssetV1 {
     }
       json[r'type'] = this.type;
       json[r'visibility'] = this.visibility;
+    if (this.width != null) {
+      json[r'width'] = this.width;
+    } else {
+    //  json[r'width'] = null;
+    }
     return json;
   }
 
@@ -176,6 +196,7 @@ class SyncAssetV1 {
         duration: mapValueOfType<String>(json, r'duration'),
         fileCreatedAt: mapDateTime(json, r'fileCreatedAt', r''),
         fileModifiedAt: mapDateTime(json, r'fileModifiedAt', r''),
+        height: mapValueOfType<int>(json, r'height'),
         id: mapValueOfType<String>(json, r'id')!,
         isFavorite: mapValueOfType<bool>(json, r'isFavorite')!,
         libraryId: mapValueOfType<String>(json, r'libraryId'),
@@ -187,6 +208,7 @@ class SyncAssetV1 {
         thumbhash: mapValueOfType<String>(json, r'thumbhash'),
         type: AssetTypeEnum.fromJson(json[r'type'])!,
         visibility: AssetVisibility.fromJson(json[r'visibility'])!,
+        width: mapValueOfType<int>(json, r'width'),
       );
     }
     return null;
@@ -239,6 +261,7 @@ class SyncAssetV1 {
     'duration',
     'fileCreatedAt',
     'fileModifiedAt',
+    'height',
     'id',
     'isFavorite',
     'libraryId',
@@ -250,6 +273,7 @@ class SyncAssetV1 {
     'thumbhash',
     'type',
     'visibility',
+    'width',
   };
 }
 

mobile/packages/ui/lib/immich_ui.dart

@@ -1,3 +1,10 @@
-export 'src/buttons/close_button.dart';
-export 'src/buttons/icon_button.dart';
+export 'src/components/close_button.dart';
+export 'src/components/form.dart';
+export 'src/components/icon_button.dart';
+export 'src/components/password_input.dart';
+export 'src/components/text_button.dart';
+export 'src/components/text_input.dart';
+export 'src/constants.dart';
+export 'src/theme.dart';
+export 'src/translation.dart';
 export 'src/types.dart';

mobile/packages/ui/lib/src/components/close_button.dart

@@ -1,15 +1,16 @@
 import 'package:flutter/material.dart';
-import 'package:immich_ui/src/buttons/icon_button.dart';
 import 'package:immich_ui/src/types.dart';
 
+import 'icon_button.dart';
+
 class ImmichCloseButton extends StatelessWidget {
-  final VoidCallback? onTap;
+  final VoidCallback? onPressed;
   final ImmichVariant variant;
   final ImmichColor color;
 
   const ImmichCloseButton({
     super.key,
-    this.onTap,
+    this.onPressed,
     this.color = ImmichColor.primary,
     this.variant = ImmichVariant.ghost,
   });
@@ -20,6 +21,6 @@ class ImmichCloseButton extends StatelessWidget {
         icon: Icons.close,
         color: color,
         variant: variant,
-        onTap: onTap ?? () => Navigator.of(context).pop(),
+        onPressed: onPressed ?? () => Navigator.of(context).pop(),
       );
 }

mobile/packages/ui/lib/src/components/form.dart

@@ -0,0 +1,98 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:immich_ui/immich_ui.dart';
+import 'package:immich_ui/src/internal.dart';
+
+class ImmichForm extends StatefulWidget {
+  final String? submitText;
+  final IconData? submitIcon;
+  final FutureOr<void> Function()? onSubmit;
+  final Widget child;
+
+  const ImmichForm({
+    super.key,
+    this.submitText,
+    this.submitIcon,
+    required this.onSubmit,
+    required this.child,
+  });
+
+  @override
+  State<ImmichForm> createState() => ImmichFormState();
+
+  static ImmichFormState of(BuildContext context) {
+    final scope = context.dependOnInheritedWidgetOfExactType<_ImmichFormScope>();
+    if (scope == null) {
+      throw FlutterError(
+        'ImmichForm.of() called with a context that does not contain an ImmichForm.\n'
+        'No ImmichForm ancestor could be found starting from the context that was passed to '
+        'ImmichForm.of(). This usually happens when the context provided is '
+        'from a widget above the ImmichForm.\n'
+        'The context used was:\n'
+        '$context',
+      );
+    }
+    return scope._formState;
+  }
+}
+
+class ImmichFormState extends State<ImmichForm> {
+  final _formKey = GlobalKey<FormState>();
+  bool _isLoading = false;
+
+  FutureOr<void> submit() async {
+    final isValid = _formKey.currentState?.validate() ?? false;
+    if (!isValid) {
+      return;
+    }
+
+    setState(() {
+      _isLoading = true;
+    });
+
+    try {
+      await widget.onSubmit?.call();
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+        });
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final submitText = widget.submitText ?? context.translations.submit;
+    return _ImmichFormScope(
+      formState: this,
+      child: Form(
+        key: _formKey,
+        child: Column(
+          spacing: ImmichSpacing.md,
+          children: [
+            widget.child,
+            ImmichTextButton(
+              labelText: submitText,
+              icon: widget.submitIcon,
+              variant: ImmichVariant.filled,
+              loading: _isLoading,
+              onPressed: submit,
+              disabled: widget.onSubmit == null,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _ImmichFormScope extends InheritedWidget {
+  const _ImmichFormScope({required super.child, required ImmichFormState formState}) : _formState = formState;
+
+  final ImmichFormState _formState;
+
+  @override
+  bool updateShouldNotify(_ImmichFormScope oldWidget) => oldWidget._formState != _formState;
+}

mobile/packages/ui/lib/src/components/icon_button.dart

@@ -3,42 +3,48 @@ import 'package:immich_ui/src/types.dart';
 
 class ImmichIconButton extends StatelessWidget {
   final IconData icon;
-  final VoidCallback onTap;
+  final VoidCallback onPressed;
   final ImmichVariant variant;
   final ImmichColor color;
+  final bool disabled;
 
   const ImmichIconButton({
     super.key,
     required this.icon,
-    required this.onTap,
+    required this.onPressed,
     this.color = ImmichColor.primary,
     this.variant = ImmichVariant.filled,
+    this.disabled = false,
   });
 
   @override
   Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
     final background = switch (variant) {
       ImmichVariant.filled => switch (color) {
-          ImmichColor.primary => Theme.of(context).colorScheme.primary,
-          ImmichColor.secondary => Theme.of(context).colorScheme.secondary,
+          ImmichColor.primary => colorScheme.primary,
+          ImmichColor.secondary => colorScheme.secondary,
         },
       ImmichVariant.ghost => Colors.transparent,
     };
 
     final foreground = switch (variant) {
       ImmichVariant.filled => switch (color) {
-          ImmichColor.primary => Theme.of(context).colorScheme.onPrimary,
-          ImmichColor.secondary => Theme.of(context).colorScheme.onSecondary,
+          ImmichColor.primary => colorScheme.onPrimary,
+          ImmichColor.secondary => colorScheme.onSecondary,
         },
       ImmichVariant.ghost => switch (color) {
-          ImmichColor.primary => Theme.of(context).colorScheme.primary,
-          ImmichColor.secondary => Theme.of(context).colorScheme.secondary,
+          ImmichColor.primary => colorScheme.primary,
+          ImmichColor.secondary => colorScheme.secondary,
         },
     };
 
+    final effectiveOnPressed = disabled ? null : onPressed;
+
     return IconButton(
       icon: Icon(icon),
-      onPressed: onTap,
+      onPressed: effectiveOnPressed,
       style: IconButton.styleFrom(
         backgroundColor: background,
         foregroundColor: foreground,

mobile/packages/ui/lib/src/components/password_input.dart

@@ -0,0 +1,58 @@
+import 'package:flutter/material.dart';
+import 'package:immich_ui/src/components/text_input.dart';
+import 'package:immich_ui/src/internal.dart';
+
+class ImmichPasswordInput extends StatefulWidget {
+  final String? label;
+  final String? hintText;
+  final TextEditingController? controller;
+  final FocusNode? focusNode;
+  final String? Function(String?)? validator;
+  final void Function(BuildContext, String)? onSubmit;
+  final TextInputAction? keyboardAction;
+
+  const ImmichPasswordInput({
+    super.key,
+    this.controller,
+    this.focusNode,
+    this.label,
+    this.hintText,
+    this.validator,
+    this.onSubmit,
+    this.keyboardAction,
+  });
+
+  @override
+  State createState() => _ImmichPasswordInputState();
+}
+
+class _ImmichPasswordInputState extends State<ImmichPasswordInput> {
+  bool _visible = false;
+
+  void _toggleVisibility() {
+    setState(() {
+      _visible = !_visible;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ImmichTextInput(
+      key: widget.key,
+      label: widget.label ?? context.translations.password,
+      hintText: widget.hintText,
+      controller: widget.controller,
+      focusNode: widget.focusNode,
+      validator: widget.validator,
+      onSubmit: widget.onSubmit,
+      keyboardAction: widget.keyboardAction,
+      obscureText: !_visible,
+      suffixIcon: IconButton(
+        onPressed: _toggleVisibility,
+        icon: Icon(_visible ? Icons.visibility_off_rounded : Icons.visibility_rounded),
+      ),
+      autofillHints: [AutofillHints.password],
+      keyboardType: TextInputType.text,
+    );
+  }
+}

mobile/packages/ui/lib/src/components/text_button.dart

@@ -0,0 +1,87 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:immich_ui/src/constants.dart';
+import 'package:immich_ui/src/types.dart';
+
+class ImmichTextButton extends StatelessWidget {
+  final String labelText;
+  final IconData? icon;
+  final FutureOr<void> Function() onPressed;
+  final ImmichVariant variant;
+  final ImmichColor color;
+  final bool expanded;
+  final bool loading;
+  final bool disabled;
+
+  const ImmichTextButton({
+    super.key,
+    required this.labelText,
+    this.icon,
+    required this.onPressed,
+    this.variant = ImmichVariant.filled,
+    this.color = ImmichColor.primary,
+    this.expanded = true,
+    this.loading = false,
+    this.disabled = false,
+  });
+
+  Widget _buildButton(ImmichVariant variant) {
+    final Widget? effectiveIcon = loading
+        ? const SizedBox.square(
+            dimension: ImmichIconSize.md,
+            child: CircularProgressIndicator(strokeWidth: ImmichBorderWidth.lg),
+          )
+        : icon != null
+            ? Icon(icon, fontWeight: FontWeight.w600)
+            : null;
+    final hasIcon = effectiveIcon != null;
+
+    final label = Text(labelText, style: const TextStyle(fontSize: ImmichTextSize.body, fontWeight: FontWeight.bold));
+    final style = ElevatedButton.styleFrom(padding: const EdgeInsets.symmetric(vertical: ImmichSpacing.md));
+
+    final effectiveOnPressed = disabled || loading ? null : onPressed;
+
+    switch (variant) {
+      case ImmichVariant.filled:
+        if (hasIcon) {
+          return ElevatedButton.icon(
+            style: style,
+            onPressed: effectiveOnPressed,
+            icon: effectiveIcon,
+            label: label,
+          );
+        }
+
+        return ElevatedButton(
+          style: style,
+          onPressed: effectiveOnPressed,
+          child: label,
+        );
+      case ImmichVariant.ghost:
+        if (hasIcon) {
+          return TextButton.icon(
+            style: style,
+            onPressed: effectiveOnPressed,
+            icon: effectiveIcon,
+            label: label,
+          );
+        }
+
+        return TextButton(
+          style: style,
+          onPressed: effectiveOnPressed,
+          child: label,
+        );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final button = _buildButton(variant);
+    if (expanded) {
+      return SizedBox(width: double.infinity, child: button);
+    }
+    return button;
+  }
+}

mobile/packages/ui/lib/src/components/text_input.dart

@@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+
+class ImmichTextInput extends StatefulWidget {
+  final String label;
+  final String? hintText;
+  final TextEditingController? controller;
+  final FocusNode? focusNode;
+  final String? Function(String?)? validator;
+  final void Function(BuildContext, String)? onSubmit;
+  final TextInputType keyboardType;
+  final TextInputAction? keyboardAction;
+  final List<String>? autofillHints;
+  final Widget? suffixIcon;
+  final bool obscureText;
+
+  const ImmichTextInput({
+    super.key,
+    this.controller,
+    this.focusNode,
+    required this.label,
+    this.hintText,
+    this.validator,
+    this.onSubmit,
+    this.keyboardType = TextInputType.text,
+    this.keyboardAction,
+    this.autofillHints,
+    this.suffixIcon,
+    this.obscureText = false,
+  });
+
+  @override
+  State createState() => _ImmichTextInputState();
+}
+
+class _ImmichTextInputState extends State<ImmichTextInput> {
+  late final FocusNode _focusNode;
+  String? _error;
+
+  @override
+  void initState() {
+    super.initState();
+    _focusNode = widget.focusNode ?? FocusNode();
+  }
+
+  @override
+  void dispose() {
+    if (widget.focusNode == null) {
+      _focusNode.dispose();
+    }
+    super.dispose();
+  }
+
+  String? _validateInput(String? value) {
+    setState(() {
+      _error = widget.validator?.call(value);
+    });
+    return null;
+  }
+
+  bool get _hasError => _error != null && _error!.isNotEmpty;
+
+  @override
+  Widget build(BuildContext context) {
+    final themeData = Theme.of(context);
+
+    return TextFormField(
+      controller: widget.controller,
+      focusNode: _focusNode,
+      decoration: InputDecoration(
+        hintText: widget.hintText,
+        labelText: widget.label,
+        labelStyle: themeData.inputDecorationTheme.labelStyle?.copyWith(
+          color: _hasError ? themeData.colorScheme.error : null,
+        ),
+        errorText: _error,
+        suffixIcon: widget.suffixIcon,
+      ),
+      obscureText: widget.obscureText,
+      validator: _validateInput,
+      keyboardType: widget.keyboardType,
+      textInputAction: widget.keyboardAction,
+      autofillHints: widget.autofillHints,
+      onTap: () => setState(() => _error = null),
+      onTapOutside: (_) => _focusNode.unfocus(),
+      onFieldSubmitted: (value) => widget.onSubmit?.call(context, value),
+    );
+  }
+}

mobile/packages/ui/lib/src/constants.dart

@@ -0,0 +1,199 @@
+/// Spacing constants for gaps between widgets
+abstract class ImmichSpacing {
+  const ImmichSpacing._();
+
+  /// Extra small spacing: 4.0
+  static const double xs = 4.0;
+
+  /// Small spacing: 8.0
+  static const double sm = 8.0;
+
+  /// Medium spacing (default): 12.0
+  static const double md = 12.0;
+
+  /// Large spacing: 16.0
+  static const double lg = 16.0;
+
+  /// Extra large spacing: 24.0
+  static const double xl = 24.0;
+
+  /// Extra extra large spacing: 32.0
+  static const double xxl = 32.0;
+
+  /// Extra extra extra large spacing: 48.0
+  static const double xxxl = 48.0;
+}
+
+/// Border radius constants for consistent rounded corners
+abstract class ImmichRadius {
+  const ImmichRadius._();
+
+  /// No radius: 0.0
+  static const double none = 0.0;
+
+  /// Extra small radius: 4.0
+  static const double xs = 4.0;
+
+  /// Small radius: 8.0
+  static const double sm = 8.0;
+
+  /// Medium radius (default): 12.0
+  static const double md = 12.0;
+
+  /// Large radius: 16.0
+  static const double lg = 16.0;
+
+  /// Extra large radius: 20.0
+  static const double xl = 20.0;
+
+  /// Extra extra large radius: 24.0
+  static const double xxl = 24.0;
+
+  /// Full circular radius: infinity
+  static const double full = double.infinity;
+}
+
+/// Icon size constants for consistent icon sizing
+abstract class ImmichIconSize {
+  const ImmichIconSize._();
+
+  /// Extra small icon: 16.0
+  static const double xs = 16.0;
+
+  /// Small icon: 20.0
+  static const double sm = 20.0;
+
+  /// Medium icon (default): 24.0
+  static const double md = 24.0;
+
+  /// Large icon: 32.0
+  static const double lg = 32.0;
+
+  /// Extra large icon: 40.0
+  static const double xl = 40.0;
+
+  /// Extra extra large icon: 48.0
+  static const double xxl = 48.0;
+}
+
+/// Animation duration constants for consistent timing
+abstract class ImmichDuration {
+  const ImmichDuration._();
+
+  /// Extra fast: 100ms
+  static const Duration extraFast = Duration(milliseconds: 100);
+
+  /// Fast: 150ms
+  static const Duration fast = Duration(milliseconds: 150);
+
+  /// Normal: 200ms
+  static const Duration normal = Duration(milliseconds: 200);
+
+  /// Moderate: 300ms
+  static const Duration moderate = Duration(milliseconds: 300);
+
+  /// Slow: 500ms
+  static const Duration slow = Duration(milliseconds: 500);
+
+  /// Extra slow: 700ms
+  static const Duration extraSlow = Duration(milliseconds: 700);
+}
+
+/// Elevation constants for consistent shadows and depth
+abstract class ImmichElevation {
+  const ImmichElevation._();
+
+  /// No elevation: 0.0
+  static const double none = 0.0;
+
+  /// Extra small elevation: 1.0
+  static const double xs = 1.0;
+
+  /// Small elevation: 2.0
+  static const double sm = 2.0;
+
+  /// Medium elevation: 4.0
+  static const double md = 4.0;
+
+  /// Large elevation: 8.0
+  static const double lg = 8.0;
+
+  /// Extra large elevation: 12.0
+  static const double xl = 12.0;
+
+  /// Extra extra large elevation: 16.0
+  static const double xxl = 16.0;
+}
+
+/// Border width constants (similar to Tailwind's border-* scale)
+abstract class ImmichBorderWidth {
+  const ImmichBorderWidth._();
+
+  /// No border: 0.0
+  static const double none = 0.0;
+
+  /// Hairline border: 0.5
+  static const double hairline = 0.5;
+
+  /// Default border: 1.0 (border)
+  static const double base = 1.0;
+
+  /// Medium border: 2.0 (border-2)
+  static const double md = 2.0;
+
+  /// Large border: 3.0 (border-4)
+  static const double lg = 3.0;
+
+  /// Extra large border: 4.0
+  static const double xl = 4.0;
+}
+
+/// Text size constants with semantic HTML-like naming
+/// These follow a type scale for harmonious text hierarchy
+abstract class ImmichTextSize {
+  const ImmichTextSize._();
+
+  /// Caption text: 10.0
+  /// Use for: Tiny labels, legal text, metadata, timestamps
+  static const double caption = 10.0;
+
+  /// Label text: 12.0
+  /// Use for: Form labels, secondary text, helper text
+  static const double label = 12.0;
+
+  /// Body text: 14.0 (default)
+  /// Use for: Main body text, paragraphs, default UI text
+  static const double body = 14.0;
+
+  /// Body emphasized: 16.0
+  /// Use for: Emphasized body text, button labels, tabs
+  static const double bodyLarge = 16.0;
+
+  /// Heading 6: 18.0 (smallest heading)
+  /// Use for: Subtitles, card titles, section headers
+  static const double h6 = 18.0;
+
+  /// Heading 5: 20.0
+  /// Use for: Small headings, prominent labels
+  static const double h5 = 20.0;
+
+  /// Heading 4: 24.0
+  /// Use for: Page titles, dialog titles
+  static const double h4 = 24.0;
+
+  /// Heading 3: 30.0
+  /// Use for: Section headings, large headings
+  static const double h3 = 30.0;
+
+  /// Heading 2: 36.0
+  /// Use for: Major section headings
+  static const double h2 = 36.0;
+
+  /// Heading 1: 48.0 (largest heading)
+  /// Use for: Page hero headings, main titles
+  static const double h1 = 48.0;
+
+  /// Display text: 60.0
+  /// Use for: Hero numbers, splash screens, extra large display
+  static const double display = 60.0;
+}

mobile/packages/ui/lib/src/internal.dart

@@ -0,0 +1,6 @@
+import 'package:flutter/material.dart';
+import 'package:immich_ui/src/translation.dart';
+
+extension TranslationHelper on BuildContext {
+  ImmichTranslations get translations => ImmichTranslationProvider.of(this);
+}

mobile/packages/ui/lib/src/theme.dart

@@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+import 'package:immich_ui/src/constants.dart';
+
+class ImmichThemeProvider extends StatelessWidget {
+  final ColorScheme colorScheme;
+  final Widget child;
+
+  const ImmichThemeProvider({super.key, required this.colorScheme, required this.child});
+
+  @override
+  Widget build(BuildContext context) {
+    return Theme(
+      data: Theme.of(context).copyWith(
+        colorScheme: colorScheme,
+        brightness: colorScheme.brightness,
+        inputDecorationTheme: InputDecorationTheme(
+          floatingLabelBehavior: FloatingLabelBehavior.always,
+          focusedBorder: OutlineInputBorder(
+            borderSide: BorderSide(color: colorScheme.primary),
+            borderRadius: const BorderRadius.all(Radius.circular(ImmichRadius.md)),
+          ),
+          enabledBorder: OutlineInputBorder(
+            borderSide: BorderSide(color: colorScheme.primary),
+            borderRadius: const BorderRadius.all(Radius.circular(ImmichRadius.md)),
+          ),
+          errorBorder: OutlineInputBorder(
+            borderSide: BorderSide(color: colorScheme.error),
+            borderRadius: const BorderRadius.all(Radius.circular(ImmichRadius.md)),
+          ),
+          focusedErrorBorder: OutlineInputBorder(
+            borderSide: BorderSide(color: colorScheme.error),
+            borderRadius: const BorderRadius.all(Radius.circular(ImmichRadius.md)),
+          ),
+          labelStyle: TextStyle(color: colorScheme.primary, fontWeight: FontWeight.w600),
+          hintStyle: const TextStyle(fontSize: ImmichTextSize.body),
+          errorStyle: TextStyle(color: colorScheme.error, fontWeight: FontWeight.w600),
+        ),
+      ),
+      child: child,
+    );
+  }
+}

mobile/packages/ui/lib/src/translation.dart

@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+
+class ImmichTranslations {
+  late String submit;
+  late String password;
+
+  ImmichTranslations({String? submit, String? password}) {
+    this.submit = submit ?? 'Submit';
+    this.password = password ?? 'Password';
+  }
+}
+
+class ImmichTranslationProvider extends InheritedWidget {
+  final ImmichTranslations? translations;
+
+  const ImmichTranslationProvider({
+    super.key,
+    this.translations,
+    required super.child,
+  });
+
+  static ImmichTranslations of(BuildContext context) {
+    final provider = context.dependOnInheritedWidgetOfExactType<ImmichTranslationProvider>();
+    return provider?.translations ?? ImmichTranslations();
+  }
+
+  @override
+  bool updateShouldNotify(covariant ImmichTranslationProvider oldWidget) {
+    return oldWidget.translations != translations;
+  }
+}

mobile/test/domain/repositories/sync_stream_repository_test.dart

@@ -0,0 +1,185 @@
+import 'package:drift/drift.dart' as drift;
+import 'package:drift/native.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
+import 'package:openapi/api.dart';
+
+SyncUserV1 _createUser({String id = 'user-1'}) {
+  return SyncUserV1(
+    id: id,
+    name: 'Test User',
+    email: 'test@test.com',
+    deletedAt: null,
+    avatarColor: null,
+    hasProfileImage: false,
+    profileChangedAt: DateTime(2024, 1, 1),
+  );
+}
+
+SyncAssetV1 _createAsset({
+  required String id,
+  required String checksum,
+  required String fileName,
+  String ownerId = 'user-1',
+  int? width,
+  int? height,
+}) {
+  return SyncAssetV1(
+    id: id,
+    checksum: checksum,
+    originalFileName: fileName,
+    type: AssetTypeEnum.IMAGE,
+    ownerId: ownerId,
+    isFavorite: false,
+    fileCreatedAt: DateTime(2024, 1, 1),
+    fileModifiedAt: DateTime(2024, 1, 1),
+    localDateTime: DateTime(2024, 1, 1),
+    visibility: AssetVisibility.timeline,
+    width: width,
+    height: height,
+    deletedAt: null,
+    duration: null,
+    libraryId: null,
+    livePhotoVideoId: null,
+    stackId: null,
+    thumbhash: null,
+  );
+}
+
+SyncAssetExifV1 _createExif({
+  required String assetId,
+  required int width,
+  required int height,
+  required String orientation,
+}) {
+  return SyncAssetExifV1(
+    assetId: assetId,
+    exifImageWidth: width,
+    exifImageHeight: height,
+    orientation: orientation,
+    city: null,
+    country: null,
+    dateTimeOriginal: null,
+    description: null,
+    exposureTime: null,
+    fNumber: null,
+    fileSizeInByte: null,
+    focalLength: null,
+    fps: null,
+    iso: null,
+    latitude: null,
+    lensModel: null,
+    longitude: null,
+    make: null,
+    model: null,
+    modifyDate: null,
+    profileDescription: null,
+    projectionType: null,
+    rating: null,
+    state: null,
+    timeZone: null,
+  );
+}
+
+void main() {
+  late Drift db;
+  late SyncStreamRepository sut;
+
+  setUp(() async {
+    db = Drift(drift.DatabaseConnection(NativeDatabase.memory(), closeStreamsSynchronously: true));
+    sut = SyncStreamRepository(db);
+  });
+
+  tearDown(() async {
+    await db.close();
+  });
+
+  group('SyncStreamRepository - Dimension swapping based on orientation', () {
+    test('swaps dimensions for asset with rotated orientation', () async {
+      final flippedOrientations = ['5', '6', '7', '8', '90', '-90'];
+
+      for (final orientation in flippedOrientations) {
+        final assetId = 'asset-$orientation-degrees';
+
+        await sut.updateUsersV1([_createUser()]);
+
+        final asset = _createAsset(
+          id: assetId,
+          checksum: 'checksum-$orientation',
+          fileName: 'rotated_$orientation.jpg',
+        );
+        await sut.updateAssetsV1([asset]);
+
+        final exif = _createExif(
+          assetId: assetId,
+          width: 1920,
+          height: 1080,
+          orientation: orientation, // EXIF orientation value for 90 degrees CW
+        );
+        await sut.updateAssetsExifV1([exif]);
+
+        final query = db.remoteAssetEntity.select()..where((tbl) => tbl.id.equals(assetId));
+        final result = await query.getSingle();
+
+        expect(result.width, equals(1080));
+        expect(result.height, equals(1920));
+      }
+    });
+
+    test('does not swap dimensions for asset with normal orientation', () async {
+      final nonFlippedOrientations = ['1', '2', '3', '4'];
+      for (final orientation in nonFlippedOrientations) {
+        final assetId = 'asset-$orientation-degrees';
+
+        await sut.updateUsersV1([_createUser()]);
+
+        final asset = _createAsset(id: assetId, checksum: 'checksum-$orientation', fileName: 'normal_$orientation.jpg');
+        await sut.updateAssetsV1([asset]);
+
+        final exif = _createExif(
+          assetId: assetId,
+          width: 1920,
+          height: 1080,
+          orientation: orientation, // EXIF orientation value for normal
+        );
+        await sut.updateAssetsExifV1([exif]);
+
+        final query = db.remoteAssetEntity.select()..where((tbl) => tbl.id.equals(assetId));
+        final result = await query.getSingle();
+
+        expect(result.width, equals(1920));
+        expect(result.height, equals(1080));
+      }
+    });
+
+    test('does not update dimensions if asset already has width and height', () async {
+      const assetId = 'asset-with-dimensions';
+      const existingWidth = 1920;
+      const existingHeight = 1080;
+      const exifWidth = 3840;
+      const exifHeight = 2160;
+
+      await sut.updateUsersV1([_createUser()]);
+
+      final asset = _createAsset(
+        id: assetId,
+        checksum: 'checksum-with-dims',
+        fileName: 'with_dimensions.jpg',
+        width: existingWidth,
+        height: existingHeight,
+      );
+      await sut.updateAssetsV1([asset]);
+
+      final exif = _createExif(assetId: assetId, width: exifWidth, height: exifHeight, orientation: '6');
+      await sut.updateAssetsExifV1([exif]);
+
+      // Verify the asset still has original dimensions (not updated from EXIF)
+      final query = db.remoteAssetEntity.select()..where((tbl) => tbl.id.equals(assetId));
+      final result = await query.getSingle();
+
+      expect(result.width, equals(existingWidth), reason: 'Width should remain as originally set');
+      expect(result.height, equals(existingHeight), reason: 'Height should remain as originally set');
+    });
+  });
+}

mobile/test/domain/services/asset.service_test.dart

@@ -166,8 +166,8 @@ void main() {
       expect(result, 1080 / 1920);
     });
 
-    test('handles various flipped EXIF orientations correctly', () async {
-      final flippedOrientations = ['5', '6', '7', '8', '90', '-90'];
+    test('should not flip remote asset dimensions', () async {
+      final flippedOrientations = ['1', '2', '3', '4', '5', '6', '7', '8', '90', '-90'];
 
       for (final orientation in flippedOrientations) {
         final remoteAsset = TestUtils.createRemoteAsset(id: 'remote-$orientation', width: 1920, height: 1080);
@@ -178,23 +178,7 @@ void main() {
 
         final result = await sut.getAspectRatio(remoteAsset);
 
-        expect(result, 1080 / 1920, reason: 'Orientation $orientation should flip dimensions');
-      }
-    });
-
-    test('handles various non-flipped EXIF orientations correctly', () async {
-      final nonFlippedOrientations = ['1', '2', '3', '4'];
-
-      for (final orientation in nonFlippedOrientations) {
-        final remoteAsset = TestUtils.createRemoteAsset(id: 'remote-$orientation', width: 1920, height: 1080);
-
-        final exif = ExifInfo(orientation: orientation);
-
-        when(() => mockRemoteAssetRepository.getExif('remote-$orientation')).thenAnswer((_) async => exif);
-
-        final result = await sut.getAspectRatio(remoteAsset);
-
-        expect(result, 1920 / 1080, reason: 'Orientation $orientation should NOT flip dimensions');
+        expect(result, 1920 / 1080, reason: 'Should not flipped remote asset dimensions for orientation $orientation');
       }
     });
   });

mobile/test/domain/services/local_sync_service_test.dart

@@ -153,7 +153,14 @@ void main() {
         'album-a': [platformAsset],
       });
 
-      verify(() => mockTrashedLocalAssetRepository.processTrashSnapshot(any())).called(1);
+      final trashedSnapshot =
+          verify(() => mockTrashedLocalAssetRepository.processTrashSnapshot(captureAny())).captured.single
+              as Iterable<TrashedAsset>;
+      expect(trashedSnapshot.length, 1);
+      final trashedEntry = trashedSnapshot.single;
+      expect(trashedEntry.albumId, 'album-a');
+      expect(trashedEntry.asset.id, platformAsset.id);
+      expect(trashedEntry.asset.name, platformAsset.name);
       verify(() => mockTrashedLocalAssetRepository.getToTrash()).called(1);
 
       verify(() => mockLocalFilesManager.restoreAssetsFromTrash(any())).called(1);
@@ -174,6 +181,10 @@ void main() {
 
       await sut.processTrashedAssets({});
 
+      final trashedSnapshot =
+          verify(() => mockTrashedLocalAssetRepository.processTrashSnapshot(captureAny())).captured.single
+              as Iterable<TrashedAsset>;
+      expect(trashedSnapshot, isEmpty);
       verifyNever(() => mockLocalFilesManager.restoreAssetsFromTrash(any()));
       verifyNever(() => mockTrashedLocalAssetRepository.applyRestoredAssets(any()));
     });

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

@@ -17,6 +17,7 @@ import 'schema_v11.dart' as v11;
 import 'schema_v12.dart' as v12;
 import 'schema_v13.dart' as v13;
 import 'schema_v14.dart' as v14;
+import 'schema_v15.dart' as v15;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -50,10 +51,28 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v13.DatabaseAtV13(db);
       case 14:
         return v14.DatabaseAtV14(db);
+      case 15:
+        return v15.DatabaseAtV15(db);
       default:
         throw MissingSchemaException(version, versions);
     }
   }
 
-  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14];
+  static const versions = const [
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    7,
+    8,
+    9,
+    10,
+    11,
+    12,
+    13,
+    14,
+    15,
+  ];
 }

mobile/test/fixtures/sync_stream.stub.dart

@@ -94,25 +94,11 @@ abstract final class SyncStreamStub {
     required String ack,
     DateTime? trashedAt,
   }) {
-    return _assetV1(
-      id: id,
-      checksum: checksum,
-      deletedAt: trashedAt ?? DateTime(2025, 1, 1),
-      ack: ack,
-    );
+    return _assetV1(id: id, checksum: checksum, deletedAt: trashedAt ?? DateTime(2025, 1, 1), ack: ack);
   }
 
-  static SyncEvent assetModified({
-    required String id,
-    required String checksum,
-    required String ack,
-  }) {
-    return _assetV1(
-      id: id,
-      checksum: checksum,
-      deletedAt: null,
-      ack: ack,
-    );
+  static SyncEvent assetModified({required String id, required String checksum, required String ack}) {
+    return _assetV1(id: id, checksum: checksum, deletedAt: null, ack: ack);
   }
 
   static SyncEvent _assetV1({
@@ -140,6 +126,8 @@ abstract final class SyncStreamStub {
         thumbhash: null,
         type: AssetTypeEnum.IMAGE,
         visibility: AssetVisibility.timeline,
+        width: null,
+        height: null,
       ),
       ack: ack,
     );

mobile/test/modules/utils/openapi_patching_test.dart

@@ -45,5 +45,17 @@ void main() {
       addDefault(value, keys, defaultValue);
       expect(value['alpha']['beta'], 'gamma');
     });
+
+    test('addDefault with null', () {
+      dynamic value = jsonDecode("""
+{
+  "download": {
+    "archiveSize": 4294967296,
+    "includeEmbeddedVideos": false
+  }
+}
+""");
+      expect(value['download']['unknownKey'], isNull);
+    });
   });
 }

mobile/test/services/action.service_test.dart

@@ -0,0 +1,118 @@
+import 'package:drift/drift.dart' as drift;
+import 'package:drift/native.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/services/store.service.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
+import 'package:immich_mobile/repositories/download.repository.dart';
+import 'package:immich_mobile/services/action.service.dart';
+import 'package:mocktail/mocktail.dart';
+
+import '../infrastructure/repository.mock.dart';
+import '../repository.mocks.dart';
+
+class MockDownloadRepository extends Mock implements DownloadRepository {}
+
+void main() {
+  late ActionService sut;
+
+  late MockAssetApiRepository assetApiRepository;
+  late MockRemoteAssetRepository remoteAssetRepository;
+  late MockDriftLocalAssetRepository localAssetRepository;
+  late MockDriftAlbumApiRepository albumApiRepository;
+  late MockRemoteAlbumRepository remoteAlbumRepository;
+  late MockTrashedLocalAssetRepository trashedLocalAssetRepository;
+  late MockAssetMediaRepository assetMediaRepository;
+  late MockDownloadRepository downloadRepository;
+
+  late Drift db;
+
+  setUpAll(() async {
+    TestWidgetsFlutterBinding.ensureInitialized();
+    debugDefaultTargetPlatformOverride = TargetPlatform.android;
+
+    db = Drift(drift.DatabaseConnection(NativeDatabase.memory(), closeStreamsSynchronously: true));
+    await StoreService.init(storeRepository: DriftStoreRepository(db));
+  });
+
+  tearDownAll(() async {
+    debugDefaultTargetPlatformOverride = null;
+    await Store.clear();
+    await db.close();
+  });
+
+  setUp(() {
+    assetApiRepository = MockAssetApiRepository();
+    remoteAssetRepository = MockRemoteAssetRepository();
+    localAssetRepository = MockDriftLocalAssetRepository();
+    albumApiRepository = MockDriftAlbumApiRepository();
+    remoteAlbumRepository = MockRemoteAlbumRepository();
+    trashedLocalAssetRepository = MockTrashedLocalAssetRepository();
+    assetMediaRepository = MockAssetMediaRepository();
+    downloadRepository = MockDownloadRepository();
+
+    sut = ActionService(
+      assetApiRepository,
+      remoteAssetRepository,
+      localAssetRepository,
+      albumApiRepository,
+      remoteAlbumRepository,
+      trashedLocalAssetRepository,
+      assetMediaRepository,
+      downloadRepository,
+    );
+  });
+
+  tearDown(() async {
+    await Store.clear();
+  });
+
+  group('ActionService.deleteLocal', () {
+    test('routes deleted ids to trashed repository when Android trash handling is enabled', () async {
+      await Store.put(StoreKey.manageLocalMediaAndroid, true);
+      const ids = ['a', 'b'];
+
+      when(() => assetMediaRepository.deleteAll(ids)).thenAnswer((_) async => ids);
+      when(() => trashedLocalAssetRepository.applyTrashedAssets(ids)).thenAnswer((_) async {});
+
+      final result = await sut.deleteLocal(ids);
+
+      expect(result, ids.length);
+      verify(() => assetMediaRepository.deleteAll(ids)).called(1);
+      verify(() => trashedLocalAssetRepository.applyTrashedAssets(ids)).called(1);
+      verifyNever(() => localAssetRepository.delete(any()));
+    });
+
+    test('deletes locally when Android trash handling is disabled', () async {
+      await Store.put(StoreKey.manageLocalMediaAndroid, false);
+      const ids = ['c'];
+
+      when(() => assetMediaRepository.deleteAll(ids)).thenAnswer((_) async => ids);
+      when(() => localAssetRepository.delete(ids)).thenAnswer((_) async {});
+
+      final result = await sut.deleteLocal(ids);
+
+      expect(result, ids.length);
+      verify(() => assetMediaRepository.deleteAll(ids)).called(1);
+      verify(() => localAssetRepository.delete(ids)).called(1);
+      verifyNever(() => trashedLocalAssetRepository.applyTrashedAssets(any()));
+    });
+
+    test('short-circuits when nothing was deleted', () async {
+      await Store.put(StoreKey.manageLocalMediaAndroid, true);
+      const ids = ['x'];
+
+      when(() => assetMediaRepository.deleteAll(ids)).thenAnswer((_) async => <String>[]);
+
+      final result = await sut.deleteLocal(ids);
+
+      expect(result, 0);
+      verify(() => assetMediaRepository.deleteAll(ids)).called(1);
+      verifyNever(() => trashedLocalAssetRepository.applyTrashedAssets(any()));
+      verifyNever(() => localAssetRepository.delete(any()));
+    });
+  });
+}