diff --git a/lib/views/common/pages/page_layout.dart b/lib/views/common/pages/page_layout.dart index 168660c89d..5347c6d3bc 100644 --- a/lib/views/common/pages/page_layout.dart +++ b/lib/views/common/pages/page_layout.dart @@ -23,14 +23,14 @@ class PageLayout extends StatelessWidget { header: header, content: content, noBackground: noBackground, - padding: padding ?? PagePlate.defaultPadding, + padding: padding ?? EdgeInsets.zero, ); } return _DesktopLayout( header: header, content: content, noBackground: noBackground, - padding: padding, + padding: padding ?? PagePlate.standardPadding, ); } } @@ -40,7 +40,7 @@ class _MobileLayout extends StatelessWidget { required this.content, this.header, this.noBackground = false, - this.padding = PagePlate.defaultPadding, + this.padding = PagePlate.standardPadding, }); final Widget? header; @@ -93,7 +93,7 @@ class _DesktopLayout extends StatelessWidget { Flexible( child: PagePlate( noBackground: noBackground, - padding: padding ?? PagePlate.defaultPadding, + padding: padding ?? EdgeInsets.zero, child: Column( mainAxisSize: MainAxisSize.min, children: [ diff --git a/lib/views/common/pages/page_plate.dart b/lib/views/common/pages/page_plate.dart index 04e32f9579..7d2d6e7d02 100644 --- a/lib/views/common/pages/page_plate.dart +++ b/lib/views/common/pages/page_plate.dart @@ -5,7 +5,7 @@ class PagePlate extends StatelessWidget { const PagePlate({ required this.child, this.noBackground = true, - this.padding = defaultPadding, + this.padding = standardPadding, super.key, }); @@ -13,7 +13,7 @@ class PagePlate extends StatelessWidget { final bool noBackground; final EdgeInsetsGeometry padding; - static const EdgeInsets defaultPadding = EdgeInsets.fromLTRB(15, 32, 15, 0); + static const EdgeInsets standardPadding = EdgeInsets.fromLTRB(15, 32, 15, 0); @override Widget build(BuildContext context) { diff --git a/lib/views/wallet/coin_details/coin_details_info/coin_details_info.dart b/lib/views/wallet/coin_details/coin_details_info/coin_details_info.dart index ca4615f5fb..dc1cf26332 100644 --- a/lib/views/wallet/coin_details/coin_details_info/coin_details_info.dart +++ b/lib/views/wallet/coin_details/coin_details_info/coin_details_info.dart @@ -105,6 +105,7 @@ class _CoinDetailsInfoState extends State .add(CoinsPubkeysRequested(widget.coin.abbr)); }, child: PageLayout( + padding: const EdgeInsets.fromLTRB(15, 32, 15, 20), header: PageHeader( title: widget.coin.name, widgetTitle: widget.coin.mode == CoinMode.segwit @@ -198,7 +199,8 @@ class _DesktopContent extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - padding: const EdgeInsets.fromLTRB(0, 20.0, 0, 20.0), + margin: const EdgeInsets.only(top: 16), + padding: const EdgeInsets.symmetric(horizontal: 16), decoration: BoxDecoration( color: Theme.of(context).cardColor, borderRadius: BorderRadius.circular(18.0), @@ -246,6 +248,7 @@ class _DesktopCoinDetails extends StatelessWidget { padding: const EdgeInsets.only(right: 8.0), child: Column( children: [ + SizedBox(height: 16), Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/views/wallet/coin_details/withdraw_form/withdraw_form.dart b/lib/views/wallet/coin_details/withdraw_form/withdraw_form.dart index 9b7aa32992..ca024b8ded 100644 --- a/lib/views/wallet/coin_details/withdraw_form/withdraw_form.dart +++ b/lib/views/wallet/coin_details/withdraw_form/withdraw_form.dart @@ -2,6 +2,7 @@ import 'dart:async' show Timer; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; +import 'package:komodo_ui_kit/komodo_ui_kit.dart'; import 'package:web_dex/generated/codegen_loader.g.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:komodo_defi_sdk/komodo_defi_sdk.dart'; @@ -222,7 +223,7 @@ class PreviewWithdrawButton extends StatelessWidget { return SizedBox( width: double.infinity, height: 48, - child: FilledButton( + child: UiPrimaryButton( onPressed: onPressed, child: isSending ? const SizedBox(