Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UI Enhancements #1824

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

UI Enhancements #1824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4619506
Fix button color
tuxpizza Nov 24, 2024
ab22542
Unify search icon
tuxpizza Nov 24, 2024
c82e70e
Update select button colors
tuxpizza Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions lib/src/screens/cake_pay/cards/cake_pay_cards_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class CakePayCardsPage extends BasePage {
},
child: Container(
width: 32,
padding: EdgeInsets.all(8),
padding: EdgeInsets.only(top: 7, bottom: 7),
decoration: BoxDecoration(
color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
border: Border.all(
Expand All @@ -121,7 +121,7 @@ class CakePayCardsPage extends BasePage {
borderRadius: BorderRadius.circular(10),
),
child: Image.asset(
'assets/images/filter.png',
'assets/images/filter_icon.png',
color: Theme.of(context).extension<FilterTheme>()!.iconColor,
))),
);
Expand All @@ -137,14 +137,14 @@ class CakePayCardsPage extends BasePage {
}
},
child: Container(
padding: EdgeInsets.symmetric(horizontal: 6),
padding: EdgeInsets.symmetric(horizontal: 8),
decoration: BoxDecoration(
color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
border: Border.all(color: Colors.transparent),
borderRadius: BorderRadius.circular(10),
),
child: Container(
margin: EdgeInsets.symmetric(vertical: 2),
margin: EdgeInsets.symmetric(vertical: 4),
child: Row(
children: [
Image.asset(
Expand Down Expand Up @@ -359,13 +359,10 @@ class _SearchWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
final searchIcon = ExcludeSemantics(
child: Padding(
padding: EdgeInsets.all(8),
child: Image.asset(
'assets/images/mini_search_icon.png',
child: Icon( Icons.search,
color: Theme.of(context).extension<FilterTheme>()!.iconColor,
//size: 24
),
),
);

return TextField(
Expand All @@ -375,8 +372,8 @@ class _SearchWidget extends StatelessWidget {
decoration: InputDecoration(
filled: true,
contentPadding: EdgeInsets.only(
top: 10,
left: 10,
top: 8,
left: 8,
),
fillColor: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
hintText: S.of(context).search,
Expand Down
2 changes: 1 addition & 1 deletion lib/src/screens/new_wallet/new_wallet_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
key: ValueKey('new_wallet_page_confirm_button_key'),
onPressed: _confirmForm,
text: S.of(context).seed_language_next,
color: Colors.green,
color: Theme.of(context).primaryColor,
textColor: Colors.white,
isLoading: _walletNewVM.state is IsExecutingState,
isDisabled: _walletNewVM.name.isEmpty,
Expand Down
2 changes: 1 addition & 1 deletion lib/src/screens/new_wallet/widgets/select_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class SelectButton extends StatelessWidget {

@override
Widget build(BuildContext context) {
final backgroundColor = color ?? (isSelected ? Colors.green : Theme.of(context).cardColor);
final backgroundColor = color ?? (isSelected ? Theme.of(context).primaryColor : Theme.of(context).cardColor);
final effectiveTextColor = textColor ??
(isSelected
? Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor
Expand Down
2 changes: 1 addition & 1 deletion lib/src/screens/receive/widgets/header_tile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class _HeaderTileState extends State<HeaderTile> {

@override
Widget build(BuildContext context) {
final searchIcon = Image.asset("assets/images/search_icon.png",
final searchIcon = Icon( Icons.search,
color: Theme.of(context).extension<ReceivePageTheme>()!.iconsColor);

return Container(
Expand Down
4 changes: 2 additions & 2 deletions lib/src/widgets/search_bar_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ class SearchBarWidget extends StatelessWidget {
decoration: InputDecoration(
hintText: hintText ?? S.of(context).search,
hintStyle: TextStyle(color: Theme.of(context).extension<PickerTheme>()!.searchHintColor),
prefixIcon: Image.asset("assets/images/search_icon.png",
color: Theme.of(context).extension<PickerTheme>()!.searchIconColor),
prefixIcon: Icon( Icons.search,
color: Theme.of(context).primaryColor),
filled: true,
fillColor: Theme.of(context).extension<PickerTheme>()!.searchBackgroundFillColor,
alignLabelWithHint: false,
Expand Down
Loading