Merge branch 'master' into 'diplomatic-quarter-live'

Master

See merge request Cloud_Solution/diplomatic-quarter!80
merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
commit baba683d54

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

@ -547,18 +547,18 @@ const Map<String, Map<String, String>> localizedValues = {
"en": "Please enter the verification code send to", "en": "Please enter the verification code send to",
"ar": "الرجاء إدخال رمز التحقق المرسل إلى" "ar": "الرجاء إدخال رمز التحقق المرسل إلى"
}, },
"EyeMeasurements":{"en":"Eye Measurements","ar":"قياسات النظر"}, "EyeMeasurements": {"en": "Eye Measurements", "ar": "قياسات النظر"},
"Measurements":{"en":"Measurements","ar":"قياسات"}, "Measurements": {"en": "Measurements", "ar": "قياسات"},
"Classes":{"en":"Classes","ar":"نظارات"}, "Classes": {"en": "Classes", "ar": "نظارات"},
"ContactLens":{"en":"Contact Lens","ar":"العدسات اللاصقة"}, "ContactLens": {"en": "Contact Lens", "ar": "العدسات اللاصقة"},
"RightEye":{"en":"Right Eye","ar":"العين اليمين"}, "RightEye": {"en": "Right Eye", "ar": "العين اليمين"},
"Sphere":{"en":"Sphere","ar":"القوة"}, "Sphere": {"en": "Sphere", "ar": "القوة"},
"Cylinder":{"en":"Cylinder","ar":"الدائرية"}, "Cylinder": {"en": "Cylinder", "ar": "الدائرية"},
"Axis":{"en":"Axis","ar":"المحاور"}, "Axis": {"en": "Axis", "ar": "المحاور"},
"Prism":{"en":"Prism","ar":"موشور"}, "Prism": {"en": "Prism", "ar": "موشور"},
"VA":{"en":"Prism","ar":"المحاور"}, "VA": {"en": "Prism", "ar": "المحاور"},
"LeftEye":{"en":"Left Eye","ar":"العين اليسرى"}, "LeftEye": {"en": "Left Eye", "ar": "العين اليسرى"},
"Brand":{"en":"Brand","ar":"النوع"}, "Brand": {"en": "Brand", "ar": "النوع"},
"Power": {"en": "Power", "ar": "القوة"}, "Power": {"en": "Power", "ar": "القوة"},
"Diameter": {"en": "Diameter", "ar": "القطر"}, "Diameter": {"en": "Diameter", "ar": "القطر"},
"Remarks": {"en": "Remarks", "ar": "ملاحضات"}, "Remarks": {"en": "Remarks", "ar": "ملاحضات"},
@ -590,6 +590,11 @@ const Map<String, Map<String, String>> localizedValues = {
"en": "View Doctor Responses", "en": "View Doctor Responses",
"ar": "الاطلاع على ردود الأطباء" "ar": "الاطلاع على ردود الأطباء"
}, },
"ServiceInformationButton": {"en": "LOGIN / REGISTER", "ar": "دخول / تسجيل"},
"ServiceInformationTitle": {
"en": "Service Information",
"ar": "معلومات الخدمة"
},
"ServiceInformation": {"en": "Service Information", "ar": "معلومات الخدمة"}, "ServiceInformation": {"en": "Service Information", "ar": "معلومات الخدمة"},
"HomeHealthCare": { "HomeHealthCare": {
"en": "Home Health Care", "en": "Home Health Care",
@ -601,24 +606,66 @@ const Map<String, Map<String, String>> localizedValues = {
"ar": "ar":
"توفر هذه الخدمة مجموعه من خدمات الرعايه الصحيه المنزلية و متابعه مستمره وشامله للذين لا يستطيعون الوصول للمنشات الصحيه في اماكن اقامتهم (التحاليل المخبرية الاشعة التطعيمات العلاج الطبيعي)... " "توفر هذه الخدمة مجموعه من خدمات الرعايه الصحيه المنزلية و متابعه مستمره وشامله للذين لا يستطيعون الوصول للمنشات الصحيه في اماكن اقامتهم (التحاليل المخبرية الاشعة التطعيمات العلاج الطبيعي)... "
}, },
"LoginRegister": { "LoginRegister": {"en": "Login/Register", "ar": "دخول / تسجيل"},
"en": "Login/Register", "OrderLog": {"en": "Order Log", "ar": " سجل الطلبات"},
"ar": "دخول / تسجيل" "info-lab": {
"en":
"This service allows you to view the results of all laboratory tests performed in Al Habib Medical Group as well as sending the report via e-mail.",
"ar":
"خدمة نتائج المختبر: هذه الخدمة تمكنك من الاطلاع على نتائج جميع الفحوصات المخبرية التي تمت في مجموعة الحبيب الطبية."
}, },
"OrderLog": { "info-radiology": {
"en": "Order Log", "en":
"ar": " سجل الطلبات" "This service allows you to view the reports and photos of radiology in Al Habib Medical Group as well as send the report by e-mail.",
"ar":
"خدمة الاشعة: هذه الخدمة تمكنك من الاطلاع على تقارير وصور الاشعة التي تمت في مجموعة الحبيب الطبية وكذلك ارسال التقرير عن طريق الايميل."
}, },
"ServiceInformationButton":{"en":"LOGIN / REGISTER","ar":"دخول / تسجيل"}, "TermsService": {"en": "Terms of Service", "ar": "شروط الخدمه"},
"ServiceInformationTitle":{"en":"Service Information","ar":"معلومات الخدمة"}, "Beforeusing": {
"info-lab": { "en": "Before using the checkup, please read Terms of Service.",
"en": "This service allows you to view the results of all laboratory tests performed in Al Habib Medical Group as well as sending the report via e-mail.", "ar": "قبل استخدام الفحص ، يرجى قراءة شروط الخدمة"
"ar": "خدمة نتائج المختبر: هذه الخدمة تمكنك من الاطلاع على نتائج جميع الفحوصات المخبرية التي تمت في مجموعة الحبيب الطبية."
}, },
"info-radiology": { "accept": {
"en": "This service allows you to view the reports and photos of radiology in Al Habib Medical Group as well as send the report by e-mail.", "en": "I read and accept Terms of Service and Privacy Policy",
"ar": "خدمة الاشعة: هذه الخدمة تمكنك من الاطلاع على تقارير وصور الاشعة التي تمت في مجموعة الحبيب الطبية وكذلك ارسال التقرير عن طريق الايميل." "ar": "قرأت ووافقت على شروط الخدمة وسياسة الخصوصية"
}, },
"data-safe-info": {
"en":
"Information that you provide is anonymous and not shared with anyone.",
"ar": "المعلومات التي تقدمها لا تتم مشاركتها مع أي شخص"
},
"data-safe": {"en": " Your data is safe.", "ar": "بياناتك آمنة"},
"informational": {
"en":
"Checkup is for informational purposes and is not a qualified medical opinion",
"ar": "الفحص هو لأغراض معلوماتية وليس رأي طبي مؤهل"
},
"not-use-in-emerbency": {
"en": "Do not use in emergencies.",
"ar": "لا تستخدم في حالات الطوارئ"
},
"not-use-in-emerbency-details": {
"en": "In case of health emergency, ",
"ar": "في حالة الطوارئ اتصل بأقرب رقم للطوارئ على الفور"
},
"not-use-in-emerbency-details-call": {
"en": "call the nearest emergency number immediately",
"ar": " اتصل بأقرب رقم للطوارئ على الفور"
},
"check-diagnosis": {
"en": "Checkup is not a diagnosis.",
"ar": "الفحص ليس تشخيص."
},
"remeberthat": {"en": "Remember that", "ar": "تذكر ذلك:"},
"select-gender": {"en": "Select Gender", "ar": "اختر الجنس"},
"i-am-a": {"en": "I am a ...", "ar": "أنا ..."},
"select-age": {"en": "Select Your Age", "ar": "حدد العمر"},
"i-am": {"en": "I am", "ar": "أنا"},
"years-old": {"en": "years old", "ar": "سنة"},
"drag-point": {
"en": "Drag point to change your age",
"ar": "اسحب لتغيير عمرك"
},
}; };

@ -17,6 +17,7 @@ import 'package:diplomaticquarterapp/pages/insurance/insurance_update_screen.dar
import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart';
import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart';
import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart'; import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart';
import 'package:diplomaticquarterapp/pages/symptom-checker/info.dart';
import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/routes.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
@ -224,8 +225,9 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
title: TranslationBase.of(context).todoList, title: TranslationBase.of(context).todoList,
), ),
ServicesContainer( ServicesContainer(
onTap: () => Navigator.of(context).pushNamed( onTap: () => Navigator.push(
SYMPTOM_CHECKER, context,
FadePage(page: SymptomInfo()),
), ),
imageLocation: 'assets/images/new-design/body_icon.png', imageLocation: 'assets/images/new-design/body_icon.png',
title: 'Symptom Checker'), title: 'Symptom Checker'),

@ -0,0 +1,131 @@
import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/routes.dart';
class SymptomInfo extends StatefulWidget {
@override
_SymptomInfo createState() => new _SymptomInfo();
}
class _SymptomInfo extends State<SymptomInfo> {
bool checkValue = false;
@override
Widget build(BuildContext context) {
return AppScaffold(
appBarTitle: TranslationBase.of(context).termsService,
isShowAppBar: true,
body: Padding(
padding: EdgeInsets.all(20),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context).beforeUsing,
fontWeight: FontWeight.bold,
fontSize: 14,
// textAlign: TextAlign.center,
),
Container(
width: MediaQuery.of(context).size.width,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: Colors.white,
),
padding: EdgeInsets.all(30),
margin: EdgeInsets.all(10),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
AppText(TranslationBase.of(context).remeberthat,
fontSize: 16),
SizedBox(
height: 10,
),
AppText(
'1. ' + TranslationBase.of(context).checkDiagnosis,
fontWeight: FontWeight.bold,
fontSize: 16,
),
AppText(TranslationBase.of(context).informational,
fontSize: 16),
SizedBox(
height: 10,
),
AppText(
'2. ' + TranslationBase.of(context).notUseInEmbergency,
fontWeight: FontWeight.bold,
fontSize: 16,
),
AppText(
TranslationBase.of(context).notUseInEmbergencyDetails,
fontSize: 16),
AppText(
TranslationBase.of(context).notUseInEmbergencyCall,
underline: true,
color: Colors.blue,
fontSize: 16),
SizedBox(
height: 10,
),
AppText(
'3.' + TranslationBase.of(context).dataSafe,
fontWeight: FontWeight.bold,
fontSize: 16,
),
AppText(TranslationBase.of(context).dataSafeInfo,
fontSize: 16),
],
),
),
Expanded(
flex: 1,
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
Padding(
padding: EdgeInsets.all(10),
child: CheckboxListTile(
title: AppText(TranslationBase.of(context).accept),
value: checkValue,
onChanged: (newValue) {
setState(() {
this.checkValue = newValue;
});
},
controlAffinity: ListTileControlAffinity
.leading, // <-- leading Checkbox
),
),
Row(
children: <Widget>[
Expanded(
child: DefaultButton(
TranslationBase.of(context).next,
() => {
if (checkValue == true)
{
Navigator.of(context).pushNamed(
SELECT_GENDER,
)
}
},
color: checkValue == true
? Colors.black
: Colors.grey,
textColor: Colors.white,
))
],
),
],
))
],
)));
}
}

@ -0,0 +1,124 @@
import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/routes.dart';
import 'package:flutter_xlider/flutter_xlider.dart';
class SelectGender extends StatefulWidget {
@override
_SelectGender createState() => new _SelectGender();
}
class _SelectGender extends State<SelectGender> {
double slider = 22;
@override
Widget build(BuildContext context) {
return AppScaffold(
appBarTitle: TranslationBase.of(context).gender,
isShowAppBar: true,
body: Padding(
padding: EdgeInsets.all(20),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
AppText(
//TranslationBase.of(context).beforeUsing,
TranslationBase.of(context).selectGender,
fontWeight: FontWeight.bold,
fontSize: 20,
// textAlign: TextAlign.center,
),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
AppText(TranslationBase.of(context).iAma, fontSize: 16),
SizedBox(
height: 10,
),
Row(
children: [
Expanded(
child: Container(
height: 200,
width: 150,
child: Card(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(15.0),
),
shadowColor: Colors.red,
child: Image.asset(
'assets/images/female_face.png')))),
Expanded(
child: Container(
height: 200,
width: 150,
child: Card(
shadowColor: Colors.red,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(15.0),
),
child: Image.asset(
'assets/images/male_face.png'))))
],
),
AppText(TranslationBase.of(context).selectAge,
fontSize: 25),
SizedBox(
height: 10,
),
AppText(
TranslationBase.of(context).iAm +
' ' +
slider.toString() +
' ' +
TranslationBase.of(context)
.yearOld, //TranslationBase.of(context).remeberthat,
fontSize: 16),
SizedBox(
height: 30,
),
FlutterSlider(
values: [slider],
max: 90,
min: 14,
onDragCompleted: (handlerIndex, lowerValue, upperValue) {
print(lowerValue);
print(upperValue);
setState(() {
slider = upperValue;
});
},
),
],
),
Expanded(
flex: 1,
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
Row(
children: <Widget>[
Expanded(
child: DefaultButton(
TranslationBase.of(context).next,
() => {
Navigator.of(context).pushNamed(
SYMPTOM_CHECKER,
)
},
))
],
),
],
))
],
)));
}
}

File diff suppressed because one or more lines are too long

@ -10,6 +10,8 @@ import 'package:diplomaticquarterapp/pages/login/login.dart';
import 'package:diplomaticquarterapp/pages/login/register.dart'; import 'package:diplomaticquarterapp/pages/login/register.dart';
import 'package:diplomaticquarterapp/pages/family/add-family_type.dart'; import 'package:diplomaticquarterapp/pages/family/add-family_type.dart';
import 'package:diplomaticquarterapp/pages/family/add-family-member.dart'; import 'package:diplomaticquarterapp/pages/family/add-family-member.dart';
import 'package:diplomaticquarterapp/pages/symptom-checker/info.dart';
import 'package:diplomaticquarterapp/pages/symptom-checker/select-gender.dart';
import 'package:diplomaticquarterapp/pages/symptom-checker/symtom-checker.dart'; import 'package:diplomaticquarterapp/pages/symptom-checker/symtom-checker.dart';
const String INIT_ROUTE = '/'; const String INIT_ROUTE = '/';
@ -27,6 +29,8 @@ const String ADD_FAMILY_MEMBER_TYPE = 'add-family-member-type';
const String ADD_FAMILY_MEMBER = 'add-family-member'; const String ADD_FAMILY_MEMBER = 'add-family-member';
const String LIVE_CARE = 'live-care'; const String LIVE_CARE = 'live-care';
const String SYMPTOM_CHECKER = 'symptom-checker'; const String SYMPTOM_CHECKER = 'symptom-checker';
const String SYMPTOM_CHECKER_INFO = 'symptom-checker-info';
const String SELECT_GENDER = 'select-gender';
var routes = { var routes = {
HOME: (_) => LandingPage(), HOME: (_) => LandingPage(),
WELCOME_LOGIN: (_) => WelcomeLogin(), WELCOME_LOGIN: (_) => WelcomeLogin(),
@ -40,5 +44,7 @@ var routes = {
ADD_FAMILY_MEMBER_TYPE: (_) => AddFamilyMemberType(), ADD_FAMILY_MEMBER_TYPE: (_) => AddFamilyMemberType(),
ADD_FAMILY_MEMBER: (_) => AddMember(), ADD_FAMILY_MEMBER: (_) => AddMember(),
LIVE_CARE: (_) => LiveCareHome(), LIVE_CARE: (_) => LiveCareHome(),
SYMPTOM_CHECKER: (_) => SymptomChecker() SYMPTOM_CHECKER: (_) => SymptomChecker(),
SYMPTOM_CHECKER_INFO: (_) => SymptomInfo(),
SELECT_GENDER: (_) => SelectGender()
}; };

@ -66,7 +66,8 @@ class DoctorsListService extends BaseService {
// "Latitude": 0, // "Latitude": 0,
// "Longitude": 0, // "Longitude": 0,
// "License": true, // "License": true,
"IsVoiceCommand": doctorId != null && doctorId.length > 0 ? true : false, "SearchForVoiceCommand":
doctorId != null && doctorId.length > 0 ? true : false,
"DoctorIDsList": doctorId, "DoctorIDsList": doctorId,
"Latitude": lat != null ? lat.toString() : 0, "Latitude": lat != null ? lat.toString() : 0,
"Longitude": long != null ? long.toString() : 0, "Longitude": long != null ? long.toString() : 0,
@ -212,8 +213,8 @@ class DoctorsListService extends BaseService {
return Future.value(localRes); return Future.value(localRes);
} }
Future<Map> getDoctorScheduledFreeSlots( Future<Map> getDoctorScheduledFreeSlots(int docID, int clinicID,
int docID, int clinicID, int projectID, int serviceID, BuildContext context) async { int projectID, int serviceID, BuildContext context) async {
Map<String, dynamic> request; Map<String, dynamic> request;
var languageID = await sharedPref.getString(APP_LANGUAGE); var languageID = await sharedPref.getString(APP_LANGUAGE);
Request req = appGlobal.getPublicRequest(); Request req = appGlobal.getPublicRequest();
@ -241,10 +242,10 @@ class DoctorsListService extends BaseService {
await baseAppClient.post(GET_LIVECARE_SCHEDULE_DOCTOR_TIME_SLOTS, await baseAppClient.post(GET_LIVECARE_SCHEDULE_DOCTOR_TIME_SLOTS,
onSuccess: (response, statusCode) async { onSuccess: (response, statusCode) async {
localRes = response; localRes = response;
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
throw error; throw error;
}, body: request); }, body: request);
return Future.value(localRes); return Future.value(localRes);
} }
@ -301,8 +302,14 @@ class DoctorsListService extends BaseService {
return Future.value(localRes); return Future.value(localRes);
} }
Future<Map> insertLiveCareScheduleAppointment(int docID, int clinicID, int projectID, int serviceID, Future<Map> insertLiveCareScheduleAppointment(
String selectedTime, String selectedDate, BuildContext context) async { int docID,
int clinicID,
int projectID,
int serviceID,
String selectedTime,
String selectedDate,
BuildContext context) async {
Map<String, dynamic> request; Map<String, dynamic> request;
if (await this.sharedPref.getObject(USER_PROFILE) != null) { if (await this.sharedPref.getObject(USER_PROFILE) != null) {
@ -348,10 +355,10 @@ class DoctorsListService extends BaseService {
await baseAppClient.post(INSERT_LIVECARE_SCHEDULE_APPOINTMENT, await baseAppClient.post(INSERT_LIVECARE_SCHEDULE_APPOINTMENT,
onSuccess: (response, statusCode) async { onSuccess: (response, statusCode) async {
localRes = response; localRes = response;
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
throw error; throw error;
}, body: request); }, body: request);
return Future.value(localRes); return Future.value(localRes);
} }
@ -437,10 +444,10 @@ class DoctorsListService extends BaseService {
await baseAppClient.post(GET_PATIENT_SHARE_LIVECARE, await baseAppClient.post(GET_PATIENT_SHARE_LIVECARE,
onSuccess: (response, statusCode) async { onSuccess: (response, statusCode) async {
localRes = response['OnlineCheckInAppointments'][0]; localRes = response['OnlineCheckInAppointments'][0];
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
throw error; throw error;
}, body: request); }, body: request);
return Future.value(localRes); return Future.value(localRes);
} }
@ -519,8 +526,8 @@ class DoctorsListService extends BaseService {
return Future.value(localRes); return Future.value(localRes);
} }
Future<Map> confirmAppointment( Future<Map> confirmAppointment(int appoNo, int clinicID, int projectID,
int appoNo, int clinicID, int projectID, bool isLiveCare, BuildContext context) async { bool isLiveCare, BuildContext context) async {
Map<String, dynamic> request; Map<String, dynamic> request;
if (await this.sharedPref.getObject(USER_PROFILE) != null) { if (await this.sharedPref.getObject(USER_PROFILE) != null) {
@ -564,9 +571,8 @@ class DoctorsListService extends BaseService {
return Future.value(localRes); return Future.value(localRes);
} }
Future<Map> insertVIDARequest(int appoNo, int clinicID, int projectID,
Future<Map> insertVIDARequest( int serviceID, int docID, BuildContext context) async {
int appoNo, int clinicID, int projectID, int serviceID, int docID, BuildContext context) async {
Map<String, dynamic> request; Map<String, dynamic> request;
if (await this.sharedPref.getObject(USER_PROFILE) != null) { if (await this.sharedPref.getObject(USER_PROFILE) != null) {
@ -613,10 +619,10 @@ class DoctorsListService extends BaseService {
await baseAppClient.post(INSERT_VIDA_REQUEST, await baseAppClient.post(INSERT_VIDA_REQUEST,
onSuccess: (response, statusCode) async { onSuccess: (response, statusCode) async {
localRes = response; localRes = response;
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
throw error; throw error;
}, body: request); }, body: request);
return Future.value(localRes); return Future.value(localRes);
} }

@ -1,6 +1,7 @@
import 'dart:async'; import 'dart:async';
import 'package:diplomaticquarterapp/config/localized_values.dart'; import 'package:diplomaticquarterapp/config/localized_values.dart';
import 'package:diplomaticquarterapp/pages/symptom-checker/select-gender.dart';
import 'package:flutter/foundation.dart' show SynchronousFuture; import 'package:flutter/foundation.dart' show SynchronousFuture;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -95,9 +96,11 @@ class TranslationBase {
String get confirm => localizedValues['confirm'][locale.languageCode]; String get confirm => localizedValues['confirm'][locale.languageCode];
String get confirmLiveCare => localizedValues['confirmLiveCare'][locale.languageCode]; String get confirmLiveCare =>
localizedValues['confirmLiveCare'][locale.languageCode];
String get waitingForDoctor => localizedValues['waitingForDoctor'][locale.languageCode]; String get waitingForDoctor =>
localizedValues['waitingForDoctor'][locale.languageCode];
String get confirmLater => String get confirmLater =>
localizedValues['confirmLater'][locale.languageCode]; localizedValues['confirmLater'][locale.languageCode];
@ -674,17 +677,51 @@ class TranslationBase {
localizedValues['DoctorResponses'][locale.languageCode]; localizedValues['DoctorResponses'][locale.languageCode];
String get newDes => localizedValues['New'][locale.languageCode]; String get newDes => localizedValues['New'][locale.languageCode];
String get all => localizedValues['All'][locale.languageCode]; String get all => localizedValues['All'][locale.languageCode];
String get questionHere => localizedValues['QuestionHere'][locale.languageCode]; String get questionHere =>
String get viewDoctorResponses => localizedValues['ViewDoctorResponses'][locale.languageCode]; localizedValues['QuestionHere'][locale.languageCode];
String get serviceInformation => localizedValues['ServiceInformation'][locale.languageCode]; String get viewDoctorResponses =>
String get homeHealthCare => localizedValues['HomeHealthCare'][locale.languageCode]; localizedValues['ViewDoctorResponses'][locale.languageCode];
String get homeHealthCareText => localizedValues['HomeHealthCareText'][locale.languageCode]; String get serviceInformationButton =>
String get loginRegister => localizedValues['LoginRegister'][locale.languageCode]; localizedValues['ServiceInformationButton'][locale.languageCode];
String get serviceInformationTitle =>
localizedValues['ServiceInformationTitle'][locale.languageCode];
String get serviceInformation =>
localizedValues['ServiceInformation'][locale.languageCode];
String get homeHealthCare =>
localizedValues['HomeHealthCare'][locale.languageCode];
String get homeHealthCareText =>
localizedValues['HomeHealthCareText'][locale.languageCode];
String get loginRegister =>
localizedValues['LoginRegister'][locale.languageCode];
String get orderLog => localizedValues['OrderLog'][locale.languageCode]; String get orderLog => localizedValues['OrderLog'][locale.languageCode];
String get serviceInformationButton => localizedValues['ServiceInformationButton'][locale.languageCode];
String get serviceInformationTitle => localizedValues['ServiceInformationTitle'][locale.languageCode];
String get infoLab => localizedValues['info-lab'][locale.languageCode]; String get infoLab => localizedValues['info-lab'][locale.languageCode];
String get infoRadiology => localizedValues['info-radiology'][locale.languageCode]; String get infoRadiology =>
localizedValues['info-radiology'][locale.languageCode];
String get termsService =>
localizedValues['TermsService'][locale.languageCode];
String get beforeUsing => localizedValues['Beforeusing'][locale.languageCode];
String get accept => localizedValues['accept'][locale.languageCode];
String get dataSafeInfo =>
localizedValues['data-safe-info'][locale.languageCode];
String get dataSafe => localizedValues['data-safe'][locale.languageCode];
String get informational =>
localizedValues['informational'][locale.languageCode];
String get checkDiagnosis =>
localizedValues['check-diagnosis'][locale.languageCode];
String get remeberthat => localizedValues['remeberthat'][locale.languageCode];
String get notUseInEmbergency =>
localizedValues['not-use-in-emerbency'][locale.languageCode];
String get notUseInEmbergencyDetails =>
localizedValues['not-use-in-emerbency-details'][locale.languageCode];
String get notUseInEmbergencyCall =>
localizedValues['not-use-in-emerbency-details-call'][locale.languageCode];
String get selectGender =>
localizedValues['select-gender'][locale.languageCode];
String get iAma => localizedValues['i-am-a'][locale.languageCode];
String get selectAge => localizedValues['select-age'][locale.languageCode];
String get iAm => localizedValues['i-am'][locale.languageCode];
String get yearOld => localizedValues['years-old'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -50,7 +50,8 @@ class AppScaffold extends StatelessWidget {
this.floatingActionButton, this.floatingActionButton,
this.title, this.title,
this.description, this.description,
this.isShowDecPage = true, this.isBottomBar}); this.isShowDecPage = true,
this.isBottomBar});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -68,7 +69,8 @@ class AppScaffold extends StatelessWidget {
), ),
title: Text(authenticatedUserObject.isLogin title: Text(authenticatedUserObject.isLogin
? appBarTitle.toUpperCase() ? appBarTitle.toUpperCase()
: TranslationBase.of(context).serviceInformationTitle),leading: Builder( : TranslationBase.of(context).serviceInformationTitle),
leading: Builder(
builder: (BuildContext context) { builder: (BuildContext context) {
return ArrowBack(); return ArrowBack();
}, },
@ -79,7 +81,10 @@ class AppScaffold extends StatelessWidget {
icon: Icon(FontAwesomeIcons.home), icon: Icon(FontAwesomeIcons.home),
color: Colors.white, color: Colors.white,
onPressed: () { onPressed: () {
Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (context) => LandingPage()), (Route<dynamic> r) => false); Navigator.pushAndRemoveUntil(
context,
MaterialPageRoute(builder: (context) => LandingPage()),
(Route<dynamic> r) => false);
}, },
), ),
], ],
@ -90,14 +95,14 @@ class AppScaffold extends StatelessWidget {
title: appBarTitle, title: appBarTitle,
description: description, description: description,
) )
:baseViewModel != null : baseViewModel != null
? NetworkBaseView( ? NetworkBaseView(
child: buildBodyWidget(), child: buildBodyWidget(),
baseViewModel: baseViewModel, baseViewModel: baseViewModel,
) )
: buildBodyWidget(), : buildBodyWidget(),
bottomSheet: bottomSheet, bottomSheet: bottomSheet,
floatingActionButton: floatingActionButton ?? floatingActionButton, //floatingActionButton: floatingActionButton ?? floatingActionButton,
// bottomNavigationBar: // bottomNavigationBar:
// this.isBottomBar == true ? BottomBarSearch() : SizedBox() // this.isBottomBar == true ? BottomBarSearch() : SizedBox()
// floatingActionButton: FloatingSearchButton(), // floatingActionButton: FloatingSearchButton(),

@ -70,6 +70,7 @@ dependencies:
# Notification Banner # Notification Banner
dropdown_banner: ^1.4.0 dropdown_banner: ^1.4.0
flutter_xlider: ^3.4.0
# flutter_local_notifications: # flutter_local_notifications:
# charts # charts

Loading…
Cancel
Save