ui_kit-ui_components/feat/add-textinputs-components #145

Merged
hugo merged 25 commits from ui_kit-ui_components/feat/add-textinputs-components into master 2023-02-21 15:11:35 +00:00
3 changed files with 13 additions and 29 deletions
Showing only changes of commit 6037e13f50 - Show all commits

View File

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

View File

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

View File

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