Merge pull request #43033 from nextcloud/fix/color-capabilities

fix(theming): Apply same logic on capabilities for primary color as done on themes
nextcloud · Jan 23, 2024 · 8ba7de8 · 8ba7de8
2 parents 2ac1d86 + 8de89b2
commit 8ba7de8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/apps/theming/lib/Capabilities.php b/apps/theming/lib/Capabilities.php
@@ -94,7 +94,11 @@ public function __construct(ThemingDefaults $theming, Util $util, IURLGenerator
 	 */
 	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 @@ public function getCapabilities() {
 			 * @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
@@ -174,9 +174,6 @@ public function testGetCapabilities($name, $url, $slogan, $color, $textColor, $l
 		$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 @@ public function testGetCapabilities($name, $url, $slogan, $color, $textColor, $l
 				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);