diff --git a/lib/core/model/pending_orders/pending_orders_model.dart b/lib/core/model/pending_orders/pending_orders_model.dart index 0243dc8..875636b 100644 --- a/lib/core/model/pending_orders/pending_orders_model.dart +++ b/lib/core/model/pending_orders/pending_orders_model.dart @@ -1,5 +1,3 @@ - - class PendingOrders { int driverID; String searchKey; diff --git a/lib/pages/dashboard/dashboard_screen.dart b/lib/pages/dashboard/dashboard_screen.dart index 7d9eb6e..a0e56ed 100644 --- a/lib/pages/dashboard/dashboard_screen.dart +++ b/lib/pages/dashboard/dashboard_screen.dart @@ -316,7 +316,7 @@ class _DashboardScreenState extends State { itemCount: //model.orders == null ? 0 : model.orders.length, 2, itemBuilder: (BuildContext context, int index) { - return GestureDetector( + return InkWell( onTap: () { Navigator.push( context, MaterialPageRoute(builder: (context) => diff --git a/lib/pages/delivery/delivery_confirmed_page.dart b/lib/pages/delivery/delivery_confirmed_page.dart index 2c8ca26..e7af05a 100644 --- a/lib/pages/delivery/delivery_confirmed_page.dart +++ b/lib/pages/delivery/delivery_confirmed_page.dart @@ -1,12 +1,17 @@ +import 'package:driverapp/widgets/delivery/customer_brief_card.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:driverapp/widgets/delivery/customer_brief_card.dart'; + +import '../../widgets/others/app_scaffold_widget.dart'; class DeliveryConfirmedPage extends StatelessWidget { + final dynamic item; + + DeliveryConfirmedPage(this.item); @override Widget build(BuildContext context) { - return Scaffold( + return AppScaffold( body: SafeArea( child: Container( color: Color(0xff41bdbb), @@ -18,7 +23,7 @@ class DeliveryConfirmedPage extends StatelessWidget { children: [ Container( child: Container( - alignment: Alignment.topLeft, + alignment: Alignment.topLeft, child: IconButton( color: Colors.white, iconSize: 40, @@ -130,7 +135,12 @@ class DeliveryConfirmedPage extends StatelessWidget { ], ), ), - CustomerBrief(), + CustomerBrief( + itemId: item.driverID, + customerFirstName: item.firstName, + customerLastName: item.lastName, + mobileNo: item.mobileNumber + ), ], ), ], diff --git a/lib/pages/delivery/information_page.dart b/lib/pages/delivery/information_page.dart index 38e1844..16e4852 100644 --- a/lib/pages/delivery/information_page.dart +++ b/lib/pages/delivery/information_page.dart @@ -5,6 +5,8 @@ import 'package:driverapp/widgets/delivery/package_content.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import '../../widgets/others/app_scaffold_widget.dart'; + class InformationPage extends StatelessWidget { final dynamic item; @@ -18,7 +20,7 @@ class InformationPage extends StatelessWidget { // child: Texts('Replay Page')), // ), // ); - return Scaffold( + return AppScaffold( body: Container( color: Color(0xff41bdbb), child: ListView( @@ -194,7 +196,7 @@ class InformationPage extends StatelessWidget { Navigator.push( context, MaterialPageRoute( builder: (context) => - DeliveryConfirmedPage())); + DeliveryConfirmedPage(item))); }, ), ], diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index be3803e..7d42558 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -59,7 +59,7 @@ class _LandingPageState extends State { children: [ HomePage(), InformationPage(null), - DeliveryConfirmedPage(), + DeliveryConfirmedPage(null), Container() ], ),