settings [nfc]: Move the settings data out to GlobalSettingsStore

Author: gnprice

lib/model/settings.dart

@@ -90,13 +90,17 @@ extension GlobalSettingsHelpers on GlobalSettingsData {
 ///
 /// From UI code, use [GlobalStoreWidget.settingsOf] to get hold of
 /// the settings data.
-///
-/// (At the moment the actual settings data lives on [GlobalStore];
-/// but when the settings change, the notification goes to listeners
-/// of this class, not [GlobalStore].  Soon the actual data will
-/// move to this class too.)
 class GlobalSettingsStore extends ChangeNotifier {
-  // TODO move the actual settings content to this class
+  GlobalSettingsStore({required GlobalSettingsData data}) : _data = data;
+
+  /// A cache of the [GlobalSettingsData] singleton in the underlying data store.
+  GlobalSettingsData get data => _data;
+  GlobalSettingsData _data;
 
-  void markUpdated() => notifyListeners();
+  /// (Should only be called by [GlobalStore].)
+  void update(GlobalSettingsCompanion data) {
+    // TODO move responsibility for updating the DB to this class too
+    _data = _data.copyWithCompanion(data);
+    notifyListeners();
+  }
 }

lib/model/store.dart

@@ -58,25 +58,22 @@ abstract class GlobalStore extends ChangeNotifier {
     required GlobalSettingsData globalSettings,
     required Iterable<Account> accounts,
   })
-    : _globalSettings = globalSettings,
+    : settingsNotifier = GlobalSettingsStore(data: globalSettings),
       _accounts = Map.fromEntries(accounts.map((a) => MapEntry(a.id, a)));
 
-  // TODO use this as the actual store
-  final GlobalSettingsStore settingsNotifier = GlobalSettingsStore();
+  final GlobalSettingsStore settingsNotifier; // TODO rename as the store
 
   /// A cache of the [GlobalSettingsData] singleton in the underlying data store.
   ///
   /// To be notified for changes to this value, subscribe to [settingsNotifier]
   /// (usually by calling [GlobalStoreWidget.settingsOf]).
   /// The [GlobalStore] itself will not notify its own listeners.
-  GlobalSettingsData get globalSettings => _globalSettings;
-  GlobalSettingsData _globalSettings;
+  GlobalSettingsData get globalSettings => settingsNotifier.data;
 
   /// Update the global settings in the store.
   Future<void> updateGlobalSettings(GlobalSettingsCompanion data) async {
     await doUpdateGlobalSettings(data);
-    _globalSettings = _globalSettings.copyWithCompanion(data);
-    settingsNotifier.markUpdated();
+    settingsNotifier.update(data);
   }
 
   /// Update the global settings in the underlying data store.