Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bottom sheet functions

Browse Source
merge-requests/424/head
Elham Rababh 4 years ago
parent 944bbce1bf
commit 8fac62bcb1
5 changed files with 70 additions and 57 deletions
Show Stats Download Patch File Download Diff File

4
lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
Unescape Escape View File

@ -49,7 +49,7 @@ class ProductDetailViewModel extends BaseViewModel{
Future notifyMe(customerId, itemID) async {
hasError = false;
setState(ViewState.Busy);
setState(ViewState.BusyLocal);
await _productDetailService.notifyMe(customerId, itemID);
if (_productDetailService.hasError) {
error = _productDetailService.error;
@ -60,7 +60,7 @@ class ProductDetailViewModel extends BaseViewModel{
Future addToCartData(quantity, itemID) async {
hasError = false;
setState(ViewState.Busy);
setState(ViewState.BusyLocal);
await _productDetailService.addToCart(quantity, itemID);
if (_productDetailService.hasError) {
error = _productDetailService.error;

80
lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart
Unescape Escape View File

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/footor/quantity_box.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
@ -10,6 +11,7 @@ import 'package:hexcolor/hexcolor.dart';
import '../../../../../locator.dart';
import '../../../../../routes.dart';
import '../../cart-order-page.dart';
import '../product-detail.dart';
class FooterWidget extends StatefulWidget {
final bool isAvailable;
@ -18,13 +20,17 @@ class FooterWidget extends StatefulWidget {
final int quantityLimit;
final PharmacyProduct item;
final Function addToCartFunction;
final ProductDetailViewModel model;
int quantity;
bool isOverQuantity;
FooterWidget(this.isAvailable, this.maxQuantity, this.minQuantity,
this.quantityLimit, this.item,
{this.quantity, this.isOverQuantity = false, this.addToCartFunction});
{this.quantity,
this.isOverQuantity = false,
this.addToCartFunction,
this.model});
@override
_FooterWidgetState createState() => _FooterWidgetState();
@ -98,38 +104,31 @@ class _FooterWidgetState extends State<FooterWidget> {
label: i,
onTapFunc: onChangeValue,
isSelected: widget.quantity == i),
Column(
children: [
Container(
width: 100,
decoration: BoxDecoration(
border:
Border.all(color: Colors.grey[300]),
color: Colors.white,
),
child: TextField(
decoration: InputDecoration(
labelText: 'quantity #'),
onChanged: (text) {
print(widget.quantity);
print(widget.quantityLimit);
if (int.tryParse(text) == null) {
text = '';
Container(
width: 100,
decoration: BoxDecoration(
border: Border.all(color: Colors.grey[300]),
color: Colors.white,
),
child: TextField(
decoration: InputDecoration(
labelText: ' Quantity # '),
onChanged: (text) {
if (int.tryParse(text) == null) {
text = '';
} else {
setState(() {
widget.quantity = int.parse(text);
if (widget.quantity >=
widget.quantityLimit) {
widget.isOverQuantity = true;
} else {
setState(() {
widget.quantity = int.parse(text);
if (widget.quantity >=
widget.quantityLimit) {
widget.isOverQuantity = true;
} else {
widget.isOverQuantity = false;
}
});
widget.isOverQuantity = false;
}
},
),
),
],
});
}
},
),
),
],
),
@ -175,7 +174,7 @@ class _FooterWidgetState extends State<FooterWidget> {
quantityUI = 80;
showUI = false;
} else {
quantityUI = 150;
quantityUI = 160;
showUI = true;
}
});
@ -197,10 +196,13 @@ class _FooterWidgetState extends State<FooterWidget> {
);
} else
await widget.addToCartFunction(
widget.quantity, widget.item.id, context);
quantity: widget.quantity,
itemID: widget.item.id,
model: widget.model);
},
fontWeight: FontWeight.w600,
borderColor: Color(0xFF4CAF50),
borderRadius: 5,
borderRadius: 3,
color: Color(0xFF4CAF50),
),
),
@ -215,14 +217,18 @@ class _FooterWidgetState extends State<FooterWidget> {
widget.quantity > widget.quantityLimit ||
widget.item.rxMessage != null,
onTap: () async {
await widget.addToCartFunction(
widget.quantity, widget.item.id, context);
await widget.addToCartFunction(
quantity: widget.quantity,
itemID: widget.item.id,
model: widget.model);
Navigator.push(
context,
FadePage(page: CartOrderPage()),
);
},
borderRadius: 5,
fontWeight: FontWeight.w600,
borderColor: Colors.grey[800],
borderRadius: 3,
disableColor: Colors.grey[700],
color: !widget.isAvailable && widget.quantity > 0 ||
widget.quantity > widget.quantityLimit ||

22
lib/pages/pharmacies/screens/product-details/product-detail.dart
Unescape Escape View File

@ -103,7 +103,8 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
deleteFromWishlistFunction: () async {
await deleteFromWishlistFunction(itemID: itemID, model: model);
},
isInWishList:isInWishList
isInWishList:isInWishList,
addToCartFunction:addToCartFunction ,
),
body: SingleChildScrollView(
child: Column(
@ -323,6 +324,7 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
quantity: quantity,
isOverQuantity: isOverQuantity,
addToCartFunction: addToCartFunction,
model: model,
),
));
}
@ -338,17 +340,17 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
await model.deleteWishlistData(itemID);
setState(() {});
}
addToCartFunction(
{quantity,
itemID,
ProductDetailViewModel model}) async {
GifLoaderDialogUtils.showMyDialog(context);
await model.addToCartData(quantity, itemID);
GifLoaderDialogUtils.hideDialog(context);
}
}
addToCartFunction(
{quantity,
itemID,
BuildContext context,
ProductDetailViewModel model}) async {
GifLoaderDialogUtils.showMyDialog(context);
await model.addToCartData(quantity, itemID);
GifLoaderDialogUtils.hideDialog(context);
}
notifyMeWhenAvailable(
{itemId, customerId, ProductDetailViewModel model}) async {

7
lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
Unescape Escape View File

@ -23,6 +23,8 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget {
final Function deleteFromWishlistFunction;
final int quantity;
final bool isInWishList;
final Function addToCartFunction;
ProductAppBar(
{Key key,
@ -31,7 +33,7 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget {
this.addToWishlistFunction,
this.quantity,
this.deleteFromWishlistFunction,
this.isInWishList})
this.isInWishList, this.addToCartFunction})
: super(key: key);
AuthenticatedUserObject authenticatedUserObject =
@ -83,7 +85,7 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget {
top:0, right: -1.0,
child: Container(
decoration: BoxDecoration(
color: Colors.red,
color: Colors.red[800],
borderRadius: BorderRadius.circular(15),
),
@ -136,7 +138,6 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget {
await addToCartFunction(
quantity: quantity,
itemID: itemID,
context: context,
model: model);
Navigator.of(context).pop();

14
lib/widgets/buttons/secondary_button.dart
Unescape Escape View File

@ -29,7 +29,10 @@ class SecondaryButton extends StatefulWidget {
this.small = false,
this.disabled = false,
this.borderColor,
this.noBorderRadius = false, this.borderRadius, this.disableColor})
this.noBorderRadius = false,
this.borderRadius,
this.disableColor,
this.fontWeight})
: super(key: key);
final String label;
@ -45,7 +48,7 @@ class SecondaryButton extends StatefulWidget {
final bool noBorderRadius;
final double borderRadius;
final Color disableColor;
final FontWeight fontWeight;
@override
@ -173,7 +176,8 @@ class _SecondaryButtonState extends State<SecondaryButton>
child: ClipRRect(
borderRadius: widget.noBorderRadius
? BorderRadius.all(Radius.circular(0.0))
: BorderRadius.all(Radius.circular(widget.borderRadius??10.0)),
: BorderRadius.all(
Radius.circular(widget.borderRadius ?? 10.0), ),
child: Stack(
children: <Widget>[
Positioned(
@ -184,7 +188,7 @@ class _SecondaryButtonState extends State<SecondaryButton>
height: 100,
decoration: BoxDecoration(
color: widget.disabled
? widget.disableColor??Colors.grey
? widget.disableColor ?? Colors.grey
: widget.color ?? Theme.of(context).buttonColor),
),
),
@ -246,7 +250,7 @@ class _SecondaryButtonState extends State<SecondaryButton>
style: TextStyle(
color: widget.textColor,
fontSize: widget.small ? 12.0 : 14.0,
// fontWeight: FontWeight.w800,
fontWeight: widget.fontWeight,
fontFamily: projectViewModel.isArabic
? 'Cairo'
: 'WorkSans'),

Write Preview
Loading…
Cancel
Save