update the item ID and change the icon , icon label, remove description and fix the stack issue in delivery_confirmed.

setting_branch
enadhilal 6 years ago
parent c5cb40fdb4
commit 1f6acfcb5d

@ -23,7 +23,7 @@ class DeliveryConfirmedPage extends StatelessWidget {
color: Theme.of(context).primaryColor, color: Theme.of(context).primaryColor,
child: ListView( child: ListView(
children: <Widget>[ children: <Widget>[
Column( Stack(
children: <Widget>[ children: <Widget>[
Column( Column(
children: <Widget>[ children: <Widget>[
@ -34,12 +34,10 @@ class DeliveryConfirmedPage extends StatelessWidget {
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.width * 0.7, height: MediaQuery.of(context).size.width * 0.7,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: MediaQuery.of(context).size.width * top: MediaQuery.of(context).size.width * 0.12,
0.12,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white10, color: Colors.white10, shape: BoxShape.circle),
shape: BoxShape.circle),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Icon( Icon(
@ -47,9 +45,10 @@ class DeliveryConfirmedPage extends StatelessWidget {
color: Colors.white, color: Colors.white,
size: 75, size: 75,
), ),
SizedBox(
SizedBox(height: MediaQuery.of(context).size.width * 0.03,), height:
MediaQuery.of(context).size.width * 0.03,
),
Text( Text(
TranslationBase.of(context).deliveryInfo, TranslationBase.of(context).deliveryInfo,
style: TextStyle( style: TextStyle(
@ -57,12 +56,12 @@ class DeliveryConfirmedPage extends StatelessWidget {
fontSize: 20, fontSize: 20,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),
SizedBox(
SizedBox(height: MediaQuery.of(context).size.width * 0.03,), height:
MediaQuery.of(context).size.width * 0.03,
),
Text( Text(
TranslationBase.of(context) TranslationBase.of(context).confirmationSent,
.confirmationSent,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 13, fontSize: 13,
@ -76,76 +75,77 @@ class DeliveryConfirmedPage extends StatelessWidget {
), ),
], ],
), ),
Stack( Container(
children: <Widget>[ width: MediaQuery.of(context).size.width,
Container( height: MediaQuery.of(context).size.width,
width: MediaQuery.of(context).size.width, ),
height: MediaQuery.of(context).size.width, Container(
), width: MediaQuery.of(context).size.width,
Container( height: MediaQuery.of(context).size.width * 1.0,
width: MediaQuery.of(context).size.width, margin: EdgeInsets.only(
height: MediaQuery.of(context).size.width * 1.2, top: MediaQuery.of(context).size.width * 0.75,
margin: EdgeInsets.only(top: 60), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
topLeft: Radius.circular(80), topLeft: Radius.circular(80),
topRight: Radius.circular(80)), topRight: Radius.circular(80)),
), ),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
bottom: MediaQuery.of(context).size.width * 0.15, bottom: MediaQuery.of(context).size.width * 0.09,
),
child: Column(
children: <Widget>[
FlatButton.icon(
padding: EdgeInsets.all(8),
color: Colors.orangeAccent,
shape: RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(10.0),
),
label: Text(
TranslationBase.of(context).addNoteBtn,
style: TextStyle(color: Colors.white),
),
icon: Icon(
Icons.mode_edit,
color: Colors.white,
),
onPressed: () {},
), ),
child: Column( SizedBox(
children: <Widget>[ height:
FlatButton.icon( MediaQuery.of(context).size.width * 0.02, //20,
padding: EdgeInsets.all(8),
color: Colors.orangeAccent,
shape: RoundedRectangleBorder(
borderRadius:
new BorderRadius.circular(10.0),
),
label: Text(
TranslationBase.of(context).addNoteBtn,
style: TextStyle(color: Colors.white),
),
icon: Icon(
Icons.mode_edit,
color: Colors.white,
),
onPressed: () {},
),
SizedBox(
height: MediaQuery.of(context).size.width *
0.1, //20,
),
Container(
margin: EdgeInsets.all(10),
child: SecondaryButton(
label: TranslationBase.of(context)
.nextDelivery,
onTap: () {},
),
),
],
), ),
), Container(
], margin: EdgeInsets.all(10),
child: SecondaryButton(
label: TranslationBase.of(context).nextDelivery,
onTap: () {},
),
),
],
),
), ),
), ],
CustomerBriefCard( ),
itemId: item.patientID, ),
customerFirstName: item.firstName, Container(
customerLastName: item.lastName, margin: EdgeInsets.only(
mobileNo: item.mobileNumber, top: MediaQuery.of(context).size.width * 0.6,
totalPayment: item.amount, ),
showDistance: false, child: CustomerBriefCard(
deliveryTime: item.orderCreatedOn), itemId: item.orderID,
], customerFirstName: item.firstName,
customerLastName: item.lastName,
mobileNo: item.mobileNumber,
totalPayment: item.amount,
showDistance: false,
deliveryTime: item.orderCreatedOn),
), ),
], ],
), ),

File diff suppressed because one or more lines are too long

@ -4,7 +4,7 @@ import '../../uitl/date_uitl.dart';
import '../../uitl/translations_delegate_base.dart'; import '../../uitl/translations_delegate_base.dart';
class CustomerBriefCard extends StatelessWidget { class CustomerBriefCard extends StatelessWidget {
final String itemId; final int itemId;
final String time; final String time;
final String customerFirstName; final String customerFirstName;
final String customerLastName; final String customerLastName;
@ -102,13 +102,13 @@ class CustomerBriefCard extends StatelessWidget {
style: TextStyle(color: Color(0xFF50BDC5)), style: TextStyle(color: Color(0xFF50BDC5)),
), ),
SizedBox( SizedBox(
height:MediaQuery.of(context).size.width*0.05, height:MediaQuery.of(context).size.width*0.005,
),
Text(
'Olaya street, behind KFC resturant, next to kingdom towers 2nd floor ofice 277',
style: TextStyle(
color: Color(0xFF464748), fontWeight: FontWeight.w600),
), ),
// Text(
// 'Olaya street, behind KFC resturant, next to kingdom towers 2nd floor ofice 277',
// style: TextStyle(
// color: Color(0xFF464748), fontWeight: FontWeight.w600),
// ),
SizedBox( SizedBox(
height: 10, height: 10,
), ),

@ -24,22 +24,13 @@ class DeliveryInfoButton extends StatelessWidget {
.of(context) .of(context)
.size .size
.width * 0.165, // specific value .width * 0.165, // specific value
child: RaisedButton( child:
padding: EdgeInsets.only(left: 2), InkWell(
color: btnColor, child: btnIcon,
shape: RoundedRectangleBorder( onTap: btnFunction,
borderRadius: new BorderRadius.circular(8.0),
),
child: btnIcon,
onPressed: btnFunction,
), ),
), ),
SizedBox(
height: MediaQuery
.of(context)
.size
.width * 0.05,
),
Text( Text(
btnName, btnName,
style: TextStyle( style: TextStyle(

Loading…
Cancel
Save