commit 9dde5b09718163ee2aed00f530871dd04744e2b1
author Andrew <35672654+flaringapp@users.noreply.github.com> Sat Nov 26 03:20:48 2022 +0200
committer GitHub <noreply@github.com> Fri Nov 25 17:20:48 2022 -0800
tree 27e8ff5059554efab59099902ce9101cbef0b876
parent 26c9089d30e2492d9fb6455fbcb1f1875b72bcaa

Fix LottieAnimationView.setProgress called from the view init method prevents the progress from being restored from the saved state (#2072)

lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java

diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
index 037b6f9..166e59a 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
@@ -184,7 +184,10 @@
     }
 
     setImageAssetsFolder(ta.getString(R.styleable.LottieAnimationView_lottie_imageAssetsFolder));
-    setProgress(ta.getFloat(R.styleable.LottieAnimationView_lottie_progress, 0));
+
+    boolean hasProgress = ta.hasValue(R.styleable.LottieAnimationView_lottie_progress);
+    setProgressInternal(ta.getFloat(R.styleable.LottieAnimationView_lottie_progress, 0f), hasProgress);
+
     enableMergePathsForKitKatAndAbove(ta.getBoolean(
         R.styleable.LottieAnimationView_lottie_enableMergePathsForKitKatAndAbove, false));
     if (ta.hasValue(R.styleable.LottieAnimationView_lottie_colorFilter)) {
@@ -294,7 +297,7 @@
       setAnimation(animationResId);
     }
     if (!userActionsTaken.contains(UserActionTaken.SET_PROGRESS)) {
-      setProgress(ss.progress);
+      setProgressInternal(ss.progress, false);
     }
     if (!userActionsTaken.contains(UserActionTaken.PLAY_OPTION) && ss.isAnimating) {
       playAnimation();
@@ -996,7 +999,15 @@
   }
 
   public void setProgress(@FloatRange(from = 0f, to = 1f) float progress) {
-    userActionsTaken.add(UserActionTaken.SET_PROGRESS);
+    setProgressInternal(progress, true);
+  }
+
+  private void setProgressInternal(
+      @FloatRange(from = 0f, to = 1f) float progress,
+      boolean fromUser) {
+    if (fromUser) {
+      userActionsTaken.add(UserActionTaken.SET_PROGRESS);
+    }
     lottieDrawable.setProgress(progress);
   }