From d1e0b6ccd95cf01375f588b6dced6612b9f42e7c Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Wed, 10 Nov 2021 11:42:22 +0300 Subject: [PATCH] fix issue --- lib/pages/final_products_page.dart | 18 ++++- lib/pages/offers_categorise_page.dart | 78 +++++++++++--------- lib/pages/pharmacies/search_brands_page.dart | 12 ++- lib/pages/search_products_page.dart | 41 ++++++---- lib/pages/sub_categorise_page.dart | 2 +- 5 files changed, 93 insertions(+), 58 deletions(-) diff --git a/lib/pages/final_products_page.dart b/lib/pages/final_products_page.dart index 519c8c4d..f65665b5 100644 --- a/lib/pages/final_products_page.dart +++ b/lib/pages/final_products_page.dart @@ -60,6 +60,7 @@ class _FinalProductsPageState extends State { @override Widget build(BuildContext context) { + ProjectViewModel projectProvider = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context); return BaseView( onModelReady: (model) { @@ -228,7 +229,7 @@ class _FinalProductsPageState extends State { ), child: model.finalProducts[index].rxMessage != null ? Texts( - languageID == 'ar' ? model.finalProducts[index].rxMessagen : model.finalProducts[index].rxMessage, + projectProvider.isArabic ? model.finalProducts[index].rxMessagen : model.finalProducts[index].rxMessage, color: Colors.white, regular: true, fontSize: 10, @@ -390,13 +391,22 @@ class _FinalProductsPageState extends State { color: Color(0xffb23838), borderRadius: BorderRadius.only(topLeft: Radius.circular(6)), ), - child: Texts( - model.finalProducts[index].rxMessage != null ? model.finalProducts[index].rxMessage : "", + child:model.finalProducts[index].rxMessage != null + ? Texts( + projectProvider.isArabic ? model.finalProducts[index].rxMessagen : model.finalProducts[index].rxMessage, color: Colors.white, regular: true, fontSize: 10, fontWeight: FontWeight.w600, - ), + ) + : Texts(""), +// Texts( +// model.finalProducts[index].rxMessage != null ? model.finalProducts[index].rxMessage : "", +// color: Colors.white, +// regular: true, +// fontSize: 10, +// fontWeight: FontWeight.w600, +// ), ), ], ), diff --git a/lib/pages/offers_categorise_page.dart b/lib/pages/offers_categorise_page.dart index a9e9622a..a4708830 100644 --- a/lib/pages/offers_categorise_page.dart +++ b/lib/pages/offers_categorise_page.dart @@ -275,7 +275,7 @@ class _OffersCategorisePageState extends State { bottom: 5.0, ), child: Texts( - 'offer' + TranslationBase.of(context).offers .toUpperCase(), color: Colors .red, @@ -338,25 +338,28 @@ class _OffersCategorisePageState extends State { .circular( 6)), ), - child: Texts( - model - .products[ - index] - .rxMessage != - null - ? model - .products[ - index] - .rxMessage - : "", - color: - Colors.white, + child: model.products[index].rxMessage != null + ? Texts( + projectProvider.isArabic + ? model.products[index].rxMessagen + : model.products[index].rxMessage, + color: Colors.white, regular: true, fontSize: 10, - fontWeight: - FontWeight - .w400, - ), + fontWeight: FontWeight.w400, + ): Texts("") +// Texts( +// model.products[index].rxMessage != null ? +// model.products[index].rxMessage +// : "", +// color: +// Colors.white, +// regular: true, +// fontSize: 10, +// fontWeight: +// FontWeight +// .w400, +// ), ), ], ), @@ -508,7 +511,7 @@ class _OffersCategorisePageState extends State { child: Center( child: Texts( - 'offer' + TranslationBase.of(context).offers .toUpperCase(), color: Colors .red, @@ -576,25 +579,28 @@ class _OffersCategorisePageState extends State { .circular( 6)), ), - child: Texts( - model - .products[ - index] - .rxMessage != - null - ? model - .products[ - index] - .rxMessage - : "", - color: - Colors.white, + child: model.products[index].rxMessage != null + ? Texts( + projectProvider.isArabic + ? model.products[index].rxMessagen + : model.products[index].rxMessage, + color: Colors.white, regular: true, fontSize: 10, - fontWeight: - FontWeight - .w400, - ), + fontWeight: FontWeight.w400, + ): Texts("") +// Texts( +// model.products[index].rxMessage != null +// ? model.products[index].rxMessage +// : "", +// color: +// Colors.white, +// regular: true, +// fontSize: 10, +// fontWeight: +// FontWeight +// .w400, +// ), ), ], ), diff --git a/lib/pages/pharmacies/search_brands_page.dart b/lib/pages/pharmacies/search_brands_page.dart index db9dbcb6..7ffe8d26 100644 --- a/lib/pages/pharmacies/search_brands_page.dart +++ b/lib/pages/pharmacies/search_brands_page.dart @@ -1,5 +1,6 @@ import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/brand_view_model.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; @@ -9,6 +10,7 @@ import 'package:diplomaticquarterapp/widgets/input/text_field.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:provider/provider.dart'; class SearchBrandsPage extends StatefulWidget { @override @@ -22,6 +24,7 @@ class _SearchBrandsPageState extends State { @override Widget build(BuildContext context) { + ProjectViewModel projectProvider = Provider.of(context); return BaseView( onModelReady: (model) => model.searchProducts(), builder: (BuildContext context, model, Widget child) => @@ -60,7 +63,7 @@ class _SearchBrandsPageState extends State { RegExp regExp = RegExp(r'([A-Za-z0-9 a space])'); if (value.isEmpty) { TranslationBase.of(context).pleaseEnterProductName; - }else if (regExp.hasMatch(value)){ + }else if (!regExp.hasMatch(value)){ AppToast.showErrorToast(message: TranslationBase.of(context).noArabicLetters); } return null; @@ -112,7 +115,7 @@ class _SearchBrandsPageState extends State { model.searchList.length == 0 ? Container( child: Text( - 'no data' + model.searchList.length.toString()), + TranslationBase.of(context).noData + model.searchList.length.toString()), ) : Expanded( child: Container( @@ -128,8 +131,9 @@ class _SearchBrandsPageState extends State { Padding( padding: const EdgeInsets.all(8.0), child: Container( - child: Text( - model.searchList[index].name, + child: Text( projectProvider.isArabic + ? model.searchList[index].namen + :model.searchList[index].name, style: TextStyle(fontSize: 20), ), ), diff --git a/lib/pages/search_products_page.dart b/lib/pages/search_products_page.dart index b7f08378..8ec9f014 100644 --- a/lib/pages/search_products_page.dart +++ b/lib/pages/search_products_page.dart @@ -1,5 +1,6 @@ import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart'; // import 'package:diplomaticquarterapp/pages/pharmacies/product_detail.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; @@ -13,6 +14,7 @@ import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:provider/provider.dart'; import 'base/base_view.dart'; @@ -28,6 +30,7 @@ class _SearchProductsPageState extends State { @override Widget build(BuildContext context) { + ProjectViewModel projectProvider = Provider.of(context); return BaseView( onModelReady: (model) => model.clearSearchList(), builder: (BuildContext context, PharmacyCategoriseViewModel model, @@ -67,7 +70,7 @@ class _SearchProductsPageState extends State { if (value.isEmpty) { TranslationBase.of(context) .pleaseEnterProductName; - } else if (regExp.hasMatch(value)) { + } else if (!regExp.hasMatch(value)) { AppToast.showErrorToast( message: TranslationBase.of(context) .noArabicLetters); @@ -220,19 +223,29 @@ class _SearchProductsPageState extends State { Radius.circular( 6)), ), - child: Texts( - model.searchList[index] - .rxMessage != - null - ? model - .searchList[index] - .rxMessage - : "", + child: model.searchList[index].rxMessage != null + ? Texts( + projectProvider.isArabic + ? model.searchList[index].rxMessagen + : model.searchList[index].rxMessage, color: Colors.white, regular: true, fontSize: 10, fontWeight: FontWeight.w400, - ), + ): Texts(""), +// Texts( +// model.searchList[index] +// .rxMessage != +// null +// ? model +// .searchList[index] +// .rxMessage +// : "", +// color: Colors.white, +// regular: true, +// fontSize: 10, +// fontWeight: FontWeight.w400, +// ), ), ], ), @@ -245,9 +258,11 @@ class _SearchProductsPageState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ - Texts( - model - .searchList[index].name, + Texts(projectProvider.isArabic + ? model.searchList[index].namen + :model.searchList[index].name, + + // model.searchList[index].name, regular: true, fontSize: 12, fontWeight: FontWeight.w400, diff --git a/lib/pages/sub_categorise_page.dart b/lib/pages/sub_categorise_page.dart index 178b511b..d5309383 100644 --- a/lib/pages/sub_categorise_page.dart +++ b/lib/pages/sub_categorise_page.dart @@ -884,7 +884,7 @@ class _SubCategorisePageState extends State { Padding( padding: const EdgeInsets.all(8.0), child: Text( - 'There is no data', + TranslationBase.of(context).noData, style: TextStyle(fontSize: 30), ), )