Remove nineoldandroids.

Author: daimajia

library/build.gradle

@@ -1,25 +1,26 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 22
-        versionCode 13
-        versionName "1.1.3"
+        minSdkVersion 14
+        targetSdkVersion 25
+        versionCode 20
+        versionName "2.0"
     }
     buildTypes {
         release {
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            minifyEnabled false
+            consumerProguardFiles 'proguard-rules.pro'
         }
     }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.nineoldandroids:library:2.4.0'
-    compile 'com.daimajia.easing:library:1.0.0@aar'
+    compile 'com.daimajia.easing:library:2.0@aar'
+    compile 'com.android.support:support-compat:25.1.1'
 }
 apply from: './gradle-mvn-push.gradle'

library/proguard-rules.pro

@@ -15,3 +15,5 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+-keep class com.daimajia.androidanimations.** { *; }
+-keep interface com.daimajia.androidanimations.** { *; }

library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java

@@ -24,12 +24,12 @@
 
 package com.daimajia.androidanimations.library;
 
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.support.v4.view.ViewCompat;
 import android.view.View;
 import android.view.animation.Interpolator;
 
-import com.nineoldandroids.animation.Animator.AnimatorListener;
-import com.nineoldandroids.animation.AnimatorSet;
-import com.nineoldandroids.view.ViewHelper;
 
 public abstract class BaseViewAnimator {
 
@@ -61,16 +61,16 @@ public void animate() {
      * @param target
      */
     public void reset(View target) {
-        ViewHelper.setAlpha(target, 1);
-        ViewHelper.setScaleX(target, 1);
-        ViewHelper.setScaleY(target, 1);
-        ViewHelper.setTranslationX(target, 0);
-        ViewHelper.setTranslationY(target, 0);
-        ViewHelper.setRotation(target, 0);
-        ViewHelper.setRotationY(target, 0);
-        ViewHelper.setRotationX(target, 0);
-        ViewHelper.setPivotX(target, target.getMeasuredWidth() / 2.0f);
-        ViewHelper.setPivotY(target, target.getMeasuredHeight() / 2.0f);
+        ViewCompat.setAlpha(target, 1);
+        ViewCompat.setScaleX(target, 1);
+        ViewCompat.setScaleY(target, 1);
+        ViewCompat.setTranslationX(target, 0);
+        ViewCompat.setTranslationY(target, 0);
+        ViewCompat.setRotation(target, 0);
+        ViewCompat.setRotationY(target, 0);
+        ViewCompat.setRotationX(target, 0);
+        ViewCompat.setPivotX(target, target.getMeasuredWidth() / 2.0f);
+        ViewCompat.setPivotY(target, target.getMeasuredHeight() / 2.0f);
     }
 
     /**
@@ -95,24 +95,24 @@ public long getStartDelay() {
         return mAnimatorSet.getStartDelay();
     }
 
-    public BaseViewAnimator addAnimatorListener(AnimatorListener l) {
+    public BaseViewAnimator addAnimatorListener(Animator.AnimatorListener l) {
         mAnimatorSet.addListener(l);
         return this;
     }
 
-    public void cancel(){
+    public void cancel() {
         mAnimatorSet.cancel();
     }
 
-    public boolean isRunning(){
+    public boolean isRunning() {
         return mAnimatorSet.isRunning();
     }
 
-    public boolean isStarted(){
+    public boolean isStarted() {
         return mAnimatorSet.isStarted();
     }
 
-    public void removeAnimatorListener(AnimatorListener l) {
+    public void removeAnimatorListener(Animator.AnimatorListener l) {
         mAnimatorSet.removeListener(l);
     }
 

library/src/main/java/com/daimajia/androidanimations/library/YoYo.java

@@ -25,10 +25,10 @@
 
 package com.daimajia.androidanimations.library;
 
+import android.animation.Animator;
 import android.view.View;
 import android.view.animation.Interpolator;
 
-import com.nineoldandroids.animation.Animator;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -68,18 +68,25 @@ public interface AnimatorCallback {
 
     private static class EmptyAnimatorListener implements Animator.AnimatorListener {
         @Override
-        public void onAnimationStart(Animator animation){}
+        public void onAnimationStart(Animator animation) {
+        }
+
         @Override
-        public void onAnimationEnd(Animator animation){}
+        public void onAnimationEnd(Animator animation) {
+        }
+
         @Override
-        public void onAnimationCancel(Animator animation){}
+        public void onAnimationCancel(Animator animation) {
+        }
+
         @Override
-        public void onAnimationRepeat(Animator animation){}
+        public void onAnimationRepeat(Animator animation) {
+        }
     }
 
     public static final class AnimationComposer {
 
-        private List<Animator.AnimatorListener> callbacks = new ArrayList<Animator.AnimatorListener>();
+        private List<Animator.AnimatorListener> callbacks = new ArrayList<>();
 
         private BaseViewAnimator animator;
         private long duration = DURATION;
@@ -119,31 +126,39 @@ public AnimationComposer withListener(Animator.AnimatorListener listener) {
         public AnimationComposer onStart(final AnimatorCallback callback) {
             callbacks.add(new EmptyAnimatorListener() {
                 @Override
-                public void onAnimationStart(Animator animation) { callback.call(animation); }
+                public void onAnimationStart(Animator animation) {
+                    callback.call(animation);
+                }
             });
             return this;
         }
 
         public AnimationComposer onEnd(final AnimatorCallback callback) {
             callbacks.add(new EmptyAnimatorListener() {
                 @Override
-                public void onAnimationEnd(Animator animation) { callback.call(animation); }
+                public void onAnimationEnd(Animator animation) {
+                    callback.call(animation);
+                }
             });
             return this;
         }
 
         public AnimationComposer onCancel(final AnimatorCallback callback) {
             callbacks.add(new EmptyAnimatorListener() {
                 @Override
-                public void onAnimationCancel(Animator animation) { callback.call(animation); }
+                public void onAnimationCancel(Animator animation) {
+                    callback.call(animation);
+                }
             });
             return this;
         }
 
         public AnimationComposer onRepeat(final AnimatorCallback callback) {
             callbacks.add(new EmptyAnimatorListener() {
                 @Override
-                public void onAnimationRepeat(Animator animation) { callback.call(animation); }
+                public void onAnimationRepeat(Animator animation) {
+                    callback.call(animation);
+                }
             });
             return this;
         }
@@ -163,23 +178,23 @@ public static final class YoYoString {
         private BaseViewAnimator animator;
         private View target;
 
-        private YoYoString(BaseViewAnimator animator, View target){
+        private YoYoString(BaseViewAnimator animator, View target) {
             this.target = target;
             this.animator = animator;
         }
 
-        public boolean isStarted(){
+        public boolean isStarted() {
             return animator.isStarted();
         }
 
-        public boolean isRunning(){
+        public boolean isRunning() {
             return animator.isRunning();
         }
 
-        public void stop(boolean reset){
+        public void stop(boolean reset) {
             animator.cancel();
 
-            if(reset)
+            if (reset)
                 animator.reset(target);
         }
 

library/src/main/java/com/daimajia/androidanimations/library/attention/BounceAnimator.java

@@ -24,16 +24,16 @@
 
 package com.daimajia.androidanimations.library.attention;
 
+import android.animation.ObjectAnimator;
 import android.view.View;
 
 import com.daimajia.androidanimations.library.BaseViewAnimator;
-import com.nineoldandroids.animation.ObjectAnimator;
 
 public class BounceAnimator extends BaseViewAnimator {
     @Override
     public void prepare(View target) {
         getAnimatorAgent().playTogether(
-                ObjectAnimator.ofFloat(target,"translationY",0,0,-30,0,-15,0,0)
+                ObjectAnimator.ofFloat(target, "translationY", 0, 0, -30, 0, -15, 0, 0)
         );
     }
 }

library/src/main/java/com/daimajia/androidanimations/library/attention/FlashAnimator.java

@@ -24,16 +24,16 @@
 
 package com.daimajia.androidanimations.library.attention;
 
+import android.animation.ObjectAnimator;
 import android.view.View;
 
 import com.daimajia.androidanimations.library.BaseViewAnimator;
-import com.nineoldandroids.animation.ObjectAnimator;
 
-public class FlashAnimator extends BaseViewAnimator{
+public class FlashAnimator extends BaseViewAnimator {
     @Override
     public void prepare(View target) {
         getAnimatorAgent().playTogether(
-                ObjectAnimator.ofFloat(target,"alpha",1,0,1,0,1)
+                ObjectAnimator.ofFloat(target, "alpha", 1, 0, 1, 0, 1)
         );
     }
 }

library/src/main/java/com/daimajia/androidanimations/library/attention/PulseAnimator.java

@@ -24,10 +24,10 @@
 
 package com.daimajia.androidanimations.library.attention;
 
+import android.animation.ObjectAnimator;
 import android.view.View;
 
 import com.daimajia.androidanimations.library.BaseViewAnimator;
-import com.nineoldandroids.animation.ObjectAnimator;
 
 public class PulseAnimator extends BaseViewAnimator {
     @Override

library/src/main/java/com/daimajia/androidanimations/library/attention/RubberBandAnimator.java

@@ -24,10 +24,10 @@
 
 package com.daimajia.androidanimations.library.attention;
 
+import android.animation.ObjectAnimator;
 import android.view.View;
 
 import com.daimajia.androidanimations.library.BaseViewAnimator;
-import com.nineoldandroids.animation.ObjectAnimator;
 
 public class RubberBandAnimator extends BaseViewAnimator {
     @Override

library/src/main/java/com/daimajia/androidanimations/library/attention/ShakeAnimator.java

@@ -25,16 +25,16 @@
 package com.daimajia.androidanimations.library.attention;
 
 
+import android.animation.ObjectAnimator;
 import android.view.View;
 
 import com.daimajia.androidanimations.library.BaseViewAnimator;
-import com.nineoldandroids.animation.ObjectAnimator;
 
 public class ShakeAnimator extends BaseViewAnimator {
     @Override
     public void prepare(View target) {
         getAnimatorAgent().playTogether(
-                ObjectAnimator.ofFloat(target, "translationX", 0, 25, -25, 25, -25,15, -15, 6, -6, 0)
+                ObjectAnimator.ofFloat(target, "translationX", 0, 25, -25, 25, -25, 15, -15, 6, -6, 0)
         );
     }
 }

library/src/main/java/com/daimajia/androidanimations/library/attention/StandUpAnimator.java

@@ -24,23 +24,22 @@
 
 package com.daimajia.androidanimations.library.attention;
 
+import android.animation.ObjectAnimator;
 import android.view.View;
 
 import com.daimajia.androidanimations.library.BaseViewAnimator;
-import com.nineoldandroids.animation.ObjectAnimator;
 
 
-
-public class StandUpAnimator extends BaseViewAnimator{
+public class StandUpAnimator extends BaseViewAnimator {
     @Override
     public void prepare(View target) {
-        float x = (target.getWidth() - target.getPaddingLeft() - target.getPaddingRight())/2
+        float x = (target.getWidth() - target.getPaddingLeft() - target.getPaddingRight()) / 2
                 + target.getPaddingLeft();
         float y = target.getHeight() - target.getPaddingBottom();
         getAnimatorAgent().playTogether(
-                ObjectAnimator.ofFloat(target,"pivotX",x,x,x,x,x),
-                ObjectAnimator.ofFloat(target,"pivotY",y,y,y,y,y),
-                ObjectAnimator.ofFloat(target,"rotationX",55,-30,15,-15,0)
+                ObjectAnimator.ofFloat(target, "pivotX", x, x, x, x, x),
+                ObjectAnimator.ofFloat(target, "pivotY", y, y, y, y, y),
+                ObjectAnimator.ofFloat(target, "rotationX", 55, -30, 15, -15, 0)
         );
     }
 }