Browse Source

[PM-3680] Remove ipcRenderer from desktop-theming.service (#6478)

pull/6499/head
Daniel García 2 years ago committed by GitHub
parent
commit
3dab77ba9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      apps/desktop/src/app/services/desktop-theming.service.ts
  2. 7
      apps/desktop/src/platform/preload.ts

7
apps/desktop/src/app/services/desktop-theming.service.ts

@ -1,5 +1,4 @@ @@ -1,5 +1,4 @@
import { Injectable } from "@angular/core";
import { ipcRenderer } from "electron";
import { ThemingService } from "@bitwarden/angular/services/theming/theming.service";
import { ThemeType } from "@bitwarden/common/enums";
@ -7,12 +6,10 @@ import { ThemeType } from "@bitwarden/common/enums"; @@ -7,12 +6,10 @@ import { ThemeType } from "@bitwarden/common/enums";
@Injectable()
export class DesktopThemingService extends ThemingService {
protected async getSystemTheme(): Promise<ThemeType> {
return await ipcRenderer.invoke("systemTheme");
return await ipc.platform.getSystemTheme();
}
protected monitorSystemThemeChanges(): void {
ipcRenderer.on("systemThemeUpdated", (_event, theme: ThemeType) =>
this.updateSystemTheme(theme)
);
ipc.platform.onSystemThemeUpdated((theme: ThemeType) => this.updateSystemTheme(theme));
}
}

7
apps/desktop/src/platform/preload.ts

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
import { ipcRenderer } from "electron";
import { DeviceType } from "@bitwarden/common/enums/device-type.enum";
import { DeviceType, ThemeType } from "@bitwarden/common/enums";
import { isDev, isWindowsStore } from "../utils";
@ -12,6 +12,11 @@ export default { @@ -12,6 +12,11 @@ export default {
isDev: isDev(),
isWindowsStore: isWindowsStore(),
reloadProcess: () => ipcRenderer.send("reload-process"),
getSystemTheme: (): Promise<ThemeType> => ipcRenderer.invoke("systemTheme"),
onSystemThemeUpdated: (callback: (theme: ThemeType) => void) => {
ipcRenderer.on("systemThemeUpdated", (_event, theme: ThemeType) => callback(theme));
},
};
function deviceType(): DeviceType {

Loading…
Cancel
Save