Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-05-06 07:42:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CAKE-20 | merged dev branch to current

Browse source
This commit is contained in:
Oleksandr Sobol 2020-07-31 20:44:37 +03:00
parent 2d20c1dee3
commit b2f590ee4b
4 changed files with 9 additions and 8 deletions
lib
palette.dart
src/screens
dashboard
dashboard_page.dart
widgets
menu_widget.dart
receive/widgets
qr_widget.dart

6
lib/palette.dart
View file

@ -22,7 +22,7 @@ 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 lightDistantBlue = Color.fromRGBO(81, 96, 147, 1.0); // borderCardColor
static const Color gray = Color.fromRGBO(140, 153, 201, 1.0); // walletCardText static const Color gray = Color.fromRGBO(140, 153, 201, 1.0); // walletCardText
static const Color violetBlue = Color.fromRGBO(51, 63, 104, 1.0); // walletCardAddressField //static const Color violetBlue = Color.fromRGBO(51, 63, 104, 1.0); // walletCardAddressField
//static const Color moderateBlue = Color.fromRGBO(63, 77, 122, 1.0); // walletCardSubAddressField //static const Color moderateBlue = Color.fromRGBO(63, 77, 122, 1.0); // walletCardSubAddressField
//static const Color darkNightBlue = Color.fromRGBO(33, 43, 73, 1.0); // historyPanel //static const Color darkNightBlue = Color.fromRGBO(33, 43, 73, 1.0); // historyPanel
static const Color pigeonBlue = Color.fromRGBO(91, 112, 146, 1.0); // historyPanelText static const Color pigeonBlue = Color.fromRGBO(91, 112, 146, 1.0); // historyPanelText
@ -53,13 +53,11 @@ class PaletteDark {
static const Color blueGrey = Color.fromRGBO(87, 98, 138, 1.0); static const Color blueGrey = Color.fromRGBO(87, 98, 138, 1.0);
static const Color moderateBlue = Color.fromRGBO(60, 73, 118, 1.0); 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 deepPurpleBlue = Color.fromRGBO(19, 29, 56, 1.0);
static const Color lightOceanBlue = Color.fromRGBO(30, 42, 73, 1.0); static const Color darkOceanBlue = 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 wildBlueGrey = Color.fromRGBO(125, 137, 182, 1.0);
static const Color darkGrey = Color.fromRGBO(118, 131, 169, 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 dividerColor = Color.fromRGBO(48, 59, 95, 1.0);
static const Color violetBlue = Color.fromRGBO(59, 72, 119, 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); static const Color distantBlue = Color.fromRGBO(72, 85, 131, 1.0);
// FIXME: Rename. // FIXME: Rename.

4
lib/src/screens/dashboard/dashboard_page.dart
View file

@ -20,7 +20,9 @@ class DashboardPage extends BasePage {
DashboardPage({ DashboardPage({
@required this.walletViewModel, @required this.walletViewModel,
@required this.addressListViewModel, @required this.addressListViewModel,
}); }) {
walletViewModel.pageViewStore.setCurrentPage(1);
}
@override @override
Color get backgroundLightColor => PaletteDark.backgroundColor; Color get backgroundLightColor => PaletteDark.backgroundColor;

4
lib/src/screens/dashboard/widgets/menu_widget.dart
View file

@ -140,7 +140,7 @@ class MenuWidgetState extends State<MenuWidget> {
), ),
Container( Container(
height: 1, height: 1,
color: PaletteDark.lightOceanBlue, color: PaletteDark.darkOceanBlue,
), ),
ListView.separated( ListView.separated(
shrinkWrap: true, shrinkWrap: true,
@ -189,7 +189,7 @@ class MenuWidgetState extends State<MenuWidget> {
}, },
separatorBuilder: (_, index) => Container( separatorBuilder: (_, index) => Container(
height: 1, height: 1,
color: PaletteDark.lightOceanBlue, color: PaletteDark.darkOceanBlue,
), ),
itemCount: itemCount) itemCount: itemCount)
], ],

3
lib/src/screens/receive/widgets/qr_widget.dart
View file

@ -81,7 +81,8 @@ class QRWidget extends StatelessWidget {
textColor: Colors.white, textColor: Colors.white,
borderColor: PaletteDark.darkGrey, borderColor: PaletteDark.darkGrey,
validator: AmountValidator( validator: AmountValidator(
type: addressListViewModel.type type: addressListViewModel.type,
isAutovalidate: true
), ),
autovalidate: true, autovalidate: true,
placeholderTextStyle: TextStyle( placeholderTextStyle: TextStyle(