jira bugs (Health Calculator)

merge-requests/315/head
hussam al-habibeh 5 years ago
parent 1ce10f4d78
commit 14939d3513

@ -123,6 +123,16 @@ class _BMICalculatorState extends State<BMICalculator> {
isShowDecPage: false, isShowDecPage: false,
appBarTitle: appBarTitle:
"${TranslationBase.of(context).bmi} ${TranslationBase.of(context).calcHealth}", "${TranslationBase.of(context).bmi} ${TranslationBase.of(context).calcHealth}",
showHomeAppBarIcon: false,
appBarIcons: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 7.0),
child: Icon(
Icons.info_outline,
color: Colors.white,
),
)
],
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
@ -511,10 +521,10 @@ class _BMICalculatorState extends State<BMICalculator> {
context, context,
FadePage( FadePage(
page: ResultPage( page: ResultPage(
finalResult: bmiResult, finalResult: bmiResult,
textResult: textResult, textResult: textResult,
msg: msg, msg: msg,
)), )),
); );
} }
}) })

@ -125,6 +125,16 @@ class _BmrCalculatorState extends State<BmrCalculator> {
isShowAppBar: true, isShowAppBar: true,
isShowDecPage: false, isShowDecPage: false,
appBarTitle: 'Bmr Calculator', appBarTitle: 'Bmr Calculator',
showHomeAppBarIcon: false,
appBarIcons: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 7.0),
child: Icon(
Icons.info_outline,
color: Colors.white,
),
)
],
body: Padding( body: Padding(
padding: EdgeInsets.symmetric(horizontal: 25.0, vertical: 15.0), padding: EdgeInsets.symmetric(horizontal: 25.0, vertical: 15.0),
child: SingleChildScrollView( child: SingleChildScrollView(
@ -704,9 +714,9 @@ class _BmrCalculatorState extends State<BmrCalculator> {
context, context,
FadePage( FadePage(
page: BmrResultPage( page: BmrResultPage(
bmrResult: bmrResult, bmrResult: bmrResult,
calories: calories, calories: calories,
)), )),
); );
} }
}); });

@ -210,6 +210,16 @@ class _BodyFatState extends State<BodyFat> {
return AppScaffold( return AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBarTitle: 'Body Fat', appBarTitle: 'Body Fat',
showHomeAppBarIcon: false,
appBarIcons: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 7.0),
child: Icon(
Icons.info_outline,
color: Colors.white,
),
)
],
body: Padding( body: Padding(
padding: EdgeInsets.symmetric(horizontal: 25.0, vertical: 15.0), padding: EdgeInsets.symmetric(horizontal: 25.0, vertical: 15.0),
child: SingleChildScrollView( child: SingleChildScrollView(
@ -1004,10 +1014,10 @@ class _BodyFatState extends State<BodyFat> {
context, context,
FadePage( FadePage(
page: FatResult( page: FatResult(
bodyFat: bodyFat, bodyFat: bodyFat,
fat: fat, fat: fat,
textResult: textResult, textResult: textResult,
)), )),
); );
} }
}); });

@ -108,6 +108,16 @@ class _CalorieCalculatorState extends State<CalorieCalculator> {
isShowDecPage: false, isShowDecPage: false,
appBarTitle: appBarTitle:
"${TranslationBase.of(context).calories} ${TranslationBase.of(context).calcHealth}", "${TranslationBase.of(context).calories} ${TranslationBase.of(context).calcHealth}",
showHomeAppBarIcon: false,
appBarIcons: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 7.0),
child: Icon(
Icons.info_outline,
color: Colors.white,
),
)
],
body: Column( body: Column(
children: [ children: [
Expanded( Expanded(
@ -417,7 +427,9 @@ class _CalorieCalculatorState extends State<CalorieCalculator> {
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
vertical: 0.0, horizontal: 18.0), vertical: 0.0, horizontal: 18.0),
child: Center(child: Texts(TranslationBase.of(context).cm)), child: Center(
child:
Texts(TranslationBase.of(context).cm)),
), ),
), ),
), ),
@ -446,11 +458,13 @@ class _CalorieCalculatorState extends State<CalorieCalculator> {
], ],
), ),
child: Padding( child: Padding(
padding: padding: const EdgeInsets.symmetric(
const EdgeInsets.symmetric(horizontal: 16.0), horizontal: 16.0),
child: Center(child: Texts(TranslationBase.of(context).feet))), child: Center(
), child: Texts(
TranslationBase.of(context).feet))),
), ),
),
), ),
], ],
), ),
@ -465,7 +479,7 @@ class _CalorieCalculatorState extends State<CalorieCalculator> {
), ),
Container( Container(
margin: margin:
EdgeInsets.symmetric(horizontal: 4.0, vertical: 12.0), EdgeInsets.symmetric(horizontal: 4.0, vertical: 12.0),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
), ),
@ -514,8 +528,7 @@ class _CalorieCalculatorState extends State<CalorieCalculator> {
), ),
onTap: () { onTap: () {
setState(() { setState(() {
if (weight < 250) if (weight < 250) weight++;
weight++;
}); });
}, },
), ),
@ -589,7 +602,9 @@ class _CalorieCalculatorState extends State<CalorieCalculator> {
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
vertical: 0.0, horizontal: 18.0), vertical: 0.0, horizontal: 18.0),
child: Center(child: Texts(TranslationBase.of(context).kg)), child: Center(
child:
Texts(TranslationBase.of(context).kg)),
), ),
), ),
), ),
@ -618,9 +633,11 @@ class _CalorieCalculatorState extends State<CalorieCalculator> {
], ],
), ),
child: Padding( child: Padding(
padding: padding: const EdgeInsets.symmetric(
const EdgeInsets.symmetric(horizontal: 16.0), horizontal: 16.0),
child: Center(child: Texts(TranslationBase.of(context).pound)), child: Center(
child: Texts(
TranslationBase.of(context).pound)),
), ),
), ),
), ),
@ -681,8 +698,8 @@ class _CalorieCalculatorState extends State<CalorieCalculator> {
context, context,
FadePage( FadePage(
page: CalorieResultPage( page: CalorieResultPage(
calorie: calories, calorie: calories,
)), )),
); );
} }
}); });

@ -82,6 +82,16 @@ class _CarbsState extends State<Carbs> {
return AppScaffold( return AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBarTitle: 'Carb Protein Fat', appBarTitle: 'Carb Protein Fat',
showHomeAppBarIcon: false,
appBarIcons: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 7.0),
child: Icon(
Icons.info_outline,
color: Colors.white,
),
)
],
body: Padding( body: Padding(
padding: EdgeInsets.symmetric(horizontal: 25.0, vertical: 15.0), padding: EdgeInsets.symmetric(horizontal: 25.0, vertical: 15.0),
child: SingleChildScrollView( child: SingleChildScrollView(
@ -201,7 +211,7 @@ class _CarbsState extends State<Carbs> {
), ),
Button( Button(
backgroundColor: Color(0xffC5272D), backgroundColor: Color(0xffC5272D),
label: 'NOT SURE? CLICK HERE ', label: 'NOT SURE? CLICK HERE',
onTap: () { onTap: () {
setState(() { setState(() {
{ {
@ -341,16 +351,16 @@ class _CarbsState extends State<Carbs> {
context, context,
FadePage( FadePage(
page: CarbsResult( page: CarbsResult(
cCal: cCal, cCal: cCal,
pCal: pCal, pCal: pCal,
fCal: fCal, fCal: fCal,
pCalGram: pCalGram, pCalGram: pCalGram,
pCalMeal: pCalMeal, pCalMeal: pCalMeal,
fCalGram: fCalGram, fCalGram: fCalGram,
fCalMeal: fCalMeal, fCalMeal: fCalMeal,
cCalGram: cCalGram, cCalGram: cCalGram,
cCalMeal: cCalMeal, cCalMeal: cCalMeal,
)), )),
); );
} }
}); });

@ -102,6 +102,16 @@ class _IdealBodyState extends State<IdealBody> {
return AppScaffold( return AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBarTitle: 'Ideal Body Weight', appBarTitle: 'Ideal Body Weight',
showHomeAppBarIcon: false,
appBarIcons: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 7.0),
child: Icon(
Icons.info_outline,
color: Colors.white,
),
)
],
body: Padding( body: Padding(
padding: EdgeInsets.symmetric(vertical: 15.0, horizontal: 25.0), padding: EdgeInsets.symmetric(vertical: 15.0, horizontal: 25.0),
child: SingleChildScrollView( child: SingleChildScrollView(
@ -518,7 +528,7 @@ class _IdealBodyState extends State<IdealBody> {
height: 30.0, height: 30.0,
), ),
Container( Container(
height: 100.0, height: 50.0,
width: 350.0, width: 350.0,
child: SecondaryButton( child: SecondaryButton(
label: 'CALCULATE', label: 'CALCULATE',
@ -535,12 +545,12 @@ class _IdealBodyState extends State<IdealBody> {
context, context,
FadePage( FadePage(
page: IdealBodyResult( page: IdealBodyResult(
idealBodyWeight: idealWeight, idealBodyWeight: idealWeight,
minRange: minRange, minRange: minRange,
mixRange: maxRange, mixRange: maxRange,
overWeightBy: overWeightBy, overWeightBy: overWeightBy,
textResult: textResult, textResult: textResult,
)), )),
); );
} }
}); });

@ -254,7 +254,7 @@ class _BloodSugarState extends State<BloodSugar> {
), ),
Flexible( Flexible(
child: Container( child: Container(
height: 60.0, height: 50.0,
width: 150.0, width: 150.0,
child: SecondaryButton( child: SecondaryButton(
label: TranslationBase.of(context).calculate, label: TranslationBase.of(context).calculate,

@ -45,7 +45,8 @@ class PackagesCartPage extends StatefulWidget {
_PackagesCartPageState createState() => _PackagesCartPageState(); _PackagesCartPageState createState() => _PackagesCartPageState();
} }
class _PackagesCartPageState extends State<PackagesCartPage> with AfterLayoutMixin<PackagesCartPage>, SingleTickerProviderStateMixin { class _PackagesCartPageState extends State<PackagesCartPage>
with AfterLayoutMixin<PackagesCartPage>, SingleTickerProviderStateMixin {
getLanguageID() async { getLanguageID() async {
languageID = await sharedPref.getString(APP_LANGUAGE); languageID = await sharedPref.getString(APP_LANGUAGE);
} }
@ -54,7 +55,8 @@ class _PackagesCartPageState extends State<PackagesCartPage> with AfterLayoutMix
void initState() { void initState() {
_agreeTerms = false; _agreeTerms = false;
_selectedPaymentMethod = null; _selectedPaymentMethod = null;
_animationController = AnimationController(vsync: this, duration: Duration(seconds: 500)); _animationController =
AnimationController(vsync: this, duration: Duration(seconds: 500));
super.initState(); super.initState();
} }
@ -77,20 +79,25 @@ class _PackagesCartPageState extends State<PackagesCartPage> with AfterLayoutMix
Navigator.push(context, FadePage(page: PharmacyTermsConditions())); Navigator.push(context, FadePage(page: PharmacyTermsConditions()));
} }
onPayNowClick() async{ onPayNowClick() async {
await viewModel.service.placeOrder(context: context,paymentOption: _selectedPaymentMethod.toUpperCase()).then((orderId){ await viewModel.service
if(orderId.runtimeType == int){ // result == order_id .placeOrder(
context: context,
paymentOption: _selectedPaymentMethod.toUpperCase())
.then((orderId) {
if (orderId.runtimeType == int) {
// result == order_id
var browser = MyInAppBrowser( var browser = MyInAppBrowser(
context: context, context: context,
onExitCallback: (data, isDone) => paymentClosed(orderId: orderId, withStatus: isDone, data: data) onExitCallback: (data, isDone) => paymentClosed(
); orderId: orderId, withStatus: isDone, data: data));
browser.openPackagesPaymentBrowser(customer_id: viewModel.service.customer.id, order_id: orderId); browser.openPackagesPaymentBrowser(
customer_id: viewModel.service.customer.id, order_id: orderId);
}else{ } else {
utils.Utils.showErrorToast('Failed to place order, please try again later'); utils.Utils.showErrorToast(
'Failed to place order, please try again later');
} }
}).catchError((error) {
}).catchError((error){
utils.Utils.showErrorToast(error); utils.Utils.showErrorToast(error);
}); });
} }
@ -124,7 +131,6 @@ class _PackagesCartPageState extends State<PackagesCartPage> with AfterLayoutMix
crossAxisCount: (_columnCount * _columnCount), crossAxisCount: (_columnCount * _columnCount),
itemCount: viewModel.cartItemList.length, itemCount: viewModel.cartItemList.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
var item = viewModel.cartItemList[index]; var item = viewModel.cartItemList[index];
return Dismissible( return Dismissible(
key: Key(index.toString()), key: Key(index.toString()),
@ -132,7 +138,9 @@ class _PackagesCartPageState extends State<PackagesCartPage> with AfterLayoutMix
background: _cartItemDeleteContainer(), background: _cartItemDeleteContainer(),
secondaryBackground: _cartItemDeleteContainer(), secondaryBackground: _cartItemDeleteContainer(),
confirmDismiss: (direction) async { confirmDismiss: (direction) async {
bool status = await viewModel.service.deleteProductFromCart(item.id, context: context, showLoading: false); bool status = await viewModel.service
.deleteProductFromCart(item.id,
context: context, showLoading: false);
return status; return status;
}, },
onDismissed: (direction) { onDismissed: (direction) {
@ -141,17 +149,23 @@ class _PackagesCartPageState extends State<PackagesCartPage> with AfterLayoutMix
}, },
child: PackagesCartItemCard( child: PackagesCartItemCard(
itemModel: item, itemModel: item,
shouldStepperChangeApply: (apply,total) async{ shouldStepperChangeApply: (apply, total) async {
var request = AddProductToCartRequestModel(product_id: item.productId, quantity: apply); var request = AddProductToCartRequestModel(
ResponseModel response = await viewModel.service.addProductToCart(request, context: context, showLoading: false).catchError((error){ product_id: item.productId,
quantity: apply);
ResponseModel response = await viewModel
.service
.addProductToCart(request,
context: context, showLoading: false)
.catchError((error) {
utils.Utils.showErrorToast(error); utils.Utils.showErrorToast(error);
}); });
return response.status ?? false; return response.status ?? false;
}, },
) ));
);
}, },
staggeredTileBuilder: (int index) => StaggeredTile.fit(_columnCount), staggeredTileBuilder: (int index) =>
StaggeredTile.fit(_columnCount),
mainAxisSpacing: 0, mainAxisSpacing: 0,
crossAxisSpacing: 10, crossAxisSpacing: 10,
)), )),
@ -164,25 +178,29 @@ class _PackagesCartPageState extends State<PackagesCartPage> with AfterLayoutMix
color: Colors.white, color: Colors.white,
child: Column( child: Column(
children: [ children: [
Texts( Texts(TranslationBase.of(context).selectPaymentOption,
TranslationBase.of(context).selectPaymentOption, fontSize: 10, fontWeight: FontWeight.bold),
fontSize: 10, Container(
fontWeight: FontWeight.bold height: 0.25,
width: 100,
color: Colors.grey[300],
), ),
Container(height: 0.25, width: 100, color: Colors.grey[300],),
_paymentOptions(context, (paymentMethod) { _paymentOptions(context, (paymentMethod) {
setState(() => _selectedPaymentMethod = paymentMethod); setState(() => _selectedPaymentMethod = paymentMethod);
}), }),
Container(
Container(height: 0.25, color: Colors.grey[300],), height: 0.25,
color: Colors.grey[300],
Container(height: 40, ),
child: _termsAndCondition(context, onSelected: onTermsClick, onInfoClick: onTermsInfoClick) Container(
height: 40,
child: _termsAndCondition(context,
onSelected: onTermsClick,
onInfoClick: onTermsInfoClick)),
Container(
height: 0.25,
color: Colors.grey[300],
), ),
Container(height: 0.25, color: Colors.grey[300],),
_payNow(context, onPayNowClick: onPayNowClick) _payNow(context, onPayNowClick: onPayNowClick)
], ],
), ),
@ -195,19 +213,19 @@ class _PackagesCartPageState extends State<PackagesCartPage> with AfterLayoutMix
fetchData() async { fetchData() async {
await viewModel.service.cartItems(context: context).catchError((error) {}); await viewModel.service.cartItems(context: context).catchError((error) {});
setState((){}); setState(() {});
} }
paymentClosed({@required int orderId, @required bool withStatus, dynamic data}) async{ paymentClosed(
viewModel.service.getOrderById(orderId, context: context).then((value){ {@required int orderId, @required bool withStatus, dynamic data}) async {
viewModel.service.getOrderById(orderId, context: context).then((value) {
var heading = withStatus ? "Success" : "Failed"; var heading = withStatus ? "Success" : "Failed";
var title = "Your order has been placed successfully"; var title = "Your order has been placed successfully";
var subTitle = "Order# ${value.data.customOrderNumber}"; var subTitle = "Order# ${value.data.customOrderNumber}";
Navigator.of(context).pushReplacement( Navigator.of(context).pushReplacement(MaterialPageRoute(
MaterialPageRoute(builder: (context) => PackageOrderCompletedPage(heading: heading, title: title, subTitle: subTitle)) builder: (context) => PackageOrderCompletedPage(
); heading: heading, title: title, subTitle: subTitle)));
}).catchError((error) {
}).catchError((error){
debugPrint(error); debugPrint(error);
}); });
} }
@ -231,13 +249,13 @@ Widget _paymentOptions(BuildContext context, Function(String) onSelected) {
), ),
], ],
borderRadius: BorderRadius.all(Radius.circular(5)), borderRadius: BorderRadius.all(Radius.circular(5)),
border: Border.all(color: isSelected ? Colors.green : Colors.grey, width: isSelected ? 1 : 0.5) border: Border.all(
), color: isSelected ? Colors.green : Colors.grey,
width: isSelected ? 1 : 0.5)),
child: Padding( child: Padding(
padding: const EdgeInsets.all(4), padding: const EdgeInsets.all(4),
child: Image.asset('assets/images/new-design/$imageName'), child: Image.asset('assets/images/new-design/$imageName'),
) ));
);
} }
return Padding( return Padding(
@ -267,7 +285,8 @@ Widget _paymentOptions(BuildContext context, Function(String) onSelected) {
width: 5, width: 5,
), ),
InkWell( InkWell(
child: buttonContent(_selectedPaymentMethod == "mastercard", 'mastercard.png'), child: buttonContent(
_selectedPaymentMethod == "mastercard", 'mastercard.png'),
onTap: () { onTap: () {
onSelected("mastercard"); onSelected("mastercard");
}, },
@ -276,7 +295,8 @@ Widget _paymentOptions(BuildContext context, Function(String) onSelected) {
width: 5, width: 5,
), ),
InkWell( InkWell(
child: buttonContent(_selectedPaymentMethod == "installment", 'installment.png'), child: buttonContent(
_selectedPaymentMethod == "installment", 'installment.png'),
onTap: () { onTap: () {
onSelected("installment"); onSelected("installment");
}, },
@ -288,14 +308,17 @@ Widget _paymentOptions(BuildContext context, Function(String) onSelected) {
} }
bool _agreeTerms = false; bool _agreeTerms = false;
Widget _termsAndCondition(BuildContext context, {@required Function(bool) onSelected, @required VoidCallback onInfoClick}) { Widget _termsAndCondition(BuildContext context,
{@required Function(bool) onSelected, @required VoidCallback onInfoClick}) {
return Padding( return Padding(
padding: const EdgeInsets.all(5), padding: const EdgeInsets.all(5),
child: Row( child: Row(
children: [ children: [
InkWell( InkWell(
child: Icon( child: Icon(
_agreeTerms ? Icons.check_circle : Icons.radio_button_unchecked_sharp, _agreeTerms
? Icons.check_circle
: Icons.radio_button_unchecked_sharp,
size: 20, size: 20,
color: _agreeTerms ? Colors.green[600] : Colors.grey[400], color: _agreeTerms ? Colors.green[600] : Colors.grey[400],
), ),
@ -308,7 +331,8 @@ Widget _termsAndCondition(BuildContext context, {@required Function(bool) onSele
padding: const EdgeInsets.symmetric(horizontal: 8), padding: const EdgeInsets.symmetric(horizontal: 8),
child: Texts( child: Texts(
TranslationBase.of(context).pharmacyServiceTermsCondition, TranslationBase.of(context).pharmacyServiceTermsCondition,
fontWeight: FontWeight.normal, fontSize: 13, fontWeight: FontWeight.normal,
fontSize: 13,
), ),
)), )),
InkWell( InkWell(
@ -340,9 +364,18 @@ Widget _payNow(BuildContext context, {@required VoidCallback onPayNowClick}) {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts('${TranslationBase.of(context).subtotal}: ${'999.9'} ${TranslationBase.of(context).sar}', Texts(
heightFactor: 1.5, fontWeight: FontWeight.bold, color: Colors.grey, fontSize: 8), '${TranslationBase.of(context).subtotal}: ${'999.9'} ${TranslationBase.of(context).sar}',
Texts('${TranslationBase.of(context).vat}: ${'14.9'} ${TranslationBase.of(context).sar}', heightFactor: 1.5, fontWeight: FontWeight.bold, color: Colors.grey, fontSize: 8), heightFactor: 1.5,
fontWeight: FontWeight.bold,
color: Colors.grey,
fontSize: 8),
Texts(
'${TranslationBase.of(context).vat}: ${'14.9'} ${TranslationBase.of(context).sar}',
heightFactor: 1.5,
fontWeight: FontWeight.bold,
color: Colors.grey,
fontSize: 8),
Padding( Padding(
padding: const EdgeInsets.all(3), padding: const EdgeInsets.all(3),
child: Container( child: Container(
@ -351,8 +384,12 @@ Widget _payNow(BuildContext context, {@required VoidCallback onPayNowClick}) {
color: Colors.grey[300], color: Colors.grey[300],
), ),
), ),
Texts('${TranslationBase.of(context).total}: 999.99 ${TranslationBase.of(context).sar}', Texts(
heightFactor: 1.5, fontWeight: FontWeight.bold, color: Colors.black54, fontSize: 15) '${TranslationBase.of(context).total}: 999.99 ${TranslationBase.of(context).sar}',
heightFactor: 1.5,
fontWeight: FontWeight.bold,
color: Colors.black54,
fontSize: 15)
], ],
), ),
), ),
@ -360,10 +397,15 @@ Widget _payNow(BuildContext context, {@required VoidCallback onPayNowClick}) {
RaisedButton( RaisedButton(
child: Texts( child: Texts(
TranslationBase.of(context).payNow, TranslationBase.of(context).payNow,
fontSize: 15, color: Colors.white, fontWeight: FontWeight.bold, fontSize: 15,
color: Colors.white,
fontWeight: FontWeight.bold,
), ),
padding: EdgeInsets.only(top: 5, bottom: 5, left: 0, right: 0), padding: EdgeInsets.only(top: 5, bottom: 5, left: 0, right: 0),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5), side: BorderSide(color: Theme.of(context).primaryColor, width: 0.5)), shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(5),
side: BorderSide(
color: Theme.of(context).primaryColor, width: 0.5)),
color: Theme.of(context).primaryColor, color: Theme.of(context).primaryColor,
onPressed: isPayNowAQctive ? onPayNowClick : null, onPressed: isPayNowAQctive ? onPayNowClick : null,
), ),
@ -381,23 +423,23 @@ Widget _cartItemDeleteContainer() {
child: Padding( child: Padding(
padding: const EdgeInsets.all(5), padding: const EdgeInsets.all(5),
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.red, color: Colors.red,
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colors.grey[500], color: Colors.grey[500],
blurRadius: 2, blurRadius: 2,
spreadRadius: 1, spreadRadius: 1,
), ),
], ],
borderRadius: BorderRadius.all(Radius.circular(5)), borderRadius: BorderRadius.all(Radius.circular(5)),
), ),
child: Center( child: Center(
child: Texts( child: Texts(
"Deleting...", "Deleting...",
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontSize: 15, fontSize: 15,
color: Colors.white, color: Colors.white,
)), )),
), ),
), ),

Loading…
Cancel
Save