Merge pull request #1 from airbnb/cleanup

Set interpolators in some missing places

LotteSample/src/androidTest/java/com/airbnb/lotte/samples/LotteTest.java

@@ -14,9 +14,8 @@ public LotteTest() {
     @Test
     public void testHosts() {
         TestRobot.testStaticFile(getActivity(), "Hosts Still.json");
-        TestRobot.testStaticFile(getActivity(), "BusinessTravel01_Still.json");
-        TestRobot.testStaticFile(getActivity(), "BusinessTravel02_Still.json");
-        TestRobot.testStaticFile(getActivity(), "BusinessTravel03_Still.json");
+        TestRobot.testAnimatedFile(getActivity(), "BusinessTravel01.json");
+        TestRobot.testAnimatedFile(getActivity(), "BusinessTravel03.json");
         TestRobot.testAnimatedFile(getActivity(), "LightBulb.json");
         TestRobot.testAnimatedFile(getActivity(), "Diamond 2.json");
         TestRobot.testAnimatedFile(getActivity(), "CheckSwitch.json");

lotte/src/main/java/com/airbnb/lotte/animation/BaseLotteAnimatableValue.java

@@ -22,7 +22,7 @@ public abstract class BaseLotteAnimatableValue<T> implements LotteAnimatableValu
     protected final Observable<T> observable = new Observable<>();
     final List<T> keyValues = new ArrayList<>();
     protected final List<Float> keyTimes = new ArrayList<>();
-    final List<Interpolator> timingFunctions = new ArrayList<>();
+    final List<Interpolator> interpolators = new ArrayList<>();
     long delay;
     protected long duration;
 
@@ -88,7 +88,7 @@ private void buildAnimationForKeyframes(JSONArray keyframes) {
 
                 if (outValue != null) {
                     keyValues.add(outValue);
-                    timingFunctions.add(new LinearInterpolator());
+                    interpolators.add(new LinearInterpolator());
                     outValue = null;
                 }
 
@@ -101,8 +101,8 @@ private void buildAnimationForKeyframes(JSONArray keyframes) {
                             observable.setValue(initialValue);
                         }
                         keyValues.add(startValue);
-                        if (!timingFunctions.isEmpty()) {
-                            timingFunctions.add(new LinearInterpolator());
+                        if (!interpolators.isEmpty()) {
+                            interpolators.add(new LinearInterpolator());
                         }
                     }
                     addStartValue = false;
@@ -132,7 +132,7 @@ private void buildAnimationForKeyframes(JSONArray keyframes) {
                     } else {
                         timingFunction = new LinearInterpolator();
                     }
-                    timingFunctions.add(timingFunction);
+                    interpolators.add(timingFunction);
                 }
 
                 keyTimes.add(timePercentage);
@@ -162,5 +162,5 @@ public Observable<T> getObservable() {
 
     protected abstract T valueFromObject(Object array) throws JSONException;
 
-    public abstract LotteKeyframeAnimation animationForKeyPath(@LotteAnimatableProperty.AnimatableProperty int property);
+    public abstract LotteKeyframeAnimation animationForKeyPath();
 }

lotte/src/main/java/com/airbnb/lotte/animation/LotteAnimatableColorValue.java

@@ -2,7 +2,6 @@
 
 import android.graphics.Color;
 
-import com.airbnb.lotte.animation.LotteAnimatableProperty.AnimatableProperty;
 import com.airbnb.lotte.utils.LotteColorKeyframeAnimation;
 import com.airbnb.lotte.utils.LotteKeyframeAnimation;
 
@@ -40,17 +39,16 @@ protected Integer valueFromObject(Object object) throws JSONException {
 
 
     @Override
-    public LotteKeyframeAnimation animationForKeyPath(@AnimatableProperty int property) {
+    public LotteKeyframeAnimation animationForKeyPath() {
         if (!hasAnimation()) {
             return null;
         }
-        LotteKeyframeAnimation animation = new LotteColorKeyframeAnimation(property, duration, compDuration, keyTimes, keyValues);
+        LotteColorKeyframeAnimation animation = new LotteColorKeyframeAnimation(duration, compDuration, keyTimes, keyValues, interpolators);
         animation.setStartDelay(delay);
-        animation.setInterpolators(timingFunctions);
-        animation.addUpdateListener(new LotteKeyframeAnimation.AnimationListener() {
+        animation.addUpdateListener(new LotteKeyframeAnimation.AnimationListener<Integer>() {
             @Override
-            public void onValueChanged(Object progress) {
-                observable.setValue((Integer) progress);
+            public void onValueChanged(Integer progress) {
+                observable.setValue(progress);
             }
         });
         return animation;

lotte/src/main/java/com/airbnb/lotte/animation/LotteAnimatableFloatValue.java

@@ -28,8 +28,8 @@ protected Float valueFromObject(Object object) throws JSONException {
     }
 
     @Override
-    public LotteKeyframeAnimation animationForKeyPath(@LotteAnimatableProperty.AnimatableProperty int property) {
-        LotteKeyframeAnimation<Float> animation = new LotteNumberKeyframeAnimation<>(property, duration, compDuration, keyTimes, Float.class, keyValues);
+    public LotteKeyframeAnimation animationForKeyPath() {
+        LotteKeyframeAnimation<Float> animation = new LotteNumberKeyframeAnimation<>(duration, compDuration, keyTimes, Float.class, keyValues, interpolators);
         animation.setStartDelay(delay);
         animation.addUpdateListener(new LotteKeyframeAnimation.AnimationListener<Float>() {
             @Override

lotte/src/main/java/com/airbnb/lotte/animation/LotteAnimatableIntegerValue.java

@@ -23,8 +23,8 @@ protected Integer valueFromObject(Object object) throws JSONException {
     }
 
     @Override
-    public LotteKeyframeAnimation animationForKeyPath(@LotteAnimatableProperty.AnimatableProperty int property) {
-        LotteKeyframeAnimation<Integer> animation = new LotteNumberKeyframeAnimation<>(property, duration, compDuration, keyTimes, Integer.class, keyValues);
+    public LotteKeyframeAnimation animationForKeyPath() {
+        LotteKeyframeAnimation<Integer> animation = new LotteNumberKeyframeAnimation<>(duration, compDuration, keyTimes, Integer.class, keyValues, interpolators);
         animation.setStartDelay(delay);
         animation.addUpdateListener(new LotteKeyframeAnimation.AnimationListener<Integer>() {
             @Override

lotte/src/main/java/com/airbnb/lotte/animation/LotteAnimatableNumberValue.java

@@ -7,7 +7,6 @@
 import android.view.animation.Interpolator;
 import android.view.animation.LinearInterpolator;
 
-import com.airbnb.lotte.animation.LotteAnimatableProperty.AnimatableProperty;
 import com.airbnb.lotte.model.RemapInterface;
 import com.airbnb.lotte.utils.JsonUtils;
 import com.airbnb.lotte.utils.LotteKeyframeAnimation;
@@ -32,7 +31,7 @@ public class LotteAnimatableNumberValue implements LotteAnimatableValue<Number>
 
     private final List<Float> valueKeyframes = new ArrayList<>();
     private final List<Float> keyTimes = new ArrayList<>();
-    private final List<Interpolator> timingFunctions = new ArrayList<>();
+    private final List<Interpolator> interpolators = new ArrayList<>();
     private long delay;
     private long duration;
     private long startFrame;
@@ -96,7 +95,7 @@ private void buildAnimationForKeyframes(JSONArray keyframes) {
 
                 if (outValue != null) {
                     valueKeyframes.add(outValue);
-                    timingFunctions.add(new LinearInterpolator());
+                    interpolators.add(new LinearInterpolator());
                     outValue = null;
                 }
 
@@ -108,8 +107,8 @@ private void buildAnimationForKeyframes(JSONArray keyframes) {
                             observable.setValue(initialValue);
                         }
                         valueKeyframes.add(startValue);
-                        if (!timingFunctions.isEmpty()) {
-                            timingFunctions.add(new LinearInterpolator());
+                        if (!interpolators.isEmpty()) {
+                            interpolators.add(new LinearInterpolator());
                         }
                     }
                     addStartValue = false;
@@ -139,7 +138,7 @@ private void buildAnimationForKeyframes(JSONArray keyframes) {
                     } else {
                         timingFunction = new LinearInterpolator();
                     }
-                    timingFunctions.add(timingFunction);
+                    interpolators.add(timingFunction);
                 }
 
                 keyTimes.add(timePercentage);
@@ -160,9 +159,9 @@ private Float numberValueFromObject(Object valueObject) throws JSONException {
         if (valueObject instanceof Float) {
             return (Float) valueObject;
         } else if (valueObject instanceof JSONArray && ((JSONArray) valueObject).get(0) instanceof Double) {
-            return new Float(((JSONArray) valueObject).getDouble(0));
+            return (float) ((JSONArray) valueObject).getDouble(0);
         } else if (valueObject instanceof JSONArray && ((JSONArray) valueObject).get(0) instanceof Integer) {
-            return new Float(((JSONArray) valueObject).getInt(0));
+            return (float) ((JSONArray) valueObject).getInt(0);
         }
         return null;
     }
@@ -197,13 +196,13 @@ public float getInitialValue() {
 
 
     @Override
-    public LotteKeyframeAnimation animationForKeyPath(@AnimatableProperty int property) {
-        LotteKeyframeAnimation<Float> animation = new LotteNumberKeyframeAnimation<>(property, duration, compDuration, keyTimes, Float.class, valueKeyframes);
+    public LotteKeyframeAnimation animationForKeyPath() {
+        LotteNumberKeyframeAnimation<Float> animation = new LotteNumberKeyframeAnimation<>(duration, compDuration, keyTimes, Float.class, valueKeyframes, interpolators);
         animation.setStartDelay(delay);
-        animation.addUpdateListener(new LotteKeyframeAnimation.AnimationListener() {
+        animation.addUpdateListener(new LotteKeyframeAnimation.AnimationListener<Float>() {
             @Override
-            public void onValueChanged(Object progress) {
-                observable.setValue((Number) progress);
+            public void onValueChanged(Float progress) {
+                observable.setValue(progress);
             }
         });
         return animation;
@@ -221,9 +220,6 @@ public Observable<Number> getObservable() {
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("LotteAnimatableNumberValue{");
-        sb.append("initialValue=").append(initialValue);
-        sb.append('}');
-        return sb.toString();
+        return "LotteAnimatableNumberValue{" + "initialValue=" + initialValue + '}';
     }
 }

lotte/src/main/java/com/airbnb/lotte/animation/LotteAnimatablePointValue.java

@@ -1,12 +1,10 @@
 package com.airbnb.lotte.animation;
 
 import android.graphics.PointF;
-import android.graphics.Rect;
 import android.support.v4.view.animation.PathInterpolatorCompat;
 import android.view.animation.Interpolator;
 import android.view.animation.LinearInterpolator;
 
-import com.airbnb.lotte.animation.LotteAnimatableProperty.AnimatableProperty;
 import com.airbnb.lotte.utils.LotteKeyframeAnimation;
 import com.airbnb.lotte.utils.LottePathKeyframeAnimation;
 import com.airbnb.lotte.utils.LottePointKeyframeAnimation;
@@ -38,6 +36,7 @@ public class LotteAnimatablePointValue implements LotteAnimatableValue<PointF> {
     private long durationFrames;
     private int frameRate;
 
+    @SuppressWarnings("EmptyCatchBlock")
     public LotteAnimatablePointValue(JSONObject pointValues, int frameRate, long compDuration) {
         this.compDuration = compDuration;
         usePathAnimation = true;
@@ -141,9 +140,8 @@ private void buildAnimationForKeyframes(JSONArray keyframes) {
                     PointF vertex = pointFromValueArray(keyframe.getJSONArray("e"));
                     pointKeyframes.add(vertex);
                     if (cp1 != null && cp2 != null) {
-                        PointF inVertex = startPoint;
                         animationPath.cubicTo(
-                                inVertex.x + cp1.x, inVertex.y + cp1.y,
+                                startPoint.x + cp1.x, startPoint.y + cp1.y,
                                 vertex.x + cp2.x, vertex.y + cp2.y,
                                 vertex.x, vertex.y);
                     } else {
@@ -195,7 +193,7 @@ private PointF pointFromValueObject(JSONObject value) {
 
             PointF point = new PointF();
             if (x instanceof JSONArray) {
-                point.x = new Float(((JSONArray) x).getDouble(0));
+                point.x = (float) ((JSONArray) x).getDouble(0);
             } else {
                 if (x instanceof Integer) {
                     point.x = (Integer) x;
@@ -205,7 +203,7 @@ private PointF pointFromValueObject(JSONObject value) {
             }
 
             if (y instanceof JSONArray) {
-                point.y = new Float(((JSONArray) y).getDouble(0));
+                point.y = (float) ((JSONArray) y).getDouble(0);
             } else {
                 if (y instanceof Integer) {
                     point.y = (Integer) y;
@@ -220,23 +218,6 @@ private PointF pointFromValueObject(JSONObject value) {
         }
     }
 
-
-    public void remapPointsFromBounds(Rect fromBounds, Rect toBounds) {
-        // TODO: this is broken. Maybe not necessary.
-//        if (pointKeyframes.isEmpty()) {
-//            initialPoint = new PointF(
-//                    MiscUtils.remapValue(initialPoint.x, fromBounds.left, fromBounds.width(), toBounds.left, toBounds.width()),
-//                    MiscUtils.remapValue(initialPoint.y, fromBounds.top, fromBounds.height(), toBounds.top, toBounds.height()));
-//        } else {
-//            for (PointF point : pointKeyframes) {
-//               point.set(
-//                        MiscUtils.remapValue(point.x, fromBounds.left, fromBounds.width(), toBounds.left, toBounds.width()),
-//                        MiscUtils.remapValue(point.y, fromBounds.top, fromBounds.height(), toBounds.top, toBounds.height()));
-//
-//            }
-//        }
-    }
-
     public void setUsePathAnimation(boolean usePathAnimation) {
         this.usePathAnimation = usePathAnimation;
     }
@@ -251,24 +232,24 @@ public PointF getInitialPoint() {
     }
 
     @Override
-    public LotteKeyframeAnimation animationForKeyPath(@AnimatableProperty int property) {
+    public LotteKeyframeAnimation animationForKeyPath() {
         if (!hasAnimation()) {
             return null;
         }
 
-        LotteKeyframeAnimation animation;
+        LotteKeyframeAnimation<PointF> animation;
         if (!animationPath.isEmpty() && usePathAnimation) {
-            animation = new LottePathKeyframeAnimation(property, duration, compDuration, keyTimes, animationPath);
+            animation = new LottePathKeyframeAnimation(duration, compDuration, keyTimes, animationPath, interpolators);
         } else {
-            animation = new LottePointKeyframeAnimation(property, duration, compDuration, keyTimes, pointKeyframes);
+            animation = new LottePointKeyframeAnimation(duration, compDuration, keyTimes, pointKeyframes, interpolators);
         }
+        animation.setStartDelay(delay);
         animation.addUpdateListener(new LotteKeyframeAnimation.AnimationListener<PointF>() {
             @Override
             public void onValueChanged(PointF progress) {
                 observable.setValue(progress);
             }
         });
-        animation.setStartDelay(delay);
         return animation;
     }
 
@@ -279,9 +260,6 @@ public boolean hasAnimation() {
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("LotteAnimatablePointValue{");
-        sb.append("initialPoint=").append(initialPoint);
-        sb.append('}');
-        return sb.toString();
+        return "LotteAnimatablePointValue{" + "initialPoint=" + initialPoint + '}';
     }
 }

lotte/src/main/java/com/airbnb/lotte/animation/LotteAnimatableScaleValue.java

@@ -5,7 +5,6 @@
 import android.view.animation.Interpolator;
 import android.view.animation.LinearInterpolator;
 
-import com.airbnb.lotte.animation.LotteAnimatableProperty.AnimatableProperty;
 import com.airbnb.lotte.utils.JsonUtils;
 import com.airbnb.lotte.utils.LotteKeyframeAnimation;
 import com.airbnb.lotte.utils.LotteTransform3D;
@@ -157,9 +156,8 @@ public LotteTransform3D getInitialScale() {
     }
 
     @Override
-    public LotteKeyframeAnimation animationForKeyPath(@AnimatableProperty int property) {
-        LotteKeyframeAnimation animation = new LotteTransformKeyframeAnimation(property, duration, compDuration, keyTimes, scaleKeyframes);
-        animation.setInterpolators(interpolators);
+    public LotteKeyframeAnimation animationForKeyPath() {
+        LotteKeyframeAnimation animation = new LotteTransformKeyframeAnimation(duration, compDuration, keyTimes, scaleKeyframes, interpolators);
         animation.setStartDelay(delay);
         animation.addUpdateListener(new LotteKeyframeAnimation.AnimationListener() {
             @Override

lotte/src/main/java/com/airbnb/lotte/animation/LotteAnimatableShapeValue.java

@@ -223,13 +223,12 @@ private PointF vertexAtIndex(int idx, JSONArray points) {
     }
 
     @Override
-    public LotteKeyframeAnimation animationForKeyPath(@LotteAnimatableProperty.AnimatableProperty int property) {
-        LotteShapeKeyframeAnimation animation = new LotteShapeKeyframeAnimation(property, duration, compDuration, keyTimes, shapeKeyframes);
-        animation.setInterpolators(interpolators);
-        animation.addUpdateListener(new LotteKeyframeAnimation.AnimationListener() {
+    public LotteKeyframeAnimation animationForKeyPath() {
+        LotteShapeKeyframeAnimation animation = new LotteShapeKeyframeAnimation(duration, compDuration, keyTimes, shapeKeyframes, interpolators);
+        animation.addUpdateListener(new LotteKeyframeAnimation.AnimationListener<Path>() {
             @Override
-            public void onValueChanged(Object progress) {
-                observable.setValue((Path) progress);
+            public void onValueChanged(Path progress) {
+                observable.setValue(progress);
             }
         });
         return animation;