Merge branch 'main' into triple-state-switch-widget

Author: vinothvino42

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,16 @@
+---
+name: Feature request
+about: Suggest a new feature to the framework
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+
+**Describe the solution you'd like if possible share the expected EDL**
+
+**Describe alternatives you've considered**
+
+**Additional context could be screen shot, discord conversation, figma file**

lib/action/upload_files_action.dart

@@ -85,9 +85,11 @@ Future<void> uploadFiles({
       }
     });
   }
+  String rawUrl = apiDefinition['url']?.toString().trim() ??
+      apiDefinition['uri']?.toString().trim() ??
+      '';
 
-  String url =
-      HttpUtils.resolveUrl(dataContext, apiDefinition['uri'].toString().trim());
+  String url = HttpUtils.resolveUrl(dataContext, rawUrl);
   String method = apiDefinition['method']?.toString().toUpperCase() ?? 'POST';
   final fileResponse = action.id == null
       ? null

lib/framework/theme/theme_loader.dart

@@ -12,9 +12,13 @@ mixin ThemeLoader {
   final Color _buttonBorderOutlineColor = Colors.black12;
 
   ThemeData getAppTheme(YamlMap? overrides) {
+    final seedColor = Utils.getColor(overrides?['Colors']?['seed']);
+
     ThemeData defaultTheme = ThemeData(
       useMaterial3: true,
-      colorScheme: defaultColorScheme,
+      colorScheme: seedColor == null
+          ? defaultColorScheme
+          : ColorScheme.fromSeed(seedColor: seedColor),
       scaffoldBackgroundColor:
           Utils.getColor(overrides?['Screen']?['backgroundColor']) ??
               DesignSystem.scaffoldBackgroundColor,
@@ -94,13 +98,6 @@ mixin ThemeLoader {
       ),
     );
 
-    final seedColor = Utils.getColor(overrides?['Colors']?['seed']);
-
-    if (seedColor != null) {
-      defaultTheme = defaultTheme.copyWith(
-          colorScheme: ColorScheme.fromSeed(seedColor: seedColor));
-    }
-
     final customColorSchema = defaultTheme.colorScheme.copyWith(
       primary: Utils.getColor(overrides?['Colors']?['primary']),
       onPrimary: Utils.getColor(overrides?['Colors']?['onPrimary']),

lib/util/utils.dart

@@ -621,12 +621,11 @@ class Utils {
     return int.tryParse(value);
   }
 
-  static final onlyExpression = RegExp(
-      r'''^\${([a-z_-\d\s.,:?!$@&|<>\+/*|%^="'\(\)\[\]]+)}$''',
-      caseSensitive: false);
-  static final containExpression = RegExp(
-      r'''\${([a-z_-\d\s.,:?!$@&|<>\+/*|%^="'\(\)\[\]]+)}''',
-      caseSensitive: false);
+  static final onlyExpression =
+      RegExp(r'''^\$\{([^}]+)\}$''', caseSensitive: false);
+
+  static final containExpression =
+      RegExp(r'''\$\{([^}{]+(?:\{[^}{]*\}[^}{]*)*)\}''', caseSensitive: false);
 
   static final i18nExpression = RegExp(r'\br@([\w\.]+)', caseSensitive: false);
 

lib/widget/calendar.dart

@@ -75,6 +75,7 @@ class EnsembleCalendar extends StatefulWidget
           duration: const Duration(milliseconds: 300), curve: Curves.easeOut),
       'addRowSpan': (value) => setRowSpan(value),
       'update': () => _controller.update(),
+      'clearRange': () => clearRange(),
     };
   }
 
@@ -119,6 +120,12 @@ class EnsembleCalendar extends StatefulWidget
     };
   }
 
+  void clearRange() {
+    _controller.rangeStart = null;
+    _controller.rangeEnd = null;
+    _controller.range = null;
+  }
+
   void setRowSpanItemTemplate(dynamic rowSpanData) {
     try {
       if (rowSpanData is! Map ||
@@ -308,9 +315,6 @@ class EnsembleCalendar extends StatefulWidget
       updatedDisabledDays.remove(date);
     }
 
-    _controller.rangeStart = null;
-    _controller.rangeEnd = null;
-    _controller.range = null;
     _controller.selectedDays.value = updatedDisabledDays;
   }