diff --git a/lib/pages/dashboard/dashboard_screen.dart b/lib/pages/dashboard/dashboard_screen.dart index 7088983..343aeac 100644 --- a/lib/pages/dashboard/dashboard_screen.dart +++ b/lib/pages/dashboard/dashboard_screen.dart @@ -502,7 +502,7 @@ class _DashboardScreenState extends State { if (model.state == ViewState.Idle) model.orders.length == 0 ? Text("There's No Orders To deliver") - : Text(""), + : SizedBox(), NetworkBaseView( baseViewModel: model, child: Expanded( diff --git a/lib/pages/orders/deliverd_orders_page.dart b/lib/pages/orders/deliverd_orders_page.dart index 9f73296..6eaa83c 100644 --- a/lib/pages/orders/deliverd_orders_page.dart +++ b/lib/pages/orders/deliverd_orders_page.dart @@ -31,7 +31,7 @@ class _DeliverdOrdersPageState extends State { if (model.state == ViewState.Idle) model.deliverdOrders.length == 0 ? Text("There's No Orders To deliver") - : Text(''), + : SizedBox(), NetworkBaseView( baseViewModel: model, child: Expanded( diff --git a/lib/pages/orders/pending_orders_page.dart b/lib/pages/orders/pending_orders_page.dart index 7e8e098..abe8613 100644 --- a/lib/pages/orders/pending_orders_page.dart +++ b/lib/pages/orders/pending_orders_page.dart @@ -32,7 +32,7 @@ class _OrdersListScreenState extends State { if (model.state == ViewState.Idle) model.orders.length == 0 ? Text("There's No Orders To deliver") - : Text(""), + : SizedBox(), Expanded( child: ListView.builder( shrinkWrap: true, diff --git a/lib/widgets/delivery/customer_brief_card.dart b/lib/widgets/delivery/customer_brief_card.dart index de860b4..f314854 100644 --- a/lib/widgets/delivery/customer_brief_card.dart +++ b/lib/widgets/delivery/customer_brief_card.dart @@ -45,7 +45,7 @@ class CustomerBriefCard extends StatelessWidget { width: MediaQuery.of(context).orientation == Orientation.landscape ? SizeConfig.widthMultiplier * 125.0 : SizeConfig.widthMultiplier * 90.0, - height: 290, + height: SizeConfig.heightMultiplier * 33.0, // TODO make it responsive decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.only( @@ -66,6 +66,7 @@ class CustomerBriefCard extends StatelessWidget { padding: EdgeInsets.only(left: 30, top: 20, right: 30), child: Column( crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, children: [ Row( children: [ @@ -81,7 +82,7 @@ class CustomerBriefCard extends StatelessWidget { ), Expanded( child: Padding( - padding: EdgeInsets.all(8.0), + padding: EdgeInsets.all(2.0), child: DistanceInKilometers( distanceInKilometers: distanceInKilometers, ), @@ -89,29 +90,34 @@ class CustomerBriefCard extends StatelessWidget { ), ], ), - SizedBox( - height: MediaQuery.of(context).size.width * 0.02, - ), - Text( - Utils.formatStringToPascalCase( - '${customerFirstName} ${customerLastName}'), - style: TextStyle( - color: Color(0xff343333), - fontWeight: FontWeight.bold, - fontSize: 20.0, - ), - ), - SizedBox( - height: MediaQuery.of(context).size.width * 0.019, - ), - Text( - mobileNo, - style: TextStyle( - color: Color(0xff14A0A9), fontWeight: FontWeight.w400), - ), - SizedBox( - height: MediaQuery.of(context).size.width * 0.005, + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Text( + Utils.formatStringToPascalCase( + '${customerFirstName} ${customerLastName}'), + style: TextStyle( + color: Color(0xff343333), + fontWeight: FontWeight.bold, + fontSize: 20.0, + ), + ), +// SizedBox( +// height: MediaQuery.of(context).size.width * 0.00, +// ), + Text( + mobileNo, + style: TextStyle( + color: Color(0xff14A0A9), + fontWeight: FontWeight.w400), + ), + SizedBox( + height: MediaQuery.of(context).size.width * 0.005, + ), + ], ), + // Text( // 'Olaya street, behind KFC resturant, next to kingdom towers 2nd floor ofice 277', // style: TextStyle(