Non square crop + Ti 6+ (Android)

README.md

@@ -2,26 +2,43 @@
 
 ## Description
 
-A cross platform image cropper for Titanium mobile. 
+A cross platform image cropper for Titanium mobile.
 
-The iOS version uses [RSKImageCropper](https://github.com/ruslanskorb/RSKImageCropper) and the 
+The iOS version uses [RSKImageCropper](https://github.com/ruslanskorb/RSKImageCropper) and the
 Android version uses [android-crop](https://github.com/jdamcd/android-crop).
 
 ## Usage
 
 ```js
 var imageCropper = require('se.hyperlab.imagecropper');
 
-imageCropper.open({
-  image: originalImage,
-  size: 960,
-  error: function (e) {
-    console.error('[CROPPING ERROR] ' + e);
-  },
-  success: function (e) {
-    someImageView.image = e.image;
-  }
-});
+if (OS_ANDROID){
+    imageCropper.open({
+      image: originalImage,
+      aspect_x: 1,
+      aspect_y: 2,
+      max_x: 300,
+      max_y: 300,
+      //size: 960,  // for square images with aspect_x = aspect_y = 1
+      error: function (e) {
+        console.error('[CROPPING ERROR] ' + e);
+      },
+      success: function (e) {
+        someImageView.image = e.image;
+      }
+    });    
+} else {
+    imageCropper.open({
+      image: originalImage,
+      size: 960,
+      error: function (e) {
+        console.error('[CROPPING ERROR] ' + e);
+      },
+      success: function (e) {
+        someImageView.image = e.image;
+      }
+    });
+}
 ```
 
 You will also need to install and include the module in your `tiapp.xml` file.

android/manifest

@@ -2,9 +2,9 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 1.0.0
-apiversion: 2
-architectures: armeabi armeabi-v7a x86
+version: 2.0.1
+apiversion: 3
+architectures: armeabi-v7a x86
 description: TiImageCropper
 author: Jonatan Lundin
 license: MIT
@@ -13,8 +13,8 @@ copyright: Copyright (c) 2015 by Hyperlab AB
 respackage: com.soundcloud.android.crop
 
 # these should not be edited
-name: TiImageCropper
+name: tiimagecropper
 moduleid: se.hyperlab.imagecropper
 guid: 3f9278fb-c443-430a-8b6c-e7ee932b746c
 platform: android
-minsdk: 3.4.1.GA
+minsdk: 6.0.0.GA

android/src/se/hyperlab/imagecropper/TiImageCropperModule.java

@@ -102,7 +102,7 @@ public void onError(Activity activity, int requestCode, Exception e)
 	// Methods
 	@Kroll.method
 	public void open(KrollDict options) {
-        Activity activity = getTiContext().getTiApp().getCurrentActivity();
+        Activity activity = TiApplication.getInstance().getCurrentActivity();
         TiActivitySupport support = (TiActivitySupport) activity;
 
 		successCallback = getCallback(options, "success");
@@ -118,15 +118,25 @@ public void open(KrollDict options) {
 
         cropIntent.setData(source);
         cropIntent.putExtra(MediaStore.EXTRA_OUTPUT, destination);
-        cropIntent.putExtra("aspect_x", 1);
-        cropIntent.putExtra("aspect_y", 1);
 
-        if (options.containsKeyAndNotNull("size")) {
-            Log.i(LCAT, "Setting size to:" + options.getInt("size").toString());
-            cropIntent.putExtra("max_x", options.getInt("size"));
-            cropIntent.putExtra("max_y", options.getInt("size"));
+		cropIntent.putExtra("aspect_x", options.getInt("aspect_x"));
+        cropIntent.putExtra("aspect_y", options.getInt("aspect_y"));
+
+        if (options.containsKeyAndNotNull("max_y")) {
+			cropIntent.putExtra("max_y", options.getInt("max_y"));
+		}
+		if (options.containsKeyAndNotNull("max_x")) {
+            cropIntent.putExtra("max_x", options.getInt("max_x"));
         }
 
+		// override with size for square images and backwards compatibility
+		if (options.containsKeyAndNotNull("size")) {
+			cropIntent.putExtra("max_x", options.getInt("size"));
+			cropIntent.putExtra("max_y", options.getInt("size"));
+
+			cropIntent.putExtra("aspect_x", 1);
+	        cropIntent.putExtra("aspect_y", 1);
+		}
         cropIntent.setClass(activity, CropImageActivity.class);
 
         support.launchActivityForResult(cropIntent, Crop.REQUEST_CROP, this);