CAKE-252 | UI fixed for buttons on the backup_page.dart, edit_backup_password_page.dart and new_wallet_type_page.dart
OleksandrSobol committed
Jan 28, 2021 at 21:36 UTC
9effac982493b89b21d6eee97c5854c215aee72e
3 files changed
+45
-48
lib/src/screens/backup/backup_page.dart
+4
-4
@@ -35,7 +35,7 @@ class BackupPage extends BasePage {
35
children: [
36
Center(
37
child: Container(
38
- padding: EdgeInsets.only(left: 20, right: 20),
38
+ padding: EdgeInsets.only(left: 24, right: 24),
39
height: 300,
40
child: Column(children: [
41
Text(
@@ -78,9 +78,9 @@ class BackupPage extends BasePage {
78
text: S.of(context).export_backup,
79
color: Theme.of(context).accentTextTheme.body2.color,
80
textColor: Colors.white)),
81
- bottom: 30,
82
- left: 20,
83
- right: 20,
81
+ bottom: 24,
82
+ left: 24,
83
+ right: 24,
84
)
85
],
86
);
lib/src/screens/backup/edit_backup_password_page.dart
+2
-2
@@ -25,7 +25,7 @@ class EditBackupPasswordPage extends BasePage {
25
@override
26
Widget body(BuildContext context) {
27
return Padding(
28
- padding: EdgeInsets.only(left: 20, right: 20),
28
+ padding: EdgeInsets.only(left: 24, right: 24),
29
child: Stack(
30
fit: StackFit.expand,
31
children: [
@@ -48,7 +48,7 @@ class EditBackupPasswordPage extends BasePage {
48
color: Theme.of(context).accentTextTheme.body2.color,
49
textColor: Colors.white,
50
isDisabled: !editBackupPasswordViewModel.canSave)),
51
- bottom: 30,
51
+ bottom: 24,
52
left: 0,
53
right: 0)
54
],
lib/src/screens/new_wallet/new_wallet_type_page.dart
+39
-42
@@ -75,49 +75,46 @@ class WalletTypeFormState extends State<WalletTypeForm> {
75
76
@override
77
Widget build(BuildContext context) {
78
- return Container(
79
- padding: EdgeInsets.only(top: 24, bottom: 24),
80
- child: ScrollableWithBottomSection(
81
- contentPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
82
- content: Column(
83
- crossAxisAlignment: CrossAxisAlignment.center,
84
- children: <Widget>[
85
- Padding(
86
- padding: EdgeInsets.only(left: 12, right: 12),
87
- child: AspectRatio(
88
- aspectRatio: aspectRatioImage,
89
- child:
90
- FittedBox(child: widget.walletImage, fit: BoxFit.fill)),
78
+ return ScrollableWithBottomSection(
79
+ contentPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
80
+ content: Column(
81
+ crossAxisAlignment: CrossAxisAlignment.center,
82
+ children: <Widget>[
83
+ Padding(
84
+ padding: EdgeInsets.only(left: 12, right: 12),
85
+ child: AspectRatio(
86
+ aspectRatio: aspectRatioImage,
87
+ child:
88
+ FittedBox(child: widget.walletImage, fit: BoxFit.fill)),
89
+ ),
90
+ Padding(
91
+ padding: EdgeInsets.only(top: 48),
92
+ child: Text(
93
+ S.of(context).choose_wallet_currency,
94
+ textAlign: TextAlign.center,
95
+ style: TextStyle(
96
+ fontSize: 16,
97
+ fontWeight: FontWeight.w500,
98
+ color: Theme.of(context).primaryTextTheme.title.color),
99
),
92
- Padding(
93
- padding: EdgeInsets.only(top: 48),
94
- child: Text(
95
- S.of(context).choose_wallet_currency,
96
- textAlign: TextAlign.center,
97
- style: TextStyle(
98
- fontSize: 16,
99
- fontWeight: FontWeight.w500,
100
- color: Theme.of(context).primaryTextTheme.title.color),
101
- ),
102
- ),
103
- ...types.map((type) => Padding(
104
- padding: EdgeInsets.only(top: 24),
105
- child: SelectButton(
106
- image: _iconFor(type),
107
- text: walletTypeToDisplayName(type),
108
- isSelected: selected == type,
109
- onTap: () => setState(() => selected = type)),
110
- ))
111
- ],
112
- ),
113
- bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
114
- bottomSection: PrimaryButton(
115
- onPressed: () => onTypeSelected(),
116
- text: S.of(context).seed_language_next,
117
- color: Theme.of(context).accentTextTheme.body2.color,
118
- textColor: Colors.white,
119
- isDisabled: selected == null,
120
- ),
100
+ ),
101
+ ...types.map((type) => Padding(
102
+ padding: EdgeInsets.only(top: 24),
103
+ child: SelectButton(
104
+ image: _iconFor(type),
105
+ text: walletTypeToDisplayName(type),
106
+ isSelected: selected == type,
107
+ onTap: () => setState(() => selected = type)),
108
+ ))
109
+ ],
110
+ ),
111
+ bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
112
+ bottomSection: PrimaryButton(
113
+ onPressed: () => onTypeSelected(),
114
+ text: S.of(context).seed_language_next,
115
+ color: Theme.of(context).accentTextTheme.body2.color,
116
+ textColor: Colors.white,
117
+ isDisabled: selected == null,
118
),
119
);
120
}