Settings Search

CodeEdit.xcodeproj/project.pbxproj

@@ -330,6 +330,10 @@
 		6CFF967C29BEBD5200182D6F /* WindowCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CFF967B29BEBD5200182D6F /* WindowCommands.swift */; };
 		850C631029D6B01D00E1444C /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850C630F29D6B01D00E1444C /* SettingsView.swift */; };
 		850C631229D6B03400E1444C /* SettingsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850C631129D6B03400E1444C /* SettingsPage.swift */; };
+		85745D5B2A377CA400089AAB /* SettingsPageSetting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85745D5A2A377CA400089AAB /* SettingsPageSetting.swift */; };
+		85745D5D2A379FEC00089AAB /* String+camelCaseToProperWord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85745D5C2A379FEC00089AAB /* String+camelCaseToProperWord.swift */; };
+		85745D632A38F8D900089AAB /* String+highlightOccurrences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85745D622A38F8D900089AAB /* String+highlightOccurrences.swift */; };
+		85773E1E2A3E0A1F00C5D926 /* SettingsSearchResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85773E1D2A3E0A1F00C5D926 /* SettingsSearchResult.swift */; };
 		85CD0C5F2A10CC3200E531FD /* URL+isImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85CD0C5E2A10CC3200E531FD /* URL+isImage.swift */; };
 		B6041F4D29D7A4E9000F3454 /* SettingsPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6041F4C29D7A4E9000F3454 /* SettingsPageView.swift */; };
 		B6041F5229D7D6D6000F3454 /* SettingsWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6041F5129D7D6D6000F3454 /* SettingsWindow.swift */; };
@@ -774,6 +778,10 @@
 		6CFF967B29BEBD5200182D6F /* WindowCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowCommands.swift; sourceTree = "<group>"; };
 		850C630F29D6B01D00E1444C /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
 		850C631129D6B03400E1444C /* SettingsPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsPage.swift; sourceTree = "<group>"; };
+		85745D5A2A377CA400089AAB /* SettingsPageSetting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsPageSetting.swift; sourceTree = "<group>"; };
+		85745D5C2A379FEC00089AAB /* String+camelCaseToProperWord.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+camelCaseToProperWord.swift"; sourceTree = "<group>"; };
+		85745D622A38F8D900089AAB /* String+highlightOccurrences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+highlightOccurrences.swift"; sourceTree = "<group>"; };
+		85773E1D2A3E0A1F00C5D926 /* SettingsSearchResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsSearchResult.swift; sourceTree = "<group>"; };
 		85CD0C5E2A10CC3200E531FD /* URL+isImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+isImage.swift"; sourceTree = "<group>"; };
 		B6041F4C29D7A4E9000F3454 /* SettingsPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsPageView.swift; sourceTree = "<group>"; };
 		B6041F5129D7D6D6000F3454 /* SettingsWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsWindow.swift; sourceTree = "<group>"; };
@@ -1968,6 +1976,8 @@
 				D7E201AD27E8B3C000CB86D0 /* String+Ranges.swift */,
 				58D01C8D293167DC00C5B6B4 /* String+RemoveOccurrences.swift */,
 				58D01C8C293167DC00C5B6B4 /* String+SHA256.swift */,
+				85745D5C2A379FEC00089AAB /* String+camelCaseToProperWord.swift */,
+				85745D622A38F8D900089AAB /* String+highlightOccurrences.swift */,
 			);
 			path = String;
 			sourceTree = "<group>";
@@ -2198,6 +2208,8 @@
 				6CD03B6929FC773F001BD1D0 /* SettingsInjector.swift */,
 				6C0D0C6729E861B000AE4D3F /* SettingsSidebarFix.swift */,
 				850C631129D6B03400E1444C /* SettingsPage.swift */,
+				85745D5A2A377CA400089AAB /* SettingsPageSetting.swift */,
+				85773E1D2A3E0A1F00C5D926 /* SettingsSearchResult.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -2830,6 +2842,7 @@
 				587B9E7529301D8F00AC7927 /* String+QueryParameters.swift in Sources */,
 				58798219292D92370085B254 /* SearchModeModel.swift in Sources */,
 				B62AEDD72A27B3D0009A9F52 /* DebugAreaTabViewModel.swift in Sources */,
+				85773E1E2A3E0A1F00C5D926 /* SettingsSearchResult.swift in Sources */,
 				B66A4E4F29C917B8004573B4 /* WelcomeWindow.swift in Sources */,
 				58D01C9D293167DC00C5B6B4 /* KeychainSwiftAccessOptions.swift in Sources */,
 				B6E41C8B29DE7AE80088F9F4 /* AccountsSettingsSigninView.swift in Sources */,
@@ -2989,9 +3002,11 @@
 				58822530292C280D00E83CDE /* FilterTextField.swift in Sources */,
 				6C82D6B929BFE34900495C54 /* HelpCommands.swift in Sources */,
 				6C147C4929A32A080089B630 /* EditorView.swift in Sources */,
+				85745D5B2A377CA400089AAB /* SettingsPageSetting.swift in Sources */,
 				6C147C4129A328BF0089B630 /* TabGroup.swift in Sources */,
 				B6D7EA592971078500301FAC /* InspectorSection.swift in Sources */,
 				58F2EAEF292FB2B0004A9BDE /* ThemeSettingsView.swift in Sources */,
+				85745D632A38F8D900089AAB /* String+highlightOccurrences.swift in Sources */,
 				B6EE989027E8879A00CDD8AB /* InspectorSidebarView.swift in Sources */,
 				587B9DA229300ABD00AC7927 /* EffectView.swift in Sources */,
 				6C97EBCC2978760400302F95 /* AcknowledgementsWindowController.swift in Sources */,
@@ -3028,6 +3043,7 @@
 				6CFF967C29BEBD5200182D6F /* WindowCommands.swift in Sources */,
 				587B9E7229301D8F00AC7927 /* GitJSONPostRouter.swift in Sources */,
 				5878DAB0291D627C00DD95A3 /* PathBarMenu.swift in Sources */,
+				85745D5D2A379FEC00089AAB /* String+camelCaseToProperWord.swift in Sources */,
 				587B9DA529300ABD00AC7927 /* PressActionsModifier.swift in Sources */,
 				6C147C4029A328BC0089B630 /* SplitViewData.swift in Sources */,
 				587B9E9029301D8F00AC7927 /* BitBucketTokenRouter.swift in Sources */,

CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -39,7 +39,7 @@
     {
       "identity" : "codeedittextview",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/CodeEditApp/CodeEditTextView",
+      "location" : "https://github.com/CodeEditApp/CodeEditTextView.git",
       "state" : {
         "revision" : "8150e91dd81c698fde068e7cdf06a6f43d7ddd17",
         "version" : "0.6.4"
@@ -59,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/ChimeHQ/ConcurrencyPlus",
       "state" : {
-        "revision" : "8dc56499412a373d617d50d059116bccf44b9874",
-        "version" : "0.4.2"
+        "revision" : "b5ba8d5ea6bfe9e43ccc44aa63f9b458057fa0f4",
+        "version" : "0.4.1"
       }
     },
     {
@@ -221,8 +221,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/siteline/SwiftUI-Introspect",
       "state" : {
-        "revision" : "84196bab1c7f05ad8c3c2a5bfb3058b1211e189f",
-        "version" : "0.6.1"
+        "revision" : "5b3f3996c7a2a84d5f4ba0e03cd7d584154778f2",
+        "version" : "0.3.1"
       }
     },
     {

CodeEdit/Features/Settings/Models/SettingsData.swift

@@ -25,7 +25,7 @@ struct SettingsData: Codable, Hashable {
     /// The general global setting
     var general: GeneralSettings = .init()
 
-    /// The global settings for text editing
+    /// The global settings for accounts
     var accounts: AccountsSettings = .init()
 
     /// The global settings for themes
@@ -37,7 +37,7 @@ struct SettingsData: Codable, Hashable {
     /// The global settings for text editing
     var textEditing: TextEditingSettings = .init()
 
-    /// The global settings for text editing
+    /// The global settings for source control
     var sourceControl: SourceControlSettings = .init()
 
     /// The global settings for keybindings
@@ -60,4 +60,23 @@ struct SettingsData: Codable, Hashable {
         ) ?? .init()
         self.keybindings = try container.decodeIfPresent(KeybindingsSettings.self, forKey: .keybindings) ?? .init()
     }
+
+    func propertiesOf(_ value: Any) -> [SettingsPageSetting] {
+        var properties: [SettingsPageSetting] = []
+        let mirror = Mirror(reflecting: value)
+
+        guard let style = mirror.displayStyle, style == .struct else {
+            return [SettingsPageSetting(nameString: "Error")]
+        }
+
+        for (possibleLabel, _) in mirror.children {
+            guard let label = possibleLabel else {
+                continue
+            }
+
+            properties.append(SettingsPageSetting(nameString: label.camelCaseToProperWord()))
+        }
+
+        return properties
+    }
 }

CodeEdit/Features/Settings/Models/SettingsPage.swift

@@ -8,31 +8,31 @@
 import Foundation
 import SwiftUI
 
-/// A struct for a preferences tab
-struct SettingsPage: Hashable, Identifiable {
-    /// Default intializer
+/// A struct for a settings page
+struct SettingsPage: Hashable, Equatable, Identifiable {
+    /// Default initializer
     internal init(
         _ name: Name,
-        baseColor: Color? = nil,
-        icon: IconResource? = nil,
-        hideName: Bool? = false,
-        children: [SettingsPage] = []
+        baseColor: Color,
+        icon: IconResource,
+        isSetting: Bool = false,
+        displayName: String = ""
     ) {
-        self.children = children
         self.name = name
-        self.baseColor = baseColor ?? .red
-        self.icon = icon ?? .system("questionmark.app")
-        self.hideName = hideName
+        self.baseColor = baseColor
+        self.icon = icon
+        self.isSetting = isSetting
+        self.displayName = displayName
     }
 
-    var id: String { name.rawValue }
+    let id: UUID = UUID()
 
     let name: Name
     let baseColor: Color
-    let children: [SettingsPage]
-    let hideName: Bool?
+    let isSetting: Bool
+    let displayName: String
     var nameString: LocalizedStringKey { LocalizedStringKey(name.rawValue) }
-    let icon: IconResource?
+    let icon: IconResource
 
     /// A struct for a sidebar icon, with a base color and SF Symbol
     enum IconResource: Equatable, Hashable {
@@ -57,5 +57,4 @@ struct SettingsPage: Hashable, Identifiable {
         case location = "Locations"
         case advanced = "Advanced"
     }
-
 }

CodeEdit/Features/Settings/Models/SettingsPageSetting.swift

@@ -0,0 +1,19 @@
+//
+//  SettingsPageSetting.swift
+//  CodeEdit
+//
+//  Created by Raymond Vleeshouwer on 12/06/23.
+//
+
+import Foundation
+
+struct SettingsPageSetting: Hashable, Equatable, Identifiable {
+    internal init(
+        nameString: String
+    ) {
+        self.nameString = nameString
+    }
+
+    var id = UUID()
+    var nameString: String
+}

CodeEdit/Features/Settings/Models/SettingsSearchResult.swift

@@ -0,0 +1,25 @@
+//
+//  SettingsSearchResult.swift
+//  CodeEdit
+//
+//  Created by Raymond Vleeshouwer on 17/06/23.
+//
+
+import Foundation
+import SwiftUI
+
+// TODO: Extend this struct further to support setting "flashing"
+class SettingsSearchResult: Identifiable {
+    init(
+        pageFound: Bool,
+        pages: [SettingsPage]
+    ) {
+        self.pageFound = pageFound
+        self.pages = pages
+    }
+
+    let id: UUID = UUID()
+
+    let pageFound: Bool
+    let pages: [SettingsPage]
+}