Merge pull request #12 from florent37/dev

Dev
florent37 · Feb 3, 2016 · dfa45e0 · dfa45e0
2 parents 5abe2e5 + 763a265
commit dfa45e0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -186,7 +186,7 @@ Add into your **build.gradle**
 [![Download](https://api.bintray.com/packages/florent37/maven/ViewAnimator/images/download.svg)](https://bintray.com/florent37/maven/ViewAnimator/_latestVersion)
 
 ```groovy
-compile 'com.github.florent37:viewanimator:1.0.2@aar'
+compile 'com.github.florent37:viewanimator:1.0.3@aar'
 compile 'com.nineoldandroids:library:2.4.0'
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ ext{
     sourceCompatibilityVersion = JavaVersion.VERSION_1_7
     targetCompatibilityVersion = JavaVersion.VERSION_1_7
 
-    libraryVersion="1.0.2"
+    libraryVersion="1.0.3"
 }
 
 allprojects {

diff --git a/sample/src/main/java/com/github/florent37/sample/viewanimator/MainActivity.java b/sample/src/main/java/com/github/florent37/sample/viewanimator/MainActivity.java
@@ -210,5 +210,9 @@ protected void animateSequentially() {
                 .interpolator(new AccelerateInterpolator())
                 .duration(1200)
                 .start();
+
+        ViewAnimator
+                .animate(image).scaleX(0, 1).scaleY(0, 1).alpha(0, 1).descelerate().duration(500)
+                .thenAnimate(image).scaleX(1, 0).scaleY(1, 0).alpha(1, 0).accelerate().duration(500);
     }
 }
diff --git a/viewanimator/src/main/java/com/github/florent37/viewanimator/AnimationBuilder.java b/viewanimator/src/main/java/com/github/florent37/viewanimator/AnimationBuilder.java
@@ -5,7 +5,9 @@
 import android.support.annotation.IntRange;
 import android.util.Log;
 import android.view.View;
+import android.view.animation.AccelerateInterpolator;
 import android.view.animation.CycleInterpolator;
+import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.widget.TextView;
 
@@ -443,6 +445,14 @@ public AnimationBuilder interpolator(Interpolator interpolator) {
         return this;
     }
 
+    public ViewAnimator accelerate() {
+        return viewAnimator.interpolator(new AccelerateInterpolator());
+    }
+
+    public ViewAnimator descelerate() {
+        return viewAnimator.interpolator(new DecelerateInterpolator());
+    }
+
     /**
      * Start.
      */