CAKE-20 | merged dev branch to current
Oleksandr Sobol committed
Jul 31, 2020 at 20:44 UTC
b2f590ee4b76483554afcacf0f88949a76048e38
4 files changed
+9
-8
lib/palette.dart
+2
-4
@@ -22,7 +22,7 @@ class PaletteDark {
22
//static const Color distantBlue = Color.fromRGBO(70, 85, 133, 1.0); // mainBackgroundColor
23
static const Color lightDistantBlue = Color.fromRGBO(81, 96, 147, 1.0); // borderCardColor
24
static const Color gray = Color.fromRGBO(140, 153, 201, 1.0); // walletCardText
25
- static const Color violetBlue = Color.fromRGBO(51, 63, 104, 1.0); // walletCardAddressField
25
+ //static const Color violetBlue = Color.fromRGBO(51, 63, 104, 1.0); // walletCardAddressField
26
//static const Color moderateBlue = Color.fromRGBO(63, 77, 122, 1.0); // walletCardSubAddressField
27
//static const Color darkNightBlue = Color.fromRGBO(33, 43, 73, 1.0); // historyPanel
28
static const Color pigeonBlue = Color.fromRGBO(91, 112, 146, 1.0); // historyPanelText
@@ -53,13 +53,11 @@ class PaletteDark {
53
static const Color blueGrey = Color.fromRGBO(87, 98, 138, 1.0);
54
static const Color moderateBlue = Color.fromRGBO(60, 73, 118, 1.0);
55
static const Color deepPurpleBlue = Color.fromRGBO(19, 29, 56, 1.0);
56
- static const Color lightOceanBlue = Color.fromRGBO(30, 42, 73, 1.0);
57
- static const Color lightBlueGrey = Color.fromRGBO(125, 141, 183, 1.0);
56
+ static const Color darkOceanBlue = Color.fromRGBO(30, 42, 73, 1.0);
57
static const Color wildBlueGrey = Color.fromRGBO(125, 137, 182, 1.0);
58
static const Color darkGrey = Color.fromRGBO(118, 131, 169, 1.0);
59
static const Color dividerColor = Color.fromRGBO(48, 59, 95, 1.0);
60
static const Color violetBlue = Color.fromRGBO(59, 72, 119, 1.0);
62
- static const Color deepPurpleBlue = Color.fromRGBO(19, 29, 56, 1.0);
61
static const Color distantBlue = Color.fromRGBO(72, 85, 131, 1.0);
62
63
// FIXME: Rename.
lib/src/screens/dashboard/dashboard_page.dart
+3
-1
@@ -20,7 +20,9 @@ class DashboardPage extends BasePage {
20
DashboardPage({
21
@required this.walletViewModel,
22
@required this.addressListViewModel,
23
- });
23
+ }) {
24
+ walletViewModel.pageViewStore.setCurrentPage(1);
25
+ }
26
27
@override
28
Color get backgroundLightColor => PaletteDark.backgroundColor;
lib/src/screens/dashboard/widgets/menu_widget.dart
+2
-2
@@ -140,7 +140,7 @@ class MenuWidgetState extends State<MenuWidget> {
140
),
141
Container(
142
height: 1,
143
- color: PaletteDark.lightOceanBlue,
143
+ color: PaletteDark.darkOceanBlue,
144
),
145
ListView.separated(
146
shrinkWrap: true,
@@ -189,7 +189,7 @@ class MenuWidgetState extends State<MenuWidget> {
189
},
190
separatorBuilder: (_, index) => Container(
191
height: 1,
192
- color: PaletteDark.lightOceanBlue,
192
+ color: PaletteDark.darkOceanBlue,
193
),
194
itemCount: itemCount)
195
],
lib/src/screens/receive/widgets/qr_widget.dart
+2
-1
@@ -81,7 +81,8 @@ class QRWidget extends StatelessWidget {
81
textColor: Colors.white,
82
borderColor: PaletteDark.darkGrey,
83
validator: AmountValidator(
84
- type: addressListViewModel.type
84
+ type: addressListViewModel.type,
85
+ isAutovalidate: true
86
),
87
autovalidate: true,
88
placeholderTextStyle: TextStyle(