Haroon6138
/
driver-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dashboard_landscape' of https://gitlab.com/Cloud_Solution/driver-app into merge_dashboard_into_dev

Browse Source 
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/dashboard/dashboard_screen.dart
	lib/pages/delivery/information_page.dart
	lib/uitl/translations_delegate_base.dart
logut
Elham Rababah 5 years ago
parent ec4651c612 27a070f778
commit e27093311f
6 changed files with 165 additions and 123 deletions
Show Stats Download Patch File Download Diff File

34
lib/config/localized_values.dart
Unescape Escape View File

@ -28,23 +28,39 @@ const Map<String, Map<String, String>> localizedValues = {
},
'forgotPassword': {'en': 'Forgot Password?', 'ar': 'هل نسيت كلمة المرور ؟'},
'login': {'en': 'Login', 'ar': 'تسجيل الدخول'},
'haveGreatDay': {'en': 'have a great day ,', 'ar': 'أتمنى لك يوما جميلا '},
'haveGreatDay': {'en': 'have a great day,', 'ar': 'أتمنى لك يوما جميلا '},
'youHave': {'en': 'You Have', 'ar': 'يوجد لديك'},
'deliveredPackages': {'en': 'Delivered Packages', 'ar': 'الطرود المسلمة'},
'deliveredPackages': {'en': 'Delivered \nPackages', 'ar': 'الطرود\n المسلمة'},
'seeAll': {'en': 'See All', 'ar': 'اظهار الكل'},
'nearestDropOffs': {'en': 'nearest drop-offs', 'ar': 'أقرب نقطة إنزال'},
'nearestDropOffs': {'en': 'Nearest Drop-Offs', 'ar': 'أقرب نقطة إنزال'},
'undeliveredPackages': {
'en': 'Undelivered Packages',
'ar': 'الطرود التي لم يتم تسليمها'
},
'deliveryInfo': {
'en': 'Delivery information',
'ar': 'معلومات الشحنة'
'en': 'Undelivered\nPackages',
'ar': 'الطرود التي\n لم يتم تسليمها'
},
'deliveryInfo': {'en': 'Delivery information', 'ar': 'معلومات الشحنة'},
'confirmationSent': {
'en': 'Confirmation email and SMS has been sent',
'ar': 'تم إرسال التأكيد للبرييد الإلكتروني والرسائل النصية القصيرة'
},
'location': {'en': 'Location', 'ar': 'الموقع'},
'call': {'en': 'Call', 'ar': 'اتصال'},
'sms': {'en': 'SMS', 'ar': 'رسالة نصية'},
'packageContent': {'en': 'Package Content', 'ar': 'محتوى الحزمة'},
'payment': {'en': 'Payment', 'ar': 'دفع'},
'delivryTime': {'en': 'Delivery Time', 'ar': 'وقت التوصيل'},
'clientReached': {'en': 'Client Reached', 'ar': 'الوصول الى العميل'},
'addNoteBtn': {'en': 'Add Note', 'ar': 'اضافة ملاحظة'},
'nextDelivery': {'en': 'Next Delivery', 'ar': 'الشحنة التالية'},
'scan': {'en': 'SCAN', 'ar': 'مسح'},
'away': {'en': 'away', 'ar': 'مسح'},
'yourDeliveryQue': {
'en': 'Your Delivery Que',
'ar': 'قائمة التسليم الخاصة بك'
},
'toAddPackageToQue': {
'en': 'To add package to que',
'ar': 'لإضافة حزمة إلى قائمة الانتظار'
},
'location': {
'en': 'Location',
'ar': 'الموقع'

2
lib/core/viewModels/base_view_model.dart
Unescape Escape View File

@ -13,7 +13,7 @@ class BaseViewModel extends ChangeNotifier {
String error = "";
AppSharedPreferences sharedPref = AppSharedPreferences();
BaseViewModel(){
BaseViewModel() {
getUser();
}

170
lib/pages/dashboard/dashboard_screen.dart
Unescape Escape View File

@ -13,7 +13,11 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:driverapp/widgets/data_display/circle-container.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import '../base/base_view.dart';
import 'package:driverapp/config/shared_pref_kay.dart';
import 'package:driverapp/uitl/translations_delegate_base.dart';
class DashboardScreen extends StatefulWidget {
@override
@ -45,7 +49,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'Have a great day,',
TranslationBase.of(context).haveGreatDay,
style: TextStyle(
fontSize: 14.5,
color: Color(0xff636363),
@ -54,7 +58,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
Padding(
padding: EdgeInsets.only(top: 4.5),
child: Text(
'Driver Name',
'Drive Name',
//model.user.userName,
style: TextStyle(
fontWeight: FontWeight.w400,
fontSize: 25.0),
@ -115,7 +120,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
MainAxisAlignment.spaceEvenly,
children: <Widget>[
Text(
'You Have',
TranslationBase.of(context).youHave,
style: TextStyle(
color: Colors.white,
fontSize: 10.0),
@ -127,7 +132,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
fontSize: 25.0),
),
Text(
'Undeliverd\nPackages',
TranslationBase.of(context)
.undeliveredPackages,
style: TextStyle(
color: Colors.white, fontSize: 9.5),
)
@ -192,7 +198,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
MainAxisAlignment.spaceEvenly,
children: <Widget>[
Text(
'You Have',
TranslationBase.of(context).youHave,
style: TextStyle(
color: Colors.white,
fontSize: 10.0),
@ -204,7 +210,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
fontSize: 25.0),
),
Text(
'Succesful\nDeliveries',
TranslationBase.of(context)
.deliveredPackages,
style: TextStyle(
color: Colors.white,
fontSize: 10.0),
@ -255,7 +262,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
Expanded(
child: InkWell(
child: Container(
height: MediaQuery.of(context).size.height * 0.18,
height: MediaQuery.of(context).orientation ==
Orientation.portrait
? MediaQuery.of(context).size.height * 0.18
: MediaQuery.of(context).size.height * 0.28,
width: MediaQuery.of(context).size.width * 0.50,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15.0),
@ -290,18 +300,20 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: Padding(
padding: EdgeInsets.only(top: 8.0),
child: Text(
'SCAN',
TranslationBase.of(context).scan,
style: TextStyle(
fontSize: 35.0,
color: Colors.white,
fontWeight: FontWeight.w400),
fontSize: 35.0,
color: Colors.white,
fontWeight: FontWeight.w400,
),
),
),
),
Padding(
padding: EdgeInsets.only(top: 0.0),
child: Text(
'To add package to que ',
TranslationBase.of(context)
.toAddPackageToQue,
style: TextStyle(
fontSize: 15.0,
color: Colors.white,
@ -320,30 +332,32 @@ class _DashboardScreenState extends State<DashboardScreen> {
],
),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 20.0, vertical: 1.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Column(
children: <Widget>[
Text(
'Nearest Drop-Offs',
style: TextStyle(
fontSize: 21.0,
fontWeight: FontWeight.w400,
NetworkBaseView(
baseViewModel: model,
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 20.0, vertical: 1.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Column(
children: <Widget>[
Text(
TranslationBase.of(context).nearestDropOffs,
style: TextStyle(
fontSize: 21.0,
fontWeight: FontWeight.w400,
),
),
),
],
),
Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
InkWell(
],
),
Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
InkWell(
child: Row(
children: <Widget>[
Text(
'See All',
TranslationBase.of(context).seeAll,
style: TextStyle(
fontSize: 14.5, color: Color(0xff42B6AD)),
),
@ -355,13 +369,15 @@ class _DashboardScreenState extends State<DashboardScreen> {
],
),
onTap: () => Navigator.push(
context,
MaterialPageRoute(
builder: (context) => OrdersListScreen()),
)),
],
),
],
context,
MaterialPageRoute(
builder: (context) => OrdersListScreen()),
),
),
],
),
],
),
),
),
NetworkBaseView(
@ -378,7 +394,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: InkWell(
child: RoundedContainer(
raduis: 25.0,
height: MediaQuery.of(context).size.height * 0.109,
height: MediaQuery.of(context).orientation ==
Orientation.portrait
? MediaQuery.of(context).size.height * 0.109
: MediaQuery.of(context).size.height * 0.209,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
@ -386,18 +405,35 @@ class _DashboardScreenState extends State<DashboardScreen> {
flex: 1,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Padding(
padding: EdgeInsets.only(
left: 10.0, bottom: 5.0, top: 10.0),
left: 15.0, top: 14.0),
child: Image.asset(
'assets/images/location.png',
height:
MediaQuery.of(context).size.height *
0.06,
width:
MediaQuery.of(context).size.width *
0.05,
height: MediaQuery.of(context)
.orientation ==
Orientation.portrait
? MediaQuery.of(context)
.size
.height *
0.06
: MediaQuery.of(context)
.size
.height *
0.11,
width: MediaQuery.of(context)
.orientation ==
Orientation.portrait
? MediaQuery.of(context)
.size
.width *
0.05
: MediaQuery.of(context)
.size
.width *
0.09,
),
)
],
@ -405,13 +441,13 @@ class _DashboardScreenState extends State<DashboardScreen> {
),
if (model.orders.length != 0)
Expanded(
flex: 3,
flex: 5,
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
Padding(
padding: EdgeInsets.only(top: 10.0),
padding: EdgeInsets.only(top: 20.0),
child: Text(
model.orders[index].firstName +
' ' +
@ -438,31 +474,17 @@ class _DashboardScreenState extends State<DashboardScreen> {
),
),
Padding(
padding: EdgeInsets.all(10.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Expanded(
child: CircleAvatar(
backgroundColor: Color(0xff707070),
radius: 28.0,
child: CircleAvatar(
backgroundColor: Colors.white,
maxRadius: 25.0,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
'3 K.m \n away',
style: TextStyle(
color: Color(0xff30B7B9),
fontSize: 10.5,
fontWeight: FontWeight.w400),
),
),
),
),
)
],
padding: EdgeInsets.all(8.0),
child: CircleContainer(
child: Text(
model.orders[index].distanceInKilometers
.toString() +
' K.m\naway',
style: TextStyle(
color: Color(0xff42B6AD),
fontWeight: FontWeight.w800,
fontStyle: FontStyle.normal),
),
),
),
],

2
lib/pages/delivery/information_page.dart
View File

File diff suppressed because one or more lines are too long

76
lib/pages/orders/pending_orders_page.dart
Unescape Escape View File

@ -1,10 +1,11 @@
import 'package:driverapp/core/viewModels/orders_view_model.dart';
import 'package:driverapp/pages/delivery/information_page.dart';
import 'package:driverapp/widgets/data_display/circle-container.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 'package:driverapp/uitl/translations_delegate_base.dart';
import '../base/base_view.dart';
class OrdersListScreen extends StatefulWidget {
@ -20,7 +21,7 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
builder: (BuildContext context, OrdersViewModel model, Widget child) =>
AppScaffold(
isShowAppBar: true,
appBarTitle: 'Your Delivery Que',
appBarTitle: TranslationBase.of(context).yourDeliveryQue,
titleColor: Colors.black,
body: Column(
children: <Widget>[
@ -35,7 +36,10 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
child: InkWell(
child: RoundedContainer(
raduis: 25.0,
height: MediaQuery.of(context).size.height * 0.109,
height: MediaQuery.of(context).orientation ==
Orientation.portrait
? MediaQuery.of(context).size.height * 0.109
: MediaQuery.of(context).size.height * 0.209,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
@ -43,17 +47,27 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
flex: 1,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Padding(
padding: EdgeInsets.only(
left: 10.0, bottom: 5.0, top: 10.0),
padding:
EdgeInsets.only(left: 15.0, top: 14.0),
child: Image.asset(
'assets/images/location.png',
height:
MediaQuery.of(context).size.height *
0.06,
width: MediaQuery.of(context).size.width *
0.05,
height: MediaQuery.of(context)
.orientation ==
Orientation.portrait
? MediaQuery.of(context).size.height *
0.06
: MediaQuery.of(context).size.height *
0.11,
width: MediaQuery.of(context)
.orientation ==
Orientation.portrait
? MediaQuery.of(context).size.width *
0.05
: MediaQuery.of(context).size.width *
0.09,
),
)
],
@ -61,12 +75,12 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
),
if (model.orders.length != 0)
Expanded(
flex: 3,
flex: 5,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Padding(
padding: EdgeInsets.only(top: 10.0),
padding: EdgeInsets.only(top: 20.0),
child: Text(
model.orders[index].firstName +
' ' +
@ -84,7 +98,7 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
),
Expanded(
child: Text(
'Olaya ST, Behind kfc next to king , ',
'Olaya ST, Behind kfc next to king',
style:
TextStyle(color: Color(0xff636363)),
),
@ -93,31 +107,17 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
),
),
Padding(
padding: EdgeInsets.all(10.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Expanded(
child: CircleAvatar(
backgroundColor: Colors.black45,
radius: 28.0,
child: CircleAvatar(
backgroundColor: Colors.white,
maxRadius: 25.0,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
'3 K.m \n away',
style: TextStyle(
color: Color(0xff30B7B9),
fontSize: 10.5,
fontWeight: FontWeight.w400),
),
),
),
),
)
],
padding: EdgeInsets.all(8.0),
child: CircleContainer(
child: Text(
model.orders[index].distanceInKilometers
.toString() +
' K.m\naway',
style: TextStyle(
color: Color(0xff42B6AD),
fontWeight: FontWeight.w800,
fontStyle: FontStyle.normal),
),
),
),
],

4
lib/uitl/translations_delegate_base.dart
Unescape Escape View File

@ -103,6 +103,10 @@ class TranslationBase {
String get confirmationSent =>
localizedValues['confirmationSent'][locale.languageCode];
String get yourDeliveryQue =>
localizedValues['yourDeliveryQue'][locale.languageCode];
String get toAddPackageToQue =>
localizedValues['toAddPackageToQue'][locale.languageCode];
String get delivered => localizedValues['delivered'][locale.languageCode];

Write Preview
Loading…
Cancel
Save