nextcloud / server

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('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';
-		$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, 60),
-			'--color-primary-light' => $this->util->mix($this->primaryColor, $colorMainBackground, -80),
-			'--color-primary-light-text' => $this->primaryColor,
-			'--color-primary-light-hover' => $this->util->mix($this->primaryColor, $colorMainText, -80),
-			'--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, -70),
-
-			// 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, 60),
-			'--color-warning' => '#eca700',
-			'--color-warning-hover' => $this->util->mix('#eca700', $colorMainBackground, 60),
-			'--color-success' => '#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-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('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';
+        $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, 60),
+            '--color-primary-light' => $this->util->mix($this->primaryColor, $colorMainBackground, -80),
+            '--color-primary-light-text' => $this->primaryColor,
+            '--color-primary-light-hover' => $this->util->mix($this->primaryColor, $colorMainText, -80),
+            '--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, -70),
+
+            // 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, 60),
+            '--color-warning' => '#eca700',
+            '--color-warning-hover' => $this->util->mix('#eca700', $colorMainBackground, 60),
+            '--color-success' => '#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-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 '';
+    }
 }

apps/theming/lib/Themes/LightTheme.php

Indentation +18 added lines, -18 removed lines

@@ -35,27 +35,27 @@
 
 class LightTheme extends DefaultTheme implements ITheme {
 
-	public function getId(): string {
-		return 'light';
-	}
+    public function getId(): string {
+        return 'light';
+    }
 
-	public function getType(): int {
-		return ITheme::TYPE_THEME;
-	}
+    public function getType(): int {
+        return ITheme::TYPE_THEME;
+    }
 
-	public function getTitle(): string {
-		return $this->l->t('Light 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 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 getDescription(): string {
+        return $this->l->t('The default light appearance.');
+    }
 
-	public function getMediaQuery(): string {
-		return '(prefers-color-scheme: light)';
-	}
+    public function getMediaQuery(): string {
+        return '(prefers-color-scheme: light)';
+    }
 }

apps/theming/lib/Service/ThemesService.php

Indentation +136 added lines, -136 removed lines

@@ -35,141 +35,141 @@
 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_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_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))));
+    }
 }