Merge branch 'main' into android_TV_implementation

Author: TheNoumanDev

modules/ensemble/lib/action/invoke_api_action.dart

@@ -1,4 +1,5 @@
 import 'package:ensemble/framework/action.dart';
+import 'package:ensemble/framework/apiproviders/firestore/firestore_api_provider.dart';
 import 'package:ensemble/framework/apiproviders/http_api_provider.dart';
 import 'package:ensemble/framework/apiproviders/sse_api_provider.dart';
 import 'package:ensemble/framework/bindings.dart';
@@ -295,7 +296,7 @@ class InvokeAPIController {
 
     String? errorStr;
     dynamic data;
-    if (errorResponse is HttpResponse) {
+    if (errorResponse is HttpResponse || errorResponse is FirestoreResponse) {
       errorResponse.apiState = APIState.error;
       APIResponse apiResponse = APIResponse(response: errorResponse);
       scopeManager.dataContext.addInvokableContext('response', apiResponse);

modules/ensemble/lib/ensemble.dart

@@ -18,6 +18,7 @@ import 'package:ensemble/framework/app_info.dart';
 import 'package:ensemble/framework/logging/console_log_provider.dart';
 import 'package:ensemble/framework/logging/log_manager.dart';
 import 'package:ensemble/framework/logging/log_provider.dart';
+import 'package:ensemble/framework/dotenv_bundle.dart';
 import 'package:ensemble/framework/ensemble_config_service.dart';
 import 'package:ensemble/framework/route_observer.dart';
 import 'package:ensemble/framework/scope.dart';
@@ -244,40 +245,13 @@ class Ensemble extends WithEnsemble with EnsembleRouteObserver {
 
   Future<Map<String, String>> _loadDotEnvConfigFile(String fileName) async {
     try {
-      final content = await rootBundle.loadString(fileName);
-      return _parseDotEnvContent(content);
+      final String content = await rootBundle.loadString(fileName);
+      return parseDotEnvBundleContent(content);
     } catch (_) {
       return {};
     }
   }
 
-  Map<String, String> _parseDotEnvContent(String content) {
-    final Map<String, String> values = {};
-    for (String rawLine in content.split('\n')) {
-      String line = rawLine.trim();
-      if (line.isEmpty || line.startsWith('#')) {
-        continue;
-      }
-      if (line.startsWith('export ')) {
-        line = line.substring('export '.length).trim();
-      }
-
-      final int equalIndex = line.indexOf('=');
-      if (equalIndex <= 0) {
-        continue;
-      }
-
-      final String key = line.substring(0, equalIndex).trim();
-      String value = line.substring(equalIndex + 1).trim();
-      if ((value.startsWith('"') && value.endsWith('"')) ||
-          (value.startsWith("'") && value.endsWith("'"))) {
-        value = value.substring(1, value.length - 1);
-      }
-      values[key] = value;
-    }
-    return values;
-  }
-
   void _mergeWithOverwrite(
       Map<String, dynamic> target, Map<String, String> source) {
     source.forEach((key, value) {

modules/ensemble/lib/framework/dotenv_bundle.dart

@@ -0,0 +1,20 @@
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+
+/// Parses `.env`-style text (e.g. from `rootBundle`) using [Parser] from
+/// `flutter_dotenv` — same rules as [LocalDefinitionProvider] and
+/// [Ensemble.initialize] for quoted values, `\\"`, and `=` inside values.
+Map<String, String> parseDotEnvBundleContent(String content) {
+  const Parser parser = Parser();
+  final Map<String, String> result = <String, String>{};
+  for (final String rawLine in content.split(RegExp(r'\r?\n'))) {
+    final String line = rawLine.replaceAll('\r', '');
+    final Map<String, String> kv =
+        parser.parseOne(line, envMap: Map<String, String>.from(result));
+    if (kv.isNotEmpty) {
+      final String key = kv.keys.single;
+      final String value = kv.values.single;
+      result[key] = value;
+    }
+  }
+  return result;
+}

modules/ensemble/lib/framework/theme/theme_loader.dart

@@ -4,6 +4,7 @@ import 'package:ensemble/framework/theme/theme_manager.dart';
 import 'package:ensemble/framework/tv/tv_focus_theme.dart';
 import 'package:ensemble/model/text_scale.dart';
 import 'package:ensemble/util/utils.dart';
+import 'package:ensemble/widget/image.dart';
 import 'package:flutter/material.dart';
 import 'package:yaml/yaml.dart';
 
@@ -163,6 +164,9 @@ mixin ThemeLoader {
             maxFactor: Utils.optionalDouble(
                 getProp(appOverrides, ['textScale', 'maxFactor']),
                 min: 0)));
+    
+    // Configure image cache settings from App.imageCache
+    _configureImageCache(appOverrides);
 
     // extends ThemeData
     return customTheme.copyWith(extensions: [
@@ -537,6 +541,32 @@ mixin ThemeLoader {
   }
 }
 
+  /// Configures image cache settings from App.imageCache in theme.yaml.
+  ///
+  /// Example YAML:
+  /// ```yaml
+  /// App:
+  ///   imageCache:
+  ///     stalePeriodMinutes: 10080  # 7 days (default: 15 minutes)
+  ///     maxObjects: 500            # (default: 50)
+  /// ```
+  void _configureImageCache(YamlMap? appOverrides) {
+    final imageCache = appOverrides?['imageCache'];
+    if (imageCache == null) {
+      return;
+    }
+
+    final stalePeriodMinutes = Utils.optionalInt(imageCache['stalePeriodMinutes'], min: 1);
+    final maxObjects = Utils.optionalInt(imageCache['maxObjects'], min: 1);
+
+    if (stalePeriodMinutes != null || maxObjects != null) {
+      ImageCacheConfig().configure(
+        stalePeriodMinutes: stalePeriodMinutes,
+        maxObjects: maxObjects,
+      );
+    }
+  }
+
 // add more data to checkbox theme
 extension CheckboxThemeDataExtension on CheckboxThemeData {
   static int? _size;

modules/ensemble/lib/widget/image.dart

@@ -381,15 +381,86 @@ class ImageState extends EWidgetState<EnsembleImage> {
     }
     return fallbackWidget;
   }
+
+}
+
+/// Configuration for image caching behavior.
+/// Can be set at app level via theme.yaml:
+/// ```yaml
+/// App:
+///   imageCache:
+///     stalePeriodMinutes: 10080  # 7 days
+///     maxObjects: 500
+/// ```
+class ImageCacheConfig {
+  static final ImageCacheConfig _instance = ImageCacheConfig._internal();
+
+  factory ImageCacheConfig() => _instance;
+
+  ImageCacheConfig._internal();
+
+  // Default values - 15 minutes stale period, 50 objects max
+  static const int defaultStalePeriodMinutes = 15;
+  static const int defaultMaxObjects = 50;
+
+  int _stalePeriodMinutes = defaultStalePeriodMinutes;
+  int _maxObjects = defaultMaxObjects;
+  bool _initialized = false;
+
+  /// Gets the configured stale period in minutes
+  int get stalePeriodMinutes => _stalePeriodMinutes;
+
+  /// Gets the configured max number of cached objects
+  int get maxObjects => _maxObjects;
+
+  /// Whether the cache config has been explicitly initialized
+  bool get isInitialized => _initialized;
+
+  /// Configure the image cache settings.
+  /// Called from theme loader when parsing App.imageCache settings.
+  void configure({int? stalePeriodMinutes, int? maxObjects}) {
+    if (stalePeriodMinutes != null && stalePeriodMinutes > 0) {
+      _stalePeriodMinutes = stalePeriodMinutes;
+    }
+    if (maxObjects != null && maxObjects > 0) {
+      _maxObjects = maxObjects;
+    }
+    _initialized = true;
+
+    // Reinitialize the cache manager with new settings
+    EnsembleImageCacheManager._reinitialize();
+  }
+
+  /// Reset to default values (useful for testing)
+  void reset() {
+    _stalePeriodMinutes = defaultStalePeriodMinutes;
+    _maxObjects = defaultMaxObjects;
+    _initialized = false;
+    EnsembleImageCacheManager._reinitialize();
+  }
 }
 
 class EnsembleImageCacheManager {
   static const key = 'ensembleImageCacheKey';
-  static CacheManager instance = CacheManager(Config(
-    key,
-    stalePeriod: const Duration(minutes: 15),
-    maxNrOfCacheObjects: 50,
-  ));
+
+  static CacheManager _instance = _createCacheManager();
+
+  static CacheManager get instance => _instance;
+
+  static CacheManager _createCacheManager() {
+    final config = ImageCacheConfig();
+    return CacheManager(Config(
+      key,
+      stalePeriod: Duration(minutes: config.stalePeriodMinutes),
+      maxNrOfCacheObjects: config.maxObjects,
+    ));
+  }
+
+  /// Reinitialize the cache manager with current config settings.
+  /// Called when ImageCacheConfig.configure() is called.
+  static void _reinitialize() {
+    _instance = _createCacheManager();
+  }
 }
 
 class PinchToZoom extends StatefulWidget {