Merge branch 'feature/font-picker' into develop

Author: intitni

Core/Sources/ChatGPTChatTab/ChatPanel.swift

@@ -533,12 +533,12 @@ struct ChatPanel_EmptyChat_Preview: PreviewProvider {
 
 struct ChatCodeSyntaxHighlighter: CodeSyntaxHighlighter {
     let brightMode: Bool
-    let fontSize: Double
+    let font: NSFont
     let colorChange: Color?
 
-    init(brightMode: Bool, fontSize: Double, colorChange: Color?) {
+    init(brightMode: Bool, font: NSFont, colorChange: Color?) {
         self.brightMode = brightMode
-        self.fontSize = fontSize
+        self.font = font
         self.colorChange = colorChange
     }
 
@@ -548,7 +548,7 @@ struct ChatCodeSyntaxHighlighter: CodeSyntaxHighlighter {
             language: language ?? "",
             scenario: "chat",
             brightMode: brightMode,
-            fontSize: fontSize
+            font: font
         )
         return Text(AttributedString(content))
     }

Core/Sources/ChatGPTChatTab/Styles.swift

@@ -81,7 +81,7 @@ struct ThemedMarkdownText: View {
     @AppStorage(\.codeForegroundColorDark) var codeForegroundColorDark
     @AppStorage(\.codeBackgroundColorDark) var codeBackgroundColorDark
     @AppStorage(\.chatFontSize) var chatFontSize
-    @AppStorage(\.chatCodeFontSize) var chatCodeFontSize
+    @AppStorage(\.chatCodeFont) var chatCodeFont
     @Environment(\.colorScheme) var colorScheme
 
     let text: String
@@ -122,7 +122,7 @@ struct ThemedMarkdownText: View {
             .markdownCodeSyntaxHighlighter(
                 ChatCodeSyntaxHighlighter(
                     brightMode: colorScheme != .dark,
-                    fontSize: chatCodeFontSize,
+                    font: chatCodeFont.value.nsFont,
                     colorChange: colorScheme == .dark
                         ? codeForegroundColorDark.value?.swiftUIColor
                         : codeForegroundColorLight.value?.swiftUIColor

Core/Sources/HostApp/FeatureSettings/ChatSettingsView.swift

@@ -13,7 +13,7 @@ struct ChatSettingsView: View {
         @AppStorage(\.chatGPTTemperature) var chatGPTTemperature
         @AppStorage(\.chatGPTMaxMessageCount) var chatGPTMaxMessageCount
         @AppStorage(\.chatFontSize) var chatFontSize
-        @AppStorage(\.chatCodeFontSize) var chatCodeFontSize
+        @AppStorage(\.chatCodeFont) var chatCodeFont
 
         @AppStorage(\.defaultChatFeatureChatModelId) var defaultChatFeatureChatModelId
         @AppStorage(\.defaultChatSystemPrompt) var defaultChatSystemPrompt
@@ -150,17 +150,8 @@ struct ChatSettingsView: View {
                 Text("pt")
             }
 
-            HStack {
-                TextField(text: .init(get: {
-                    "\(Int(settings.chatCodeFontSize))"
-                }, set: {
-                    settings.chatCodeFontSize = Double(Int($0) ?? 0)
-                })) {
-                    Text("Font size of code block")
-                }
-                .textFieldStyle(.roundedBorder)
-
-                Text("pt")
+            FontPicker(font: $settings.chatCodeFont) {
+                Text("Font of code")
             }
 
             Toggle(isOn: $settings.wrapCodeInCodeBlock) {

Core/Sources/HostApp/FeatureSettings/PromptToCodeSettingsView.swift

@@ -10,8 +10,8 @@ struct PromptToCodeSettingsView: View {
     final class Settings: ObservableObject {
         @AppStorage(\.hideCommonPrecedingSpacesInPromptToCode)
         var hideCommonPrecedingSpaces
-        @AppStorage(\.promptToCodeCodeFontSize)
-        var fontSize
+        @AppStorage(\.promptToCodeCodeFont)
+        var font
         @AppStorage(\.promptToCodeGenerateDescription)
         var promptToCodeGenerateDescription
         @AppStorage(\.promptToCodeGenerateDescriptionInUserPreferredLanguage)
@@ -91,24 +91,15 @@ struct PromptToCodeSettingsView: View {
                     Text("Hide Common Preceding Spaces")
                 }
 
-                HStack {
-                    TextField(text: .init(get: {
-                        "\(Int(settings.fontSize))"
-                    }, set: {
-                        settings.fontSize = Double(Int($0) ?? 0)
-                    })) {
-                        Text("Font size of suggestion code")
-                    }
-                    .textFieldStyle(.roundedBorder)
-
-                    Text("pt")
-                }
-
                 #if canImport(ProHostApp)
 
                 CodeHighlightThemePicker(scenario: .promptToCode)
 
                 #endif
+                
+                FontPicker(font: $settings.font) {
+                    Text("Font")
+                }
             }
 
             ScopeForm()

Core/Sources/HostApp/FeatureSettings/SuggestionSettingsView.swift

@@ -46,8 +46,8 @@ struct SuggestionSettingsView: View {
         var suggestionFeatureEnabledProjectList
         @AppStorage(\.hideCommonPrecedingSpacesInSuggestion)
         var hideCommonPrecedingSpacesInSuggestion
-        @AppStorage(\.suggestionCodeFontSize)
-        var suggestionCodeFontSize
+        @AppStorage(\.suggestionCodeFont)
+        var font
         @AppStorage(\.suggestionFeatureProvider)
         var suggestionFeatureProvider
         @AppStorage(\.suggestionDisplayCompactMode)
@@ -247,24 +247,15 @@ struct SuggestionSettingsView: View {
                 Text("Hide Common Preceding Spaces")
             }
 
-            HStack {
-                TextField(text: .init(get: {
-                    "\(Int(settings.suggestionCodeFontSize))"
-                }, set: {
-                    settings.suggestionCodeFontSize = Double(Int($0) ?? 0)
-                })) {
-                    Text("Font size of suggestion code")
-                }
-                .textFieldStyle(.roundedBorder)
-
-                Text("pt")
-            }
-
             #if canImport(ProHostApp)
 
             CodeHighlightThemePicker(scenario: .suggestion)
-            
+
             #endif
+
+            FontPicker(font: $settings.font) {
+                Text("Font")
+            }
         }
     }
 }

Core/Sources/HostApp/FeatureSettings/TerminalSettingsView.swift

@@ -0,0 +1,27 @@
+import Preferences
+import SharedUIComponents
+import SwiftUI
+
+#if canImport(ProHostApp)
+import ProHostApp
+#endif
+
+struct TerminalSettingsView: View {
+    class Settings: ObservableObject {
+        @AppStorage(\.terminalFont) var terminalFont
+        init() {}
+    }
+    
+    @StateObject var settings = Settings()
+    
+    var body: some View {
+        ScrollView {
+            Form {
+                FontPicker(font: $settings.terminalFont) {
+                    Text("Font of code")
+                }
+            }
+        }
+                
+    }
+}

Core/Sources/HostApp/FeatureSettingsView.swift

@@ -34,6 +34,18 @@ struct FeatureSettingsView: View {
                 subtitle: "Write code with natural language",
                 image: "paintbrush"
             )
+            
+//            #if canImport(ProHostApp)
+//            ScrollView {
+//                TerminalSettingsView().padding()
+//            }
+//            .sidebarItem(
+//                tag: 3,
+//                title: "Terminal",
+//                subtitle: "Terminal chat tab",
+//                image: "terminal"
+//            )
+//            #endif
         }
     }
 }

Core/Sources/SuggestionWidget/SuggestionPanelContent/CodeBlockSuggestionPanel.swift

@@ -4,7 +4,7 @@ import SwiftUI
 struct CodeBlockSuggestionPanel: View {
     @ObservedObject var suggestion: CodeSuggestionProvider
     @Environment(\.colorScheme) var colorScheme
-    @AppStorage(\.suggestionCodeFontSize) var fontSize
+    @AppStorage(\.suggestionCodeFont) var codeFont
     @AppStorage(\.suggestionDisplayCompactMode) var suggestionDisplayCompactMode
     @AppStorage(\.suggestionPresentationMode) var suggestionPresentationMode
     @AppStorage(\.hideCommonPrecedingSpacesInSuggestion) var hideCommonPrecedingSpaces
@@ -108,7 +108,7 @@ struct CodeBlockSuggestionPanel: View {
                     startLineIndex: suggestion.startLineIndex,
                     scenario: "suggestion",
                     colorScheme: colorScheme,
-                    fontSize: fontSize,
+                    font: codeFont.value.nsFont,
                     droppingLeadingSpaces: hideCommonPrecedingSpaces,
                     proposedForegroundColor: {
                         if syncHighlightTheme {

Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanel.swift

@@ -202,7 +202,7 @@ extension PromptToCodePanel {
     struct Content: View {
         let store: StoreOf<PromptToCode>
         @Environment(\.colorScheme) var colorScheme
-        @AppStorage(\.promptToCodeCodeFontSize) var fontSize
+        @AppStorage(\.promptToCodeCodeFont) var codeFont
         @AppStorage(\.hideCommonPrecedingSpacesInPromptToCode) var hideCommonPrecedingSpaces
         @AppStorage(\.syncPromptToCodeHighlightTheme) var syncHighlightTheme
         @AppStorage(\.codeForegroundColorLight) var codeForegroundColorLight
@@ -312,7 +312,7 @@ extension PromptToCodePanel {
                                 colorScheme: colorScheme,
                                 firstLinePrecedingSpaceCount: viewStore.state
                                     .firstLinePrecedingSpaceCount,
-                                fontSize: fontSize, 
+                                font: codeFont.value.nsFont,
                                 droppingLeadingSpaces: hideCommonPrecedingSpaces,
                                 proposedForegroundColor:codeForegroundColor
                             )