add adaptive_scaffold

mobile-v2/lib/domain/store_manager.dart

@@ -1,8 +1,8 @@
 import 'dart:async';
 
-import 'package:collection/collection.dart';
 import 'package:immich_mobile/domain/interfaces/store.interface.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/service_locator.dart';
 import 'package:immich_mobile/utils/mixins/log_context.mixin.dart';
 
 class StoreKeyNotFoundException implements Exception {
@@ -13,39 +13,32 @@ class StoreKeyNotFoundException implements Exception {
   String toString() => "Key '${key.name}' not found in Store";
 }
 
-/// Key-value store for individual items enumerated in StoreKey.
-/// Supports String, int and JSON-serializable Objects
-/// Can be used concurrently from multiple isolates
+/// Key-value cache for individual items enumerated in StoreKey.
 class StoreManager with LogContext {
   late final IStoreRepository _db;
-  // This cannot be final or else dart would bite when we access the field in the factory method
-  StreamSubscription? _subscription;
+  late final StreamSubscription _subscription;
   final Map<int, dynamic> _cache = {};
 
-  StoreManager._internal();
-  static final StoreManager _instance = StoreManager._internal();
-
-  factory StoreManager(IStoreRepository db) {
-    if (_instance._subscription == null) {
-      _instance._db = db;
-      _instance._populateCache();
-      _instance._subscription =
-          _instance._db.watchStore().listen(_instance._onChangeListener);
-    }
-    return _instance;
+  StoreManager(IStoreRepository db) {
+    _db = db;
+    _subscription = _db.watchStore().listen(_onChangeListener);
+    _populateCache();
   }
 
   void dispose() {
-    _subscription?.cancel();
+    _subscription.cancel();
   }
 
   FutureOr<void> _populateCache() async {
     for (StoreKey key in StoreKey.values) {
-      final StoreValue? value = await _db.getValue(key);
+      final value = await _db.getValue(key);
       if (value != null) {
         _cache[key.id] = value;
       }
     }
+
+    /// Signal ready once the cache is populated
+    di.signalReady(this);
   }
 
   /// clears all values from this store (cache and DB), only for testing!
@@ -55,11 +48,11 @@ class StoreManager with LogContext {
   }
 
   /// Returns the stored value for the given key (possibly null)
-  T? tryGet<T>(StoreKey key) => _cache[key.id] as T?;
+  T? tryGet<T, U>(StoreKey<T, U> key) => _cache[key.id] as T?;
 
   /// Returns the stored value for the given key or if null the [defaultValue]
   /// Throws a [StoreKeyNotFoundException] if both are null
-  T get<T>(StoreKey key, [T? defaultValue]) {
+  T get<T, U>(StoreKey<T, U> key, [T? defaultValue]) {
     final value = _cache[key.id] ?? defaultValue;
     if (value == null) {
       throw StoreKeyNotFoundException(key);
@@ -68,17 +61,17 @@ class StoreManager with LogContext {
   }
 
   /// Watches a specific key for changes
-  Stream<T?> watch<T>(StoreKey key) => _db.watchValue(key);
+  Stream<T?> watch<T, U>(StoreKey<T, U> key) => _db.watchValue(key);
 
   /// Stores the value synchronously in the cache and asynchronously in the DB
-  FutureOr<void> put<T>(StoreKey key, T value) async {
-    if (_cache[key.id] == value) return Future.value();
+  FutureOr<bool> put<T, U>(StoreKey<T, U> key, T value) async {
+    if (_cache[key.id] == value) return Future.value(true);
     _cache[key.id] = value;
     return await _db.setValue(key, value);
   }
 
   /// Removes the value synchronously from the cache and asynchronously from the DB
-  Future<void> delete(StoreKey key) async {
+  Future<void> delete<T, U>(StoreKey<T, U> key) async {
     if (_cache[key.id] == null) return Future.value();
     _cache.remove(key.id);
     return await _db.deleteValue(key);
@@ -87,12 +80,9 @@ class StoreManager with LogContext {
   /// Updates the state in cache if a value is updated in any isolate
   void _onChangeListener(List<StoreValue>? data) {
     if (data != null) {
-      for (StoreValue value in data) {
-        final key = StoreKey.values.firstWhereOrNull((e) => e.id == value.id);
-        if (key != null) {
-          _cache[value.id] = value.extract(key.type);
-        } else {
-          log.warning("No key available for value Id - ${value.id}");
+      for (StoreValue storeValue in data) {
+        if (storeValue.value != null) {
+          _cache[storeValue.id] = storeValue.value;
         }
       }
     }