Skip to content
This repository has been archived by the owner on Sep 6, 2018. It is now read-only.

Colors: support multiple palettes #55

Merged
merged 4 commits into from
Jun 4, 2017
Merged

Colors: support multiple palettes #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84e1ec2
updated contexts with palettes
djbe May 30, 2017
a331603
Update templates to support multiple palettes + refactor to use structs
djbe May 30, 2017
a88bc83
test multiple palettes output
djbe May 31, 2017
5ec47f9
Changelog entry & documentation
djbe May 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
* Strings: the templates have been updated to support multiple string tables.
[David Jennes](https://github.com/djbe)
[#49](https://github.com/SwiftGen/templates/issues/49)
* Colors: the templates have been updated to support multiple color palettes.
[David Jennes](https://github.com/djbe)
[#55](https://github.com/SwiftGen/templates/issues/55)

### Internal Changes

Expand Down
99 changes: 53 additions & 46 deletions Contexts/Colors/defaults.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,62 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>colors</key>
<key>palettes</key>
<array>
<dict>
<key>alpha</key>
<string>ff</string>
<key>blue</key>
<string>66</string>
<key>green</key>
<string>96</string>
<key>colors</key>
<array>
<dict>
<key>alpha</key>
<string>ff</string>
<key>blue</key>
<string>66</string>
<key>green</key>
<string>96</string>
<key>name</key>
<string>ArticleBody</string>
<key>red</key>
<string>33</string>
</dict>
<dict>
<key>alpha</key>
<string>ff</string>
<key>blue</key>
<string>cc</string>
<key>green</key>
<string>66</string>
<key>name</key>
<string>ArticleFootnote</string>
<key>red</key>
<string>ff</string>
</dict>
<dict>
<key>alpha</key>
<string>ff</string>
<key>blue</key>
<string>66</string>
<key>green</key>
<string>fe</string>
<key>name</key>
<string>ArticleTitle</string>
<key>red</key>
<string>33</string>
</dict>
<dict>
<key>alpha</key>
<string>cc</string>
<key>blue</key>
<string>ff</string>
<key>green</key>
<string>ff</string>
<key>name</key>
<string>private</string>
<key>red</key>
<string>ff</string>
</dict>
</array>
<key>name</key>
<string>ArticleBody</string>
<key>red</key>
<string>33</string>
</dict>
<dict>
<key>alpha</key>
<string>ff</string>
<key>blue</key>
<string>cc</string>
<key>green</key>
<string>66</string>
<key>name</key>
<string>ArticleFootnote</string>
<key>red</key>
<string>ff</string>
</dict>
<dict>
<key>alpha</key>
<string>ff</string>
<key>blue</key>
<string>66</string>
<key>green</key>
<string>fe</string>
<key>name</key>
<string>ArticleTitle</string>
<key>red</key>
<string>33</string>
</dict>
<dict>
<key>alpha</key>
<string>cc</string>
<key>blue</key>
<string>ff</string>
<key>green</key>
<string>ff</string>
<key>name</key>
<string>private</string>
<key>red</key>
<string>ff</string>
<string>colors</string>
</dict>
</array>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Contexts/Colors/empty.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>colors</key>
<key>palettes</key>
<array/>
</dict>
</plist>
45 changes: 0 additions & 45 deletions Contexts/Colors/entries.plist
View file
Open in desktop

This file was deleted.

100 changes: 100 additions & 0 deletions Contexts/Colors/extra.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?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>palettes</key>
<array>
<dict>
<key>colors</key>
<array>
<dict>
<key>alpha</key>
<string>ff</string>
<key>blue</key>
<string>66</string>
<key>green</key>
<string>96</string>
<key>name</key>
<string>ArticleBody</string>
<key>red</key>
<string>33</string>
</dict>
<dict>
<key>alpha</key>
<string>ff</string>
<key>blue</key>
<string>cc</string>
<key>green</key>
<string>66</string>
<key>name</key>
<string>ArticleFootnote</string>
<key>red</key>
<string>ff</string>
</dict>
<dict>
<key>alpha</key>
<string>ff</string>
<key>blue</key>
<string>66</string>
<key>green</key>
<string>fe</string>
<key>name</key>
<string>ArticleTitle</string>
<key>red</key>
<string>33</string>
</dict>
<dict>
<key>alpha</key>
<string>ff</string>
<key>blue</key>
<string>cc</string>
<key>green</key>
<string>66</string>
<key>name</key>
<string>Cyan-Color</string>
<key>red</key>
<string>ff</string>
</dict>
<dict>
<key>alpha</key>
<string>cc</string>
<key>blue</key>
<string>ff</string>
<key>green</key>
<string>ff</string>
<key>name</key>
<string>NamedValue</string>
<key>red</key>
<string>ff</string>
</dict>
<dict>
<key>alpha</key>
<string>cc</string>
<key>blue</key>
<string>ff</string>
<key>green</key>
<string>ff</string>
<key>name</key>
<string>NestedNamedValue</string>
<key>red</key>
<string>ff</string>
</dict>
<dict>
<key>alpha</key>
<string>cc</string>
<key>blue</key>
<string>ff</string>
<key>green</key>
<string>ff</string>
<key>name</key>
<string>private</string>
<key>red</key>
<string>ff</string>
</dict>
</array>
<key>name</key>
<string>extra</string>
</dict>
</array>
</dict>
</plist>
Loading