store [nfc]: Simplify name GlobalStore.settings, from globalSettings

It's natural that the settings found directly on the global store
are the global settings.

Author: gnprice

lib/model/store.dart

@@ -58,23 +58,21 @@ abstract class GlobalStore extends ChangeNotifier {
     required GlobalSettingsData globalSettings,
     required Iterable<Account> accounts,
   })
-    : settingsNotifier = GlobalSettingsStore(data: globalSettings),
+    : settings = GlobalSettingsStore(data: globalSettings),
       _accounts = Map.fromEntries(accounts.map((a) => MapEntry(a.id, a)));
 
-  final GlobalSettingsStore settingsNotifier; // TODO rename as the store
-
   /// The store for the user's account-independent settings.
   ///
   /// When the settings data changes, the [GlobalSettingsStore] will notify
   /// its listeners, but the [GlobalStore] will not notify its own listeners.
   /// Consider using [GlobalStoreWidget.settingsOf], which automatically
   /// subscribes to changes in the [GlobalSettingsStore].
-  GlobalSettingsStore get globalSettings => settingsNotifier;
+  final GlobalSettingsStore settings;
 
   /// Update the global settings in the store.
   Future<void> updateGlobalSettings(GlobalSettingsCompanion data) async {
     await doUpdateGlobalSettings(data);
-    settingsNotifier.update(data);
+    settings.update(data);
   }
 
   /// Update the global settings in the underlying data store.

lib/widgets/store.dart

@@ -110,7 +110,7 @@ class _GlobalStoreInheritedWidget extends InheritedNotifier<GlobalStore> {
     required Widget child,
   }) : super(notifier: store,
          child: _GlobalSettingsStoreInheritedWidget(
-           store: store.settingsNotifier, child: child));
+           store: store.settings, child: child));
 
   GlobalStore get store => notifier!;
 }

test/model/settings_test.dart

@@ -17,37 +17,37 @@ void main() {
     testAndroidIos('globalSettings.browserPreference is null; use our per-platform defaults for HTTP links', () {
       final globalStore = eg.globalStore(globalSettings: GlobalSettingsData(
         browserPreference: null));
-      check(globalStore).globalSettings.getUrlLaunchMode(httpLink).equals(
+      check(globalStore).settings.getUrlLaunchMode(httpLink).equals(
         defaultTargetPlatform == TargetPlatform.android
           ? UrlLaunchMode.inAppBrowserView : UrlLaunchMode.externalApplication);
     });
 
     testAndroidIos('globalSettings.browserPreference is null; use our per-platform defaults for non-HTTP links', () {
       final globalStore = eg.globalStore(globalSettings: GlobalSettingsData(
         browserPreference: null));
-      check(globalStore).globalSettings.getUrlLaunchMode(nonHttpLink).equals(
+      check(globalStore).settings.getUrlLaunchMode(nonHttpLink).equals(
         defaultTargetPlatform == TargetPlatform.android
           ? UrlLaunchMode.platformDefault : UrlLaunchMode.externalApplication);
     });
 
     testAndroidIos('globalSettings.browserPreference is inApp; follow the user preference for http links', () {
       final globalStore = eg.globalStore(globalSettings: GlobalSettingsData(
         browserPreference: BrowserPreference.inApp));
-      check(globalStore).globalSettings.getUrlLaunchMode(httpLink).equals(
+      check(globalStore).settings.getUrlLaunchMode(httpLink).equals(
         UrlLaunchMode.inAppBrowserView);
     });
 
     testAndroidIos('globalSettings.browserPreference is inApp; use platform default for non-http links', () {
       final globalStore = eg.globalStore(globalSettings: GlobalSettingsData(
         browserPreference: BrowserPreference.inApp));
-      check(globalStore).globalSettings.getUrlLaunchMode(nonHttpLink).equals(
+      check(globalStore).settings.getUrlLaunchMode(nonHttpLink).equals(
         UrlLaunchMode.platformDefault);
     });
 
     testAndroidIos('globalSettings.browserPreference is external; follow the user preference', () {
       final globalStore = eg.globalStore(globalSettings: GlobalSettingsData(
         browserPreference: BrowserPreference.external));
-      check(globalStore).globalSettings.getUrlLaunchMode(httpLink).equals(
+      check(globalStore).settings.getUrlLaunchMode(httpLink).equals(
         UrlLaunchMode.externalApplication);
     });
   });

test/model/store_checks.dart

@@ -35,7 +35,7 @@ extension GlobalSettingsStoreChecks on Subject<GlobalSettingsStore> {
 }
 
 extension GlobalStoreChecks on Subject<GlobalStore> {
-  Subject<GlobalSettingsStore> get globalSettings => has((x) => x.globalSettings, 'globalSettings');
+  Subject<GlobalSettingsStore> get settings => has((x) => x.settings, 'settings');
   Subject<Iterable<Account>> get accounts => has((x) => x.accounts, 'accounts');
   Subject<Iterable<int>> get accountIds => has((x) => x.accountIds, 'accountIds');
   Subject<Iterable<({ int accountId, Account account })>> get accountEntries => has((x) => x.accountEntries, 'accountEntries');

test/model/store_test.dart

@@ -35,17 +35,17 @@ void main() {
   group('GlobalStore.updateGlobalSettings', () {
     test('smoke', () async {
       final globalStore = eg.globalStore();
-      check(globalStore).globalSettings.themeSetting.equals(null);
+      check(globalStore).settings.themeSetting.equals(null);
 
       await globalStore.updateGlobalSettings(
         GlobalSettingsCompanion(themeSetting: Value(ThemeSetting.dark)));
-      check(globalStore).globalSettings.themeSetting.equals(ThemeSetting.dark);
+      check(globalStore).settings.themeSetting.equals(ThemeSetting.dark);
     });
 
     test('should notify listeners', () async {
       int notifyCount = 0;
       final globalStore = eg.globalStore();
-      globalStore.settingsNotifier.addListener(() => notifyCount++);
+      globalStore.settings.addListener(() => notifyCount++);
       check(notifyCount).equals(0);
 
       await globalStore.updateGlobalSettings(

test/widgets/settings_test.dart

@@ -45,7 +45,7 @@ void main() {
             .checked.equals(title == expectedCheckedTitle);
       }
       check(testBinding.globalStore)
-        .globalSettings.themeSetting.equals(expectedThemeSetting);
+        .settings.themeSetting.equals(expectedThemeSetting);
     }
 
     testWidgets('smoke', (tester) async {
@@ -97,7 +97,7 @@ void main() {
       check(tester.widget<SwitchListTile>(useInAppBrowserSwitchFinder))
         .value.equals(checked);
       check(testBinding.globalStore)
-        .globalSettings.browserPreference.equals(expectedBrowserPreference);
+        .settings.browserPreference.equals(expectedBrowserPreference);
     }
 
     testWidgets('smoke', (tester) async {

test/widgets/theme_test.dart

@@ -111,7 +111,7 @@ void main() {
 
     await tester.pumpWidget(const TestZulipApp(child: Placeholder()));
     await tester.pump();
-    check(testBinding.globalStore).globalSettings.themeSetting.isNull();
+    check(testBinding.globalStore).settings.themeSetting.isNull();
 
     final element = tester.element(find.byType(Placeholder));
     check(zulipThemeData(element)).brightness.equals(Brightness.light);
@@ -129,7 +129,7 @@ void main() {
 
     await tester.pumpWidget(const TestZulipApp(child: Placeholder()));
     await tester.pump();
-    check(testBinding.globalStore).globalSettings.themeSetting.isNull();
+    check(testBinding.globalStore).settings.themeSetting.isNull();
 
     final element = tester.element(find.byType(Placeholder));
     check(zulipThemeData(element)).brightness.equals(Brightness.light);