Merge branch 'delivery_confirmed' of https://gitlab.com/Cloud_Solution/driver-app into merge_delivery_into_dev

 Conflicts:
	lib/pages/delivery/information_page.dart
logut
Elham Rababah 5 years ago
commit ec5af29492

@ -1,3 +1,4 @@
import 'package:driverapp/widgets/buttons/secondary_button.dart';
import 'package:driverapp/widgets/delivery/customer_brief_card.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -15,7 +16,7 @@ class DeliveryConfirmedPage extends StatelessWidget {
return AppScaffold(
body: SafeArea(
child: Container(
color: Color(0xff41bdbb),
color: Theme.of(context).primaryColor,
child: ListView(
children: <Widget>[
Column(
@ -39,21 +40,11 @@ class DeliveryConfirmedPage extends StatelessWidget {
child: Column(
children: <Widget>[
Container(
width: MediaQuery
.of(context)
.size
.width,
//300,
height: MediaQuery
.of(context)
.size
.width * 0.7,
//300,
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.width * 0.7,
padding: EdgeInsets.only(
top: MediaQuery
.of(context)
.size
.width * 0.2, //60,
top: MediaQuery.of(context).size.width *
0.2,
),
decoration: BoxDecoration(
color: Colors.white10,
@ -66,17 +57,14 @@ class DeliveryConfirmedPage extends StatelessWidget {
size: 60,
),
Text(
TranslationBase
.of(context)
.deliveryInfo,
TranslationBase.of(context).deliveryInfo,
style: TextStyle(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.bold),
),
Text(
TranslationBase
.of(context)
TranslationBase.of(context)
.confirmationSent,
style: TextStyle(
color: Colors.white,
@ -94,25 +82,13 @@ class DeliveryConfirmedPage extends StatelessWidget {
Stack(
children: <Widget>[
Container(
width: MediaQuery
.of(context)
.size
.width, //400,
height: MediaQuery
.of(context)
.size
.width, //500,
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.width,
),
Container(
width: MediaQuery
.of(context)
.size
.width,
width: MediaQuery.of(context).size.width,
//800,
height: MediaQuery
.of(context)
.size
.width * 1.2,
height: MediaQuery.of(context).size.width * 1.2,
//440,
margin: EdgeInsets.only(top: 60),
decoration: BoxDecoration(
@ -127,10 +103,8 @@ class DeliveryConfirmedPage extends StatelessWidget {
children: <Widget>[
Container(
margin: EdgeInsets.only(
bottom: MediaQuery
.of(context)
.size
.width * 0.15, //50
bottom: MediaQuery.of(context).size.width *
0.15, //50
),
child: Column(
children: <Widget>[
@ -139,52 +113,29 @@ class DeliveryConfirmedPage extends StatelessWidget {
color: Colors.orangeAccent,
shape: RoundedRectangleBorder(
borderRadius:
new BorderRadius.circular(10.0),
new BorderRadius.circular(10.0),
),
label: Text(
TranslationBase.of(context).addNoteBtn,
style: TextStyle(color: Colors.white),
),
icon: Icon(
Icons.mode_edit,
color: Colors.white,
),
label: Text(
TranslationBase
.of(context)
.addNoteBtn,
style: TextStyle(color: Colors.white),
),
onPressed: () {},
),
SizedBox(
height: MediaQuery
.of(context)
.size
.width * 0.1, //20,
height: MediaQuery.of(context).size.width *
0.1, //20,
),
FlatButton(
color: Color(0xff41bdbb),
padding:
EdgeInsets.only(
right: MediaQuery
.of(context)
.size
.width * 0.25, //100,
left: MediaQuery
.of(context)
.size
.width * 0.25, //100
),
shape: RoundedRectangleBorder(
borderRadius:
new BorderRadius.circular(18.0),
side:
BorderSide(color: Color(0xff41bdbb)),
),
child: Text(
TranslationBase
.of(context)
Container(
margin: EdgeInsets.all(10),
child: SecondaryButton(
label: TranslationBase.of(context)
.nextDelivery,
style: TextStyle(color: Colors.white),
onTap: () {},
),
onPressed: () {},
),
],
),
@ -192,14 +143,13 @@ class DeliveryConfirmedPage extends StatelessWidget {
],
),
),
CustomerBrief(
CustomerBriefCard(
itemId: item.patientID,
customerFirstName: item.firstName,
customerLastName: item.lastName,
mobileNo: item.mobileNumber,
totalPayment: item.amount,
deliveryTime: item.orderCreatedOn
),
deliveryTime: item.orderCreatedOn),
],
),
],

File diff suppressed because one or more lines are too long

@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
import '../../uitl/date_uitl.dart';
import '../../uitl/translations_delegate_base.dart';
class CustomerBrief extends StatelessWidget {
class CustomerBriefCard extends StatelessWidget {
final String itemId;
final String time;
final String customerFirstName;
@ -15,7 +15,7 @@ class CustomerBrief extends StatelessWidget {
final double longitude;
final double latitude;
CustomerBrief(
CustomerBriefCard(
{this.itemId,
this.time,
this.customerFirstName,
@ -32,14 +32,14 @@ class CustomerBrief extends StatelessWidget {
return Center(
child: Container(
width: 350,
height: 300,
height: 270,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(45),
topRight: Radius.circular(45),
bottomRight: Radius.circular(45),
bottomLeft: Radius.circular(45)),
topLeft: Radius.circular(30),
topRight: Radius.circular(30),
bottomRight: Radius.circular(30),
bottomLeft: Radius.circular(30)),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.3),
@ -50,37 +50,35 @@ class CustomerBrief extends StatelessWidget {
],
),
child: Container(
padding: EdgeInsets.only(left: 30, top: 10, right: 30),
padding: EdgeInsets.only(left: 30, top: 20, right: 30),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: <Widget>[
Expanded(
child: Text('ID: ${itemId}'),
flex: 3,
child: Text(
'ID: ${itemId}',
style: TextStyle(color: Color(0xFFADACAD)),
),
),
Expanded(
child: Container(
margin: EdgeInsets.only(left: 83),
width: 10,
height: 60,
decoration: BoxDecoration(
border: Border.all(
width: 2.0,
color: Color(0xff41bdbb),
),
borderRadius: BorderRadius.only(
topLeft: Radius.circular(45),
topRight: Radius.circular(45),
bottomRight: Radius.circular(45),
bottomLeft: Radius.circular(45),
),
),
child: Container(
margin: EdgeInsets.only(left: 12, top: 10),
child: Text(
'3 min away',
style: TextStyle(color: Color(0xff41bdbb)),
child: CircleAvatar(
backgroundColor: Colors.black45,
radius: 28.0,
child: CircleAvatar(
backgroundColor: Colors.white,
maxRadius: 25.1,
child: Padding(
padding: const EdgeInsets.only(left: 3),
child: Text(
'3 K.m \n away',
style: TextStyle(
color: Color(0xff30B7B9),
fontSize: 12.5,
fontWeight: FontWeight.w600),
),
),
),
),
@ -89,24 +87,32 @@ class CustomerBrief extends StatelessWidget {
),
Text(
'${customerFirstName} ${customerLastName}',
style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
style: TextStyle(fontSize: 20, fontWeight: FontWeight.w900),
),
Text(
mobileNo,
style: TextStyle(color: Colors.lightBlue),
style: TextStyle(color: Color(0xFF50BDC5)),
),
SizedBox(
height: 10,
),
Text(
'Olaya street, behind KFC resturant, next to kingdom towers 2ND floor ofice 277',
style: TextStyle(fontWeight: FontWeight.w600),
'Olaya street, behind KFC resturant, next to kingdom towers 2nd floor ofice 277',
style: TextStyle(
color: Color(0xFF464748), fontWeight: FontWeight.w600),
),
SizedBox(
height: 10,
),
Divider(
color: Colors.grey,
SizedBox(
height: 10.0,
child: Center(
child: Container(
margin: EdgeInsetsDirectional.only(start: 1.0, end: 1.0),
height: 1.0,
color: Colors.grey,
),
),
),
SizedBox(
height: 20,
@ -115,15 +121,22 @@ class CustomerBrief extends StatelessWidget {
children: <Widget>[
Row(
children: <Widget>[
Text(
TranslationBase.of(context).payment,
Expanded(
flex: 2,
child: Text(
TranslationBase.of(context).payment,
textAlign: TextAlign.start,
),
),
SizedBox(
width: 170,
),
Text(
totalPayment.toString(), //'SAR 70',
style: TextStyle(fontWeight: FontWeight.bold),
Expanded(
child: Text(
totalPayment.toString(),
textAlign: TextAlign.end,
style: TextStyle(fontWeight: FontWeight.w600),
),
),
],
),
@ -132,19 +145,19 @@ class CustomerBrief extends StatelessWidget {
),
Row(
children: <Widget>[
Text(
TranslationBase.of(context).delivryTime,
Expanded(
flex: 1,
child: Text(
TranslationBase.of(context).delivryTime,
textAlign: TextAlign.start,
),
),
SizedBox(
width: 50,
Expanded(
child: Text(
'${DateUtil.getMonthDayYearDateFormatted(DateUtil.convertStringToDate(deliveryTime))} ${(DateUtil.convertStringToHours(deliveryTime))}',
textAlign: TextAlign.end,
style: TextStyle(fontWeight: FontWeight.w600)),
),
Text(
'${DateUtil.getMonthDayYearDateFormatted(
DateUtil.convertStringToDate(
deliveryTime))} ${(DateUtil
.convertStringToHours(deliveryTime))}',
//'05 Aug 20 - 10:00 AM',
style: TextStyle(fontWeight: FontWeight.bold)),
],
)
],

@ -1,12 +1,12 @@
import 'package:flutter/material.dart';
class delivery_info_button extends StatelessWidget {
class DeliveryInfoButton extends StatelessWidget {
final Color btnColor;
final Icon btnIcon;
final Function btnFunction;
final String btnName;
delivery_info_button(
DeliveryInfoButton(
{this.btnColor, this.btnIcon, this.btnFunction, this.btnName});
@override
Widget build(BuildContext context) {
@ -16,8 +16,14 @@ class delivery_info_button extends StatelessWidget {
child: Column(
children: <Widget>[
SizedBox(
height: 50,
width: 60, // specific value
height: MediaQuery
.of(context)
.size
.width * 0.14,
width: MediaQuery
.of(context)
.size
.width * 0.165, // specific value
child: RaisedButton(
padding: EdgeInsets.only(left: 2),
color: btnColor,
@ -29,7 +35,10 @@ class delivery_info_button extends StatelessWidget {
),
),
SizedBox(
height: 10,
height: MediaQuery
.of(context)
.size
.width * 0.05,
),
Text(
btnName,

@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
class package_content extends StatelessWidget {
class packageContent extends StatelessWidget {
final String packageName;
final String packageCount;
package_content({this.packageName, this.packageCount});
packageContent({this.packageName, this.packageCount});
@override
Widget build(BuildContext context) {

@ -15,6 +15,7 @@ class AppScaffold extends StatelessWidget {
final Widget bottomSheet;
final Color titleColor;
final Color arrowColor;
final Color appBarColor;
AppScaffold(
{@required this.body,
@ -24,14 +25,16 @@ class AppScaffold extends StatelessWidget {
this.baseViewModel,
this.bottomSheet,
this.titleColor,
this.arrowColor});
this.arrowColor,
this.appBarColor,
});
@override
Widget build(BuildContext context) {
AppGlobal.context = context;
return SafeArea(
child: Scaffold(
backgroundColor: Theme.of(context).scaffoldBackgroundColor,
backgroundColor: appBarColor ?? Theme.of(context).scaffoldBackgroundColor,
appBar: isShowAppBar
? AppBar(
elevation: 0,

Loading…
Cancel
Save