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

@@ -15,7 +15,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import 'package:flutter/widgets.dart';
-import 'package:wyatt_ui_components/src/core/utils/multi_color.dart';
 import 'package:wyatt_ui_components/src/domain/entities/component.dart';
 
 abstract class CardComponent extends Component {
@@ -42,10 +41,10 @@ abstract class CardComponent extends Component {
   final double? padding;
 
   /// Border gradient color (from left to right)
-  final MultiColor? borderColors;
+  final List<Color>? borderColors;
 
   /// Card background color
-  final MultiColor? backgroundColors;
+  final List<Color>? backgroundColors;
 
   /// Minimum size for this card
   final Size? minSize;

packages/wyatt_ui_components/lib/src/domain/entities/cards/information_card_component.g.dart

@@ -14,8 +14,8 @@ abstract class $InformationCardComponentCWProxy {
   InformationCardComponent axis(Axis? axis);
   InformationCardComponent radius(double? radius);
   InformationCardComponent padding(double? padding);
-  InformationCardComponent borderColors(MultiColor? borderColors);
+  InformationCardComponent borderColors(List<Color>? borderColors);
-  InformationCardComponent backgroundColors(MultiColor? backgroundColors);
+  InformationCardComponent backgroundColors(List<Color>? backgroundColors);
   InformationCardComponent minSize(Size? minSize);
   InformationCardComponent maxSize(Size? maxSize);
   InformationCardComponent shadow(BoxShadow? shadow);
@@ -29,8 +29,8 @@ abstract class $InformationCardComponentCWProxy {
     Axis? axis,
     double? radius,
     double? padding,
-    MultiColor? borderColors,
+    List<Color>? borderColors,
-    MultiColor? backgroundColors,
+    List<Color>? backgroundColors,
     Size? minSize,
     Size? maxSize,
     BoxShadow? shadow,

packages/wyatt_ui_components/lib/src/domain/entities/cards/portfolio_card_component.g.dart

@@ -19,8 +19,8 @@ abstract class $PortfolioCardComponentCWProxy {
   PortfolioCardComponent assets(List<Widget>? assets);
   PortfolioCardComponent radius(double? radius);
   PortfolioCardComponent padding(double? padding);
-  PortfolioCardComponent borderColors(MultiColor? borderColors);
+  PortfolioCardComponent borderColors(List<Color>? borderColors);
-  PortfolioCardComponent backgroundColors(MultiColor? backgroundColors);
+  PortfolioCardComponent backgroundColors(List<Color>? backgroundColors);
   PortfolioCardComponent minSize(Size? minSize);
   PortfolioCardComponent maxSize(Size? maxSize);
   PortfolioCardComponent shadow(BoxShadow? shadow);
@@ -38,8 +38,8 @@ abstract class $PortfolioCardComponentCWProxy {
     List<Widget>? assets,
     double? radius,
     double? padding,
-    MultiColor? borderColors,
+    List<Color>? borderColors,
-    MultiColor? backgroundColors,
+    List<Color>? backgroundColors,
     Size? minSize,
     Size? maxSize,
     BoxShadow? shadow,

packages/wyatt_ui_components/lib/src/domain/entities/cards/quote_card_component.g.dart

@@ -16,8 +16,8 @@ abstract class $QuoteCardComponentCWProxy {
   QuoteCardComponent rightQuote(Widget? rightQuote);
   QuoteCardComponent radius(double? radius);
   QuoteCardComponent padding(double? padding);
-  QuoteCardComponent borderColors(MultiColor? borderColors);
+  QuoteCardComponent borderColors(List<Color>? borderColors);
-  QuoteCardComponent backgroundColors(MultiColor? backgroundColors);
+  QuoteCardComponent backgroundColors(List<Color>? backgroundColors);
   QuoteCardComponent minSize(Size? minSize);
   QuoteCardComponent maxSize(Size? maxSize);
   QuoteCardComponent shadow(BoxShadow? shadow);
@@ -33,8 +33,8 @@ abstract class $QuoteCardComponentCWProxy {
     Widget? rightQuote,
     double? radius,
     double? padding,
-    MultiColor? borderColors,
+    List<Color>? borderColors,
-    MultiColor? backgroundColors,
+    List<Color>? backgroundColors,
     Size? minSize,
     Size? maxSize,
     BoxShadow? shadow,

packages/wyatt_ui_components/lib/src/domain/entities/cards/skill_card_component.g.dart

@@ -17,8 +17,8 @@ abstract class $SkillCardComponentCWProxy {
       Color? secondaryBackgroundColors);
   SkillCardComponent radius(double? radius);
   SkillCardComponent padding(double? padding);
-  SkillCardComponent borderColors(MultiColor? borderColors);
+  SkillCardComponent borderColors(List<Color>? borderColors);
-  SkillCardComponent backgroundColors(MultiColor? backgroundColors);
+  SkillCardComponent backgroundColors(List<Color>? backgroundColors);
   SkillCardComponent minSize(Size? minSize);
   SkillCardComponent maxSize(Size? maxSize);
   SkillCardComponent shadow(BoxShadow? shadow);
@@ -34,8 +34,8 @@ abstract class $SkillCardComponentCWProxy {
     Color? secondaryBackgroundColors,
     double? radius,
     double? padding,
-    MultiColor? borderColors,
+    List<Color>? borderColors,
-    MultiColor? backgroundColors,
+    List<Color>? backgroundColors,
     Size? minSize,
     Size? maxSize,
     BoxShadow? shadow,

packages/wyatt_ui_components/pubspec.yaml

@@ -14,10 +14,12 @@ dependencies:
     git:
       url: ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-packages.git
       path: packages/wyatt_component_copy_with_extension
+  freezed_annotation: ^2.2.0
 
 dev_dependencies:
   build_runner: ^2.3.3
   flutter_test: { sdk: flutter }
+  freezed: ^2.3.2
   wyatt_analysis:
     hosted: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub
     version: ^2.4.0

packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button_screen.dart

@@ -121,7 +121,7 @@ class FlatButtonScreen extends CubitScreen<ButtonCubit, ButtonState> {
               // If no border color => no default value
               border: (style.borderColors != null && style.stroke != null)
                   ? (style.borderColors?.isGradient ?? false)
-                      ? GradientBoxBorder(
+                      ? CustomGradientBoxBorder(
                           gradient: LinearGradient(
                             colors: style.borderColors!.colors,
                           ),

packages/wyatt_ui_kit/lib/src/components/buttons/simple_icon_button/simple_icon_screen.dart

@@ -120,7 +120,7 @@ class SimpleIconButtonScreen extends CubitScreen<ButtonCubit, ButtonState> {
                   // If no border color => no default value
                   border: (style.borderColors != null && style.stroke != null)
                       ? (style.borderColors?.isGradient ?? false)
-                          ? GradientBoxBorder(
+                          ? CustomGradientBoxBorder(
                               gradient: LinearGradient(
                                 colors: style.borderColors!.colors,
                               ),

packages/wyatt_ui_kit/lib/src/components/buttons/symbol_button/symbol_button_screen.dart

@@ -144,7 +144,7 @@ class SymbolButtonScreen
                       border:
                           (style.borderColors != null && style.stroke != null)
                               ? (style.borderColors?.isGradient ?? false)
-                                  ? GradientBoxBorder(
+                                  ? CustomGradientBoxBorder(
                                       gradient: LinearGradient(
                                         colors: style.borderColors!.colors,
                                       ),

packages/wyatt_ui_kit/lib/src/components/cards/information_card/information_card.g.dart

@@ -24,10 +24,10 @@ class $InformationCardCWProxyImpl implements $InformationCardComponentCWProxy {
   @override
   InformationCard padding(double? padding) => this(padding: padding);
   @override
-  InformationCard borderColors(MultiColor? borderColors) =>
+  InformationCard borderColors(List<Color>? borderColors) =>
       this(borderColors: borderColors);
   @override
-  InformationCard backgroundColors(MultiColor? backgroundColors) =>
+  InformationCard backgroundColors(List<Color>? backgroundColors) =>
       this(backgroundColors: backgroundColors);
   @override
   InformationCard minSize(Size? minSize) => this(minSize: minSize);
@@ -49,8 +49,8 @@ class $InformationCardCWProxyImpl implements $InformationCardComponentCWProxy {
     Axis? axis,
     double? radius,
     double? padding,
-    MultiColor? borderColors,
+    List<Color>? borderColors,
-    MultiColor? backgroundColors,
+    List<Color>? backgroundColors,
     Size? minSize,
     Size? maxSize,
     BoxShadow? shadow,

packages/wyatt_ui_kit/lib/src/components/cards/portfolio_card/portfolio_card.g.dart

@@ -36,10 +36,10 @@ class $PortfolioCardCWProxyImpl implements $PortfolioCardComponentCWProxy {
   @override
   PortfolioCard padding(double? padding) => this(padding: padding);
   @override
-  PortfolioCard borderColors(MultiColor? borderColors) =>
+  PortfolioCard borderColors(List<Color>? borderColors) =>
       this(borderColors: borderColors);
   @override
-  PortfolioCard backgroundColors(MultiColor? backgroundColors) =>
+  PortfolioCard backgroundColors(List<Color>? backgroundColors) =>
       this(backgroundColors: backgroundColors);
   @override
   PortfolioCard minSize(Size? minSize) => this(minSize: minSize);
@@ -64,8 +64,8 @@ class $PortfolioCardCWProxyImpl implements $PortfolioCardComponentCWProxy {
     List<Widget>? assets,
     double? radius,
     double? padding,
-    MultiColor? borderColors,
+    List<Color>? borderColors,
-    MultiColor? backgroundColors,
+    List<Color>? backgroundColors,
     Size? minSize,
     Size? maxSize,
     BoxShadow? shadow,

packages/wyatt_ui_kit/lib/src/components/cards/quote_card/quote_card.g.dart

@@ -28,10 +28,10 @@ class $QuoteCardCWProxyImpl implements $QuoteCardComponentCWProxy {
   @override
   QuoteCard padding(double? padding) => this(padding: padding);
   @override
-  QuoteCard borderColors(MultiColor? borderColors) =>
+  QuoteCard borderColors(List<Color>? borderColors) =>
       this(borderColors: borderColors);
   @override
-  QuoteCard backgroundColors(MultiColor? backgroundColors) =>
+  QuoteCard backgroundColors(List<Color>? backgroundColors) =>
       this(backgroundColors: backgroundColors);
   @override
   QuoteCard minSize(Size? minSize) => this(minSize: minSize);
@@ -54,8 +54,8 @@ class $QuoteCardCWProxyImpl implements $QuoteCardComponentCWProxy {
     Widget? rightQuote,
     double? radius,
     double? padding,
-    MultiColor? borderColors,
+    List<Color>? borderColors,
-    MultiColor? backgroundColors,
+    List<Color>? backgroundColors,
     Size? minSize,
     Size? maxSize,
     BoxShadow? shadow,

packages/wyatt_ui_kit/lib/src/components/cards/skill_card/skill_card.g.dart

@@ -31,10 +31,10 @@ class $SkillCardCWProxyImpl implements $SkillCardComponentCWProxy {
   @override
   SkillCard padding(double? padding) => this(padding: padding);
   @override
-  SkillCard borderColors(MultiColor? borderColors) =>
+  SkillCard borderColors(List<Color>? borderColors) =>
       this(borderColors: borderColors);
   @override
-  SkillCard backgroundColors(MultiColor? backgroundColors) =>
+  SkillCard backgroundColors(List<Color>? backgroundColors) =>
       this(backgroundColors: backgroundColors);
   @override
   SkillCard minSize(Size? minSize) => this(minSize: minSize);
@@ -57,8 +57,8 @@ class $SkillCardCWProxyImpl implements $SkillCardComponentCWProxy {
     Color? secondaryBackgroundColors,
     double? radius,
     double? padding,
-    MultiColor? borderColors,
+    List<Color>? borderColors,
-    MultiColor? backgroundColors,
+    List<Color>? backgroundColors,
     Size? minSize,
     Size? maxSize,
     BoxShadow? shadow,

packages/wyatt_ui_kit/lib/src/components/cards/widgets/card_wrapper.dart

@@ -15,9 +15,9 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import 'package:flutter/material.dart';
-import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart';
 import 'package:wyatt_ui_kit/src/components/cards/widgets/card_background.dart';
-import 'package:wyatt_ui_kit/wyatt_ui_kit.dart';
+import 'package:wyatt_ui_kit/src/components/gradients/gradient_box_border.dart';
+import 'package:wyatt_ui_kit/src/domain/card_theme_extension.dart';
 
 class CardWrapper extends StatelessWidget {
   CardWrapper({
@@ -34,8 +34,8 @@ class CardWrapper extends StatelessWidget {
 
   final Widget? background;
   final Widget child;
-  final MultiColor? backgroundColors;
+  final List<Color>? backgroundColors;
-  final MultiColor? borderColors;
+  final List<Color>? borderColors;
   final BoxShadow? shadow;
   final Size? minSize;
   final Size? maxSize;
@@ -67,8 +67,8 @@ class CardWrapper extends StatelessWidget {
         );
 
   Gradient? _cardGradient(BuildContext context) {
-    if (backgroundColors != null && backgroundColors!.isGradient) {
+    if (backgroundColors != null && backgroundColors!.length >= 2) {
-      return LinearGradientHelper.fromMultiColor(backgroundColors!);
+      return LinearGradient(colors: backgroundColors!);
     } else {
       final extensionCardColor =
           Theme.of(context).extension<CardThemeExtension>();
@@ -85,8 +85,8 @@ class CardWrapper extends StatelessWidget {
   }
 
   Color? _cardColor(BuildContext context) {
-    if (backgroundColors != null && backgroundColors!.isColor) {
+    if (backgroundColors != null && backgroundColors!.length == 1) {
-      return backgroundColors!.color;
+      return backgroundColors!.first;
     } else {
       final extensionCardColor =
           Theme.of(context).extension<CardThemeExtension>();
@@ -101,13 +101,15 @@ class CardWrapper extends StatelessWidget {
 
   BoxBorder? _boxBorder(BuildContext context) {
     if (borderColors != null) {
-      if (borderColors!.isGradient) {
+      if (borderColors!.length >= 2) {
-        return GradientBoxBorder(
+        return CustomGradientBoxBorder(
-          gradient: LinearGradientHelper.fromMultiColor(borderColors!),
+          gradient: LinearGradient(
+            colors: borderColors!,
+          ),
         );
-      } else if (borderColors!.isColor) {
+      } else if (borderColors!.isNotEmpty) {
         return Border.all(
-          color: borderColors!.color,
+          color: borderColors!.first,
         );
       }
     } else {
@@ -116,7 +118,7 @@ class CardWrapper extends StatelessWidget {
       if (extensionCardColor != null &&
           extensionCardColor.borderColors != null) {
         if (extensionCardColor.borderColors!.isGradient) {
-          return GradientBoxBorder(
+          return CustomGradientBoxBorder(
             gradient: LinearGradient(
               colors: extensionCardColor.borderColors!.colors,
             ),

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

@@ -17,8 +17,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/painting.dart';
 
-class GradientBoxBorder extends Border {
+class CustomGradientBoxBorder extends Border {
-  const GradientBoxBorder({this.gradient, this.width = 1});
+  const CustomGradientBoxBorder({this.gradient, this.width = 1});
 
   final Gradient? gradient;
   final double width;

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

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

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

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with super program. If not, see <https://www.gnu.org/licenses/>.
 
-abstract class ThemeHelper {
+class ThemeHelper {
   static T? getThemeElement<P, T>(
     List<P?>? styles, {
     required T? Function(P?)? transform,