Merge branch 'master' of gitlab.com:Cloud_Solution/driver-app into delivery_confirmed

# Conflicts:
#	lib/pages/delivery/information_page.dart
setting_branch
enadhilal 5 years ago
parent 5c9417ca6d
commit df3e4b0bfd

@ -27,19 +27,6 @@ class DeliveryConfirmedPage extends StatelessWidget {
children: <Widget>[
Column(
children: <Widget>[
// Container(
// child: Container(
// alignment: Alignment.topLeft,
// child: IconButton(
// color: Colors.white,
// iconSize: 40,
// icon: Icon(Icons.arrow_back),
// onPressed: () {
// Navigator.pop(context);
// },
// ),
// ),
// ),
Container(
child: Column(
children: <Widget>[
@ -97,9 +84,7 @@ class DeliveryConfirmedPage extends StatelessWidget {
),
Container(
width: MediaQuery.of(context).size.width,
//800,
height: MediaQuery.of(context).size.width * 1.2,
//440,
margin: EdgeInsets.only(top: 60),
decoration: BoxDecoration(
color: Colors.white,
@ -113,8 +98,7 @@ class DeliveryConfirmedPage extends StatelessWidget {
children: <Widget>[
Container(
margin: EdgeInsets.only(
bottom: MediaQuery.of(context).size.width *
0.15, //50
bottom: MediaQuery.of(context).size.width * 0.15,
),
child: Column(
children: <Widget>[

File diff suppressed because one or more lines are too long

@ -149,7 +149,7 @@ class CustomerBriefCard extends StatelessWidget {
],
),
SizedBox(
height: MediaQuery.of(context).size.width*0.07,
height: MediaQuery.of(context).size.width*0.03,
),
Row(
children: <Widget>[

Loading…
Cancel
Save