refactor(TrayIcon): move event listeners from the TrayIconManager to …

…the TrayIconModule (oliverschwendener#1218)
ke1v · Sep 23, 2024 · 6988277 · 6988277
1 parent 8e541d8
commit 6988277
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 48 deletions.
diff --git a/src/main/Core/TrayIcon/TrayIconManager.test.ts b/src/main/Core/TrayIcon/TrayIconManager.test.ts
@@ -1,5 +1,4 @@
-import type { EventSubscriber } from "@Core/EventSubscriber";
-import type { Menu, MenuItemConstructorOptions, NativeTheme, Tray } from "electron";
+import type { Menu, MenuItemConstructorOptions, Tray } from "electron";
 import { describe, expect, it, vi } from "vitest";
 import type { ContextMenuBuilder } from "./ContextMenuBuilder";
 import type { ContextMenuTemplateProvider } from "./ContextMenuTemplateProvider";
@@ -39,8 +38,6 @@ describe(TrayIconManager, () => {
                 trayIconFilePathResolver,
                 contextMenuTemplateProvider,
                 contextMenuBuilder,
-                <NativeTheme>{},
-                <EventSubscriber>{},
             );
 
             await trayIconManager.createTrayIcon();
@@ -65,8 +62,6 @@ describe(TrayIconManager, () => {
                 <TrayIconFilePathResolver>{ resolve: () => resolveTrayIconFilePath() },
                 <ContextMenuTemplateProvider>{},
                 <ContextMenuBuilder>{},
-                <NativeTheme>{},
-                <EventSubscriber>{},
             );
 
             trayIconManager.updateImage();
@@ -83,8 +78,6 @@ describe(TrayIconManager, () => {
                 <TrayIconFilePathResolver>{ resolve: () => resolveTrayIconFilePath() },
                 <ContextMenuTemplateProvider>{},
                 <ContextMenuBuilder>{},
-                <NativeTheme>{},
-                <EventSubscriber>{},
             );
 
             trayIconManager["tray"] = <Tray>{ setImage: (i) => setImageMock(i) };
@@ -96,32 +89,4 @@ describe(TrayIconManager, () => {
             expect(setImageMock).toHaveBeenCalledWith("test-tray-icon-file-path");
         });
     });
-
-    describe(TrayIconManager.prototype.registerEventListeners, () => {
-        it("should register the native theme updated event listener and the setting updated event listener", () => {
-            const onUpdatedMock = vi.fn();
-            const onMock = vi.fn().mockReturnValue({ on: onUpdatedMock });
-            const nativeTheme = <NativeTheme>{ on: (e, c) => onMock(e, c) };
-
-            const subscribeMock = vi.fn();
-            const eventSubscriber = <EventSubscriber>{ subscribe: (e, c) => subscribeMock(e, c) };
-
-            const trayIconManager = new TrayIconManager(
-                <TrayCreator>{},
-                <TrayIconFilePathResolver>{},
-                <ContextMenuTemplateProvider>{},
-                <ContextMenuBuilder>{},
-                nativeTheme,
-                eventSubscriber,
-            );
-
-            trayIconManager.registerEventListeners();
-
-            expect(onMock).toHaveBeenCalledOnce();
-            expect(onMock).toHaveBeenCalledWith("updated", expect.any(Function));
-
-            expect(subscribeMock).toHaveBeenCalledOnce();
-            expect(subscribeMock).toHaveBeenCalledWith("settingUpdated[general.language]", expect.any(Function));
-        });
-    });
 });
diff --git a/src/main/Core/TrayIcon/TrayIconManager.ts b/src/main/Core/TrayIcon/TrayIconManager.ts
@@ -1,5 +1,4 @@
-import type { EventSubscriber } from "@Core/EventSubscriber";
-import type { NativeTheme, Tray } from "electron";
+import type { Tray } from "electron";
 import type { ContextMenuBuilder } from "./ContextMenuBuilder";
 import type { ContextMenuTemplateProvider } from "./ContextMenuTemplateProvider";
 import type { TrayCreator } from "./TrayCreator";
@@ -13,8 +12,6 @@ export class TrayIconManager {
         private readonly trayIconFilePathResolver: TrayIconFilePathResolver,
         private readonly contextMenuTemplateProvider: ContextMenuTemplateProvider,
         private readonly contextMenuBuilder: ContextMenuBuilder,
-        private readonly nativeTheme: NativeTheme,
-        private readonly eventSubscriber: EventSubscriber,
     ) {}
 
     public async createTrayIcon() {
@@ -32,9 +29,4 @@ export class TrayIconManager {
         const menu = this.contextMenuBuilder.buildFromTemplate(template);
         this.tray?.setContextMenu(menu);
     }
-
-    public registerEventListeners() {
-        this.nativeTheme.on("updated", () => this.updateImage());
-        this.eventSubscriber.subscribe("settingUpdated[general.language]", () => this.updateContextMenu());
-    }
 }
diff --git a/src/main/Core/TrayIcon/TrayIconModule.ts b/src/main/Core/TrayIcon/TrayIconModule.ts
@@ -33,12 +33,12 @@ export class TrayIconModule {
             trayIconFilePathResolvers[operatingSystem](),
             new ContextMenuTemplateProvider(translator, ueliCommandInvoker, resources),
             new ContextMenuBuilder(),
-            nativeTheme,
-            eventSubscriber,
         );
 
         await trayIconManager.createTrayIcon();
 
-        trayIconManager.registerEventListeners();
+        nativeTheme.on("updated", () => trayIconManager.updateImage());
+
+        eventSubscriber.subscribe("settingUpdated[general.language]", () => trayIconManager.updateContextMenu());
     }
 }