Squashed commit of the following:

commit aa59ef28ea56315eb421ba044ddaf0c4066bfff8
Author: Thibaut Schmitt <t.schmitt@openium.fr>
Date:   Mon Nov 7 10:26:28 2022 +0100

    Add trailing carrier at the end of generated extension files

commit e985950aa1e39d81d4938e15f8724c0f7723b003
Author: Thibaut Schmitt <t.schmitt@openium.fr>
Date:   Fri Nov 4 16:37:34 2022 +0100

    Replace installation script by script that install completion file
    Setup a Makefile to install resgen

commit d574384c151259610a4c2f837b14068bb7716e44
Author: Thibaut Schmitt <t.schmitt@openium.fr>
Date:   Fri Nov 4 14:33:39 2022 +0100

    Refactor
    Improve testability
    Add tests on SwiftUI generated code
    Add tests on  command

commit d9e76632c3037da0ed9e1dd37056685416579da9
Author: Thibaut Schmitt <t.schmitt@openium.fr>
Date:   Thu Nov 3 15:43:47 2022 +0100

    Fixing bad merge on FontOptions

commit 76b5ebfcd1cde7a7d4c83f516a4fc937841e7715
Author: Thibaut Schmitt <t.schmitt@openium.fr>
Date:   Thu Nov 3 15:37:28 2022 +0100

    Squashed commit of the following:

    commit 085f1ffc3347d3c48af91ffb00a1a9b381ce47d1
    Author: Thibaut Schmitt <t.schmitt@openium.fr>
    Date:   Thu Nov 3 15:00:27 2022 +0100

        Refactor SwiftUI extension generation and generation SwiftUI extension for images

    commit 4f7d7e18b138343a07cbb0bb47213818678ced6b
    Author: Thibaut Schmitt <t.schmitt@openium.fr>
    Date:   Mon Oct 31 16:21:32 2022 +0100

        Génération de composant SwiftUI: Color et Image

    commit 0797667b2510f6fd45b9845f2d29c0c1e31da877
    Author: Thibaut Schmitt <t.schmitt@openium.fr>
    Date:   Mon Oct 31 16:21:12 2022 +0100

        Génération de composant SwiftUI: Color et Image

commit 417a2630925841dd486ae1d684d28ab7dca240e0
Author: Thibaut Schmitt <t.schmitt@openium.fr>
Date:   Wed Oct 19 17:13:03 2022 +0200

    Update Info.plist UIAppFonts key when generating fonts (if plist path if defined)

Makefile

@@ -0,0 +1,63 @@
+SHELL = /bin/zsh
+
+#INSTALL_DIR ?= /usr/local/bin
+INSTALL_DIR = /tmp/ResgenYolo
+
+MAN_DIR := /usr/local/share/man
+MAN_PAGE_NAME = resgen-swift.1
+REPO_DIR = $(shell pwd)
+BUILD_DIR = $(REPO_DIR)/.build
+
+#
+# Man pages
+#
+
+# create-man-files:
+# 	swift package plugin generate-manual
+# 	cp $(BUILDDIR)/plugins/GenerateManualPlugin/outputs/ResgenSwift/resgen-swift.1 $(REPODIR)/man/resgen-swift.1
+
+# install-man-files:
+# 	mkdir -p ${DESTDIR}${mandir}/man1
+# 	cp $(REPODIR)/man/resgen-swift.1 ${DESTDIR}${mandir}/man1/resgen-swift.1
+
+create-and-install-man-files:
+	swift package plugin generate-manual
+	mkdir -p ${MAN_DIR}/man1
+	cp $(BUILD_DIR)/plugins/GenerateManualPlugin/outputs/ResgenSwift/${MAN_PAGE_NAME} ${MAN_DIR}/man1/${MAN_PAGE_NAME}
+
+#
+# Build and install
+#
+
+build-debug:
+	@swift build \
+		-c debug \
+		--build-path "$(BUILD_DIR)"
+
+build-release:
+	@swift build \
+		-c release \
+		--build-path "$(BUILD_DIR)"
+
+.PHONY: install
+install: build-release
+	@install -d "$(INSTALL_DIR)"
+	@install "$(wildcard $(BUILD_DIR)/**/release/ResgenSwift)" "$(INSTALL_DIR)/resgen-swift"
+	@make create-and-install-man-files
+
+#
+# Uninstall and cleaning
+#
+
+.PHONY: uninstall
+uninstall:
+	@rm -rf "$(INSTALL_DIR)/resgen-swift"
+	@rm -rf ${MAN_DIR}/man1/${MAN_PAGE_NAME}
+
+.PHONY: clean
+distclean:
+	@rm -f $(BUILD_DIR)/release
+	
+.PHONY: clean
+clean: distclean
+	@rm -rf $(BUILD_DIR)

Package.resolved

@@ -1,25 +1,23 @@
 {
-  "object": {
+  "pins" : [
-    "pins": [
+    {
-      {
+      "identity" : "swift-argument-parser",
-        "package": "swift-argument-parser",
+      "kind" : "remoteSourceControl",
-        "repositoryURL": "https://github.com/apple/swift-argument-parser",
+      "location" : "https://github.com/apple/swift-argument-parser",
-        "state": {
+      "state" : {
-          "branch": null,
+        "revision" : "9f39744e025c7d377987f30b03770805dcb0bcd1",
-          "revision": "e1465042f195f374b94f915ba8ca49de24300a0d",
+        "version" : "1.1.4"
-          "version": "1.0.2"
-        }
-      },
-      {
-        "package": "Yams",
-        "repositoryURL": "https://github.com/jpsim/Yams.git",
-        "state": {
-          "branch": null,
-          "revision": "01835dc202670b5bb90d07f3eae41867e9ed29f6",
-          "version": "5.0.1"
-        }
       }
-    ]
+    },
-  },
+    {
-  "version": 1
+      "identity" : "yams",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/jpsim/Yams.git",
+      "state" : {
+        "revision" : "01835dc202670b5bb90d07f3eae41867e9ed29f6",
+        "version" : "5.0.1"
+      }
+    }
+  ],
+  "version" : 2
 }

README.md

@@ -6,8 +6,9 @@ ResgenSwift is a package, fully written in Swift, to help you automatize ressour
 
 ## Fonts
 
-Font generator generates an extension of `UIFont` (or a custom class). It also prints `UIAppFonts` to put in your project `.plist`. 
+Font generator generates an extension of `UIFont` and `Font` (or custom classes). It also prints content of `UIAppFonts` from your project `.plist`. If project `.plist` is specified, it will update `UIAppFonts` content of all `.plist`.
-iOS required to use the **real name** of the font, this name can be different from its filename. To get the **real name**, it uses `fc-scan`.
+
+iOS required to use the **real name** of the font, this name can be different from its filename. To get the **real name**, it uses `fc-scan`. So, be sure that the `$PATH` contains path of `fc-scan`.
 
 **Example**
 
@@ -15,8 +16,10 @@ iOS required to use the **real name** of the font, this name can be different fr
 swift run -c release ResgenSwift fonts $FORCE_FLAG "./Fonts/fonts.txt" \
  --extension-output-path "./Fonts/Generated" \
  --extension-name "AppFont" \
+ --extension-name-swift-ui "SUIAppFont" \
  --extension-suffix "GreatApp" \
- --static-members true
+ --static-members true \
+ --info-plist-paths "./path/one/to/Info.plist ./path/two/to/Info.plist"
 ```
 
 **Parameters**
@@ -24,9 +27,11 @@ swift run -c release ResgenSwift fonts $FORCE_FLAG "./Fonts/fonts.txt" \
 1. `-f`: force generation
 2. Font input folder, it will search for every `.ttf` and `.otf` files specified in `fonts.txt`
 3. `--extension-output-path`: path where to generate generated extension
-4. `--extension-name` *(optional)* : name of thee class to add the extension
+4. `--extension-name` *(optional)* : name of the class to add UIKit getters
-5. `--extension-suffix` *(optional)* : additional text which is added to the filename (ex: `AppFont+GreatApp.swift`)
+5. `--extension-name-swift-ui` *(optional)* : name of the class to add SwiftUI getters
-6. `--static-members` *(optional)*: generate static properties or not
+6. `--extension-suffix` *(optional)* : additional text which is added to the filename (ex: `AppFont+GreatApp.swift`)
+7. `--static-members` *(optional)*: generate static properties or not
+8. `--info-plist-paths` *(optional)*: array of `.plist`, you can specify multiple `Info.plist` for multiple targets
 
 
 ## Colors
@@ -39,6 +44,7 @@ swift run -c release ResgenSwift colors $FORCE_FLAG "./Colors/colors.txt" \
  --xcassets-path "./Colors/colors.xcassets" \
  --extension-output-path "./Colors/Generated/" \
  --extension-name "AppColor" \
+ --extension-name-swift-ui "SUIAppColor" \ 
  --extension-suffix "GreatApp" \
  --static-members true
 ```
@@ -49,9 +55,10 @@ swift run -c release ResgenSwift colors $FORCE_FLAG "./Colors/colors.txt" \
 2. Input colors file
 3. `--style` can be `all` or `light`
 4. `--extension-output-path`: path where to generate generated extension
-5. `--extension-name` *(optional)* : name of class to add the extension
+5. `--extension-name` *(optional)* : name of the class to add UIKit getters
-6. `--extension-suffix` *(optional)* : additional text which is added to filename (ex: `AppColor+GreatApp.swift`)
+6. `--extension-name-swift-ui` *(optional)* : name of the class to add SwiftUI getters
-7. `--static-members` *(optional)*: generate static properties or not
+7. `--extension-suffix` *(optional)* : additional text which is added to filename (ex: `AppColor+GreatApp.swift`)
+8. `--static-members` *(optional)*: generate static properties or not
    
  
 ## Strings
@@ -135,6 +142,7 @@ swift run -c release ResgenSwift images $FORCE_FLAG "./Images/images.txt" \
  --xcassets-path "./Images/app.xcassets" \
  --extension-output-path "./Images/Generated" \
  --extension-name "AppImage" \
+ --extension-name-swift-ui "SUIAppImage" \ 
  --extension-suffix "GreatApp" \
  --static-members true
 ```
@@ -145,7 +153,8 @@ swift run -c release ResgenSwift images $FORCE_FLAG "./Images/images.txt" \
 2. Input images definitions file
 3. `--xcassets-path`: xcasset path where to generate imagesets
 4. `--extension-output-path`: path where to generate generated extension
-5. `--extension-name` *(optional)* : name of class to add the extension
+5. `--extension-name` *(optional)* : name of the class to add UIKit getters
+6. `--extension-name-swift-ui` *(optional)* : name of the class to add SwiftUI getters
 6. `--extension-suffix` *(optional)* : additional text which is added to filename (ex: `AppImage+GreatApp.swift`)
 7. `--static-members` *(optional)*: generate static properties or not
 
@@ -167,6 +176,7 @@ colors:
   xcassetsPath: String
   extensionOutputPath: String
   extensionName: String?
+  extensionNameSwiftUI: String?
   extensionSuffix: String?
   staticMembers: Bool?
 
@@ -175,15 +185,18 @@ fonts:
   inputFile: String
   extensionOutputPath: String
   extensionName: String?
+  extensionNameSwiftUI: String?
   extensionSuffix: String?
   staticMembers: Bool?
-
+  infoPlistPaths: [String]
+  
 images:
 - 
   inputFile: String
   xcassetsPath: String
   extensionOutputPath: String
   extensionName: String?
+  extensionNameSwiftUI: String?
   extensionSuffix: String?
   staticMembers: Bool?
 
@@ -223,6 +236,7 @@ colors:
   xcassetsPath: String
   extensionOutputPath: String
   extensionName: String?
+  extensionNameSwiftUI: String?
   extensionSuffix: String?
   staticMembers: Bool?
 -
@@ -231,6 +245,7 @@ colors:
   xcassetsPath: String
   extensionOutputPath: String
   extensionName: String?
+  extensionNameSwiftUI: String?
   extensionSuffix: String?
   staticMembers: Bool?  
 ...
@@ -263,4 +278,4 @@ Example:
 
 ```sh
 ResgenSwift generate path/to/configuration.yml --project-directory ${PROJECT_DIR}
-```
+```

SampleFiles/Colors/Generated/ColorYolo+GenAllScript.swift

@@ -0,0 +1,21 @@
+// Generated by ResgenSwift.Color 1.0
+
+import SwiftUI
+
+extension ColorYolo {
+
+    /// Color red is #FF0000 (light) or #FF0000 (dark)"
+    var red: Color {
+        Color("red")
+    }
+
+    /// Color green_alpha_50 is #A000FF00 (light) or #A000FF00 (dark)"
+    var green_alpha_50: Color {
+        Color("green_alpha_50")
+    }
+
+    /// Color blue_light_dark is #0000FF (light) or #0000AA (dark)"
+    var blue_light_dark: Color {
+        Color("blue_light_dark")
+    }
+}

SampleFiles/Colors/Generated/UIColor+Color.swift

@@ -1,21 +0,0 @@
-// Generated from ColorToolCore at 2021-12-20 15:16:18 +0000
-
-import UIKit
-
-extension UIColor {
-
-    /// Color red is #FF0000 (light) or #FF0000 (dark)"
-    static var red: UIColor {
-        UIColor(named: "red")!
-    }
-
-    /// Color green_alpha_50 is #A000FF00 (light) or #A000FF00 (dark)"
-    static var green_alpha_50: UIColor {
-        UIColor(named: "green_alpha_50")!
-    }
-
-    /// Color blue_light_dark is #0000FF (light) or #0000AA (dark)"
-    static var blue_light_dark: UIColor {
-        UIColor(named: "blue_light_dark")!
-    }
-}

SampleFiles/Colors/Generated/UIColor+ColorGenAllScript.swift

@@ -1,21 +0,0 @@
-// Generated from ColorToolCore at 2022-02-14 09:30:19 +0000
-
-import UIKit
-
-extension UIColor {
-
-    /// Color red is #FF0000 (light) or #FF0000 (dark)"
-    static var red: UIColor {
-        UIColor(named: "red")!
-    }
-
-    /// Color green_alpha_50 is #A000FF00 (light) or #A000FF00 (dark)"
-    static var green_alpha_50: UIColor {
-        UIColor(named: "green_alpha_50")!
-    }
-
-    /// Color blue_light_dark is #0000FF (light) or #0000AA (dark)"
-    static var blue_light_dark: UIColor {
-        UIColor(named: "blue_light_dark")!
-    }
-}

SampleFiles/Colors/Generated/UIColor+ColorSampleApp.swift

@@ -1,21 +0,0 @@
-// Generated from ColorToolCore at 2021-12-20 15:17:10 +0000
-
-import UIKit
-
-extension UIColor {
-
-    /// Color red is #FF0000 (light) or #FF0000 (dark)"
-    static var red: UIColor {
-        UIColor(named: "red")!
-    }
-
-    /// Color green_alpha_50 is #A000FF00 (light) or #A000FF00 (dark)"
-    static var green_alpha_50: UIColor {
-        UIColor(named: "green_alpha_50")!
-    }
-
-    /// Color blue_light_dark is #0000FF (light) or #0000AA (dark)"
-    static var blue_light_dark: UIColor {
-        UIColor(named: "blue_light_dark")!
-    }
-}

SampleFiles/Colors/Generated/UIColor+GenAllScript.swift

@@ -1,21 +0,0 @@
-// Generated by ResgenSwift.ColorTool 1.0.0
-
-import UIKit
-
-extension UIColor {
-
-    /// Color red is #FF0000 (light) or #FF0000 (dark)"
-    static var red: UIColor {
-        UIColor(named: "red")!
-    }
-
-    /// Color green_alpha_50 is #A000FF00 (light) or #A000FF00 (dark)"
-    static var green_alpha_50: UIColor {
-        UIColor(named: "green_alpha_50")!
-    }
-
-    /// Color blue_light_dark is #0000FF (light) or #0000AA (dark)"
-    static var blue_light_dark: UIColor {
-        UIColor(named: "blue_light_dark")!
-    }
-}

SampleFiles/Colors/Generated/UIColorYolo+GenAllScript.swift

@@ -1,8 +1,8 @@
-// Generated from ColorToolCore at 2021-12-20 15:34:55 +0000
+// Generated by ResgenSwift.Color 1.0
 
 import UIKit
 
-extension R2Color {
+extension UIColorYolo {
 
     /// Color red is #FF0000 (light) or #FF0000 (dark)"
     @objc var red: UIColor {
@@ -14,7 +14,7 @@ extension R2Color {
         UIColor(named: "green_alpha_50")!
     }
 
-    /// Color blue_light_dark is #0000FF (light) or #0000FF (dark)"
+    /// Color blue_light_dark is #0000FF (light) or #0000AA (dark)"
     @objc var blue_light_dark: UIColor {
         UIColor(named: "blue_light_dark")!
     }

SampleFiles/Fonts/Generated/FontYolo+GenAllScript.swift

@@ -0,0 +1,61 @@
+// Generated by ResgenSwift.Fonts 1.0
+
+import SwiftUI
+
+extension FontYolo {
+
+    enum FontName: String {
+        case LatoItalic = "Lato-Italic"
+        case LatoLightItalic = "Lato-LightItalic"
+        case LatoHairline = "Lato-Hairline"
+        case LatoBold = "Lato-Bold"
+        case LatoBlack = "Lato-Black"
+        case LatoRegular = "Lato-Regular"
+        case LatoBlackItalic = "Lato-BlackItalic"
+        case LatoBoldItalic = "Lato-BoldItalic"
+        case LatoLight = "Lato-Light"
+        case LatoHairlineItalic = "Lato-HairlineItalic"
+    }
+
+    // MARK: - Getter
+
+    func LatoItalic(withSize size: CGFloat) -> Font {
+        Font.custom(FontName.LatoItalic.rawValue, size: size)
+    }
+
+    func LatoLightItalic(withSize size: CGFloat) -> Font {
+        Font.custom(FontName.LatoLightItalic.rawValue, size: size)
+    }
+
+    func LatoHairline(withSize size: CGFloat) -> Font {
+        Font.custom(FontName.LatoHairline.rawValue, size: size)
+    }
+
+    func LatoBold(withSize size: CGFloat) -> Font {
+        Font.custom(FontName.LatoBold.rawValue, size: size)
+    }
+
+    func LatoBlack(withSize size: CGFloat) -> Font {
+        Font.custom(FontName.LatoBlack.rawValue, size: size)
+    }
+
+    func LatoRegular(withSize size: CGFloat) -> Font {
+        Font.custom(FontName.LatoRegular.rawValue, size: size)
+    }
+
+    func LatoBlackItalic(withSize size: CGFloat) -> Font {
+        Font.custom(FontName.LatoBlackItalic.rawValue, size: size)
+    }
+
+    func LatoBoldItalic(withSize size: CGFloat) -> Font {
+        Font.custom(FontName.LatoBoldItalic.rawValue, size: size)
+    }
+
+    func LatoLight(withSize size: CGFloat) -> Font {
+        Font.custom(FontName.LatoLight.rawValue, size: size)
+    }
+
+    func LatoHairlineItalic(withSize size: CGFloat) -> Font {
+        Font.custom(FontName.LatoHairlineItalic.rawValue, size: size)
+    }
+}

SampleFiles/Fonts/Generated/R2Font+Font.swift

@@ -1,62 +0,0 @@
-// Generated from FontToolCore
-
-import UIKit
-
-extension R2Font {
-
-	enum FontName: String {
-		case LatoItalic = "Lato-Italic"
-		case LatoLightItalic = "Lato-LightItalic"
-		case LatoHairline = "Lato-Hairline"
-		case LatoBold = "Lato-Bold"
-		case LatoBlack = "Lato-Black"
-		case LatoRegular = "Lato-Regular"
-		case LatoBlackItalic = "Lato-BlackItalic"
-		case LatoBoldItalic = "Lato-BoldItalic"
-		case LatoLight = "Lato-Light"
-		case LatoHairlineItalic = "Lato-HairlineItalic"
-	}
-
-	// MARK: - Getter
-
-	func LatoItalic(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoItalic.rawValue, size: size)!
-	}
-
-	func LatoLightItalic(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoLightItalic.rawValue, size: size)!
-	}
-
-	func LatoHairline(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoHairline.rawValue, size: size)!
-	}
-
-	func LatoBold(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoBold.rawValue, size: size)!
-	}
-
-	func LatoBlack(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoBlack.rawValue, size: size)!
-	}
-
-	func LatoRegular(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoRegular.rawValue, size: size)!
-	}
-
-	func LatoBlackItalic(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoBlackItalic.rawValue, size: size)!
-	}
-
-	func LatoBoldItalic(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoBoldItalic.rawValue, size: size)!
-	}
-
-	func LatoLight(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoLight.rawValue, size: size)!
-	}
-
-	func LatoHairlineItalic(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoHairlineItalic.rawValue, size: size)!
-	}
-
-}

SampleFiles/Fonts/Generated/R2Font+FontGenAllScript.swift

@@ -1,62 +0,0 @@
-// Generated from FontToolCore
-
-import UIKit
-
-extension R2Font {
-
-	enum FontName: String {
-		case LatoItalic = "Lato-Italic"
-		case LatoLightItalic = "Lato-LightItalic"
-		case LatoHairline = "Lato-Hairline"
-		case LatoBold = "Lato-Bold"
-		case LatoBlack = "Lato-Black"
-		case LatoRegular = "Lato-Regular"
-		case LatoBlackItalic = "Lato-BlackItalic"
-		case LatoBoldItalic = "Lato-BoldItalic"
-		case LatoLight = "Lato-Light"
-		case LatoHairlineItalic = "Lato-HairlineItalic"
-	}
-
-	// MARK: - Getter
-
-	func LatoItalic(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoItalic.rawValue, size: size)!
-	}
-
-	func LatoLightItalic(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoLightItalic.rawValue, size: size)!
-	}
-
-	func LatoHairline(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoHairline.rawValue, size: size)!
-	}
-
-	func LatoBold(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoBold.rawValue, size: size)!
-	}
-
-	func LatoBlack(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoBlack.rawValue, size: size)!
-	}
-
-	func LatoRegular(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoRegular.rawValue, size: size)!
-	}
-
-	func LatoBlackItalic(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoBlackItalic.rawValue, size: size)!
-	}
-
-	func LatoBoldItalic(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoBoldItalic.rawValue, size: size)!
-	}
-
-	func LatoLight(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoLight.rawValue, size: size)!
-	}
-
-	func LatoHairlineItalic(withSize size: CGFloat) -> UIFont {
-    	UIFont(name: FontName.LatoHairlineItalic.rawValue, size: size)!
-	}
-
-}

SampleFiles/Fonts/Generated/UIFont+Font.swift

@@ -1,63 +0,0 @@
-// Lato/Lato-Italic.ttf Lato/Lato-LightItalic.ttf Lato/Lato-Thin.ttf Lato/Lato-Bold.ttf Lato/Lato-Black.ttf Lato/Lato-Regular.ttf Lato/Lato-BlackItalic.ttf Lato/Lato-BoldItalic.ttf Lato/Lato-Light.ttf Lato/Lato-ThinItalic.ttf
-// Generated from FontToolCore
-
-import UIKit
-
-extension UIFont {
-
-	enum FontName: String {
-		case LatoItalic = "Lato-Italic"
-		case LatoLightItalic = "Lato-LightItalic"
-		case LatoHairline = "Lato-Hairline"
-		case LatoBold = "Lato-Bold"
-		case LatoBlack = "Lato-Black"
-		case LatoRegular = "Lato-Regular"
-		case LatoBlackItalic = "Lato-BlackItalic"
-		case LatoBoldItalic = "Lato-BoldItalic"
-		case LatoLight = "Lato-Light"
-		case LatoHairlineItalic = "Lato-HairlineItalic"
-	}
-
-	// MARK: - Getter
-
-	static let LatoItalic: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoItalic.rawValue, size: size)!
-	}
-
-	static let LatoLightItalic: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoLightItalic.rawValue, size: size)!
-	}
-
-	static let LatoHairline: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoHairline.rawValue, size: size)!
-	}
-
-	static let LatoBold: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoBold.rawValue, size: size)!
-	}
-
-	static let LatoBlack: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoBlack.rawValue, size: size)!
-	}
-
-	static let LatoRegular: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoRegular.rawValue, size: size)!
-	}
-
-	static let LatoBlackItalic: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoBlackItalic.rawValue, size: size)!
-	}
-
-	static let LatoBoldItalic: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoBoldItalic.rawValue, size: size)!
-	}
-
-	static let LatoLight: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoLight.rawValue, size: size)!
-	}
-
-	static let LatoHairlineItalic: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoHairlineItalic.rawValue, size: size)!
-	}
-
-}

SampleFiles/Fonts/Generated/UIFont+FontGenAllScript.swift

@@ -1,62 +0,0 @@
-// Generated from FontToolCore
-
-import UIKit
-
-extension UIFont {
-
-	enum FontName: String {
-		case LatoItalic = "Lato-Italic"
-		case LatoLightItalic = "Lato-LightItalic"
-		case LatoHairline = "Lato-Hairline"
-		case LatoBold = "Lato-Bold"
-		case LatoBlack = "Lato-Black"
-		case LatoRegular = "Lato-Regular"
-		case LatoBlackItalic = "Lato-BlackItalic"
-		case LatoBoldItalic = "Lato-BoldItalic"
-		case LatoLight = "Lato-Light"
-		case LatoHairlineItalic = "Lato-HairlineItalic"
-	}
-
-	// MARK: - Getter
-
-	static let LatoItalic: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoItalic.rawValue, size: size)!
-	}
-
-	static let LatoLightItalic: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoLightItalic.rawValue, size: size)!
-	}
-
-	static let LatoHairline: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoHairline.rawValue, size: size)!
-	}
-
-	static let LatoBold: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoBold.rawValue, size: size)!
-	}
-
-	static let LatoBlack: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoBlack.rawValue, size: size)!
-	}
-
-	static let LatoRegular: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoRegular.rawValue, size: size)!
-	}
-
-	static let LatoBlackItalic: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoBlackItalic.rawValue, size: size)!
-	}
-
-	static let LatoBoldItalic: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoBoldItalic.rawValue, size: size)!
-	}
-
-	static let LatoLight: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoLight.rawValue, size: size)!
-	}
-
-	static let LatoHairlineItalic: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoHairlineItalic.rawValue, size: size)!
-	}
-
-}

SampleFiles/Fonts/Generated/UIFont+GenAllScript.swift

@@ -1,61 +0,0 @@
-// Generated by ResgenSwift.FontTool 1.0.0
-
-import UIKit
-
-extension UIFont {
-
-	enum FontName: String {
-		case LatoItalic = "Lato-Italic"
-		case LatoLightItalic = "Lato-LightItalic"
-		case LatoHairline = "Lato-Hairline"
-		case LatoBold = "Lato-Bold"
-		case LatoBlack = "Lato-Black"
-		case LatoRegular = "Lato-Regular"
-		case LatoBlackItalic = "Lato-BlackItalic"
-		case LatoBoldItalic = "Lato-BoldItalic"
-		case LatoLight = "Lato-Light"
-		case LatoHairlineItalic = "Lato-HairlineItalic"
-	}
-
-	// MARK: - Getter
-
-    static let LatoItalic: ((_ size: CGFloat) -> UIFont) = { size in
-        UIFont(name: FontName.LatoItalic.rawValue, size: size)!
-    }
-
-    static let LatoLightItalic: ((_ size: CGFloat) -> UIFont) = { size in
-        UIFont(name: FontName.LatoLightItalic.rawValue, size: size)!
-    }
-
-    static let LatoHairline: ((_ size: CGFloat) -> UIFont) = { size in
-        UIFont(name: FontName.LatoHairline.rawValue, size: size)!
-    }
-
-    static let LatoBold: ((_ size: CGFloat) -> UIFont) = { size in
-        UIFont(name: FontName.LatoBold.rawValue, size: size)!
-    }
-
-    static let LatoBlack: ((_ size: CGFloat) -> UIFont) = { size in
-        UIFont(name: FontName.LatoBlack.rawValue, size: size)!
-    }
-
-    static let LatoRegular: ((_ size: CGFloat) -> UIFont) = { size in
-        UIFont(name: FontName.LatoRegular.rawValue, size: size)!
-    }
-
-    static let LatoBlackItalic: ((_ size: CGFloat) -> UIFont) = { size in
-        UIFont(name: FontName.LatoBlackItalic.rawValue, size: size)!
-    }
-
-    static let LatoBoldItalic: ((_ size: CGFloat) -> UIFont) = { size in
-        UIFont(name: FontName.LatoBoldItalic.rawValue, size: size)!
-    }
-
-    static let LatoLight: ((_ size: CGFloat) -> UIFont) = { size in
-        UIFont(name: FontName.LatoLight.rawValue, size: size)!
-    }
-
-    static let LatoHairlineItalic: ((_ size: CGFloat) -> UIFont) = { size in
-        UIFont(name: FontName.LatoHairlineItalic.rawValue, size: size)!
-    }
-}

SampleFiles/Fonts/Generated/UIFontYolo+GenAllScript.swift

@@ -0,0 +1,61 @@
+// Generated by ResgenSwift.Fonts 1.0
+
+import UIKit
+
+extension UIFontYolo {
+
+    enum FontName: String {
+        case LatoItalic = "Lato-Italic"
+        case LatoLightItalic = "Lato-LightItalic"
+        case LatoHairline = "Lato-Hairline"
+        case LatoBold = "Lato-Bold"
+        case LatoBlack = "Lato-Black"
+        case LatoRegular = "Lato-Regular"
+        case LatoBlackItalic = "Lato-BlackItalic"
+        case LatoBoldItalic = "Lato-BoldItalic"
+        case LatoLight = "Lato-Light"
+        case LatoHairlineItalic = "Lato-HairlineItalic"
+    }
+
+    // MARK: - Getter
+
+    func LatoItalic(withSize size: CGFloat) -> UIFont {
+        UIFont(name: FontName.LatoItalic.rawValue, size: size)!
+    }
+
+    func LatoLightItalic(withSize size: CGFloat) -> UIFont {
+        UIFont(name: FontName.LatoLightItalic.rawValue, size: size)!
+    }
+
+    func LatoHairline(withSize size: CGFloat) -> UIFont {
+        UIFont(name: FontName.LatoHairline.rawValue, size: size)!
+    }
+
+    func LatoBold(withSize size: CGFloat) -> UIFont {
+        UIFont(name: FontName.LatoBold.rawValue, size: size)!
+    }
+
+    func LatoBlack(withSize size: CGFloat) -> UIFont {
+        UIFont(name: FontName.LatoBlack.rawValue, size: size)!
+    }
+
+    func LatoRegular(withSize size: CGFloat) -> UIFont {
+        UIFont(name: FontName.LatoRegular.rawValue, size: size)!
+    }
+
+    func LatoBlackItalic(withSize size: CGFloat) -> UIFont {
+        UIFont(name: FontName.LatoBlackItalic.rawValue, size: size)!
+    }
+
+    func LatoBoldItalic(withSize size: CGFloat) -> UIFont {
+        UIFont(name: FontName.LatoBoldItalic.rawValue, size: size)!
+    }
+
+    func LatoLight(withSize size: CGFloat) -> UIFont {
+        UIFont(name: FontName.LatoLight.rawValue, size: size)!
+    }
+
+    func LatoHairlineItalic(withSize size: CGFloat) -> UIFont {
+        UIFont(name: FontName.LatoHairlineItalic.rawValue, size: size)!
+    }
+}

SampleFiles/Fonts/Generated/UIFontoptions.+FontGenAllScript.swift

@@ -1,62 +0,0 @@
-// Generated from FontToolCore
-
-import UIKit
-
-extension UIFont {
-
-	enum FontName: String {
-		case LatoItalic = "Lato-Italic"
-		case LatoLightItalic = "Lato-LightItalic"
-		case LatoHairline = "Lato-Hairline"
-		case LatoBold = "Lato-Bold"
-		case LatoBlack = "Lato-Black"
-		case LatoRegular = "Lato-Regular"
-		case LatoBlackItalic = "Lato-BlackItalic"
-		case LatoBoldItalic = "Lato-BoldItalic"
-		case LatoLight = "Lato-Light"
-		case LatoHairlineItalic = "Lato-HairlineItalic"
-	}
-
-	// MARK: - Getter
-
-	static let LatoItalic: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoItalic.rawValue, size: size)!
-	}
-
-	static let LatoLightItalic: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoLightItalic.rawValue, size: size)!
-	}
-
-	static let LatoHairline: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoHairline.rawValue, size: size)!
-	}
-
-	static let LatoBold: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoBold.rawValue, size: size)!
-	}
-
-	static let LatoBlack: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoBlack.rawValue, size: size)!
-	}
-
-	static let LatoRegular: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoRegular.rawValue, size: size)!
-	}
-
-	static let LatoBlackItalic: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoBlackItalic.rawValue, size: size)!
-	}
-
-	static let LatoBoldItalic: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoBoldItalic.rawValue, size: size)!
-	}
-
-	static let LatoLight: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoLight.rawValue, size: size)!
-	}
-
-	static let LatoHairlineItalic: ((_ size: CGFloat) -> UIFont) = { size in
-    	UIFont(name: FontName.LatoHairlineItalic.rawValue, size: size)!
-	}
-
-}

SampleFiles/Fonts/Generated/test.plist

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NewArr</key>
+	<array/>
+	<key>UIAppFonts</key>
+	<array>
+		<string>Lato-Italic</string>
+		<string>Lato-LightItalic</string>
+		<string>Lato-Hairline</string>
+		<string>Lato-Bold</string>
+		<string>Lato-Black</string>
+		<string>Lato-Regular</string>
+		<string>Lato-BlackItalic</string>
+		<string>Lato-BoldItalic</string>
+		<string>Lato-Light</string>
+		<string>Lato-HairlineItalic</string>
+	</array>
+</dict>
+</plist>

SampleFiles/Fonts/Generated/test2.plist

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NewArr</key>
+	<array/>
+	<key>UIAppFonts</key>
+	<array>
+		<string>Lato-Italic</string>
+		<string>Lato-LightItalic</string>
+		<string>Lato-Hairline</string>
+		<string>Lato-Bold</string>
+		<string>Lato-Black</string>
+		<string>Lato-Regular</string>
+		<string>Lato-BlackItalic</string>
+		<string>Lato-BoldItalic</string>
+		<string>Lato-Light</string>
+		<string>Lato-HairlineItalic</string>
+	</array>
+</dict>
+</plist>

SampleFiles/Images/Generated/ImageYolo+GenAllScript.swift

@@ -0,0 +1,31 @@
+// Generated by ResgenSwift.Images 1.0
+// Images from sampleImages
+
+import SwiftUI
+
+extension ImageYolo {
+
+    var article_notification_pull_detail: Image {
+        Image("article_notification_pull_detail")
+    }
+
+    var article_notification_pull: Image {
+        Image("article_notification_pull")
+    }
+
+    var new_article: Image {
+        Image("new_article")
+    }
+
+    var welcome_background: Image {
+        Image("welcome_background")
+    }
+
+    var article_trash: Image {
+        Image("article_trash")
+    }
+
+    var ic_close_article: Image {
+        Image("ic_close_article")
+    }
+}

SampleFiles/Images/Generated/UIImage+GenAllScript.swift

@@ -1,32 +1,31 @@
-// Generated by ResgenSwift.Imagium 1.0.0
+// Generated by ResgenSwift.Images 1.0
 // Images from sampleImages
 
 import UIKit
 
 extension UIImage {
 
-    static var article_notification_pull_detail: UIImage {
+    var article_notification_pull_detail: UIImage {
         UIImage(named: "article_notification_pull_detail")!
     }
- 
+
-    static var article_notification_pull: UIImage {
+    var article_notification_pull: UIImage {
         UIImage(named: "article_notification_pull")!
     }
- 
+
-    static var new_article: UIImage {
+    var new_article: UIImage {
         UIImage(named: "new_article")!
     }
- 
+
-    static var welcome_background: UIImage {
+    var welcome_background: UIImage {
         UIImage(named: "welcome_background")!
     }
- 
+
-    static var article_trash: UIImage {
+    var article_trash: UIImage {
         UIImage(named: "article_trash")!
     }
- 
+
-    static var ic_close_article: UIImage {
+    var ic_close_article: UIImage {
         UIImage(named: "ic_close_article")!
     }
- 
 }

SampleFiles/Images/Generated/UIImage+ImageGenAllScript.swift

@@ -1,32 +0,0 @@
-// Generated from Imagium at 2022-02-14 09:30:23 +0000
-// Images from sampleImages
-
-import UIKit
-
-extension UIImage {
-
-    static var article_notification_pull_detail: UIImage {
-        UIImage(named: "article_notification_pull_detail")!
-    }
- 
-    static var article_notification_pull: UIImage {
-        UIImage(named: "article_notification_pull")!
-    }
- 
-    static var new_article: UIImage {
-        UIImage(named: "new_article")!
-    }
- 
-    static var welcome_background: UIImage {
-        UIImage(named: "welcome_background")!
-    }
- 
-    static var article_trash: UIImage {
-        UIImage(named: "article_trash")!
-    }
- 
-    static var ic_close_article: UIImage {
-        UIImage(named: "ic_close_article")!
-    }
- 
-}

SampleFiles/Strings/Generated/MyString+TargetSuffix.swift

@@ -1,37 +0,0 @@
-// Generated from StringToolCore at 2022-01-10 08:27:11 +0000
-
-import UIKit
-
-fileprivate let kStringsFileName = "sampleStrings"
-
-extension MyString {
-
-	// MARK: - Webservice    
-
-    /// Translation in en :
-    /// en
-    var param_lang: String {
-        NSLocalizedString("param_lang", tableName: kStringsFileName, bundle: Bundle.main, value: "en", comment: "")
-    }
-
-	// MARK: - Generic    
-
-    /// Translation in en :
-    /// Back
-    var generic_back: String {
-        NSLocalizedString("generic_back", tableName: kStringsFileName, bundle: Bundle.main, value: "Back", comment: "")
-    }    
-
-    /// Translation in en :
-    /// Loading data...
-    var generic_loading_data: String {
-        NSLocalizedString("generic_loading_data", tableName: kStringsFileName, bundle: Bundle.main, value: "Loading data...", comment: "")
-    }    
-
-    /// Translation in en :
-    /// Welcome %@ !
-    var generic_welcome_firstname_format: String {
-        NSLocalizedString("generic_welcome_firstname_format", tableName: kStringsFileName, bundle: Bundle.main, value: "Welcome %@ !", comment: "")
-    }
-
-}

SampleFiles/Strings/Generated/String+GenAllScript.swift

@@ -1,4 +1,4 @@
-// Generated by ResgenSwift.Strings.Stringium 1.0.0
+// Generated by ResgenSwift.Strings.Stringium 1.0
 
 import UIKit
 
@@ -6,60 +6,59 @@ fileprivate let kStringsFileName = "sampleStrings"
 
 extension String {
 
-	// MARK: - Webservice
+    // MARK: - Webservice
 
     /// Translation in en :
     /// en
-    static var param_lang: String {
+    var param_lang: String {
         NSLocalizedString("param_lang", tableName: kStringsFileName, bundle: Bundle.main, value: "en", comment: "")
     }
 
-	// MARK: - Generic
+    // MARK: - Generic
 
     /// Translation in en :
     /// Back
-    static var generic_back: String {
+    var generic_back: String {
         NSLocalizedString("generic_back", tableName: kStringsFileName, bundle: Bundle.main, value: "Back", comment: "")
     }
 
     /// Translation in en :
     /// Loading data...
-    static var generic_loading_data: String {
+    var generic_loading_data: String {
         NSLocalizedString("generic_loading_data", tableName: kStringsFileName, bundle: Bundle.main, value: "Loading data...", comment: "")
     }
 
     /// Translation in en :
     /// Welcome \"%@\" !
-    static var generic_welcome_firstname_format: String {
+    var generic_welcome_firstname_format: String {
         NSLocalizedString("generic_welcome_firstname_format", tableName: kStringsFileName, bundle: Bundle.main, value: "Welcome \"%@\" !", comment: "")
     }    
 
     /// Translation in en :
     /// Welcome \"%@\" !
-    static func generic_welcome_firstname_format(arg0: String) -> String {
+    func generic_welcome_firstname_format(arg0: String) -> String {
-        String(format: Self.generic_welcome_firstname_format, arg0)
+        String(format: self.generic_welcome_firstname_format, arg0)
     }
 
-	// MARK: - EqualSymbol
+    // MARK: - EqualSymbol
 
     /// Translation in en :
     /// 1€ = 1 point !
-    static var test_equal_symbol: String {
+    var test_equal_symbol: String {
         NSLocalizedString("test_equal_symbol", tableName: kStringsFileName, bundle: Bundle.main, value: "1€ = 1 point !", comment: "")
     }
 
-	// MARK: - Placeholders
+    // MARK: - Placeholders
 
     /// Translation in en :
     /// You %%: %2$@ %1$@ Age: %3$d
-    static var placeholders_test_one: String {
+    var placeholders_test_one: String {
         NSLocalizedString("placeholders_test_one", tableName: kStringsFileName, bundle: Bundle.main, value: "You %%: %2$@ %1$@ Age: %3$d", comment: "")
     }    
 
     /// Translation in en :
     /// You %%: %2$@ %1$@ Age: %3$d
-    static func placeholders_test_one(arg0: String, arg1: String, arg2: Int) -> String {
+    func placeholders_test_one(arg0: String, arg1: String, arg2: Int) -> String {
-        String(format: Self.placeholders_test_one, arg0, arg1, arg2)
+        String(format: self.placeholders_test_one, arg0, arg1, arg2)
     }
-
 }

SampleFiles/Strings/Generated/String+Placeholders.swift

@@ -1,57 +0,0 @@
-// Generated from Strings-Stringium at 2022-03-07 11:02:15 +0000
-
-import UIKit
-
-fileprivate let kStringsFileName = "sampleStrings"
-
-extension String {
-
-	// MARK: - Webservice
-
-    /// Translation in en :
-    /// en
-    static var param_lang: String {
-        NSLocalizedString("param_lang", tableName: kStringsFileName, bundle: Bundle.main, value: "en", comment: "")
-    }
-
-	// MARK: - Generic
-
-    /// Translation in en :
-    /// Back
-    static var generic_back: String {
-        NSLocalizedString("generic_back", tableName: kStringsFileName, bundle: Bundle.main, value: "Back", comment: "")
-    }
-
-    /// Translation in en :
-    /// Loading data...
-    static var generic_loading_data: String {
-        NSLocalizedString("generic_loading_data", tableName: kStringsFileName, bundle: Bundle.main, value: "Loading data...", comment: "")
-    }
-
-    /// Translation in en :
-    /// Welcome \"%@\" !
-    static var generic_welcome_firstname_format: String {
-        NSLocalizedString("generic_welcome_firstname_format", tableName: kStringsFileName, bundle: Bundle.main, value: "Welcome \"%@\" !", comment: "")
-    }    
-
-    /// Translation in en :
-    /// Welcome \"%@\" !
-    static func generic_welcome_firstname_format(arg0: String) -> String {
-        String(format: Self.generic_welcome_firstname_format, arg0)
-    }
-
-	// MARK: - Placeholders
-
-    /// Translation in en :
-    /// You %%: %2$@ %1$@ Age: %3$d
-    static var placeholders_test_one: String {
-        NSLocalizedString("placeholders_test_one", tableName: kStringsFileName, bundle: Bundle.main, value: "You %%: %2$@ %1$@ Age: %3$d", comment: "")
-    }    
-
-    /// Translation in en :
-    /// You %%: %2$@ %1$@ Age: %3$d
-    static func placeholders_test_one(arg0: String, arg1: String, arg2: Int) -> String {
-        String(format: Self.placeholders_test_one, arg0, arg1, arg2)
-    }
-
-}

SampleFiles/Strings/Generated/String+TargetSuffix.swift

@@ -1,37 +0,0 @@
-// Generated from StringToolCore at 2022-01-10 08:39:52 +0000
-
-import UIKit
-
-fileprivate let kStringsFileName = "sampleStrings"
-
-extension String {
-
-	// MARK: - Webservice
-
-    /// Translation in en :
-    /// en
-    static var param_lang: String {
-        NSLocalizedString("param_lang", tableName: kStringsFileName, bundle: Bundle.main, value: "en", comment: "")
-    }
-
-	// MARK: - Generic
-
-    /// Translation in en :
-    /// Back
-    static var generic_back: String {
-        NSLocalizedString("generic_back", tableName: kStringsFileName, bundle: Bundle.main, value: "Back", comment: "")
-    }
-
-    /// Translation in en :
-    /// Loading data...
-    static var generic_loading_data: String {
-        NSLocalizedString("generic_loading_data", tableName: kStringsFileName, bundle: Bundle.main, value: "Loading data...", comment: "")
-    }
-
-    /// Translation in en :
-    /// Welcome \"%@\" !
-    static var generic_welcome_firstname_format: String {
-        NSLocalizedString("generic_welcome_firstname_format", tableName: kStringsFileName, bundle: Bundle.main, value: "Welcome \"%@\" !", comment: "")
-    }
-
-}

SampleFiles/Strings/Generated/StringTest+Placeholders.swift

@@ -1,57 +0,0 @@
-// Generated from Strings-Stringium at 2022-03-07 11:00:52 +0000
-
-import UIKit
-
-fileprivate let kStringsFileName = "sampleStrings"
-
-extension StringTest {
-
-	// MARK: - Webservice
-
-    /// Translation in en :
-    /// en
-    var param_lang: String {
-        NSLocalizedString("param_lang", tableName: kStringsFileName, bundle: Bundle.main, value: "en", comment: "")
-    }
-
-	// MARK: - Generic
-
-    /// Translation in en :
-    /// Back
-    var generic_back: String {
-        NSLocalizedString("generic_back", tableName: kStringsFileName, bundle: Bundle.main, value: "Back", comment: "")
-    }
-
-    /// Translation in en :
-    /// Loading data...
-    var generic_loading_data: String {
-        NSLocalizedString("generic_loading_data", tableName: kStringsFileName, bundle: Bundle.main, value: "Loading data...", comment: "")
-    }
-
-    /// Translation in en :
-    /// Welcome \"%@\" !
-    var generic_welcome_firstname_format: String {
-        NSLocalizedString("generic_welcome_firstname_format", tableName: kStringsFileName, bundle: Bundle.main, value: "Welcome \"%@\" !", comment: "")
-    }    
-
-    /// Translation in en :
-    /// Welcome \"%@\" !
-    func generic_welcome_firstname_format(arg0: String) -> String {
-        String(format: self.generic_welcome_firstname_format, arg0)
-    }
-
-	// MARK: - Placeholders
-
-    /// Translation in en :
-    /// You %%: %2$@ %1$@ Age: %3$d
-    var placeholders_test_one: String {
-        NSLocalizedString("placeholders_test_one", tableName: kStringsFileName, bundle: Bundle.main, value: "You %%: %2$@ %1$@ Age: %3$d", comment: "")
-    }    
-
-    /// Translation in en :
-    /// You %%: %2$@ %1$@ Age: %3$d
-    func placeholders_test_one(arg0: String, arg1: String, arg2: Int) -> String {
-        String(format: self.placeholders_test_one, arg0, arg1, arg2)
-    }
-
-}

SampleFiles/Strings/Generated/en-us.lproj/sampleStrings.strings

@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by ResgenSwift 1.0.0
+ * Generated by ResgenSwift 1.0
  * Language: en-us
  */
 

SampleFiles/Strings/Generated/en.lproj/sampleStrings.strings

@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by ResgenSwift 1.0.0
+ * Generated by ResgenSwift 1.0
  * Language: en
  */
 

SampleFiles/Strings/Generated/fr.lproj/sampleStrings.strings

@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by ResgenSwift 1.0.0
+ * Generated by ResgenSwift 1.0
  * Language: fr
  */
 

SampleFiles/Tags/Generated/Tags+GenAllScript.swift

@@ -1,23 +1,20 @@
-// Generated by ResgenSwift.Strings.Tags 1.0.0
+// Generated by ResgenSwift.Strings.Tags 1.0
-
-// typelias Tags = String
 
 import UIKit
 
 extension Tags {
 
-	// MARK: - ScreenTag
+    // MARK: - ScreenTag
 
     /// Translation in ium :
     /// Ecran un
-    static var screen_one: String {
+    var screen_one: String {
         "Ecran un"
     }
 
     /// Translation in ium :
     /// Ecran deux
-    static var screen_two: String {
+    var screen_two: String {
         "Ecran deux"
     }
-
 }

SampleFiles/Tags/Generated/Tags+TagGenAllScript.swift

@@ -1,23 +0,0 @@
-// Generated from Strings-Tags at 2022-02-14 09:30:20 +0000
-
-// typelias Tags = String
-
-import UIKit
-
-extension Tags {
-
-	// MARK: - ScreenTag
-
-    /// Translation in ium :
-    /// Ecran un
-    static var screen_one: String {
-        "Ecran un"
-    }
-
-    /// Translation in ium :
-    /// Ecran deux
-    static var screen_two: String {
-        "Ecran deux"
-    }
-
-}

SampleFiles/genAllRessources.sh

@@ -3,25 +3,28 @@
 FORCE_FLAG="$1"
 
 # Font
-swift run -c release FontTool $FORCE_FLAG "./Fonts/sampleFontsAll.txt" \
+swift run -c release ResgenSwift fonts $FORCE_FLAG "./Fonts/sampleFontsAll.txt" \
  --extension-output-path "./Fonts/Generated" \
- --extension-name "UIFont" \
+ --extension-name "UIFontYolo" \
- --extension-suffix "GenAllScript"
+ --extension-name-swift-ui "FontYolo" \
+ --extension-suffix "GenAllScript" \
+ --info-plist-paths "./Fonts/Generated/test.plist ./Fonts/Generated/test2.plist"
 
 echo "\n-------------------------\n"
 
 # Color
-swift run -c release ColorTool $FORCE_FLAG "./Colors/sampleColors1.txt" \
+swift run -c release ResgenSwift colors $FORCE_FLAG "./Colors/sampleColors1.txt" \
  --style all \
  --xcassets-path "./Colors/colors.xcassets" \
  --extension-output-path "./Colors/Generated/" \
- --extension-name "UIColor" \
+ --extension-name "UIColorYolo" \
+ --extension-name-swift-ui "ColorYolo" \
  --extension-suffix "GenAllScript"
 
 echo "\n-------------------------\n"
 
 # Twine
-swift run -c release Strings twine $FORCE_FLAG "./Twine/sampleStrings.txt" \
+swift run -c release ResgenSwift strings twine $FORCE_FLAG "./Twine/sampleStrings.txt" \
  --output-path "./Twine/Generated" \
  --langs "fr en en-us" \
  --default-lang "en" \
@@ -30,7 +33,7 @@ swift run -c release Strings twine $FORCE_FLAG "./Twine/sampleStrings.txt" \
 echo "\n-------------------------\n"
 
 # Strings
-swift run -c release Strings stringium $FORCE_FLAG "./Strings/sampleStrings.txt" \
+swift run -c release ResgenSwift strings stringium $FORCE_FLAG "./Strings/sampleStrings.txt" \
  --output-path "./Strings/Generated" \
  --langs "fr en en-us" \
  --default-lang "en" \
@@ -41,7 +44,7 @@ swift run -c release Strings stringium $FORCE_FLAG "./Strings/sampleStrings.txt"
 echo "\n-------------------------\n"
 
 # Tags
-swift run -c release Strings tags $FORCE_FLAG "./Tags/sampleTags.txt" \
+swift run -c release ResgenSwift strings tags $FORCE_FLAG "./Tags/sampleTags.txt" \
  --lang "ium" \
  --extension-output-path "./Tags/Generated" \
  --extension-name "Tags" \
@@ -50,8 +53,9 @@ swift run -c release Strings tags $FORCE_FLAG "./Tags/sampleTags.txt" \
 echo "\n-------------------------\n"
 
 # Images
-swift run -c release Imagium $FORCE_FLAG "./Images/sampleImages.txt" \
+swift run -c release ResgenSwift images $FORCE_FLAG "./Images/sampleImages.txt" \
  --xcassets-path "./Images/imagium.xcassets" \
  --extension-output-path "./Images/Generated" \
  --extension-name "UIImage" \
+ --extension-name-swift-ui "ImageYolo" \
  --extension-suffix "GenAllScript"

SampleFiles/resgenConfiguration.yml

@@ -0,0 +1,65 @@
+---
+#
+# Strings
+#
+strings:
+-
+ inputFile: ./Strings/sampleStrings.txt
+ outputPath: ./Strings/Generated
+ langs: "fr en en-us"
+ defaultLang: en
+ extensionOutputPath: ./Strings/Generated
+ extensionName: String
+ extensionSuffix: GenAllScript
+
+
+#
+# Images
+#
+images:
+- 
+  inputFile: ./Images/sampleImages.txt
+  xcassetsPath: ./Images/imagium.xcassets
+  extensionOutputPath: ./Images/Generated
+  extensionName: UIImage
+  extensionNameSwiftUI: ImageYolo
+  extensionSuffix: GenAllScript
+
+
+# 
+# Colors
+#
+colors:
+-
+ inputFile: ./Colors/sampleColors1.txt
+ style: all
+ xcassetsPath: ./Colors/colors.xcassets
+ extensionOutputPath: ./Colors/Generated/
+ extensionName: UIColorYolo
+ extensionNameSwiftUI: ColorYolo
+ extensionSuffix: GenAllScript
+
+
+#
+# Tags
+#
+tags:
+- 
+  inputFile: ./Tags/sampleTags.txt
+  lang: ium
+  extensionOutputPath: ./Tags/Generated
+  extensionName: Tags
+  extensionSuffix: GenAllScript
+
+
+#
+# Fonts
+#
+fonts:
+-
+   inputFile: ./Fonts/sampleFontsAll.txt
+   extensionOutputPath: ./Fonts/Generated
+   extensionName: UIFontYolo
+   extensionNameSwiftUI: FontYolo
+   extensionSuffix: GenAllScript
+   infoPlistPaths: "./Fonts/Generated/test.plist ./Fonts/Generated/test2.plist"

Sources/ResgenSwift/Colors/Colors.swift

@@ -22,6 +22,7 @@ struct Colors: ParsableCommand {
     
     static let toolName = "Color"
     static let defaultExtensionName = "UIColor"
+    static let defaultExtensionNameSUI = "Color"
     static let assetsColorsFolderName = "Colors"
     
     // MARK: - Command options
@@ -43,7 +44,7 @@ struct Colors: ParsableCommand {
 
         // Get colors to generate
         let parsedColors = ColorFileParser.parse(options.inputFile,
-                                                colorStyle: options.colorStyle)
+                                                colorStyle: options.style)
         // -> Time: 0.0020350217819213867 seconds
 
         // Generate all colors in xcassets
@@ -55,9 +56,16 @@ struct Colors: ParsableCommand {
         ColorExtensionGenerator.writeExtensionFile(colors: parsedColors,
                                                    staticVar: options.staticMembers,
                                                    extensionName: options.extensionName,
-                                                   extensionFilePath: options.extensionFilePath)
+                                                   extensionFilePath: options.extensionFilePath,
-        // -> Time: 0.0010340213775634766 seconds
+                                                   isSwiftUI: false)
-
+        
+        // Generate extension
+        ColorExtensionGenerator.writeExtensionFile(colors: parsedColors,
+                                                   staticVar: options.staticMembers,
+                                                   extensionName: options.extensionNameSwiftUI,
+                                                   extensionFilePath: options.extensionFilePathSwiftUI,
+                                                   isSwiftUI: true)
+        
         print("[\(Self.toolName)] Colors generated")
     }
     
@@ -80,6 +88,13 @@ struct Colors: ParsableCommand {
             Colors.exit(withError: error)
         }
         
+        // Extension for UIKit and SwiftUI should have different name
+        guard options.extensionName != options.extensionNameSwiftUI else {
+            let error = ColorsToolError.extensionNamesCollision(options.extensionName)
+            print(error.localizedDescription)
+            Colors.exit(withError: error)
+        }
+        
         // Check if needed to regenerate
         guard GeneratorChecker.shouldGenerate(force: options.forceGeneration,
                                               inputFilePath: options.inputFile,

Sources/ResgenSwift/Colors/ColorsToolError.swift

@@ -8,6 +8,7 @@
 import Foundation
 
 enum ColorsToolError: Error {
+    case extensionNamesCollision(String)
     case badFormat(String)
     case writeAsset(String)
     case createAssetFolder(String)
@@ -18,6 +19,9 @@ enum ColorsToolError: Error {
     
     var description: String {
         switch self {
+        case .extensionNamesCollision(let extensionName):
+            return "error:[\(Fonts.toolName)] Error on extension names, extension name and SwiftUI extension name should be different (\(extensionName) is used on both)"
+            
         case .badFormat(let info):
             return "error:[\(Colors.toolName)] Bad line format: \(info). Accepted format are: colorName=\"#RGB/#ARGB\"; colorName \"#RGB/#ARGB\"; colorName \"#RGB/#ARGB\" \"#RGB/#ARGB\""
             

Sources/ResgenSwift/Colors/ColorsToolOptions.swift

@@ -16,7 +16,7 @@ struct ColorsToolOptions: ParsableArguments {
     var inputFile: String
     
     @Option(help: "Color style to generate: light for light colors only, or all for dark and light colors")
-    fileprivate var style: String
+    var style: ColorStyle
     
     @Option(help: "Path of xcassets where to generate colors", transform: { $0.replaceTiltWithHomeDirectoryPath() })
     var xcassetsPath: String
@@ -27,9 +27,12 @@ struct ColorsToolOptions: ParsableArguments {
     @Option(help: "Tell if it will generate static properties or not")
     var staticMembers: Bool = false
     
-    @Option(help: "Extension name. If not specified, it will generate an UIColor extension. Using default extension name will generate static property.")
+    @Option(help: "Extension name. If not specified, it will generate an UIColor extension.")
     var extensionName: String = Colors.defaultExtensionName
     
+    @Option(help: "SwiftUI Extension name. If not specified, it will generate an Color extension.")
+    var extensionNameSwiftUI: String = Colors.defaultExtensionNameSUI
+    
     @Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+ColorsMyApp.swift")
     var extensionSuffix: String?
 }
@@ -37,9 +40,8 @@ struct ColorsToolOptions: ParsableArguments {
 // MARK: - Computed var
 
 extension ColorsToolOptions {
-    var colorStyle: ColorStyle {
+    
-        ColorStyle(rawValue: style) ?? .all
+    // MARK: - UIKit
-    }
     
     var extensionFileName: String {
         if let extensionSuffix = extensionSuffix {
@@ -51,4 +53,17 @@ extension ColorsToolOptions {
     var extensionFilePath: String {
         "\(extensionOutputPath)/\(extensionFileName)"
     }
+    
+    // MARK: - SwiftUI
+    
+    var extensionFileNameSwiftUI: String {
+        if let extensionSuffix = extensionSuffix {
+            return "\(extensionNameSwiftUI)+\(extensionSuffix).swift"
+        }
+        return "\(extensionNameSwiftUI).swift"
+    }
+    
+    var extensionFilePathSwiftUI: String {
+        "\(extensionOutputPath)/\(extensionFileNameSwiftUI)"
+    }
 }

Sources/ResgenSwift/Colors/Generator/ColorExtensionGenerator.swift

@@ -13,11 +13,18 @@ struct ColorExtensionGenerator {
     let colors: [ParsedColor]
     let extensionClassname: String
     
-    static func writeExtensionFile(colors: [ParsedColor], staticVar: Bool, extensionName: String, extensionFilePath: String) {
+    // MARK: - UIKit
+    
+    static func writeExtensionFile(colors: [ParsedColor],
+                                   staticVar: Bool,
+                                   extensionName: String,
+                                   extensionFilePath: String,
+                                   isSwiftUI: Bool) {
         // Create extension content
         let extensionContent = Self.getExtensionContent(colors: colors,
                                                         staticVar: staticVar,
-                                                        extensionName: extensionName)
+                                                        extensionName: extensionName,
+                                                        isSwiftUI: isSwiftUI)
         
         // Write content
         let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
@@ -30,20 +37,23 @@ struct ColorExtensionGenerator {
         }
     }
     
-    static func getExtensionContent(colors: [ParsedColor], staticVar: Bool, extensionName: String) -> String {
+    static func getExtensionContent(colors: [ParsedColor],
+                                    staticVar: Bool,
+                                    extensionName: String,
+                                    isSwiftUI: Bool) -> String {
         [
-            Self.getHeader(extensionClassname: extensionName),
+            Self.getHeader(extensionClassname: extensionName, isSwiftUI: isSwiftUI),
-            Self.getProperties(for: colors, withStaticVar: staticVar),
+            Self.getProperties(for: colors, withStaticVar: staticVar, isSwiftUI: isSwiftUI),
             Self.getFooter()
         ]
             .joined(separator: "\n")
     }
     
-    private static func getHeader(extensionClassname: String) -> String {
+    private static func getHeader(extensionClassname: String, isSwiftUI: Bool) -> String {
         """
         // Generated by ResgenSwift.\(Colors.toolName) \(ResgenSwiftVersion)
 
-        import UIKit
+        import \(isSwiftUI ? "SwiftUI" : "UIKit")
 
         extension \(extensionClassname) {\n
         """
@@ -52,15 +62,15 @@ struct ColorExtensionGenerator {
     private static func getFooter() -> String {
         """
         }
+        
         """
     }
     
-    private static func getProperties(for colors: [ParsedColor], withStaticVar staticVar: Bool) -> String {
+    private static func getProperties(for colors: [ParsedColor],
+                                      withStaticVar staticVar: Bool,
+                                      isSwiftUI: Bool) -> String {
         colors.map {
-            if staticVar {
+            $0.getColorProperty(isStatic: staticVar, isSwiftUI: isSwiftUI)
-                return $0.getColorStaticProperty()
-            }
-            return $0.getColorProperty()
         }
         .joined(separator: "\n\n")
     }

Sources/ResgenSwift/Colors/Model/ColorStyle.swift

@@ -6,8 +6,16 @@
 //
 
 import Foundation
+import ArgumentParser
 
-enum ColorStyle: String, Decodable {
+enum ColorStyle: String, Decodable, ExpressibleByArgument {
     case light
     case all
+    
+    static var allValueStrings: [String] {
+        [
+            Self.light.rawValue,
+            Self.all.rawValue
+        ]
+    }
 }

Sources/ResgenSwift/Colors/Model/ParsedColor.swift

@@ -72,19 +72,20 @@ struct ParsedColor {
         """
     }
     
-    func getColorProperty() -> String {
+    // MARK: - UIKit
-        """
+    
+    func getColorProperty(isStatic: Bool, isSwiftUI: Bool) -> String {
+        if isSwiftUI {
+            return """
+                /// Color \(name) is \(light) (light) or \(dark) (dark)"
+                \(isStatic ? "static " : "")var \(name): Color {
+                    Color("\(name)")
+                }
+            """
+        }
+        return """
             /// Color \(name) is \(light) (light) or \(dark) (dark)"
-            @objc var \(name): UIColor {
+            \(isStatic ? "static " : "@objc ")var \(name): UIColor {
-                UIColor(named: "\(name)")!
-            }
-        """
-    }
-
-    func getColorStaticProperty() -> String {
-        """
-            /// Color \(name) is \(light) (light) or \(dark) (dark)"
-            static var \(name): UIColor {
                 UIColor(named: "\(name)")!
             }
         """

Sources/ResgenSwift/Fonts/FontOptions.swift

@@ -21,16 +21,25 @@ struct FontsOptions: ParsableArguments {
     @Option(help: "Tell if it will generate static properties or methods")
     var staticMembers: Bool = false
     
-    @Option(help: "Extension name. If not specified, it will generate an UIFont extension. Using default extension name will generate static property.")
+    @Option(help: "Extension name. If not specified, it will generate an UIFont extension.")
     var extensionName: String = Fonts.defaultExtensionName
     
+    @Option(help: "Extension name. If not specified, it will generate an Font extension.")
+    var extensionNameSwiftUI: String = Fonts.defaultExtensionNameSUI
+    
     @Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+FontsMyApp.swift")
     var extensionSuffix: String = ""
+    
+    @Option(name: .customLong("info-plist-paths"), help: "Info.plist paths (array). Will be used to update UIAppFonts content")
+    fileprivate var infoPlistPathsRaw: String = ""
 }
 
 // MARK: - Computed var
 
 extension FontsOptions {
+    
+    // MARK: - UIKit
+    
     var extensionFileName: String {
         if extensionSuffix.isEmpty == false {
             return "\(extensionName)+\(extensionSuffix).swift"
@@ -41,4 +50,25 @@ extension FontsOptions {
     var extensionFilePath: String {
         "\(extensionOutputPath)/\(extensionFileName)"
     }
+    
+    // MARK: - SwiftUI
+    
+    var extensionFileNameSwiftUI: String {
+        if extensionSuffix.isEmpty == false {
+            return "\(extensionNameSwiftUI)+\(extensionSuffix).swift"
+        }
+        return "\(extensionNameSwiftUI).swift"
+    }
+    
+    var extensionFilePathSwiftUI: String {
+        "\(extensionOutputPath)/\(extensionFileNameSwiftUI)"
+    }
+
+    // MARK: - 
+
+    var infoPlistPaths: [String] {
+        infoPlistPathsRaw
+            .split(separator: " ")
+            .map { String($0) }
+    }
 }

Sources/ResgenSwift/Fonts/Fonts.swift

@@ -22,6 +22,7 @@ struct Fonts: ParsableCommand {
     
     static let toolName = "Fonts"
     static let defaultExtensionName = "UIFont"
+    static let defaultExtensionNameSUI = "Font"
     
     // MARK: - Command Options
     
@@ -50,10 +51,17 @@ struct Fonts: ParsableCommand {
         FontExtensionGenerator.writeExtensionFile(fontsNames: fontsNames,
                                                   staticVar: options.staticMembers,
                                                   extensionName: options.extensionName,
-                                                  extensionFilePath: options.extensionFilePath)
+                                                  extensionFilePath: options.extensionFilePath,
+                                                  isSwiftUI: false)
         
-        print("Info.plist information:")
+        FontExtensionGenerator.writeExtensionFile(fontsNames: fontsNames,
-        print("\(FontPlistGenerator.generatePlistUIAppsFontContent(for: fontsNames))")
+                                                  staticVar: options.staticMembers,
+                                                  extensionName: options.extensionNameSwiftUI,
+                                                  extensionFilePath: options.extensionFilePathSwiftUI,
+                                                  isSwiftUI: true)
+        
+        print("Info.plist has been updated with:")
+        print("\(FontPlistGenerator.generatePlistUIAppsFontContent(for: fontsNames, infoPlistPaths: options.infoPlistPaths))")
         
         print("[\(Self.toolName)] Fonts generated")
     }
@@ -70,6 +78,13 @@ struct Fonts: ParsableCommand {
             Fonts.exit(withError: error)
         }
         
+        // Extension for UIKit and SwiftUI should have different name
+        guard options.extensionName != options.extensionNameSwiftUI else {
+            let error = FontsToolError.extensionNamesCollision(options.extensionName)
+            print(error.localizedDescription)
+            Fonts.exit(withError: error)
+        }
+        
         // Check if needed to regenerate
         guard GeneratorChecker.shouldGenerate(force: options.forceGeneration,
                                               inputFilePath: options.inputFile,

Sources/ResgenSwift/Fonts/FontsToolError.swift

@@ -8,6 +8,7 @@
 import Foundation
 
 enum FontsToolError: Error {
+    case extensionNamesCollision(String)
     case fcScan(String, Int32, String?)
     case inputFolderNotFound(String)
     case fileNotExists(String)
@@ -15,6 +16,9 @@ enum FontsToolError: Error {
     
     var localizedDescription: String {
         switch self {
+        case .extensionNamesCollision(let extensionName):
+            return "error:[\(Fonts.toolName)] Error on extension names, extension name and SwiftUI extension name should be different (\(extensionName) is used on both)"
+            
         case .fcScan(let path, let code, let output):
             return "error:[\(Fonts.toolName)] Error while getting fontName (fc-scan --format %{postscriptname} \(path). fc-scan exit with \(code) and output is: \(output ?? "no output")"
             

Sources/ResgenSwift/Fonts/Generator/FontPlistGenerator.swift

@@ -6,12 +6,34 @@
 //
 
 import Foundation
+import ToolCore
 
 class FontPlistGenerator {
-    static func generatePlistUIAppsFontContent(for fonts: [FontName]) -> String {
+    static func generatePlistUIAppsFontContent(for fonts: [FontName], infoPlistPaths: [String]) -> String {
-        var plistData = "<key>UIAppFonts</key>\n\t<array>\n"
+        let fontsToAddToPlist = fonts
-        fonts
             .compactMap { $0 }
+        
+        // Update each plist
+        infoPlistPaths.forEach { infoPlist in
+            // Remove UIAppFonts value
+            Shell.shell(launchPath: "/usr/libexec/PlistBuddy",
+                        ["-c", "delete :UIAppFonts", infoPlist])
+            
+            // Add UIAppFonts empty array
+            debugPrint("Will PlistBuddy -c add :UIAppFonts array \(infoPlist)")
+            Shell.shell(launchPath: "/usr/libexec/PlistBuddy",
+                        ["-c", "add :UIAppFonts array", infoPlist])
+
+            // Fill array with fonts
+            fontsToAddToPlist
+                .forEach {
+                    Shell.shell(launchPath: "/usr/libexec/PlistBuddy",
+                                ["-c", "add :UIAppFonts: string \($0)", infoPlist])
+                }
+        }
+
+        var plistData = "<key>UIAppFonts</key>\n\t<array>\n"
+        fontsToAddToPlist
             .forEach {
                 plistData += "\t\t<string>\($0)</string>\n"
             }

Sources/ResgenSwift/Fonts/Generator/FontToolContentGenerator.swift

@@ -9,12 +9,28 @@ import Foundation
 import ToolCore
 
 class FontExtensionGenerator {
+
+    private static func getFontNameEnum(fontsNames: [String]) -> String {
+        var enumDefinition = "    enum FontName: String {\n"
+        
+        fontsNames.forEach {
+            enumDefinition += "        case \($0.fontNameSanitize) = \"\($0)\"\n"
+        }
+        enumDefinition += "    }\n"
+        
+        return enumDefinition
+    }
     
-    static func writeExtensionFile(fontsNames: [String], staticVar: Bool, extensionName: String, extensionFilePath: String) {
+    static func writeExtensionFile(fontsNames: [String],
+                                   staticVar: Bool,
+                                   extensionName: String,
+                                   extensionFilePath: String,
+                                   isSwiftUI: Bool) {
         // Create extension content
         let extensionContent = Self.getExtensionContent(fontsNames: fontsNames,
                                                         staticVar: staticVar,
-                                                        extensionName: extensionName)
+                                                        extensionName: extensionName,
+                                                        isSwiftUI: isSwiftUI)
         
         // Write content
         let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
@@ -27,48 +43,36 @@ class FontExtensionGenerator {
         }
     }
     
-    static func getExtensionContent(fontsNames: [String], staticVar: Bool, extensionName: String) -> String {
+    static func getExtensionContent(fontsNames: [String],
+                                    staticVar: Bool,
+                                    extensionName: String,
+                                    isSwiftUI: Bool) -> String {
         [
-            Self.getHeader(extensionClassname: extensionName),
+            Self.getHeader(extensionClassname: extensionName, isSwiftUI: isSwiftUI),
             Self.getFontNameEnum(fontsNames: fontsNames),
-            Self.getFontMethods(fontsNames: fontsNames, staticVar: staticVar),
+            Self.getFontMethods(fontsNames: fontsNames, staticVar: staticVar, isSwiftUI: isSwiftUI),
             Self.getFooter()
         ]
             .joined(separator: "\n")
     }
     
-    private static func getHeader(extensionClassname: String) -> String {
+    private static func getHeader(extensionClassname: String, isSwiftUI: Bool) -> String {
         """
         // Generated by ResgenSwift.\(Fonts.toolName) \(ResgenSwiftVersion)
         
-        import UIKit
+        import \(isSwiftUI ? "SwiftUI" : "UIKit")
         
         extension \(extensionClassname) {\n
         """
     }
     
-    private static func getFontNameEnum(fontsNames: [String]) -> String {
+    private static func getFontMethods(fontsNames: [FontName], staticVar: Bool, isSwiftUI: Bool) -> String {
-        var enumDefinition = "    enum FontName: String {\n"
-        
-        fontsNames.forEach {
-            enumDefinition += "        case \($0.fontNameSanitize) = \"\($0)\"\n"
-        }
-        enumDefinition += "    }\n"
-        
-        return enumDefinition
-    }
-    
-    private static func getFontMethods(fontsNames: [FontName], staticVar: Bool) -> String {
         let pragma = "    // MARK: - Getter"
             
         var propertiesOrMethods: [String] = fontsNames
             .unique()
             .map {
-                if staticVar {
+                $0.getProperty(isStatic: staticVar, isSwiftUI: isSwiftUI)
-                    return $0.staticProperty
-                } else {
-                    return $0.method
-                }
             }
         
         propertiesOrMethods.insert(pragma, at: 0)
@@ -78,6 +82,7 @@ class FontExtensionGenerator {
     private static func getFooter() -> String {
         """
         }
+        
         """
     }
 }

Sources/ResgenSwift/Fonts/Model/FontName.swift

@@ -14,19 +14,33 @@ extension FontName {
         self.removeCharacters(from: "[]+-_")
     }
     
-    var method: String {        
+    func getProperty(isStatic: Bool, isSwiftUI: Bool) -> String {
-        """
+        if isSwiftUI {
+            if isStatic {
+                return """
+                    static let \(fontNameSanitize): ((_ size: CGFloat) -> Font) = { size in
+                        Font.custom(FontName.\(fontNameSanitize).rawValue, size: size)
+                    }
+                """
+            }
+            return """
+                func \(fontNameSanitize)(withSize size: CGFloat) -> Font {
+                    Font.custom(FontName.\(fontNameSanitize).rawValue, size: size)
+                }
+            """
+        }
+        // UIKit
+        if isStatic {
+            return """
+                static let \(fontNameSanitize): ((_ size: CGFloat) -> UIFont) = { size in
+                    UIFont(name: FontName.\(fontNameSanitize).rawValue, size: size)!
+                }
+            """
+        }
+        return """
             func \(fontNameSanitize)(withSize size: CGFloat) -> UIFont {
                 UIFont(name: FontName.\(fontNameSanitize).rawValue, size: size)!
             }
         """
     }
-    
-    var staticProperty: String {
-        """
-            static let \(fontNameSanitize): ((_ size: CGFloat) -> UIFont) = { size in
-                UIFont(name: FontName.\(fontNameSanitize).rawValue, size: size)!
-            }
-        """
-    }
 }

Sources/ResgenSwift/Generate/Extensions/StringExtensions.swift

@@ -10,6 +10,7 @@ import Foundation
 extension String {
     
     func prependIfRelativePath(_ prependPath: String) -> String {
+        // If path starts with "/", it's an absolute path
         if self.hasPrefix("/") {
             return self
         }

Sources/ResgenSwift/Generate/Generate.swift

@@ -34,11 +34,11 @@ struct Generate: ParsableCommand {
         // Parse
         let configuration = ConfigurationFileParser.parse(options.configurationFile)
         print("Found configurations :")
-        print("  - \(configuration.colors.count) colors configuration")
+        print("  - \(configuration.colors.count) colors configuration(s)")
-        print("  - \(configuration.fonts.count) fonts configuration")
+        print("  - \(configuration.fonts.count) fonts configuration(s)")
-        print("  - \(configuration.images.count) images configuration")
+        print("  - \(configuration.images.count) images configuration(s)")
-        print("  - \(configuration.strings.count) strings configuration")
+        print("  - \(configuration.strings.count) strings configuration(s)")
-        print("  - \(configuration.tags.count) tags configuration")
+        print("  - \(configuration.tags.count) tags configuration(s)")
         print()
         
         print("Input file: \(configuration.colors.first?.inputFile ?? "no input file")")

Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift

@@ -45,6 +45,7 @@ struct ColorsConfiguration: Codable, CustomDebugStringConvertible {
     let xcassetsPath: String
     let extensionOutputPath: String
     let extensionName: String?
+    let extensionNameSwiftUI: String?
     let extensionSuffix: String?
     private let staticMembers: Bool?
     
@@ -55,6 +56,24 @@ struct ColorsConfiguration: Codable, CustomDebugStringConvertible {
         return false
     }
     
+    internal init(inputFile: String,
+                  style: String,
+                  xcassetsPath: String,
+                  extensionOutputPath: String,
+                  extensionName: String?,
+                  extensionNameSwiftUI: String?,
+                  extensionSuffix: String?,
+                  staticMembers: Bool?) {
+        self.inputFile = inputFile
+        self.style = style
+        self.xcassetsPath = xcassetsPath
+        self.extensionOutputPath = extensionOutputPath
+        self.extensionName = extensionName
+        self.extensionNameSwiftUI = extensionNameSwiftUI
+        self.extensionSuffix = extensionSuffix
+        self.staticMembers = staticMembers
+    }
+    
     var debugDescription: String {
         """
         Colors configuration:
@@ -63,6 +82,7 @@ struct ColorsConfiguration: Codable, CustomDebugStringConvertible {
             - Xcassets path: \(xcassetsPath)
             - Extension output path: \(extensionOutputPath)
             - Extension name: \(extensionName ?? "-")
+            - Extension name SwiftUI: \(extensionNameSwiftUI ?? "-")
             - Extension suffix: \(extensionSuffix ?? "-")
         """
     }
@@ -72,7 +92,9 @@ struct FontsConfiguration: Codable, CustomDebugStringConvertible {
     let inputFile: String
     let extensionOutputPath: String
     let extensionName: String?
+    let extensionNameSwiftUI: String?
     let extensionSuffix: String?
+    let infoPlistPaths: String?
     private let staticMembers: Bool?
     
     var staticMembersOptions: Bool {
@@ -82,13 +104,31 @@ struct FontsConfiguration: Codable, CustomDebugStringConvertible {
         return false
     }
     
+    internal init(inputFile: String,
+                  extensionOutputPath: String,
+                  extensionName: String?,
+                  extensionNameSwiftUI: String?,
+                  extensionSuffix: String?,
+                  infoPlistPaths: String?,
+                  staticMembers: Bool?) {
+        self.inputFile = inputFile
+        self.extensionOutputPath = extensionOutputPath
+        self.extensionName = extensionName
+        self.extensionNameSwiftUI = extensionNameSwiftUI
+        self.extensionSuffix = extensionSuffix
+        self.infoPlistPaths = infoPlistPaths
+        self.staticMembers = staticMembers
+    }
+    
     var debugDescription: String {
         """
         Fonts configuration:
             - Input file: \(inputFile)
             - Extension output path: \(extensionOutputPath)
             - Extension name: \(extensionName ?? "-")
+            - Extension name SwiftUI: \(extensionNameSwiftUI ?? "-")
             - Extension suffix: \(extensionSuffix ?? "-")
+            - InfoPlistPaths: \(infoPlistPaths ?? "-")
         """
     }
 }
@@ -98,6 +138,7 @@ struct ImagesConfiguration: Codable, CustomDebugStringConvertible {
     let xcassetsPath: String
     let extensionOutputPath: String
     let extensionName: String?
+    let extensionNameSwiftUI: String?
     let extensionSuffix: String?
     private let staticMembers: Bool?
     
@@ -108,6 +149,22 @@ struct ImagesConfiguration: Codable, CustomDebugStringConvertible {
         return false
     }
     
+    internal init(inputFile: String,
+                  xcassetsPath: String,
+                  extensionOutputPath: String,
+                  extensionName: String?,
+                  extensionNameSwiftUI: String?,
+                  extensionSuffix: String?,
+                  staticMembers: Bool?) {
+        self.inputFile = inputFile
+        self.xcassetsPath = xcassetsPath
+        self.extensionOutputPath = extensionOutputPath
+        self.extensionName = extensionName
+        self.extensionNameSwiftUI = extensionNameSwiftUI
+        self.extensionSuffix = extensionSuffix
+        self.staticMembers = staticMembers
+    }
+    
     var debugDescription: String {
         """
         Images configuration:
@@ -115,6 +172,7 @@ struct ImagesConfiguration: Codable, CustomDebugStringConvertible {
             - Xcassets path: \(xcassetsPath)
             - Extension output path: \(extensionOutputPath)
             - Extension name: \(extensionName ?? "-")
+            - Extension name SwiftUI: \(extensionNameSwiftUI ?? "-")
             - Extension suffix: \(extensionSuffix ?? "-")
         """
     }
@@ -137,6 +195,24 @@ struct StringsConfiguration: Codable, CustomDebugStringConvertible {
         return false
     }
     
+    internal init(inputFile: String,
+                  outputPath: String,
+                  langs: String,
+                  defaultLang: String,
+                  extensionOutputPath: String,
+                  extensionName: String?,
+                  extensionSuffix: String?,
+                  staticMembers: Bool?) {
+        self.inputFile = inputFile
+        self.outputPath = outputPath
+        self.langs = langs
+        self.defaultLang = defaultLang
+        self.extensionOutputPath = extensionOutputPath
+        self.extensionName = extensionName
+        self.extensionSuffix = extensionSuffix
+        self.staticMembers = staticMembers
+    }
+    
     var debugDescription: String {
         """
         Strings configuration:
@@ -166,6 +242,20 @@ struct TagsConfiguration: Codable, CustomDebugStringConvertible {
         return false
     }
     
+    internal init(inputFile: String,
+                  lang: String,
+                  extensionOutputPath: String,
+                  extensionName: String?,
+                  extensionSuffix: String?,
+                  staticMembers: Bool?) {
+        self.inputFile = inputFile
+        self.lang = lang
+        self.extensionOutputPath = extensionOutputPath
+        self.extensionName = extensionName
+        self.extensionSuffix = extensionSuffix
+        self.staticMembers = staticMembers
+    }
+    
     var debugDescription: String {
         """
         Tags configuration:

Sources/ResgenSwift/Generate/Runnable/ColorsConfiguration+Runnable.swift

@@ -9,6 +9,11 @@ import Foundation
 
 extension ColorsConfiguration: Runnable {
     func run(projectDirectory: String, force: Bool) {
+        let args = getArguments(projectDirectory: projectDirectory, force: force)
+        Colors.main(args)
+    }
+    
+    func getArguments(projectDirectory: String, force: Bool) -> [String] {
         var args = [String]()
         
         if force {
@@ -33,6 +38,12 @@ extension ColorsConfiguration: Runnable {
                 extensionName
             ]
         }
+        if let extensionNameSwiftUI = extensionNameSwiftUI {
+            args += [
+                "--extension-name-swift-ui",
+                extensionNameSwiftUI
+            ]
+        }
         if let extensionSuffix = extensionSuffix {
             args += [
                 "--extension-suffix",
@@ -40,6 +51,6 @@ extension ColorsConfiguration: Runnable {
             ]
         }
         
-        Colors.main(args)
+        return args
     }
 }

Sources/ResgenSwift/Generate/Runnable/FontsConfiguration+Runnable.swift

@@ -9,6 +9,11 @@ import Foundation
 
 extension FontsConfiguration: Runnable {
     func run(projectDirectory: String, force: Bool) {
+        let args = getArguments(projectDirectory: projectDirectory, force: force)
+        Fonts.main(args)
+    }
+    
+    func getArguments(projectDirectory: String, force: Bool) -> [String] {
         var args = [String]()
         
         if force {
@@ -29,6 +34,12 @@ extension FontsConfiguration: Runnable {
                 extensionName
             ]
         }
+        if let extensionNameSwiftUI = extensionNameSwiftUI {
+            args += [
+                "--extension-name-swift-ui",
+                extensionNameSwiftUI
+            ]
+        }
         
         if let extensionSuffix = extensionSuffix {
             args += [
@@ -37,6 +48,18 @@ extension FontsConfiguration: Runnable {
             ]
         }
         
-        Fonts.main(args)
+        if let infoPlistPaths = infoPlistPaths {
+            let adjustedPlistPaths = infoPlistPaths
+                .split(separator: " ")
+                .map { String($0).prependIfRelativePath(projectDirectory) }
+                .joined(separator: " ")
+            
+            args += [
+                "--info-plist-paths",
+                adjustedPlistPaths
+            ]
+        }
+        
+        return args
     }
 }

Sources/ResgenSwift/Generate/Runnable/ImagesConfiguration+Runnable.swift

@@ -9,6 +9,11 @@ import Foundation
 
 extension ImagesConfiguration: Runnable {
     func run(projectDirectory: String, force: Bool) {
+        let args = getArguments(projectDirectory: projectDirectory, force: force)
+        Images.main(args)
+    }
+    
+    func getArguments(projectDirectory: String, force: Bool) -> [String] {
         var args = [String]()
         
         if force {
@@ -31,6 +36,12 @@ extension ImagesConfiguration: Runnable {
                 extensionName
             ]
         }
+        if let extensionNameSwiftUI = extensionNameSwiftUI {
+            args += [
+                "--extension-name-swift-ui",
+                extensionNameSwiftUI
+            ]
+        }
         if let extensionSuffix = extensionSuffix {
             args += [
                 "--extension-suffix",
@@ -38,6 +49,6 @@ extension ImagesConfiguration: Runnable {
             ]
         }
         
-        Images.main(args)
+        return args
     }
 }

Sources/ResgenSwift/Images/Generator/ImageExtensionGenerator.swift

@@ -10,18 +10,20 @@ import Foundation
 
 class ImageExtensionGenerator {
     
-    // MARK: - pragm
+    // MARK: - UIKit
     
     static func generateExtensionFile(images: [ParsedImage],
                                       staticVar: Bool,
                                       inputFilename: String,
                                       extensionName: String,
-                                      extensionFilePath: String) {
+                                      extensionFilePath: String,
+                                      isSwiftUI: Bool) {
         // Create extension conten1t
         let extensionContent = Self.getExtensionContent(images: images,
                                                         staticVar: staticVar,
                                                         extensionName: extensionName,
-                                                        inputFilename: inputFilename)
+                                                        inputFilename: inputFilename,
+                                                        isSwiftUI: isSwiftUI)
         
         // Write content
         let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
@@ -34,44 +36,42 @@ class ImageExtensionGenerator {
         }
     }
     
-    // MARK: - Extension content
+    static func getExtensionContent(images: [ParsedImage],
-    
+                                    staticVar: Bool,
-    static func getExtensionContent(images: [ParsedImage], staticVar: Bool, extensionName: String, inputFilename: String) -> String {
+                                    extensionName: String,
+                                    inputFilename: String,
+                                    isSwiftUI: Bool) -> String {
         [
-            Self.getHeader(inputFilename: inputFilename, extensionClassname: extensionName),
+            Self.getHeader(inputFilename: inputFilename, extensionClassname: extensionName, isSwiftUI: isSwiftUI),
-            Self.getProperties(images: images, staticVar: staticVar),
+            Self.getProperties(images: images, staticVar: staticVar, isSwiftUI: isSwiftUI),
             Self.getFooter()
         ]
             .joined(separator: "\n")
     }
     
-    // MARK: - Extension part
+    private static func getHeader(inputFilename: String,
-    
+                                  extensionClassname: String,
-    private static func getHeader(inputFilename: String, extensionClassname: String) -> String {
+                                  isSwiftUI: Bool) -> String {
         """
         // Generated by ResgenSwift.\(Images.toolName) \(ResgenSwiftVersion)
         // Images from \(inputFilename)
         
-        import UIKit
+        import \(isSwiftUI ? "SwiftUI" : "UIKit")
         
         extension \(extensionClassname) {
         """
     }
     
-    private static func getProperties(images: [ParsedImage], staticVar: Bool) -> String {
+    private static func getProperties(images: [ParsedImage], staticVar: Bool, isSwiftUI: Bool) -> String {
-        if staticVar {
+        images
-            return images
+            .map { "\n\($0.getImageProperty(isStatic: staticVar, isSwiftUI: isSwiftUI))" }
-                .map { "\n\($0.getStaticImageProperty())" }
-                .joined(separator: "\n")
-        }
-        return images
-            .map { "\n\($0.getImageProperty())" }
             .joined(separator: "\n")
     }
     
     private static func getFooter() -> String {
         """
         }
+        
         """
     }
 }

Sources/ResgenSwift/Images/Images.swift

@@ -22,6 +22,7 @@ struct Images: ParsableCommand {
     
     static let toolName = "Images"
     static let defaultExtensionName = "UIImage"
+    static let defaultExtensionNameSUI = "Image"
     
     // MARK: - Command Options
     
@@ -56,8 +57,15 @@ struct Images: ParsableCommand {
                                                       staticVar: options.staticMembers,
                                                       inputFilename: options.inputFilenameWithoutExt,
                                                       extensionName: options.extensionName,
-                                                      extensionFilePath: options.extensionFilePath)
+                                                      extensionFilePath: options.extensionFilePath,
+                                                      isSwiftUI: false)
         
+        ImageExtensionGenerator.generateExtensionFile(images: imagesToGenerate,
+                                                      staticVar: options.staticMembers,
+                                                      inputFilename: options.inputFilenameWithoutExt,
+                                                      extensionName: options.extensionNameSwiftUI,
+                                                      extensionFilePath: options.extensionFilePathSwiftUI,
+                                                      isSwiftUI: true)
         
         print("[\(Self.toolName)] Images generated")
     }
@@ -81,6 +89,13 @@ struct Images: ParsableCommand {
         // RSVG-Converter
         _ = Images.getSvgConverterPath()
 
+        // Extension for UIKit and SwiftUI should have different name
+        guard options.extensionName != options.extensionNameSwiftUI else {
+            let error = ImagesError.extensionNamesCollision(options.extensionName)
+            print(error.localizedDescription)
+            Images.exit(withError: error)
+        }
+        
         // Check if needed to regenerate
         guard GeneratorChecker.shouldGenerate(force: options.forceExecution,
                                               inputFilePath: options.inputFile,

Sources/ResgenSwift/Images/ImagesError.swift

@@ -8,6 +8,7 @@
 import Foundation
 
 enum ImagesError: Error {
+    case extensionNamesCollision(String)
     case inputFolderNotFound(String)
     case fileNotExists(String)
     case unknownImageExtension(String)
@@ -19,6 +20,9 @@ enum ImagesError: Error {
     
     var localizedDescription: String {
         switch self {
+        case .extensionNamesCollision(let extensionName):
+            return "error:[\(Fonts.toolName)] Error on extension names, extension name and SwiftUI extension name should be different (\(extensionName) is used on both)"
+            
         case .inputFolderNotFound(let inputFolder):
             return " error:[\(Images.toolName)] Input folder not found: \(inputFolder)"
             

Sources/ResgenSwift/Images/ImagesOptions.swift

@@ -27,9 +27,12 @@ struct ImagesOptions: ParsableArguments {
     @Option(help: "Tell if it will generate static properties or not")
     var staticMembers: Bool = false
     
-    @Option(help: "Extension name. If not specified, it will generate an UIImage extension. Using default extension name will generate static property.")
+    @Option(help: "Extension name. If not specified, it will generate an UIImage extension.")
     var extensionName: String = Images.defaultExtensionName
     
+    @Option(help: "Extension name. If not specified, it will generate an Image extension.")
+    var extensionNameSwiftUI: String = Images.defaultExtensionNameSUI
+    
     @Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+Image{extensionSuffix}.swift")
     var extensionSuffix: String?
 }
@@ -37,6 +40,9 @@ struct ImagesOptions: ParsableArguments {
 // MARK: - Computed var
 
 extension ImagesOptions {
+    
+    // MARK: - UIKit
+    
     var extensionFileName: String {
         if let extensionSuffix = extensionSuffix {
             return "\(extensionName)+\(extensionSuffix).swift"
@@ -48,6 +54,21 @@ extension ImagesOptions {
         "\(extensionOutputPath)/\(extensionFileName)"
     }
     
+    // MARK: - SwiftUI
+    
+    var extensionFileNameSwiftUI: String {
+        if let extensionSuffix = extensionSuffix {
+            return "\(extensionNameSwiftUI)+\(extensionSuffix).swift"
+        }
+        return "\(extensionNameSwiftUI).swift"
+    }
+    
+    var extensionFilePathSwiftUI: String {
+        "\(extensionOutputPath)/\(extensionFileNameSwiftUI)"
+    }
+    
+    // MARK: -
+    
     var inputFilenameWithoutExt: String {
         URL(fileURLWithPath: inputFile)
             .deletingPathExtension()

Sources/ResgenSwift/Images/Model/ParsedImage.swift

@@ -72,17 +72,16 @@ struct ParsedImage {
     
     // MARK: - Extension property
     
-    func getImageProperty() -> String {
+    func getImageProperty(isStatic: Bool, isSwiftUI: Bool) -> String {
-        """
+        if isSwiftUI {
-            var \(name): UIImage {
+            return """
-                UIImage(named: "\(name)")!
+                \(isStatic ? "static ": "")var \(name): Image {
-            }
+                    Image("\(name)")
-        """
+                }
-    }
+            """
-    
+        }
-    func getStaticImageProperty() -> String {
+        return """
-        """
+            \(isStatic ? "static ": "")var \(name): UIImage {
-            static var \(name): UIImage {
                 UIImage(named: "\(name)")!
             }
         """

Sources/ResgenSwift/Strings/Generator/StringsFileGenerator.swift

@@ -158,6 +158,7 @@ class StringsFileGenerator {
     private static func getFooter() -> String {
         """
         }
+        
         """
     }
 }

Sources/ResgenSwift/Strings/Generator/TagsGenerator.swift

@@ -80,6 +80,7 @@ class TagsGenerator {
     private static func getFooter() -> String {
         """
         }
+        
         """
     }
 }

Sources/ResgenSwift/Strings/Stringium/StringiumOptions.swift

@@ -33,7 +33,7 @@ struct StringiumOptions: ParsableArguments {
     @Option(help: "Tell if it will generate static properties or not")
     var staticMembers: Bool = false
     
-    @Option(help: "Extension name. If not specified, it will generate an String extension. Using default extension name will generate static property.")
+    @Option(help: "Extension name. If not specified, it will generate an String extension.")
     var extensionName: String = Stringium.defaultExtensionName
     
     @Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+{extensionSuffix}.swift")

Sources/ResgenSwift/Strings/Tag/TagsOptions.swift

@@ -24,7 +24,7 @@ struct TagsOptions: ParsableArguments {
     @Option(help: "Tell if it will generate static properties or not")
     var staticMembers: Bool = false
     
-    @Option(help: "Extension name. If not specified, it will generate a Tag extension. Using default extension name will generate static property.")
+    @Option(help: "Extension name. If not specified, it will generate a Tag extension.")
     var extensionName: String = Tags.defaultExtensionName
     
     @Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+Tag{extensionSuffix}.swift")

Tests/ResgenSwiftTests/Colors/ColorExtensionGeneratorTests.swift

@@ -13,7 +13,7 @@ import ToolCore
 
 final class ColorExtensionGeneratorTests: XCTestCase {
     
-    func testGeneratedExtensionContent() {
+    func test_uiKit_GeneratedExtensionContent() {
         // Given
         let colors = [
             ParsedColor(name: "colorOne", light: "#FF00FF", dark: "#00FF00"),
@@ -23,7 +23,8 @@ final class ColorExtensionGeneratorTests: XCTestCase {
         // When
         let extensionContent = ColorExtensionGenerator.getExtensionContent(colors: colors,
                                                                            staticVar: false,
-                                                                           extensionName: "GenColors")
+                                                                           extensionName: "GenColors",
+                                                                           isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -48,7 +49,7 @@ final class ColorExtensionGeneratorTests: XCTestCase {
         XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
     }
     
-    func testGeneratedExtensionContentForStaticVar() {
+    func test_uiKit_GeneratedExtensionContentForStaticVar() {
         // Given
         let colors = [
             ParsedColor(name: "colorOne", light: "#FF00FF", dark: "#00FF00"),
@@ -58,7 +59,8 @@ final class ColorExtensionGeneratorTests: XCTestCase {
         // When
         let extensionContent = ColorExtensionGenerator.getExtensionContent(colors: colors,
                                                                            staticVar: true,
-                                                                           extensionName: "GenColor")
+                                                                           extensionName: "GenColor",
+                                                                           isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -82,4 +84,76 @@ final class ColorExtensionGeneratorTests: XCTestCase {
         
         XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
     }
+    
+    func test_swiftUI_GeneratedExtensionContent() {
+        // Given
+        let colors = [
+            ParsedColor(name: "colorOne", light: "#FF00FF", dark: "#00FF00"),
+            ParsedColor(name: "colorTwo", light: "#F0F0F0", dark: "#0F0F0F")
+        ]
+        
+        // When
+        let extensionContent = ColorExtensionGenerator.getExtensionContent(colors: colors,
+                                                                           staticVar: false,
+                                                                           extensionName: "GenColors",
+                                                                           isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+        // Generated by ResgenSwift.Color \(ResgenSwiftVersion)
+
+        import SwiftUI
+
+        extension GenColors {
+        
+            /// Color colorOne is #FF00FF (light) or #00FF00 (dark)"
+            var colorOne: Color {
+                Color("colorOne")
+            }
+        
+            /// Color colorTwo is #F0F0F0 (light) or #0F0F0F (dark)"
+             var colorTwo: Color {
+                Color("colorTwo")
+            }
+        }
+        """
+        
+        XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
+    }
+    
+    func test_swiftUI_GeneratedExtensionContentForStaticVar() {
+        // Given
+        let colors = [
+            ParsedColor(name: "colorOne", light: "#FF00FF", dark: "#00FF00"),
+            ParsedColor(name: "colorTwo", light: "#F0F0F0", dark: "#0F0F0F")
+        ]
+        
+        // When
+        let extensionContent = ColorExtensionGenerator.getExtensionContent(colors: colors,
+                                                                           staticVar: true,
+                                                                           extensionName: "GenColor",
+                                                                           isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+        // Generated by ResgenSwift.Color \(ResgenSwiftVersion)
+
+        import SwiftUI
+
+        extension GenColor {
+        
+            /// Color colorOne is #FF00FF (light) or #00FF00 (dark)"
+            static var colorOne: Color {
+                Color("colorOne")
+            }
+        
+            /// Color colorTwo is #F0F0F0 (light) or #0F0F0F (dark)"
+            static var colorTwo: Color {
+                Color("colorTwo")
+            }
+        }
+        """
+        
+        XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
+    }
 }

Tests/ResgenSwiftTests/Colors/ParsedColorTests.swift

@@ -12,12 +12,12 @@ import XCTest
 
 final class ParsedColorTests: XCTestCase {
 
-    func testGeneratedProperty() {
+    func test_uiKit_GeneratedProperty() {
         // Given
         let color = ParsedColor(name: "red", light: "#FF0000", dark: "#0000FF")
         
         // When
-        let property = color.getColorProperty()
+        let property = color.getColorProperty(isStatic: false, isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -30,12 +30,12 @@ final class ParsedColorTests: XCTestCase {
         XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
     }
     
-    func testGeneratedStaticProperty() {
+    func test_uiKit_GeneratedStaticProperty() {
         // Given
         let color = ParsedColor(name: "red", light: "#FF0000", dark: "#0000FF")
         
         // When
-        let property = color.getColorStaticProperty()
+        let property = color.getColorProperty(isStatic: true, isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -48,6 +48,42 @@ final class ParsedColorTests: XCTestCase {
         XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
     }
     
+    func test_swiftUI_GeneratedProperty() {
+        // Given
+        let color = ParsedColor(name: "red", light: "#FF0000", dark: "#0000FF")
+        
+        // When
+        let property = color.getColorProperty(isStatic: false, isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+        /// Color red is #FF0000 (light) or #0000FF (dark)"
+        var red: Color {
+            Color("red")
+        }
+        """
+            
+        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
+    }
+    
+    func test_swiftUI_GeneratedStaticProperty() {
+        // Given
+        let color = ParsedColor(name: "red", light: "#FF0000", dark: "#0000FF")
+        
+        // When
+        let property = color.getColorProperty(isStatic: true, isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+            /// Color red is #FF0000 (light) or #0000FF (dark)"
+            static var red: Color {
+                Color("red")
+            }
+        """
+        
+        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
+    }
+    
     func testGeneratedColorAsset() {
         // Given
         let color = ParsedColor(name: "red", light: "#FF0000", dark: "#0000FF")

Tests/ResgenSwiftTests/Fonts/FontExtensionGeneratorTests.swift

@@ -13,7 +13,7 @@ import ToolCore
 
 final class FontExtensionGeneratorTests: XCTestCase {
     
-    func testGeneratedExtensionContent() {
+    func test_uiKit_GeneratedExtensionContent() {
         // Given
         let fontNames: [FontName] = [
             "CircularStd-Regular",
@@ -23,7 +23,8 @@ final class FontExtensionGeneratorTests: XCTestCase {
         // When
         let extensionContent = FontExtensionGenerator.getExtensionContent(fontsNames: fontNames,
                                                                           staticVar: false,
-                                                                          extensionName: "GenFonts")
+                                                                          extensionName: "GenFonts",
+                                                                          isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -53,5 +54,47 @@ final class FontExtensionGeneratorTests: XCTestCase {
         
         XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
     }
+
     
+    func test_swiftUI_GeneratedExtensionContent() {
+        // Given
+        let fontNames: [FontName] = [
+            "CircularStd-Regular",
+            "CircularStd-Bold"
+        ]
+        
+        // When
+        let extensionContent = FontExtensionGenerator.getExtensionContent(fontsNames: fontNames,
+                                                                          staticVar: false,
+                                                                          extensionName: "GenFonts",
+                                                                          isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+        // Generated by ResgenSwift.Fonts \(ResgenSwiftVersion)
+
+        import SwiftUI
+
+        extension GenFonts {
+        
+            enum FontName: String {
+                case CircularStdRegular = "CircularStd-Regular"
+                case CircularStdBold = "CircularStd-Bold"
+            }
+        
+            // MARK: - Getter
+        
+            func CircularStdRegular(withSize size: CGFloat) -> Font {
+                Font.custom(FontName.CircularStdRegular.rawValue, size: size)
+            }
+        
+            func CircularStdBold(withSize size: CGFloat) -> Font {
+                Font.custom(FontName.CircularStdBold.rawValue, size: size)
+            }
+        
+        }
+        """
+        
+        XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
+    }
 }

Tests/ResgenSwiftTests/Fonts/FontNameTests.swift

@@ -12,12 +12,12 @@ import XCTest
 
 final class FontNameTests: XCTestCase {
  
-    func testGeneratedProperty_noForbiddenCharacter() {
+    func test_uiKit_GeneratedProperty_noForbiddenCharacter() {
         // Given
         let fontName: FontName = "CircularStdBold"
         
         // When
-        let property = fontName.staticProperty
+        let property = fontName.getProperty(isStatic: true, isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -29,12 +29,12 @@ final class FontNameTests: XCTestCase {
         XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
     }
     
-    func testGeneratedProperty_withForbiddenCharacter() {
+    func test_uiKit_GeneratedProperty_withForbiddenCharacter() {
         // Given
         let fontName: FontName = "[Circular_Std+Bold-Underline]"
         
         // When
-        let property = fontName.staticProperty
+        let property = fontName.getProperty(isStatic: true, isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -46,12 +46,12 @@ final class FontNameTests: XCTestCase {
         XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
     }
     
-    func testGeneratedMethod_noForbiddenCharacter() {
+    func test_uiKit_GeneratedMethod_noForbiddenCharacter() {
         // Given
         let fontName: FontName = "CircularStdBold"
         
         // When
-        let property = fontName.method
+        let property = fontName.getProperty(isStatic: false, isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -63,12 +63,12 @@ final class FontNameTests: XCTestCase {
         XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
     }
     
-    func testGeneratedMethod_withForbiddenCharacter() {
+    func test_uiKit_GeneratedMethod_withForbiddenCharacter() {
         // Given
         let fontName: FontName = "[Circular_Std+Bold-Underline]"
         
         // When
-        let property = fontName.method
+        let property = fontName.getProperty(isStatic: false, isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -79,5 +79,72 @@ final class FontNameTests: XCTestCase {
             
         XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
     }
+ 
+    func test_swiftUI_GeneratedProperty_noForbiddenCharacter() {
+        // Given
+        let fontName: FontName = "CircularStdBold"
+        
+        // When
+        let property = fontName.getProperty(isStatic: true, isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+         static let CircularStdBold: ((_ size: CGFloat) -> Font) = { size in
+             Font.custom(FontName.CircularStdBold.rawValue, size: size)
+         }
+        """
+            
+        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
+    }
     
+    func test_swiftUI_GeneratedProperty_withForbiddenCharacter() {
+        // Given
+        let fontName: FontName = "[Circular_Std+Bold-Underline]"
+        
+        // When
+        let property = fontName.getProperty(isStatic: true, isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+         static let CircularStdBoldUnderline: ((_ size: CGFloat) -> Font) = { size in
+             Font.custom(FontName.CircularStdBoldUnderline.rawValue, size: size)
+         }
+        """
+            
+        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
+    }
+    
+    func test_swiftUI_GeneratedMethod_noForbiddenCharacter() {
+        // Given
+        let fontName: FontName = "CircularStdBold"
+        
+        // When
+        let property = fontName.getProperty(isStatic: false, isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+         func CircularStdBold(withSize size: CGFloat) -> Font {
+             Font.custom(FontName.CircularStdBold.rawValue, size: size)
+         }
+        """
+            
+        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
+    }
+    
+    func test_swiftUI_GeneratedMethod_withForbiddenCharacter() {
+        // Given
+        let fontName: FontName = "[Circular_Std+Bold-Underline]"
+        
+        // When
+        let property = fontName.getProperty(isStatic: false, isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+        func CircularStdBoldUnderline(withSize size: CGFloat) -> Font {
+            Font.custom(FontName.CircularStdBoldUnderline.rawValue, size: size)
+        }
+        """
+            
+        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
+    }
 }

Tests/ResgenSwiftTests/Fonts/FontPlistGeneratorTests.swift

@@ -19,7 +19,7 @@ final class FontPlistGeneratorTests: XCTestCase {
         ]
         
         // When
-        let plistContent = FontPlistGenerator.generatePlistUIAppsFontContent(for: fontNames)
+        let plistContent = FontPlistGenerator.generatePlistUIAppsFontContent(for: fontNames, infoPlistPaths: [String]())
         
         // Expect
         let expect = """

Tests/ResgenSwiftTests/Generate/ColorsConfigurationTests.swift

@@ -0,0 +1,81 @@
+//
+//  ColorsConfigurationTests.swift
+//  
+//
+//  Created by Thibaut Schmitt on 04/11/2022.
+//
+
+import Foundation
+import XCTest
+
+@testable import ResgenSwift
+
+final class ColorsConfigurationTests: XCTestCase {
+    
+    let projectDirectory = "projectDirectory/"
+    
+    func test_argsGeneration_requiredArgs() {
+        // Given
+        let testingConfiguration = ColorsConfiguration(inputFile: "path/to/colors.txt",
+                                                       style: ColorStyle.all.rawValue,
+                                                       xcassetsPath: "path/to/assets.xcassets",
+                                                       extensionOutputPath: "Colors/Generated",
+                                                       extensionName: nil,
+                                                       extensionNameSwiftUI: nil,
+                                                       extensionSuffix: nil,
+                                                       staticMembers: false)
+        // When
+        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: false)
+                
+        // Expect
+        let expectedArguments = [
+            "projectDirectory/path/to/colors.txt",
+            "--style",
+            "all",
+            "--xcassets-path",
+            "projectDirectory/path/to/assets.xcassets",
+            "--extension-output-path",
+            "projectDirectory/Colors/Generated",
+            "--static-members",
+            "false"
+        ]
+        
+        XCTAssertEqual(arguments, expectedArguments)
+    }
+    
+    func test_argsGeneration_allArguments() {
+        // Given
+        let testingConfiguration = ColorsConfiguration(inputFile: "path/to/colors.txt",
+                                                       style: ColorStyle.all.rawValue,
+                                                       xcassetsPath: "path/to/assets.xcassets",
+                                                       extensionOutputPath: "Colors/Generated",
+                                                       extensionName: "AppUIColor",
+                                                       extensionNameSwiftUI: "AppColor",
+                                                       extensionSuffix: "Testing",
+                                                       staticMembers: false)
+        // When
+        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: true)
+                
+        // Expect
+        let expectedArguments = [
+            "-f",
+            "projectDirectory/path/to/colors.txt",
+            "--style",
+            "all",
+            "--xcassets-path",
+            "projectDirectory/path/to/assets.xcassets",
+            "--extension-output-path",
+            "projectDirectory/Colors/Generated",
+            "--static-members",
+            "false",
+            "--extension-name",
+            "AppUIColor",
+            "--extension-name-swift-ui",
+            "AppColor",
+            "--extension-suffix",
+            "Testing",
+        ]
+        
+        XCTAssertEqual(arguments, expectedArguments)
+    }
+}

Tests/ResgenSwiftTests/Generate/FontsConfigurationTests.swift

@@ -0,0 +1,73 @@
+//
+//  FontsConfigurationTests.swift
+//  
+//
+//  Created by Thibaut Schmitt on 04/11/2022.
+//
+
+import Foundation
+import XCTest
+
+@testable import ResgenSwift
+
+final class FontsConfigurationTests: XCTestCase {
+    
+    let projectDirectory = "projectDirectory/"
+    
+    func test_argsGeneration_requiredArgs() {
+        // Given
+        let testingConfiguration = FontsConfiguration(inputFile: "path/to/fonts.txt",
+                                                      extensionOutputPath: "Fonts/Generated",
+                                                      extensionName: nil,
+                                                      extensionNameSwiftUI: nil,
+                                                      extensionSuffix: nil,
+                                                      infoPlistPaths: nil,
+                                                      staticMembers: nil)
+        // When
+        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: false)
+                
+        // Expect
+        let expectedArguments = [
+            "projectDirectory/path/to/fonts.txt",
+            "--extension-output-path",
+            "projectDirectory/Fonts/Generated",
+            "--static-members",
+            "false"
+        ]
+        
+        XCTAssertEqual(arguments, expectedArguments)
+    }
+    
+    func test_argsGeneration_allArguments() {
+        // Given
+        let testingConfiguration = FontsConfiguration(inputFile: "path/to/fonts.txt",
+                                                      extensionOutputPath: "Fonts/Generated",
+                                                      extensionName: "AppUIFont",
+                                                      extensionNameSwiftUI: "AppFont",
+                                                      extensionSuffix: "Testing",
+                                                      infoPlistPaths: "path/to/plist1.plist path/to/plist2.plist",
+                                                      staticMembers: true)
+        // When
+        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: true)
+                
+        // Expect
+        let expectedArguments = [
+            "-f",
+            "projectDirectory/path/to/fonts.txt",
+            "--extension-output-path",
+            "projectDirectory/Fonts/Generated",
+            "--static-members",
+            "true",
+            "--extension-name",
+            "AppUIFont",
+            "--extension-name-swift-ui",
+            "AppFont",
+            "--extension-suffix",
+            "Testing",
+            "--info-plist-paths",
+            "projectDirectory/path/to/plist1.plist projectDirectory/path/to/plist2.plist"
+        ]
+        
+        XCTAssertEqual(arguments, expectedArguments)
+    }
+}

Tests/ResgenSwiftTests/Generate/ImagesConfigurationTests.swift

@@ -0,0 +1,78 @@
+//
+//  ImagesConfigurationTests.swift
+//  
+//
+//  Created by Thibaut Schmitt on 04/11/2022.
+//
+
+import Foundation
+import XCTest
+
+@testable import ResgenSwift
+
+final class ImagesConfigurationTests: XCTestCase {
+    
+    let projectDirectory = "projectDirectory/"
+    
+    func test_argsGeneration_requiredArgs() {
+        // Given
+        let testingConfiguration = ImagesConfiguration(inputFile: "path/to/images.txt",
+                                                       xcassetsPath: "path/to/assets.xcassets",
+                                                       extensionOutputPath: "Images/Generated",
+                                                       extensionName: nil,
+                                                       extensionNameSwiftUI: nil,
+                                                       extensionSuffix: nil,
+                                                       staticMembers: nil)
+        
+        // When
+        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: false)
+                
+        // Expect
+        let expectedArguments = [
+            "projectDirectory/path/to/images.txt",
+            "--xcassets-path",
+            "projectDirectory/path/to/assets.xcassets",
+            "--extension-output-path",
+            "projectDirectory/Images/Generated",
+            "--static-members",
+            "false"
+        ]
+        
+        XCTAssertEqual(arguments, expectedArguments)
+    }
+    
+    func test_argsGeneration_allArguments() {
+        // Given
+        let testingConfiguration = ImagesConfiguration(inputFile: "path/to/images.txt",
+                                                       xcassetsPath: "path/to/assets.xcassets",
+                                                       extensionOutputPath: "Images/Generated",
+                                                       extensionName: "AppUIImage",
+                                                       extensionNameSwiftUI: "AppImage",
+                                                       extensionSuffix: "Testing",
+                                                       staticMembers: true)
+        
+        // When
+        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: true)
+
+        // Expect
+        let expectedArguments = [
+            "-f",
+            "projectDirectory/path/to/images.txt",
+            "--xcassets-path",
+            "projectDirectory/path/to/assets.xcassets",
+            "--extension-output-path",
+            "projectDirectory/Images/Generated",
+            "--static-members",
+            "true",
+            "--extension-name",
+            "AppUIImage",
+            "--extension-name-swift-ui",
+            "AppImage",
+            "--extension-suffix",
+            "Testing",
+        ]
+
+        XCTAssertEqual(arguments, expectedArguments)
+    }
+}
+

Tests/ResgenSwiftTests/Images/ImageExtensionGeneratorTests.swift

@@ -13,7 +13,7 @@ import ToolCore
 
 final class ImageExtensionGeneratorTests: XCTestCase {
     
-    func testGeneratedExtensionContent() {
+    func test_uiKit_GeneratedExtensionContent() {
         // Given
         let images = [
             ParsedImage(name: "image_one", tags: "id", width: 10, height: 10),
@@ -24,7 +24,8 @@ final class ImageExtensionGeneratorTests: XCTestCase {
         let extensionContent = ImageExtensionGenerator.getExtensionContent(images: images,
                                                                            staticVar: false,
                                                                            extensionName: "GenImages",
-                                                                           inputFilename: "myInputFilename")
+                                                                           inputFilename: "myInputFilename",
+                                                                           isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -48,7 +49,7 @@ final class ImageExtensionGeneratorTests: XCTestCase {
         XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
     }
     
-    func testGeneratedExtensionContentForStaticVar() {
+    func test_uiKit_GeneratedExtensionContentForStaticVar() {
         // Given
         let images = [
             ParsedImage(name: "image_one", tags: "id", width: 10, height: 10),
@@ -59,7 +60,8 @@ final class ImageExtensionGeneratorTests: XCTestCase {
         let extensionContent = ImageExtensionGenerator.getExtensionContent(images: images,
                                                                            staticVar: true,
                                                                            extensionName: "GenImages",
-                                                                           inputFilename: "myInputFilename")
+                                                                           inputFilename: "myInputFilename",
+                                                                           isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -82,4 +84,76 @@ final class ImageExtensionGeneratorTests: XCTestCase {
         
         XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
     }
+    
+    func test_swiftUI_GeneratedExtensionContent() {
+        // Given
+        let images = [
+            ParsedImage(name: "image_one", tags: "id", width: 10, height: 10),
+            ParsedImage(name: "image_two", tags: "id", width: 180, height: 90),
+        ]
+        
+        // When
+        let extensionContent = ImageExtensionGenerator.getExtensionContent(images: images,
+                                                                           staticVar: false,
+                                                                           extensionName: "GenImages",
+                                                                           inputFilename: "myInputFilename",
+                                                                           isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+        // Generated by ResgenSwift.Images \(ResgenSwiftVersion)
+        // Images from myInputFilename
+        
+        import SwiftUI
+        
+        extension GenImages {
+        
+            var image_one: Image {
+                Image("image_one")
+            }
+        
+            var image_two: Image {
+                Image("image_two")
+            }
+        }
+        """
+        
+        XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
+    }
+    
+    func test_swiftUI_GeneratedExtensionContentForStaticVar() {
+        // Given
+        let images = [
+            ParsedImage(name: "image_one", tags: "id", width: 10, height: 10),
+            ParsedImage(name: "image_two", tags: "id", width: 180, height: 90),
+        ]
+        
+        // When
+        let extensionContent = ImageExtensionGenerator.getExtensionContent(images: images,
+                                                                           staticVar: true,
+                                                                           extensionName: "GenImages",
+                                                                           inputFilename: "myInputFilename",
+                                                                           isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+        // Generated by ResgenSwift.Images \(ResgenSwiftVersion)
+        // Images from myInputFilename
+        
+        import SwiftUI
+        
+        extension GenImages {
+        
+            static var image_one: Image {
+                Image("image_one")
+            }
+        
+            static var image_two: Image {
+                Image("image_two")
+            }
+        }
+        """
+        
+        XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
+    }
 }

Tests/ResgenSwiftTests/Images/ParsedImageTests.swift

@@ -34,7 +34,7 @@ final class ParsedImageTests: XCTestCase {
         XCTAssertEqual(convertArguments.x3.height, "30")
     }
     
-    func testGeneratedProperty() {
+    func test_uiKit_GeneratedProperty() {
         // Given
         let imageName = "the_name"
         let parsedImage = ParsedImage(name: imageName,
@@ -43,7 +43,7 @@ final class ParsedImageTests: XCTestCase {
                                       height: 10)
         
         // When
-        let property = parsedImage.getImageProperty()
+        let property = parsedImage.getImageProperty(isStatic: false, isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -55,7 +55,7 @@ final class ParsedImageTests: XCTestCase {
         XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
     }
     
-    func testGeneratedStaticProperty() {
+    func test_uiKit_GeneratedStaticProperty() {
         // Given
         let imageName = "the_name"
         let parsedImage = ParsedImage(name: imageName,
@@ -64,7 +64,7 @@ final class ParsedImageTests: XCTestCase {
                                       height: 10)
         
         // When
-        let property = parsedImage.getStaticImageProperty()
+        let property = parsedImage.getImageProperty(isStatic: true, isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -76,6 +76,48 @@ final class ParsedImageTests: XCTestCase {
         XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
     }
     
+    func test_swiftUI_GeneratedProperty() {
+        // Given
+        let imageName = "the_name"
+        let parsedImage = ParsedImage(name: imageName,
+                                      tags: "id",
+                                      width: 10,
+                                      height: 10)
+        
+        // When
+        let property = parsedImage.getImageProperty(isStatic: false, isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+        var \(imageName): Image {
+            Image("\(imageName)")
+        }
+        """
+        
+        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
+    }
+    
+    func test_swiftUI_GeneratedStaticProperty() {
+        // Given
+        let imageName = "the_name"
+        let parsedImage = ParsedImage(name: imageName,
+                                      tags: "id",
+                                      width: 10,
+                                      height: 10)
+        
+        // When
+        let property = parsedImage.getImageProperty(isStatic: true, isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+        static var \(imageName): Image {
+            Image("\(imageName)")
+        }
+        """
+        
+        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
+    }
+    
     func testAssetContentJson() {
         // Given
         let imageName = "the_name"

install-completion.sh

@@ -0,0 +1,13 @@
+#!/bin/zsh
+
+if [[ $SHELL == "/bin/zsh" ]]
+then
+    if [ ! -d "~/.oh-my-zsh/completions" ]
+    then
+        mkdir -p ~/.oh-my-zsh/completions
+    fi
+    resgen-swift --generate-completion-script zsh > ~/.oh-my-zsh/completions/_resgen-swift
+else
+    echo "Completion file can only be installed automaticaly for oh-my-zsh shell. See https://apple.github.io/swift-argument-parser/documentation/argumentparser/installingcompletionscripts to install it ti your shell"
+fi
+

install.sh

@@ -1,4 +0,0 @@
-#!/bin/zsh
-
-swift build -c release
-cp .build/release/ResgenSwift /usr/local/bin/ResgenSwift