|
|
|
@ -6,6 +6,7 @@ import 'package:flutter/cupertino.dart';
|
|
|
|
|
import 'package:driverapp/app-icons/driver_app_icons.dart';
|
|
|
|
|
import 'package:driverapp/widgets/others/rounded_container.dart';
|
|
|
|
|
import 'package:driverapp/pages/orders/pending_orders_page.dart';
|
|
|
|
|
import 'package:driverapp/widgets/others/app_scaffold_widget.dart';
|
|
|
|
|
|
|
|
|
|
class DashboardScreen extends StatefulWidget {
|
|
|
|
|
@override
|
|
|
|
@ -15,12 +16,12 @@ class DashboardScreen extends StatefulWidget {
|
|
|
|
|
class _DashboardScreenState extends State<DashboardScreen> {
|
|
|
|
|
@override
|
|
|
|
|
Widget build(BuildContext context) {
|
|
|
|
|
int orderId;
|
|
|
|
|
return BaseView<PendingOrdersViewModel>(
|
|
|
|
|
onModelReady: (model) => model.getPendingOrders(),
|
|
|
|
|
builder:
|
|
|
|
|
(BuildContext context, PendingOrdersViewModel model, Widget child) =>
|
|
|
|
|
Scaffold(
|
|
|
|
|
backgroundColor: Color(0xffF4F9FA),
|
|
|
|
|
AppScaffold(
|
|
|
|
|
body: Column(
|
|
|
|
|
// mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.center,
|
|
|
|
@ -210,7 +211,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
|
|
|
|
|
0.10,
|
|
|
|
|
width: MediaQuery.of(context).size.width *
|
|
|
|
|
0.20,
|
|
|
|
|
scale: 0.9,
|
|
|
|
|
fit: BoxFit.cover,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
@ -328,98 +328,113 @@ class _DashboardScreenState extends State<DashboardScreen> {
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
Column(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
ListView.builder(
|
|
|
|
|
shrinkWrap: true,
|
|
|
|
|
scrollDirection: Axis.vertical,
|
|
|
|
|
itemCount: //model.orders == null ? 0 : model.orders.length,
|
|
|
|
|
3,
|
|
|
|
|
itemBuilder: (BuildContext context, int index) {
|
|
|
|
|
return Padding(
|
|
|
|
|
padding: EdgeInsets.symmetric(horizontal: 12.2),
|
|
|
|
|
child: RoundedContainer(
|
|
|
|
|
height: MediaQuery.of(context).size.height * 0.108,
|
|
|
|
|
child: Row(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Expanded(
|
|
|
|
|
flex: 1,
|
|
|
|
|
child: Column(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Padding(
|
|
|
|
|
padding: EdgeInsets.only(left: 22.0),
|
|
|
|
|
child: Image.asset(
|
|
|
|
|
'assets/images/location.png'),
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
if (model.orders.length != 0)
|
|
|
|
|
Expanded(
|
|
|
|
|
child: ListView.builder(
|
|
|
|
|
shrinkWrap: true,
|
|
|
|
|
scrollDirection: Axis.vertical,
|
|
|
|
|
itemCount: //model.orders == null ? 0 : model.orders.length,
|
|
|
|
|
3,
|
|
|
|
|
itemBuilder: (BuildContext context, int index) {
|
|
|
|
|
return Padding(
|
|
|
|
|
padding: EdgeInsets.symmetric(horizontal: 12.2),
|
|
|
|
|
child: InkWell(
|
|
|
|
|
child: RoundedContainer(
|
|
|
|
|
height: MediaQuery.of(context).size.height * 0.108,
|
|
|
|
|
child: Row(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Expanded(
|
|
|
|
|
flex: 3,
|
|
|
|
|
flex: 1,
|
|
|
|
|
child: Column(
|
|
|
|
|
crossAxisAlignment:
|
|
|
|
|
CrossAxisAlignment.start,
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Text(
|
|
|
|
|
model.orders[index].firstName +
|
|
|
|
|
' ' +
|
|
|
|
|
model.orders[index].lastName,
|
|
|
|
|
style: TextStyle(fontSize: 18.0),
|
|
|
|
|
),
|
|
|
|
|
Text(
|
|
|
|
|
model.orders[index].mobileNumber,
|
|
|
|
|
style: TextStyle(
|
|
|
|
|
color: Color(0xff30B7B9),
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
fontSize: 15.0),
|
|
|
|
|
),
|
|
|
|
|
Expanded(
|
|
|
|
|
child: Text(
|
|
|
|
|
'Olaya ST, Behind kfc next to king ',
|
|
|
|
|
style:
|
|
|
|
|
TextStyle(color: Colors.black45),
|
|
|
|
|
Padding(
|
|
|
|
|
padding: EdgeInsets.only(left: 22.0),
|
|
|
|
|
child: Image.asset(
|
|
|
|
|
'assets/images/location.png',
|
|
|
|
|
height: MediaQuery.of(context)
|
|
|
|
|
.size
|
|
|
|
|
.height *
|
|
|
|
|
0.10,
|
|
|
|
|
width: MediaQuery.of(context)
|
|
|
|
|
.size
|
|
|
|
|
.width *
|
|
|
|
|
0.09,
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
Padding(
|
|
|
|
|
padding: EdgeInsets.all(10.0),
|
|
|
|
|
child: Column(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Expanded(
|
|
|
|
|
child: CircleAvatar(
|
|
|
|
|
backgroundColor: Colors.black45,
|
|
|
|
|
radius: 28.0,
|
|
|
|
|
if (model.orders.length != 0)
|
|
|
|
|
Expanded(
|
|
|
|
|
flex: 3,
|
|
|
|
|
child: Column(
|
|
|
|
|
crossAxisAlignment:
|
|
|
|
|
CrossAxisAlignment.start,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Text(
|
|
|
|
|
model.orders[index].firstName +
|
|
|
|
|
' ' +
|
|
|
|
|
model.orders[index].lastName,
|
|
|
|
|
style: TextStyle(fontSize: 18.0),
|
|
|
|
|
),
|
|
|
|
|
Text(
|
|
|
|
|
model.orders[index].mobileNumber,
|
|
|
|
|
style: TextStyle(
|
|
|
|
|
color: Color(0xff30B7B9),
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
fontSize: 15.0),
|
|
|
|
|
),
|
|
|
|
|
Expanded(
|
|
|
|
|
child: Text(
|
|
|
|
|
'Olaya ST, Behind kfc next to king ,Olaya ST ',
|
|
|
|
|
style: TextStyle(
|
|
|
|
|
color: Colors.black45),
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
Padding(
|
|
|
|
|
padding: EdgeInsets.all(10.0),
|
|
|
|
|
child: Column(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Expanded(
|
|
|
|
|
child: CircleAvatar(
|
|
|
|
|
backgroundColor: Colors.white,
|
|
|
|
|
maxRadius: 25.1,
|
|
|
|
|
child: Padding(
|
|
|
|
|
padding: const EdgeInsets.all(8.0),
|
|
|
|
|
child: Text(
|
|
|
|
|
'3 K.m \n away',
|
|
|
|
|
style: TextStyle(
|
|
|
|
|
color: Color(0xff30B7B9),
|
|
|
|
|
fontSize: 12.5,
|
|
|
|
|
fontWeight: FontWeight.w600),
|
|
|
|
|
backgroundColor: Colors.black45,
|
|
|
|
|
radius: 28.0,
|
|
|
|
|
child: CircleAvatar(
|
|
|
|
|
backgroundColor: Colors.white,
|
|
|
|
|
maxRadius: 25.1,
|
|
|
|
|
child: Padding(
|
|
|
|
|
padding:
|
|
|
|
|
const EdgeInsets.all(8.0),
|
|
|
|
|
child: Text(
|
|
|
|
|
'3 K.m \n away',
|
|
|
|
|
style: TextStyle(
|
|
|
|
|
color: Color(0xff30B7B9),
|
|
|
|
|
fontSize: 12.5,
|
|
|
|
|
fontWeight:
|
|
|
|
|
FontWeight.w600),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
);
|
|
|
|
|
})
|
|
|
|
|
],
|
|
|
|
|
onTap: () => Navigator.push(
|
|
|
|
|
context,
|
|
|
|
|
MaterialPageRoute(
|
|
|
|
|
builder: (context) => OrdersListScreen()),
|
|
|
|
|
)),
|
|
|
|
|
);
|
|
|
|
|
}),
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|