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

Merge branch 'setting_branch' of https://gitlab.com/Cloud_Solution/driver-app into merge_setting_br_into_dev

Browse Source 
 Conflicts:
	lib/pages/delivery/information_page.dart
	lib/pages/orders/pending_orders_page.dart
	lib/widgets/delivery/customer_brief_card.dart
updates_new
Elham Rababah 5 years ago
parent bdcec73c58 c62b551c2b
commit 007005a40d
9 changed files with 309 additions and 140 deletions
Show Stats Download Patch File Download Diff File

84
lib/app-icons/config.json
Unescape Escape View File

@ -62,20 +62,6 @@
"open_box"
]
},
{
"uid": "d755ac5bb912e95877e670a67bf4528d",
"css": "phone_call",
"code": 59398,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M907.5 618.9L829.1 540.7A45.6 45.6 0 0 0 764.4 540.7L764.4 540.7 719.7 585.5A9.9 9.9 0 0 1 707 586.6 517.6 517.6 0 0 1 586 467.8 9.9 9.9 0 0 1 586.9 455.1L633 409A45.7 45.7 0 0 0 633 344.4L554.6 265.9A46.7 46.7 0 0 0 489.9 265.9L465.1 290.8A139.5 139.5 0 0 0 430.3 433.2 417.6 417.6 0 0 0 481.3 536.8 544.9 544.9 0 0 0 638.1 690.9 400.4 400.4 0 0 0 754.2 742.5 134.2 134.2 0 0 0 786.7 746.4 141.4 141.4 0 0 0 886.1 704.6L907.4 683.2A45.6 45.6 0 0 0 907.5 618.9Z",
"width": 1344
},
"search": [
"phone_call"
]
},
{
"uid": "bf7916a50afc43e4ef26fe098b6c10f3",
"css": "qr",
@ -215,6 +201,76 @@
"search": [
"location"
]
},
{
"uid": "12c8b9f62dbd71097b9e0774d8ea3aa2",
"css": "logout_icon",
"code": 59394,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M497 848H183C164 848 148 832 148 813V185C148 166 164 150 183 150H497C516 150 532 134 532 115S517 80 497 80H183C125 80 78 127 78 185V813C78 871 125 918 183 918H497C516 918 532 902 532 883 532 864 517 848 497 848ZM909 474L696 265C682 251 660 252 647 265 633 279 634 301 647 314L799 464H393C374 464 358 480 358 499S374 534 393 534H799L647 684C633 698 633 720 647 733 654 740 663 743 672 743 681 743 690 740 697 733L909 524C916 517 919 508 919 499 919 490 915 481 909 474Z",
"width": 1000
},
"search": [
"logout_icon"
]
},
{
"uid": "4477449a41e25549927f47fa79837b37",
"css": "settings_icon",
"code": 59398,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M857 727H770C756 680 713 646 661 646S567 680 552 727H141C123 727 108 742 108 760S123 793 141 793H553C567 840 610 874 662 874 713 874 756 840 771 793H858C876 793 891 778 891 760S875 727 857 727ZM661 808C634 808 612 786 612 759S634 710 661 710 710 732 710 759 688 808 661 808ZM857 206H770C756 159 713 125 661 125S567 159 552 206H141C123 206 108 221 108 239S123 272 141 272H553C567 319 610 353 662 353S756 319 771 272H858C876 272 891 257 891 239S875 206 857 206ZM661 287C634 287 612 265 612 238S634 189 661 189 710 211 710 238 688 287 661 287ZM857 466H445C431 419 388 385 336 385S242 419 227 466H140C122 466 107 481 107 499 107 517 122 532 140 532H227C241 579 284 613 336 613S430 579 445 532H857C875 532 890 517 890 499 889 481 875 466 857 466ZM336 548C309 548 287 526 287 499 287 472 309 450 336 450 363 450 385 472 385 499 385 526 363 548 336 548Z",
"width": 1000
},
"search": [
"settings_icon"
]
},
{
"uid": "4290c78df9df640ac05e5e85479f198d",
"css": "bell_icon",
"code": 59409,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M824 676C791 676 765 650 765 617V410C765 339 737 272 687 222 656 191 619 169 578 156 585 144 588 130 588 115 588 66 548 26 499 26S410 66 410 115C410 130 414 144 420 156 312 190 233 293 233 413V617C233 650 207 676 174 676 158 676 144 689 144 706V824C144 840 157 854 174 854H397C396 859 396 864 396 869 396 926 442 972 499 972S602 926 602 869C602 864 602 859 601 854H824C840 854 854 841 854 824V706C853 689 840 676 824 676ZM499 85C515 85 529 98 529 115S516 145 499 145C483 145 469 132 469 115S483 85 499 85ZM543 868C543 892 523 912 499 912 475 912 455 892 455 868 455 863 456 858 458 853H542C542 858 543 863 543 868ZM794 794H558 440 204V731C255 718 293 672 293 617V413C293 298 385 204 499 204 499 204 499 204 500 204 555 204 607 225 646 264 685 303 707 355 707 410V617C707 672 745 718 796 731L794 794ZM381 440C365 440 351 427 351 410 351 329 417 262 499 262 515 262 529 275 529 292 529 308 516 322 499 322 450 322 410 362 410 411 410 427 397 440 381 440Z",
"width": 1000
},
"search": [
"bell_icon"
]
},
{
"uid": "28ba081187e1746ddc2a5eb098545058",
"css": "language_icon",
"code": 59400,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M864 413H584V294L675 229C682 224 686 216 686 207 686 198 682 190 675 185L583 119C576 71 534 33 484 33H133C78 33 33 78 33 133V484C33 539 78 584 133 584H413V703L322 768C315 773 311 781 311 790S315 807 322 812L414 878C421 926 463 964 513 964H864C919 964 964 919 964 864V514C965 458 920 413 864 413ZM133 530C108 530 87 509 87 484V133C87 108 108 87 133 87H484C509 87 530 108 530 133 530 142 534 150 541 155L612 206 541 257C534 263 530 271 530 280V414H513C458 414 413 459 413 514V530H133ZM910 864C910 890 890 910 864 910H513C488 910 467 889 467 864 467 855 463 847 456 842L385 791 456 740C463 735 467 727 467 718V514C467 489 488 468 513 468H557 557 557 864C889 468 910 489 910 514V864ZM275 312H225V345H281V370H193V233H278V258H224V286H274V312ZM302 370V233H338L366 283C374 297 382 315 388 330H389C387 312 386 293 386 273V233H414V370H381L352 317C344 302 335 285 328 269L327 269C328 287 328 306 328 329V370H302ZM775 678H686C651 678 634 693 634 722 634 748 654 764 686 764H746V801H689C636 801 598 769 598 721 598 679 623 649 661 642 653 627 649 613 649 600 649 558 679 529 718 529 743 529 762 541 773 565L745 578C739 566 730 560 717 560 696 560 683 576 683 600 683 618 694 637 706 641H774V678Z",
"width": 1000
},
"search": [
"language_icon"
]
},
{
"uid": "d755ac5bb912e95877e670a67bf4528d",
"css": "phone_call",
"code": 59398,
"src": "custom_icons",
"selected": false,
"svg": {
"path": "M907.5 618.9L829.1 540.7A45.6 45.6 0 0 0 764.4 540.7L764.4 540.7 719.7 585.5A9.9 9.9 0 0 1 707 586.6 517.6 517.6 0 0 1 586 467.8 9.9 9.9 0 0 1 586.9 455.1L633 409A45.7 45.7 0 0 0 633 344.4L554.6 265.9A46.7 46.7 0 0 0 489.9 265.9L465.1 290.8A139.5 139.5 0 0 0 430.3 433.2 417.6 417.6 0 0 0 481.3 536.8 544.9 544.9 0 0 0 638.1 690.9 400.4 400.4 0 0 0 754.2 742.5 134.2 134.2 0 0 0 786.7 746.4 141.4 141.4 0 0 0 886.1 704.6L907.4 683.2A45.6 45.6 0 0 0 907.5 618.9Z",
"width": 1344
},
"search": [
"phone_call"
]
}
]
}

5
lib/app-icons/driver_app_icons.dart
Unescape Escape View File

@ -23,11 +23,13 @@ class DriverApp {
static const IconData location_1 = IconData(0xe800, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData logo = IconData(0xe801, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData logout_icon = IconData(0xe802, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData closed_box = IconData(0xe803, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData location = IconData(0xe804, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData open_box = IconData(0xe805, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData phone_call = IconData(0xe806, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData settings_icon = IconData(0xe806, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData qr = IconData(0xe807, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData language_icon = IconData(0xe808, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData not_available = IconData(0xe80a, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData rejected_icon = IconData(0xe80b, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData not_reachable_icon = IconData(0xe80c, fontFamily: _kFontFam, fontPackage: _kFontPkg);
@ -35,5 +37,6 @@ class DriverApp {
static const IconData message = IconData(0xe80e, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData whatsapp = IconData(0xe80f, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData call = IconData(0xe810, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData bell_icon = IconData(0xe811, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData deliverd_icon = IconData(0xe812, fontFamily: _kFontFam, fontPackage: _kFontPkg);
}

BIN
lib/app-icons/fonts/DriverApp.ttf
View File

Binary file not shown.

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

@ -69,4 +69,6 @@ const Map<String, Map<String, String>> localizedValues = {
'youHaveSelected': {'en': 'You have selected:', 'ar': 'لقد قمت باختيار:'},
'confirm': {'en': 'Confirm', 'ar': 'تأكيد'},
'areYouSure': {'en': 'Are you sure?', 'ar': 'هل أنت واثق؟'},
'languageText':{'en':'Language','ar':'اللغة'},
'notification':{'en':'Notification','ar':'تنبيهات'},
};

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

@ -499,7 +499,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
context,
MaterialPageRoute(
builder: (context) => InformationPage(
model.orders[index])));
model.orders[index]),),);
}),
);
},

335
lib/pages/setting/setting_page.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:driverapp/app-icons/driver_app_icons.dart';
import 'package:driverapp/core/viewModels/authentication_view_model.dart';
import 'package:driverapp/uitl/translations_delegate_base.dart';
import 'package:driverapp/widgets/others/app_scaffold_widget.dart';
@ -19,155 +20,247 @@ class SettingPage extends StatelessWidget {
_authenticationViewModel = Provider.of(context);
return AppScaffold(
isShowAppBar: true,
appBarColor: Color(0xff30B7B9),
appBarColor: Color(0xFF1DA4AA),
arrowColor: Colors.white,
titleColor: Colors.white,
body: SingleChildScrollView(
child: Column(
children: <Widget>[
Container(
width: double.infinity,
child: Column(
children: <Widget>[
Container(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.width * 0.7,
child: CircleAvatar(
radius: 25.5,
backgroundColor: Theme.of(context).primaryColor,
child: Container(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment(0.0,0.0),
end: Alignment(-1.5, 0.0), // 10% of the width, so there are ten blinds.
colors: [const Color(0xFF1DA4AA), const Color(0xFF3EB4AD)],//[const Color(0xff30B7B9), const Color(0xff3AB2AD)], // whitish to gray
tileMode: TileMode.clamp, // repeats the gradient over the canvas
),
),
child: Column(
children: <Widget>[
Container(
width: double.infinity,
child: Column(
children: <Widget>[
Container(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.width * 0.7,
child: CircleAvatar(
radius: 25.5,
backgroundColor: Theme.of(context).primaryColor,
maxRadius: 200.0,
child: Image.asset(
'assets/images/driver.png',
height: MediaQuery.of(context).size.width * 1 ,
width: MediaQuery.of(context).size.width * 1,
fit: BoxFit.contain,
child: CircleAvatar(
backgroundColor: Theme.of(context).primaryColor,
maxRadius: 200.0,
child: Image.asset(
'assets/images/driver.png',
height: MediaQuery.of(context).size.width * 1 ,
width: MediaQuery.of(context).size.width * 1,
fit: BoxFit.contain,
),
),
),
),
),
SizedBox(height: MediaQuery.of(context).size.width *0.05,),
Container(
child: Text(
driverName,
style: TextStyle(
fontSize: 40,
fontWeight: FontWeight.w600,
color: Colors.white
SizedBox(height: MediaQuery.of(context).size.width *0.05,),
Container(
child: Text(
driverName,
style: TextStyle(
fontSize: 40,
fontWeight: FontWeight.w600,
color: Colors.white
),
),
),
),
SizedBox(height: MediaQuery.of(context).size.width *0.05,),
Container(
child: Text(
'ID: ${driverID.toString()}',
style: TextStyle(
fontSize: 20,
color: Colors.white
SizedBox(height: MediaQuery.of(context).size.width *0.05,),
Container(
child: Text(
'ID: ${driverID.toString()}',
style: TextStyle(
fontSize: 20,
color: Colors.white
),
),
),
),
],
],
),
),
),
SizedBox(height: MediaQuery.of(context).size.width *0.1,),
Container(
margin: EdgeInsets.only(left: 35),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
InkWell(
onTap: () async {
await _authenticationViewModel.logout();
Navigator.pushReplacement(
context,
MaterialPageRoute(builder: (context) => RootPage()),
);
},
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
margin: EdgeInsets.only(left: 15),
child: Row(
children: <Widget>[
Icon(
Icons.input,
size: 40,
SizedBox(height: MediaQuery.of(context).size.width *0.1,),
Container(
margin: EdgeInsets.only(left: 35),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
InkWell(
onTap: () async {
await _authenticationViewModel.logout();
Navigator.pushReplacement(
context,
MaterialPageRoute(builder: (context) => RootPage()),
);
},
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
margin: EdgeInsets.only(left: 15),
child: Row(
children: <Widget>[
Icon(
DriverApp.logout_icon,
size: 40,
color: Colors.white,
),
SizedBox(width: MediaQuery.of(context).size.width *0.05,),
Text(
TranslationBase.of(context).logout,
style: TextStyle(
fontWeight: FontWeight.w500,
color: Colors.white,
fontSize: 18
),
),
],
),
),
SizedBox(
height: MediaQuery.of(context).size.width *0.05,
child: Center(
child: Container(
margin: EdgeInsetsDirectional.only(start: 0, end: 30),
height: 1.0,
color: Colors.white,
),
SizedBox(width: MediaQuery.of(context).size.width *0.05,),
Text(
TranslationBase.of(context).logout,
style: TextStyle(
fontWeight: FontWeight.w500,
color: Colors.white,
fontSize: 18
),
),
],
),
),
SizedBox(height: MediaQuery.of(context).size.width*0.05,),
InkWell(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
margin: EdgeInsets.only(left: 15),
child: Row(
children: <Widget>[
Icon(
DriverApp.language_icon,
size: 40,
color: Colors.white,
),
),
],
SizedBox(
width: MediaQuery.of(context).size.width * 0.05,
),
Text(
TranslationBase.of(context).languageText,
style: TextStyle(
fontWeight: FontWeight.w500,
color: Colors.white,
fontSize: 18
),
),
],
),
),
),
SizedBox(
height: MediaQuery.of(context).size.width *0.05,
child: Center(
child: Container(
margin: EdgeInsetsDirectional.only(start: 0, end: 30),
height: 1.0,
color: Colors.white,
SizedBox(
height: 10.0,
child: Center(
child: Container(
margin: EdgeInsetsDirectional.only(start: 0, end: 30),
height: 1.0,
color: Colors.white,
),
),
),
),
],
SizedBox(height: MediaQuery.of(context).size.width*0.05,),
],
),
),
),
SizedBox(height: MediaQuery.of(context).size.width*0.05,),
InkWell(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
margin: EdgeInsets.only(left: 15),
child: Row(
children: <Widget>[
Icon(
Icons.settings,
size: 40,
InkWell(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
margin: EdgeInsets.only(left: 15),
child: Row(
children: <Widget>[
Icon(
DriverApp.settings_icon,
size: 40,
color: Colors.white,
),
SizedBox(
width: MediaQuery.of(context).size.width * 0.05,
),
Text(
TranslationBase.of(context).settings,
style: TextStyle(
fontWeight: FontWeight.w500,
color: Colors.white,
fontSize: 18
),
),
],
),
),
SizedBox(
height: 10.0,
child: Center(
child: Container(
margin: EdgeInsetsDirectional.only(start: 0, end: 30),
height: 1.0,
color: Colors.white,
),
SizedBox(
width: MediaQuery.of(context).size.width * 0.05,
),
Text(
TranslationBase.of(context).settings,
style: TextStyle(
fontWeight: FontWeight.w500,
color: Colors.white,
fontSize: 18
),
),
SizedBox(height: MediaQuery.of(context).size.width*0.05,),
],
),
),
InkWell(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
margin: EdgeInsets.only(left: 15),
child: Row(
children: <Widget>[
Icon(
DriverApp.bell_icon,
size: 40,
color: Colors.white,
),
),
],
SizedBox(
width: MediaQuery.of(context).size.width * 0.05,
),
Text(
TranslationBase.of(context).notification,
style: TextStyle(
fontWeight: FontWeight.w500,
color: Colors.white,
fontSize: 18
),
),
],
),
),
),
SizedBox(
height: 10.0,
child: Center(
child: Container(
margin: EdgeInsetsDirectional.only(start: 0, end: 30),
height: 1.0,
color: Colors.white,
SizedBox(
height: 10.0,
child: Center(
child: Container(
margin: EdgeInsetsDirectional.only(start: 0, end: 30),
height: 1.0,
color: Colors.white,
),
),
),
),
SizedBox(height: MediaQuery.of(context).size.width*0.05,),
],
SizedBox(height: MediaQuery.of(context).size.width*0.05,),
],
),
),
),
],
],
),
),
),
],
],
),
),
),
);

12
lib/pages/splash_screen_page.dart
Unescape Escape View File

@ -14,7 +14,7 @@ class SplashScreenPage extends StatefulWidget {
class _SplashScreenPageState extends State<SplashScreenPage> {
startTime() async {
var _duration = new Duration(seconds: 1);
var _duration = new Duration(seconds: 5);
return new Timer(_duration, navigationPage);
}
@ -31,7 +31,15 @@ class _SplashScreenPageState extends State<SplashScreenPage> {
return AppScaffold(
isShowAppBar: false,
appBarColor: Color(0xff30B7B9),
body: SingleChildScrollView(
body: Container(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment(1.0,0.0),
end: Alignment(-0.0, 0.0), // 10% of the width, so there are ten blinds.
colors: [const Color(0xFF1BB0B8), const Color(0xFF44BFBB)],//[const Color(0xff30B7B9), const Color(0xff3AB2AD)], // whitish to gray
tileMode: TileMode.clamp, // repeats the gradient over the canvas
),
),
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,

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

@ -127,6 +127,11 @@ class TranslationBase {
String get confirm => localizedValues['confirm'][locale.languageCode];
String get areYouSure => localizedValues['areYouSure'][locale.languageCode];
String get languageText =>
localizedValues['languageText'][locale.languageCode];
String get notification =>
localizedValues['notification'][locale.languageCode];
}
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

4
lib/widgets/delivery/customer_brief_card.dart
Unescape Escape View File

@ -19,6 +19,7 @@ class CustomerBriefCard extends StatelessWidget {
final double longitude;
final double latitude;
final bool showDistance;
final dynamic distanceInKilometers;
CustomerBriefCard({
this.itemId,
@ -32,6 +33,7 @@ class CustomerBriefCard extends StatelessWidget {
this.longitude,
this.latitude,
this.showDistance = true,
this.distanceInKilometers,
});
@override
@ -81,7 +83,7 @@ class CustomerBriefCard extends StatelessWidget {
child: Padding(
padding: EdgeInsets.all(8.0),
child: DistanceInKilometers(
distanceInKilometers: 0.0,
distanceInKilometers: distanceInKilometers,
),
),
),

Write Preview
Loading…
Cancel
Save