Rebase: onto develop resolved conflicts...

...according to the latest dynamic env.
Added: default type in json files


Fixed: timeout_limit in json files

- 20000 
+ 20
Fixed: static modifier in the LocalStorage abstract class

Author: we-mohd-i001

assets/env/develop.json

@@ -7,7 +7,7 @@
   "backend_url": "",
   "api_url": "",
   "firebase_id": null,
-  "timeout_limit": 20000,
+  "timeout_limit": 20,
   "enable_local_logs": false,
   "enable_cloud_logs": false,
   "enable_api_log_interceptor": false,
@@ -17,5 +17,6 @@
   "one_signal_config": null,
   "pusher_config": null,
   "show_debug_panel": true,
+  "local_storage_type": "none",
   "debug_panel_color": 3422552064
-}
+}

assets/env/production.json

@@ -7,7 +7,7 @@
   "backend_url": "",
   "api_url": "",
   "firebase_id": null,
-  "timeout_limit": 20000,
+  "timeout_limit": 20,
   "enable_local_logs": false,
   "enable_cloud_logs": false,
   "enable_api_log_interceptor": false,
@@ -17,5 +17,6 @@
   "one_signal_config": null,
   "pusher_config": null,
   "show_debug_panel": false,
+  "local_storage_type": "none",
   "debug_panel_color": 3422552064
-}
+}

assets/env/staging.json

@@ -7,7 +7,7 @@
   "backend_url": "",
   "api_url": "",
   "firebase_id": null,
-  "timeout_limit": 20000,
+  "timeout_limit": 20,
   "enable_local_logs": false,
   "enable_cloud_logs": false,
   "enable_api_log_interceptor": false,
@@ -17,5 +17,6 @@
   "one_signal_config": null,
   "pusher_config": null,
   "show_debug_panel": true,
+  "local_storage_type": "none",
   "debug_panel_color": 3422552064
-}
+}

lib/vaahextendflutter/base/base_controller.dart

@@ -11,6 +11,7 @@ import 'package:sentry_flutter/sentry_flutter.dart';
 
 import '../app_theme.dart';
 import '../env/env.dart';
+import '../env/storage.dart';
 import '../services/api.dart';
 import '../services/dynamic_links.dart';
 import '../services/notification/internal/notification.dart';

lib/vaahextendflutter/env/env.dart

@@ -9,6 +9,7 @@ import 'package:json_annotation/json_annotation.dart';
 import '../services/logging_library/logging_library.dart';
 import 'logging.dart';
 import 'notification.dart';
+import 'storage.dart';
 
 part 'env.g.dart';
 
@@ -58,6 +59,7 @@ class EnvironmentConfig {
     this.oneSignalConfig,
     this.pusherConfig,
     required this.showDebugPanel,
+    required this.localStorageType,
     required this.debugPanelColor,
   });
 
@@ -78,6 +80,7 @@ class EnvironmentConfig {
   final OneSignalConfig? oneSignalConfig;
   final PusherConfig? pusherConfig;
   final bool showDebugPanel;
+  final LocalStorageType localStorageType;
   @JsonKey(fromJson: _colorFromJson, toJson: _colorToJson)
   final Color debugPanelColor;
 
@@ -119,6 +122,7 @@ class EnvironmentConfig {
       pushNotificationsServiceType: PushNotificationsServiceType.none,
       internalNotificationsServiceType: InternalNotificationsServiceType.none,
       showDebugPanel: true,
+      localStorageType: LocalStorageType.none,
       debugPanelColor: Colors.black.withOpacity(0.8),
     );
   }

lib/vaahextendflutter/env/env.g.dart

@@ -0,0 +1 @@
+enum LocalStorageType { hive, flutterSecureStorage, none }

lib/vaahextendflutter/env/storage.dart

@@ -1,11 +1,12 @@
-import '../../../env.dart';
+import '../../../env/env.dart';
+import '../../../env/storage.dart';
 import 'services/base_service.dart';
 import 'services/flutter_secure_storage.dart';
 import 'services/hive.dart';
 import 'services/no_op_storage.dart';
 
 LocalStorageService get instanceLocal {
-  final EnvironmentConfig envConfig = EnvironmentConfig.getEnvConfig();
+  final EnvironmentConfig envConfig = EnvironmentConfig.getConfig;
   switch (envConfig.localStorageType) {
     case LocalStorageType.hive:
       return LocalStorageWithHive();
@@ -31,7 +32,7 @@ abstract class LocalStorage {
   /// LocalStorage.add('posts');
   /// //used only with Hive
   /// ```
-  void add(String collectionName) {
+  static void add(String collectionName) {
     return _instanceLocal.add(collectionName);
   }