CWA-222 | decreased height of spaces in the dashboard page; renamed clear button to trail button; changed clear button to reset button on exchange page; changed font color on confirm sending alert; increased next button on seed page
Oleksandr Sobol committed
Jun 10, 2020 at 19:17 UTC
4dfed515c7be20b8a5c09c90effba7a5d63fd267
8 files changed
+25
-19
lib/src/screens/dashboard/dashboard_page.dart
+2
-2
@@ -64,11 +64,11 @@ class DashboardPageBodyState extends State<DashboardPageBody> {
64
),
65
),
66
Padding(
67
- padding: EdgeInsets.only(left: 20, top: 20),
67
+ padding: EdgeInsets.only(left: 20, top: 5),
68
child: WalletCard(),
69
),
70
SizedBox(
71
- height: 28,
71
+ height: 18,
72
),
73
Expanded(child: TradeHistoryPanel())
74
],
lib/src/screens/dashboard/widgets/button_header.dart
+1
-1
@@ -244,7 +244,7 @@ class ButtonHeader extends SliverPersistentHeaderDelegate {
244
}
245
246
@override
247
- double get maxExtent => 174;
247
+ double get maxExtent => 154;
248
249
@override
250
double get minExtent => 66;
lib/src/screens/dashboard/widgets/trade_history_panel.dart
+1
-1
@@ -75,7 +75,7 @@ class TradeHistoryPanelState extends State<TradeHistoryPanel> {
75
: actionListStore.items;
76
final itemsCount = items.length + 1;
77
final symbol = settingsStore.fiatCurrency.toString();
78
- double freeSpaceHeight = MediaQuery.of(context).size.height - 496;
78
+ double freeSpaceHeight = MediaQuery.of(context).size.height - 460;
79
80
return SliverList(
81
key: _listKey,
lib/src/screens/exchange/exchange_page.dart
+3
-2
@@ -10,7 +10,7 @@ import 'package:cake_wallet/src/screens/base_page.dart';
10
import 'package:cake_wallet/src/stores/exchange_template/exchange_template_store.dart';
11
import 'package:cake_wallet/src/screens/exchange/widgets/present_provider_picker.dart';
12
import 'package:cake_wallet/src/screens/exchange/widgets/base_exchange_widget.dart';
13
-import 'package:cake_wallet/src/widgets/clear_button.dart';
13
+import 'package:cake_wallet/src/widgets/trail_button.dart';
14
15
class ExchangePage extends BasePage {
16
@override
@@ -33,7 +33,8 @@ class ExchangePage extends BasePage {
33
Widget trailing(BuildContext context) {
34
final exchangeStore = Provider.of<ExchangeStore>(context);
35
36
- return ClearButton(
36
+ return TrailButton(
37
+ caption: S.of(context).reset,
38
onPressed: () => exchangeStore.reset()
39
);
40
}
lib/src/screens/seed/seed_page.dart
+4
-3
@@ -35,9 +35,10 @@ class SeedPage extends BasePage {
35
? GestureDetector(
36
onTap: () => onClose(context),
37
child: Container(
38
- width: 70,
39
- height: 32,
38
+ width: 100,
39
+ height: 42,
40
alignment: Alignment.center,
41
+ margin: EdgeInsets.only(left: 10),
42
decoration: BoxDecoration(
43
borderRadius: BorderRadius.all(Radius.circular(16)),
44
color: Theme.of(context).accentTextTheme.title.color
@@ -45,7 +46,7 @@ class SeedPage extends BasePage {
46
child: Text(
47
S.of(context).seed_language_next,
48
style: TextStyle(
48
- fontSize: 10,
49
+ fontSize: 14,
50
fontWeight: FontWeight.w600,
51
color: Colors.blue
52
),
lib/src/screens/send/send_page.dart
+3
-2
@@ -29,7 +29,7 @@ import 'package:cake_wallet/src/screens/send/widgets/confirm_sending_alert.dart'
29
import 'package:cake_wallet/src/screens/send/widgets/sending_alert.dart';
30
import 'package:cake_wallet/src/widgets/template_tile.dart';
31
import 'package:cake_wallet/src/stores/send_template/send_template_store.dart';
32
-import 'package:cake_wallet/src/widgets/clear_button.dart';
32
+import 'package:cake_wallet/src/widgets/trail_button.dart';
33
34
class SendPage extends BasePage {
35
@override
@@ -48,7 +48,8 @@ class SendPage extends BasePage {
48
Widget trailing(context) {
49
final sendStore = Provider.of<SendStore>(context);
50
51
- return ClearButton(
51
+ return TrailButton(
52
+ caption: S.of(context).clear,
53
onPressed: () => sendStore.clear()
54
);
55
}
lib/src/screens/send/widgets/confirm_sending_alert.dart
+4
-4
@@ -55,7 +55,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
55
style: TextStyle(
56
fontSize: 16,
57
fontWeight: FontWeight.w600,
58
- color: Colors.white,
58
+ color: Theme.of(context).primaryTextTheme.title.color,
59
decoration: TextDecoration.none,
60
),
61
),
@@ -64,7 +64,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
64
style: TextStyle(
65
fontSize: 16,
66
fontWeight: FontWeight.w600,
67
- color: Colors.white,
67
+ color: Theme.of(context).primaryTextTheme.title.color,
68
decoration: TextDecoration.none,
69
),
70
)
@@ -79,7 +79,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
79
style: TextStyle(
80
fontSize: 16,
81
fontWeight: FontWeight.w600,
82
- color: Colors.white,
82
+ color: Theme.of(context).primaryTextTheme.title.color,
83
decoration: TextDecoration.none,
84
),
85
),
@@ -88,7 +88,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
88
style: TextStyle(
89
fontSize: 16,
90
fontWeight: FontWeight.w600,
91
- color: Colors.white,
91
+ color: Theme.of(context).primaryTextTheme.title.color,
92
decoration: TextDecoration.none,
93
),
94
)
lib/src/widgets/trail_button.dart
renamed
+7
-4
@@ -1,9 +1,12 @@
1
import 'package:flutter/material.dart';
2
-import 'package:cake_wallet/generated/i18n.dart';
2
4
-class ClearButton extends StatelessWidget {
5
- ClearButton({@required this.onPressed});
3
+class TrailButton extends StatelessWidget {
4
+ TrailButton({
5
+ @required this.caption,
6
+ @required this.onPressed
7
+ });
8
9
+ final String caption;
10
final VoidCallback onPressed;
11
12
@override
@@ -16,7 +19,7 @@ class ClearButton extends StatelessWidget {
19
child: FlatButton(
20
padding: EdgeInsets.all(0),
21
child: Text(
19
- S.of(context).clear,
22
+ caption,
23
style: TextStyle(
24
color: Theme.of(context).primaryTextTheme.caption.color,
25
fontWeight: FontWeight.w500,