Skip to content

Import, duplicate and delete themes #1718

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 12 commits into from
Jun 26, 2024
Merged

Import, duplicate and delete themes #1718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b3f95e3
Put UI in place to configure theme tokens to be bold and or or italic…
austincondiff May 14, 2024
a66d3c6
Added isBundled flag to Theme. Added ability to import, duplicate, an…
austincondiff Jun 17, 2024
64f32b8
Renaming theme file when displayName is changed. Persisting changes t…
austincondiff Jun 18, 2024
5d78614
Changed theme details UI when adding theme, cancel deletes new theme …
austincondiff Jun 18, 2024
f8addd6
Removed dev text in theme details
austincondiff Jun 18, 2024
9f45dce
Sorting the keys in the JSON output when modifying a theme
austincondiff Jun 18, 2024
7598adb
Added delete button to theme details sheet
austincondiff Jun 18, 2024
1416830
PR Issues
austincondiff Jun 19, 2024
450b1cc
PR Issues
austincondiff Jun 19, 2024
f88a81a
Moved view functions to ThemeModel
austincondiff Jun 24, 2024
225521a
Storing and updating colorScheme in ThemeModel because otherwise it w…
austincondiff Jun 24, 2024
e85a8ef
Update Theme While Editing, Warnings
thecoolwinter Jun 26, 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
10 changes: 9 additions & 1 deletion CodeEdit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,7 @@
B61A606129F188AB009B43F9 /* ExternalLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = B61A606029F188AB009B43F9 /* ExternalLink.swift */; };
B61A606929F4481A009B43F9 /* MonospacedFontPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B61A606829F4481A009B43F9 /* MonospacedFontPicker.swift */; };
B61DA9DF29D929E100BF4A43 /* GeneralSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B61DA9DE29D929E100BF4A43 /* GeneralSettingsView.swift */; };
B62423302C21EE280096668B /* ThemeModel+CRUD.swift in Sources */ = {isa = PBXBuildFile; fileRef = B624232F2C21EE280096668B /* ThemeModel+CRUD.swift */; };
B628B7932B18369800F9775A /* GitClient+Validate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B628B7922B18369800F9775A /* GitClient+Validate.swift */; };
B628B7B72B223BAD00F9775A /* FindModePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B628B7B62B223BAD00F9775A /* FindModePicker.swift */; };
B62AEDAA2A1FCBE5009A9F52 /* AreaTabBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B62AEDA92A1FCBE5009A9F52 /* AreaTabBar.swift */; };
Expand Down Expand Up @@ -519,6 +520,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 */; };
B6FA3F882BF41C940023DE9C /* ThemeSettingsThemeToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6FA3F872BF41C940023DE9C /* ThemeSettingsThemeToken.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 */; };
Expand Down Expand Up @@ -689,7 +691,7 @@
5878DA81291863F900DD95A3 /* AcknowledgementsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AcknowledgementsView.swift; sourceTree = "<group>"; };
5878DA832918642000DD95A3 /* ParsePackagesResolved.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParsePackagesResolved.swift; sourceTree = "<group>"; };
5878DA862918642F00DD95A3 /* AcknowledgementsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AcknowledgementsViewModel.swift; sourceTree = "<group>"; };
5878DAA1291AE76700DD95A3 /* QuickOpenView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuickOpenView.swift; sourceTree = "<group>"; };
5878DAA1291AE76700DD95A3 /* QuickOpenView.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = QuickOpenView.swift; sourceTree = "<group>"; wrapsLines = 1; };
5878DAA2291AE76700DD95A3 /* QuickOpenPreviewView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuickOpenPreviewView.swift; sourceTree = "<group>"; };
5878DAA3291AE76700DD95A3 /* QuickOpenViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuickOpenViewModel.swift; sourceTree = "<group>"; };
5878DAA4291AE76700DD95A3 /* QuickOpenItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuickOpenItem.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1012,6 +1014,7 @@
B61A606029F188AB009B43F9 /* ExternalLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExternalLink.swift; sourceTree = "<group>"; };
B61A606829F4481A009B43F9 /* MonospacedFontPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonospacedFontPicker.swift; sourceTree = "<group>"; };
B61DA9DE29D929E100BF4A43 /* GeneralSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralSettingsView.swift; sourceTree = "<group>"; };
B624232F2C21EE280096668B /* ThemeModel+CRUD.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ThemeModel+CRUD.swift"; sourceTree = "<group>"; };
B628B7922B18369800F9775A /* GitClient+Validate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GitClient+Validate.swift"; sourceTree = "<group>"; };
B628B7B62B223BAD00F9775A /* FindModePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindModePicker.swift; sourceTree = "<group>"; };
B62AEDA92A1FCBE5009A9F52 /* AreaTabBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AreaTabBar.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1096,6 +1099,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>"; };
B6FA3F872BF41C940023DE9C /* ThemeSettingsThemeToken.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeSettingsThemeToken.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>"; };
Expand Down Expand Up @@ -2285,6 +2289,7 @@
B6EA1FF729DB78DB001BF195 /* ThemeSettingThemeRow.swift */,
B6EA1FFA29DB78F6001BF195 /* ThemeSettingsThemeDetails.swift */,
B6EA1FFC29DB792C001BF195 /* ThemeSettingsColorPreview.swift */,
B6FA3F872BF41C940023DE9C /* ThemeSettingsThemeToken.swift */,
);
path = ThemeSettings;
sourceTree = "<group>";
Expand Down Expand Up @@ -3100,6 +3105,7 @@
children = (
58F2EAE0292FB2B0004A9BDE /* ThemeSettings.swift */,
B6EA1FE429DA33DB001BF195 /* ThemeModel.swift */,
B624232F2C21EE280096668B /* ThemeModel+CRUD.swift */,
B6EA1FE629DA341D001BF195 /* Theme.swift */,
);
path = Models;
Expand Down Expand Up @@ -3568,6 +3574,7 @@
58798219292D92370085B254 /* SearchModeModel.swift in Sources */,
6C5C891B2A3F736500A94FE1 /* FocusedValues.swift in Sources */,
611192062B08CCF600D4459B /* SearchIndexer+Add.swift in Sources */,
B62423302C21EE280096668B /* ThemeModel+CRUD.swift in Sources */,
B62AEDD72A27B3D0009A9F52 /* UtilityAreaTabViewModel.swift in Sources */,
85773E1E2A3E0A1F00C5D926 /* SettingsSearchResult.swift in Sources */,
B66A4E4F29C917B8004573B4 /* WelcomeWindow.swift in Sources */,
Expand Down Expand Up @@ -3814,6 +3821,7 @@
58798236292E30B90085B254 /* FeedbackType.swift in Sources */,
587B9E6D29301D8F00AC7927 /* GitLabEventNote.swift in Sources */,
587B9E9129301D8F00AC7927 /* BitBucketOAuthRouter.swift in Sources */,
B6FA3F882BF41C940023DE9C /* ThemeSettingsThemeToken.swift in Sources */,
B6E41C7429DD40010088F9F4 /* View+HideSidebarToggle.swift in Sources */,
611191FA2B08CC9000D4459B /* SearchIndexer.swift in Sources */,
58822532292C280D00E83CDE /* UtilityAreaViewModel.swift in Sources */,
Expand Down
28 changes: 12 additions & 16 deletions CodeEdit/Features/Editor/Views/CodeFileView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ struct CodeFileView: View {

@EnvironmentObject private var editorManager: EditorManager

@StateObject private var themeModel: ThemeModel = .shared
@ObservedObject private var themeModel: ThemeModel = .shared

private var cancellables = Set<AnyCancellable>()

Expand Down Expand Up @@ -77,7 +77,9 @@ struct CodeFileView: View {
codeFile.undoManager = self.undoManager.manager
}

@State private var selectedTheme = ThemeModel.shared.selectedTheme ?? ThemeModel.shared.themes.first!
private var currentTheme: Theme {
themeModel.selectedTheme ?? themeModel.themes.first!
}

@State private var font: NSFont = Settings[\.textEditing].font.current

Expand Down Expand Up @@ -107,7 +109,7 @@ struct CodeFileView: View {
CodeEditSourceEditor(
codeFile.content ?? NSTextStorage(),
language: getLanguage(),
theme: selectedTheme.editor.editorTheme,
theme: currentTheme.editor.editorTheme,
font: font,
tabWidth: codeFile.defaultTabWidth ?? defaultTabWidth,
indentOption: (codeFile.indentOption ?? indentOption).textViewOption(),
Expand All @@ -131,17 +133,9 @@ struct CodeFileView: View {
EffectView(.contentBackground)
}
}
.colorScheme(
selectedTheme.appearance == .dark
? .dark
: .light
)
.colorScheme(currentTheme.appearance == .dark ? .dark : .light)
// minHeight zero fixes a bug where the app would freeze if the contents of the file are empty.
.frame(minHeight: .zero, maxHeight: .infinity)
.onChange(of: themeModel.selectedTheme) { newValue in
guard let theme = newValue else { return }
self.selectedTheme = theme
}
.onChange(of: settingsFont) { newFontSetting in
font = newFontSetting.current
}
Expand All @@ -162,10 +156,12 @@ struct CodeFileView: View {
}

private func getBracketPairHighlight() -> BracketPairHighlight? {
let theme = ThemeModel.shared.selectedTheme ?? ThemeModel.shared.themes.first!
let color = Settings[\.textEditing].bracketHighlight.useCustomColor
? Settings[\.textEditing].bracketHighlight.color.nsColor
: theme.editor.text.nsColor.withAlphaComponent(0.8)
let color = if Settings[\.textEditing].bracketHighlight.useCustomColor {
Settings[\.textEditing].bracketHighlight.color.nsColor
} else {
currentTheme.editor.text.nsColor.withAlphaComponent(0.8)
}

switch Settings[\.textEditing].bracketHighlight.highlightType {
case .disabled:
return nil
Expand Down
8 changes: 8 additions & 0 deletions CodeEdit/Features/Settings/Pages/ThemeSettings/Models/Theme.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ struct Theme: Identifiable, Codable, Equatable, Hashable, Loopable {
/// An URL for reference
var distributionURL: String

/// If the theme is bundled with CodeEdit or not
var isBundled: Bool = false

/// The URL for the theme file
var fileURL: URL?

/// The `unique name` of the theme
var name: String

Expand Down Expand Up @@ -66,6 +72,7 @@ struct Theme: Identifiable, Codable, Equatable, Hashable, Loopable {
license: String,
metadataDescription: String,
distributionURL: String,
isBundled: Bool,
name: String,
displayName: String,
appearance: ThemeType,
Expand All @@ -75,6 +82,7 @@ struct Theme: Identifiable, Codable, Equatable, Hashable, Loopable {
self.license = license
self.metadataDescription = metadataDescription
self.distributionURL = distributionURL
self.isBundled = isBundled
self.name = name
self.displayName = displayName
self.appearance = appearance
Expand Down
Loading