Merge pull request #25 from pszypowicz/hide-menu-icon

Make the menu bar icon optional

Author: pszypowicz

README.md

@@ -81,7 +81,7 @@ open /Applications/Cyclist.app
 
 The build script signs with your "Apple Development" certificate when one is present so the Accessibility grant survives rebuilds. See `scripts/build-app.sh --help` for options.
 
-On first launch Cyclist prompts for Accessibility permission and activates itself once granted. It lives in the menu bar (no Dock icon); the menu holds Settings, About, and Quit - quitting is how every hook releases and the native shortcuts return. The Settings window holds the list options, trackpad swipe navigation, and a native Launch at Login toggle (registers with System Settings > General > Login Items).
+On first launch Cyclist prompts for Accessibility permission and activates itself once granted. It lives in the menu bar (no Dock icon); the menu holds Settings, About, and Quit - quitting is how every hook releases and the native shortcuts return. The Settings window holds the list options, trackpad swipe navigation, and a native Launch at Login toggle (registers with System Settings > General > Login Items). The menu bar icon itself is optional (Settings > General): with it hidden, hold the switcher open and press `,` to reach Settings, or just relaunch Cyclist - reopening the app always presents the Settings window (where Cmd+Q still quits).
 
 ## Configuration
 
@@ -100,6 +100,7 @@ defaults write io.github.pszypowicz.Cyclist switcherShortcut "alt+tab"
 | `includeNoWindows`        | bool   | `false`        |
 | `trackpadSwipe`           | bool   | `true`         |
 | `keyboardSpaceNavigation` | bool   | `true`         |
+| `showMenuBarIcon`         | bool   | `true`         |
 | `aerospaceIntegration`    | bool   | `false`        |
 | `showHollowWorkspaces`    | bool   | `false`        |
 | `switcherShortcut`        | string | `cmd+tab`      |

Sources/Cyclist/AppDelegate.swift

@@ -27,12 +27,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         // Start delivering only after every consumer has wired its callbacks.
         wsEvents.start()
         controller.onTapInvalidated = { [weak self] in self?.scheduleRecovery() }
-        statusItem.setUp()
-        // The AeroSpace integration applies through defaults KVO, so the
-        // Settings toggle and `defaults write` are the same mechanism and
-        // external writes take effect immediately.
-        UserDefaults.standard.addObserver(
-            self, forKeyPath: Settings.aerospaceIntegrationKey, options: [], context: nil)
+        statusItem.refresh()
+        // The AeroSpace integration and the menu bar icon apply through
+        // defaults KVO, so the Settings toggles and `defaults write` are
+        // the same mechanism and external writes take effect immediately.
+        for key in [Settings.aerospaceIntegrationKey, Settings.showMenuBarIconKey] {
+            UserDefaults.standard.addObserver(self, forKeyPath: key, options: [], context: nil)
+        }
         ensurePermissionAndStart()
         // Optional: unlocks live titles for windows in other Spaces via
         // CGWindowList. Used solely to read titles; Cyclist never captures
@@ -48,10 +49,20 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
                                change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
         // KVO from an external `defaults write` can arrive off-main.
         DispatchQueue.main.async { [weak self] in
-            self?.applyAerospace()
+            guard let self else { return }
+            self.applyAerospace()
+            self.statusItem.refresh()
         }
     }
 
+    // Reopening the app (Finder double-click, `open -a Cyclist`) presents
+    // Settings - the universal "where did it go" gesture, and the escape
+    // hatch when the menu bar icon is hidden.
+    func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
+        SettingsView.showWindow()
+        return false
+    }
+
     private func applyAerospace() {
         let on = Settings.aerospaceIntegration
         guard on != aerospaceApplied else { return }

Sources/Cyclist/Settings.swift

@@ -12,6 +12,7 @@ enum Settings {
     static let includeNoWindowsKey = "includeNoWindows"
     static let trackpadSwipeKey = "trackpadSwipe"
     static let keyboardSpaceNavKey = "keyboardSpaceNavigation"
+    static let showMenuBarIconKey = "showMenuBarIcon"
     static let aerospaceIntegrationKey = "aerospaceIntegration"
     static let showHollowWorkspacesKey = "showHollowWorkspaces"
     static let switcherShortcutKey = "switcherShortcut"
@@ -27,6 +28,7 @@ enum Settings {
             includeNoWindowsKey: false,
             trackpadSwipeKey: true,
             keyboardSpaceNavKey: true,
+            showMenuBarIconKey: true,
             aerospaceIntegrationKey: false,
             showHollowWorkspacesKey: false,
             switcherShortcutKey: "cmd+tab",
@@ -60,6 +62,10 @@ enum Settings {
         UserDefaults.standard.bool(forKey: keyboardSpaceNavKey)
     }
 
+    static var showMenuBarIcon: Bool {
+        UserDefaults.standard.bool(forKey: showMenuBarIconKey)
+    }
+
     static var aerospaceIntegration: Bool {
         UserDefaults.standard.bool(forKey: aerospaceIntegrationKey)
     }

Sources/Cyclist/SettingsView.swift

@@ -45,6 +45,7 @@ struct SettingsView: View {
     @AppStorage(Settings.includeNoWindowsKey) private var includeNoWindows = false
     @AppStorage(Settings.trackpadSwipeKey) private var trackpadSwipe = true
     @AppStorage(Settings.keyboardSpaceNavKey) private var keyboardSpaceNav = true
+    @AppStorage(Settings.showMenuBarIconKey) private var showMenuBarIcon = true
     @AppStorage(Settings.aerospaceIntegrationKey) private var aerospaceIntegration = false
     @AppStorage(Settings.showHollowWorkspacesKey) private var showHollowWorkspaces = false
     @AppStorage(Settings.switcherShortcutKey) private var switcherShortcut = "cmd+tab"
@@ -107,10 +108,16 @@ struct SettingsView: View {
                 Label("Launch at Login", systemImage: "power")
             }
             .onChange(of: launchAtLogin) { setLaunchAtLogin($0) }
+            Toggle(isOn: $showMenuBarIcon) {
+                HStack(spacing: 4) {
+                    Text("Show menu bar icon")
+                    InfoDot("Cyclist keeps running without the icon. To get back here: hold the switcher open and press comma, or relaunch Cyclist - reopening the app always shows this window.")
+                }
+            }
         } header: {
             Text("General")
         } footer: {
-            Text("A macOS login item; also listed in System Settings > General > Login Items.")
+            Text("Launch at Login is a macOS login item; also listed in System Settings > General > Login Items.")
                 .font(.caption)
                 .foregroundStyle(.secondary)
         }

Sources/Cyclist/StatusItem.swift

@@ -3,7 +3,20 @@ import AppKit
 final class StatusItemController: NSObject {
     private var statusItem: NSStatusItem?
 
-    func setUp() {
+    // Creates or removes the status item to match the setting; the owner
+    // calls it at launch and from its defaults observation, so hiding or
+    // showing the icon applies live. Idempotent.
+    func refresh() {
+        if Settings.showMenuBarIcon {
+            guard statusItem == nil else { return }
+            statusItem = makeItem()
+        } else if let item = statusItem {
+            NSStatusBar.system.removeStatusItem(item)
+            statusItem = nil
+        }
+    }
+
+    private func makeItem() -> NSStatusItem {
         let item = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
         item.button?.image = NSImage(
             systemSymbolName: "arrow.triangle.2.circlepath",
@@ -29,7 +42,7 @@ final class StatusItemController: NSObject {
         menu.addItem(quitItem)
 
         item.menu = menu
-        statusItem = item
+        return item
     }
 
     @objc private func showSettings() {