mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-01-03 09:29:48 +00:00
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
This commit is contained in:
parent
2a7a4cad0a
commit
844847f703
8 changed files with 24 additions and 12 deletions
BIN
assets/images/monero_logo.png
Normal file
BIN
assets/images/monero_logo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 69 KiB |
|
@ -41,6 +41,8 @@ class Palette {
|
||||||
static const Color shadowWhite = Color.fromRGBO(242, 245, 255, 1.0);
|
static const Color shadowWhite = Color.fromRGBO(242, 245, 255, 1.0);
|
||||||
static const Color niagara = Color.fromRGBO(152, 172, 201, 1.0);
|
static const Color niagara = Color.fromRGBO(152, 172, 201, 1.0);
|
||||||
static const Color alizarinRed = Color.fromRGBO(233, 45, 45, 1.0);
|
static const Color alizarinRed = Color.fromRGBO(233, 45, 45, 1.0);
|
||||||
|
static const Color moderateSlateBlue = Color.fromRGBO(129, 93, 251, 1.0);
|
||||||
|
static const Color brightOrange = Color.fromRGBO(255, 102, 0, 1.0);
|
||||||
|
|
||||||
// FIXME: Rename.
|
// FIXME: Rename.
|
||||||
static const Color eee = Color.fromRGBO(236, 239, 245, 1.0);
|
static const Color eee = Color.fromRGBO(236, 239, 245, 1.0);
|
||||||
|
|
|
@ -197,7 +197,7 @@ class ContactListPage extends BasePage {
|
||||||
Image image;
|
Image image;
|
||||||
switch (currency) {
|
switch (currency) {
|
||||||
case CryptoCurrency.xmr:
|
case CryptoCurrency.xmr:
|
||||||
image = Image.asset('assets/images/monero.png', height: 24, width: 24);
|
image = Image.asset('assets/images/monero_logo.png', height: 24, width: 24);
|
||||||
break;
|
break;
|
||||||
case CryptoCurrency.ada:
|
case CryptoCurrency.ada:
|
||||||
image = Image.asset('assets/images/ada.png', height: 24, width: 24);
|
image = Image.asset('assets/images/ada.png', height: 24, width: 24);
|
||||||
|
|
|
@ -38,7 +38,7 @@ class WalletTypeFormState extends State<WalletTypeForm> {
|
||||||
static const aspectRatioImage = 1.22;
|
static const aspectRatioImage = 1.22;
|
||||||
|
|
||||||
final moneroIcon =
|
final moneroIcon =
|
||||||
Image.asset('assets/images/monero.png', height: 24, width: 24);
|
Image.asset('assets/images/monero_logo.png', height: 24, width: 24);
|
||||||
final bitcoinIcon =
|
final bitcoinIcon =
|
||||||
Image.asset('assets/images/bitcoin.png', height: 24, width: 24);
|
Image.asset('assets/images/bitcoin.png', height: 24, width: 24);
|
||||||
final walletTypeImage = Image.asset('assets/images/wallet_type.png');
|
final walletTypeImage = Image.asset('assets/images/wallet_type.png');
|
||||||
|
|
|
@ -33,7 +33,7 @@ class WalletListBody extends StatefulWidget {
|
||||||
|
|
||||||
class WalletListBodyState extends State<WalletListBody> {
|
class WalletListBodyState extends State<WalletListBody> {
|
||||||
final moneroIcon =
|
final moneroIcon =
|
||||||
Image.asset('assets/images/monero.png', height: 24, width: 24);
|
Image.asset('assets/images/monero_logo.png', height: 24, width: 24);
|
||||||
final bitcoinIcon =
|
final bitcoinIcon =
|
||||||
Image.asset('assets/images/bitcoin.png', height: 24, width: 24);
|
Image.asset('assets/images/bitcoin.png', height: 24, width: 24);
|
||||||
final scrollController = ScrollController();
|
final scrollController = ScrollController();
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:cake_wallet/src/widgets/base_alert_dialog.dart';
|
import 'package:cake_wallet/src/widgets/base_alert_dialog.dart';
|
||||||
import 'package:cake_wallet/palette.dart';
|
|
||||||
|
|
||||||
class AlertWithOneAction extends BaseAlertDialog {
|
class AlertWithOneAction extends BaseAlertDialog {
|
||||||
AlertWithOneAction({
|
AlertWithOneAction({
|
||||||
|
@ -32,7 +31,7 @@ class AlertWithOneAction extends BaseAlertDialog {
|
||||||
width: 300,
|
width: 300,
|
||||||
height: 52,
|
height: 52,
|
||||||
padding: EdgeInsets.only(left: 12, right: 12),
|
padding: EdgeInsets.only(left: 12, right: 12),
|
||||||
color: Palette.blueCraiola,
|
color: Theme.of(context).accentTextTheme.body2.color,
|
||||||
child: ButtonTheme(
|
child: ButtonTheme(
|
||||||
minWidth: double.infinity,
|
minWidth: double.infinity,
|
||||||
child: FlatButton(
|
child: FlatButton(
|
||||||
|
|
|
@ -47,7 +47,7 @@ class BaseAlertDialog extends StatelessWidget {
|
||||||
child: Container(
|
child: Container(
|
||||||
height: 52,
|
height: 52,
|
||||||
padding: EdgeInsets.only(left: 6, right: 6),
|
padding: EdgeInsets.only(left: 6, right: 6),
|
||||||
color: Palette.alizarinRed,
|
color: Theme.of(context).accentTextTheme.body2.decorationColor,
|
||||||
child: ButtonTheme(
|
child: ButtonTheme(
|
||||||
minWidth: double.infinity,
|
minWidth: double.infinity,
|
||||||
child: FlatButton(
|
child: FlatButton(
|
||||||
|
@ -72,7 +72,7 @@ class BaseAlertDialog extends StatelessWidget {
|
||||||
child: Container(
|
child: Container(
|
||||||
height: 52,
|
height: 52,
|
||||||
padding: EdgeInsets.only(left: 6, right: 6),
|
padding: EdgeInsets.only(left: 6, right: 6),
|
||||||
color: Palette.blueCraiola,
|
color: Theme.of(context).accentTextTheme.body2.color,
|
||||||
child: ButtonTheme(
|
child: ButtonTheme(
|
||||||
minWidth: double.infinity,
|
minWidth: double.infinity,
|
||||||
child: FlatButton(
|
child: FlatButton(
|
||||||
|
|
|
@ -48,7 +48,8 @@ class Themes {
|
||||||
),
|
),
|
||||||
display3: TextStyle(
|
display3: TextStyle(
|
||||||
color: Colors.white, // text color of current tile (receive page),
|
color: Colors.white, // text color of current tile (receive page),
|
||||||
decorationColor: Palette.blueCraiola // background of current tile (receive page)
|
//decorationColor: Palette.blueCraiola // background of current tile (receive page)
|
||||||
|
decorationColor: Palette.moderateSlateBlue // background of current tile (receive page)
|
||||||
),
|
),
|
||||||
display4: TextStyle(
|
display4: TextStyle(
|
||||||
color: Palette.violetBlue, // text color of tiles (account list)
|
color: Palette.violetBlue, // text color of tiles (account list)
|
||||||
|
@ -56,7 +57,8 @@ class Themes {
|
||||||
),
|
),
|
||||||
subtitle: TextStyle(
|
subtitle: TextStyle(
|
||||||
color: Colors.white, // text color of current tile (account list)
|
color: Colors.white, // text color of current tile (account list)
|
||||||
decorationColor: Palette.blueCraiola // background of current tile (account list)
|
//decorationColor: Palette.blueCraiola // background of current tile (account list)
|
||||||
|
decorationColor: Palette.moderateSlateBlue // background of current tile (account list)
|
||||||
),
|
),
|
||||||
body1: TextStyle(
|
body1: TextStyle(
|
||||||
color: Palette.moderatePurpleBlue, // scrollbar thumb
|
color: Palette.moderatePurpleBlue, // scrollbar thumb
|
||||||
|
@ -132,7 +134,8 @@ class Themes {
|
||||||
subtitle: TextStyle(
|
subtitle: TextStyle(
|
||||||
color: Palette.darkBlueCraiola, // QR code (exchange trade page)
|
color: Palette.darkBlueCraiola, // QR code (exchange trade page)
|
||||||
backgroundColor: Palette.wildPeriwinkle, // divider (exchange trade page)
|
backgroundColor: Palette.wildPeriwinkle, // divider (exchange trade page)
|
||||||
decorationColor: Palette.blueCraiola // crete new wallet button background (wallet list page)
|
//decorationColor: Palette.blueCraiola // crete new wallet button background (wallet list page)
|
||||||
|
decorationColor: Palette.moderateSlateBlue // crete new wallet button background (wallet list page)
|
||||||
),
|
),
|
||||||
headline: TextStyle(
|
headline: TextStyle(
|
||||||
color: Palette.moderateLavender, // first gradient color of wallet action buttons (wallet list page)
|
color: Palette.moderateLavender, // first gradient color of wallet action buttons (wallet list page)
|
||||||
|
@ -166,7 +169,11 @@ class Themes {
|
||||||
body1: TextStyle(
|
body1: TextStyle(
|
||||||
color: Palette.darkGray, // indicators (PIN code)
|
color: Palette.darkGray, // indicators (PIN code)
|
||||||
decorationColor: Palette.darkGray // switch (PIN code)
|
decorationColor: Palette.darkGray // switch (PIN code)
|
||||||
)
|
),
|
||||||
|
body2: TextStyle(
|
||||||
|
color: Palette.moderateSlateBlue, // primary buttons, alert right buttons
|
||||||
|
decorationColor: Palette.brightOrange // alert left button
|
||||||
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -334,7 +341,11 @@ class Themes {
|
||||||
body1: TextStyle(
|
body1: TextStyle(
|
||||||
color: PaletteDark.indicatorVioletBlue, // indicators (PIN code)
|
color: PaletteDark.indicatorVioletBlue, // indicators (PIN code)
|
||||||
decorationColor: PaletteDark.lightPurpleBlue // switch (PIN code)
|
decorationColor: PaletteDark.lightPurpleBlue // switch (PIN code)
|
||||||
)
|
),
|
||||||
|
body2: TextStyle(
|
||||||
|
color: Palette.blueCraiola, // primary buttons, alert right buttons
|
||||||
|
decorationColor: Palette.alizarinRed // alert left button
|
||||||
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
Loading…
Reference in a new issue