Merge pull request #256 from provokateurin/refactor/storage-initialization

neon: Move storage initialization to blocs

packages/neon/neon/lib/neon.dart

@@ -130,14 +130,13 @@ Future runNeon({
   final packageInfo = await PackageInfo.fromPlatform();
 
   final globalOptions = GlobalOptions(
-    AppStorage('global', sharedPreferences),
+    sharedPreferences,
     packageInfo,
   );
 
   final accountsBloc = AccountsBloc(
     requestManager,
     platform,
-    AppStorage('accounts', sharedPreferences),
     sharedPreferences,
     globalOptions,
     allAppImplementations,

packages/neon/neon/lib/src/blocs/accounts.dart

@@ -16,7 +16,6 @@ class AccountsBloc extends Bloc implements AccountsBlocEvents, AccountsBlocState
   AccountsBloc(
     this._requestManager,
     this._platform,
-    this._storage,
     this._sharedPreferences,
     this._globalOptions,
     this._allAppImplementations,
@@ -53,7 +52,7 @@ class AccountsBloc extends Bloc implements AccountsBlocEvents, AccountsBlocState
 
   final RequestManager _requestManager;
   final NeonPlatform _platform;
-  final AppStorage _storage;
+  late final AppStorage _storage = AppStorage('accounts', _sharedPreferences);
   final SharedPreferences _sharedPreferences;
   final GlobalOptions _globalOptions;
   final List<AppImplementation> _allAppImplementations;

packages/neon/neon/lib/src/utils/global_options.dart

@@ -4,7 +4,7 @@ const unifiedPushNextPushID = 'org.unifiedpush.distributor.nextpush';
 
 class GlobalOptions {
   GlobalOptions(
-    this._storage,
+    this._sharedPreferences,
     this._packageInfo,
   ) {
     themeMode.stream.listen((final value) {
@@ -47,7 +47,8 @@ class GlobalOptions {
     });
   }
 
-  final AppStorage _storage;
+  final SharedPreferences _sharedPreferences;
+  late final AppStorage _storage = AppStorage('global', _sharedPreferences);
   final PackageInfo _packageInfo;
   final _themeOLEDAsDarkEnabledSubject = BehaviorSubject<bool>();
   final _pushNotificationsEnabledEnabledSubject = BehaviorSubject<bool>();