-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
[stable28] fix(theming): Adjust high contrast theme to fulfill WCAG AAA text contrast #42491
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+173
−3
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2022 John Molakvoæ <[email protected]> | ||
| * | ||
| * @author John Molakvoæ <[email protected]> | ||
| * | ||
| * @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\Tests\Themes; | ||
|
|
||
| use OCA\Theming\AppInfo\Application; | ||
| use OCA\Theming\ImageManager; | ||
| use OCA\Theming\ITheme; | ||
| use OCA\Theming\Service\BackgroundService; | ||
| use OCA\Theming\Themes\HighContrastTheme; | ||
| use OCA\Theming\ThemingDefaults; | ||
| use OCA\Theming\Util; | ||
| use OCP\App\IAppManager; | ||
| use OCP\Files\IAppData; | ||
| use OCP\IConfig; | ||
| use OCP\IL10N; | ||
| use OCP\IURLGenerator; | ||
| use OCP\IUserSession; | ||
| use PHPUnit\Framework\MockObject\MockObject; | ||
|
|
||
| class HighContrastThemeTest extends AccessibleThemeTestCase { | ||
| /** @var ThemingDefaults|MockObject */ | ||
| private $themingDefaults; | ||
| /** @var IUserSession|MockObject */ | ||
| private $userSession; | ||
| /** @var IURLGenerator|MockObject */ | ||
| private $urlGenerator; | ||
| /** @var ImageManager|MockObject */ | ||
| private $imageManager; | ||
| /** @var IConfig|MockObject */ | ||
| private $config; | ||
| /** @var IL10N|MockObject */ | ||
| private $l10n; | ||
| /** @var IAppManager|MockObject */ | ||
| private $appManager; | ||
|
|
||
| // !! important: Enable WCAG AAA tests | ||
| protected bool $WCAGaaa = true; | ||
|
|
||
| protected function setUp(): void { | ||
| $this->themingDefaults = $this->createMock(ThemingDefaults::class); | ||
| $this->userSession = $this->createMock(IUserSession::class); | ||
| $this->urlGenerator = $this->createMock(IURLGenerator::class); | ||
| $this->imageManager = $this->createMock(ImageManager::class); | ||
| $this->config = $this->createMock(IConfig::class); | ||
| $this->l10n = $this->createMock(IL10N::class); | ||
| $this->appManager = $this->createMock(IAppManager::class); | ||
|
|
||
| $this->util = new Util( | ||
| $this->config, | ||
| $this->appManager, | ||
| $this->createMock(IAppData::class), | ||
| $this->imageManager | ||
| ); | ||
|
|
||
| $this->themingDefaults | ||
| ->expects($this->any()) | ||
| ->method('getColorPrimary') | ||
| ->willReturn('#0082c9'); | ||
|
|
||
| $this->themingDefaults | ||
| ->expects($this->any()) | ||
| ->method('getDefaultColorPrimary') | ||
| ->willReturn('#0082c9'); | ||
|
|
||
| $this->themingDefaults | ||
| ->expects($this->any()) | ||
| ->method('getBackground') | ||
| ->willReturn('/apps/' . Application::APP_ID . '/img/background/' . BackgroundService::DEFAULT_BACKGROUND_IMAGE); | ||
|
|
||
| $this->l10n | ||
| ->expects($this->any()) | ||
| ->method('t') | ||
| ->willReturnCallback(function ($text, $parameters = []) { | ||
| return vsprintf($text, $parameters); | ||
| }); | ||
|
|
||
| $this->urlGenerator | ||
| ->expects($this->any()) | ||
| ->method('imagePath') | ||
| ->willReturnCallback(function ($app = 'core', $filename = '') { | ||
| return "/$app/img/$filename"; | ||
| }); | ||
|
|
||
| $this->theme = new HighContrastTheme( | ||
| $this->util, | ||
| $this->themingDefaults, | ||
| $this->userSession, | ||
| $this->urlGenerator, | ||
| $this->imageManager, | ||
| $this->config, | ||
| $this->l10n, | ||
| $this->appManager, | ||
| ); | ||
|
|
||
| parent::setUp(); | ||
| } | ||
|
|
||
|
|
||
| public function testGetId() { | ||
| $this->assertEquals('light-highcontrast', $this->theme->getId()); | ||
| } | ||
|
|
||
| public function testGetType() { | ||
| $this->assertEquals(ITheme::TYPE_THEME, $this->theme->getType()); | ||
| } | ||
|
|
||
| public function testGetTitle() { | ||
| $this->assertEquals('High contrast mode', $this->theme->getTitle()); | ||
| } | ||
|
|
||
| public function testGetEnableLabel() { | ||
| $this->assertEquals('Enable high contrast mode', $this->theme->getEnableLabel()); | ||
| } | ||
|
|
||
| public function testGetDescription() { | ||
| $this->assertEquals('A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased.', $this->theme->getDescription()); | ||
| } | ||
|
|
||
| public function testGetMediaQuery() { | ||
| $this->assertEquals('(prefers-contrast: more)', $this->theme->getMediaQuery()); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.