+ * Features guarded by LottieFeatureFlags are experimental or only supported by a subset of API levels. + * Please ensure that the animation supported by the enabled feature looks acceptable across all + * targeted API levels. + */ + public void enableFeatureFlag(LottieFeatureFlag flag, boolean enable) { + lottieDrawable.enableFeatureFlag(flag, enable); + } + + /** + * Returns whether the specified feature is enabled. + */ + public boolean isFeatureFlagEnabled(LottieFeatureFlag flag) { + return lottieDrawable.isFeatureFlagEnabled(flag); } /** diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java b/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java index a03e392101..c91bbf6732 100644 --- a/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java +++ b/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java @@ -26,7 +26,6 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Map; diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java b/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java index 89ec1a8165..dfcae27c7b 100644 --- a/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java +++ b/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java @@ -142,7 +142,7 @@ private enum OnVisibleAction { FontAssetDelegate fontAssetDelegate; @Nullable TextDelegate textDelegate; - private boolean enableMergePaths; + private final LottieFeatureFlags lottieFeatureFlags = new LottieFeatureFlags(); private boolean maintainOriginalImageBounds = false; private boolean clipToCompositionBounds = true; @Nullable @@ -285,34 +285,51 @@ public boolean hasMatte() { return compositionLayer != null && compositionLayer.hasMatte(); } + @Deprecated public boolean enableMergePathsForKitKatAndAbove() { - return enableMergePaths; + return lottieFeatureFlags.isFlagEnabled(LottieFeatureFlag.MergePathsApi19); } /** * Enable this to get merge path support for devices running KitKat (19) and above. + * Deprecated: Use enableFeatureFlag(LottieFeatureFlags.FeatureFlag.MergePathsApi19, enable) *
* Merge paths currently don't work if the the operand shape is entirely contained within the * first shape. If you need to cut out one shape from another shape, use an even-odd fill type * instead of using merge paths. */ + @Deprecated public void enableMergePathsForKitKatAndAbove(boolean enable) { - if (enableMergePaths == enable) { - return; + boolean changed = lottieFeatureFlags.enableFlag(LottieFeatureFlag.MergePathsApi19, enable); + if (composition != null && changed) { + buildCompositionLayer(); } + } - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) { - Logger.warning("Merge paths are not supported pre-Kit Kat."); - return; - } - enableMergePaths = enable; - if (composition != null) { + /** + * @deprecated Replaced by {@link #enableFeatureFlag(LottieFeatureFlag, boolean)} + */ + @Deprecated + public boolean isMergePathsEnabledForKitKatAndAbove() { + return lottieFeatureFlags.isFlagEnabled(LottieFeatureFlag.MergePathsApi19); + } + + /** + * Enable the specified feature for this drawable. + *
+ * Features guarded by LottieFeatureFlags are experimental or only supported by a subset of API levels.
+ * Please ensure that the animation supported by the enabled feature looks acceptable across all
+ * targeted API levels.
+ */
+ public void enableFeatureFlag(LottieFeatureFlag flag, boolean enable) {
+ boolean changed = lottieFeatureFlags.enableFlag(flag, enable);
+ if (composition != null && changed) {
buildCompositionLayer();
}
}
- public boolean isMergePathsEnabledForKitKatAndAbove() {
- return enableMergePaths;
+ public boolean isFeatureFlagEnabled(LottieFeatureFlag flag) {
+ return lottieFeatureFlags.isFlagEnabled(flag);
}
/**
diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieFeatureFlag.java b/lottie/src/main/java/com/airbnb/lottie/LottieFeatureFlag.java
new file mode 100644
index 0000000000..228e199882
--- /dev/null
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieFeatureFlag.java
@@ -0,0 +1,18 @@
+package com.airbnb.lottie;
+
+import android.os.Build;
+
+public enum LottieFeatureFlag {
+ /**
+ * Merge paths currently don't work if the the operand shape is entirely contained within the
+ * first shape. If you need to cut out one shape from another shape, use an even-odd fill type
+ * instead of using merge paths.
+ */
+ MergePathsApi19(Build.VERSION_CODES.KITKAT);
+
+ public final int minRequiredSdkVersion;
+
+ LottieFeatureFlag(int minRequiredSdkVersion) {
+ this.minRequiredSdkVersion = minRequiredSdkVersion;
+ }
+}
diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieFeatureFlags.java b/lottie/src/main/java/com/airbnb/lottie/LottieFeatureFlags.java
new file mode 100644
index 0000000000..7e7560a81c
--- /dev/null
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieFeatureFlags.java
@@ -0,0 +1,34 @@
+package com.airbnb.lottie;
+
+import android.annotation.SuppressLint;
+import android.os.Build;
+
+import com.airbnb.lottie.utils.Logger;
+
+import java.util.HashSet;
+
+class LottieFeatureFlags {
+
+ private final HashSet