chore: upgrade android lottie to 6.1.0 (#1060)

* chore: upgrade android lottie to 6.1.0 * remove redundant import
lottie-react-native · Jul 24, 2023 · f00907b · f00907b
1 parent f6b56ad
commit f00907b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 28 deletions.
diff --git a/apps/paper/src/LottieAnimatedExample.tsx b/apps/paper/src/LottieAnimatedExample.tsx
@@ -100,7 +100,7 @@ const LottieAnimatedExample = () => {
           onAnimationFinish={onAnimationFinish}
           enableMergePathsAndroidForKitKatAndAbove
           renderMode={renderMode}
-          resizeMode={'cover'}
+          resizeMode={'contain'}
         />
       </View>
       <View style={{paddingBottom: 20, paddingHorizontal: 10}}>

diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle
@@ -118,12 +118,11 @@ def kotlin_version = getExtOrDefault('kotlinVersion', project.properties['lottie
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+' // From node_modules
 
-    implementation "com.airbnb.android:lottie:6.0.0"
+    implementation "com.airbnb.android:lottie:6.1.0"
 }
 
 if (isNewArchitectureEnabled()) {

diff --git a/...e/android/src/main/java/com/airbnb/android/react/lottie/LottieAnimationViewManagerImpl.kt b/...e/android/src/main/java/com/airbnb/android/react/lottie/LottieAnimationViewManagerImpl.kt
@@ -12,11 +12,6 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
-import com.facebook.react.util.RNLog
-import kotlinx.coroutines.*
-import java.io.BufferedReader
-import java.io.InputStreamReader
-import java.net.URL
 
 internal object LottieAnimationViewManagerImpl {
     const val REACT_CLASS = "LottieAnimationView"
@@ -141,32 +136,19 @@ internal object LottieAnimationViewManagerImpl {
     @JvmStatic
     fun setSourceJson(
         json: String?,
-        propManagersMap: LottieAnimationViewPropertyManager
+        viewManager: LottieAnimationViewPropertyManager
     ) {
-        propManagersMap.animationJson = json
-        propManagersMap.commitChanges()
+        viewManager.animationJson = json
+        viewManager.commitChanges()
     }
 
     @JvmStatic
     fun setSourceURL(
         urlString: String?,
-        propManagersMap: LottieAnimationViewPropertyManager
+        viewManager: LottieAnimationViewPropertyManager
     ) {
-        CoroutineScope(Dispatchers.Main).launch {
-            try {
-                val jsonString = withContext(Dispatchers.IO) {
-                    URL(urlString).openStream().use {
-                        BufferedReader(InputStreamReader(it)).useLines { lines ->
-                            lines.joinToString("\n")
-                        }
-                    }
-                }
-                propManagersMap.animationJson = jsonString
-                propManagersMap.commitChanges()
-            } catch (e: Exception) {
-                RNLog.l("Error while loading animation from URL")
-            }
-        }
+        viewManager.animationURL = urlString
+        viewManager.commitChanges()
     }
 
     @JvmStatic

diff --git a/...droid/src/main/java/com/airbnb/android/react/lottie/LottieAnimationViewPropertyManager.kt b/...droid/src/main/java/com/airbnb/android/react/lottie/LottieAnimationViewPropertyManager.kt
@@ -46,6 +46,7 @@ class LottieAnimationViewPropertyManager(view: LottieAnimationView) {
     var renderMode: RenderMode? = null
     var layerType: Int? = null
     var animationJson: String? = null
+    var animationURL: String? = null
     var progress: Float? = null
     var loop: Boolean? = null
     var autoPlay: Boolean? = null
@@ -84,6 +85,11 @@ class LottieAnimationViewPropertyManager(view: LottieAnimationView) {
             animationJson = null
         }
 
+        animationURL?.let {
+            view.setAnimationFromUrl(it, it.hashCode().toString())
+            animationURL = null
+        }
+
         if (animationNameDirty) {
             view.setAnimation(animationName)
             animationNameDirty = false
@@ -103,7 +109,6 @@ class LottieAnimationViewPropertyManager(view: LottieAnimationView) {
             if (it && !view.isAnimating) {
                 view.playAnimation()
             }
-            autoPlay = null
         }
 
         speed?.let {