|
|
|
@ -1,4 +1,5 @@
|
|
|
|
import 'package:driverapp/pages/delivery/delivery_confirmed_page.dart';
|
|
|
|
import 'package:driverapp/pages/delivery/delivery_confirmed_page.dart';
|
|
|
|
|
|
|
|
import 'package:driverapp/widgets/buttons/secondary_button.dart';
|
|
|
|
import 'package:driverapp/widgets/delivery/customer_brief_card.dart';
|
|
|
|
import 'package:driverapp/widgets/delivery/customer_brief_card.dart';
|
|
|
|
import 'package:driverapp/widgets/delivery/delivery_action_button.dart';
|
|
|
|
import 'package:driverapp/widgets/delivery/delivery_action_button.dart';
|
|
|
|
import 'package:driverapp/widgets/delivery/package_content.dart';
|
|
|
|
import 'package:driverapp/widgets/delivery/package_content.dart';
|
|
|
|
@ -17,9 +18,9 @@ class InformationPage extends StatelessWidget {
|
|
|
|
Widget build(BuildContext context) {
|
|
|
|
Widget build(BuildContext context) {
|
|
|
|
return AppScaffold(
|
|
|
|
return AppScaffold(
|
|
|
|
body: Container(
|
|
|
|
body: Container(
|
|
|
|
color: Color(0xff41bdbb),
|
|
|
|
color: Color(0xff3ABBBA),
|
|
|
|
child: Container(
|
|
|
|
child: Container(
|
|
|
|
color: Color(0xff41bdbb),
|
|
|
|
color: Color(0xff3ABBBA),
|
|
|
|
child: ListView(
|
|
|
|
child: ListView(
|
|
|
|
children: <Widget>[
|
|
|
|
children: <Widget>[
|
|
|
|
Column(
|
|
|
|
Column(
|
|
|
|
@ -32,7 +33,7 @@ class InformationPage extends StatelessWidget {
|
|
|
|
right: MediaQuery
|
|
|
|
right: MediaQuery
|
|
|
|
.of(context)
|
|
|
|
.of(context)
|
|
|
|
.size
|
|
|
|
.size
|
|
|
|
.width * 0.15, //50
|
|
|
|
.width * 0.10, //50
|
|
|
|
),
|
|
|
|
),
|
|
|
|
child: IconButton(
|
|
|
|
child: IconButton(
|
|
|
|
color: Colors.white,
|
|
|
|
color: Colors.white,
|
|
|
|
@ -83,10 +84,10 @@ class InformationPage extends StatelessWidget {
|
|
|
|
top: MediaQuery
|
|
|
|
top: MediaQuery
|
|
|
|
.of(context)
|
|
|
|
.of(context)
|
|
|
|
.size
|
|
|
|
.size
|
|
|
|
.width * 0.3, //100
|
|
|
|
.width * 0.23, //100
|
|
|
|
),
|
|
|
|
),
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
color: Colors.white,
|
|
|
|
color: Theme.of(context).scaffoldBackgroundColor,
|
|
|
|
borderRadius: BorderRadius.only(
|
|
|
|
borderRadius: BorderRadius.only(
|
|
|
|
topLeft: Radius.circular(45),
|
|
|
|
topLeft: Radius.circular(45),
|
|
|
|
topRight: Radius.circular(45)),
|
|
|
|
topRight: Radius.circular(45)),
|
|
|
|
@ -98,13 +99,13 @@ class InformationPage extends StatelessWidget {
|
|
|
|
height: MediaQuery
|
|
|
|
height: MediaQuery
|
|
|
|
.of(context)
|
|
|
|
.of(context)
|
|
|
|
.size
|
|
|
|
.size
|
|
|
|
.width * 0.2, //170,
|
|
|
|
.width * 0.4, //170,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Row(
|
|
|
|
Row(
|
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
children: <Widget>[
|
|
|
|
children: <Widget>[
|
|
|
|
delivery_info_button(
|
|
|
|
deliveryInfoButton(
|
|
|
|
btnColor: Color(0xfff44336),
|
|
|
|
btnColor: Color(0xffED1C24),
|
|
|
|
btnIcon: Icon(
|
|
|
|
btnIcon: Icon(
|
|
|
|
Icons.near_me,
|
|
|
|
Icons.near_me,
|
|
|
|
size: 30,
|
|
|
|
size: 30,
|
|
|
|
@ -115,8 +116,8 @@ class InformationPage extends StatelessWidget {
|
|
|
|
.location,
|
|
|
|
.location,
|
|
|
|
btnFunction: () {},
|
|
|
|
btnFunction: () {},
|
|
|
|
),
|
|
|
|
),
|
|
|
|
delivery_info_button(
|
|
|
|
deliveryInfoButton(
|
|
|
|
btnColor: Colors.green,
|
|
|
|
btnColor: Color(0xFF61B260),
|
|
|
|
btnIcon: Icon(
|
|
|
|
btnIcon: Icon(
|
|
|
|
Icons.whatshot,
|
|
|
|
Icons.whatshot,
|
|
|
|
size: 30,
|
|
|
|
size: 30,
|
|
|
|
@ -125,8 +126,8 @@ class InformationPage extends StatelessWidget {
|
|
|
|
btnName: 'Whatsapp',
|
|
|
|
btnName: 'Whatsapp',
|
|
|
|
btnFunction: () {},
|
|
|
|
btnFunction: () {},
|
|
|
|
),
|
|
|
|
),
|
|
|
|
delivery_info_button(
|
|
|
|
deliveryInfoButton(
|
|
|
|
btnColor: Colors.orangeAccent,
|
|
|
|
btnColor: Color(0xFFFCB657),
|
|
|
|
btnIcon: Icon(
|
|
|
|
btnIcon: Icon(
|
|
|
|
Icons.mail_outline,
|
|
|
|
Icons.mail_outline,
|
|
|
|
size: 30,
|
|
|
|
size: 30,
|
|
|
|
@ -137,7 +138,7 @@ class InformationPage extends StatelessWidget {
|
|
|
|
.sms,
|
|
|
|
.sms,
|
|
|
|
btnFunction: () {},
|
|
|
|
btnFunction: () {},
|
|
|
|
),
|
|
|
|
),
|
|
|
|
delivery_info_button(
|
|
|
|
deliveryInfoButton(
|
|
|
|
btnColor: Color(0xff41bdbb),
|
|
|
|
btnColor: Color(0xff41bdbb),
|
|
|
|
btnIcon: Icon(
|
|
|
|
btnIcon: Icon(
|
|
|
|
Icons.phone,
|
|
|
|
Icons.phone,
|
|
|
|
@ -166,7 +167,7 @@ class InformationPage extends StatelessWidget {
|
|
|
|
right: MediaQuery
|
|
|
|
right: MediaQuery
|
|
|
|
.of(context)
|
|
|
|
.of(context)
|
|
|
|
.size
|
|
|
|
.size
|
|
|
|
.width * 0.02, //15
|
|
|
|
.width * 0.05, //15
|
|
|
|
),
|
|
|
|
),
|
|
|
|
child: Column(
|
|
|
|
child: Column(
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
@ -176,7 +177,7 @@ class InformationPage extends StatelessWidget {
|
|
|
|
.of(context)
|
|
|
|
.of(context)
|
|
|
|
.packageContent,
|
|
|
|
.packageContent,
|
|
|
|
style: TextStyle(
|
|
|
|
style: TextStyle(
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
fontWeight: FontWeight.w900,
|
|
|
|
fontSize: 20),
|
|
|
|
fontSize: 20),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
SizedBox(
|
|
|
|
SizedBox(
|
|
|
|
@ -194,7 +195,6 @@ class InformationPage extends StatelessWidget {
|
|
|
|
.itemsQuantitiesList[index]
|
|
|
|
.itemsQuantitiesList[index]
|
|
|
|
.itemName
|
|
|
|
.itemName
|
|
|
|
.toString(),
|
|
|
|
.toString(),
|
|
|
|
//'Panadol Extra 50 tablet',
|
|
|
|
|
|
|
|
packageCount: item
|
|
|
|
packageCount: item
|
|
|
|
.itemsQuantitiesList[index]
|
|
|
|
.itemsQuantitiesList[index]
|
|
|
|
.quantity
|
|
|
|
.quantity
|
|
|
|
@ -217,40 +217,12 @@ class InformationPage extends StatelessWidget {
|
|
|
|
.size
|
|
|
|
.size
|
|
|
|
.width * 0.1, //30,
|
|
|
|
.width * 0.1, //30,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
FlatButton(
|
|
|
|
Container(
|
|
|
|
color: Color(0xff41bdbb),
|
|
|
|
margin: EdgeInsets.all(10),
|
|
|
|
padding: EdgeInsets.only(
|
|
|
|
// height: MediaQuery.of(context).size.height *0.08,
|
|
|
|
right: MediaQuery
|
|
|
|
child: SecondaryButton(
|
|
|
|
.of(context)
|
|
|
|
label: TranslationBase.of(context).clientReached,
|
|
|
|
.size
|
|
|
|
onTap: () {
|
|
|
|
.width * 0.3, //100,
|
|
|
|
|
|
|
|
left: MediaQuery
|
|
|
|
|
|
|
|
.of(context)
|
|
|
|
|
|
|
|
.size
|
|
|
|
|
|
|
|
.width * 0.3, //100,
|
|
|
|
|
|
|
|
bottom: MediaQuery
|
|
|
|
|
|
|
|
.of(context)
|
|
|
|
|
|
|
|
.size
|
|
|
|
|
|
|
|
.width * 0.035, //15,
|
|
|
|
|
|
|
|
top: MediaQuery
|
|
|
|
|
|
|
|
.of(context)
|
|
|
|
|
|
|
|
.size
|
|
|
|
|
|
|
|
.width * 0.035, //15
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
shape: RoundedRectangleBorder(
|
|
|
|
|
|
|
|
borderRadius: new BorderRadius.circular(30.0),
|
|
|
|
|
|
|
|
side: BorderSide(color: Color(0xff41bdbb)),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
child: Text(
|
|
|
|
|
|
|
|
TranslationBase
|
|
|
|
|
|
|
|
.of(context)
|
|
|
|
|
|
|
|
.clientReached,
|
|
|
|
|
|
|
|
style: TextStyle(
|
|
|
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
|
|
|
|
fontSize: 16),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
onPressed: () {
|
|
|
|
|
|
|
|
Navigator.push(
|
|
|
|
Navigator.push(
|
|
|
|
context,
|
|
|
|
context,
|
|
|
|
MaterialPageRoute(
|
|
|
|
MaterialPageRoute(
|
|
|
|
@ -258,6 +230,48 @@ class InformationPage extends StatelessWidget {
|
|
|
|
DeliveryConfirmedPage(item)));
|
|
|
|
DeliveryConfirmedPage(item)));
|
|
|
|
},
|
|
|
|
},
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
// FlatButton(
|
|
|
|
|
|
|
|
// color: Color(0xff41bdbb),
|
|
|
|
|
|
|
|
// padding: EdgeInsets.only(
|
|
|
|
|
|
|
|
// right: MediaQuery
|
|
|
|
|
|
|
|
// .of(context)
|
|
|
|
|
|
|
|
// .size
|
|
|
|
|
|
|
|
// .width * 0.3, //100,
|
|
|
|
|
|
|
|
// left: MediaQuery
|
|
|
|
|
|
|
|
// .of(context)
|
|
|
|
|
|
|
|
// .size
|
|
|
|
|
|
|
|
// .width * 0.3, //100,
|
|
|
|
|
|
|
|
// bottom: MediaQuery
|
|
|
|
|
|
|
|
// .of(context)
|
|
|
|
|
|
|
|
// .size
|
|
|
|
|
|
|
|
// .width * 0.035, //15,
|
|
|
|
|
|
|
|
// top: MediaQuery
|
|
|
|
|
|
|
|
// .of(context)
|
|
|
|
|
|
|
|
// .size
|
|
|
|
|
|
|
|
// .width * 0.035, //15
|
|
|
|
|
|
|
|
// ),
|
|
|
|
|
|
|
|
// shape: RoundedRectangleBorder(
|
|
|
|
|
|
|
|
// borderRadius: new BorderRadius.circular(30.0),
|
|
|
|
|
|
|
|
// side: BorderSide(color: Color(0xff41bdbb)),
|
|
|
|
|
|
|
|
// ),
|
|
|
|
|
|
|
|
// child: Text(
|
|
|
|
|
|
|
|
// TranslationBase
|
|
|
|
|
|
|
|
// .of(context)
|
|
|
|
|
|
|
|
// .clientReached,
|
|
|
|
|
|
|
|
// style: TextStyle(
|
|
|
|
|
|
|
|
// color: Colors.white,
|
|
|
|
|
|
|
|
// fontWeight: FontWeight.bold,
|
|
|
|
|
|
|
|
// fontSize: 16),
|
|
|
|
|
|
|
|
// ),
|
|
|
|
|
|
|
|
// onPressed: () {
|
|
|
|
|
|
|
|
// Navigator.push(
|
|
|
|
|
|
|
|
// context,
|
|
|
|
|
|
|
|
// MaterialPageRoute(
|
|
|
|
|
|
|
|
// builder: (context) =>
|
|
|
|
|
|
|
|
// DeliveryConfirmedPage(item)));
|
|
|
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
// ),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|