feat(mobile): sync local asset width & height from platform (#18994)

* add width and height to sqlite entities

* sync width & height from platform

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt

@@ -85,6 +85,8 @@ data class PlatformAsset (
   val type: Long,
   val createdAt: Long? = null,
   val updatedAt: Long? = null,
+  val width: Long? = null,
+  val height: Long? = null,
   val durationInSeconds: Long
 )
  {
@@ -95,8 +97,10 @@ data class PlatformAsset (
       val type = pigeonVar_list[2] as Long
       val createdAt = pigeonVar_list[3] as Long?
       val updatedAt = pigeonVar_list[4] as Long?
-      val durationInSeconds = pigeonVar_list[5] as Long
+      val width = pigeonVar_list[5] as Long?
-      return PlatformAsset(id, name, type, createdAt, updatedAt, durationInSeconds)
+      val height = pigeonVar_list[6] as Long?
+      val durationInSeconds = pigeonVar_list[7] as Long
+      return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds)
     }
   }
   fun toList(): List<Any?> {
@@ -106,6 +110,8 @@ data class PlatformAsset (
       type,
       createdAt,
       updatedAt,
+      width,
+      height,
       durationInSeconds,
     )
   }

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt

@@ -37,6 +37,8 @@ open class NativeSyncApiImplBase(context: Context) {
       MediaStore.MediaColumns.DATE_MODIFIED,
       MediaStore.Files.FileColumns.MEDIA_TYPE,
       MediaStore.MediaColumns.BUCKET_ID,
+      MediaStore.MediaColumns.WIDTH,
+      MediaStore.MediaColumns.HEIGHT,
       MediaStore.MediaColumns.DURATION
     )
 
@@ -68,6 +70,8 @@ open class NativeSyncApiImplBase(context: Context) {
         val dateModifiedColumn = c.getColumnIndexOrThrow(MediaStore.MediaColumns.DATE_MODIFIED)
         val mediaTypeColumn = c.getColumnIndexOrThrow(MediaStore.Files.FileColumns.MEDIA_TYPE)
         val bucketIdColumn = c.getColumnIndexOrThrow(MediaStore.MediaColumns.BUCKET_ID)
+        val widthColumn = c.getColumnIndexOrThrow(MediaStore.MediaColumns.WIDTH)
+        val heightColumn = c.getColumnIndexOrThrow(MediaStore.MediaColumns.HEIGHT)
         val durationColumn = c.getColumnIndexOrThrow(MediaStore.MediaColumns.DURATION)
 
         while (c.moveToNext()) {
@@ -86,12 +90,23 @@ open class NativeSyncApiImplBase(context: Context) {
             ?: c.getLong(dateAddedColumn)
           // Date modified is seconds since epoch
           val modifiedAt = c.getLong(dateModifiedColumn)
+          val width = c.getInt(widthColumn).toLong()
+          val height = c.getInt(heightColumn).toLong()
           // Duration is milliseconds
           val duration = if (mediaType == MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE) 0
           else c.getLong(durationColumn) / 1000
           val bucketId = c.getString(bucketIdColumn)
 
-          val asset = PlatformAsset(id, name, mediaType.toLong(), createdAt, modifiedAt, duration)
+          val asset = PlatformAsset(
+            id,
+            name,
+            mediaType.toLong(),
+            createdAt,
+            modifiedAt,
+            width,
+            height,
+            duration
+          )
           yield(AssetResult.ValidAsset(asset, bucketId))
         }
       }

mobile/ios/Runner/Sync/Messages.g.swift

@@ -135,6 +135,8 @@ struct PlatformAsset: Hashable {
   var type: Int64
   var createdAt: Int64? = nil
   var updatedAt: Int64? = nil
+  var width: Int64? = nil
+  var height: Int64? = nil
   var durationInSeconds: Int64
 
 
@@ -145,7 +147,9 @@ struct PlatformAsset: Hashable {
     let type = pigeonVar_list[2] as! Int64
     let createdAt: Int64? = nilOrValue(pigeonVar_list[3])
     let updatedAt: Int64? = nilOrValue(pigeonVar_list[4])
-    let durationInSeconds = pigeonVar_list[5] as! Int64
+    let width: Int64? = nilOrValue(pigeonVar_list[5])
+    let height: Int64? = nilOrValue(pigeonVar_list[6])
+    let durationInSeconds = pigeonVar_list[7] as! Int64
 
     return PlatformAsset(
       id: id,
@@ -153,6 +157,8 @@ struct PlatformAsset: Hashable {
       type: type,
       createdAt: createdAt,
       updatedAt: updatedAt,
+      width: width,
+      height: height,
       durationInSeconds: durationInSeconds
     )
   }
@@ -163,6 +169,8 @@ struct PlatformAsset: Hashable {
       type,
       createdAt,
       updatedAt,
+      width,
+      height,
       durationInSeconds,
     ]
   }

mobile/ios/Runner/Sync/MessagesImpl.swift

@@ -25,7 +25,9 @@ extension PHAsset {
       type: Int64(mediaType.rawValue),
       createdAt: creationDate.map { Int64($0.timeIntervalSince1970) },
       updatedAt: modificationDate.map { Int64($0.timeIntervalSince1970) },
-      durationInSeconds: Int64(duration)
+      width: Int64(pixelWidth),
+      height: Int64(pixelHeight),
+      durationInSeconds: Int64(duration),
     )
   }
 }
@@ -156,8 +158,6 @@ class NativeSyncApiImpl: NativeSyncApi {
             id: asset.localIdentifier,
             name: "",
             type: 0,
-            createdAt: nil,
-            updatedAt: nil,
             durationInSeconds: 0
           )
           if (updatedAssets.contains(AssetWrapper(with: predicate))) {

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

@@ -373,6 +373,8 @@ extension on Iterable<PlatformAsset> {
         updatedAt: e.updatedAt == null
             ? DateTime.now()
             : DateTime.fromMillisecondsSinceEpoch(e.updatedAt! * 1000),
+        width: e.width,
+        height: e.height,
         durationInSeconds: e.durationInSeconds,
       ),
     ).toList();

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

@@ -14,6 +14,8 @@ typedef $$LocalAssetEntityTableCreateCompanionBuilder
   required i2.AssetType type,
   i0.Value<DateTime> createdAt,
   i0.Value<DateTime> updatedAt,
+  i0.Value<int?> width,
+  i0.Value<int?> height,
   i0.Value<int?> durationInSeconds,
   required String id,
   i0.Value<String?> checksum,
@@ -25,6 +27,8 @@ typedef $$LocalAssetEntityTableUpdateCompanionBuilder
   i0.Value<i2.AssetType> type,
   i0.Value<DateTime> createdAt,
   i0.Value<DateTime> updatedAt,
+  i0.Value<int?> width,
+  i0.Value<int?> height,
   i0.Value<int?> durationInSeconds,
   i0.Value<String> id,
   i0.Value<String?> checksum,
@@ -54,6 +58,12 @@ class $$LocalAssetEntityTableFilterComposer
   i0.ColumnFilters<DateTime> get updatedAt => $composableBuilder(
       column: $table.updatedAt, builder: (column) => i0.ColumnFilters(column));
 
+  i0.ColumnFilters<int> get width => $composableBuilder(
+      column: $table.width, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<int> get height => $composableBuilder(
+      column: $table.height, builder: (column) => i0.ColumnFilters(column));
+
   i0.ColumnFilters<int> get durationInSeconds => $composableBuilder(
       column: $table.durationInSeconds,
       builder: (column) => i0.ColumnFilters(column));
@@ -91,6 +101,12 @@ class $$LocalAssetEntityTableOrderingComposer
       column: $table.updatedAt,
       builder: (column) => i0.ColumnOrderings(column));
 
+  i0.ColumnOrderings<int> get width => $composableBuilder(
+      column: $table.width, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get height => $composableBuilder(
+      column: $table.height, builder: (column) => i0.ColumnOrderings(column));
+
   i0.ColumnOrderings<int> get durationInSeconds => $composableBuilder(
       column: $table.durationInSeconds,
       builder: (column) => i0.ColumnOrderings(column));
@@ -127,6 +143,12 @@ class $$LocalAssetEntityTableAnnotationComposer
   i0.GeneratedColumn<DateTime> get updatedAt =>
       $composableBuilder(column: $table.updatedAt, builder: (column) => column);
 
+  i0.GeneratedColumn<int> get width =>
+      $composableBuilder(column: $table.width, builder: (column) => column);
+
+  i0.GeneratedColumn<int> get height =>
+      $composableBuilder(column: $table.height, builder: (column) => column);
+
   i0.GeneratedColumn<int> get durationInSeconds => $composableBuilder(
       column: $table.durationInSeconds, builder: (column) => column);
 
@@ -173,6 +195,8 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
             i0.Value<i2.AssetType> type = const i0.Value.absent(),
             i0.Value<DateTime> createdAt = const i0.Value.absent(),
             i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            i0.Value<int?> width = const i0.Value.absent(),
+            i0.Value<int?> height = const i0.Value.absent(),
             i0.Value<int?> durationInSeconds = const i0.Value.absent(),
             i0.Value<String> id = const i0.Value.absent(),
             i0.Value<String?> checksum = const i0.Value.absent(),
@@ -183,6 +207,8 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
             type: type,
             createdAt: createdAt,
             updatedAt: updatedAt,
+            width: width,
+            height: height,
             durationInSeconds: durationInSeconds,
             id: id,
             checksum: checksum,
@@ -193,6 +219,8 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
             required i2.AssetType type,
             i0.Value<DateTime> createdAt = const i0.Value.absent(),
             i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            i0.Value<int?> width = const i0.Value.absent(),
+            i0.Value<int?> height = const i0.Value.absent(),
             i0.Value<int?> durationInSeconds = const i0.Value.absent(),
             required String id,
             i0.Value<String?> checksum = const i0.Value.absent(),
@@ -203,6 +231,8 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
             type: type,
             createdAt: createdAt,
             updatedAt: updatedAt,
+            width: width,
+            height: height,
             durationInSeconds: durationInSeconds,
             id: id,
             checksum: checksum,
@@ -268,6 +298,18 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
           type: i0.DriftSqlType.dateTime,
           requiredDuringInsert: false,
           defaultValue: i4.currentDateAndTime);
+  static const i0.VerificationMeta _widthMeta =
+      const i0.VerificationMeta('width');
+  @override
+  late final i0.GeneratedColumn<int> width = i0.GeneratedColumn<int>(
+      'width', aliasedName, true,
+      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+  static const i0.VerificationMeta _heightMeta =
+      const i0.VerificationMeta('height');
+  @override
+  late final i0.GeneratedColumn<int> height = i0.GeneratedColumn<int>(
+      'height', aliasedName, true,
+      type: i0.DriftSqlType.int, requiredDuringInsert: false);
   static const i0.VerificationMeta _durationInSecondsMeta =
       const i0.VerificationMeta('durationInSeconds');
   @override
@@ -301,6 +343,8 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
         type,
         createdAt,
         updatedAt,
+        width,
+        height,
         durationInSeconds,
         id,
         checksum,
@@ -331,6 +375,14 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
       context.handle(_updatedAtMeta,
           updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta));
     }
+    if (data.containsKey('width')) {
+      context.handle(
+          _widthMeta, width.isAcceptableOrUnknown(data['width']!, _widthMeta));
+    }
+    if (data.containsKey('height')) {
+      context.handle(_heightMeta,
+          height.isAcceptableOrUnknown(data['height']!, _heightMeta));
+    }
     if (data.containsKey('duration_in_seconds')) {
       context.handle(
           _durationInSecondsMeta,
@@ -371,6 +423,10 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
           i0.DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!,
       updatedAt: attachedDatabase.typeMapping.read(
           i0.DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      width: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}width']),
+      height: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}height']),
       durationInSeconds: attachedDatabase.typeMapping.read(
           i0.DriftSqlType.int, data['${effectivePrefix}duration_in_seconds']),
       id: attachedDatabase.typeMapping
@@ -401,6 +457,8 @@ class LocalAssetEntityData extends i0.DataClass
   final i2.AssetType type;
   final DateTime createdAt;
   final DateTime updatedAt;
+  final int? width;
+  final int? height;
   final int? durationInSeconds;
   final String id;
   final String? checksum;
@@ -410,6 +468,8 @@ class LocalAssetEntityData extends i0.DataClass
       required this.type,
       required this.createdAt,
       required this.updatedAt,
+      this.width,
+      this.height,
       this.durationInSeconds,
       required this.id,
       this.checksum,
@@ -424,6 +484,12 @@ class LocalAssetEntityData extends i0.DataClass
     }
     map['created_at'] = i0.Variable<DateTime>(createdAt);
     map['updated_at'] = i0.Variable<DateTime>(updatedAt);
+    if (!nullToAbsent || width != null) {
+      map['width'] = i0.Variable<int>(width);
+    }
+    if (!nullToAbsent || height != null) {
+      map['height'] = i0.Variable<int>(height);
+    }
     if (!nullToAbsent || durationInSeconds != null) {
       map['duration_in_seconds'] = i0.Variable<int>(durationInSeconds);
     }
@@ -444,6 +510,8 @@ class LocalAssetEntityData extends i0.DataClass
           .fromJson(serializer.fromJson<int>(json['type'])),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
       updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      width: serializer.fromJson<int?>(json['width']),
+      height: serializer.fromJson<int?>(json['height']),
       durationInSeconds: serializer.fromJson<int?>(json['durationInSeconds']),
       id: serializer.fromJson<String>(json['id']),
       checksum: serializer.fromJson<String?>(json['checksum']),
@@ -459,6 +527,8 @@ class LocalAssetEntityData extends i0.DataClass
           .toJson<int>(i1.$LocalAssetEntityTable.$convertertype.toJson(type)),
       'createdAt': serializer.toJson<DateTime>(createdAt),
       'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'width': serializer.toJson<int?>(width),
+      'height': serializer.toJson<int?>(height),
       'durationInSeconds': serializer.toJson<int?>(durationInSeconds),
       'id': serializer.toJson<String>(id),
       'checksum': serializer.toJson<String?>(checksum),
@@ -471,6 +541,8 @@ class LocalAssetEntityData extends i0.DataClass
           i2.AssetType? type,
           DateTime? createdAt,
           DateTime? updatedAt,
+          i0.Value<int?> width = const i0.Value.absent(),
+          i0.Value<int?> height = const i0.Value.absent(),
           i0.Value<int?> durationInSeconds = const i0.Value.absent(),
           String? id,
           i0.Value<String?> checksum = const i0.Value.absent(),
@@ -480,6 +552,8 @@ class LocalAssetEntityData extends i0.DataClass
         type: type ?? this.type,
         createdAt: createdAt ?? this.createdAt,
         updatedAt: updatedAt ?? this.updatedAt,
+        width: width.present ? width.value : this.width,
+        height: height.present ? height.value : this.height,
         durationInSeconds: durationInSeconds.present
             ? durationInSeconds.value
             : this.durationInSeconds,
@@ -493,6 +567,8 @@ class LocalAssetEntityData extends i0.DataClass
       type: data.type.present ? data.type.value : this.type,
       createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
       updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      width: data.width.present ? data.width.value : this.width,
+      height: data.height.present ? data.height.value : this.height,
       durationInSeconds: data.durationInSeconds.present
           ? data.durationInSeconds.value
           : this.durationInSeconds,
@@ -510,6 +586,8 @@ class LocalAssetEntityData extends i0.DataClass
           ..write('type: $type, ')
           ..write('createdAt: $createdAt, ')
           ..write('updatedAt: $updatedAt, ')
+          ..write('width: $width, ')
+          ..write('height: $height, ')
           ..write('durationInSeconds: $durationInSeconds, ')
           ..write('id: $id, ')
           ..write('checksum: $checksum, ')
@@ -519,8 +597,8 @@ class LocalAssetEntityData extends i0.DataClass
   }
 
   @override
-  int get hashCode => Object.hash(name, type, createdAt, updatedAt,
+  int get hashCode => Object.hash(name, type, createdAt, updatedAt, width,
-      durationInSeconds, id, checksum, isFavorite);
+      height, durationInSeconds, id, checksum, isFavorite);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -529,6 +607,8 @@ class LocalAssetEntityData extends i0.DataClass
           other.type == this.type &&
           other.createdAt == this.createdAt &&
           other.updatedAt == this.updatedAt &&
+          other.width == this.width &&
+          other.height == this.height &&
           other.durationInSeconds == this.durationInSeconds &&
           other.id == this.id &&
           other.checksum == this.checksum &&
@@ -541,6 +621,8 @@ class LocalAssetEntityCompanion
   final i0.Value<i2.AssetType> type;
   final i0.Value<DateTime> createdAt;
   final i0.Value<DateTime> updatedAt;
+  final i0.Value<int?> width;
+  final i0.Value<int?> height;
   final i0.Value<int?> durationInSeconds;
   final i0.Value<String> id;
   final i0.Value<String?> checksum;
@@ -550,6 +632,8 @@ class LocalAssetEntityCompanion
     this.type = const i0.Value.absent(),
     this.createdAt = const i0.Value.absent(),
     this.updatedAt = const i0.Value.absent(),
+    this.width = const i0.Value.absent(),
+    this.height = const i0.Value.absent(),
     this.durationInSeconds = const i0.Value.absent(),
     this.id = const i0.Value.absent(),
     this.checksum = const i0.Value.absent(),
@@ -560,6 +644,8 @@ class LocalAssetEntityCompanion
     required i2.AssetType type,
     this.createdAt = const i0.Value.absent(),
     this.updatedAt = const i0.Value.absent(),
+    this.width = const i0.Value.absent(),
+    this.height = const i0.Value.absent(),
     this.durationInSeconds = const i0.Value.absent(),
     required String id,
     this.checksum = const i0.Value.absent(),
@@ -572,6 +658,8 @@ class LocalAssetEntityCompanion
     i0.Expression<int>? type,
     i0.Expression<DateTime>? createdAt,
     i0.Expression<DateTime>? updatedAt,
+    i0.Expression<int>? width,
+    i0.Expression<int>? height,
     i0.Expression<int>? durationInSeconds,
     i0.Expression<String>? id,
     i0.Expression<String>? checksum,
@@ -582,6 +670,8 @@ class LocalAssetEntityCompanion
       if (type != null) 'type': type,
       if (createdAt != null) 'created_at': createdAt,
       if (updatedAt != null) 'updated_at': updatedAt,
+      if (width != null) 'width': width,
+      if (height != null) 'height': height,
       if (durationInSeconds != null) 'duration_in_seconds': durationInSeconds,
       if (id != null) 'id': id,
       if (checksum != null) 'checksum': checksum,
@@ -594,6 +684,8 @@ class LocalAssetEntityCompanion
       i0.Value<i2.AssetType>? type,
       i0.Value<DateTime>? createdAt,
       i0.Value<DateTime>? updatedAt,
+      i0.Value<int?>? width,
+      i0.Value<int?>? height,
       i0.Value<int?>? durationInSeconds,
       i0.Value<String>? id,
       i0.Value<String?>? checksum,
@@ -603,6 +695,8 @@ class LocalAssetEntityCompanion
       type: type ?? this.type,
       createdAt: createdAt ?? this.createdAt,
       updatedAt: updatedAt ?? this.updatedAt,
+      width: width ?? this.width,
+      height: height ?? this.height,
       durationInSeconds: durationInSeconds ?? this.durationInSeconds,
       id: id ?? this.id,
       checksum: checksum ?? this.checksum,
@@ -626,6 +720,12 @@ class LocalAssetEntityCompanion
     if (updatedAt.present) {
       map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
     }
+    if (width.present) {
+      map['width'] = i0.Variable<int>(width.value);
+    }
+    if (height.present) {
+      map['height'] = i0.Variable<int>(height.value);
+    }
     if (durationInSeconds.present) {
       map['duration_in_seconds'] = i0.Variable<int>(durationInSeconds.value);
     }
@@ -648,6 +748,8 @@ class LocalAssetEntityCompanion
           ..write('type: $type, ')
           ..write('createdAt: $createdAt, ')
           ..write('updatedAt: $updatedAt, ')
+          ..write('width: $width, ')
+          ..write('height: $height, ')
           ..write('durationInSeconds: $durationInSeconds, ')
           ..write('id: $id, ')
           ..write('checksum: $checksum, ')

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

@@ -17,6 +17,8 @@ typedef $$RemoteAssetEntityTableCreateCompanionBuilder
   required i2.AssetType type,
   i0.Value<DateTime> createdAt,
   i0.Value<DateTime> updatedAt,
+  i0.Value<int?> width,
+  i0.Value<int?> height,
   i0.Value<int?> durationInSeconds,
   required String id,
   required String checksum,
@@ -33,6 +35,8 @@ typedef $$RemoteAssetEntityTableUpdateCompanionBuilder
   i0.Value<i2.AssetType> type,
   i0.Value<DateTime> createdAt,
   i0.Value<DateTime> updatedAt,
+  i0.Value<int?> width,
+  i0.Value<int?> height,
   i0.Value<int?> durationInSeconds,
   i0.Value<String> id,
   i0.Value<String> checksum,
@@ -101,6 +105,12 @@ class $$RemoteAssetEntityTableFilterComposer
   i0.ColumnFilters<DateTime> get updatedAt => $composableBuilder(
       column: $table.updatedAt, builder: (column) => i0.ColumnFilters(column));
 
+  i0.ColumnFilters<int> get width => $composableBuilder(
+      column: $table.width, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<int> get height => $composableBuilder(
+      column: $table.height, builder: (column) => i0.ColumnFilters(column));
+
   i0.ColumnFilters<int> get durationInSeconds => $composableBuilder(
       column: $table.durationInSeconds,
       builder: (column) => i0.ColumnFilters(column));
@@ -175,6 +185,12 @@ class $$RemoteAssetEntityTableOrderingComposer
       column: $table.updatedAt,
       builder: (column) => i0.ColumnOrderings(column));
 
+  i0.ColumnOrderings<int> get width => $composableBuilder(
+      column: $table.width, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get height => $composableBuilder(
+      column: $table.height, builder: (column) => i0.ColumnOrderings(column));
+
   i0.ColumnOrderings<int> get durationInSeconds => $composableBuilder(
       column: $table.durationInSeconds,
       builder: (column) => i0.ColumnOrderings(column));
@@ -249,6 +265,12 @@ class $$RemoteAssetEntityTableAnnotationComposer
   i0.GeneratedColumn<DateTime> get updatedAt =>
       $composableBuilder(column: $table.updatedAt, builder: (column) => column);
 
+  i0.GeneratedColumn<int> get width =>
+      $composableBuilder(column: $table.width, builder: (column) => column);
+
+  i0.GeneratedColumn<int> get height =>
+      $composableBuilder(column: $table.height, builder: (column) => column);
+
   i0.GeneratedColumn<int> get durationInSeconds => $composableBuilder(
       column: $table.durationInSeconds, builder: (column) => column);
 
@@ -326,6 +348,8 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
             i0.Value<i2.AssetType> type = const i0.Value.absent(),
             i0.Value<DateTime> createdAt = const i0.Value.absent(),
             i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            i0.Value<int?> width = const i0.Value.absent(),
+            i0.Value<int?> height = const i0.Value.absent(),
             i0.Value<int?> durationInSeconds = const i0.Value.absent(),
             i0.Value<String> id = const i0.Value.absent(),
             i0.Value<String> checksum = const i0.Value.absent(),
@@ -341,6 +365,8 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
             type: type,
             createdAt: createdAt,
             updatedAt: updatedAt,
+            width: width,
+            height: height,
             durationInSeconds: durationInSeconds,
             id: id,
             checksum: checksum,
@@ -356,6 +382,8 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
             required i2.AssetType type,
             i0.Value<DateTime> createdAt = const i0.Value.absent(),
             i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            i0.Value<int?> width = const i0.Value.absent(),
+            i0.Value<int?> height = const i0.Value.absent(),
             i0.Value<int?> durationInSeconds = const i0.Value.absent(),
             required String id,
             required String checksum,
@@ -371,6 +399,8 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
             type: type,
             createdAt: createdAt,
             updatedAt: updatedAt,
+            width: width,
+            height: height,
             durationInSeconds: durationInSeconds,
             id: id,
             checksum: checksum,
@@ -477,6 +507,18 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
           type: i0.DriftSqlType.dateTime,
           requiredDuringInsert: false,
           defaultValue: i4.currentDateAndTime);
+  static const i0.VerificationMeta _widthMeta =
+      const i0.VerificationMeta('width');
+  @override
+  late final i0.GeneratedColumn<int> width = i0.GeneratedColumn<int>(
+      'width', aliasedName, true,
+      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+  static const i0.VerificationMeta _heightMeta =
+      const i0.VerificationMeta('height');
+  @override
+  late final i0.GeneratedColumn<int> height = i0.GeneratedColumn<int>(
+      'height', aliasedName, true,
+      type: i0.DriftSqlType.int, requiredDuringInsert: false);
   static const i0.VerificationMeta _durationInSecondsMeta =
       const i0.VerificationMeta('durationInSeconds');
   @override
@@ -543,6 +585,8 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
         type,
         createdAt,
         updatedAt,
+        width,
+        height,
         durationInSeconds,
         id,
         checksum,
@@ -578,6 +622,14 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
       context.handle(_updatedAtMeta,
           updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta));
     }
+    if (data.containsKey('width')) {
+      context.handle(
+          _widthMeta, width.isAcceptableOrUnknown(data['width']!, _widthMeta));
+    }
+    if (data.containsKey('height')) {
+      context.handle(_heightMeta,
+          height.isAcceptableOrUnknown(data['height']!, _heightMeta));
+    }
     if (data.containsKey('duration_in_seconds')) {
       context.handle(
           _durationInSecondsMeta,
@@ -640,6 +692,10 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
           i0.DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!,
       updatedAt: attachedDatabase.typeMapping.read(
           i0.DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      width: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}width']),
+      height: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}height']),
       durationInSeconds: attachedDatabase.typeMapping.read(
           i0.DriftSqlType.int, data['${effectivePrefix}duration_in_seconds']),
       id: attachedDatabase.typeMapping
@@ -684,6 +740,8 @@ class RemoteAssetEntityData extends i0.DataClass
   final i2.AssetType type;
   final DateTime createdAt;
   final DateTime updatedAt;
+  final int? width;
+  final int? height;
   final int? durationInSeconds;
   final String id;
   final String checksum;
@@ -698,6 +756,8 @@ class RemoteAssetEntityData extends i0.DataClass
       required this.type,
       required this.createdAt,
       required this.updatedAt,
+      this.width,
+      this.height,
       this.durationInSeconds,
       required this.id,
       required this.checksum,
@@ -717,6 +777,12 @@ class RemoteAssetEntityData extends i0.DataClass
     }
     map['created_at'] = i0.Variable<DateTime>(createdAt);
     map['updated_at'] = i0.Variable<DateTime>(updatedAt);
+    if (!nullToAbsent || width != null) {
+      map['width'] = i0.Variable<int>(width);
+    }
+    if (!nullToAbsent || height != null) {
+      map['height'] = i0.Variable<int>(height);
+    }
     if (!nullToAbsent || durationInSeconds != null) {
       map['duration_in_seconds'] = i0.Variable<int>(durationInSeconds);
     }
@@ -749,6 +815,8 @@ class RemoteAssetEntityData extends i0.DataClass
           .fromJson(serializer.fromJson<int>(json['type'])),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
       updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      width: serializer.fromJson<int?>(json['width']),
+      height: serializer.fromJson<int?>(json['height']),
       durationInSeconds: serializer.fromJson<int?>(json['durationInSeconds']),
       id: serializer.fromJson<String>(json['id']),
       checksum: serializer.fromJson<String>(json['checksum']),
@@ -770,6 +838,8 @@ class RemoteAssetEntityData extends i0.DataClass
           .toJson<int>(i1.$RemoteAssetEntityTable.$convertertype.toJson(type)),
       'createdAt': serializer.toJson<DateTime>(createdAt),
       'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'width': serializer.toJson<int?>(width),
+      'height': serializer.toJson<int?>(height),
       'durationInSeconds': serializer.toJson<int?>(durationInSeconds),
       'id': serializer.toJson<String>(id),
       'checksum': serializer.toJson<String>(checksum),
@@ -788,6 +858,8 @@ class RemoteAssetEntityData extends i0.DataClass
           i2.AssetType? type,
           DateTime? createdAt,
           DateTime? updatedAt,
+          i0.Value<int?> width = const i0.Value.absent(),
+          i0.Value<int?> height = const i0.Value.absent(),
           i0.Value<int?> durationInSeconds = const i0.Value.absent(),
           String? id,
           String? checksum,
@@ -802,6 +874,8 @@ class RemoteAssetEntityData extends i0.DataClass
         type: type ?? this.type,
         createdAt: createdAt ?? this.createdAt,
         updatedAt: updatedAt ?? this.updatedAt,
+        width: width.present ? width.value : this.width,
+        height: height.present ? height.value : this.height,
         durationInSeconds: durationInSeconds.present
             ? durationInSeconds.value
             : this.durationInSeconds,
@@ -821,6 +895,8 @@ class RemoteAssetEntityData extends i0.DataClass
       type: data.type.present ? data.type.value : this.type,
       createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
       updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      width: data.width.present ? data.width.value : this.width,
+      height: data.height.present ? data.height.value : this.height,
       durationInSeconds: data.durationInSeconds.present
           ? data.durationInSeconds.value
           : this.durationInSeconds,
@@ -846,6 +922,8 @@ class RemoteAssetEntityData extends i0.DataClass
           ..write('type: $type, ')
           ..write('createdAt: $createdAt, ')
           ..write('updatedAt: $updatedAt, ')
+          ..write('width: $width, ')
+          ..write('height: $height, ')
           ..write('durationInSeconds: $durationInSeconds, ')
           ..write('id: $id, ')
           ..write('checksum: $checksum, ')
@@ -865,6 +943,8 @@ class RemoteAssetEntityData extends i0.DataClass
       type,
       createdAt,
       updatedAt,
+      width,
+      height,
       durationInSeconds,
       id,
       checksum,
@@ -882,6 +962,8 @@ class RemoteAssetEntityData extends i0.DataClass
           other.type == this.type &&
           other.createdAt == this.createdAt &&
           other.updatedAt == this.updatedAt &&
+          other.width == this.width &&
+          other.height == this.height &&
           other.durationInSeconds == this.durationInSeconds &&
           other.id == this.id &&
           other.checksum == this.checksum &&
@@ -899,6 +981,8 @@ class RemoteAssetEntityCompanion
   final i0.Value<i2.AssetType> type;
   final i0.Value<DateTime> createdAt;
   final i0.Value<DateTime> updatedAt;
+  final i0.Value<int?> width;
+  final i0.Value<int?> height;
   final i0.Value<int?> durationInSeconds;
   final i0.Value<String> id;
   final i0.Value<String> checksum;
@@ -913,6 +997,8 @@ class RemoteAssetEntityCompanion
     this.type = const i0.Value.absent(),
     this.createdAt = const i0.Value.absent(),
     this.updatedAt = const i0.Value.absent(),
+    this.width = const i0.Value.absent(),
+    this.height = const i0.Value.absent(),
     this.durationInSeconds = const i0.Value.absent(),
     this.id = const i0.Value.absent(),
     this.checksum = const i0.Value.absent(),
@@ -928,6 +1014,8 @@ class RemoteAssetEntityCompanion
     required i2.AssetType type,
     this.createdAt = const i0.Value.absent(),
     this.updatedAt = const i0.Value.absent(),
+    this.width = const i0.Value.absent(),
+    this.height = const i0.Value.absent(),
     this.durationInSeconds = const i0.Value.absent(),
     required String id,
     required String checksum,
@@ -948,6 +1036,8 @@ class RemoteAssetEntityCompanion
     i0.Expression<int>? type,
     i0.Expression<DateTime>? createdAt,
     i0.Expression<DateTime>? updatedAt,
+    i0.Expression<int>? width,
+    i0.Expression<int>? height,
     i0.Expression<int>? durationInSeconds,
     i0.Expression<String>? id,
     i0.Expression<String>? checksum,
@@ -963,6 +1053,8 @@ class RemoteAssetEntityCompanion
       if (type != null) 'type': type,
       if (createdAt != null) 'created_at': createdAt,
       if (updatedAt != null) 'updated_at': updatedAt,
+      if (width != null) 'width': width,
+      if (height != null) 'height': height,
       if (durationInSeconds != null) 'duration_in_seconds': durationInSeconds,
       if (id != null) 'id': id,
       if (checksum != null) 'checksum': checksum,
@@ -980,6 +1072,8 @@ class RemoteAssetEntityCompanion
       i0.Value<i2.AssetType>? type,
       i0.Value<DateTime>? createdAt,
       i0.Value<DateTime>? updatedAt,
+      i0.Value<int?>? width,
+      i0.Value<int?>? height,
       i0.Value<int?>? durationInSeconds,
       i0.Value<String>? id,
       i0.Value<String>? checksum,
@@ -994,6 +1088,8 @@ class RemoteAssetEntityCompanion
       type: type ?? this.type,
       createdAt: createdAt ?? this.createdAt,
       updatedAt: updatedAt ?? this.updatedAt,
+      width: width ?? this.width,
+      height: height ?? this.height,
       durationInSeconds: durationInSeconds ?? this.durationInSeconds,
       id: id ?? this.id,
       checksum: checksum ?? this.checksum,
@@ -1022,6 +1118,12 @@ class RemoteAssetEntityCompanion
     if (updatedAt.present) {
       map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
     }
+    if (width.present) {
+      map['width'] = i0.Variable<int>(width.value);
+    }
+    if (height.present) {
+      map['height'] = i0.Variable<int>(height.value);
+    }
     if (durationInSeconds.present) {
       map['duration_in_seconds'] = i0.Variable<int>(durationInSeconds.value);
     }
@@ -1061,6 +1163,8 @@ class RemoteAssetEntityCompanion
           ..write('type: $type, ')
           ..write('createdAt: $createdAt, ')
           ..write('updatedAt: $updatedAt, ')
+          ..write('width: $width, ')
+          ..write('height: $height, ')
           ..write('durationInSeconds: $durationInSeconds, ')
           ..write('id: $id, ')
           ..write('checksum: $checksum, ')

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

@@ -272,7 +272,9 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository
           type: asset.type,
           createdAt: Value(asset.createdAt),
           updatedAt: Value(asset.updatedAt),
-          durationInSeconds: Value.absentIfNull(asset.durationInSeconds),
+          width: Value(asset.width),
+          height: Value(asset.height),
+          durationInSeconds: Value(asset.durationInSeconds),
           id: asset.id,
           checksum: const Value(null),
         );

mobile/lib/infrastructure/utils/asset.mixin.dart

@@ -6,5 +6,7 @@ mixin AssetEntityMixin on Table {
   IntColumn get type => intEnum<AssetType>()();
   DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
   DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
+  IntColumn get width => integer().nullable()();
+  IntColumn get height => integer().nullable()();
   IntColumn get durationInSeconds => integer().nullable()();
 }

mobile/lib/platform/native_sync_api.g.dart

@@ -37,6 +37,8 @@ class PlatformAsset {
     required this.type,
     this.createdAt,
     this.updatedAt,
+    this.width,
+    this.height,
     required this.durationInSeconds,
   });
 
@@ -50,6 +52,10 @@ class PlatformAsset {
 
   int? updatedAt;
 
+  int? width;
+
+  int? height;
+
   int durationInSeconds;
 
   List<Object?> _toList() {
@@ -59,6 +65,8 @@ class PlatformAsset {
       type,
       createdAt,
       updatedAt,
+      width,
+      height,
       durationInSeconds,
     ];
   }
@@ -75,7 +83,9 @@ class PlatformAsset {
       type: result[2]! as int,
       createdAt: result[3] as int?,
       updatedAt: result[4] as int?,
-      durationInSeconds: result[5]! as int,
+      width: result[5] as int?,
+      height: result[6] as int?,
+      durationInSeconds: result[7]! as int,
     );
   }
 

mobile/pigeon/native_sync_api.dart

@@ -20,6 +20,8 @@ class PlatformAsset {
   // Seconds since epoch
   final int? createdAt;
   final int? updatedAt;
+  final int? width;
+  final int? height;
   final int durationInSeconds;
 
   const PlatformAsset({
@@ -28,6 +30,8 @@ class PlatformAsset {
     required this.type,
     this.createdAt,
     this.updatedAt,
+    this.width,
+    this.height,
     this.durationInSeconds = 0,
   });
 }