Move UserDefaults related code to Preferences

intitni · intitni · commit caf53e7e095b · 2023-03-23T11:29:41.000+08:00
diff --git a/Copilot for Xcode/LaunchAgentView.swift b/Copilot for Xcode/LaunchAgentView.swift
@@ -1,6 +1,6 @@
 import LaunchAgentManager
 import SwiftUI
-import XPCShared
+import Preferences
 
 struct LaunchAgentView: View {
     @State var errorMessage: String?
diff --git a/Copilot for Xcode/SettingsView.swift b/Copilot for Xcode/SettingsView.swift
@@ -1,6 +1,6 @@
 import LaunchAgentManager
+import Preferences
 import SwiftUI
-import XPCShared
 
 final class Settings: ObservableObject {
     @AppStorage(SettingsKey.quitXPCServiceOnXcodeAndAppQuit, store: .shared)
@@ -66,7 +66,7 @@ struct SettingsView: View {
                     } label: {
                         Text("Widget position")
                     }
-                    
+
                     Picker(selection: $settings.widgetColorScheme) {
                         ForEach(WidgetColorScheme.allCases, id: \.rawValue) {
                             switch $0 {
diff --git a/Core/Package.swift b/Core/Package.swift
@@ -24,6 +24,7 @@ let package = Package(
                 "CopilotModel",
                 "Client",
                 "XPCShared",
+                "Preferences",
                 "LaunchAgentManager",
                 "Logger",
             ]
@@ -40,7 +41,7 @@ let package = Package(
         .target(name: "CGEventObserver"),
         .target(
             name: "CopilotService",
-            dependencies: ["LanguageClient", "CopilotModel", "XPCShared"]
+            dependencies: ["LanguageClient", "CopilotModel", "XPCShared", "Preferences"]
         ),
         .testTarget(
             name: "CopilotServiceTests",
@@ -64,13 +65,14 @@ let package = Package(
         ),
         .target(
             name: "Client",
-            dependencies: ["CopilotModel", "XPCShared", "Logger"]
+            dependencies: ["CopilotModel", "Preferences", "XPCShared", "Logger"]
         ),
         .target(
             name: "Service",
             dependencies: [
                 "CopilotModel",
                 "CopilotService",
+                "Preferences",
                 "XPCShared",
                 "CGEventObserver",
                 "DisplayLink",
@@ -94,6 +96,7 @@ let package = Package(
                 "Client",
                 "CopilotService",
                 "SuggestionInjector",
+                "Preferences",
                 "XPCShared",
                 "Environment",
             ]
@@ -131,5 +134,6 @@ let package = Package(
             name: "OpenAIServiceTests",
             dependencies: ["OpenAIService"]
         ),
+        .target(name: "Preferences"),
     ]
 )
diff --git a/Core/Sources/CopilotService/CopilotService.swift b/Core/Sources/CopilotService/CopilotService.swift
@@ -3,6 +3,7 @@ import Foundation
 import LanguageClient
 import LanguageServerProtocol
 import XPCShared
+import Preferences
 
 public protocol CopilotAuthServiceType {
     func checkStatus() async throws -> CopilotStatus
diff --git a/Core/Sources/Preferences/PresentationMode.swift b/Core/Sources/Preferences/PresentationMode.swift
diff --git a/Core/Sources/Preferences/SuggestionWidgetPositionMode.swift b/Core/Sources/Preferences/SuggestionWidgetPositionMode.swift
diff --git a/Core/Sources/Preferences/UserDefaults.swift b/Core/Sources/Preferences/UserDefaults.swift
diff --git a/Core/Sources/Preferences/WidgetColorScheme.swift b/Core/Sources/Preferences/WidgetColorScheme.swift
diff --git a/Core/Sources/Service/GUI/RealtimeSuggestionIndicatorController.swift b/Core/Sources/Service/GUI/RealtimeSuggestionIndicatorController.swift
@@ -6,7 +6,7 @@ import DisplayLink
 import Environment
 import QuartzCore
 import SwiftUI
-import XPCShared
+import Preferences
 
 /// Present a tiny dot next to mouse cursor if real-time suggestion is enabled.
 @MainActor
diff --git a/Core/Sources/Service/RealtimeSuggestionController.swift b/Core/Sources/Service/RealtimeSuggestionController.swift
@@ -7,8 +7,8 @@ import CGEventObserver
 import Environment
 import Foundation
 import Logger
+import Preferences
 import QuartzCore
-import XPCShared
 
 @ServiceActor
 public class RealtimeSuggestionController {
diff --git a/Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift
@@ -2,6 +2,7 @@ import ActiveApplicationMonitor
 import AppKit
 import CopilotModel
 import Environment
+import Preferences
 import SuggestionInjector
 import XPCShared
 
diff --git a/Core/Sources/Service/Workspace.swift b/Core/Sources/Service/Workspace.swift
@@ -2,6 +2,7 @@ import CopilotModel
 import CopilotService
 import Environment
 import Foundation
+import Preferences
 import SuggestionInjector
 import XPCShared
 
diff --git a/Core/Sources/Service/XPCService.swift b/Core/Sources/Service/XPCService.swift
@@ -4,6 +4,7 @@ import Environment
 import Foundation
 import LanguageServerProtocol
 import Logger
+import Preferences
 import XPCShared
 
 @globalActor enum ServiceActor {
diff --git a/Core/Sources/SuggestionWidget/SuggestionWidgetController.swift b/Core/Sources/SuggestionWidget/SuggestionWidgetController.swift
@@ -4,7 +4,7 @@ import AsyncAlgorithms
 import AXNotificationStream
 import Environment
 import SwiftUI
-import XPCShared
+import Preferences
 
 @MainActor
 public final class SuggestionWidgetController {
diff --git a/ExtensionService/AppDelegate.swift b/ExtensionService/AppDelegate.swift
@@ -2,12 +2,12 @@ import AppKit
 import FileChangeChecker
 import LaunchAgentManager
 import Logger
+import Preferences
 import Service
 import ServiceManagement
 import SwiftUI
 import UpdateChecker
 import UserNotifications
-import XPCShared
 
 let bundleIdentifierBase = Bundle.main
     .object(forInfoDictionaryKey: "BUNDLE_IDENTIFIER_BASE") as! String
