fix: fix some race conditions, allow string values calls

m1ga · Sep 18, 2022 · f1424f0 · f1424f0
1 parent a8f4467
commit f1424f0
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 30 deletions.
diff --git a/ios/Classes/TiAnimationAnimationView.swift b/ios/Classes/TiAnimationAnimationView.swift
@@ -12,13 +12,14 @@ import Lottie
 @objc(TiAnimationAnimationView)
 public class TiAnimationAnimationView : TiUIView {
 
-  private var _animationView: AnimationView!
+  var _animationView: AnimationView!
 
   private func animationView() -> AnimationView {
     if _animationView == nil {
       let file = TiUtils.stringValue(proxy.value(forKey: "file"))
       let jsonString = TiUtils.stringValue(proxy.value(forKey: "jsonString"))
       let autoStart = (proxy as! TiAnimationAnimationViewProxy).autoStart
+      let speed = TiUtils.floatValueSwift((proxy as! TiAnimationAnimationViewProxy).speed)
       let loop = (proxy as! TiAnimationAnimationViewProxy).loop
       let contentMode: Int? = Int(TiUtils.intValue(proxy.value(forKey: "contentMode")))
 
@@ -51,6 +52,10 @@ public class TiAnimationAnimationView : TiUIView {
         _animationView.contentMode = .scaleAspectFit
       }
 
+      if let speed = speed {
+        setSpeed(speed: speed)
+      }
+
       _animationView.frame = bounds
       addSubview(_animationView)
 
@@ -131,10 +136,16 @@ public class TiAnimationAnimationView : TiUIView {
 
     return try? JSONSerialization.jsonObject(with: data!) as? [String: Any]
   }
+
+  func initializeView() {
+    let _ = animationView()
+  }
 
   public override func frameSizeChanged(_ frame: CGRect, bounds: CGRect) {
     super.frameSizeChanged(frame, bounds: bounds)
-    animationView().frame = bounds
+    if let animationView = _animationView {
+      animationView.frame = bounds
+    }
   }
 }
 

diff --git a/ios/Classes/TiAnimationAnimationViewProxy.swift b/ios/Classes/TiAnimationAnimationViewProxy.swift
@@ -13,12 +13,25 @@ import TitaniumKit
 class TiAnimationAnimationViewProxy: TiViewProxy {
 
   var autoStart = false
-
+
+  var loop = false
+
+  var speed: Float? = 1.0
+
+  var progress: Float? = 0.0
+
+  var cache = false
+
   override func _init(withProperties properties: [AnyHashable : Any]!) {
     super._init(withProperties: properties)
 
     autoStart = TiUtils.boolValue("autoStart", properties: properties)
     loop = TiUtils.boolValue("loop", properties: properties)
+    cache = TiUtils.boolValue("cache", properties: properties)
+    progress = TiUtils.floatValueSwift(properties["progress"])
+    speed = TiUtils.floatValueSwift(properties["speed"])
+
+    animationView().initializeView()
   }
 
   private func animationView() -> TiAnimationAnimationView {
@@ -66,43 +79,34 @@ class TiAnimationAnimationViewProxy: TiViewProxy {
 
   // MARK: - Properties
 
-  @objc var progress: Any? {
-    set {
-      let progress = newValue as? Float ?? 0.0
+  @objc(setProgress:)
+  func setProgress(value: Any) {
+    let progress = TiUtils.floatValueSwift(value) ?? 0.0
+    if animationView()._animationView != nil {
       animationView().setProgress(progress: progress)
-
-      replaceValue(progress, forKey: "progress", notification: false)
-    }
-    get {
-      return animationView().progress()
     }
+
+    replaceValue(progress, forKey: "progress", notification: false)
   }
 
-  @objc var speed: Any? {
-    set {
-      let speed = newValue as? Float ?? 0.0
+  @objc(setSpeed:)
+  func setSpeed(value: Any) {
+    let speed = TiUtils.floatValueSwift(value) ?? 1.0
+    if animationView()._animationView != nil {
       animationView().setSpeed(speed: speed)
-
-      replaceValue(speed, forKey: "speed", notification: false)
-
-    }
-    get {
-      return animationView().speed()
     }
+
+    replaceValue(speed, forKey: "speed", notification: false)
   }
 
-  @objc lazy var loop: Bool = {
-    return animationView().loop()
-  }()
-
-  @objc var cache: Any {
-    set {
-      let cache = newValue as? Bool ?? false
+  @objc(setCache:)
+  func setCache(value: Any) {
+    let cache = value as? Bool ?? false
+    if animationView()._animationView != nil {
       animationView().setCacheEnabled(cacheEnabled: cache)
     }
-    get {
-      return animationView().cacheEnabled()
-    }
+
+    replaceValue(cache, forKey: "cache", notification: false)
   }
 
   @objc var isPlaying: Bool {
@@ -135,3 +139,18 @@ class TiAnimationAnimationViewProxy: TiViewProxy {
     animationView().add(view: viewProxy.view, toLayer: keypathLayer)
   }
 }
+
+// MARK: Utils
+
+extension TiUtils {
+
+  class func floatValueSwift(_ value: Any?) -> Float? {
+    if let floatValue = value as? Float {
+      return floatValue
+    } else if let stringValue = value as? String {
+      return Float(stringValue)
+    }
+
+    return nil
+  }
+}