add dark mode colors

lib/Controller/CssController.php

@@ -65,29 +65,61 @@ class CssController extends Controller
 
     protected function getConfig(): array
     {
-        $backgroundColor = $this->config->getAppValue('background-color', '#333333');
-        $backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
         $isForced = $this->config->getAppValueBool('force', '0');
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
 
+        $isAccessibilityAppEnabled = $this->config->getAppValueBool('enabled', '0', 'accessibility');
+        $isBreezeDarkAppEnabled = $this->config->getAppValueBool('enabled', '0', 'breezedark');
+        $isBreezeDarkGlobalEnabled = $this->config->getAppValueBool('theme_enabled', '0', 'breezedark');
+
         if ($this->user) {
             $userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
 
             if (!empty($userTopMenuApps) && !$isForced) {
                 $topMenuApps = $userTopMenuApps;
             }
+
+            $isDarkThemeUserEnabled = $this->config->getUserValue($this->user, 'theme', '', 'accessibility') === 'dark';
+            $isBreezeDarkUserEnabled = $this->config->getUserValue($this->user, 'theme_enabled', '', 'breezedark');
+
+            $isBreezeDarkUserEnabled = $isBreezeDarkUserEnabled === '1' || ($isBreezeDarkGlobalEnabled && $isBreezeDarkUserEnabled === '');
+        } else {
+            $isDarkThemeUserEnabled = false;
+            $isBreezeDarkUserEnabled = false;
+        }
+
+        $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) || ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
+
+        if ($isDarkMode) {
+            $backgroundColor = $this->config->getAppValue('dark-mode-background-color', '#333333');
+            $backgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $backgroundColor);
+            $currentAppBackgroundColor = $this->config->getAppValue('dark-mode-current-app-background-color', '#444444');
+            $loaderColor = $this->config->getAppValue('dark-mode-loader-color', '#cccccc');
+            $textColor = $this->config->getAppValue('dark-mode-text-color', '#FFFFFF');
+            $iconInvertFilter = abs($this->config->getAppValueInt('dark-mode-icon-invert-filter', '0')).'%';
+            $iconOpacity = abs($this->config->getAppValueInt('dark-mode-icon-opacity', '100') / 100);
+            $opener = $this->config->getAppValue('dark-mode-opener', 'side-menu-opener');
+        } else {
+            $backgroundColor = $this->config->getAppValue('background-color', '#333333');
+            $backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
+            $currentAppBackgroundColor = $this->config->getAppValue('current-app-background-color', '#444444');
+            $loaderColor = $this->config->getAppValue('loader-color', '#0e75ac');
+            $textColor = $this->config->getAppValue('text-color', '#FFFFFF');
+            $iconInvertFilter = abs($this->config->getAppValueInt('icon-invert-filter', '0')).'%';
+            $iconOpacity = abs($this->config->getAppValueInt('icon-opacity', '100') / 100);
+            $opener = $this->config->getAppValue('opener', 'side-menu-opener');
         }
 
         return [
             'vars' => [
                 'background-color' => $backgroundColor,
                 'background-color-to' => $backgroundColorTo,
-                'current-app-background-color' => $this->config->getAppValue('current-app-background-color', '#444444'),
-                'loader-color' => $this->config->getAppValue('loader-color', '#0e75ac'),
-                'text-color' => $this->config->getAppValue('text-color', '#FFFFFF'),
-                'opener' => $this->config->getAppValue('opener', 'side-menu-opener'),
-                'icon-invert-filter' => abs($this->config->getAppValueInt('icon-invert-filter', '0')).'%',
-                'icon-opacity' => abs($this->config->getAppValueInt('icon-opacity', '100') / 100),
+                'current-app-background-color' => $currentAppBackgroundColor,
+                'loader-color' => $loaderColor,
+                'text-color' => $textColor,
+                'opener' => $opener,
+                'icon-invert-filter' => $iconInvertFilter,
+                'icon-opacity' => $iconOpacity,
             ],
             'display-logo' => $this->config->getAppValueBool('display-logo', '1'),
             'opener-only' => $this->config->getAppValueBool('opener-only', '0'),

lib/Service/ConfigProxy.php

@@ -23,43 +23,47 @@ class ConfigProxy
         $this->config = $config;
     }
 
-    public function getAppValue(string $name, string $default): string
+    public function getAppValue(string $name, string $default, $appId = null): string
     {
-        return (string) $this->config->getAppValue(Application::APP_ID, $name, $default);
+        return (string) $this->config->getAppValue($appId ?? Application::APP_ID, $name, $default);
     }
 
-    public function getUserValue(User $user, string $name, string $default): string
+    public function getUserValue(User $user, string $name, string $default, $appId = null): string
     {
-        return (string) $this->config->getUserValue($user->getUid(), Application::APP_ID, $name, $default);
+        return (string) $this->config->getUserValue($user->getUid(), $appId ?? Application::APP_ID, $name, $default);
     }
 
-    public function getAppValueBool(string $name, string $default): bool
+    public function getAppValueBool(string $name, string $default, $appId = null): bool
     {
-        return (bool) $this->getAppValue($name, $default);
+        return (bool) $this->getAppValue($name, $default, $appId);
     }
 
-    public function getAppValueArray(string $name, string $default): array
+    public function getAppValueArray(string $name, string $default, $appId = null): array
     {
-        return (array) json_decode($this->getAppValue($name, $default), true);
+        return (array) json_decode($this->getAppValue($name, $default, $appId), true);
     }
 
-    public function getAppValueInt(string $name, string $default): int
+    public function getAppValueInt(string $name, string $default, $appId = null): int
     {
-        return (int) $this->getAppValue($name, $default);
+        return (int) $this->getAppValue($name, $default, $appId);
     }
 
-    public function getUserValueBool(User $user, string $name, string $default): bool
+    public function getUserValueBool(User $user, string $name, string $default, $appId = null): bool
     {
-        return (bool) $this->getUserValue($user, $name, $default);
+        return (bool) str_replace(
+            ['yes', 'no'],
+            ['1', '0'],
+            $this->getUserValue($user, $name, $default, $appId)
+        );
     }
 
-    public function getUserValueArray(User $user, string $name, string $default): array
+    public function getUserValueArray(User $user, string $name, string $default, $appId = null): array
     {
-        return (array) json_decode($this->getUserValue($user, $name, $default), true);
+        return (array) json_decode($this->getUserValue($user, $name, $default, $appId), true);
     }
 
-    public function getUserValueInt(User $user, string $name, string $default): int
+    public function getUserValueInt(User $user, string $name, string $default, $appId = null): int
     {
-        return (int) $this->getUserValue($user, $name, $default);
+        return (int) $this->getUserValue($user, $name, $default, $appId);
     }
 }

lib/Settings/Admin.php

@@ -76,6 +76,9 @@ class Admin implements ISettings
         $backgroundColor = $this->config->getAppValue('background-color', '#333333');
         $backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
 
+        $darkModeBackgroundColor = $this->config->getAppValue('dark-mode-background-color', '#333333');
+        $darkModeBackgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkModeBackgroundColor);
+
         $parameters = [
             'background-color' => $backgroundColor,
             'background-color-to' => $backgroundColorTo,
@@ -83,10 +86,18 @@ class Admin implements ISettings
             'loader-color' => $this->config->getAppValue('loader-color', '#0e75ac'),
             'icon-invert-filter' => $this->config->getAppValueInt('icon-invert-filter', '0'),
             'icon-opacity' => $this->config->getAppValueInt('icon-opacity', '100'),
-            'loader-enabled' => $this->config->getAppValue('loader-enabled', '1'),
             'text-color' => $this->config->getAppValue('text-color', '#FFFFFF'),
-            'cache' => $this->config->getAppValue('cache', '0'),
+            'dark-mode-background-color' => $darkModeBackgroundColor,
+            'dark-mode-background-color-to' => $darkModeBackgroundColorTo,
+            '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-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-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'),
+            'cache' => $this->config->getAppValue('cache', '0'),
             'always-displayed' => $this->config->getAppValue('always-displayed', '0'),
             'big-menu' => $this->config->getAppValue('big-menu', '0'),
             'big-menu-hidden-apps' => $this->config->getAppValueArray('big-menu-hidden-apps', '[]'),