Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

language translation fixes

Browse Source
fix_issues
haroon amjad 4 years ago
parent 9096ccd4d4
commit b89c1f03b3
21 changed files with 179 additions and 66 deletions
Show Stats Download Patch File Download Diff File

2
lib/config/localized_values.dart
Unescape Escape View File

@ -823,4 +823,6 @@ const Map localizedValues = {
"ar":
"خدمة التقارير الشهرية: عند تفعيل هذه الخدمة سيقوم النظام بارسال تقرير شهري بشكل آلي على الايميل المسجل والذي يسرد المؤشرات الحيوية ونتائج التحاليل لآخر زيارات تمت بمجموعة الحبيب الطبية."
},
"selectClinic": {"en": "Select Clinic", "ar": " بحث بالعيادة"},
"reviews": {"en": "Reviews", "ar": "تقييمات"},
};

20
lib/core/service/client/base_app_client.dart
Unescape Escape View File

@ -19,7 +19,9 @@ AppSharedPreferences sharedPref = new AppSharedPreferences();
/// onFailure: (String error, int statusCode) {},
/// body: Map();
///
AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>();
AuthenticatedUserObject authenticatedUserObject =
locator<AuthenticatedUserObject>();
class BaseAppClient {
post(String endPoint,
{Map<String, dynamic> body,
@ -42,7 +44,16 @@ class BaseAppClient {
}
body['VersionID'] = VERSION_ID;
body['Channel'] = CHANNEL;
body['LanguageID'] = languageID == 'ar' ? 1 : 2;
body['LanguageID'] = body.containsKey('LanguageID')
? body['LanguageID'] != null
? body['LanguageID']
: languageID == 'ar'
? 1
: 2
: languageID == 'ar'
? 1
: 2;
body['IPAdress'] = IP_ADDRESS;
body['generalid'] = GENERAL_ID;
body['PatientOutSA'] = body.containsKey('PatientOutSA')
@ -80,7 +91,7 @@ class BaseAppClient {
body['PatientID'] =
body['PatientID'] != null ? body['PatientID'] : user['PatientID'];
body['PatientOutSA'] = user['OutSA'];
body['SessionID'] = SESSION_ID;//getSessionId(token);
body['SessionID'] = SESSION_ID; //getSessionId(token);
}
}
@ -117,12 +128,11 @@ class BaseAppClient {
onFailure(
parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
statusCode);
}
} else if (parsed['MessageStatus'] == 1 ||
parsed['SMSLoginRequired'] == true) {
onSuccess(parsed, statusCode);
}else if (!parsed['IsAuthenticated']) {
} else if (!parsed['IsAuthenticated']) {
await logout();
//helpers.showErrorToast('Your session expired Please login agian');

2
lib/pages/BookAppointment/DentalComplaints.dart
Unescape Escape View File

@ -55,7 +55,7 @@ class _DentalComplaintsState extends State<DentalComplaints> {
}
getLanguageID() async {
languageID = await sharedPref.getString(APP_LANGUAGE);
languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
}
getChiefComplaintsList() {

2
lib/pages/BookAppointment/DoctorProfile.dart
Unescape Escape View File

@ -156,7 +156,7 @@ class _DoctorProfileState extends State<DoctorProfile>
child: Text(
"(" +
widget.doctor.noOfPatientsRate.toString() +
" Reviews)",
" " + TranslationBase.of(context).reviews + ")",
style: TextStyle(
fontSize: 14.0,
color: Colors.blue[800],

22
lib/pages/BookAppointment/components/DocAvailableAppointments.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
import 'package:diplomaticquarterapp/models/Appointments/FreeSlot.dart';
import 'package:diplomaticquarterapp/models/Appointments/timeSlot.dart';
@ -49,6 +50,8 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
ScrollController _scrollController;
var language;
@override
void initState() {
// TODO: implement initState
@ -62,6 +65,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
};
WidgetsBinding.instance.addPostFrameCallback((_) async {
getCurrentLanguage();
if (widget.isLiveCareAppointment)
getDoctorScheduledFreeSlots(context, widget.doctor);
else {
@ -88,7 +92,8 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
void _onDaySelected(DateTime day, List events) {
final DateFormat formatter = DateFormat('yyyy-MM-dd');
setState(() {
this.selectedDate = DateUtil.getMonthDayYearDateFormatted(day);
this.selectedDate =
DateUtil.getWeekDayMonthDayYearDateFormatted(day, language);
openTimeSlotsPickerForDate(day, docFreeSlots);
DocAvailableAppointments.selectedDate = formatter.format(day);
print(DocAvailableAppointments.selectedDate);
@ -154,7 +159,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
Widget _buildTableCalendarWithBuilders() {
return TableCalendar(
locale: 'en_US',
locale: language == "en" ? 'en_US' : 'ar_SA',
calendarController: _calendarController,
events: _events,
initialCalendarFormat: CalendarFormat.month,
@ -221,7 +226,6 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
},
markersBuilder: (context, date, events, holidays) {
final children = <Widget>[];
if (events.isNotEmpty) {
children.add(
Positioned(
@ -287,8 +291,8 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
setState(() {
DocAvailableAppointments.selectedDate = dateFormatter
.format(DateUtil.convertStringToDate(freeSlotsResponse[0]));
selectedDate = DateUtil.getMonthDayYearDateFormatted(
DateUtil.convertStringToDate(freeSlotsResponse[0]));
selectedDate = DateUtil.getWeekDayMonthDayYearDateFormatted(
DateUtil.convertStringToDate(freeSlotsResponse[0]), language);
selectedDateJSON = freeSlotsResponse[0];
});
openTimeSlotsPickerForDate(
@ -380,6 +384,14 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
});
}
getCurrentLanguage() async {
var languageID =
await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
setState(() {
this.language = languageID;
});
}
Widget _buildEventsMarker(DateTime date, List events) {
return Container(
decoration: BoxDecoration(

2
lib/pages/BookAppointment/components/SearchByClinic.dart
Unescape Escape View File

@ -102,7 +102,7 @@ class _SearchByClinicState extends State<SearchByClinic> {
width: MediaQuery.of(context).size.width,
child: DropdownButtonHideUnderline(
child: DropdownButton<String>(
hint: new Text("Select Clinic"),
hint: new Text(TranslationBase.of(context).selectClinic),
value: dropdownValue,
items: clinicsList.map((item) {
return new DropdownMenuItem<String>(

2
lib/pages/ToDoList/ToDo.dart
Unescape Escape View File

@ -426,7 +426,7 @@ class _ToDoState extends State<ToDo> {
}
getLanguageID() async {
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
setState(() {
widget.languageID = languageID;
});

2
lib/pages/ToDoList/widgets/upcomingCard.dart
Unescape Escape View File

@ -312,7 +312,7 @@ class _TodoListCardState extends State<TodoListCard> {
}
getLanguageID() async {
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
setState(() {
widget.languageID = languageID;
});

2
lib/pages/livecare/livecare_type_select.dart
Unescape Escape View File

@ -219,7 +219,7 @@ class _LiveCareTypeSelectState extends State<LiveCareTypeSelect> {
}
getLanguageID() async {
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
setState(() {
this.languageID = languageID;
});

2
lib/pages/livecare/widgets/clinic_list.dart
Unescape Escape View File

@ -357,7 +357,7 @@ class _clinic_listState extends State<ClinicList> {
}
getLanguageID() async {
languageID = await sharedPref.getString(APP_LANGUAGE);
languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
}
getLiveCareClinicsList() {

15
lib/pages/login/confirm-login.dart
Unescape Escape View File

@ -317,7 +317,6 @@ class _ConfirmLogin extends State<ConfirmLogin> {
.catchError((err) {
print(err);
GifLoaderDialogUtils.hideDialog(context);
});
}
@ -520,7 +519,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
checkIfUserAgreedBefore(CheckActivationCode result) {
print(result);
if (result.isNeedUserAgreement ==true) {
if (result.isNeedUserAgreement == true) {
//move to agreement page.
} else {
insertIMEI();
@ -635,7 +634,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
return InkWell(
onTap: () => {authenticateUser(3, BiometricType.face.index)},
child: RoundedContainer(
backgroundColor: BiometricType.face.index == 1
backgroundColor: checkIfBiometricAvailable(BiometricType.face)
? Colors.white
: Colors.white.withOpacity(.7),
borderColor: Colors.grey,
@ -718,6 +717,16 @@ class _ConfirmLogin extends State<ConfirmLogin> {
}
}
bool checkIfBiometricAvailable(BiometricType biometricType) {
bool isAvailable = false;
if(_availableBiometrics != null) {
for (var i = 0; i < _availableBiometrics.length; i++) {
if (biometricType == _availableBiometrics[i]) isAvailable = true;
}
}
return isAvailable;
}
formatDate(date) {
return DateFormat('MMM dd, yyy, kk:mm').format(date);
}

52
lib/services/appointment_services/GetDoctorsList.dart
Unescape Escape View File

@ -41,7 +41,7 @@ class DoctorsListService extends BaseService {
long = await this.sharedPref.getDouble(USER_LONG);
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
@ -105,7 +105,7 @@ class DoctorsListService extends BaseService {
long = await this.sharedPref.getDouble(USER_LONG);
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
@ -145,7 +145,7 @@ class DoctorsListService extends BaseService {
Future<Map> getDoctorsProfile(
int docID, int clinicID, int projectID, context) async {
Map<String, dynamic> request;
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
@ -180,7 +180,7 @@ class DoctorsListService extends BaseService {
Future<Map> getDoctorFreeSlots(
int docID, int clinicID, int projectID, BuildContext context) async {
Map<String, dynamic> request;
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"DoctorID": docID,
@ -215,7 +215,7 @@ class DoctorsListService extends BaseService {
Future<Map> getDoctorScheduledFreeSlots(int docID, int clinicID,
int projectID, int serviceID, BuildContext context) async {
Map<String, dynamic> request;
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"DoctorID": docID,
@ -258,7 +258,7 @@ class DoctorsListService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"IsForLiveCare": false,
@ -317,7 +317,7 @@ class DoctorsListService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"IsForLiveCare": true,
@ -371,7 +371,7 @@ class DoctorsListService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
@ -415,7 +415,7 @@ class DoctorsListService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
@ -460,7 +460,7 @@ class DoctorsListService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
@ -494,7 +494,7 @@ class DoctorsListService extends BaseService {
Future<Map> getPatientAppointmentCurfewHistory(
bool isActiveAppointment) async {
Map<String, dynamic> request;
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
@ -535,7 +535,7 @@ class DoctorsListService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
@ -588,7 +588,7 @@ class DoctorsListService extends BaseService {
long = await this.sharedPref.getDouble(USER_LONG);
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
@ -635,7 +635,7 @@ class DoctorsListService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
@ -685,7 +685,7 @@ class DoctorsListService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
@ -736,7 +736,7 @@ class DoctorsListService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
@ -781,7 +781,7 @@ class DoctorsListService extends BaseService {
await this.sharedPref.getObject(USER_PROFILE));
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"ClientRequestID": transactionID,
@ -820,7 +820,7 @@ class DoctorsListService extends BaseService {
await this.sharedPref.getObject(USER_PROFILE));
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"AdvanceNumber": advanceNumber,
@ -857,7 +857,7 @@ class DoctorsListService extends BaseService {
await this.sharedPref.getObject(USER_PROFILE));
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"IsForAskYourDoctor": true,
@ -897,7 +897,7 @@ class DoctorsListService extends BaseService {
await this.sharedPref.getObject(USER_PROFILE));
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"VersionID": req.VersionID,
@ -933,7 +933,7 @@ class DoctorsListService extends BaseService {
await this.sharedPref.getObject(USER_PROFILE));
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
@ -992,7 +992,7 @@ class DoctorsListService extends BaseService {
await this.sharedPref.getObject(USER_PROFILE));
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"AppointmentNo": appoNo,
@ -1029,7 +1029,7 @@ class DoctorsListService extends BaseService {
await this.sharedPref.getObject(USER_PROFILE));
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"AppointmentNo": appo.appointmentNo,
@ -1070,7 +1070,7 @@ class DoctorsListService extends BaseService {
await this.sharedPref.getObject(USER_PROFILE));
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"AppointmentDate": appoDate,
@ -1119,7 +1119,7 @@ class DoctorsListService extends BaseService {
await this.sharedPref.getObject(USER_PROFILE));
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"ProjectID": projectID,
@ -1175,7 +1175,7 @@ class DoctorsListService extends BaseService {
await this.sharedPref.getObject(USER_PROFILE));
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {

2
lib/services/authentication/auth_provider.dart
Unescape Escape View File

@ -367,7 +367,7 @@ class AuthProvider with ChangeNotifier {
Future<Map> sendPatientIDSMS(mobileNo, context) async {
Map<String, dynamic> request;
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,

10
lib/services/clinic_services/get_clinic_service.dart
Unescape Escape View File

@ -19,7 +19,7 @@ class ClinicListService extends BaseService {
Future<Map> getClinicsList(context) async {
Map<String, dynamic> request;
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
@ -46,7 +46,7 @@ class ClinicListService extends BaseService {
Future<Map> getActiveAppointmentNo(context) async {
Map<String, dynamic> request;
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
@ -76,7 +76,7 @@ class ClinicListService extends BaseService {
Future<Map> getProjectsList(context) async {
Map<String, dynamic> request;
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
@ -113,7 +113,7 @@ class ClinicListService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"ClinicID": clinicID,
@ -163,7 +163,7 @@ class ClinicListService extends BaseService {
long = await this.sharedPref.getDouble(USER_LONG);
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"ChiefComplaintID": chiefComplaintID,

6
lib/services/covid-drivethru/covid-drivethru.dart
Unescape Escape View File

@ -23,7 +23,7 @@ class CovidDriveThruService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
@ -59,7 +59,7 @@ class CovidDriveThruService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
@ -96,7 +96,7 @@ class CovidDriveThruService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,

16
lib/services/livecare_services/livecare_provider.dart
Unescape Escape View File

@ -25,7 +25,7 @@ class LiveCareService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
@ -62,7 +62,7 @@ class LiveCareService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
@ -99,7 +99,7 @@ class LiveCareService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
@ -137,7 +137,7 @@ class LiveCareService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
// Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
@ -166,7 +166,7 @@ class LiveCareService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
@ -203,7 +203,7 @@ class LiveCareService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
@ -243,7 +243,7 @@ class LiveCareService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
@ -290,7 +290,7 @@ class LiveCareService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,

2
lib/services/smartwatch_integration/SmartWatchIntegrationService.dart
Unescape Escape View File

@ -23,7 +23,7 @@ class SmartWatchIntegrationService extends BaseService {
authUser = data;
}
var languageID = await sharedPref.getString(APP_LANGUAGE);
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Request req = appGlobal.getPublicRequest();
request = {

76
lib/uitl/date_uitl.dart
Unescape Escape View File

@ -112,6 +112,37 @@ class DateUtil {
}
}
/// get month by
/// [month] convert month number in to month name in Arabic
static getMonthArabic(int month) {
switch (month) {
case 1:
return "يناير";
case 2:
return " فبراير";
case 3:
return "مارس";
case 4:
return "أبريل";
case 5:
return "مايو";
case 6:
return "يونيو";
case 7:
return "يوليو";
case 8:
return "أغسطس";
case 9:
return "سبتمبر";
case 10:
return " اكتوبر";
case 11:
return " نوفمبر";
case 12:
return "ديسمبر";
}
}
static getMonthByName(String month) {
switch (month.toLowerCase()) {
case 'january':
@ -172,6 +203,27 @@ class DateUtil {
}
}
/// get month by
/// [weekDay] convert week day in int to week day name arabic
static getWeekDayArabic(int weekDay) {
switch (weekDay) {
case 1:
return "الاثنين";
case 2:
return "الثلاثاء";
case 3:
return "الاربعاء";
case 4:
return "الخميس";
case 5:
return "الجمعه";
case 6:
return "السبت ";
case 7:
return "الاحد";
}
}
/// get data formatted like Apr 26,2020
/// [dateTime] convert DateTime to data formatted
static String getMonthDayYearDateFormatted(DateTime dateTime) {
@ -185,6 +237,30 @@ class DateUtil {
return "";
}
/// get data formatted like Thursday, Apr 26,2020
/// [dateTime] convert DateTime to date formatted
static String getWeekDayMonthDayYearDateFormatted(
DateTime dateTime, String lang) {
if (dateTime != null)
return lang == 'en'
? getDay(dateTime.weekday.getDayOfWeekEnumValue) +
", " +
getMonth(dateTime.month) +
" " +
dateTime.day.toString() +
" " +
dateTime.year.toString()
: getWeekDayArabic(dateTime.weekday) +
", " +
dateTime.day.toString() +
" " +
getMonthArabic(dateTime.month) +
" " +
dateTime.year.toString();
else
return "";
}
/// get data formatted like 26/4/2020
/// [dateTime] convert DateTime to data formatted
static String getDayMonthYearDateFormatted(DateTime dateTime) {

4
lib/uitl/translations_delegate_base.dart
Unescape Escape View File

@ -776,6 +776,10 @@ class TranslationBase {
localizedValues['month-report'][locale.languageCode];
String get infoMonthReport =>
localizedValues['info-month-report'][locale.languageCode];
String get selectClinic =>
localizedValues['selectClinic'][locale.languageCode];
String get reviews =>
localizedValues['reviews'][locale.languageCode];
}
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

2
lib/widgets/in_app_browser/InAppBrowser.dart
Unescape Escape View File

@ -84,7 +84,7 @@ class MyInAppBrowser extends InAppBrowser {
}
getLanguageID() async {
return await sharedPref.getString(APP_LANGUAGE);
return await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
}
getDeviceToken() async {

2
pubspec.yaml
Unescape Escape View File

@ -85,7 +85,7 @@ dependencies:
rating_bar: ^0.2.0
# Calendar
table_calendar: ^2.2.3
table_calendar: ^2.3.0
# SVG Images
flutter_svg: ^0.18.0

Write Preview
Loading…
Cancel
Save