Merge branch 'updates_new' into 'development'

Updates new

See merge request Cloud_Solution/driver-app!111
barcode_scanner
Elham 5 years ago
commit 8d9449a239

@ -55,9 +55,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
onModelReady: (model) => model.getPendingOrders(),
builder: (BuildContext context, OrdersViewModel model, Widget child) =>
AppScaffold(
body: Container(
body: SingleChildScrollView(
child: Container(
height: MediaQuery.of(context).size.height * 1.6,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -147,7 +148,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
gradient: LINEAR_GRADIENT,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: <Widget>[
Expanded(
child: Padding(
@ -271,15 +273,18 @@ class _DashboardScreenState extends State<DashboardScreen> {
MainAxisAlignment.spaceEvenly,
children: <Widget>[
Text(
TranslationBase.of(context).youHave,
TranslationBase.of(context)
.youHave,
style: TextStyle(
color: Colors.white,
fontSize: MediaQuery.of(context)
.orientation ==
Orientation.landscape
? SizeConfig.textMultiplier *
? SizeConfig
.textMultiplier *
2.2
: SizeConfig.textMultiplier *
: SizeConfig
.textMultiplier *
1.3,
),
),
@ -287,8 +292,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
'3',
style: TextStyle(
color: Colors.white,
fontSize:
SizeConfig.textMultiplier *
fontSize: SizeConfig
.textMultiplier *
3.0),
),
Text(
@ -299,9 +304,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
fontSize: MediaQuery.of(context)
.orientation ==
Orientation.landscape
? SizeConfig.textMultiplier *
? SizeConfig
.textMultiplier *
2.2
: SizeConfig.textMultiplier *
: SizeConfig
.textMultiplier *
1.3,
),
)
@ -357,7 +364,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
],
),
Padding(
padding: EdgeInsets.symmetric(vertical: 16.0, horizontal: 15.0),
padding:
EdgeInsets.symmetric(vertical: 16.0, horizontal: 15.0),
child: Row(
children: <Widget>[
Expanded(
@ -444,7 +452,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 20.0, vertical: 1.0),
padding:
EdgeInsets.symmetric(horizontal: 20.0, vertical: 1.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
@ -467,7 +476,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
Text(
TranslationBase.of(context).seeAll,
style: TextStyle(
fontSize: 14.5, color: Color(0xff42B6AD)),
fontSize: 14.5,
color: Color(0xff42B6AD)),
),
Icon(
Icons.arrow_forward_ios,
@ -487,15 +497,21 @@ class _DashboardScreenState extends State<DashboardScreen> {
],
),
),
if (model.state == ViewState.Idle)
model.orders.length == 0
? Text("There's No Orders To deliver")
: Text(""),
NetworkBaseView(
baseViewModel: model,
child: Column(
children: <Widget>[
...List.generate(
model.orders == null
child: Expanded(
child: ListView.builder(
shrinkWrap: true,
scrollDirection: Axis.vertical,
itemCount: model.orders == null
? 0
: model.orders.length < 3 ? model.orders.length : 3,
(index) => Padding(
itemBuilder: (BuildContext context, int index) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 0.2),
child: OrderInfoCard(
order: model.orders[index],
@ -503,19 +519,21 @@ class _DashboardScreenState extends State<DashboardScreen> {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
InformationPage(
builder: (context) => InformationPage(
item: model.orders[index],
)));
}),
))
],
},
),
);
},
),
),
),
],
),
),
),
),
);
}
@ -537,5 +555,3 @@ class _DashboardScreenState extends State<DashboardScreen> {
}
}
}

@ -1,3 +1,4 @@
import 'package:driverapp/core/enum/viewstate.dart';
import 'package:driverapp/core/viewModels/orders_view_model.dart';
import 'package:driverapp/widgets/order/order_info_card.dart';
import 'package:driverapp/widgets/others/app_scaffold_widget.dart';
@ -27,6 +28,10 @@ class _DeliverdOrdersPageState extends State<DeliverdOrdersPage> {
SizedBox(
height: 20,
),
if (model.state == ViewState.Idle)
model.deliverdOrders.length == 0
? Text("There's No Orders To deliver")
: Text(''),
NetworkBaseView(
baseViewModel: model,
child: Expanded(

@ -1,3 +1,4 @@
import 'package:driverapp/core/enum/viewstate.dart';
import 'package:driverapp/core/viewModels/orders_view_model.dart';
import 'package:driverapp/pages/delivery/information_page.dart';
import 'package:driverapp/uitl/translations_delegate_base.dart';
@ -28,6 +29,10 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
SizedBox(
height: 20,
),
if (model.state == ViewState.Idle)
model.orders.length == 0
? Text("There's No Orders To deliver")
: Text(""),
Expanded(
child: ListView.builder(
shrinkWrap: true,

Loading…
Cancel
Save