From 9eec0ce3efc6dd58f6731a81d5b5584192e71b7a Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Thu, 13 Aug 2020 21:22:10 +0200
Subject: [PATCH] add icon color filter range

---
 css/admin.css                     |  3 +++
 css/sideMenu.css                  |  1 +
 lib/Controller/CssController.php  |  1 +
 lib/Settings/Admin.php            | 10 +++++-----
 templates/settings/admin-form.php | 29 ++++++++++++++++++-----------
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/css/admin.css b/css/admin.css
index 6532ea0..ea60c8f 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -24,6 +24,9 @@
     vertical-align: middle;
 }
 
+#side-menu-section input[type="range"] {
+    vertical-align: middle;
+}
 
 #side-menu-section select {
     margin: 10px 0 10px 0;
diff --git a/css/sideMenu.css b/css/sideMenu.css
index 67cb823..3cfad48 100644
--- a/css/sideMenu.css
+++ b/css/sideMenu.css
@@ -63,6 +63,7 @@
     width: 20px;
     vertical-align: top;
     margin-right: 10px;
+    filter: invert(var(--side-menu-icon-invert-filter, 0%));
 }
 
 .side-menu-app-icon svg {
diff --git a/lib/Controller/CssController.php b/lib/Controller/CssController.php
index b06ff49..1845e15 100644
--- a/lib/Controller/CssController.php
+++ b/lib/Controller/CssController.php
@@ -74,6 +74,7 @@ class CssController extends Controller
                 'loader-color' => $this->config->getAppValue('side_menu', 'loader-color', '#0e75ac'),
                 'text-color' => $this->config->getAppValue('side_menu', 'text-color', '#FFFFFF'),
                 'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
+                'icon-invert-filter' => abs((int) $this->config->getAppValue('side_menu', 'icon-invert-filter', '0')).'%',
             ],
             'display-logo' => (bool) $this->config->getAppValue('side_menu', 'display-logo', 1),
             'opener-only' => (bool) $this->config->getAppValue('side_menu', 'opener-only', 0),
diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
index 0131a50..314d91d 100644
--- a/lib/Settings/Admin.php
+++ b/lib/Settings/Admin.php
@@ -18,12 +18,12 @@
 
 namespace OCA\SideMenu\Settings;
 
+use OCA\SideMenu\Service\AppRepository;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
 use OCP\IL10N;
 use OCP\ILogger;
 use OCP\Settings\ISettings;
-use OCP\IConfig;
-use OCA\SideMenu\Service\AppRepository;
 
 class Admin implements ISettings
 {
@@ -68,9 +68,9 @@ class Admin implements ISettings
             'background-color-to' => $backgroundColorTo,
             'current-app-background-color' => $this->config->getAppValue('side_menu', 'current-app-background-color', '#444444'),
             'loader-color' => $this->config->getAppValue('side_menu', 'loader-color', '#0e75ac'),
+            'icon-invert-filter' => (int) $this->config->getAppValue('side_menu', 'icon-invert-filter', '0'),
             'loader-enabled' => $this->config->getAppValue('side_menu', 'loader-enabled', '1'),
             'text-color' => $this->config->getAppValue('side_menu', 'text-color', '#FFFFFF'),
-            'force-light-icon' => $this->config->getAppValue('side_menu', 'force-light-icon', '0'),
             'cache' => $this->config->getAppValue('side_menu', 'cache', '0'),
             'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
             'big-menu' => $this->config->getAppValue('side_menu', 'big-menu', '0'),
@@ -98,8 +98,8 @@ class Admin implements ISettings
 
     /**
      * @return int whether the form should be rather on the top or bottom of
-     * the admin section. The forms are arranged in ascending order of the
-     * priority values. It is required to return a value between 0 and 100.
+     *             the admin section. The forms are arranged in ascending order of the
+     *             priority values. It is required to return a value between 0 and 100.
      *
      * E.g.: 70
      */
diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php
index 64e8c62..b841b11 100644
--- a/templates/settings/admin-form.php
+++ b/templates/settings/admin-form.php
@@ -88,21 +88,28 @@ $choicesSizes = [
         </div>
 
         <div>
-            <label for="side-menu-opener-only">
-                <?php p($l->t('Force light icons')); ?>
+            <label for="side-menu-icon-invert-filter">
+                <?php p($l->t('Icon color')); ?>
             </label>
         </div>
 
-        <p><em>This feature is not compatible with the <code>big menu</code> display.</em></p>
-
         <div>
-            <select id="side-menu-force-light-icon" name="force-light-icon" class="side-menu-setting">
-                <?php foreach ($choicesYesNo as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['force-light-icon']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label);  ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
+            <em>
+                <?php p($l->t('Same color')); ?>
+            </em>
+
+            <input
+                type="range"
+                min="0" max="100"
+                id="side-menu-icon-invert-filter"
+                name="icon-invert-filter"
+                class="side-menu-setting"
+                value="<?php echo $_['icon-invert-filter'] ?>"
+            >
+
+            <em>
+                <?php p($l->t('Opposite color')); ?>
+            </em>
         </div>
 
         <div>