From 3b79d0ac41deec5261b01a5d15c15953c184c560 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Wed, 6 Oct 2021 11:45:11 +0300 Subject: [PATCH] return the disable colors --- .../screens/product-details/footor/footer-widget.dart | 10 ++++++---- .../screens/product-details/product-detail.dart | 5 ++--- lib/widgets/buttons/secondary_button.dart | 5 +++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart b/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart index 7cdfe7f2..4233e42a 100644 --- a/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart +++ b/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart @@ -189,13 +189,14 @@ class _FooterWidgetState extends State { disabled: !widget.isAvailable && widget.price > 0 || widget.price > widget.quantityLimit || widget.item.rxMessage != null, - onTap: () { + disableColor: Colors.green[400], + onTap: () async { if (!authenticatedUserObject.isLogin) { Navigator.of(context).pushNamed( WELCOME_LOGIN, ); } else - widget.addToCartFunction( + await widget.addToCartFunction( widget.price, widget.item.id, context); }, borderRadius: 5, @@ -212,8 +213,8 @@ class _FooterWidgetState extends State { disabled: !widget.isAvailable && widget.price > 0 || widget.price > widget.quantityLimit || widget.item.rxMessage != null, - onTap: () { - widget.addToCartFunction( + onTap: () async { + await widget.addToCartFunction( widget.price, widget.item.id, context); Navigator.push( context, @@ -221,6 +222,7 @@ class _FooterWidgetState extends State { ); }, borderRadius: 5, + disableColor: Colors.grey[700], color: !widget.isAvailable && widget.price > 0 || widget.price > widget.quantityLimit || widget.item.rxMessage != null diff --git a/lib/pages/pharmacies/screens/product-details/product-detail.dart b/lib/pages/pharmacies/screens/product-details/product-detail.dart index c263f77a..63765ed4 100644 --- a/lib/pages/pharmacies/screens/product-details/product-detail.dart +++ b/lib/pages/pharmacies/screens/product-details/product-detail.dart @@ -357,9 +357,8 @@ convertCityName(txt) { addToCartFunction(quantity, itemID, BuildContext context) async { GifLoaderDialogUtils.showMyDialog(context); ProductDetailViewModel x = new ProductDetailViewModel(); - await x.addToCartData(quantity, itemID).then((value) { - GifLoaderDialogUtils.hideDialog(context); - }); + await x.addToCartData(quantity, itemID); + GifLoaderDialogUtils.hideDialog(context); } notifyMeWhenAvailable(context, itemId) async { diff --git a/lib/widgets/buttons/secondary_button.dart b/lib/widgets/buttons/secondary_button.dart index 9d5df436..4b2f23a9 100644 --- a/lib/widgets/buttons/secondary_button.dart +++ b/lib/widgets/buttons/secondary_button.dart @@ -29,7 +29,7 @@ class SecondaryButton extends StatefulWidget { this.small = false, this.disabled = false, this.borderColor, - this.noBorderRadius = false, this.borderRadius}) + this.noBorderRadius = false, this.borderRadius, this.disableColor}) : super(key: key); final String label; @@ -44,6 +44,7 @@ class SecondaryButton extends StatefulWidget { final bool disabled; final bool noBorderRadius; final double borderRadius; + final Color disableColor; @@ -183,7 +184,7 @@ class _SecondaryButtonState extends State height: 100, decoration: BoxDecoration( color: widget.disabled - ? Colors.grey + ? widget.disableColor??Colors.grey : widget.color ?? Theme.of(context).buttonColor), ), ),