change base on comment in gitlab

setting_branch
enadhilal 6 years ago
parent 46abb059b6
commit ed27e27244

@ -1,7 +1,7 @@
import 'package:barcode_scan/platform_wrapper.dart'; import 'package:barcode_scan/platform_wrapper.dart';
import 'package:driverapp/core/enum/viewstate.dart'; import 'package:driverapp/core/enum/viewstate.dart';
import 'package:driverapp/core/viewModels/orders_view_model.dart'; import 'package:driverapp/core/viewModels/orders_view_model.dart';
import 'package:driverapp/pages/delivery/information_page.dart'; import 'package:driverapp/pages/delivery/InformationPage.dart';
import 'package:driverapp/pages/orders/pending_orders_page.dart'; import 'package:driverapp/pages/orders/pending_orders_page.dart';
import 'package:driverapp/uitl/app_toast.dart'; import 'package:driverapp/uitl/app_toast.dart';
import 'package:driverapp/uitl/utils.dart'; import 'package:driverapp/uitl/utils.dart';

@ -1,5 +1,5 @@
import 'package:driverapp/widgets/buttons/secondary_button.dart'; import 'package:driverapp/widgets/buttons/secondary_button.dart';
import 'package:driverapp/widgets/delivery/customer_brief_card.dart'; import 'package:driverapp/widgets/delivery/CustomerBriefCard.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -16,7 +16,7 @@ class DeliveryConfirmedPage extends StatelessWidget {
return AppScaffold( return AppScaffold(
body: SafeArea( body: SafeArea(
child: Container( child: Container(
color: Color(0xff41bdbb), color: Theme.of(context).disabledColor,
child: ListView( child: ListView(
children: <Widget>[ children: <Widget>[
Column( Column(
@ -41,12 +41,10 @@ class DeliveryConfirmedPage extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Container( Container(
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
//300,
height: MediaQuery.of(context).size.width * 0.7, height: MediaQuery.of(context).size.width * 0.7,
//300,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: MediaQuery.of(context).size.width * top: MediaQuery.of(context).size.width *
0.2, //60, 0.2,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white10, color: Colors.white10,
@ -84,8 +82,8 @@ class DeliveryConfirmedPage extends StatelessWidget {
Stack( Stack(
children: <Widget>[ children: <Widget>[
Container( Container(
width: MediaQuery.of(context).size.width, //400, width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.width, //500, height: MediaQuery.of(context).size.width,
), ),
Container( Container(
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
@ -110,16 +108,6 @@ class DeliveryConfirmedPage extends StatelessWidget {
), ),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
// Container(
// margin: EdgeInsets.all(10),
// child: SecondaryButton(
// color: Colors.orangeAccent,
// label: TranslationBase.of(context).addNoteBtn,
// icon: Icon(Icons.mode_edit),
// small: true,
// onTap: () {},
// ),
// ),
FlatButton.icon( FlatButton.icon(
padding: EdgeInsets.all(8), padding: EdgeInsets.all(8),
color: Colors.orangeAccent, color: Colors.orangeAccent,
@ -143,39 +131,11 @@ class DeliveryConfirmedPage extends StatelessWidget {
), ),
Container( Container(
margin: EdgeInsets.all(10), margin: EdgeInsets.all(10),
// height: MediaQuery.of(context).size.height *0.08,
child: SecondaryButton( child: SecondaryButton(
label: TranslationBase.of(context) label: TranslationBase.of(context)
.nextDelivery, .nextDelivery,
onTap: () {}, onTap: () {},
), ),
// 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)
// .nextDelivery,
// style: TextStyle(color: Colors.white),
// ),
// onPressed: () {},
// ),
), ),
], ],
), ),

@ -1,8 +1,8 @@
import 'package:driverapp/pages/delivery/delivery_confirmed_page.dart'; import 'package:driverapp/pages/delivery/DeliveryConfirmedPage.dart';
import 'package:driverapp/widgets/buttons/secondary_button.dart'; import 'package:driverapp/widgets/buttons/secondary_button.dart';
import 'package:driverapp/widgets/delivery/customer_brief_card.dart'; import 'package:driverapp/widgets/delivery/CustomerBriefCard.dart';
import 'package:driverapp/widgets/delivery/delivery_action_button.dart'; import 'package:driverapp/widgets/delivery/DeliveryActionButton.dart';
import 'package:driverapp/widgets/delivery/package_content.dart'; import 'package:driverapp/widgets/delivery/PackageContent.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -18,14 +18,14 @@ class InformationPage extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBarColor: Color(0xff3ABBBA), appBarColor: Theme.of(context).disabledColor,
arrowColor: Colors.white, arrowColor: Colors.white,
titleColor: Colors.white, titleColor: Colors.white,
appBarTitle: TranslationBase.of(context).deliveryInfo, appBarTitle: TranslationBase.of(context).deliveryInfo,
body: Container( body: Container(
color: Color(0xff3ABBBA), color: Theme.of(context).disabledColor,
child: Container( child: Container(
color: Color(0xff3ABBBA), color: Theme.of(context).disabledColor,
child: ListView( child: ListView(
children: <Widget>[ children: <Widget>[
Column( Column(
@ -36,28 +36,26 @@ class InformationPage extends StatelessWidget {
width: MediaQuery width: MediaQuery
.of(context) .of(context)
.size .size
.width, //400, .width,
height: MediaQuery height: MediaQuery
.of(context) .of(context)
.size .size
.width, //500, .width,
), ),
Container( Container(
width: MediaQuery width: MediaQuery
.of(context) .of(context)
.size .size
.width * 1, .width * 1,
//800,
height: MediaQuery height: MediaQuery
.of(context) .of(context)
.size .size
.width * 1.5, .width * 1.5,
//700,
margin: EdgeInsets.only( margin: EdgeInsets.only(
top: MediaQuery top: MediaQuery
.of(context) .of(context)
.size .size
.width * 0.23, //100 .width * 0.23,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).scaffoldBackgroundColor, color: Theme.of(context).scaffoldBackgroundColor,
@ -72,7 +70,7 @@ class InformationPage extends StatelessWidget {
height: MediaQuery height: MediaQuery
.of(context) .of(context)
.size .size
.width * 0.53, //170, .width * 0.53,
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@ -112,7 +110,7 @@ class InformationPage extends StatelessWidget {
btnFunction: () {}, btnFunction: () {},
), ),
deliveryInfoButton( deliveryInfoButton(
btnColor: Color(0xff41bdbb), btnColor: Theme.of(context).disabledColor,
btnIcon: Icon( btnIcon: Icon(
Icons.phone, Icons.phone,
size: 30, size: 30,
@ -129,18 +127,18 @@ class InformationPage extends StatelessWidget {
height: MediaQuery height: MediaQuery
.of(context) .of(context)
.size .size
.width * 0.1, //30, .width * 0.1,
), ),
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: MediaQuery left: MediaQuery
.of(context) .of(context)
.size .size
.width * 0.05, //15, .width * 0.05,
right: MediaQuery right: MediaQuery
.of(context) .of(context)
.size .size
.width * 0.05, //15 .width * 0.05,
), ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -160,7 +158,7 @@ class InformationPage extends StatelessWidget {
height: MediaQuery height: MediaQuery
.of(context) .of(context)
.size .size
.width * 0.05, //20, .width * 0.05,
), ),
Padding( Padding(
padding: const EdgeInsets.only(left: 10), padding: const EdgeInsets.only(left: 10),
@ -168,12 +166,11 @@ class InformationPage extends StatelessWidget {
children: List.generate( children: List.generate(
item.itemsQuantitiesList.length, item.itemsQuantitiesList.length,
(index) { (index) {
return package_content( return packageContent(
packageName: item packageName: item
.itemsQuantitiesList[index] .itemsQuantitiesList[index]
.itemName .itemName
.toString(), .toString(),
//'Panadol Extra 50 tablet',
packageCount: item packageCount: item
.itemsQuantitiesList[index] .itemsQuantitiesList[index]
.quantity .quantity
@ -186,7 +183,7 @@ class InformationPage extends StatelessWidget {
height: MediaQuery height: MediaQuery
.of(context) .of(context)
.size .size
.width * 0.01, //10, .width * 0.01,
), ),
], ],
), ),
@ -195,11 +192,10 @@ class InformationPage extends StatelessWidget {
height: MediaQuery height: MediaQuery
.of(context) .of(context)
.size .size
.width * 0.1, //30, .width * 0.1,
), ),
Container( Container(
margin: EdgeInsets.all(10), margin: EdgeInsets.all(10),
// height: MediaQuery.of(context).size.height *0.08,
child: SecondaryButton( child: SecondaryButton(
label: TranslationBase.of(context).clientReached, label: TranslationBase.of(context).clientReached,
onTap: () { onTap: () {

@ -1,5 +1,5 @@
import 'package:driverapp/pages/delivery/delivery_confirmed_page.dart'; import 'package:driverapp/pages/delivery/DeliveryConfirmedPage.dart';
import 'package:driverapp/pages/delivery/information_page.dart'; import 'package:driverapp/pages/delivery/InformationPage.dart';
import 'package:driverapp/uitl/translations_delegate_base.dart'; import 'package:driverapp/uitl/translations_delegate_base.dart';
import 'package:driverapp/widgets/bottom_navigation/bottom_nav_bar.dart'; import 'package:driverapp/widgets/bottom_navigation/bottom_nav_bar.dart';
import 'package:driverapp/widgets/drawer/app_drawer_widget.dart'; import 'package:driverapp/widgets/drawer/app_drawer_widget.dart';

@ -1,5 +1,5 @@
import 'package:driverapp/core/viewModels/orders_view_model.dart'; import 'package:driverapp/core/viewModels/orders_view_model.dart';
import 'package:driverapp/pages/delivery/information_page.dart'; import 'package:driverapp/pages/delivery/InformationPage.dart';
import 'package:driverapp/widgets/others/app_scaffold_widget.dart'; import 'package:driverapp/widgets/others/app_scaffold_widget.dart';
import 'package:driverapp/widgets/others/rounded_container.dart'; import 'package:driverapp/widgets/others/rounded_container.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';

@ -58,9 +58,10 @@ class CustomerBrief extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
flex: 3, flex: 3,
child: Text('ID: ${itemId}', style: TextStyle( child: Text(
color: Color(0xFFADACAD) 'ID: ${itemId}',
),), style: TextStyle(color: Color(0xFFADACAD)),
),
), ),
Expanded( Expanded(
child: CircleAvatar( child: CircleAvatar(
@ -97,7 +98,8 @@ class CustomerBrief extends StatelessWidget {
), ),
Text( Text(
'Olaya street, behind KFC resturant, next to kingdom towers 2nd floor ofice 277', 'Olaya street, behind KFC resturant, next to kingdom towers 2nd floor ofice 277',
style: TextStyle(color: Color(0xFF464748),fontWeight: FontWeight.w600), style: TextStyle(
color: Color(0xFF464748), fontWeight: FontWeight.w600),
), ),
SizedBox( SizedBox(
height: 10, height: 10,
@ -122,9 +124,7 @@ class CustomerBrief extends StatelessWidget {
Expanded( Expanded(
flex: 2, flex: 2,
child: Text( child: Text(
TranslationBase TranslationBase.of(context).payment,
.of(context)
.payment,
textAlign: TextAlign.start, textAlign: TextAlign.start,
), ),
), ),
@ -133,7 +133,7 @@ class CustomerBrief extends StatelessWidget {
), ),
Expanded( Expanded(
child: Text( child: Text(
totalPayment.toString(), //'SAR 70', totalPayment.toString(),
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: TextStyle(fontWeight: FontWeight.w600), style: TextStyle(fontWeight: FontWeight.w600),
), ),
@ -148,22 +148,13 @@ class CustomerBrief extends StatelessWidget {
Expanded( Expanded(
flex: 1, flex: 1,
child: Text( child: Text(
TranslationBase TranslationBase.of(context).delivryTime,
.of(context)
.delivryTime,
textAlign: TextAlign.start, textAlign: TextAlign.start,
), ),
), ),
// SizedBox(
// width: 50,
// ),
Expanded( Expanded(
child: Text( child: Text(
'${DateUtil.getMonthDayYearDateFormatted( '${DateUtil.getMonthDayYearDateFormatted(DateUtil.convertStringToDate(deliveryTime))} ${(DateUtil.convertStringToHours(deliveryTime))}',
DateUtil.convertStringToDate(
deliveryTime))} ${(DateUtil
.convertStringToHours(deliveryTime))}',
//'05 Aug 20 - 10:00 AM',
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: TextStyle(fontWeight: FontWeight.w600)), style: TextStyle(fontWeight: FontWeight.w600)),
), ),

@ -16,8 +16,14 @@ class deliveryInfoButton extends StatelessWidget {
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: 50, height: MediaQuery
width: 60, // specific value .of(context)
.size
.width * 0.14,
width: MediaQuery
.of(context)
.size
.width * 0.165, // specific value
child: RaisedButton( child: RaisedButton(
padding: EdgeInsets.only(left: 2), padding: EdgeInsets.only(left: 2),
color: btnColor, color: btnColor,
@ -29,7 +35,10 @@ class deliveryInfoButton extends StatelessWidget {
), ),
), ),
SizedBox( SizedBox(
height: 10, height: MediaQuery
.of(context)
.size
.width * 0.05,
), ),
Text( Text(
btnName, btnName,

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