Wyatt-FOSS/wyatt-packages
Wyatt-FOSS/wyatt-packages
6
2
Fork 0
Code Issues 20 Pull Requests 4 Actions Packages Projects Releases Activity

fix(ui_component): inverse merge in TextInputStyle
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Hugo Pointcheval 2023-02-21 16:08:23 +01:00
parent 93cc5058d1
commit 6037e13f50
Signed by: hugo
GPG Key ID: 3AAC487E131E00BC
3 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/wyatt_ui_components/lib/src/domain/entities/text_inputs/text_input_style.dart
View File

@ -55,19 +55,19 @@ class TextInputStyle extends ThemeStyle<TextInputStyle> {
if (a == null) {
return b.copyWith();
}
return b.copyWith(
labelStyle: a.labelStyle,
hintStyle: a.hintStyle,
backgroundColors: a.backgroundColors,
borderColors: a.borderColors,
boxShadow: a.boxShadow,
radius: a.radius,
inputStyle: a.inputStyle,
iconColor: a.iconColor,
prefixStyle: a.prefixStyle,
prefixIconColor: a.prefixIconColor,
suffixIconColor: a.suffixIconColor,
suffixStyle: a.suffixStyle,
return a.copyWith(
labelStyle: b.labelStyle,
hintStyle: b.hintStyle,
backgroundColors: b.backgroundColors,
borderColors: b.borderColors,
boxShadow: b.boxShadow,
radius: b.radius,
inputStyle: b.inputStyle,
iconColor: b.iconColor,
prefixStyle: b.prefixStyle,
prefixIconColor: b.prefixIconColor,
suffixIconColor: b.suffixIconColor,
suffixStyle: b.suffixStyle,
);
}

5
packages/wyatt_ui_kit/lib/src/components/text_inputs/text_input_screen.dart
View File

@ -208,9 +208,7 @@ class TextInputScreen extends CubitScreen<TextInputCubit, TextInputState> {
textInputStyle = normalStyle;
break;
case ControlState.hovered:
break;
case ControlState.tapped:
break;
case null:
break;
}
@ -221,11 +219,8 @@ class TextInputScreen extends CubitScreen<TextInputCubit, TextInputState> {
style = errorStyle;
break;
case StatusState.initial:
break;
case StatusState.success:
break;
case StatusState.loading:
break;
case null:
break;
}

11
packages/wyatt_ui_kit/lib/src/components/text_inputs/text_input_theme_resolver.dart
View File

@ -81,11 +81,8 @@ class TextInputThemeResolver extends ThemeResolver<TextInputStyle,
labelStyle = labelStyle?.copyWith(color: context.colorScheme.primary);
break;
case ControlState.hovered:
break;
case ControlState.tapped:
break;
case ControlState.normal:
break;
case null:
break;
}
@ -97,11 +94,8 @@ class TextInputThemeResolver extends ThemeResolver<TextInputStyle,
borderColors = context.colorScheme.error;
break;
case StatusState.initial:
break;
case StatusState.success:
break;
case StatusState.loading:
break;
case null:
break;
}
@ -139,9 +133,7 @@ class TextInputThemeResolver extends ThemeResolver<TextInputStyle,
textInputStyle = themeExtension.normalStyle;
break;
case ControlState.hovered:
break;
case ControlState.tapped:
break;
case null:
break;
}
@ -152,11 +144,8 @@ class TextInputThemeResolver extends ThemeResolver<TextInputStyle,
style = themeExtension.errorStyle;
break;
case StatusState.initial:
break;
case StatusState.success:
break;
case StatusState.loading:
break;
case null:
break;
}