add support to configure bundle

KeetaPay · Apr 26, 2023 · 82bde93 · 82bde93
1 parent 8fa20fc
commit 82bde93
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/Source/RiveModel.swift b/Source/RiveModel.swift
@@ -18,8 +18,8 @@ open class RiveModel: ObservableObject {
         self.riveFile = riveFile
     }
 
-    public init(fileName: String) throws {
-        riveFile = try RiveFile(name: fileName)
+    public init(fileName: String, in bundle: Bundle) throws {
+        riveFile = try RiveFile(name: fileName, bundle: bundle)
     }
 
     public init(webURL: String, delegate: RiveFileDelegate) {

diff --git a/Source/RiveViewModel.swift b/Source/RiveViewModel.swift
@@ -77,6 +77,7 @@ open class RiveViewModel: NSObject, ObservableObject, RiveFileDelegate, RiveStat
 
     public init(
         fileName: String,
+        bundle: Bundle = .main,
         stateMachineName: String?,
         fit: RiveFit = .contain,
         alignment: RiveAlignment = .center,
@@ -87,12 +88,13 @@ open class RiveViewModel: NSObject, ObservableObject, RiveFileDelegate, RiveStat
         self.alignment = alignment
         self.autoPlay = autoPlay
         super.init()
-        riveModel = try! RiveModel(fileName: fileName)
+        riveModel = try! RiveModel(fileName: fileName, in: bundle)
         sharedInit(artboardName: artboardName, stateMachineName: stateMachineName, animationName: nil)
     }
 
     public init(
         fileName: String,
+        bundle: Bundle = .main,
         animationName: String? = nil,
         fit: RiveFit = .contain,
         alignment: RiveAlignment = .center,
@@ -103,7 +105,7 @@ open class RiveViewModel: NSObject, ObservableObject, RiveFileDelegate, RiveStat
         self.alignment = alignment
         self.autoPlay = autoPlay
         super.init()
-        riveModel = try! RiveModel(fileName: fileName)
+        riveModel = try! RiveModel(fileName: fileName, in: bundle)
         sharedInit(artboardName: artboardName, stateMachineName: nil, animationName: animationName)
     }
 

diff --git a/Source/Utils/RiveFile+Extensions.swift b/Source/Utils/RiveFile+Extensions.swift
@@ -9,17 +9,17 @@
 import Foundation
 
 public extension RiveFile {
-    convenience init(name fileName: String, extension ext: String = ".riv") throws {
-        let byteArray = RiveFile.getBytes(fileName: fileName, extension: ext)
+    convenience init(name fileName: String, extension ext: String = ".riv", bundle: Bundle = .main) throws {
+        let byteArray = RiveFile.getBytes(fileName: fileName, extension: ext, bundle: bundle)
         try self.init(byteArray: byteArray)
     }
 
-    static func getBytes(fileName: String, extension ext: String = ".riv") -> [UInt8] {
-        guard let url = Bundle.main.url(forResource: fileName, withExtension: ext) else {
+    static func getBytes(fileName: String, extension ext: String = ".riv", bundle: Bundle) -> [UInt8] {
+        guard let url = bundle.url(forResource: fileName, withExtension: ext) else {
             fatalError("Failed to locate \(fileName) in bundle.")
         }
         guard let data = try? Data(contentsOf: url) else {
-            fatalError("Failed to load \(url) from bundle.")
+            fatalError("Failed to load \(url) from bundle \(bundle).")
         }
 
         // Import the data into a RiveFile