fixed issues

merge-update-with-lab-changes
Fatimah Alshammari 5 years ago
parent 42e74759e4
commit 044f74865e

@ -585,6 +585,7 @@ const Map localizedValues = {
"remeberthat": {"en": "Remember that", "ar": "تذكر ذلك:"}, "remeberthat": {"en": "Remember that", "ar": "تذكر ذلك:"},
"loginToUseService": {"en": "You need to login to use this service", "ar": "هذة الخدمة تتطلب تسجيل الدخول"}, "loginToUseService": {"en": "You need to login to use this service", "ar": "هذة الخدمة تتطلب تسجيل الدخول"},
"offersAndPromotions": {"en": "OFFERS & SPECIAL PROMOTIONS", "ar": "العروض والترقيات الخاصة"}, "offersAndPromotions": {"en": "OFFERS & SPECIAL PROMOTIONS", "ar": "العروض والترقيات الخاصة"},
"offers": {"en": "OFFERS", "ar": "العروض"},
"myPrescriptions": {"en": "MY PRESCRIPTIONS", "ar": "وصفاتي"}, "myPrescriptions": {"en": "MY PRESCRIPTIONS", "ar": "وصفاتي"},
"searchAndScanMedication": {"en": "SEARCH & SCAN FOR MEDICATION", "ar": "البحث والمسح للأدوية"}, "searchAndScanMedication": {"en": "SEARCH & SCAN FOR MEDICATION", "ar": "البحث والمسح للأدوية"},
"shopByBrands": {"en": "Shop by Brands", "ar": "تسوق حسب الماركات"}, "shopByBrands": {"en": "Shop by Brands", "ar": "تسوق حسب الماركات"},

@ -33,7 +33,7 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
builder: (BuildContext context, OffersCategoriseViewModel model, builder: (BuildContext context, OffersCategoriseViewModel model,
Widget child) => Widget child) =>
PharmacyAppScaffold( PharmacyAppScaffold(
appBarTitle: 'Offers', appBarTitle: TranslationBase.of(context).offers,
isShowAppBar: true, isShowAppBar: true,
backgroundColor: Colors.white, backgroundColor: Colors.white,
isShowDecPage: false, isShowDecPage: false,

@ -60,7 +60,7 @@ class _ProductBrandsPageState extends State<ProductBrandsPage> {
height: 10, height: 10,
), ),
Container( Container(
height: MediaQuery.of(context).size.height * 0.056, height: MediaQuery.of(context).size.height * 0.076,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(5.0), borderRadius: BorderRadius.circular(5.0),
color: Colors.white, color: Colors.white,
@ -95,7 +95,7 @@ class _ProductBrandsPageState extends State<ProductBrandsPage> {
height: 10, height: 10,
), ),
Container( Container(
height: 420, height: 250,
width: double.infinity, width: double.infinity,
color: Colors.white, color: Colors.white,
child: ListView.builder( child: ListView.builder(

@ -86,7 +86,7 @@ class _FooterWidgetState extends State<FooterWidget> {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
), ),
Container( Container(
height: 50.0, height: 35.0,
child: ListView( child: ListView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
children: <Widget>[ children: <Widget>[

@ -52,10 +52,12 @@ class _SearchBrandsPageState extends State<SearchBrandsPage> {
prefixIcon: Icon(Icons.search), prefixIcon: Icon(Icons.search),
inputAction: TextInputAction.search, inputAction: TextInputAction.search,
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny(RegExp("[\u0621-\u064a-\ ]")) FilteringTextInputFormatter.allow(RegExp(r'([A-Za-z0-9 a space])')
// ("[\u0621-\u064a-\ ]")
)
], ],
validator: (value) { validator: (value) {
RegExp regExp = RegExp('[\u0621-\u064a-\ ]'); RegExp regExp = RegExp(r'([A-Za-z0-9 a space])');
if (value.isEmpty) { if (value.isEmpty) {
TranslationBase.of(context).pleaseEnterProductName; TranslationBase.of(context).pleaseEnterProductName;
}else if (regExp.hasMatch(value)){ }else if (regExp.hasMatch(value)){

@ -125,12 +125,12 @@ class ProductTileItem extends StatelessWidget {
], ],
), ),
Padding( Padding(
padding: EdgeInsets.fromLTRB(4,2,4,2), padding: EdgeInsets.fromLTRB(1,1,1,1),
child: Container( child: Container(
// width: item.rxMessage != null width: item.rxMessage != null
// ? MediaQuery.of(context).size.width / 5 ? MediaQuery.of(context).size.width / 1.0
// : 0, : 0,
// padding: EdgeInsets.fromLTRB(6,4,6,4), padding: EdgeInsets.fromLTRB(8,2,8,2),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xffb23838), color: Color(0xffb23838),

@ -59,11 +59,11 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
prefixIcon: Icon(Icons.search), prefixIcon: Icon(Icons.search),
inputAction: TextInputAction.search, inputAction: TextInputAction.search,
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny( FilteringTextInputFormatter.allow(
RegExp("[\u0621-\u064a-\ ]")) RegExp(r'([A-Za-z0-9 a space])'))
], ],
validator: (value) { validator: (value) {
RegExp regExp = RegExp('[\u0621-\u064a-\ ]'); RegExp regExp = RegExp(r'([A-Za-z0-9 a space])');
if (value.isEmpty) { if (value.isEmpty) {
TranslationBase.of(context) TranslationBase.of(context)
.pleaseEnterProductName; .pleaseEnterProductName;

@ -1072,6 +1072,8 @@ class TranslationBase {
String get offersAndPromotions => localizedValues['offersAndPromotions'][locale.languageCode]; String get offersAndPromotions => localizedValues['offersAndPromotions'][locale.languageCode];
String get offers => localizedValues['offers'][locale.languageCode];
String get review => localizedValues['review'][locale.languageCode]; String get review => localizedValues['review'][locale.languageCode];
String get deliveredOrder => localizedValues['deliveredOrder'][locale.languageCode]; String get deliveredOrder => localizedValues['deliveredOrder'][locale.languageCode];

Loading…
Cancel
Save