From 29cf1cbb1380a6c2df9213f12a501c6dc29498bd Mon Sep 17 00:00:00 2001 From: Nickolay Semendyaev Date: Sat, 21 Oct 2017 23:52:15 +0600 Subject: [PATCH 1/2] Add support 14+ API --- library/build.gradle | 8 +++++--- .../android/library/imagezoom/ImageViewTouchBase.java | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 375ea8f..a4c391e 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,8 +3,6 @@ apply plugin: 'com.android.library' group GROUP version VERSION_NAME -dependencies {} - android { compileSdkVersion ANDROID_BUILD_SDK_VERSION as int buildToolsVersion ANDROID_BUILD_TOOLS_VERSION @@ -12,7 +10,7 @@ android { defaultConfig { versionCode 1 versionName version - minSdkVersion 16 + minSdkVersion 14 targetSdkVersion ANDROID_BUILD_TARGET_SDK_VERSION as int } @@ -34,6 +32,10 @@ android { } } +dependencies { + implementation "com.android.support:support-compat:26.1.0" +} + apply from: rootProject.file('checkstyle.gradle') apply from: 'https://raw.githubusercontent.com/sephiroth74/gradle-mvn-push/master/gradle-mvn-push.gradle' diff --git a/library/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java b/library/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java index a191f4e..13aa8bb 100644 --- a/library/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java +++ b/library/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java @@ -12,6 +12,7 @@ import android.graphics.PointF; import android.graphics.RectF; import android.graphics.drawable.Drawable; +import android.support.v4.view.ViewCompat; import android.util.AttributeSet; import android.util.Log; import android.view.ViewConfiguration; @@ -963,7 +964,7 @@ public void onAnimationUpdate(final ValueAnimator animation) { panBy(valueX - oldValueX, valueY - oldValueY); oldValueX = valueX; oldValueY = valueY; - postInvalidateOnAnimation(); + ViewCompat.postInvalidateOnAnimation(ImageViewTouchBase.this); } } ); @@ -1022,7 +1023,7 @@ protected void zoomTo(float scale, float centerX, float centerY, final long dura public void onAnimationUpdate(final ValueAnimator animation) { float value = (Float) animation.getAnimatedValue(); zoomTo(value, destX, destY); - postInvalidateOnAnimation(); + ViewCompat.postInvalidateOnAnimation(ImageViewTouchBase.this); } } ); From a95773530d2638092abdb60f74751841afddfa43 Mon Sep 17 00:00:00 2001 From: Nickolay Semendyaev Date: Sat, 21 Oct 2017 23:52:35 +0600 Subject: [PATCH 2/2] Add support Android Studio 3.0 Bump to 2.3.1 --- README.md | 2 +- build.gradle | 6 ++++-- gradle.properties | 9 +++++---- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 021b67a..69a408c 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ The default display state is `DisplayState.NONE'. it.sephiroth.android.library.imagezoom imagezoom - 2.3.0 + 2.3.1 ##Usage (Gradle) diff --git a/build.gradle b/build.gradle index 029ef9f..fd1d438 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { jcenter() mavenLocal() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.0-rc1' } } @@ -16,5 +17,6 @@ allprojects { repositories { jcenter() mavenCentral() + google() } -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index c753340..3ced38a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -VERSION_NAME=2.3.0 +VERSION_NAME=2.3.1 GROUP=it.sephiroth.android.library.imagezoom POM_DESCRIPTION=Android ImageView widget with zoom and pan capabilities @@ -16,8 +16,9 @@ POM_SCM_URL=https://github.com/sephiroth74/ImageViewZoom POM_SCM_CONNECTION=scm:git@github.com:sephiroth74/ImageViewZoom POM_SCM_DEV_CONNECTION=scm:git@github.com:sephiroth74/ImageViewZoom.git -ANDROID_BUILD_TARGET_SDK_VERSION=25 -ANDROID_BUILD_TOOLS_VERSION=25.0.3 -ANDROID_BUILD_SDK_VERSION=25 +ANDROID_BUILD_TARGET_SDK_VERSION=26 +ANDROID_BUILD_TOOLS_VERSION=26.0.2 +ANDROID_BUILD_SDK_VERSION=26 +ANDROID_SUPPORT_LIB_VERSION=26.1.0 org.gradle.daemon=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4488b3e..d475d10 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jun 27 18:55:51 EEST 2017 +#Sat Oct 21 23:42:36 GMT+06:00 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index a4c391e..8616a60 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -33,7 +33,7 @@ android { } dependencies { - implementation "com.android.support:support-compat:26.1.0" + implementation "com.android.support:support-compat:$ANDROID_SUPPORT_LIB_VERSION" } apply from: rootProject.file('checkstyle.gradle')