From c3f429a90af5955568838ed576aaab184acafdbc Mon Sep 17 00:00:00 2001
From: otsmr <git@tsmr.eu>
Date: Sun, 9 Feb 2025 12:41:44 +0100
Subject: [PATCH] fix rotation issue

---
 README.md                                     |  3 ---
 android/app/src/main/AndroidManifest.xml      |  2 +-
 lib/src/app.dart                              |  1 -
 .../image_editor/data/image_item.dart         | 25 +++++++++++++++++++
 .../share_image_editor_view.dart              |  3 +--
 pubspec.lock                                  | 16 ++++++++++++
 pubspec.yaml                                  |  1 +
 7 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 89cbf12..e595089 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,6 @@ Don't be lonely, get twonly! Send pictures to a friend in real time and be sure
 - MediaView:
     - Bei weiteren geladenen Bildern -> Direkt anzeigen ohne pop
 
-## Not my issues
-- FIX: Problem Bild falsch, wenn handy schräg... -> Issue already openend
-
 ## TODOS bevor first release
 - Settings
     - Subscription
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 6522dfa..64bbc6d 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -35,7 +35,7 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
          https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
diff --git a/lib/src/app.dart b/lib/src/app.dart
index 0b29866..e1fdb9b 100644
--- a/lib/src/app.dart
+++ b/lib/src/app.dart
@@ -77,7 +77,6 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     super.didChangeAppLifecycleState(state);
-    print("STATE: $state");
     if (state == AppLifecycleState.resumed) {
       apiProvider.connect();
     }
diff --git a/lib/src/components/image_editor/data/image_item.dart b/lib/src/components/image_editor/data/image_item.dart
index 96d53e5..0d7aedf 100755
--- a/lib/src/components/image_editor/data/image_item.dart
+++ b/lib/src/components/image_editor/data/image_item.dart
@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'dart:typed_data';
 import 'package:flutter/material.dart';
+import 'package:exif/exif.dart';
+import 'package:image/image.dart' as img;
 
 class ImageItem {
   int width = 1;
@@ -29,6 +31,29 @@ class ImageItem {
       height = decodedImage.height;
       width = decodedImage.width;
 
+      if (height < width) {
+        final exifData = await readExifFromBytes(bytes);
+
+        img.Image fixedImage;
+
+        if (height < width) {
+          debugPrint('Rotating image necessary');
+          final originalImage = img.decodeImage(bytes)!;
+          if (exifData['Image Orientation']!.printable.contains('Horizontal')) {
+            fixedImage = img.copyRotate(originalImage, angle: 90);
+          } else if (exifData['Image Orientation']!.printable.contains('180')) {
+            fixedImage = img.copyRotate(originalImage, angle: -90);
+          } else if (exifData['Image Orientation']!.printable.contains('CCW')) {
+            fixedImage = img.copyRotate(originalImage, angle: 180);
+          } else {
+            fixedImage = img.copyRotate(originalImage, angle: 0);
+          }
+          bytes = img.encodeJpg(fixedImage);
+          height = fixedImage.height;
+          width = fixedImage.width;
+        }
+      }
+
       return loader.complete(true);
     } else {
       return loader.complete(false);
diff --git a/lib/src/views/camera_to_share/share_image_editor_view.dart b/lib/src/views/camera_to_share/share_image_editor_view.dart
index 5dc4312..a661694 100644
--- a/lib/src/views/camera_to_share/share_image_editor_view.dart
+++ b/lib/src/views/camera_to_share/share_image_editor_view.dart
@@ -35,9 +35,8 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
 
   @override
   void initState() {
-    loadImage(widget.imageBytes);
-
     super.initState();
+    loadImage(widget.imageBytes);
   }
 
   @override
diff --git a/pubspec.lock b/pubspec.lock
index 2f46193..86527b2 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -273,6 +273,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.1"
+  exif:
+    dependency: "direct main"
+    description:
+      name: exif
+      sha256: a7980fdb3b7ffcd0b035e5b8a5e1eef7cadfe90ea6a4e85ebb62f87b96c7a172
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.3.0"
   fake_async:
     dependency: transitive
     description:
@@ -1138,6 +1146,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.10.0"
+  sprintf:
+    dependency: transitive
+    description:
+      name: sprintf
+      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
   sqflite_common:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index d44d4c1..a505ae1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,6 +16,7 @@ dependencies:
   collection: ^1.18.0
   connectivity_plus: ^6.1.2
   cv: ^1.1.3
+  exif: ^3.3.0
   fixnum: ^1.1.1
   flutter:
     sdk: flutter