From 7ee7ef58c4d41bb07c12502bb618d376e2153f0a Mon Sep 17 00:00:00 2001 From: mosazaid Date: Sun, 6 Dec 2020 14:06:59 +0200 Subject: [PATCH] working on dynamic title on pharmacy --- lib/config/localized_values.dart | 2 ++ lib/pages/pharmacies/screens/cart-order-page.dart | 6 ++++-- lib/pages/pharmacies/screens/cart-order-preview.dart | 2 +- .../pharmacies/screens/pharmacy-terms-conditions-page.dart | 4 ++-- lib/uitl/translations_delegate_base.dart | 2 ++ 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index e60b85a3..7f6eff4e 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1285,5 +1285,7 @@ const Map localizedValues = { "Month": {"en": "MONTH", "ar": "الشهر"}, "point": {"en": "POINT", "ar": "النقاط"}, "riyal": {"en": "RIYAL", "ar": "الريال"}, + "termOfService": {"en": "Terms of service", "ar": "شروط الخدمة"}, + "shoppingCart": {"en": "Shopping Cart", "ar": "عربة التسوق"}, }; diff --git a/lib/pages/pharmacies/screens/cart-order-page.dart b/lib/pages/pharmacies/screens/cart-order-page.dart index 93b4d060..fe5f64b2 100644 --- a/lib/pages/pharmacies/screens/cart-order-page.dart +++ b/lib/pages/pharmacies/screens/cart-order-page.dart @@ -28,9 +28,10 @@ class CartOrderPage extends StatelessWidget { builder: (_, model, wi) => ChangeNotifierProvider.value( value: model.cartResponse, child: AppScaffold( - title: "Shopping Cart", + title: TranslationBase.of(context).shoppingCart, isShowAppBar: true, isShowDecPage: false, + isPharmacy: true, baseViewModel: model, appBarWidget: appBarWidget, backgroundColor: Colors.white, @@ -178,7 +179,8 @@ class CartOrderPage extends StatelessWidget { ) : Container(), bottomSheet: Container( - height: height * 0.15, + height: !(model.cartResponse.shoppingCarts == null || + model.cartResponse.shoppingCarts.length == 0) ? height * 0.15 : 0, color: Colors.white, child: OrderBottomWidget(model.addresses, height), ), diff --git a/lib/pages/pharmacies/screens/cart-order-preview.dart b/lib/pages/pharmacies/screens/cart-order-preview.dart index 262eed28..aed2dbc5 100644 --- a/lib/pages/pharmacies/screens/cart-order-preview.dart +++ b/lib/pages/pharmacies/screens/cart-order-preview.dart @@ -215,7 +215,7 @@ class OrderPreviewPage extends StatelessWidget { ), ), bottomSheet: Container( - height: height * 0.10, + height: model.cartResponse.shoppingCarts != null ? height * 0.10 : 0, color: Colors.white, child: PaymentBottomWidget(model), ), diff --git a/lib/pages/pharmacies/screens/pharmacy-terms-conditions-page.dart b/lib/pages/pharmacies/screens/pharmacy-terms-conditions-page.dart index a26994a0..90d8bcc2 100644 --- a/lib/pages/pharmacies/screens/pharmacy-terms-conditions-page.dart +++ b/lib/pages/pharmacies/screens/pharmacy-terms-conditions-page.dart @@ -9,7 +9,6 @@ import 'package:flutter_html/flutter_html.dart'; import 'package:provider/provider.dart'; class PharmacyTermsConditions extends StatelessWidget { - @override Widget build(BuildContext context) { ProjectViewModel projectProvider = Provider.of(context); @@ -17,9 +16,10 @@ class PharmacyTermsConditions extends StatelessWidget { return BaseView( onModelReady: (model) => model.getUserTermsAndConditionsForEPharmcy(), builder: (_, model, wi) => AppScaffold( - title: "Terms of service", + title: TranslationBase.of(context).termOfService, isShowAppBar: true, isShowDecPage: false, + isPharmacy: true, backgroundColor: Colors.white, baseViewModel: model, body: Container( diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 448baf68..ec9573a7 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -981,6 +981,8 @@ String get fileno => localizedValues['fileno'][locale.languageCode]; String get month => localizedValues['Month'][locale.languageCode]; String get point => localizedValues['point'][locale.languageCode]; String get riyal => localizedValues['riyal'][locale.languageCode]; + String get termOfService => localizedValues['termOfService'][locale.languageCode]; + String get shoppingCart => localizedValues['ShoppingCart'][locale.languageCode]; }