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

Split settings into groups (#67)

Browse Source
This commit is contained in:
redphx 2023-08-06 07:17:46 +07:00 committed by GitHub
parent d6852e132d
commit 19856e6381
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 117 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
better-xcloud.user.js
View File

@ -653,22 +653,17 @@ class Preferences {
static SETTINGS = { static SETTINGS = {
[Preferences.LAST_UPDATE_CHECK]: { [Preferences.LAST_UPDATE_CHECK]: {
'default': 0, 'default': 0,
'hidden': true,
}, },
[Preferences.LATEST_VERSION]: { [Preferences.LATEST_VERSION]: {
'default': '', 'default': '',
'hidden': true,
}, },
[Preferences.CURRENT_VERSION]: { [Preferences.CURRENT_VERSION]: {
'default': '', 'default': '',
'hidden': true,
}, },
[Preferences.SERVER_REGION]: { [Preferences.SERVER_REGION]: {
'label': 'Region of streaming server',
'default': 'default', 'default': 'default',
}, },
[Preferences.STREAM_PREFERRED_LOCALE]: { [Preferences.STREAM_PREFERRED_LOCALE]: {
'label': 'Preferred game\'s language',
'default': 'default', 'default': 'default',
'options': { 'options': {
'default': 'Default', 'default': 'Default',
@ -702,7 +697,6 @@ class Preferences {
}, },
}, },
[Preferences.STREAM_TARGET_RESOLUTION]: { [Preferences.STREAM_TARGET_RESOLUTION]: {
'label': 'Stream\'s target resolution',
'default': 'auto', 'default': 'auto',
'options': { 'options': {
'auto': 'Auto', 'auto': 'Auto',
@ -711,19 +705,15 @@ class Preferences {
}, },
}, },
[Preferences.USE_DESKTOP_CODEC]: { [Preferences.USE_DESKTOP_CODEC]: {
'label': 'Force high-quality codec',
'default': false, 'default': false,
}, },
[Preferences.PREFER_IPV6_SERVER]: { [Preferences.PREFER_IPV6_SERVER]: {
'label': 'Prefer IPv6 streaming server',
'default': false, 'default': false,
}, },
[Preferences.DISABLE_BANDWIDTH_CHECKING]: { [Preferences.DISABLE_BANDWIDTH_CHECKING]: {
'label': 'Disable bandwidth checking',
'default': false, 'default': false,
}, },
[Preferences.SCREENSHOT_BUTTON_POSITION]: { [Preferences.SCREENSHOT_BUTTON_POSITION]: {
'label': 'Screenshot button\'s position',
'default': 'bottom-left', 'default': 'bottom-left',
'options': 'options':
{ {
@ -733,15 +723,12 @@ class Preferences {
}, },
}, },
[Preferences.SKIP_SPLASH_VIDEO]: { [Preferences.SKIP_SPLASH_VIDEO]: {
'label': 'Skip Xbox splash video',
'default': false, 'default': false,
}, },
[Preferences.HIDE_DOTS_ICON]: { [Preferences.HIDE_DOTS_ICON]: {
'label': 'Hide System menu\'s icon while playing',
'default': false, 'default': false,
}, },
[Preferences.STREAM_TOUCH_CONTROLLER]: { [Preferences.STREAM_TOUCH_CONTROLLER]: {
'label': 'Touch controller',
'default': 'default', 'default': 'default',
'options': { 'options': {
'default': 'Default', 'default': 'Default',
@ -750,27 +737,21 @@ class Preferences {
}, },
}, },
[Preferences.STREAM_SIMPLIFY_MENU]: { [Preferences.STREAM_SIMPLIFY_MENU]: {
'label': 'Simplify Stream\'s menu',
'default': false, 'default': false,
}, },
[Preferences.STREAM_HIDE_IDLE_CURSOR]: { [Preferences.STREAM_HIDE_IDLE_CURSOR]: {
'label': 'Hide mouse cursor while playing',
'default': false, 'default': false,
}, },
[Preferences.REDUCE_ANIMATIONS]: { [Preferences.REDUCE_ANIMATIONS]: {
'label': 'Reduce UI animations',
'default': false, 'default': false,
}, },
[Preferences.BLOCK_SOCIAL_FEATURES]: { [Preferences.BLOCK_SOCIAL_FEATURES]: {
'label': 'Disable social features',
'default': false, 'default': false,
}, },
[Preferences.BLOCK_TRACKING]: { [Preferences.BLOCK_TRACKING]: {
'label': 'Disable xCloud analytics',
'default': false, 'default': false,
}, },
[Preferences.USER_AGENT_PROFILE]: { [Preferences.USER_AGENT_PROFILE]: {
'label': 'User-Agent profile',
'default': 'default', 'default': 'default',
'options': { 'options': {
[UserAgent.PROFILE_DEFAULT]: 'Default', [UserAgent.PROFILE_DEFAULT]: 'Default',
@ -782,41 +763,30 @@ class Preferences {
}, },
[Preferences.USER_AGENT_CUSTOM]: { [Preferences.USER_AGENT_CUSTOM]: {
'default': '', 'default': '',
'hidden': true,
}, },
[Preferences.VIDEO_FILL_FULL_SCREEN]: { [Preferences.VIDEO_FILL_FULL_SCREEN]: {
'label': 'Stretch video to full screen',
'default': false, 'default': false,
'hidden': true,
}, },
[Preferences.VIDEO_SATURATION]: { [Preferences.VIDEO_SATURATION]: {
'label': 'Video saturation (%)',
'default': 100, 'default': 100,
'min': 0, 'min': 0,
'max': 150, 'max': 150,
'hidden': true,
}, },
[Preferences.VIDEO_CONTRAST]: { [Preferences.VIDEO_CONTRAST]: {
'label': 'Video contrast (%)',
'default': 100, 'default': 100,
'min': 0, 'min': 0,
'max': 150, 'max': 150,
'hidden': true,
}, },
[Preferences.VIDEO_BRIGHTNESS]: { [Preferences.VIDEO_BRIGHTNESS]: {
'label': 'Video brightness (%)',
'default': 100, 'default': 100,
'min': 0, 'min': 0,
'max': 150, 'max': 150,
'hidden': true,
}, },
[Preferences.STATS_SHOW_WHEN_PLAYING]: { [Preferences.STATS_SHOW_WHEN_PLAYING]: {
'default': false, 'default': false,
'hidden': true,
}, },
[Preferences.STATS_QUICK_GLANCE]: { [Preferences.STATS_QUICK_GLANCE]: {
'default': false, 'default': false,
'hidden': true,
}, },
[Preferences.STATS_POSITION]: { [Preferences.STATS_POSITION]: {
'default': 'top-left', 'default': 'top-left',
@ -825,7 +795,6 @@ class Preferences {
'top-center': 'Top Center', 'top-center': 'Top Center',
'top-right': 'Top Right', 'top-right': 'Top Right',
}, },
'hidden': true,
}, },
[Preferences.STATS_TEXT_SIZE]: { [Preferences.STATS_TEXT_SIZE]: {
'default': '0.9rem', 'default': '0.9rem',
@ -834,21 +803,17 @@ class Preferences {
'1.0rem': 'Normal', '1.0rem': 'Normal',
'1.1rem': 'Large', '1.1rem': 'Large',
}, },
'hidden': true,
}, },
[Preferences.STATS_TRANSPARENT]: { [Preferences.STATS_TRANSPARENT]: {
'default': false, 'default': false,
'hidden': true,
}, },
[Preferences.STATS_OPACITY]: { [Preferences.STATS_OPACITY]: {
'default': 80, 'default': 80,
'min': 50, 'min': 50,
'max': 100, 'max': 100,
'hidden': true,
}, },
[Preferences.STATS_CONDITIONAL_FORMATTING]: { [Preferences.STATS_CONDITIONAL_FORMATTING]: {
'default': false, 'default': false,
'hidden': true,
}, },
} }
@ -1044,7 +1009,7 @@ function addCss() {
.better-xcloud-settings-wrapper a.better-xcloud-settings-title { .better-xcloud-settings-wrapper a.better-xcloud-settings-title {
font-family: Bahnschrift, Arial, Helvetica, sans-serif; font-family: Bahnschrift, Arial, Helvetica, sans-serif;
font-size: 20px; font-size: 1.4rem;
text-decoration: none; text-decoration: none;
font-weight: bold; font-weight: bold;
display: block; display: block;
@ -1053,6 +1018,12 @@ function addCss() {
flex: 1; flex: 1;
} }
.better-xcloud-settings-group-label {
font-weight: bold;
display: block;
font-size: 1.1rem;
}
@media (hover: hover) { @media (hover: hover) {
.better-xcloud-settings-wrapper a.better-xcloud-settings-title:hover { .better-xcloud-settings-wrapper a.better-xcloud-settings-title:hover {
color: #83f73a; color: #83f73a;
@ -1081,29 +1052,30 @@ function addCss() {
text-decoration: underline; text-decoration: underline;
} }
.better-xcloud-settings-wrapper .setting_row { .better-xcloud-settings-row {
display: flex; display: flex;
margin-bottom: 8px; margin-bottom: 8px;
padding: 2px 4px; padding: 2px 4px;
} }
.better-xcloud-settings-wrapper .setting_row label { .better-xcloud-settings-row label {
flex: 1; flex: 1;
align-self: center; align-self: center;
margin-bottom: 0; margin-bottom: 0;
padding-left: 10px;
} }
@media not (hover: hover) { @media not (hover: hover) {
.better-xcloud-settings-wrapper .setting_row:focus-within { .better-xcloud-settings-row:focus-within {
background-color: #242424; background-color: #242424;
} }
} }
.better-xcloud-settings-wrapper .setting_row input { .better-xcloud-settings-row input {
align-self: center; align-self: center;
} }
.better-xcloud-settings-wrapper .setting_button { .better-xcloud-settings-reload-button {
padding: 8px 32px; padding: 8px 32px;
margin: 10px auto 0; margin: 10px auto 0;
border: none; border: none;
@ -1119,16 +1091,16 @@ function addCss() {
} }
@media (hover: hover) { @media (hover: hover) {
.better-xcloud-settings-wrapper .setting_button:hover { .better-xcloud-settings-reload-button:hover {
background-color: #00753c; background-color: #00753c;
} }
} }
.better-xcloud-settings-wrapper .setting_button:focus { .better-xcloud-settings-reload-button:focus {
background-color: #00753c; background-color: #00753c;
} }
.better-xcloud-settings-wrapper .setting_button:active { .better-xcloud-settings-reload-button:active {
background-color: #00753c; background-color: #00753c;
} }
@ -1876,6 +1848,7 @@ function injectSettingsButton($parent) {
const PREF_PREFERRED_REGION = getPreferredServerRegion(); const PREF_PREFERRED_REGION = getPreferredServerRegion();
const PREF_LATEST_VERSION = PREFS.get(Preferences.LATEST_VERSION, null); const PREF_LATEST_VERSION = PREFS.get(Preferences.LATEST_VERSION, null);
// Setup Settings button
const $button = CE('button', {'class': 'better-xcloud-settings-button'}, PREF_PREFERRED_REGION); const $button = CE('button', {'class': 'better-xcloud-settings-button'}, PREF_PREFERRED_REGION);
$button.addEventListener('click', e => { $button.addEventListener('click', e => {
const $settings = document.querySelector('.better_xcloud_settings'); const $settings = document.querySelector('.better_xcloud_settings');
@ -1883,12 +1856,15 @@ function injectSettingsButton($parent) {
$settings.scrollIntoView(); $settings.scrollIntoView();
}); });
// Show new update status
if (PREF_LATEST_VERSION && PREF_LATEST_VERSION !== SCRIPT_VERSION) { if (PREF_LATEST_VERSION && PREF_LATEST_VERSION !== SCRIPT_VERSION) {
$button.setAttribute('data-update-available', true); $button.setAttribute('data-update-available', true);
} }
// Add Settings button to the web page
$parent.appendChild($button); $parent.appendChild($button);
// Setup Settings UI
const $container = CE('div', { const $container = CE('div', {
'class': 'better_xcloud_settings better-xcloud-gone', 'class': 'better_xcloud_settings better-xcloud-gone',
}); });
@ -1910,16 +1886,51 @@ function injectSettingsButton($parent) {
); );
$container.appendChild($wrapper); $container.appendChild($wrapper);
// Show new version indicator
if (PREF_LATEST_VERSION && PREF_LATEST_VERSION != SCRIPT_VERSION) { if (PREF_LATEST_VERSION && PREF_LATEST_VERSION != SCRIPT_VERSION) {
$updateAvailable.textContent = `🌟 Version ${PREF_LATEST_VERSION} available`; $updateAvailable.textContent = `🌟 Version ${PREF_LATEST_VERSION} available`;
$updateAvailable.style.display = 'block'; $updateAvailable.style.display = 'block';
} }
for (let settingId in Preferences.SETTINGS) { // Render settings
const SETTINGS_UI = {
'Server': {
[Preferences.SERVER_REGION]: 'Region',
[Preferences.STREAM_PREFERRED_LOCALE]: 'Preferred game\'s language',
[Preferences.PREFER_IPV6_SERVER]: 'Prefer IPv6 server',
},
'Stream quality': {
[Preferences.STREAM_TARGET_RESOLUTION]: 'Target resolution',
[Preferences.USE_DESKTOP_CODEC]: 'Force high-quality codec',
[Preferences.DISABLE_BANDWIDTH_CHECKING]: 'Disable bandwidth checking',
},
'Controller': {
[Preferences.STREAM_TOUCH_CONTROLLER]: 'Touch controller',
[Preferences.STREAM_HIDE_IDLE_CURSOR]: 'Hide mouse cursor on idle',
},
'UI': {
[Preferences.STREAM_SIMPLIFY_MENU]: 'Simplify Stream\'s menu',
[Preferences.SKIP_SPLASH_VIDEO]: 'Skip Xbox splash video',
[Preferences.HIDE_DOTS_ICON]: 'Hide System menu\'s icon',
[Preferences.REDUCE_ANIMATIONS]: 'Reduce UI animations',
[Preferences.SCREENSHOT_BUTTON_POSITION]: 'Screenshot button\'s position',
},
'Other': {
[Preferences.BLOCK_SOCIAL_FEATURES]: 'Disable social features',
[Preferences.BLOCK_TRACKING]: 'Disable xCloud analytics',
},
'Advanced': {
[Preferences.USER_AGENT_PROFILE]: 'User-Agent profile',
},
};
for (let groupLabel in SETTINGS_UI) {
const $group = CE('span', {'class': 'better-xcloud-settings-group-label'}, groupLabel);
$wrapper.appendChild($group);
for (let settingId in SETTINGS_UI[groupLabel]) {
const setting = Preferences.SETTINGS[settingId]; const setting = Preferences.SETTINGS[settingId];
if (setting.hidden) { const settingLabel = SETTINGS_UI[groupLabel][settingId];
continue;
}
let $control, $inpCustomUserAgent; let $control, $inpCustomUserAgent;
let labelAttrs = {}; let labelAttrs = {};
@ -1944,7 +1955,7 @@ function injectSettingsButton($parent) {
$inpCustomUserAgent.readOnly = !isCustom; $inpCustomUserAgent.readOnly = !isCustom;
$inpCustomUserAgent.disabled = !isCustom; $inpCustomUserAgent.disabled = !isCustom;
}); });
} else if (settingId === Preferences.SERVER_REGION || setting.options) { } else if (settingId === Preferences.SERVER_REGION) {
let selectedValue; let selectedValue;
$control = CE('select', {id: 'xcloud_setting_' + settingId}); $control = CE('select', {id: 'xcloud_setting_' + settingId});
@ -1952,7 +1963,6 @@ function injectSettingsButton($parent) {
PREFS.set(settingId, e.target.value); PREFS.set(settingId, e.target.value);
}); });
if (settingId === Preferences.SERVER_REGION) {
selectedValue = PREF_PREFERRED_REGION; selectedValue = PREF_PREFERRED_REGION;
setting.options = {}; setting.options = {};
for (let regionName in SERVER_REGIONS) { for (let regionName in SERVER_REGIONS) {
@ -1967,9 +1977,6 @@ function injectSettingsButton($parent) {
setting.options[value] = label; setting.options[value] = label;
} }
} else {
selectedValue = PREFS.get(settingId);
}
for (let value in setting.options) { for (let value in setting.options) {
const label = setting.options[value]; const label = setting.options[value];
@ -1978,24 +1985,12 @@ function injectSettingsButton($parent) {
$option.selected = value === selectedValue || label.includes(selectedValue); $option.selected = value === selectedValue || label.includes(selectedValue);
$control.appendChild($option); $control.appendChild($option);
} }
} else { } else {
$control = CE('input', { $control = PREFS.toElement(settingId);
id: 'xcloud_setting_' + settingId, labelAttrs = {'for': $control.id, 'tabindex': 0};
type: 'checkbox',
'data-key': settingId,
});
$control.addEventListener('change', e => {
PREFS.set(e.target.getAttribute('data-key'), e.target.checked);
});
setting.value = PREFS.get(settingId);
$control.checked = setting.value;
labelAttrs = {'for': 'xcloud_setting_' + settingId, 'tabindex': 0};
} }
// Disable unsupported settings
if (settingId === Preferences.USE_DESKTOP_CODEC && !hasHighQualityCodecSupport()) { if (settingId === Preferences.USE_DESKTOP_CODEC && !hasHighQualityCodecSupport()) {
$control.disabled = true; $control.disabled = true;
$control.checked = false; $control.checked = false;
@ -2009,8 +2004,8 @@ function injectSettingsButton($parent) {
} }
$control.disabled && ($control.style.cursor = 'help'); $control.disabled && ($control.style.cursor = 'help');
const $elm = CE('div', {'class': 'setting_row'}, const $elm = CE('div', {'class': 'better-xcloud-settings-row'},
CE('label', labelAttrs, setting.label), CE('label', labelAttrs, settingLabel),
$control $control
); );
@ -2023,11 +2018,14 @@ function injectSettingsButton($parent) {
$control.dispatchEvent(new Event('change')); $control.dispatchEvent(new Event('change'));
} }
} }
}
const $reloadBtn = CE('button', {'class': 'setting_button', 'tabindex': 0}, 'Reload page to reflect changes'); // Setup Reload button
const $reloadBtn = CE('button', {'class': 'better-xcloud-settings-reload-button', 'tabindex': 0}, 'Reload page to reflect changes');
$reloadBtn.addEventListener('click', e => window.location.reload()); $reloadBtn.addEventListener('click', e => window.location.reload());
$wrapper.appendChild($reloadBtn); $wrapper.appendChild($reloadBtn);
// Add Settings UI to the web page
const $pageContent = document.getElementById('PageContent'); const $pageContent = document.getElementById('PageContent');
$pageContent.parentNode.insertBefore($container, $pageContent); $pageContent.parentNode.insertBefore($container, $pageContent);
} }