nextcloud / server

apps/theming/lib/Util.php

Indentation +227 added lines, -227 removed lines

@@ -39,258 +39,258 @@
 
 class Util {
 
-	private IConfig $config;
-	private IAppManager $appManager;
-	private IAppData $appData;
-	private ImageManager $imageManager;
+    private IConfig $config;
+    private IAppManager $appManager;
+    private IAppData $appData;
+    private ImageManager $imageManager;
 
-	public function __construct(IConfig $config, IAppManager $appManager, IAppData $appData, ImageManager $imageManager) {
-		$this->config = $config;
-		$this->appManager = $appManager;
-		$this->appData = $appData;
-		$this->imageManager = $imageManager;
-	}
+    public function __construct(IConfig $config, IAppManager $appManager, IAppData $appData, ImageManager $imageManager) {
+        $this->config = $config;
+        $this->appManager = $appManager;
+        $this->appData = $appData;
+        $this->imageManager = $imageManager;
+    }
 
-	/**
-	 * Should we invert the text on this background color?
-	 * @param string $color rgb color value
-	 * @return bool
-	 */
-	public function invertTextColor(string $color): bool {
-		return $this->isBrightColor($color);
-	}
+    /**
+     * Should we invert the text on this background color?
+     * @param string $color rgb color value
+     * @return bool
+     */
+    public function invertTextColor(string $color): bool {
+        return $this->isBrightColor($color);
+    }
 
-	/**
-	 * Is this color too bright ?
-	 * @param string $color rgb color value
-	 * @return bool
-	 */
-	public function isBrightColor(string $color): bool {
-		$l = $this->calculateLuma($color);
-		if ($l > 0.6) {
-			return true;
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Is this color too bright ?
+     * @param string $color rgb color value
+     * @return bool
+     */
+    public function isBrightColor(string $color): bool {
+        $l = $this->calculateLuma($color);
+        if ($l > 0.6) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 
-	/**
-	 * get color for on-page elements:
-	 * theme color by default, grey if theme color is to bright
-	 * @param string $color
-	 * @param bool $brightBackground
-	 * @return string
-	 */
-	public function elementColor($color, bool $brightBackground = true) {
-		$luminance = $this->calculateLuminance($color);
+    /**
+     * get color for on-page elements:
+     * theme color by default, grey if theme color is to bright
+     * @param string $color
+     * @param bool $brightBackground
+     * @return string
+     */
+    public function elementColor($color, bool $brightBackground = true) {
+        $luminance = $this->calculateLuminance($color);
 
-		if ($brightBackground && $luminance > 0.8) {
-			// If the color is too bright in bright mode, we fall back to a darker gray
-			return '#aaaaaa';
-		}
+        if ($brightBackground && $luminance > 0.8) {
+            // If the color is too bright in bright mode, we fall back to a darker gray
+            return '#aaaaaa';
+        }
 
-		if (!$brightBackground && $luminance < 0.2) {
-			// If the color is too dark in dark mode, we fall back to a brighter gray
-			return '#8c8c8c';
-		}
+        if (!$brightBackground && $luminance < 0.2) {
+            // If the color is too dark in dark mode, we fall back to a brighter gray
+            return '#8c8c8c';
+        }
 
-		return $color;
-	}
+        return $color;
+    }
 
-	public function mix(string $color1, string $color2, int $factor): string {
-		$color = new Color($color1);
-		return '#' . $color->mix($color2, $factor);
-	}
+    public function mix(string $color1, string $color2, int $factor): string {
+        $color = new Color($color1);
+        return '#' . $color->mix($color2, $factor);
+    }
 
-	public function lighten(string $color, int $factor): string {
-		$color = new Color($color);
-		return '#' . $color->lighten($factor);
-	}
+    public function lighten(string $color, int $factor): string {
+        $color = new Color($color);
+        return '#' . $color->lighten($factor);
+    }
 
-	public function darken(string $color, int $factor): string {
-		$color = new Color($color);
-		return '#' . $color->darken($factor);
-	}
+    public function darken(string $color, int $factor): string {
+        $color = new Color($color);
+        return '#' . $color->darken($factor);
+    }
 
-	/**
-	 * Convert RGB to HSL
-	 *
-	 * Copied from cssphp, copyright Leaf Corcoran, licensed under MIT
-	 *
-	 * @param int $red
-	 * @param int $green
-	 * @param int $blue
-	 *
-	 * @return float[]
-	 */
-	public function toHSL(int $red, int $green, int $blue): array {
-		$color = new Color(Color::rgbToHex(['R' => $red, 'G' => $green, 'B' => $blue]));
-		return array_values($color->getHsl());
-	}
+    /**
+     * Convert RGB to HSL
+     *
+     * Copied from cssphp, copyright Leaf Corcoran, licensed under MIT
+     *
+     * @param int $red
+     * @param int $green
+     * @param int $blue
+     *
+     * @return float[]
+     */
+    public function toHSL(int $red, int $green, int $blue): array {
+        $color = new Color(Color::rgbToHex(['R' => $red, 'G' => $green, 'B' => $blue]));
+        return array_values($color->getHsl());
+    }
 
-	/**
-	 * @param string $color rgb color value
-	 * @return float
-	 */
-	public function calculateLuminance(string $color): float {
-		[$red, $green, $blue] = $this->hexToRGB($color);
-		$hsl = $this->toHSL($red, $green, $blue);
-		return $hsl[2];
-	}
+    /**
+     * @param string $color rgb color value
+     * @return float
+     */
+    public function calculateLuminance(string $color): float {
+        [$red, $green, $blue] = $this->hexToRGB($color);
+        $hsl = $this->toHSL($red, $green, $blue);
+        return $hsl[2];
+    }
 
-	/**
-	 * @param string $color rgb color value
-	 * @return float
-	 */
-	public function calculateLuma(string $color): float {
-		[$red, $green, $blue] = $this->hexToRGB($color);
-		return (0.2126 * $red + 0.7152 * $green + 0.0722 * $blue) / 255;
-	}
+    /**
+     * @param string $color rgb color value
+     * @return float
+     */
+    public function calculateLuma(string $color): float {
+        [$red, $green, $blue] = $this->hexToRGB($color);
+        return (0.2126 * $red + 0.7152 * $green + 0.0722 * $blue) / 255;
+    }
 
-	/**
-	 * @param string $color rgb color value
-	 * @return int[]
-	 * @psalm-return array{0: int, 1: int, 2: int}
-	 */
-	public function hexToRGB(string $color): array {
-		$color = new Color($color);
-		return array_values($color->getRgb());
-	}
+    /**
+     * @param string $color rgb color value
+     * @return int[]
+     * @psalm-return array{0: int, 1: int, 2: int}
+     */
+    public function hexToRGB(string $color): array {
+        $color = new Color($color);
+        return array_values($color->getRgb());
+    }
 
-	/**
-	 * @param $color
-	 * @return string base64 encoded radio button svg
-	 */
-	public function generateRadioButton($color) {
-		$radioButtonIcon = '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">' .
-			'<path d="M8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6zm0 2a4 4 0 1 0 0 8 4 4 0 0 0 0-8z" fill="'.$color.'"/></svg>';
-		return base64_encode($radioButtonIcon);
-	}
+    /**
+     * @param $color
+     * @return string base64 encoded radio button svg
+     */
+    public function generateRadioButton($color) {
+        $radioButtonIcon = '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">' .
+            '<path d="M8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6zm0 2a4 4 0 1 0 0 8 4 4 0 0 0 0-8z" fill="'.$color.'"/></svg>';
+        return base64_encode($radioButtonIcon);
+    }
 
 
-	/**
-	 * @param $app string app name
-	 * @return string|ISimpleFile path to app icon / file of logo
-	 */
-	public function getAppIcon($app) {
-		$app = str_replace(['\0', '/', '\\', '..'], '', $app);
-		try {
-			$appPath = $this->appManager->getAppPath($app);
-			$icon = $appPath . '/img/' . $app . '.svg';
-			if (file_exists($icon)) {
-				return $icon;
-			}
-			$icon = $appPath . '/img/app.svg';
-			if (file_exists($icon)) {
-				return $icon;
-			}
-		} catch (AppPathNotFoundException $e) {
-		}
+    /**
+     * @param $app string app name
+     * @return string|ISimpleFile path to app icon / file of logo
+     */
+    public function getAppIcon($app) {
+        $app = str_replace(['\0', '/', '\\', '..'], '', $app);
+        try {
+            $appPath = $this->appManager->getAppPath($app);
+            $icon = $appPath . '/img/' . $app . '.svg';
+            if (file_exists($icon)) {
+                return $icon;
+            }
+            $icon = $appPath . '/img/app.svg';
+            if (file_exists($icon)) {
+                return $icon;
+            }
+        } catch (AppPathNotFoundException $e) {
+        }
 
-		if ($this->config->getAppValue('theming', 'logoMime', '') !== '') {
-			$logoFile = null;
-			try {
-				$folder = $this->appData->getFolder('images');
-				return $folder->getFile('logo');
-			} catch (NotFoundException $e) {
-			}
-		}
-		return \OC::$SERVERROOT . '/core/img/logo/logo.svg';
-	}
+        if ($this->config->getAppValue('theming', 'logoMime', '') !== '') {
+            $logoFile = null;
+            try {
+                $folder = $this->appData->getFolder('images');
+                return $folder->getFile('logo');
+            } catch (NotFoundException $e) {
+            }
+        }
+        return \OC::$SERVERROOT . '/core/img/logo/logo.svg';
+    }
 
-	/**
-	 * @param $app string app name
-	 * @param $image string relative path to image in app folder
-	 * @return string|false absolute path to image
-	 */
-	public function getAppImage($app, $image) {
-		$app = str_replace(['\0', '/', '\\', '..'], '', $app);
-		$image = str_replace(['\0', '\\', '..'], '', $image);
-		if ($app === "core") {
-			$icon = \OC::$SERVERROOT . '/core/img/' . $image;
-			if (file_exists($icon)) {
-				return $icon;
-			}
-		}
+    /**
+     * @param $app string app name
+     * @param $image string relative path to image in app folder
+     * @return string|false absolute path to image
+     */
+    public function getAppImage($app, $image) {
+        $app = str_replace(['\0', '/', '\\', '..'], '', $app);
+        $image = str_replace(['\0', '\\', '..'], '', $image);
+        if ($app === "core") {
+            $icon = \OC::$SERVERROOT . '/core/img/' . $image;
+            if (file_exists($icon)) {
+                return $icon;
+            }
+        }
 
-		try {
-			$appPath = $this->appManager->getAppPath($app);
-		} catch (AppPathNotFoundException $e) {
-			return false;
-		}
+        try {
+            $appPath = $this->appManager->getAppPath($app);
+        } catch (AppPathNotFoundException $e) {
+            return false;
+        }
 
-		$icon = $appPath . '/img/' . $image;
-		if (file_exists($icon)) {
-			return $icon;
-		}
-		$icon = $appPath . '/img/' . $image . '.svg';
-		if (file_exists($icon)) {
-			return $icon;
-		}
-		$icon = $appPath . '/img/' . $image . '.png';
-		if (file_exists($icon)) {
-			return $icon;
-		}
-		$icon = $appPath . '/img/' . $image . '.gif';
-		if (file_exists($icon)) {
-			return $icon;
-		}
-		$icon = $appPath . '/img/' . $image . '.jpg';
-		if (file_exists($icon)) {
-			return $icon;
-		}
+        $icon = $appPath . '/img/' . $image;
+        if (file_exists($icon)) {
+            return $icon;
+        }
+        $icon = $appPath . '/img/' . $image . '.svg';
+        if (file_exists($icon)) {
+            return $icon;
+        }
+        $icon = $appPath . '/img/' . $image . '.png';
+        if (file_exists($icon)) {
+            return $icon;
+        }
+        $icon = $appPath . '/img/' . $image . '.gif';
+        if (file_exists($icon)) {
+            return $icon;
+        }
+        $icon = $appPath . '/img/' . $image . '.jpg';
+        if (file_exists($icon)) {
+            return $icon;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * replace default color with a custom one
-	 *
-	 * @param $svg string content of a svg file
-	 * @param $color string color to match
-	 * @return string
-	 */
-	public function colorizeSvg($svg, $color) {
-		$svg = preg_replace('/#0082c9/i', $color, $svg);
-		return $svg;
-	}
+    /**
+     * replace default color with a custom one
+     *
+     * @param $svg string content of a svg file
+     * @param $color string color to match
+     * @return string
+     */
+    public function colorizeSvg($svg, $color) {
+        $svg = preg_replace('/#0082c9/i', $color, $svg);
+        return $svg;
+    }
 
-	/**
-	 * Check if a custom theme is set in the server configuration
-	 *
-	 * @return bool
-	 */
-	public function isAlreadyThemed() {
-		$theme = $this->config->getSystemValue('theme', '');
-		if ($theme !== '') {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * Check if a custom theme is set in the server configuration
+     *
+     * @return bool
+     */
+    public function isAlreadyThemed() {
+        $theme = $this->config->getSystemValue('theme', '');
+        if ($theme !== '') {
+            return true;
+        }
+        return false;
+    }
 
-	public function isBackgroundThemed() {
-		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', '');
-		return $backgroundLogo !== '' && $backgroundLogo !== 'backgroundColor';
-	}
+    public function isBackgroundThemed() {
+        $backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', '');
+        return $backgroundLogo !== '' && $backgroundLogo !== 'backgroundColor';
+    }
 
-	public function isLogoThemed() {
-		return $this->imageManager->hasImage('logo')
-			|| $this->imageManager->hasImage('logoheader');
-	}
+    public function isLogoThemed() {
+        return $this->imageManager->hasImage('logo')
+            || $this->imageManager->hasImage('logoheader');
+    }
 
-	public function getCacheBuster(): string {
-		$userSession = \OC::$server->get(IUserSession::class);
-		$userId = '';
-		$user = $userSession->getUser();
-		if (!is_null($user)) {
-			$userId = $user->getUID();
-		}
-		$userCacheBuster = '';
-		if ($userId) {
-			$userCacheBusterValue = (int)$this->config->getUserValue($userId, 'theming', 'userCacheBuster', '0');
-			$userCacheBuster = $userId . '_' . $userCacheBusterValue;
-		}
-		$systemCacheBuster = $this->config->getAppValue('theming', 'cachebuster', '0');
-		return substr(sha1($userCacheBuster . $systemCacheBuster), 0, 8);
-	}
+    public function getCacheBuster(): string {
+        $userSession = \OC::$server->get(IUserSession::class);
+        $userId = '';
+        $user = $userSession->getUser();
+        if (!is_null($user)) {
+            $userId = $user->getUID();
+        }
+        $userCacheBuster = '';
+        if ($userId) {
+            $userCacheBusterValue = (int)$this->config->getUserValue($userId, 'theming', 'userCacheBuster', '0');
+            $userCacheBuster = $userId . '_' . $userCacheBusterValue;
+        }
+        $systemCacheBuster = $this->config->getAppValue('theming', 'cachebuster', '0');
+        return substr(sha1($userCacheBuster . $systemCacheBuster), 0, 8);
+    }
 }

apps/theming/lib/Themes/CommonThemeTrait.php

Indentation +132 added lines, -132 removed lines

@@ -30,136 +30,136 @@
 use OCA\Theming\Service\BackgroundService;
 
 trait CommonThemeTrait {
-	public Util $util;
-
-	/**
-	 * Generate primary-related variables
-	 * This is shared between multiple themes because colorMainBackground and colorMainText
-	 * will change in between.
-	 */
-	protected function generatePrimaryVariables(string $colorMainBackground, string $colorMainText): array {
-		$isBrightColor = $this->util->isBrightColor($colorMainBackground);
-		$colorPrimaryElement = $this->util->elementColor($this->primaryColor, $isBrightColor);
-		$colorPrimaryLight = $this->util->mix($colorPrimaryElement, $colorMainBackground, -80);
-		$colorPrimaryElementLight = $this->util->mix($colorPrimaryElement, $colorMainBackground, -80);
-
-		// primary related colours
-		return [
-			// invert filter if primary is too bright
-			// to be used for legacy reasons only. Use inline
-			// svg with proper css variable instead or material
-			// design icons.
-			// ⚠️ Using 'no' as a value to make sure we specify an
-			// invalid one with no fallback. 'unset' could here fallback to some
-			// other theme with media queries
-			'--primary-invert-if-bright' => $this->util->invertTextColor($this->primaryColor) ? 'invert(100%)' : 'no',
-
-			'--color-primary' => $this->primaryColor,
-			'--color-primary-default' => $this->defaultPrimaryColor,
-			'--color-primary-text' => $this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff',
-			'--color-primary-hover' => $this->util->mix($this->primaryColor, $colorMainBackground, 60),
-			'--color-primary-light' => $colorPrimaryLight,
-			'--color-primary-light-text' => $this->util->mix($this->primaryColor, $this->util->invertTextColor($colorPrimaryLight) ? '#000000' : '#ffffff', -20),
-			'--color-primary-light-hover' => $this->util->mix($colorPrimaryLight, $colorMainText, 90),
-
-			// used for buttons, inputs...
-			'--color-primary-element' => $colorPrimaryElement,
-			'--color-primary-element-hover' => $this->util->mix($colorPrimaryElement, $colorMainBackground, 60),
-			'--color-primary-element-text' => $this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff',
-
-			// used for hover/focus states
-			'--color-primary-element-light' => $colorPrimaryElementLight,
-			'--color-primary-element-light-hover' => $this->util->mix($colorPrimaryElementLight, $colorMainText, 90),
-			'--color-primary-element-light-text' => $this->util->mix($colorPrimaryElement, $this->util->invertTextColor($colorPrimaryElementLight) ? '#000000' : '#ffffff', -20),
-			// mostly used for disabled states
-			'--color-primary-element-text-dark' => $this->util->darken($this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff', 7),
-
-			// to use like this: background-image: var(--gradient-primary-background);
-			'--gradient-primary-background' => 'linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-hover) 100%)',
-		];
-	}
-
-	/**
-	 * Generate admin theming background-related variables
-	 */
-	protected function generateGlobalBackgroundVariables(): array {
-		$backgroundDeleted = $this->config->getAppValue(Application::APP_ID, 'backgroundMime', '') === 'backgroundColor';
-		$hasCustomLogoHeader = $this->util->isLogoThemed();
-		$isDefaultPrimaryBright = $this->util->invertTextColor($this->defaultPrimaryColor);
-
-		$variables = [];
-
-		// Default last fallback values
-		$variables['--image-background-default'] = "url('" . $this->themingDefaults->getBackground() . "')";
-		$variables['--color-background-plain'] = $this->defaultPrimaryColor;
-
-		// Register image variables only if custom-defined
-		foreach (ImageManager::SUPPORTED_IMAGE_KEYS as $image) {
-			if ($this->imageManager->hasImage($image)) {
-				$imageUrl = $this->imageManager->getImageUrl($image);
-				// --image-background is overridden by user theming
-				$variables["--image-$image"] = "url('" . $imageUrl . "')";
-			}
-		}
-
-		// If primary as background has been request or if we have a custom primary colour
-		// let's not define the background image
-		if ($backgroundDeleted) {
-			$variables['--color-background-plain'] = $this->defaultPrimaryColor;
-			$variables['--image-background-plain'] = 'yes';
-			$variables['--image-background'] = 'no';
-			// If no background image is set, we need to check against the shown primary colour
-			$variables['--background-image-invert-if-bright'] = $isDefaultPrimaryBright ? 'invert(100%)' : 'no';
-		}
-
-		if ($hasCustomLogoHeader) {
-			$variables['--image-logoheader-custom'] = 'true';
-		}
-
-		return $variables;
-	}
-
-	/**
-	 * Generate user theming background-related variables
-	 */
-	protected function generateUserBackgroundVariables(): array {
-		$user = $this->userSession->getUser();
-		if ($user !== null
-			&& !$this->themingDefaults->isUserThemingDisabled()
-			&& $this->appManager->isEnabledForUser(Application::APP_ID)) {
-			$backgroundImage = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'background_image', BackgroundService::BACKGROUND_DEFAULT);
-			$currentVersion = (int)$this->config->getUserValue($user->getUID(), Application::APP_ID, 'userCacheBuster', '0');
-			$isPrimaryBright = $this->util->invertTextColor($this->primaryColor);
-
-			// The user removed the background
-			if ($backgroundImage === BackgroundService::BACKGROUND_DISABLED) {
-				return [
-					'--image-background' => 'no',
-					'--color-background-plain' => $this->primaryColor,
-					// If no background image is set, we need to check against the shown primary colour
-					'--background-image-invert-if-bright' => $isPrimaryBright ? 'invert(100%)' : 'no',
-				];
-			}
-
-			// The user uploaded a custom background
-			if ($backgroundImage === BackgroundService::BACKGROUND_CUSTOM) {
-				$cacheBuster = substr(sha1($user->getUID() . '_' . $currentVersion), 0, 8);
-				return [
-					'--image-background' => "url('" . $this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground') . "?v=$cacheBuster')",
-					'--color-background-plain' => $this->themingDefaults->getColorPrimary(),
-				];
-			}
-
-			// The user picked a shipped background
-			if (isset(BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage])) {
-				return [
-					'--image-background' => "url('" . $this->urlGenerator->linkTo(Application::APP_ID, "img/background/$backgroundImage") . "')",
-					'--color-background-plain' => $this->themingDefaults->getColorPrimary(),
-					'--background-image-invert-if-bright' => BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage]['theming'] ?? null === BackgroundService::THEMING_MODE_DARK ? 'invert(100%)' : 'no',
-				];
-			}
-		}
-
-		return [];
-	}
+    public Util $util;
+
+    /**
+     * Generate primary-related variables
+     * This is shared between multiple themes because colorMainBackground and colorMainText
+     * will change in between.
+     */
+    protected function generatePrimaryVariables(string $colorMainBackground, string $colorMainText): array {
+        $isBrightColor = $this->util->isBrightColor($colorMainBackground);
+        $colorPrimaryElement = $this->util->elementColor($this->primaryColor, $isBrightColor);
+        $colorPrimaryLight = $this->util->mix($colorPrimaryElement, $colorMainBackground, -80);
+        $colorPrimaryElementLight = $this->util->mix($colorPrimaryElement, $colorMainBackground, -80);
+
+        // primary related colours
+        return [
+            // invert filter if primary is too bright
+            // to be used for legacy reasons only. Use inline
+            // svg with proper css variable instead or material
+            // design icons.
+            // ⚠️ Using 'no' as a value to make sure we specify an
+            // invalid one with no fallback. 'unset' could here fallback to some
+            // other theme with media queries
+            '--primary-invert-if-bright' => $this->util->invertTextColor($this->primaryColor) ? 'invert(100%)' : 'no',
+
+            '--color-primary' => $this->primaryColor,
+            '--color-primary-default' => $this->defaultPrimaryColor,
+            '--color-primary-text' => $this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff',
+            '--color-primary-hover' => $this->util->mix($this->primaryColor, $colorMainBackground, 60),
+            '--color-primary-light' => $colorPrimaryLight,
+            '--color-primary-light-text' => $this->util->mix($this->primaryColor, $this->util->invertTextColor($colorPrimaryLight) ? '#000000' : '#ffffff', -20),
+            '--color-primary-light-hover' => $this->util->mix($colorPrimaryLight, $colorMainText, 90),
+
+            // used for buttons, inputs...
+            '--color-primary-element' => $colorPrimaryElement,
+            '--color-primary-element-hover' => $this->util->mix($colorPrimaryElement, $colorMainBackground, 60),
+            '--color-primary-element-text' => $this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff',
+
+            // used for hover/focus states
+            '--color-primary-element-light' => $colorPrimaryElementLight,
+            '--color-primary-element-light-hover' => $this->util->mix($colorPrimaryElementLight, $colorMainText, 90),
+            '--color-primary-element-light-text' => $this->util->mix($colorPrimaryElement, $this->util->invertTextColor($colorPrimaryElementLight) ? '#000000' : '#ffffff', -20),
+            // mostly used for disabled states
+            '--color-primary-element-text-dark' => $this->util->darken($this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff', 7),
+
+            // to use like this: background-image: var(--gradient-primary-background);
+            '--gradient-primary-background' => 'linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-hover) 100%)',
+        ];
+    }
+
+    /**
+     * Generate admin theming background-related variables
+     */
+    protected function generateGlobalBackgroundVariables(): array {
+        $backgroundDeleted = $this->config->getAppValue(Application::APP_ID, 'backgroundMime', '') === 'backgroundColor';
+        $hasCustomLogoHeader = $this->util->isLogoThemed();
+        $isDefaultPrimaryBright = $this->util->invertTextColor($this->defaultPrimaryColor);
+
+        $variables = [];
+
+        // Default last fallback values
+        $variables['--image-background-default'] = "url('" . $this->themingDefaults->getBackground() . "')";
+        $variables['--color-background-plain'] = $this->defaultPrimaryColor;
+
+        // Register image variables only if custom-defined
+        foreach (ImageManager::SUPPORTED_IMAGE_KEYS as $image) {
+            if ($this->imageManager->hasImage($image)) {
+                $imageUrl = $this->imageManager->getImageUrl($image);
+                // --image-background is overridden by user theming
+                $variables["--image-$image"] = "url('" . $imageUrl . "')";
+            }
+        }
+
+        // If primary as background has been request or if we have a custom primary colour
+        // let's not define the background image
+        if ($backgroundDeleted) {
+            $variables['--color-background-plain'] = $this->defaultPrimaryColor;
+            $variables['--image-background-plain'] = 'yes';
+            $variables['--image-background'] = 'no';
+            // If no background image is set, we need to check against the shown primary colour
+            $variables['--background-image-invert-if-bright'] = $isDefaultPrimaryBright ? 'invert(100%)' : 'no';
+        }
+
+        if ($hasCustomLogoHeader) {
+            $variables['--image-logoheader-custom'] = 'true';
+        }
+
+        return $variables;
+    }
+
+    /**
+     * Generate user theming background-related variables
+     */
+    protected function generateUserBackgroundVariables(): array {
+        $user = $this->userSession->getUser();
+        if ($user !== null
+            && !$this->themingDefaults->isUserThemingDisabled()
+            && $this->appManager->isEnabledForUser(Application::APP_ID)) {
+            $backgroundImage = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'background_image', BackgroundService::BACKGROUND_DEFAULT);
+            $currentVersion = (int)$this->config->getUserValue($user->getUID(), Application::APP_ID, 'userCacheBuster', '0');
+            $isPrimaryBright = $this->util->invertTextColor($this->primaryColor);
+
+            // The user removed the background
+            if ($backgroundImage === BackgroundService::BACKGROUND_DISABLED) {
+                return [
+                    '--image-background' => 'no',
+                    '--color-background-plain' => $this->primaryColor,
+                    // If no background image is set, we need to check against the shown primary colour
+                    '--background-image-invert-if-bright' => $isPrimaryBright ? 'invert(100%)' : 'no',
+                ];
+            }
+
+            // The user uploaded a custom background
+            if ($backgroundImage === BackgroundService::BACKGROUND_CUSTOM) {
+                $cacheBuster = substr(sha1($user->getUID() . '_' . $currentVersion), 0, 8);
+                return [
+                    '--image-background' => "url('" . $this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground') . "?v=$cacheBuster')",
+                    '--color-background-plain' => $this->themingDefaults->getColorPrimary(),
+                ];
+            }
+
+            // The user picked a shipped background
+            if (isset(BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage])) {
+                return [
+                    '--image-background' => "url('" . $this->urlGenerator->linkTo(Application::APP_ID, "img/background/$backgroundImage") . "')",
+                    '--color-background-plain' => $this->themingDefaults->getColorPrimary(),
+                    '--background-image-invert-if-bright' => BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage]['theming'] ?? null === BackgroundService::THEMING_MODE_DARK ? 'invert(100%)' : 'no',
+                ];
+            }
+        }
+
+        return [];
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -90,7 +90,7 @@ 
 		$variables = [];
 
 		// Default last fallback values
-		$variables['--image-background-default'] = "url('" . $this->themingDefaults->getBackground() . "')";
+		$variables['--image-background-default'] = "url('".$this->themingDefaults->getBackground()."')";
 		$variables['--color-background-plain'] = $this->defaultPrimaryColor;
 
 		// Register image variables only if custom-defined
@@ -98,7 +98,7 @@ 
 			if ($this->imageManager->hasImage($image)) {
 				$imageUrl = $this->imageManager->getImageUrl($image);
 				// --image-background is overridden by user theming
-				$variables["--image-$image"] = "url('" . $imageUrl . "')";
+				$variables["--image-$image"] = "url('".$imageUrl."')";
 			}
 		}
 
@@ -128,7 +128,7 @@ 
 			&& !$this->themingDefaults->isUserThemingDisabled()
 			&& $this->appManager->isEnabledForUser(Application::APP_ID)) {
 			$backgroundImage = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'background_image', BackgroundService::BACKGROUND_DEFAULT);
-			$currentVersion = (int)$this->config->getUserValue($user->getUID(), Application::APP_ID, 'userCacheBuster', '0');
+			$currentVersion = (int) $this->config->getUserValue($user->getUID(), Application::APP_ID, 'userCacheBuster', '0');
 			$isPrimaryBright = $this->util->invertTextColor($this->primaryColor);
 
 			// The user removed the background
@@ -143,9 +143,9 @@ 
 
 			// The user uploaded a custom background
 			if ($backgroundImage === BackgroundService::BACKGROUND_CUSTOM) {
-				$cacheBuster = substr(sha1($user->getUID() . '_' . $currentVersion), 0, 8);
+				$cacheBuster = substr(sha1($user->getUID().'_'.$currentVersion), 0, 8);
 				return [
-					'--image-background' => "url('" . $this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground') . "?v=$cacheBuster')",
+					'--image-background' => "url('".$this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground')."?v=$cacheBuster')",
 					'--color-background-plain' => $this->themingDefaults->getColorPrimary(),
 				];
 			}
@@ -153,7 +153,7 @@ 
 			// The user picked a shipped background
 			if (isset(BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage])) {
 				return [
-					'--image-background' => "url('" . $this->urlGenerator->linkTo(Application::APP_ID, "img/background/$backgroundImage") . "')",
+					'--image-background' => "url('".$this->urlGenerator->linkTo(Application::APP_ID, "img/background/$backgroundImage")."')",
 					'--color-background-plain' => $this->themingDefaults->getColorPrimary(),
 					'--background-image-invert-if-bright' => BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage]['theming'] ?? null === BackgroundService::THEMING_MODE_DARK ? 'invert(100%)' : 'no',
 				];