Merge branch 'merge_trans_dash_into_dev' into 'development'

Merge trans dash into dev

See merge request Cloud_Solution/driver-app!16
logut
Elham 6 years ago
commit ecd8c0f2fe

@ -11,7 +11,7 @@ const Map<String, Map<String, String>> localizedValues = {
'services': {'en': 'SERVICES', 'ar': 'الخدمات'},
'mySchedule': {'en': 'My Schedule', 'ar': 'جدولي'},
'logout': {'en': 'Logout', 'ar': 'تسجيل خروج'},
'booking':{'en': 'Booking','ar':'حجز'},
'booking': {'en': 'Booking', 'ar': 'حجز'},
'enterId': {'en': 'User Name', 'ar': 'اسم المستخدم'},
'pleaseEnterYourID': {
'en': 'Please enter your ',
@ -26,13 +26,19 @@ const Map<String, Map<String, String>> localizedValues = {
'en': 'Please insert username and password to login',
'ar': 'الرجاء إدخال اسم المستخدم وكلمة المرور لتسجيل الدخول'
},
'forgotPassword': {
'en': 'Forgot Password?',
'ar': 'هل نسيت كلمة المرور ؟'
'forgotPassword': {'en': 'Forgot Password?', 'ar': 'هل نسيت كلمة المرور ؟'},
'login': {'en': 'Login', 'ar': 'تسجيل الدخول'},
'haveGreatDay': {'en': 'have a great day ,', 'ar': 'أتمنى لك يوما جميلا '},
'youHave': {'en': 'You Have', 'ar': 'يوجد لديك'},
'deliveredPackages': {'en': 'Delivered Packages', 'ar': 'الطرود المسلمة'},
'seeAll': {'en': 'See All', 'ar': 'اظهار الكل'},
'nearestDropOffs': {'en': 'nearest drop-offs', 'ar': 'أقرب نقطة إنزال'},
'undeliveredPackages': {
'en': 'Undelivered Packages',
'ar': 'الطرود التي لم يتم تسليمها'
},
'login': {
'en': 'Login',
'ar': 'تسجيل الدخول'
}
'away': {'en': 'away', 'ar': 'بعيدا'},
'scan': {'en': 'Scan', 'ar': 'مسح'},
'scan2': {'en': 'away', 'ar': 'بعيدا'},
'scanDb': {'en': 'away', 'ar': 'بعيدا'},
};

@ -9,9 +9,10 @@ class PendingOrders {
String firstName;
String lastName;
String mobileNumber;
int distanceInKilometers;
PendingOrders(
{this.driverID,
PendingOrders({
this.driverID,
this.searchKey,
this.pageSize,
this.pageIndex,
@ -20,7 +21,9 @@ class PendingOrders {
this.mobileNo,
this.firstName,
this.lastName,
this.mobileNumber});
this.mobileNumber,
this.distanceInKilometers,
});
PendingOrders.fromJson(Map<String, dynamic> json) {
driverID = json['DriverID'];
@ -33,6 +36,7 @@ class PendingOrders {
firstName = json['FirstName'];
lastName = json['LastName'];
mobileNumber = json['MobileNumber'];
distanceInKilometers = json['DistanceInKilometers'];
}
Map<String, dynamic> toJson() {

@ -1,14 +1,15 @@
import 'package:barcode_scan/platform_wrapper.dart';
import 'package:driverapp/config/size_config.dart';
import 'package:driverapp/core/enum/viewstate.dart';
import 'package:driverapp/core/viewModels/orders_view_model.dart';
import 'package:driverapp/uitl/app_toast.dart';
import 'package:driverapp/uitl/utils.dart';
import 'package:driverapp/pages/delivery/information_page.dart';
import 'package:driverapp/pages/orders/pending_orders_page.dart';
import 'package:driverapp/uitl/app_toast.dart';
import 'package:driverapp/uitl/utils.dart';
import 'package:driverapp/widgets/others/app_scaffold_widget.dart';
import 'package:driverapp/widgets/others/rounded_container.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../base/base_view.dart';
class DashboardScreen extends StatefulWidget {
@ -19,12 +20,12 @@ class DashboardScreen extends StatefulWidget {
class _DashboardScreenState extends State<DashboardScreen> {
@override
Widget build(BuildContext context) {
int orderId;
return BaseView<OrdersViewModel>(
onModelReady: (model) => model.getPendingOrders(),
builder:
(BuildContext context, OrdersViewModel model, Widget child) =>
Scaffold(
backgroundColor: Color(0xffF4F9FA),
AppScaffold(
body: Column(
// mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
@ -337,22 +338,16 @@ class _DashboardScreenState extends State<DashboardScreen> {
],
),
),
Column(
children: <Widget>[
ListView.builder(
Expanded(
child: ListView.builder(
shrinkWrap: true,
scrollDirection: Axis.vertical,
itemCount: //model.orders == null ? 0 : model.orders.length,
3,
itemBuilder: (BuildContext context, int index) {
return InkWell(
onTap: () {
Navigator.push(
context, MaterialPageRoute(builder: (context) =>
InformationPage(model.orders[index])));
},
child: Padding(
return Padding(
padding: EdgeInsets.symmetric(horizontal: 12.2),
child: InkWell(
child: RoundedContainer(
height: MediaQuery.of(context).size.height * 0.108,
child: Row(
@ -366,7 +361,16 @@ class _DashboardScreenState extends State<DashboardScreen> {
Padding(
padding: EdgeInsets.only(left: 22.0),
child: Image.asset(
'assets/images/location.png'),
'assets/images/location.png',
height: MediaQuery.of(context)
.size
.height *
0.10,
width: MediaQuery.of(context)
.size
.width *
0.09,
),
)
],
),
@ -393,11 +397,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
),
Expanded(
child: Text(
'Olaya ST, Behind kfc next to king ',
style:
TextStyle(color: Colors.black45),
'Olaya ST, Behind kfc next to king ,Olaya ST ',
style: TextStyle(color: Colors.black45),
),
),
)
],
),
),
@ -432,10 +435,17 @@ class _DashboardScreenState extends State<DashboardScreen> {
],
),
),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
InformationPage(model.orders[index])));
},
),
);
})
],
},
),
)
],
),

@ -27,11 +27,17 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
),
body: Column(
children: <Widget>[
Text(
Center(
child: Text(
'Nearest',
style: TextStyle(color: Color(0xff30B7B9), fontSize: 18.0),
style: TextStyle(
color: Color(0xff30B7B9),
fontSize: 18.0,
fontWeight: FontWeight.w400),
),
ListView.builder(
),
Expanded(
child: ListView.builder(
itemCount: model.orders == null ? 0 : model.orders.length,
scrollDirection: Axis.vertical,
shrinkWrap: true,
@ -39,7 +45,10 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 12.2),
child: RoundedContainer(
height: MediaQuery.of(context).size.height * 0.11,
height: MediaQuery.of(context).orientation ==
Orientation.portrait
? MediaQuery.of(context).size.height * 0.107
: MediaQuery.of(context).size.height * 0.18,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
@ -50,9 +59,13 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
children: <Widget>[
Padding(
padding: EdgeInsets.only(left: 22.0),
child:
Image.asset('assets/images/location.png'),
)
child: Image.asset(
'assets/images/location.png',
height:
MediaQuery.of(context).size.height *
0.101,
),
),
],
),
),
@ -62,12 +75,14 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
Expanded(
child: Text(
model.orders[index].firstName +
' ' +
model.orders[index].lastName,
style: TextStyle(fontSize: 18.0),
),
),
Text(
model.orders[index].mobileNumber,
style: TextStyle(
@ -117,6 +132,7 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
),
);
}),
),
],
),
),

@ -49,9 +49,23 @@ class TranslationBase {
String get english => localizedValues['english'][locale.languageCode];
String get arabic => localizedValues['arabic'][locale.languageCode];
String get enterCredentialsMsg => localizedValues['enterCredentialsMsg'][locale.languageCode];
String get forgotPassword => localizedValues['forgotPassword'][locale.languageCode];
String get enterCredentialsMsg =>
localizedValues['enterCredentialsMsg'][locale.languageCode];
String get forgotPassword =>
localizedValues['forgotPassword'][locale.languageCode];
String get login => localizedValues['login'][locale.languageCode];
String get haveGreatDay =>
localizedValues['haveGreatDay'][locale.languageCode];
String get youHave => localizedValues['youHave'][locale.languageCode];
String get deliveredPackages =>
localizedValues['deliveredPackages'][locale.languageCode];
String get seeAll => localizedValues['seeAll'][locale.languageCode];
String get nearestDropOffs =>
localizedValues['nearestDropOffs'][locale.languageCode];
String get undeliveredPackages =>
localizedValues['undeliveredPackages'][locale.languageCode];
String get away => localizedValues['away'][locale.languageCode];
String get scan => localizedValues['scan'][locale.languageCode];
}
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

Loading…
Cancel
Save