From 79db0c779d6942c6bdc6823a5faef57b5307f7b3 Mon Sep 17 00:00:00 2001 From: AAGaming Date: Wed, 24 Aug 2022 23:51:20 -0400 Subject: Settings API for loader, preview branch select --- .../settings/pages/general/BranchSelect.tsx | 33 ++++++++++++++++++ .../settings/pages/general/RemoteDebugging.tsx | 13 +++----- .../components/settings/pages/general/Updater.tsx | 3 +- .../components/settings/pages/general/index.tsx | 2 ++ frontend/src/utils/hooks/useSetting.ts | 39 ++++++++++++++++++++++ 5 files changed, 80 insertions(+), 10 deletions(-) create mode 100644 frontend/src/components/settings/pages/general/BranchSelect.tsx create mode 100644 frontend/src/utils/hooks/useSetting.ts (limited to 'frontend') diff --git a/frontend/src/components/settings/pages/general/BranchSelect.tsx b/frontend/src/components/settings/pages/general/BranchSelect.tsx new file mode 100644 index 00000000..91e814e5 --- /dev/null +++ b/frontend/src/components/settings/pages/general/BranchSelect.tsx @@ -0,0 +1,33 @@ +import { Dropdown, Field } from 'decky-frontend-lib'; +import { FunctionComponent } from 'react'; + +import { useSetting } from '../../../../utils/hooks/useSetting'; + +enum UpdateBranch { + Stable, + Prerelease, + Nightly, +} + +const BranchSelect: FunctionComponent<{}> = () => { + const [selectedBranch, setSelectedBranch] = useSetting('branch', UpdateBranch.Prerelease); + + return ( + + typeof branch == 'string') + .map((branch) => ({ + label: branch, + data: UpdateBranch[branch], + }))} + selectedOption={selectedBranch} + onChange={(newVal) => { + setSelectedBranch(newVal.data); + }} + /> + + ); +}; + +export default BranchSelect; diff --git a/frontend/src/components/settings/pages/general/RemoteDebugging.tsx b/frontend/src/components/settings/pages/general/RemoteDebugging.tsx index 3fea0513..36badf45 100644 --- a/frontend/src/components/settings/pages/general/RemoteDebugging.tsx +++ b/frontend/src/components/settings/pages/general/RemoteDebugging.tsx @@ -1,15 +1,10 @@ import { Field, Toggle } from 'decky-frontend-lib'; -import { useEffect, useState } from 'react'; import { FaBug } from 'react-icons/fa'; +import { useSetting } from '../../../../utils/hooks/useSetting'; + export default function RemoteDebuggingSettings() { - const [allowRemoteDebugging, setAllowRemoteDebugging] = useState(false); - useEffect(() => { - (async () => { - const res = (await window.DeckyPluginLoader.callServerMethod('remote_debugging_allowed')) as { result: boolean }; - setAllowRemoteDebugging(res.result); - })(); - }, []); + const [allowRemoteDebugging, setAllowRemoteDebugging] = useSetting('cef_forward', false); return ( } > { setAllowRemoteDebugging(toggleValue); if (toggleValue) window.DeckyPluginLoader.callServerMethod('allow_remote_debugging'); diff --git a/frontend/src/components/settings/pages/general/Updater.tsx b/frontend/src/components/settings/pages/general/Updater.tsx index e0abe0a0..f7e4a29d 100644 --- a/frontend/src/components/settings/pages/general/Updater.tsx +++ b/frontend/src/components/settings/pages/general/Updater.tsx @@ -6,9 +6,10 @@ import { VerInfo, callUpdaterMethod, finishUpdate } from '../../../../updater'; import { useDeckyState } from '../../../DeckyState'; export default function UpdaterSettings() { + const { isLoaderUpdating, setIsLoaderUpdating } = useDeckyState(); + const [versionInfo, setVersionInfo] = useState(null); const [checkingForUpdates, setCheckingForUpdates] = useState(false); - const { isLoaderUpdating, setIsLoaderUpdating } = useDeckyState(); const [updateProgress, setUpdateProgress] = useState(-1); const [reloading, setReloading] = useState(false); diff --git a/frontend/src/components/settings/pages/general/index.tsx b/frontend/src/components/settings/pages/general/index.tsx index c6680026..a37d8dab 100644 --- a/frontend/src/components/settings/pages/general/index.tsx +++ b/frontend/src/components/settings/pages/general/index.tsx @@ -3,6 +3,7 @@ import { useState } from 'react'; import { FaShapes } from 'react-icons/fa'; import { installFromURL } from '../../../../store'; +import BranchSelect from './BranchSelect'; import RemoteDebuggingSettings from './RemoteDebugging'; import UpdaterSettings from './Updater'; @@ -21,6 +22,7 @@ export default function GeneralSettings() { /> */} + { + key: string; + default: T; +} + +interface SetSettingArgs { + key: string; + value: T; +} + +export function useSetting(key: string, def: T): [value: T | null, setValue: (value: T) => void] { + const [value, setValue] = useState(def); + const [ready, setReady] = useState(false); + + useEffect(() => { + (async () => { + const res = (await window.DeckyPluginLoader.callServerMethod('get_setting', { + key, + default: def, + } as GetSettingArgs)) as { result: T }; + setReady(true); + setValue(res.result); + })(); + }, []); + + useEffect(() => { + if (ready) + (async () => { + await window.DeckyPluginLoader.callServerMethod('set_setting', { + key, + value, + } as SetSettingArgs); + })(); + }, [value]); + + return [value, setValue]; +} -- cgit v1.2.3