rename confusing getMailHeaderColor to getColorPrimary, ref #3491

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>

5 files changed, 9 insertions, 9 deletions

diff --git a/apps/theming/lib/Capabilities.php b/apps/theming/lib/Capabilities.php
index b483cc80aed..2a9e9a3c6cf 100644
--- a/apps/theming/lib/Capabilities.php
+++ b/apps/theming/lib/Capabilities.php
@@ -60,7 +60,7 @@ class Capabilities implements ICapability {
 				'name' => $this->theming->getName(),
 				'url' => $this->theming->getBaseUrl(),
 				'slogan' => $this->theming->getSlogan(),
-				'color' => $this->theming->getMailHeaderColor(),
+				'color' => $this->theming->getColorPrimary(),
 				'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()),
 				'background' => $this->url->getAbsoluteURL($this->theming->getBackground()),
 			],
diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index 2aa79df2464..093134e6c5e 100644
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -451,8 +451,8 @@ class ThemingController extends Controller {
 		name: ' . json_encode($this->template->getName()) . ',
 		url: ' . json_encode($this->template->getBaseUrl()) . ',
 		slogan: ' . json_encode($this->template->getSlogan()) . ',
-		color: ' . json_encode($this->template->getMailHeaderColor()) . ',
-		inverted: ' . json_encode($this->util->invertTextColor($this->template->getMailHeaderColor())) . ',
+		color: ' . json_encode($this->template->getColorPrimary()) . ',
+		inverted: ' . json_encode($this->util->invertTextColor($this->template->getColorPrimary())) . ',
 		cacheBuster: ' . json_encode($cacheBusterValue). '
 	};
 })();';
diff --git a/apps/theming/lib/IconBuilder.php b/apps/theming/lib/IconBuilder.php
index 39a7722f0a5..7db24c4a2b0 100644
--- a/apps/theming/lib/IconBuilder.php
+++ b/apps/theming/lib/IconBuilder.php
@@ -97,7 +97,7 @@ class IconBuilder {
 			return false;
 		}
 
-		$color = $this->themingDefaults->getMailHeaderColor();
+		$color = $this->themingDefaults->getColorPrimary();
 		$mime = mime_content_type($appIcon);
 
 		// generate background image with rounded corners
@@ -178,7 +178,7 @@ class IconBuilder {
 		}
 		$svg = file_get_contents($imageFile);
 		if ($svg !== false && $svg !== "") {
-			$color = $this->util->elementColor($this->themingDefaults->getMailHeaderColor());
+			$color = $this->util->elementColor($this->themingDefaults->getColorPrimary());
 			$svg = $this->util->colorizeSvg($svg, $color);
 			return $svg;
 		} else {
diff --git a/apps/theming/lib/Settings/Admin.php b/apps/theming/lib/Settings/Admin.php
index 22ab5650e5b..c8074f386af 100644
--- a/apps/theming/lib/Settings/Admin.php
+++ b/apps/theming/lib/Settings/Admin.php
@@ -70,7 +70,7 @@ class Admin implements ISettings {
 			'name'            => $this->themingDefaults->getEntity(),
 			'url'             => $this->themingDefaults->getBaseUrl(),
 			'slogan'          => $this->themingDefaults->getSlogan(),
-			'color'           => $this->themingDefaults->getMailHeaderColor(),
+			'color'           => $this->themingDefaults->getColorPrimary(),
 			'logo'            => $this->themingDefaults->getLogo(),
 			'logoMime'        => $this->config->getAppValue('theming', 'logoMime', ''),
 			'background'      => $this->themingDefaults->getBackground(),
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
index 20625116213..5a863b1eb22 100644
--- a/apps/theming/lib/ThemingDefaults.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -78,7 +78,7 @@ class ThemingDefaults extends \OC_Defaults {
 		$this->name = $defaults->getName();
 		$this->url = $defaults->getBaseUrl();
 		$this->slogan = $defaults->getSlogan();
-		$this->color = $defaults->getMailHeaderColor();
+		$this->color = $defaults->getColorPrimary();
 	}
 
 	public function getName() {
@@ -119,7 +119,7 @@ class ThemingDefaults extends \OC_Defaults {
 	 *
 	 * @return string
 	 */
-	public function getMailHeaderColor() {
+	public function getColorPrimary() {
 		return $this->config->getAppValue('theming', 'color', $this->color);
 	}
 
@@ -214,7 +214,7 @@ class ThemingDefaults extends \OC_Defaults {
 				$returnValue = $this->getSlogan();
 				break;
 			case 'color':
-				$returnValue = $this->getMailHeaderColor();
+				$returnValue = $this->getColorPrimary();
 				break;
 			default:
 				$returnValue = '';