Add badge to tray menu icon

Author: almenscorner

SupportCompanion/AppDelegate.swift

@@ -11,7 +11,7 @@ import UserNotifications
 import SwiftUI
 import Combine
 
-class AppDelegate: NSObject, NSApplicationDelegate {
+class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
     var popover: NSPopover!
     var statusItem: NSStatusItem?
     var windowController: NSWindowController?
@@ -22,8 +22,14 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     static var shouldExit = false
     private var notificationDelegate: NotificationDelegate?
     private var cancellables: Set<AnyCancellable> = []
+    private var trayManager: TrayMenuManager { TrayMenuManager.shared }
+
     @AppStorage("isDarkMode") private var isDarkMode: Bool = false
 
+    var hasUpdatesAvailable: Bool {
+        appStateManager.pendingUpdatesCount > 0 || appStateManager.systemUpdateCache.count > 0
+    }
+
     func application(_ application: NSApplication, open urls: [URL]) {
         guard let url = urls.first else { return }
         switch url.host?.lowercased() {
@@ -46,10 +52,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         if !AppDelegate.shouldExit { 
             setupTrayMenu()
         }
-        let icon = NSImage(named: "MenuIcon")
-        icon?.size = NSSize(width: 16, height: 16)
-        statusItem?.button?.image = icon
-        statusItem?.button?.image?.isTemplate = true
 
         popover = NSPopover()
         popover.behavior = .transient // Closes when clicking outside
@@ -60,6 +62,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             )
             .environmentObject(AppStateManager.shared)
         )
+        popover.delegate = self
+
         configureAppUpdateNotificationCommand(mode: appStateManager.preferences.mode)
 
         appStateManager.showWindowCallback = { [weak self] in
@@ -83,87 +87,106 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         UNUserNotificationCenter.current().delegate = notificationDelegate
         appStateManager.startBackgroundTasks()
         appStateManager.refreshAll()
-        
-        /*appStateManager.preferences.$actions
-            .debounce(for: .seconds(0.5), scheduler: RunLoop.main)
-            .sink { [weak self] _ in
-                self?.setupTrayMenu()
-            }
-            .store(in: &cancellables)*/
-            
     }
 
-    /*private func setupTrayMenu() {
-        // Initialize status item only if it doesn't already exist
+    private func setupTrayMenu() {
+        let trayManager = TrayMenuManager.shared
         if statusItem == nil {
             statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
-            if let button = statusItem?.button {
-                let icon = NSImage(named: "MenuIcon")
-                icon?.size = NSSize(width: 16, height: 16)
-                button.image = icon
-                button.image?.isTemplate = true
+
+            setupTrayMenuIconBinding()
+
+            if let button = trayManager.getStatusItem().button {
+                button.action = #selector(togglePopover)
+                button.target = self
             }
         }
+    }
 
-        // Update the menu
-        let menu = NSMenu()
+    func setupTrayMenuIconBinding() {
+        appStateManager.$pendingUpdatesCount
+            .combineLatest(appStateManager.$systemUpdateCache)
+            .map { pendingUpdatesCount, systemUpdateCache in
+                pendingUpdatesCount > 0 || systemUpdateCache.count > 0
+            }
+            .sink { hasUpdates in
+                TrayMenuManager.shared.updateTrayIcon(hasUpdates: hasUpdates)
+            }
+            .store(in: &cancellables)
+    }
 
-        menu.addItem(NSMenuItem(title: Constants.TrayMenu.openApp, action: #selector(showWindow), keyEquivalent: "o"))
-        menu.addItem(NSMenuItem.separator())
+    class TrayMenuManager {
+        static let shared = TrayMenuManager()
+        
+        private var statusItem: NSStatusItem
 
-        // Create Actions submenu
-        let actionsSubmenu = NSMenu()
-        for action in appStateManager.preferences.actions {
-            let actionItem = NSMenuItem(title: action.name, action: #selector(runAction), keyEquivalent: "")
-            actionItem.representedObject = action
-            actionsSubmenu.addItem(actionItem)
+        private init() {
+            statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
+            updateTrayIcon(hasUpdates: false) // Default state
         }
 
-        let actionsMenuItem = NSMenuItem(title: Constants.CardTitle.actions, action: nil, keyEquivalent: "")
-        menu.setSubmenu(actionsSubmenu, for: actionsMenuItem)
-        menu.addItem(actionsMenuItem)
-
-        menu.addItem(NSMenuItem.separator())
-        menu.addItem(NSMenuItem(title: Constants.TrayMenu.quitApp, action: #selector(quitApp), keyEquivalent: "q"))
-
-        // Assign the updated menu to the status item
-        statusItem?.menu = menu
-    }*/
+        func updateTrayIcon(hasUpdates: Bool) {
+            let iconName = "MenuIcon"
+            guard let baseIcon = NSImage(named: iconName) else {
+                print("Error: \(iconName) not found")
+                return
+            }
 
-    private func setupTrayMenu() {
-        if statusItem == nil {
-            statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
-            
-            if let button = statusItem?.button {
-                let icon = NSImage(named: "MenuIcon")
-                icon?.size = NSSize(width: 16, height: 16)
-                button.image = icon
-                button.image?.isTemplate = true
-                
-                // Connect the button action
-                button.action = #selector(togglePopover)
-                button.target = self
+            if hasUpdates {
+                // Add a red dot badge
+                Logger.shared.logDebug("Updates available, adding badge to tray icon")
+                let iconWithBadge = baseIcon.compositeWithBadge(color: .red, badgeSize: 8)
+                statusItem.button?.image = iconWithBadge
+                baseIcon.size = NSSize(width: 16, height: 16)
+            } else {
+                // Use the base icon as is
+                Logger.shared.logDebug("No updates available, showing base tray icon")
+                baseIcon.isTemplate = true
+                baseIcon.size = NSSize(width: 16, height: 16)
+                statusItem.button?.image = baseIcon
             }
         }
+
+        func getStatusItem() -> NSStatusItem {
+            return statusItem
+        }
     }
 
     @objc private func togglePopover() {
-        guard let button = statusItem?.button else { return }
+        guard let button = trayManager.getStatusItem().button else {
+            print("Error: TrayMenuManager's statusItem.button is nil")
+            return
+        }
 
         if popover.isShown {
             popover.performClose(nil)
         } else {
-            // Show the popover relative to the status bar button
+            // Dynamically set the popover content
+            popover.contentViewController = NSHostingController(
+                rootView: TrayMenuView(
+                    viewModel: CardGridViewModel(appState: AppStateManager.shared)
+                )
+                .environmentObject(AppStateManager.shared)
+            )
+            
+            // Anchor the popover to the status item's button
             popover.show(relativeTo: button.bounds, of: button, preferredEdge: .minY)
 
-            // Bring the application and popover window to the front
+            // Ensure the popover window is brought to the front
             if let popoverWindow = popover.contentViewController?.view.window {
                 popoverWindow.makeKeyAndOrderFront(nil)
-                NSApp.activate(ignoringOtherApps: true) // Ensure app gets focus
+                NSApp.activate(ignoringOtherApps: true)
             }
         }
     }
 
+    func popoverDidClose(_ notification: Notification) {
+        Logger.shared.logDebug("Popover closed, cleaning up...")
+        
+        // Cleanup logic: release the popover or its content
+        popover.contentViewController = nil
+    }
+
     @objc func showWindow() {
         if windowController == nil {
             NSApp.setActivationPolicy(.regular)

SupportCompanion/Extensions/Extensions.swift

@@ -96,3 +96,28 @@ extension Color {
     // Red shades
     static let redLight = Color(hue: 0.02, saturation: 0.8, brightness: 0.7) // Softer red for light mode
 }
+
+extension NSImage {
+    func compositeWithBadge(color: NSColor, badgeSize: CGFloat) -> NSImage? {
+        let size = self.size
+        let newImage = NSImage(size: size)
+        
+        newImage.lockFocus()
+        // Draw the base icon (template behavior applies)
+        self.draw(at: .zero, from: NSRect(origin: .zero, size: size), operation: .sourceOver, fraction: 1.0)
+        
+        // Draw the red dot badge
+        color.setFill()
+        let badgeRect = NSRect(
+            x: size.width - badgeSize, 
+            y: 0,
+            width: badgeSize, 
+            height: badgeSize
+        )
+        let badgePath = NSBezierPath(ovalIn: badgeRect)
+        badgePath.fill()
+        
+        newImage.unlockFocus()
+        return newImage
+    }
+}