Alright Apple, your WYSIWYG menu is there

Author: ApolloZhu

Dynamic/Utilities/Preferences.swift

@@ -230,7 +230,7 @@ extension UserDefaults {
         }
     }
 
-    var rawSettingsStyle: Int {
+    @objc dynamic var rawSettingsStyle: Int {
         get {
             return preferences.integer(forKey: #function)
         }

Dynamic/View Controller/AppDelegate.swift

@@ -18,6 +18,7 @@ import LetsMove
 class AppDelegate: NSObject, NSApplicationDelegate {
     private lazy var statusBarItem = NSStatusBar.system
         .statusItem(withLength: NSStatusItem.squareLength)
+    private var token: NSKeyValueObservation?
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         #if canImport(LetsMove) && !DEBUG
@@ -35,6 +36,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         statusBarItem.button?.image = #imageLiteral(resourceName: "status_bar_icon")
         statusBarItem.button?.sendAction(on: [.leftMouseUp, .rightMouseUp])
         statusBarItem.button?.action = #selector(handleEvent)
+        token = preferences.observe(\.rawSettingsStyle, options: [.initial, .new])
+        { [weak self] _, change in
+            guard let self = self else { return }
+            if change.newValue == 1 {
+                self.statusBarItem.menu = self.buildMenu()
+            } else {
+                self.statusBarItem.menu = nil
+            }
+        }
 
         DispatchQueue.global(qos: .userInteractive).async(execute: setup)
         DispatchQueue.global(qos: .userInitiated).async(execute: setupTouchBar)
@@ -48,6 +58,42 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
     }
 
+    func buildMenu() -> NSMenu {
+        let menu = NSMenu()
+        let toggleItem = NSMenuItem(
+            title: NSLocalizedString(
+                "Menu.toggle",
+                value: "Toggle Dark Mode",
+                comment: "Action item to toggle in from menu bar"),
+            action: #selector(toggleInterfaceStyle),
+            keyEquivalent: "\u{000d}" // return
+        )
+        menu.addItem(toggleItem)
+        menu.addItem(.separator())
+        let preferencesItem = NSMenuItem(
+            title: NSLocalizedString(
+                "Menu.preferences",
+                value: "Preferences…",
+                comment: "Settings"),
+            action: #selector(SettingsViewController.show),
+            keyEquivalent: ","
+        )
+        preferencesItem.keyEquivalentModifierMask = .command
+        preferencesItem.target = SettingsViewController.self
+        menu.addItem(preferencesItem)
+        let quitItem = NSMenuItem(
+            title: NSLocalizedString(
+                "Menu.quit",
+                value: "Quit",
+                comment: "Use system translation for quit"),
+            action: #selector(NSApplication.terminate(_:)),
+            keyEquivalent: "Q"
+        )
+        quitItem.keyEquivalentModifierMask = .command
+        menu.addItem(quitItem)
+        return menu
+    }
+
     // MARK: - Control Strip Setup
 
     private func setupTouchBar() {
@@ -80,6 +126,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     func applicationWillTerminate(_ notification: Notification) {
+        token?.invalidate()
         Preferences.removeObservers()
         Scheduler.shared.cancel()
     }

Dynamic/View Controller/Base.lproj/Main.storyboard

@@ -897,7 +897,7 @@ DQ
                                 <subviews>
                                     <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="Ik9-Rl-d1Q">
                                         <rect key="frame" x="-1" y="21" width="433" height="18"/>
-                                        <buttonCell key="cell" type="radio" title="Left click on the menu bar icon to show menu, then choose Settings" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="EJk-BY-RUI">
+                                        <buttonCell key="cell" type="radio" title="Left click on the menu bar icon to show menu, then choose Settings" bezelStyle="regularSquare" imagePosition="left" alignment="left" tag="1" inset="2" id="EJk-BY-RUI">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>

Dynamic/View Controller/Settings/SettingsViewController.swift

@@ -19,7 +19,7 @@ class SettingsViewController: NSViewController {
         case menu
     }
     private static weak var window: NSWindow? = nil
-    public static func show() {
+    @objc public static func show() {
         if window == nil {
             ValueTransformer.setValueTransformer(
                 UsesCustomRange(), forName: .usesCustomRangeTransformerName
@@ -79,5 +79,6 @@ extension Preferences {
         preferences.scheduleZenithType = .official
         preferences.scheduled = true
         preferences.opensAtLogin = true
+        preferences.settingsStyle = .rightClick
     }
 }