diff --git a/README.md b/README.md index ede776c7..8095021f 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,15 @@ For more information, see the [GitHub Wiki](https://github.com/ArthurHub/Android - [Adding auto-zoom feature to Android-Image-Cropper](https://theartofdev.com/2016/04/25/adding-auto-zoom-feature-to-android-image-cropper/) ## Change log +*2.5.0* +- Update to sdk v26 +- Update gradle plugin to 2.0 +- Update min sdk version to 14 +- Fix NPE in `getWholeImageRect` +- Remove `crop_image_menu_crop` drawable support, replace with `setCropMenuCropButtonIcon` builder api. +- Support setting crop button title via builder api. +- Add string resource for "no permissions" toast. + *2.4.7* - Fix toolbar menu crop icon sometimes appears with random icon (#305) - Use CharSequence instead of string for activity title (thx @KentHawkings) (#297) @@ -129,13 +138,6 @@ For more information, see the [GitHub Wiki](https://github.com/ArthurHub/Android - Making the library JitPack-friendly (Thanks @gazialankus) (#325) - Allow a Fragment to call the startPickImageActivity help method in CropImage (Thanks @cdavietei) (#315) -*2.4.6* -- Fix undefined drawable in Android Studio 3.0 (thx @adrien-aubel) -- Added `CropImage.activity()` overload without `uri` parameter (thx @jake32321) - -*2.4.4* -- Fix image exif (rotation) data not always extracted during image loading (thx @danikula). - See [full change log](https://github.com/ArthurHub/Android-Image-Cropper/wiki/Change-Log). ## License diff --git a/cropper/build.gradle b/cropper/build.gradle index 489d3aa6..a5fc07db 100644 --- a/cropper/build.gradle +++ b/cropper/build.gradle @@ -8,7 +8,7 @@ group='com.github.ArthurHub' ext { PUBLISH_GROUP_ID = 'com.theartofdev.edmodo' PUBLISH_ARTIFACT_ID = 'android-image-cropper' - PUBLISH_VERSION = '2.4.7' + PUBLISH_VERSION = '2.5.0' // gradlew clean build generateRelease } diff --git a/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImage.java b/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImage.java index e60f4e04..e7b0fe88 100644 --- a/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImage.java +++ b/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImage.java @@ -915,8 +915,8 @@ public ActivityBuilder setCropMenuCropButtonTitle(CharSequence title) { * Image resource id to use for crop icon instead of text.
* Default: 0 */ - public ActivityBuilder setCropMenuCropIcon(@DrawableRes int cropMenuCropIcon) { - mOptions.cropMenuCropButtonIcon = cropMenuCropIcon; + public ActivityBuilder setCropMenuCropButtonIcon(@DrawableRes int drawableResource) { + mOptions.cropMenuCropButtonIcon = drawableResource; return this; } } 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 index 7c30f57c..2599a284 100644 --- 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 @@ -40,7 +40,7 @@ public void onSelectImageClick(View view) { .setCropShape(CropImageView.CropShape.OVAL) .setCropMenuCropButtonTitle("Done") .setRequestedSize(400, 400) - .setCropMenuCropIcon(R.drawable.ic_launcher) + .setCropMenuCropButtonIcon(R.drawable.ic_launcher) .start(this); }