Skip to content

High performance self-hosted photo and video management solution.

fix(mobile): respect orientation on displaying asset dimensions (#13129)

Hannes R. Brunsch35bb2e786f8f
diff --git a/mobile/lib/entities/asset.entity.dart b/mobile/lib/entities/asset.entity.dart
index df902ca995..8e2d9c84d5 100644
--- a/mobile/lib/entities/asset.entity.dart
+++ b/mobile/lib/entities/asset.entity.dart
@@ -22,8 +22,12 @@ class Asset {
durationInSeconds = remote.duration.toDuration()?.inSeconds ?? 0,
type = remote.type.toAssetType(),
fileName = remote.originalFileName,
- height = remote.exifInfo?.exifImageHeight?.toInt(),
- width = remote.exifInfo?.exifImageWidth?.toInt(),
+ height = isFlipped(remote)
+ ? remote.exifInfo?.exifImageWidth?.toInt()
+ : remote.exifInfo?.exifImageHeight?.toInt(),
+ width = isFlipped(remote)
+ ? remote.exifInfo?.exifImageHeight?.toInt()
+ : remote.exifInfo?.exifImageWidth?.toInt(),
livePhotoVideoId = remote.livePhotoVideoId,
ownerId = fastHash(remote.ownerId),
exifInfo =
@@ -507,3 +511,20 @@ extension AssetsHelper on IsarCollection<Asset> {
return where().anyOf(ids, (q, String e) => q.localIdEqualTo(e));
}
}
+
+/// Returns `true` if this [int] is flipped 90° clockwise
+bool isRotated90CW(int orientation) {
+ return [7, 8, -90].contains(orientation);
+}
+
+/// Returns `true` if this [int] is flipped 270° clockwise
+bool isRotated270CW(int orientation) {
+ return [5, 6, 90].contains(orientation);
+}
+
+/// Returns `true` if this [Asset] is flipped 90° or 270° clockwise
+bool isFlipped(AssetResponseDto response) {
+ final int orientation = response.exifInfo?.orientation?.toInt() ?? 0;
+ return orientation != 0 &&
+ (isRotated90CW(orientation) || isRotated270CW(orientation));
+}