Merge pull request #44 from LottieFiles/feat/dotlottie-v2

feat: dotlottie v2 specs support
LottieFiles · Nov 20, 2024 · f2be1be · f2be1be
2 parents d84ba19 + eda821b
commit f2be1be
Show file tree

Hide file tree

Showing 11 changed files with 1,157 additions and 351 deletions.
diff --git a/Sources/DotLottie/Public/DotLottieAnimation.swift b/Sources/DotLottie/Public/DotLottieAnimation.swift
@@ -121,7 +121,8 @@ public final class DotLottieAnimation: ObservableObject {
                              segment: config.segments != nil ? [config.segments!.0, config.segments!.1] : [],
                              backgroundColor: 0,
                              layout: config.layout ?? createDefaultLayout(),
-                             marker: config.marker ?? "")
+                             marker: config.marker ?? "",
+                             themeId: config.themeId ?? "")
         self.player = Player(config: self.config)
 
         if (config.width != nil || config.height != nil) {
@@ -472,6 +473,30 @@ public final class DotLottieAnimation: ObservableObject {
         return pe
     }
 
+    public func setSlots(_ slots: String) -> Bool {
+        player.setSlots(slots)
+    }
+
+    public func setTheme(_ themeId: String) -> Bool {
+        player.setTheme(themeId)
+    }
+
+    public func setThemeData(_ themeData: String) -> Bool {
+        player.setThemeData(themeData)
+    }
+
+    public func resetTheme() -> Bool {
+        player.resetTheme()
+    }
+
+    public func activeThemeId() -> String {
+        player.activeThemeId()
+    }
+
+    public func activeAnimationId() -> String {
+        player.activeAnimationId()
+    }
+
     public func stateMachineSubscribe(oberserver: StateMachineObserver) -> Bool {
         player.stateMachineSubscribe(oberserver: oberserver)
     }
@@ -548,14 +573,6 @@ public final class DotLottieAnimation: ObservableObject {
         player.setConfig(config: config)
     }
 
-    public func loadTheme(themeId: String) -> Bool {
-        return player.loadTheme(themeId: themeId)
-    }
-
-    public func loadThemeData(themeData: String) -> Bool {
-        return player.loadThemeData(themeData: themeData)
-    }
-
     public func resize(width: Int, height: Int) {
         self.animationModel.width = width
         self.animationModel.height = height

diff --git a/Sources/DotLottie/Public/Models/AnimationConfig.swift b/Sources/DotLottie/Public/Models/AnimationConfig.swift
@@ -20,6 +20,7 @@ public struct AnimationConfig {
     public var height: Int? = 512
     public var layout: Layout? = createDefaultLayout()
     public var marker: String? = ""
+    public var themeId: String? = ""
 
     public init(
         autoplay: Bool? = false,
@@ -32,7 +33,8 @@ public struct AnimationConfig {
         width: Int? = nil,
         height: Int? = nil,
         layout: Layout? = createDefaultLayout(),
-        marker: String? = nil
+        marker: String? = nil,
+        themeId: String? = nil
     ) {
         self.autoplay = autoplay
         self.loop = loop
@@ -45,5 +47,6 @@ public struct AnimationConfig {
         self.height = height
         self.layout = layout
         self.marker = marker
+        self.themeId = themeId
     }
 }
diff --git a/Sources/DotLottie/Public/Player.swift b/Sources/DotLottie/Public/Player.swift
@@ -129,14 +129,6 @@ class Player: ObservableObject {
         dotLottiePlayer.totalFrames()
     }
 
-    public func loadTheme(themeId: String) -> Bool {
-        dotLottiePlayer.loadTheme(themeId: themeId)
-    }
-
-    public func loadThemeData(themeData: String) -> Bool {
-        dotLottiePlayer.loadThemeData(themeData: themeData)
-    }
-
     public func setFrame(no: Float32) -> Bool {
         dotLottiePlayer.setFrame(no: no)
     }
@@ -258,6 +250,30 @@ class Player: ObservableObject {
         dotLottiePlayer.clear()
     }
 
+    public func setSlots(_ slots: String) -> Bool {
+        dotLottiePlayer.setSlots(slots: slots);
+    }
+
+    public func setTheme(_ themeId: String) -> Bool {
+        dotLottiePlayer.setTheme(themeId: themeId)
+    }
+
+    public func setThemeData(_ themeData: String) -> Bool {
+        dotLottiePlayer.setThemeData(themeData: themeData)
+    }
+
+    public func resetTheme() -> Bool {
+        dotLottiePlayer.resetTheme();
+    }
+
+    public func activeThemeId() -> String {
+        dotLottiePlayer.activeThemeId()
+    }
+
+    public func activeAnimationId() -> String {
+        dotLottiePlayer.activeAnimationId()
+    }
+
     public func setStateMachineNumericContext(key: String, value: Float) -> Bool {
         dotLottiePlayer.setStateMachineNumericContext(key: key, value: value)
     }