new animators, Landing and TakingOff

daimajia · Aug 8, 2014 · d4b96ae · d4b96ae
1 parent 7c66c6b
commit d4b96ae
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -18,8 +18,8 @@
 # org.gradle.parallel=true
 
 
-VERSION_NAME=1.1.1
-VERSION_CODE=12
+VERSION_NAME=1.1.2
+VERSION_CODE=13
 GROUP=com.daimajia.androidanimations
 
 POM_DESCRIPTION=Collect android animations

diff --git a/library/build.gradle b/library/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.daimajia.androidanimations.library"
         minSdkVersion 8
         targetSdkVersion 20
-        versionCode 12
-        versionName "1.1.1"
+        versionCode 13
+        versionName "1.1.2"
     }
     buildTypes {
         release {

diff --git a/library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java b/library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java
@@ -122,7 +122,7 @@ public BaseViewAnimator setInterpolator(Interpolator interpolator) {
     }
 
     public long getDuration() {
-        return mDuration
+        return mDuration;
     }
 
     public AnimatorSet getAnimatorAgent() {

diff --git a/library/src/main/java/com/daimajia/androidanimations/library/Techniques.java b/library/src/main/java/com/daimajia/androidanimations/library/Techniques.java
@@ -26,7 +26,6 @@
 package com.daimajia.androidanimations.library;
 
 import com.daimajia.androidanimations.library.attention.BounceAnimator;
-import com.daimajia.androidanimations.library.attention.DropOutAnimator;
 import com.daimajia.androidanimations.library.attention.FlashAnimator;
 import com.daimajia.androidanimations.library.attention.PulseAnimator;
 import com.daimajia.androidanimations.library.attention.RubberBandAnimator;
@@ -75,6 +74,9 @@
 import com.daimajia.androidanimations.library.specials.HingeAnimator;
 import com.daimajia.androidanimations.library.specials.RollInAnimator;
 import com.daimajia.androidanimations.library.specials.RollOutAnimator;
+import com.daimajia.androidanimations.library.specials.in.DropOutAnimator;
+import com.daimajia.androidanimations.library.specials.in.LandingAnimator;
+import com.daimajia.androidanimations.library.specials.out.TakingOffAnimator;
 import com.daimajia.androidanimations.library.zooming_entrances.ZoomInAnimator;
 import com.daimajia.androidanimations.library.zooming_entrances.ZoomInDownAnimator;
 import com.daimajia.androidanimations.library.zooming_entrances.ZoomInLeftAnimator;
@@ -88,6 +90,10 @@
 
 public enum Techniques {
 
+    DropOut(DropOutAnimator.class),
+    Landing(LandingAnimator.class),
+    TakingOff(TakingOffAnimator.class),
+
     Flash(FlashAnimator.class),
     Pulse(PulseAnimator.class),
     RubberBand(RubberBandAnimator.class),
@@ -98,7 +104,6 @@ public enum Techniques {
     Tada(TadaAnimator.class),
     StandUp(StandUpAnimator.class),
     Wave(WaveAnimator.class),
-    DropOut(DropOutAnimator.class),
 
     Hinge(HingeAnimator.class),
     RollIn(RollInAnimator.class),
@@ -160,6 +165,8 @@ public enum Techniques {
     ZoomOutRight(ZoomOutRightAnimator.class),
     ZoomOutUp(ZoomOutUpAnimator.class);
 
+
+
     private Class animatorClazz;
 
     private Techniques(Class clazz) {

diff --git a/...ns/library/attention/DropOutAnimator.java → .../library/specials/in/DropOutAnimator.java b/...ns/library/attention/DropOutAnimator.java → .../library/specials/in/DropOutAnimator.java
@@ -1,4 +1,4 @@
-package com.daimajia.androidanimations.library.attention;
+package com.daimajia.androidanimations.library.specials.in;
 
 import android.view.View;
 

diff --git a/...ary/src/main/java/com/daimajia/androidanimations/library/specials/in/LandingAnimator.java b/...ary/src/main/java/com/daimajia/androidanimations/library/specials/in/LandingAnimator.java
@@ -0,0 +1,19 @@
+package com.daimajia.androidanimations.library.specials.in;
+
+import android.view.View;
+
+import com.daimajia.androidanimations.library.BaseViewAnimator;
+import com.daimajia.easing.Glider;
+import com.daimajia.easing.Skill;
+import com.nineoldandroids.animation.ObjectAnimator;
+
+public class LandingAnimator extends BaseViewAnimator{
+    @Override
+    protected void prepare(View target) {
+        getAnimatorAgent().playTogether(
+                Glider.glide(Skill.QuintEaseOut, getDuration(), ObjectAnimator.ofFloat(target, "scaleX", 1.5f, 1f)),
+                Glider.glide(Skill.QuintEaseOut, getDuration(), ObjectAnimator.ofFloat(target, "scaleY", 1.5f, 1f)),
+                Glider.glide(Skill.QuintEaseOut, getDuration(), ObjectAnimator.ofFloat(target, "alpha", 0, 1f))
+        );
+    }
+}
diff --git a/.../src/main/java/com/daimajia/androidanimations/library/specials/out/TakingOffAnimator.java b/.../src/main/java/com/daimajia/androidanimations/library/specials/out/TakingOffAnimator.java
@@ -0,0 +1,19 @@
+package com.daimajia.androidanimations.library.specials.out;
+
+import android.view.View;
+
+import com.daimajia.androidanimations.library.BaseViewAnimator;
+import com.daimajia.easing.Glider;
+import com.daimajia.easing.Skill;
+import com.nineoldandroids.animation.ObjectAnimator;
+
+public class TakingOffAnimator extends BaseViewAnimator {
+    @Override
+    protected void prepare(View target) {
+        getAnimatorAgent().playTogether(
+                Glider.glide(Skill.QuintEaseOut, getDuration(), ObjectAnimator.ofFloat(target, "scaleX", 1f, 1.5f)),
+                Glider.glide(Skill.QuintEaseOut, getDuration(), ObjectAnimator.ofFloat(target, "scaleY", 1f, 1.5f)),
+                Glider.glide(Skill.QuintEaseOut, getDuration(), ObjectAnimator.ofFloat(target, "alpha", 1, 0))
+        );
+    }
+}