|
|
|
@ -2,6 +2,7 @@ import 'package:driverapp/core/viewModels/orders_view_model.dart';
|
|
|
|
import 'package:driverapp/pages/delivery/information_page.dart';
|
|
|
|
import 'package:driverapp/pages/delivery/information_page.dart';
|
|
|
|
import 'package:driverapp/widgets/data_display/circle-container.dart';
|
|
|
|
import 'package:driverapp/widgets/data_display/circle-container.dart';
|
|
|
|
import 'package:driverapp/widgets/others/app_scaffold_widget.dart';
|
|
|
|
import 'package:driverapp/widgets/others/app_scaffold_widget.dart';
|
|
|
|
|
|
|
|
import 'package:driverapp/widgets/others/network_base_view.dart';
|
|
|
|
import 'package:driverapp/widgets/others/rounded_container.dart';
|
|
|
|
import 'package:driverapp/widgets/others/rounded_container.dart';
|
|
|
|
import 'package:flutter/cupertino.dart';
|
|
|
|
import 'package:flutter/cupertino.dart';
|
|
|
|
import 'package:flutter/material.dart';
|
|
|
|
import 'package:flutter/material.dart';
|
|
|
|
@ -29,7 +30,9 @@ class _DeliverdOrdersPageState extends State<DeliverdOrdersPage> {
|
|
|
|
SizedBox(
|
|
|
|
SizedBox(
|
|
|
|
height: 20,
|
|
|
|
height: 20,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Expanded(
|
|
|
|
NetworkBaseView(
|
|
|
|
|
|
|
|
baseViewModel: model,
|
|
|
|
|
|
|
|
child: Expanded(
|
|
|
|
child: ListView.builder(
|
|
|
|
child: ListView.builder(
|
|
|
|
shrinkWrap: true,
|
|
|
|
shrinkWrap: true,
|
|
|
|
scrollDirection: Axis.vertical,
|
|
|
|
scrollDirection: Axis.vertical,
|
|
|
|
@ -56,23 +59,31 @@ class _DeliverdOrdersPageState extends State<DeliverdOrdersPage> {
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
children: <Widget>[
|
|
|
|
children: <Widget>[
|
|
|
|
Padding(
|
|
|
|
Padding(
|
|
|
|
padding:
|
|
|
|
padding: EdgeInsets.only(
|
|
|
|
EdgeInsets.only(left: 15.0, top: 14.0),
|
|
|
|
left: 15.0, top: 14.0),
|
|
|
|
child: Image.asset(
|
|
|
|
child: Image.asset(
|
|
|
|
'assets/images/location.png',
|
|
|
|
'assets/images/location.png',
|
|
|
|
height: MediaQuery.of(context)
|
|
|
|
height: MediaQuery.of(context)
|
|
|
|
.orientation ==
|
|
|
|
.orientation ==
|
|
|
|
Orientation.portrait
|
|
|
|
Orientation.portrait
|
|
|
|
? MediaQuery.of(context).size.height *
|
|
|
|
? MediaQuery.of(context)
|
|
|
|
|
|
|
|
.size
|
|
|
|
|
|
|
|
.height *
|
|
|
|
0.06
|
|
|
|
0.06
|
|
|
|
: MediaQuery.of(context).size.height *
|
|
|
|
: MediaQuery.of(context)
|
|
|
|
|
|
|
|
.size
|
|
|
|
|
|
|
|
.height *
|
|
|
|
0.11,
|
|
|
|
0.11,
|
|
|
|
width: MediaQuery.of(context)
|
|
|
|
width: MediaQuery.of(context)
|
|
|
|
.orientation ==
|
|
|
|
.orientation ==
|
|
|
|
Orientation.portrait
|
|
|
|
Orientation.portrait
|
|
|
|
? MediaQuery.of(context).size.width *
|
|
|
|
? MediaQuery.of(context)
|
|
|
|
|
|
|
|
.size
|
|
|
|
|
|
|
|
.width *
|
|
|
|
0.05
|
|
|
|
0.05
|
|
|
|
: MediaQuery.of(context).size.width *
|
|
|
|
: MediaQuery.of(context)
|
|
|
|
|
|
|
|
.size
|
|
|
|
|
|
|
|
.width *
|
|
|
|
0.09,
|
|
|
|
0.09,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
)
|
|
|
|
)
|
|
|
|
@ -83,12 +94,14 @@ class _DeliverdOrdersPageState extends State<DeliverdOrdersPage> {
|
|
|
|
Expanded(
|
|
|
|
Expanded(
|
|
|
|
flex: 5,
|
|
|
|
flex: 5,
|
|
|
|
child: Column(
|
|
|
|
child: Column(
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
crossAxisAlignment:
|
|
|
|
|
|
|
|
CrossAxisAlignment.start,
|
|
|
|
children: <Widget>[
|
|
|
|
children: <Widget>[
|
|
|
|
Padding(
|
|
|
|
Padding(
|
|
|
|
padding: EdgeInsets.only(top: 20.0),
|
|
|
|
padding: EdgeInsets.only(top: 20.0),
|
|
|
|
child: Text(
|
|
|
|
child: Text(
|
|
|
|
model.deliverdOrders[index].firstName +
|
|
|
|
model.deliverdOrders[index]
|
|
|
|
|
|
|
|
.firstName +
|
|
|
|
' ' +
|
|
|
|
' ' +
|
|
|
|
model.orders[index].lastName,
|
|
|
|
model.orders[index].lastName,
|
|
|
|
style: TextStyle(
|
|
|
|
style: TextStyle(
|
|
|
|
@ -98,7 +111,8 @@ class _DeliverdOrdersPageState extends State<DeliverdOrdersPage> {
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Text(
|
|
|
|
Text(
|
|
|
|
model.deliverdOrders[index].mobileNumber,
|
|
|
|
model
|
|
|
|
|
|
|
|
.deliverdOrders[index].mobileNumber,
|
|
|
|
style: TextStyle(
|
|
|
|
style: TextStyle(
|
|
|
|
color: Color(0xff30B7B9),
|
|
|
|
color: Color(0xff30B7B9),
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
@ -150,6 +164,7 @@ class _DeliverdOrdersPageState extends State<DeliverdOrdersPage> {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|