Skip to content

Commit

Permalink
Add Debug Display
Browse files Browse the repository at this point in the history
  • Loading branch information
@igreenwood
igreenwood committed Apr 10, 2016
1 parent bf83410 commit 9c80f02
Show file tree
Hide file tree
Showing 4 changed files with 148 additions and 23 deletions.
1 change: 1 addition & 0 deletions simplecropview-sample/src/main/java/com/example/simplecropviewsample/MainFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
FontUtils.setFont(mRootLayout);
// set bitmap to CropImageView
if (mCropView.getImageBitmap() == null) {
mCropView.setDebug(true);
mCropView.setImageResource(R.drawable.sample5);
}
}
Expand Down
158 changes: 139 additions & 19 deletions simplecropview/src/main/java/com/isseiaoki/simplecropview/CropImageView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,12 @@ public class CropImageView extends ImageView {
private static final int GUIDE_STROKE_WEIGHT_IN_DP = 1;
private static final float DEFAULT_INITIAL_FRAME_SCALE = 1f;
private static final int DEFAULT_ANIMATION_DURATION_MILLIS = 100;
private static final int DEBUG_TEXT_SIZE_IN_DP = 10;
private static final int DEBUG_TEXT_SIZE_IN_DP = 15;

private static final int TRANSPARENT = 0x00000000;
private static final int TRANSLUCENT_WHITE = 0xBBFFFFFF;
private static final int WHITE = 0xFFFFFFFF;
private static final int TRANSLUCENT_BLACK = 0xBB000000;
private static final int VERMILION = 0xEF454A;

// Member variables ////////////////////////////////////////////////////////////////////////////

Expand All @@ -81,6 +80,7 @@ public class CropImageView extends ImageView {
private Paint mPaintTranslucent;
private Paint mPaintFrame;
private Paint mPaintBitmap;
private Paint mPaintDebug;
private RectF mFrameRect;
private RectF mImageRect;
private PointF mCenter = new PointF();
Expand All @@ -102,10 +102,15 @@ public class CropImageView extends ImageView {
private int mOutputMaxHeight;
private int mOutputWidth = 0;
private int mOutputHeight = 0;
private boolean mIsLoggingEnabled = false;
private boolean mIsDebug = false;
private boolean mIsCropping = false;
private Bitmap.CompressFormat mCompressFormat = Bitmap.CompressFormat.PNG;
private int mCompressQuality = 100;
private int mInputImageWidth = 0;
private int mInputImageHeight = 0;
private int mOutputImageWidth = 0;
private int mOutputImageHeight = 0;
private boolean mIsLoading = false;
// Instance variables for customizable attributes //////////////////////////////////////////////

private TouchArea mTouchArea = TouchArea.OUT_OF_BOUNDS;
Expand Down Expand Up @@ -147,16 +152,21 @@ public CropImageView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);

mExecutor = Executors.newSingleThreadExecutor();
float mDensity = getDensity();
mHandleSize = (int) (mDensity * HANDLE_SIZE_IN_DP);
mMinFrameSize = mDensity * MIN_FRAME_SIZE_IN_DP;
mFrameStrokeWeight = mDensity * FRAME_STROKE_WEIGHT_IN_DP;
mGuideStrokeWeight = mDensity * GUIDE_STROKE_WEIGHT_IN_DP;
float density = getDensity();
mHandleSize = (int) (density * HANDLE_SIZE_IN_DP);
mMinFrameSize = density * MIN_FRAME_SIZE_IN_DP;
mFrameStrokeWeight = density * FRAME_STROKE_WEIGHT_IN_DP;
mGuideStrokeWeight = density * GUIDE_STROKE_WEIGHT_IN_DP;

mPaintFrame = new Paint();
mPaintTranslucent = new Paint();
mPaintBitmap = new Paint();
mPaintBitmap.setFilterBitmap(true);
mPaintDebug = new Paint();
mPaintDebug.setAntiAlias(true);
mPaintDebug.setStyle(Paint.Style.STROKE);
mPaintDebug.setColor(WHITE);
mPaintDebug.setTextSize((float) DEBUG_TEXT_SIZE_IN_DP * density);

mMatrix = new Matrix();
mScale = 1.0f;
Expand All @@ -167,7 +177,7 @@ public CropImageView(Context context, AttributeSet attrs, int defStyle) {
mGuideColor = TRANSLUCENT_WHITE;

// handle Styleable
handleStyleable(context, attrs, defStyle, mDensity);
handleStyleable(context, attrs, defStyle, density);
}

// Lifecycle methods ///////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -204,12 +214,16 @@ public Parcelable onSaveInstanceState() {
ss.saveUri = this.mSaveUri;
ss.compressFormat = this.mCompressFormat;
ss.compressQuality = this.mCompressQuality;
ss.isLoggingEnabled = this.mIsLoggingEnabled;
ss.isDebug = this.mIsDebug;
ss.outputMaxWidth = this.mOutputMaxWidth;
ss.outputMaxHeight = this.mOutputMaxHeight;
ss.outputWidth = this.mOutputWidth;
ss.outputHeight = this.mOutputHeight;
ss.isHandleShadowEnabled = this.mIsHandleShadowEnabled;
ss.inputImageWidth = this.mInputImageWidth;
ss.inputImageHeight = this.mInputImageHeight;
ss.outputImageWidth = this.mOutputImageWidth;
ss.outputImageHeight = this.mOutputImageHeight;
return ss;
}

Expand Down Expand Up @@ -243,12 +257,16 @@ public void onRestoreInstanceState(Parcelable state) {
this.mSaveUri = ss.saveUri;
this.mCompressFormat = ss.compressFormat;
this.mCompressQuality = ss.compressQuality;
this.mIsLoggingEnabled = ss.isLoggingEnabled;
this.mIsDebug = ss.isDebug;
this.mOutputMaxWidth = ss.outputMaxWidth;
this.mOutputMaxHeight = ss.outputMaxHeight;
this.mOutputWidth = ss.outputWidth;
this.mOutputHeight = ss.outputHeight;
this.mIsHandleShadowEnabled = ss.isHandleShadowEnabled;
this.mInputImageWidth = ss.inputImageWidth;
this.mInputImageHeight = ss.inputImageHeight;
this.mOutputImageWidth = ss.outputImageWidth;
this.mOutputImageHeight = ss.outputImageHeight;
setImageBitmap(ss.image);
requestLayout();
}
Expand Down Expand Up @@ -281,6 +299,9 @@ public void onDraw(Canvas canvas) {
// draw edit frame
drawCropFrame(canvas);
}
if (mIsDebug) {
drawDebugInfo(canvas);
}
}
}

Expand Down Expand Up @@ -365,6 +386,63 @@ private void handleStyleable(Context context, AttributeSet attrs, int defStyle,

// Drawing method //////////////////////////////////////////////////////////////////////////////

private void drawDebugInfo(Canvas canvas) {
Paint.FontMetrics fontMetrics = mPaintDebug.getFontMetrics();
mPaintDebug.measureText("W");
int textHeight = (int) (fontMetrics.descent - fontMetrics.ascent);
int x = (int) (mImageRect.left + (float) mHandleSize * 0.5f * getDensity());
int y = (int) (mImageRect.top + textHeight + (float) mHandleSize * 0.5f * getDensity());
StringBuilder builder = new StringBuilder();
builder.append("LOADED FROM: ")
.append(mSourceUri != null ? "Uri" : "Bitmap");
canvas.drawText(builder.toString(), x, y, mPaintDebug);
builder = new StringBuilder();

if (mSourceUri == null) {
builder.append("INPUT_IMAGE_SIZE: ")
.append((int) mImgWidth)
.append("x")
.append((int) mImgHeight);
y += textHeight;
canvas.drawText(builder.toString(), x, y, mPaintDebug);
builder = new StringBuilder();
} else {
builder = new StringBuilder()
.append("INPUT_IMAGE_SIZE: ")
.append(mInputImageWidth)
.append("x")
.append(mInputImageHeight);
y += textHeight;
canvas.drawText(builder.toString(), x, y, mPaintDebug);
builder = new StringBuilder();
}
builder.append("LOADED_IMAGE_SIZE: ")
.append(getBitmap().getWidth())
.append("x")
.append(getBitmap().getHeight());
y += textHeight;
canvas.drawText(builder.toString(), x, y, mPaintDebug);
builder = new StringBuilder();
if (mOutputImageWidth > 0 && mOutputImageHeight > 0) {
builder.append("OUTPUT_IMAGE_SIZE: ")
.append(mOutputImageWidth)
.append("x")
.append(mOutputImageHeight);
y += textHeight;
canvas.drawText(builder.toString(), x, y, mPaintDebug);
builder = new StringBuilder()
.append("EXIF ROTATION: ")
.append(mExifRotation);
y += textHeight;
canvas.drawText(builder.toString(), x, y, mPaintDebug);
builder = new StringBuilder()
.append("CURRENT_ROTATION: ")
.append((int) mAngle);
y += textHeight;
canvas.drawText(builder.toString(), x, y, mPaintDebug);
}
}

private void drawCropFrame(Canvas canvas) {
if (!mIsCropEnabled) return;
if (mIsRotating) return;
Expand Down Expand Up @@ -519,6 +597,7 @@ public boolean onTouchEvent(MotionEvent event) {
if (!mIsEnabled) return false;
if (mIsRotating) return false;
if (mIsAnimating) return false;
if (mIsLoading) return false;
if (mIsCropping) return false;
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
Expand Down Expand Up @@ -1287,7 +1366,7 @@ public void setImageBitmap(Bitmap bitmap) {
public void setImageResource(int resId) {
mIsInitialized = false;
super.setImageResource(resId);
updateDrawableInfo();
updateLayout();
}

/**
Expand All @@ -1299,7 +1378,7 @@ public void setImageResource(int resId) {
public void setImageDrawable(Drawable drawable) {
mIsInitialized = false;
super.setImageDrawable(drawable);
updateDrawableInfo();
updateLayout();
}

/**
Expand All @@ -1311,17 +1390,28 @@ public void setImageDrawable(Drawable drawable) {
public void setImageURI(Uri uri) {
mIsInitialized = false;
super.setImageURI(uri);
updateDrawableInfo();
updateLayout();
}

private void updateDrawableInfo() {
private void updateLayout() {
resetImageInfo();
Drawable d = getDrawable();
mAngle = mExifRotation;
if (d != null) {
setupLayout(mViewWidth, mViewHeight);
}
}

private void resetImageInfo() {
if (mIsLoading) return;
mSourceUri = null;
mSaveUri = null;
mInputImageWidth = 0;
mInputImageHeight = 0;
mOutputImageWidth = 0;
mOutputImageHeight = 0;
mAngle = mExifRotation;
}

/**
* Load image from Uri.
*
Expand All @@ -1338,6 +1428,7 @@ public void startLoad(Uri sourceUri, LoadCallback callback) {
mExecutor.submit(new Runnable() {
@Override
public void run() {
mIsLoading = true;
mExifRotation = Utils.getExifOrientation(getContext(), mSourceUri);
int maxSize = Utils.getMaxSize();
int requestSize = Math.max(mViewWidth, mViewHeight);
Expand All @@ -1346,19 +1437,24 @@ public void run() {
final Bitmap sampledBitmap = Utils.decodeSampledBitmapFromUri(getContext(),
mSourceUri,
requestSize);
mInputImageWidth = Utils.sInputImageWidth;
mInputImageHeight = Utils.sInputImageHeight;
mHandler.post(new Runnable() {
@Override
public void run() {
setImageBitmap(sampledBitmap);
if (mLoadCallback != null) mLoadCallback.onSuccess();
mIsLoading = false;
}
});
} catch (OutOfMemoryError e) {
Logger.e("OOM Error: " + e.getMessage(), e);
postErrorOnMainThread(mLoadCallback);
mIsLoading = false;
} catch (Exception e) {
Logger.e("An unexpected error has occurred: " + e.getMessage(), e);
postErrorOnMainThread(mLoadCallback);
mIsLoading = false;
}
}
});
Expand Down Expand Up @@ -1518,10 +1614,13 @@ public void run() {
if (cropped != null) {
cropped = scaleBitmapIfNeeded(cropped);
final Bitmap tmp = cropped;
mOutputImageWidth = tmp.getWidth();
mOutputImageHeight = tmp.getHeight();
mHandler.post(new Runnable() {
@Override
public void run() {
if (mCropCallback != null) mCropCallback.onSuccess(tmp);
if (mIsDebug) invalidate();
}
});
}
Expand Down Expand Up @@ -1811,6 +1910,15 @@ public void setInterpolator(Interpolator interpolator) {
setupAnimatorIfNeeded();
}

/**
* Set whether to show debug display
*
* @param debug is logging enabled
*/
public void setDebug(boolean debug) {
mIsDebug = debug;
}

/**
* Set whether to log exception
*
Expand Down Expand Up @@ -2004,12 +2112,16 @@ public static class SavedState extends BaseSavedState {
Uri saveUri;
Bitmap.CompressFormat compressFormat;
int compressQuality;
boolean isLoggingEnabled;
boolean isDebug;
int outputMaxWidth;
int outputMaxHeight;
int outputWidth;
int outputHeight;
boolean isHandleShadowEnabled;
int inputImageWidth;
int inputImageHeight;
int outputImageWidth;
int outputImageHeight;

SavedState(Parcelable superState) {
super(superState);
Expand Down Expand Up @@ -2045,12 +2157,16 @@ private SavedState(Parcel in) {
saveUri = in.readParcelable(Uri.class.getClassLoader());
compressFormat = (Bitmap.CompressFormat) in.readSerializable();
compressQuality = in.readInt();
isLoggingEnabled = (in.readInt() != 0);
isDebug = (in.readInt() != 0);
outputMaxWidth = in.readInt();
outputMaxHeight = in.readInt();
outputWidth = in.readInt();
outputHeight = in.readInt();
isHandleShadowEnabled = (in.readInt() != 0);
inputImageWidth = in.readInt();
inputImageHeight = in.readInt();
outputImageWidth = in.readInt();
outputImageHeight = in.readInt();
}

@Override
Expand Down Expand Up @@ -2084,12 +2200,16 @@ public void writeToParcel(Parcel out, int flag) {
out.writeParcelable(saveUri, flag);
out.writeSerializable(compressFormat);
out.writeInt(compressQuality);
out.writeInt(isLoggingEnabled ? 1 : 0);
out.writeInt(isDebug ? 1 : 0);
out.writeInt(outputMaxWidth);
out.writeInt(outputMaxHeight);
out.writeInt(outputWidth);
out.writeInt(outputHeight);
out.writeInt(isHandleShadowEnabled ? 1 : 0);
out.writeInt(inputImageWidth);
out.writeInt(inputImageHeight);
out.writeInt(outputImageWidth);
out.writeInt(outputImageHeight);
}

public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
Expand Down
8 changes: 4 additions & 4 deletions simplecropview/src/main/java/com/isseiaoki/simplecropview/util/Logger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ public class Logger {
private static final String TAG = "SimpleCropView";
public static boolean enabled = false;

public static void e(String msg){
if(!enabled) return;
public static void e(String msg) {
if (!enabled) return;
android.util.Log.e(TAG, msg);
}

public static void e(String msg, Throwable e){
if(!enabled) return;
public static void e(String msg, Throwable e) {
if (!enabled) return;
android.util.Log.e(TAG, msg, e);
}
}
Loading

0 comments on commit 9c80f02

Please sign in to comment.