From c51f0b5f93f831a8b759ec526df256f6b8dd2929 Mon Sep 17 00:00:00 2001
From: Marcus Andersson <systemvetaren@gmail.com>
Date: Wed, 20 Dec 2017 12:14:41 +0100
Subject: [PATCH] fixed so android cropping works in all orientations.

---
 Example/Example.js                                |  3 +--
 .../com/lwansbrough/RCTCamera/MutableImage.java   | 15 +++++++++++----
 .../lwansbrough/RCTCamera/RCTCameraModule.java    |  3 ++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Example/Example.js b/Example/Example.js
index e86185b..0a58944 100644
--- a/Example/Example.js
+++ b/Example/Example.js
@@ -14,7 +14,6 @@ const styles = StyleSheet.create({
   },
   preview: {
     flex: 1,
-    alignSelf: "stretch",
     justifyContent: 'flex-end',
     alignItems: 'center'
   },
@@ -187,7 +186,7 @@ export default class Example extends React.Component {
           onZoomChanged={() => {}}
           defaultTouchToFocus
           mirrorImage={false}
-          cropToPreview={false}
+          cropToPreview={true}
         />
         <View style={[styles.overlay, styles.topOverlay]}>
           <TouchableOpacity
diff --git a/android/src/main/java/com/lwansbrough/RCTCamera/MutableImage.java b/android/src/main/java/com/lwansbrough/RCTCamera/MutableImage.java
index 1687272..ed2f6f0 100644
--- a/android/src/main/java/com/lwansbrough/RCTCamera/MutableImage.java
+++ b/android/src/main/java/com/lwansbrough/RCTCamera/MutableImage.java
@@ -76,17 +76,24 @@ public class MutableImage {
         }
     }
 
-    public void cropToPreview(float xPercentage, float yPercentage) throws ImageMutationFailedException {
+    public void cropToPreview(int orientation, float xPercentage, float yPercentage) throws ImageMutationFailedException {
         int width = this.currentRepresentation.getWidth();
         int height = this.currentRepresentation.getHeight();
 
         int x = (int) Math.round(height * xPercentage);
         int y = (int) Math.round(width * yPercentage);
 
-        int cropWidth = width - (y*2);
-        int cropHeight =  height - (x*2);
+        if (orientation == 1) {
+            int cropWidth = width - (y*2);
+            int cropHeight =  height - (x*2);
 
-        this.currentRepresentation = Bitmap.createBitmap(this.currentRepresentation, y, x, cropWidth, cropHeight);
+            this.currentRepresentation = Bitmap.createBitmap(this.currentRepresentation, y, x, cropWidth, cropHeight);
+        } else {
+            int cropWidth = width - (x*2);
+            int cropHeight =  height - (y*2);
+
+            this.currentRepresentation = Bitmap.createBitmap(this.currentRepresentation, x, y, cropWidth, cropHeight);
+        }
     }
 
     //see http://www.impulseadventure.com/photo/exif-orientation.html
diff --git a/android/src/main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java b/android/src/main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java
index c20186d..ce6d1cc 100644
--- a/android/src/main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java
+++ b/android/src/main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java
@@ -586,8 +586,9 @@ public class RCTCameraModule extends ReactContextBaseJavaModule
                 int type = options.getInt("type");
                 float paddingWidth = RCTCamera.getInstance().getPreviewPaddingWidth(type);
                 float paddingHeight = RCTCamera.getInstance().getPreviewPaddingHeight(type);
+                int orientation = _reactContext.getResources().getConfiguration().orientation;
 
-                mutableImage.cropToPreview(paddingWidth, paddingHeight);
+                mutableImage.cropToPreview(orientation, paddingWidth, paddingHeight);
             } catch (MutableImage.ImageMutationFailedException e) {
                 promise.reject("Error cropping image to preview", e);
             }