From 00956c00b240789ad29289b9c100c237b1843e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 7 Nov 2017 12:31:23 +0100
Subject: [PATCH] Theming: expose element color though capabilities API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/theming/lib/Capabilities.php       | 7 ++++---
 apps/theming/lib/Util.php               | 3 +--
 apps/theming/tests/CapabilitiesTest.php | 3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/theming/lib/Capabilities.php b/apps/theming/lib/Capabilities.php
index bb06ab107e..b43779a27b 100644
--- a/apps/theming/lib/Capabilities.php
+++ b/apps/theming/lib/Capabilities.php
@@ -68,14 +68,15 @@ class Capabilities implements IPublicCapability {
 	 */
 	public function getCapabilities() {
 		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', false);
-
+		$color = $this->theming->getColorPrimary();
 		return [
 			'theming' => [
 				'name' => $this->theming->getName(),
 				'url' => $this->theming->getBaseUrl(),
 				'slogan' => $this->theming->getSlogan(),
-				'color' => $this->theming->getColorPrimary(),
-				'color-text' => $this->util->invertTextColor($this->theming->getColorPrimary()) ? '#000000' : '#FFFFFF',
+				'color' => $color,
+				'color-text' => $this->util->invertTextColor($color) ? '#000000' : '#FFFFFF',
+				'color-element' => $this->util->elementColor($color),
 				'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()),
 				'background' => $backgroundLogo === 'backgroundColor' ?
 					$this->theming->getColorPrimary() :
diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
index 5d0eba49ec..194b5eeb0d 100644
--- a/apps/theming/lib/Util.php
+++ b/apps/theming/lib/Util.php
@@ -81,9 +81,8 @@ class Util {
 		$l = $this->calculateLuminance($color);
 		if($l>0.8) {
 			return '#555555';
-		} else {
-			return $color;
 		}
+		return $color;
 	}
 
 	/**
diff --git a/apps/theming/tests/CapabilitiesTest.php b/apps/theming/tests/CapabilitiesTest.php
index d042265213..17fc253fa4 100644
--- a/apps/theming/tests/CapabilitiesTest.php
+++ b/apps/theming/tests/CapabilitiesTest.php
@@ -71,6 +71,7 @@ class CapabilitiesTest extends TestCase  {
 				'slogan' => 'slogan',
 				'color' => '#FFFFFF',
 				'color-text' => '#000000',
+				'color-element' => '#555555',
 				'logo' => 'http://absolute/logo',
 				'background' => 'http://absolute/background',
 			]],
@@ -80,6 +81,7 @@ class CapabilitiesTest extends TestCase  {
 				'slogan' => 'slogan3',
 				'color' => '#01e4a0',
 				'color-text' => '#FFFFFF',
+				'color-element' => '#01e4a0',
 				'logo' => 'http://localhost/logo5',
 				'background' => 'http://localhost/background6',
 			]],
@@ -89,6 +91,7 @@ class CapabilitiesTest extends TestCase  {
 				'slogan' => 'slogan3',
 				'color' => '#000000',
 				'color-text' => '#FFFFFF',
+				'color-element' => '#000000',
 				'logo' => 'http://localhost/logo5',
 				'background' => '#000000',
 			]],