CAKE-39 | changed monero logo (contact list, wallet list, new wallet type pages); changed buttons color on alerts, wallet list page, new wallet type page, receive page, monero account list page
OleksandrSobol committed
Sep 9, 2020 at 22:12 UTC
844847f703272db4c273c7cf43193e5a3efe0c37
8 files changed
+24
-12
assets/images/monero_logo.png
Binary files /dev/null and b/assets/images/monero_logo.png differ
lib/palette.dart
+2
@@ -41,6 +41,8 @@ class Palette {
41
static const Color shadowWhite = Color.fromRGBO(242, 245, 255, 1.0);
42
static const Color niagara = Color.fromRGBO(152, 172, 201, 1.0);
43
static const Color alizarinRed = Color.fromRGBO(233, 45, 45, 1.0);
44
+ static const Color moderateSlateBlue = Color.fromRGBO(129, 93, 251, 1.0);
45
+ static const Color brightOrange = Color.fromRGBO(255, 102, 0, 1.0);
46
47
// FIXME: Rename.
48
static const Color eee = Color.fromRGBO(236, 239, 245, 1.0);
lib/src/screens/contact/contact_list_page.dart
+1
-1
@@ -197,7 +197,7 @@ class ContactListPage extends BasePage {
197
Image image;
198
switch (currency) {
199
case CryptoCurrency.xmr:
200
- image = Image.asset('assets/images/monero.png', height: 24, width: 24);
200
+ image = Image.asset('assets/images/monero_logo.png', height: 24, width: 24);
201
break;
202
case CryptoCurrency.ada:
203
image = Image.asset('assets/images/ada.png', height: 24, width: 24);
lib/src/screens/new_wallet/new_wallet_type_page.dart
+1
-1
@@ -38,7 +38,7 @@ class WalletTypeFormState extends State<WalletTypeForm> {
38
static const aspectRatioImage = 1.22;
39
40
final moneroIcon =
41
- Image.asset('assets/images/monero.png', height: 24, width: 24);
41
+ Image.asset('assets/images/monero_logo.png', height: 24, width: 24);
42
final bitcoinIcon =
43
Image.asset('assets/images/bitcoin.png', height: 24, width: 24);
44
final walletTypeImage = Image.asset('assets/images/wallet_type.png');
lib/src/screens/wallet_list/wallet_list_page.dart
+1
-1
@@ -33,7 +33,7 @@ class WalletListBody extends StatefulWidget {
33
34
class WalletListBodyState extends State<WalletListBody> {
35
final moneroIcon =
36
- Image.asset('assets/images/monero.png', height: 24, width: 24);
36
+ Image.asset('assets/images/monero_logo.png', height: 24, width: 24);
37
final bitcoinIcon =
38
Image.asset('assets/images/bitcoin.png', height: 24, width: 24);
39
final scrollController = ScrollController();
lib/src/widgets/alert_with_one_action.dart
+1
-2
@@ -1,6 +1,5 @@
1
import 'package:flutter/material.dart';
2
import 'package:cake_wallet/src/widgets/base_alert_dialog.dart';
3
-import 'package:cake_wallet/palette.dart';
3
4
class AlertWithOneAction extends BaseAlertDialog {
5
AlertWithOneAction({
@@ -32,7 +31,7 @@ class AlertWithOneAction extends BaseAlertDialog {
31
width: 300,
32
height: 52,
33
padding: EdgeInsets.only(left: 12, right: 12),
35
- color: Palette.blueCraiola,
34
+ color: Theme.of(context).accentTextTheme.body2.color,
35
child: ButtonTheme(
36
minWidth: double.infinity,
37
child: FlatButton(
lib/src/widgets/base_alert_dialog.dart
+2
-2
@@ -47,7 +47,7 @@ class BaseAlertDialog extends StatelessWidget {
47
child: Container(
48
height: 52,
49
padding: EdgeInsets.only(left: 6, right: 6),
50
- color: Palette.alizarinRed,
50
+ color: Theme.of(context).accentTextTheme.body2.decorationColor,
51
child: ButtonTheme(
52
minWidth: double.infinity,
53
child: FlatButton(
@@ -72,7 +72,7 @@ class BaseAlertDialog extends StatelessWidget {
72
child: Container(
73
height: 52,
74
padding: EdgeInsets.only(left: 6, right: 6),
75
- color: Palette.blueCraiola,
75
+ color: Theme.of(context).accentTextTheme.body2.color,
76
child: ButtonTheme(
77
minWidth: double.infinity,
78
child: FlatButton(
lib/themes.dart
+16
-5
@@ -48,7 +48,8 @@ class Themes {
48
),
49
display3: TextStyle(
50
color: Colors.white, // text color of current tile (receive page),
51
- decorationColor: Palette.blueCraiola // background of current tile (receive page)
51
+ //decorationColor: Palette.blueCraiola // background of current tile (receive page)
52
+ decorationColor: Palette.moderateSlateBlue // background of current tile (receive page)
53
),
54
display4: TextStyle(
55
color: Palette.violetBlue, // text color of tiles (account list)
@@ -56,7 +57,8 @@ class Themes {
57
),
58
subtitle: TextStyle(
59
color: Colors.white, // text color of current tile (account list)
59
- decorationColor: Palette.blueCraiola // background of current tile (account list)
60
+ //decorationColor: Palette.blueCraiola // background of current tile (account list)
61
+ decorationColor: Palette.moderateSlateBlue // background of current tile (account list)
62
),
63
body1: TextStyle(
64
color: Palette.moderatePurpleBlue, // scrollbar thumb
@@ -132,7 +134,8 @@ class Themes {
134
subtitle: TextStyle(
135
color: Palette.darkBlueCraiola, // QR code (exchange trade page)
136
backgroundColor: Palette.wildPeriwinkle, // divider (exchange trade page)
135
- decorationColor: Palette.blueCraiola // crete new wallet button background (wallet list page)
137
+ //decorationColor: Palette.blueCraiola // crete new wallet button background (wallet list page)
138
+ decorationColor: Palette.moderateSlateBlue // crete new wallet button background (wallet list page)
139
),
140
headline: TextStyle(
141
color: Palette.moderateLavender, // first gradient color of wallet action buttons (wallet list page)
@@ -166,7 +169,11 @@ class Themes {
169
body1: TextStyle(
170
color: Palette.darkGray, // indicators (PIN code)
171
decorationColor: Palette.darkGray // switch (PIN code)
169
- )
172
+ ),
173
+ body2: TextStyle(
174
+ color: Palette.moderateSlateBlue, // primary buttons, alert right buttons
175
+ decorationColor: Palette.brightOrange // alert left button
176
+ ),
177
),
178
);
179
@@ -334,7 +341,11 @@ class Themes {
341
body1: TextStyle(
342
color: PaletteDark.indicatorVioletBlue, // indicators (PIN code)
343
decorationColor: PaletteDark.lightPurpleBlue // switch (PIN code)
337
- )
344
+ ),
345
+ body2: TextStyle(
346
+ color: Palette.blueCraiola, // primary buttons, alert right buttons
347
+ decorationColor: Palette.alizarinRed // alert left button
348
+ ),
349
),
350
);
351
}
\ No newline at end of file