marcel/better-xcloud
1
0
Fork 0
mirror of https://github.com/redphx/better-xcloud.git synced 2025-06-06 07:37:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve ready() in Preferences

Browse Source
This commit is contained in:
redphx 2024-05-11 07:58:27 +07:00
parent 9988a55601
commit 77f7b647da
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/types/preferences.d.ts vendored
View File

@ -5,7 +5,7 @@ export type PreferenceSetting = {
unsupported?: string | boolean; unsupported?: string | boolean;
note?: string | HTMLElement; note?: string | HTMLElement;
type?: SettingElementType; type?: SettingElementType;
ready?: () => void; ready?: (setting: PreferenceSetting) => void;
migrate?: (savedPrefs: any, value: any) => {}; migrate?: (savedPrefs: any, value: any) => {};
min?: number; min?: number;
max?: number; max?: number;

24
src/utils/preferences.ts
View File

@ -3,7 +3,7 @@ import { SUPPORTED_LANGUAGES, t } from "@utils/translation";
import { SettingElement, SettingElementType } from "@utils/settings"; import { SettingElement, SettingElementType } from "@utils/settings";
import { UserAgentProfile } from "@utils/user-agent"; import { UserAgentProfile } from "@utils/user-agent";
import { StreamStat } from "@modules/stream/stream-stats"; import { StreamStat } from "@modules/stream/stream-stats";
import type { PreferenceSettings } from "@/types/preferences"; import type { PreferenceSetting, PreferenceSettings } from "@/types/preferences";
import { STATES } from "@utils/global"; import { STATES } from "@utils/global";
export enum PrefKey { export enum PrefKey {
@ -207,8 +207,7 @@ export class Preferences {
return options; return options;
})(), })(),
ready: () => { ready: (setting: PreferenceSetting) => {
const setting = Preferences.SETTINGS[PrefKey.STREAM_CODEC_PROFILE]
const options: any = setting.options; const options: any = setting.options;
const keys = Object.keys(options); const keys = Object.keys(options);
@ -256,8 +255,7 @@ export class Preferences {
off: t('off'), off: t('off'),
}, },
unsupported: !STATES.hasTouchSupport, unsupported: !STATES.hasTouchSupport,
ready: () => { ready: (setting: PreferenceSetting) => {
const setting = Preferences.SETTINGS[PrefKey.STREAM_TOUCH_CONTROLLER];
if (setting.unsupported) { if (setting.unsupported) {
setting.default = 'default'; setting.default = 'default';
} }
@ -364,15 +362,13 @@ export class Preferences {
label: t('enable-mkb'), label: t('enable-mkb'),
default: false, default: false,
unsupported: ((): string | boolean => { unsupported: ((): string | boolean => {
const userAgent = ((window.navigator as any).orgUserAgent || window.navigator.userAgent || '').toLowerCase(); const userAgent = ((window.navigator as any).orgUserAgent || window.navigator.userAgent || '').toLowerCase();
return userAgent.match(/(android|iphone|ipad)/) ? t('browser-unsupported-feature') : false; return userAgent.match(/(android|iphone|ipad)/) ? t('browser-unsupported-feature') : false;
})(), })(),
ready: () => { ready: (setting: PreferenceSetting) => {
const pref = Preferences.SETTINGS[PrefKey.MKB_ENABLED];
let note; let note;
let url; let url;
if (pref.unsupported) { if (setting.unsupported) {
note = t('browser-unsupported-feature'); note = t('browser-unsupported-feature');
url = 'https://github.com/redphx/better-xcloud/issues/206#issuecomment-1920475657'; url = 'https://github.com/redphx/better-xcloud/issues/206#issuecomment-1920475657';
} else { } else {
@ -380,7 +376,7 @@ export class Preferences {
url = 'https://better-xcloud.github.io/mouse-and-keyboard/#disclaimer'; url = 'https://better-xcloud.github.io/mouse-and-keyboard/#disclaimer';
} }
Preferences.SETTINGS[PrefKey.MKB_ENABLED].note = CE('a', { setting.note = CE('a', {
href: url, href: url,
target: '_blank', target: '_blank',
}, '⚠️ ' + note); }, '⚠️ ' + note);
@ -629,7 +625,7 @@ export class Preferences {
for (let settingId in Preferences.SETTINGS) { for (let settingId in Preferences.SETTINGS) {
const setting = Preferences.SETTINGS[settingId]; const setting = Preferences.SETTINGS[settingId];
setting.ready && setting.ready.call(this); setting.ready && setting.ready.call(this, setting);
if (setting.migrate && settingId in savedPrefs) { if (setting.migrate && settingId in savedPrefs) {
setting.migrate.call(this, savedPrefs, savedPrefs[settingId]); setting.migrate.call(this, savedPrefs, savedPrefs[settingId]);