Fix error happen in information_page

location
Elham Rababah 6 years ago
parent fcfb19963c
commit 02f96e3891

@ -55,8 +55,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
builder: (BuildContext context, OrdersViewModel model, Widget child) => builder: (BuildContext context, OrdersViewModel model, Widget child) =>
AppScaffold( AppScaffold(
body: Container( body: Container(
height: MediaQuery.of(context).size.height * .95, child: Column(
child: ListView( mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -488,15 +488,13 @@ class _DashboardScreenState extends State<DashboardScreen> {
), ),
NetworkBaseView( NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: Expanded( child: Column(
child: ListView.builder( children: <Widget>[
shrinkWrap: true, ...List.generate(
scrollDirection: Axis.vertical, model.orders == null
itemCount: model.orders == null
? 0 ? 0
: model.orders.length < 3 ? model.orders.length : 3, : model.orders.length < 3 ? model.orders.length : 3,
itemBuilder: (BuildContext context, int index) { (index) => Padding(
return Padding(
padding: EdgeInsets.symmetric(horizontal: 0.2), padding: EdgeInsets.symmetric(horizontal: 0.2),
child: OrderInfoCard( child: OrderInfoCard(
order: model.orders[index], order: model.orders[index],
@ -504,12 +502,13 @@ class _DashboardScreenState extends State<DashboardScreen> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => InformationPage( builder: (context) =>
model.orders[index]))); InformationPage(
item: model.orders[index],
)));
}), }),
); ))
}, ],
),
), ),
), ),
], ],

@ -3,7 +3,6 @@ import 'package:driverapp/core/model/orders/next_order_request_model.dart';
import 'package:driverapp/core/model/orders/pending_orders_res_model.dart'; import 'package:driverapp/core/model/orders/pending_orders_res_model.dart';
import 'package:driverapp/core/viewModels/orders_view_model.dart'; import 'package:driverapp/core/viewModels/orders_view_model.dart';
import 'package:driverapp/pages/base/base_view.dart'; import 'package:driverapp/pages/base/base_view.dart';
import 'package:driverapp/pages/delivery/information_page.dart';
import 'package:driverapp/uitl/utils.dart'; import 'package:driverapp/uitl/utils.dart';
import 'package:driverapp/widgets/buttons/secondary_button.dart'; import 'package:driverapp/widgets/buttons/secondary_button.dart';
import 'package:driverapp/widgets/delivery/customer_brief_card.dart'; import 'package:driverapp/widgets/delivery/customer_brief_card.dart';
@ -13,6 +12,7 @@ import 'package:location/location.dart';
import '../../uitl/translations_delegate_base.dart'; import '../../uitl/translations_delegate_base.dart';
import '../../widgets/others/app_scaffold_widget.dart'; import '../../widgets/others/app_scaffold_widget.dart';
import 'information_page.dart';
class DeliveryConfirmedPage extends StatelessWidget { class DeliveryConfirmedPage extends StatelessWidget {
final PendingOrdersRes item; final PendingOrdersRes item;
@ -199,7 +199,8 @@ class DeliveryConfirmedPage extends StatelessWidget {
Navigator.pushReplacement( Navigator.pushReplacement(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => InformationPage(model.nextOrdersList[0]), builder: (context) =>
InformationPage(item: model.nextOrdersList[0]),
), ),
); );
} }

File diff suppressed because one or more lines are too long

@ -1,84 +0,0 @@
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/widgets/bottom_navigation/bottom_nav_bar.dart';
import 'package:driverapp/widgets/drawer/app_drawer_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'home_page.dart';
class LandingPage extends StatefulWidget {
@override
_LandingPageState createState() => _LandingPageState();
}
class _LandingPageState extends State<LandingPage> {
int currentTab = 0;
PageController pageController;
_changeCurrentTab(int tab) {
setState(() {
currentTab = tab;
pageController.jumpToPage(tab);
});
}
@override
void initState() {
super.initState();
pageController = PageController(keepPage: true);
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
elevation: 0,
textTheme: TextTheme(
headline6:
TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
),
title: Text(getText(currentTab).toUpperCase()),
leading: Builder(
builder: (BuildContext context) {
return IconButton(
icon: Icon(Icons.menu),
color: Colors.white,
onPressed: () => Scaffold.of(context).openDrawer(),
);
},
),
centerTitle: true,
),
drawer: SafeArea(child: AppDrawer()),
extendBody: true,
body: PageView(
physics: NeverScrollableScrollPhysics(),
controller: pageController,
children: [
HomePage(),
InformationPage(null),
DeliveryConfirmedPage(null),
Container()
],
),
bottomNavigationBar: BottomNavBar(changeIndex: _changeCurrentTab),
);
}
getText(currentTab) {
switch (currentTab) {
case 0:
return TranslationBase.of(context).home;
case 1:
return 'new One';
case 2:
return TranslationBase.of(context).booking;
case 3:
return TranslationBase.of(context).mySchedule;
case 4:
return TranslationBase.of(context).services;
}
}
}

@ -17,7 +17,7 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<OrdersViewModel>( return BaseView<OrdersViewModel>(
onModelReady: (model) => model.getPendingOrders(), // onModelReady: (model) => model.getPendingOrders(),
builder: (BuildContext context, OrdersViewModel model, Widget child) => builder: (BuildContext context, OrdersViewModel model, Widget child) =>
AppScaffold( AppScaffold(
isShowAppBar: true, isShowAppBar: true,
@ -42,8 +42,9 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => builder: (context) => InformationPage(
InformationPage(model.orders[index]))); item: model.orders[index],
)));
}, },
), ),
); );

@ -102,7 +102,7 @@ class Utils {
try { try {
currentLocation = await location.getLocation(); currentLocation = await location.getLocation();
} catch (e) { } catch (e) {
await getLocationPermission(); // await getLocationPermission();
print(e); print(e);
} }
return currentLocation; return currentLocation;

Loading…
Cancel
Save