Made a few getters on LottieComposition public

airbnb#93
BigSnake1989 · Feb 20, 2017 · 7190023 · 7190023
1 parent a89288a
commit 7190023
Showing 1 changed file with 3 additions and 25 deletions.
diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java b/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java
@@ -153,12 +153,6 @@ static LottieComposition fromJsonSync(Resources res, JSONObject json) {
         Layer layer = new Layer(layersJson.optJSONObject(j), composition);
         layerMap.put(layer.getId(), layer);
         layers.add(layer);
-        if (!layer.getMasks().isEmpty()) {
-          composition.hasMasks = true;
-        }
-        if (layer.getMatteType() != null && layer.getMatteType() != Layer.MatteType.None) {
-          composition.hasMattes = true;
-        }
       }
       String id = precomp.optString("id");
       composition.precomps.put(id, layers);
@@ -170,12 +164,6 @@ static LottieComposition fromJsonSync(Resources res, JSONObject json) {
   private static void addLayer(LottieComposition composition, Layer layer) {
     composition.layers.add(layer);
     composition.layerMap.put(layer.getId(), layer);
-    if (!layer.getMasks().isEmpty()) {
-      composition.hasMasks = true;
-    }
-    if (layer.getMatteType() != null && layer.getMatteType() != Layer.MatteType.None) {
-      composition.hasMattes = true;
-    }
   }
 
   private final Map<String, List<Layer>> precomps = new HashMap<>();
@@ -185,8 +173,6 @@ private static void addLayer(LottieComposition composition, Layer layer) {
   private long startFrame;
   private long endFrame;
   private int frameRate;
-  private boolean hasMasks;
-  private boolean hasMattes;
   private float scale;
 
   private LottieComposition(Resources res) {
@@ -198,11 +184,11 @@ Layer layerModelForId(long id) {
     return layerMap.get(id);
   }
 
-  Rect getBounds() {
+  @SuppressWarnings("WeakerAccess") public Rect getBounds() {
     return bounds;
   }
 
-  long getDuration() {
+  @SuppressWarnings("WeakerAccess") public long getDuration() {
     long frameDuration = endFrame - startFrame;
     return (long) (frameDuration / (float) frameRate * 1000);
   }
@@ -225,15 +211,7 @@ float getDurationFrames() {
   }
 
 
-  boolean hasMasks() {
-    return hasMasks;
-  }
-
-  boolean hasMattes() {
-    return hasMattes;
-  }
-
-  float getScale() {
+  public float getScale() {
     return scale;
   }