diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/theming/lib/Capabilities.php | 11 | ||||
| -rw-r--r-- | apps/theming/tests/CapabilitiesTest.php | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/apps/theming/lib/Capabilities.php b/apps/theming/lib/Capabilities.php index e19665ffb31..b0c6a71731b 100644 --- a/apps/theming/lib/Capabilities.php +++ b/apps/theming/lib/Capabilities.php @@ -94,7 +94,11 @@ class Capabilities implements IPublicCapability { */ public function getCapabilities() { $color = $this->theming->getDefaultColorPrimary(); - $colorText = $this->theming->getDefaultTextColorPrimary(); + // Same as in DefaultTheme + if ($color === BackgroundService::DEFAULT_COLOR) { + $color = BackgroundService::DEFAULT_ACCESSIBLE_COLOR; + } + $colorText = $this->util->invertTextColor($color) ? '#000000' : '#ffffff'; $backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', ''); $backgroundPlain = $backgroundLogo === 'backgroundColor' || ($backgroundLogo === '' && $color !== '#0082c9'); @@ -108,7 +112,10 @@ class Capabilities implements IPublicCapability { * @see \OCA\Theming\Themes\CommonThemeTrait::generateUserBackgroundVariables() */ $color = $this->theming->getColorPrimary(); - $colorText = $this->theming->getTextColorPrimary(); + if ($color === BackgroundService::DEFAULT_COLOR) { + $color = BackgroundService::DEFAULT_ACCESSIBLE_COLOR; + } + $colorText = $this->util->invertTextColor($color) ? '#000000' : '#ffffff'; $backgroundImage = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'background_image', BackgroundService::BACKGROUND_DEFAULT); if ($backgroundImage === BackgroundService::BACKGROUND_CUSTOM) { diff --git a/apps/theming/tests/CapabilitiesTest.php b/apps/theming/tests/CapabilitiesTest.php index 932cbe4a111..566380b3237 100644 --- a/apps/theming/tests/CapabilitiesTest.php +++ b/apps/theming/tests/CapabilitiesTest.php @@ -174,9 +174,6 @@ class CapabilitiesTest extends TestCase { $this->theming->expects($this->exactly(3)) ->method('getLogo') ->willReturn($logo); - $this->theming->expects($this->once()) - ->method('getDefaultTextColorPrimary') - ->willReturn($textColor); $util = new Util($this->config, $this->createMock(IAppManager::class), $this->createMock(IAppData::class), $this->createMock(ImageManager::class)); $this->util->expects($this->exactly(3)) @@ -186,6 +183,9 @@ class CapabilitiesTest extends TestCase { return $util->elementColor($color, $brightBackground); }); + $this->util->expects($this->any()) + ->method('invertTextColor') + ->willReturnCallback(fn () => $textColor === '#000000'); $this->util->expects($this->once()) ->method('isBackgroundThemed') ->willReturn($backgroundThemed); |