add constructor property promotion
add return type of methods
This commit is contained in:
parent
05c35b9a63
commit
7c5654f3bc
14 changed files with 77 additions and 387 deletions
|
|
@ -32,49 +32,26 @@ use OCP\IUserSession;
|
|||
|
||||
class CssController extends Controller
|
||||
{
|
||||
/**
|
||||
* @var ConfigProxy
|
||||
*/
|
||||
protected $config;
|
||||
|
||||
/**
|
||||
* @var User
|
||||
*/
|
||||
protected $user;
|
||||
|
||||
/**
|
||||
* @var ThemingDefaults
|
||||
*/
|
||||
protected $theming;
|
||||
|
||||
/**
|
||||
* @var Color
|
||||
*/
|
||||
protected $color;
|
||||
protected ?User $user;
|
||||
|
||||
public function __construct(
|
||||
string $appName,
|
||||
IRequest $request,
|
||||
ConfigProxy $config,
|
||||
ThemingDefaults $theming,
|
||||
Color $color
|
||||
protected ConfigProxy $config,
|
||||
protected ThemingDefaults $theming,
|
||||
protected Color $color
|
||||
) {
|
||||
parent::__construct($appName, $request);
|
||||
|
||||
$this->user = OC::$server[IUserSession::class]->getUser();
|
||||
$this->config = $config;
|
||||
$this->theming = $theming;
|
||||
$this->color = $color;
|
||||
}
|
||||
|
||||
/**
|
||||
* @NoAdminRequired
|
||||
* @NoCSRFRequired
|
||||
* @PublicPage
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function stylesheet()
|
||||
public function stylesheet(): TemplateResponse
|
||||
{
|
||||
$response = new TemplateResponse(Application::APP_ID, 'css/stylesheet', $this->getConfig(), 'blank');
|
||||
$response->addHeader('Content-Type', 'text/css');
|
||||
|
|
@ -107,15 +84,15 @@ class CssController extends Controller
|
|||
$isDarkThemeUserEnabled = 'dark' === $this->config->getUserValue($this->user, 'theme', '', 'accessibility');
|
||||
$isBreezeDarkUserEnabled = $this->config->getUserValue($this->user, 'theme_enabled', '', 'breezedark');
|
||||
|
||||
$isBreezeDarkUserEnabled = '1' === $isBreezeDarkUserEnabled ||
|
||||
($isBreezeDarkGlobalEnabled && '' === $isBreezeDarkUserEnabled);
|
||||
$isBreezeDarkUserEnabled = '1' === $isBreezeDarkUserEnabled
|
||||
|| ($isBreezeDarkGlobalEnabled && '' === $isBreezeDarkUserEnabled);
|
||||
} else {
|
||||
$isDarkThemeUserEnabled = false;
|
||||
$isBreezeDarkUserEnabled = false;
|
||||
}
|
||||
|
||||
$isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) ||
|
||||
($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
|
||||
$isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled)
|
||||
|| ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
|
||||
|
||||
$primaryColor = $this->theming->getColorPrimary();
|
||||
$lightenPrimaryColor = $this->color->adjustBrightness($primaryColor, 0.2);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue