Update usage of resources

wordpress-mobile · Jun 28, 2024 · 95de1c4 · 95de1c4
1 parent e0c6a62
commit 95de1c4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/Sources/Capabilities/Drawing/MediaEditorDrawing.swift b/Sources/Capabilities/Drawing/MediaEditorDrawing.swift
@@ -20,7 +20,7 @@ class MediaEditorDrawing: UIViewController {
     static func initialize() -> MediaEditorDrawing {
         return UIStoryboard(
             name: "MediaEditorDrawing",
-            bundle: Bundle(for: MediaEditorDrawing.self)
+            bundle: mediaEditorBundle(for: MediaEditorDrawing.self)
         ).instantiateViewController(withIdentifier: "drawingViewController") as! MediaEditorDrawing
     }
 

diff --git a/Sources/Capabilities/Filters/MediaEditorFilters.swift b/Sources/Capabilities/Filters/MediaEditorFilters.swift
@@ -120,7 +120,7 @@ class MediaEditorFilters: UIViewController {
     static func initialize() -> MediaEditorFilters {
         return UIStoryboard(
             name: "MediaEditorFilters",
-            bundle: Bundle(for: MediaEditorFilters.self)
+            bundle: mediaEditorBundle(for: MediaEditorFilters.self)
         ).instantiateViewController(withIdentifier: "filtersViewController") as! MediaEditorFilters
     }
 

diff --git a/Sources/Extensions/Bundle+mediaEditor.swift b/Sources/Extensions/Bundle+mediaEditor.swift
@@ -13,6 +13,14 @@ extension Bundle {
         }
         // Otherwise, the default bundle is used for resources
         return defaultBundle
+#endif
+    }
+
+    static func mediaEditorBundle(for type: AnyClass) -> Bundle? {
+#if SWIFT_PACKAGE
+        return Bundle.module
+#else
+        return Bundle(for: type)
 #endif
     }
 }
diff --git a/Sources/MediaEditorHub.swift b/Sources/MediaEditorHub.swift
@@ -253,7 +253,7 @@ public class MediaEditorHub: UIViewController {
     }
 
     static func initialize() -> MediaEditorHub {
-        return UIStoryboard(name: "MediaEditorHub", bundle: Bundle(for: MediaEditorHub.self)).instantiateViewController(withIdentifier: "hubViewController") as! MediaEditorHub
+        return UIStoryboard(name: "MediaEditorHub", bundle: .mediaEditorBundle(for: MediaEditorHub.self)).instantiateViewController(withIdentifier: "hubViewController") as! MediaEditorHub
     }
 
     private enum Constants {