Show status bar item during onboarding flow (as recommended by AppSto…

…re Review
leits · Mar 24, 2024 · 7f0d053 · 7f0d053
1 parent b480f47
commit 7f0d053
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/MeetingBar/AppDelegate.swift b/MeetingBar/AppDelegate.swift
@@ -39,6 +39,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
             Defaults[.appVersion] = appVersion
         }
 
+        statusBarItem = StatusBarItemController()
+
         if Defaults[.onboardingCompleted] {
             setEventStoreProvider(provider: Defaults[.eventStoreProvider])
             setup()
@@ -48,7 +50,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
     }
 
     func setup() {
-        statusBarItem = StatusBarItemController()
         statusBarItem.setAppDelegate(appdelegate: self)
 
         registerNotificationCategories()

diff --git a/MeetingBar/StatusBarItemController.swift b/MeetingBar/StatusBarItemController.swift
@@ -38,6 +38,13 @@ class StatusBarItemController {
         statusItem.button?.target = self
         statusItem.button?.action = #selector(statusMenuBarAction)
         statusItem.button?.sendAction(on: [NSEvent.EventTypeMask.rightMouseDown, NSEvent.EventTypeMask.leftMouseUp, NSEvent.EventTypeMask.leftMouseDown])
+
+        // Temporary icon and menu before app delegate setup
+        statusItem.button?.image = NSImage(named: "AppIcon")!
+        statusItem.button?.image?.size = NSSize(width: 16, height: 16)
+        statusItem.button?.imagePosition = .imageLeft
+        let menuItem = statusItemMenu.addItem(withTitle: "window_title_onboarding".loco(), action: nil, keyEquivalent: "")
+        menuItem.isEnabled = false
     }
 
     @objc
@@ -181,11 +188,12 @@ class StatusBarItemController {
 
                     button.image = image
                     button.image?.size = NSSize(width: 16, height: 16)
-                    if image.name() == "no_online_session" {
-                        button.imagePosition = .noImage
-                    } else {
-                        button.imagePosition = .imageLeft
-                    }
+                }
+
+                if button.image?.name() == "no_online_session" {
+                    button.imagePosition = .noImage
+                } else {
+                    button.imagePosition = .imageLeft
                 }
 
                 // create an NSMutableAttributedString that we'll append everything to