Allow repeater contents to have dynamic properties (#2164)

Fixes #2143
airbnb · Nov 14, 2022 · 5512f3d · 5512f3d
1 parent def619c
commit 5512f3d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/content/ContentGroup.java b/lottie/src/main/java/com/airbnb/lottie/animation/content/ContentGroup.java
@@ -115,6 +115,10 @@ public ContentGroup(final LottieDrawable lottieDrawable, BaseLayer layer, ShapeG
     }
   }
 
+  public List<Content> getContents() {
+    return contents;
+  }
+
   List<PathContent> getPathList() {
     if (pathContents == null) {
       pathContents = new ArrayList<>();

diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/content/RepeaterContent.java b/lottie/src/main/java/com/airbnb/lottie/animation/content/RepeaterContent.java
@@ -131,6 +131,12 @@ public RepeaterContent(LottieDrawable lottieDrawable, BaseLayer layer, Repeater
   @Override public void resolveKeyPath(
       KeyPath keyPath, int depth, List<KeyPath> accumulator, KeyPath currentPartialKeyPath) {
     MiscUtils.resolveKeyPath(keyPath, depth, accumulator, currentPartialKeyPath, this);
+    for (int i = 0; i < contentGroup.getContents().size(); i++) {
+      Content content = contentGroup.getContents().get(i);
+      if (content instanceof KeyPathElementContent) {
+        MiscUtils.resolveKeyPath(keyPath, depth, accumulator, currentPartialKeyPath, (KeyPathElementContent) content);
+      }
+    }
   }
 
   @SuppressWarnings("unchecked")

diff --git a/...tests/src/androidTest/java/com/airbnb/lottie/snapshots/tests/DynamicPropertiesTestCase.kt b/...tests/src/androidTest/java/com/airbnb/lottie/snapshots/tests/DynamicPropertiesTestCase.kt
@@ -250,6 +250,20 @@ class DynamicPropertiesTestCase : SnapshotTestCase {
             LottieRelativePointValueCallback(PointF(100f, 100f))
         )
 
+        testDynamicProperty(
+            "Repeater contents",
+            KeyPath("Shape Layer 1", "Repeater Shape", "Repeater 1"),
+            LottieProperty.TRANSFORM_POSITION,
+            LottieRelativePointValueCallback(PointF(100f, 100f))
+        )
+
+        testDynamicProperty(
+            "Repeater sub-contents",
+            KeyPath("Shape Layer 1", "Repeater Shape", "Fill 1"),
+            LottieProperty.COLOR_FILTER,
+            LottieValueCallback(SimpleColorFilter(Color.GREEN))
+        )
+
         testDynamicProperty(
             "Repeater transform start opacity",
             KeyPath("Shape Layer 1", "Repeater Shape", "Repeater 1"),