From 5a91f6a25bb9bc7f1afba7b295cea2f52df8c05c Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Sun, 29 Aug 2021 16:36:56 +0300 Subject: [PATCH] fix issues --- lib/config/config.dart | 4 ++-- lib/config/localized_values.dart | 2 +- lib/main.dart | 3 +++ lib/util/translations_delegate_base.dart | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 7a95022d..8616a2f7 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]"; const ONLY_LETTERS = "[a-zA-Z &'\"]"; const ONLY_DATE = "[0-9/]"; const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; -// const BASE_URL = 'https://hmgwebservices.com/'; -const BASE_URL = 'https://uat.hmgwebservices.com/'; +const BASE_URL = 'https://hmgwebservices.com/'; +// const BASE_URL = 'https://uat.hmgwebservices.com/'; const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh"; const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList"; const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient"; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 234903ba..d3898a92 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -551,7 +551,7 @@ const Map> localizedValues = { "en": "Please enter the code", "ar": "الرجاء ادخال الرمز" }, - "youDon\"tHaveAnyPatient": { + "youDontHaveAnyPatient": { "en": "No data found for the selected search criteria", "ar": "لا توجد بيانات لمعايير البحث المختارة" }, diff --git a/lib/main.dart b/lib/main.dart index 6bfd624a..450c046f 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -5,6 +5,7 @@ import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:firebase_analytics/firebase_analytics.dart'; import 'package:firebase_analytics/observer.dart'; import 'package:firebase_core/firebase_core.dart'; +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:hexcolor/hexcolor.dart'; @@ -56,6 +57,8 @@ class MyApp extends StatelessWidget { TranslationBaseDelegate(), GlobalMaterialLocalizations.delegate, GlobalWidgetsLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + DefaultCupertinoLocalizations.delegate ], supportedLocales: [ const Locale('ar', ''), // Arabic diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index ab07724e..6b2afbf6 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -336,7 +336,7 @@ class TranslationBase { localizedValues['pleaseEnterTheCode'][locale.languageCode]; String get youDontHaveAnyPatient => - localizedValues['youDon\'tHaveAnyPatient'][locale.languageCode]; + localizedValues['youDontHaveAnyPatient'][locale.languageCode]; String get youDoNotHaveAnyItem => localizedValues['youDoNotHaveAnyItem'][locale.languageCode];