Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: app theme depend on local storage instead native theme electron #1014

Merged
merged 1 commit into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions core/src/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
* @description Enum of all the routes exposed by the app
*/
export enum AppRoute {
setNativeThemeLight = 'setNativeThemeLight',
setNativeThemeDark = 'setNativeThemeDark',
setNativeThemeSystem = 'setNativeThemeSystem',
appDataPath = 'appDataPath',
appVersion = 'appVersion',
getResourcePath = 'getResourcePath',
Expand Down
24 changes: 0 additions & 24 deletions electron/handlers/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,6 @@ import { AppRoute } from '@janhq/core'
import { getResourcePath } from './../utils/path'

export function handleAppIPCs() {
/**
* Handles the "setNativeThemeLight" IPC message by setting the native theme source to "light".
* This will change the appearance of the app to the light theme.
*/
ipcMain.handle(AppRoute.setNativeThemeLight, () => {
nativeTheme.themeSource = 'light'
})

/**
* Handles the "setNativeThemeDark" IPC message by setting the native theme source to "dark".
* This will change the appearance of the app to the dark theme.
*/
ipcMain.handle(AppRoute.setNativeThemeDark, () => {
nativeTheme.themeSource = 'dark'
})

/**
* Handles the "setNativeThemeSystem" IPC message by setting the native theme source to "system".
* This will change the appearance of the app to match the system's current theme.
*/
ipcMain.handle(AppRoute.setNativeThemeSystem, () => {
nativeTheme.themeSource = 'system'
})

/**
* Returns the version of the app.
* @param _event - The IPC event object.
Expand Down
17 changes: 3 additions & 14 deletions web/containers/Layout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,11 @@ const BaseLayout = (props: PropsWithChildren) => {
const { children } = props
const { mainViewState } = useMainViewState()

const { theme } = useTheme()
const { theme, setTheme } = useTheme()

// Force set theme native
useEffect(() => {
async function setTheme() {
switch (theme) {
case 'light':
return await window?.electronAPI.setNativeThemeLight()
case 'dark':
return await window?.electronAPI.setNativeThemeDark()
default:
return await window?.electronAPI.setNativeThemeSystem()
}
}
setTheme()
}, [theme])
setTheme(theme as string)
}, [setTheme, theme])

return (
<div className="flex h-screen w-screen flex-1 overflow-hidden">
Expand Down
13 changes: 1 addition & 12 deletions web/screens/Settings/Appearance/ToggleTheme.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,6 @@ const themeMenus = [{ name: 'light' }, { name: 'dark' }, { name: 'system' }]
export default function ToggleTheme() {
const { theme: currentTheme, setTheme } = useTheme()

const handeleNativeTheme = async (val: string) => {
switch (val) {
case 'light':
return await window?.electronAPI.setNativeThemeLight()
case 'dark':
return await window?.electronAPI.setNativeThemeDark()
default:
return await window?.electronAPI.setNativeThemeSystem()
}
}

return (
<div className="flex items-center space-x-1">
{themeMenus.map((theme, i) => {
Expand All @@ -32,7 +21,7 @@ export default function ToggleTheme() {
)}
onClick={async () => {
setTheme(theme.name)
handeleNativeTheme(theme.name)
// handeleNativeTheme(theme.name)
}}
>
{theme.name}
Expand Down
Loading