LottieComposition: Add getHeight & getWidth function to return origin…

…al dimensions.
airbnb · Jul 2, 2024 · dc5fbda · dc5fbda
1 parent 99b0683
commit dc5fbda
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 20 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
@@ -139,6 +139,8 @@ class LottieClipSpecTest {
             SparseArrayCompat(),
             emptyMap(),
             markers,
+            0,
+            0,
         )
         return composition
     }

diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java b/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java
@@ -72,12 +72,15 @@ public class LottieComposition {
    */
   private int maskAndMatteCount = 0;
 
+  private int width;
+  private int height;
+
   @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, float imagesDpScale,
       SparseArrayCompat<FontCharacter> characters, Map<String, Font> fonts,
-      List<Marker> markers) {
+      List<Marker> markers, int width, int height) {
     this.bounds = bounds;
     this.startFrame = startFrame;
     this.endFrame = endFrame;
@@ -90,6 +93,8 @@ public void init(Rect bounds, float startFrame, float endFrame, float frameRate,
     this.characters = characters;
     this.fonts = fonts;
     this.markers = markers;
+    this.width = width;
+    this.height = height;
   }
 
   @RestrictTo(RestrictTo.Scope.LIBRARY)
@@ -233,6 +238,13 @@ public float getDurationFrames() {
     return endFrame - startFrame;
   }
 
+  public int getHeight() {
+    return height;
+  }
+
+  public int getWidth() {
+    return width;
+  }
 
   @NonNull
   @Override

diff --git a/lottie/src/main/java/com/airbnb/lottie/parser/LottieCompositionMoshiParser.java b/lottie/src/main/java/com/airbnb/lottie/parser/LottieCompositionMoshiParser.java
@@ -44,8 +44,8 @@ public static LottieComposition parse(JsonReader reader) throws IOException {
     float frameRate = 0f;
     final LongSparseArray<Layer> layerMap = new LongSparseArray<>();
     final List<Layer> layers = new ArrayList<>();
-    int width = 0;
-    int height = 0;
+    int unscaledWidth = 0;
+    int unscaledHeight = 0;
     Map<String, List<Layer>> precomps = new HashMap<>();
     Map<String, LottieImageAsset> images = new HashMap<>();
     Map<String, Font> fonts = new HashMap<>();
@@ -57,10 +57,10 @@ public static LottieComposition parse(JsonReader reader) throws IOException {
     while (reader.hasNext()) {
       switch (reader.selectName(NAMES)) {
         case 0:
-          width = reader.nextInt();
+          unscaledWidth = reader.nextInt();
           break;
         case 1:
-          height = reader.nextInt();
+          unscaledHeight = reader.nextInt();
           break;
         case 2:
           startFrame = (float) reader.nextDouble();
@@ -102,12 +102,12 @@ public static LottieComposition parse(JsonReader reader) throws IOException {
           reader.skipValue();
       }
     }
-    int scaledWidth = (int) (width * scale);
-    int scaledHeight = (int) (height * scale);
+    int scaledWidth = (int) (unscaledWidth * scale);
+    int scaledHeight = (int) (unscaledHeight * scale);
     Rect bounds = new Rect(0, 0, scaledWidth, scaledHeight);
 
     composition.init(bounds, startFrame, endFrame, frameRate, layers, layerMap, precomps,
-        images, Utils.dpScale(), characters, fonts, markers);
+        images, Utils.dpScale(), characters, fonts, markers, unscaledWidth, unscaledHeight);
 
     return composition;
   }

diff --git a/lottie/src/test/java/com/airbnb/lottie/LottieDrawableTest.java b/lottie/src/test/java/com/airbnb/lottie/LottieDrawableTest.java
@@ -4,10 +4,6 @@
 import android.graphics.Rect;
 import androidx.collection.LongSparseArray;
 import androidx.collection.SparseArrayCompat;
-import com.airbnb.lottie.model.Font;
-import com.airbnb.lottie.model.FontCharacter;
-import com.airbnb.lottie.model.Marker;
-import com.airbnb.lottie.model.layer.Layer;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -16,7 +12,6 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 
 import static junit.framework.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
@@ -39,7 +34,7 @@ private LottieComposition createComposition(int startFrame, int endFrame) {
     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<>());
+        new HashMap<>(0), new ArrayList<>(), 0, 0);
     return composition;
   }
 

diff --git a/lottie/src/test/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java b/lottie/src/test/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java
@@ -5,10 +5,6 @@
 import android.graphics.Rect;
 import androidx.collection.LongSparseArray;
 import androidx.collection.SparseArrayCompat;
-import com.airbnb.lottie.model.Font;
-import com.airbnb.lottie.model.FontCharacter;
-import com.airbnb.lottie.model.Marker;
-import com.airbnb.lottie.model.layer.Layer;
 import com.airbnb.lottie.utils.LottieValueAnimator;
 import org.junit.Before;
 import org.junit.Test;
@@ -17,7 +13,6 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static junit.framework.Assert.assertEquals;
@@ -63,7 +58,7 @@ private LottieComposition createComposition(int startFrame, int endFrame) {
     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<>());
+        new HashMap<>(0), new ArrayList<>(), 0, 0);
     return composition;
   }