diff --git a/lib/new-ui/pages/settings_page.dart b/lib/new-ui/pages/settings_page.dart index 76446f0f9..04b4e362e 100644 --- a/lib/new-ui/pages/settings_page.dart +++ b/lib/new-ui/pages/settings_page.dart @@ -5,6 +5,7 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/new-ui/modal_navigator.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; import 'package:cake_wallet/routes.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/src/widgets/new_list_row/new_list_section.dart'; import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart'; import 'package:cw_core/wallet_info.dart'; @@ -146,7 +147,7 @@ class SettingsMainPage extends StatelessWidget { child: Row( spacing: 8, children: [ - SvgPicture.asset(section.titleIconPath, + CakeImageWidget(imageUrl: section.titleIconPath, colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.onSurfaceVariant, BlendMode.srcIn, diff --git a/lib/new-ui/widgets/coins_page/assets_history/assets_top_bar.dart b/lib/new-ui/widgets/coins_page/assets_history/assets_top_bar.dart index c2a19f5fb..2e043f114 100644 --- a/lib/new-ui/widgets/coins_page/assets_history/assets_top_bar.dart +++ b/lib/new-ui/widgets/coins_page/assets_history/assets_top_bar.dart @@ -28,7 +28,7 @@ class AssetsTopBar extends StatelessWidget { return SliverToBoxAdapter( child: Padding( - padding: const EdgeInsets.only(top: 12.0, bottom: 12.0, left: 12.0, right: 18.0), + padding: const EdgeInsets.only(top: 32.0, bottom: 0.0, left: 12.0, right: 18.0), child: Row( crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -68,7 +68,7 @@ class AssetsTopBar extends StatelessWidget { child: Padding( padding: const EdgeInsets.symmetric(horizontal: 12.0), child: Row( - spacing: 4.0, + spacing: 0, children: [ CakeImageWidget( imageUrl: "assets/new-ui/options_slider.svg", diff --git a/lib/new-ui/widgets/coins_page/assets_history/history_section.dart b/lib/new-ui/widgets/coins_page/assets_history/history_section.dart index 8ee960838..82109190c 100644 --- a/lib/new-ui/widgets/coins_page/assets_history/history_section.dart +++ b/lib/new-ui/widgets/coins_page/assets_history/history_section.dart @@ -28,7 +28,7 @@ class HistorySection extends StatelessWidget { @override Widget build(BuildContext context) { return SliverPadding( - padding: const EdgeInsets.symmetric(horizontal: 24.0), + padding: const EdgeInsets.symmetric(horizontal: 16.0), sliver: Observer( builder: (_) => (dashboardViewModel.items.isEmpty && dashboardViewModel.status is! SyncingSyncStatus) @@ -49,6 +49,7 @@ class HistorySection extends StatelessWidget { childCount: dashboardViewModel.items.length, (context, index) => Observer(builder: (_) { final prevItem = index == 0 ? null : dashboardViewModel.items[index - 1]; + final topPadding = index == 0 ? 0.0 : 18.0; final item = dashboardViewModel.items[index]; final nextItem = index == dashboardViewModel.items.length - 1 ? null @@ -109,7 +110,7 @@ class HistorySection extends StatelessWidget { ); } else if (item is DateSectionItem) { return Padding( - padding: EdgeInsets.only(left: 8.0, bottom: 8.0, top: 18.0), + padding: EdgeInsets.only(left: 8.0, bottom: 8.0, top: topPadding), child: Text(DateFormatter.convertDateTimeToReadableString(item.date), style: TextStyle(color: Theme.of(context).colorScheme.onSurfaceVariant))); }else if(item is OrderListItem){