Fix logo invert

skjnldsv · skjnldsv · commit 975174a6bdcd · 2022-11-08T17:01:17.000+01:00
Signed-off-by: John Molakvoæ &lt;skjnldsv@protonmail.com&gt;
diff --git a/apps/theming/lib/Themes/CommonThemeTrait.php b/apps/theming/lib/Themes/CommonThemeTrait.php
@@ -84,7 +84,7 @@ protected function generatePrimaryVariables(string $colorMainBackground, string
 	protected function generateGlobalBackgroundVariables(): array {
 		$user = $this->userSession->getUser();
 		$backgroundDeleted = $this->config->getAppValue(Application::APP_ID, 'backgroundMime', '') === 'backgroundColor';
-		$hasCustomLogoHeader = $this->imageManager->hasImage('logo') || $this->imageManager->hasImage('logoheader');
+		$hasCustomLogoHeader = $this->util->isLogoThemed();
 
 		$variables = [];
 
diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
@@ -41,18 +41,13 @@ class Util {
 	private IConfig $config;
 	private IAppManager $appManager;
 	private IAppData $appData;
+	private ImageManager $imageManager;
 
-	/**
-	 * Util constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IAppManager $appManager
-	 * @param IAppData $appData
-	 */
-	public function __construct(IConfig $config, IAppManager $appManager, IAppData $appData) {
+	public function __construct(IConfig $config, IAppManager $appManager, IAppData $appData, ImageManager $imageManager) {
 		$this->config = $config;
 		$this->appManager = $appManager;
 		$this->appData = $appData;
+		$this->imageManager = $imageManager;
 	}
 
 	/**
@@ -266,4 +261,9 @@ public function isBackgroundThemed() {
 		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', '');
 		return $backgroundLogo !== '' && $backgroundLogo !== 'backgroundColor';
 	}
+
+	public function isLogoThemed() {
+		return $this->imageManager->hasImage('logo')
+			|| $this->imageManager->hasImage('logoheader');
+	}
 }
diff --git a/apps/theming/tests/CapabilitiesTest.php b/apps/theming/tests/CapabilitiesTest.php
@@ -29,6 +29,7 @@
 namespace OCA\Theming\Tests;
 
 use OCA\Theming\Capabilities;
+use OCA\Theming\ImageManager;
 use OCA\Theming\ThemingDefaults;
 use OCA\Theming\Util;
 use OCP\App\IAppManager;
@@ -173,7 +174,7 @@ public function testGetCapabilities($name, $url, $slogan, $color, $textColor, $l
 			->method('getTextColorPrimary')
 			->willReturn($textColor);
 
-		$util = new Util($this->config, $this->createMock(IAppManager::class), $this->createMock(IAppData::class));
+		$util = new Util($this->config, $this->createMock(IAppManager::class), $this->createMock(IAppData::class), $this->createMock(ImageManager::class));
 		$this->util->expects($this->exactly(3))
 			->method('elementColor')
 			->with($color)
diff --git a/apps/theming/tests/IconBuilderTest.php b/apps/theming/tests/IconBuilderTest.php
@@ -63,7 +63,7 @@ protected function setUp(): void {
 		$this->themingDefaults = $this->createMock(ThemingDefaults::class);
 		$this->appManager = $this->createMock(IAppManager::class);
 		$this->imageManager = $this->createMock(ImageManager::class);
-		$this->util = new Util($this->config, $this->appManager, $this->appData);
+		$this->util = new Util($this->config, $this->appManager, $this->appData, $this->imageManager);
 		$this->iconBuilder = new IconBuilder($this->themingDefaults, $this->util, $this->imageManager);
 	}
 
diff --git a/apps/theming/tests/Themes/DefaultThemeTest.php b/apps/theming/tests/Themes/DefaultThemeTest.php
@@ -66,7 +66,8 @@ protected function setUp(): void {
 		$util = new Util(
 			$this->config,
 			$this->appManager,
-			$this->createMock(IAppData::class)
+			$this->createMock(IAppData::class),
+			$this->imageManager
 		);
 
 		$this->themingDefaults
diff --git a/apps/theming/tests/Themes/DyslexiaFontTest.php b/apps/theming/tests/Themes/DyslexiaFontTest.php
@@ -67,8 +67,9 @@ protected function setUp(): void {
 
 		$util = new Util(
 			$this->config,
-			$this->createMock(AppManager::class),
-			$this->createMock(IAppData::class)
+			$this->appManager,
+			$this->createMock(IAppData::class),
+			$this->imageManager
 		);
 
 		$userSession = $this->createMock(IUserSession::class);
diff --git a/apps/theming/tests/UtilTest.php b/apps/theming/tests/UtilTest.php
@@ -27,6 +27,7 @@
  */
 namespace OCA\Theming\Tests;
 
+use OCA\Theming\ImageManager;
 use OCA\Theming\Util;
 use OCP\App\IAppManager;
 use OCP\Files\IAppData;
@@ -46,13 +47,16 @@ class UtilTest extends TestCase {
 	protected $appData;
 	/** @var IAppManager */
 	protected $appManager;
+	/** @var ImageManager */
+	protected $imageManager;
 
 	protected function setUp(): void {
 		parent::setUp();
 		$this->config = $this->createMock(IConfig::class);
 		$this->appData = $this->createMock(IAppData::class);
 		$this->appManager = $this->createMock(IAppManager::class);
-		$this->util = new Util($this->config, $this->appManager, $this->appData);
+		$this->imageManager = $this->createMock(ImageManager::class);
+		$this->util = new Util($this->config, $this->appManager, $this->appData, $this->imageManager);
 	}
 
 	public function dataInvertTextColor() {
diff --git a/core/css/header.css b/core/css/header.css
diff --git a/core/css/header.css.map b/core/css/header.css.map
diff --git a/core/css/header.scss b/core/css/header.scss
@@ -172,6 +172,8 @@
 		left: 12px;
 		top: 1px;
 		bottom: 1px;
+		// Invert if not customized
+		filter: var(--image-logoheader-custom, invert(100%));
 	}
 
 	.header-appname-container {
diff --git a/core/css/server.css b/core/css/server.css
diff --git a/core/css/server.css.map b/core/css/server.css.map
diff --git a/lib/private/Server.php b/lib/private/Server.php
@@ -1209,21 +1209,22 @@ public function __construct($webRoot, \OC\Config $config) {
 			}
 
 			if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValue('installed', false) && $c->get(IAppManager::class)->isInstalled('theming') && $c->getTrustedDomainHelper()->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
+				$imageManager = new ImageManager(
+					$c->get(\OCP\IConfig::class),
+					$c->getAppDataDir('theming'),
+					$c->get(IURLGenerator::class),
+					$this->get(ICacheFactory::class),
+					$this->get(ILogger::class),
+					$this->get(ITempManager::class)
+				);
 				return new ThemingDefaults(
 					$c->get(\OCP\IConfig::class),
 					$c->getL10N('theming'),
 					$c->get(IUserSession::class),
 					$c->get(IURLGenerator::class),
 					$c->get(ICacheFactory::class),
-					new Util($c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming')),
-					new ImageManager(
-						$c->get(\OCP\IConfig::class),
-						$c->getAppDataDir('theming'),
-						$c->get(IURLGenerator::class),
-						$this->get(ICacheFactory::class),
-						$this->get(ILogger::class),
-						$this->get(ITempManager::class)
-					),
+					new Util($c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming'), $imageManager),
+					$imageManager,
 					$c->get(IAppManager::class),
 					$c->get(INavigationManager::class)
 				);

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ protected function setUp(): void {`
`63`	`63`	`$this->themingDefaults = $this->createMock(ThemingDefaults::class);`
`64`	`64`	`$this->appManager = $this->createMock(IAppManager::class);`
`65`	`65`	`$this->imageManager = $this->createMock(ImageManager::class);`
`66`		`- $this->util = new Util($this->config, $this->appManager, $this->appData);`
	`66`	`+ $this->util = new Util($this->config, $this->appManager, $this->appData, $this->imageManager);`
`67`	`67`	`$this->iconBuilder = new IconBuilder($this->themingDefaults, $this->util, $this->imageManager);`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,8 @@`
`172`	`172`	`left: 12px;`
`173`	`173`	`top: 1px;`
`174`	`174`	`bottom: 1px;`
	`175`	`+ // Invert if not customized`
	`176`	`+ filter: var(--image-logoheader-custom, invert(100%));`
`175`	`177`	`}`
`176`	`178`
`177`	`179`	`.header-appname-container {`