Add CropInfo

Author: helloyako

gradle.properties

@@ -1,5 +1,5 @@
-VERSION_NAME=1.1.0
-VERSION_CODE=6
+VERSION_NAME=1.1.1-SNAPSHOT
+VERSION_CODE=7
 GROUP=com.naver.android.helloyako
 
 POM_DESCRIPTION=Android Image Crop View

imagecropview/src/main/java/com/naver/android/helloyako/imagecrop/model/CropInfo.java

@@ -0,0 +1,96 @@
+package com.naver.android.helloyako.imagecrop.model;
+
+import android.graphics.Bitmap;
+
+import com.naver.android.helloyako.imagecrop.util.BitmapLoadUtils;
+
+/**
+ * Created by helloyako on 2016. 5. 10..
+ */
+public class CropInfo {
+    private float scale;
+    private float viewBitmapWidth;
+    private float viewImageTop;
+    private float viewImageLeft;
+    private float cropTop;
+    private float cropLeft;
+
+    private float cropWidth;
+    private float cropHeight;
+
+
+    public CropInfo(float scale, float viewBitmapWidth, float viewImageTop, float viewImageLeft, float cropTop, float cropLeft, float cropWidth, float cropHeight) {
+        this.scale = scale;
+        this.viewBitmapWidth = viewBitmapWidth;
+        this.viewImageTop = viewImageTop;
+        this.viewImageLeft = viewImageLeft;
+        this.cropTop = cropTop;
+        this.cropLeft = cropLeft;
+        this.cropWidth = cropWidth;
+        this.cropHeight = cropHeight;
+    }
+
+    public Bitmap getCroppedImage(String path) {
+        int reqSize = 4000;
+        Bitmap bitmap = BitmapLoadUtils.decode(path, reqSize, reqSize);
+        return getCroppedImage(bitmap);
+    }
+
+    public Bitmap getCroppedImage(Bitmap bitmap) {
+        float scale = this.scale * (viewBitmapWidth / (float) bitmap.getWidth());
+        float x = Math.abs(viewImageLeft - cropLeft) / scale;
+        float y = Math.abs(viewImageTop - cropTop) / scale;
+        float actualCropWidth = cropWidth / scale;
+        float actualCropHeight = cropHeight / scale;
+
+        if (x < 0) {
+            x = 0;
+        }
+
+        if (y < 0) {
+            y = 0;
+        }
+
+        if (y + actualCropHeight > bitmap.getHeight()) {
+            actualCropHeight = bitmap.getHeight() - y;
+        }
+
+        if (x + actualCropWidth > bitmap.getWidth()) {
+            actualCropWidth = bitmap.getWidth() - x;
+        }
+
+        return Bitmap.createBitmap(bitmap, (int) x, (int) y, (int) actualCropWidth, (int) actualCropHeight);
+    }
+
+    public float getScale() {
+        return scale;
+    }
+
+    public float getViewBitmapWidth() {
+        return viewBitmapWidth;
+    }
+
+    public float getViewImageTop() {
+        return viewImageTop;
+    }
+
+    public float getViewImageLeft() {
+        return viewImageLeft;
+    }
+
+    public float getCropTop() {
+        return cropTop;
+    }
+
+    public float getCropLeft() {
+        return cropLeft;
+    }
+
+    public float getCropWidth() {
+        return cropWidth;
+    }
+
+    public float getCropHeight() {
+        return cropHeight;
+    }
+}

imagecropview/src/main/java/com/naver/android/helloyako/imagecrop/view/ImageCropViewBase.java

@@ -35,6 +35,7 @@
 import android.widget.ImageView;
 
 import com.naver.android.helloyako.imagecrop.R;
+import com.naver.android.helloyako.imagecrop.model.CropInfo;
 import com.naver.android.helloyako.imagecrop.util.BitmapLoadUtils;
 import com.naver.android.helloyako.imagecrop.view.graphics.FastBitmapDrawable;
 
@@ -959,42 +960,21 @@ public void run() {
     }
 
     public Bitmap getCroppedImage() {
-
-        Bitmap viewBitmap = getViewBitmap();
-        Bitmap sourceBitmap = viewBitmap;
-
-        float scale = baseScale * getScale();
+        CropInfo cropInfo = getCropInfo();
 
         if (imageFilePath != null) {
-            int reqSize = 4000;
-            sourceBitmap = BitmapLoadUtils.decode(imageFilePath, reqSize, reqSize);
-            scale = scale * ((float) viewBitmap.getWidth() / (float) sourceBitmap.getWidth());
+            return cropInfo.getCroppedImage(imageFilePath);
+        } else {
+            return cropInfo.getCroppedImage(getViewBitmap());
         }
+    }
 
+    public CropInfo getCropInfo() {
+        Bitmap viewBitmap = getViewBitmap();
+        float scale = baseScale * getScale();
         RectF viewImageRect = getBitmapRect();
 
-        float x = Math.abs(viewImageRect.left - mCropRect.left) / scale;
-        float y = Math.abs(viewImageRect.top - mCropRect.top) / scale;
-        float actualCropWidth = mCropRect.width() / scale;
-        float actualCropHeight = mCropRect.height() / scale;
-
-        if (x < 0) {
-            x = 0;
-        }
-
-        if (y < 0) {
-            y = 0;
-        }
-
-        if (y + actualCropHeight > sourceBitmap.getHeight()) {
-            actualCropHeight = sourceBitmap.getHeight() - y;
-        }
-
-        if (x + actualCropWidth > sourceBitmap.getWidth()) {
-            actualCropWidth = sourceBitmap.getWidth() - x;
-        }
-
-        return Bitmap.createBitmap(sourceBitmap, (int) x, (int) y, (int) actualCropWidth, (int) actualCropHeight);
+        return new CropInfo(scale, viewBitmap.getWidth(), viewImageRect.top, viewImageRect.left, mCropRect.top, mCropRect.left, mCropRect.width(), mCropRect.height());
     }
 
     public Bitmap getViewBitmap() {