CAKE-182 | applied light theme to the app

OleksandrSobol committed Dec 11, 2020 at 20:46 UTC 941e7c4dd8ca83957c024a696e8f8867129bd063
14 files changed +301 -70
lib/palette.dart
+9 -25
@@ -4,7 +4,7 @@ class Palette {
4 static const Color green = Color.fromRGBO(39, 206, 80, 1.0);
5 static const Color red = Color.fromRGBO(255, 51, 51, 1.0);
6 static const Color darkRed = Color.fromRGBO(204, 38, 38, 1.0);
7 - static const Color blueAlice = Color.fromRGBO(231, 240, 253, 1.0);
7 + static const Color blueAlice = Color.fromRGBO(229, 247, 255, 1.0);
8 static const Color lightBlue = Color.fromRGBO(172, 203, 238, 1.0);
9 static const Color lavender = Color.fromRGBO(237, 245, 252, 1.0);
10 static const Color oceanBlue = Color.fromRGBO(30, 52, 78, 1.0);
@@ -13,7 +13,6 @@ class Palette {
13 static const Color blue = Color.fromRGBO(88, 143, 252, 1.0);
14 static const Color darkLavender = Color.fromRGBO(229, 238, 250, 1.0);
15 static const Color nightBlue = Color.fromRGBO(46, 57, 96, 1.0);
16 -
16 static const Color moderateOrangeYellow = Color.fromRGBO(245, 134, 82, 1.0);
17 static const Color moderateOrange = Color.fromRGBO(235, 117, 63, 1.0);
18 static const Color shineGreen = Color.fromRGBO(76, 189, 87, 1.0);
@@ -22,9 +21,8 @@ class Palette {
21 static const Color royalBlue = Color.fromRGBO(43, 114, 221, 1.0);
22 static const Color lightRed = Color.fromRGBO(227, 87, 87, 1.0);
23 static const Color persianRed = Color.fromRGBO(206, 55, 55, 1.0);
25 -
26 - // NEW DESIGN
24 static const Color blueCraiola = Color.fromRGBO(69, 110, 255, 1.0);
25 + static const Color blueGreyCraiola = Color.fromRGBO(106, 177, 207, 1.0);
26 static const Color darkBlueCraiola = Color.fromRGBO(53, 86, 136, 1.0);
27 static const Color pinkFlamingo = Color.fromRGBO(240, 60, 243, 1.0);
28 static const Color redHat = Color.fromRGBO(209, 68, 37, 1.0);
@@ -44,26 +42,16 @@ class Palette {
42 static const Color moderateSlateBlue = Color.fromRGBO(129, 93, 251, 1.0);
43 static const Color brightOrange = Color.fromRGBO(255, 102, 0, 1.0);
44 static const Color dullGray = Color.fromRGBO(98, 98, 98, 1.0);
47 -
48 - // FIXME: Rename.
49 - static const Color eee = Color.fromRGBO(236, 239, 245, 1.0);
50 - static const Color xxx = Color.fromRGBO(72, 89, 109, 1);
45 + static const Color protectiveBlue = Color.fromRGBO(33, 148, 255, 1.0);
46 }
47
48 class PaletteDark {
54 - //static const Color distantBlue = Color.fromRGBO(70, 85, 133, 1.0); // mainBackgroundColor
55 - static const Color lightDistantBlue = Color.fromRGBO(81, 96, 147, 1.0); // borderCardColor
56 - static const Color gray = Color.fromRGBO(140, 153, 201, 1.0); // walletCardText
57 - //static const Color violetBlue = Color.fromRGBO(51, 63, 104, 1.0); // walletCardAddressField
58 - //static const Color moderateBlue = Color.fromRGBO(63, 77, 122, 1.0); // walletCardSubAddressField
59 - //static const Color darkNightBlue = Color.fromRGBO(33, 43, 73, 1.0); // historyPanel
60 - static const Color pigeonBlue = Color.fromRGBO(91, 112, 146, 1.0); // historyPanelText
61 - static const Color moderateNightBlue = Color.fromRGBO(39, 53, 96, 1.0); // historyPanelButton
62 - static const Color headerNightBlue = Color.fromRGBO(41, 52, 84, 1.0); // menuHeader
63 - //static const Color lightNightBlue = Color.fromRGBO(48, 59, 95, 1.0); // menuList
64 - static const Color moderatePurpleBlue = Color.fromRGBO(57, 74, 95, 1.0); // selectButtonText
65 -
66 - // NEW DESIGN
49 + static const Color lightDistantBlue = Color.fromRGBO(81, 96, 147, 1.0);
50 + static const Color gray = Color.fromRGBO(140, 153, 201, 1.0);
51 + static const Color pigeonBlue = Color.fromRGBO(91, 112, 146, 1.0);
52 + static const Color moderateNightBlue = Color.fromRGBO(39, 53, 96, 1.0);
53 + static const Color headerNightBlue = Color.fromRGBO(41, 52, 84, 1.0);
54 + static const Color moderatePurpleBlue = Color.fromRGBO(57, 74, 95, 1.0);
55 static const Color backgroundColor = Color.fromRGBO(25, 35, 60, 1.0);
56 static const Color nightBlue = Color.fromRGBO(35, 47, 79, 1.0);
57 static const Color wildNightBlue = Color.fromRGBO(39, 53, 96, 1.0);
@@ -96,8 +84,4 @@ class PaletteDark {
84 static const Color lightPurpleBlue = Color.fromRGBO(120, 133, 170, 1.0);
85 static const Color indicatorVioletBlue = Color.fromRGBO(59, 72, 119, 1.0);
86 static const Color granite = Color.fromRGBO(48, 51, 60, 1.0);
99 -
100 - // FIXME: Rename.
101 - static const Color eee = Color.fromRGBO(236, 239, 245, 1.0);
102 - static const Color xxx = Color.fromRGBO(72, 89, 109, 1);
87 }
\ No newline at end of file
lib/src/screens/dashboard/dashboard_page.dart
+13 -8
@@ -50,7 +50,8 @@ class DashboardPage extends BasePage {
50 @override
51 Widget trailing(BuildContext context) {
52 final menuButton =
53 - Image.asset('assets/images/menu.png', color: Colors.white);
53 + Image.asset('assets/images/menu.png',
54 + color: Theme.of(context).accentTextTheme.display3.backgroundColor);
55
56 return Container(
57 alignment: Alignment.centerRight,
@@ -65,12 +66,6 @@ class DashboardPage extends BasePage {
66
67 final DashboardViewModel walletViewModel;
68 final WalletAddressListViewModel addressListViewModel;
68 - final sendImage = Image.asset('assets/images/upload.png',
69 - height: 22.24, width: 24, color: Colors.white);
70 - final exchangeImage = Image.asset('assets/images/transfer.png',
71 - height: 24.27, width: 22.25, color: Colors.white);
72 - final receiveImage = Image.asset('assets/images/download.png',
73 - height: 22.24, width: 24, color: Colors.white);
69 final controller = PageController(initialPage: 1);
70
71 var pages = <Widget>[];
@@ -78,6 +73,15 @@ class DashboardPage extends BasePage {
73
74 @override
75 Widget body(BuildContext context) {
76 + final sendImage = Image.asset('assets/images/upload.png',
77 + height: 22.24, width: 24,
78 + color: Theme.of(context).accentTextTheme.display3.backgroundColor);
79 + final exchangeImage = Image.asset('assets/images/transfer.png',
80 + height: 24.27, width: 22.25,
81 + color: Theme.of(context).accentTextTheme.display3.backgroundColor);
82 + final receiveImage = Image.asset('assets/images/download.png',
83 + height: 22.24, width: 24,
84 + color: Theme.of(context).accentTextTheme.display3.backgroundColor);
85 _setEffects();
86
87 return SafeArea(
@@ -100,7 +104,8 @@ class DashboardPage extends BasePage {
104 dotWidth: 6.0,
105 dotHeight: 6.0,
106 dotColor: Theme.of(context).indicatorColor,
103 - activeDotColor: Colors.white),
107 + activeDotColor: Theme.of(context).accentTextTheme.display1
108 + .backgroundColor),
109 )),
110 Container(
111 padding: EdgeInsets.only(left: 45, right: 45, bottom: 24),
lib/src/screens/dashboard/widgets/action_button.dart
+4 -1
@@ -39,7 +39,10 @@ class ActionButton extends StatelessWidget {
39 SizedBox(height: 15),
40 Text(
41 title,
42 - style: TextStyle(fontSize: 14, color: Colors.white),
42 + style: TextStyle(
43 + fontSize: 14,
44 + color: Theme.of(context).accentTextTheme.display3
45 + .backgroundColor),
46 )
47 ],
48 ),
lib/src/screens/dashboard/widgets/address_page.dart
+4 -2
@@ -43,13 +43,15 @@ class AddressPage extends StatelessWidget {
43 style: TextStyle(
44 fontSize: 14,
45 fontWeight: FontWeight.w500,
46 - color: Colors.white
46 + color: Theme.of(context).accentTextTheme.display3
47 + .backgroundColor
48 ),
49 ),
50 Icon(
51 Icons.arrow_forward_ios,
52 size: 14,
52 - color: Colors.white,
53 + color: Theme.of(context).accentTextTheme.display3
54 + .backgroundColor,
55 )
56 ],
57 ),
lib/src/screens/dashboard/widgets/balance_page.dart
+8 -4
@@ -25,7 +25,8 @@ class BalancePage extends StatelessWidget {
25 style: TextStyle(
26 fontSize: 40,
27 fontWeight: FontWeight.bold,
28 - color: Theme.of(context).indicatorColor,
28 + color: Theme.of(context).accentTextTheme.display2
29 + .backgroundColor,
30 height: 1),
31 );
32 }),
@@ -35,7 +36,8 @@ class BalancePage extends StatelessWidget {
36 style: TextStyle(
37 fontSize: 12,
38 fontWeight: FontWeight.w600,
38 - color: Theme.of(context).indicatorColor,
39 + color: Theme.of(context).accentTextTheme.display2
40 + .backgroundColor,
41 height: 1),
42 );
43 }),
@@ -45,7 +47,8 @@ class BalancePage extends StatelessWidget {
47 style: TextStyle(
48 fontSize: 54,
49 fontWeight: FontWeight.bold,
48 - color: Colors.white,
50 + color: Theme.of(context).accentTextTheme.display3
51 + .backgroundColor,
52 height: 1),
53 maxLines: 1,
54 textAlign: TextAlign.center);
@@ -56,7 +59,8 @@ class BalancePage extends StatelessWidget {
59 style: TextStyle(
60 fontSize: 18,
61 fontWeight: FontWeight.w500,
59 - color: Theme.of(context).indicatorColor,
62 + color: Theme.of(context).accentTextTheme.display2
63 + .backgroundColor,
64 height: 1),
65 textAlign: TextAlign.center);
66 }),
lib/src/screens/dashboard/widgets/header_row.dart
+3 -2
@@ -27,14 +27,15 @@ class HeaderRow extends StatelessWidget {
27 style: TextStyle(
28 fontSize: 20,
29 fontWeight: FontWeight.w500,
30 - color: Colors.white
30 + color: Theme.of(context).accentTextTheme.display3.backgroundColor
31 ),
32 ),
33 GestureDetector(
34 onTap: () {
35 showPopUp<void>(
36 context: context,
37 - builder: (context) => FilterWidget(dashboardViewModel: dashboardViewModel)
37 + builder: (context) =>
38 + FilterWidget(dashboardViewModel: dashboardViewModel)
39 );
40 },
41 child: Container(
lib/src/screens/dashboard/widgets/trade_row.dart
+4 -2
@@ -48,14 +48,16 @@ class TradeRow extends StatelessWidget {
48 style: TextStyle(
49 fontSize: 16,
50 fontWeight: FontWeight.w500,
51 - color: Colors.white
51 + color: Theme.of(context).accentTextTheme.
52 + display3.backgroundColor
53 )),
54 formattedAmount != null
55 ? Text(formattedAmount + ' ' + amountCrypto,
56 style: TextStyle(
57 fontSize: 16,
58 fontWeight: FontWeight.w500,
58 - color: Colors.white
59 + color: Theme.of(context).accentTextTheme.
60 + display3.backgroundColor
61 ))
62 : Container()
63 ]),
lib/src/screens/dashboard/widgets/transaction_raw.dart
+4 -2
@@ -60,12 +60,14 @@ class TransactionRow extends StatelessWidget {
60 style: TextStyle(
61 fontSize: 16,
62 fontWeight: FontWeight.w500,
63 - color: Colors.white)),
63 + color: Theme.of(context).accentTextTheme.
64 + display3.backgroundColor)),
65 Text(formattedAmount,
66 style: TextStyle(
67 fontSize: 16,
68 fontWeight: FontWeight.w500,
68 - color: Colors.white))
69 + color: Theme.of(context).accentTextTheme.
70 + display3.backgroundColor))
71 ]),
72 Row(
73 mainAxisAlignment: MainAxisAlignment.spaceBetween,
lib/src/screens/exchange/widgets/exchange_card.dart
+14 -8
@@ -166,8 +166,8 @@ class ExchangeCardState extends State<ExchangeCard> {
166 fontSize: 16,
167 fontWeight: FontWeight.w600,
168 color: Theme.of(context)
169 - .textTheme
170 - .subhead
169 + .accentTextTheme
170 + .display4
171 .decorationColor),
172 validator: _isAmountEditable
173 ? widget.currencyValueValidator
@@ -211,8 +211,8 @@ class ExchangeCardState extends State<ExchangeCard> {
211 fontSize: 10,
212 height: 1.2,
213 color: Theme.of(context)
214 - .textTheme
215 - .subhead
214 + .accentTextTheme
215 + .display4
216 .decorationColor),
217 )
218 : Offstage(),
@@ -224,8 +224,8 @@ class ExchangeCardState extends State<ExchangeCard> {
224 fontSize: 10,
225 height: 1.2,
226 color: Theme.of(context)
227 - .textTheme
228 - .subhead
227 + .accentTextTheme
228 + .display4
229 .decorationColor))
230 : Offstage(),
231 ]),
@@ -239,7 +239,10 @@ class ExchangeCardState extends State<ExchangeCard> {
239 fontSize: 14,
240 fontWeight: FontWeight.w500,
241 color:
242 - Theme.of(context).textTheme.subhead.decorationColor),
242 + Theme.of(context)
243 + .accentTextTheme
244 + .display4
245 + .decorationColor),
246 ))
247 : Offstage(),
248 _isAddressEditable
@@ -263,7 +266,10 @@ class ExchangeCardState extends State<ExchangeCard> {
266 fontSize: 16,
267 fontWeight: FontWeight.w600,
268 color:
266 - Theme.of(context).textTheme.subhead.decorationColor),
269 + Theme.of(context)
270 + .accentTextTheme
271 + .display4
272 + .decorationColor),
273 buttonColor: widget.addressButtonsColor,
274 validator: widget.addressTextFieldValidator,
275 ),
lib/src/screens/receive/receive_page.dart
+34 -3
@@ -32,10 +32,40 @@ class ReceivePage extends BasePage {
32 @override
33 Color get backgroundDarkColor => Colors.transparent;
34
35 + final FocusNode _cryptoAmountFocus;
36 +
37 @override
36 - Color get titleColor => Colors.white;
38 + Widget leading(BuildContext context) {
39 + final _backButton = Icon(Icons.arrow_back_ios,
40 + color: Theme.of(context).accentTextTheme.display3.backgroundColor,
41 + size: 16,);
42
38 - final FocusNode _cryptoAmountFocus;
43 + return SizedBox(
44 + height: 37,
45 + width: 37,
46 + child: ButtonTheme(
47 + minWidth: double.minPositive,
48 + child: FlatButton(
49 + highlightColor: Colors.transparent,
50 + splashColor: Colors.transparent,
51 + padding: EdgeInsets.all(0),
52 + onPressed: () => onClose(context),
53 + child: _backButton),
54 + ),
55 + );
56 + }
57 +
58 + @override
59 + Widget middle(BuildContext context) {
60 + return Text(
61 + title,
62 + style: TextStyle(
63 + fontSize: 18.0,
64 + fontWeight: FontWeight.bold,
65 + fontFamily: 'Lato',
66 + color: Theme.of(context).accentTextTheme.display3.backgroundColor),
67 + );
68 + }
69
70 @override
71 Widget Function(BuildContext, Widget) get rootWrapper =>
@@ -51,7 +81,8 @@ class ReceivePage extends BasePage {
81 @override
82 Widget trailing(BuildContext context) {
83 final shareImage =
54 - Image.asset('assets/images/share.png', color: Colors.white);
84 + Image.asset('assets/images/share.png',
85 + color: Theme.of(context).accentTextTheme.display3.backgroundColor);
86
87 return SizedBox(
88 height: 20.0,
lib/src/screens/receive/widgets/qr_widget.dart
+6 -4
@@ -47,8 +47,8 @@ class QRWidget extends StatelessWidget {
47 child: QrImage(
48 data: addressListViewModel.uri.toString(),
49 backgroundColor: Colors.transparent,
50 - foregroundColor: Colors.white,
51 - //Theme.of(context).textTheme.headline.color,
50 + foregroundColor: Theme.of(context).accentTextTheme.
51 + display3.backgroundColor,
52 ))))),
53 Spacer(flex: 3)
54 ]),
@@ -71,7 +71,8 @@ class QRWidget extends StatelessWidget {
71 ],
72 textAlign: TextAlign.center,
73 hintText: S.of(context).receive_amount,
74 - textColor: Colors.white,
74 + textColor: Theme.of(context).accentTextTheme.
75 + display3.backgroundColor,
76 borderColor: Theme.of(context)
77 .textTheme
78 .headline
@@ -110,7 +111,8 @@ class QRWidget extends StatelessWidget {
111 style: TextStyle(
112 fontSize: 16,
113 fontWeight: FontWeight.w500,
113 - color: Colors.white),
114 + color: Theme.of(context).accentTextTheme.
115 + display3.backgroundColor),
116 ),
117 ),
118 Padding(
lib/src/screens/send/send_template_page.dart
+1 -1
@@ -245,7 +245,7 @@ class SendTemplatePage extends BasePage {
245 }
246 },
247 text: S.of(context).save,
248 - color: Theme.of(context).accentTextTheme.subtitle.decorationColor,
248 + color: Colors.green,
249 textColor:
250 Theme.of(context).accentTextTheme.headline.decorationColor,
251 ),
lib/src/widgets/trail_button.dart
+4 -1
@@ -21,7 +21,10 @@ class TrailButton extends StatelessWidget {
21 child: Text(
22 caption,
23 style: TextStyle(
24 - color: Theme.of(context).textTheme.subhead.decorationColor,
24 + color: Theme.of(context)
25 + .accentTextTheme
26 + .display4
27 + .decorationColor,
28 fontWeight: FontWeight.w500,
29 fontSize: 14),
30 ),
lib/themes.dart
+193 -7
@@ -35,7 +35,7 @@ class Themes extends EnumerableItem<int> with Serializable<int> {
35 case Themes.light:
36 return lightTheme;
37 case Themes.bright:
38 - return lightTheme;
38 + return brightTheme;
39 case Themes.dark:
40 return darkTheme;
41 default:
@@ -58,6 +58,184 @@ class Themes extends EnumerableItem<int> with Serializable<int> {
58 }
59
60 static final ThemeData lightTheme = ThemeData(
61 + fontFamily: 'Lato',
62 + brightness: Brightness.light,
63 + backgroundColor: Colors.white,
64 + accentColor: Colors.white, // first gradient color
65 + scaffoldBackgroundColor: Colors.white, // second gradient color
66 + primaryColor: Colors.white, // third gradient color
67 + buttonColor: Palette.blueAlice, // action buttons on dashboard page
68 + indicatorColor: PaletteDark.darkCyanBlue, // page indicator
69 + hoverColor: Palette.darkBlueCraiola, // amount hint text (receive page)
70 + dividerColor: Palette.paleBlue,
71 + hintColor: Palette.gray,
72 + textTheme: TextTheme(
73 + title: TextStyle(
74 + color: Palette.darkBlueCraiola, // sync_indicator text
75 + backgroundColor: Palette.blueAlice, // synced sync_indicator
76 + decorationColor: Palette.blueAlice.withOpacity(0.75), // not synced sync_indicator
77 + ),
78 + caption: TextStyle(
79 + color: Palette.shineOrange, // not synced light
80 + decorationColor: PaletteDark.wildBlue, // filter icon
81 + ),
82 + overline: TextStyle(
83 + color: Palette.blueAlice, // filter button
84 + backgroundColor: PaletteDark.darkCyanBlue, // date section row
85 + decorationColor: Palette.blueAlice // icons (transaction and trade rows)
86 + ),
87 + subhead: TextStyle(
88 + color: Palette.blueAlice, // address button border
89 + decorationColor: PaletteDark.lightBlueGrey, // copy button (qr widget)
90 + ),
91 + headline: TextStyle(
92 + color: Colors.white, // qr code
93 + decorationColor: Palette.darkBlueCraiola, // bottom border of amount (receive page)
94 + ),
95 + display1: TextStyle(
96 + color: PaletteDark.lightBlueGrey, // icons color (receive page)
97 + decorationColor: Palette.moderateLavender, // icons background (receive page)
98 + ),
99 + display2: TextStyle(
100 + color: Palette.darkBlueCraiola, // text color of tiles (receive page)
101 + decorationColor: Palette.blueAlice // background of tiles (receive page)
102 + ),
103 + display3: TextStyle(
104 + color: Colors.white, // text color of current tile (receive page),
105 + //decorationColor: Palette.blueCraiola // background of current tile (receive page)
106 + decorationColor: Palette.blueCraiola // background of current tile (receive page)
107 + ),
108 + display4: TextStyle(
109 + color: Palette.violetBlue, // text color of tiles (account list)
110 + decorationColor: Colors.white // background of tiles (account list)
111 + ),
112 + subtitle: TextStyle(
113 + color: Palette.protectiveBlue, // text color of current tile (account list)
114 + decorationColor: Colors.white // background of current tile (account list)
115 + ),
116 + body1: TextStyle(
117 + color: Palette.moderatePurpleBlue, // scrollbar thumb
118 + decorationColor: Palette.periwinkleCraiola // scrollbar background
119 + ),
120 + body2: TextStyle(
121 + color: Palette.moderateLavender, // menu header
122 + decorationColor: Colors.white, // menu background
123 + )
124 + ),
125 + primaryTextTheme: TextTheme(
126 + title: TextStyle(
127 + color: Palette.darkBlueCraiola, // title color
128 + backgroundColor: Palette.wildPeriwinkle // textfield underline
129 + ),
130 + caption: TextStyle(
131 + color: PaletteDark.pigeonBlue, // secondary text
132 + decorationColor: Palette.wildLavender // menu divider
133 + ),
134 + overline: TextStyle(
135 + color: Palette.darkGray, // transaction/trade details titles
136 + decorationColor: PaletteDark.darkCyanBlue, // placeholder
137 + ),
138 + subhead: TextStyle(
139 + color: Palette.blueCraiola, // first gradient color (send page)
140 + decorationColor: Palette.blueGreyCraiola // second gradient color (send page)
141 + ),
142 + headline: TextStyle(
143 + color: Colors.white.withOpacity(0.5), // text field border color (send page)
144 + decorationColor: Colors.white.withOpacity(0.5), // text field hint color (send page)
145 + ),
146 + display1: TextStyle(
147 + color: Colors.white.withOpacity(0.2), // text field button color (send page)
148 + decorationColor: Colors.white // text field button icon color (send page)
149 + ),
150 + display2: TextStyle(
151 + color: Colors.white.withOpacity(0.5), // estimated fee (send page)
152 + decorationColor: Palette.moderateLavender // template dotted border (send page)
153 + ),
154 + display3: TextStyle(
155 + color: Palette.darkBlueCraiola, // template new text (send page)
156 + decorationColor: Palette.blueAlice // template background color (send page)
157 + ),
158 + display4: TextStyle(
159 + color: Palette.darkBlueCraiola, // template title (send page)
160 + decorationColor: Palette.niagara // receive amount text (exchange page)
161 + ),
162 + subtitle: TextStyle(
163 + color: Palette.blueCraiola, // first gradient color top panel (exchange page)
164 + decorationColor: Palette.blueGreyCraiola // second gradient color top panel (exchange page)
165 + ),
166 + body1: TextStyle(
167 + color: Palette.blueCraiola.withOpacity(0.7), // first gradient color bottom panel (exchange page)
168 + decorationColor: Palette.blueGreyCraiola.withOpacity(0.7) // second gradient color bottom panel (exchange page)
169 + ),
170 + body2: TextStyle(
171 + color: Colors.white.withOpacity(0.5), // text field border on top panel (exchange page)
172 + decorationColor: Colors.white.withOpacity(0.5), // text field border on bottom panel (exchange page)
173 + )
174 + ),
175 + focusColor: Colors.white.withOpacity(0.2), // text field button (exchange page)
176 + accentTextTheme: TextTheme(
177 + title: TextStyle(
178 + color: Colors.white, // picker background
179 + backgroundColor: Palette.periwinkleCraiola, // picker divider
180 + decorationColor: Colors.white // dialog background
181 + ),
182 + caption: TextStyle(
183 + color: Palette.blueAlice, // container (confirm exchange)
184 + backgroundColor: Palette.blueAlice, // button background (confirm exchange)
185 + decorationColor: Palette.darkBlueCraiola, // text color (information page)
186 + ),
187 + subtitle: TextStyle(
188 + color: Palette.darkBlueCraiola, // QR code (exchange trade page)
189 + backgroundColor: Palette.wildPeriwinkle, // divider (exchange trade page)
190 + decorationColor: Palette.protectiveBlue // crete new wallet button background (wallet list page)
191 + ),
192 + headline: TextStyle(
193 + color: Palette.moderateLavender, // first gradient color of wallet action buttons (wallet list page)
194 + backgroundColor: Palette.moderateLavender, // second gradient color of wallet action buttons (wallet list page)
195 + decorationColor: Colors.white // restore wallet button text color (wallet list page)
196 + ),
197 + subhead: TextStyle(
198 + color: Palette.darkGray, // titles color (filter widget)
199 + backgroundColor: Palette.periwinkle, // divider color (filter widget)
200 + decorationColor: Colors.white // checkbox background (filter widget)
201 + ),
202 + overline: TextStyle(
203 + color: Palette.wildPeriwinkle, // checkbox bounds (filter widget)
204 + decorationColor: Colors.white, // menu subname
205 + ),
206 + display1: TextStyle(
207 + color: Palette.blueCraiola, // first gradient color (menu header)
208 + decorationColor: Palette.blueGreyCraiola, // second gradient color(menu header)
209 + backgroundColor: PaletteDark.darkNightBlue // active dot color
210 + ),
211 + display2: TextStyle(
212 + color: Palette.shadowWhite, // action button color (address text field)
213 + decorationColor: Palette.darkGray, // hint text (seed widget)
214 + backgroundColor: Palette.darkBlueCraiola // text on balance page
215 + ),
216 + display3: TextStyle(
217 + color: Palette.darkGray, // hint text (new wallet page)
218 + decorationColor: Palette.periwinkleCraiola, // underline (new wallet page)
219 + backgroundColor: Palette.darkBlueCraiola // menu, icons, balance (dashboard page)
220 + ),
221 + display4: TextStyle(
222 + color: Palette.darkGray, // switch background (settings page)
223 + decorationColor: Colors.white.withOpacity(0.4) // hint text (exchange page)
224 + ),
225 + body1: TextStyle(
226 + color: Palette.darkGray, // indicators (PIN code)
227 + decorationColor: Palette.darkGray // switch (PIN code)
228 + ),
229 + body2: TextStyle(
230 + color: Palette.protectiveBlue, // primary buttons, alert right buttons
231 + decorationColor: Palette.brightOrange, // alert left button,
232 + backgroundColor: Palette.dullGray // keyboard bar color
233 + ),
234 + ),
235 + cardColor: Palette.protectiveBlue // bottom button (action list)
236 + );
237 +
238 + static final ThemeData brightTheme = ThemeData(
239 fontFamily: 'Lato',
240 brightness: Brightness.light,
241 backgroundColor: Colors.white,
@@ -206,18 +384,22 @@ class Themes extends EnumerableItem<int> with Serializable<int> {
384 ),
385 display1: TextStyle(
386 color: Palette.blueCraiola, // first gradient color (menu header)
209 - decorationColor: Palette.pinkFlamingo // second gradient color(menu header)
387 + decorationColor: Palette.pinkFlamingo, // second gradient color(menu header)
388 + backgroundColor: Colors.white // active dot color
389 ),
390 display2: TextStyle(
391 color: Palette.shadowWhite, // action button color (address text field)
213 - decorationColor: Palette.darkGray // hint text (seed widget)
392 + decorationColor: Palette.darkGray, // hint text (seed widget)
393 + backgroundColor: Colors.white.withOpacity(0.5) // text on balance page
394 ),
395 display3: TextStyle(
396 color: Palette.darkGray, // hint text (new wallet page)
217 - decorationColor: Palette.periwinkleCraiola // underline (new wallet page)
397 + decorationColor: Palette.periwinkleCraiola, // underline (new wallet page)
398 + backgroundColor: Colors.white // menu, icons, balance (dashboard page)
399 ),
400 display4: TextStyle(
401 color: Palette.darkGray, // switch background (settings page)
402 + decorationColor: Colors.white.withOpacity(0.4) // hint text (exchange page)
403 ),
404 body1: TextStyle(
405 color: Palette.darkGray, // indicators (PIN code)
@@ -380,18 +562,22 @@ class Themes extends EnumerableItem<int> with Serializable<int> {
562 ),
563 display1: TextStyle(
564 color: PaletteDark.deepPurpleBlue, // first gradient color (menu header)
383 - decorationColor: PaletteDark.deepPurpleBlue // second gradient color(menu header)
565 + decorationColor: PaletteDark.deepPurpleBlue, // second gradient color(menu header)
566 + backgroundColor: Colors.white // active dot color
567 ),
568 display2: TextStyle(
569 color: PaletteDark.nightBlue, // action button color (address text field)
387 - decorationColor: PaletteDark.darkCyanBlue // hint text (seed widget)
570 + decorationColor: PaletteDark.darkCyanBlue, // hint text (seed widget)
571 + backgroundColor: PaletteDark.cyanBlue // text on balance page
572 ),
573 display3: TextStyle(
574 color: PaletteDark.cyanBlue, // hint text (new wallet page)
391 - decorationColor: PaletteDark.darkGrey // underline (new wallet page)
575 + decorationColor: PaletteDark.darkGrey, // underline (new wallet page)
576 + backgroundColor: Colors.white // menu, icons, balance (dashboard page)
577 ),
578 display4: TextStyle(
579 color: PaletteDark.deepVioletBlue, // switch background (settings page)
580 + decorationColor: PaletteDark.lightBlueGrey // hint text (exchange page)
581 ),
582 body1: TextStyle(
583 color: PaletteDark.indicatorVioletBlue, // indicators (PIN code)