Merge pull request #12 from LottieFiles/feat/multi-animation

Feat/multi animation
LottieFiles · Feb 7, 2024 · 9f9ae83 · 9f9ae83
2 parents 2034e7c + c7a0918
commit 9f9ae83
Show file tree

Hide file tree

Showing 10 changed files with 120 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -104,6 +104,7 @@ class AnimationViewController: UIViewController {
 | `isPaused()`        | Bool | Reflects whether the animation is paused or not.                                                                      |
 | `isStopped()`       | Bool | Reflects whether the animation is stopped or not.                                                                     |
 | `isPlaying()`       | Bool | Reflects whether the animation is playing or not.                                                                     |
+| `manifest()`       | Manifst | Returns the .lottie's manifest file.                                                                     |
 | `segments()`        | (Float, Float)  | Reflects the frames range of the animations. where segments\[0] is the start frame and segments\[1] is the end frame. |
 | `backgroundColor()` | CIImage  | Gets the background color of the canvas.                                                                              |
 | `autoplay()`        | Bool | Indicates if the animation is set to auto play.                                                                       |
@@ -122,6 +123,7 @@ class AnimationViewController: UIViewController {
 | `setLoop(loop: Bool)` | Configures whether the animation should loop continuously. |
 | `setFrame(frame: Float)` | Directly navigates the animation to a specified frame. |
 | `load(config: Config)` | Loads a new configuration or a new animation. |
+| `loadAnimation(animationId: String)` | Loads the animation by id. Animation id's are visible inside the manifest, recoverable via the manifest() method. |
 | `setMode(mode: Mode)` | Sets the animation play mode. |
 | `setSegments(segments: (Float, Float))` | Sets the start and end frame of the animation. |
 | `setBackgroundColor(color: CIImage)` | Sets the background color of the animation. |
@@ -143,6 +145,9 @@ class YourDotLottieObserver: Observer {
     func onLoad() {
     }
 
+    func onLoadError() {
+    }
+
     func onLoop(loopCount: UInt32) {
     }
 
@@ -175,6 +180,7 @@ animationView.subscribe(observer: myObserver)
 | `onComplete`  | Emitted when the animation completes.                                   |
 | `onFrame(frameNo: Float)`     | Emitted when the animation reaches a new frame.         |
 | `onLoad`      | Emitted when the animation is loaded.                                   |
+| `onLoadError` | Emitted when the animation failed to load.                         |
 | `onLoop(loopCount: UIint32)`      | Emitted when the animation completes a loop.        |
 | `onPause`     | Emitted when the animation is paused.                                   |
 | `onPlay`      | Emitted when the animation starts playing.                              |

diff --git a/Sources/DotLottie/Public/DotLottieAnimation.swift b/Sources/DotLottie/Public/DotLottieAnimation.swift
@@ -218,6 +218,19 @@ public class DotLottieAnimation: ObservableObject {
         }
     }
 
+    /// Loads animation with the id passed as argument.
+    /// - Parameter animationData: Animation data (.json).
+    public func loadAnimationById(_ animationId: String) throws {
+        do {
+            try player.loadAnimation(animationId: animationId, width: self.animationModel.width, height: self.animationModel.height)
+        } catch let error {
+            animationModel.error = true
+            animationModel.errorMessage = error.localizedDescription
+
+            throw error
+        }
+    }
+
     private func initWidthHeight(animationData: String?, animationFilePath: URL?) {
         // Parse width and height of animation
         do {
@@ -389,6 +402,10 @@ public class DotLottieAnimation: ObservableObject {
         return player.config().mode
     }
 
+    public func manifest() -> Manifest? {
+        return player.manifest()
+    }
+
     public func resize(width: Int, height: Int) {
         self.animationModel.width = width
         self.animationModel.height = height

diff --git a/Sources/DotLottie/Public/Player.swift b/Sources/DotLottie/Public/Player.swift
@@ -54,6 +54,18 @@ class Player: ObservableObject, Observer {
         }
     }
 
+    public func loadAnimation(animationId: String, width: Int, height: Int) throws {
+        self.WIDTH = UInt32(width)
+        self.HEIGHT = UInt32(height)
+
+        if (!dotLottiePlayer.loadAnimation(animationId: animationId,
+                                                    width: self.WIDTH,
+                                               height: self.HEIGHT)) {
+            self.setPlayerState(state: .error)
+            throw AnimationLoadErrors.loadFromPathError
+        }
+    }
+
     public func render() -> CGImage? {
         if (!self.isLoaded() || !dotLottiePlayer.render()) {
             return nil
@@ -213,4 +225,8 @@ class Player: ObservableObject, Observer {
     func onStop() {
         self.setPlayerState(state: .stopped)
     }
+
+    func onLoadError() {
+        self.setPlayerState(state: .error)
+    }
 }
diff --git a/Sources/DotLottie/Public/dotlottie_player.swift b/Sources/DotLottie/Public/dotlottie_player.swift
@@ -471,6 +471,8 @@ public protocol DotLottiePlayerProtocol: AnyObject {
 
     func resize(width: UInt32, height: UInt32) -> Bool
 
+    func seek(no: Float) -> Bool
+
     func setConfig(config: Config)
 
     func setFrame(no: Float) -> Bool
@@ -731,6 +733,16 @@ public class DotLottiePlayer:
         )
     }
 
+    public func seek(no: Float) -> Bool {
+        return try! FfiConverterBool.lift(
+            try!
+                rustCall {
+                    uniffi_dotlottie_player_fn_method_dotlottieplayer_seek(self.uniffiClonePointer(),
+                                                                           FfiConverterFloat.lower(no), $0)
+                }
+        )
+    }
+
     public func setConfig(config: Config) {
         try!
             rustCall {
@@ -829,6 +841,8 @@ public protocol Observer: AnyObject {
 
     func onLoad()
 
+    func onLoadError()
+
     func onLoop(loopCount: UInt32)
 
     func onPause()
@@ -882,6 +896,13 @@ public class ObserverImpl:
             }
     }
 
+    public func onLoadError() {
+        try!
+            rustCall {
+                uniffi_dotlottie_player_fn_method_observer_on_load_error(self.uniffiClonePointer(), $0)
+            }
+    }
+
     public func onLoop(loopCount: UInt32) {
         try!
             rustCall {
@@ -1018,6 +1039,15 @@ private let uniffiCallbackInterfaceObserver: ForeignCallback = { (handle: UniFFI
         return try makeCall()
     }
 
+    func invokeOnLoadError(_ swiftCallbackInterface: Observer, _: UnsafePointer<UInt8>, _: Int32, _: UnsafeMutablePointer<RustBuffer>) throws -> Int32 {
+        func makeCall() throws -> Int32 {
+            swiftCallbackInterface.onLoadError(
+            )
+            return UNIFFI_CALLBACK_SUCCESS
+        }
+        return try makeCall()
+    }
+
     func invokeOnLoop(_ swiftCallbackInterface: Observer, _ argsData: UnsafePointer<UInt8>, _ argsLen: Int32, _: UnsafeMutablePointer<RustBuffer>) throws -> Int32 {
         var reader = createReader(data: Data(bytes: argsData, count: Int(argsLen)))
         func makeCall() throws -> Int32 {
@@ -1112,7 +1142,7 @@ private let uniffiCallbackInterfaceObserver: ForeignCallback = { (handle: UniFFI
             return UNIFFI_CALLBACK_UNEXPECTED_ERROR
         }
         do {
-            return try invokeOnLoop(cb, argsData, argsLen, out_buf)
+            return try invokeOnLoadError(cb, argsData, argsLen, out_buf)
         } catch {
             out_buf.pointee = FfiConverterString.lower(String(describing: error))
             return UNIFFI_CALLBACK_UNEXPECTED_ERROR
@@ -1123,7 +1153,7 @@ private let uniffiCallbackInterfaceObserver: ForeignCallback = { (handle: UniFFI
             return UNIFFI_CALLBACK_UNEXPECTED_ERROR
         }
         do {
-            return try invokeOnPause(cb, argsData, argsLen, out_buf)
+            return try invokeOnLoop(cb, argsData, argsLen, out_buf)
         } catch {
             out_buf.pointee = FfiConverterString.lower(String(describing: error))
             return UNIFFI_CALLBACK_UNEXPECTED_ERROR
@@ -1134,7 +1164,7 @@ private let uniffiCallbackInterfaceObserver: ForeignCallback = { (handle: UniFFI
             return UNIFFI_CALLBACK_UNEXPECTED_ERROR
         }
         do {
-            return try invokeOnPlay(cb, argsData, argsLen, out_buf)
+            return try invokeOnPause(cb, argsData, argsLen, out_buf)
         } catch {
             out_buf.pointee = FfiConverterString.lower(String(describing: error))
             return UNIFFI_CALLBACK_UNEXPECTED_ERROR
@@ -1145,12 +1175,23 @@ private let uniffiCallbackInterfaceObserver: ForeignCallback = { (handle: UniFFI
             return UNIFFI_CALLBACK_UNEXPECTED_ERROR
         }
         do {
-            return try invokeOnRender(cb, argsData, argsLen, out_buf)
+            return try invokeOnPlay(cb, argsData, argsLen, out_buf)
         } catch {
             out_buf.pointee = FfiConverterString.lower(String(describing: error))
             return UNIFFI_CALLBACK_UNEXPECTED_ERROR
         }
     case 8:
+        guard let cb = FfiConverterTypeObserver.handleMap.get(handle: handle) else {
+            out_buf.pointee = FfiConverterString.lower("No callback in handlemap; this is a Uniffi bug")
+            return UNIFFI_CALLBACK_UNEXPECTED_ERROR
+        }
+        do {
+            return try invokeOnRender(cb, argsData, argsLen, out_buf)
+        } catch {
+            out_buf.pointee = FfiConverterString.lower(String(describing: error))
+            return UNIFFI_CALLBACK_UNEXPECTED_ERROR
+        }
+    case 9:
         guard let cb = FfiConverterTypeObserver.handleMap.get(handle: handle) else {
             out_buf.pointee = FfiConverterString.lower("No callback in handlemap; this is a Uniffi bug")
             return UNIFFI_CALLBACK_UNEXPECTED_ERROR
@@ -2078,6 +2119,9 @@ private var initializationResult: InitializationResult {
     if uniffi_dotlottie_player_checksum_method_dotlottieplayer_resize() != 16787 {
         return InitializationResult.apiChecksumMismatch
     }
+    if uniffi_dotlottie_player_checksum_method_dotlottieplayer_seek() != 60656 {
+        return InitializationResult.apiChecksumMismatch
+    }
     if uniffi_dotlottie_player_checksum_method_dotlottieplayer_set_config() != 39472 {
         return InitializationResult.apiChecksumMismatch
     }
@@ -2105,6 +2149,9 @@ private var initializationResult: InitializationResult {
     if uniffi_dotlottie_player_checksum_method_observer_on_load() != 56735 {
         return InitializationResult.apiChecksumMismatch
     }
+    if uniffi_dotlottie_player_checksum_method_observer_on_load_error() != 51239 {
+        return InitializationResult.apiChecksumMismatch
+    }
     if uniffi_dotlottie_player_checksum_method_observer_on_loop() != 7035 {
         return InitializationResult.apiChecksumMismatch
     }

diff --git a/...ottieCore/DotLottiePlayer.xcframework/ios-arm64/DotLottiePlayer.framework/DotLottiePlayer b/...ottieCore/DotLottiePlayer.xcframework/ios-arm64/DotLottiePlayer.framework/DotLottiePlayer
diff --git a/...otLottiePlayer.xcframework/ios-arm64/DotLottiePlayer.framework/Headers/dotlottie_player.h b/...otLottiePlayer.xcframework/ios-arm64/DotLottiePlayer.framework/Headers/dotlottie_player.h
@@ -103,6 +103,8 @@ float uniffi_dotlottie_player_fn_method_dotlottieplayer_request_frame(void*_Nonn
 );
 int8_t uniffi_dotlottie_player_fn_method_dotlottieplayer_resize(void*_Nonnull ptr, uint32_t width, uint32_t height, RustCallStatus *_Nonnull out_status
 );
+int8_t uniffi_dotlottie_player_fn_method_dotlottieplayer_seek(void*_Nonnull ptr, float no, RustCallStatus *_Nonnull out_status
+);
 void uniffi_dotlottie_player_fn_method_dotlottieplayer_set_config(void*_Nonnull ptr, RustBuffer config, RustCallStatus *_Nonnull out_status
 );
 int8_t uniffi_dotlottie_player_fn_method_dotlottieplayer_set_frame(void*_Nonnull ptr, float no, RustCallStatus *_Nonnull out_status
@@ -127,6 +129,8 @@ void uniffi_dotlottie_player_fn_method_observer_on_frame(void*_Nonnull ptr, floa
 );
 void uniffi_dotlottie_player_fn_method_observer_on_load(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
 );
+void uniffi_dotlottie_player_fn_method_observer_on_load_error(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
+);
 void uniffi_dotlottie_player_fn_method_observer_on_loop(void*_Nonnull ptr, uint32_t loop_count, RustCallStatus *_Nonnull out_status
 );
 void uniffi_dotlottie_player_fn_method_observer_on_pause(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
@@ -317,6 +321,9 @@ uint16_t uniffi_dotlottie_player_checksum_method_dotlottieplayer_request_frame(v
 );
 uint16_t uniffi_dotlottie_player_checksum_method_dotlottieplayer_resize(void
 
+);
+uint16_t uniffi_dotlottie_player_checksum_method_dotlottieplayer_seek(void
+
 );
 uint16_t uniffi_dotlottie_player_checksum_method_dotlottieplayer_set_config(void
 
@@ -344,6 +351,9 @@ uint16_t uniffi_dotlottie_player_checksum_method_observer_on_frame(void
 );
 uint16_t uniffi_dotlottie_player_checksum_method_observer_on_load(void
 
+);
+uint16_t uniffi_dotlottie_player_checksum_method_observer_on_load_error(void
+
 );
 uint16_t uniffi_dotlottie_player_checksum_method_observer_on_loop(void
 

diff --git a/...iePlayer.xcframework/ios-arm64_x86_64-simulator/DotLottiePlayer.framework/DotLottiePlayer b/...iePlayer.xcframework/ios-arm64_x86_64-simulator/DotLottiePlayer.framework/DotLottiePlayer
diff --git a/...framework/ios-arm64_x86_64-simulator/DotLottiePlayer.framework/Headers/dotlottie_player.h b/...framework/ios-arm64_x86_64-simulator/DotLottiePlayer.framework/Headers/dotlottie_player.h
@@ -103,6 +103,8 @@ float uniffi_dotlottie_player_fn_method_dotlottieplayer_request_frame(void*_Nonn
 );
 int8_t uniffi_dotlottie_player_fn_method_dotlottieplayer_resize(void*_Nonnull ptr, uint32_t width, uint32_t height, RustCallStatus *_Nonnull out_status
 );
+int8_t uniffi_dotlottie_player_fn_method_dotlottieplayer_seek(void*_Nonnull ptr, float no, RustCallStatus *_Nonnull out_status
+);
 void uniffi_dotlottie_player_fn_method_dotlottieplayer_set_config(void*_Nonnull ptr, RustBuffer config, RustCallStatus *_Nonnull out_status
 );
 int8_t uniffi_dotlottie_player_fn_method_dotlottieplayer_set_frame(void*_Nonnull ptr, float no, RustCallStatus *_Nonnull out_status
@@ -127,6 +129,8 @@ void uniffi_dotlottie_player_fn_method_observer_on_frame(void*_Nonnull ptr, floa
 );
 void uniffi_dotlottie_player_fn_method_observer_on_load(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
 );
+void uniffi_dotlottie_player_fn_method_observer_on_load_error(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
+);
 void uniffi_dotlottie_player_fn_method_observer_on_loop(void*_Nonnull ptr, uint32_t loop_count, RustCallStatus *_Nonnull out_status
 );
 void uniffi_dotlottie_player_fn_method_observer_on_pause(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
@@ -317,6 +321,9 @@ uint16_t uniffi_dotlottie_player_checksum_method_dotlottieplayer_request_frame(v
 );
 uint16_t uniffi_dotlottie_player_checksum_method_dotlottieplayer_resize(void
 
+);
+uint16_t uniffi_dotlottie_player_checksum_method_dotlottieplayer_seek(void
+
 );
 uint16_t uniffi_dotlottie_player_checksum_method_dotlottieplayer_set_config(void
 
@@ -344,6 +351,9 @@ uint16_t uniffi_dotlottie_player_checksum_method_observer_on_frame(void
 );
 uint16_t uniffi_dotlottie_player_checksum_method_observer_on_load(void
 
+);
+uint16_t uniffi_dotlottie_player_checksum_method_observer_on_load_error(void
+
 );
 uint16_t uniffi_dotlottie_player_checksum_method_observer_on_loop(void
 

diff --git a/.../DotLottiePlayer.xcframework/macos-arm64_x86_64/DotLottiePlayer.framework/DotLottiePlayer b/.../DotLottiePlayer.xcframework/macos-arm64_x86_64/DotLottiePlayer.framework/DotLottiePlayer
diff --git a/...layer.xcframework/macos-arm64_x86_64/DotLottiePlayer.framework/Headers/dotlottie_player.h b/...layer.xcframework/macos-arm64_x86_64/DotLottiePlayer.framework/Headers/dotlottie_player.h
@@ -103,6 +103,8 @@ float uniffi_dotlottie_player_fn_method_dotlottieplayer_request_frame(void*_Nonn
 );
 int8_t uniffi_dotlottie_player_fn_method_dotlottieplayer_resize(void*_Nonnull ptr, uint32_t width, uint32_t height, RustCallStatus *_Nonnull out_status
 );
+int8_t uniffi_dotlottie_player_fn_method_dotlottieplayer_seek(void*_Nonnull ptr, float no, RustCallStatus *_Nonnull out_status
+);
 void uniffi_dotlottie_player_fn_method_dotlottieplayer_set_config(void*_Nonnull ptr, RustBuffer config, RustCallStatus *_Nonnull out_status
 );
 int8_t uniffi_dotlottie_player_fn_method_dotlottieplayer_set_frame(void*_Nonnull ptr, float no, RustCallStatus *_Nonnull out_status
@@ -127,6 +129,8 @@ void uniffi_dotlottie_player_fn_method_observer_on_frame(void*_Nonnull ptr, floa
 );
 void uniffi_dotlottie_player_fn_method_observer_on_load(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
 );
+void uniffi_dotlottie_player_fn_method_observer_on_load_error(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
+);
 void uniffi_dotlottie_player_fn_method_observer_on_loop(void*_Nonnull ptr, uint32_t loop_count, RustCallStatus *_Nonnull out_status
 );
 void uniffi_dotlottie_player_fn_method_observer_on_pause(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
@@ -317,6 +321,9 @@ uint16_t uniffi_dotlottie_player_checksum_method_dotlottieplayer_request_frame(v
 );
 uint16_t uniffi_dotlottie_player_checksum_method_dotlottieplayer_resize(void
 
+);
+uint16_t uniffi_dotlottie_player_checksum_method_dotlottieplayer_seek(void
+
 );
 uint16_t uniffi_dotlottie_player_checksum_method_dotlottieplayer_set_config(void
 
@@ -344,6 +351,9 @@ uint16_t uniffi_dotlottie_player_checksum_method_observer_on_frame(void
 );
 uint16_t uniffi_dotlottie_player_checksum_method_observer_on_load(void
 
+);
+uint16_t uniffi_dotlottie_player_checksum_method_observer_on_load_error(void
+
 );
 uint16_t uniffi_dotlottie_player_checksum_method_observer_on_loop(void