diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index aa786e77..ba89e77a 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -585,6 +585,7 @@ const Map localizedValues = { "remeberthat": {"en": "Remember that", "ar": "تذكر ذلك:"}, "loginToUseService": {"en": "You need to login to use this service", "ar": "هذة الخدمة تتطلب تسجيل الدخول"}, "offersAndPromotions": {"en": "OFFERS & SPECIAL PROMOTIONS", "ar": "العروض والترقيات الخاصة"}, + "offers": {"en": "OFFERS", "ar": "العروض"}, "myPrescriptions": {"en": "MY PRESCRIPTIONS", "ar": "وصفاتي"}, "searchAndScanMedication": {"en": "SEARCH & SCAN FOR MEDICATION", "ar": "البحث والمسح للأدوية"}, "shopByBrands": {"en": "Shop by Brands", "ar": "تسوق حسب الماركات"}, diff --git a/lib/pages/offers_categorise_page.dart b/lib/pages/offers_categorise_page.dart index 2715b2b0..15c3b070 100644 --- a/lib/pages/offers_categorise_page.dart +++ b/lib/pages/offers_categorise_page.dart @@ -33,7 +33,7 @@ class _OffersCategorisePageState extends State { builder: (BuildContext context, OffersCategoriseViewModel model, Widget child) => PharmacyAppScaffold( - appBarTitle: 'Offers', + appBarTitle: TranslationBase.of(context).offers, isShowAppBar: true, backgroundColor: Colors.white, isShowDecPage: false, diff --git a/lib/pages/pharmacies/product-brands.dart b/lib/pages/pharmacies/product-brands.dart index 4ff90706..29146381 100644 --- a/lib/pages/pharmacies/product-brands.dart +++ b/lib/pages/pharmacies/product-brands.dart @@ -60,7 +60,7 @@ class _ProductBrandsPageState extends State { height: 10, ), Container( - height: MediaQuery.of(context).size.height * 0.056, + height: MediaQuery.of(context).size.height * 0.076, decoration: BoxDecoration( borderRadius: BorderRadius.circular(5.0), color: Colors.white, @@ -95,7 +95,7 @@ class _ProductBrandsPageState extends State { height: 10, ), Container( - height: 420, + height: 250, width: double.infinity, color: Colors.white, child: ListView.builder( 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 b8bc5808..977e3e39 100644 --- a/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart +++ b/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart @@ -86,7 +86,7 @@ class _FooterWidgetState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, ), Container( - height: 50.0, + height: 35.0, child: ListView( scrollDirection: Axis.horizontal, children: [ diff --git a/lib/pages/pharmacies/search_brands_page.dart b/lib/pages/pharmacies/search_brands_page.dart index cb1281ff..5794ac55 100644 --- a/lib/pages/pharmacies/search_brands_page.dart +++ b/lib/pages/pharmacies/search_brands_page.dart @@ -52,10 +52,12 @@ class _SearchBrandsPageState extends State { prefixIcon: Icon(Icons.search), inputAction: TextInputAction.search, inputFormatters: [ - FilteringTextInputFormatter.deny(RegExp("[\u0621-\u064a-\ ]")) + FilteringTextInputFormatter.allow(RegExp(r'([A-Za-z0-9 a space])') +// ("[\u0621-\u064a-\ ]") + ) ], validator: (value) { - RegExp regExp = RegExp('[\u0621-\u064a-\ ]'); + RegExp regExp = RegExp(r'([A-Za-z0-9 a space])'); if (value.isEmpty) { TranslationBase.of(context).pleaseEnterProductName; }else if (regExp.hasMatch(value)){ diff --git a/lib/pages/pharmacies/widgets/ProductTileItem.dart b/lib/pages/pharmacies/widgets/ProductTileItem.dart index a24531a5..278fc6aa 100644 --- a/lib/pages/pharmacies/widgets/ProductTileItem.dart +++ b/lib/pages/pharmacies/widgets/ProductTileItem.dart @@ -125,12 +125,12 @@ class ProductTileItem extends StatelessWidget { ], ), Padding( - padding: EdgeInsets.fromLTRB(4,2,4,2), + padding: EdgeInsets.fromLTRB(1,1,1,1), child: Container( -// width: item.rxMessage != null -// ? MediaQuery.of(context).size.width / 5 -// : 0, - // padding: EdgeInsets.fromLTRB(6,4,6,4), + width: item.rxMessage != null + ? MediaQuery.of(context).size.width / 1.0 + : 0, + padding: EdgeInsets.fromLTRB(8,2,8,2), decoration: BoxDecoration( color: Color(0xffb23838), diff --git a/lib/pages/search_products_page.dart b/lib/pages/search_products_page.dart index 954546d7..b7f08378 100644 --- a/lib/pages/search_products_page.dart +++ b/lib/pages/search_products_page.dart @@ -59,11 +59,11 @@ class _SearchProductsPageState extends State { prefixIcon: Icon(Icons.search), inputAction: TextInputAction.search, inputFormatters: [ - FilteringTextInputFormatter.deny( - RegExp("[\u0621-\u064a-\ ]")) + FilteringTextInputFormatter.allow( + RegExp(r'([A-Za-z0-9 a space])')) ], validator: (value) { - RegExp regExp = RegExp('[\u0621-\u064a-\ ]'); + RegExp regExp = RegExp(r'([A-Za-z0-9 a space])'); if (value.isEmpty) { TranslationBase.of(context) .pleaseEnterProductName; diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 134da8bf..6efa2283 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -1072,6 +1072,8 @@ class TranslationBase { String get offersAndPromotions => localizedValues['offersAndPromotions'][locale.languageCode]; + String get offers => localizedValues['offers'][locale.languageCode]; + String get review => localizedValues['review'][locale.languageCode]; String get deliveredOrder => localizedValues['deliveredOrder'][locale.languageCode];