From b8145624958d3866d414180fae2ac50aa085f429 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Mon, 31 Aug 2020 16:44:40 +0300 Subject: [PATCH] merge conflect --- lib/pages/dashboard/dashboard_screen.dart | 104 +++++++++------------- 1 file changed, 41 insertions(+), 63 deletions(-) diff --git a/lib/pages/dashboard/dashboard_screen.dart b/lib/pages/dashboard/dashboard_screen.dart index d14c211..96f0ffb 100644 --- a/lib/pages/dashboard/dashboard_screen.dart +++ b/lib/pages/dashboard/dashboard_screen.dart @@ -96,14 +96,8 @@ class _DashboardScreenState extends State { Padding( padding: EdgeInsets.symmetric(horizontal: 10.0), child: Container( - height: MediaQuery - .of(context) - .size - .height * 0.16, - width: MediaQuery - .of(context) - .size - .width * 0.44, + height: MediaQuery.of(context).size.height * 0.16, + width: MediaQuery.of(context).size.width * 0.44, decoration: BoxDecoration( borderRadius: BorderRadius.circular(15.0), gradient: LinearGradient( @@ -115,9 +109,9 @@ class _DashboardScreenState extends State { Expanded( child: Padding( padding: EdgeInsets.all(2.0), - child: Column( - mainAxisAlignment: - MainAxisAlignment.spaceEvenly, + child: Column( + mainAxisAlignment: + MainAxisAlignment.spaceEvenly, children: [ Text( 'You Have', @@ -151,17 +145,13 @@ class _DashboardScreenState extends State { child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Image.asset( - 'assets/images/closed_box.png', - height: MediaQuery - .of(context) - .size - .height * + Image.asset( + 'assets/images/closed_box.png', + height: + MediaQuery.of(context).size.height * 0.10, - width: MediaQuery - .of(context) - .size - .width * + width: + MediaQuery.of(context).size.width * 0.20, scale: 0.9, fit: BoxFit.contain, @@ -184,10 +174,7 @@ class _DashboardScreenState extends State { padding: EdgeInsets.symmetric(horizontal: 10.0), child: Container( height: MediaQuery.of(context).size.height * 0.16, - width: MediaQuery - .of(context) - .size - .width * 0.45, + width: MediaQuery.of(context).size.width * 0.45, decoration: BoxDecoration( borderRadius: BorderRadius.circular(15.0), gradient: LinearGradient( @@ -199,21 +186,23 @@ class _DashboardScreenState extends State { Expanded( child: Padding( padding: EdgeInsets.all(2.0), - child: Column( - mainAxisAlignment: - MainAxisAlignment.spaceEvenly, - children: [ - Text( - 'You Have', - style: TextStyle( - color: Colors.white, fontSize: 10.0), - ), - Text( - '25', - style: TextStyle( - color: Colors.white, fontSize: 25.0), - ), - Text( + child: Column( + mainAxisAlignment: + MainAxisAlignment.spaceEvenly, + children: [ + Text( + 'You Have', + style: TextStyle( + color: Colors.white, + fontSize: 10.0), + ), + Text( + '25', + style: TextStyle( + color: Colors.white, + fontSize: 25.0), + ), + Text( 'Succesful\nDeliveries', style: TextStyle( color: Colors.white, @@ -265,14 +254,8 @@ class _DashboardScreenState extends State { Expanded( child: InkWell( child: Container( - height: MediaQuery - .of(context) - .size - .height * 0.18, - width: MediaQuery - .of(context) - .size - .width * 0.50, + height: MediaQuery.of(context).size.height * 0.18, + width: MediaQuery.of(context).size.width * 0.50, decoration: BoxDecoration( borderRadius: BorderRadius.circular(15.0), gradient: LinearGradient(colors: [ @@ -288,15 +271,9 @@ class _DashboardScreenState extends State { Image.asset( 'assets/images/qr_code.png', width: - MediaQuery - .of(context) - .size - .width * 0.26, + MediaQuery.of(context).size.width * 0.26, height: - MediaQuery - .of(context) - .size - .height * 0.14, + MediaQuery.of(context).size.height * 0.14, fit: BoxFit.contain, ) ], @@ -377,10 +354,10 @@ class _DashboardScreenState extends State { ], ), onTap: () => Navigator.push( - context, - MaterialPageRoute( - builder: (context) => OrdersListScreen()), - )), + context, + MaterialPageRoute( + builder: (context) => OrdersListScreen()), + )), ], ), ], @@ -399,7 +376,8 @@ class _DashboardScreenState extends State { padding: EdgeInsets.symmetric(horizontal: 12.2), child: InkWell( child: RoundedContainer( - raduis: 25.0,height: MediaQuery.of(context).size.height * 0.109, + raduis: 25.0, + height: MediaQuery.of(context).size.height * 0.109, child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -451,8 +429,8 @@ class _DashboardScreenState extends State { Expanded( child: Text( 'Olaya ST, Behind kfc next to king , ', - style: - TextStyle(color: Color(0xff636363)), + style: TextStyle( + color: Color(0xff636363)), ), ), ],