From 5e9ef9f23f53c3efb92d495be05cb5f7aa969cdd Mon Sep 17 00:00:00 2001 From: Kendall Garner <17521368+kgarner7@users.noreply.github.com> Date: Mon, 22 Jan 2024 18:52:14 -0800 Subject: [PATCH] use type, remove console --- src/main/features/core/settings/index.ts | 3 ++- src/main/main.ts | 3 ++- src/main/preload/local-settings.ts | 3 ++- .../features/settings/components/general/theme-settings.tsx | 1 - src/renderer/types.ts | 2 ++ 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/features/core/settings/index.ts b/src/main/features/core/settings/index.ts index 4d2a4064..f829ea58 100644 --- a/src/main/features/core/settings/index.ts +++ b/src/main/features/core/settings/index.ts @@ -1,5 +1,6 @@ import { ipcMain, nativeTheme, safeStorage } from 'electron'; import Store from 'electron-store'; +import type { TitleTheme } from '/@/renderer/types'; export const store = new Store(); @@ -49,7 +50,7 @@ ipcMain.handle('password-set', (_event, password: string, server: string) => { return false; }); -ipcMain.on('theme-set', (_event, theme: 'dark' | 'light' | 'system') => { +ipcMain.on('theme-set', (_event, theme: TitleTheme) => { store.set('theme', theme); nativeTheme.themeSource = theme; }); diff --git a/src/main/main.ts b/src/main/main.ts index 50116805..6649fa76 100644 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -35,6 +35,7 @@ import { store } from './features/core/settings/index'; import MenuBuilder from './menu'; import { hotkeyToElectronAccelerator, isLinux, isMacOS, isWindows, resolveHtmlPath } from './utils'; import './features'; +import type { TitleTheme } from '/@/renderer/types'; declare module 'node-mpv'; @@ -416,7 +417,7 @@ const createWindow = async () => { new AppUpdater(); } - const theme = store.get('theme') as 'dark' | 'light' | 'system' | undefined; + const theme = store.get('theme') as TitleTheme | undefined; nativeTheme.themeSource = theme || 'dark'; }; diff --git a/src/main/preload/local-settings.ts b/src/main/preload/local-settings.ts index ca8937bb..7b1b3732 100644 --- a/src/main/preload/local-settings.ts +++ b/src/main/preload/local-settings.ts @@ -1,5 +1,6 @@ import { IpcRendererEvent, ipcRenderer, webFrame } from 'electron'; import Store from 'electron-store'; +import type { TitleTheme } from '/@/renderer/types'; const store = new Store(); @@ -43,7 +44,7 @@ const fontError = (cb: (event: IpcRendererEvent, file: string) => void) => { ipcRenderer.on('custom-font-error', cb); }; -const themeSet = (theme: 'dark' | 'light' | 'system'): void => { +const themeSet = (theme: TitleTheme): void => { ipcRenderer.send('theme-set', theme); }; diff --git a/src/renderer/features/settings/components/general/theme-settings.tsx b/src/renderer/features/settings/components/general/theme-settings.tsx index db82832f..af9230ca 100644 --- a/src/renderer/features/settings/components/general/theme-settings.tsx +++ b/src/renderer/features/settings/components/general/theme-settings.tsx @@ -62,7 +62,6 @@ export const ThemeSettings = () => { }, }); if (localSettings) { - console.log(theme); localSettings.themeSet( theme === AppTheme.DEFAULT_DARK ? 'dark' : 'light', ); diff --git a/src/renderer/types.ts b/src/renderer/types.ts index a40018b7..1ede3dea 100644 --- a/src/renderer/types.ts +++ b/src/renderer/types.ts @@ -209,3 +209,5 @@ export enum FontType { CUSTOM = 'custom', SYSTEM = 'system', } + +export type TitleTheme = 'dark' | 'light' | 'system';