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

Jump to bottom

Oval crop corners added #307

Merged
merged 7 commits into from
Feb 2, 2022
Merged

Oval crop corners added #307

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
16be478
Oval crop corners added
bhagyae5308 Jan 25, 2022
6ae2187
PR initial feedback addressed
bhagyae5308 Jan 27, 2022
4c16c8f
CodeStyle applied to resolve CI error
bhagyae5308 Feb 2, 2022
268a716
Compilation error fix: Updated missed refactored circleCornerFillColo…
bhagyae5308 Feb 2, 2022
143e607
Change log updated
bhagyae5308 Feb 2, 2022
44922d9
PR feedback addressed: Default color of oval corner changed to white
bhagyae5308 Feb 2, 2022
4d40c52
Support added to set cropCornerRadius from xml attributes
bhagyae5308 Feb 2, 2022
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
26 changes: 26 additions & 0 deletions cropper/src/main/java/com/canhub/cropper/CropImageContractOptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,32 @@ data class CropImageContractOptions @JvmOverloads constructor(
cropImageOptions.cropShape = cropShape
return this
}
/**
* To set the shape of the cropper corner (RECTANGLE / OVAL)
* Default: RECTANGLE
*/
fun setCropCornerShape(cornerShape: CropImageView.CropCornerShape): CropImageContractOptions {
cropImageOptions.cornerShape = cornerShape
return this
}

/**
* To set the fill color of the Oval crop corner
* @param circleFillColorHexValue Hex value of the color (Default is MAGENTA)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's change the default to White please

*/
fun setCircleCornerFillColor(circleFillColorHexValue: Int): CropImageContractOptions {
cropImageOptions.circleCornerFillColorHexValue = circleFillColorHexValue
return this
}

/**
* To set the Oval crop corner radius
* Default is 10
*/
fun setCropCornerRadius(cornerRadius: Float): CropImageContractOptions {
cropImageOptions.cropCornerRadius = cornerRadius
return this
}

/**
* An edge of the crop window will snap to the corresponding edge of a specified bounding box
Expand Down
24 changes: 24 additions & 0 deletions cropper/src/main/java/com/canhub/cropper/CropImageOptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@ open class CropImageOptions : Parcelable {
/** The shape of the cropping window. */
@JvmField
var cropShape: CropShape
/**
* The shape of cropper corners
*/
@JvmField
var cornerShape: CropImageView.CropCornerShape
/**
* The radius of the circular crop corner
*/
@JvmField
var cropCornerRadius: Float

/**
* An edge of the crop window will snap to the corresponding edge of a specified bounding box when
Expand Down Expand Up @@ -141,6 +151,11 @@ open class CropImageOptions : Parcelable {
/** the color of the corner line */
@JvmField
var borderCornerColor: Int
/**
* The fill color of circle corner
*/
@JvmField
var circleCornerFillColorHexValue: Int

/** the thickness of the guidelines lines. (in pixels) */
@JvmField
Expand Down Expand Up @@ -275,6 +290,9 @@ open class CropImageOptions : Parcelable {
imageSourceIncludeCamera = true
imageSourceIncludeGallery = true
cropShape = CropShape.RECTANGLE
cornerShape = CropImageView.CropCornerShape.RECTANGLE
circleCornerFillColorHexValue = Color.MAGENTA
cropCornerRadius = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10f, dm)
snapRadius = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 3f, dm)
touchRadius = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 24f, dm)
guidelines = Guidelines.ON_TOUCH
Expand Down Expand Up @@ -331,6 +349,8 @@ open class CropImageOptions : Parcelable {
imageSourceIncludeCamera = parcel.readByte().toInt() != 0
imageSourceIncludeGallery = parcel.readByte().toInt() != 0
cropShape = CropShape.values()[parcel.readInt()]
cornerShape = CropImageView.CropCornerShape.values()[parcel.readInt()]
cropCornerRadius = parcel.readFloat()
snapRadius = parcel.readFloat()
touchRadius = parcel.readFloat()
guidelines = Guidelines.values()[parcel.readInt()]
Expand All @@ -351,6 +371,7 @@ open class CropImageOptions : Parcelable {
borderCornerOffset = parcel.readFloat()
borderCornerLength = parcel.readFloat()
borderCornerColor = parcel.readInt()
circleCornerFillColorHexValue = parcel.readInt()
guidelinesThickness = parcel.readFloat()
guidelinesColor = parcel.readInt()
backgroundColor = parcel.readInt()
Expand Down Expand Up @@ -385,6 +406,8 @@ open class CropImageOptions : Parcelable {
dest.writeByte((if (imageSourceIncludeCamera) 1 else 0).toByte())
dest.writeByte((if (imageSourceIncludeGallery) 1 else 0).toByte())
dest.writeInt(cropShape.ordinal)
dest.writeInt(cornerShape.ordinal)
dest.writeFloat(cropCornerRadius)
dest.writeFloat(snapRadius)
dest.writeFloat(touchRadius)
dest.writeInt(guidelines.ordinal)
Expand All @@ -405,6 +428,7 @@ open class CropImageOptions : Parcelable {
dest.writeFloat(borderCornerOffset)
dest.writeFloat(borderCornerLength)
dest.writeInt(borderCornerColor)
dest.writeInt(circleCornerFillColorHexValue)
dest.writeFloat(guidelinesThickness)
dest.writeInt(guidelinesColor)
dest.writeInt(backgroundColor)
Expand Down
24 changes: 24 additions & 0 deletions cropper/src/main/java/com/canhub/cropper/CropImageView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,15 @@ class CropImageView @JvmOverloads constructor(context: Context, attrs: Attribute
set(cropShape) {
mCropOverlayView!!.setCropShape(cropShape!!)
}
/**
* The shape of the crop corner in the crop overlay (Rectangular / Circular)
*/
var cornerShape: CropCornerShape?
get() = mCropOverlayView!!.cornerShape
set(cornerShape) {
mCropOverlayView!!.setCropCornerShape(cornerShape!!)
}

/** if auto-zoom functionality is enabled. default: true. */
/** Set auto-zoom functionality to enabled/disabled. */
var isAutoZoomEnabled: Boolean
Expand Down Expand Up @@ -1440,6 +1449,12 @@ class CropImageView @JvmOverloads constructor(context: Context, attrs: Attribute

RECTANGLE, OVAL, RECTANGLE_VERTICAL_ONLY, RECTANGLE_HORIZONTAL_ONLY
}
/**
* Possible crop corner shape
*/
enum class CropCornerShape {
RECTANGLE, OVAL
}

/**
* Options for scaling the bounds of cropping image to the bounds of Crop Image View.<br></br>
Expand Down Expand Up @@ -1759,6 +1774,12 @@ class CropImageView @JvmOverloads constructor(context: Context, attrs: Attribute
options.cropShape.ordinal
)
]
options.cornerShape = CropCornerShape.values()[
ta.getInt(
R.styleable.CropImageView_cornerShape,
options.cornerShape.ordinal
)
]
options.guidelines = Guidelines.values()[
ta.getInt(
R.styleable.CropImageView_cropGuidelines, options.guidelines.ordinal
Expand All @@ -1776,6 +1797,9 @@ class CropImageView @JvmOverloads constructor(context: Context, attrs: Attribute
R.styleable.CropImageView_cropInitialCropWindowPaddingRatio,
options.initialCropWindowPaddingRatio
)
options.circleCornerFillColorHexValue = ta.getInteger(
R.styleable.CropImageView_cropCornerCircleFillColor, options.circleCornerFillColorHexValue
)
options.borderLineThickness = ta.getDimension(
R.styleable.CropImageView_cropBorderLineThickness,
options.borderLineThickness
Expand Down
Loading