Merge pull request #15 from tajchert/master

Animate from void to any number ! Thanks tajchert
adnan-SM · Aug 27, 2014 · ee681c0 · ee681c0
2 parents 9ed59a9 + 4b206a8
commit ee681c0
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/timelytextview/src/main/java/com/github/adnansm/timelytextview/TimelyView.java b/timelytextview/src/main/java/com/github/adnansm/timelytextview/TimelyView.java
@@ -60,6 +60,13 @@ public ObjectAnimator animate(int start, int end) {
         return ObjectAnimator.ofObject(this, CONTROL_POINTS_PROPERTY, new TimelyEvaluator(), startPoints, endPoints);
     }
 
+    public ObjectAnimator animate(int end) {
+        float[][] startPoints = NumberUtils.getControlPointsFor(-1);
+        float[][] endPoints = NumberUtils.getControlPointsFor(end);
+
+        return ObjectAnimator.ofObject(this, CONTROL_POINTS_PROPERTY, new TimelyEvaluator(), startPoints, endPoints);
+    }
+
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);

diff --git a/timelytextview/src/main/java/com/github/adnansm/timelytextview/model/NumberUtils.java b/timelytextview/src/main/java/com/github/adnansm/timelytextview/model/NumberUtils.java
@@ -8,6 +8,8 @@ public class NumberUtils {
 
     public static float[][] getControlPointsFor(int start) {
         switch (start) {
+            case (-1):
+                return Null.getInstance().getControlPoints();
             case 0:
                 return Zero.getInstance().getControlPoints();
             case 1:

diff --git a/timelytextview/src/main/java/com/github/adnansm/timelytextview/model/number/Null.java b/timelytextview/src/main/java/com/github/adnansm/timelytextview/model/number/Null.java
@@ -0,0 +1,24 @@
+package com.github.adnansm.timelytextview.model.number;
+
+
+import com.github.adnansm.timelytextview.model.core.Figure;
+
+public class Null extends Figure {
+    private static final float[][] POINTS = {
+            {0.5f, 0.5f},   {0.5f, 0.5f},   {0.5f, 0.5f},
+            {0.5f, 0.5f},   {0.5f, 0.5f},   {0.5f, 0.5f},
+            {0.5f, 0.5f},                   {0.5f, 0.5f},                   {0.5f, 0.5f},
+            {0.5f, 0.5f},                   {0.5f, 0.5f},                   {0.5f, 0.5f},
+            {0.5f, 0.5f}
+    };
+
+    private static final Null INSTANCE = new Null();
+
+    protected Null() {
+        super(POINTS);
+    }
+
+    public static Null getInstance() {
+        return INSTANCE;
+    }
+}