Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The default display state is `DisplayState.NONE'.
<dependency>
<groupId>it.sephiroth.android.library.imagezoom</groupId>
<artifactId>imagezoom</artifactId>
<version>2.3.0</version>
<version>2.3.1</version>
</dependency>

##Usage (Gradle)
Expand Down
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand All @@ -16,5 +17,6 @@ allprojects {
repositories {
jcenter()
mavenCentral()
google()
}
}
}
9 changes: 5 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,8 +16,9 @@ POM_SCM_URL=https://github.com/sephiroth74/ImageViewZoom
POM_SCM_CONNECTION=scm:[email protected]:sephiroth74/ImageViewZoom
POM_SCM_DEV_CONNECTION=scm:[email protected]: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
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
8 changes: 5 additions & 3 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@ apply plugin: 'com.android.library'
group GROUP
version VERSION_NAME

dependencies {}

android {
compileSdkVersion ANDROID_BUILD_SDK_VERSION as int
buildToolsVersion ANDROID_BUILD_TOOLS_VERSION

defaultConfig {
versionCode 1
versionName version
minSdkVersion 16
minSdkVersion 14
targetSdkVersion ANDROID_BUILD_TARGET_SDK_VERSION as int
}

Expand All @@ -34,6 +32,10 @@ android {
}
}

dependencies {
implementation "com.android.support:support-compat:$ANDROID_SUPPORT_LIB_VERSION"
}

apply from: rootProject.file('checkstyle.gradle')
apply from: 'https://raw.githubusercontent.com/sephiroth74/gradle-mvn-push/master/gradle-mvn-push.gradle'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -963,7 +964,7 @@ public void onAnimationUpdate(final ValueAnimator animation) {
panBy(valueX - oldValueX, valueY - oldValueY);
oldValueX = valueX;
oldValueY = valueY;
postInvalidateOnAnimation();
ViewCompat.postInvalidateOnAnimation(ImageViewTouchBase.this);
}
}
);
Expand Down Expand Up @@ -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);
}
}
);
Expand Down