Merge branch 'dev' into CAKE-20-update-exchange-and-send-screens

# Conflicts:
#	lib/di.dart
#	lib/palette.dart
#	lib/src/screens/base_page.dart
#	lib/src/screens/dashboard/dashboard_page.dart
#	lib/src/screens/receive/receive_page.dart
This commit is contained in:
Oleksandr Sobol 2020-07-31 19:17:10 +03:00
commit 2d20c1dee3
41 changed files with 645 additions and 297 deletions

View file

@ -19,7 +19,7 @@ class Palette {
}
class PaletteDark {
static const Color distantBlue = Color.fromRGBO(70, 85, 133, 1.0); // mainBackgroundColor
//static const Color distantBlue = Color.fromRGBO(70, 85, 133, 1.0); // mainBackgroundColor
static const Color lightDistantBlue = Color.fromRGBO(81, 96, 147, 1.0); // borderCardColor
static const Color gray = Color.fromRGBO(140, 153, 201, 1.0); // walletCardText
static const Color violetBlue = Color.fromRGBO(51, 63, 104, 1.0); // walletCardAddressField
@ -35,11 +35,13 @@ class PaletteDark {
static const Color backgroundColor = Color.fromRGBO(25, 35, 60, 1.0);
static const Color nightBlue = Color.fromRGBO(35, 47, 79, 1.0);
static const Color wildNightBlue = Color.fromRGBO(39, 53, 96, 1.0);
static const Color distantNightBlue = Color.fromRGBO(46, 57, 96, 1.0);
static const Color cyanBlue = Color.fromRGBO(99, 113, 150, 1.0);
static const Color darkCyanBlue = Color.fromRGBO(91, 112, 146, 1.0);
static const Color orangeYellow = Color.fromRGBO(243, 166, 50, 1.0);
static const Color brightGreen = Color.fromRGBO(88, 243, 50, 1.0);
static const Color oceanBlue = Color.fromRGBO(27, 39, 71, 1.0);
static const Color lightOceanBlue = Color.fromRGBO(32, 45, 80, 1.0);
static const Color lightNightBlue = Color.fromRGBO(39, 52, 89, 1.0);
static const Color wildBlue = Color.fromRGBO(165, 176, 205, 1.0);
static const Color buttonNightBlue = Color.fromRGBO(46, 57, 96, 1.0);
@ -52,6 +54,13 @@ class PaletteDark {
static const Color moderateBlue = Color.fromRGBO(60, 73, 118, 1.0);
static const Color deepPurpleBlue = Color.fromRGBO(19, 29, 56, 1.0);
static const Color lightOceanBlue = Color.fromRGBO(30, 42, 73, 1.0);
static const Color lightBlueGrey = Color.fromRGBO(125, 141, 183, 1.0);
static const Color wildBlueGrey = Color.fromRGBO(125, 137, 182, 1.0);
static const Color darkGrey = Color.fromRGBO(118, 131, 169, 1.0);
static const Color dividerColor = Color.fromRGBO(48, 59, 95, 1.0);
static const Color violetBlue = Color.fromRGBO(59, 72, 119, 1.0);
static const Color deepPurpleBlue = Color.fromRGBO(19, 29, 56, 1.0);
static const Color distantBlue = Color.fromRGBO(72, 85, 131, 1.0);
// FIXME: Rename.
static const Color eee = Color.fromRGBO(236, 239, 245, 1.0);