Added isBundled flag to Theme. Added ability to import, duplicate, and delete themes.

Author: austincondiff

CodeEdit.xcodeproj/project.pbxproj

@@ -662,7 +662,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>"; };

CodeEdit/Features/Settings/Pages/ThemeSettings/Models/Theme.swift

@@ -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
 
@@ -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,
@@ -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

CodeEdit/Features/Settings/Pages/ThemeSettings/Models/ThemeModel.swift

@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import UniformTypeIdentifiers
 
 /// The Theme View Model. Accessible via the singleton "``ThemeModel/shared``".
 ///
@@ -199,6 +200,10 @@ final class ThemeModel: ObservableObject {
                         }
                     }
 
+                    theme.isBundled = fileURL.path.contains(bundledThemesURL.path)
+
+                    theme.fileURL = fileURL
+
                     // add the theme to themes array
                     self.themes.append(theme)
 
@@ -264,20 +269,19 @@ final class ThemeModel: ObservableObject {
     ///
     /// - Parameter theme: The theme to delete
     func delete(_ theme: Theme) {
-        let url = themesURL
-            .appendingPathComponent(theme.name)
-            .appendingPathExtension("cetheme")
-        do {
-            // remove the theme from the list
-            try filemanager.removeItem(at: url)
+        if let url = theme.fileURL {
+            do {
+                // remove the theme from the list
+                try filemanager.removeItem(at: url)
 
-            // remove from overrides in `settings.json`
-            Settings.shared.preferences.theme.overrides.removeValue(forKey: theme.name)
+                // remove from overrides in `settings.json`
+                Settings.shared.preferences.theme.overrides.removeValue(forKey: theme.name)
 
-            // reload themes
-            try self.loadThemes()
-        } catch {
-            print(error)
+                // reload themes
+                try self.loadThemes()
+            } catch {
+                print(error)
+            }
         }
     }
 
@@ -325,4 +329,61 @@ final class ThemeModel: ObservableObject {
             }
         }
     }
+
+    func importTheme() {
+        let openPanel = NSOpenPanel()
+        let allowedTypes = [UTType(filenameExtension: "cetheme")!]
+
+        openPanel.prompt = "Import"
+        openPanel.allowedContentTypes = allowedTypes
+        openPanel.canChooseFiles = true
+        openPanel.canChooseDirectories = false
+        openPanel.allowsMultipleSelection = false
+
+        openPanel.begin { result in
+            if result.rawValue == NSApplication.ModalResponse.OK.rawValue {
+                if let url = openPanel.urls.first {
+                    self.duplicate(url)
+                }
+            }
+        }
+    }
+
+    func duplicate(_ url: URL) {
+        do {
+            // Construct the destination file URL
+            var destinationFileURL = self.themesURL.appendingPathComponent(url.lastPathComponent)
+
+            // Check if the file already exists
+            var iterator = 1
+            while FileManager.default.fileExists(atPath: destinationFileURL.path) {
+                // Extract the base filename and extension
+                let fileExtension = destinationFileURL.pathExtension
+                var fileName = destinationFileURL.deletingPathExtension().lastPathComponent
+
+                // Remove any existing iterator
+                if let range = fileName.range(of: " \\d+$", options: .regularExpression) {
+                    fileName = String(fileName[..<range.lowerBound])
+                }
+
+                // Generate a new filename with an iterator
+                let newFileName = "\(fileName) \(iterator)"
+                destinationFileURL = self.themesURL.appendingPathComponent(newFileName).appendingPathExtension(fileExtension)
+                iterator += 1
+            }
+
+            // Copy the file from selected URL to the destination
+            try FileManager.default.copyItem(at: url, to: destinationFileURL)
+
+            try self.loadThemes()
+
+            if var newTheme = self.themes.first(where: { $0.fileURL == destinationFileURL }) {
+                newTheme.name = newTheme.fileURL?.lastPathComponent ?? ""
+                self.selectedTheme = newTheme
+            }
+        } catch {
+            print("Error adding theme: \(error.localizedDescription)")
+        }
+    }
+
 }

CodeEdit/Features/Settings/Pages/ThemeSettings/ThemeSettingThemeRow.swift

@@ -12,6 +12,8 @@ struct ThemeSettingsThemeRow: View {
     var active: Bool
     var action: (Theme) -> Void
 
+    @ObservedObject private var themeModel: ThemeModel = .shared
+
     @State private var presentingDetails: Bool = false
 
     @State private var isHovering = false
@@ -28,22 +30,40 @@ struct ThemeSettingsThemeRow: View {
                     .font(.footnote)
             }
             .frame(maxWidth: .infinity, alignment: .leading)
-            Button {
-                presentingDetails = true
-            } label: {
-                Text("Details...")
+            if !active {
+                Button {
+                    action(theme)
+                } label: {
+                    Text("Choose")
+                }
+                .buttonStyle(.bordered)
+                .opacity(isHovering ? 1 : 0)
             }
-            .buttonStyle(.bordered)
-            .opacity(isHovering ? 1 : 0)
             ThemeSettingsColorPreview(theme)
+            Menu {
+                Button("Details...") {
+                    presentingDetails = true
+                }
+                Button("Duplicate") {
+                    if let fileURL = theme.fileURL {
+                        themeModel.duplicate(fileURL)
+                    }
+                }
+                Divider()
+                Button("Delete") {
+                    themeModel.delete(theme)
+                }
+                .disabled(theme.isBundled)
+            } label: {
+                Image(systemName: "ellipsis.circle")
+                    .font(.system(size: 16))
+            }
+            .buttonStyle(.icon)
         }
         .padding(10)
         .onHover { hovering in
             isHovering = hovering
         }
-        .onTapGesture {
-            action(theme)
-        }
         .sheet(isPresented: $presentingDetails) {
             ThemeSettingsThemeDetails($theme)
         }

CodeEdit/Features/Settings/Pages/ThemeSettings/ThemeSettingsThemeDetails.swift

@@ -11,6 +11,9 @@ struct ThemeSettingsThemeDetails: View {
     @Environment(\.dismiss)
     var dismiss
 
+    @Environment(\.colorScheme)
+    var colorScheme
+
     @Binding var theme: Theme
 
     @State private var initialTheme: Theme
@@ -27,8 +30,15 @@ struct ThemeSettingsThemeDetails: View {
             Form {
                 Section {
                     TextField("Name", text: $theme.displayName)
+                    TextField("Author", text: $theme.author)
+                    Picker("Type", selection: $theme.appearance) {
+                        Text("Light")
+                            .tag(Theme.ThemeType.light)
+                        Text("Dark")
+                            .tag(Theme.ThemeType.dark)
+                    }
                 }
-                Section {
+                Section("Text") {
                     SettingsColorPicker(
                         "Text",
                         color: $theme.editor.text.swiftColor
@@ -42,7 +52,7 @@ struct ThemeSettingsThemeDetails: View {
                         color: $theme.editor.invisibles.swiftColor
                     )
                 }
-                Section {
+                Section("Background") {
                     SettingsColorPicker(
                         "Background",
                         color: $theme.editor.background.swiftColor
@@ -56,59 +66,66 @@ struct ThemeSettingsThemeDetails: View {
                         color: $theme.editor.selection.swiftColor
                     )
                 }
-                Section {
+                Section("Tokens") {
                     VStack(spacing: 0) {
                         ThemeSettingsThemeToken(
                             "Keywords",
                             color: $theme.editor.keywords.swiftColor
                         )
-                        Divider().padding(.leading, 10)
+                        Divider().padding(.horizontal, 10)
                         ThemeSettingsThemeToken(
                             "Commands",
                             color: $theme.editor.commands.swiftColor
                         )
-                        Divider().padding(.leading, 10)
+                        Divider().padding(.horizontal, 10)
                         ThemeSettingsThemeToken(
                             "Types",
                             color: $theme.editor.types.swiftColor
                         )
-                        Divider().padding(.leading, 10)
+                        Divider().padding(.horizontal, 10)
                         ThemeSettingsThemeToken(
                             "Attributes",
                             color: $theme.editor.attributes.swiftColor
                         )
-                        Divider().padding(.leading, 10)
+                        Divider().padding(.horizontal, 10)
                         ThemeSettingsThemeToken(
                             "Variables",
                             color: $theme.editor.variables.swiftColor
                         )
-                        Divider().padding(.leading, 10)
+                        Divider().padding(.horizontal, 10)
                         ThemeSettingsThemeToken(
                             "Values",
                             color: $theme.editor.values.swiftColor
                         )
-                        Divider().padding(.leading, 10)
+                        Divider().padding(.horizontal, 10)
                         ThemeSettingsThemeToken(
                             "Numbers",
                             color: $theme.editor.numbers.swiftColor
                         )
-                        Divider().padding(.leading, 10)
+                        Divider().padding(.horizontal, 10)
                         ThemeSettingsThemeToken(
                             "Strings",
                             color: $theme.editor.strings.swiftColor
                         )
-                        Divider().padding(.leading, 10)
+                        Divider().padding(.horizontal, 10)
                         ThemeSettingsThemeToken(
                             "Characters",
                             color: $theme.editor.characters.swiftColor
                         )
-                        Divider().padding(.leading, 10)
+                        Divider().padding(.horizontal, 10)
                         ThemeSettingsThemeToken(
                             "Comments",
                             color: $theme.editor.comments.swiftColor
                         )
                     }
+                    .background(theme.editor.background.swiftColor)
                     .padding(-10)
+                    .colorScheme(
+                        theme.appearance == .dark
+                        ? .dark
+                        : theme.appearance == .light
+                        ? .light : colorScheme
+                    )
                 }
             }.formStyle(.grouped)
             Divider()

CodeEdit/Features/Settings/Pages/ThemeSettings/ThemeSettingsThemeToken.swift

@@ -12,38 +12,49 @@ struct ThemeSettingsThemeToken: View {
     @Binding var color: Color
 
     @State private var isHovering = false
+    @State private var selectedColor: Color
     @State private var isBold = false
     @State private var isItalic = false
 
     init(_ label: String, color: Binding<Color>) {
         self.label = label
         self._color = color
+        self._selectedColor = State(initialValue: color.wrappedValue)
     }
 
     var body: some View {
-        SettingsColorPicker(
-            label,
-            color: $color
-        ) {
-            HStack(spacing: 8) {
-                Toggle(isOn: $isBold) {
-                    Image(systemName: "bold")
+        LabeledContent {
+            HStack(spacing: 16) {
+                HStack(spacing: 8) {
+                    Toggle(isOn: $isBold) {
+                        Image(systemName: "bold")
+                    }
+                    .toggleStyle(.icon)
+                    .help("Bold")
+                    Divider()
+                        .fixedSize()
+                    Toggle(isOn: $isItalic) {
+                        Image(systemName: "italic")
+                    }
+                    .toggleStyle(.icon)
+                    .help("Italic")
                 }
-                .toggleStyle(.icon)
-                .help("Bold")
-                Divider()
-                    .fixedSize()
-                Toggle(isOn: $isItalic) {
-                    Image(systemName: "italic")
-                }
-                .toggleStyle(.icon)
-                .help("Italic")
+                .opacity(isHovering || isBold || isItalic ? 1 : 0)
+                ColorPicker(selection: $selectedColor, supportsOpacity: false) { }
+                    .labelsHidden()
             }
-            .opacity(isHovering || isBold || isItalic ? 1 : 0)
+        } label: {
+            Text(label)
+                .font(.system(.body, design: .monospaced, weight: isBold ? .bold : .medium))
+                .foregroundStyle(color)
+                .italic(isItalic)
         }
         .padding(10)
         .onHover { hovering in
             isHovering = hovering
         }
+        .onChange(of: selectedColor) { newValue in
+            color = newValue
+        }
     }
 }