BugFixes for Stac DSL

examples/movie_app/assets/jsons/screens/onboarding_screen.json

@@ -22,6 +22,7 @@
                     "height": 500,
                     "decoration": {
                         "gradient": {
+                            "gradientType": "linear",
                             "colors": [
                                 "#00050608",
                                 "#050608",
@@ -55,7 +56,7 @@
                                     "style": "displayMedium",
                                     "children": [
                                         {
-                                            "data": "\nDatabase",
+                                            "text": "\nDatabase",
                                             "style": {
                                                 "color": "primary"
                                             }

examples/movie_app/lib/main.dart

@@ -98,14 +98,14 @@ final Map<String, dynamic> darkThemeJson = {
     "minimumSize": {"width": 120, "height": 40},
     "textStyle": {"fontSize": 16, "fontWeight": "w500", "height": 1.3},
     "padding": {"left": 10, "right": 10, "top": 8, "bottom": 8},
-    "shape": {"borderRadius": 8},
+    "shape": {"type": "roundedRectangleBorder", "borderRadius": 8},
   },
   "outlinedButtonTheme": {
     "minimumSize": {"width": 120, "height": 40},
     "textStyle": {"fontSize": 16, "fontWeight": "w500", "height": 1.3},
     "padding": {"left": 10, "right": 10, "top": 8, "bottom": 8},
     "side": {"color": "#95E183", "width": 1.0},
-    "shape": {"borderRadius": 8},
+    "shape": {"type": "roundedRectangleBorder", "borderRadius": 8},
   },
   "dividerTheme": {"color": "#24FFFFFF", "thickness": 1},
 };

packages/stac/lib/src/parsers/painting/stac_text_style_parser.dart

@@ -4,28 +4,67 @@ import 'package:stac/src/utils/color_utils.dart';
 import 'package:stac_core/stac_core.dart';
 
 extension StacTextStyleParser on StacTextStyle {
-  TextStyle parse(BuildContext context) {
-    return TextStyle(
-      inherit: inherit ?? true,
-      color: color?.toColor(context),
-      backgroundColor: backgroundColor.toColor(context),
-      fontSize: fontSize,
-      fontWeight: fontWeight?.parse,
-      fontStyle: fontStyle?.parse,
-      letterSpacing: letterSpacing,
-      wordSpacing: wordSpacing,
-      textBaseline: textBaseline?.parse,
-      height: height,
-      leadingDistribution: leadingDistribution?.parse,
-      decorationColor: decorationColor?.toColor(context),
-      decorationStyle: decorationStyle?.parse,
-      decorationThickness: decorationThickness,
-      debugLabel: debugLabel,
-      fontFamily: fontFamily,
-      fontFamilyFallback: fontFamilyFallback,
-      package: package,
-      overflow: overflow?.parse,
-    );
+  TextStyle? parse(BuildContext context) {
+    switch (type) {
+      case StacTextStyleType.theme:
+        final themeStyle = (this as StacThemeTextStyle).textTheme;
+        final textTheme = Theme.of(context).textTheme;
+        switch (themeStyle) {
+          case StacMaterialTextStyle.displayLarge:
+            return textTheme.displayLarge;
+          case StacMaterialTextStyle.displayMedium:
+            return textTheme.displayMedium;
+          case StacMaterialTextStyle.displaySmall:
+            return textTheme.displaySmall;
+          case StacMaterialTextStyle.headlineLarge:
+            return textTheme.headlineLarge;
+          case StacMaterialTextStyle.headlineMedium:
+            return textTheme.headlineMedium;
+          case StacMaterialTextStyle.headlineSmall:
+            return textTheme.headlineSmall;
+          case StacMaterialTextStyle.titleLarge:
+            return textTheme.titleLarge;
+          case StacMaterialTextStyle.titleMedium:
+            return textTheme.titleMedium;
+          case StacMaterialTextStyle.titleSmall:
+            return textTheme.titleSmall;
+          case StacMaterialTextStyle.bodyLarge:
+            return textTheme.bodyLarge;
+          case StacMaterialTextStyle.bodyMedium:
+            return textTheme.bodyMedium;
+          case StacMaterialTextStyle.bodySmall:
+            return textTheme.bodySmall;
+          case StacMaterialTextStyle.labelLarge:
+            return textTheme.labelLarge;
+          case StacMaterialTextStyle.labelMedium:
+            return textTheme.labelMedium;
+          case StacMaterialTextStyle.labelSmall:
+            return textTheme.labelSmall;
+        }
+      case StacTextStyleType.custom:
+        final style = this as StacCustomTextStyle;
+        return TextStyle(
+          inherit: style.inherit ?? true,
+          color: style.color?.toColor(context),
+          backgroundColor: style.backgroundColor?.toColor(context),
+          fontSize: style.fontSize,
+          fontWeight: style.fontWeight?.parse,
+          fontStyle: style.fontStyle?.parse,
+          letterSpacing: style.letterSpacing,
+          wordSpacing: style.wordSpacing,
+          textBaseline: style.textBaseline?.parse,
+          height: style.height,
+          leadingDistribution: style.leadingDistribution?.parse,
+          decorationColor: style.decorationColor?.toColor(context),
+          decorationStyle: style.decorationStyle?.parse,
+          decorationThickness: style.decorationThickness,
+          debugLabel: style.debugLabel,
+          fontFamily: style.fontFamily,
+          fontFamilyFallback: style.fontFamilyFallback,
+          package: style.package,
+          overflow: style.overflow?.parse,
+        );
+    }
   }
 }
 

packages/stac/lib/src/parsers/widgets/stac_text/stac_text_parser.dart

@@ -4,7 +4,9 @@ import 'package:stac/src/framework/framework.dart';
 import 'package:stac/src/parsers/painting/stac_text_style_parser.dart';
 import 'package:stac/src/parsers/types/type_parser.dart';
 import 'package:stac/src/utils/color_utils.dart';
-import 'package:stac_core/stac_core.dart';
+import 'package:stac_core/foundation/specifications/widget_type.dart';
+import 'package:stac_core/foundation/text/stac_text_style/stac_text_style.dart';
+import 'package:stac_core/widgets/text/stac_text.dart';
 import 'package:stac_framework/stac_framework.dart';
 
 class StacTextParser extends StacParser<StacText> {
@@ -20,7 +22,7 @@ class StacTextParser extends StacParser<StacText> {
   Widget parse(BuildContext context, StacText model) {
     return Text.rich(
       _buildTextSpan(context, model),
-      style: model.style?.parse(context),
+      style: _resolveStyle(context, model.style, model.copyWithStyle),
       textAlign: model.textAlign?.parse,
       textDirection: model.textDirection?.parse,
       softWrap: model.softWrap,
@@ -36,12 +38,13 @@ class StacTextParser extends StacParser<StacText> {
   }
 
   TextSpan _buildTextSpan(BuildContext context, StacText model) {
+    var children = model.children ?? [];
     return TextSpan(
       text: model.data,
-      children: model.children.map((child) {
+      children: children.map((child) {
         return TextSpan(
           text: child.text,
-          style: model.style?.parse(context),
+          style: child.style?.parse(context),
           recognizer: child.onTap != null
               ? (TapGestureRecognizer()
                 ..onTap = () => Stac.onCallFromJson(child.onTap, context))
@@ -50,4 +53,38 @@ class StacTextParser extends StacParser<StacText> {
       }).toList(),
     );
   }
+
+  TextStyle? _resolveStyle(
+    BuildContext context,
+    StacTextStyle? base,
+    StacCustomTextStyle? override,
+  ) {
+    final baseStyle = base?.parse(context);
+    if (override == null) return baseStyle;
+
+    final overrideParsed = override.parse(context);
+    if (overrideParsed == null) return baseStyle;
+    if (baseStyle == null) return null;
+
+    return baseStyle.copyWith(
+      inherit: override.inherit,
+      color: overrideParsed.color,
+      backgroundColor: overrideParsed.backgroundColor,
+      fontSize: overrideParsed.fontSize,
+      fontWeight: overrideParsed.fontWeight,
+      fontStyle: overrideParsed.fontStyle,
+      letterSpacing: overrideParsed.letterSpacing,
+      wordSpacing: overrideParsed.wordSpacing,
+      textBaseline: overrideParsed.textBaseline,
+      height: overrideParsed.height,
+      leadingDistribution: overrideParsed.leadingDistribution,
+      decorationColor: overrideParsed.decorationColor,
+      decorationStyle: overrideParsed.decorationStyle,
+      decorationThickness: overrideParsed.decorationThickness,
+      debugLabel: overrideParsed.debugLabel,
+      fontFamily: overrideParsed.fontFamily,
+      fontFamilyFallback: overrideParsed.fontFamilyFallback,
+      overflow: overrideParsed.overflow,
+    );
+  }
 }

packages/stac_core/lib/foundation/effects/stac_gradient/stac_gradient.dart

@@ -40,8 +40,7 @@ enum StacTileMode {
 /// {@tool snippet}
 /// Dart Example:
 /// ```dart
-/// const StacGradient(
-///   gradientType: StacGradientType.linear,
+/// StacLinearGradient(
 ///   colors: [StacColors.blue, StacColors.red],
 ///   stops: [0.0, 1.0],
 ///   begin: StacAlignment.topLeft,
@@ -80,6 +79,82 @@ class StacGradient {
     this.endAngle,
   });
 
+  /// Creates a linear gradient.
+  ///
+  /// Example:
+  /// ```dart
+  /// StacLinearGradient(
+  ///   colors: [StacColors.blue, StacColors.red],
+  ///   begin: StacAlignment.topLeft,
+  ///   end: StacAlignment.bottomRight,
+  ///   stops: [0.0, 1.0],
+  /// )
+  /// ```
+  const StacGradient.linear({
+    required this.colors,
+    this.stops,
+    this.begin,
+    this.end,
+    this.tileMode,
+  }) : gradientType = StacGradientType.linear,
+       center = null,
+       focal = null,
+       focalRadius = null,
+       radius = null,
+       startAngle = null,
+       endAngle = null;
+
+  /// Creates a radial gradient.
+  ///
+  /// Example:
+  /// ```dart
+  /// StacRadialGradient(
+  ///   colors: [StacColors.blue, StacColors.red],
+  ///   center: StacAlignment.center,
+  ///   radius: 0.5,
+  ///   stops: [0.0, 1.0],
+  /// )
+  /// ```
+  const StacGradient.radial({
+    required this.colors,
+    this.stops,
+    this.center,
+    this.focal,
+    this.focalRadius,
+    this.radius,
+    this.tileMode,
+  }) : gradientType = StacGradientType.radial,
+       begin = null,
+       end = null,
+       startAngle = null,
+       endAngle = null;
+
+  /// Creates a sweep gradient.
+  ///
+  /// Example:
+  /// ```dart
+  /// StacSweepGradient(
+  ///   colors: [StacColors.blue, StacColors.red],
+  ///   center: StacAlignment.center,
+  ///   startAngle: 0.0,
+  ///   endAngle: 3.14159,
+  ///   stops: [0.0, 1.0],
+  /// )
+  /// ```
+  const StacGradient.sweep({
+    required this.colors,
+    this.stops,
+    this.center,
+    this.startAngle,
+    this.endAngle,
+    this.tileMode,
+  }) : gradientType = StacGradientType.sweep,
+       begin = null,
+       end = null,
+       focal = null,
+       focalRadius = null,
+       radius = null;
+
   /// The type of gradient (linear, radial, or sweep).
   final StacGradientType? gradientType;
 
@@ -123,3 +198,55 @@ class StacGradient {
   /// Converts this [StacGradient] instance to a JSON map.
   Map<String, dynamic> toJson() => _$StacGradientToJson(this);
 }
+
+/// A linear gradient that transitions colors along a straight line.
+///
+/// This is a convenience constructor for [StacGradient.linear] for a more Flutter-like API.
+/// Colors transition from [begin] to [end] alignment points.
+///
+/// Example:
+/// ```dart
+/// StacLinearGradient(
+///   colors: [StacColors.blue, StacColors.red],
+///   begin: StacAlignment.topLeft,
+///   end: StacAlignment.bottomRight,
+///   stops: [0.0, 1.0],
+/// )
+/// ```
+// ignore: constant_identifier_names
+const StacLinearGradient = StacGradient.linear;
+
+/// A radial gradient that transitions colors in a circular pattern from center outward.
+///
+/// This is a convenience constructor for [StacGradient.radial] for a more Flutter-like API.
+/// Colors transition from the center point outward in a circular pattern.
+///
+/// Example:
+/// ```dart
+/// StacRadialGradient(
+///   colors: [StacColors.blue, StacColors.red],
+///   center: StacAlignment.center,
+///   radius: 0.5,
+///   stops: [0.0, 1.0],
+/// )
+/// ```
+// ignore: constant_identifier_names
+const StacRadialGradient = StacGradient.radial;
+
+/// A sweep gradient that transitions colors in a circular sweep around a center point.
+///
+/// This is a convenience constructor for [StacGradient.sweep] for a more Flutter-like API.
+/// Colors transition in a circular sweep around the center point.
+///
+/// Example:
+/// ```dart
+/// StacSweepGradient(
+///   colors: [StacColors.blue, StacColors.red],
+///   center: StacAlignment.center,
+///   startAngle: 0.0,
+///   endAngle: 3.14159,
+///   stops: [0.0, 1.0],
+/// )
+/// ```
+// ignore: constant_identifier_names
+const StacSweepGradient = StacGradient.sweep;