From ec6e5f6c00ca2bb6ec7208e8f5ed62afd6121406 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 8 Jul 2018 09:39:01 +0300 Subject: [PATCH] Adjust layout --- lib/ui/dashboard/dashboard_panels.dart | 50 +++++++++++++------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/lib/ui/dashboard/dashboard_panels.dart b/lib/ui/dashboard/dashboard_panels.dart index 37368fea7..e8ff1ec92 100644 --- a/lib/ui/dashboard/dashboard_panels.dart +++ b/lib/ui/dashboard/dashboard_panels.dart @@ -43,31 +43,33 @@ class DashboardPanels extends StatelessWidget { Row( children: [ DashboardColumn( - amount: viewModel.dashboardState.data.averageInvoice, - icon: Icons.email, - color: Color(0xFF44AF69), - title: localization.averageInvoice, - ), + title: localization.invoicesSent, + color: Color(0xFFFCAB10), + icon: Icons.send, + isMoney: false, + amount: + viewModel.dashboardState.data.invoicesSent.toDouble()), DashboardColumn( - amount: viewModel.dashboardState.data.balances, - icon: Icons.schedule, - color: Color(0xFFF8333C), - title: localization.outstanding, - ), + title: localization.activeClients, + color: Color(0xFFDBD5B5), + icon: Icons.people, + isMoney: false, + amount: + viewModel.dashboardState.data.activeClients.toDouble()), ], ), DashboardRow( - title: localization.invoicesSent, - color: Color(0xFFFCAB10), - icon: Icons.send, - isMoney: false, - amount: viewModel.dashboardState.data.invoicesSent.toDouble()), + amount: viewModel.dashboardState.data.averageInvoice, + icon: Icons.email, + color: Color(0xFF44AF69), + title: localization.averageInvoice, + ), DashboardRow( - title: localization.activeClients, - color: Color(0xFFDBD5B5), - icon: Icons.people, - isMoney: false, - amount: viewModel.dashboardState.data.activeClients.toDouble()), + amount: viewModel.dashboardState.data.balances, + icon: Icons.schedule, + color: Color(0xFFF8333C), + title: localization.outstanding, + ), ]), ); } @@ -99,8 +101,8 @@ class ColorIcon extends StatelessWidget { } class DashboardRow extends StatelessWidget { - const DashboardRow({ - @required this.title, + const DashboardRow( + {@required this.title, @required this.icon, @required this.amount, @required this.color, @@ -146,8 +148,8 @@ class DashboardRow extends StatelessWidget { } class DashboardColumn extends StatelessWidget { - const DashboardColumn({ - @required this.title, + const DashboardColumn( + {@required this.title, @required this.icon, @required this.amount, @required this.color,