Skip to content

Commit 7cbf9d6

Browse files
authored
Update project description, update format to automatically remove Color keyword from variable names (#18)
1 parent d696be7 commit 7cbf9d6

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Chroma
2+
Xcode Assets Macros alternative CLI to automatically generate static properties corresponding to color assets on SwiftUI, UIKit or AppKIt projects.
23

3-
A command line tool to generate .swift extensions or structs files from .xcassets on your UIKit, AppKIt or SwiftUI projects.
44

55
### Usage
66

Sources/Chroma/App/Framework.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ extension Framework {
6060
}
6161

6262
func colorVariable(name: String) -> String? {
63-
let formattedName = name.camelCased().removing(.punctuationCharacters.union(.symbols))
63+
let formattedName = name.camelCased().removing(.punctuationCharacters.union(.symbols)).replacingOccurrences(of: "Color", with: "")
6464
guard !systemReservedVariableNames.contains(formattedName) else { return nil }
6565
return " static var \(formattedName): \(variableType) { return \(variableType)(\(parameterName)\"\(name)\") \(defaultValue)}"
6666
}

Tests/ChromaTests/FileGeneratorTests.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,21 +160,21 @@ extension FileGeneratorTests {
160160
switch assetType {
161161
case .regular:
162162
return [
163-
" static var exampleColor1: \(variableType) { return \(variableType)(\(framework.parameterName)\"Example Color 1\") \(defaultValue)}",
164-
" static var exampleColor2: \(variableType) { return \(variableType)(\(framework.parameterName)\"exampleColor2\") \(defaultValue)}",
165-
" static var exampleColor3: \(variableType) { return \(variableType)(\(framework.parameterName)\"ExampleColor3\") \(defaultValue)}",
166-
" static var exampleColor4: \(variableType) { return \(variableType)(\(framework.parameterName)\"ExampleColor4-\") \(defaultValue)}"
163+
" static var example1: \(variableType) { return \(variableType)(\(framework.parameterName)\"Example Color 1\") \(defaultValue)}",
164+
" static var example2: \(variableType) { return \(variableType)(\(framework.parameterName)\"exampleColor2\") \(defaultValue)}",
165+
" static var example3: \(variableType) { return \(variableType)(\(framework.parameterName)\"ExampleColor3\") \(defaultValue)}",
166+
" static var example4: \(variableType) { return \(variableType)(\(framework.parameterName)\"ExampleColor4-\") \(defaultValue)}"
167167
]
168168
case .withFolders:
169169
return [
170-
" static var rootExampleColor: \(variableType) { return \(variableType)(\(framework.parameterName)\"Root Example Color\") \(defaultValue)}",
170+
" static var rootExample: \(variableType) { return \(variableType)(\(framework.parameterName)\"Root Example Color\") \(defaultValue)}",
171171
" // MARK: - Example 1",
172-
" static var exampleColor1: \(variableType) { return \(variableType)(\(framework.parameterName)\"Example Color 1\") \(defaultValue)}",
173-
" static var exampleColor2: \(variableType) { return \(variableType)(\(framework.parameterName)\"exampleColor2\") \(defaultValue)}",
174-
" static var exampleColor3: \(variableType) { return \(variableType)(\(framework.parameterName)\"ExampleColor3\") \(defaultValue)}",
175-
" static var exampleColor4: \(variableType) { return \(variableType)(\(framework.parameterName)\"ExampleColor4-\") \(defaultValue)}",
172+
" static var example1: \(variableType) { return \(variableType)(\(framework.parameterName)\"Example Color 1\") \(defaultValue)}",
173+
" static var example2: \(variableType) { return \(variableType)(\(framework.parameterName)\"exampleColor2\") \(defaultValue)}",
174+
" static var example3: \(variableType) { return \(variableType)(\(framework.parameterName)\"ExampleColor3\") \(defaultValue)}",
175+
" static var example4: \(variableType) { return \(variableType)(\(framework.parameterName)\"ExampleColor4-\") \(defaultValue)}",
176176
" // MARK: - SubFolder",
177-
" static var subFolderExampleColor: \(variableType) { return \(variableType)(\(framework.parameterName)\"SubFolder Example Color\") \(defaultValue)}"
177+
" static var subFolderExample: \(variableType) { return \(variableType)(\(framework.parameterName)\"SubFolder Example Color\") \(defaultValue)}"
178178
]
179179
}
180180
}

Tests/ChromaTests/FrameworkTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ final class FrameworkTests: XCTestCase {
2525
func test_colorVariable_outputValues() throws {
2626
let variableName = "ExampleColor1"
2727
var platform: Framework = .AppKit
28-
XCTAssertEqual(platform.colorVariable(name: variableName), " static var exampleColor1: NSColor { return NSColor(named: \"ExampleColor1\") ?? .clear }")
28+
XCTAssertEqual(platform.colorVariable(name: variableName), " static var example1: NSColor { return NSColor(named: \"ExampleColor1\") ?? .clear }")
2929
platform = .SwiftUI
30-
XCTAssertEqual(platform.colorVariable(name: variableName), " static var exampleColor1: Color { return Color(\"ExampleColor1\") }")
30+
XCTAssertEqual(platform.colorVariable(name: variableName), " static var example1: Color { return Color(\"ExampleColor1\") }")
3131
platform = .UIKit
32-
XCTAssertEqual(platform.colorVariable(name: variableName), " static var exampleColor1: UIColor { return UIColor(named: \"ExampleColor1\") ?? .clear }")
32+
XCTAssertEqual(platform.colorVariable(name: variableName), " static var example1: UIColor { return UIColor(named: \"ExampleColor1\") ?? .clear }")
3333
}
3434

3535
static var allTests = [

0 commit comments

Comments
 (0)