nextcloud / server

apps/theming/lib/Themes/DefaultTheme.php

Indentation +202 added lines, -202 removed lines

@@ -37,206 +37,206 @@
 use OCP\Server;
 
 class DefaultTheme implements ITheme {
-	use CommonThemeTrait;
-
-	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('System default theme');
-	}
-
-	public function getEnableLabel(): string {
-		return $this->l->t('Enable the system default');
-	}
-
-	public function getDescription(): string {
-		return $this->l->t('Using the default system appearance.');
-	}
-
-	public function getMediaQuery(): string {
-		return '';
-	}
-
-	public function getCSSVariables(): array {
-		$colorMainText = '#222222';
-		$colorMainTextRgb = join(',', $this->util->hexToRGB($colorMainText));
-		$colorMainBackground = '#ffffff';
-		$colorMainBackgroundRGB = join(',', $this->util->hexToRGB($colorMainBackground));
-		$colorBoxShadow = $this->util->darken($colorMainBackground, 70);
-		$colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow));
-
-		$hasCustomLogoHeader = $this->imageManager->hasImage('logo') || $this->imageManager->hasImage('logoheader');
-		$hasCustomPrimaryColour = !empty($this->config->getAppValue(Application::APP_ID, 'color'));
-
-		$variables = [
-			'--color-main-background' => $colorMainBackground,
-			'--color-main-background-rgb' => $colorMainBackgroundRGB,
-			'--color-main-background-translucent' => 'rgba(var(--color-main-background-rgb), .97)',
-			'--color-main-background-blur' => 'rgba(var(--color-main-background-rgb), .8)',
-			'--filter-background-blur' => 'blur(25px)',
-
-			// 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),
-
-			// 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),
-
-			'--color-scrollbar' => 'rgba(' . $colorMainTextRgb . ', .15)',
-
-			// info/warning/success feedback colours
-			'--color-error' => '#e9322d',
-			'--color-error-rgb' => join(',', $this->util->hexToRGB('#e9322d')),
-			'--color-error-hover' => $this->util->mix('#e9322d', $colorMainBackground, 60),
-			'--color-warning' => '#eca700',
-			'--color-warning-rgb' => join(',', $this->util->hexToRGB('#eca700')),
-			'--color-warning-hover' => $this->util->mix('#eca700', $colorMainBackground, 60),
-			'--color-success' => '#46ba61',
-			'--color-success-rgb' => join(',', $this->util->hexToRGB('#46ba61')),
-			'--color-success-hover' => $this->util->mix('#46ba61', $colorMainBackground, 60),
-
-			// 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-clickable-area' => '44px',
-			'--default-line-height' => '24px',
-			'--default-grid-baseline' => '4px',
-
-			// 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.
-			// ⚠️ 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',
-			'--background-invert-if-dark' => 'no',
-			'--background-invert-if-bright' => 'invert(100%)',
-
-			'--image-main-background' => "url('" . $this->urlGenerator->imagePath('core', 'app-background.jpg') . "')",
-		];
-
-		// Primary variables
-		$variables = array_merge($variables, $this->generatePrimaryVariables($colorMainBackground, $colorMainText));
-
-		$backgroundDeleted = $this->config->getAppValue(Application::APP_ID, 'backgroundMime', '') === 'backgroundColor';
-		// If primary as background has been request or if we have a custom primary colour
-		// let's not define the background image
-		if ($backgroundDeleted || $hasCustomPrimaryColour) {
-			$variables["--image-background-plain"] = 'true';
-		}
-
-		// Register image variables only if custom-defined
-		foreach (['logo', 'logoheader', 'favicon', 'background'] as $image) {
-			if ($this->imageManager->hasImage($image)) {
-				$imageUrl = $this->imageManager->getImageUrl($image);
-				if ($image === 'background') {
-					// If background deleted is set, ignoring variable
-					if ($backgroundDeleted) {
-						continue;
-					}
-					$variables['--image-background-size'] = 'cover';
-					$variables['--image-main-background'] = "url('" . $imageUrl . "')";
-				}
-				$variables["--image-$image"] = "url('" . $imageUrl . "')";
-			}
-		}
-
-		if ($hasCustomLogoHeader) {
-			$variables["--image-logoheader-custom"] = 'true';
-		}
-
-		$appManager = Server::get(IAppManager::class);
-		$userSession = Server::get(IUserSession::class);
-		$user = $userSession->getUser();
-		if ($appManager->isEnabledForUser(Application::APP_ID) && $user !== null) {
-			$themingBackground = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'background', 'default');
-
-			if ($themingBackground === 'custom') {
-				$variables['--image-main-background'] = "url('" . $this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground') . "')";
-			} elseif ($themingBackground !== 'default' && substr($themingBackground, 0, 1) !== '#') {
-				$variables['--image-main-background'] = "url('" . $this->urlGenerator->linkTo(Application::APP_ID, "/img/background/$themingBackground") . "')";
-			}
-		}
-
-		return $variables;
-	}
-
-	public function getCustomCss(): string {
-		return '';
-	}
+    use CommonThemeTrait;
+
+    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('System default theme');
+    }
+
+    public function getEnableLabel(): string {
+        return $this->l->t('Enable the system default');
+    }
+
+    public function getDescription(): string {
+        return $this->l->t('Using the default system appearance.');
+    }
+
+    public function getMediaQuery(): string {
+        return '';
+    }
+
+    public function getCSSVariables(): array {
+        $colorMainText = '#222222';
+        $colorMainTextRgb = join(',', $this->util->hexToRGB($colorMainText));
+        $colorMainBackground = '#ffffff';
+        $colorMainBackgroundRGB = join(',', $this->util->hexToRGB($colorMainBackground));
+        $colorBoxShadow = $this->util->darken($colorMainBackground, 70);
+        $colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow));
+
+        $hasCustomLogoHeader = $this->imageManager->hasImage('logo') || $this->imageManager->hasImage('logoheader');
+        $hasCustomPrimaryColour = !empty($this->config->getAppValue(Application::APP_ID, 'color'));
+
+        $variables = [
+            '--color-main-background' => $colorMainBackground,
+            '--color-main-background-rgb' => $colorMainBackgroundRGB,
+            '--color-main-background-translucent' => 'rgba(var(--color-main-background-rgb), .97)',
+            '--color-main-background-blur' => 'rgba(var(--color-main-background-rgb), .8)',
+            '--filter-background-blur' => 'blur(25px)',
+
+            // 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),
+
+            // 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),
+
+            '--color-scrollbar' => 'rgba(' . $colorMainTextRgb . ', .15)',
+
+            // info/warning/success feedback colours
+            '--color-error' => '#e9322d',
+            '--color-error-rgb' => join(',', $this->util->hexToRGB('#e9322d')),
+            '--color-error-hover' => $this->util->mix('#e9322d', $colorMainBackground, 60),
+            '--color-warning' => '#eca700',
+            '--color-warning-rgb' => join(',', $this->util->hexToRGB('#eca700')),
+            '--color-warning-hover' => $this->util->mix('#eca700', $colorMainBackground, 60),
+            '--color-success' => '#46ba61',
+            '--color-success-rgb' => join(',', $this->util->hexToRGB('#46ba61')),
+            '--color-success-hover' => $this->util->mix('#46ba61', $colorMainBackground, 60),
+
+            // 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-clickable-area' => '44px',
+            '--default-line-height' => '24px',
+            '--default-grid-baseline' => '4px',
+
+            // 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.
+            // ⚠️ 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',
+            '--background-invert-if-dark' => 'no',
+            '--background-invert-if-bright' => 'invert(100%)',
+
+            '--image-main-background' => "url('" . $this->urlGenerator->imagePath('core', 'app-background.jpg') . "')",
+        ];
+
+        // Primary variables
+        $variables = array_merge($variables, $this->generatePrimaryVariables($colorMainBackground, $colorMainText));
+
+        $backgroundDeleted = $this->config->getAppValue(Application::APP_ID, 'backgroundMime', '') === 'backgroundColor';
+        // If primary as background has been request or if we have a custom primary colour
+        // let's not define the background image
+        if ($backgroundDeleted || $hasCustomPrimaryColour) {
+            $variables["--image-background-plain"] = 'true';
+        }
+
+        // Register image variables only if custom-defined
+        foreach (['logo', 'logoheader', 'favicon', 'background'] as $image) {
+            if ($this->imageManager->hasImage($image)) {
+                $imageUrl = $this->imageManager->getImageUrl($image);
+                if ($image === 'background') {
+                    // If background deleted is set, ignoring variable
+                    if ($backgroundDeleted) {
+                        continue;
+                    }
+                    $variables['--image-background-size'] = 'cover';
+                    $variables['--image-main-background'] = "url('" . $imageUrl . "')";
+                }
+                $variables["--image-$image"] = "url('" . $imageUrl . "')";
+            }
+        }
+
+        if ($hasCustomLogoHeader) {
+            $variables["--image-logoheader-custom"] = 'true';
+        }
+
+        $appManager = Server::get(IAppManager::class);
+        $userSession = Server::get(IUserSession::class);
+        $user = $userSession->getUser();
+        if ($appManager->isEnabledForUser(Application::APP_ID) && $user !== null) {
+            $themingBackground = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'background', 'default');
+
+            if ($themingBackground === 'custom') {
+                $variables['--image-main-background'] = "url('" . $this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground') . "')";
+            } elseif ($themingBackground !== 'default' && substr($themingBackground, 0, 1) !== '#') {
+                $variables['--image-main-background'] = "url('" . $this->urlGenerator->linkTo(Application::APP_ID, "/img/background/$themingBackground") . "')";
+            }
+        }
+
+        return $variables;
+    }
+
+    public function getCustomCss(): string {
+        return '';
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -123,7 +123,7 @@ 
 			'--color-text-light' => $colorMainText,
 			'--color-text-lighter' => $this->util->lighten($colorMainText, 33),
 
-			'--color-scrollbar' => 'rgba(' . $colorMainTextRgb . ', .15)',
+			'--color-scrollbar' => 'rgba('.$colorMainTextRgb.', .15)',
 
 			// info/warning/success feedback colours
 			'--color-error' => '#e9322d',
@@ -187,7 +187,7 @@ 
 			'--background-invert-if-dark' => 'no',
 			'--background-invert-if-bright' => 'invert(100%)',
 
-			'--image-main-background' => "url('" . $this->urlGenerator->imagePath('core', 'app-background.jpg') . "')",
+			'--image-main-background' => "url('".$this->urlGenerator->imagePath('core', 'app-background.jpg')."')",
 		];
 
 		// Primary variables
@@ -210,9 +210,9 @@ 
 						continue;
 					}
 					$variables['--image-background-size'] = 'cover';
-					$variables['--image-main-background'] = "url('" . $imageUrl . "')";
+					$variables['--image-main-background'] = "url('".$imageUrl."')";
 				}
-				$variables["--image-$image"] = "url('" . $imageUrl . "')";
+				$variables["--image-$image"] = "url('".$imageUrl."')";
 			}
 		}
 
@@ -227,9 +227,9 @@ 
 			$themingBackground = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'background', 'default');
 
 			if ($themingBackground === 'custom') {
-				$variables['--image-main-background'] = "url('" . $this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground') . "')";
+				$variables['--image-main-background'] = "url('".$this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground')."')";
 			} elseif ($themingBackground !== 'default' && substr($themingBackground, 0, 1) !== '#') {
-				$variables['--image-main-background'] = "url('" . $this->urlGenerator->linkTo(Application::APP_ID, "/img/background/$themingBackground") . "')";
+				$variables['--image-main-background'] = "url('".$this->urlGenerator->linkTo(Application::APP_ID, "/img/background/$themingBackground")."')";
 			}
 		}
 

apps/theming/lib/Themes/CommonThemeTrait.php

Indentation +31 added lines, -31 removed lines

@@ -27,39 +27,39 @@
 use OCA\Theming\Util;
 
 trait CommonThemeTrait {
-	public Util $util;
+    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 {
-		$colorPrimaryLight = $this->util->mix($this->primaryColor, $colorMainBackground, -80);
-		$colorPrimaryElement = $this->util->elementColor($this->primaryColor);
-		$colorPrimaryElementLight = $this->util->mix($colorPrimaryElement, $colorMainBackground, -80);
+    /**
+     * 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 {
+        $colorPrimaryLight = $this->util->mix($this->primaryColor, $colorMainBackground, -80);
+        $colorPrimaryElement = $this->util->elementColor($this->primaryColor);
+        $colorPrimaryElementLight = $this->util->mix($colorPrimaryElement, $colorMainBackground, -80);
 
-		// primary related colours
-		return [
-			'--color-primary' => $this->primaryColor,
-			'--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->primaryColor,
-			'--color-primary-light-hover' => $this->util->mix($colorPrimaryLight, $colorMainText, 90),
-			'--color-primary-text-dark' => $this->util->darken($this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff', 7),
+        // primary related colours
+        return [
+            '--color-primary' => $this->primaryColor,
+            '--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->primaryColor,
+            '--color-primary-light-hover' => $this->util->mix($colorPrimaryLight, $colorMainText, 90),
+            '--color-primary-text-dark' => $this->util->darken($this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff', 7),
 
-			// used for buttons, inputs...
-			'--color-primary-element' => $colorPrimaryElement,
-			'--color-primary-element-text' => $this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff',
-			'--color-primary-element-hover' => $this->util->mix($colorPrimaryElement, $colorMainBackground, 60),
-			'--color-primary-element-light' => $colorPrimaryElementLight,
-			'--color-primary-element-light-text' => $colorPrimaryElement,
-			'--color-primary-element-light-hover' => $this->util->mix($colorPrimaryElementLight, $colorMainText, 90),
-			'--color-primary-element-text-dark' => $this->util->darken($this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff', 7),
+            // used for buttons, inputs...
+            '--color-primary-element' => $colorPrimaryElement,
+            '--color-primary-element-text' => $this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff',
+            '--color-primary-element-hover' => $this->util->mix($colorPrimaryElement, $colorMainBackground, 60),
+            '--color-primary-element-light' => $colorPrimaryElementLight,
+            '--color-primary-element-light-text' => $colorPrimaryElement,
+            '--color-primary-element-light-hover' => $this->util->mix($colorPrimaryElementLight, $colorMainText, 90),
+            '--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%)',
-		];
-	}
+            // 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%)',
+        ];
+    }
 }

apps/theming/lib/Themes/DarkHighContrastTheme.php

Indentation +52 added lines, -52 removed lines

@@ -28,73 +28,73 @@ 
 
 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.');
+    }
 
-	/**
-	 * Keep this consistent with other HighContrast Themes
-	 */
-	public function getCSSVariables(): array {
-		$defaultVariables = parent::getCSSVariables();
+    /**
+     * Keep this consistent with other HighContrast Themes
+     */
+    public function getCSSVariables(): array {
+        $defaultVariables = parent::getCSSVariables();
 
-		$colorMainText = '#ffffff';
-		$colorMainBackground = '#000000';
+        $colorMainText = '#ffffff';
+        $colorMainBackground = '#000000';
 
-		return array_merge(
-			$defaultVariables,
-			$this->generatePrimaryVariables($colorMainBackground, $colorMainText),
-			[
-				'--color-main-background' => $colorMainBackground,
-				'--color-main-background-translucent' => 'rgba(var(--color-main-background-rgb), .1)',
-				'--color-main-text' => $colorMainText,
+        return array_merge(
+            $defaultVariables,
+            $this->generatePrimaryVariables($colorMainBackground, $colorMainText),
+            [
+                '--color-main-background' => $colorMainBackground,
+                '--color-main-background-translucent' => 'rgba(var(--color-main-background-rgb), .1)',
+                '--color-main-text' => $colorMainText,
 
-				'--color-background-dark' => $this->util->lighten($colorMainBackground, 30),
-				'--color-background-darker' => $this->util->lighten($colorMainBackground, 30),
+                '--color-background-dark' => $this->util->lighten($colorMainBackground, 30),
+                '--color-background-darker' => $this->util->lighten($colorMainBackground, 30),
 
-				'--color-main-background-blur' => $colorMainBackground,
-				'--filter-background-blur' => 'none',
+                '--color-main-background-blur' => $colorMainBackground,
+                '--filter-background-blur' => 'none',
 
-				'--color-placeholder-light' => $this->util->lighten($colorMainBackground, 30),
-				'--color-placeholder-dark' => $this->util->lighten($colorMainBackground, 45),
+                '--color-placeholder-light' => $this->util->lighten($colorMainBackground, 30),
+                '--color-placeholder-dark' => $this->util->lighten($colorMainBackground, 45),
 
-				'--color-text-maxcontrast' => $colorMainText,
-				'--color-text-light' => $colorMainText,
-				'--color-text-lighter' => $colorMainText,
+                '--color-text-maxcontrast' => $colorMainText,
+                '--color-text-light' => $colorMainText,
+                '--color-text-lighter' => $colorMainText,
 
-				'--color-scrollbar' => $this->util->lighten($colorMainBackground, 35),
+                '--color-scrollbar' => $this->util->lighten($colorMainBackground, 35),
 
-				// used for the icon loading animation
-				'--color-loading-light' => '#000000',
-				'--color-loading-dark' => '#dddddd',
+                // used for the icon loading animation
+                '--color-loading-light' => '#000000',
+                '--color-loading-dark' => '#dddddd',
 
-				'--color-box-shadow-rgb' => $colorMainText,
-				'--color-box-shadow' => $colorMainText,
+                '--color-box-shadow-rgb' => $colorMainText,
+                '--color-box-shadow' => $colorMainText,
 
-				'--color-border' => $this->util->lighten($colorMainBackground, 50),
-				'--color-border-dark' => $this->util->lighten($colorMainBackground, 50),
-			]
-		);
-	}
+                '--color-border' => $this->util->lighten($colorMainBackground, 50),
+                '--color-border-dark' => $this->util->lighten($colorMainBackground, 50),
+            ]
+        );
+    }
 
-	public function getCustomCss(): string {
-		return "
+    public function getCustomCss(): string {
+        return "
 		[class^='icon-'], [class*=' icon-'],
 			.action,
 			#appmenu li a,
@@ -102,5 +102,5 @@ 
 				opacity: 1 !important;
 			}
 		";
-	}
+    }
 }

apps/theming/lib/Themes/HighContrastTheme.php

Indentation +52 added lines, -52 removed lines

@@ -28,73 +28,73 @@ 
 
 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.');
+    }
 
-	/**
-	 * Keep this consistent with other HighContrast Themes
-	 */
-	public function getCSSVariables(): array {
-		$defaultVariables = parent::getCSSVariables();
+    /**
+     * Keep this consistent with other HighContrast Themes
+     */
+    public function getCSSVariables(): array {
+        $defaultVariables = parent::getCSSVariables();
 
-		$colorMainText = '#000000';
-		$colorMainBackground = '#ffffff';
+        $colorMainText = '#000000';
+        $colorMainBackground = '#ffffff';
 
-		return array_merge(
-			$defaultVariables,
-			$this->generatePrimaryVariables($colorMainBackground, $colorMainText),
-			[
-				'--color-main-background' => $colorMainBackground,
-				'--color-main-background-translucent' => 'rgba(var(--color-main-background-rgb), .1)',
-				'--color-main-text' => $colorMainText,
+        return array_merge(
+            $defaultVariables,
+            $this->generatePrimaryVariables($colorMainBackground, $colorMainText),
+            [
+                '--color-main-background' => $colorMainBackground,
+                '--color-main-background-translucent' => 'rgba(var(--color-main-background-rgb), .1)',
+                '--color-main-text' => $colorMainText,
 
-				'--color-background-dark' => $this->util->darken($colorMainBackground, 30),
-				'--color-background-darker' => $this->util->darken($colorMainBackground, 30),
+                '--color-background-dark' => $this->util->darken($colorMainBackground, 30),
+                '--color-background-darker' => $this->util->darken($colorMainBackground, 30),
 
-				'--color-main-background-blur' => $colorMainBackground,
-				'--filter-background-blur' => 'none',
+                '--color-main-background-blur' => $colorMainBackground,
+                '--filter-background-blur' => 'none',
 
-				'--color-placeholder-light' => $this->util->darken($colorMainBackground, 30),
-				'--color-placeholder-dark' => $this->util->darken($colorMainBackground, 45),
+                '--color-placeholder-light' => $this->util->darken($colorMainBackground, 30),
+                '--color-placeholder-dark' => $this->util->darken($colorMainBackground, 45),
 
-				'--color-text-maxcontrast' => $colorMainText,
-				'--color-text-light' => $colorMainText,
-				'--color-text-lighter' => $colorMainText,
+                '--color-text-maxcontrast' => $colorMainText,
+                '--color-text-light' => $colorMainText,
+                '--color-text-lighter' => $colorMainText,
 
-				'--color-scrollbar' => $this->util->darken($colorMainBackground, 25),
+                '--color-scrollbar' => $this->util->darken($colorMainBackground, 25),
 
-				// used for the icon loading animation
-				'--color-loading-light' => '#dddddd',
-				'--color-loading-dark' => '#000000',
+                // used for the icon loading animation
+                '--color-loading-light' => '#dddddd',
+                '--color-loading-dark' => '#000000',
 
-				'--color-box-shadow-rgb' => $colorMainText,
-				'--color-box-shadow' => $colorMainText,
+                '--color-box-shadow-rgb' => $colorMainText,
+                '--color-box-shadow' => $colorMainText,
 
-				'--color-border' => $this->util->darken($colorMainBackground, 50),
-				'--color-border-dark' => $this->util->darken($colorMainBackground, 50),
-			]
-		);
-	}
+                '--color-border' => $this->util->darken($colorMainBackground, 50),
+                '--color-border-dark' => $this->util->darken($colorMainBackground, 50),
+            ]
+        );
+    }
 
-	public function getCustomCss(): string {
-		return "
+    public function getCustomCss(): string {
+        return "
 			[class^='icon-'], [class*=' icon-'],
 			.action,
 			#appmenu li a,
@@ -102,5 +102,5 @@ 
 				opacity: 1 !important;
 			}
 		";
-	}
+    }
 }

apps/theming/lib/Themes/DarkTheme.php

Indentation +50 added lines, -50 removed lines

@@ -28,70 +28,70 @@
 
 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.');
-	}
+    public function getDescription(): string {
+        return $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness.');
+    }
 
-	public function getCSSVariables(): array {
-		$defaultVariables = parent::getCSSVariables();
+    public function getCSSVariables(): array {
+        $defaultVariables = parent::getCSSVariables();
 
-		$colorMainText = '#D8D8D8';
-		$colorMainBackground = '#171717';
-		$colorMainBackgroundRGB = join(',', $this->util->hexToRGB($colorMainBackground));
+        $colorMainText = '#D8D8D8';
+        $colorMainBackground = '#171717';
+        $colorMainBackgroundRGB = join(',', $this->util->hexToRGB($colorMainBackground));
 
-		$colorBoxShadow = $this->util->darken($colorMainBackground, 70);
-		$colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow));
+        $colorBoxShadow = $this->util->darken($colorMainBackground, 70);
+        $colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow));
 
-		return array_merge(
-			$defaultVariables,
-			$this->generatePrimaryVariables($colorMainBackground, $colorMainText),
-			[
-				'--color-main-text' => $colorMainText,
-				'--color-main-background' => $colorMainBackground,
-				'--color-main-background-rgb' => $colorMainBackgroundRGB,
+        return array_merge(
+            $defaultVariables,
+            $this->generatePrimaryVariables($colorMainBackground, $colorMainText),
+            [
+                '--color-main-text' => $colorMainText,
+                '--color-main-background' => $colorMainBackground,
+                '--color-main-background-rgb' => $colorMainBackgroundRGB,
 
-				'--color-scrollbar' => $this->util->lighten($colorMainBackground, 15),
+                '--color-scrollbar' => $this->util->lighten($colorMainBackground, 15),
 
-				'--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),
 
-				// used for the icon loading animation
-				'--color-loading-light' => '#777',
-				'--color-loading-dark' => '#CCC',
+                // used for the icon loading animation
+                '--color-loading-light' => '#777',
+                '--color-loading-dark' => '#CCC',
 
-				'--color-box-shadow' => $colorBoxShadow,
-				'--color-box-shadow-rgb' => $colorBoxShadowRGB,
+                '--color-box-shadow' => $colorBoxShadow,
+                '--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-bright' => 'no',
-			]
-		);
-	}
+                '--background-invert-if-dark' => 'invert(100%)',
+                '--background-invert-if-bright' => 'no',
+            ]
+        );
+    }
 }

apps/theming/lib/Service/ThemesService.php

Indentation +142 added lines, -142 removed lines

@@ -35,147 +35,147 @@
 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,
-								LightTheme $lightTheme,
-								DarkTheme $darkTheme,
-								HighContrastTheme $highContrastTheme,
-								DarkHighContrastTheme $darkHighContrastTheme,
-								DyslexiaFont $dyslexiaFont) {
-		$this->userSession = $userSession;
-		$this->config = $config;
-
-		// Register themes
-		$this->themesProviders = [
-			$defaultTheme->getId()			=> $defaultTheme,
-			$lightTheme->getId()			=> $lightTheme,
-			$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_filter(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,
+                                LightTheme $lightTheme,
+                                DarkTheme $darkTheme,
+                                HighContrastTheme $highContrastTheme,
+                                DarkHighContrastTheme $darkHighContrastTheme,
+                                DyslexiaFont $dyslexiaFont) {
+        $this->userSession = $userSession;
+        $this->config = $config;
+
+        // Register themes
+        $this->themesProviders = [
+            $defaultTheme->getId()			=> $defaultTheme,
+            $lightTheme->getId()			=> $lightTheme,
+            $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_filter(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 [];
-		}
-
-		$enforcedTheme = $this->config->getSystemValueString('enforce_theme', '');
-		$enabledThemes = json_decode($this->config->getUserValue($user->getUID(), Application::APP_ID, 'enabled-themes', '[]'));
-		if ($enforcedTheme !== '') {
-			return array_merge([$enforcedTheme], $enabledThemes);
-		}
-
-		try {
-			return $enabledThemes;
-		} 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_values(array_unique($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 [];
+        }
+
+        $enforcedTheme = $this->config->getSystemValueString('enforce_theme', '');
+        $enabledThemes = json_decode($this->config->getUserValue($user->getUID(), Application::APP_ID, 'enabled-themes', '[]'));
+        if ($enforcedTheme !== '') {
+            return array_merge([$enforcedTheme], $enabledThemes);
+        }
+
+        try {
+            return $enabledThemes;
+        } 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_values(array_unique($themes))));
+    }
 }