🎨 cleanup

leonardodino · Jun 5, 2023 · bcee962 · bcee962
1 parent d313af1
commit bcee962
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 18 deletions.
diff --git a/Sources/AboutWindow.swift b/Sources/AboutWindow.swift
@@ -31,7 +31,7 @@ class AboutWindow {
     let menuItem: NSMenuItem
     private init() {
         let appName = Bundle.main.object(forInfoDictionaryKey: "CFBundleName") ?? ""
-        menuItem = NSMenuItem(title: "About \(appName)", action: #selector(AboutWindow.show), keyEquivalent: "")
+        menuItem = NSMenuItem(title: "About \(appName)", action: #selector(show), keyEquivalent: "")
         menuItem.target = self
     }
     @objc func show() {

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
@@ -8,7 +8,6 @@ enum State: Equatable {
 
 @main
 class AppDelegate: NSObject, NSApplicationDelegate {
-    private let notificationCenter = NotificationCenter.default
     private var blinkStick: BlinkStick?
     private var statusItem: StatusItem?
     private var audioInput: AudioInput?

diff --git a/Sources/AudioInput.swift b/Sources/AudioInput.swift
@@ -1,5 +1,3 @@
-import Foundation
-import CoreAudio
 import Cocoa
 
 public extension Notification.Name {

diff --git a/Sources/LaunchAtLogin.swift b/Sources/LaunchAtLogin.swift
@@ -7,7 +7,7 @@ final class LaunchAtLogin {
     private(set) var menuItem: NSMenuItem
 
     private init() {
-        menuItem = NSMenuItem(title: "Launch at login", action: #selector(LaunchAtLogin.toggle), keyEquivalent: "")
+        menuItem = NSMenuItem(title: "Launch at login", action: #selector(toggle), keyEquivalent: "")
         menuItem.target = self
         menuItem.state = state
     }

diff --git a/Sources/StatusItem.swift b/Sources/StatusItem.swift
@@ -1,5 +1,4 @@
 import Cocoa
-import ServiceManagement
 
 fileprivate extension NSApplication {
     var quitMenuItem: NSMenuItem {
@@ -24,19 +23,17 @@ class StatusItem {
 
     private let instance = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
 
-    private lazy var menu: NSMenu = {
-        let menu = NSMenu()
-        menu.addItem(AboutWindow.shared.menuItem)
-        if #available(macOS 13.0, *) {
-            menu.addItem(LaunchAtLogin.shared.menuItem)
-            menu.addItem(NSMenuItem.separator())
-        }
-        menu.addItem(NSApplication.shared.quitMenuItem)
-        return menu
-    }()
-
     init() {
-        instance.menu = menu
+        instance.menu = {
+            let menu = NSMenu()
+            menu.addItem(AboutWindow.shared.menuItem)
+            if #available(macOS 13.0, *) {
+                menu.addItem(LaunchAtLogin.shared.menuItem)
+                menu.addItem(NSMenuItem.separator())
+            }
+            menu.addItem(NSApplication.shared.quitMenuItem)
+            return menu
+        }()
     }
 
     func setIcon(_ icon: StateIcon) {