Adjust UI

Core/Sources/HostApp/AccountSettings/CodeiumView.swift

@@ -1,5 +1,6 @@
 import CodeiumService
 import Foundation
+import SharedUIComponents
 import SwiftUI
 
 struct CodeiumView: View {
@@ -220,7 +221,7 @@ struct CodeiumView: View {
                     .stroke(Color(nsColor: .separatorColor), style: .init(lineWidth: 1))
             }
 
-            Divider()
+            SettingsDivider("Advanced")
 
             Form {
                 Toggle("Verbose Log", isOn: $viewModel.codeiumVerboseLog)

Core/Sources/HostApp/AccountSettings/GitHubCopilotView.swift

@@ -270,7 +270,7 @@ struct GitHubCopilotView: View {
                         .stroke(Color(nsColor: .separatorColor), style: .init(lineWidth: 1))
                 }
 
-                Divider()
+                SettingsDivider("Advanced")
 
                 Form {
                     Toggle(
@@ -287,7 +287,7 @@ struct GitHubCopilotView: View {
                     Toggle("Verbose Log", isOn: $settings.gitHubCopilotVerboseLog)
                 }
 
-                Divider()
+                SettingsDivider("Proxy")
 
                 Form {
                     TextField(

Core/Sources/HostApp/FeatureSettings/ChatSettingsView.swift

@@ -14,8 +14,7 @@ struct ChatSettingsView: View {
         @AppStorage(\.chatGPTMaxMessageCount) var chatGPTMaxMessageCount
         @AppStorage(\.chatFontSize) var chatFontSize
         @AppStorage(\.chatCodeFontSize) var chatCodeFontSize
-        @AppStorage(\.maxFocusedCodeLineCount)
-        var maxFocusedCodeLineCount
+
         @AppStorage(\.defaultChatFeatureChatModelId) var defaultChatFeatureChatModelId
         @AppStorage(\.defaultChatSystemPrompt) var defaultChatSystemPrompt
         @AppStorage(\.chatSearchPluginMaxIterations) var chatSearchPluginMaxIterations
@@ -37,8 +36,6 @@ struct ChatSettingsView: View {
             chatSettingsForm
             SettingsDivider("UI")
             uiForm
-            SettingsDivider("Context")
-            contextForm
             SettingsDivider("Plugin")
             pluginForm
             ScopeForm()
@@ -171,24 +168,6 @@ struct ChatSettingsView: View {
         }
     }
 
-    @ViewBuilder
-    var contextForm: some View {
-        Form {
-            HStack {
-                TextField(text: .init(get: {
-                    "\(Int(settings.maxFocusedCodeLineCount))"
-                }, set: {
-                    settings.maxFocusedCodeLineCount = Int($0) ?? 0
-                })) {
-                    Text("Max focused code line count in chat context")
-                }
-                .textFieldStyle(.roundedBorder)
-
-                Text("lines")
-            }
-        }
-    }
-
     @ViewBuilder
     var pluginForm: some View {
         Form {
@@ -255,6 +234,8 @@ struct ChatSettingsView: View {
             @AppStorage(\.preferredChatModelIdForWebScope)
             var preferredChatModelIdForWebScope: String
             @AppStorage(\.chatModels) var chatModels
+            @AppStorage(\.maxFocusedCodeLineCount)
+            var maxFocusedCodeLineCount
 
             init() {}
         }
@@ -282,6 +263,19 @@ struct ChatSettingsView: View {
                         Toggle(isOn: $settings.enableCodeScopeByDefaultInChatContext) {
                             Text("Enable @code scope by default in chat context.")
                         }
+
+                        HStack {
+                            TextField(text: .init(get: {
+                                "\(Int(settings.maxFocusedCodeLineCount))"
+                            }, set: {
+                                settings.maxFocusedCodeLineCount = Int($0) ?? 0
+                            })) {
+                                Text("Max focused code")
+                            }
+                            .textFieldStyle(.roundedBorder)
+
+                            Text("lines")
+                        }
                     }
                 }
 
@@ -322,7 +316,6 @@ struct ChatSettingsView: View {
                             }
                         }
                     }
-                    .padding(.top, 20)
                 }
 
                 Scope(
@@ -334,7 +327,7 @@ struct ChatSettingsView: View {
                             Toggle(isOn: $settings.enableProjectScopeByDefaultInChatContext) {
                                 Text("Enable @project scope by default in chat context.")
                             }
-                            
+
                             Picker(
                                 "Preferred Chat Model",
                                 selection: $settings.preferredChatModelIdForProjectScope
@@ -372,7 +365,7 @@ struct ChatSettingsView: View {
                         Toggle(isOn: $settings.enableWebScopeByDefaultInChatContext) {
                             Text("Enable @web scope by default in chat context.")
                         }
-                        
+
                         Picker(
                             "Preferred Chat Model",
                             selection: $settings.preferredChatModelIdForWebScope
@@ -412,15 +405,13 @@ struct ChatSettingsView: View {
                     Text(description)
                         .multilineTextAlignment(.center)
                         .foregroundStyle(.secondary)
+                        .frame(maxWidth: .infinity)
                         .padding(8)
                         .background {
                             RoundedRectangle(cornerRadius: 8)
                                 .fill(Color.secondary.opacity(0.1))
                         }
-                        .frame(maxWidth: 500)
-                    Form {
-                        content()
-                    }
+                    content()
                 }
             }
         }

Core/Sources/HostApp/FeatureSettings/PromptToCodeSettingsView.swift

@@ -1,3 +1,4 @@
+import SharedUIComponents
 import SwiftUI
 
 struct PromptToCodeSettingsView: View {
@@ -30,7 +31,7 @@ struct PromptToCodeSettingsView: View {
                     selection: $settings.promptToCodeChatModelId
                 ) {
                     Text("Same as Chat Feature").tag("")
-                    
+
                     if !settings.chatModels
                         .contains(where: { $0.id == settings.promptToCodeChatModelId }),
                         !settings.promptToCodeChatModelId.isEmpty
@@ -52,7 +53,7 @@ struct PromptToCodeSettingsView: View {
                     selection: $settings.promptToCodeEmbeddingModelId
                 ) {
                     Text("Same as Chat Feature").tag("")
-                    
+
                     if !settings.embeddingModels
                         .contains(where: { $0.id == settings.promptToCodeEmbeddingModelId }),
                         !settings.promptToCodeEmbeddingModelId.isEmpty
@@ -78,16 +79,7 @@ struct PromptToCodeSettingsView: View {
                 }
             }
 
-            Divider()
-
-            Text("Mirroring Settings of Suggestion Feature")
-                .foregroundColor(.white)
-                .padding(.vertical, 2)
-                .padding(.horizontal, 8)
-                .background(
-                    Color.accentColor,
-                    in: RoundedRectangle(cornerRadius: 20)
-                )
+            SettingsDivider("Mirroring Settings of Suggestion Feature")
 
             Form {
                 Toggle(isOn: $settings.hideCommonPrecedingSpacesInSuggestion) {

Core/Sources/HostApp/FeatureSettings/SuggestionSettingsView.swift

@@ -1,4 +1,5 @@
 import Preferences
+import SharedUIComponents
 import SwiftUI
 
 #if canImport(ProHostApp)
@@ -36,112 +37,109 @@ struct SuggestionSettingsView: View {
 
     var body: some View {
         Form {
-            Group {
-                Picker(selection: $settings.suggestionPresentationMode) {
-                    ForEach(PresentationMode.allCases, id: \.rawValue) {
-                        switch $0 {
-                        case .nearbyTextCursor:
-                            Text("Nearby Text Cursor").tag($0)
-                        case .floatingWidget:
-                            Text("Floating Widget").tag($0)
-                        }
+            Picker(selection: $settings.suggestionPresentationMode) {
+                ForEach(PresentationMode.allCases, id: \.rawValue) {
+                    switch $0 {
+                    case .nearbyTextCursor:
+                        Text("Nearby Text Cursor").tag($0)
+                    case .floatingWidget:
+                        Text("Floating Widget").tag($0)
                     }
-                } label: {
-                    Text("Presentation")
                 }
+            } label: {
+                Text("Presentation")
+            }
 
-                Picker(selection: $settings.suggestionFeatureProvider) {
-                    ForEach(SuggestionFeatureProvider.allCases, id: \.rawValue) {
-                        switch $0 {
-                        case .gitHubCopilot:
-                            Text("GitHub Copilot").tag($0)
-                        case .codeium:
-                            Text("Codeium").tag($0)
-                        }
+            Picker(selection: $settings.suggestionFeatureProvider) {
+                ForEach(SuggestionFeatureProvider.allCases, id: \.rawValue) {
+                    switch $0 {
+                    case .gitHubCopilot:
+                        Text("GitHub Copilot").tag($0)
+                    case .codeium:
+                        Text("Codeium").tag($0)
                     }
-                } label: {
-                    Text("Feature Provider")
                 }
+            } label: {
+                Text("Feature Provider")
+            }
 
-                Toggle(isOn: $settings.realtimeSuggestionToggle) {
-                    Text("Real-time Suggestion")
-                }
+            Toggle(isOn: $settings.realtimeSuggestionToggle) {
+                Text("Real-time Suggestion")
+            }
 
-                #if canImport(ProHostApp)
-                WithFeatureEnabled(\.tabToAcceptSuggestion) {
-                    Toggle(isOn: $settings.acceptSuggestionWithTab) {
-                        Text("Accept Suggestion with Tab")
-                    }
+            #if canImport(ProHostApp)
+            WithFeatureEnabled(\.tabToAcceptSuggestion) {
+                Toggle(isOn: $settings.acceptSuggestionWithTab) {
+                    Text("Accept Suggestion with Tab")
                 }
-                #endif
-
-                HStack {
-                    Toggle(isOn: $settings.disableSuggestionFeatureGlobally) {
-                        Text("Disable Suggestion Feature Globally")
-                    }
+            }
+            #endif
 
-                    Button("Exception List") {
-                        isSuggestionFeatureEnabledListPickerOpen = true
-                    }
-                }.sheet(isPresented: $isSuggestionFeatureEnabledListPickerOpen) {
-                    SuggestionFeatureEnabledProjectListView(
-                        isOpen: $isSuggestionFeatureEnabledListPickerOpen
-                    )
+            HStack {
+                Toggle(isOn: $settings.disableSuggestionFeatureGlobally) {
+                    Text("Disable Suggestion Feature Globally")
                 }
 
-                HStack {
-                    Button("Disabled Language List") {
-                        isSuggestionFeatureDisabledLanguageListViewOpen = true
-                    }
-                }.sheet(isPresented: $isSuggestionFeatureDisabledLanguageListViewOpen) {
-                    SuggestionFeatureDisabledLanguageListView(
-                        isOpen: $isSuggestionFeatureDisabledLanguageListViewOpen
-                    )
+                Button("Exception List") {
+                    isSuggestionFeatureEnabledListPickerOpen = true
                 }
+            }.sheet(isPresented: $isSuggestionFeatureEnabledListPickerOpen) {
+                SuggestionFeatureEnabledProjectListView(
+                    isOpen: $isSuggestionFeatureEnabledListPickerOpen
+                )
+            }
 
-                HStack {
-                    Slider(value: $settings.realtimeSuggestionDebounce, in: 0...2, step: 0.1) {
-                        Text("Real-time Suggestion Debounce")
-                    }
+            HStack {
+                Button("Disabled Language List") {
+                    isSuggestionFeatureDisabledLanguageListViewOpen = true
+                }
+            }.sheet(isPresented: $isSuggestionFeatureDisabledLanguageListViewOpen) {
+                SuggestionFeatureDisabledLanguageListView(
+                    isOpen: $isSuggestionFeatureDisabledLanguageListViewOpen
+                )
+            }
 
-                    Text(
-                        "\(settings.realtimeSuggestionDebounce.formatted(.number.precision(.fractionLength(2))))s"
-                    )
-                    .font(.body)
-                    .monospacedDigit()
-                    .padding(.vertical, 2)
-                    .padding(.horizontal, 6)
-                    .background(
-                        RoundedRectangle(cornerRadius: 4, style: .continuous)
-                            .fill(Color.primary.opacity(0.1))
-                    )
+            HStack {
+                Slider(value: $settings.realtimeSuggestionDebounce, in: 0...2, step: 0.1) {
+                    Text("Real-time Suggestion Debounce")
                 }
 
-                Divider()
+                Text(
+                    "\(settings.realtimeSuggestionDebounce.formatted(.number.precision(.fractionLength(2))))s"
+                )
+                .font(.body)
+                .monospacedDigit()
+                .padding(.vertical, 2)
+                .padding(.horizontal, 6)
+                .background(
+                    RoundedRectangle(cornerRadius: 4, style: .continuous)
+                        .fill(Color.primary.opacity(0.1))
+                )
             }
+        }
 
-            Group {
-                Toggle(isOn: $settings.suggestionDisplayCompactMode) {
-                    Text("Hide Buttons")
-                }
+        SettingsDivider("UI")
 
-                Toggle(isOn: $settings.hideCommonPrecedingSpacesInSuggestion) {
-                    Text("Hide Common Preceding Spaces")
-                }
+        Form {
+            Toggle(isOn: $settings.suggestionDisplayCompactMode) {
+                Text("Hide Buttons")
+            }
 
-                HStack {
-                    TextField(text: .init(get: {
-                        "\(Int(settings.suggestionCodeFontSize))"
-                    }, set: {
-                        settings.suggestionCodeFontSize = Double(Int($0) ?? 0)
-                    })) {
-                        Text("Font size of suggestion code")
-                    }
-                    .textFieldStyle(.roundedBorder)
+            Toggle(isOn: $settings.hideCommonPrecedingSpacesInSuggestion) {
+                Text("Hide Common Preceding Spaces")
+            }
 
-                    Text("pt")
+            HStack {
+                TextField(text: .init(get: {
+                    "\(Int(settings.suggestionCodeFontSize))"
+                }, set: {
+                    settings.suggestionCodeFontSize = Double(Int($0) ?? 0)
+                })) {
+                    Text("Font size of suggestion code")
                 }
-                Divider()
+                .textFieldStyle(.roundedBorder)
+
+                Text("pt")
             }
         }
     }