Added "Show indicator on Caps Lock change"

Author: Bohdan

LanguageFlag/Helpers/CapsLockManager.swift

@@ -5,9 +5,17 @@ class CapsLockManager {
 
     // MARK: - Variables
     private(set) var isCapsLockEnabled: Bool = false
-    
+    private var eventMonitor: Any?
+
     // MARK: - Init
     init() {
+        setupCapsLockObserver()
+    }
+
+    deinit {
+        if let monitor = eventMonitor {
+            NSEvent.removeMonitor(monitor)
+        }
     }
 
     func isCapsLockOn() -> Bool {
@@ -22,8 +30,7 @@ extension CapsLockManager {
 
     /// Sets up an observer to monitor Caps Lock state changes.
     private func setupCapsLockObserver() {
-        let eventMask = NSEvent.EventTypeMask.flagsChanged
-        NSEvent.addGlobalMonitorForEvents(matching: eventMask) { [weak self] event in
+        eventMonitor = NSEvent.addGlobalMonitorForEvents(matching: .flagsChanged) { [weak self] event in
             self?.handleCapsLockStateChange(event: event)
         }
     }
@@ -40,7 +47,8 @@ extension CapsLockManager {
 
     /// Notifies observers about the Caps Lock state change.
     private func notifyCapsLockStateChanged(newCapsLockEnabled: Bool) {
-        NotificationCenter.default.post(name: .capsLockChanged,
-                                        object: newCapsLockEnabled)
+        guard UserPreferences.shared.showCapsLockIndicator else { return }
+
+        NotificationCenter.default.post(name: .capsLockChanged, object: newCapsLockEnabled)
     }
 }

LanguageFlag/Helpers/NotificationManager.swift

@@ -4,6 +4,9 @@ import Combine
 
 class NotificationManager {
 
+    // MARK: - Variables
+    private let capsLockManager = CapsLockManager()
+
     // MARK: - Init
     init() {
         setupObservers()

LanguageFlag/Models/UserPreferences.swift

@@ -97,6 +97,7 @@ final class UserPreferences: ObservableObject {
         static let showShortcuts = "showShortcuts"
         static let showInMenuBar = "showInMenuBar"
         static let resetAnimationOnChange = "resetAnimationOnChange"
+        static let showCapsLockIndicator = "showCapsLockIndicator"
     }
 
     // MARK: - Published Properties
@@ -148,6 +149,10 @@ final class UserPreferences: ObservableObject {
         didSet { defaults.set(resetAnimationOnChange, forKey: Keys.resetAnimationOnChange) }
     }
 
+    @Published var showCapsLockIndicator: Bool {
+        didSet { defaults.set(showCapsLockIndicator, forKey: Keys.showCapsLockIndicator) }
+    }
+
     // MARK: - Initialization
     private init() {
         self.defaults = .standard
@@ -157,13 +162,14 @@ final class UserPreferences: ObservableObject {
         self.showShortcuts = false
         self.showInMenuBar = false
         self.resetAnimationOnChange = true
+        self.showCapsLockIndicator = false
         self.displayPosition = .bottomCenter
         self.windowSize = .medium
         self.animationStyle = .fade
-        
+
         loadSavedPreferences()
     }
-    
+
     // Initializer for testing with dependency injection
     init(defaults: UserDefaults) {
         self.defaults = defaults
@@ -173,10 +179,11 @@ final class UserPreferences: ObservableObject {
         self.showShortcuts = false
         self.showInMenuBar = false
         self.resetAnimationOnChange = true
+        self.showCapsLockIndicator = false
         self.displayPosition = .bottomCenter
         self.windowSize = .medium
         self.animationStyle = .fade
-        
+
         loadSavedPreferences()
     }
 
@@ -188,6 +195,7 @@ final class UserPreferences: ObservableObject {
         self.showShortcuts = defaults.object(forKey: Keys.showShortcuts) as? Bool ?? false
         self.showInMenuBar = defaults.object(forKey: Keys.showInMenuBar) as? Bool ?? false
         self.resetAnimationOnChange = defaults.object(forKey: Keys.resetAnimationOnChange) as? Bool ?? true
+        self.showCapsLockIndicator = defaults.object(forKey: Keys.showCapsLockIndicator) as? Bool ?? false
 
         // Decode complex types
         if
@@ -228,5 +236,6 @@ final class UserPreferences: ObservableObject {
         showShortcuts = false
         showInMenuBar = false
         resetAnimationOnChange = true
+        showCapsLockIndicator = false
     }
 }

LanguageFlag/Stories/Preferences/Panes/GeneralPreferencesPane.swift

@@ -33,6 +33,8 @@ struct GeneralPreferencesPane: View {
 
                 menuBarToggle
 
+                capsLockToggle
+
                 Spacer().frame(height: 20)
 
                 resetButton
@@ -111,6 +113,11 @@ struct GeneralPreferencesPane: View {
         Toggle("Show current layout in menu bar", isOn: $preferences.showInMenuBar)
             .help("Display the current keyboard layout in the menu bar")
     }
+
+    private var capsLockToggle: some View {
+        Toggle("Show indicator on Caps Lock change", isOn: $preferences.showCapsLockIndicator)
+            .help("Show the language indicator window when Caps Lock is toggled")
+    }
 
     private var resetButton: some View {
         HStack {