Allow AnimatableIntegerValue to parse decimal values

Fixes #72
airbnb · Feb 9, 2017 · e7664e2 · e7664e2
1 parent 151a1e0
commit e7664e2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lottie/src/main/java/com/airbnb/lottie/AnimatableIntegerValue.java b/lottie/src/main/java/com/airbnb/lottie/AnimatableIntegerValue.java
@@ -22,7 +22,11 @@ class AnimatableIntegerValue extends BaseAnimatableValue<Integer, Integer> {
   }
 
   @Override protected Integer valueFromObject(Object object, float scale) throws JSONException {
-    if (object instanceof Integer) {
+    if (object instanceof Float) {
+      return Math.round((Float) object * scale);
+    } else if (object instanceof Double) {
+      return (int) Math.round((Double) object * scale);
+    } else if (object instanceof Integer) {
       return Math.round((Integer) object * scale);
     } else if (object instanceof JSONArray && ((JSONArray) object).get(0) instanceof Integer) {
       return Math.round(((JSONArray) object).getInt(0) * scale);