commit 32f875a3a81a3f9d24ea4e99f02ef862e6454250
author Gabriel Peal <gabriel@tonal.com> Tue Nov 27 12:27:54 2018 -0600
committer Gabriel Peal <gabriel@tonal.com> Tue Nov 27 12:27:54 2018 -0600
tree bee37d39fe66d42ddc3e046f7f71882ab60b97e8
parent 484b9dd8be1e2f8aa0c3c93007b9be1a1f2a05fc

Transform shape layers for mattes

lottie/src/main/java/com/airbnb/lottie/model/layer/ShapeLayer.java

diff --git a/lottie/src/main/java/com/airbnb/lottie/model/layer/ShapeLayer.java b/lottie/src/main/java/com/airbnb/lottie/model/layer/ShapeLayer.java
index 4ef1db7..a0c766c 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/layer/ShapeLayer.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/layer/ShapeLayer.java
@@ -20,8 +20,8 @@
 
 public class ShapeLayer extends BaseLayer {
   private final Path path = new Path();
-  private final List<Path> paths = Collections.emptyList();
   private final ContentGroup contentGroup;
+  private List<Path> paths = Collections.emptyList();
 
   ShapeLayer(LottieDrawable lottieDrawable, Layer layerModel) {
     super(lottieDrawable, layerModel);
@@ -50,11 +50,19 @@
 
   @Override
   public List<Path> getPaths() {
-    List<Path> paths = new ArrayList<>(contentGroup.getPaths());
-    for (int i = 0; i < paths.size(); i++) {
-      paths.get(i).transform(getTransformMatrix());
+    List<Path> contentGroupPaths = contentGroup.getPaths();
+    if (paths.size() != contentGroupPaths.size()) {
+      paths = new ArrayList<>(contentGroupPaths.size());
+      for (int i = 0; i < contentGroupPaths.size(); i++) {
+        paths.add(new Path());
+      }
     }
-    return contentGroup.getPaths();
+    Matrix matrix = getTransformMatrix();
+    for (int i = 0; i < paths.size(); i++) {
+      contentGroupPaths.get(i).transform(matrix, paths.get(i));
+    }
+
+    return paths;
   }
 
   @Override

lottie/src/main/java/com/airbnb/lottie/utils/Utils.java

diff --git a/lottie/src/main/java/com/airbnb/lottie/utils/Utils.java b/lottie/src/main/java/com/airbnb/lottie/utils/Utils.java
index fb84cd4..dde5ad6 100644
--- a/lottie/src/main/java/com/airbnb/lottie/utils/Utils.java
+++ b/lottie/src/main/java/com/airbnb/lottie/utils/Utils.java
@@ -183,11 +183,9 @@
   }
 
   public static float dpScale() {
-//    if (dpScale == -1) {
-//      dpScale = Resources.getSystem().getDisplayMetrics().density;
-//    }
-//    return dpScale;
-    // DO MOT MERGE THIS
-    return 1f;
+    if (dpScale == -1) {
+      dpScale = Resources.getSystem().getDisplayMetrics().density;
+    }
+    return dpScale;
   }
 }