diff --git a/README.md b/README.md index ae50e16..32c86d7 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,7 @@ Flexoki is available for the following apps and tools. - [Waybar](https://github.com/kepano/flexoki/tree/main/waybar) by @Orest58008 - [WezTerm](https://github.com/kepano/flexoki/tree/main/wezterm) by @jbromley - [Windows Terminal](https://github.com/kepano/flexoki/tree/main/windows-terminal) by @joukevandermaas +- [Xcode](https://github.com/kepano/flexoki/tree/main/xcode) by @ezefranca - [Xresources](https://github.com/kepano/flexoki/tree/main/xresources) by @dmb2 - [Yazi Dark](https://github.com/gosxrgxx/flexoki-dark.yazi), [Yazi Light](https://github.com/gosxrgxx/flexoki-light.yazi) by @gosxrgxx - [Zed](https://github.com/kepano/flexoki/tree/main/zed) by @dinocosta diff --git a/xcode/Flexoki Dark.xccolortheme b/xcode/Flexoki Dark.xccolortheme index 6ec92fd..71dff37 100644 --- a/xcode/Flexoki Dark.xccolortheme +++ b/xcode/Flexoki Dark.xccolortheme @@ -28,6 +28,8 @@ 0.808 0.804 0.765 1 DVTConsoleTextSelectionColor 0.204 0.192 0.192 1 + DVTFontAndColorVersion + 1 DVTDebuggerInstructionPointerColor 0.816 0.635 0.082 1 DVTLineSpacing @@ -146,6 +148,16 @@ 0.808 0.804 0.765 1 xcode.syntax.preprocessor 0.82 0.302 0.255 1 + xcode.syntax.regex + 0.227 0.663 0.624 1 + xcode.syntax.regex.capturename + 0.529 0.604 0.224 1 + xcode.syntax.regex.charname + 0.545 0.494 0.784 1 + xcode.syntax.regex.number + 0.545 0.494 0.784 1 + xcode.syntax.regex.other + 0.808 0.804 0.765 1 xcode.syntax.string 0.227 0.663 0.624 1 xcode.syntax.url @@ -203,10 +215,20 @@ SFMono-Regular - 13.0 xcode.syntax.preprocessor SFMono-Regular - 13.0 + xcode.syntax.regex + SFMono-Regular - 13.0 + xcode.syntax.regex.capturename + SFMono-Regular - 13.0 + xcode.syntax.regex.charname + SFMono-Regular - 13.0 + xcode.syntax.regex.number + SFMono-Regular - 13.0 + xcode.syntax.regex.other + SFMono-Regular - 13.0 xcode.syntax.string SFMono-Regular - 13.0 xcode.syntax.url SFMono-Regular - 13.0 - \ No newline at end of file + diff --git a/xcode/Flexoki Light.xccolortheme b/xcode/Flexoki Light.xccolortheme index 9481b23..dedfc9c 100644 --- a/xcode/Flexoki Light.xccolortheme +++ b/xcode/Flexoki Light.xccolortheme @@ -28,6 +28,8 @@ 0.063 0.059 0.059 1 DVTConsoleTextSelectionColor 0.855 0.845 0.804 1 + DVTFontAndColorVersion + 1 DVTDebuggerInstructionPointerColor 0.678 0.514 0.004 1 DVTLineSpacing @@ -146,6 +148,16 @@ 0.063 0.059 0.059 1 xcode.syntax.preprocessor 0.686 0.188 0.161 1 + xcode.syntax.regex + 0.141 0.514 0.482 1 + xcode.syntax.regex.capturename + 0.4 0.502 0.043 1 + xcode.syntax.regex.charname + 0.369 0.251 0.616 1 + xcode.syntax.regex.number + 0.369 0.251 0.616 1 + xcode.syntax.regex.other + 0.063 0.059 0.059 1 xcode.syntax.string 0.141 0.514 0.482 1 xcode.syntax.url @@ -203,10 +215,20 @@ SFMono-Regular - 13.0 xcode.syntax.preprocessor SFMono-Regular - 13.0 + xcode.syntax.regex + SFMono-Regular - 13.0 + xcode.syntax.regex.capturename + SFMono-Regular - 13.0 + xcode.syntax.regex.charname + SFMono-Regular - 13.0 + xcode.syntax.regex.number + SFMono-Regular - 13.0 + xcode.syntax.regex.other + SFMono-Regular - 13.0 xcode.syntax.string SFMono-Regular - 13.0 xcode.syntax.url SFMono-Regular - 13.0 - \ No newline at end of file + diff --git a/xcode/README.md b/xcode/README.md index 8a0fc18..86b3f61 100644 --- a/xcode/README.md +++ b/xcode/README.md @@ -1,42 +1,41 @@ # Flexoki for Xcode +Xcode themes based on [Flexoki](https://stephango.com/flexoki), the inky color system created by [Steph Ango](https://github.com/kepano). + +This directory includes the Xcode port with: + +- `Flexoki Dark.xccolortheme` +- `Flexoki Light.xccolortheme` + +## Screenshots + +| Flexoki Dark | Flexoki Light | +| --- | --- | +| ![Flexoki Dark theme in Xcode](img/dark.png) | ![Flexoki Light theme in Xcode](img/light.png) | + ## Installation -1. Download the `.xccolortheme` files: - - `Flexoki Dark.xccolortheme` - - `Flexoki Light.xccolortheme` - -2. Copy the files to your Xcode themes directory: - ```bash - cp "Flexoki Dark.xccolortheme" ~/Library/Developer/Xcode/UserData/FontAndColorThemes/ - cp "Flexoki Light.xccolortheme" ~/Library/Developer/Xcode/UserData/FontAndColorThemes/ - ``` - -3. Restart Xcode - -4. Go to **Xcode > Preferences > Themes** and select either "Flexoki Dark" or "Flexoki Light" - -## Color Mapping - -The themes use the following Flexoki colors: - -### Dark Theme -- Background: `#100F0F` RGB(16, 15, 15) - **black** -- Foreground: `#CECDC3` RGB(206, 205, 195) - **base-200** -- Comments: `#878580` RGB(135, 133, 128) - **base-500** -- Keywords: `#879A39` RGB(135, 154, 57) - **green-400** -- Strings: `#3AA99F` RGB(58, 169, 159) - **cyan-400** -- Numbers: `#8B7EC8` RGB(139, 126, 200) - **purple-400** -- Functions: `#DA702C` RGB(218, 112, 44) - **orange-400** -- Types: `#D0A215` RGB(208, 162, 21) - **yellow-400** - -### Light Theme -- Background: `#FFFCF0` RGB(255, 252, 240) - **paper** -- Foreground: `#100F0F` RGB(16, 15, 15) - **black** -- Comments: `#5A5955` RGB(90, 89, 85) - *custom (between base-600 and base-700)* -- Doc comments: `#8B8A82` RGB(139, 138, 130) - *custom (between base-500 and base-600)* -- Keywords: `#66800B` RGB(102, 128, 11) - **green-600** -- Strings: `#24837B` RGB(36, 131, 123) - **cyan-600** -- Numbers: `#5E409D` RGB(94, 64, 157) - **purple-600** -- Functions: `#BC5215` RGB(188, 82, 21) - **orange-600** -- Types: `#AD8301` RGB(173, 131, 1) - **yellow-600** \ No newline at end of file +1. Clone or download this repository, then open the `xcode/` directory. +2. Create Xcode's themes directory if it does not exist: + +```bash +mkdir -p ~/Library/Developer/Xcode/UserData/FontAndColorThemes +``` + +3. Copy the theme files into Xcode's theme folder: + +```bash +cp "Flexoki Dark.xccolortheme" ~/Library/Developer/Xcode/UserData/FontAndColorThemes/ +cp "Flexoki Light.xccolortheme" ~/Library/Developer/Xcode/UserData/FontAndColorThemes/ +``` + +4. Restart Xcode. +5. Open `Xcode > Settings > Themes` and select `Flexoki Dark` or `Flexoki Light`. + +Older Xcode releases use `Xcode > Preferences > Themes`. + +## Notes + +- The light and dark themes keep Flexoki's published palette values. +- A few Xcode-only syntax keys missing from the upstream export are filled in here so recent Xcode releases can color every built-in token category consistently. +- After selecting the theme, you can still change the editor font and size from Xcode's theme editor. diff --git a/xcode/img/dark.png b/xcode/img/dark.png new file mode 100644 index 0000000..a93e52d Binary files /dev/null and b/xcode/img/dark.png differ diff --git a/xcode/img/light.png b/xcode/img/light.png new file mode 100644 index 0000000..189a235 Binary files /dev/null and b/xcode/img/light.png differ