CAKE-248 | displayed address as multiline text and changed insets in the qr_widget.dart; wrapped QRWidget by Observer in the address_page.dart
OleksandrSobol committed
Jan 26, 2021 at 19:43 UTC
d275ffe72b210cbc365fda48cf28a158cceee7ae
2 files changed
+6
-7
lib/src/screens/dashboard/widgets/address_page.dart
+2
-2
@@ -40,10 +40,10 @@ class AddressPage extends StatelessWidget {
40
children: <Widget>[
41
Expanded(
42
child: Center(
43
- child: QRWidget(
43
+ child: Observer(builder: (_) => QRWidget(
44
addressListViewModel: addressListViewModel,
45
amountTextFieldFocusNode: _cryptoAmountFocus,
46
- isAmountFieldShow: !addressListViewModel.hasAccounts),
46
+ isAmountFieldShow: !addressListViewModel.hasAccounts)),
47
)),
48
Observer(builder: (_) {
49
return addressListViewModel.hasAddressList
lib/src/screens/receive/widgets/qr_widget.dart
+4
-5
@@ -30,7 +30,6 @@ class QRWidget extends StatelessWidget {
30
Widget build(BuildContext context) {
31
final copyImage = Image.asset('assets/images/copy_address.png',
32
color: Theme.of(context).textTheme.subhead.decorationColor);
33
- final addressTopOffset = isAmountFieldShow ? 60.0 : 40.0;
33
34
return Column(
35
mainAxisSize: MainAxisSize.min,
@@ -54,7 +53,7 @@ class QRWidget extends StatelessWidget {
53
]),
54
isAmountFieldShow
55
? Padding(
57
- padding: EdgeInsets.only(top: 40),
56
+ padding: EdgeInsets.only(top: 20),
57
child: Row(
58
children: <Widget>[
59
Expanded(
@@ -90,7 +89,7 @@ class QRWidget extends StatelessWidget {
89
)
90
: Offstage(),
91
Padding(
93
- padding: EdgeInsets.only(top: addressTopOffset),
92
+ padding: EdgeInsets.only(top: 20),
93
child: Builder(
94
builder: (context) => Observer(
95
builder: (context) => GestureDetector(
@@ -102,12 +101,12 @@ class QRWidget extends StatelessWidget {
101
},
102
child: Row(
103
mainAxisSize: MainAxisSize.max,
104
+ crossAxisAlignment: CrossAxisAlignment.start,
105
children: <Widget>[
106
Expanded(
107
child: Text(
108
addressListViewModel.address.address,
109
- maxLines: 1,
110
- overflow: TextOverflow.ellipsis,
109
+ textAlign: TextAlign.justify,
110
style: TextStyle(
111
fontSize: 15,
112
fontWeight: FontWeight.w500,