diff --git a/lib/widgets/address_book_card.dart b/lib/widgets/address_book_card.dart index cebcf166f..c9ac86052 100644 --- a/lib/widgets/address_book_card.dart +++ b/lib/widgets/address_book_card.dart @@ -9,7 +9,6 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/theme/stack_colors.dart'; import 'package:stackwallet/utilities/util.dart'; -import 'package:stackwallet/widgets/conditional_parent.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart'; class AddressBookCard extends ConsumerStatefulWidget { @@ -59,111 +58,108 @@ class _AddressBookCardState extends ConsumerState { } } - return ConditionalParent( - condition: !isDesktop, - child: Row( - children: [ - Container( - width: 32, - height: 32, - decoration: BoxDecoration( - color: contact.id == "default" - ? Theme.of(context) - .extension()! - .myStackContactIconBG - : Theme.of(context) - .extension()! - .textFieldDefaultBG, - borderRadius: BorderRadius.circular(32), + return RoundedWhiteContainer( + padding: const EdgeInsets.all(4), + child: RawMaterialButton( + // splashColor: Theme.of(context).extension()!.highlight, + padding: const EdgeInsets.all(0), + materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular( + Constants.size.circularBorderRadius, + ), + ), + onPressed: () { + showDialog( + context: context, + useSafeArea: true, + barrierDismissible: true, + builder: (_) => ContactPopUp( + contactId: contact.id, ), - child: contact.id == "default" - ? Center( - child: SvgPicture.asset( - Assets.svg.stackIcon(context), - width: 20, - ), - ) - : contact.emojiChar != null + ); + }, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + children: [ + Container( + width: 32, + height: 32, + decoration: BoxDecoration( + color: contact.id == "default" + ? Theme.of(context) + .extension()! + .myStackContactIconBG + : Theme.of(context) + .extension()! + .textFieldDefaultBG, + borderRadius: BorderRadius.circular(32), + ), + child: contact.id == "default" ? Center( - child: Text(contact.emojiChar!), - ) - : Center( child: SvgPicture.asset( - Assets.svg.user, - width: 18, + Assets.svg.stackIcon(context), + width: 20, ), - ), - ), - const SizedBox( - width: 12, - ), - if (isDesktop) - Text( - contact.name, - style: STextStyles.itemSubtitle12(context), - ), - if (isDesktop) - const SizedBox( - width: 16, - ), - if (isDesktop) - Text( - coinsString, - style: STextStyles.label(context), - ), - if (!isDesktop) - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ + ) + : contact.emojiChar != null + ? Center( + child: Text(contact.emojiChar!), + ) + : Center( + child: SvgPicture.asset( + Assets.svg.user, + width: 18, + ), + ), + ), + const SizedBox( + width: 12, + ), + if (isDesktop) Text( contact.name, style: STextStyles.itemSubtitle12(context), ), + if (isDesktop) const SizedBox( - height: 4, + width: 16, ), + if (isDesktop) Text( coinsString, style: STextStyles.label(context), ), - ], - ), - if (isDesktop) const Spacer(), - if (isDesktop) - SvgPicture.asset( - widget.indicatorDown == true - ? Assets.svg.chevronDown - : Assets.svg.chevronUp, - width: 10, - height: 5, - color: Theme.of(context).extension()!.textSubtitle2, - ), - ], - ), - builder: (child) => RoundedWhiteContainer( - padding: const EdgeInsets.all(4), - child: RawMaterialButton( - // splashColor: Theme.of(context).extension()!.highlight, - padding: const EdgeInsets.all(0), - materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular( - Constants.size.circularBorderRadius, - ), - ), - onPressed: () { - showDialog( - context: context, - useSafeArea: true, - barrierDismissible: true, - builder: (_) => ContactPopUp( - contactId: contact.id, - ), - ); - }, - child: Padding( - padding: const EdgeInsets.all(8.0), - child: child, + if (!isDesktop) + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + contact.name, + style: STextStyles.itemSubtitle12(context), + ), + const SizedBox( + height: 4, + ), + Text( + coinsString, + style: STextStyles.label(context), + ), + ], + ), + if (isDesktop) const Spacer(), + // if (isDesktop) + // SvgPicture.asset( + // widget.indicatorDown == true + // ? Assets.svg.chevronDown + // : Assets.svg.chevronUp, + // width: 10, + // height: 5, + // color: + // Theme.of(context).extension()!.textSubtitle2, + // ), + ], ), ), ),