From aedddc0a64176521d162bd262b045d67523a2e7f Mon Sep 17 00:00:00 2001 From: Jay Rambhia Date: Thu, 20 Apr 2017 15:30:36 +0200 Subject: [PATCH] bumped to 0.1.9 Signed-off-by: Jay Rambhia --- Changelog.md | 3 +++ README.md | 2 +- nocropper/build.gradle | 2 +- nocropper/nocropper.iml | 3 +++ sample/build.gradle | 2 +- sample/sample.iml | 18 +++++++++--------- .../fenctose/imagecropper/MainActivity.java | 5 ++++- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2fa57c4..5817e3f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,6 @@ +### V 0.1.9 (2017-04-20) +Fixed [image center panning issue with min zoom](https://github.com/jayrambhia/CropperNoCropper/issues/21). Fixed overriding of `min zoom` by the view. + ### V 0.1.8 (2017-04-14) Fixed [panning with min zoom](https://github.com/jayrambhia/CropperNoCropper/issues/10). Async cropping support added. diff --git a/README.md b/README.md index 31283be..5a5e306 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ forwarded to `CropperImageView`. ### Dependency dependencies { - compile 'com.fenchtose.nocropper:nocropper:0.1.8' + compile 'com.fenchtose.nocropper:nocropper:0.1.9' } ## CropperImageView diff --git a/nocropper/build.gradle b/nocropper/build.gradle index b3e05a9..09c83cc 100644 --- a/nocropper/build.gradle +++ b/nocropper/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' -version = "0.1.8" +version = "0.1.9" group = "com.fenchtose.nocropper" def siteUrl = "https://github.com/jayrambhia/CropperNoCropper" diff --git a/nocropper/nocropper.iml b/nocropper/nocropper.iml index a5e7daf..98f4706 100644 --- a/nocropper/nocropper.iml +++ b/nocropper/nocropper.iml @@ -77,6 +77,7 @@ + @@ -91,7 +92,9 @@ + + diff --git a/sample/build.gradle b/sample/build.gradle index 2ff630d..180cf01 100755 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -26,6 +26,6 @@ dependencies { compile 'com.android.support:appcompat-v7:25.3.1' //Butterknife compile 'com.jakewharton:butterknife:7.0.1' - compile 'com.fenchtose.nocropper:nocropper:0.1.8' + compile 'com.fenchtose.nocropper:nocropper:0.1.9' // compile project(':nocropper') } diff --git a/sample/sample.iml b/sample/sample.iml index 5362650..b66896f 100644 --- a/sample/sample.iml +++ b/sample/sample.iml @@ -62,13 +62,6 @@ - - - - - - - @@ -76,6 +69,13 @@ + + + + + + + @@ -89,7 +89,7 @@ - + @@ -106,7 +106,7 @@ - + diff --git a/sample/src/main/java/com/fenctose/imagecropper/MainActivity.java b/sample/src/main/java/com/fenctose/imagecropper/MainActivity.java index e65387b..4fc09ec 100755 --- a/sample/src/main/java/com/fenctose/imagecropper/MainActivity.java +++ b/sample/src/main/java/com/fenctose/imagecropper/MainActivity.java @@ -93,7 +93,7 @@ private void loadNewImage(String filePath) { Log.i(TAG, "bitmap: " + mBitmap.getWidth() + " " + mBitmap.getHeight()); int maxP = Math.max(mBitmap.getWidth(), mBitmap.getHeight()); - float scale1280 = (float)maxP / 1280; + float scale1280 = (float)maxP / 2560; if (mImageView.getWidth() != 0) { mImageView.setMaxZoom(mImageView.getWidth() * 2 / 1280f); @@ -111,9 +111,12 @@ public boolean onPreDraw() { } + mImageView.setMinZoom(0.8f); + mBitmap = Bitmap.createScaledBitmap(mBitmap, (int)(mBitmap.getWidth()/scale1280), (int)(mBitmap.getHeight()/scale1280), true); mImageView.setImageBitmap(mBitmap); + } private void startGalleryIntent() {