Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-04-04 13:27:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from cypherstack/ui-fixes

Browse source 
disable editing of default node fields
This commit is contained in:
Diego Salazar 2023-01-12 11:52:01 -07:00 committed by GitHub
commit fac550d208
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 113 additions and 64 deletions

6
assets/svg/oled-black-theme.svg
View file

@ -1,6 +1,6 @@
<svg width="200" height="162" viewBox="0 0 200 162" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_489_21263)">
<rect width="200" height="162" rx="8" fill="url(#paint0_linear_489_21263)"/>
<rect width="200" height="162" rx="8" fill="black"/>
<rect x="10" y="10" width="180" height="20" rx="2" fill="#77A7F9"/>
<rect x="16" y="16" width="106" height="8" rx="1" fill="black"/>
<rect x="10" y="40" width="180" height="20" rx="2" fill="#212F46"/>
@ -17,10 +17,6 @@
<rect x="16" y="156" width="106" height="8" rx="1" fill="black"/>
</g>
<defs>
<linearGradient id="paint0_linear_489_21263" x1="100" y1="0" x2="100" y2="162" gradientUnits="userSpaceOnUse">
<stop offset="0.9999"/>
<stop offset="1" stop-color="#E8F2F9"/>
</linearGradient>
<clipPath id="clip0_489_21263">
<rect width="200" height="162" rx="8" fill="white"/>
</clipPath>

Side by side Swipe Overlay

Before

(image error) Size: 1.4 KiB

After

(image error) Size: 1.2 KiB

16
assets/svg/oled-black.svg Normal file
View file

@ -0,0 +1,16 @@
<svg width="180" height="152" viewBox="0 0 180 152" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="180" height="20" rx="2" fill="#77A7F9"/>
<rect x="6" y="6" width="106" height="8" rx="1" fill="black"/>
<rect y="30" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="6" y="36" width="106" height="8" rx="1" fill="black"/>
<rect y="52" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="6" y="58" width="106" height="8" rx="1" fill="black"/>
<rect y="74" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="6" y="80" width="106" height="8" rx="1" fill="black"/>
<rect y="96" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="6" y="102" width="106" height="8" rx="1" fill="black"/>
<rect y="118" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="6" y="124" width="106" height="8" rx="1" fill="black"/>
<rect y="140" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="6" y="146" width="106" height="8" rx="1" fill="black"/>
</svg>
Side by side

After

(image error) Size: 979 B

28
assets/svg/oledBlack/oled-black-theme.svg
View file

@ -1,28 +0,0 @@
<svg width="200" height="162" viewBox="0 0 200 162" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_489_21263)">
<rect width="200" height="162" rx="8" fill="url(#paint0_linear_489_21263)"/>
<rect x="10" y="10" width="180" height="20" rx="2" fill="#77A7F9"/>
<rect x="16" y="16" width="106" height="8" rx="1" fill="black"/>
<rect x="10" y="40" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="16" y="46" width="106" height="8" rx="1" fill="black"/>
<rect x="10" y="62" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="16" y="68" width="106" height="8" rx="1" fill="black"/>
<rect x="10" y="84" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="16" y="90" width="106" height="8" rx="1" fill="black"/>
<rect x="10" y="106" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="16" y="112" width="106" height="8" rx="1" fill="black"/>
<rect x="10" y="128" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="16" y="134" width="106" height="8" rx="1" fill="black"/>
<rect x="10" y="150" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="16" y="156" width="106" height="8" rx="1" fill="black"/>
</g>
<defs>
<linearGradient id="paint0_linear_489_21263" x1="100" y1="0" x2="100" y2="162" gradientUnits="userSpaceOnUse">
<stop offset="0.9999"/>
<stop offset="1" stop-color="#E8F2F9"/>
</linearGradient>
<clipPath id="clip0_489_21263">
<rect width="200" height="162" rx="8" fill="white"/>
</clipPath>
</defs>
</svg>
Side by side

Before

(image error) Size: 1.4 KiB

21
lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart
View file

@ -373,17 +373,22 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
FormInputStatus status, String prefix) {
Color color;
Color prefixColor;
Color borderColor;
Widget? suffixIcon;
switch (status) {
case FormInputStatus.empty:
color = Theme.of(context).extension<StackColors>()!.textFieldDefaultBG;
prefixColor = Theme.of(context).extension<StackColors>()!.textSubtitle2;
borderColor =
Theme.of(context).extension<StackColors>()!.textFieldDefaultBG;
break;
case FormInputStatus.invalid:
color = Theme.of(context).extension<StackColors>()!.textFieldErrorBG;
prefixColor = Theme.of(context)
.extension<StackColors>()!
.textFieldErrorSearchIconLeft;
borderColor =
Theme.of(context).extension<StackColors>()!.textFieldErrorBorder;
suffixIcon = SvgPicture.asset(
Assets.svg.alertCircle,
width: 16,
@ -398,6 +403,8 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
prefixColor = Theme.of(context)
.extension<StackColors>()!
.textFieldSuccessSearchIconLeft;
borderColor =
Theme.of(context).extension<StackColors>()!.textFieldSuccessBorder;
suffixIcon = SvgPicture.asset(
Assets.svg.checkCircle,
width: 16,
@ -449,11 +456,11 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
child: suffixIcon,
),
),
enabledBorder: _buildOutlineInputBorder(color),
focusedBorder: _buildOutlineInputBorder(color),
errorBorder: _buildOutlineInputBorder(color),
disabledBorder: _buildOutlineInputBorder(color),
focusedErrorBorder: _buildOutlineInputBorder(color),
enabledBorder: _buildOutlineInputBorder(borderColor),
focusedBorder: _buildOutlineInputBorder(borderColor),
errorBorder: _buildOutlineInputBorder(borderColor),
disabledBorder: _buildOutlineInputBorder(borderColor),
focusedErrorBorder: _buildOutlineInputBorder(borderColor),
);
}
@ -786,7 +793,7 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
.copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.overlay,
.textRestore,
fontSize: isDesktop ? 16 : 14,
),
),
@ -993,7 +1000,7 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
STextStyles.field(context).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.overlay,
.textRestore,
fontSize: isDesktop ? 16 : 14,
),
),

39
lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
View file

@ -671,7 +671,6 @@ class _NodeFormState extends ConsumerState<NodeForm> {
bool _trusted = false;
int? port;
late bool enableSSLCheckbox;
late bool trustedCheckbox;
late final bool enableAuthFields;
@ -722,6 +721,9 @@ class _NodeFormState extends ConsumerState<NodeForm> {
return enable;
}
bool get shouldBeReadOnly =>
widget.readOnly || widget.node?.isDefault == true;
void _updateState() {
port = int.tryParse(_portController.text);
onChanged?.call(canSave, canTestConnection);
@ -775,11 +777,6 @@ class _NodeFormState extends ConsumerState<NodeForm> {
} else {
enableSSLCheckbox = true;
}
if (widget.coin == Coin.monero || widget.coin == Coin.wownero) {
trustedCheckbox = node.trusted ?? false;
} else {
trustedCheckbox = false;
}
WidgetsBinding.instance.addPostFrameCallback((_) {
// update provider state object so test connection works without having to modify a field in the ui first
@ -822,7 +819,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
autocorrect: Util.isDesktop ? false : true,
enableSuggestions: Util.isDesktop ? false : true,
key: const Key("addCustomNodeNodeNameFieldKey"),
readOnly: widget.readOnly,
readOnly: shouldBeReadOnly,
enabled: enableField(_nameController),
controller: _nameController,
focusNode: _nameFocusNode,
@ -832,7 +829,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
_nameFocusNode,
context,
).copyWith(
suffixIcon: !widget.readOnly && _nameController.text.isNotEmpty
suffixIcon: !shouldBeReadOnly && _nameController.text.isNotEmpty
? Padding(
padding: const EdgeInsets.only(right: 0),
child: UnconstrainedBox(
@ -868,7 +865,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
autocorrect: Util.isDesktop ? false : true,
enableSuggestions: Util.isDesktop ? false : true,
key: const Key("addCustomNodeNodeAddressFieldKey"),
readOnly: widget.readOnly,
readOnly: shouldBeReadOnly,
enabled: enableField(_hostController),
controller: _hostController,
focusNode: _hostFocusNode,
@ -880,7 +877,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
_hostFocusNode,
context,
).copyWith(
suffixIcon: !widget.readOnly && _hostController.text.isNotEmpty
suffixIcon: !shouldBeReadOnly && _hostController.text.isNotEmpty
? Padding(
padding: const EdgeInsets.only(right: 0),
child: UnconstrainedBox(
@ -927,7 +924,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
autocorrect: Util.isDesktop ? false : true,
enableSuggestions: Util.isDesktop ? false : true,
key: const Key("addCustomNodeNodePortFieldKey"),
readOnly: widget.readOnly,
readOnly: shouldBeReadOnly,
enabled: enableField(_portController),
controller: _portController,
focusNode: _portFocusNode,
@ -939,7 +936,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
_portFocusNode,
context,
).copyWith(
suffixIcon: !widget.readOnly && _portController.text.isNotEmpty
suffixIcon: !shouldBeReadOnly && _portController.text.isNotEmpty
? Padding(
padding: const EdgeInsets.only(right: 0),
child: UnconstrainedBox(
@ -976,7 +973,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
autocorrect: Util.isDesktop ? false : true,
enableSuggestions: Util.isDesktop ? false : true,
controller: _usernameController,
readOnly: widget.readOnly,
readOnly: shouldBeReadOnly,
enabled: enableField(_usernameController),
keyboardType: TextInputType.number,
focusNode: _usernameFocusNode,
@ -987,7 +984,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
context,
).copyWith(
suffixIcon:
!widget.readOnly && _usernameController.text.isNotEmpty
!shouldBeReadOnly && _usernameController.text.isNotEmpty
? Padding(
padding: const EdgeInsets.only(right: 0),
child: UnconstrainedBox(
@ -1025,7 +1022,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
autocorrect: Util.isDesktop ? false : true,
enableSuggestions: Util.isDesktop ? false : true,
controller: _passwordController,
readOnly: widget.readOnly,
readOnly: shouldBeReadOnly,
enabled: enableField(_passwordController),
keyboardType: TextInputType.number,
focusNode: _passwordFocusNode,
@ -1036,7 +1033,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
context,
).copyWith(
suffixIcon:
!widget.readOnly && _passwordController.text.isNotEmpty
!shouldBeReadOnly && _passwordController.text.isNotEmpty
? Padding(
padding: const EdgeInsets.only(right: 0),
child: UnconstrainedBox(
@ -1069,7 +1066,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
Row(
children: [
GestureDetector(
onTap: !widget.readOnly && enableSSLCheckbox
onTap: !shouldBeReadOnly && enableSSLCheckbox
? () {
setState(() {
_useSSL = !_useSSL;
@ -1085,7 +1082,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
width: 20,
height: 20,
child: Checkbox(
fillColor: !widget.readOnly && enableSSLCheckbox
fillColor: !shouldBeReadOnly && enableSSLCheckbox
? null
: MaterialStateProperty.all(Theme.of(context)
.extension<StackColors>()!
@ -1093,7 +1090,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
materialTapTargetSize:
MaterialTapTargetSize.shrinkWrap,
value: _useSSL,
onChanged: !widget.readOnly && enableSSLCheckbox
onChanged: !shouldBeReadOnly && enableSSLCheckbox
? (newValue) {
setState(() {
_useSSL = newValue!;
@ -1136,7 +1133,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
width: 20,
height: 20,
child: Checkbox(
fillColor: !widget.readOnly /*&& trustedCheckbox*/
fillColor: !widget.readOnly
? null
: MaterialStateProperty.all(Theme.of(context)
.extension<StackColors>()!
@ -1144,7 +1141,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
materialTapTargetSize:
MaterialTapTargetSize.shrinkWrap,
value: _trusted,
onChanged: !widget.readOnly /*&& trustedCheckbox*/
onChanged: !widget.readOnly
? (newValue) {
setState(() {
_trusted = newValue!;

5
lib/utilities/theme/color_theme.dart
View file

@ -7,6 +7,8 @@ import 'package:stackwallet/utilities/theme/oled_black_colors.dart';
enum ThemeType { light, dark, oceanBreeze, oledBlack }
// adjust this file
extension ThemeTypeExt on ThemeType {
StackColorTheme get colorTheme {
switch (this) {
@ -66,6 +68,7 @@ abstract class StackColorTheme {
Color get textWhite;
Color get textFavoriteCard;
Color get textError;
Color get textRestore;
// button background
Color get buttonBackPrimary;
@ -144,6 +147,8 @@ abstract class StackColorTheme {
Color get textFieldDefaultBG;
Color get textFieldErrorBG;
Color get textFieldSuccessBG;
Color get textFieldErrorBorder;
Color get textFieldSuccessBorder;
Color get textFieldActiveSearchIconLeft;
Color get textFieldDefaultSearchIconLeft;
Color get textFieldErrorSearchIconLeft;

6
lib/utilities/theme/dark_colors.dart
View file

@ -55,6 +55,8 @@ class DarkColors extends StackColorTheme {
Color get textFavoriteCard => const Color(0xFF232323);
@override
Color get textError => const Color(0xFFF37475);
@override
Color get textRestore => overlay;
// button background
@override
@ -194,6 +196,10 @@ class DarkColors extends StackColorTheme {
Color get textFieldErrorBG => const Color(0xFFFFB4A9);
@override
Color get textFieldSuccessBG => const Color(0xFF8EF5C3);
@override
Color get textFieldErrorBorder => textFieldErrorBG;
@override
Color get textFieldSuccessBorder => textFieldSuccessBG;
@override
Color get textFieldActiveSearchIconLeft => const Color(0xFFA9ACAC);

6
lib/utilities/theme/light_colors.dart
View file

@ -55,6 +55,8 @@ class LightColors extends StackColorTheme {
Color get textFavoriteCard => const Color(0xFF232323);
@override
Color get textError => const Color(0xFF930006);
@override
Color get textRestore => overlay;
// button background
@override
@ -194,6 +196,10 @@ class LightColors extends StackColorTheme {
Color get textFieldErrorBG => const Color(0xFFFFDAD4);
@override
Color get textFieldSuccessBG => const Color(0xFFB9E9D4);
@override
Color get textFieldErrorBorder => textFieldErrorBG;
@override
Color get textFieldSuccessBorder => textFieldSuccessBG;
@override
Color get textFieldActiveSearchIconLeft => const Color(0xFFA9ACAC);

6
lib/utilities/theme/ocean_breeze_colors.dart
View file

@ -62,6 +62,8 @@ class OceanBreezeColors extends StackColorTheme {
Color get textFavoriteCard => const Color(0xFF232323);
@override
Color get textError => const Color(0xFF8D0006);
@override
Color get textRestore => overlay;
// button background
@override
@ -201,6 +203,10 @@ class OceanBreezeColors extends StackColorTheme {
Color get textFieldErrorBG => const Color(0xFFF6C7C3);
@override
Color get textFieldSuccessBG => const Color(0xFFADD6D2);
@override
Color get textFieldErrorBorder => textFieldErrorBG;
@override
Color get textFieldSuccessBorder => textFieldSuccessBG;
@override
Color get textFieldActiveSearchIconLeft => const Color(0xFF86898C);

13
lib/utilities/theme/oled_black_colors.dart
View file

@ -51,11 +51,13 @@ class OledBlackColors extends StackColorTheme {
@override
Color get textSubtitle6 => const Color(0xFF878A8A);
@override
Color get textWhite => const Color(0xFFDEDEDE);
Color get textWhite => const Color(0xFF242424);
@override
Color get textFavoriteCard => const Color(0xFFDEDEDE);
Color get textFavoriteCard => const Color(0xFF232323);
@override
Color get textError => const Color(0xFFCF6679);
@override
Color get textRestore => textDark;
// button background
@override
@ -76,7 +78,7 @@ class OledBlackColors extends StackColorTheme {
@override
Color get numpadBackDefault => const Color(0xFF6F9CE9);
@override
Color get bottomNavBack => const Color(0xFFDEDEDE);
Color get bottomNavBack => const Color(0xFF202122);
// button text/element
@override
@ -195,6 +197,11 @@ class OledBlackColors extends StackColorTheme {
Color get textFieldErrorBG => const Color(0xFF141414);
@override
Color get textFieldSuccessBG => const Color(0xFF141414);
//add border color vars here
@override
Color get textFieldErrorBorder => const Color(0xFFCF6679);
@override
Color get textFieldSuccessBorder => const Color(0xFF23CFA1);
@override
Color get textFieldActiveSearchIconLeft => const Color(0xFF9C9C9C);

31
lib/utilities/theme/stack_colors.dart
View file

@ -32,6 +32,7 @@ class StackColors extends ThemeExtension<StackColors> {
final Color textWhite;
final Color textFavoriteCard;
final Color textError;
final Color textRestore;
// button background
final Color buttonBackPrimary;
@ -110,6 +111,8 @@ class StackColors extends ThemeExtension<StackColors> {
final Color textFieldDefaultBG;
final Color textFieldErrorBG;
final Color textFieldSuccessBG;
final Color textFieldErrorBorder;
final Color textFieldSuccessBorder;
final Color textFieldActiveSearchIconLeft;
final Color textFieldDefaultSearchIconLeft;
final Color textFieldErrorSearchIconLeft;
@ -198,6 +201,7 @@ class StackColors extends ThemeExtension<StackColors> {
required this.textWhite,
required this.textFavoriteCard,
required this.textError,
required this.textRestore,
required this.buttonBackPrimary,
required this.buttonBackSecondary,
required this.buttonBackPrimaryDisabled,
@ -258,6 +262,8 @@ class StackColors extends ThemeExtension<StackColors> {
required this.textFieldDefaultBG,
required this.textFieldErrorBG,
required this.textFieldSuccessBG,
required this.textFieldErrorBorder,
required this.textFieldSuccessBorder,
required this.textFieldActiveSearchIconLeft,
required this.textFieldDefaultSearchIconLeft,
required this.textFieldErrorSearchIconLeft,
@ -334,6 +340,7 @@ class StackColors extends ThemeExtension<StackColors> {
textWhite: colorTheme.textWhite,
textFavoriteCard: colorTheme.textFavoriteCard,
textError: colorTheme.textError,
textRestore: colorTheme.textRestore,
buttonBackPrimary: colorTheme.buttonBackPrimary,
buttonBackSecondary: colorTheme.buttonBackSecondary,
buttonBackPrimaryDisabled: colorTheme.buttonBackPrimaryDisabled,
@ -394,6 +401,8 @@ class StackColors extends ThemeExtension<StackColors> {
textFieldDefaultBG: colorTheme.textFieldDefaultBG,
textFieldErrorBG: colorTheme.textFieldErrorBG,
textFieldSuccessBG: colorTheme.textFieldSuccessBG,
textFieldErrorBorder: colorTheme.textFieldErrorBorder,
textFieldSuccessBorder: colorTheme.textFieldSuccessBorder,
textFieldActiveSearchIconLeft: colorTheme.textFieldActiveSearchIconLeft,
textFieldDefaultSearchIconLeft: colorTheme.textFieldDefaultSearchIconLeft,
textFieldErrorSearchIconLeft: colorTheme.textFieldErrorSearchIconLeft,
@ -473,6 +482,7 @@ class StackColors extends ThemeExtension<StackColors> {
Color? textWhite,
Color? textFavoriteCard,
Color? textError,
Color? textRestore,
Color? buttonBackPrimary,
Color? buttonBackSecondary,
Color? buttonBackPrimaryDisabled,
@ -533,6 +543,8 @@ class StackColors extends ThemeExtension<StackColors> {
Color? textFieldDefaultBG,
Color? textFieldErrorBG,
Color? textFieldSuccessBG,
Color? textFieldErrorBorder,
Color? textFieldSuccessBorder,
Color? textFieldActiveSearchIconLeft,
Color? textFieldDefaultSearchIconLeft,
Color? textFieldErrorSearchIconLeft,
@ -607,6 +619,7 @@ class StackColors extends ThemeExtension<StackColors> {
textWhite: textWhite ?? this.textWhite,
textFavoriteCard: textFavoriteCard ?? this.textFavoriteCard,
textError: textError ?? this.textError,
textRestore: textRestore ?? this.textRestore,
buttonBackPrimary: buttonBackPrimary ?? this.buttonBackPrimary,
buttonBackSecondary: buttonBackSecondary ?? this.buttonBackSecondary,
buttonBackPrimaryDisabled:
@ -679,6 +692,9 @@ class StackColors extends ThemeExtension<StackColors> {
textFieldDefaultBG: textFieldDefaultBG ?? this.textFieldDefaultBG,
textFieldErrorBG: textFieldErrorBG ?? this.textFieldErrorBG,
textFieldSuccessBG: textFieldSuccessBG ?? this.textFieldSuccessBG,
textFieldErrorBorder: textFieldErrorBorder ?? this.textFieldErrorBorder,
textFieldSuccessBorder:
textFieldSuccessBorder ?? this.textFieldSuccessBorder,
textFieldActiveSearchIconLeft:
textFieldActiveSearchIconLeft ?? this.textFieldActiveSearchIconLeft,
textFieldDefaultSearchIconLeft:
@ -877,6 +893,11 @@ class StackColors extends ThemeExtension<StackColors> {
other.textError,
t,
)!,
textRestore: Color.lerp(
textRestore,
other.textRestore,
t,
)!,
buttonBackPrimary: Color.lerp(
buttonBackPrimary,
other.buttonBackPrimary,
@ -1177,6 +1198,16 @@ class StackColors extends ThemeExtension<StackColors> {
other.textFieldSuccessBG,
t,
)!,
textFieldErrorBorder: Color.lerp(
textFieldErrorBorder,
other.textFieldErrorBorder,
t,
)!,
textFieldSuccessBorder: Color.lerp(
textFieldSuccessBorder,
other.textFieldSuccessBorder,
t,
)!,
textFieldActiveSearchIconLeft: Color.lerp(
textFieldActiveSearchIconLeft,
other.textFieldActiveSearchIconLeft,