diff --git a/lottie-compose/src/test/java/com/airbnb/lottie/compose/LottieClipSpecTest.kt b/lottie-compose/src/test/java/com/airbnb/lottie/compose/LottieClipSpecTest.kt index 8457f54b9c..346c95d73f 100644 --- a/lottie-compose/src/test/java/com/airbnb/lottie/compose/LottieClipSpecTest.kt +++ b/lottie-compose/src/test/java/com/airbnb/lottie/compose/LottieClipSpecTest.kt @@ -135,10 +135,11 @@ class LottieClipSpecTest { LongSparseArray(), emptyMap(), emptyMap(), + 1f, SparseArrayCompat(), emptyMap(), markers, ) return composition } -} \ No newline at end of file +} diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java b/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java index e43e2042d8..7144543b2d 100644 --- a/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java +++ b/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java @@ -47,7 +47,7 @@ public class LottieComposition { private final HashSet warnings = new HashSet<>(); private Map> precomps; private Map images; - private float imagesDpScale = Utils.dpScale(); + private float imagesDpScale; /** * Map of font names to fonts */ @@ -75,7 +75,7 @@ public class LottieComposition { @RestrictTo(RestrictTo.Scope.LIBRARY) public void init(Rect bounds, float startFrame, float endFrame, float frameRate, List layers, LongSparseArray layerMap, Map> precomps, Map images, + List> precomps, Map images, float imagesDpScale, SparseArrayCompat characters, Map fonts, List markers) { this.bounds = bounds; @@ -86,6 +86,7 @@ public void init(Rect bounds, float startFrame, float endFrame, float frameRate, this.layerMap = layerMap; this.precomps = precomps; this.images = images; + this.imagesDpScale = imagesDpScale; this.characters = characters; this.fonts = fonts; this.markers = markers; diff --git a/lottie/src/main/java/com/airbnb/lottie/parser/LottieCompositionMoshiParser.java b/lottie/src/main/java/com/airbnb/lottie/parser/LottieCompositionMoshiParser.java index 4950753ff0..ee972df675 100644 --- a/lottie/src/main/java/com/airbnb/lottie/parser/LottieCompositionMoshiParser.java +++ b/lottie/src/main/java/com/airbnb/lottie/parser/LottieCompositionMoshiParser.java @@ -107,7 +107,7 @@ public static LottieComposition parse(JsonReader reader) throws IOException { Rect bounds = new Rect(0, 0, scaledWidth, scaledHeight); composition.init(bounds, startFrame, endFrame, frameRate, layers, layerMap, precomps, - images, characters, fonts, markers); + images, Utils.dpScale(), characters, fonts, markers); return composition; } diff --git a/lottie/src/test/java/com/airbnb/lottie/LottieDrawableTest.java b/lottie/src/test/java/com/airbnb/lottie/LottieDrawableTest.java index 0132d8d5a4..3e158ec722 100644 --- a/lottie/src/test/java/com/airbnb/lottie/LottieDrawableTest.java +++ b/lottie/src/test/java/com/airbnb/lottie/LottieDrawableTest.java @@ -36,10 +36,10 @@ public void setup() { @SuppressWarnings("SameParameterValue") private LottieComposition createComposition(int startFrame, int endFrame) { LottieComposition composition = new LottieComposition(); - composition.init(new Rect(), startFrame, endFrame, 1000, new ArrayList(), - new LongSparseArray(0), new HashMap>(0), - new HashMap(0), new SparseArrayCompat(0), - new HashMap(0), new ArrayList()); + composition.init(new Rect(), startFrame, endFrame, 1000, new ArrayList<>(), + new LongSparseArray<>(0), new HashMap<>(0), + new HashMap<>(0), 1f, new SparseArrayCompat<>(0), + new HashMap<>(0), new ArrayList<>()); return composition; } diff --git a/lottie/src/test/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java b/lottie/src/test/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java index 08b0b8c18a..102087b636 100644 --- a/lottie/src/test/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java +++ b/lottie/src/test/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java @@ -60,10 +60,10 @@ private LottieValueAnimator createAnimator() { private LottieComposition createComposition(int startFrame, int endFrame) { LottieComposition composition = new LottieComposition(); - composition.init(new Rect(), startFrame, endFrame, 1000, new ArrayList(), - new LongSparseArray(0), new HashMap>(0), - new HashMap(0), new SparseArrayCompat(0), - new HashMap(0), new ArrayList()); + composition.init(new Rect(), startFrame, endFrame, 1000, new ArrayList<>(), + new LongSparseArray<>(0), new HashMap<>(0), + new HashMap<>(0), 1f, new SparseArrayCompat<>(0), + new HashMap<>(0), new ArrayList<>()); return composition; }