diff --git a/app/src/main/java/team/uptech/motionviews/viewmodel/Layer.java b/app/src/main/java/team/uptech/motionviews/viewmodel/Layer.java index c3de6c6..47197f4 100644 --- a/app/src/main/java/team/uptech/motionviews/viewmodel/Layer.java +++ b/app/src/main/java/team/uptech/motionviews/viewmodel/Layer.java @@ -37,7 +37,7 @@ protected void reset() { } public void postScale(float scaleDiff) { - float newVal = scale + scaleDiff; + float newVal = scale * scaleDiff; if (newVal >= getMinScale() && newVal <= getMaxScale()) { scale = newVal; } diff --git a/app/src/main/java/team/uptech/motionviews/widget/MotionView.java b/app/src/main/java/team/uptech/motionviews/widget/MotionView.java index 128477f..a6fb801 100644 --- a/app/src/main/java/team/uptech/motionviews/widget/MotionView.java +++ b/app/src/main/java/team/uptech/motionviews/widget/MotionView.java @@ -356,7 +356,7 @@ private class ScaleListener extends ScaleGestureDetector.SimpleOnScaleGestureLis public boolean onScale(ScaleGestureDetector detector) { if (selectedEntity != null) { float scaleFactorDiff = detector.getScaleFactor(); - selectedEntity.getLayer().postScale(scaleFactorDiff - 1.0F); + selectedEntity.getLayer().postScale(scaleFactorDiff); updateUI(); } return true; diff --git a/build.gradle b/build.gradle index d9b961b..60825dd 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:3.0.0-alpha3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..0aaaae1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Wed Jun 07 11:36:42 KRAT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-milestone-1-all.zip