Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 2 type corner style #42

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+58 −6
Open

Add 2 type corner style #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 58 additions & 6 deletions simplecropview/src/main/java/com/isseiaoki/simplecropview/CropImageView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ public class CropImageView extends ImageView {
private int mHandleColor;
private int mGuideColor;
private float mInitialFrameScale; // 0.01 ~ 1.0, 0.75 is default value

private int mCurrentCropHandlerMode = CropHandlerMode.CORNER;

// Constructor /////////////////////////////////////////////////////////////////////////////////

public CropImageView(Context context) {
Expand Down Expand Up @@ -310,10 +311,15 @@ private void drawEditFrame(Canvas canvas) {
if (mShowHandle) {
mPaintFrame.setStyle(Paint.Style.FILL);
mPaintFrame.setColor(mHandleColor);
canvas.drawCircle(mFrameRect.left, mFrameRect.top, mHandleSize, mPaintFrame);
canvas.drawCircle(mFrameRect.right, mFrameRect.top, mHandleSize, mPaintFrame);
canvas.drawCircle(mFrameRect.left, mFrameRect.bottom, mHandleSize, mPaintFrame);
canvas.drawCircle(mFrameRect.right, mFrameRect.bottom, mHandleSize, mPaintFrame);
if(mCurrentCropHandlerMode == CropHandlerMode.CIRCLE) {
canvas.drawCircle(mFrameRect.left, mFrameRect.top, mHandleSize, mPaintFrame);
canvas.drawCircle(mFrameRect.right, mFrameRect.top, mHandleSize, mPaintFrame);
canvas.drawCircle(mFrameRect.left, mFrameRect.bottom, mHandleSize, mPaintFrame);
canvas.drawCircle(mFrameRect.right, mFrameRect.bottom, mHandleSize, mPaintFrame);
}else if(mCurrentCropHandlerMode == CropHandlerMode.CORNER) {
mPaintFrame.setStrokeWidth(mHandleSize / 2);
drawCorners(canvas);
}
}
}

Expand All @@ -323,6 +329,34 @@ private void setMatrix() {
mMatrix.postScale(mScale, mScale, mCenter.x, mCenter.y);
mMatrix.postRotate(mAngle, mCenter.x, mCenter.y);
}

private void drawCorners(Canvas canvas) {

float w = mPaintFrame.getStrokeWidth() ;
float l = mFrameRect.left;
float t = mFrameRect.top;
float r = mFrameRect.right;
float b = mFrameRect.bottom;
float mCornerOffset = mPaintFrame.getStrokeWidth() / 2 ;
float mCornerExtension = w ;
float mCornerLength = mHandleSize * 4;

// Top left
canvas.drawLine(l - mCornerOffset, t - mCornerExtension, l - mCornerOffset, t + mCornerLength, mPaintFrame);
canvas.drawLine(l, t - mCornerOffset, l + mCornerLength, t - mCornerOffset, mPaintFrame);

// Top right
canvas.drawLine(r + mCornerOffset, t - mCornerExtension, r + mCornerOffset, t + mCornerLength, mPaintFrame);
canvas.drawLine(r, t - mCornerOffset, r - mCornerLength, t - mCornerOffset, mPaintFrame);

// Bottom left
canvas.drawLine(l - mCornerOffset, b + mCornerExtension, l - mCornerOffset, b - mCornerLength, mPaintFrame);
canvas.drawLine(l, b + mCornerOffset, l + mCornerLength, b + mCornerOffset, mPaintFrame);

// Bottom left
canvas.drawLine(r + mCornerOffset, b + mCornerExtension, r + mCornerOffset, b - mCornerLength, mPaintFrame);
canvas.drawLine(r, b + mCornerOffset, r - mCornerLength, b + mCornerOffset, mPaintFrame);
}

// Initializer /////////////////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -1304,6 +1338,19 @@ public void setCropEnabled(boolean enabled) {
mIsCropEnabled = enabled;
invalidate();
}

/**
* Set whether Crop Corner Handler style
*
* @param {@link CornerCropImageView.CropHandlerMode }
*/
public void setCurrentCropHandlerMode(int mode){
if(mode == CropHandlerMode.CIRCLE || mode == CropHandlerMode.CORNER) {
mCurrentCropHandlerMode = mode;
} else {
throw new InvalidParameterException();
}
}

/**
* Set locking the crop frame.
Expand Down Expand Up @@ -1386,7 +1433,12 @@ public int getValue() {
return VALUE;
}
}


public interface CropHandlerMode{
int CIRCLE = 0;
int CORNER = 1;
}

// Save/Restore support ////////////////////////////////////////////////////////////////////////

public static class SavedState extends BaseSavedState {
Expand Down