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

setting_branch
enadhilal 5 years ago
parent c5cb40fdb4
commit 1f6acfcb5d

@ -23,7 +23,7 @@ class DeliveryConfirmedPage extends StatelessWidget {
color: Theme.of(context).primaryColor,
child: ListView(
children: <Widget>[
Column(
Stack(
children: <Widget>[
Column(
children: <Widget>[
@ -34,12 +34,10 @@ class DeliveryConfirmedPage extends StatelessWidget {
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.width * 0.7,
padding: EdgeInsets.only(
top: MediaQuery.of(context).size.width *
0.12,
top: MediaQuery.of(context).size.width * 0.12,
),
decoration: BoxDecoration(
color: Colors.white10,
shape: BoxShape.circle),
color: Colors.white10, shape: BoxShape.circle),
child: Column(
children: <Widget>[
Icon(
@ -47,9 +45,10 @@ class DeliveryConfirmedPage extends StatelessWidget {
color: Colors.white,
size: 75,
),
SizedBox(height: MediaQuery.of(context).size.width * 0.03,),
SizedBox(
height:
MediaQuery.of(context).size.width * 0.03,
),
Text(
TranslationBase.of(context).deliveryInfo,
style: TextStyle(
@ -57,12 +56,12 @@ class DeliveryConfirmedPage extends StatelessWidget {
fontSize: 20,
fontWeight: FontWeight.bold),
),
SizedBox(height: MediaQuery.of(context).size.width * 0.03,),
SizedBox(
height:
MediaQuery.of(context).size.width * 0.03,
),
Text(
TranslationBase.of(context)
.confirmationSent,
TranslationBase.of(context).confirmationSent,
style: TextStyle(
color: Colors.white,
fontSize: 13,
@ -76,76 +75,77 @@ class DeliveryConfirmedPage extends StatelessWidget {
),
],
),
Stack(
children: <Widget>[
Container(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.width,
),
Container(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.width * 1.2,
margin: EdgeInsets.only(top: 60),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(80),
topRight: Radius.circular(80)),
),
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
margin: EdgeInsets.only(
bottom: MediaQuery.of(context).size.width * 0.15,
Container(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.width,
),
Container(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.width * 1.0,
margin: EdgeInsets.only(
top: MediaQuery.of(context).size.width * 0.75,
),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(80),
topRight: Radius.circular(80)),
),
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
margin: EdgeInsets.only(
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(
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: () {},
),
SizedBox(
height: MediaQuery.of(context).size.width *
0.1, //20,
),
Container(
margin: EdgeInsets.all(10),
child: SecondaryButton(
label: TranslationBase.of(context)
.nextDelivery,
onTap: () {},
),
),
],
SizedBox(
height:
MediaQuery.of(context).size.width * 0.02, //20,
),
),
],
Container(
margin: EdgeInsets.all(10),
child: SecondaryButton(
label: TranslationBase.of(context).nextDelivery,
onTap: () {},
),
),
],
),
),
),
CustomerBriefCard(
itemId: item.patientID,
customerFirstName: item.firstName,
customerLastName: item.lastName,
mobileNo: item.mobileNumber,
totalPayment: item.amount,
showDistance: false,
deliveryTime: item.orderCreatedOn),
],
],
),
),
Container(
margin: EdgeInsets.only(
top: MediaQuery.of(context).size.width * 0.6,
),
child: CustomerBriefCard(
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';
class CustomerBriefCard extends StatelessWidget {
final String itemId;
final int itemId;
final String time;
final String customerFirstName;
final String customerLastName;
@ -102,13 +102,13 @@ class CustomerBriefCard extends StatelessWidget {
style: TextStyle(color: Color(0xFF50BDC5)),
),
SizedBox(
height:MediaQuery.of(context).size.width*0.05,
),
Text(
'Olaya street, behind KFC resturant, next to kingdom towers 2nd floor ofice 277',
style: TextStyle(
color: Color(0xFF464748), fontWeight: FontWeight.w600),
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),
// ),
SizedBox(
height: 10,
),

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

Loading…
Cancel
Save