feat(RES-58): Add new parameter "bundle" (#19)

Add bundle parameter to define if resource should be load from Bundle.main (app) or Bundle.module (SPM package)

Reviewed-on: #19

Sources/ResgenSwift/Colors/Colors.swift

@@ -59,11 +59,12 @@ struct Colors: ParsableCommand {
            let extensionFilePath = options.extensionFilePath {
             ColorExtensionGenerator.writeExtensionFile(
                 colors: parsedColors,
-                staticVar: options.staticMembers,
+                isStatic: options.staticMembers,
                 extensionName: extensionName,
                 extensionFilePath: extensionFilePath,
                 isSwiftUI: true,
-                visibility: options.extensionVisibility
+                visibility: options.extensionVisibility,
+                assetBundle: options.assetBundle
             )
         }
 
@@ -72,11 +73,12 @@ struct Colors: ParsableCommand {
            let extensionFilePathUIKit = options.extensionFilePathUIKit {
             ColorExtensionGenerator.writeExtensionFile(
                 colors: parsedColors,
-                staticVar: options.staticMembers,
+                isStatic: options.staticMembers,
                 extensionName: extensionNameUIKit,
                 extensionFilePath: extensionFilePathUIKit,
                 isSwiftUI: false,
-                visibility: options.extensionVisibility
+                visibility: options.extensionVisibility,
+                assetBundle: options.assetBundle
             )
         }
 

Sources/ResgenSwift/Colors/ColorsToolOptions.swift

@@ -5,6 +5,8 @@
 //  Created by Thibaut Schmitt on 17/01/2022.
 //
 
+// CPD-OFF
+
 import ArgumentParser
 import Foundation
 import ToolCore
@@ -44,6 +46,11 @@ struct ColorsToolOptions: ParsableArguments {
     )
     var extensionVisibility: ExtensionVisibility = .internal
 
+    @Option(
+        help: "Bundle where the asset are generated"
+    )
+    var assetBundle: AssetBundle = .main
+
     @Option(
         help: "Path where to generate the extension.",
         transform: { $0.replaceTiltWithHomeDirectoryPath() }
@@ -97,4 +104,4 @@ extension ColorsToolOptions {
 
         return "\(extensionOutputPath)/\(extensionFileNameUIKit)"
     }
-}
+}// CPD-ON

Sources/ResgenSwift/Colors/Generator/ColorExtensionGenerator.swift

@@ -17,19 +17,21 @@ struct ColorExtensionGenerator {
 
     static func writeExtensionFile(
         colors: [ParsedColor],
-        staticVar: Bool,
+        isStatic: Bool,
         extensionName: String,
         extensionFilePath: String,
         isSwiftUI: Bool,
-        visibility: ExtensionVisibility
+        visibility: ExtensionVisibility,
+        assetBundle: AssetBundle
     ) {
         // Create extension content
         let extensionContent = Self.getExtensionContent(
             colors: colors,
-            staticVar: staticVar,
+            isStatic: isStatic,
             extensionName: extensionName,
             isSwiftUI: isSwiftUI,
-            visibility: visibility
+            visibility: visibility,
+            assetBundle: assetBundle
         )
 
         // Write content
@@ -45,10 +47,11 @@ struct ColorExtensionGenerator {
 
     static func getExtensionContent(
         colors: [ParsedColor],
-        staticVar: Bool,
+        isStatic: Bool,
         extensionName: String,
         isSwiftUI: Bool,
-        visibility: ExtensionVisibility
+        visibility: ExtensionVisibility,
+        assetBundle: AssetBundle
     ) -> String {
         [
             Self.getHeader(
@@ -57,9 +60,10 @@ struct ColorExtensionGenerator {
             ),
             Self.getProperties(
                 for: colors,
-                withStaticVar: staticVar,
+                withIsStatic: isStatic,
                 isSwiftUI: isSwiftUI,
-                visibility: visibility
+                visibility: visibility,
+                assetBundle: assetBundle
             ),
             Self.getFooter()
         ]
@@ -85,15 +89,17 @@ struct ColorExtensionGenerator {
 
     private static func getProperties(
         for colors: [ParsedColor],
-        withStaticVar staticVar: Bool,
+        withIsStatic isStatic: Bool,
         isSwiftUI: Bool,
-        visibility: ExtensionVisibility
+        visibility: ExtensionVisibility,
+        assetBundle: AssetBundle
     ) -> String {
         colors.map {
             $0.getColorProperty(
-                isStatic: staticVar,
+                isStatic: isStatic,
                 isSwiftUI: isSwiftUI,
-                visibility: visibility
+                visibility: visibility,
+                assetBundle: assetBundle
             )
         }
         .joined(separator: "\n\n")

Sources/ResgenSwift/Colors/Model/ParsedColor.swift

@@ -83,20 +83,21 @@ struct ParsedColor {
     func getColorProperty(
         isStatic: Bool,
         isSwiftUI: Bool,
-        visibility: ExtensionVisibility
+        visibility: ExtensionVisibility,
+        assetBundle: AssetBundle
     ) -> String {
         if isSwiftUI {
             return """
                 /// Color \(name) is \(light) (light) or \(dark) (dark)"
                 \(visibility) \(isStatic ? "static " : "")var \(name): Color {
-                    Color("\(name)")
+                    Color("\(name)", bundle: Bundle.\(assetBundle))
                 }
             """
         }
         return """
             /// Color \(name) is \(light) (light) or \(dark) (dark)"
             \(isStatic ? "" : "@objc ")\(visibility) \(isStatic ? "static " : "")var \(name): UIColor {
-                UIColor(named: "\(name)")!
+                UIColor(named: "\(name)", in: Bundle.\(assetBundle), compatibleWith: nil)!
             }
         """
     }