android lottie: update and bugfix

m1ga · Jun 23, 2024 · 6278a92 · 6278a92
1 parent d3afb04
commit 6278a92
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -7,7 +7,7 @@ dependencies {
   implementation "androidx.startup:startup-runtime:1.1.1"
 
   // https://github.com/airbnb/lottie-android
-  implementation 'com.airbnb.android:lottie:6.3.0'
+  implementation 'com.airbnb.android:lottie:6.4.0'
 
   // https://github.com/rive-app/rive-android
   implementation 'app.rive:rive-android:5.1.5'

diff --git a/android/manifest b/android/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 4.6.0
+version: 4.7.0
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86 x86_64
 description: ti.animation

diff --git a/android/src/ti/animation/AnimationView.java b/android/src/ti/animation/AnimationView.java
@@ -214,8 +214,13 @@ private void setScaleMode(String smode) {
     private void parseJson(String json) {
         try {
             JSONObject jsonObject = new JSONObject(json);
-            proxy.setProperty("width", jsonObject.optInt("w", 0));
-            proxy.setProperty("height", jsonObject.optInt("h", 0));
+            if (!proxy.hasPropertyAndNotNull("width")) {
+                proxy.setProperty("width", jsonObject.optInt("w", 0));
+            }
+            if (!proxy.hasPropertyAndNotNull("height")) {
+                proxy.setProperty("height", jsonObject.optInt("h", 0));
+            }
+
         } catch (Exception e) {
             Log.e(LCAT, "Couldn't read width/height");
         }