Skip to content

Commit

Permalink
use type, remove console
Browse files Browse the repository at this point in the history
  • Loading branch information
kgarner7 committed Jan 23, 2024
1 parent b3a9e7c commit 5e9ef9f
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion src/main/features/core/settings/index.ts
Original file line number Diff line number Diff line change
@@ -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();

Expand Down Expand Up @@ -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;
});
3 changes: 2 additions & 1 deletion src/main/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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';
};

Expand Down
3 changes: 2 additions & 1 deletion src/main/preload/local-settings.ts
Original file line number Diff line number Diff line change
@@ -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();

Expand Down Expand Up @@ -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);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ export const ThemeSettings = () => {
},
});
if (localSettings) {
console.log(theme);
localSettings.themeSet(
theme === AppTheme.DEFAULT_DARK ? 'dark' : 'light',
);
Expand Down
2 changes: 2 additions & 0 deletions src/renderer/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,3 +209,5 @@ export enum FontType {
CUSTOM = 'custom',
SYSTEM = 'system',
}

export type TitleTheme = 'dark' | 'light' | 'system';

0 comments on commit 5e9ef9f

Please sign in to comment.