Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2024-11-17 01:37:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #539 from cypherstack/ui-fixes

Browse source 
fix support page icon color
This commit is contained in:
julian-CStack 2023-05-16 16:32:02 -06:00 committed by GitHub
commit e935bd0bb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pages/address_book_views/subviews/contact_details_view.dart
View file

@ -270,7 +270,7 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
onPressed: () { onPressed: () {
Navigator.of(context).pushNamed( Navigator.of(context).pushNamed(
EditContactNameEmojiView.routeName, EditContactNameEmojiView.routeName,
arguments: _contact.id, arguments: _contact.customId,
); );
}, },
style: Theme.of(context) style: Theme.of(context)
@ -318,7 +318,7 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
onTap: () { onTap: () {
Navigator.of(context).pushNamed( Navigator.of(context).pushNamed(
AddNewContactAddressView.routeName, AddNewContactAddressView.routeName,
arguments: _contact.id, arguments: _contact.customId,
); );
}, },
), ),
@ -385,7 +385,7 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
Navigator.of(context).pushNamed( Navigator.of(context).pushNamed(
EditContactAddressView.routeName, EditContactAddressView.routeName,
arguments: Tuple2(_contact.id, e), arguments: Tuple2(_contact.customId, e),
); );
}, },
child: RoundedContainer( child: RoundedContainer(

16
lib/pages/address_book_views/subviews/contact_popup.dart
View file

@ -110,7 +110,7 @@ class ContactPopUp extends ConsumerWidget {
.textFieldDefaultBG, .textFieldDefaultBG,
borderRadius: BorderRadius.circular(32), borderRadius: BorderRadius.circular(32),
), ),
child: contact.id == "default" child: contact.customId == "default"
? Center( ? Center(
child: SvgPicture.file( child: SvgPicture.file(
File( File(
@ -146,13 +146,13 @@ class ContactPopUp extends ConsumerWidget {
STextStyles.itemSubtitle12(context), STextStyles.itemSubtitle12(context),
), ),
), ),
if (contact.id != "default") if (contact.customId != "default")
TextButton( TextButton(
onPressed: () { onPressed: () {
Navigator.pop(context); Navigator.pop(context);
Navigator.of(context).pushNamed( Navigator.of(context).pushNamed(
ContactDetailsView.routeName, ContactDetailsView.routeName,
arguments: contact.id, arguments: contact.customId,
); );
}, },
style: Theme.of(context) style: Theme.of(context)
@ -176,7 +176,7 @@ class ContactPopUp extends ConsumerWidget {
), ),
), ),
SizedBox( SizedBox(
height: contact.id == "default" ? 16 : 8, height: contact.customId == "default" ? 16 : 8,
), ),
Container( Container(
height: 1, height: 1,
@ -233,14 +233,14 @@ class ContactPopUp extends ConsumerWidget {
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
if (contact.id == "default") if (contact.customId == "default")
Text( Text(
e.other!, e.other!,
style: style:
STextStyles.itemSubtitle12( STextStyles.itemSubtitle12(
context), context),
), ),
if (contact.id != "default") if (contact.customId != "default")
Text( Text(
"${e.label} (${e.coin.ticker})", "${e.label} (${e.coin.ticker})",
style: style:
@ -336,13 +336,13 @@ class ContactPopUp extends ConsumerWidget {
), ),
], ],
), ),
if (contact.id != "default" && if (contact.customId != "default" &&
hasActiveWallet && hasActiveWallet &&
!isExchangeFlow) !isExchangeFlow)
const SizedBox( const SizedBox(
width: 4, width: 4,
), ),
if (contact.id != "default" && if (contact.customId != "default" &&
hasActiveWallet && hasActiveWallet &&
!isExchangeFlow) !isExchangeFlow)
Column( Column(

2
lib/pages/settings_views/global_settings_view/support_view.dart
View file

@ -190,7 +190,7 @@ class AboutItem extends StatelessWidget {
height: iconSize, height: iconSize,
color: Theme.of(context) color: Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.bottomNavIconIcon, .topNavIconPrimary,
), ),
), ),
const SizedBox( const SizedBox(

2
lib/pages_desktop_specific/address_book_view/subwidgets/desktop_contact_details.dart
View file

@ -111,7 +111,7 @@ class _DesktopContactDetailsState extends ConsumerState<DesktopContactDetails> {
width: 32, width: 32,
height: 32, height: 32,
decoration: BoxDecoration( decoration: BoxDecoration(
color: contact.id == "default" color: contact.customId == "default"
? Colors.transparent ? Colors.transparent
: Theme.of(context) : Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!

2
lib/pages_desktop_specific/password/desktop_login_view.dart
View file

@ -252,7 +252,7 @@ class _DesktopLoginViewState extends ConsumerState<DesktopLoginView> {
), ),
suffixIcon: UnconstrainedBox( suffixIcon: UnconstrainedBox(
child: SizedBox( child: SizedBox(
height: 70, height: 40,
child: Row( child: Row(
children: [ children: [
const SizedBox( const SizedBox(