1 files changed, 24 insertions, 13 deletions

diff --git a/packages/main/src/controllers/NativeThemeController.ts b/packages/main/src/controllers/NativeThemeController.ts
index 07a3292..a50d41e 100644
--- a/packages/main/src/controllers/NativeThemeController.ts
+++ b/packages/main/src/controllers/NativeThemeController.ts
@@ -18,21 +18,32 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import { nativeTheme } from 'electron';
 import { autorun } from 'mobx';
-import type { IDisposer } from 'mobx-state-tree';
+import { IDisposer } from 'mobx-state-tree';
 
-import type { NativeThemeService } from '../services/NativeThemeService';
 import type { MainStore } from '../stores/MainStore';
 
-export function initNativeTheme(store: MainStore, service: NativeThemeService): IDisposer {
-  const themeSourceReactionDisposer = autorun(() => {
-    service.setThemeSource(store.config.themeSource);
-  });
-  const onShouldUseDarkColorsUpdatedDisposer = service.onShouldUseDarkColorsUpdated(
-    store.setShouldUseDarkColors,
-  );
-  return () => {
-    onShouldUseDarkColorsUpdatedDisposer();
-    themeSourceReactionDisposer();
-  };
+export class NativeThemeController {
+  private autorunDisposer: IDisposer | null = null;
+
+  private shouldUseDarkColorsListener: (() => void) | null = null;
+
+  connect(store: MainStore): void {
+    this.autorunDisposer = autorun(() => {
+      nativeTheme.themeSource = store.config.themeSource;
+    });
+    store.setShouldUseDarkColors(nativeTheme.shouldUseDarkColors);
+    this.shouldUseDarkColorsListener = () => {
+      store.setShouldUseDarkColors(nativeTheme.shouldUseDarkColors);
+    };
+    nativeTheme.on('updated', this.shouldUseDarkColorsListener);
+  }
+
+  dispose(): void {
+    if (this.shouldUseDarkColorsListener !== null) {
+      nativeTheme.off('updated', this.shouldUseDarkColorsListener);
+    }
+    this.autorunDisposer?.();
+  }
 }