settings [nfc]: Give settings specific setter methods

This makes the call sites significantly nicer to read.

Relatedly, it turns the specifics of how the settings are
represented in the database into more of an implementation detail
of the settings store.

Author: gnprice

lib/model/settings.dart

@@ -62,12 +62,16 @@ class GlobalSettingsStore extends ChangeNotifier {
 
   /// The user's choice of [ThemeSetting];
   /// null means the device-level choice of theme.
+  ///
+  /// See also [setThemeSetting].
   ThemeSetting? get themeSetting => _data.themeSetting;
 
   /// The user's choice of [BrowserPreference];
   /// null means use our default choice.
   ///
   /// Consider using [effectiveBrowserPreference] or [getUrlLaunchMode].
+  ///
+  /// See also [setBrowserPreference].
   BrowserPreference? get browserPreference => _data.browserPreference;
 
   /// The value of [BrowserPreference] to use:
@@ -110,10 +114,19 @@ class GlobalSettingsStore extends ChangeNotifier {
     }
   }
 
-  /// Update the global settings in the store.
-  Future<void> update(GlobalSettingsCompanion data) async {
+  Future<void> _update(GlobalSettingsCompanion data) async {
     await _backend.doUpdateGlobalSettings(data);
     _data = _data.copyWithCompanion(data);
     notifyListeners();
   }
+
+  /// Set [themeSetting], persistently for future runs of the app.
+  Future<void> setThemeSetting(ThemeSetting? value) async {
+    await _update(GlobalSettingsCompanion(themeSetting: Value(value)));
+  }
+
+  /// Set [browserPreference], persistently for future runs of the app.
+  Future<void> setBrowserPreference(BrowserPreference? value) async {
+    await _update(GlobalSettingsCompanion(browserPreference: Value(value)));
+  }
 }

lib/widgets/settings.dart

@@ -1,8 +1,6 @@
-import 'package:drift/drift.dart' hide Column;
 import 'package:flutter/material.dart';
 
 import '../generated/l10n/zulip_localizations.dart';
-import '../model/database.dart';
 import '../model/settings.dart';
 import 'app_bar.dart';
 import 'page.dart';
@@ -34,8 +32,7 @@ class _ThemeSetting extends StatelessWidget {
 
   void _handleChange(BuildContext context, ThemeSetting? newThemeSetting) {
     final globalSettings = GlobalStoreWidget.settingsOf(context);
-    globalSettings.update(
-      GlobalSettingsCompanion(themeSetting: Value(newThemeSetting)));
+    globalSettings.setThemeSetting(newThemeSetting);
   }
 
   @override
@@ -62,9 +59,9 @@ class _BrowserPreferenceSetting extends StatelessWidget {
 
   void _handleChange(BuildContext context, bool newOpenLinksWithInAppBrowser) {
     final globalSettings = GlobalStoreWidget.settingsOf(context);
-    globalSettings.update(GlobalSettingsCompanion(browserPreference: Value(
+    globalSettings.setBrowserPreference(
       newOpenLinksWithInAppBrowser ? BrowserPreference.inApp
-                                   : BrowserPreference.external)));
+                                   : BrowserPreference.external);
   }
 
   @override

test/model/store_test.dart

@@ -15,7 +15,6 @@ import 'package:zulip/api/route/messages.dart';
 import 'package:zulip/api/route/realm.dart';
 import 'package:zulip/log.dart';
 import 'package:zulip/model/actions.dart';
-import 'package:zulip/model/database.dart';
 import 'package:zulip/model/settings.dart';
 import 'package:zulip/model/store.dart';
 import 'package:zulip/notifications/receive.dart';
@@ -37,8 +36,7 @@ void main() {
       final globalStore = eg.globalStore();
       check(globalStore).settings.themeSetting.equals(null);
 
-      await globalStore.settings.update(
-        GlobalSettingsCompanion(themeSetting: Value(ThemeSetting.dark)));
+      await globalStore.settings.setThemeSetting(ThemeSetting.dark);
       check(globalStore).settings.themeSetting.equals(ThemeSetting.dark);
     });
 
@@ -48,8 +46,7 @@ void main() {
       globalStore.settings.addListener(() => notifyCount++);
       check(notifyCount).equals(0);
 
-      await globalStore.settings.update(
-        GlobalSettingsCompanion(themeSetting: Value(ThemeSetting.light)));
+      await globalStore.settings.setThemeSetting(ThemeSetting.light);
       check(notifyCount).equals(1);
     });
 

test/widgets/content_test.dart

@@ -8,7 +8,6 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:zulip/api/core.dart';
 import 'package:zulip/model/content.dart';
-import 'package:zulip/model/database.dart';
 import 'package:zulip/model/narrow.dart';
 import 'package:zulip/model/settings.dart';
 import 'package:zulip/model/store.dart';
@@ -801,9 +800,8 @@ void main() {
     }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));
 
     testWidgets('follow browser preference setting to open URL', (tester) async {
-      await testBinding.globalStore.settings.update(
-        GlobalSettingsData(
-          browserPreference: BrowserPreference.inApp).toCompanion(false));
+      await testBinding.globalStore.settings
+        .setBrowserPreference(BrowserPreference.inApp);
       await prepare(tester,
         '<p><a href="https://example/">hello</a></p>');
 

test/widgets/settings_test.dart

@@ -2,7 +2,6 @@ import 'package:checks/checks.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:zulip/model/database.dart';
 import 'package:zulip/model/settings.dart';
 import 'package:zulip/widgets/settings.dart';
 
@@ -51,8 +50,7 @@ void main() {
     testWidgets('smoke', (tester) async {
       debugBrightnessOverride = Brightness.light;
 
-      await testBinding.globalStore.settings.update(
-        GlobalSettingsData(themeSetting: ThemeSetting.light).toCompanion(false));
+      await testBinding.globalStore.settings.setThemeSetting(ThemeSetting.light);
       await prepare(tester);
       final element = tester.element(find.byType(SettingsPage));
       check(Theme.of(element)).brightness.equals(Brightness.light);
@@ -101,9 +99,8 @@ void main() {
     }
 
     testWidgets('smoke', (tester) async {
-      await testBinding.globalStore.settings.update(
-        GlobalSettingsData(
-          browserPreference: BrowserPreference.external).toCompanion(false));
+      await testBinding.globalStore.settings
+        .setBrowserPreference(BrowserPreference.external);
       await prepare(tester);
       checkSwitchAndGlobalSettings(tester,
         checked: false, expectedBrowserPreference: BrowserPreference.external);

test/widgets/store_test.dart

@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_checks/flutter_checks.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:zulip/model/actions.dart';
-import 'package:zulip/model/database.dart';
 import 'package:zulip/model/settings.dart';
 import 'package:zulip/model/store.dart';
 import 'package:zulip/widgets/app.dart';
@@ -106,8 +105,7 @@ void main() {
 
   testWidgets('GlobalStoreWidget.settingsOf updates on settings update', (tester) async {
     addTearDown(testBinding.reset);
-    await testBinding.globalStore.settings.update(
-      GlobalSettingsCompanion(themeSetting: Value(ThemeSetting.dark)));
+    await testBinding.globalStore.settings.setThemeSetting(ThemeSetting.dark);
 
     ThemeSetting? themeSetting;
     await tester.pumpWidget(
@@ -120,8 +118,7 @@ void main() {
     await tester.pump();
     check(themeSetting).equals(ThemeSetting.dark);
 
-    await testBinding.globalStore.settings.update(
-      GlobalSettingsCompanion(themeSetting: Value(ThemeSetting.light)));
+    await testBinding.globalStore.settings.setThemeSetting(ThemeSetting.light);
     await tester.pump();
     check(themeSetting).equals(ThemeSetting.light);
   });

test/widgets/theme_test.dart

@@ -1,9 +1,7 @@
 import 'package:checks/checks.dart';
-import 'package:drift/drift.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:zulip/model/database.dart';
 import 'package:zulip/model/settings.dart';
 import 'package:zulip/widgets/channel_colors.dart';
 import 'package:zulip/widgets/text.dart';
@@ -134,12 +132,10 @@ void main() {
     final element = tester.element(find.byType(Placeholder));
     check(zulipThemeData(element)).brightness.equals(Brightness.light);
 
-    await testBinding.globalStore.settings.update(
-      const GlobalSettingsCompanion(themeSetting: Value(ThemeSetting.dark)));
+    await testBinding.globalStore.settings.setThemeSetting(ThemeSetting.dark);
     check(zulipThemeData(element)).brightness.equals(Brightness.dark);
 
-    await testBinding.globalStore.settings.update(
-      const GlobalSettingsCompanion(themeSetting: Value(null)));
+    await testBinding.globalStore.settings.setThemeSetting(null);
     check(zulipThemeData(element)).brightness.equals(Brightness.light);
   });