Prepare settings listeners (#187)

Author: jpnurmi

lib/services/settings_service.dart

@@ -1,3 +1,5 @@
+import 'dart:ui';
+
 import 'package:gsettings/gsettings.dart';
 
 class SettingsService {
@@ -21,6 +23,15 @@ class Settings {
       : _settings = GSettings(schemaId: schemaId, path: path);
 
   final GSettings _settings;
+  final _listeners = <VoidCallback>{};
+
+  void addListener(VoidCallback listener) => _listeners.add(listener);
+  void removeListener(VoidCallback listener) => _listeners.remove(listener);
+  void notifyListeners() {
+    for (final listener in _listeners) {
+      listener();
+    }
+  }
 
   void dispose() => _settings.dispose();
 

lib/view/pages/accessibility/accessibility_model.dart

@@ -68,7 +68,31 @@ class AccessibilityModel extends ChangeNotifier {
         _interfaceSettings = service.lookup(schemaInterface),
         _peripheralsMouseSettings = service.lookup(schemaPeripheralsMouse),
         _peripheralsKeyboardSettings =
-            service.lookup(schemaPeripheralsKeyboard);
+            service.lookup(schemaPeripheralsKeyboard) {
+    _desktopA11Settings?.addListener(notifyListeners);
+    _a11yAppsSettings?.addListener(notifyListeners);
+    _a11yKeyboardSettings?.addListener(notifyListeners);
+    _a11yMagnifierSettings?.addListener(notifyListeners);
+    _a11yMouseSettings?.addListener(notifyListeners);
+    _wmPreferencesSettings?.addListener(notifyListeners);
+    _interfaceSettings?.addListener(notifyListeners);
+    _peripheralsMouseSettings?.addListener(notifyListeners);
+    _peripheralsKeyboardSettings?.addListener(notifyListeners);
+  }
+
+  @override
+  void dispose() {
+    _desktopA11Settings?.removeListener(notifyListeners);
+    _a11yAppsSettings?.removeListener(notifyListeners);
+    _a11yKeyboardSettings?.removeListener(notifyListeners);
+    _a11yMagnifierSettings?.removeListener(notifyListeners);
+    _a11yMouseSettings?.removeListener(notifyListeners);
+    _wmPreferencesSettings?.removeListener(notifyListeners);
+    _interfaceSettings?.removeListener(notifyListeners);
+    _peripheralsMouseSettings?.removeListener(notifyListeners);
+    _peripheralsKeyboardSettings?.removeListener(notifyListeners);
+    super.dispose();
+  }
 
   final Settings? _desktopA11Settings;
   final Settings? _a11yAppsSettings;

lib/view/pages/appearance/appearance_model.dart

@@ -12,7 +12,15 @@ class AppearanceModel extends ChangeNotifier {
   static const _clickActionKey = 'click-action';
 
   AppearanceModel(SettingsService service)
-      : _dashToDockSettings = service.lookup(schemaDashToDock);
+      : _dashToDockSettings = service.lookup(schemaDashToDock) {
+    _dashToDockSettings?.addListener(notifyListeners);
+  }
+
+  @override
+  void dispose() {
+    _dashToDockSettings?.removeListener(notifyListeners);
+    super.dispose();
+  }
 
   final Settings? _dashToDockSettings;
 

lib/view/pages/keyboard_shortcuts/keyboard_shortcuts_model.dart

@@ -5,7 +5,15 @@ class KeyboardShortcutsModel extends ChangeNotifier {
   final String schemaId;
 
   KeyboardShortcutsModel(SettingsService service, {required this.schemaId})
-      : _shortcutSettings = service.lookup(schemaId);
+      : _shortcutSettings = service.lookup(schemaId) {
+    _shortcutSettings?.addListener(notifyListeners);
+  }
+
+  @override
+  void dispose() {
+    _shortcutSettings?.removeListener(notifyListeners);
+    super.dispose();
+  }
 
   final Settings? _shortcutSettings;
 

lib/view/pages/mouse_and_touchpad/mouse_and_touchpad_model.dart

@@ -13,7 +13,18 @@ class MouseAndTouchpadModel extends ChangeNotifier {
   MouseAndTouchpadModel(SettingsService service)
       : _peripheralsMouseSettings =
             service.lookup(schemaDesktopPeripheralsMouse),
-        _peripheralsTouchpadSettings = service.lookup(schemaPeripheralTouchpad);
+        _peripheralsTouchpadSettings =
+            service.lookup(schemaPeripheralTouchpad) {
+    _peripheralsMouseSettings?.addListener(notifyListeners);
+    _peripheralsTouchpadSettings?.addListener(notifyListeners);
+  }
+
+  @override
+  void dispose() {
+    _peripheralsMouseSettings?.removeListener(notifyListeners);
+    _peripheralsTouchpadSettings?.removeListener(notifyListeners);
+    super.dispose();
+  }
 
   final Settings? _peripheralsMouseSettings;
   final Settings? _peripheralsTouchpadSettings;

lib/view/pages/notifications/notifications_model.dart

@@ -7,7 +7,15 @@ class NotificationsModel extends ChangeNotifier {
   static const _showInLockScreenKey = 'show-in-lock-screen';
 
   NotificationsModel(SettingsService service)
-      : _notificationSettings = service.lookup(schemaNotifications);
+      : _notificationSettings = service.lookup(schemaNotifications) {
+    _notificationSettings?.addListener(notifyListeners);
+  }
+
+  @override
+  void dispose() {
+    _notificationSettings?.removeListener(notifyListeners);
+    super.dispose();
+  }
 
   final Settings? _notificationSettings;
 
@@ -44,7 +52,15 @@ class AppNotificationsModel extends ChangeNotifier {
 
   AppNotificationsModel(this.appId, SettingsService service)
       : _appNotificationSettings =
-            service.lookup(_appSchemaId, path: _getPath(appId));
+            service.lookup(_appSchemaId, path: _getPath(appId)) {
+    _appNotificationSettings?.addListener(notifyListeners);
+  }
+
+  @override
+  void dispose() {
+    _appNotificationSettings?.removeListener(notifyListeners);
+    super.dispose();
+  }
 
   final String appId;
   final Settings? _appNotificationSettings;

lib/view/pages/power/power_settings_model.dart

@@ -20,7 +20,10 @@ class SuspendModel extends SafeChangeNotifier {
         _sessionSettings = settings.lookup(_kSessionSchema),
         _powerService = power,
         _bluetoothService = bluetooth,
-        _networkManager = network;
+        _networkManager = network {
+    _daemonSettings?.addListener(notifyListeners);
+    _sessionSettings?.addListener(notifyListeners);
+  }
 
   final Settings? _daemonSettings;
   final Settings? _sessionSettings;
@@ -53,6 +56,8 @@ class SuspendModel extends SafeChangeNotifier {
 
   @override
   Future<void> dispose() async {
+    _daemonSettings?.removeListener(notifyListeners);
+    _sessionSettings?.removeListener(notifyListeners);
     await _airplaneMode?.cancel();
     await _screenBrightness?.cancel();
     await _keyboardBrightness?.cancel();

lib/view/pages/power/suspend_model.dart

@@ -8,7 +8,17 @@ const _kInterfaceSchema = 'org.gnome.desktop.interface';
 class SuspendModel extends SafeChangeNotifier {
   SuspendModel(SettingsService settings)
       : _daemonSettings = settings.lookup(_kDaemonSchema),
-        _interfaceSettings = settings.lookup(_kInterfaceSchema);
+        _interfaceSettings = settings.lookup(_kInterfaceSchema) {
+    _daemonSettings?.addListener(notifyListeners);
+    _interfaceSettings?.addListener(notifyListeners);
+  }
+
+  @override
+  void dispose() {
+    _daemonSettings?.removeListener(notifyListeners);
+    _interfaceSettings?.removeListener(notifyListeners);
+    super.dispose();
+  }
 
   final Settings? _daemonSettings;
   final Settings? _interfaceSettings;

lib/view/pages/removable_media/removable_media_model.dart

@@ -35,7 +35,15 @@ class RemovableMediaModel extends SafeChangeNotifier {
   final Settings? _removableMediaSettings;
 
   RemovableMediaModel(SettingsService service)
-      : _removableMediaSettings = service.lookup(schemaMediaHandling);
+      : _removableMediaSettings = service.lookup(schemaMediaHandling) {
+    _removableMediaSettings?.addListener(notifyListeners);
+  }
+
+  @override
+  void dispose() {
+    _removableMediaSettings?.removeListener(notifyListeners);
+    super.dispose();
+  }
 
   // autorun-never
   final _autoRunNeverKey = 'autorun-never';

lib/view/pages/sound/sound_model.dart

@@ -8,7 +8,15 @@ class SoundModel extends ChangeNotifier {
   static const _inputFeedbackSounds = 'input-feedback-sounds';
 
   SoundModel(SettingsService service)
-      : _soundSettings = service.lookup(schemaSound);
+      : _soundSettings = service.lookup(schemaSound) {
+    _soundSettings?.addListener(notifyListeners);
+  }
+
+  @override
+  void dispose() {
+    _soundSettings?.removeListener(notifyListeners);
+    super.dispose();
+  }
 
   final Settings? _soundSettings;