Set default bundle for BPKIcon if not provided and update BPKIconView…

… accordingly
Skyscanner · Jan 23, 2025 · 92610d0 · 92610d0
1 parent 0883cac
commit 92610d0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Backpack-SwiftUI/Icons/Classes/BPKIcon.swift b/Backpack-SwiftUI/Icons/Classes/BPKIcon.swift
@@ -16,13 +16,15 @@
  * limitations under the License.
  */
 
+import Backpack_Common
+
 public struct BPKIcon {
     public let name: String
     let bundle: Bundle?
 
     init (name: String, bundle: Bundle? = nil) {
         self.name = name
-        self.bundle = bundle
+        self.bundle = bundle ?? BPKCommonBundle.iconsBundle
     }
 
     public enum Size {

diff --git a/Backpack-SwiftUI/Icons/Classes/BPKIconView.swift b/Backpack-SwiftUI/Icons/Classes/BPKIconView.swift
@@ -83,11 +83,10 @@ private extension BPKIcon.Size {
 private extension Image {
     init(icon: BPKIcon, size: BPKIcon.Size = .small, shouldEnableAccessibility: Bool) {
         let iconName = "\(icon.name)-\(size.suffix)"
-        let bundle = icon.bundle ?? BPKCommonBundle.iconsBundle
         if shouldEnableAccessibility {
-            self.init(iconName, bundle: bundle)
+            self.init(iconName, bundle: icon.bundle)
         } else {
-            self.init(decorative: iconName, bundle: bundle)
+            self.init(decorative: iconName, bundle: icon.bundle)
         }
     }
 }