|
|
|
|
@ -1,8 +1,8 @@
|
|
|
|
|
import 'package:driverapp/pages/delivery/delivery_confirmed_page.dart';
|
|
|
|
|
import 'package:driverapp/pages/delivery/DeliveryConfirmedPage.dart';
|
|
|
|
|
import 'package:driverapp/widgets/buttons/secondary_button.dart';
|
|
|
|
|
import 'package:driverapp/widgets/delivery/customer_brief_card.dart';
|
|
|
|
|
import 'package:driverapp/widgets/delivery/delivery_action_button.dart';
|
|
|
|
|
import 'package:driverapp/widgets/delivery/package_content.dart';
|
|
|
|
|
import 'package:driverapp/widgets/delivery/CustomerBriefCard.dart';
|
|
|
|
|
import 'package:driverapp/widgets/delivery/DeliveryActionButton.dart';
|
|
|
|
|
import 'package:driverapp/widgets/delivery/PackageContent.dart';
|
|
|
|
|
import 'package:flutter/cupertino.dart';
|
|
|
|
|
import 'package:flutter/material.dart';
|
|
|
|
|
|
|
|
|
|
@ -18,14 +18,14 @@ class InformationPage extends StatelessWidget {
|
|
|
|
|
Widget build(BuildContext context) {
|
|
|
|
|
return AppScaffold(
|
|
|
|
|
isShowAppBar: true,
|
|
|
|
|
appBarColor: Color(0xff3ABBBA),
|
|
|
|
|
appBarColor: Theme.of(context).disabledColor,
|
|
|
|
|
arrowColor: Colors.white,
|
|
|
|
|
titleColor: Colors.white,
|
|
|
|
|
appBarTitle: TranslationBase.of(context).deliveryInfo,
|
|
|
|
|
body: Container(
|
|
|
|
|
color: Color(0xff3ABBBA),
|
|
|
|
|
color: Theme.of(context).disabledColor,
|
|
|
|
|
child: Container(
|
|
|
|
|
color: Color(0xff3ABBBA),
|
|
|
|
|
color: Theme.of(context).disabledColor,
|
|
|
|
|
child: ListView(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Column(
|
|
|
|
|
@ -36,28 +36,26 @@ class InformationPage extends StatelessWidget {
|
|
|
|
|
width: MediaQuery
|
|
|
|
|
.of(context)
|
|
|
|
|
.size
|
|
|
|
|
.width, //400,
|
|
|
|
|
.width,
|
|
|
|
|
height: MediaQuery
|
|
|
|
|
.of(context)
|
|
|
|
|
.size
|
|
|
|
|
.width, //500,
|
|
|
|
|
.width,
|
|
|
|
|
),
|
|
|
|
|
Container(
|
|
|
|
|
width: MediaQuery
|
|
|
|
|
.of(context)
|
|
|
|
|
.size
|
|
|
|
|
.width * 1,
|
|
|
|
|
//800,
|
|
|
|
|
height: MediaQuery
|
|
|
|
|
.of(context)
|
|
|
|
|
.size
|
|
|
|
|
.width * 1.5,
|
|
|
|
|
//700,
|
|
|
|
|
margin: EdgeInsets.only(
|
|
|
|
|
top: MediaQuery
|
|
|
|
|
.of(context)
|
|
|
|
|
.size
|
|
|
|
|
.width * 0.23, //100
|
|
|
|
|
.width * 0.23,
|
|
|
|
|
),
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Theme.of(context).scaffoldBackgroundColor,
|
|
|
|
|
@ -72,7 +70,7 @@ class InformationPage extends StatelessWidget {
|
|
|
|
|
height: MediaQuery
|
|
|
|
|
.of(context)
|
|
|
|
|
.size
|
|
|
|
|
.width * 0.53, //170,
|
|
|
|
|
.width * 0.53,
|
|
|
|
|
),
|
|
|
|
|
Row(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
|
@ -112,7 +110,7 @@ class InformationPage extends StatelessWidget {
|
|
|
|
|
btnFunction: () {},
|
|
|
|
|
),
|
|
|
|
|
deliveryInfoButton(
|
|
|
|
|
btnColor: Color(0xff41bdbb),
|
|
|
|
|
btnColor: Theme.of(context).disabledColor,
|
|
|
|
|
btnIcon: Icon(
|
|
|
|
|
Icons.phone,
|
|
|
|
|
size: 30,
|
|
|
|
|
@ -129,18 +127,18 @@ class InformationPage extends StatelessWidget {
|
|
|
|
|
height: MediaQuery
|
|
|
|
|
.of(context)
|
|
|
|
|
.size
|
|
|
|
|
.width * 0.1, //30,
|
|
|
|
|
.width * 0.1,
|
|
|
|
|
),
|
|
|
|
|
Container(
|
|
|
|
|
margin: EdgeInsets.only(
|
|
|
|
|
left: MediaQuery
|
|
|
|
|
.of(context)
|
|
|
|
|
.size
|
|
|
|
|
.width * 0.05, //15,
|
|
|
|
|
.width * 0.05,
|
|
|
|
|
right: MediaQuery
|
|
|
|
|
.of(context)
|
|
|
|
|
.size
|
|
|
|
|
.width * 0.05, //15
|
|
|
|
|
.width * 0.05,
|
|
|
|
|
),
|
|
|
|
|
child: Column(
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
@ -160,7 +158,7 @@ class InformationPage extends StatelessWidget {
|
|
|
|
|
height: MediaQuery
|
|
|
|
|
.of(context)
|
|
|
|
|
.size
|
|
|
|
|
.width * 0.05, //20,
|
|
|
|
|
.width * 0.05,
|
|
|
|
|
),
|
|
|
|
|
Padding(
|
|
|
|
|
padding: const EdgeInsets.only(left: 10),
|
|
|
|
|
@ -168,12 +166,11 @@ class InformationPage extends StatelessWidget {
|
|
|
|
|
children: List.generate(
|
|
|
|
|
item.itemsQuantitiesList.length,
|
|
|
|
|
(index) {
|
|
|
|
|
return package_content(
|
|
|
|
|
return packageContent(
|
|
|
|
|
packageName: item
|
|
|
|
|
.itemsQuantitiesList[index]
|
|
|
|
|
.itemName
|
|
|
|
|
.toString(),
|
|
|
|
|
//'Panadol Extra 50 tablet',
|
|
|
|
|
packageCount: item
|
|
|
|
|
.itemsQuantitiesList[index]
|
|
|
|
|
.quantity
|
|
|
|
|
@ -186,7 +183,7 @@ class InformationPage extends StatelessWidget {
|
|
|
|
|
height: MediaQuery
|
|
|
|
|
.of(context)
|
|
|
|
|
.size
|
|
|
|
|
.width * 0.01, //10,
|
|
|
|
|
.width * 0.01,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
@ -195,11 +192,10 @@ class InformationPage extends StatelessWidget {
|
|
|
|
|
height: MediaQuery
|
|
|
|
|
.of(context)
|
|
|
|
|
.size
|
|
|
|
|
.width * 0.1, //30,
|
|
|
|
|
.width * 0.1,
|
|
|
|
|
),
|
|
|
|
|
Container(
|
|
|
|
|
margin: EdgeInsets.all(10),
|
|
|
|
|
// height: MediaQuery.of(context).size.height *0.08,
|
|
|
|
|
child: SecondaryButton(
|
|
|
|
|
label: TranslationBase.of(context).clientReached,
|
|
|
|
|
onTap: () {
|