upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Merge pull request #32681 from nextcloud/backport/32510/stable22

Browse source 
[stable22] Properly calculate primary element based on background luminance
This commit is contained in:
blizzz 2022-07-06 13:32:49 +02:00 committed by GitHub
commit 6509c841b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/accessibility/lib/Controller/AccessibilityController.php
View file

@ -248,7 +248,7 @@ class AccessibilityController extends Controller {
return $this->injectedVariables;
}
$variables = '';
foreach ($this->defaults->getScssVariables() as $key => $value) {
foreach ($this->defaults->getScssVariables(!$this->isDarkThemeEnabled()) as $key => $value) {
$variables .= '$' . $key . ': ' . $value . ';';
}
@ -267,4 +267,18 @@ class AccessibilityController extends Controller {
}
return $variables;
}
/**
* Return true if the dark theme is enabled for the current user
*/
private function isDarkThemeEnabled(): bool {
if (!$this->userSession->isLoggedIn()) {
return false;
}
$user = $this->userSession->getUser();
if (!$user) {
return false;
}
return $this->config->getUserValue($user->getUID(), $this->appName, 'theme', false) === 'dark';
}
}

4
apps/theming/lib/ThemingDefaults.php
View file

@ -301,7 +301,7 @@ class ThemingDefaults extends \OC_Defaults {
/**
* @return array scss variables to overwrite
*/
public function getScssVariables() {
public function getScssVariables(bool $brightBackground = true) {
$cacheBuster = $this->config->getAppValue('theming', 'cachebuster', '0');
$cache = $this->cacheFactory->createDistributed('theming-' . $cacheBuster . '-' . $this->urlGenerator->getBaseUrl());
if ($value = $cache->get('getScssVariables')) {
@ -325,7 +325,7 @@ class ThemingDefaults extends \OC_Defaults {
if ($this->config->getAppValue('theming', 'color', '') !== '') {
$variables['color-primary'] = $this->getColorPrimary();
$variables['color-primary-text'] = $this->getTextColorPrimary();
$variables['color-primary-element'] = $this->util->elementColor($this->getColorPrimary());
$variables['color-primary-element'] = $this->util->elementColor($this->getColorPrimary(), $brightBackground);
}
if ($this->config->getAppValue('theming', 'backgroundMime', '') === 'backgroundColor') {

4
lib/private/legacy/OC_Defaults.php
View file

@ -297,9 +297,9 @@ class OC_Defaults {
/**
* @return array scss variables to overwrite
*/
public function getScssVariables() {
public function getScssVariables(bool $brightBackground = true) {
if ($this->themeExist('getScssVariables')) {
return $this->theme->getScssVariables();
return $this->theme->getScssVariables($brightBackground);
}
return [];
}

2
themes/example/defaults.php
View file

@ -119,7 +119,7 @@ class OC_Theme {
* Returns variables to overload defaults from core/css/variables.scss
* @return array
*/
public function getScssVariables() {
public function getScssVariables(bool $brightBackground) {
return [
'color-primary' => '#745bca'
];