allow custom name and bundle for icons

Skyscanner · Dec 19, 2024 · f77eded · f77eded
1 parent 72ac694
commit f77eded
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/Backpack-SwiftUI/Icons/Classes/BPKIcon.swift b/Backpack-SwiftUI/Icons/Classes/BPKIcon.swift
@@ -15,9 +15,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import Backpack_Common
 
 public struct BPKIcon {
     public let name: String
+    let bundle: Bundle
+
+    init (name: String, bundle: Bundle = BPKCommonBundle.iconsBundle) {
+        self.name = name
+        self.bundle = bundle
+    }
 
     public enum Size {
         case large, small

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 = 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)
         }
     }
 }

diff --git a/Backpack-SwiftUI/Icons/Classes/Generated/BPKIcons.swift b/Backpack-SwiftUI/Icons/Classes/Generated/BPKIcons.swift
@@ -298,7 +298,12 @@ public extension BPKIcon {
 
 public extension BPKIcon {
     // swiftlint:disable function_body_length cyclomatic_complexity
-    static func named(_ iconName: String) -> BPKIcon? {
+    static func named(_ iconName: String, bundle: Bundle? = nil) -> BPKIcon? {
+
+        if let bundle {
+            return BPKIcon(name: iconName, bundle: bundle)
+        }
+
         switch iconName {
         case "accessibility": return .accessibility
         case "account--add": return .accountAdd