fix(ui_components-ui_kit): fix, clean and unify logic and code after rebase

packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button_screen.dart

@@ -67,7 +67,7 @@ class FileSelectionButtonScreen
   FileSelectionButtonStyle _resolve(BuildContext context, ButtonState state) {
     final FileSelectionButtonThemeResolver resolver = themeResolver ??
         FileSelectionButtonThemeResolver(
-          customStyleFn: (context, extensionValue, {extra}) {
+          customStyleFn: (context, {extra}) {
             FileSelectionButtonStyle? style;
             switch (extra?.state) {
               case ControlState.disabled:

packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button_theme_resolver.dart

@@ -73,19 +73,17 @@ class FileSelectionButtonThemeResolver extends ThemeResolver<
 
   @override
   final FileSelectionButtonStyle? Function(
-    BuildContext context,
-    FileSelectionButtonStyle? extensionValue, {
+    BuildContext context, {
     ButtonState? extra,
   }) customStyleFn;
 
   @override
   FileSelectionButtonStyle? computeExtensionValueFn(
     BuildContext context,
-    FileSelectionButtonStyle defaultValue,
     FileSelectionButtonThemeExtension themeExtension, {
     ButtonState? extra,
   }) {
-    FileSelectionButtonStyle? style = defaultValue;
+    FileSelectionButtonStyle? style;
     switch (extra?.state) {
       case ControlState.disabled:
         style = themeExtension.disabledStyle;

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

@@ -61,7 +61,7 @@ class FlatButtonScreen extends CubitScreen<ButtonCubit, ButtonState> {
   FlatButtonStyle _resolve(BuildContext context, ControlState state) {
     final FlatButtonThemeResolver resolver = themeResolver ??
         FlatButtonThemeResolver(
-          customStyleFn: (context, extensionValue, {extra}) {
+          customStyleFn: (context, {extra}) {
             switch (extra) {
               case ControlState.disabled:
                 return disabledStyle;

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

@@ -69,15 +69,13 @@ class FlatButtonThemeResolver extends ThemeResolver<FlatButtonStyle,
 
   @override
   final FlatButtonStyle? Function(
-    BuildContext context,
-    FlatButtonStyle? extensionValue, {
+    BuildContext context, {
     ControlState? extra,
   }) customStyleFn;
 
   @override
   FlatButtonStyle? computeExtensionValueFn(
     BuildContext context,
-    FlatButtonStyle defaultValue,
     FlatButtonThemeExtension themeExtension, {
     ControlState? extra,
   }) {

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

@@ -67,15 +67,13 @@ class SimpleIconButtonThemeResolver extends ThemeResolver<SimpleIconButtonStyle,
 
   @override
   final SimpleIconButtonStyle? Function(
-    BuildContext context,
-    SimpleIconButtonStyle? extensionValue, {
+    BuildContext context, {
     ControlState? extra,
   }) customStyleFn;
 
   @override
   SimpleIconButtonStyle? computeExtensionValueFn(
     BuildContext context,
-    SimpleIconButtonStyle defaultValue,
     SimpleIconButtonThemeExtension themeExtension, {
     ControlState? extra,
   }) {

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

@@ -55,7 +55,7 @@ class SimpleIconButtonScreen extends CubitScreen<ButtonCubit, ButtonState> {
   SimpleIconButtonStyle _resolve(BuildContext context, ControlState state) {
     final SimpleIconButtonThemeResolver resolver = themeResolver ??
         SimpleIconButtonThemeResolver(
-          customStyleFn: (context, extensionValue, {extra}) {
+          customStyleFn: (context, {extra}) {
             switch (extra) {
               case ControlState.disabled:
                 return disabledStyle;

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

@@ -63,7 +63,7 @@ class SymbolButtonScreen
   SymbolButtonStyle _resolve(BuildContext context, ButtonState state) {
     final SymbolButtonThemeResolver resolver = themeResolver ??
         SymbolButtonThemeResolver(
-          customStyleFn: (context, extensionValue, {extra}) {
+          customStyleFn: (context, {extra}) {
             SymbolButtonStyle? style;
             switch (extra?.state) {
               case ControlState.disabled:

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

@@ -69,19 +69,17 @@ class SymbolButtonThemeResolver extends ThemeResolver<SymbolButtonStyle,
 
   @override
   final SymbolButtonStyle? Function(
-    BuildContext context,
-    SymbolButtonStyle? extensionValue, {
+    BuildContext context, {
     ButtonState? extra,
   }) customStyleFn;
 
   @override
   SymbolButtonStyle? computeExtensionValueFn(
     BuildContext context,
-    SymbolButtonStyle defaultValue,
     SymbolButtonThemeExtension themeExtension, {
     ButtonState? extra,
   }) {
-    SymbolButtonStyle? style = defaultValue;
+    SymbolButtonStyle? style;
     switch (extra?.state) {
       case ControlState.disabled:
         style = themeExtension.disabledStyle;

packages/wyatt_ui_kit/lib/src/components/loader/loader.dart

@@ -45,16 +45,6 @@ class Loader extends LoaderComponent with $LoaderCWMixin {
   LoaderStyle _resolve(BuildContext context) {
     final LoaderThemeResolver resolver = themeResolver ??
         LoaderThemeResolver(
-          computeExtensionValueFn: (
-            context,
-            defaultValue,
-            themeExtension, {
-            extra,
-          }) =>
-              LoaderStyle(
-            colors: themeExtension.colors,
-            stroke: themeExtension.stroke,
-          ),
           customStyleFn: (context, {extra}) => LoaderStyle(
             colors: colors,
             stroke: stroke,

packages/wyatt_ui_kit/lib/src/components/loader/loader_theme_resolver.dart

@@ -21,7 +21,6 @@ import 'package:wyatt_ui_kit/wyatt_ui_kit.dart';
 class LoaderThemeResolver
     extends ThemeResolver<LoaderStyle, LoaderThemeExtension, void> {
   const LoaderThemeResolver({
-    required this.computeExtensionValueFn,
     required this.customStyleFn,
   });
 
@@ -42,12 +41,18 @@ class LoaderThemeResolver
 
   @override
   final LoaderStyle? Function(
-    BuildContext context,
-    LoaderStyle defaultValue,
-    LoaderThemeExtension themeExtension, {
+    BuildContext context, {
     void extra,
-  }) computeExtensionValueFn;
+  }) customStyleFn;
 
   @override
-  final LoaderStyle? Function(BuildContext context, {void extra}) customStyleFn;
+  LoaderStyle? computeExtensionValueFn(
+    BuildContext context,
+    LoaderThemeExtension themeExtension, {
+    void extra,
+  }) =>
+      LoaderStyle(
+        colors: themeExtension.colors,
+        stroke: themeExtension.stroke,
+      );
 }

packages/wyatt_ui_kit/lib/src/components/rich_text_builder/rich_text_builder.dart

@@ -42,16 +42,6 @@ class RichTextBuilder extends RichTextBuilderComponent
   RichTextBuilderStyle _resolve(BuildContext context) {
     final RichTextBuilderThemeResolver resolver = themeResolver ??
         RichTextBuilderThemeResolver(
-          computeExtensionValueFn: (
-            context,
-            defaultValue,
-            themeExtension, {
-            extra,
-          }) =>
-              RichTextBuilderStyle(
-            defaultStyle: themeExtension.defaultStyle,
-            styles: themeExtension.styles,
-          ),
           customStyleFn: (context, {extra}) => RichTextBuilderStyle(
             defaultStyle: defaultStyle,
             styles: styles,

packages/wyatt_ui_kit/lib/src/components/rich_text_builder/rich_text_builder_theme_resolver.dart

@@ -21,7 +21,6 @@ import 'package:wyatt_ui_kit/wyatt_ui_kit.dart';
 class RichTextBuilderThemeResolver extends ThemeResolver<RichTextBuilderStyle,
     RichTextBuilderThemeExtension, void> {
   const RichTextBuilderThemeResolver({
-    required this.computeExtensionValueFn,
     required this.customStyleFn,
   });
 
@@ -37,13 +36,18 @@ class RichTextBuilderThemeResolver extends ThemeResolver<RichTextBuilderStyle,
 
   @override
   final RichTextBuilderStyle? Function(
-    BuildContext context,
-    RichTextBuilderStyle defaultValue,
-    RichTextBuilderThemeExtension themeExtension, {
+    BuildContext context, {
     void extra,
-  }) computeExtensionValueFn;
+  }) customStyleFn;
 
   @override
-  final RichTextBuilderStyle? Function(BuildContext context, {void extra})
-      customStyleFn;
+  RichTextBuilderStyle? computeExtensionValueFn(
+    BuildContext context,
+    RichTextBuilderThemeExtension themeExtension, {
+    void extra,
+  }) =>
+      RichTextBuilderStyle(
+        defaultStyle: themeExtension.defaultStyle,
+        styles: themeExtension.styles,
+      );
 }

packages/wyatt_ui_kit/lib/src/components/text_inputs/text_input_screen.dart

@@ -195,7 +195,7 @@ class TextInputScreen extends CubitScreen<TextInputCubit, TextInputState> {
 
   TextInputStyle _resolve(BuildContext context, TextInputState state) {
     final resolver = TextInputThemeResolver(
-      customStyleFn: (context, extensionValue, {extra}) {
+      customStyleFn: (context, {extra}) {
         TextInputStyle? textInputStyle;
         switch (extra?.controlState) {
           case ControlState.focused:
@@ -230,10 +230,7 @@ class TextInputScreen extends CubitScreen<TextInputCubit, TextInputState> {
             break;
         }
 
-        return TextInputStyle.merge(
-          extensionValue,
-          TextInputStyle.merge(textInputStyle, style),
-        );
+        return TextInputStyle.merge(textInputStyle, style);
       },
     );
 

packages/wyatt_ui_kit/lib/src/components/text_inputs/text_input_theme_resolver.dart

@@ -28,8 +28,7 @@ class TextInputThemeResolver extends ThemeResolver<TextInputStyle,
 
   @override
   final TextInputStyle? Function(
-    BuildContext context,
-    TextInputStyle extensionValue, {
+    BuildContext context, {
     TextInputState? extra,
   }) customStyleFn;
 
@@ -126,7 +125,6 @@ class TextInputThemeResolver extends ThemeResolver<TextInputStyle,
   @override
   TextInputStyle? computeExtensionValueFn(
     BuildContext context,
-    TextInputStyle defaultValue,
     TextInputThemeExtension themeExtension, {
     TextInputState? extra,
   }) {
@@ -164,9 +162,6 @@ class TextInputThemeResolver extends ThemeResolver<TextInputStyle,
         break;
     }
 
-    return TextInputStyle.merge(
-      defaultValue,
-      TextInputStyle.merge(textInputStyle, style),
-    );
+    return TextInputStyle.merge(textInputStyle, style);
   }
 }