fix highcontrast theme icons

Signed-off-by: szaimen <szaimen@e.mail.de>

diff --git a/apps/theming/lib/Themes/HighContrastTheme.php b/apps/theming/lib/Themes/HighContrastTheme.php
index c7d3b2e8c7f548aa99be77c4f52c74693ffb1838..fda02058446cef10b6e8b9d9ce558b196c1031e1 100644 (file)
--- a/apps/theming/lib/Themes/HighContrastTheme.php
+++ b/apps/theming/lib/Themes/HighContrastTheme.php
@@ -29,7 +29,7 @@ use OCA\Theming\ITheme;
 class HighContrastTheme extends DefaultTheme implements ITheme {
 
        public function getId(): string {
-               return 'highcontrast';
+               return 'light-highcontrast';
        }
 
        public function getMediaQuery(): string {

diff --git a/apps/theming/tests/Controller/UserThemeControllerTest.php b/apps/theming/tests/Controller/UserThemeControllerTest.php
index ffacf5108a567a9e2740033c792480744d054002..a6f73a087fc6f61421367861acf097d61887dc3c 100644 (file)
--- a/apps/theming/tests/Controller/UserThemeControllerTest.php
+++ b/apps/theming/tests/Controller/UserThemeControllerTest.php
@@ -72,7 +72,7 @@ class UserThemeControllerTest extends TestCase {
                        'default' => $this->createMock(DefaultTheme::class),
                        'light' => $this->createMock(LightTheme::class),
                        'dark' => $this->createMock(DarkTheme::class),
-                       'highcontrast' => $this->createMock(HighContrastTheme::class),
+                       'light-highcontrast' => $this->createMock(HighContrastTheme::class),
                        'dark-highcontrast' => $this->createMock(DarkHighContrastTheme::class),
                        'opendyslexic' => $this->createMock(DyslexiaFont::class),
                ];
@@ -102,7 +102,7 @@ class UserThemeControllerTest extends TestCase {
                        ['default'],
                        ['light'],
                        ['dark'],
-                       ['highcontrast'],
+                       ['light-highcontrast'],
                        ['dark-highcontrast'],
                        ['opendyslexic'],
                        ['', OCSBadRequestException::class],

diff --git a/apps/theming/tests/Service/ThemesServiceTest.php b/apps/theming/tests/Service/ThemesServiceTest.php
index 90816ae23282f45736dfc75fea367a188b565787..3be8881669a828c3fc448054571767fea0f1a232 100644 (file)
--- a/apps/theming/tests/Service/ThemesServiceTest.php
+++ b/apps/theming/tests/Service/ThemesServiceTest.php
@@ -84,7 +84,7 @@ class ThemesServiceTest extends TestCase {
                        'default',
                        'light',
                        'dark',
-                       'highcontrast',
+                       'light-highcontrast',
                        'dark-highcontrast',
                        'opendyslexic',
                ];
@@ -98,7 +98,7 @@ class ThemesServiceTest extends TestCase {
                        ['dark', [], ['dark']],
                        ['dark', ['dark'], ['dark']],
                        ['opendyslexic', ['dark'], ['dark', 'opendyslexic']],
-                       ['dark', ['highcontrast', 'opendyslexic'], ['opendyslexic', 'dark']],
+                       ['dark', ['light-highcontrast', 'opendyslexic'], ['opendyslexic', 'dark']],
                ];
        }
 
@@ -132,7 +132,7 @@ class ThemesServiceTest extends TestCase {
                        ['dark', [], []],
                        ['dark', ['dark'], []],
                        ['opendyslexic', ['dark', 'opendyslexic'], ['dark'], ],
-                       ['highcontrast', ['opendyslexic'], ['opendyslexic']],
+                       ['light-highcontrast', ['opendyslexic'], ['opendyslexic']],
                ];
        }
 
@@ -167,7 +167,7 @@ class ThemesServiceTest extends TestCase {
                        ['dark', [], false],
                        ['dark', ['dark'], true],
                        ['opendyslexic', ['dark', 'opendyslexic'], true],
-                       ['highcontrast', ['opendyslexic'], false],
+                       ['light-highcontrast', ['opendyslexic'], false],
                ];
        }
 
@@ -302,7 +302,7 @@ class ThemesServiceTest extends TestCase {
                                $this->config,
                                $l10n,
                        ),
-                       'highcontrast' => new HighContrastTheme(
+                       'light-highcontrast' => new HighContrastTheme(
                                $util,
                                $this->themingDefaults,
                                $urlGenerator,

diff --git a/apps/theming/tests/Settings/PersonalTest.php b/apps/theming/tests/Settings/PersonalTest.php
index 3051a210353ecd098c4080cfdc8e06ac8e04dd5c..8e121c0a057419e8c3314da25bbe8eff3999ce97 100644 (file)
--- a/apps/theming/tests/Settings/PersonalTest.php
+++ b/apps/theming/tests/Settings/PersonalTest.php
@@ -83,7 +83,7 @@ class PersonalTest extends TestCase {
                                $this->formatThemeForm('default'),
                                $this->formatThemeForm('light'),
                                $this->formatThemeForm('dark'),
-                               $this->formatThemeForm('highcontrast'),
+                               $this->formatThemeForm('light-highcontrast'),
                                $this->formatThemeForm('dark-highcontrast'),
                                $this->formatThemeForm('opendyslexic'),
                        ]],
@@ -162,7 +162,7 @@ class PersonalTest extends TestCase {
                                $config,
                                $l10n,
                        ),
-                       'highcontrast' => new HighContrastTheme(
+                       'light-highcontrast' => new HighContrastTheme(
                                $util,
                                $themingDefaults,
                                $urlGenerator,