[gnome-shell/wip/exalm/dark-1: 3/3] accessibility: Use the new high-contrast gsettings key

[Alexander Mikhaylenko <alexm src gnome org>]

commit c051e661eb8d6963c9d57da52ee727350cfd6cc8
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Sun Dec 19 21:30:00 2021 +0500

    accessibility: Use the new high-contrast gsettings key

 js/ui/status/accessibility.js | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)
---
diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index a0513f68c8..fddc0caeb4 100644
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -27,6 +27,9 @@ const KEY_GTK_THEME                 = 'gtk-theme';
 const KEY_ICON_THEME                = 'icon-theme';
 const KEY_TEXT_SCALING_FACTOR       = 'text-scaling-factor';
 
+const A11Y_INTERFACE_SCHEMA         = 'org.gnome.desktop.a11y.interface';
+const KEY_HIGH_CONTRAST             = 'high-contrast';
+
 const HIGH_CONTRAST_THEME           = 'HighContrast';
 
 var ATIndicator = GObject.registerClass(
@@ -127,45 +130,33 @@ class ATIndicator extends PanelMenu.Button {
 
     _buildHCItem() {
         let interfaceSettings = new Gio.Settings({ schema_id: DESKTOP_INTERFACE_SCHEMA });
-        let gtkTheme = interfaceSettings.get_string(KEY_GTK_THEME);
-        let iconTheme = interfaceSettings.get_string(KEY_ICON_THEME);
-        let hasHC = gtkTheme == HIGH_CONTRAST_THEME;
+        let a11ySettings = new Gio.Settings({ schema_id: A11Y_INTERFACE_SCHEMA });
+        let hc = a11ySettings.get_boolean(KEY_HIGH_CONTRAST);
         let highContrast = this._buildItemExtended(
             _("High Contrast"),
-            hasHC,
+            hc,
+            a11ySettings.is_writable(KEY_HIGH_CONTRAST) &&
             interfaceSettings.is_writable(KEY_GTK_THEME) &&
             interfaceSettings.is_writable(KEY_ICON_THEME),
             enabled => {
                 if (enabled) {
+                    a11ySettings.set_boolean(KEY_HIGH_CONTRAST, enabled);
                     interfaceSettings.set_string(KEY_ICON_THEME, HIGH_CONTRAST_THEME);
                     interfaceSettings.set_string(KEY_GTK_THEME, HIGH_CONTRAST_THEME);
-                } else if (!hasHC) {
-                    interfaceSettings.set_string(KEY_ICON_THEME, iconTheme);
-                    interfaceSettings.set_string(KEY_GTK_THEME, gtkTheme);
                 } else {
+                    a11ySettings.reset(KEY_HIGH_CONTRAST);
                     interfaceSettings.reset(KEY_ICON_THEME);
                     interfaceSettings.reset(KEY_GTK_THEME);
                 }
             });
 
-        interfaceSettings.connect('changed::%s'.format(KEY_GTK_THEME), () => {
-            let value = interfaceSettings.get_string(KEY_GTK_THEME);
-            if (value == HIGH_CONTRAST_THEME) {
-                highContrast.setToggleState(true);
-            } else {
-                highContrast.setToggleState(false);
-                gtkTheme = value;
-            }
+        a11ySettings.connect('changed::%s'.format(KEY_HIGH_CONTRAST), () => {
+            hc = a11ySettings.get_boolean(KEY_HIGH_CONTRAST);
+            highContrast.setToggleState(hc);
 
             this._queueSyncMenuVisibility();
         });
 
-        interfaceSettings.connect('changed::%s'.format(KEY_ICON_THEME), () => {
-            let value = interfaceSettings.get_string(KEY_ICON_THEME);
-            if (value != HIGH_CONTRAST_THEME)
-                iconTheme = value;
-        });
-
         return highContrast;
     }