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.

Sign up for GitHub

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

Jump to bottom

allow to override prefers-color-scheme via url param for guests #29940

Closed
wants to merge 4 commits into from
Closed

allow to override prefers-color-scheme via url param for guests #29940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06cd8e2
allow to override prefers-color-scheme via url param for guests
jonathanmmm Nov 27, 2021
e3c012b
Update apps/accessibility/src/accessibilityoca.js
CarlSchwan Nov 29, 2021
8ad68c8
fixed string in double quote to single quote
jonathanmmm Nov 29, 2021
fde70cd
works with dark mode enabled in system (not with light mode and forci…
jonathanmmm Dec 6, 2021
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
4 changes: 2 additions & 2 deletions apps/accessibility/js/accessibilityoca.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/accessibility/js/accessibilityoca.js.map
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 8 additions & 5 deletions apps/accessibility/lib/AppInfo/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,17 @@ public function injectCss(IUserSession $userSession,
$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
}
\OCP\Util::addScript('accessibility', 'accessibilityoca');
} else {
$userValues = ['dark'];

//override prefers-color-scheme for guests if force-color-scheme is given
if (isset($_GET['force-color-scheme']) && ($_GET['force-color-scheme'] === 'dark' || $_GET['force-color-scheme'] === 'light')) {
$userValues = [$_GET['force-color-scheme']];
} else {
$userValues = ['dark'];
}
$hash = md5(implode('-', $userValues));
$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
\OCP\Util::addScript('accessibility', 'accessibilityoca');
\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: ' . $userValues[0] . ')', 'href' => $linkToCSS]);
}
\OCP\Util::addScript('accessibility', 'accessibilityoca');
}
}
7 changes: 6 additions & 1 deletion apps/accessibility/lib/Controller/AccessibilityController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,12 @@ public function getCss(): DataDisplayResponse {
if ($this->userSession->isLoggedIn()) {
$userValues = $this->getUserValues();
} else {
$userValues = ['dark'];
if (isset($_GET['force-color-scheme']) && ($_GET['force-color-scheme'] === 'dark' || $_GET['force-color-scheme'] === 'light')) {
$userValues = $_GET['force-color-scheme'];
} else {
$userValues = ['dark'];
}

}

foreach ($userValues as $key => $scssFile) {
Expand Down
9 changes: 7 additions & 2 deletions apps/accessibility/src/accessibilityoca.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,13 @@
import { loadState } from '@nextcloud/initial-state'

OCA.Accessibility = loadState('accessibility', 'data')
if (OCA.Accessibility.checkMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
// Overwrite the theme for Guests based on the prefers-color-scheme
// Force a specific theme for guests based on force-color-scheme param
const srvUrl = new URL(window.location.href)
const forceColorScheme = srvUrl.searchParams.get('force-color-scheme')
if (forceColorScheme !== null && (forceColorScheme === 'dark' || forceColorScheme === 'light')) {
OCA.Accessibility.theme = forceColorScheme
} else if (OCA.Accessibility.checkMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
// Overwrite the theme for guests based on the prefers-color-scheme
OCA.Accessibility.theme = 'dark'
}

Expand Down