Cleanup
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/BaseKeyframeAnimation.java b/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/BaseKeyframeAnimation.java
index 31d48c0..118b85a 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/BaseKeyframeAnimation.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/BaseKeyframeAnimation.java
@@ -134,15 +134,8 @@
final Keyframe<K> keyframe = getCurrentKeyframe();
if (keyframe.xInterpolator != null && keyframe.yInterpolator != null) {
- float xProgress = 0f;
- float yProgress = 0f;
-
- if (!keyframe.isStatic()) {
- //noinspection ConstantConditions
- xProgress = keyframe.xInterpolator.getInterpolation(linearProgress);
- //noinspection ConstantConditions
- yProgress = keyframe.yInterpolator.getInterpolation(linearProgress);
- }
+ float xProgress = keyframe.xInterpolator.getInterpolation(linearProgress);
+ float yProgress = keyframe.yInterpolator.getInterpolation(linearProgress);
value = getValue(keyframe, linearProgress, xProgress, yProgress);
} else {
float progress = getInterpolatedCurrentKeyframeProgress();
diff --git a/lottie/src/main/java/com/airbnb/lottie/parser/KeyframeParser.java b/lottie/src/main/java/com/airbnb/lottie/parser/KeyframeParser.java
index 7604cee..3e54a6a 100644
--- a/lottie/src/main/java/com/airbnb/lottie/parser/KeyframeParser.java
+++ b/lottie/src/main/java/com/airbnb/lottie/parser/KeyframeParser.java
@@ -68,6 +68,9 @@
}
}
+ /**
+ * @param multiDimensional When true, the keyframe interpolators can be independent for the X and Y axis.
+ */
static <T> Keyframe<T> parse(JsonReader reader, LottieComposition composition,
float scale, ValueParser<T> valueParser, boolean animated, boolean multiDimensional) throws IOException {
diff --git a/sample/src/main/assets/Tests/Rect7.json b/sample/src/main/assets/Tests/Rect7.json
index dc85ac7..6b73af9 100644
--- a/sample/src/main/assets/Tests/Rect7.json
+++ b/sample/src/main/assets/Tests/Rect7.json
@@ -1,668 +1 @@
-{
- "assets": [],
- "layers": [
- {
- "ddd": 0,
- "ind": 0,
- "ty": 4,
- "nm": "Shape Layer 4",
- "parent": 3,
- "ks": {
- "o": {
- "k": 100
- },
- "r": {
- "k": 0
- },
- "p": {
- "k": [
- {
- "i": {
- "x": 0,
- "y": 1
- },
- "o": {
- "x": 0.167,
- "y": 0.167
- },
- "n": "0_1_0p167_0p167",
- "t": 35,
- "s": [
- 111.714,
- 91,
- 0
- ],
- "e": [
- 99.714,
- 100,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "t": 62
- }
- ]
- },
- "a": {
- "k": [
- 0,
- 0,
- 0
- ]
- },
- "s": {
- "k": [
- 100,
- 100,
- 100
- ]
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ty": "rc",
- "d": 1,
- "s": {
- "k": [
- {
- "i": {
- "x": [
- 0,
- 0
- ],
- "y": [
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167
- ],
- "y": [
- 0.167,
- 0.167
- ]
- },
- "n": [
- "0_1_0p167_0p167",
- "0_1_0p167_0p167"
- ],
- "t": 35,
- "s": [
- 109.714,
- 103.714
- ],
- "e": [
- 85.714,
- 85.714
- ]
- },
- {
- "t": 62
- }
- ]
- },
- "p": {
- "k": [
- 0,
- 0
- ]
- },
- "r": {
- "k": 0
- },
- "nm": "Rectangle Path 1",
- "mn": "ADBE Vector Shape - Rect"
- },
- {
- "ty": "st",
- "c": {
- "k": [
- 0,
- 0,
- 0,
- 1
- ]
- },
- "o": {
- "k": 100
- },
- "w": {
- "k": 14
- },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke"
- },
- {
- "ty": "tr",
- "p": {
- "k": [
- 0.198,
- 1.099
- ],
- "ix": 2
- },
- "a": {
- "k": [
- 0,
- 0
- ],
- "ix": 1
- },
- "s": {
- "k": [
- 100,
- 100
- ],
- "ix": 3
- },
- "r": {
- "k": 0,
- "ix": 6
- },
- "o": {
- "k": 100,
- "ix": 7
- },
- "sk": {
- "k": 0,
- "ix": 4
- },
- "sa": {
- "k": 0,
- "ix": 5
- },
- "nm": "Transform"
- }
- ],
- "nm": "Rectangle 1",
- "np": 2,
- "mn": "ADBE Vector Group"
- }
- ],
- "ip": 35,
- "op": 63,
- "st": 0,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 1,
- "ty": 4,
- "nm": "Shape Layer 3",
- "parent": 3,
- "ks": {
- "o": {
- "k": 100
- },
- "r": {
- "k": 0
- },
- "p": {
- "k": [
- {
- "i": {
- "x": 0,
- "y": 1
- },
- "o": {
- "x": 0.167,
- "y": 0.167
- },
- "n": "0_1_0p167_0p167",
- "t": 16,
- "s": [
- 111.714,
- 100,
- 0
- ],
- "e": [
- 111.714,
- 91,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "t": 35
- }
- ]
- },
- "a": {
- "k": [
- 0,
- 0,
- 0
- ]
- },
- "s": {
- "k": [
- 100,
- 100,
- 100
- ]
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ty": "rc",
- "d": 1,
- "s": {
- "k": [
- {
- "i": {
- "x": [
- 0,
- 0
- ],
- "y": [
- 0,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167
- ],
- "y": [
- 0.167,
- 0.167
- ]
- },
- "n": [
- "0_0_0p167_0p167",
- "0_1_0p167_0p167"
- ],
- "t": 16,
- "s": [
- 109.714,
- 85.714
- ],
- "e": [
- 109.714,
- 103.714
- ]
- },
- {
- "t": 35
- }
- ]
- },
- "p": {
- "k": [
- 0,
- 0
- ]
- },
- "r": {
- "k": 0
- },
- "nm": "Rectangle Path 1",
- "mn": "ADBE Vector Shape - Rect"
- },
- {
- "ty": "st",
- "c": {
- "k": [
- 0,
- 0,
- 0,
- 1
- ]
- },
- "o": {
- "k": 100
- },
- "w": {
- "k": 14
- },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke"
- },
- {
- "ty": "tr",
- "p": {
- "k": [
- 0.198,
- 1.099
- ],
- "ix": 2
- },
- "a": {
- "k": [
- 0,
- 0
- ],
- "ix": 1
- },
- "s": {
- "k": [
- 100,
- 100
- ],
- "ix": 3
- },
- "r": {
- "k": 0,
- "ix": 6
- },
- "o": {
- "k": 100,
- "ix": 7
- },
- "sk": {
- "k": 0,
- "ix": 4
- },
- "sa": {
- "k": 0,
- "ix": 5
- },
- "nm": "Transform"
- }
- ],
- "nm": "Rectangle 1",
- "np": 2,
- "mn": "ADBE Vector Group"
- }
- ],
- "ip": 16,
- "op": 35,
- "st": 0,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 2,
- "ty": 4,
- "nm": "Shape Layer 2",
- "parent": 3,
- "ks": {
- "o": {
- "k": 100
- },
- "r": {
- "k": 0
- },
- "p": {
- "k": [
- {
- "i": {
- "x": 0,
- "y": 1
- },
- "o": {
- "x": 0.167,
- "y": 0.167
- },
- "n": "0_1_0p167_0p167",
- "t": 0,
- "s": [
- 99.714,
- 100,
- 0
- ],
- "e": [
- 111.714,
- 100,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "t": 16
- }
- ]
- },
- "a": {
- "k": [
- 0,
- 0,
- 0
- ]
- },
- "s": {
- "k": [
- 100,
- 100,
- 100
- ]
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ty": "rc",
- "d": 1,
- "s": {
- "k": [
- {
- "i": {
- "x": [
- 0,
- 0
- ],
- "y": [
- 1,
- 0
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167
- ],
- "y": [
- 0.167,
- 0.167
- ]
- },
- "n": [
- "0_1_0p167_0p167",
- "0_0_0p167_0p167"
- ],
- "t": 0,
- "s": [
- 85.714,
- 85.714
- ],
- "e": [
- 109.714,
- 85.714
- ]
- },
- {
- "t": 16
- }
- ]
- },
- "p": {
- "k": [
- 0,
- 0
- ]
- },
- "r": {
- "k": 0
- },
- "nm": "Rectangle Path 1",
- "mn": "ADBE Vector Shape - Rect"
- },
- {
- "ty": "st",
- "c": {
- "k": [
- 0,
- 0,
- 0,
- 1
- ]
- },
- "o": {
- "k": 100
- },
- "w": {
- "k": 14
- },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke"
- },
- {
- "ty": "tr",
- "p": {
- "k": [
- 0.198,
- 1.099
- ],
- "ix": 2
- },
- "a": {
- "k": [
- 0,
- 0
- ],
- "ix": 1
- },
- "s": {
- "k": [
- 100,
- 100
- ],
- "ix": 3
- },
- "r": {
- "k": 0,
- "ix": 6
- },
- "o": {
- "k": 100,
- "ix": 7
- },
- "sk": {
- "k": 0,
- "ix": 4
- },
- "sa": {
- "k": 0,
- "ix": 5
- },
- "nm": "Transform"
- }
- ],
- "nm": "Rectangle 1",
- "np": 2,
- "mn": "ADBE Vector Group"
- }
- ],
- "ip": 0,
- "op": 16,
- "st": 0,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 3,
- "ty": 1,
- "nm": "White Solid 1",
- "ks": {
- "o": {
- "k": 100
- },
- "r": {
- "k": 0
- },
- "p": {
- "k": [
- 45,
- 45,
- 0
- ]
- },
- "a": {
- "k": [
- 100,
- 100,
- 0
- ]
- },
- "s": {
- "k": [
- 45,
- 45,
- 100
- ]
- }
- },
- "ao": 0,
- "sw": 200,
- "sh": 200,
- "sc": "#ffffff",
- "ip": 0,
- "op": 63,
- "st": 0,
- "bm": 0,
- "sr": 1
- }
- ],
- "v": "4.5.4",
- "ddd": 0,
- "ip": 0,
- "op": 63,
- "fr": 60,
- "w": 90,
- "h": 90
-}
\ No newline at end of file
+{ "assets": [], "layers": [ { "ddd": 0, "ind": 0, "ty": 4, "nm": "Shape Layer 4", "parent": 3, "ks": { "o": { "k": 100 }, "r": { "k": 0 }, "p": { "k": [ { "i": { "x": 0, "y": 1 }, "o": { "x": 0.167, "y": 0.167 }, "n": "0_1_0p167_0p167", "t": 35, "s": [ 111.714, 91, 0 ], "e": [ 99.714, 100, 0 ], "to": [ 0, 0, 0 ], "ti": [ 0, 0, 0 ] }, { "t": 62 } ] }, "a": { "k": [ 0, 0, 0 ] }, "s": { "k": [ 100, 100, 100 ] } }, "ao": 0, "shapes": [ { "ty": "gr", "it": [ { "ty": "rc", "d": 1, "s": { "k": [ { "i": { "x": [ 0, 0 ], "y": [ 1, 1 ] }, "o": { "x": [ 0.167, 0.167 ], "y": [ 0.167, 0.167 ] }, "n": [ "0_1_0p167_0p167", "0_1_0p167_0p167" ], "t": 35, "s": [ 109.714, 103.714 ], "e": [ 85.714, 85.714 ] }, { "t": 62 } ] }, "p": { "k": [ 0, 0 ] }, "r": { "k": 0 }, "nm": "Rectangle Path 1", "mn": "ADBE Vector Shape - Rect" }, { "ty": "st", "c": { "k": [ 0, 0, 0, 1 ] }, "o": { "k": 100 }, "w": { "k": 14 }, "lc": 1, "lj": 1, "ml": 4, "nm": "Stroke 1", "mn": "ADBE Vector Graphic - Stroke" }, { "ty": "tr", "p": { "k": [ 0.198, 1.099 ], "ix": 2 }, "a": { "k": [ 0, 0 ], "ix": 1 }, "s": { "k": [ 100, 100 ], "ix": 3 }, "r": { "k": 0, "ix": 6 }, "o": { "k": 100, "ix": 7 }, "sk": { "k": 0, "ix": 4 }, "sa": { "k": 0, "ix": 5 }, "nm": "Transform" } ], "nm": "Rectangle 1", "np": 2, "mn": "ADBE Vector Group" } ], "ip": 35, "op": 63, "st": 0, "bm": 0, "sr": 1 }, { "ddd": 0, "ind": 1, "ty": 4, "nm": "Shape Layer 3", "parent": 3, "ks": { "o": { "k": 100 }, "r": { "k": 0 }, "p": { "k": [ { "i": { "x": 0, "y": 1 }, "o": { "x": 0.167, "y": 0.167 }, "n": "0_1_0p167_0p167", "t": 16, "s": [ 111.714, 100, 0 ], "e": [ 111.714, 91, 0 ], "to": [ 0, 0, 0 ], "ti": [ 0, 0, 0 ] }, { "t": 35 } ] }, "a": { "k": [ 0, 0, 0 ] }, "s": { "k": [ 100, 100, 100 ] } }, "ao": 0, "shapes": [ { "ty": "gr", "it": [ { "ty": "rc", "d": 1, "s": { "k": [ { "i": { "x": [ 0, 0 ], "y": [ 0, 1 ] }, "o": { "x": [ 0.167, 0.167 ], "y": [ 0.167, 0.167 ] }, "n": [ "0_0_0p167_0p167", "0_1_0p167_0p167" ], "t": 16, "s": [ 109.714, 85.714 ], "e": [ 109.714, 103.714 ] }, { "t": 35 } ] }, "p": { "k": [ 0, 0 ] }, "r": { "k": 0 }, "nm": "Rectangle Path 1", "mn": "ADBE Vector Shape - Rect" }, { "ty": "st", "c": { "k": [ 0, 0, 0, 1 ] }, "o": { "k": 100 }, "w": { "k": 14 }, "lc": 1, "lj": 1, "ml": 4, "nm": "Stroke 1", "mn": "ADBE Vector Graphic - Stroke" }, { "ty": "tr", "p": { "k": [ 0.198, 1.099 ], "ix": 2 }, "a": { "k": [ 0, 0 ], "ix": 1 }, "s": { "k": [ 100, 100 ], "ix": 3 }, "r": { "k": 0, "ix": 6 }, "o": { "k": 100, "ix": 7 }, "sk": { "k": 0, "ix": 4 }, "sa": { "k": 0, "ix": 5 }, "nm": "Transform" } ], "nm": "Rectangle 1", "np": 2, "mn": "ADBE Vector Group" } ], "ip": 16, "op": 35, "st": 0, "bm": 0, "sr": 1 }, { "ddd": 0, "ind": 2, "ty": 4, "nm": "Shape Layer 2", "parent": 3, "ks": { "o": { "k": 100 }, "r": { "k": 0 }, "p": { "k": [ { "i": { "x": 0, "y": 1 }, "o": { "x": 0.167, "y": 0.167 }, "n": "0_1_0p167_0p167", "t": 0, "s": [ 99.714, 100, 0 ], "e": [ 111.714, 100, 0 ], "to": [ 0, 0, 0 ], "ti": [ 0, 0, 0 ] }, { "t": 16 } ] }, "a": { "k": [ 0, 0, 0 ] }, "s": { "k": [ 100, 100, 100 ] } }, "ao": 0, "shapes": [ { "ty": "gr", "it": [ { "ty": "rc", "d": 1, "s": { "k": [ { "i": { "x": [ 0, 0 ], "y": [ 1, 0 ] }, "o": { "x": [ 0.167, 0.167 ], "y": [ 0.167, 0.167 ] }, "n": [ "0_1_0p167_0p167", "0_0_0p167_0p167" ], "t": 0, "s": [ 85.714, 85.714 ], "e": [ 109.714, 85.714 ] }, { "t": 16 } ] }, "p": { "k": [ 0, 0 ] }, "r": { "k": 0 }, "nm": "Rectangle Path 1", "mn": "ADBE Vector Shape - Rect" }, { "ty": "st", "c": { "k": [ 0, 0, 0, 1 ] }, "o": { "k": 100 }, "w": { "k": 14 }, "lc": 1, "lj": 1, "ml": 4, "nm": "Stroke 1", "mn": "ADBE Vector Graphic - Stroke" }, { "ty": "tr", "p": { "k": [ 0.198, 1.099 ], "ix": 2 }, "a": { "k": [ 0, 0 ], "ix": 1 }, "s": { "k": [ 100, 100 ], "ix": 3 }, "r": { "k": 0, "ix": 6 }, "o": { "k": 100, "ix": 7 }, "sk": { "k": 0, "ix": 4 }, "sa": { "k": 0, "ix": 5 }, "nm": "Transform" } ], "nm": "Rectangle 1", "np": 2, "mn": "ADBE Vector Group" } ], "ip": 0, "op": 16, "st": 0, "bm": 0, "sr": 1 }, { "ddd": 0, "ind": 3, "ty": 1, "nm": "White Solid 1", "ks": { "o": { "k": 100 }, "r": { "k": 0 }, "p": { "k": [ 45, 45, 0 ] }, "a": { "k": [ 100, 100, 0 ] }, "s": { "k": [ 45, 45, 100 ] } }, "ao": 0, "sw": 200, "sh": 200, "sc": "#ffffff", "ip": 0, "op": 63, "st": 0, "bm": 0, "sr": 1 } ], "v": "4.5.4", "ddd": 0, "ip": 0, "op": 63, "fr": 60, "w": 90, "h": 90 }
\ No newline at end of file
diff --git a/sample/src/main/assets/Tests/Rect8.json b/sample/src/main/assets/Tests/Rect8.json
index 5d5ac9d..5c89a83 100644
--- a/sample/src/main/assets/Tests/Rect8.json
+++ b/sample/src/main/assets/Tests/Rect8.json
@@ -1,1160 +1 @@
-{
- "assets": [],
- "layers": [
- {
- "ddd": 0,
- "ind": 0,
- "ty": 3,
- "nm": "MAIN BOX POSITION",
- "parent": 2,
- "ks": {
- "o": {
- "k": 0
- },
- "r": {
- "k": 0
- },
- "p": {
- "k": [
- {
- "i": {
- "x": 0.667,
- "y": 1
- },
- "o": {
- "x": 0.333,
- "y": 0
- },
- "n": "0p667_1_0p333_0",
- "t": 0,
- "s": [
- 38.675,
- 23.477,
- 0
- ],
- "e": [
- 38.675,
- 56.177,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "i": {
- "x": 0.667,
- "y": 1
- },
- "o": {
- "x": 0.333,
- "y": 0
- },
- "n": "0p667_1_0p333_0",
- "t": 16,
- "s": [
- 38.675,
- 56.177,
- 0
- ],
- "e": [
- 38.675,
- 54.327,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "i": {
- "x": 0.667,
- "y": 1
- },
- "o": {
- "x": 0.333,
- "y": 0
- },
- "n": "0p667_1_0p333_0",
- "t": 23,
- "s": [
- 38.675,
- 54.327,
- 0
- ],
- "e": [
- 38.675,
- 54.927,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "i": {
- "x": 0.667,
- "y": 0.667
- },
- "o": {
- "x": 0.333,
- "y": 0.333
- },
- "n": "0p667_0p667_0p333_0p333",
- "t": 33,
- "s": [
- 38.675,
- 54.927,
- 0
- ],
- "e": [
- 38.675,
- 54.927,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "i": {
- "x": 0.667,
- "y": 1
- },
- "o": {
- "x": 0.333,
- "y": 0
- },
- "n": "0p667_1_0p333_0",
- "t": 46,
- "s": [
- 38.675,
- 54.927,
- 0
- ],
- "e": [
- 38.675,
- 66.027,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "i": {
- "x": 0.667,
- "y": 1
- },
- "o": {
- "x": 0.333,
- "y": 0
- },
- "n": "0p667_1_0p333_0",
- "t": 61,
- "s": [
- 38.675,
- 66.027,
- 0
- ],
- "e": [
- 38.675,
- 53.027,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "i": {
- "x": 0.667,
- "y": 1
- },
- "o": {
- "x": 0.167,
- "y": 0.167
- },
- "n": "0p667_1_0p167_0p167",
- "t": 70,
- "s": [
- 38.675,
- 53.027,
- 0
- ],
- "e": [
- 38.675,
- 55.927,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "i": {
- "x": 0.667,
- "y": 1
- },
- "o": {
- "x": 0.167,
- "y": 0.167
- },
- "n": "0p667_1_0p167_0p167",
- "t": 81,
- "s": [
- 38.675,
- 55.927,
- 0
- ],
- "e": [
- 38.675,
- 55.477,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "i": {
- "x": 0.833,
- "y": 0.833
- },
- "o": {
- "x": 0.333,
- "y": 0.333
- },
- "n": "0p833_0p833_0p333_0p333",
- "t": 94,
- "s": [
- 38.675,
- 55.477,
- 0
- ],
- "e": [
- 38.675,
- 55.477,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "i": {
- "x": 0.667,
- "y": 1
- },
- "o": {
- "x": 0.167,
- "y": 0.167
- },
- "n": "0p667_1_0p167_0p167",
- "t": 118,
- "s": [
- 38.675,
- 55.477,
- 0
- ],
- "e": [
- 38.675,
- 50.252,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "i": {
- "x": 0.667,
- "y": 1
- },
- "o": {
- "x": 0.167,
- "y": 0.167
- },
- "n": "0p667_1_0p167_0p167",
- "t": 129,
- "s": [
- 38.675,
- 50.252,
- 0
- ],
- "e": [
- 18.141,
- 74.318,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "t": 141
- }
- ]
- },
- "a": {
- "k": [
- 60,
- 60,
- 0
- ]
- },
- "s": {
- "k": [
- 10,
- 10,
- 100
- ]
- }
- },
- "ao": 0,
- "ip": 0,
- "op": 163,
- "st": -7,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 1,
- "ty": 4,
- "nm": "MAIN BOX 12",
- "parent": 0,
- "ks": {
- "o": {
- "k": 100
- },
- "r": {
- "k": 0
- },
- "p": {
- "k": [
- 60,
- 76,
- 0
- ]
- },
- "a": {
- "k": [
- -322.967,
- 107.138,
- 0
- ]
- },
- "s": {
- "k": [
- 206,
- 206,
- 100
- ]
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ty": "rc",
- "d": 1,
- "s": {
- "k": [
- {
- "i": {
- "x": [
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.333,
- 0.333
- ],
- "y": [
- 0,
- 0
- ]
- },
- "n": [
- "0p667_1_0p333_0",
- "0p667_1_0p333_0"
- ],
- "t": -0.015,
- "s": [
- 0,
- 0
- ],
- "e": [
- 187.466,
- 206.343
- ]
- },
- {
- "i": {
- "x": [
- 0.667,
- 0.667
- ],
- "y": [
- 0.667,
- 1
- ]
- },
- "o": {
- "x": [
- 0.333,
- 0.333
- ],
- "y": [
- 0.333,
- 0
- ]
- },
- "n": [
- "0p667_0p667_0p333_0p333",
- "0p667_1_0p333_0"
- ],
- "t": 16.001,
- "s": [
- 187.466,
- 206.343
- ],
- "e": [
- 187.466,
- 188.143
- ]
- },
- {
- "i": {
- "x": [
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.333,
- 0.333
- ],
- "y": [
- 0,
- 0
- ]
- },
- "n": [
- "0p667_1_0p333_0",
- "0p667_1_0p333_0"
- ],
- "t": 23.001,
- "s": [
- 187.466,
- 188.143
- ],
- "e": [
- 187.466,
- 194.243
- ]
- },
- {
- "i": {
- "x": [
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.333,
- 0.333
- ],
- "y": [
- 0,
- 0
- ]
- },
- "n": [
- "0p667_1_0p333_0",
- "0p667_1_0p333_0"
- ],
- "t": 33.001,
- "s": [
- 187.466,
- 194.243
- ],
- "e": [
- 187.466,
- 194.243
- ]
- },
- {
- "i": {
- "x": [
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.333,
- 0.333
- ],
- "y": [
- 0,
- 0
- ]
- },
- "n": [
- "0p667_1_0p333_0",
- "0p667_1_0p333_0"
- ],
- "t": 46.001,
- "s": [
- 187.466,
- 194.243
- ],
- "e": [
- 216.366,
- 86.843
- ]
- },
- {
- "i": {
- "x": [
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.333,
- 0.333
- ],
- "y": [
- 0,
- 0
- ]
- },
- "n": [
- "0p667_1_0p333_0",
- "0p667_1_0p333_0"
- ],
- "t": 61.001,
- "s": [
- 216.366,
- 86.843
- ],
- "e": [
- 147.766,
- 212.543
- ]
- },
- {
- "i": {
- "x": [
- 0.667,
- 0.667
- ],
- "y": [
- 0.667,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167
- ],
- "y": [
- 0.167,
- 0.167
- ]
- },
- "n": [
- "0p667_0p667_0p167_0p167",
- "0p667_1_0p167_0p167"
- ],
- "t": 70.001,
- "s": [
- 147.766,
- 212.543
- ],
- "e": [
- 147.766,
- 184.043
- ]
- },
- {
- "i": {
- "x": [
- 0.667,
- 0.667
- ],
- "y": [
- 0.667,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167
- ],
- "y": [
- 0.167,
- 0.167
- ]
- },
- "n": [
- "0p667_0p667_0p167_0p167",
- "0p667_1_0p167_0p167"
- ],
- "t": 81.001,
- "s": [
- 147.766,
- 184.043
- ],
- "e": [
- 147.766,
- 188.543
- ]
- },
- {
- "i": {
- "x": [
- 0.833,
- 0.833
- ],
- "y": [
- 0.833,
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.333,
- 0.333
- ],
- "y": [
- 0.333,
- 0.333
- ]
- },
- "n": [
- "0p833_0p833_0p333_0p333",
- "0p833_0p833_0p333_0p333"
- ],
- "t": 94.001,
- "s": [
- 147.766,
- 188.543
- ],
- "e": [
- 147.766,
- 188.543
- ]
- },
- {
- "i": {
- "x": [
- 0.667,
- 0.667
- ],
- "y": [
- 0.667,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167
- ],
- "y": [
- 0.167,
- 0.167
- ]
- },
- "n": [
- "0p667_0p667_0p167_0p167",
- "0p667_1_0p167_0p167"
- ],
- "t": 118.001,
- "s": [
- 147.766,
- 188.543
- ],
- "e": [
- 147.766,
- 239.043
- ]
- },
- {
- "i": {
- "x": [
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167
- ],
- "y": [
- 0.167,
- 0.167
- ]
- },
- "n": [
- "0p667_1_0p167_0p167",
- "0p667_1_0p167_0p167"
- ],
- "t": 129.001,
- "s": [
- 147.766,
- 239.043
- ],
- "e": [
- 5,
- 5
- ]
- },
- {
- "t": 141.000609984985
- }
- ]
- },
- "p": {
- "k": [
- 0,
- 0
- ]
- },
- "r": {
- "k": [
- {
- "i": {
- "x": [
- 0.667
- ],
- "y": [
- 1
- ]
- },
- "o": {
- "x": [
- 0.333
- ],
- "y": [
- 0
- ]
- },
- "n": [
- "0p667_1_0p333_0"
- ],
- "t": 61.001,
- "s": [
- 10
- ],
- "e": [
- 0.3
- ]
- },
- {
- "i": {
- "x": [
- 0.667
- ],
- "y": [
- 0.667
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
- "n": [
- "0p667_0p667_0p167_0p167"
- ],
- "t": 70.001,
- "s": [
- 0.3
- ],
- "e": [
- 0.3
- ]
- },
- {
- "i": {
- "x": [
- 0.667
- ],
- "y": [
- 0.667
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
- "n": [
- "0p667_0p667_0p167_0p167"
- ],
- "t": 81.001,
- "s": [
- 0.3
- ],
- "e": [
- 0.3
- ]
- },
- {
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.333
- ],
- "y": [
- 0.333
- ]
- },
- "n": [
- "0p833_0p833_0p333_0p333"
- ],
- "t": 94.001,
- "s": [
- 0.3
- ],
- "e": [
- 0.3
- ]
- },
- {
- "i": {
- "x": [
- 0.667
- ],
- "y": [
- 0.667
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
- "n": [
- "0p667_0p667_0p167_0p167"
- ],
- "t": 118.001,
- "s": [
- 0.3
- ],
- "e": [
- 0.3
- ]
- },
- {
- "i": {
- "x": [
- 0.667
- ],
- "y": [
- 1
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
- "n": [
- "0p667_1_0p167_0p167"
- ],
- "t": 129.001,
- "s": [
- 0.3
- ],
- "e": [
- 15.3
- ]
- },
- {
- "t": 141.000609984985
- }
- ]
- },
- "nm": "Rectangle Path 1",
- "mn": "ADBE Vector Shape - Rect"
- },
- {
- "ty": "st",
- "c": {
- "k": [
- 0.1,
- 0.65,
- 0.6,
- 1
- ]
- },
- "o": {
- "k": 100
- },
- "w": {
- "k": 10
- },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke"
- },
- {
- "ty": "fl",
- "c": {
- "k": [
- 1,
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "k": 100
- },
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill"
- },
- {
- "ty": "tr",
- "p": {
- "k": [
- -322.967,
- 7.271
- ],
- "ix": 2
- },
- "a": {
- "k": [
- 0,
- 0
- ],
- "ix": 1
- },
- "s": {
- "k": [
- 100,
- 100
- ],
- "ix": 3
- },
- "r": {
- "k": 0,
- "ix": 6
- },
- "o": {
- "k": 100,
- "ix": 7
- },
- "sk": {
- "k": 0,
- "ix": 4
- },
- "sa": {
- "k": 0,
- "ix": 5
- },
- "nm": "Transform"
- }
- ],
- "nm": "Rectangle 1",
- "np": 3,
- "mn": "ADBE Vector Group"
- }
- ],
- "ip": 0,
- "op": 141,
- "st": -22.015015015015,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 2,
- "ty": 1,
- "nm": "White Solid 2",
- "ks": {
- "o": {
- "k": 100
- },
- "r": {
- "k": 0
- },
- "p": {
- "k": [
- 45,
- 45,
- 0
- ]
- },
- "a": {
- "k": [
- 35,
- 35,
- 0
- ]
- },
- "s": {
- "k": [
- 128.571,
- 128.571,
- 100
- ]
- }
- },
- "ao": 0,
- "sw": 70,
- "sh": 70,
- "sc": "#ffffff",
- "ip": 0,
- "op": 163,
- "st": 0,
- "bm": 0,
- "sr": 1
- }
- ],
- "v": "4.5.4",
- "ddd": 0,
- "ip": 0,
- "op": 163,
- "fr": 60,
- "w": 90,
- "h": 90
-}
\ No newline at end of file
+{ "assets": [], "layers": [ { "ddd": 0, "ind": 0, "ty": 3, "nm": "MAIN BOX POSITION", "parent": 2, "ks": { "o": { "k": 0 }, "r": { "k": 0 }, "p": { "k": [ { "i": { "x": 0.667, "y": 1 }, "o": { "x": 0.333, "y": 0 }, "n": "0p667_1_0p333_0", "t": 0, "s": [ 38.675, 23.477, 0 ], "e": [ 38.675, 56.177, 0 ], "to": [ 0, 0, 0 ], "ti": [ 0, 0, 0 ] }, { "i": { "x": 0.667, "y": 1 }, "o": { "x": 0.333, "y": 0 }, "n": "0p667_1_0p333_0", "t": 16, "s": [ 38.675, 56.177, 0 ], "e": [ 38.675, 54.327, 0 ], "to": [ 0, 0, 0 ], "ti": [ 0, 0, 0 ] }, { "i": { "x": 0.667, "y": 1 }, "o": { "x": 0.333, "y": 0 }, "n": "0p667_1_0p333_0", "t": 23, "s": [ 38.675, 54.327, 0 ], "e": [ 38.675, 54.927, 0 ], "to": [ 0, 0, 0 ], "ti": [ 0, 0, 0 ] }, { "i": { "x": 0.667, "y": 0.667 }, "o": { "x": 0.333, "y": 0.333 }, "n": "0p667_0p667_0p333_0p333", "t": 33, "s": [ 38.675, 54.927, 0 ], "e": [ 38.675, 54.927, 0 ], "to": [ 0, 0, 0 ], "ti": [ 0, 0, 0 ] }, { "i": { "x": 0.667, "y": 1 }, "o": { "x": 0.333, "y": 0 }, "n": "0p667_1_0p333_0", "t": 46, "s": [ 38.675, 54.927, 0 ], "e": [ 38.675, 66.027, 0 ], "to": [ 0, 0, 0 ], "ti": [ 0, 0, 0 ] }, { "i": { "x": 0.667, "y": 1 }, "o": { "x": 0.333, "y": 0 }, "n": "0p667_1_0p333_0", "t": 61, "s": [ 38.675, 66.027, 0 ], "e": [ 38.675, 53.027, 0 ], "to": [ 0, 0, 0 ], "ti": [ 0, 0, 0 ] }, { "i": { "x": 0.667, "y": 1 }, "o": { "x": 0.167, "y": 0.167 }, "n": "0p667_1_0p167_0p167", "t": 70, "s": [ 38.675, 53.027, 0 ], "e": [ 38.675, 55.927, 0 ], "to": [ 0, 0, 0 ], "ti": [ 0, 0, 0 ] }, { "i": { "x": 0.667, "y": 1 }, "o": { "x": 0.167, "y": 0.167 }, "n": "0p667_1_0p167_0p167", "t": 81, "s": [ 38.675, 55.927, 0 ], "e": [ 38.675, 55.477, 0 ], "to": [ 0, 0, 0 ], "ti": [ 0, 0, 0 ] }, { "i": { "x": 0.833, "y": 0.833 }, "o": { "x": 0.333, "y": 0.333 }, "n": "0p833_0p833_0p333_0p333", "t": 94, "s": [ 38.675, 55.477, 0 ], "e": [ 38.675, 55.477, 0 ], "to": [ 0, 0, 0 ], "ti": [ 0, 0, 0 ] }, { "i": { "x": 0.667, "y": 1 }, "o": { "x": 0.167, "y": 0.167 }, "n": "0p667_1_0p167_0p167", "t": 118, "s": [ 38.675, 55.477, 0 ], "e": [ 38.675, 50.252, 0 ], "to": [ 0, 0, 0 ], "ti": [ 0, 0, 0 ] }, { "i": { "x": 0.667, "y": 1 }, "o": { "x": 0.167, "y": 0.167 }, "n": "0p667_1_0p167_0p167", "t": 129, "s": [ 38.675, 50.252, 0 ], "e": [ 18.141, 74.318, 0 ], "to": [ 0, 0, 0 ], "ti": [ 0, 0, 0 ] }, { "t": 141 } ] }, "a": { "k": [ 60, 60, 0 ] }, "s": { "k": [ 10, 10, 100 ] } }, "ao": 0, "ip": 0, "op": 163, "st": -7, "bm": 0, "sr": 1 }, { "ddd": 0, "ind": 1, "ty": 4, "nm": "MAIN BOX 12", "parent": 0, "ks": { "o": { "k": 100 }, "r": { "k": 0 }, "p": { "k": [ 60, 76, 0 ] }, "a": { "k": [ -322.967, 107.138, 0 ] }, "s": { "k": [ 206, 206, 100 ] } }, "ao": 0, "shapes": [ { "ty": "gr", "it": [ { "ty": "rc", "d": 1, "s": { "k": [ { "i": { "x": [ 0.667, 0.667 ], "y": [ 1, 1 ] }, "o": { "x": [ 0.333, 0.333 ], "y": [ 0, 0 ] }, "n": [ "0p667_1_0p333_0", "0p667_1_0p333_0" ], "t": -0.015, "s": [ 0, 0 ], "e": [ 187.466, 206.343 ] }, { "i": { "x": [ 0.667, 0.667 ], "y": [ 0.667, 1 ] }, "o": { "x": [ 0.333, 0.333 ], "y": [ 0.333, 0 ] }, "n": [ "0p667_0p667_0p333_0p333", "0p667_1_0p333_0" ], "t": 16.001, "s": [ 187.466, 206.343 ], "e": [ 187.466, 188.143 ] }, { "i": { "x": [ 0.667, 0.667 ], "y": [ 1, 1 ] }, "o": { "x": [ 0.333, 0.333 ], "y": [ 0, 0 ] }, "n": [ "0p667_1_0p333_0", "0p667_1_0p333_0" ], "t": 23.001, "s": [ 187.466, 188.143 ], "e": [ 187.466, 194.243 ] }, { "i": { "x": [ 0.667, 0.667 ], "y": [ 1, 1 ] }, "o": { "x": [ 0.333, 0.333 ], "y": [ 0, 0 ] }, "n": [ "0p667_1_0p333_0", "0p667_1_0p333_0" ], "t": 33.001, "s": [ 187.466, 194.243 ], "e": [ 187.466, 194.243 ] }, { "i": { "x": [ 0.667, 0.667 ], "y": [ 1, 1 ] }, "o": { "x": [ 0.333, 0.333 ], "y": [ 0, 0 ] }, "n": [ "0p667_1_0p333_0", "0p667_1_0p333_0" ], "t": 46.001, "s": [ 187.466, 194.243 ], "e": [ 216.366, 86.843 ] }, { "i": { "x": [ 0.667, 0.667 ], "y": [ 1, 1 ] }, "o": { "x": [ 0.333, 0.333 ], "y": [ 0, 0 ] }, "n": [ "0p667_1_0p333_0", "0p667_1_0p333_0" ], "t": 61.001, "s": [ 216.366, 86.843 ], "e": [ 147.766, 212.543 ] }, { "i": { "x": [ 0.667, 0.667 ], "y": [ 0.667, 1 ] }, "o": { "x": [ 0.167, 0.167 ], "y": [ 0.167, 0.167 ] }, "n": [ "0p667_0p667_0p167_0p167", "0p667_1_0p167_0p167" ], "t": 70.001, "s": [ 147.766, 212.543 ], "e": [ 147.766, 184.043 ] }, { "i": { "x": [ 0.667, 0.667 ], "y": [ 0.667, 1 ] }, "o": { "x": [ 0.167, 0.167 ], "y": [ 0.167, 0.167 ] }, "n": [ "0p667_0p667_0p167_0p167", "0p667_1_0p167_0p167" ], "t": 81.001, "s": [ 147.766, 184.043 ], "e": [ 147.766, 188.543 ] }, { "i": { "x": [ 0.833, 0.833 ], "y": [ 0.833, 0.833 ] }, "o": { "x": [ 0.333, 0.333 ], "y": [ 0.333, 0.333 ] }, "n": [ "0p833_0p833_0p333_0p333", "0p833_0p833_0p333_0p333" ], "t": 94.001, "s": [ 147.766, 188.543 ], "e": [ 147.766, 188.543 ] }, { "i": { "x": [ 0.667, 0.667 ], "y": [ 0.667, 1 ] }, "o": { "x": [ 0.167, 0.167 ], "y": [ 0.167, 0.167 ] }, "n": [ "0p667_0p667_0p167_0p167", "0p667_1_0p167_0p167" ], "t": 118.001, "s": [ 147.766, 188.543 ], "e": [ 147.766, 239.043 ] }, { "i": { "x": [ 0.667, 0.667 ], "y": [ 1, 1 ] }, "o": { "x": [ 0.167, 0.167 ], "y": [ 0.167, 0.167 ] }, "n": [ "0p667_1_0p167_0p167", "0p667_1_0p167_0p167" ], "t": 129.001, "s": [ 147.766, 239.043 ], "e": [ 5, 5 ] }, { "t": 141.000609984985 } ] }, "p": { "k": [ 0, 0 ] }, "r": { "k": [ { "i": { "x": [ 0.667 ], "y": [ 1 ] }, "o": { "x": [ 0.333 ], "y": [ 0 ] }, "n": [ "0p667_1_0p333_0" ], "t": 61.001, "s": [ 10 ], "e": [ 0.3 ] }, { "i": { "x": [ 0.667 ], "y": [ 0.667 ] }, "o": { "x": [ 0.167 ], "y": [ 0.167 ] }, "n": [ "0p667_0p667_0p167_0p167" ], "t": 70.001, "s": [ 0.3 ], "e": [ 0.3 ] }, { "i": { "x": [ 0.667 ], "y": [ 0.667 ] }, "o": { "x": [ 0.167 ], "y": [ 0.167 ] }, "n": [ "0p667_0p667_0p167_0p167" ], "t": 81.001, "s": [ 0.3 ], "e": [ 0.3 ] }, { "i": { "x": [ 0.833 ], "y": [ 0.833 ] }, "o": { "x": [ 0.333 ], "y": [ 0.333 ] }, "n": [ "0p833_0p833_0p333_0p333" ], "t": 94.001, "s": [ 0.3 ], "e": [ 0.3 ] }, { "i": { "x": [ 0.667 ], "y": [ 0.667 ] }, "o": { "x": [ 0.167 ], "y": [ 0.167 ] }, "n": [ "0p667_0p667_0p167_0p167" ], "t": 118.001, "s": [ 0.3 ], "e": [ 0.3 ] }, { "i": { "x": [ 0.667 ], "y": [ 1 ] }, "o": { "x": [ 0.167 ], "y": [ 0.167 ] }, "n": [ "0p667_1_0p167_0p167" ], "t": 129.001, "s": [ 0.3 ], "e": [ 15.3 ] }, { "t": 141.000609984985 } ] }, "nm": "Rectangle Path 1", "mn": "ADBE Vector Shape - Rect" }, { "ty": "st", "c": { "k": [ 0.1, 0.65, 0.6, 1 ] }, "o": { "k": 100 }, "w": { "k": 10 }, "lc": 1, "lj": 1, "ml": 4, "nm": "Stroke 1", "mn": "ADBE Vector Graphic - Stroke" }, { "ty": "fl", "c": { "k": [ 1, 1, 1, 1 ] }, "o": { "k": 100 }, "nm": "Fill 1", "mn": "ADBE Vector Graphic - Fill" }, { "ty": "tr", "p": { "k": [ -322.967, 7.271 ], "ix": 2 }, "a": { "k": [ 0, 0 ], "ix": 1 }, "s": { "k": [ 100, 100 ], "ix": 3 }, "r": { "k": 0, "ix": 6 }, "o": { "k": 100, "ix": 7 }, "sk": { "k": 0, "ix": 4 }, "sa": { "k": 0, "ix": 5 }, "nm": "Transform" } ], "nm": "Rectangle 1", "np": 3, "mn": "ADBE Vector Group" } ], "ip": 0, "op": 141, "st": -22.015015015015, "bm": 0, "sr": 1 }, { "ddd": 0, "ind": 2, "ty": 1, "nm": "White Solid 2", "ks": { "o": { "k": 100 }, "r": { "k": 0 }, "p": { "k": [ 45, 45, 0 ] }, "a": { "k": [ 35, 35, 0 ] }, "s": { "k": [ 128.571, 128.571, 100 ] } }, "ao": 0, "sw": 70, "sh": 70, "sc": "#ffffff", "ip": 0, "op": 163, "st": 0, "bm": 0, "sr": 1 } ], "v": "4.5.4", "ddd": 0, "ip": 0, "op": 163, "fr": 60, "w": 90, "h": 90 }
\ No newline at end of file
