nextcloud / server

apps/theming/lib/Util.php

Indentation +204 added lines, -204 removed lines

@@ -38,232 +38,232 @@
 
 class Util {
 
-	private IConfig $config;
-	private IAppManager $appManager;
-	private IAppData $appData;
+    private IConfig $config;
+    private IAppManager $appManager;
+    private IAppData $appData;
 
-	/**
-	 * Util constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IAppManager $appManager
-	 * @param IAppData $appData
-	 */
-	public function __construct(IConfig $config, IAppManager $appManager, IAppData $appData) {
-		$this->config = $config;
-		$this->appManager = $appManager;
-		$this->appData = $appData;
-	}
+    /**
+     * Util constructor.
+     *
+     * @param IConfig $config
+     * @param IAppManager $appManager
+     * @param IAppData $appData
+     */
+    public function __construct(IConfig $config, IAppManager $appManager, IAppData $appData) {
+        $this->config = $config;
+        $this->appManager = $appManager;
+        $this->appData = $appData;
+    }
 
-	/**
-	 * @param string $color rgb color value
-	 * @return bool
-	 */
-	public function invertTextColor($color) {
-		$l = $this->calculateLuma($color);
-		if ($l > 0.6) {
-			return true;
-		} else {
-			return false;
-		}
-	}
+    /**
+     * @param string $color rgb color value
+     * @return bool
+     */
+    public function invertTextColor($color) {
+        $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 '#555555';
-		}
+        if (!$brightBackground && $luminance < 0.2) {
+            // If the color is too dark in dark mode, we fall back to a brighter gray
+            return '#555555';
+        }
 
-		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';
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -93,17 +93,17 @@ 
 
 	public function mix(string $color1, string $color2, int $factor): string {
 		$color = new Color($color1);
-		return '#' . $color->mix($color2, $factor);
+		return '#'.$color->mix($color2, $factor);
 	}
 
 	public function lighten(string $color, int $factor): string {
 		$color = new Color($color);
-		return '#' . $color->lighten($factor);
+		return '#'.$color->lighten($factor);
 	}
 
 	public function darken(string $color, int $factor): string {
 		$color = new Color($color);
-		return '#' . $color->darken($factor);
+		return '#'.$color->darken($factor);
 	}
 
 	/**
@@ -156,7 +156,7 @@ 
 	 * @return string base64 encoded radio button svg
 	 */
 	public function generateRadioButton($color) {
-		$radioButtonIcon = '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">' .
+		$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);
 	}
@@ -170,11 +170,11 @@ 
 		$app = str_replace(['\0', '/', '\\', '..'], '', $app);
 		try {
 			$appPath = $this->appManager->getAppPath($app);
-			$icon = $appPath . '/img/' . $app . '.svg';
+			$icon = $appPath.'/img/'.$app.'.svg';
 			if (file_exists($icon)) {
 				return $icon;
 			}
-			$icon = $appPath . '/img/app.svg';
+			$icon = $appPath.'/img/app.svg';
 			if (file_exists($icon)) {
 				return $icon;
 			}
@@ -189,7 +189,7 @@ 
 			} catch (NotFoundException $e) {
 			}
 		}
-		return \OC::$SERVERROOT . '/core/img/logo/logo.svg';
+		return \OC::$SERVERROOT.'/core/img/logo/logo.svg';
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 		$app = str_replace(['\0', '/', '\\', '..'], '', $app);
 		$image = str_replace(['\0', '\\', '..'], '', $image);
 		if ($app === "core") {
-			$icon = \OC::$SERVERROOT . '/core/img/' . $image;
+			$icon = \OC::$SERVERROOT.'/core/img/'.$image;
 			if (file_exists($icon)) {
 				return $icon;
 			}
@@ -213,23 +213,23 @@ 
 			return false;
 		}
 
-		$icon = $appPath . '/img/' . $image;
+		$icon = $appPath.'/img/'.$image;
 		if (file_exists($icon)) {
 			return $icon;
 		}
-		$icon = $appPath . '/img/' . $image . '.svg';
+		$icon = $appPath.'/img/'.$image.'.svg';
 		if (file_exists($icon)) {
 			return $icon;
 		}
-		$icon = $appPath . '/img/' . $image . '.png';
+		$icon = $appPath.'/img/'.$image.'.png';
 		if (file_exists($icon)) {
 			return $icon;
 		}
-		$icon = $appPath . '/img/' . $image . '.gif';
+		$icon = $appPath.'/img/'.$image.'.gif';
 		if (file_exists($icon)) {
 			return $icon;
 		}
-		$icon = $appPath . '/img/' . $image . '.jpg';
+		$icon = $appPath.'/img/'.$image.'.jpg';
 		if (file_exists($icon)) {
 			return $icon;
 		}

apps/theming/lib/Themes/DefaultTheme.php

Indentation +167 added lines, -167 removed lines

@@ -33,171 +33,171 @@
 use OCP\IURLGenerator;
 
 class DefaultTheme implements ITheme {
-	public Util $util;
-	public ThemingDefaults $themingDefaults;
-	public IURLGenerator $urlGenerator;
-	public ImageManager $imageManager;
-	public IConfig $config;
-	public IL10N $l;
-
-	public string $primaryColor;
-
-	public function __construct(Util $util,
-								ThemingDefaults $themingDefaults,
-								IURLGenerator $urlGenerator,
-								ImageManager $imageManager,
-								IConfig $config,
-								IL10N $l) {
-		$this->util = $util;
-		$this->themingDefaults = $themingDefaults;
-		$this->urlGenerator = $urlGenerator;
-		$this->imageManager = $imageManager;
-		$this->config = $config;
-		$this->l = $l;
-
-		$this->primaryColor = $this->themingDefaults->getColorPrimary();
-	}
-
-	public function getId(): string {
-		return 'default';
-	}
-
-	public function getType(): int {
-		return ITheme::TYPE_THEME;
-	}
-
-	public function getTitle(): string {
-		return $this->l->t('Light theme');
-	}
-
-	public function getEnableLabel(): string {
-		return $this->l->t('Enable the default light theme');
-	}
-
-	public function getDescription(): string {
-		return $this->l->t('The default light appearance.');
-	}
-
-	public function getMediaQuery(): string {
-		return '';
-	}
-
-	public function getCSSVariables(): array {
-		$colorMainText = '#222222';
-		$colorMainBackground = '#ffffff';
-		$colorMainBackgroundRGB = join(',', $this->util->hexToRGB($colorMainBackground));
-		$colorBoxShadow = $this->util->darken($colorMainBackground, 70);
-		$colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow));
-
-		$variables = [
-			'--color-main-background' => $colorMainBackground,
-			'--color-main-background-rgb' => $colorMainBackgroundRGB,
-			'--color-main-background-translucent' => 'rgba(var(--color-main-background-rgb), .97)',
-
-			// to use like this: background-image: linear-gradient(0, var('--gradient-main-background));
-			'--gradient-main-background' => 'var(--color-main-background) 0%, var(--color-main-background-translucent) 85%, transparent 100%',
-
-			// used for different active/hover/focus/disabled states
-			'--color-background-hover' => $this->util->darken($colorMainBackground, 4),
-			'--color-background-dark' => $this->util->darken($colorMainBackground, 7),
-			'--color-background-darker' => $this->util->darken($colorMainBackground, 14),
-
-			'--color-placeholder-light' => $this->util->darken($colorMainBackground, 10),
-			'--color-placeholder-dark' => $this->util->darken($colorMainBackground, 20),
-
-			// primary related colours
-			'--color-primary' => $this->primaryColor,
-			'--color-primary-text' => $this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff',
-			'--color-primary-hover' => $this->util->mix($this->primaryColor, $colorMainBackground, 80),
-			'--color-primary-light' => $this->util->mix($this->primaryColor, $colorMainBackground, 10),
-			'--color-primary-light-text' => $this->primaryColor,
-			'--color-primary-light-hover' => $this->util->mix($this->primaryColor, $colorMainText, 10),
-			'--color-primary-text-dark' => $this->util->darken($this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff', 7),
-			// used for buttons, inputs...
-			'--color-primary-element' => $this->util->elementColor($this->primaryColor),
-			'--color-primary-element-hover' => $this->util->mix($this->util->elementColor($this->primaryColor), $colorMainBackground, 80),
-			'--color-primary-element-light' => $this->util->lighten($this->util->elementColor($this->primaryColor), 15),
-			'--color-primary-element-lighter' => $this->util->mix($this->util->elementColor($this->primaryColor), $colorMainBackground, 15),
-
-			// max contrast for WCAG compliance
-			'--color-main-text' => $colorMainText,
-			'--color-text-maxcontrast' => $this->util->lighten($colorMainText, 33),
-			'--color-text-light' => $colorMainText,
-			'--color-text-lighter' => $this->util->lighten($colorMainText, 33),
-
-			// info/warning/success feedback colours
-			'--color-error' => '#e9322d',
-			'--color-error-hover' => $this->util->mix('#e9322d', $colorMainBackground, 80),
-			'--color-warning' => '#eca700',
-			'--color-warning-hover' => $this->util->mix('#eca700', $colorMainBackground, 80),
-			'--color-success' => '#46ba61',
-			'--color-success-hover' => $this->util->mix('#46ba61', $colorMainBackground, 80),
-
-			// used for the icon loading animation
-			'--color-loading-light' => '#cccccc',
-			'--color-loading-dark' => '#444444',
-
-			'--color-box-shadow-rgb' => $colorBoxShadowRGB,
-			'--color-box-shadow' => "rgba(var(--color-box-shadow-rgb), 0.5)",
-
-			'--color-border' => $this->util->darken($colorMainBackground, 7),
-			'--color-border-dark' => $this->util->darken($colorMainBackground, 14),
-
-			'--font-face' => "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', Arial, sans-serif, 'Noto Color Emoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'",
-			'--default-font-size' => '15px',
-
-			// TODO: support "(prefers-reduced-motion)"
-			'--animation-quick' => '100ms',
-			'--animation-slow' => '300ms',
-
-			// Default variables --------------------------------------------
-			'--border-radius' => '3px',
-			'--border-radius-large' => '10px',
-			// pill-style button, value is large so big buttons also have correct roundness
-			'--border-radius-pill' => '100px',
-
-			'--default-line-height' => '24px',
-
-			// various structure data
-			'--header-height' => '50px',
-			'--navigation-width' => '300px',
-			'--sidebar-min-width' => '300px',
-			'--sidebar-max-width' => '500px',
-			'--list-min-width' => '200px',
-			'--list-max-width' => '300px',
-			'--header-menu-item-height' => '44px',
-			'--header-menu-profile-item-height' => '66px',
-
-			// mobile. Keep in sync with core/js/js.js
-			'--breakpoint-mobile' => '1024px',
-
-			// 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.
-			'--primary-invert-if-bright' => $this->util->invertTextColor($this->primaryColor) ? 'invert(100%)' : 'unset',
-			'--background-invert-if-dark' => 'unset',
-		];
-
-		// Register image variables only if custom-defined
-		$backgroundDeleted = $this->config->getAppValue('theming', 'backgroundMime', '') === 'backgroundColor';
-		foreach(['logo', 'logoheader', 'favicon', 'background'] as $image) {
-			if ($this->imageManager->hasImage($image)) {
-				// If primary as background has been request, let's not define the background image
-				if ($image === 'background' && $backgroundDeleted) {
-					$variables["--image-background-plain"] = true;
-					continue;
-				} else if ($image === 'background') {
-					$variables['--image-background-size'] = 'cover';
-				}
-				$variables["--image-$image"] = "url('".$this->imageManager->getImageUrl($image)."')";
-			}
-		}
-
-		return $variables;
-	}
-
-	public function getCustomCss(): string {
-		return '';
-	}
+    public Util $util;
+    public ThemingDefaults $themingDefaults;
+    public IURLGenerator $urlGenerator;
+    public ImageManager $imageManager;
+    public IConfig $config;
+    public IL10N $l;
+
+    public string $primaryColor;
+
+    public function __construct(Util $util,
+                                ThemingDefaults $themingDefaults,
+                                IURLGenerator $urlGenerator,
+                                ImageManager $imageManager,
+                                IConfig $config,
+                                IL10N $l) {
+        $this->util = $util;
+        $this->themingDefaults = $themingDefaults;
+        $this->urlGenerator = $urlGenerator;
+        $this->imageManager = $imageManager;
+        $this->config = $config;
+        $this->l = $l;
+
+        $this->primaryColor = $this->themingDefaults->getColorPrimary();
+    }
+
+    public function getId(): string {
+        return 'default';
+    }
+
+    public function getType(): int {
+        return ITheme::TYPE_THEME;
+    }
+
+    public function getTitle(): string {
+        return $this->l->t('Light theme');
+    }
+
+    public function getEnableLabel(): string {
+        return $this->l->t('Enable the default light theme');
+    }
+
+    public function getDescription(): string {
+        return $this->l->t('The default light appearance.');
+    }
+
+    public function getMediaQuery(): string {
+        return '';
+    }
+
+    public function getCSSVariables(): array {
+        $colorMainText = '#222222';
+        $colorMainBackground = '#ffffff';
+        $colorMainBackgroundRGB = join(',', $this->util->hexToRGB($colorMainBackground));
+        $colorBoxShadow = $this->util->darken($colorMainBackground, 70);
+        $colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow));
+
+        $variables = [
+            '--color-main-background' => $colorMainBackground,
+            '--color-main-background-rgb' => $colorMainBackgroundRGB,
+            '--color-main-background-translucent' => 'rgba(var(--color-main-background-rgb), .97)',
+
+            // to use like this: background-image: linear-gradient(0, var('--gradient-main-background));
+            '--gradient-main-background' => 'var(--color-main-background) 0%, var(--color-main-background-translucent) 85%, transparent 100%',
+
+            // used for different active/hover/focus/disabled states
+            '--color-background-hover' => $this->util->darken($colorMainBackground, 4),
+            '--color-background-dark' => $this->util->darken($colorMainBackground, 7),
+            '--color-background-darker' => $this->util->darken($colorMainBackground, 14),
+
+            '--color-placeholder-light' => $this->util->darken($colorMainBackground, 10),
+            '--color-placeholder-dark' => $this->util->darken($colorMainBackground, 20),
+
+            // primary related colours
+            '--color-primary' => $this->primaryColor,
+            '--color-primary-text' => $this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff',
+            '--color-primary-hover' => $this->util->mix($this->primaryColor, $colorMainBackground, 80),
+            '--color-primary-light' => $this->util->mix($this->primaryColor, $colorMainBackground, 10),
+            '--color-primary-light-text' => $this->primaryColor,
+            '--color-primary-light-hover' => $this->util->mix($this->primaryColor, $colorMainText, 10),
+            '--color-primary-text-dark' => $this->util->darken($this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff', 7),
+            // used for buttons, inputs...
+            '--color-primary-element' => $this->util->elementColor($this->primaryColor),
+            '--color-primary-element-hover' => $this->util->mix($this->util->elementColor($this->primaryColor), $colorMainBackground, 80),
+            '--color-primary-element-light' => $this->util->lighten($this->util->elementColor($this->primaryColor), 15),
+            '--color-primary-element-lighter' => $this->util->mix($this->util->elementColor($this->primaryColor), $colorMainBackground, 15),
+
+            // max contrast for WCAG compliance
+            '--color-main-text' => $colorMainText,
+            '--color-text-maxcontrast' => $this->util->lighten($colorMainText, 33),
+            '--color-text-light' => $colorMainText,
+            '--color-text-lighter' => $this->util->lighten($colorMainText, 33),
+
+            // info/warning/success feedback colours
+            '--color-error' => '#e9322d',
+            '--color-error-hover' => $this->util->mix('#e9322d', $colorMainBackground, 80),
+            '--color-warning' => '#eca700',
+            '--color-warning-hover' => $this->util->mix('#eca700', $colorMainBackground, 80),
+            '--color-success' => '#46ba61',
+            '--color-success-hover' => $this->util->mix('#46ba61', $colorMainBackground, 80),
+
+            // used for the icon loading animation
+            '--color-loading-light' => '#cccccc',
+            '--color-loading-dark' => '#444444',
+
+            '--color-box-shadow-rgb' => $colorBoxShadowRGB,
+            '--color-box-shadow' => "rgba(var(--color-box-shadow-rgb), 0.5)",
+
+            '--color-border' => $this->util->darken($colorMainBackground, 7),
+            '--color-border-dark' => $this->util->darken($colorMainBackground, 14),
+
+            '--font-face' => "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', Arial, sans-serif, 'Noto Color Emoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'",
+            '--default-font-size' => '15px',
+
+            // TODO: support "(prefers-reduced-motion)"
+            '--animation-quick' => '100ms',
+            '--animation-slow' => '300ms',
+
+            // Default variables --------------------------------------------
+            '--border-radius' => '3px',
+            '--border-radius-large' => '10px',
+            // pill-style button, value is large so big buttons also have correct roundness
+            '--border-radius-pill' => '100px',
+
+            '--default-line-height' => '24px',
+
+            // various structure data
+            '--header-height' => '50px',
+            '--navigation-width' => '300px',
+            '--sidebar-min-width' => '300px',
+            '--sidebar-max-width' => '500px',
+            '--list-min-width' => '200px',
+            '--list-max-width' => '300px',
+            '--header-menu-item-height' => '44px',
+            '--header-menu-profile-item-height' => '66px',
+
+            // mobile. Keep in sync with core/js/js.js
+            '--breakpoint-mobile' => '1024px',
+
+            // 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.
+            '--primary-invert-if-bright' => $this->util->invertTextColor($this->primaryColor) ? 'invert(100%)' : 'unset',
+            '--background-invert-if-dark' => 'unset',
+        ];
+
+        // Register image variables only if custom-defined
+        $backgroundDeleted = $this->config->getAppValue('theming', 'backgroundMime', '') === 'backgroundColor';
+        foreach(['logo', 'logoheader', 'favicon', 'background'] as $image) {
+            if ($this->imageManager->hasImage($image)) {
+                // If primary as background has been request, let's not define the background image
+                if ($image === 'background' && $backgroundDeleted) {
+                    $variables["--image-background-plain"] = true;
+                    continue;
+                } else if ($image === 'background') {
+                    $variables['--image-background-size'] = 'cover';
+                }
+                $variables["--image-$image"] = "url('".$this->imageManager->getImageUrl($image)."')";
+            }
+        }
+
+        return $variables;
+    }
+
+    public function getCustomCss(): string {
+        return '';
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -181,7 +181,7 @@
 
 		// Register image variables only if custom-defined
 		$backgroundDeleted = $this->config->getAppValue('theming', 'backgroundMime', '') === 'backgroundColor';
-		foreach(['logo', 'logoheader', 'favicon', 'background'] as $image) {
+		foreach (['logo', 'logoheader', 'favicon', 'background'] as $image) {
 			if ($this->imageManager->hasImage($image)) {
 				// If primary as background has been request, let's not define the background image
 				if ($image === 'background' && $backgroundDeleted) {

apps/theming/lib/Themes/DyslexiaFont.php

Indentation +26 added lines, -26 removed lines

@@ -28,39 +28,39 @@ 
 
 class DyslexiaFont extends DefaultTheme implements ITheme {
 
-	public function getId(): string {
-		return 'opendyslexic';
-	}
+    public function getId(): string {
+        return 'opendyslexic';
+    }
 
-	public function getType(): int {
-		return ITheme::TYPE_FONT;
-	}
+    public function getType(): int {
+        return ITheme::TYPE_FONT;
+    }
 
-	public function getTitle(): string {
-		return $this->l->t('Dyslexia font');
-	}
+    public function getTitle(): string {
+        return $this->l->t('Dyslexia font');
+    }
 
-	public function getEnableLabel(): string {
-		return $this->l->t('Enable dyslexia font');
-	}
+    public function getEnableLabel(): string {
+        return $this->l->t('Enable dyslexia font');
+    }
 
-	public function getDescription(): string {
-		return $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia.');
-	}
+    public function getDescription(): string {
+        return $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia.');
+    }
 
-	public function getCSSVariables(): array {
-		$variables = parent::getCSSVariables();
-		$originalFontFace = $variables['--font-face'];
+    public function getCSSVariables(): array {
+        $variables = parent::getCSSVariables();
+        $originalFontFace = $variables['--font-face'];
 
-		$variables = [
-			'--font-face' => 'OpenDyslexic, ' . $originalFontFace
-		];
+        $variables = [
+            '--font-face' => 'OpenDyslexic, ' . $originalFontFace
+        ];
 
-		return $variables;
-	}
+        return $variables;
+    }
 
-	public function getCustomCss(): string {
-		return "
+    public function getCustomCss(): string {
+        return "
 			@font-face {
 				font-family: 'OpenDyslexic';
 				font-style: normal;
@@ -79,6 +79,6 @@ 
 					 url('../fonts/OpenDyslexic-Bold.ttf') format('truetype');
 			}
 		";
-	}
+    }
 }
 

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 		$originalFontFace = $variables['--font-face'];
 
 		$variables = [
-			'--font-face' => 'OpenDyslexic, ' . $originalFontFace
+			'--font-face' => 'OpenDyslexic, '.$originalFontFace
 		];
 
 		return $variables;

apps/theming/lib/Themes/DarkHighContrastTheme.php

Indentation +44 added lines, -44 removed lines

@@ -28,65 +28,65 @@ 
 
 class DarkHighContrastTheme extends DarkTheme implements ITheme {
 
-	public function getId(): string {
-		return 'dark-highcontrast';
-	}
+    public function getId(): string {
+        return 'dark-highcontrast';
+    }
 
-	public function getMediaQuery(): string {
-		return '(prefers-color-scheme: dark) and (prefers-contrast: more)';
-	}
+    public function getMediaQuery(): string {
+        return '(prefers-color-scheme: dark) and (prefers-contrast: more)';
+    }
 
-	public function getTitle(): string {
-		return $this->l->t('Dark theme with high contrast mode');
-	}
+    public function getTitle(): string {
+        return $this->l->t('Dark theme with high contrast mode');
+    }
 
-	public function getEnableLabel(): string {
-		return $this->l->t('Enable dark high contrast mode');
-	}
+    public function getEnableLabel(): string {
+        return $this->l->t('Enable dark high contrast mode');
+    }
 
-	public function getDescription(): string {
-		return $this->l->t('Similar to the high contrast mode, but with dark colours.');
-	}
+    public function getDescription(): string {
+        return $this->l->t('Similar to the high contrast mode, but with dark colours.');
+    }
 
-	/**
-	 * Try to keep this consistent with HighContrastTheme
-	 */
-	public function getCSSVariables(): array {
-		$variables = parent::getCSSVariables();
-		$colorMainText = '#ffffff';
-		$colorMainBackground = '#000000';
-		$colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorMainText));
+    /**
+     * Try to keep this consistent with HighContrastTheme
+     */
+    public function getCSSVariables(): array {
+        $variables = parent::getCSSVariables();
+        $colorMainText = '#ffffff';
+        $colorMainBackground = '#000000';
+        $colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorMainText));
 
-		$variables['--color-main-background'] = $colorMainBackground;
-		$variables['--color-main-text'] = $colorMainText;
+        $variables['--color-main-background'] = $colorMainBackground;
+        $variables['--color-main-text'] = $colorMainText;
 
-		$variables['--color-background-dark'] = $this->util->lighten($colorMainBackground, 30);
-		$variables['--color-background-darker'] = $this->util->lighten($colorMainBackground, 30);
+        $variables['--color-background-dark'] = $this->util->lighten($colorMainBackground, 30);
+        $variables['--color-background-darker'] = $this->util->lighten($colorMainBackground, 30);
 
-		$variables['--color-placeholder-light'] = $this->util->lighten($colorMainBackground, 30);
-		$variables['--color-placeholder-dark'] = $this->util->lighten($colorMainBackground, 45);
+        $variables['--color-placeholder-light'] = $this->util->lighten($colorMainBackground, 30);
+        $variables['--color-placeholder-dark'] = $this->util->lighten($colorMainBackground, 45);
 
-		$variables['--color-text-maxcontrast'] = $colorMainText;
-		$variables['--color-text-light'] = $colorMainText;
-		$variables['--color-text-lighter'] = $colorMainText;
+        $variables['--color-text-maxcontrast'] = $colorMainText;
+        $variables['--color-text-light'] = $colorMainText;
+        $variables['--color-text-lighter'] = $colorMainText;
 
-		// used for the icon loading animation
-		$variables['--color-loading-light'] = '#000000';
-		$variables['--color-loading-dark'] = '#dddddd';
+        // used for the icon loading animation
+        $variables['--color-loading-light'] = '#000000';
+        $variables['--color-loading-dark'] = '#dddddd';
 
 
-		$variables['--color-box-shadow-rgb'] = $colorBoxShadowRGB;
-		$variables['--color-box-shadow'] = $colorBoxShadowRGB;
+        $variables['--color-box-shadow-rgb'] = $colorBoxShadowRGB;
+        $variables['--color-box-shadow'] = $colorBoxShadowRGB;
 
 
-		$variables['--color-border'] = $this->util->lighten($colorMainBackground, 50);
-		$variables['--color-border-dark'] = $this->util->lighten($colorMainBackground, 50);
+        $variables['--color-border'] = $this->util->lighten($colorMainBackground, 50);
+        $variables['--color-border-dark'] = $this->util->lighten($colorMainBackground, 50);
 
-		return $variables;
-	}
+        return $variables;
+    }
 
-	public function getCustomCss(): string {
-		return "
+    public function getCustomCss(): string {
+        return "
 		[class^='icon-'], [class*=' icon-'],
 			.action,
 			#appmenu li a,
@@ -94,5 +94,5 @@ 
 				opacity: 1 !important;
 			}
 		";
-	}
+    }
 }

apps/theming/lib/Themes/HighContrastTheme.php

Indentation +39 added lines, -39 removed lines

@@ -28,58 +28,58 @@ 
 
 class HighContrastTheme extends DefaultTheme implements ITheme {
 
-	public function getId(): string {
-		return 'highcontrast';
-	}
+    public function getId(): string {
+        return 'highcontrast';
+    }
 
-	public function getMediaQuery(): string {
-		return '(prefers-contrast: more)';
-	}
+    public function getMediaQuery(): string {
+        return '(prefers-contrast: more)';
+    }
 
-	public function getTitle(): string {
-		return $this->l->t('High contrast mode');
-	}
+    public function getTitle(): string {
+        return $this->l->t('High contrast mode');
+    }
 
-	public function getEnableLabel(): string {
-		return $this->l->t('Enable high contrast mode');
-	}
+    public function getEnableLabel(): string {
+        return $this->l->t('Enable high contrast mode');
+    }
 
-	public function getDescription(): string {
-		return $this->l->t('A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased.');
-	}
+    public function getDescription(): string {
+        return $this->l->t('A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased.');
+    }
 
-	public function getCSSVariables(): array {
-		$variables = parent::getCSSVariables();
-		$colorMainText = '#000000';
-		$colorMainBackground = '#ffffff';
+    public function getCSSVariables(): array {
+        $variables = parent::getCSSVariables();
+        $colorMainText = '#000000';
+        $colorMainBackground = '#ffffff';
 
-		$variables['--color-main-background'] = $colorMainBackground;
-		$variables['--color-main-text'] = $colorMainText;
+        $variables['--color-main-background'] = $colorMainBackground;
+        $variables['--color-main-text'] = $colorMainText;
 
-		$variables['--color-background-dark'] = $this->util->darken($colorMainBackground, 30);
-		$variables['--color-background-darker'] = $this->util->darken($colorMainBackground, 30);
+        $variables['--color-background-dark'] = $this->util->darken($colorMainBackground, 30);
+        $variables['--color-background-darker'] = $this->util->darken($colorMainBackground, 30);
 
-		$variables['--color-placeholder-light'] = $this->util->darken($colorMainBackground, 30);
-		$variables['--color-placeholder-dark'] = $this->util->darken($colorMainBackground, 45);
+        $variables['--color-placeholder-light'] = $this->util->darken($colorMainBackground, 30);
+        $variables['--color-placeholder-dark'] = $this->util->darken($colorMainBackground, 45);
 
-		$variables['--color-text-maxcontrast'] = 'var(--color-main-text)';
-		$variables['--color-text-light'] = 'var(--color-main-text)';
-		$variables['--color-text-lighter'] = 'var(--color-main-text)';
+        $variables['--color-text-maxcontrast'] = 'var(--color-main-text)';
+        $variables['--color-text-light'] = 'var(--color-main-text)';
+        $variables['--color-text-lighter'] = 'var(--color-main-text)';
 
-		// used for the icon loading animation
-		$variables['--color-loading-light'] = '#dddddd';
-		$variables['--color-loading-dark'] = '#000000';
+        // used for the icon loading animation
+        $variables['--color-loading-light'] = '#dddddd';
+        $variables['--color-loading-dark'] = '#000000';
 
-		$variables['--color-box-shadow'] = 'var(--color-main-text)';
+        $variables['--color-box-shadow'] = 'var(--color-main-text)';
 
-		$variables['--color-border'] = $this->util->darken($colorMainBackground, 50);
-		$variables['--color-border-dark'] = $this->util->darken($colorMainBackground, 50);
+        $variables['--color-border'] = $this->util->darken($colorMainBackground, 50);
+        $variables['--color-border-dark'] = $this->util->darken($colorMainBackground, 50);
 
-		return $variables;
-	}
+        return $variables;
+    }
 
-	public function getCustomCss(): string {
-		return "
+    public function getCustomCss(): string {
+        return "
 			[class^='icon-'], [class*=' icon-'],
 			.action,
 			#appmenu li a,
@@ -87,5 +87,5 @@ 
 				opacity: 1 !important;
 			}
 		";
-	}
+    }
 }

apps/theming/lib/Themes/DarkTheme.php

Indentation +42 added lines, -42 removed lines

@@ -28,60 +28,60 @@
 
 class DarkTheme extends DefaultTheme implements ITheme {
 
-	public function getId(): string {
-		return 'dark';
-	}
+    public function getId(): string {
+        return 'dark';
+    }
 
-	public function getMediaQuery(): string {
-		return '(prefers-color-scheme: dark)';
-	}
+    public function getMediaQuery(): string {
+        return '(prefers-color-scheme: dark)';
+    }
 
-	public function getTitle(): string {
-		return $this->l->t('Dark theme');
-	}
+    public function getTitle(): string {
+        return $this->l->t('Dark theme');
+    }
 
-	public function getEnableLabel(): string {
-		return $this->l->t('Enable dark theme');
-	}
+    public function getEnableLabel(): string {
+        return $this->l->t('Enable dark theme');
+    }
 
-	public function getDescription(): string {
-		return $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find.');
-	}
+    public function getDescription(): string {
+        return $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find.');
+    }
 
-	public function getCSSVariables(): array {
-		$defaultVariables = parent::getCSSVariables();
+    public function getCSSVariables(): array {
+        $defaultVariables = parent::getCSSVariables();
 
-		$colorMainText = '#D8D8D8';
-		$colorMainBackground = '#171717';
-		$colorMainBackgroundRGB = join(',', $this->util->hexToRGB($colorMainBackground));
-		$colorBoxShadow = $this->util->darken($colorMainBackground, 70);
-		$colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow));
+        $colorMainText = '#D8D8D8';
+        $colorMainBackground = '#171717';
+        $colorMainBackgroundRGB = join(',', $this->util->hexToRGB($colorMainBackground));
+        $colorBoxShadow = $this->util->darken($colorMainBackground, 70);
+        $colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow));
 
-		return array_merge($defaultVariables, [	
-			'--color-main-text' => $colorMainText,
-			'--color-main-background' => $colorMainBackground,
-			'--color-main-background-rgb' => $colorMainBackgroundRGB,
+        return array_merge($defaultVariables, [	
+            '--color-main-text' => $colorMainText,
+            '--color-main-background' => $colorMainBackground,
+            '--color-main-background-rgb' => $colorMainBackgroundRGB,
 
-			'--color-background-hover' => $this->util->lighten($colorMainBackground, 4),
-			'--color-background-dark' => $this->util->lighten($colorMainBackground, 7),
-			'--color-background-darker' => $this->util->lighten($colorMainBackground, 14),
+            '--color-background-hover' => $this->util->lighten($colorMainBackground, 4),
+            '--color-background-dark' => $this->util->lighten($colorMainBackground, 7),
+            '--color-background-darker' => $this->util->lighten($colorMainBackground, 14),
 
-			'--color-placeholder-light' => $this->util->lighten($colorMainBackground, 10),
-			'--color-placeholder-dark' => $this->util->lighten($colorMainBackground, 20),
+            '--color-placeholder-light' => $this->util->lighten($colorMainBackground, 10),
+            '--color-placeholder-dark' => $this->util->lighten($colorMainBackground, 20),
 
-			'--color-text-maxcontrast' => $this->util->darken($colorMainText, 30),
-			'--color-text-light' => $this->util->darken($colorMainText, 10),
-			'--color-text-lighter' => $this->util->darken($colorMainText, 20),
+            '--color-text-maxcontrast' => $this->util->darken($colorMainText, 30),
+            '--color-text-light' => $this->util->darken($colorMainText, 10),
+            '--color-text-lighter' => $this->util->darken($colorMainText, 20),
 
-			'--color-loading-light' => '#777',
-			'--color-loading-dark' => '#CCC',
+            '--color-loading-light' => '#777',
+            '--color-loading-dark' => '#CCC',
 
-			'--color-box-shadow-rgb' => $colorBoxShadowRGB,
+            '--color-box-shadow-rgb' => $colorBoxShadowRGB,
 
-			'--color-border' => $this->util->lighten($colorMainBackground, 7),
-			'--color-border-dark' => $this->util->lighten($colorMainBackground, 14),
+            '--color-border' => $this->util->lighten($colorMainBackground, 7),
+            '--color-border-dark' => $this->util->lighten($colorMainBackground, 14),
 
-			'--background-invert-if-dark' => 'invert(100%)',
-		]);
-	}
+            '--background-invert-if-dark' => 'invert(100%)',
+        ]);
+    }
 }

apps/theming/lib/Service/ThemesService.php

Indentation +134 added lines, -134 removed lines

@@ -34,139 +34,139 @@
 use OCP\IUserSession;
 
 class ThemesService {
-	private IUserSession $userSession;
-	private IConfig $config;
-
-	/** @var ITheme[] */
-	private array $themesProviders;
-
-	public function __construct(IUserSession $userSession,
-								IConfig $config,
-								DefaultTheme $defaultTheme,
-								DarkTheme $darkTheme,
-								HighContrastTheme $highContrastTheme,
-								DarkHighContrastTheme $darkHighContrastTheme,
-								DyslexiaFont $dyslexiaFont) {
-		$this->userSession = $userSession;
-		$this->config = $config;
-
-		// Register themes
-		$this->themesProviders = [
-			$defaultTheme->getId()			=> $defaultTheme,
-			$darkTheme->getId()				=> $darkTheme,
-			$highContrastTheme->getId()		=> $highContrastTheme,
-			$darkHighContrastTheme->getId()	=> $darkHighContrastTheme,
-			$dyslexiaFont->getId()			=> $dyslexiaFont,
-		];
-	}
-
-	/**
-	 * Get the list of all registered themes
-	 * 
-	 * @return ITheme[]
-	 */
-	public function getThemes(): array {
-		return $this->themesProviders;
-	}
-
-	/**
-	 * Enable a theme for the logged-in user
-	 * 
-	 * @param ITheme $theme the theme to enable
-	 * @return string[] the enabled themes
-	 */
-	public function enableTheme(ITheme $theme): array {
-		$themesIds = $this->getEnabledThemes();
-
-		// If already enabled, ignore
-		if (in_array($theme->getId(), $themesIds)) {
-			return $themesIds;
-		}
-
-		/** @var ITheme[] */
-		$themes = array_map(function($themeId) {
-			return $this->getThemes()[$themeId];
-		}, $themesIds);
-
-		// Filtering all themes with the same type
-		$filteredThemes = array_filter($themes, function(ITheme $t) use ($theme) {
-			return $theme->getType() === $t->getType();
-		});
-
-		// Retrieve IDs only
-		/** @var string[] */
-		$filteredThemesIds = array_map(function(ITheme $t) {
-			return $t->getId();
-		}, array_values($filteredThemes));
-
-		$enabledThemes = array_merge(array_diff($themesIds, $filteredThemesIds), [$theme->getId()]);
-		$this->setEnabledThemes($enabledThemes);
-
-		return $enabledThemes;
-	}
-
-	/**
-	 * Disable a theme for the logged-in user
-	 * 
-	 * @param ITheme $theme the theme to disable
-	 * @return string[] the enabled themes
-	 */
-	public function disableTheme(ITheme $theme): array {
-		$themesIds = $this->getEnabledThemes();
-
-		// If enabled, removing it
-		if (in_array($theme->getId(), $themesIds)) {
-			$enabledThemes = array_diff($themesIds, [$theme->getId()]);
-			$this->setEnabledThemes($enabledThemes);
-			return $enabledThemes;
-		}
+    private IUserSession $userSession;
+    private IConfig $config;
+
+    /** @var ITheme[] */
+    private array $themesProviders;
+
+    public function __construct(IUserSession $userSession,
+                                IConfig $config,
+                                DefaultTheme $defaultTheme,
+                                DarkTheme $darkTheme,
+                                HighContrastTheme $highContrastTheme,
+                                DarkHighContrastTheme $darkHighContrastTheme,
+                                DyslexiaFont $dyslexiaFont) {
+        $this->userSession = $userSession;
+        $this->config = $config;
+
+        // Register themes
+        $this->themesProviders = [
+            $defaultTheme->getId()			=> $defaultTheme,
+            $darkTheme->getId()				=> $darkTheme,
+            $highContrastTheme->getId()		=> $highContrastTheme,
+            $darkHighContrastTheme->getId()	=> $darkHighContrastTheme,
+            $dyslexiaFont->getId()			=> $dyslexiaFont,
+        ];
+    }
+
+    /**
+     * Get the list of all registered themes
+     * 
+     * @return ITheme[]
+     */
+    public function getThemes(): array {
+        return $this->themesProviders;
+    }
+
+    /**
+     * Enable a theme for the logged-in user
+     * 
+     * @param ITheme $theme the theme to enable
+     * @return string[] the enabled themes
+     */
+    public function enableTheme(ITheme $theme): array {
+        $themesIds = $this->getEnabledThemes();
+
+        // If already enabled, ignore
+        if (in_array($theme->getId(), $themesIds)) {
+            return $themesIds;
+        }
+
+        /** @var ITheme[] */
+        $themes = array_map(function($themeId) {
+            return $this->getThemes()[$themeId];
+        }, $themesIds);
+
+        // Filtering all themes with the same type
+        $filteredThemes = array_filter($themes, function(ITheme $t) use ($theme) {
+            return $theme->getType() === $t->getType();
+        });
+
+        // Retrieve IDs only
+        /** @var string[] */
+        $filteredThemesIds = array_map(function(ITheme $t) {
+            return $t->getId();
+        }, array_values($filteredThemes));
+
+        $enabledThemes = array_merge(array_diff($themesIds, $filteredThemesIds), [$theme->getId()]);
+        $this->setEnabledThemes($enabledThemes);
+
+        return $enabledThemes;
+    }
+
+    /**
+     * Disable a theme for the logged-in user
+     * 
+     * @param ITheme $theme the theme to disable
+     * @return string[] the enabled themes
+     */
+    public function disableTheme(ITheme $theme): array {
+        $themesIds = $this->getEnabledThemes();
+
+        // If enabled, removing it
+        if (in_array($theme->getId(), $themesIds)) {
+            $enabledThemes = array_diff($themesIds, [$theme->getId()]);
+            $this->setEnabledThemes($enabledThemes);
+            return $enabledThemes;
+        }
 		
-		return $themesIds;
-	}
-
-	/**
-	 * Check whether a theme is enabled or not
-	 * for the logged-in user
-	 * 
-	 * @return bool
-	 */
-	public function isEnabled(ITheme $theme): bool {
-		$user = $this->userSession->getUser();
-		if ($user instanceof IUser) {
-			// Using keys as it's faster
-			$themes = $this->getEnabledThemes();
-			return in_array($theme->getId(), $themes);
-		}
-		return false;
-	}
-
-	/**
-	 * Get the list of all enabled themes IDs
-	 * for the logged-in user
-	 * 
-	 * @return string[]
-	 */
-	public function getEnabledThemes(): array {
-		$user = $this->userSession->getUser();
-		if ($user === null) {
-			return [];
-		}
-
-		try {
-			return json_decode($this->config->getUserValue($user->getUID(), Application::APP_ID, 'enabled-themes', '[]'));
-		} catch (\Exception $e) {
-			return [];
-		}
-	}
-
-	/**
-	 * Set the list of enabled themes 
-	 * for the logged-in user
-	 * 
-	 * @param string[] $themes the list of enabled themes IDs
-	 */
-	private function setEnabledThemes(array $themes): void {
-		$user = $this->userSession->getUser();
-		$this->config->setUserValue($user->getUID(), Application::APP_ID, 'enabled-themes', json_encode(array_unique(array_values($themes))));
-	}
+        return $themesIds;
+    }
+
+    /**
+     * Check whether a theme is enabled or not
+     * for the logged-in user
+     * 
+     * @return bool
+     */
+    public function isEnabled(ITheme $theme): bool {
+        $user = $this->userSession->getUser();
+        if ($user instanceof IUser) {
+            // Using keys as it's faster
+            $themes = $this->getEnabledThemes();
+            return in_array($theme->getId(), $themes);
+        }
+        return false;
+    }
+
+    /**
+     * Get the list of all enabled themes IDs
+     * for the logged-in user
+     * 
+     * @return string[]
+     */
+    public function getEnabledThemes(): array {
+        $user = $this->userSession->getUser();
+        if ($user === null) {
+            return [];
+        }
+
+        try {
+            return json_decode($this->config->getUserValue($user->getUID(), Application::APP_ID, 'enabled-themes', '[]'));
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+
+    /**
+     * Set the list of enabled themes 
+     * for the logged-in user
+     * 
+     * @param string[] $themes the list of enabled themes IDs
+     */
+    private function setEnabledThemes(array $themes): void {
+        $user = $this->userSession->getUser();
+        $this->config->setUserValue($user->getUID(), Application::APP_ID, 'enabled-themes', json_encode(array_unique(array_values($themes))));
+    }
 }

apps/theming/lib/Service/JSDataService.php

Indentation +28 added lines, -28 removed lines

@@ -32,34 +32,34 @@
 use OCP\IConfig;
 
 class JSDataService implements \JsonSerializable {
-	private ThemingDefaults $themingDefaults;
-	private Util $util;
-	private IConfig $appConfig;
-	private ThemesService $themesService;
+    private ThemingDefaults $themingDefaults;
+    private Util $util;
+    private IConfig $appConfig;
+    private ThemesService $themesService;
 
-	public function __construct(
-		ThemingDefaults $themingDefaults,
-		Util $util,
-		IConfig $appConfig,
-		ThemesService $themesService
-	) {
-		$this->themingDefaults = $themingDefaults;
-		$this->util = $util;
-		$this->appConfig = $appConfig;
-		$this->themesService = $themesService;
-	}
+    public function __construct(
+        ThemingDefaults $themingDefaults,
+        Util $util,
+        IConfig $appConfig,
+        ThemesService $themesService
+    ) {
+        $this->themingDefaults = $themingDefaults;
+        $this->util = $util;
+        $this->appConfig = $appConfig;
+        $this->themesService = $themesService;
+    }
 
-	public function jsonSerialize(): array {
-		return [
-			'name' => $this->themingDefaults->getName(),
-			'url' => $this->themingDefaults->getBaseUrl(),
-			'slogan' => $this->themingDefaults->getSlogan(),
-			'color' => $this->themingDefaults->getColorPrimary(),
-			'imprintUrl' => $this->themingDefaults->getImprintUrl(),
-			'privacyUrl' => $this->themingDefaults->getPrivacyUrl(),
-			'inverted' => $this->util->invertTextColor($this->themingDefaults->getColorPrimary()),
-			'cacheBuster' => $this->appConfig->getAppValue(Application::APP_ID, 'cachebuster', '0'),
-			'enabledThemes' => $this->themesService->getEnabledThemes(),
-		];
-	}
+    public function jsonSerialize(): array {
+        return [
+            'name' => $this->themingDefaults->getName(),
+            'url' => $this->themingDefaults->getBaseUrl(),
+            'slogan' => $this->themingDefaults->getSlogan(),
+            'color' => $this->themingDefaults->getColorPrimary(),
+            'imprintUrl' => $this->themingDefaults->getImprintUrl(),
+            'privacyUrl' => $this->themingDefaults->getPrivacyUrl(),
+            'inverted' => $this->util->invertTextColor($this->themingDefaults->getColorPrimary()),
+            'cacheBuster' => $this->appConfig->getAppValue(Application::APP_ID, 'cachebuster', '0'),
+            'enabledThemes' => $this->themesService->getEnabledThemes(),
+        ];
+    }
 }

apps/theming/lib/Service/ThemeInjectionService.php

Indentation +51 added lines, -51 removed lines

@@ -28,61 +28,61 @@
 
 class ThemeInjectionService {
 
-	private IURLGenerator $urlGenerator;
-	private ThemesService $themesService;
-	private DefaultTheme $defaultTheme;
+    private IURLGenerator $urlGenerator;
+    private ThemesService $themesService;
+    private DefaultTheme $defaultTheme;
 
-	public function __construct(IURLGenerator $urlGenerator,
-								ThemesService $themesService,
-								DefaultTheme $defaultTheme) {
-		$this->urlGenerator = $urlGenerator;
-		$this->themesService = $themesService;
-		$this->defaultTheme = $defaultTheme;
-	}
+    public function __construct(IURLGenerator $urlGenerator,
+                                ThemesService $themesService,
+                                DefaultTheme $defaultTheme) {
+        $this->urlGenerator = $urlGenerator;
+        $this->themesService = $themesService;
+        $this->defaultTheme = $defaultTheme;
+    }
 
-	public function injectHeaders() {
-		$themes = $this->themesService->getThemes();
-		$defaultTheme = $themes[$this->defaultTheme->getId()];
-		$mediaThemes = array_filter($themes, function($theme) {
-			// Check if the theme provides a media query
-			return (bool)$theme->getMediaQuery();
-		});
+    public function injectHeaders() {
+        $themes = $this->themesService->getThemes();
+        $defaultTheme = $themes[$this->defaultTheme->getId()];
+        $mediaThemes = array_filter($themes, function($theme) {
+            // Check if the theme provides a media query
+            return (bool)$theme->getMediaQuery();
+        });
 
-		// Default theme fallback
-		$this->addThemeHeader($defaultTheme->getId());
+        // Default theme fallback
+        $this->addThemeHeader($defaultTheme->getId());
 		
-		// Themes applied by media queries
-		foreach($mediaThemes as $theme) {
-			$this->addThemeHeader($theme->getId(), true, $theme->getMediaQuery());
-		}
+        // Themes applied by media queries
+        foreach($mediaThemes as $theme) {
+            $this->addThemeHeader($theme->getId(), true, $theme->getMediaQuery());
+        }
 
-		// Themes 
-		foreach($this->themesService->getThemes() as $theme) {
-			// Ignore default theme as already processed first
-			if ($theme->getId() === $this->defaultTheme->getId()) {
-				continue;
-			}
-			$this->addThemeHeader($theme->getId(), false);
-		}
-	}
+        // Themes 
+        foreach($this->themesService->getThemes() as $theme) {
+            // Ignore default theme as already processed first
+            if ($theme->getId() === $this->defaultTheme->getId()) {
+                continue;
+            }
+            $this->addThemeHeader($theme->getId(), false);
+        }
+    }
 
-	/**
-	 * Inject theme header into rendered page
-	 * 
-	 * @param string $themeId the theme ID
-	 * @param bool $plain request the :root syntax
-	 * @param string $media media query to use in the <link> element
-	 */
-	private function addThemeHeader(string $themeId, bool $plain = true, string $media = null) {
-		$linkToCSS = $this->urlGenerator->linkToRoute('theming.Theming.getThemeStylesheet', [
-			'themeId' => $themeId,
-			'plain' => $plain,
-		]);
-		Util::addHeader('link', [
-			'rel' => 'stylesheet',
-			'media' => $media,
-			'href' => $linkToCSS,
-			'class' => 'theme'
-		]);
-	}
+    /**
+     * Inject theme header into rendered page
+     * 
+     * @param string $themeId the theme ID
+     * @param bool $plain request the :root syntax
+     * @param string $media media query to use in the <link> element
+     */
+    private function addThemeHeader(string $themeId, bool $plain = true, string $media = null) {
+        $linkToCSS = $this->urlGenerator->linkToRoute('theming.Theming.getThemeStylesheet', [
+            'themeId' => $themeId,
+            'plain' => $plain,
+        ]);
+        Util::addHeader('link', [
+            'rel' => 'stylesheet',
+            'media' => $media,
+            'href' => $linkToCSS,
+            'class' => 'theme'
+        ]);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -45,19 +45,19 @@
 		$defaultTheme = $themes[$this->defaultTheme->getId()];
 		$mediaThemes = array_filter($themes, function($theme) {
 			// Check if the theme provides a media query
-			return (bool)$theme->getMediaQuery();
+			return (bool) $theme->getMediaQuery();
 		});
 
 		// Default theme fallback
 		$this->addThemeHeader($defaultTheme->getId());
 		
 		// Themes applied by media queries
-		foreach($mediaThemes as $theme) {
+		foreach ($mediaThemes as $theme) {
 			$this->addThemeHeader($theme->getId(), true, $theme->getMediaQuery());
 		}
 
 		// Themes 
-		foreach($this->themesService->getThemes() as $theme) {
+		foreach ($this->themesService->getThemes() as $theme) {
 			// Ignore default theme as already processed first
 			if ($theme->getId() === $this->defaultTheme->getId()) {
 				continue;