packages/wyatt_component_copy_with_extension/lib/wyatt_component_copy_with_extension.dart

@@ -15,7 +15,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 /// Extension for component copy with feature
-library wyatt_component_copy_with_extension;
+library component_copy_with_extension;
 
 export './src/domain/domain.dart';
 export 'src/component_copy_with_extension.dart';

packages/wyatt_component_copy_with_gen/build.yaml

@@ -1,7 +1,7 @@
 targets:
   $default:
     builders:
-      wyatt_component_copy_with_gen:
+      component_copy_with_gen:
         enabled: true
         generate_for:
           exclude:
@@ -11,9 +11,9 @@ targets:
             - test/gen_*
 
 builders:
-  wyatt_component_copy_with_gen:
+  component_copy_with_gen:
-    target: ":wyatt_component_copy_with_gen"
+    target: ":component_copy_with_gen"
-    import: "package:wyatt_component_copy_with_gen/wyatt_component_copy_with_gen.dart"
+    import: "package:wyatt_component_copy_with_gen/component_copy_with_gen.dart"
     builder_factories: ["componentCopyWithReporter"]
     build_extensions: { ".dart": ["copy_with_extension_gen.g.part"] }
     auto_apply: dependents

packages/wyatt_component_copy_with_gen/lib/wyatt_component_copy_with_gen.dart

@@ -15,7 +15,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 /// Generator for copywith method for components
-library wyatt_component_copy_with_gen;
+library component_copy_with_gen;
 
 export 'src/builder.dart';
 export 'src/generators/component_copy_with_generator.dart';

packages/wyatt_ui_components/build.yaml

@@ -2,8 +2,8 @@ targets:
   $default:
     builders:
       # Typically the builder key is just the package name, run `pub run build_runner doctor` to check your config.
-      wyatt_component_copy_with_gen:wyatt_component_copy_with_gen:
+      wyatt_component_copy_with_gen:component_copy_with_gen:
         generate_for:
           # Example glob for only the Dart files under `lib/models`
           - lib/**/*.dart
-          - example/lib/**/*.dart
+          - example/lib/**/*.dart

packages/wyatt_ui_components/example/lib/main.dart

@@ -49,14 +49,14 @@ class Home extends StatelessWidget {
         appBar: PreferredSize(
           preferredSize: const Size.fromHeight(60),
           child: context.components.appBar?.copyWith
-                  .title(const TextWrapper('Example title')) ??
+                  .title('Example title'.wrap()) ??
               const SizedBox.shrink(),
         ),
         body: Column(
           children: [
             Expanded(
               child: context.components.errorWidget
-                      ?.copyWith(error: const TextWrapper('Example erreur')) ??
+                      ?.copyWith(error: 'Example erreur'.wrap()) ??
                   const SizedBox.shrink(),
             ),
             const SizedBox(

packages/wyatt_ui_components/lib/src/core/core.dart

@@ -16,5 +16,6 @@
 
 export 'enums/enums.dart';
 export 'extensions/build_context_extensions.dart';
+export 'extensions/string_extension.dart';
 export 'mixins/copy_with_mixin.dart';
 export 'utils/utils.dart';

packages/wyatt_ui_components/lib/src/core/extensions/string_extension.dart

@@ -14,26 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+import 'package:wyatt_ui_components/wyatt_ui_components.dart';
 
-abstract class ThemeImporter {
+extension StringExtension on String? {
-  /// Imports a [ThemeData] from either a [BuildContext] or a [ThemeData].
+  TextWrapper? wrap({TextStyle? style, MultiColor? gradientColors}) =>
-  ///
+      this != null
-  /// Throws an [ArgumentError] if the type of [from] is not a [BuildContext]
+          ? TextWrapper(this!, style: style, gradientColors: gradientColors)
-  /// or a [ThemeData].
+          : null;
-  static ThemeData importFrom<T>(T from) {
-    ThemeData theme;
-
-    if (from is BuildContext) {
-      theme = Theme.of(from);
-    } else if (from is ThemeData) {
-      theme = from;
-    } else {
-      throw ArgumentError(
-        'from must be either a BuildContext or a ThemeData',
-      );
-    }
-
-    return theme;
-  }
 }

packages/wyatt_ui_components/lib/src/core/utils/gradient_helper.dart

@@ -1,38 +0,0 @@
-// Copyright (C) 2023 WYATT GROUP
-// Please see the AUTHORS file for details.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-import 'package:flutter/material.dart';
-import 'package:wyatt_ui_components/wyatt_ui_components.dart';
-
-abstract class GradientHelper {
-  static LinearGradient? linearFromNullableColors(List<Color>? colors) =>
-      colors != null ? LinearGradient(colors: colors) : null;
-
-  static LinearGradient? linearFromMultiColor(MultiColor multiColor) =>
-      multiColor.isGradient ? LinearGradient(colors: multiColor.colors) : null;
-
-  static RadialGradient? radialFromNullableColors(List<Color>? colors) =>
-      colors != null ? RadialGradient(colors: colors) : null;
-
-  static RadialGradient? radialFromMultiColor(MultiColor multiColor) =>
-      multiColor.isGradient ? RadialGradient(colors: multiColor.colors) : null;
-
-  static SweepGradient? sweepFromNullableColors(List<Color>? colors) =>
-      colors != null ? SweepGradient(colors: colors) : null;
-
-  static SweepGradient? sweepFromMultiColor(MultiColor multiColor) =>
-      multiColor.isGradient ? SweepGradient(colors: multiColor.colors) : null;
-}

packages/wyatt_ui_components/lib/src/core/utils/text_wrapper.dart

@@ -36,28 +36,15 @@ class TextWrapper {
   });
 
   /// Creates a [TextWrapper] from a [Text] widget.
-  TextWrapper.text(Text text)
+  const TextWrapper.text(this.data)
-      : data = text.data!,
+      : style = null,
-        style = text.style,
         gradientColors = null,
-        textAlign = text.textAlign,
+        textAlign = null,
-        textDirection = text.textDirection,
+        textDirection = null,
-        softWrap = text.softWrap,
+        softWrap = null,
-        overflow = text.overflow,
+        overflow = null,
-        maxLines = text.maxLines,
+        maxLines = null,
-        selectionColor = text.selectionColor;
+        selectionColor = null;
-
-  /// Creates a [TextWrapper] from a [RichText] widget.
-  TextWrapper.rich(RichText richText)
-      : data = richText.text.toPlainText(),
-        style = richText.text.style,
-        gradientColors = null,
-        textAlign = richText.textAlign,
-        textDirection = richText.textDirection,
-        softWrap = richText.softWrap,
-        overflow = richText.overflow,
-        maxLines = richText.maxLines,
-        selectionColor = richText.selectionColor;
 
   /// Text to be displayed
   final String data;

packages/wyatt_ui_components/lib/src/core/utils/theme_helper.dart

@@ -16,76 +16,33 @@
 
 /// A helper class for getting theme elements.
 abstract class ThemeHelper {
-  /// Gets a nullable theme element from a list of styles.
+  /// Gets a theme element from a list of styles.
-  /// {@template getElement}
   /// Styles are checked in order, and the first one that passes the
   /// [valueValidator] is returned.
   /// Style elements are transformed using the [transform] function.
   ///
-  /// - [styles] : A list of styles that need to be checked.
+  /// [styles]: A list of styles that need to be checked.
-  ///
+  /// [transform]: A function that transforms each style element
-  /// - [transform] : An optional function that transforms each style element
+  /// to a [T] type.
-  /// to a [T] type after it passes the [valueValidator]. *(default: returns
+  /// [valueValidator]: An optional validation function that
-  /// element as is)*
+  /// determines if a style element is valid.
-  ///
+  /// [combine]: A function that combines two [P] type objects to create
-  /// - [valueValidator] : An optional validation function that
+  /// a new object.
-  /// determines if a style element is valid. *(default: checks if element
+  static T? getThemeElement<P, T>(
-  /// is not null)*
-  ///
-  /// - [combine] : A function that combines two [P] type objects to create
-  /// a new object. *(default: returns the first element)*
-  ///
-  /// So, if you only pass a [styles] list, the first valid style element
-  /// will be returned as is.
-  /// If you pass a [transform] function, the first valid style element
-  /// will be transformed to a [T] type.
-  /// {@endtemplate}
-  static T? maybeGetElement<P, T>(
     List<P?>? styles, {
-    T? Function(P?)? transform,
+    required T? Function(P?)? transform,
     bool? Function(P?)? valueValidator,
     P? Function(P?, P?)? combine,
   }) {
-    // List of valid styles
     final Iterable<P?>? validStyles = styles?.where(
       (element) => valueValidator?.call(element) ?? (element != null),
     );
-
-    // tranformation function
-    final transformation = transform ?? (element) => element as T?;
-
     return (validStyles?.isNotEmpty ?? false)
-        ? transformation.call(
+        ? transform?.call(
             validStyles?.reduce(
               (value, element) => combine?.call(value, element) ?? value,
             ),
           )
         : null;
   }
-
-  /// Gets a theme element from a list of styles. Throws an exception if no
-  /// valid style is found.
-  ///
-  /// See [maybeGetElement] for more details.
-  ///
-  /// {@macro getElement}
-  static T getElement<P, T>(
-    List<P?>? styles, {
-    T? Function(P?)? transform,
-    bool? Function(P?)? valueValidator,
-    P? Function(P?, P?)? combine,
-  }) {
-    final result = maybeGetElement<P, T>(
-      styles,
-      transform: transform,
-      valueValidator: valueValidator,
-      combine: combine,
-    );
-
-    if (result == null) {
-      throw Exception('No valid style found');
-    }
-
-    return result;
-  }
 }

packages/wyatt_ui_components/lib/src/core/utils/theme_resolver.dart

@@ -26,52 +26,47 @@ import 'package:wyatt_ui_components/src/domain/entities/theme_style.dart';
 /// 1) Pass the "radius" into the constructor, `Component(radius: 12)`.
 /// 2) Set up a theme extension `ComponentThemeExtension(radius: 15)`.
 /// 3) Let `wyatt_ui_kit` "negotiate" and try to find a suitable style in the
-/// flutter theme, or use a hardcoded value.
+/// flutter theme.
 ///
-/// If a negotiation phase fails, it will fallback to the next one.
+/// If this negotiation phase fails, then:
-///
+/// - If the value is mandatory: a hardcoded value in "wyatt_ui_kit" is chosen.
-/// This resolver uses [ThemeHelper] to negotiate and merge styles.
+/// - If not, the style is simply not applied.
 /// {@endtemplate}
-abstract class ThemeResolver<Style extends ThemeStyle<Style>, Extension,
+abstract class ThemeResolver<S extends ThemeStyle<S>, T, E> {
-    Extra> {
   /// {@macro theme_resolver}
   const ThemeResolver();
 
+  S? Function(BuildContext context, {E? extra}) get customStyleFn;
+
   /// Compute default value from Flutter Theme or with hardcoded values.
-  Style computeDefaultValue(
+  S computeDefaultValue(
     BuildContext context, {
-    Extra? extra,
+    E? extra,
   });
 
-  /// Compute custom style from context.
-  Style? Function(BuildContext context, {Extra? extra}) get customStyleFn;
-
   /// Compute extension value from custom component extension.
-  Style? computeExtensionValueFn(
+  S? computeExtensionValueFn(
     BuildContext context,
-    Extension? themeExtension, {
+    T? themeExtension, {
-    Extra? extra,
+    E? extra,
   });
 
   /// Choose most suitable style for a given context.
-  Style negotiate(BuildContext context, {Extra? extra}) {
+  S negotiate(BuildContext context, {E? extra}) {
-    // 1) Custom style passed in constructor (cannot be null)
     final style = computeDefaultValue(context, extra: extra);
-    return ThemeHelper.getElement<Style, Style>(
+    return ThemeHelper.getThemeElement<S, S>(
-      [
+          [
-        // 1) Custom style passed in constructor
+            style,
-        customStyleFn(context, extra: extra),
+            computeExtensionValueFn(
-        // 2) Theme extension
+              context,
-        computeExtensionValueFn(
+              Theme.of(context).extension<T>(),
-          context,
+              extra: extra,
-          Theme.of(context).extension<Extension>(),
+            ),
-          extra: extra,
+            customStyleFn(context, extra: extra)
-        ),
+          ],
-        // 3) Default
+          transform: (value) => value,
-        style,
+          combine: (value, element) => value?.mergeWith(element),
-      ],
+        ) ??
-      transform: (value) => value,
+        style;
-      combine: (value, element) => value?.mergeWith(element),
-    );
   }
 }

packages/wyatt_ui_components/lib/src/core/utils/utils.dart

@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-export 'gradient_helper.dart';
 export 'multi_color.dart';
 export 'text_wrapper.dart';
 export 'theme_helper.dart';

packages/wyatt_ui_components/lib/src/domain/entities/component.dart

@@ -21,7 +21,6 @@ import 'package:wyatt_ui_components/src/core/utils/theme_resolver.dart';
 /// Base class for all components.
 /// {@endtemplate}
 abstract class Component extends StatelessWidget {
-  /// {@macro component}
   const Component({this.themeResolver, super.key});
 
   /// Theme Resolver for this component

packages/wyatt_ui_components/lib/src/domain/entities/entities.dart

@@ -19,7 +19,6 @@ export './buttons/buttons.dart';
 export './cards/cards.dart';
 export './component.dart';
 export './error_widget_component.dart';
-export './gradients/gradients.dart';
 export './loader/loader.dart';
 export './loading_widget_component.dart';
 export './rich_text_builder/rich_text_builder.dart';

packages/wyatt_ui_components/lib/src/domain/entities/gradients/gradient_icon_component.dart

@@ -1,47 +0,0 @@
-// Copyright (C) 2023 WYATT GROUP
-// Please see the AUTHORS file for details.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-import 'package:flutter/widgets.dart';
-import 'package:wyatt_component_copy_with_extension/wyatt_component_copy_with_extension.dart';
-import 'package:wyatt_ui_components/wyatt_ui_components.dart';
-
-part 'gradient_icon_component.g.dart';
-
-@ComponentProxyExtension()
-abstract class GradientIconComponent extends Icon
-    with CopyWithMixin<$GradientIconComponentCWProxy>
-    implements GradientComponent {
-  GradientIconComponent({
-    required IconData? icon,
-    required this.gradientColors,
-    super.key,
-    super.size,
-    super.fill,
-    super.weight,
-    super.grade,
-    super.opticalSize,
-    super.color,
-    super.shadows,
-    super.semanticLabel,
-    super.textDirection,
-  }) : super(icon);
-
-  @override
-  final MultiColor gradientColors;
-
-  @override
-  ThemeResolver<dynamic, dynamic, dynamic>? get themeResolver => null;
-}

packages/wyatt_ui_components/lib/src/domain/entities/gradients/gradient_icon_component.g.dart

@@ -1,36 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'gradient_icon_component.dart';
-
-// **************************************************************************
-// ComponentProxyGenerator
-// **************************************************************************
-
-abstract class $GradientIconComponentCWProxy {
-  GradientIconComponent icon(IconData? icon);
-  GradientIconComponent gradientColors(MultiColor? gradientColors);
-  GradientIconComponent key(Key? key);
-  GradientIconComponent size(double? size);
-  GradientIconComponent fill(double? fill);
-  GradientIconComponent weight(double? weight);
-  GradientIconComponent grade(double? grade);
-  GradientIconComponent opticalSize(double? opticalSize);
-  GradientIconComponent color(Color? color);
-  GradientIconComponent shadows(List<Shadow>? shadows);
-  GradientIconComponent semanticLabel(String? semanticLabel);
-  GradientIconComponent textDirection(TextDirection? textDirection);
-  GradientIconComponent call({
-    IconData? icon,
-    MultiColor? gradientColors,
-    Key? key,
-    double? size,
-    double? fill,
-    double? weight,
-    double? grade,
-    double? opticalSize,
-    Color? color,
-    List<Shadow>? shadows,
-    String? semanticLabel,
-    TextDirection? textDirection,
-  });
-}

packages/wyatt_ui_components/lib/src/domain/entities/gradients/gradient_text_component.dart

@@ -1,54 +0,0 @@
-// Copyright (C) 2023 WYATT GROUP
-// Please see the AUTHORS file for details.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-import 'package:flutter/widgets.dart';
-import 'package:wyatt_component_copy_with_extension/wyatt_component_copy_with_extension.dart';
-import 'package:wyatt_ui_components/src/core/mixins/copy_with_mixin.dart';
-import 'package:wyatt_ui_components/src/core/utils/multi_color.dart';
-import 'package:wyatt_ui_components/src/core/utils/theme_resolver.dart';
-import 'package:wyatt_ui_components/src/domain/entities/gradients/gradients.dart';
-
-part 'gradient_text_component.g.dart';
-
-@ComponentProxyExtension()
-abstract class GradientTextComponent extends Text
-    with CopyWithMixin<$GradientTextComponentCWProxy>
-    implements GradientComponent {
-  const GradientTextComponent({
-    required String? data,
-    required this.gradientColors,
-    super.style,
-    super.key,
-    super.strutStyle,
-    super.textAlign,
-    super.textDirection,
-    super.locale,
-    super.softWrap,
-    super.overflow,
-    super.textScaleFactor,
-    super.maxLines,
-    super.semanticsLabel,
-    super.textWidthBasis,
-    super.textHeightBehavior,
-    super.selectionColor,
-  }) : super(data ?? '');
-
-  @override
-  final MultiColor gradientColors;
-
-  @override
-  ThemeResolver<dynamic, dynamic, dynamic>? get themeResolver => null;
-}

packages/wyatt_ui_components/lib/src/domain/entities/gradients/gradient_text_component.g.dart

@@ -1,45 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'gradient_text_component.dart';
-
-// **************************************************************************
-// ComponentProxyGenerator
-// **************************************************************************
-
-abstract class $GradientTextComponentCWProxy {
-  GradientTextComponent data(String? data);
-  GradientTextComponent gradientColors(MultiColor? gradientColors);
-  GradientTextComponent style(TextStyle? style);
-  GradientTextComponent key(Key? key);
-  GradientTextComponent strutStyle(StrutStyle? strutStyle);
-  GradientTextComponent textAlign(TextAlign? textAlign);
-  GradientTextComponent textDirection(TextDirection? textDirection);
-  GradientTextComponent locale(Locale? locale);
-  GradientTextComponent softWrap(bool? softWrap);
-  GradientTextComponent overflow(TextOverflow? overflow);
-  GradientTextComponent textScaleFactor(double? textScaleFactor);
-  GradientTextComponent maxLines(int? maxLines);
-  GradientTextComponent semanticsLabel(String? semanticsLabel);
-  GradientTextComponent textWidthBasis(TextWidthBasis? textWidthBasis);
-  GradientTextComponent textHeightBehavior(
-      TextHeightBehavior? textHeightBehavior);
-  GradientTextComponent selectionColor(Color? selectionColor);
-  GradientTextComponent call({
-    String? data,
-    MultiColor? gradientColors,
-    TextStyle? style,
-    Key? key,
-    StrutStyle? strutStyle,
-    TextAlign? textAlign,
-    TextDirection? textDirection,
-    Locale? locale,
-    bool? softWrap,
-    TextOverflow? overflow,
-    double? textScaleFactor,
-    int? maxLines,
-    String? semanticsLabel,
-    TextWidthBasis? textWidthBasis,
-    TextHeightBehavior? textHeightBehavior,
-    Color? selectionColor,
-  });
-}

packages/wyatt_ui_kit/build.yaml

@@ -2,7 +2,7 @@ targets:
   $default:
     builders:
       # Typically the builder key is just the package name, run `pub run build_runner doctor` to check your config.
-      wyatt_component_copy_with_gen:wyatt_component_copy_with_gen:
+      wyatt_component_copy_with_gen:component_copy_with_gen:
         generate_for:
           # Example glob for only the Dart files under `lib/models`
-          - lib/**/*.dart
+          - lib/**/*.dart

packages/wyatt_ui_kit/lib/src/components/gradients/gradient_icon.dart

@@ -14,18 +14,17 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
-import 'package:wyatt_component_copy_with_extension/wyatt_component_copy_with_extension.dart';
-import 'package:wyatt_ui_components/wyatt_ui_components.dart';
 
-part 'gradient_icon.g.dart';
+extension GradientIconExtension on Icon {
+  GradientIcon toGradient(Gradient? gradient) =>
+      GradientIcon.from(this, gradient);
+}
 
-@ComponentCopyWithExtension()
+class GradientIcon extends Icon {
-class GradientIcon extends GradientIconComponent with $GradientIconCWMixin {
+  const GradientIcon(
-  GradientIcon(
+    super.icon, {
-    {
+    this.gradient,
-    required super.icon,
-    required super.gradientColors,
     super.key,
     super.size,
     super.fill,
@@ -36,34 +35,11 @@ class GradientIcon extends GradientIconComponent with $GradientIconCWMixin {
     super.shadows,
     super.semanticLabel,
     super.textDirection,
-  }) : widgetIcon = null;
+  });
 
-  GradientIcon.fromWidget(
+  factory GradientIcon.from(Icon icon, Gradient? gradient) => GradientIcon(
-    Widget icon, {
+        icon.icon,
-    MultiColor? gradientColors,
+        gradient: gradient,
-    super.key,
-    super.size,
-    super.fill,
-    super.weight,
-    super.grade,
-    super.opticalSize,
-    super.color,
-    super.shadows,
-    super.semanticLabel,
-    super.textDirection,
-  })  : widgetIcon = icon,
-        super(
-          icon: null,
-          gradientColors: gradientColors ?? const MultiColor([]),
-        );
-
-  factory GradientIcon.fromIcon(
-    Icon icon, {
-    MultiColor? gradientColors,
-  }) =>
-      GradientIcon(
-        icon: icon.icon,
-        gradientColors: gradientColors ?? const MultiColor([]),
         key: icon.key,
         size: icon.size,
         fill: icon.fill,
@@ -76,76 +52,20 @@ class GradientIcon extends GradientIconComponent with $GradientIconCWMixin {
         textDirection: icon.textDirection,
       );
 
-  /// Creates a [GradientIcon] from a [Widget].
+  final Gradient? gradient;
-  ///
-  /// Use [GradientIcon.fromWidget] to set this widget as the icon.
-  final Widget? widgetIcon;
 
   @override
   Widget build(BuildContext context) {
-    if (widgetIcon != null) {
+    if (gradient != null) {
-      // Return the widget icon colorized with the super.color.
-      if (super.color != null) {
-        return ColorFiltered(
-          colorFilter: ColorFilter.mode(
-            super.color!,
-            BlendMode.srcIn,
-          ),
-          child: widgetIcon,
-        );
-      }
-      // else, return the widget icon with the gradient.
-      final Gradient? linearGradient =
-          GradientHelper.linearFromMultiColor(gradientColors);
-      if (linearGradient != null) {
-        return ShaderMask(
-          blendMode: BlendMode.srcIn,
-          shaderCallback: (bounds) => linearGradient.createShader(
-            Rect.fromLTWH(0, 0, bounds.width, bounds.height),
-          ),
-          child: widgetIcon,
-        );
-      }
-
-      if (gradientColors.colors.isNotEmpty) {
-        // if multicolor has only one color, return the widget icon with the
-        // color.
-        return ColorFiltered(
-          colorFilter: ColorFilter.mode(
-            gradientColors.color,
-            BlendMode.srcIn,
-          ),
-          child: widgetIcon,
-        );
-      }
-
-      // If there is no gradient and no color, just build the widget icon.
-      return widgetIcon!;
-    }
-
-    // if no widgetIcon, work with the icon.
-
-    if (super.color != null) {
-      return super.copyWith.call(color: super.color).build(context);
-    }
-
-    final Gradient? linearGradient =
-        GradientHelper.linearFromMultiColor(gradientColors);
-    if (linearGradient != null) {
       return ShaderMask(
         blendMode: BlendMode.srcIn,
-        shaderCallback: (bounds) => linearGradient.createShader(
+        shaderCallback: (bounds) => gradient!.createShader(
           Rect.fromLTWH(0, 0, bounds.width, bounds.height),
         ),
         child: super.build(context),
       );
+    } else {
+      return super.build(context);
     }
-
-    if (gradientColors.colors.isNotEmpty) {
-      return super.copyWith.call(color: gradientColors.color).build(context);
-    }
-
-    // If there is no gradient and no color, just build the icon.
-    return super.build(context);
   }
 }

packages/wyatt_ui_kit/lib/src/components/gradients/gradient_icon.g.dart

@@ -1,74 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'gradient_icon.dart';
-
-// **************************************************************************
-// ComponentCopyWithGenerator
-// **************************************************************************
-
-class $GradientIconCWProxyImpl implements $GradientIconComponentCWProxy {
-  const $GradientIconCWProxyImpl(this._value);
-  final GradientIcon _value;
-  @override
-  GradientIcon icon(IconData? icon) => this(icon: icon);
-  @override
-  GradientIcon gradientColors(MultiColor? gradientColors) =>
-      this(gradientColors: gradientColors);
-  @override
-  GradientIcon key(Key? key) => this(key: key);
-  @override
-  GradientIcon size(double? size) => this(size: size);
-  @override
-  GradientIcon fill(double? fill) => this(fill: fill);
-  @override
-  GradientIcon weight(double? weight) => this(weight: weight);
-  @override
-  GradientIcon grade(double? grade) => this(grade: grade);
-  @override
-  GradientIcon opticalSize(double? opticalSize) =>
-      this(opticalSize: opticalSize);
-  @override
-  GradientIcon color(Color? color) => this(color: color);
-  @override
-  GradientIcon shadows(List<Shadow>? shadows) => this(shadows: shadows);
-  @override
-  GradientIcon semanticLabel(String? semanticLabel) =>
-      this(semanticLabel: semanticLabel);
-  @override
-  GradientIcon textDirection(TextDirection? textDirection) =>
-      this(textDirection: textDirection);
-  @override
-  GradientIcon call({
-    IconData? icon,
-    MultiColor? gradientColors,
-    Key? key,
-    double? size,
-    double? fill,
-    double? weight,
-    double? grade,
-    double? opticalSize,
-    Color? color,
-    List<Shadow>? shadows,
-    String? semanticLabel,
-    TextDirection? textDirection,
-  }) =>
-      GradientIcon(
-        icon: icon ?? _value.icon,
-        gradientColors: gradientColors ?? _value.gradientColors,
-        key: key ?? _value.key,
-        size: size ?? _value.size,
-        fill: fill ?? _value.fill,
-        weight: weight ?? _value.weight,
-        grade: grade ?? _value.grade,
-        opticalSize: opticalSize ?? _value.opticalSize,
-        color: color ?? _value.color,
-        shadows: shadows ?? _value.shadows,
-        semanticLabel: semanticLabel ?? _value.semanticLabel,
-        textDirection: textDirection ?? _value.textDirection,
-      );
-}
-
-mixin $GradientIconCWMixin on Component {
-  $GradientIconComponentCWProxy get copyWith =>
-      $GradientIconCWProxyImpl(this as GradientIcon);
-}

packages/wyatt_ui_kit/lib/src/components/gradients/gradient_text.dart

@@ -17,19 +17,30 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import 'package:flutter/widgets.dart';
-import 'package:wyatt_component_copy_with_extension/wyatt_component_copy_with_extension.dart';
 import 'package:wyatt_ui_components/wyatt_ui_components.dart';
-import 'package:wyatt_ui_kit/src/components/gradients/gradient_text_style.dart';
+import 'package:wyatt_ui_kit/wyatt_ui_kit.dart';
 
-part 'gradient_text.g.dart';
+extension GradientTextExtension on Text {
+  /// If this text contains a [GradientTextStyle] it simply transforms it in
+  /// [GradientText], if not it needs a [MultiColor].
+  GradientText toGradient({MultiColor? gradientColors}) {
+    if (style is GradientTextStyle?) {
+      // Gradient
+      final gradientStyle = (style as GradientTextStyle?)?.gradientColors;
+      return GradientText.from(this, gradientStyle ?? gradientColors);
+    }
 
-@ComponentCopyWithExtension()
+    return GradientText.from(this, gradientColors);
-class GradientText extends GradientTextComponent with $GradientTextCWMixin {
+  }
-  const GradientText({
+
-    required super.data,
+  GradientText toFlutterGradient(Gradient? gradient) =>
-    required super.gradientColors,
+      GradientText.from(this, MultiColor(gradient?.colors));
+}
+
+class GradientText extends Text {
+  const GradientText(
+    super.data, {
     super.style,
-    super.key,
     super.strutStyle,
     super.textAlign,
     super.textDirection,
@@ -42,79 +53,46 @@ class GradientText extends GradientTextComponent with $GradientTextCWMixin {
     super.textWidthBasis,
     super.textHeightBehavior,
     super.selectionColor,
+    super.key,
   });
 
-  /// Creates a [GradientText] from a [TextWrapper].
+  factory GradientText.from(Text text, MultiColor? gradientColors) =>
-  ///
-  /// You can pass a gradient in case the [TextWrapper] doesn't have one.
-  /// You can also pass a style in case the [TextWrapper] doesn't have one.
-  factory GradientText.fromWrapper(
-    TextWrapper wrapper, {
-    MultiColor? gradientColors,
-    TextStyle? style,
-  }) =>
       GradientText(
-        data: wrapper.data,
+        text.data ?? '',
-        gradientColors:
+        style: GradientTextStyle.from(text.style, gradientColors),
-            wrapper.gradientColors ?? gradientColors ?? const MultiColor([]),
+        strutStyle: text.strutStyle,
-        style: wrapper.style ?? style,
+        textAlign: text.textAlign,
-        textAlign: wrapper.textAlign,
+        textDirection: text.textDirection,
-        textDirection: wrapper.textDirection,
+        locale: text.locale,
-        softWrap: wrapper.softWrap,
+        softWrap: text.softWrap,
-        overflow: wrapper.overflow,
+        overflow: text.overflow,
-        maxLines: wrapper.maxLines,
+        textScaleFactor: text.textScaleFactor,
-        selectionColor: wrapper.selectionColor,
+        maxLines: text.maxLines,
-      );
+        semanticsLabel: text.semanticsLabel,
-
+        textWidthBasis: text.textWidthBasis,
-  factory GradientText.fromGradientStyle(
+        textHeightBehavior: text.textHeightBehavior,
-    String data, {
+        selectionColor: text.selectionColor,
-    required GradientTextStyle style,
+        key: text.key,
-  }) =>
-      GradientText(
-        data: data,
-        gradientColors: style.gradientColors ?? const MultiColor([]),
-        style: style,
       );
 
   @override
   Widget build(BuildContext context) {
-    if (super.style is GradientTextStyle) {
+    if (style is GradientTextStyle?) {
-      // If the style is a gradient style, create a gradient text from it.
+      // Gradient
-      final Gradient? linearGradient = GradientHelper.linearFromMultiColor(
+      final gradientStyle = (style as GradientTextStyle?)?.gradientColors;
-        (super.style as GradientTextStyle?)?.gradientColors ??
+      final gradient = (gradientStyle?.isGradient ?? false)
-            const MultiColor([]),
+          ? LinearGradientHelper.fromMultiColor(gradientStyle!)
-      );
+          : null;
-      if (linearGradient != null) {
+      if (gradient != null) {
         return ShaderMask(
           blendMode: BlendMode.srcIn,
-          shaderCallback: (bounds) => linearGradient.createShader(
+          shaderCallback: (bounds) => gradient.createShader(
             Rect.fromLTWH(0, 0, bounds.width, bounds.height),
           ),
           child: super.build(context),
         );
       }
     }
-
-    final Gradient? linearGradient =
-        GradientHelper.linearFromMultiColor(gradientColors);
-    if (linearGradient != null) {
-      return ShaderMask(
-        blendMode: BlendMode.srcIn,
-        shaderCallback: (bounds) => linearGradient.createShader(
-          Rect.fromLTWH(0, 0, bounds.width, bounds.height),
-        ),
-        child: super.build(context),
-      );
-    }
-
-    if (gradientColors.colors.isNotEmpty) {
-      return super
-          .copyWith
-          .call(style: style?.copyWith(color: gradientColors.color))
-          .build(context);
-    }
-
-    // If there is no gradient and no color, just build the text.
     return super.build(context);
   }
 }

packages/wyatt_ui_kit/lib/src/components/gradients/gradient_text.g.dart

@@ -1,94 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'gradient_text.dart';
-
-// **************************************************************************
-// ComponentCopyWithGenerator
-// **************************************************************************
-
-class $GradientTextCWProxyImpl implements $GradientTextComponentCWProxy {
-  const $GradientTextCWProxyImpl(this._value);
-  final GradientText _value;
-  @override
-  GradientText data(String? data) => this(data: data);
-  @override
-  GradientText gradientColors(MultiColor? gradientColors) =>
-      this(gradientColors: gradientColors);
-  @override
-  GradientText style(TextStyle? style) => this(style: style);
-  @override
-  GradientText key(Key? key) => this(key: key);
-  @override
-  GradientText strutStyle(StrutStyle? strutStyle) =>
-      this(strutStyle: strutStyle);
-  @override
-  GradientText textAlign(TextAlign? textAlign) => this(textAlign: textAlign);
-  @override
-  GradientText textDirection(TextDirection? textDirection) =>
-      this(textDirection: textDirection);
-  @override
-  GradientText locale(Locale? locale) => this(locale: locale);
-  @override
-  GradientText softWrap(bool? softWrap) => this(softWrap: softWrap);
-  @override
-  GradientText overflow(TextOverflow? overflow) => this(overflow: overflow);
-  @override
-  GradientText textScaleFactor(double? textScaleFactor) =>
-      this(textScaleFactor: textScaleFactor);
-  @override
-  GradientText maxLines(int? maxLines) => this(maxLines: maxLines);
-  @override
-  GradientText semanticsLabel(String? semanticsLabel) =>
-      this(semanticsLabel: semanticsLabel);
-  @override
-  GradientText textWidthBasis(TextWidthBasis? textWidthBasis) =>
-      this(textWidthBasis: textWidthBasis);
-  @override
-  GradientText textHeightBehavior(TextHeightBehavior? textHeightBehavior) =>
-      this(textHeightBehavior: textHeightBehavior);
-  @override
-  GradientText selectionColor(Color? selectionColor) =>
-      this(selectionColor: selectionColor);
-  @override
-  GradientText call({
-    String? data,
-    MultiColor? gradientColors,
-    TextStyle? style,
-    Key? key,
-    StrutStyle? strutStyle,
-    TextAlign? textAlign,
-    TextDirection? textDirection,
-    Locale? locale,
-    bool? softWrap,
-    TextOverflow? overflow,
-    double? textScaleFactor,
-    int? maxLines,
-    String? semanticsLabel,
-    TextWidthBasis? textWidthBasis,
-    TextHeightBehavior? textHeightBehavior,
-    Color? selectionColor,
-  }) =>
-      GradientText(
-        data: data ?? _value.data,
-        gradientColors: gradientColors ?? _value.gradientColors,
-        style: style ?? _value.style,
-        key: key ?? _value.key,
-        strutStyle: strutStyle ?? _value.strutStyle,
-        textAlign: textAlign ?? _value.textAlign,
-        textDirection: textDirection ?? _value.textDirection,
-        locale: locale ?? _value.locale,
-        softWrap: softWrap ?? _value.softWrap,
-        overflow: overflow ?? _value.overflow,
-        textScaleFactor: textScaleFactor ?? _value.textScaleFactor,
-        maxLines: maxLines ?? _value.maxLines,
-        semanticsLabel: semanticsLabel ?? _value.semanticsLabel,
-        textWidthBasis: textWidthBasis ?? _value.textWidthBasis,
-        textHeightBehavior: textHeightBehavior ?? _value.textHeightBehavior,
-        selectionColor: selectionColor ?? _value.selectionColor,
-      );
-}
-
-mixin $GradientTextCWMixin on Component {
-  $GradientTextComponentCWProxy get copyWith =>
-      $GradientTextCWProxyImpl(this as GradientText);
-}

packages/wyatt_ui_kit/lib/src/core/core.dart

@@ -15,3 +15,4 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 export './extensions/extensions.dart';
+export './helpers/helpers.dart';

packages/wyatt_ui_kit/lib/src/core/helpers/helpers.dart

@@ -14,6 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-export 'gradient_component.dart';
+export './linear_gradient_helper.dart';
-export 'gradient_icon_component.dart';
-export 'gradient_text_component.dart';

packages/wyatt_ui_kit/lib/src/core/helpers/linear_gradient_helper.dart

@@ -14,18 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-import 'package:wyatt_ui_components/src/core/utils/multi_color.dart';
+import 'package:flutter/material.dart';
-import 'package:wyatt_ui_components/src/domain/entities/component.dart';
+import 'package:wyatt_ui_components/wyatt_ui_components.dart';
 
-/// {@template gradient_component}
+class LinearGradientHelper {
-/// Base class for all gradient components.
+  static LinearGradient? fromNullableColors(List<Color>? colors) =>
-///
+      colors != null ? LinearGradient(colors: colors) : null;
-/// For example, text, icons, and box borders.
-/// {@endtemplate}
-abstract class GradientComponent extends Component {
-  /// {@macro gradient_component}
-  const GradientComponent({super.key});
 
-  /// Returns colors for the gradient.
+  static LinearGradient? fromMultiColor(MultiColor multiColor) =>
-  MultiColor get gradientColors;
+      multiColor.isGradient ? LinearGradient(colors: multiColor.colors) : null;
 }

packages/wyatt_ui_kit/lib/src/features/wyatt_component_theme_data.dart

@@ -17,11 +17,7 @@
 import 'package:wyatt_ui_components/wyatt_ui_components.dart';
 import 'package:wyatt_ui_kit/wyatt_ui_kit.dart';
 
-/// {@template wyatt_component_theme_data}
-/// A class that holds the theme data for the Wyatt UI Kit.
-/// {@endtemplate}
 class WyattComponentThemeData {
-  /// {@macro wyatt_component_theme_data}
   static ComponentThemeData get wyattComponentThemeData => ComponentThemeData(
         appBar: const TopAppBar(),
         topNavigationBarComponent: const TopNavigationBar(),