Add system/light themes

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

3 files changed, 17 insertions, 3 deletions

diff --git a/apps/theming/tests/Controller/UserThemeControllerTest.php b/apps/theming/tests/Controller/UserThemeControllerTest.php
index b925085bf41..952cd012210 100644
--- a/apps/theming/tests/Controller/UserThemeControllerTest.php
+++ b/apps/theming/tests/Controller/UserThemeControllerTest.php
@@ -30,6 +30,7 @@ use OCA\Theming\Themes\DefaultTheme;
 use OCA\Theming\Themes\DyslexiaFont;
 use OCA\Theming\Themes\HighContrastTheme;
 use OCA\Theming\Service\ThemesService;
+use OCA\Theming\Themes\LightTheme;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\IConfig;
@@ -63,6 +64,7 @@ class UserThemeControllerTest extends TestCase {
 
 		$this->themes = [
 			'default' => $this->createMock(DefaultTheme::class),
+			'light' => $this->createMock(LightTheme::class),
 			'dark' => $this->createMock(DarkTheme::class),
 			'highcontrast' => $this->createMock(HighContrastTheme::class),
 			'dark-highcontrast' => $this->createMock(DarkHighContrastTheme::class),
@@ -91,6 +93,7 @@ class UserThemeControllerTest extends TestCase {
 	public function dataTestThemes() {
 		return [
 			['default'],
+			['light'],
 			['dark'],
 			['highcontrast'],
 			['dark-highcontrast'],
diff --git a/apps/theming/tests/Service/ThemesServiceTest.php b/apps/theming/tests/Service/ThemesServiceTest.php
index 56f96d29637..5865875cbb8 100644
--- a/apps/theming/tests/Service/ThemesServiceTest.php
+++ b/apps/theming/tests/Service/ThemesServiceTest.php
@@ -31,6 +31,7 @@ use OCA\Theming\Themes\DefaultTheme;
 use OCA\Theming\Themes\DyslexiaFont;
 use OCA\Theming\Themes\HighContrastTheme;
 use OCA\Theming\Service\ThemesService;
+use OCA\Theming\Themes\LightTheme;
 use OCA\Theming\ThemingDefaults;
 use OCA\Theming\Util;
 use OCP\AppFramework\Http\DataResponse;
@@ -81,6 +82,7 @@ class ThemesServiceTest extends TestCase {
 	public function testGetThemes() {
 		$expected = [
 			'default',
+			'light',
 			'dark',
 			'highcontrast',
 			'dark-highcontrast',
@@ -92,6 +94,7 @@ class ThemesServiceTest extends TestCase {
 
 	public function dataTestEnableTheme() {
 		return [
+			['default', [], ['default']],
 			['dark', [], ['dark']],
 			['dark', ['dark'], ['dark']],
 			['opendyslexic', ['dark'], ['dark', 'opendyslexic']],
@@ -207,6 +210,14 @@ class ThemesServiceTest extends TestCase {
 				$this->config,
 				$l10n,
 			),
+			'light' => new LightTheme(
+				$util,
+				$this->themingDefaults,
+				$urlGenerator,
+				$imageManager,
+				$this->config,
+				$l10n,
+			),
 			'dark' => new DarkTheme(
 				$util,
 				$this->themingDefaults,
diff --git a/apps/theming/tests/Themes/DefaultThemeTest.php b/apps/theming/tests/Themes/DefaultThemeTest.php
index b9302bb4c95..160efdba142 100644
--- a/apps/theming/tests/Themes/DefaultThemeTest.php
+++ b/apps/theming/tests/Themes/DefaultThemeTest.php
@@ -97,15 +97,15 @@ class DefaultThemeTest extends TestCase {
 	}
 
 	public function testGetTitle() {
-		$this->assertEquals('Light theme', $this->defaultTheme->getTitle());
+		$this->assertEquals('System default theme', $this->defaultTheme->getTitle());
 	}
 
 	public function testGetEnableLabel() {
-		$this->assertEquals('Enable the default light theme', $this->defaultTheme->getEnableLabel());
+		$this->assertEquals('Enable the system default', $this->defaultTheme->getEnableLabel());
 	}
 
 	public function testGetDescription() {
-		$this->assertEquals('The default light appearance.', $this->defaultTheme->getDescription());
+		$this->assertEquals('Using the default system appearance.', $this->defaultTheme->getDescription());
 	}
 
 	public function testGetMediaQuery() {