use r, g, b, a components instead of rgb or rgba

SwiftGen · Feb 23, 2017 · b122802 · b122802
1 parent db11e1e
commit b122802
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/templates/colors-default.stencil b/templates/colors-default.stencil
@@ -28,16 +28,16 @@ extension Color {
 {% set enumName %}{{param.enumName|default:"ColorName"}}{% endset %}
 enum {{enumName}} {
   {% for color in colors %}
-  /// <span style="display:block;width:3em;height:2em;border:1px solid black;background:#{{color.rgb}}"></span>
-  /// Alpha: {{color.alpha|hexToInt|int255toFloat|percent}} <br/> (0x{{color.rgba}})
+  /// <span style="display:block;width:3em;height:2em;border:1px solid black;background:#{{color.red}}{{color.green}}{{color.blue}}"></span>
+  /// Alpha: {{color.alpha|hexToInt|int255toFloat|percent}} <br/> (0x{{color.red}}{{color.green}}{{color.blue}}{{color.alpha}})
   case {{color.name|swiftIdentifier|escapeReservedKeywords}}
   {% endfor %}
 
   var rgbaValue: UInt32 {
     switch self {
     {% for color in colors %}
     case .{{color.name|swiftIdentifier|escapeReservedKeywords}}:
-      return 0x{{color.rgba}}
+      return 0x{{color.red}}{{color.green}}{{color.blue}}{{color.alpha}}
     {% endfor %}
     }
   }

diff --git a/templates/colors-rawValue.stencil b/templates/colors-rawValue.stencil
@@ -27,9 +27,9 @@ extension Color {
 {% set enumName %}{{param.enumName|default:"ColorName"|swiftIdentifier}}{% endset %}
 enum {{enumName}}: UInt32 {
   {% for color in colors %}
-  /// <span style="display:block;width:3em;height:2em;border:1px solid black;background:#{{color.rgb}}"></span>
-  /// Alpha: {{color.alpha|hexToInt|int255toFloat|percent}} <br/> (0x{{color.rgba}})
-  case {{color.name|swiftIdentifier|escapeReservedKeywords}} = 0x{{color.rgba}}
+  /// <span style="display:block;width:3em;height:2em;border:1px solid black;background:#{{color.red}}{{color.green}}{{color.blue}}"></span>
+  /// Alpha: {{color.alpha|hexToInt|int255toFloat|percent}} <br/> (0x{{color.red}}{{color.green}}{{color.blue}}{{color.alpha}})
+  case {{color.name|swiftIdentifier|escapeReservedKeywords}} = 0x{{color.red}}{{color.green}}{{color.blue}}{{color.alpha}}
   {% endfor %}
 
   var color: Color {

diff --git a/templates/colors-swift3.stencil b/templates/colors-swift3.stencil
@@ -28,16 +28,16 @@ extension Color {
 {% set enumName %}{{param.enumName|default:"ColorName"}}{% endset %}
 enum {{enumName}} {
   {% for color in colors %}
-  /// <span style="display:block;width:3em;height:2em;border:1px solid black;background:#{{color.rgb}}"></span>
-  /// Alpha: {{color.alpha|hexToInt|int255toFloat|percent}} <br/> (0x{{color.rgba}})
+  /// <span style="display:block;width:3em;height:2em;border:1px solid black;background:#{{color.red}}{{color.green}}{{color.blue}}"></span>
+  /// Alpha: {{color.alpha|hexToInt|int255toFloat|percent}} <br/> (0x{{color.red}}{{color.green}}{{color.blue}}{{color.alpha}})
   case {{color.name|swiftIdentifier|snakeToCamelCase|lowerFirstWord|escapeReservedKeywords}}
   {% endfor %}
 
   var rgbaValue: UInt32 {
     switch self {
     {% for color in colors %}
     case .{{color.name|swiftIdentifier|snakeToCamelCase|lowerFirstWord|escapeReservedKeywords}}:
-      return 0x{{color.rgba}}
+      return 0x{{color.red}}{{color.green}}{{color.blue}}{{color.alpha}}
     {% endfor %}
     }
   }