migrate admin settings
This commit is contained in:
Simon Vieille
@@ -13,6 +13,7 @@ use OCP\AppFramework\App;
|
||||
use OCP\AppFramework\Bootstrap\IBootContext;
|
||||
use OCP\AppFramework\Bootstrap\IBootstrap;
|
||||
use OCP\AppFramework\Bootstrap\IRegistrationContext;
|
||||
use OCA\Theming\ThemingDefaults;
|
||||
use OCP\EventDispatcher\IEventDispatcher;
|
||||
use OCP\IConfig;
|
||||
use OCP\INavigationManager;
|
||||
@@ -20,6 +21,7 @@ use OCP\IUserSession;
|
||||
use OCP\L10N\IFactory;
|
||||
use OCP\Util;
|
||||
use Psr\Container\ContainerInterface;
|
||||
use OCA\SideMenu\Service\Color;
|
||||
|
||||
/**
|
||||
* class Application.
|
||||
@@ -81,6 +83,12 @@ class Application extends App implements IBootstrap
|
||||
$c->get(IConfig::class),
|
||||
);
|
||||
});
|
||||
|
||||
$context->registerService(Color::class, function (ContainerInterface $c) {
|
||||
return new Color(
|
||||
$c->get(ThemingDefaults::class),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
public function boot(IBootContext $context): void
|
||||
|
||||
@@ -20,14 +20,17 @@
|
||||
namespace OCA\SideMenu\Controller;
|
||||
|
||||
use OCA\SideMenu\AppInfo\Application;
|
||||
use OCA\SideMenu\Service\ConfigProxy;
|
||||
use OCP\AppFramework\Controller;
|
||||
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
|
||||
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
|
||||
use OCP\AppFramework\Http\DataDownloadResponse;
|
||||
use OCP\AppFramework\Http\JSONResponse;
|
||||
use OCP\AppFramework\Http\RedirectResponse;
|
||||
use OCP\IConfig;
|
||||
use OCP\IRequest;
|
||||
use OCP\IURLGenerator;
|
||||
use OCA\SideMenu\Service\Color;
|
||||
|
||||
class AdminSettingController extends Controller
|
||||
{
|
||||
@@ -35,7 +38,9 @@ class AdminSettingController extends Controller
|
||||
$appName,
|
||||
IRequest $request,
|
||||
protected IConfig $config,
|
||||
protected IURLGenerator $urlGenerator
|
||||
protected ConfigProxy $configProxy,
|
||||
protected IURLGenerator $urlGenerator,
|
||||
protected Color $color,
|
||||
) {
|
||||
parent::__construct($appName, $request);
|
||||
}
|
||||
@@ -76,4 +81,129 @@ class AdminSettingController extends Controller
|
||||
'text/json'
|
||||
);
|
||||
}
|
||||
|
||||
#[NoCSRFRequired]
|
||||
#[FrontpageRoute(verb: 'GET', url: '/admin/config')]
|
||||
public function configuration(): JSONResponse
|
||||
{
|
||||
$keys = $this->config->getAppKeys(Application::APP_ID);
|
||||
$booleans = [
|
||||
'opener-only',
|
||||
'opener-hover',
|
||||
'display-logo',
|
||||
'use-avatar',
|
||||
'add-logo-link',
|
||||
'show-settings',
|
||||
'loader-enabled',
|
||||
'top-menu-mouse-over-hidden-label',
|
||||
'always-displayed',
|
||||
'enabled',
|
||||
'force',
|
||||
'big-menu',
|
||||
'external-sites-in-top-menu',
|
||||
'force-light-icon',
|
||||
'side-with-categories',
|
||||
'default-enabled',
|
||||
];
|
||||
|
||||
$arrays = [
|
||||
'apps-categories-custom',
|
||||
'big-menu-hidden-apps',
|
||||
'apps-order',
|
||||
'categories-custom',
|
||||
'categories-order',
|
||||
'target-blank-apps',
|
||||
'top-menu-apps',
|
||||
'top-side-menu-apps',
|
||||
];
|
||||
|
||||
$integers = [
|
||||
'background-color-opacity',
|
||||
'dark-mode-background-color-opacity',
|
||||
'dark-mode-icon-invert-filter',
|
||||
'dark-mode-icon-opacity',
|
||||
'icon-invert-filter',
|
||||
'icon-opacity',
|
||||
'target-blank-mode',
|
||||
'top-menu-mouse-over-hidden-label',
|
||||
];
|
||||
|
||||
$defaults = [
|
||||
'opener-only' => '0',
|
||||
'opener-hover' => '0',
|
||||
'display-logo' => '1',
|
||||
'use-avatar' => '0',
|
||||
'add-logo-link' => '1',
|
||||
'show-settings' => '0',
|
||||
'loader-enabled' => '1',
|
||||
'top-menu-mouse-over-hidden-label' => '0',
|
||||
'always-displayed' => '0',
|
||||
'enabled' => '1',
|
||||
'force' => '0',
|
||||
'big-menu' => '0',
|
||||
'external-sites-in-top-menu' => '0',
|
||||
'force-light-icon' => '0',
|
||||
'side-with-categories' => '0',
|
||||
'cache' => '1',
|
||||
'default-enabled' => '1',
|
||||
|
||||
'apps-categories-custom' => '[]',
|
||||
'big-menu-hidden-apps' => '[]',
|
||||
'apps-order' => '[]',
|
||||
'categories-custom' => '[]',
|
||||
'categories-order' => '[]',
|
||||
'target-blank-apps' => '[]',
|
||||
'top-menu-apps' => '[]',
|
||||
'top-side-menu-apps' => '[]',
|
||||
'cache-categories' => '[]',
|
||||
|
||||
'background-color-opacity' => '100',
|
||||
'dark-mode-background-color-opacity' => '100',
|
||||
'dark-mode-icon-invert-filter' => '0',
|
||||
'dark-mode-icon-opacity' => '100',
|
||||
'icon-invert-filter' => '0',
|
||||
'icon-opacity' => '100',
|
||||
'top-menu-mouse-over-hidden-label' => '0',
|
||||
|
||||
'opener' => 'side-menu-opener',
|
||||
'dark-mode-opener' => 'side-menu-opener',
|
||||
'size-icon' => 'normal',
|
||||
'size-text' => 'normal',
|
||||
'opener-position' => 'before',
|
||||
|
||||
'background-color' => $this->color->getPrimaryColor(),
|
||||
'background-color-to' => $this->color->getLightenPrimaryColor(),
|
||||
'current-app-background-color' => $this->color->getDarkenPrimaryColor(),
|
||||
'text-color' => $this->color->getTextColorPrimary(),
|
||||
'loader-color' => $this->color->getLightenPrimaryColor(),
|
||||
|
||||
'dark-mode-background-color' => $this->color->getDarkenPrimaryColor(),
|
||||
'dark-mode-background-color-to' => $this->color->getDarkenPrimaryColor(),
|
||||
'dark-mode-current-app-background-color' => $this->color->getDarkenPrimaryColor2(),
|
||||
'dark-mode-text-color' => $this->color->getTextColorPrimary(),
|
||||
'dark-mode-loader-color' => $this->color->getLightenPrimaryColor(),
|
||||
|
||||
'categories-order-type' => 'default',
|
||||
];
|
||||
|
||||
$config = [];
|
||||
|
||||
foreach ($keys as $key) {
|
||||
if (!isset($defaults[$key])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (in_array($key, $booleans)) {
|
||||
$config[$key] = $this->configProxy->getAppValueBool($key, $defaults[$key]);
|
||||
} elseif (in_array($key, $arrays)) {
|
||||
$config[$key] = $this->configProxy->getAppValueArray($key, $defaults[$key]);
|
||||
} elseif (in_array($key, $integers)) {
|
||||
$config[$key] = $this->configProxy->getAppValueInt($key, $defaults[$key]);
|
||||
} else {
|
||||
$config[$key] = $this->configProxy->getAppValue($key, $defaults[$key]);
|
||||
}
|
||||
}
|
||||
|
||||
return new JSONResponse($config);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -95,11 +95,10 @@ class CssController extends Controller
|
||||
$isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled)
|
||||
|| ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
|
||||
|
||||
$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();
|
||||
$lightenPrimaryColor = $this->color->getLightenPrimaryColor();
|
||||
$darkenPrimaryColor = $this->color->getDarkenPrimaryColor();
|
||||
$darkenPrimaryColor2 = $this->color->getDarkenPrimaryColor2();
|
||||
$textColor = $this->color->getTextColorPrimary();
|
||||
|
||||
if ($isDarkMode) {
|
||||
$backgroundColor = $this->config->getAppValue('dark-mode-background-color', $darkenPrimaryColor);
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
|
||||
namespace OCA\SideMenu\Service;
|
||||
|
||||
use OCA\Theming\ThemingDefaults;
|
||||
|
||||
/**
|
||||
* class Color.
|
||||
*
|
||||
@@ -9,6 +11,10 @@ namespace OCA\SideMenu\Service;
|
||||
*/
|
||||
class Color
|
||||
{
|
||||
public function __construct(protected ThemingDefaults $theming)
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* @thanks https://stackoverflow.com/posts/54393956/revision
|
||||
*/
|
||||
@@ -31,4 +37,29 @@ class Color
|
||||
|
||||
return '#'.implode($hexCode);
|
||||
}
|
||||
|
||||
public function getPrimaryColor()
|
||||
{
|
||||
return $this->theming->getColorPrimary();
|
||||
}
|
||||
|
||||
public function getLightenPrimaryColor()
|
||||
{
|
||||
return $this->adjustBrightness($this->getPrimaryColor(), 0.2);
|
||||
}
|
||||
|
||||
public function getDarkenPrimaryColor()
|
||||
{
|
||||
return $this->adjustBrightness($this->getPrimaryColor(), -0.2);
|
||||
}
|
||||
|
||||
public function getDarkenPrimaryColor2()
|
||||
{
|
||||
return $this->adjustBrightness($this->getPrimaryColor(), -0.3);
|
||||
}
|
||||
|
||||
public function getTextColorPrimary()
|
||||
{
|
||||
return $this->theming->getTextColorPrimary();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user