Skip to content

Refactored how themes are stored and loaded #1601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 9, 2024
Merged

Refactored how themes are stored and loaded #1601

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
f60e23c
Pulling themes from app bundle without needing to copy them and the u…
austincondiff Feb 2, 2024
e1cadc7
Resolved SwiftLint errors
austincondiff Feb 2, 2024
9484c89
Capitalized themes folder in application support.
austincondiff Mar 4, 2024
b0b4cd9
Update CodeEdit/Features/Settings/Pages/ThemeSettings/Models/ThemeMod…
austincondiff Mar 7, 2024
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
84 changes: 4 additions & 80 deletions CodeEdit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,24 +449,6 @@
B6C6A42A297716A500A3D28F /* EditorTabCloseButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C6A429297716A500A3D28F /* EditorTabCloseButton.swift */; };
B6C6A42E29771A8D00A3D28F /* EditorTabButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C6A42D29771A8D00A3D28F /* EditorTabButtonStyle.swift */; };
B6C6A43029771F7100A3D28F /* EditorTabBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C6A42F29771F7100A3D28F /* EditorTabBackground.swift */; };
B6D26E6C2B686DE300B4C14F /* High Contrast (Light).cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E5A2B686DE200B4C14F /* High Contrast (Light).cetheme */; };
B6D26E6D2B686DE300B4C14F /* Presentation (Light).cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E5B2B686DE200B4C14F /* Presentation (Light).cetheme */; };
B6D26E6E2B686DE300B4C14F /* Solarized (Light).cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E5C2B686DE200B4C14F /* Solarized (Light).cetheme */; };
B6D26E6F2B686DE300B4C14F /* Classic (Dark).cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E5D2B686DE200B4C14F /* Classic (Dark).cetheme */; };
B6D26E702B686DE300B4C14F /* Midnight.cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E5E2B686DE200B4C14F /* Midnight.cetheme */; };
B6D26E712B686DE300B4C14F /* GitHub (Dark).cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E5F2B686DE200B4C14F /* GitHub (Dark).cetheme */; };
B6D26E722B686DE300B4C14F /* Dusk.cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E602B686DE200B4C14F /* Dusk.cetheme */; };
B6D26E732B686DE300B4C14F /* Classic (Light).cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E612B686DE200B4C14F /* Classic (Light).cetheme */; };
B6D26E742B686DE300B4C14F /* Presentation (Dark).cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E622B686DE200B4C14F /* Presentation (Dark).cetheme */; };
B6D26E752B686DE300B4C14F /* Default (Dark).cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E632B686DE300B4C14F /* Default (Dark).cetheme */; };
B6D26E762B686DE300B4C14F /* Low Key.cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E642B686DE300B4C14F /* Low Key.cetheme */; };
B6D26E772B686DE300B4C14F /* High Contrast (Dark).cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E652B686DE300B4C14F /* High Contrast (Dark).cetheme */; };
B6D26E782B686DE300B4C14F /* GitHub (Light).cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E662B686DE300B4C14F /* GitHub (Light).cetheme */; };
B6D26E792B686DE300B4C14F /* Basic.cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E672B686DE300B4C14F /* Basic.cetheme */; };
B6D26E7A2B686DE300B4C14F /* Sunset.cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E682B686DE300B4C14F /* Sunset.cetheme */; };
B6D26E7B2B686DE300B4C14F /* Default (Light).cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E692B686DE300B4C14F /* Default (Light).cetheme */; };
B6D26E7C2B686DE300B4C14F /* Civic.cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E6A2B686DE300B4C14F /* Civic.cetheme */; };
B6D26E7D2B686DE300B4C14F /* Solarized (Dark).cetheme in Resources */ = {isa = PBXBuildFile; fileRef = B6D26E6B2B686DE300B4C14F /* Solarized (Dark).cetheme */; };
B6D7EA592971078500301FAC /* InspectorSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6D7EA582971078500301FAC /* InspectorSection.swift */; };
B6D7EA5C297107DD00301FAC /* InspectorField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6D7EA5B297107DD00301FAC /* InspectorField.swift */; };
B6E41C7029DD157F0088F9F4 /* AccountsSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E41C6F29DD157F0088F9F4 /* AccountsSettingsView.swift */; };
Expand All @@ -491,6 +473,7 @@
B6F0517929D9E3C900D72287 /* SourceControlGitView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F0517829D9E3C900D72287 /* SourceControlGitView.swift */; };
B6F0517B29D9E46400D72287 /* SourceControlSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F0517A29D9E46400D72287 /* SourceControlSettingsView.swift */; };
B6F0517D29D9E4B100D72287 /* TerminalSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F0517C29D9E4B100D72287 /* TerminalSettingsView.swift */; };
B6FF04782B6C08AC002C2C78 /* DefaultThemes in Resources */ = {isa = PBXBuildFile; fileRef = B6FF04772B6C08AC002C2C78 /* DefaultThemes */; };
D7012EE827E757850001E1EF /* FindNavigatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7012EE727E757850001E1EF /* FindNavigatorView.swift */; };
D7211D4327E066CE008F2ED7 /* Localized+Ex.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7211D4227E066CE008F2ED7 /* Localized+Ex.swift */; };
D7211D4727E06BFE008F2ED7 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D7211D4927E06BFE008F2ED7 /* Localizable.strings */; };
Expand Down Expand Up @@ -997,24 +980,6 @@
B6C6A429297716A500A3D28F /* EditorTabCloseButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorTabCloseButton.swift; sourceTree = "<group>"; };
B6C6A42D29771A8D00A3D28F /* EditorTabButtonStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorTabButtonStyle.swift; sourceTree = "<group>"; };
B6C6A42F29771F7100A3D28F /* EditorTabBackground.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorTabBackground.swift; sourceTree = "<group>"; };
B6D26E5A2B686DE200B4C14F /* High Contrast (Light).cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "High Contrast (Light).cetheme"; sourceTree = "<group>"; };
B6D26E5B2B686DE200B4C14F /* Presentation (Light).cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Presentation (Light).cetheme"; sourceTree = "<group>"; };
B6D26E5C2B686DE200B4C14F /* Solarized (Light).cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Solarized (Light).cetheme"; sourceTree = "<group>"; };
B6D26E5D2B686DE200B4C14F /* Classic (Dark).cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Classic (Dark).cetheme"; sourceTree = "<group>"; };
B6D26E5E2B686DE200B4C14F /* Midnight.cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Midnight.cetheme; sourceTree = "<group>"; };
B6D26E5F2B686DE200B4C14F /* GitHub (Dark).cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "GitHub (Dark).cetheme"; sourceTree = "<group>"; };
B6D26E602B686DE200B4C14F /* Dusk.cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Dusk.cetheme; sourceTree = "<group>"; };
B6D26E612B686DE200B4C14F /* Classic (Light).cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Classic (Light).cetheme"; sourceTree = "<group>"; };
B6D26E622B686DE200B4C14F /* Presentation (Dark).cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Presentation (Dark).cetheme"; sourceTree = "<group>"; };
B6D26E632B686DE300B4C14F /* Default (Dark).cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Default (Dark).cetheme"; sourceTree = "<group>"; };
B6D26E642B686DE300B4C14F /* Low Key.cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Low Key.cetheme"; sourceTree = "<group>"; };
B6D26E652B686DE300B4C14F /* High Contrast (Dark).cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "High Contrast (Dark).cetheme"; sourceTree = "<group>"; };
B6D26E662B686DE300B4C14F /* GitHub (Light).cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "GitHub (Light).cetheme"; sourceTree = "<group>"; };
B6D26E672B686DE300B4C14F /* Basic.cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Basic.cetheme; sourceTree = "<group>"; };
B6D26E682B686DE300B4C14F /* Sunset.cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Sunset.cetheme; sourceTree = "<group>"; };
B6D26E692B686DE300B4C14F /* Default (Light).cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Default (Light).cetheme"; sourceTree = "<group>"; };
B6D26E6A2B686DE300B4C14F /* Civic.cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Civic.cetheme; sourceTree = "<group>"; };
B6D26E6B2B686DE300B4C14F /* Solarized (Dark).cetheme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Solarized (Dark).cetheme"; sourceTree = "<group>"; };
B6D7EA582971078500301FAC /* InspectorSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectorSection.swift; sourceTree = "<group>"; };
B6D7EA5B297107DD00301FAC /* InspectorField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectorField.swift; sourceTree = "<group>"; };
B6E41C6F29DD157F0088F9F4 /* AccountsSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsSettingsView.swift; sourceTree = "<group>"; };
Expand All @@ -1039,6 +1004,7 @@
B6F0517829D9E3C900D72287 /* SourceControlGitView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlGitView.swift; sourceTree = "<group>"; };
B6F0517A29D9E46400D72287 /* SourceControlSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlSettingsView.swift; sourceTree = "<group>"; };
B6F0517C29D9E4B100D72287 /* TerminalSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TerminalSettingsView.swift; sourceTree = "<group>"; };
B6FF04772B6C08AC002C2C78 /* DefaultThemes */ = {isa = PBXFileReference; lastKnownFileType = folder; path = DefaultThemes; sourceTree = "<group>"; };
D7012EE727E757850001E1EF /* FindNavigatorView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = FindNavigatorView.swift; sourceTree = "<group>"; tabWidth = 4; };
D7211D4227E066CE008F2ED7 /* Localized+Ex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Localized+Ex.swift"; sourceTree = "<group>"; };
D7211D4827E06BFE008F2ED7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1200,31 +1166,6 @@
path = Configs;
sourceTree = "<group>";
};
28069DA527F5BD320016BC47 /* DefaultThemes */ = {
isa = PBXGroup;
children = (
B6D26E672B686DE300B4C14F /* Basic.cetheme */,
B6D26E6A2B686DE300B4C14F /* Civic.cetheme */,
B6D26E5D2B686DE200B4C14F /* Classic (Dark).cetheme */,
B6D26E612B686DE200B4C14F /* Classic (Light).cetheme */,
B6D26E632B686DE300B4C14F /* Default (Dark).cetheme */,
B6D26E692B686DE300B4C14F /* Default (Light).cetheme */,
B6D26E602B686DE200B4C14F /* Dusk.cetheme */,
B6D26E5F2B686DE200B4C14F /* GitHub (Dark).cetheme */,
B6D26E662B686DE300B4C14F /* GitHub (Light).cetheme */,
B6D26E652B686DE300B4C14F /* High Contrast (Dark).cetheme */,
B6D26E5A2B686DE200B4C14F /* High Contrast (Light).cetheme */,
B6D26E642B686DE300B4C14F /* Low Key.cetheme */,
B6D26E5E2B686DE200B4C14F /* Midnight.cetheme */,
B6D26E622B686DE200B4C14F /* Presentation (Dark).cetheme */,
B6D26E5B2B686DE200B4C14F /* Presentation (Light).cetheme */,
B6D26E6B2B686DE300B4C14F /* Solarized (Dark).cetheme */,
B6D26E5C2B686DE200B4C14F /* Solarized (Light).cetheme */,
B6D26E682B686DE300B4C14F /* Sunset.cetheme */,
);
path = DefaultThemes;
sourceTree = "<group>";
};
2806E8FE2979587A000040F4 /* Model */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2610,6 +2551,7 @@
B658FB2E27DA9E0F00EA4DBD /* CodeEdit */,
587B60F329340A8000D5CD8F /* CodeEditTests */,
28052E0129730F2F00F4F90A /* Configs */,
B6FF04772B6C08AC002C2C78 /* DefaultThemes */,
58F2EACE292FB2B0004A9BDE /* Documentation.docc */,
2BE487ED28245162003F3F64 /* OpenWithCodeEdit */,
284DC8502978BA2600BF2770 /* .all-contributorsrc */,
Expand All @@ -2635,7 +2577,6 @@
B658FB2E27DA9E0F00EA4DBD /* CodeEdit */ = {
isa = PBXGroup;
children = (
28069DA527F5BD320016BC47 /* DefaultThemes */,
5831E3C52933E6CB00D5A6D2 /* Features */,
D7211D4427E066D4008F2ED7 /* Localization */,
B658FB3527DA9E1000EA4DBD /* Preview Content */,
Expand Down Expand Up @@ -3155,32 +3096,15 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
B6D26E732B686DE300B4C14F /* Classic (Light).cetheme in Resources */,
B6D26E6F2B686DE300B4C14F /* Classic (Dark).cetheme in Resources */,
B6D26E712B686DE300B4C14F /* GitHub (Dark).cetheme in Resources */,
B6D26E752B686DE300B4C14F /* Default (Dark).cetheme in Resources */,
B6D26E792B686DE300B4C14F /* Basic.cetheme in Resources */,
B6D26E7B2B686DE300B4C14F /* Default (Light).cetheme in Resources */,
B6D26E7D2B686DE300B4C14F /* Solarized (Dark).cetheme in Resources */,
B6D26E6E2B686DE300B4C14F /* Solarized (Light).cetheme in Resources */,
B6FF04782B6C08AC002C2C78 /* DefaultThemes in Resources */,
283BDCBD2972EEBD002AFF81 /* Package.resolved in Resources */,
B6D26E6C2B686DE300B4C14F /* High Contrast (Light).cetheme in Resources */,
B658FB3727DA9E1000EA4DBD /* Preview Assets.xcassets in Resources */,
3E0196732A3921AC002648D8 /* codeedit_shell_integration.zsh in Resources */,
B6D26E6D2B686DE300B4C14F /* Presentation (Light).cetheme in Resources */,
B6D26E742B686DE300B4C14F /* Presentation (Dark).cetheme in Resources */,
B6D26E702B686DE300B4C14F /* Midnight.cetheme in Resources */,
58A5DFA529339F6400D1BD5D /* default_keybindings.json in Resources */,
B6D26E782B686DE300B4C14F /* GitHub (Light).cetheme in Resources */,
3E01967A2A392B45002648D8 /* codeedit_shell_integration.bash in Resources */,
D7211D4727E06BFE008F2ED7 /* Localizable.strings in Resources */,
B6D26E7A2B686DE300B4C14F /* Sunset.cetheme in Resources */,
B6D26E762B686DE300B4C14F /* Low Key.cetheme in Resources */,
B6D26E7C2B686DE300B4C14F /* Civic.cetheme in Resources */,
B6D26E722B686DE300B4C14F /* Dusk.cetheme in Resources */,
284DC8512978BA2600BF2770 /* .all-contributorsrc in Resources */,
B658FB3427DA9E1000EA4DBD /* Assets.xcassets in Resources */,
B6D26E772B686DE300B4C14F /* High Contrast (Dark).cetheme in Resources */,
6C6BD6FC29CD152400235D17 /* codeedit.extension.appextensionpoint in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Loading