From 832d48971fed004330aab0835b6c1d9ac9bb315b Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 18 Oct 2021 17:36:20 +0300 Subject: [PATCH] updates --- .../pharmacies/widgets/home/GridViewCard.dart | 2 +- .../rate_appointment_clinic.dart | 3 - .../rate_appointment_doctor.dart | 3 - lib/widgets/others/app_scaffold_widget.dart | 126 ++++++++---------- 4 files changed, 54 insertions(+), 80 deletions(-) diff --git a/lib/pages/pharmacies/widgets/home/GridViewCard.dart b/lib/pages/pharmacies/widgets/home/GridViewCard.dart index fd8bdada..8bdaf1f5 100644 --- a/lib/pages/pharmacies/widgets/home/GridViewCard.dart +++ b/lib/pages/pharmacies/widgets/home/GridViewCard.dart @@ -35,7 +35,7 @@ class GridViewCard extends StatelessWidget { text, color: Colors.white, bold: true, - fontSize: SizeConfig.textMultiplier * 1.5, + fontSize: SizeConfig.textMultiplier * 1.3, ), ], ), diff --git a/lib/pages/rateAppointment/rate_appointment_clinic.dart b/lib/pages/rateAppointment/rate_appointment_clinic.dart index 4c1517b2..ae8fe43a 100644 --- a/lib/pages/rateAppointment/rate_appointment_clinic.dart +++ b/lib/pages/rateAppointment/rate_appointment_clinic.dart @@ -49,9 +49,6 @@ class _RateAppointmentClinicState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - SizedBox( - height: 25, - ), Text( TranslationBase.of(context).lastAppointment, style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.64, height: 23 / 16), diff --git a/lib/pages/rateAppointment/rate_appointment_doctor.dart b/lib/pages/rateAppointment/rate_appointment_doctor.dart index c46b6a50..db581123 100644 --- a/lib/pages/rateAppointment/rate_appointment_doctor.dart +++ b/lib/pages/rateAppointment/rate_appointment_doctor.dart @@ -39,9 +39,6 @@ class _RateAppointmentDoctorState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - SizedBox( - height: 25, //5598 - ), Text( TranslationBase.of(context).lastVisit, style: TextStyle( diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index 8e9691e1..cb6bc837 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -7,8 +7,6 @@ import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; -import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart'; -import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; import 'package:diplomaticquarterapp/theme/colors.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; @@ -68,44 +66,43 @@ class AppScaffold extends StatelessWidget { AppBarWidget appBar; final Widget customAppBar; - AppScaffold({ - @required this.body, - this.appBarTitle = '', - this.isLoading = false, - this.isShowAppBar = false, - this.showNewAppBar = false, - this.showNewAppBarTitle = false, - this.hasAppBarParam, - this.bottomSheet, - this.bottomNavigationBar, - this.baseViewModel, - this.floatingActionButton, - this.isPharmacy = false, - this.showPharmacyCart = true, - this.isOfferPackages = false, - this.showOfferPackagesCart = false, - this.title, - this.description, - this.isShowDecPage = true, - this.isBottomBar, - this.backgroundColor, - this.preferredSize = 0.0, - this.appBarIcons, - this.infoList, - this.isHelp = false, - this.icon, - this.showHomeAppBarIcon = true, - this.imagesInfo, - this.showDropDown = false, - this.dropDownList, - this.dropdownIndexValue, - this.dropDownIndexChange, - this.onTap, - appBar, - this.customAppBar, - this.isLocalLoader = false, - this.backButtonTab - }); + AppScaffold( + {@required this.body, + this.appBarTitle = '', + this.isLoading = false, + this.isShowAppBar = false, + this.showNewAppBar = false, + this.showNewAppBarTitle = false, + this.hasAppBarParam, + this.bottomSheet, + this.bottomNavigationBar, + this.baseViewModel, + this.floatingActionButton, + this.isPharmacy = false, + this.showPharmacyCart = true, + this.isOfferPackages = false, + this.showOfferPackagesCart = false, + this.title, + this.description, + this.isShowDecPage = true, + this.isBottomBar, + this.backgroundColor, + this.preferredSize = 0.0, + this.appBarIcons, + this.infoList, + this.isHelp = false, + this.icon, + this.showHomeAppBarIcon = true, + this.imagesInfo, + this.showDropDown = false, + this.dropDownList, + this.dropdownIndexValue, + this.dropDownIndexChange, + this.onTap, + appBar, + this.customAppBar, + this.isLocalLoader = false, + this.backButtonTab}); AppScaffold setOnAppBarCartClick(VoidCallback onClick) { _onCartClick = onClick; @@ -133,22 +130,19 @@ class AppScaffold extends StatelessWidget { onTap: onTap, ) : (isShowAppBar - ? - customAppBar != null - ? customAppBar - : - - appBar = AppBarWidget( - appBarTitle: appBarTitle, - appBarIcons: appBarIcons, - showHomeAppBarIcon: showHomeAppBarIcon, - isPharmacy: isPharmacy, - showPharmacyCart: showPharmacyCart, - isOfferPackages: isOfferPackages, - showOfferPackagesCart: showOfferPackagesCart, - isShowDecPage: isShowDecPage, - backButtonTab: backButtonTab, - ) + ? customAppBar != null + ? customAppBar + : appBar = AppBarWidget( + appBarTitle: appBarTitle, + appBarIcons: appBarIcons, + showHomeAppBarIcon: showHomeAppBarIcon, + isPharmacy: isPharmacy, + showPharmacyCart: showPharmacyCart, + isOfferPackages: isOfferPackages, + showOfferPackagesCart: showOfferPackagesCart, + isShowDecPage: isShowDecPage, + backButtonTab: backButtonTab, + ) : null)), bottomSheet: bottomSheet, body: SafeArea( @@ -179,18 +173,7 @@ class AppScaffold extends StatelessWidget { } buildBodyWidget(context) { - return Stack(children: [ - Center( - child: isLoading - ? CircularProgressIndicator( - backgroundColor: Colors.white, - valueColor: AlwaysStoppedAnimation( - Colors.grey[500], - ), - ) - : body), - isHelp == true ? RobotIcon() : Container() - ]); + return Stack(children: [body, isHelp == true ? RobotIcon() : Container()]); } } @@ -360,11 +343,8 @@ class AppBarWidgetState extends State { icon: Badge( position: BadgePosition.topStart(top: -15, start: -10), badgeContent: Text( - orderPreviewViewModel.cartResponse.quantityCount.toString() /*_badgeText*/, - style: TextStyle( - fontSize: 9, - color: Colors.white, - fontWeight: FontWeight.normal), + orderPreviewViewModel.cartResponse.quantityCount.toString() /*_badgeText*/, + style: TextStyle(fontSize: 9, color: Colors.white, fontWeight: FontWeight.normal), ), child: Icon(Icons.shopping_cart)), color: Colors.white,