CAKE-101 | changed buttons position on confirm sending alert; added poppins font to confirm sending alert
OleksandrSobol committed
Oct 1, 2020 at 20:51 UTC
0b0b5016b920f3b42de73093031e43bc067d2203
3 files changed
+10
-6
lib/src/screens/send/send_page.dart
+4
-4
@@ -556,9 +556,9 @@ class SendPage extends BasePage {
556
sendViewModel.pendingTransaction.amountFormatted,
557
fee: S.of(context).send_fee,
558
feeValue: sendViewModel.pendingTransaction.feeFormatted,
559
- leftButtonText: S.of(context).ok,
560
- rightButtonText: S.of(context).cancel,
561
- actionLeftButton: () {
559
+ rightButtonText: S.of(context).ok,
560
+ leftButtonText: S.of(context).cancel,
561
+ actionRightButton: () {
562
Navigator.of(context).pop();
563
sendViewModel.commitTransaction();
564
showPopUp<void>(
@@ -655,7 +655,7 @@ class SendPage extends BasePage {
655
});
656
});
657
},
658
- actionRightButton: () => Navigator.of(context).pop());
658
+ actionLeftButton: () => Navigator.of(context).pop());
659
});
660
});
661
}
lib/src/screens/send/widgets/confirm_sending_alert.dart
+4
@@ -55,6 +55,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
55
style: TextStyle(
56
fontSize: 16,
57
fontWeight: FontWeight.w600,
58
+ fontFamily: 'Poppins',
59
color: Theme.of(context).primaryTextTheme.title.color,
60
decoration: TextDecoration.none,
61
),
@@ -64,6 +65,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
65
style: TextStyle(
66
fontSize: 16,
67
fontWeight: FontWeight.w600,
68
+ fontFamily: 'Poppins',
69
color: Theme.of(context).primaryTextTheme.title.color,
70
decoration: TextDecoration.none,
71
),
@@ -79,6 +81,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
81
style: TextStyle(
82
fontSize: 16,
83
fontWeight: FontWeight.w600,
84
+ fontFamily: 'Poppins',
85
color: Theme.of(context).primaryTextTheme.title.color,
86
decoration: TextDecoration.none,
87
),
@@ -88,6 +91,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
91
style: TextStyle(
92
fontSize: 16,
93
fontWeight: FontWeight.w600,
94
+ fontFamily: 'Poppins',
95
color: Theme.of(context).primaryTextTheme.title.color,
96
decoration: TextDecoration.none,
97
),
lib/utils/show_pop_up.dart
+2
-2
@@ -14,8 +14,8 @@ Future<T> showPopUp<T>({
14
context: context,
15
builder: builder,
16
barrierDismissible: barrierDismissible,
17
- //barrierColor: barrierColor,
18
- //useSafeArea: useSafeArea,
17
+ barrierColor: barrierColor,
18
+ useSafeArea: useSafeArea,
19
useRootNavigator: useRootNavigator,
20
routeSettings: routeSettings,
21
child: child);