diff --git a/apps/buddy/electron/main/app/DesktopIntegrations.ts b/apps/buddy/electron/main/app/DesktopIntegrations.ts index 50f0419bf..7fead5dd4 100644 --- a/apps/buddy/electron/main/app/DesktopIntegrations.ts +++ b/apps/buddy/electron/main/app/DesktopIntegrations.ts @@ -286,6 +286,7 @@ export class DesktopIntegrations { this.#tray = createDesktopTray({ appName: paths.appName, iconPath: trayIconPath, + profile: paths.profile, language: runtime.language, onOpenDesktop: () => windows.show(), onQuit: this.#requestQuit, diff --git a/apps/buddy/electron/main/tray.ts b/apps/buddy/electron/main/tray.ts index 001a480cb..db95b4423 100644 --- a/apps/buddy/electron/main/tray.ts +++ b/apps/buddy/electron/main/tray.ts @@ -1,10 +1,13 @@ +import type { BuddyRuntimeProfile } from '../../shared/runtime/profile' import type { LexoraConfig } from '../shared/desktopApi' -import { Menu, nativeImage, Tray } from 'electron' +import { Menu, Tray } from 'electron' import { translateDesktopNative } from './desktopNativeI18n' +import { createDesktopTrayImage } from './trayIcon' export interface CreateDesktopTrayOptions { appName: string iconPath: string + profile: BuddyRuntimeProfile language: LexoraConfig['desktop']['language'] onOpenDesktop: () => void onQuit: () => void @@ -17,7 +20,7 @@ export interface DesktopTrayController { } export function createDesktopTray(options: CreateDesktopTrayOptions): DesktopTrayController { - const tray = new Tray(nativeImage.createFromPath(options.iconPath)) + const tray = new Tray(createDesktopTrayImage(options.iconPath, options.profile)) let language = options.language const rebuildMenu = () => { diff --git a/apps/buddy/electron/main/trayIcon.ts b/apps/buddy/electron/main/trayIcon.ts new file mode 100644 index 000000000..5c1a74daf --- /dev/null +++ b/apps/buddy/electron/main/trayIcon.ts @@ -0,0 +1,31 @@ +import type { NativeImage } from 'electron' +import type { BuddyRuntimeProfile } from '../../shared/runtime/profile' +import { readFileSync } from 'node:fs' +import process from 'node:process' +import { nativeImage } from 'electron' +import developmentTray from '../../resources/icons/macos/tray-icon-dev.png?asset' +import developmentTray2x from '../../resources/icons/macos/tray-icon-dev@2x.png?asset' +import testTray from '../../resources/icons/macos/tray-icon-test.png?asset' +import testTray2x from '../../resources/icons/macos/tray-icon-test@2x.png?asset' +import stableTray from '../../resources/icons/macos/tray-icon.png?asset' +import stableTray2x from '../../resources/icons/macos/tray-icon@2x.png?asset' + +const macosTrayIcons: Record = { + stable: [stableTray, stableTray2x], + development: [developmentTray, developmentTray2x], + test: [testTray, testTray2x], +} + +export function createDesktopTrayImage(iconPath: string, profile: BuddyRuntimeProfile): NativeImage { + if (process.platform !== 'darwin') + return nativeImage.createFromPath(iconPath) + + const image = nativeImage.createEmpty() + for (const [index, path] of macosTrayIcons[profile].entries()) { + image.addRepresentation({ + scaleFactor: index + 1, + dataURL: `data:image/png;base64,${readFileSync(path).toString('base64')}`, + }) + } + return image +} diff --git a/apps/buddy/resources/icons/macos/tray-icon-dev.png b/apps/buddy/resources/icons/macos/tray-icon-dev.png new file mode 100644 index 000000000..9aedc3da8 Binary files /dev/null and b/apps/buddy/resources/icons/macos/tray-icon-dev.png differ diff --git a/apps/buddy/resources/icons/macos/tray-icon-dev@2x.png b/apps/buddy/resources/icons/macos/tray-icon-dev@2x.png new file mode 100644 index 000000000..6c6bcf243 Binary files /dev/null and b/apps/buddy/resources/icons/macos/tray-icon-dev@2x.png differ diff --git a/apps/buddy/resources/icons/macos/tray-icon-test.png b/apps/buddy/resources/icons/macos/tray-icon-test.png new file mode 100644 index 000000000..947cf989b Binary files /dev/null and b/apps/buddy/resources/icons/macos/tray-icon-test.png differ diff --git a/apps/buddy/resources/icons/macos/tray-icon-test@2x.png b/apps/buddy/resources/icons/macos/tray-icon-test@2x.png new file mode 100644 index 000000000..b4ff9397e Binary files /dev/null and b/apps/buddy/resources/icons/macos/tray-icon-test@2x.png differ diff --git a/apps/buddy/resources/icons/macos/tray-icon.png b/apps/buddy/resources/icons/macos/tray-icon.png new file mode 100644 index 000000000..50ca03268 Binary files /dev/null and b/apps/buddy/resources/icons/macos/tray-icon.png differ diff --git a/apps/buddy/resources/icons/macos/tray-icon@2x.png b/apps/buddy/resources/icons/macos/tray-icon@2x.png new file mode 100644 index 000000000..b5bfa747d Binary files /dev/null and b/apps/buddy/resources/icons/macos/tray-icon@2x.png differ