Crop Image Activity builder

cooliean · May 1, 2016 · 5064ef4 · 5064ef4
1 parent 166f43e
commit 5064ef4
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 48 deletions.
diff --git a/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImage.java b/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImage.java
@@ -50,6 +50,16 @@
  */
 public final class CropImage {
 
+    /**
+     * The key used to pass crop image source URI to {@link CropImageActivity}.
+     */
+    static final String CROP_IMAGE_EXTRA_SOURCE = "CROP_IMAGE_EXTRA_SOURCE";
+
+    /**
+     * The key used to pass crop image options to {@link CropImageActivity}.
+     */
+    static final String CROP_IMAGE_EXTRA_OPTIONS = "CROP_IMAGE_EXTRA_OPTIONS";
+
     /**
      * The request code used to start pick image activity to be used on result to identify the this specific request.
      */
@@ -274,7 +284,7 @@ private ActivityBuilder(Context context, Uri source) {
 
             mIntent = new Intent();
             mIntent.setClass(context, CropImageActivity.class);
-            mIntent.putExtra("CROP_IMAGE_EXTRA_SOURCE", source);
+            mIntent.putExtra(CROP_IMAGE_EXTRA_SOURCE, source);
 
             mOptions = new CropImageOptions(context.getResources().getDisplayMetrics());
         }
@@ -284,7 +294,7 @@ private ActivityBuilder(Context context, Uri source) {
          */
         public Intent getIntent() {
             mOptions.validate();
-            mIntent.putExtra("CROP_IMAGE_EXTRA_OPTIONS", mOptions);
+            mIntent.putExtra(CROP_IMAGE_EXTRA_OPTIONS, mOptions);
             return mIntent;
         }
 

diff --git a/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageActivity.java b/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageActivity.java
@@ -15,6 +15,7 @@
 import android.app.ActionBar;
 import android.app.Activity;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -34,12 +35,21 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.crop_image_activity);
 
+        mCropImageView = (CropImageView) findViewById(R.id.cropImageView);
+
+        Intent intent = getIntent();
+        Uri source = intent.getParcelableExtra(CropImage.CROP_IMAGE_EXTRA_SOURCE);
+        CropImageOptions options = intent.getParcelableExtra(CropImage.CROP_IMAGE_EXTRA_OPTIONS);
+
+        if (savedInstanceState == null) {
+            mCropImageView.setImageUriAsync(source);
+        }
+
         ActionBar actionBar = getActionBar();
         if (actionBar != null) {
+            actionBar.setTitle("");
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
-
-        Intent intent = getIntent();
     }
 
     @Override

diff --git a/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageOptions.java b/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageOptions.java
@@ -225,8 +225,11 @@ public CropImageOptions(DisplayMetrics dm) {
      * Create object from parcel.
      */
     protected CropImageOptions(Parcel in) {
+        cropShape = CropImageView.CropShape.values()[in.readInt()];
         snapRadius = in.readFloat();
         touchRadius = in.readFloat();
+        guidelines = CropImageView.Guidelines.values()[in.readInt()];
+        scaleType = CropImageView.ScaleType.values()[in.readInt()];
         showCropOverlay = in.readByte() != 0;
         showProgressBar = in.readByte() != 0;
         autoZoomEnabled = in.readByte() != 0;
@@ -254,8 +257,11 @@ protected CropImageOptions(Parcel in) {
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(cropShape.ordinal());
         dest.writeFloat(snapRadius);
         dest.writeFloat(touchRadius);
+        dest.writeInt(guidelines.ordinal());
+        dest.writeInt(scaleType.ordinal());
         dest.writeByte((byte) (showCropOverlay ? 1 : 0));
         dest.writeByte((byte) (showProgressBar ? 1 : 0));
         dest.writeByte((byte) (autoZoomEnabled ? 1 : 0));

diff --git a/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageView.java b/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageView.java
@@ -12,7 +12,9 @@
 
 package com.theartofdev.edmodo.cropper;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -174,42 +176,51 @@ public CropImageView(Context context) {
     public CropImageView(Context context, AttributeSet attrs) {
         super(context, attrs);
 
-        CropImageOptions options = new CropImageOptions(getResources().getDisplayMetrics());
-
-        if (attrs != null) {
-            TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.CropImageView, 0, 0);
-            try {
-                options.fixAspectRatio = ta.getBoolean(R.styleable.CropImageView_cropFixAspectRatio, options.fixAspectRatio);
-                options.aspectRatioX = ta.getInteger(R.styleable.CropImageView_cropAspectRatioX, options.aspectRatioX);
-                options.aspectRatioY = ta.getInteger(R.styleable.CropImageView_cropAspectRatioY, options.aspectRatioY);
-                options.scaleType = ScaleType.values()[ta.getInt(R.styleable.CropImageView_cropScaleType, options.scaleType.ordinal())];
-                options.autoZoomEnabled = ta.getBoolean(R.styleable.CropImageView_cropAutoZoomEnabled, options.autoZoomEnabled);
-                options.maxZoom = ta.getInteger(R.styleable.CropImageView_cropMaxZoom, options.maxZoom);
-                options.cropShape = CropShape.values()[ta.getInt(R.styleable.CropImageView_cropShape, options.cropShape.ordinal())];
-                options.guidelines = Guidelines.values()[ta.getInt(R.styleable.CropImageView_cropGuidelines, options.guidelines.ordinal())];
-                options.snapRadius = ta.getDimension(R.styleable.CropImageView_cropSnapRadius, options.snapRadius);
-                options.touchRadius = ta.getDimension(R.styleable.CropImageView_cropTouchRadius, options.touchRadius);
-                options.initialCropWindowPaddingRatio = ta.getFloat(R.styleable.CropImageView_cropInitialCropWindowPaddingRatio, options.initialCropWindowPaddingRatio);
-                options.borderLineThickness = ta.getDimension(R.styleable.CropImageView_cropBorderLineThickness, options.borderLineThickness);
-                options.borderLineColor = ta.getInteger(R.styleable.CropImageView_cropBorderLineColor, options.borderLineColor);
-                options.borderCornerThickness = ta.getDimension(R.styleable.CropImageView_cropBorderCornerThickness, options.borderCornerThickness);
-                options.borderCornerOffset = ta.getDimension(R.styleable.CropImageView_cropBorderCornerOffset, options.borderCornerOffset);
-                options.borderCornerLength = ta.getDimension(R.styleable.CropImageView_cropBorderCornerLength, options.borderCornerLength);
-                options.borderCornerColor = ta.getInteger(R.styleable.CropImageView_cropBorderCornerColor, options.borderCornerColor);
-                options.guidelinesThickness = ta.getDimension(R.styleable.CropImageView_cropGuidelinesThickness, options.guidelinesThickness);
-                options.guidelinesColor = ta.getInteger(R.styleable.CropImageView_cropGuidelinesColor, options.guidelinesColor);
-                options.backgroundColor = ta.getInteger(R.styleable.CropImageView_cropBackgroundColor, options.backgroundColor);
-                options.showCropOverlay = ta.getBoolean(R.styleable.CropImageView_cropShowCropOverlay, mShowCropOverlay);
-                options.showProgressBar = ta.getBoolean(R.styleable.CropImageView_cropShowProgressBar, mShowProgressBar);
-                options.borderCornerThickness = ta.getDimension(R.styleable.CropImageView_cropBorderCornerThickness, options.borderCornerThickness);
-                options.minCropWindowWidth = ta.getDimension(R.styleable.CropImageView_cropMinCropWindowWidth, options.minCropWindowWidth);
-                options.minCropWindowHeight = ta.getDimension(R.styleable.CropImageView_cropMinCropWindowHeight, options.minCropWindowHeight);
-                options.minCropResultWidth = ta.getFloat(R.styleable.CropImageView_cropMinCropResultWidthPX, options.minCropResultWidth);
-                options.minCropResultHeight = ta.getFloat(R.styleable.CropImageView_cropMinCropResultHeightPX, options.minCropResultHeight);
-                options.maxCropResultWidth = ta.getFloat(R.styleable.CropImageView_cropMaxCropResultWidthPX, options.maxCropResultWidth);
-                options.maxCropResultHeight = ta.getFloat(R.styleable.CropImageView_cropMaxCropResultHeightPX, options.maxCropResultHeight);
-            } finally {
-                ta.recycle();
+        CropImageOptions options = null;
+        Intent intent = context instanceof Activity ? ((Activity) context).getIntent() : null;
+        if (intent != null) {
+            options = intent.getParcelableExtra(CropImage.CROP_IMAGE_EXTRA_OPTIONS);
+        }
+
+        if (options == null) {
+
+            options = new CropImageOptions(getResources().getDisplayMetrics());
+
+            if (attrs != null) {
+                TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.CropImageView, 0, 0);
+                try {
+                    options.fixAspectRatio = ta.getBoolean(R.styleable.CropImageView_cropFixAspectRatio, options.fixAspectRatio);
+                    options.aspectRatioX = ta.getInteger(R.styleable.CropImageView_cropAspectRatioX, options.aspectRatioX);
+                    options.aspectRatioY = ta.getInteger(R.styleable.CropImageView_cropAspectRatioY, options.aspectRatioY);
+                    options.scaleType = ScaleType.values()[ta.getInt(R.styleable.CropImageView_cropScaleType, options.scaleType.ordinal())];
+                    options.autoZoomEnabled = ta.getBoolean(R.styleable.CropImageView_cropAutoZoomEnabled, options.autoZoomEnabled);
+                    options.maxZoom = ta.getInteger(R.styleable.CropImageView_cropMaxZoom, options.maxZoom);
+                    options.cropShape = CropShape.values()[ta.getInt(R.styleable.CropImageView_cropShape, options.cropShape.ordinal())];
+                    options.guidelines = Guidelines.values()[ta.getInt(R.styleable.CropImageView_cropGuidelines, options.guidelines.ordinal())];
+                    options.snapRadius = ta.getDimension(R.styleable.CropImageView_cropSnapRadius, options.snapRadius);
+                    options.touchRadius = ta.getDimension(R.styleable.CropImageView_cropTouchRadius, options.touchRadius);
+                    options.initialCropWindowPaddingRatio = ta.getFloat(R.styleable.CropImageView_cropInitialCropWindowPaddingRatio, options.initialCropWindowPaddingRatio);
+                    options.borderLineThickness = ta.getDimension(R.styleable.CropImageView_cropBorderLineThickness, options.borderLineThickness);
+                    options.borderLineColor = ta.getInteger(R.styleable.CropImageView_cropBorderLineColor, options.borderLineColor);
+                    options.borderCornerThickness = ta.getDimension(R.styleable.CropImageView_cropBorderCornerThickness, options.borderCornerThickness);
+                    options.borderCornerOffset = ta.getDimension(R.styleable.CropImageView_cropBorderCornerOffset, options.borderCornerOffset);
+                    options.borderCornerLength = ta.getDimension(R.styleable.CropImageView_cropBorderCornerLength, options.borderCornerLength);
+                    options.borderCornerColor = ta.getInteger(R.styleable.CropImageView_cropBorderCornerColor, options.borderCornerColor);
+                    options.guidelinesThickness = ta.getDimension(R.styleable.CropImageView_cropGuidelinesThickness, options.guidelinesThickness);
+                    options.guidelinesColor = ta.getInteger(R.styleable.CropImageView_cropGuidelinesColor, options.guidelinesColor);
+                    options.backgroundColor = ta.getInteger(R.styleable.CropImageView_cropBackgroundColor, options.backgroundColor);
+                    options.showCropOverlay = ta.getBoolean(R.styleable.CropImageView_cropShowCropOverlay, mShowCropOverlay);
+                    options.showProgressBar = ta.getBoolean(R.styleable.CropImageView_cropShowProgressBar, mShowProgressBar);
+                    options.borderCornerThickness = ta.getDimension(R.styleable.CropImageView_cropBorderCornerThickness, options.borderCornerThickness);
+                    options.minCropWindowWidth = ta.getDimension(R.styleable.CropImageView_cropMinCropWindowWidth, options.minCropWindowWidth);
+                    options.minCropWindowHeight = ta.getDimension(R.styleable.CropImageView_cropMinCropWindowHeight, options.minCropWindowHeight);
+                    options.minCropResultWidth = ta.getFloat(R.styleable.CropImageView_cropMinCropResultWidthPX, options.minCropResultWidth);
+                    options.minCropResultHeight = ta.getFloat(R.styleable.CropImageView_cropMinCropResultHeightPX, options.minCropResultHeight);
+                    options.maxCropResultWidth = ta.getFloat(R.styleable.CropImageView_cropMaxCropResultWidthPX, options.maxCropResultWidth);
+                    options.maxCropResultHeight = ta.getFloat(R.styleable.CropImageView_cropMaxCropResultHeightPX, options.maxCropResultHeight);
+                } finally {
+                    ta.recycle();
+                }
             }
         }
 

diff --git a/cropper/src/main/res/menu/crop_image_menu.xml b/cropper/src/main/res/menu/crop_image_menu.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item
-        android:id="@+id/crop_image_menu_crop"
-        android:icon="@android:drawable/ic_menu_crop"
-        android:showAsAction="ifRoom"
-        android:title="@string/crop_image_menu_crop"/>
-
     <item
         android:id="@+id/crop_image_menu_rotate"
-        android:enabled="false"
         android:icon="@android:drawable/ic_menu_rotate"
         android:showAsAction="ifRoom"
         android:title="@string/crop_image_menu_rotate"/>
+    <item
+        android:id="@+id/crop_image_menu_crop"
+        android:icon="@android:drawable/ic_menu_crop"
+        android:showAsAction="ifRoom"
+        android:title="@string/crop_image_menu_crop"/>
 
 </menu>
diff --git a/quick-start/src/main/AndroidManifest.xml b/quick-start/src/main/AndroidManifest.xml
@@ -20,5 +20,7 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity
+            android:name="com.theartofdev.edmodo.cropper.CropImageActivity"/>
     </application>
 </manifest>
diff --git a/quick-start/src/main/java/com/theartofdev/edmodo/cropper/quick/start/MainActivity.java b/quick-start/src/main/java/com/theartofdev/edmodo/cropper/quick/start/MainActivity.java
@@ -73,6 +73,7 @@ public void onRequestPermissionsResult(int requestCode, String permissions[], in
     }
 
     private void startCropImageActivity(Uri imageUri) {
-
+        CropImage.activity(this, imageUri)
+                .start(this);
     }
 }