Add global hotkey to show/hide widget

Author: intitni

Core/Package.swift

@@ -38,8 +38,8 @@ let isProIncluded: Bool = {
             return false
         }
         do {
-            if let content = String(
-                data: try Data(contentsOf: confURL),
+            if let content = try String(
+                data: Data(contentsOf: confURL),
                 encoding: .utf8
             ) {
                 if content.hasPrefix("YES") {
@@ -98,6 +98,9 @@ let package = Package(
             url: "https://github.com/pointfreeco/swift-composable-architecture",
             from: "0.55.0"
         ),
+        // quick hack to support custom UserDefaults
+        // https://github.com/sindresorhus/KeyboardShortcuts
+        .package(url: "https://github.com/intitni/KeyboardShortcuts", branch: "main"),
     ].pro,
     targets: [
         // MARK: - Main
@@ -134,6 +137,7 @@ let package = Package(
                 .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
                 .product(name: "Dependencies", package: "swift-dependencies"),
+                .product(name: "KeyboardShortcuts", package: "KeyboardShortcuts"),
             ].pro([
                 "ProService",
             ])
@@ -168,6 +172,7 @@ let package = Package(
                 .product(name: "OpenAIService", package: "Tool"),
                 .product(name: "Preferences", package: "Tool"),
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
+                .product(name: "KeyboardShortcuts", package: "KeyboardShortcuts"),
             ].pro([
                 "ProHostApp",
             ])

Core/Sources/HostApp/GeneralView.swift

@@ -1,5 +1,6 @@
 import Client
 import ComposableArchitecture
+import KeyboardShortcuts
 import LaunchAgentManager
 import Preferences
 import SwiftUI
@@ -285,6 +286,8 @@ struct GeneralSettingsView: View {
 
                 Text("pt")
             }
+            
+            KeyboardShortcuts.Recorder("Global Shortcut to Toggle Widgets", name: .showHideWidget)
 
             Toggle(isOn: $settings.hideCircularWidget) {
                 Text("Hide circular widget")
@@ -342,7 +345,7 @@ struct LargeIconPicker<
             }
         }
     }
-    
+
     var body: some View {
         if #available(macOS 13.0, *) {
             LabeledContent {

Core/Sources/HostApp/HostApp.swift

@@ -1,11 +1,16 @@
 import Client
 import ComposableArchitecture
 import Foundation
+import KeyboardShortcuts
 
 #if canImport(LicenseManagement)
 import LicenseManagement
 #endif
 
+extension KeyboardShortcuts.Name {
+    static let showHideWidget = Self("ShowHideWidget")
+}
+
 struct HostApp: ReducerProtocol {
     struct State: Equatable {
         var general = General.State()
@@ -27,20 +32,21 @@ struct HostApp: ReducerProtocol {
         Scope(state: \.general, action: /Action.general) {
             General()
         }
-        
+
         Scope(state: \.chatModelManagement, action: /Action.chatModelManagement) {
             ChatModelManagement()
         }
-        
+
         Scope(state: \.embeddingModelManagement, action: /Action.embeddingModelManagement) {
             EmbeddingModelManagement()
         }
 
         Reduce { _, action in
             switch action {
             case .appear:
+                KeyboardShortcuts.userDefaults = .shared
                 return .none
-                
+
             case .informExtensionServiceAboutLicenseKeyChange:
                 #if canImport(LicenseManagement)
                 return .run { _ in
@@ -55,13 +61,13 @@ struct HostApp: ReducerProtocol {
                 #else
                 return .none
                 #endif
-                
+
             case .general:
                 return .none
-                
+
             case .chatModelManagement:
                 return .none
-                
+
             case .embeddingModelManagement:
                 return .none
             }
@@ -70,8 +76,8 @@ struct HostApp: ReducerProtocol {
 }
 
 import Dependencies
-import Preferences
 import Keychain
+import Preferences
 
 struct UserDefaultsDependencyKey: DependencyKey {
     static var liveValue: UserDefaultsType = UserDefaults.shared
@@ -80,6 +86,7 @@ struct UserDefaultsDependencyKey: DependencyKey {
         it.removePersistentDomain(forName: "HostAppPreview")
         return it
     }()
+
     static var testValue: UserDefaultsType = {
         let it = UserDefaults(suiteName: "HostAppTest")!
         it.removePersistentDomain(forName: "HostAppTest")
@@ -106,3 +113,4 @@ extension DependencyValues {
         set { self[APIKeyKeychainDependencyKey.self] = newValue }
     }
 }
+

Core/Sources/Service/Service.swift

@@ -1,5 +1,6 @@
 import Dependencies
 import Foundation
+import KeyboardShortcuts
 import Workspace
 import WorkspaceSuggestionService
 
@@ -12,6 +13,10 @@ import ProService
     public static let shared = TheActor()
 }
 
+extension KeyboardShortcuts.Name {
+    static let showHideWidget = Self("ShowHideWidget")
+}
+
 /// The running extension service.
 public final class Service {
     public static let shared = Service()
@@ -43,6 +48,8 @@ public final class Service {
             ProService()
         }
         #endif
+        
+        KeyboardShortcuts.userDefaults = .shared
     }
 
     @MainActor
@@ -54,6 +61,10 @@ public final class Service {
         proService.start()
         #endif
         DependencyUpdater().update()
+        
+        KeyboardShortcuts.onKeyUp(for: .showHideWidget) { [guiController] in
+            guiController.viewStore.send(.suggestionWidget(.circularWidget(.widgetClicked)))
+        }
     }
 }