add route from dashboard and delivery info with item data step 2

logut
enadhilal 6 years ago
parent 5b35d5d09a
commit fac6230205

@ -1,11 +1,12 @@
import 'package:driverapp/config/size_config.dart'; import 'package:driverapp/config/size_config.dart';
import 'package:driverapp/core/viewModels/pending_orders_view_model.dart'; import 'package:driverapp/core/viewModels/pending_orders_view_model.dart';
import 'package:driverapp/pages/delivery/information_page.dart';
import 'package:driverapp/pages/orders/pending_orders_page.dart';
import 'package:driverapp/widgets/others/rounded_container.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../base/base_view.dart'; import '../base/base_view.dart';
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';
class DashboardScreen extends StatefulWidget { class DashboardScreen extends StatefulWidget {
@override @override
@ -315,7 +316,13 @@ class _DashboardScreenState extends State<DashboardScreen> {
itemCount: //model.orders == null ? 0 : model.orders.length, itemCount: //model.orders == null ? 0 : model.orders.length,
2, 2,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return Padding( return GestureDetector(
onTap: () {
Navigator.push(
context, MaterialPageRoute(builder: (context) =>
InformationPage(model.orders[index])));
},
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 12.0), padding: EdgeInsets.symmetric(horizontal: 12.0),
child: RoundedContainer( child: RoundedContainer(
height: SizeConfig.heightMultiplier * 10.5, height: SizeConfig.heightMultiplier * 10.5,
@ -334,7 +341,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
), ),
if (model.orders.length != 0) if (model.orders.length != 0)
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment
.start,
children: <Widget>[ children: <Widget>[
Text( Text(
model.orders[index].firstName + model.orders[index].firstName +
@ -383,6 +391,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
], ],
), ),
), ),
),
); );
}) })
], ],

@ -1,13 +1,15 @@
import 'package:driverapp/widgets/data_display/text.dart';
import 'package:driverapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:driverapp/pages/delivery/delivery_confirmed_page.dart'; import 'package:driverapp/pages/delivery/delivery_confirmed_page.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';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
class InformationPage extends StatelessWidget { class InformationPage extends StatelessWidget {
final dynamic item;
InformationPage(this.item);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// return AppScaffold( // return AppScaffold(
@ -16,7 +18,8 @@ class InformationPage extends StatelessWidget {
// child: Texts('Replay Page')), // child: Texts('Replay Page')),
// ), // ),
// ); // );
return Container( return Scaffold(
body: Container(
color: Color(0xff41bdbb), color: Color(0xff41bdbb),
child: ListView( child: ListView(
children: <Widget>[ children: <Widget>[
@ -31,7 +34,9 @@ class InformationPage extends StatelessWidget {
color: Colors.white, color: Colors.white,
iconSize: 50, iconSize: 50,
icon: Icon(Icons.arrow_back), icon: Icon(Icons.arrow_back),
onPressed: () {}, onPressed: () {
Navigator.pop(context);
},
), ),
), ),
Container( Container(
@ -123,7 +128,8 @@ class InformationPage extends StatelessWidget {
Text( Text(
'Package Content', 'Package Content',
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontSize: 20), fontWeight: FontWeight.bold,
fontSize: 20),
), ),
SizedBox( SizedBox(
height: 20, height: 20,
@ -186,19 +192,27 @@ class InformationPage extends StatelessWidget {
), ),
onPressed: () { onPressed: () {
Navigator.push( Navigator.push(
context, MaterialPageRoute(builder: (context) => DeliveryConfirmedPage())); context, MaterialPageRoute(
builder: (context) =>
DeliveryConfirmedPage()));
}, },
), ),
], ],
), ),
), ),
CustomerBrief(), CustomerBrief(
itemId: item.driverID,
customerFirstName: item.firstName,
customerLastName: item.lastName,
mobileNo: item.mobileNumber
),
], ],
), ),
], ],
), ),
], ],
), ),
),
); );
} }
} }

@ -1,11 +1,10 @@
import 'package:driverapp/pages/landing/replay_page.dart'; import 'package:driverapp/pages/delivery/delivery_confirmed_page.dart';
import 'package:driverapp/pages/delivery/information_page.dart';
import 'package:driverapp/uitl/translations_delegate_base.dart'; import 'package:driverapp/uitl/translations_delegate_base.dart';
import 'package:driverapp/widgets/bottom_navigation/bottom_nav_bar.dart'; import 'package:driverapp/widgets/bottom_navigation/bottom_nav_bar.dart';
import 'package:driverapp/widgets/drawer/app_drawer_widget.dart'; import 'package:driverapp/widgets/drawer/app_drawer_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:driverapp/pages/delivery/information_page.dart';
import 'package:driverapp/pages/delivery/delivery_confirmed_page.dart';
import 'home_page.dart'; import 'home_page.dart';
@ -57,7 +56,12 @@ class _LandingPageState extends State<LandingPage> {
body: PageView( body: PageView(
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
controller: pageController, controller: pageController,
children: [HomePage(), InformationPage(), DeliveryConfirmedPage(), Container()], children: [
HomePage(),
InformationPage(null),
DeliveryConfirmedPage(),
Container()
],
), ),
bottomNavigationBar: BottomNavBar(changeIndex: _changeCurrentTab), bottomNavigationBar: BottomNavBar(changeIndex: _changeCurrentTab),
); );

@ -1,9 +1,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class CustomerBrief extends StatelessWidget { class CustomerBrief extends StatelessWidget {
final String itemId; final int itemId;
final String time; final String time;
final String customerName; final String customerFirstName;
final String customerLastName;
final String mobileNo; final String mobileNo;
final String direction; final String direction;
final String totalPayment; final String totalPayment;
@ -12,7 +13,8 @@ class CustomerBrief extends StatelessWidget {
CustomerBrief( CustomerBrief(
{this.itemId, {this.itemId,
this.time, this.time,
this.customerName, this.customerFirstName,
this.customerLastName,
this.mobileNo, this.mobileNo,
this.direction, this.direction,
this.totalPayment, this.totalPayment,
@ -48,7 +50,7 @@ class CustomerBrief extends StatelessWidget {
Row( Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: Text('ID: 123456789'), child: Text('ID: ${itemId}'),
), ),
Expanded( Expanded(
child: Container( child: Container(
@ -79,11 +81,11 @@ class CustomerBrief extends StatelessWidget {
], ],
), ),
Text( Text(
'Abdullah Olyan', '${customerFirstName} ${customerLastName}',
style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold), style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
), ),
Text( Text(
'05XXXXXXXX', mobileNo,
style: TextStyle(color: Colors.lightBlue), style: TextStyle(color: Colors.lightBlue),
), ),
SizedBox( SizedBox(

Loading…
Cancel
Save