fix: resources not loading

ekreative · Jun 21, 2022 · 82188c4 · 82188c4
1 parent c4e9a2f
commit 82188c4
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 3 deletions.
diff --git a/Filestack.xcodeproj/project.pbxproj b/Filestack.xcodeproj/project.pbxproj
@@ -259,7 +259,7 @@
 		4599415226BBF6780039BF8F /* CustomPickerUploadController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomPickerUploadController.swift; sourceTree = "<group>"; };
 		45A2497426BC3A4B0078785D /* SourceProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceProvider.swift; sourceTree = "<group>"; };
 		45A2497626BC3A5E0078785D /* SourceProviderDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceProviderDelegate.swift; sourceTree = "<group>"; };
-		45BFF67A23290B1E00944028 /* Filestack.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Filestack.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		45BFF67A23290B1E00944028 /* Filestack.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Filestack.podspec; sourceTree = "<group>"; };
 		45BFF67B23290B1E00944028 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 		45BFF67C23290B1F00944028 /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
 		45BFF67D23290B1F00944028 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };

diff --git a/Package.swift b/Package.swift
@@ -23,8 +23,7 @@ let package = Package(
             dependencies: ["FilestackSDK", "ZIPFoundation"],
             exclude: ["Filestack.h", "Info.plist"],
             resources: [
-                .copy("VERSION"),
-                .copy("Sources/Resources")
+                .copy("VERSION")
             ]
         )
     ]

diff --git a/Sources/Filestack/Public/Models/Client.swift b/Sources/Filestack/Public/Models/Client.swift
@@ -75,7 +75,12 @@ private typealias CompletionHandler = (_ response: CloudResponse, _ safariError:
         let bundleURL = frameworkBundle.resourceURL?.appendingPathComponent("Filestack.bundle")
         let resourceBundle = Bundle(url: bundleURL!)
 
+        #if SWIFT_PACKAGE
+        let storyboard = UIStoryboard(name: "Picker", bundle: Bundle.module)
+        #else
         let storyboard = UIStoryboard(name: "Picker", bundle: resourceBundle)
+        #endif
+
         let scene = PickerNavigationScene(client: self, storeOptions: storeOptions)
 
         return storyboard.instantiateViewController(for: scene)

diff --git a/Sources/Filestack/UI/Internal/Controllers/MonitorViewController.swift b/Sources/Filestack/UI/Internal/Controllers/MonitorViewController.swift
@@ -69,7 +69,12 @@ final class MonitorViewController: UIViewController {
         let frameworkBundle = Bundle(for: Self.self)
         let bundleURL = frameworkBundle.resourceURL?.appendingPathComponent("Filestack.bundle")
         let resourceBundle = Bundle(url: bundleURL!)
+        #if SWIFT_PACKAGE
+        super.init(nibName: nil, bundle: Bundle.module)
+        #else
         super.init(nibName: nil, bundle: resourceBundle)
+        #endif
+
     }
 
     required init?(coder: NSCoder) {

diff --git a/...stack/UI/Internal/PhotoEditor/EditionController/ViewController/EditorViewController.swift b/...stack/UI/Internal/PhotoEditor/EditionController/ViewController/EditorViewController.swift
@@ -47,7 +47,11 @@ final class EditorViewController: UIViewController, UIGestureRecognizerDelegate
         let bundleURL = frameworkBundle.resourceURL?.appendingPathComponent("Filestack.bundle")
         let resourceBundle = Bundle(url: bundleURL!)
 
+        #if SWIFT_PACKAGE
+        super.init(nibName: nil, bundle: Bundle.module)
+        #else
         super.init(nibName: nil, bundle: resourceBundle)
+        #endif
 
         setupGestureRecognizer()
         setupView()

diff --git a/Sources/Filestack/UI/Internal/PhotoPicker/PhotoPickerController.swift b/Sources/Filestack/UI/Internal/PhotoPicker/PhotoPickerController.swift
@@ -94,7 +94,12 @@ private extension PhotoPickerController {
         let frameworkBundle = Bundle(for: Self.self)
         let bundleURL = frameworkBundle.resourceURL?.appendingPathComponent("Filestack.bundle")
         let resourceBundle = Bundle(url: bundleURL!)
+
+        #if SWIFT_PACKAGE
+        let storyboard = UIStoryboard(name: "PhotoPicker", bundle: Bundle.module)
+        #else
         let storyboard = UIStoryboard(name: "PhotoPicker", bundle: resourceBundle)
+        #endif
 
         return storyboard.instantiateViewController(withIdentifier: name)
     }