diff --git a/SampleFiles/genAllRessources.sh b/SampleFiles/genAllRessources.sh index e81644d..e2e8494 100755 --- a/SampleFiles/genAllRessources.sh +++ b/SampleFiles/genAllRessources.sh @@ -3,12 +3,12 @@ FORCE_FLAG="$1" ## Font -swift run -c release ResgenSwift fonts $FORCE_FLAG "./Fonts/sampleFontsAll.txt" \ - --extension-output-path "./Fonts/Generated" \ - --extension-name "FontYolo" \ - --extension-name-ui-kit "UIFontYolo" \ - --extension-suffix "GenAllScript" \ - --info-plist-paths "./Fonts/Generated/test.plist ./Fonts/Generated/test2.plist" +#swift run -c release ResgenSwift fonts $FORCE_FLAG "./Fonts/sampleFontsAll.txt" \ +# --extension-output-path "./Fonts/Generated" \ +# --extension-name "FontYolo" \ +# --extension-name-ui-kit "UIFontYolo" \ +# --extension-suffix "GenAllScript" \ +# --info-plist-paths "./Fonts/Generated/test.plist ./Fonts/Generated/test2.plist" # #echo "\n-------------------------\n" # @@ -61,10 +61,10 @@ swift run -c release ResgenSwift fonts $FORCE_FLAG "./Fonts/sampleFontsAll.txt" #echo "\n-------------------------\n" # -## Images -#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" +# Images +swift run -c release ResgenSwift images $FORCE_FLAG "./Images/sampleImages.txt" \ + --xcassets-path "./Images/imagium.xcassets" \ + --extension-output-path "./Images/Generated" \ + --extension-name "ImageYolo" \ + --extension-name-ui-kit "UIImageYolo" \ + --extension-suffix "GenAllScript" diff --git a/SampleFiles/resgenConfiguration.yml b/SampleFiles/resgenConfiguration.yml index faae8ee..e7df5f8 100644 --- a/SampleFiles/resgenConfiguration.yml +++ b/SampleFiles/resgenConfiguration.yml @@ -47,8 +47,8 @@ images: inputFile: ./Images/sampleImages.txt xcassetsPath: ./Images/imagium.xcassets extensionOutputPath: ./Images/Generated - extensionName: UIImage - extensionNameSwiftUI: ImageYolo + extensionName: ImageYolo + extensionNameUIKit: UIImageYolo extensionSuffix: GenAllScript diff --git a/Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift b/Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift index 25d1e45..2701b3f 100644 --- a/Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift +++ b/Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift @@ -220,7 +220,7 @@ struct ImagesConfiguration: Codable, CustomDebugStringConvertible { let xcassetsPath: String let extensionOutputPath: String let extensionName: String? - let extensionNameSwiftUI: String? + let extensionNameUIKit: String? let extensionSuffix: String? private let staticMembers: Bool? @@ -235,14 +235,14 @@ struct ImagesConfiguration: Codable, CustomDebugStringConvertible { xcassetsPath: String, extensionOutputPath: String, extensionName: String?, - extensionNameSwiftUI: String?, + extensionNameUIKit: String?, extensionSuffix: String?, staticMembers: Bool?) { self.inputFile = inputFile self.xcassetsPath = xcassetsPath self.extensionOutputPath = extensionOutputPath self.extensionName = extensionName - self.extensionNameSwiftUI = extensionNameSwiftUI + self.extensionNameUIKit = extensionNameUIKit self.extensionSuffix = extensionSuffix self.staticMembers = staticMembers } @@ -254,7 +254,7 @@ struct ImagesConfiguration: Codable, CustomDebugStringConvertible { - Xcassets path: \(xcassetsPath) - Extension output path: \(extensionOutputPath) - Extension name: \(extensionName ?? "-") - - Extension name SwiftUI: \(extensionNameSwiftUI ?? "-") + - Extension name UIKit: \(extensionNameUIKit ?? "-") - Extension suffix: \(extensionSuffix ?? "-") """ } diff --git a/Sources/ResgenSwift/Generate/Runnable/ImagesConfiguration+Runnable.swift b/Sources/ResgenSwift/Generate/Runnable/ImagesConfiguration+Runnable.swift index 03069c5..42b5ef8 100644 --- a/Sources/ResgenSwift/Generate/Runnable/ImagesConfiguration+Runnable.swift +++ b/Sources/ResgenSwift/Generate/Runnable/ImagesConfiguration+Runnable.swift @@ -36,10 +36,10 @@ extension ImagesConfiguration: Runnable { extensionName ] } - if let extensionNameSwiftUI = extensionNameSwiftUI { + if let extensionNameUIKit = extensionNameUIKit { args += [ - "--extension-name-swift-ui", - extensionNameSwiftUI + "--extension-name-ui-kit", + extensionNameUIKit ] } if let extensionSuffix = extensionSuffix { diff --git a/Sources/ResgenSwift/Images/Images.swift b/Sources/ResgenSwift/Images/Images.swift index a4ecafa..4a028c4 100644 --- a/Sources/ResgenSwift/Images/Images.swift +++ b/Sources/ResgenSwift/Images/Images.swift @@ -21,8 +21,8 @@ struct Images: ParsableCommand { // MARK: - Static static let toolName = "Images" - static let defaultExtensionName = "UIImage" - static let defaultExtensionNameSUI = "Image" + static let defaultExtensionName = "Image" + static let defaultExtensionNameUIKit = "UIImage" // MARK: - Command Options @@ -58,14 +58,14 @@ struct Images: ParsableCommand { inputFilename: options.inputFilenameWithoutExt, extensionName: options.extensionName, extensionFilePath: options.extensionFilePath, - isSwiftUI: false) + isSwiftUI: true) ImageExtensionGenerator.generateExtensionFile(images: imagesToGenerate, staticVar: options.staticMembers, inputFilename: options.inputFilenameWithoutExt, - extensionName: options.extensionNameSwiftUI, - extensionFilePath: options.extensionFilePathSwiftUI, - isSwiftUI: true) + extensionName: options.extensionNameUIKit, + extensionFilePath: options.extensionFilePathUIKit, + isSwiftUI: false) print("[\(Self.toolName)] Images generated") } @@ -90,7 +90,7 @@ struct Images: ParsableCommand { _ = Images.getSvgConverterPath() // Extension for UIKit and SwiftUI should have different name - guard options.extensionName != options.extensionNameSwiftUI else { + guard options.extensionName != options.extensionNameUIKit else { let error = ImagesError.extensionNamesCollision(options.extensionName) print(error.description) Images.exit(withError: error) diff --git a/Sources/ResgenSwift/Images/ImagesOptions.swift b/Sources/ResgenSwift/Images/ImagesOptions.swift index 453725f..2b49cfb 100644 --- a/Sources/ResgenSwift/Images/ImagesOptions.swift +++ b/Sources/ResgenSwift/Images/ImagesOptions.swift @@ -27,11 +27,11 @@ 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.") + @Option(help: "Extension name. If not specified, it will generate an Image 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 name. If not specified, it will generate an UIImage extension.") + var extensionNameUIKit: String = Images.defaultExtensionNameUIKit @Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+Image{extensionSuffix}.swift") var extensionSuffix: String? @@ -41,7 +41,7 @@ struct ImagesOptions: ParsableArguments { extension ImagesOptions { - // MARK: - UIKit + // MARK: - SwiftUI var extensionFileName: String { if let extensionSuffix = extensionSuffix { @@ -54,17 +54,17 @@ extension ImagesOptions { "\(extensionOutputPath)/\(extensionFileName)" } - // MARK: - SwiftUI + // MARK: - UIKit - var extensionFileNameSwiftUI: String { + var extensionFileNameUIKit: String { if let extensionSuffix = extensionSuffix { - return "\(extensionNameSwiftUI)+\(extensionSuffix).swift" + return "\(extensionNameUIKit)+\(extensionSuffix).swift" } - return "\(extensionNameSwiftUI).swift" + return "\(extensionNameUIKit).swift" } - var extensionFilePathSwiftUI: String { - "\(extensionOutputPath)/\(extensionFileNameSwiftUI)" + var extensionFilePathUIKit: String { + "\(extensionOutputPath)/\(extensionFileNameUIKit)" } // MARK: -