diff --git a/apps/renderer/src/atoms/settings/general.ts b/apps/renderer/src/atoms/settings/general.ts index 8fff08649..913f0697f 100644 --- a/apps/renderer/src/atoms/settings/general.ts +++ b/apps/renderer/src/atoms/settings/general.ts @@ -18,10 +18,12 @@ const createDefaultSettings = (): GeneralSettings => ({ hoverMarkUnread: true, renderMarkUnread: false, // UX - // autoHideFeedColumn: true, + groupByDate: true, // Secure jumpOutLinkWarn: true, + // TTS + voice: "en-US-AndrewMultilingualNeural", }) export const { @@ -44,4 +46,5 @@ export const generalServerSyncWhiteListKeys: (keyof GeneralSettings)[] = [ "dataPersist", "sendAnonymousData", "language", + "voice", ] diff --git a/apps/renderer/src/atoms/settings/ui.ts b/apps/renderer/src/atoms/settings/ui.ts index 5b3597d2e..bcda1ddb2 100644 --- a/apps/renderer/src/atoms/settings/ui.ts +++ b/apps/renderer/src/atoms/settings/ui.ts @@ -11,6 +11,7 @@ export const createDefaultSettings = (): UISettings => ({ opaqueSidebar: false, sidebarShowUnreadCount: true, + hideExtraBadge: false, // Global UI uiTextSize: 16, @@ -37,9 +38,6 @@ export const createDefaultSettings = (): UISettings => ({ pictureViewMasonry: true, pictureViewFilterNoImage: false, wideMode: false, - - // TTS - voice: "en-US-AndrewMultilingualNeural", }) export const { @@ -57,7 +55,6 @@ export const uiServerSyncWhiteListKeys: (keyof UISettings)[] = [ "uiFontFamily", "readerFontFamily", "opaqueSidebar", - "voice", ] const isZenModeAtom = atom((get) => { diff --git a/apps/renderer/src/modules/settings/tabs/general.tsx b/apps/renderer/src/modules/settings/tabs/general.tsx index 2b66cace4..3411c6f16 100644 --- a/apps/renderer/src/modules/settings/tabs/general.tsx +++ b/apps/renderer/src/modules/settings/tabs/general.tsx @@ -20,10 +20,10 @@ import { defaultResources } from "~/@types/default-resource" import { langLoadingLockMapAtom } from "~/atoms/lang" import { setGeneralSetting, + useGeneralSettingKey, useGeneralSettingSelector, useGeneralSettingValue, } from "~/atoms/settings/general" -import { createDefaultSettings, setUISetting, useUISettingSelector } from "~/atoms/settings/ui" import { useModalStack } from "~/components/ui/modal/stacked/hooks" import { useProxyValue, useSetProxy } from "~/hooks/biz/useProxySetting" import { fallbackLanguage } from "~/i18n" @@ -190,16 +190,17 @@ export const VoiceSelector = () => { persist: true, }, }) - const voice = useUISettingSelector((state) => state.voice) + + const voice = useGeneralSettingKey("voice") return (