From b67cb785e4b0de7692afa35fb61fc0f2c87fae60 Mon Sep 17 00:00:00 2001
From: OleksandrSobol <dr.alexander.sobol@gmail.com>
Date: Tue, 26 Jan 2021 21:10:31 +0200
Subject: [PATCH] CAKE-248 | changed spaces between widgets (QRWWidget)
---
lib/src/screens/dashboard/widgets/address_page.dart | 11 +++++------
lib/src/screens/receive/receive_page.dart | 2 +-
lib/src/screens/receive/widgets/qr_widget.dart | 12 ++++++------
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/lib/src/screens/dashboard/widgets/address_page.dart b/lib/src/screens/dashboard/widgets/address_page.dart
index 2522d6e87..7e4fb1c73 100644
--- a/lib/src/screens/dashboard/widgets/address_page.dart
+++ b/lib/src/screens/dashboard/widgets/address_page.dart
@@ -39,12 +39,11 @@ class AddressPage extends StatelessWidget {
child: Column(
children: <Widget>[
Expanded(
- child: Center(
- child: Observer(builder: (_) => QRWidget(
- addressListViewModel: addressListViewModel,
- amountTextFieldFocusNode: _cryptoAmountFocus,
- isAmountFieldShow: !addressListViewModel.hasAccounts)),
- )),
+ child: Observer(builder: (_) => QRWidget(
+ addressListViewModel: addressListViewModel,
+ amountTextFieldFocusNode: _cryptoAmountFocus,
+ isAmountFieldShow: !addressListViewModel.hasAccounts))
+ ),
Observer(builder: (_) {
return addressListViewModel.hasAddressList
? GestureDetector(
diff --git a/lib/src/screens/receive/receive_page.dart b/lib/src/screens/receive/receive_page.dart
index c441bd380..9201b9805 100644
--- a/lib/src/screens/receive/receive_page.dart
+++ b/lib/src/screens/receive/receive_page.dart
@@ -120,7 +120,7 @@ class ReceivePage extends BasePage {
child: Column(
children: <Widget>[
Padding(
- padding: EdgeInsets.fromLTRB(24, 80, 24, 40),
+ padding: EdgeInsets.fromLTRB(24, 80, 24, 24),
child: QRWidget(
addressListViewModel: addressListViewModel,
isAmountFieldShow: true,
diff --git a/lib/src/screens/receive/widgets/qr_widget.dart b/lib/src/screens/receive/widgets/qr_widget.dart
index 3918d0fa2..0a4551ae6 100644
--- a/lib/src/screens/receive/widgets/qr_widget.dart
+++ b/lib/src/screens/receive/widgets/qr_widget.dart
@@ -33,6 +33,7 @@ class QRWidget extends StatelessWidget {
return Column(
mainAxisSize: MainAxisSize.min,
+ mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Row(children: <Widget>[
@@ -51,8 +52,8 @@ class QRWidget extends StatelessWidget {
))))),
Spacer(flex: 3)
]),
- isAmountFieldShow
- ? Padding(
+ if (isAmountFieldShow)
+ Padding(
padding: EdgeInsets.only(top: 20),
child: Row(
children: <Widget>[
@@ -86,10 +87,9 @@ class QRWidget extends StatelessWidget {
fontWeight: FontWeight.w500))))
],
),
- )
- : Offstage(),
+ ),
Padding(
- padding: EdgeInsets.only(top: 20),
+ padding: EdgeInsets.only(top: 20, bottom: 20),
child: Builder(
builder: (context) => Observer(
builder: (context) => GestureDetector(
@@ -106,7 +106,7 @@ class QRWidget extends StatelessWidget {
Expanded(
child: Text(
addressListViewModel.address.address,
- textAlign: TextAlign.justify,
+ textAlign: TextAlign.center,
style: TextStyle(
fontSize: 15,
fontWeight: FontWeight.w500,