Migrating themes to Theming app

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>

12 files changed, 557 insertions, 43 deletions

diff --git a/apps/theming/lib/Controller/UserThemeController.php b/apps/theming/lib/Controller/UserThemeController.php
new file mode 100644
index 00000000000..ec379d2e6fa
--- /dev/null
+++ b/apps/theming/lib/Controller/UserThemeController.php
@@ -0,0 +1,111 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2018 John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
+ * @copyright Copyright (c) 2019 Janis Köhr <janiskoehr@icloud.com>
+ *
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author Daniel Kesselberg <mail@danielkesselberg.de>
+ * @author Janis Köhr <janis.koehr@novatec-gmbh.de>
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Theming\Controller;
+
+use OCA\Theming\Service\ThemesService;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCS\OCSBadRequestException;
+use OCP\AppFramework\OCSController;
+use OCP\IConfig;
+use OCP\IRequest;
+use OCP\IUserSession;
+use OCP\PreConditionNotMetException;
+
+class UserThemeController extends OCSController {
+
+	protected string $userId;
+	private IConfig $config;
+	private IUserSession $userSession;
+	private ThemesService $themesService;
+
+	/**
+	 * Config constructor.
+	 */
+	public function __construct(string $appName,
+								IRequest $request,
+								IConfig $config,
+								IUserSession $userSession,
+								ThemesService $themesService) {
+		parent::__construct($appName, $request);
+		$this->config = $config;
+		$this->userSession = $userSession;
+		$this->themesService = $themesService;
+		$this->userId = $userSession->getUser()->getUID();
+	}
+
+	/**
+	 * @NoAdminRequired
+	 *
+	 * Enable theme
+	 *
+	 * @param string $themeId the theme ID
+	 * @return DataResponse
+	 * @throws OCSBadRequestException|PreConditionNotMetException
+	 */
+	public function enableTheme(string $themeId): DataResponse {
+		if ($themeId === '' || !$themeId) {
+			throw new OCSBadRequestException('Invalid theme id: ' . $themeId);
+		}
+
+		$themes = $this->themesService->getThemes();
+		if (!isset($themes[$themeId])) {
+			throw new OCSBadRequestException('Invalid theme id: ' . $themeId);
+		}
+		
+		// Enable selected theme
+		$this->themesService->enableTheme($themes[$themeId]);
+		return new DataResponse();
+	}
+
+	/**
+	 * @NoAdminRequired
+	 *
+	 * Disable theme
+	 *
+	 * @param string $themeId the theme ID
+	 * @return DataResponse
+	 * @throws OCSBadRequestException|PreConditionNotMetException
+	 */
+	public function disableTheme(string $themeId): DataResponse {
+		if ($themeId === '' || !$themeId) {
+			throw new OCSBadRequestException('Invalid theme id: ' . $themeId);
+		}
+
+		$themes = $this->themesService->getThemes();
+		if (!isset($themes[$themeId])) {
+			throw new OCSBadRequestException('Invalid theme id: ' . $themeId);
+		}
+		
+		// Enable selected theme
+		$this->themesService->disableTheme($themes[$themeId]);
+		return new DataResponse();
+	}
+}
diff --git a/apps/theming/lib/ITheme.php b/apps/theming/lib/ITheme.php
index 7f3e49075ca..20508fac4e8 100644
--- a/apps/theming/lib/ITheme.php
+++ b/apps/theming/lib/ITheme.php
@@ -30,13 +30,47 @@ namespace OCA\Theming;
  */
 interface ITheme {
 
+	const TYPE_THEME = 1;
+	const TYPE_FONT = 2;
+
 	/**
 	 * Unique theme id
+	 * Will be used to search for ID.png in the img folder
+	 *
 	 * @since 25.0.0
 	 */
 	public function getId(): string;
 
 	/**
+	 * Theme type
+	 * TYPE_THEME or TYPE_FONT
+	 *
+	 * @since 25.0.0
+	 */
+	public function getType(): int;
+
+	/**
+	 * The theme translated title
+	 *
+	 * @since 25.0.0
+	 */
+	public function getTitle(): string;
+
+	/**
+	 * The theme enable checkbox translated label
+	 *
+	 * @since 25.0.0
+	 */
+	public function getEnableLabel(): string;
+
+	/**
+	 * The theme translated description
+	 *
+	 * @since 25.0.0
+	 */
+	public function getDescription(): string;
+
+	/**
 	 * Get the media query triggering this theme
 	 * Optional, ignored if falsy
 	 *
diff --git a/apps/theming/lib/Service/ThemesService.php b/apps/theming/lib/Service/ThemesService.php
index 832c443a2e1..8b39da6bb5d 100644
--- a/apps/theming/lib/Service/ThemesService.php
+++ b/apps/theming/lib/Service/ThemesService.php
@@ -23,18 +23,18 @@
 namespace OCA\Theming\Service;
 
 use OCA\Theming\AppInfo\Application;
-use OCA\Theming\Themes\DefaultTheme;
-use OCA\Theming\Themes\DarkTheme;
+use OCA\Theming\ITheme;
 use OCA\Theming\Themes\DarkHighContrastTheme;
+use OCA\Theming\Themes\DarkTheme;
+use OCA\Theming\Themes\DefaultTheme;
+use OCA\Theming\Themes\DyslexiaFont;
 use OCA\Theming\Themes\HighContrastTheme;
-use OCA\Theming\ITheme;
-use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\IUser;
 use OCP\IUserSession;
 
 class ThemesService {
-	private IUserSession $session;
+	private IUserSession $userSession;
 	private IConfig $config;
 
 	/** @var ITheme[] */
@@ -45,7 +45,8 @@ class ThemesService {
 								DefaultTheme $defaultTheme,
 								DarkTheme $darkTheme,
 								DarkHighContrastTheme $darkHighContrastTheme,
-								HighContrastTheme $highContrastTheme) {
+								HighContrastTheme $highContrastTheme,
+								DyslexiaFont $dyslexiaFont) {
 		$this->userSession = $userSession;
 		$this->config = $config;
 
@@ -53,28 +54,57 @@ class ThemesService {
 		$this->themesProviders = [
 			$defaultTheme->getId()			=> $defaultTheme,
 			$darkTheme->getId()				=> $darkTheme,
-			$darkHighContrastTheme->getId()	=> $darkHighContrastTheme,
 			$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;
 	}
 
-	public function getThemeVariables(string $id): array {
-		return $this->themesProviders[$id]->getCSSVariables();
-	}
-
+	/**
+	 * Enable a theme for the logged-in user
+	 * 
+	 * @param ITheme $theme the theme to enable
+	 */
 	public function enableTheme(ITheme $theme): void {
-		$themes = $this->getEnabledThemes();
-		array_push($themes, $theme->getId());
-		$this->setEnabledThemes($themes);
+		$themesIds = $this->getEnabledThemes();
+
+		/** @var ITheme[] */
+		$themes = array_map(function($themeId) {
+			return $this->getThemes()[$themeId];
+		}, $themesIds);
+
+		// Filtering all themes with the same type
+		$filteredThemes = array_filter($themes, function($t) use ($theme) {
+			return $theme->getType() === $t->getType();
+		});
+
+		// Disable all the other themes of the same type
+		// as there can only be one enabled at the same time
+		foreach ($filteredThemes as $t) {
+			$this->disableTheme($t);
+		}
+
+		$this->setEnabledThemes([...$this->getEnabledThemes(), $theme->getId()]);
 	}
 
+	/**
+	 * Disable a theme for the logged-in user
+	 * 
+	 * @param ITheme $theme the theme to disable
+	 */
 	public function disableTheme(ITheme $theme): void {
 		// Using keys as it's faster
 		$themes = $this->getEnabledThemes();
+
 		// If enabled, removing it
 		if (in_array($theme->getId(), $themes)) {
 			$this->setEnabledThemes(array_filter($themes, function($themeId) use ($theme) {
@@ -83,6 +113,12 @@ class ThemesService {
 		}
 	}
 
+	/**
+	 * 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) {
@@ -92,12 +128,27 @@ class ThemesService {
 		}
 	}
 
+	/**
+	 * Get the list of all enabled themes IDs
+	 * for the logged-in user
+	 * 
+	 * @return string[]
+	 */
 	public function getEnabledThemes(): array {
 		$user = $this->userSession->getUser();
-		$enabledThemes = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'enabled-themes', '[]');
-		return json_decode($enabledThemes);
+		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($themes)));
diff --git a/apps/theming/lib/Settings/Admin.php b/apps/theming/lib/Settings/Admin.php
index 045f0b3fe77..6caa174d99b 100644
--- a/apps/theming/lib/Settings/Admin.php
+++ b/apps/theming/lib/Settings/Admin.php
@@ -36,22 +36,20 @@ use OCP\IURLGenerator;
 use OCP\Settings\IDelegatedSettings;
 
 class Admin implements IDelegatedSettings {
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	private $l;
-	/** @var ThemingDefaults */
-	private $themingDefaults;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var ImageManager */
-	private $imageManager;
+	private string $appName;
+	private IConfig $config;
+	private IL10N $l;
+	private ThemingDefaults $themingDefaults;
+	private IURLGenerator $urlGenerator;
+	private ImageManager $imageManager;
 
-	public function __construct(IConfig $config,
+	public function __construct(string $appName,
+								IConfig $config,
 								IL10N $l,
 								ThemingDefaults $themingDefaults,
 								IURLGenerator $urlGenerator,
 								ImageManager $imageManager) {
+		$this->appName = $appName;
 		$this->config = $config;
 		$this->l = $l;
 		$this->themingDefaults = $themingDefaults;
@@ -86,14 +84,14 @@ class Admin implements IDelegatedSettings {
 			'privacyUrl' => $this->themingDefaults->getPrivacyUrl(),
 		];
 
-		return new TemplateResponse('theming', 'settings-admin', $parameters, '');
+		return new TemplateResponse($this->appName, 'settings-admin', $parameters, '');
 	}
 
 	/**
 	 * @return string the section ID, e.g. 'sharing'
 	 */
 	public function getSection(): string {
-		return 'theming';
+		return $this->appName;
 	}
 
 	/**
@@ -113,7 +111,7 @@ class Admin implements IDelegatedSettings {
 
 	public function getAuthorizedAppConfig(): array {
 		return [
-			'theming' => '/.*/',
+			$this->appName => '/.*/',
 		];
 	}
 }
diff --git a/apps/theming/lib/Settings/Section.php b/apps/theming/lib/Settings/AdminSection.php
index fe2cc9243bb..2fcc81a9279 100644
--- a/apps/theming/lib/Settings/Section.php
+++ b/apps/theming/lib/Settings/AdminSection.php
@@ -26,17 +26,13 @@ use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
 
-class Section implements IIconSection {
-	/** @var IL10N */
-	private $l;
-	/** @var IURLGenerator */
-	private $url;
+class AdminSection implements IIconSection {
+	private string $appName;
+	private IL10N $l;
+	private IURLGenerator $url;
 
-	/**
-	 * @param IURLGenerator $url
-	 * @param IL10N $l
-	 */
-	public function __construct(IURLGenerator $url, IL10N $l) {
+	public function __construct(string $appName, IURLGenerator $url, IL10N $l) {
+		$this->appName = $appName;
 		$this->url = $url;
 		$this->l = $l;
 	}
@@ -48,7 +44,7 @@ class Section implements IIconSection {
 	 * @returns string
 	 */
 	public function getID() {
-		return 'theming';
+		return $this->appName;
 	}
 
 	/**
@@ -76,6 +72,6 @@ class Section implements IIconSection {
 	 * {@inheritdoc}
 	 */
 	public function getIcon() {
-		return $this->url->imagePath('theming', 'app-dark.svg');
+		return $this->url->imagePath($this->appName, 'app-dark.svg');
 	}
 }
diff --git a/apps/theming/lib/Settings/Personal.php b/apps/theming/lib/Settings/Personal.php
new file mode 100644
index 00000000000..6dd865b9cf6
--- /dev/null
+++ b/apps/theming/lib/Settings/Personal.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
+ * @copyright Copyright (c) 2019 Janis Köhr <janiskoehr@icloud.com>
+ *
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Theming\Settings;
+
+use OCA\Theming\Service\ThemesService;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Services\IInitialState;
+use OCP\IConfig;
+use OCP\IUserSession;
+use OCP\Settings\ISettings;
+use OCP\Util;
+
+class Personal implements ISettings {
+
+	protected string $appName;
+	private IConfig $config;
+	private IUserSession $userSession;
+	private ThemesService $themesService;
+	private IInitialState $initialStateService;
+
+	public function __construct(string $appName,
+								IConfig $config,
+								IUserSession $userSession,
+								ThemesService $themesService,
+								IInitialState $initialStateService) {
+		$this->appName = $appName;
+		$this->config = $config;
+		$this->userSession = $userSession;
+		$this->themesService = $themesService;
+		$this->initialStateService = $initialStateService;
+	}
+
+	public function getForm(): TemplateResponse {
+		$themes = array_map(function($theme) {
+			return [
+				'id' => $theme->getId(),
+				'type' => $theme->getType(),
+				'title' => $theme->getTitle(),
+				'enableLabel' => $theme->getEnableLabel(),
+				'description' => $theme->getDescription(),
+				'enabled' => $this->themesService->isEnabled($theme),
+			];
+		}, $this->themesService->getThemes());
+
+		$this->initialStateService->provideInitialState('themes', array_values($themes));
+		Util::addScript($this->appName, 'theming-settings');
+
+		return new TemplateResponse($this->appName, 'settings-personal');
+	}
+
+	/**
+	 * @return string the section ID, e.g. 'sharing'
+	 * @since 9.1
+	 */
+	public function getSection(): string {
+		return $this->appName;
+	}
+
+	/**
+	 * @return int whether the form should be rather on the top or bottom of
+	 * the admin section. The forms are arranged in ascending order of the
+	 * priority values. It is required to return a value between 0 and 100.
+	 *
+	 * E.g.: 70
+	 * @since 9.1
+	 */
+	public function getPriority(): int {
+		return 40;
+	}
+}
diff --git a/apps/theming/lib/Settings/PersonalSection.php b/apps/theming/lib/Settings/PersonalSection.php
new file mode 100644
index 00000000000..821708e3970
--- /dev/null
+++ b/apps/theming/lib/Settings/PersonalSection.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Theming\Settings;
+
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\Settings\IIconSection;
+
+class PersonalSection implements IIconSection {
+
+	/** @var string */
+	protected $appName;
+
+	/** @var IURLGenerator */
+	private $urlGenerator;
+
+	/** @var IL10N */
+	private $l;
+
+	/**
+	 * Personal Section constructor.
+	 *
+	 * @param string $appName
+	 * @param IURLGenerator $urlGenerator
+	 * @param IL10N $l
+	 */
+	public function __construct(string $appName,
+								IURLGenerator $urlGenerator,
+								IL10N $l) {
+		$this->appName = $appName;
+		$this->urlGenerator = $urlGenerator;
+		$this->l = $l;
+	}
+
+	/**
+	 * returns the relative path to an 16*16 icon describing the section.
+	 * e.g. '/core/img/places/files.svg'
+	 *
+	 * @returns string
+	 * @since 13.0.0
+	 */
+	public function getIcon() {
+		return $this->urlGenerator->imagePath($this->appName, 'app-dark.svg');
+	}
+
+	/**
+	 * returns the ID of the section. It is supposed to be a lower case string,
+	 * e.g. 'ldap'
+	 *
+	 * @returns string
+	 * @since 9.1
+	 */
+	public function getID() {
+		return $this->appName;
+	}
+
+	/**
+	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+	 * integration'. Use the L10N service to translate it.
+	 *
+	 * @return string
+	 * @since 9.1
+	 */
+	public function getName() {
+		return $this->l->t('Appearance and accessibility');
+	}
+
+	/**
+	 * @return int whether the form should be rather on the top or bottom of
+	 * the settings navigation. The sections are arranged in ascending order of
+	 * the priority values. It is required to return a value between 0 and 99.
+	 *
+	 * E.g.: 70
+	 * @since 9.1
+	 */
+	public function getPriority() {
+		return 15;
+	}
+}
diff --git a/apps/theming/lib/Themes/DarkHighContrastTheme.php b/apps/theming/lib/Themes/DarkHighContrastTheme.php
index 1f00990c7de..8d0b134c75f 100644
--- a/apps/theming/lib/Themes/DarkHighContrastTheme.php
+++ b/apps/theming/lib/Themes/DarkHighContrastTheme.php
@@ -36,6 +36,18 @@ class DarkHighContrastTheme extends HighContrastTheme implements ITheme {
 		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 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 getCSSVariables(): array {
 		$variables = parent::getCSSVariables();
 
diff --git a/apps/theming/lib/Themes/DarkTheme.php b/apps/theming/lib/Themes/DarkTheme.php
index b7ec16aa56b..c00f8a7ea4d 100644
--- a/apps/theming/lib/Themes/DarkTheme.php
+++ b/apps/theming/lib/Themes/DarkTheme.php
@@ -36,6 +36,18 @@ class DarkTheme extends DefaultTheme implements ITheme {
 		return '(prefers-color-scheme: dark)';
 	}
 
+	public function getTitle(): string {
+		return $this->l->t('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 getCSSVariables(): array {
 		$defaultVariables = parent::getCSSVariables();
 
diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php
index 990b011bae9..3b194a36546 100644
--- a/apps/theming/lib/Themes/DefaultTheme.php
+++ b/apps/theming/lib/Themes/DefaultTheme.php
@@ -29,6 +29,7 @@ use OCA\Theming\ThemingDefaults;
 use OCA\Theming\Util;
 use OCA\Theming\ITheme;
 use OCP\IConfig;
+use OCP\IL10N;
 use OCP\IURLGenerator;
 
 class DefaultTheme implements ITheme {
@@ -37,6 +38,7 @@ class DefaultTheme implements ITheme {
 	public IURLGenerator $urlGenerator;
 	public ImageManager $imageManager;
 	public IConfig $config;
+	public IL10N $l;
 
 	public string $primaryColor;
 
@@ -44,12 +46,14 @@ class DefaultTheme implements ITheme {
 								ThemingDefaults $themingDefaults,
 								IURLGenerator $urlGenerator,
 								ImageManager $imageManager,
-								IConfig $config) {
+								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();
 	}
@@ -58,6 +62,22 @@ class DefaultTheme implements ITheme {
 		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 '';
 	}
diff --git a/apps/theming/lib/Themes/DyslexiaFont.php b/apps/theming/lib/Themes/DyslexiaFont.php
new file mode 100644
index 00000000000..460147b9fa3
--- /dev/null
+++ b/apps/theming/lib/Themes/DyslexiaFont.php
@@ -0,0 +1,75 @@
+<?php
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2022 Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Theming\Themes;
+
+use OCA\Theming\ITheme;
+
+class DyslexiaFont extends DefaultTheme implements ITheme {
+
+	public function getId(): string {
+		return 'opendyslexic';
+	}
+
+	public function getType(): int {
+		return ITheme::TYPE_FONT;
+	}
+
+	public function getTitle(): string {
+		return $this->l->t('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 getCSSVariables(): array {
+		$variables = parent::getCSSVariables();
+		$originalFontFace = $variables['--font-face'];
+
+		$variables = [
+			'--font-face' => 'OpenDyslexic, ' . $originalFontFace
+		];
+
+		return $variables;
+	}
+}
+
+// @font-face {
+// 	font-family: 'OpenDyslexic';
+// 	font-style: normal;
+// 	font-weight: 400;
+// 	src: url('../fonts/OpenDyslexic-Regular.woff') format('woff');
+// }
+
+// @font-face {
+// 	font-family: 'OpenDyslexic';
+// 	font-style: normal;
+// 	font-weight: 700;
+// 	src: url('../fonts/OpenDyslexic-Bold.woff') format('woff');
+// }
diff --git a/apps/theming/lib/Themes/HighContrastTheme.php b/apps/theming/lib/Themes/HighContrastTheme.php
index cae7cc5be98..67276e4ef00 100644
--- a/apps/theming/lib/Themes/HighContrastTheme.php
+++ b/apps/theming/lib/Themes/HighContrastTheme.php
@@ -36,6 +36,18 @@ class HighContrastTheme extends DefaultTheme implements ITheme {
 		return '(prefers-contrast: more)';
 	}
 
+	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 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();