ref!: smush the Prefs and Stows types together

Author: adil192

lib/components/canvas/image/png_editor_image.dart

@@ -140,7 +140,7 @@ class PngEditorImage extends EditorImage {
               Size(descriptor.width.toDouble(), descriptor.height.toDouble()));
 
       if (maxSize == null) {
-        await stows.maxImageSize.waitUntilLoaded();
+        await stows.maxImageSize.waitUntilRead();
         maxSize = Size.square(stows.maxImageSize.value);
       }
       final Size reducedSize = EditorImage.resize(naturalSize, maxSize!);

lib/components/settings/update_manager.dart

@@ -38,7 +38,7 @@ abstract class UpdateManager {
     if (!userTriggered) {
       if (status.value == UpdateStatus.upToDate) {
         // check for updates if not already done
-        await stows.shouldCheckForUpdates.waitUntilLoaded();
+        await stows.shouldCheckForUpdates.waitUntilRead();
         if (!stows.shouldCheckForUpdates.value) return;
         status.value = await _checkForUpdate();
       }

lib/data/editor/pencil_sound.dart

@@ -24,7 +24,7 @@ abstract class PencilSound {
   /// Loads the audio file into the audio cache
   /// and sets the audio context.
   static Future<void> preload() => Future.wait([
-        stows.pencilSound.waitUntilLoaded().then((_) => setAudioContext()),
+        stows.pencilSound.waitUntilRead().then((_) => setAudioContext()),
         _player.audioCache.loadPath(_source),
       ]);
 

lib/data/file_manager/file_manager.dart

@@ -586,7 +586,7 @@ class FileManager {
   }
 
   static Future<List<String>> getRecentlyAccessed() async {
-    await stows.recentFiles.waitUntilLoaded();
+    await stows.recentFiles.waitUntilRead();
     return stows.recentFiles.value
         .map((String filePath) {
           if (filePath.endsWith(Editor.extension)) {

lib/data/nextcloud/nc_http_overrides.dart

@@ -28,7 +28,7 @@ class NcHttpOverrides extends HttpOverrides {
       X509Certificate cert, String host, int port) {
     if (!stows.allowInsecureConnections.loaded || !stows.url.loaded) {
       log.severe(
-          'The Prefs [allowInsecureConnections] or [url] are not loaded yet. Make sure to await pref.waitUntilLoaded() for both.');
+          'The Prefs [allowInsecureConnections] or [url] are not loaded yet. Make sure to await pref.waitUntilRead() for both.');
       return false;
     }
 

lib/data/prefs.dart

@@ -68,13 +68,13 @@ Future<void> main(
   Stows.markAsOnMainIsolate();
 
   await Future.wait([
-    stows.customDataDir.waitUntilLoaded().then((_) => FileManager.init()),
+    stows.customDataDir.waitUntilRead().then((_) => FileManager.init()),
     if (Platform.isWindows || Platform.isLinux || Platform.isMacOS)
       windowManager.ensureInitialized(),
     workerManager.init(),
-    stows.locale.waitUntilLoaded(),
-    stows.url.waitUntilLoaded(),
-    stows.allowInsecureConnections.waitUntilLoaded(),
+    stows.locale.waitUntilRead(),
+    stows.url.waitUntilRead(),
+    stows.allowInsecureConnections.waitUntilRead(),
     PencilShader.init(),
     PencilSound.preload(),
     Printing.info().then((info) {
@@ -106,8 +106,8 @@ Future<void> main(
 }
 
 void startSyncAfterLoaded() async {
-  await stows.username.waitUntilLoaded();
-  await stows.encPassword.waitUntilLoaded();
+  await stows.username.waitUntilRead();
+  await stows.encPassword.waitUntilRead();
 
   stows.username.removeListener(startSyncAfterLoaded);
   stows.encPassword.removeListener(startSyncAfterLoaded);
@@ -174,8 +174,8 @@ void doBackgroundSync() {
     await Future.wait([
       FileManager.init(),
       workerManager.init(),
-      stows.url.waitUntilLoaded(),
-      stows.allowInsecureConnections.waitUntilLoaded(),
+      stows.url.waitUntilRead(),
+      stows.allowInsecureConnections.waitUntilRead(),
     ]);
 
     /// Only sync a few files to avoid using too much data/battery

lib/main_common.dart

@@ -64,12 +64,12 @@ class _NcLoginPageState extends State<NcLoginPage> {
         !stows.key.loaded ||
         !stows.iv.loaded)
       await Future.wait([
-        stows.url.waitUntilLoaded(),
-        stows.username.waitUntilLoaded(),
-        stows.ncPassword.waitUntilLoaded(),
-        stows.encPassword.waitUntilLoaded(),
-        stows.key.waitUntilLoaded(),
-        stows.iv.waitUntilLoaded(),
+        stows.url.waitUntilRead(),
+        stows.username.waitUntilRead(),
+        stows.ncPassword.waitUntilRead(),
+        stows.encPassword.waitUntilRead(),
+        stows.key.waitUntilRead(),
+        stows.iv.waitUntilRead(),
       ]);
 
     recheckCurrentStep();

lib/pages/user/login.dart

@@ -1562,6 +1562,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.12.1"
+  stow:
+    dependency: "direct main"
+    description:
+      name: stow
+      sha256: a22979ca8f484123e6b1eeea5a46c3bbda31cc31db7308cd90f69daeda1cdd90
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  stow_codecs:
+    dependency: "direct main"
+    description:
+      name: stow_codecs
+      sha256: "08d159ff080729135bbf1036cceaecba553387018e083102fc966256f2f74557"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  stow_plain:
+    dependency: "direct main"
+    description:
+      name: stow_plain
+      sha256: "59127f21e5f92e35b48e06471495c8c6762f72afc3252c1151c2f88dd0d9b8ef"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  stow_secure:
+    dependency: "direct main"
+    description:
+      name: stow_secure
+      sha256: "6c498d4f762619418f7e625d17b8382141a1656a57516b485ff4e0e54bc813ea"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
   stream_channel:
     dependency: transitive
     description:

pubspec.lock

@@ -146,6 +146,11 @@ dependencies:
   pdfrx: ^1.0.85
   path: ^1.9.1
 
+  stow: ^0.2.0
+  stow_plain: ^0.2.0
+  stow_secure: ^0.2.0
+  stow_codecs: ^1.1.0
+
 dev_dependencies:
   flutter_test:
     sdk: flutter

pubspec.yaml

@@ -48,7 +48,7 @@ void main() {
       SharedPreferences.setMockInitialValues({});
 
       IPref<int> intPref = PlainPref('testTransformedPref', 0);
-      await intPref.waitUntilLoaded();
+      await intPref.waitUntilRead();
 
       /// Transforms intPref's value to a bool
       TransformedPref<int, bool> boolPref = TransformedPref(
@@ -101,7 +101,7 @@ Future testPref<T>({
 
   // Delete pref if it already exists
   var pref = prefBuilder();
-  await pref.waitUntilLoaded();
+  await pref.waitUntilRead();
   await pref.delete();
 
   // Check that pref.delete() is idempotent (doesn't throw an error)
@@ -120,7 +120,7 @@ Future testPref<T>({
   expect(pref.value, defaultValue);
   expect(prefChanged, false);
 
-  await pref.waitUntilLoaded();
+  await pref.waitUntilRead();
   expect(pref.loaded, true);
   expect(pref.value, defaultValue);
   expect(prefChanged, false);
@@ -139,7 +139,7 @@ Future testPref<T>({
   pref = prefBuilder();
   expect(pref.loaded, false);
   expect(pref.value, defaultValue);
-  await pref.waitUntilLoaded();
+  await pref.waitUntilRead();
   expect(pref.loaded, true);
   if (useJson) {
     expect(json.encode(pref.value), json.encode(alteredValue));