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

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

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

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

@ -190,7 +190,7 @@ class AboutItem extends StatelessWidget {
height: iconSize,
color: Theme.of(context)
.extension<StackColors>()!
.bottomNavIconIcon,
.topNavIconPrimary,
),
),
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,
height: 32,
decoration: BoxDecoration(
color: contact.id == "default"
color: contact.customId == "default"
? Colors.transparent
: Theme.of(context)
.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(
child: SizedBox(
height: 70,
height: 40,
child: Row(
children: [
const SizedBox(