Fix illegible text color in columns Size and Modified on dark theme: …

…rework after review
nextcloud · Oct 16, 2018 · a0bcac1 · a0bcac1
1 parent 6b83ec3
commit a0bcac1
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 4 deletions.
diff --git a/apps/accessibility/appinfo/app.php b/apps/accessibility/appinfo/app.php
@@ -27,4 +27,5 @@
 // Separate from the constructor since the route are not initialized before that
 // 1. create the app
 // 2. generate css route and inject
-$app->injectCss();
+$app->injectCss();
+$app->injectJavascript();
diff --git a/apps/accessibility/appinfo/routes.php b/apps/accessibility/appinfo/routes.php
@@ -24,6 +24,7 @@
 return [
     'routes' => [
         ['name' => 'accessibility#getCss', 'url' => '/css/user-{md5}.css', 'verb' => 'GET'],
+		['name' => 'accessibility#getJavascript', 'url' => '/js/accessibility', 'verb' => 'GET'],
     ],
     'ocs' => [
 		[

diff --git a/apps/accessibility/lib/AppInfo/Application.php b/apps/accessibility/lib/AppInfo/Application.php
@@ -60,4 +60,22 @@ public function injectCss() {
 			}
 		}
 	}
+
+	public function injectJavascript() {
+		$linkToJs = $this->urlGenerator->linkToRoute(
+			$this->appName . '.accessibility.getJavascript',
+			[
+				'v' => \OC::$server->getConfig()->getAppValue('accessibility', 'cachebuster', '0'),
+			]
+		);
+
+		\OCP\Util::addHeader(
+			'script',
+			[
+				'src' => $linkToJs,
+				'nonce' => \OC::$server->getContentSecurityPolicyNonceManager()->getNonce()
+			],
+			''
+		);
+	}
 }
diff --git a/apps/accessibility/lib/Controller/AccessibilityController.php b/apps/accessibility/lib/Controller/AccessibilityController.php
@@ -28,6 +28,7 @@
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataDisplayResponse;
+use OCP\AppFramework\Http\DataDownloadResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\App\IAppManager;
 use OCP\IConfig;
@@ -184,6 +185,24 @@ public function getCss(): DataDisplayResponse {
 		return $response;
 	}
 
+	/**
+	 * @NoCSRFRequired
+	 * @PublicPage
+	 *
+	 * @return DataDownloadResponse
+	 */
+	public function getJavascript(): DataDownloadResponse {
+		$responseJS = '(function() {
+	OCA.Accessibility = {
+		theme: ' . json_encode($this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false)) . ',
+		
+	};
+})();';
+		$response = new DataDownloadResponse($responseJS, 'javascript', 'text/javascript');
+		$response->cacheFor(3600);
+		return $response;
+	}
+
 	/**
 	 * Return an array with the user theme & font settings
 	 *

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
@@ -1385,7 +1385,7 @@
 				// min. color contrast for normal text on white background according to WCAG AA
 				sizeColor = Math.round(118-Math.pow((fileData.size/(1024*1024)),2));
 
-				if (oc_defaults.themeName === 'themedark') {
+				if (OCA.Accessibility && OCA.Accessibility.theme === 'themedark') {
 					sizeColor = Math.abs(sizeColor);
 				}
 			} else {
@@ -1407,7 +1407,7 @@
 			if (modifiedColor >= '118') {
 				modifiedColor = 118;
 			}
-			if (oc_defaults.themeName === 'themedark') {
+			if (OCA.Accessibility && OCA.Accessibility.theme === 'themedark') {
 				modifiedColor = Math.abs(modifiedColor);
 
 				// ensure that the dimmest color is still readable

diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php
@@ -260,7 +260,6 @@ public function getConfig() {
 				'shortFooter' => $this->defaults->getShortFooter(),
 				'longFooter' => $this->defaults->getLongFooter(),
 				'folder' => \OC_Util::getTheme(),
-				'themeName' => $this->config->getUserValue($uid, 'accessibility', 'theme', false),
 			]),
 			"oc_capabilities" => json_encode($capabilities),
 		];