mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6150 from nextcloud/backport-6128-primary-font-color-in-capabilities 

[stable12] Add the primary font color to the capabilities as well
This commit is contained in:
Morris Jobke 2017-08-16 21:51:58 +02:00 committed by GitHub
parent 669c82afea 5474e298a1
commit 3326118bdc
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/theming/lib/Capabilities.php
View File

@ -37,6 +37,9 @@ class Capabilities implements ICapability {
/** @var ThemingDefaults */
protected $theming;
/** @var Util */
protected $util;
/** @var IURLGenerator */
protected $url;
@ -45,11 +48,13 @@ class Capabilities implements ICapability {
/**
* @param ThemingDefaults $theming
* @param Util $util
* @param IURLGenerator $url
* @param IConfig $config
*/
public function __construct(ThemingDefaults $theming, IURLGenerator $url, IConfig $config) {
public function __construct(ThemingDefaults $theming, Util $util, IURLGenerator $url, IConfig $config) {
$this->theming = $theming;
$this->util = $util;
$this->url = $url;
$this->config = $config;
}
@ -68,6 +73,7 @@ class Capabilities implements ICapability {
'url' => $this->theming->getBaseUrl(),
'slogan' => $this->theming->getSlogan(),
'color' => $this->theming->getColorPrimary(),
'color-text' => $this->util->invertTextColor($this->theming->getColorPrimary()) ? '#000000' : '#FFFFFF',
'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()),
'background' => $backgroundLogo === 'backgroundColor' ?
$this->theming->getColorPrimary() :

23
apps/theming/tests/CapabilitiesTest.php
View File

@ -23,6 +23,9 @@ namespace OCA\Theming\Tests;
use OCA\Theming\Capabilities;
use OCA\Theming\ThemingDefaults;
use OCA\Theming\Util;
use OCP\App\IAppManager;
use OCP\Files\IAppData;
use OCP\IConfig;
use OCP\IURLGenerator;
use Test\TestCase;
@ -52,34 +55,38 @@ class CapabilitiesTest extends TestCase {
$this->theming = $this->createMock(ThemingDefaults::class);
$this->url = $this->getMockBuilder(IURLGenerator::class)->getMock();
$this->config = $this->createMock(IConfig::class);
$this->capabilities = new Capabilities($this->theming, $this->url, $this->config);
$util = new Util($this->config, $this->createMock(IAppManager::class), $this->createMock(IAppData::class));
$this->capabilities = new Capabilities($this->theming, $util, $this->url, $this->config);
}
public function dataGetCapabilities() {
return [
['name', 'url', 'slogan', 'color', 'logo', 'background', 'http://absolute/', [
['name', 'url', 'slogan', '#FFFFFF', 'logo', 'background', 'http://absolute/', [
'name' => 'name',
'url' => 'url',
'slogan' => 'slogan',
'color' => 'color',
'color' => '#FFFFFF',
'color-text' => '#000000',
'logo' => 'http://absolute/logo',
'background' => 'http://absolute/background',
]],
['name1', 'url2', 'slogan3', 'color4', 'logo5', 'background6', 'http://localhost/', [
['name1', 'url2', 'slogan3', '#01e4a0', 'logo5', 'background6', 'http://localhost/', [
'name' => 'name1',
'url' => 'url2',
'slogan' => 'slogan3',
'color' => 'color4',
'color' => '#01e4a0',
'color-text' => '#FFFFFF',
'logo' => 'http://localhost/logo5',
'background' => 'http://localhost/background6',
]],
['name1', 'url2', 'slogan3', 'color4', 'logo5', 'backgroundColor', 'http://localhost/', [
['name1', 'url2', 'slogan3', '#000000', 'logo5', 'backgroundColor', 'http://localhost/', [
'name' => 'name1',
'url' => 'url2',
'slogan' => 'slogan3',
'color' => 'color4',
'color' => '#000000',
'color-text' => '#FFFFFF',
'logo' => 'http://localhost/logo5',
'background' => 'color4',
'background' => '#000000',
]],
];
}