From ad0c8eaffb0ba35a0b227830355a1ddb79a0c43d Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Tue, 5 Oct 2021 15:36:43 +0300 Subject: [PATCH 1/5] fix scaffold --- lib/widgets/others/app_scaffold_widget.dart | 69 ++++++++++----------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index 87976dcb..93bccbd2 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -224,37 +224,36 @@ class AppBarWidgetState extends State { ), centerTitle: true, actions: [ - (widget.isPharmacy && widget.showPharmacyCart) - ? Container() - // ? IconButton( - // icon: Badge( - // shape: BadgeShape.circle, - // badgeContent: - Text(_badgeText, style: TextStyle(color: Colors.white)), - // child: Icon(Icons.shopping_cart)), - // color: Colors.white, - // onPressed: () { - // Navigator.of(context).popUntil(ModalRoute.withName('/')); - // }) - : Container(), + // (widget.isPharmacy && widget.showPharmacyCart) + // ? Container() + // // ? IconButton( + // // icon: Badge( + // // shape: BadgeShape.circle, + // // badgeContent: + // // Text(_badgeText, style: TextStyle(color: Colors.white)), + // // child: Icon(Icons.shopping_cart)), + // // color: Colors.white, + // // onPressed: () { + // // Navigator.of(context).popUntil(ModalRoute.withName('/')); + // // }) + // : Container(), (widget.isOfferPackages && widget.showOfferPackagesCart) - ? Container() - // ? IconButton( - // icon: Badge( - // position: BadgePosition.topStart(top: -15, start: -10), - // badgeContent: Text( - // _badgeText, - // style: TextStyle( - // fontSize: 9, - // color: Colors.white, - // fontWeight: FontWeight.normal), - // ), - // child: Icon(Icons.shopping_cart)), - // color: Colors.white, - // onPressed: () { - // // Cart Click Event - // if (_onCartClick != null) _onCartClick(); - // }) + ? IconButton( + icon: Badge( + position: BadgePosition.topStart(top: -15, start: -10), + badgeContent: Text( + _badgeText, + style: TextStyle( + fontSize: 9, + color: Colors.white, + fontWeight: FontWeight.normal), + ), + child: Icon(Icons.shopping_cart)), + color: Colors.white, + onPressed: () { + // Cart Click Event + if (_onCartClick != null) _onCartClick(); + }) : Container(), if (widget.showHomeAppBarIcon) IconButton( @@ -375,10 +374,10 @@ class _RobotIcon extends State { bottom: -15); } -// setAnimation() async { -// /// await sharedPref.getBool(IS_ROBOT_VISIBLE) || -// // var animation = -// // IS_TEXT_COMPLETED == ? true : false; + // setAnimation() async { + // /// await sharedPref.getBool(IS_ROBOT_VISIBLE) || + // // var animation = + // // IS_TEXT_COMPLETED == ? true : false; -// } + // } } From 594b2710b33fe1d99fab288e286a8d458e3dc6a6 Mon Sep 17 00:00:00 2001 From: mosazaid Date: Tue, 5 Oct 2021 16:11:44 +0300 Subject: [PATCH 2/5] fix bugs pharmacy home --- .../model/pharmacies/PharmacyProduct.dart | 8 +-- lib/core/service/client/base_app_client.dart | 3 +- .../parmacyModule/parmacy_module_service.dart | 7 +- .../pharmacyModule/LastVisitedViewModel.dart | 2 +- lib/pages/landing/home_page.dart | 9 +-- .../screens/pharmacy_module_page.dart | 2 - .../pharmacies/widgets/ProductTileItem.dart | 22 ++++++- .../widgets/home/RecentlyViewedWidget.dart | 66 +++++++++++-------- .../widgets/home/ViewAllHomeWidget.dart | 4 +- .../product_detail_service.dart | 2 +- 10 files changed, 78 insertions(+), 47 deletions(-) diff --git a/lib/core/model/pharmacies/PharmacyProduct.dart b/lib/core/model/pharmacies/PharmacyProduct.dart index f69d035b..dbef5737 100644 --- a/lib/core/model/pharmacies/PharmacyProduct.dart +++ b/lib/core/model/pharmacies/PharmacyProduct.dart @@ -108,10 +108,10 @@ class PharmacyProduct { List manufacturerIds; List reviews; List images; - List attributes; + List attributes; List specifications; - List associatedProductIds; - List tags; + List associatedProductIds; + List tags; int vendorId; String seName; @@ -367,7 +367,7 @@ class PharmacyProduct { }); } if (json['attributes'] != null) { - attributes = new List(); + attributes = new List(); json['attributes'].forEach((v) { attributes.add(v); }); diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index e74a353b..d5e5a207 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -785,7 +785,8 @@ class BaseAppClient { final int statusCode = response.statusCode; print("statusCode :$statusCode"); if (statusCode < 200 || statusCode >= 400 || json == null) { - onFailure('Error While Fetching data', statusCode); + var parsed = json.decode(utf8.decode(response.bodyBytes)); + onFailure(parsed['error']['ErrorEndUserMsg'] ??'Error While Fetching data', statusCode); } else { // var parsed = json.decode(response.body.toString()); var parsed = json.decode(utf8.decode(response.bodyBytes)); diff --git a/lib/core/service/parmacyModule/parmacy_module_service.dart b/lib/core/service/parmacyModule/parmacy_module_service.dart index d982c519..b32b86e0 100644 --- a/lib/core/service/parmacyModule/parmacy_module_service.dart +++ b/lib/core/service/parmacyModule/parmacy_module_service.dart @@ -113,7 +113,6 @@ class PharmacyModuleService extends BaseService { } Future getTopManufacturerList() async { - hasError = false; Map queryParams = {'page': '1', 'limit': '8'}; try { await baseAppClient.getPharmacy(GET_PHARMACY_TOP_MANUFACTURER, @@ -125,6 +124,7 @@ class PharmacyModuleService extends BaseService { manufacturerList.add(Manufacturer.fromJson(item)); // } }); + hasError = false; }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; @@ -146,6 +146,7 @@ class PharmacyModuleService extends BaseService { response['products'].forEach((item) { bestSellerProducts.add(PharmacyProduct.fromJson(item)); }); + hasError = false; }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; @@ -161,6 +162,7 @@ class PharmacyModuleService extends BaseService { null) { lastVisited = await this.sharedPref.getString(PHARMACY_LAST_VISITED_PRODUCTS); + // lastVisited = "2458,4561"; try { await baseAppClient .getPharmacy("$GET_PHARMACY_PRODUCTs_BY_IDS$lastVisited", @@ -169,8 +171,9 @@ class PharmacyModuleService extends BaseService { response['products'].forEach((item) { lastVisitedProducts.add(PharmacyProduct.fromJson(item)); }); + hasError = false; }, onFailure: (String error, int statusCode) { - hasError = true; + hasError = true; // sharedPref.setString(PHARMACY_LAST_VISITED_PRODUCTS, ""); super.error = error; }); } catch (error) { diff --git a/lib/core/viewModels/pharmacyModule/LastVisitedViewModel.dart b/lib/core/viewModels/pharmacyModule/LastVisitedViewModel.dart index efc628d6..f38851d9 100644 --- a/lib/core/viewModels/pharmacyModule/LastVisitedViewModel.dart +++ b/lib/core/viewModels/pharmacyModule/LastVisitedViewModel.dart @@ -13,7 +13,7 @@ class LastVisitedViewModel extends BaseViewModel { _pharmacyService.lastVisitedProducts; getLastVisitedProducts() async { - setState(ViewState.Busy); + setState(ViewState.BusyLocal); await _pharmacyService.getLastVisitedProducts(); if (_pharmacyService.hasError) { error = _pharmacyService.error; diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index a34f3b57..acc05e71 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -825,15 +825,10 @@ class _HomePageState extends State { } else { GifLoaderDialogUtils.showMyDialog(context); await pharmacyModuleViewModel.generatePharmacyToken().then((value) async { - if (pharmacyModuleViewModel.error.isNotEmpty) { - await pharmacyModuleViewModel.verifyCustomer().then((value) { - GifLoaderDialogUtils.hideDialog(context); - Navigator.push(context, FadePage(page: LandingPagePharmacy())); - }); - } else { + await pharmacyModuleViewModel.verifyCustomer().then((value) { GifLoaderDialogUtils.hideDialog(context); Navigator.push(context, FadePage(page: LandingPagePharmacy())); - } + }); }); } } diff --git a/lib/pages/pharmacies/screens/pharmacy_module_page.dart b/lib/pages/pharmacies/screens/pharmacy_module_page.dart index 755b5cef..f62ebcef 100644 --- a/lib/pages/pharmacies/screens/pharmacy_module_page.dart +++ b/lib/pages/pharmacies/screens/pharmacy_module_page.dart @@ -45,10 +45,8 @@ class _PharmacyPageState extends State { return BaseView( onModelReady: (model) async { - // GifLoaderDialogUtils.showMyDialog(context); await model.getSavedLanguage(); await model.getBannerList(); - // GifLoaderDialogUtils.hideDialog(context); }, allowAny: true, builder: (_, model, wi) => AppScaffold( diff --git a/lib/pages/pharmacies/widgets/ProductTileItem.dart b/lib/pages/pharmacies/widgets/ProductTileItem.dart index b7a061d5..149b7860 100644 --- a/lib/pages/pharmacies/widgets/ProductTileItem.dart +++ b/lib/pages/pharmacies/widgets/ProductTileItem.dart @@ -24,6 +24,7 @@ class ProductTileItem extends StatelessWidget { void _saveLastVisitProducts() async { String lastVisited = ""; bool isIdExist = false; + List items = []; if (await this.sharedPref.getString(PHARMACY_LAST_VISITED_PRODUCTS) != null) { lastVisited = @@ -32,8 +33,27 @@ class ProductTileItem extends StatelessWidget { if (id == item.id) { isIdExist = true; } + items.add(id); }); } + + if(items.length >= 15){ + items.removeAt(0); + // lastVisited = lastVisited.replaceFirst(RegExp('$itemToRemove'), ''); + } + + lastVisited = ""; + for(int i = items.length - 1; i >= 0; i--){ + if (lastVisited == "") { + // it means there is no lastVisited yet + lastVisited = "${items[i]}"; + } else { + // there is lastVisited id's and this product id is not found + lastVisited += ",${items[i]}"; + } + } + + if (!isIdExist) { if (lastVisited == "") { // it means there is no lastVisited yet @@ -42,8 +62,8 @@ class ProductTileItem extends StatelessWidget { // there is lastVisited id's and this product id is not found lastVisited += ",${item.id}"; } - sharedPref.setString(PHARMACY_LAST_VISITED_PRODUCTS, lastVisited); } + sharedPref.setString(PHARMACY_LAST_VISITED_PRODUCTS, lastVisited); } @override diff --git a/lib/pages/pharmacies/widgets/home/RecentlyViewedWidget.dart b/lib/pages/pharmacies/widgets/home/RecentlyViewedWidget.dart index b07c6da6..aaedee65 100644 --- a/lib/pages/pharmacies/widgets/home/RecentlyViewedWidget.dart +++ b/lib/pages/pharmacies/widgets/home/RecentlyViewedWidget.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/LastVisitedViewModel.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; @@ -15,31 +16,44 @@ class RecentlyViewedWidget extends StatelessWidget { onModelReady: (model) => model.getLastVisitedProducts(), allowAny: true, builder: (_, model, wi) => NetworkBaseView( - isLocalLoader: true, - baseViewModel: model, - child: Container( - child: Column( - children: [ - ViewAllHomeWidget( - TranslationBase.of(context).recentlyViewed, - FinalProductsPage( - id: "", - productType: 3, - )), - Container( - height: model.lastVisitedProducts.length > 0 - ? MediaQuery.of(context).size.height / 4 + 20 - : 0, - child: ListView.builder( - itemBuilder: (ctx, i) => - ProductTileItem(model.lastVisitedProducts[i]), - scrollDirection: Axis.horizontal, - itemCount: model.lastVisitedProducts.length, - ), + isLocalLoader: true, + baseViewModel: model, + child: Container( + child: Column( + children: [ + ViewAllHomeWidget( + TranslationBase.of(context).recentlyViewed, + FinalProductsPage( + id: "", + productType: 3, + )), + if (model.state != ViewState.BusyLocal) + Container( + height: model.lastVisitedProducts.length > 0 + ? MediaQuery.of(context).size.height / 4 + 20 + : 0, + child: ListView.builder( + itemBuilder: (ctx, i) => + ProductTileItem(model.lastVisitedProducts[i]), + scrollDirection: Axis.horizontal, + itemCount: model.lastVisitedProducts.length, + ), + ) + else + Container( + height: 80, + child: Center( + child:CircularProgressIndicator( + backgroundColor: Colors.white, + valueColor: AlwaysStoppedAnimation( + Colors.grey[500], + ), + ), + ), + ), + ], ), - ], - ), - ), - )); + ), + )); } -} \ No newline at end of file +} diff --git a/lib/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart b/lib/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart index 25981466..93a9df0c 100644 --- a/lib/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart +++ b/lib/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart @@ -14,7 +14,7 @@ class ViewAllHomeWidget extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - margin: EdgeInsets.fromLTRB(10, 10, 10, 10), + margin: EdgeInsets.fromLTRB(16, 10, 16, 10), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -28,7 +28,7 @@ class ViewAllHomeWidget extends StatelessWidget { borderColor: Colors.green, textColor: Colors.green, vPadding: 6, - hPadding: 4, + hPadding: 8, handler: () { Navigator.push( context, diff --git a/lib/services/pharmacy_services/product_detail_service.dart b/lib/services/pharmacy_services/product_detail_service.dart index f85faf2c..0f86df23 100644 --- a/lib/services/pharmacy_services/product_detail_service.dart +++ b/lib/services/pharmacy_services/product_detail_service.dart @@ -98,7 +98,7 @@ class ProductDetailService extends BaseService { }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - AppToast.showErrorToast(message: 'something went wrong please try again'); + AppToast.showErrorToast(message: super.error??'something went wrong please try again'); }, body: request); } From 6acb8031d09d8b54e861b588d67f938ab456b8ee Mon Sep 17 00:00:00 2001 From: mosazaid Date: Tue, 5 Oct 2021 16:23:54 +0300 Subject: [PATCH 3/5] fix bugs pharmacy home --- .../pharmacyModule/BestSellerViewModel.dart | 12 ++-- .../pharmacyModule/BrandViewModel.dart | 12 ++-- .../pharmacyModule/LastVisitedViewModel.dart | 10 ++-- .../pharmacy_module_view_model.dart | 2 +- lib/pages/landing/home_page.dart | 1 + .../widgets/home/BestSellerWidget.dart | 15 ++++- .../widgets/home/RecentlyViewedWidget.dart | 4 +- .../widgets/home/ShopByBrandWidget.dart | 55 ++++++++++++------- .../widgets/home/ViewAllHomeWidget.dart | 4 +- 9 files changed, 72 insertions(+), 43 deletions(-) diff --git a/lib/core/viewModels/pharmacyModule/BestSellerViewModel.dart b/lib/core/viewModels/pharmacyModule/BestSellerViewModel.dart index f530999b..b03ee5b9 100644 --- a/lib/core/viewModels/pharmacyModule/BestSellerViewModel.dart +++ b/lib/core/viewModels/pharmacyModule/BestSellerViewModel.dart @@ -13,14 +13,14 @@ class BestSellerViewModel extends BaseViewModel { _pharmacyService.bestSellerProducts; getBestSellerProducts() async { - setState(ViewState.Busy); + setState(ViewState.BusyLocal); await _pharmacyService.getBestSellerProducts(); - if (_pharmacyService.hasError) { - error = _pharmacyService.error; - setState(ViewState.Error); - } else { + // if (_pharmacyService.hasError) { + // error = _pharmacyService.error; + // setState(ViewState.Error); + // } else { setState(ViewState.Idle); - } + // } } } \ No newline at end of file diff --git a/lib/core/viewModels/pharmacyModule/BrandViewModel.dart b/lib/core/viewModels/pharmacyModule/BrandViewModel.dart index 8ffc057a..c1cdc8bc 100644 --- a/lib/core/viewModels/pharmacyModule/BrandViewModel.dart +++ b/lib/core/viewModels/pharmacyModule/BrandViewModel.dart @@ -11,14 +11,14 @@ class BrandViewModel extends BaseViewModel { List get manufacturerList => _pharmacyService.manufacturerList; Future getTopManufacturerList() async { - setState(ViewState.Busy); + setState(ViewState.BusyLocal); await _pharmacyService.getTopManufacturerList(); - if (_pharmacyService.hasError) { - error = _pharmacyService.error; - setState(ViewState.Error); - } else { + // if (_pharmacyService.hasError) { + // error = _pharmacyService.error; + // setState(ViewState.Error); + // } else { setState(ViewState.Idle); - } + // } } @override diff --git a/lib/core/viewModels/pharmacyModule/LastVisitedViewModel.dart b/lib/core/viewModels/pharmacyModule/LastVisitedViewModel.dart index f38851d9..568e56f8 100644 --- a/lib/core/viewModels/pharmacyModule/LastVisitedViewModel.dart +++ b/lib/core/viewModels/pharmacyModule/LastVisitedViewModel.dart @@ -15,11 +15,11 @@ class LastVisitedViewModel extends BaseViewModel { getLastVisitedProducts() async { setState(ViewState.BusyLocal); await _pharmacyService.getLastVisitedProducts(); - if (_pharmacyService.hasError) { - error = _pharmacyService.error; - setState(ViewState.Error); - } else { + // if (_pharmacyService.hasError) { + // error = _pharmacyService.error; + // setState(ViewState.Error); + // } else { setState(ViewState.Idle); - } + // } } } \ No newline at end of file diff --git a/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart b/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart index 3f986bcc..facccf1e 100644 --- a/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart +++ b/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart @@ -40,7 +40,7 @@ class PharmacyModuleViewModel extends BaseViewModel { } Future verifyCustomer() async { - if (authenticatedUserObject.isLogin) await generatePharmacyToken(); + // if (authenticatedUserObject.isLogin) await generatePharmacyToken(); var data = await sharedPref.getObject(USER_PROFILE); var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID); diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index acc05e71..4e19386b 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -825,6 +825,7 @@ class _HomePageState extends State { } else { GifLoaderDialogUtils.showMyDialog(context); await pharmacyModuleViewModel.generatePharmacyToken().then((value) async { + await pharmacyModuleViewModel.verifyCustomer().then((value) { GifLoaderDialogUtils.hideDialog(context); Navigator.push(context, FadePage(page: LandingPagePharmacy())); diff --git a/lib/pages/pharmacies/widgets/home/BestSellerWidget.dart b/lib/pages/pharmacies/widgets/home/BestSellerWidget.dart index 5784acaa..baf771b2 100644 --- a/lib/pages/pharmacies/widgets/home/BestSellerWidget.dart +++ b/lib/pages/pharmacies/widgets/home/BestSellerWidget.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/BestSellerViewModel.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; @@ -26,6 +27,7 @@ class BestSellerWidget extends StatelessWidget { id: "", productType: 20, )), + if (model.state != ViewState.BusyLocal) Container( height: MediaQuery.of(context).size.height / 4 + 20, child: ListView.builder( @@ -34,7 +36,18 @@ class BestSellerWidget extends StatelessWidget { scrollDirection: Axis.horizontal, itemCount: model.bestSellerProduct.length, ), - ), + ) else + Container( + height: 80, + child: Center( + child: CircularProgressIndicator( + backgroundColor: Colors.white, + valueColor: AlwaysStoppedAnimation( + Colors.grey[500], + ), + ), + ), + ), ], ), ), diff --git a/lib/pages/pharmacies/widgets/home/RecentlyViewedWidget.dart b/lib/pages/pharmacies/widgets/home/RecentlyViewedWidget.dart index aaedee65..15e9e700 100644 --- a/lib/pages/pharmacies/widgets/home/RecentlyViewedWidget.dart +++ b/lib/pages/pharmacies/widgets/home/RecentlyViewedWidget.dart @@ -18,7 +18,7 @@ class RecentlyViewedWidget extends StatelessWidget { builder: (_, model, wi) => NetworkBaseView( isLocalLoader: true, baseViewModel: model, - child: Container( + child: model.lastVisitedProducts.isNotEmpty ? Container( child: Column( children: [ ViewAllHomeWidget( @@ -53,7 +53,7 @@ class RecentlyViewedWidget extends StatelessWidget { ), ], ), - ), + ) : Container(), )); } } diff --git a/lib/pages/pharmacies/widgets/home/ShopByBrandWidget.dart b/lib/pages/pharmacies/widgets/home/ShopByBrandWidget.dart index 3d892a43..8f4f943d 100644 --- a/lib/pages/pharmacies/widgets/home/ShopByBrandWidget.dart +++ b/lib/pages/pharmacies/widgets/home/ShopByBrandWidget.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/BrandViewModel.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; @@ -15,26 +16,38 @@ class ShopByBrandWidget extends StatelessWidget { onModelReady: (model) => model.getTopManufacturerList(), allowAny: true, builder: (_, model, wi) => NetworkBaseView( - isLocalLoader: true, - baseViewModel: model, - child: Container( - child: Column( - children: [ - ViewAllHomeWidget( - TranslationBase.of(context).shopByBrands, - ProductBrandsPage()), - Container( - height: 100, - child: ListView.builder( - itemBuilder: (ctx, i) => - ManufacturerItem(model.manufacturerList[i]), - scrollDirection: Axis.horizontal, - itemCount: model.manufacturerList.length, - ), + isLocalLoader: true, + baseViewModel: model, + child: Container( + child: Column( + children: [ + ViewAllHomeWidget(TranslationBase.of(context).shopByBrands, + ProductBrandsPage()), + if (model.state != ViewState.BusyLocal) + Container( + height: 100, + child: ListView.builder( + itemBuilder: (ctx, i) => + ManufacturerItem(model.manufacturerList[i]), + scrollDirection: Axis.horizontal, + itemCount: model.manufacturerList.length, + ), + ) + else + Container( + height: 80, + child: Center( + child: CircularProgressIndicator( + backgroundColor: Colors.white, + valueColor: AlwaysStoppedAnimation( + Colors.grey[500], + ), + ), + ), + ), + ], ), - ], - ), - ), - )); + ), + )); } -} \ No newline at end of file +} diff --git a/lib/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart b/lib/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart index 93a9df0c..05c57f2e 100644 --- a/lib/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart +++ b/lib/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart @@ -21,14 +21,16 @@ class ViewAllHomeWidget extends StatelessWidget { Texts( title, bold: true, + fontSize: 16, ), BorderedButton( TranslationBase.of(context).viewAll, hasBorder: true, borderColor: Colors.green, textColor: Colors.green, + fontWeight: FontWeight.bold, vPadding: 6, - hPadding: 8, + hPadding: 14, handler: () { Navigator.push( context, From a9d0b7a14b5c3619d1075697586ca84d0725545a Mon Sep 17 00:00:00 2001 From: mosazaid Date: Tue, 5 Oct 2021 16:42:48 +0300 Subject: [PATCH 4/5] fix bugs pharmacy home --- assets/images/pharmacy_module/bg_1.png | Bin 2898 -> 3581 bytes assets/images/pharmacy_module/bg_2.png | Bin 1463 -> 867 bytes assets/images/pharmacy_module/bg_3.png | Bin 1651 -> 1526 bytes assets/images/pharmacy_module/bg_4.png | Bin 1483 -> 1555 bytes .../pharmacies/widgets/home/BannerPager.dart | 2 +- .../pharmacies/widgets/home/GridViewCard.dart | 13 +++++++++---- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/assets/images/pharmacy_module/bg_1.png b/assets/images/pharmacy_module/bg_1.png index 9505e556868edbfa5c1d80b2e7c4839248b886e4..0155a7b34691cd0035abee52998a3f309bc7c6ca 100644 GIT binary patch literal 3581 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 r+Qd^YuM0vR{%=~c4IBX~$ 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 diff --git a/assets/images/pharmacy_module/bg_3.png b/assets/images/pharmacy_module/bg_3.png index 127c266984f68af8a40dc6f9aa0b95d0d7282ef4..3a28d5f97a3f46e35b4b57837922217cff447101 100644 GIT binary patch delta 1508 zcmVuNk3CL_J4}u_ON=~9iabnw-Sk3vz8LsF1LQ;UN?4RjS(Hm! zl}uZeOtT$WB7@VwzN9npI<(R%Dx3WSdxJoLFX@ zS!bPEXPsMUo?B_2T>t<7V-FPs0000ObW%=J00jmI85$dEYiw<9#m2|T$;{2p(DC#1 z%CrNx00001Vt-3VL_=rL4PpQQ1hh#+K~!ko?VD?tn>G-J>85Ftwn>^M-B=O`8G*QC z`O@`X+KfE~wq@$37~qhTMP-@UnVHpefY zMq?4`Qy%AfB#hdd$78-n{N&gxetfyH>Zj3Ys_ymYLVvCG7%PRgBUO*Vc0{XHq`#Of z5X|9#;VdQ=q;C8 zU-A7zw38D~qN~To7HaZBi@Mso4%pPyzFBSRYJcCXHg&Z>*1fvwacY_MW<3SXTHS!~ zEM}kwlS)T5P6SwsbGMtWMiL4$jBT;rDPVib3F;A~-{`FORcDiKx+)|Tlc6jvvBm}L zWumHp8J2&;3?_d)%LyHH6;3A-w2a2QZ+}GuypU3Sn6A2v8T*1y5Fei}wp!|HkV9tV za({9@){eRw8=vrt1f86#Jnt%k8+NHzNh#rcQ8h{x z{=a>3CP)LTyamOUtNC|xLi>6ZYDgqy0Dl*1>TS3|2G}8K0rfI;>u;?VDu530V)TR|$hVtR%#$&q%MV&3yn8 zcnuB`Cbdr_hq49&md5A)PU+II55T0vtu~aS(%3gG!>+7#n{{UTv#HV9aJ{Zq+<$G+ z2jHft@@3gnRhi~$DWk5eO*uiswupb^?j(I8f(GV5_+44CxlPyTDit6xv?vbQQP(Z# zjZYBhpmf{O^xY@i>%T=cdY+Yr$@;X?rl`VsOoq;iJZ54J?27`5&dkbKW7daa!jsZF zn)SGrU+bjL>O%V%)*GXx+2tH;j#UWUk9KShaUabDK; zuV+0KRZ(;C+7Ii^WBZ!Wv_tEpPeXQE))z`0tX)qj&!(R=cd%7lZnj^ZsI3 z-#TwDhV_+m_3=VbKm6o4FE0c3!_V748eP49JM;j%{{7X)s{a9(?>$lMNgv|?0000< KMNUMnLSTXy=jLbt delta 1634 zcmV-o2A%o#3-b(+B!8k%OjJbx00320fJtqVUS5P;UVvL(fm&aHTV8-$UVvL(fLmUG zTV8-$UVvL(fLmUGTV8-$UVvO*fLvdJU0{J;VS-;`gJ5EVU}J<~WQ1X4g<@reV`heA zXNP5Hhh=DpW@(6LX^CfQiD+wzX={pUY>R4bi)w9*Yi^8eZhwtzZ;fqmj&5*{ZgG!q za*uFwka2U7a&(b$b&_*+l682Lc6pWm|NjyCrr`hp01$LiPE!B|2ODf{ZpO#R$?B-l8RKX9LgU8P%V_4zVN8M`xcdC%dpPgo` ze~2pbp8Kb&Em5J1VJ$BxuDQn^aC%mH0j$K>)mOS2v)D81MnBl|Vhffp-@rLuE4!n( z2HzEOM#kxCp%!4?u`kwNj&;8$wBDOO>ulAbtACsq`?^{xFq2%>o>+MWD8+i=;`+GL zzh3o(*N1$k{t0v= z`J2=wnw)iH55P2bHMev*LZ@IQNlc=+dNW^H+S759ve?N9god)NHnr0OSG7X4_qR41 z5r2JE5}ke(DaD4(MslaaiK_81*0v|C^>$xp;}>>!PgjjyE%P_GkSrB!^>WoGRoFEf zwX$!l@~DSZZQ$yb+sE#n(66iQn1os^Xvq;t_uP9#Zm zQdVN@s?k-6ItqoNo*Q%-yPPOql*cGmF5q&hyT8Sh9x?~Wl)~={{LY81oDRz+AIrMY zpjpc4tkl{r$DGbu1r)}vmU)-$=YIr#(N};3eqpH&VD0V+_R|OWB(x*&At_i7bAR^c zwRh*MbI4HwZzVZM46W-!?x>x>Kj#D)H$yn}obb)4EtYPqqsZJ@+d6Me6{(77zO1cz z1@UORK2E!nVglA~fp2o51T#TXK5I6JjQ;IO{R5X8gft!fFKG*Mxf%>-`hdfBAE`4z#9WvkhXusPbdwW0VffWnUJ{*RK&u8CSQ&lPMi`5Ll zCBRZ4W$9>9oF2=KW4B`n`G3n-B4iT*B4u7kf!#||x^Uo>XVGkGD`^M~o*CV7nFA_M zO9(eE4Yq_JBUTg{In=6d zf+t4(d*_+`UIj{7;zG~ltf&c&j diff --git a/assets/images/pharmacy_module/bg_4.png b/assets/images/pharmacy_module/bg_4.png index 423ab4217680468c4f013c5d09a457d84f852444..234ebe7b4287b0975e21434433605315d29dbc7e 100644 GIT binary patch delta 1538 zcmV+d2L1WV3zH0xBYy!1P)t-s0000pW-}{QD@ko6GiE6}VkbFhFE?c?H)Ja|V=Xvk zEI4E=He@U}WGpviEH`5bV5vYLQQo;PIg33c12HjMo@P~QFupEc}P-uNmF`CRC-HQ zdrMY)OjdkNSA9-ceot9`P+EUbT7OYnfKpt6Q(b{nU4m6!f>mFGR$+u#VTD;@g<4~V zT4aY?WQSa3h<{yXh+b!jUTBJ6Xo_I}|NqP=Xc+(i02p*qPE!B{1_v1$8)|E8ZEnTJ z$H>Xd&CbyA^YqHJ1GoSH00Cl4M?_bB3fUh300fmuL_t(&-qo91ciKi2Mkh|wByDqP z-8!EnKwJdavH>T;27@nPt~#`KV$AvfKcx@SfFz?L(|_fqL2qK^VJ~UVo}*c@5aRVO zpT0ot>&wUYdqN2D^Pkv-YyXW9uXh6#_+wA}ie0(hiO&ktSvA`-kEgbG_fZ@uORC?p zceT9x1EKCy?ear^G`lB9{-7}H4=#m&P?&YW+Rm_k=iJV)&UVNFm#aI#YSnDZtS=TB zLymL?M^EI^tz?J5NYDB#pQn>8k=`Lx{C9nv{IR9Dw|YdKm!L zgu1$7tY1AhC1PnzR|bIUlrA&?6-^mdtxbcR_rk9Y0A>Ga9=UW501mZPVb$86n-cMG zN`Gw)K#j-&pq-O@qzY@(d+}8t@z|v%05pgi0JIC5R#frTrb``w?a~V->0twru(Ft@jTEq&JRx#qp_dcaMspk*nu76UI_x@p{aFFu-E6`IwdX@7amC{Xkf%Twy;0LtmJ>Q^)_tr-QDxplpk zHKuynteKwoGy`tltjp~gx%re?bGPAXMY<_-D|ZB6=`>mMLk}_PW;D0H(rL05BGbyD zORY7zl}e||dg>ucH&2MxjzPuL9JXp2PX6DEC z%B2A_|9zC0HO5VuTlvK$m3}sBYtD}s#*&r#%=h&b>(xKZ!$Km~CvHYQ4ke;gdW)05 zT#xyCL$Z!gC1$rQSx>aHIWM|K0)N&{WLk;jHZXuY+n-ui9@sy)vUvpHjQL^73gleo zP6F2MxVXkmnOnK)e5JQ!tFcOW%#+g6*P1iu$BvP(1F>$dR^9faz=G$&g>UmC^Ia{_fqAGCn^vp0_!?A<>Bj4uDYf&XKyPvM@0bUfcn`$ZjW4L&fZX%gm#32 z|HWl3S6wUhGtJfiEzjpeZhO*Ia7Q?G8)+ZC{Utty?gKl*MQ}%OhF03B_#obgCib4U zBgpe%dHC9NjMP!_R_yHu@Acz#(@H6uJ}G{GCB&Qk=&$wvKdrm~>Q6!lvG?vn_>VWV oVi^EVZ@N`QKo5R<`$~v^0l$#6x))qsDF6Tf07*qoM6N<$f)oPN8~^|S delta 1466 zcmV;r1x5Ok49g3UBYyzoP)t-s00010s#R^aNnW8$VWm)Drchy}QDLP}VWm%Dq)=d` zP+_G|VWv=FrBGp|P+_G|VWm)FrBPz0QDdf3W2RGNr&DF8RAr}CW~fzXs8(mGS7@nN zX{uRjs#{mZ>?Z(tzdAjVR5cva(}O5bFXA{uw`|yW_7V= zcClx7v1oU)X?U_}d9rGGvuk>@YkIS6d$etQv~GO0Zhf_HezkCZws3#8aeuaQfVXmi zw{wBFbb`2ag1B{qxORlOc7(Zig}Hc!x_E}Vd561thr4@-yLzXRx z?)U81>oHe#j(OH8JPoG{d)4OHXWfQ#m0{LrDCdTClOwMdG;_mhhI;^$tcuoaHTwH~ zg?U!Nj(^Ej23cpYoy-l#Xmjkd{(;)x-@p*-D-?6X`UqlfSl`Un471vxcI@zzmAZvXUuqm48o_zF% zjV49LSUZj>QZ{QAnvvp_*JwyOi_8$~0Iez!HWdfC{|LE7Iy0;TuQolKP0wZr9Z)so zw0~G(?W4JCbB)Hd%|3FM6+b#;7!#~Ani9mO6R^qa$WiDFlNewvnPY<3a*khko3bg~ zA+zSLx+R}I>(E^{U4*((HmM8~GG~=;V{G~zp>oKuJ0bfT5Z|#`IyA40JHjysqHLBa zn+$XWpEb@V)e+p$t?QJsW(`j(;r^<`%?4$&>ThSP zS&CC2*w9C-D!@H`)UtvXjXxt_<87{7n_fxdI?>K&B^&G2DeF4;_EkUiKoj3TD1V7r zV{D2BT6mkonYZe6J`Jn>3cImzWVM$7PwI(v`Uqf1iCBG`xWBqKE6d=tf^CinVjHEg zN?5td9N@XBr z<@h1M_Q;C;H~`}WtP`siG5h&8see`1=2Ek|B1=csA{M#RPpl%T3ONC*T#dFlh#0`r zu~zS~#qP0Q7s>;GRXf(JI^4l-SWK7$Z)U%c%@1u30e1Al@8DZH#Y}R)s3y*=cWfR< z##%boK%nBx3Ir<7EF>q-*EpMAfAvSk>NwTjaA^k`mGm$TG%9V=J7<1X-+$O_Mh)Ob zjmz-zYe0#ZR^A>Lb~zSU|7O!0z~%LjmGi7Po2LPM%Co{MT5jOQZD-ofC}UKP`fYiY zK76f*wliJS&-&=?-_URNBepYchINfb)~NV5`(No>eja^XIM9U5QSq}77uNw;g+4Cy z4qv%?IeSv>`U`$`=Q{jq`!nOy$|s;+k_U~xTzwBcydk { ) : CachedNetworkImage( imageUrl: item, - fit: BoxFit.cover, + fit: BoxFit.fitWidth, errorWidget: (context, url, error) => SizedBox()), ), diff --git a/lib/pages/pharmacies/widgets/home/GridViewCard.dart b/lib/pages/pharmacies/widgets/home/GridViewCard.dart index 99425aa1..a8e3fe9b 100644 --- a/lib/pages/pharmacies/widgets/home/GridViewCard.dart +++ b/lib/pages/pharmacies/widgets/home/GridViewCard.dart @@ -29,10 +29,15 @@ class GridViewCard extends StatelessWidget { flex: 2, child: Padding( padding: const EdgeInsets.all(6), - child: Texts( - text, - color: Colors.white, - fontSize: SizeConfig.textMultiplier * 1.5, + child: Column( + children: [ + Texts( + text, + color: Colors.white, + bold: true, + fontSize: SizeConfig.textMultiplier * 1.5, + ), + ], ), ), ), From c56e4a1a5c72d9ef376dd0165b6e59cd33c79622 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Tue, 5 Oct 2021 16:55:22 +0300 Subject: [PATCH 5/5] cart fix --- lib/widgets/buttons/GestureIconButton.dart | 68 ++++++++++------------ 1 file changed, 31 insertions(+), 37 deletions(-) diff --git a/lib/widgets/buttons/GestureIconButton.dart b/lib/widgets/buttons/GestureIconButton.dart index 841d7ea6..329755f6 100644 --- a/lib/widgets/buttons/GestureIconButton.dart +++ b/lib/widgets/buttons/GestureIconButton.dart @@ -3,12 +3,12 @@ import 'package:flutter/material.dart'; class GestureIconButton extends StatefulWidget { GestureIconButton( - this.label, - this.icon, { - Key key, - this.onTap, - this.backgroundColor, - }) : super(key: key); + this.label, + this.icon, { + Key key, + this.onTap, + this.backgroundColor, + }) : super(key: key); final String label; final Widget icon; @@ -29,41 +29,35 @@ class _GestureIconButtonState extends State { setState(() => _buttonLongPress = !_buttonLongPress), onLongPressEnd: (_) => setState(() => _buttonLongPress = !_buttonLongPress), - child: Wrap( - children: [ - Container( - decoration: BoxDecoration( - border: Border.all( - color: widget.backgroundColor != null - ? widget.backgroundColor - : Colors.grey[200], + child: Container( + decoration: BoxDecoration( + border: Border.all( + color: widget.backgroundColor != null + ? widget.backgroundColor + : Colors.grey[200], + ), + color: widget.backgroundColor != null + ? widget.backgroundColor + : Colors.grey.shade200, + borderRadius: BorderRadius.all(Radius.circular(8))), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Container( + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Padding( + padding: const EdgeInsets.only(right: 8.0), + child: widget.icon, ), - color: widget.backgroundColor != null - ? widget.backgroundColor - : Colors.grey.shade200, - borderRadius: BorderRadius.all(Radius.circular(8))), - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Container( - child: Expanded( - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Padding( - padding: const EdgeInsets.only(right: 8.0), - child: widget.icon, - ), - Texts( - widget.label, - color: _buttonLongPress ? Colors.white : Colors.black, - ), - ], - ), + Texts( + widget.label, + color: _buttonLongPress ? Colors.white : Colors.black, ), - ), + ], ), ), - ], + ), ), ); }