Fixed test

airbnb · Dec 29, 2023 · de11798 · de11798
1 parent f131834
commit de11798
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
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
@@ -135,10 +135,11 @@ class LottieClipSpecTest {
             LongSparseArray(),
             emptyMap(),
             emptyMap(),
+            1f,
             SparseArrayCompat(),
             emptyMap(),
             markers,
         )
         return composition
     }
-}
+}
diff --git 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<String> warnings = new HashSet<>();
   private Map<String, List<Layer>> precomps;
   private Map<String, LottieImageAsset> 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<Layer> layers, LongSparseArray<Layer> layerMap, Map<String,
-      List<Layer>> precomps, Map<String, LottieImageAsset> images,
+      List<Layer>> precomps, Map<String, LottieImageAsset> images, float imagesDpScale,
       SparseArrayCompat<FontCharacter> characters, Map<String, Font> fonts,
       List<Marker> 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
@@ -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
@@ -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<Layer>(),
-            new LongSparseArray<Layer>(0), new HashMap<String, List<Layer>>(0),
-            new HashMap<String, LottieImageAsset>(0), new SparseArrayCompat<FontCharacter>(0),
-            new HashMap<String, Font>(0), new ArrayList<Marker>());
+    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
@@ -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<Layer>(),
-            new LongSparseArray<Layer>(0), new HashMap<String, List<Layer>>(0),
-            new HashMap<String, LottieImageAsset>(0), new SparseArrayCompat<FontCharacter>(0),
-            new HashMap<String, Font>(0), new ArrayList<Marker>());
+    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;
   }