Merge branch 'order_info_card' into 'development'

fix issue

See merge request Cloud_Solution/driver-app!95
merge_into_dev_9/13_final
Elham 5 years ago
commit 3156ebdd8a

@ -1,4 +1,5 @@
import 'package:driverapp/config/size_config.dart'; import 'package:driverapp/config/size_config.dart';
import 'package:driverapp/uitl/utils.dart';
import 'package:driverapp/widgets/delivery/distance_in_kilometers.dart'; import 'package:driverapp/widgets/delivery/distance_in_kilometers.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -87,7 +88,7 @@ class CustomerBriefCard extends StatelessWidget {
height: MediaQuery.of(context).size.width * 0.02, height: MediaQuery.of(context).size.width * 0.02,
), ),
Text( Text(
'${customerFirstName} ${customerLastName}', Utils.formatName('${customerFirstName} ${customerLastName}'),
style: TextStyle(fontSize: 20, fontWeight: FontWeight.w500), style: TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
), ),
SizedBox( SizedBox(

@ -33,8 +33,8 @@ class AppScaffold extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
AppGlobal.context = context; AppGlobal.context = context;
return SafeArea( return SafeArea(
// top: false, top: false,
// bottom: false, bottom: false,
child: Scaffold( child: Scaffold(
backgroundColor: backgroundColor:
appBarColor ?? Theme.of(context).scaffoldBackgroundColor, appBarColor ?? Theme.of(context).scaffoldBackgroundColor,

Loading…
Cancel
Save