Skip to content

Commit 87a939c

Browse files
committed
Use colors' "safe" names in SCSS & XML too
1 parent f284099 commit 87a939c

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

Sources/TokenGenerator/SCSSExport.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ func webSCSS(_ semanticColors: [SemanticColor]?, _ swatchColors: [SwatchColor]?)
99
}
1010

1111
/// Based on https://github.com/nytm/games-phoenix/blob/8d0f729364f342a45e58daddff5495d12d2a92db/src/shared/scss-helpers/colors.scss
12+
///
13+
/// Since Swatch color names are "safe", references to them must also be "safe".
1214
private func scssColors(_ colors: [SemanticColor]) -> String {
1315
"""
1416
/// Semantic Colors
@@ -21,9 +23,9 @@ private func scssColors(_ colors: [SemanticColor]) -> String {
2123
2224
\(colors.map {
2325
"""
24-
$\($0.name): $\($0.lightNormal);
25-
$\($0.name)HC: $\($0.lightHighContrast);
26-
$\($0.name)Dark: $\($0.dark);
26+
$\($0.safeName): $\(safeWord(raw: $0.lightNormal));
27+
$\($0.safeName)HC: $\(safeWord(raw: $0.lightHighContrast));
28+
$\($0.safeName)Dark: $\(safeWord(raw: $0.dark));
2729
"""
2830
}.joined(separator: "\n\n"))
2931
"""
@@ -40,7 +42,7 @@ private func scssColors(_ colors: [SwatchColor]) -> String {
4042
/// between web, iOS, and Android platforms.
4143
4244
\(colors
43-
.map { "$\($0.name): \($0.hexColor);" }
45+
.map { "$\($0.safeName): \($0.hexColor);" }
4446
.joined(separator: "\n"))
4547
"""
4648
}

Sources/TokenGenerator/XMLExport.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ private func xmlColors(_ colors: [SemanticColor]) -> String {
2121

2222
private func xmlColor(_ color: SemanticColor) -> String {
2323
"""
24-
<color name="\(color.name)">@android:color/\(color.lightNormal)</color>
25-
<color name="\(color.name)HC">@android:color/\(color.lightHighContrast)</color>
26-
<color name="\(color.name)Dark">@android:color/\(color.dark)</color>
24+
<color name="\(color.safeName)">@android:color/\(safeWord(raw: color.lightNormal))</color>
25+
<color name="\(color.safeName)HC">@android:color/\(safeWord(raw: color.lightHighContrast))</color>
26+
<color name="\(color.safeName)Dark">@android:color/\(safeWord(raw: color.dark))</color>
2727
"""
2828
}
2929

@@ -35,6 +35,6 @@ private func xmlColors(_ colors: [SwatchColor]) -> String {
3535

3636
private func xmlColor(_ color: SwatchColor) -> String {
3737
"""
38-
<color name="\(color.name)">\(color.hexColor)</color>
38+
<color name="\(color.safeName)">\(color.hexColor)</color>
3939
"""
4040
}

0 commit comments

Comments
 (0)