generate default colors using theming colors
All checks were successful
metroline continuous-integration/metroline
All checks were successful
metroline continuous-integration/metroline
This commit is contained in:
parent
506fa22f4b
commit
1cbdca87df
3 changed files with 104 additions and 22 deletions
|
|
@ -26,6 +26,8 @@ use OCP\AppFramework\Http\TemplateResponse;
|
|||
use OCP\IL10N;
|
||||
use OCP\ILogger;
|
||||
use OCP\Settings\ISettings;
|
||||
use OCA\Theming\ThemingDefaults;
|
||||
use OCA\SideMenu\Service\Color;
|
||||
|
||||
class Admin implements ISettings
|
||||
{
|
||||
|
|
@ -54,18 +56,32 @@ class Admin implements ISettings
|
|||
*/
|
||||
private $categoryRepository;
|
||||
|
||||
/**
|
||||
* @var ThemingDefaults
|
||||
*/
|
||||
protected $theming;
|
||||
|
||||
/**
|
||||
* @var Color
|
||||
*/
|
||||
protected $color;
|
||||
|
||||
public function __construct(
|
||||
IL10N $l,
|
||||
ILogger $logger,
|
||||
ConfigProxy $config,
|
||||
AppRepository $appRepository,
|
||||
CategoryRepository $categoryRepository
|
||||
CategoryRepository $categoryRepository,
|
||||
ThemingDefaults $theming,
|
||||
Color $color
|
||||
) {
|
||||
$this->l = $l;
|
||||
$this->logger = $logger;
|
||||
$this->config = $config;
|
||||
$this->appRepository = $appRepository;
|
||||
$this->categoryRepository = $categoryRepository;
|
||||
$this->theming = $theming;
|
||||
$this->color = $color;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -73,29 +89,35 @@ class Admin implements ISettings
|
|||
*/
|
||||
public function getForm()
|
||||
{
|
||||
$backgroundColor = $this->config->getAppValue('background-color', '#333333');
|
||||
$backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
|
||||
$primaryColor = $this->theming->getColorPrimary();
|
||||
$lightenPrimaryColor = $this->color->adjustBrightness($primaryColor, 0.2);
|
||||
$darkenPrimaryColor = $this->color->adjustBrightness($primaryColor, -0.2);
|
||||
$darkenPrimaryColor2 = $this->color->adjustBrightness($primaryColor, -0.3);
|
||||
$textColor = $this->theming->getTextColorPrimary();
|
||||
|
||||
$darkModeBackgroundColor = $this->config->getAppValue('dark-mode-background-color', '#333333');
|
||||
$darkModeBackgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkModeBackgroundColor);
|
||||
$backgroundColor = $this->config->getAppValue('background-color', $darkenPrimaryColor);
|
||||
$backgroundColorTo = $this->config->getAppValue('background-color-to', $darkenPrimaryColor);
|
||||
|
||||
$darkModeBackgroundColor = $this->config->getAppValue('dark-mode-background-color', $darkenPrimaryColor);
|
||||
$darkModeBackgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkenPrimaryColor);
|
||||
|
||||
$parameters = [
|
||||
'background-color' => $backgroundColor,
|
||||
'background-color-to' => $backgroundColorTo,
|
||||
'background-color-opacity' => $this->config->getAppValueInt('background-color-opacity', '100'),
|
||||
'current-app-background-color' => $this->config->getAppValue('current-app-background-color', '#444444'),
|
||||
'loader-color' => $this->config->getAppValue('loader-color', '#0e75ac'),
|
||||
'current-app-background-color' => $this->config->getAppValue('current-app-background-color', $darkenPrimaryColor2),
|
||||
'loader-color' => $this->config->getAppValue('loader-color', $lightenPrimaryColor),
|
||||
'icon-invert-filter' => $this->config->getAppValueInt('icon-invert-filter', '0'),
|
||||
'icon-opacity' => $this->config->getAppValueInt('icon-opacity', '100'),
|
||||
'text-color' => $this->config->getAppValue('text-color', '#FFFFFF'),
|
||||
'text-color' => $this->config->getAppValue('text-color', $textColor),
|
||||
'dark-mode-background-color' => $darkModeBackgroundColor,
|
||||
'dark-mode-background-color-to' => $darkModeBackgroundColorTo,
|
||||
'dark-mode-background-color-opacity' => $this->config->getAppValueInt('dark-mode-background-color-opacity', '100'),
|
||||
'dark-mode-current-app-background-color' => $this->config->getAppValue('dark-mode-current-app-background-color', '#444444'),
|
||||
'dark-mode-loader-color' => $this->config->getAppValue('dark-mode-loader-color', '#cccccc'),
|
||||
'dark-mode-current-app-background-color' => $this->config->getAppValue('dark-mode-current-app-background-color', $darkenPrimaryColor2),
|
||||
'dark-mode-loader-color' => $this->config->getAppValue('dark-mode-loader-color', $textColor),
|
||||
'dark-mode-icon-invert-filter' => $this->config->getAppValueInt('dark-mode-icon-invert-filter', '0'),
|
||||
'dark-mode-icon-opacity' => $this->config->getAppValueInt('dark-mode-icon-opacity', '100'),
|
||||
'dark-mode-text-color' => $this->config->getAppValue('dark-mode-text-color', '#FFFFFF'),
|
||||
'dark-mode-text-color' => $this->config->getAppValue('dark-mode-text-color', $textColor),
|
||||
'dark-mode-opener' => $this->config->getAppValue('dark-mode-opener', 'side-menu-opener'),
|
||||
'opener' => $this->config->getAppValue('opener', 'side-menu-opener'),
|
||||
'loader-enabled' => $this->config->getAppValue('loader-enabled', '1'),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue