Compare commits

..

2125 Commits

Author SHA1 Message Date
taha.alam 5e0eec2ba0 pop removed 2 years ago
taha.alam 7486f320dc king khalid university application 2 years ago
haroon amjad ed037edf22 Apple Pay fixes 2 years ago
haroon amjad 8838eb4769 Dr speciality translation fix 2 years ago
haroon amjad 43741e24cf fixes 2 years ago
Aamir.Muhammad 4c5ba6048f CR Fixes Search By Clinic & Search By Doctor List Reload Issue 2 years ago
haroon amjad 31aa09e35b translation fix 2 years ago
haroon amjad 1094d297f4 Update to stores 15.9 2 years ago
haroon amjad 52e63fe5e4 Update to stores 15.9 2 years ago
haroon amjad d0e743dcc9 Family members issue fixed in android 2 years ago
haroon amjad 752d5e5944 Appointment timeline fix 2 years ago
haroon amjad 8a319cc2f2 updates & fixes 2 years ago
haroon amjad 8edf65daf1 Updates & Fixes 2 years ago
haroon amjad c948a1780c Update to stores VersionID 15.8 2 years ago
Aamir.Muhammad be4022cee5 Calender Event Fixes Function Changes 2 years ago
haroon amjad e9404f1656 Prescription reminder fixes 2 years ago
haroon amjad 2b560840aa lab special result fix 2 years ago
Aamir.Muhammad 02878b7df9 Calender Event Fixes 2 years ago
Aamir.Muhammad 0ef716f536 Calender Event Fixes 2 years ago
Aamir.Muhammad 2e25940b62 Calender Event Fixes 2 years ago
Aamir.Muhammad 515896c265 Calender Event Fixes 2 years ago
Aamir.Muhammad 76f5fc2ef8 Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6 2 years ago
Aamir.Muhammad 69ed32917f Null fixes after merge from 3.13 2 years ago
haroon amjad 5b7b40c732 Updates & fixes 2 years ago
haroon amjad 6c9ab32d98 Native changes 2 years ago
haroon amjad c97fd25cdd Zoom integration updates & other stability fixes 2 years ago
Aamir.Muhammad e962469c7e Null fixes after merge from 3.13 2 years ago
Aamir.Muhammad d9cf383648 Merge branch 'refs/heads/development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/reports/report_home_page.dart
2 years ago
haroon amjad 3a65113149 Update to stores 15.7 2 years ago
Sultan khan 51bbc42ca9 security patch for 3 attempt fixed. 2 years ago
Sultan khan 21e4bb5138 error code 699 fixes 2 years ago
haroon amjad 9c957741b4 medical report fix 2 years ago
Aamir.Muhammad 011f5b1f57 Merge remote-tracking branch 'origin/development_v3.3' into dev_v3.13.6 2 years ago
Haroon Amjad eefdb1fa3e Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Haroon Amjad 582f1f1566 updates 2 years ago
Aamir.Muhammad 29c2fd067e Null fixes after merge from 3.13 2 years ago
Aamir.Muhammad 8441a0ef00 Merge remote-tracking branch 'origin/development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/pages/login/login.dart
#	lib/pages/medical/medical_profile_page_new.dart
#	lib/services/clinic_services/get_clinic_service.dart
#	lib/uitl/utils.dart
#	lib/widgets/dialogs/radio_selection_dialog.dart
2 years ago
Aamir.Muhammad 0588e68c67 local Auth fix 2 years ago
haroon amjad 672d0b7e8c InPatient medical report enabled 2 years ago
haroon amjad 9a102be7c7 PatientID QR image added 2 years ago
haroon amjad 96d5c3ce1d My Instructions added 2 years ago
haroon amjad 5f90435442 National ID input validation added 2 years ago
haroon amjad 6e30df2a29 WeCare service added 2 years ago
haroon amjad 4c0d758dd1 Zoom updates 2 years ago
haroon amjad 9ab10eebce Zoom Video SDK integrated 2 years ago
Sultan khan d1b13d5ce9 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
haroon amjad a4a638aa37 updates 2 years ago
Sultan khan c9be715436 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
2 years ago
haroon amjad 69e64fd5fb Blood Donation CR merged into dev_3.3 2 years ago
haroon amjad f8e7ccf73f updates 2 years ago
haroon amjad 7b181192f6 Apple Pay updates 2 years ago
Aamir Muhammad e18ba6822a changes local 2 years ago
Aamir Muhammad 660ec3a207 changes local 2 years ago
Aamir Muhammad 52a5e978a7 changes local 2 years ago
haroon amjad 3dffb26aee updates 2 years ago
Sultan khan 5e9d08b9aa Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
2 years ago
Sultan khan 08b4c8f86e Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/config/config.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/main.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/widgets/LiveCareHistoryCard.dart
#	lib/pages/medical/eye/ContactLensPage.dart
#	lib/pages/medical/medical_profile_page_new.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/gif_loader_dialog_utils.dart
#	lib/widgets/Loader/gif_loader_container.dart
#	lib/widgets/data_display/medical/time_line_new_widget.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
haroon amjad 968e59707e updates 2 years ago
Sultan khan 99e2edea31 lab result change for PMA-892 2 years ago
haroon amjad 2ebaed4841 label updated 2 years ago
haroon amjad d6dacfb743 Load more added in appointments timeline. 2 years ago
haroon amjad 5256d8873f ToDo & Appo Timeline changes 2 years ago
haroon amjad fe37de9621 Loading dialog updates 2 years ago
Sultan khan 63f5f7890e updates 2 years ago
Sultan khan eee2ccf148 updates 2 years ago
haroon amjad 727a9f1363 updates & checks 2 years ago
haroon amjad e0c9914206 Issue for appointment reschedule fixed 2 years ago
haroon amjad 7fc47ebf34 LiveCare invoice fix 2 years ago
haroon amjad 162b2fd22a updates 2 years ago
Aamir Muhammad 64568edc01 Android build issue fixed 2 years ago
Sultan khan d255ada2ea eye measurements fixed 2 years ago
Aamir Muhammad b6d222a7ea JIRA Fixes 2 years ago
haroon amjad b42c47f074 Update to stores 2 years ago
Sultan khan 0e04012219 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/services/clinic_services/get_clinic_service.dart
2 years ago
Sultan khan a4ed832147 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
#	lib/pages/ErService/OrderLogPage.dart
#	lib/pages/ErService/rapid-response-team/rrt-request-page.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/services/payfort_services/payfort_service.dart
#	lib/services/payfort_services/payfort_view_model.dart
#	lib/splashPage.dart
#	pubspec.yaml
2 years ago
haroon amjad e0ae8d7c8e Updates & fixes 2 years ago
Sultan khan d4519e1507 fixed 2 years ago
Sultan khan 001417f9b3 fixes 2 years ago
haroon amjad 357f0f8c24 updates 2 years ago
haroon amjad a12558076f Merge branch 'development_v3.3' into dev_3.3_AmbulanceRequestCR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
2 years ago
haroon amjad 46ad672649 Apple Pay fixes 2 years ago
Sultan khan 735582e3ab updated code. 2 years ago
Sultan khan 6983e309e0 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	android/build.gradle
#	android/gradle.properties
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/config/config.dart
#	lib/core/model/prescriptions/prescription_report_inp.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/BookAppointment/components/DocAvailableAppointments.dart
#	lib/pages/BookAppointment/widgets/DoctorView.dart
#	lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/services/clinic_services/get_clinic_service.dart
#	pubspec.yaml
2 years ago
haroon amjad 6e558bf5a6 Splash fix 2 years ago
Sultan khan 90dc8e5e05 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/models/LiveCare/ApplePayInsertRequest.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/gif_loader_dialog_utils.dart
#	lib/uitl/location_util.dart
#	pubspec.yaml
2 years ago
haroon amjad 32757c85f8 updates 2 years ago
haroon amjad 180cc43705 Update to stores 2 years ago
haroon amjad cb79d625d1 Update to stores for LiveCare fix 2 years ago
haroon amjad 30b57ff5f0 updates 2 years ago
haroon amjad ccdf410995 Update to stores 2 years ago
haroon amjad 9043e3c687 Apple Pay Updates 2 years ago
haroon amjad e28805f70f updates 2 years ago
haroon amjad b4138b2066 Show Date check added in DoctorView 2 years ago
haroon amjad c65d668c92 updates 2 years ago
haroon amjad 3792a67ae7 updates 2 years ago
haroon amjad 7850748ea2 Dental updates 2 years ago
Sultan khan 30c14c2167 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
#	lib/core/model/reports/Reports.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/medical/ask_doctor_view_model.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/PrescriptionReport.dart
#	lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/medical/eye/EyeHomePage.dart
#	lib/pages/medical/reports/report_list_widget.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/location_util.dart
#	lib/uitl/utils.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
haroon amjad 0168f06bb9 updates 2 years ago
haroon amjad 1b0961a08f location timeout 2 years ago
haroon amjad c29e2c88f0 location timeout handled in online check-in via location 2 years ago
haroon amjad eb1bddf772 updates 2 years ago
haroon amjad f1a74749f7 param update 2 years ago
haroon amjad bbc42bd1e7 updates 2 years ago
haroon amjad d3bdcfa975 Apple Pay code merged into main branch 2 years ago
haroon amjad 48202ffd12 updates 2 years ago
haroon amjad bea15150aa Merge branch 'development_v3.3' into dev_3.3_faiz_payfort 2 years ago
haroon amjad ec0bed04d3 Apple Pay in production implemented & tested 2 years ago
haroon amjad fe7c2c6873 CR 6631 2 years ago
haroon amjad ac52ba75a7 Updates & Fixes 2 years ago
haroon amjad 98a5b7d049 my appointments fixes 2 years ago
haroon amjad 27ed5c95f2 update to stores 2 years ago
haroon amjad e67bd54c04 updates 2 years ago
haroon amjad b39357a497 Medical report changes, Loading added in Location Check-In 2 years ago
haroon amjad 63621b5fed Updates & fixes 2 years ago
haroon amjad cd8b76a374 In App Apple Pay implemented 2 years ago
haroon amjad e1718270eb updates 2 years ago
haroon amjad e6d093a84c updates 2 years ago
haroon amjad 86d3e03c06 Updates 2 years ago
haroon amjad e5d8505c2d Updates & fixes 2 years ago
Sultan khan 4b28581c55 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/models/Appointments/toDoCountProviderModel.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/login/login.dart
#	lib/services/authentication/auth_provider.dart
#	lib/widgets/drawer/app_drawer_widget.dart
2 years ago
haroon amjad 75bfeaa716 My appointment fixes 2 years ago
haroon amjad 27b6e04d33 updates 2 years ago
haroon amjad 3401496739 Updates & fixes 2 years ago
Sultan khan 86f5e81fea merge with 3.3 2 years ago
Sultan khan d0c7b08eac Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/core/viewModels/er/EdOnlineViewModel.dart
	lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart
	lib/pages/BookAppointment/DentalComplaints.dart
	lib/pages/BookAppointment/components/SearchByClinic.dart
	lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/pages/landing/landing_page.dart
	lib/pages/livecare/widgets/clinic_card.dart
	lib/pages/login/login.dart
	lib/pages/rateAppointment/rate_appointment_clinic.dart
	lib/pages/rateAppointment/rate_appointment_doctor.dart
	lib/services/clinic_services/get_clinic_service.dart
	lib/uitl/push-notification-handler.dart
	lib/widgets/others/bottom_bar.dart
	pubspec.yaml
2 years ago
haroon amjad fddb423451 Updates & fixes 2 years ago
haroon amjad aa04e943ef updates & fixes 2 years ago
Sultan khan 98a2545a9b Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
#	lib/config/config.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/uitl/push-notification-handler.dart
2 years ago
Sultan khan c1fbce7eae bug fixes 2 years ago
haroon amjad cfa341aba5 Apple Pay Updates 2 years ago
haroon amjad 4ac11b2169 LanguageID Fixes 2 years ago
haroon amjad e4ce158277 updates 2 years ago
Sultan khan 4338da513d Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/model/labs/patient_lab_orders.dart
#	lib/core/model/labs/request_patient_lab_special_result.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/model/radiology/final_radiology.dart
#	lib/core/model/radiology/request_send_rad_report_email.dart
#	lib/core/model/rate/appoitment_rated.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/service/medical/radiology_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/medical/radiology_view_model.dart
#	lib/models/Authentication/check_activation_code_request.dart
#	lib/models/FamilyFiles/GetAllSharedRecordsByStatusReq.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/pages/DrawerPages/notifications/notification_details_page.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/login/login.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
#	lib/services/authentication/auth_provider.dart
#	lib/splashPage.dart
#	lib/uitl/push-notification-handler.dart
#	lib/widgets/drawer/app_drawer_widget.dart
2 years ago
haroon amjad 52b3c196d6 updates 2 years ago
Faiz Hashmi 704c0bbbc6 Merge branch 'development_v3.3' into dev_3.3_faiz_payfort 2 years ago
Faiz Hashmi fe665fd5ae Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
#	pubspec.yaml
2 years ago
haroon amjad 512db615be Language ID fixes & app update to stores, VersionID 11.5 2 years ago
Faiz Hashmi ccb9e93d62 Added InAppApple Pay with PayFort 2 years ago
haroon amjad 2008ccf92c updates 2 years ago
Faiz Hashmi b769959823 Revert "changes to build app"
This reverts commit 1492efde
2 years ago
Faiz Hashmi 0e67851646 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3 2 years ago
haroon amjad f7dffea2eb Language ID fixes 2 years ago
haroon amjad 724a26ca68 Updates 2 years ago
haroon amjad a9d4cb2fd8 InApp Browser Update 2 years ago
haroon amjad bcfeff2661 updates 2 years ago
haroon amjad cfd8b5e8a5 Language ID Changes 2 years ago
haroon amjad 264aed70a0 NFC Check added 2 years ago
Faiz Hashmi d3b4f37c73 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
#	pubspec.yaml
2 years ago
haroon amjad 165f3fb9f6 NFC Check removed for appo checkin 2 years ago
haroon amjad 47779f6fa7 last appointment rating fixed 2 years ago
haroon amjad 01db5408c9 fixes 2 years ago
haroon amjad 80167378d9 lat long fixes 2 years ago
haroon amjad eef6f78fd6 Updates 2 years ago
haroon amjad c6c4f933b2 Invoice Type param added in Labs & Rad 2 years ago
haroon amjad 0a9aee0246 updates 2 years ago
haroon amjad 421bae2037 updates 2 years ago
Sultan khan f2a57255fc no message 2 years ago
haroon amjad 8b468fe4b5 Updates & fixes 2 years ago
Sultan khan 6a74cdd2da Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Sultan khan 70077c97db local auth change 2 years ago
Aamir Muhammad 6f99aca8a5 Inpatient Cr Merge 2 years ago
Aamir Muhammad 77651f9652 Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/uitl/push-notification-handler.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/uitl/utils_new.dart
#	lib/widgets/avatar/large_avatar.dart
#	lib/widgets/bottom_navigation/bottom_navigation_item.dart
#	lib/widgets/bottom_options/BottomSheet.dart
#	lib/widgets/data_display/medical/medical_profile_item.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
Aamir Muhammad 22b48aef92 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
haroon amjad 70176e0cb1 updates 2 years ago
Sultan khan 359a177797 updates 2 years ago
haroon amjad beb3453ff5 updates 2 years ago
Aamir Muhammad b450091457 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Sultan khan f2079d4bbd payment fix 2 years ago
Aamir Muhammad 0a9d3e2b4d Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Sultan khan 557a3baafe theme change 2 years ago
Aamir Muhammad 881b1fba53 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Aamir Muhammad e914925181 Calender Permission 2 years ago
haroon amjad ded6e02663 CheckIn By Param added 2 years ago
devamirsaleemahmad 6671dea8d8 Delete Event on Calender 2 years ago
haroon amjad a0bca92195 CR Implemented 2 years ago
Sultan khan f534ee6f58 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/BookAppointment/widgets/reminder_dialog.dart
2 years ago
Sultan khan 62dc3c162a updated 3.13.6 2 years ago
devamirsaleemahmad 2def9f3744 Merges From 3.3 2 years ago
devamirsaleemahmad d73cc13100 Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
#	lib/splashPage.dart
#	lib/uitl/utils.dart
2 years ago
devamirsaleemahmad fb62ce2f19 Calender Fix Ios 17+ 2 years ago
devamirsaleemahmad 1ddac14efb Calender Permission Fix Ios 17+ 2 years ago
Aamir Muhammad a24afd4302 Calender Permission 2 years ago
Aamir Muhammad f211fd5617 Call Notification Fix 2 years ago
haroon amjad cb9ced27c2 updates 2 years ago
haroon amjad 1ecb8ebfe9 updated to stores version 11.3 2 years ago
Aamir Muhammad 542864c89c Gif Loader & My Family Fixes 2 years ago
haroon amjad f8fb336740 Location checkin privilege applied 2 years ago
Sultan khan d459600f22 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Sultan khan 5cca651963 no message 2 years ago
Aamir Muhammad 75b969b265 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Aamir Muhammad 7f890bb24a Changes 2 years ago
Sultan khan 8c46d2577d updated with assets 2 years ago
Sultan khan 8c520d9431 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/BookAppointment/widgets/DoctorView.dart
2 years ago
Sultan khan 432e64e51d updates 2 years ago
Aamir Muhammad b4bc99369f Changes into Rating Bar 2 years ago
haroon amjad 245716119e Location based Check In implemented 2 years ago
haroon amjad 6dd5fda997 Location check in implementing 2 years ago
haroon amjad 5c8bb241b3 Next Actions handled when navigating from My Appointments to ToDo list 2 years ago
devamirsaleemahmad 8bdcfcb764 Changes & Latest Merges 3.3 2 years ago
devamirsaleemahmad 0e8c1a8b2f Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/book_reminder_page.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/ToDoList/widgets/paymentDialog.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	pubspec.yaml
2 years ago
devamirsaleemahmad 9d1b153739 Dropdown Changed 2 years ago
haroon amjad b579e494c1 updates 2 years ago
Sultan khan 413535ef0b null safety fixed. 2 years ago
Sultan khan 649521c31f Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Sultan khan c96c151f44 null safety issue fixed. 2 years ago
devamirsaleemahmad d6f51f6c82 changes 2 years ago
haroon amjad 7f753014df Inpatient advance payment projectID param issue resolved 2 years ago
haroon amjad 7c426b90e5 updates 2 years ago
Sultan khan 1a5687a27c Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/BookAppointment/widgets/DoctorView.dart
#	lib/uitl/app_toast.dart
2 years ago
Sultan khan ec13edc28b updates. 2 years ago
devamirsaleemahmad 8f591654a5 changes 2 years ago
haroon amjad b10383c3ff Translation updates 2 years ago
haroon amjad dd0099236d Insurance dialog added post registration 2 years ago
haroon amjad 1997dbe128 updates 2 years ago
haroon amjad c7ee76d816 updates 2 years ago
haroon amjad e4492cbc1f Medical instructions updates 2 years ago
haroon amjad cb2bacf539 Update insurance for cash patient in ToDo List 2 years ago
haroon amjad 4fcc698f50 CR 6654 done 2 years ago
haroon amjad bbee4dba66 CR 6654 cancel manual insurance update CR done. 2 years ago
devamirsaleemahmad cbc38940ea changes 2 years ago
devamirsaleemahmad ed748a626b changes 2 years ago
devamirsaleemahmad 23b7d85911 changes 2 years ago
haroon amjad 81de6f9848 updated app to stores Version ID 11.0 2 years ago
devamirsaleemahmad 4231c85055 Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/model/labs/patient_lab_orders.dart
#	lib/core/model/labs/request_patient_lab_special_result.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/model/privilege/VidaPlusProjectListModel.dart
#	lib/core/model/radiology/final_radiology.dart
#	lib/core/model/radiology/request_send_rad_report_email.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/service/medical/radiology_service.dart
#	lib/core/service/privilege_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/medical/radiology_view_model.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/models/anicllary-orders/ancillary_order_list_model.dart
#	lib/models/anicllary-orders/ancillary_orders_proc_list.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/Blood/confirm_payment_page.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/insurance/insurance_update_screen.dart
#	lib/pages/login/login.dart
#	lib/pages/medical/ask_doctor/doctor_response.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/pages/medical/balance/my_balance_page.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
#	lib/pages/medical/radiology/radiology_home_page.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/splashPage.dart
#	lib/uitl/utils.dart
#	lib/widgets/bottom_navigation/bottom_navigation_item.dart
#	lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	lib/widgets/data_display/medical/doctor_card.dart
#	lib/widgets/data_display/medical/medical_profile_item.dart
#	pubspec.yaml
2 years ago
haroon amjad d5dd8757e9 Privileges added for QR & NFC CheckIn options 2 years ago
haroon amjad 772992e3ff updates 2 years ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 2 years ago
haroon amjad 41cd55e02b paymentRequestID added in the request 2 years ago
haroon amjad 13b2db47b5 HMC color change applied in my appointments 2 years ago
haroon amjad 6bd6572e7e Lab, Rad & prescription disabled in my appointments screen in case of ER appointment (Clinic ID 10) & project is Vida Plus. 2 years ago
haroon amjad ee5fb615db updates & fixes 2 years ago
haroon amjad 185f54d26d updates & fixes 2 years ago
haroon amjad 0a478e077a QR Code checkin implemented 2 years ago
haroon amjad 542501f5c5 updates 2 years ago
haroon amjad a5e0de08ce updates for ancillary 2 years ago
devamirsaleemahmad 8544b3ce3d changes & Deletion 2 years ago
devamirsaleemahmad 720c0ac6e9 changes & Deletion 2 years ago
haroon amjad 55f1e4166e updates 2 years ago
Sultan khan 4d52f639aa Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/livecare/live_care_payment_page.dart
#	lib/pages/medical/smart_watch_health_data/steps/stepsTracker.dart
#	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
#	lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart
#	lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart
#	lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart
2 years ago
Sultan khan 0c534cffae code update in progress 2 years ago
devamirsaleemahmad 2c9e51aef0 changes 2 years ago
devamirsaleemahmad 1c34843bc5 Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6 2 years ago
Sultan khan 6a8de14d5d code update in progress 2 years ago
devamirsaleemahmad 519f396e76 changes 2 years ago
Sultan khan 40656a65d8 update in progress 2 years ago
devamirsaleemahmad 49d3df8c87 changes 2 years ago
devamirsaleemahmad 47801ecb36 changes 2 years ago
devamirsaleemahmad d8836d5e89 Merge branch 'dev_v3.13.6_automigrate' into dev_v3.13.6
# Conflicts:
#	lib/main.dart
#	lib/uitl/CalendarUtils.dart
#	lib/uitl/app_shared_preferences.dart
2 years ago
devamirsaleemahmad c1fd6313b1 changes 2 years ago
Sultan khan c63a1fadf5 code updated in-progress 2 years ago
Sultan khan 6a6ac76973 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Sultan khan 8a42bf8b2f Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/widgets/buttons/custom_text_button.dart
2 years ago
devamirsaleemahmad dfc6e86442 models updates -> 3.13.6 2 years ago
Sultan khan aa605a2e47 file updated 2 years ago
devamirsaleemahmad 1c19b36d2d models updates -> 3.13.6 2 years ago
devamirsaleemahmad b26f535749 models updates -> 3.13.6 2 years ago
devamirsaleemahmad 9c2948db29 models updates -> 3.13.6 2 years ago
devamirsaleemahmad 50816d452e Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6 2 years ago
devamirsaleemahmad b3587688b8 models updates -> 3.13.6 2 years ago
Sultan khan 391331f508 code update in progress 2 years ago
devamirsaleemahmad 971bab465c models updates -> 3.13.6 2 years ago
devamirsaleemahmad 03d550936e models updates -> 3.13.6 2 years ago
devamirsaleemahmad cb56750e6b models updates -> 3.13.6 2 years ago
Sultan khan 04244675e1 code updated. 2 years ago
Sultan khan 6f8be66f42 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
devamirsaleemahmad 511c9788da models updates -> 3.13.6 2 years ago
devamirsaleemahmad 2a4059fd66 models updates -> 3.13.6 2 years ago
Sultan khan 1eb38b1dc4 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
devamirsaleemahmad 3523daa9fa updates -> 3.13.6 2 years ago
Faiz Hashmi 1492efdedb changes to build app 2 years ago
Sultan khan f9d3602e9a updated code 2 years ago
devamirsaleemahmad 6ff864c4cd updates -> 3.13.6 2 years ago
Sultan khan 8bf5479f56 code updated. 2 years ago
devamirsaleemahmad e8e7a726f5 updates -> 3.13.6 2 years ago
Sultan khan b45cbbcf29 updates 2 years ago
haroon amjad 7c804f77fb updates & fixes 2 years ago
haroon amjad dac842f50c fixes for inpatient advance 2 years ago
haroon amjad d11b12ac9a no message 2 years ago
haroon amjad c5e88ac7ba fixes 2 years ago
haroon amjad 645e266af8 Vida plus updates sent to stores 2 years ago
haroon amjad f0a4bd6925 Commented the CRs code 2 years ago
haroon amjad 3f6c05825d updates 2 years ago
haroon amjad 4e962bda07 Merge branch 'development_v3.3' into PatientApp_VIDA_Plus_3.3
# Conflicts:
#	lib/config/config.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/service/medical/ask_doctor_services.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/pages/conference/web_rtc/call_home_page_.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/pages/webRTC/call_page.dart
#	lib/pages/webRTC/signaling.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/SignalRUtil.dart
#	lib/uitl/utils.dart
#	lib/widgets/others/floating_button_search.dart
2 years ago
haroon amjad 0f4f98f31c fixes 2 years ago
haroon amjad af5b0766a2 CR 6654, Disable update manual insurance temporarily. 2 years ago
haroon amjad b2f390c19d CR 6204 implemented 2 years ago
haroon amjad 14928ad833 CR 6204 2 years ago
haroon amjad 34d3cf2945 CR 6204 Lab reports enhancements in progress 2 years ago
haroon amjad f2bf57f8cc updates 2 years ago
haroon amjad df610690d5 updates 2 years ago
haroon amjad e780df90e1 updates 2 years ago
haroon amjad d8e9f36844 updates 2 years ago
haroon amjad c0595a8dc6 updates 2 years ago
Sultan khan abcf82346e Excluded change 2 years ago
haroon amjad 31144c7c27 updates 2 years ago
haroon amjad 2048747a62 ancillary updates 2 years ago
haroon amjad 9ed454f67a Cash patient check implemented 3 years ago
haroon amjad 49963911ba Patient eligibility change 3 years ago
haroon amjad 4dd16bde59 Inpatient medical report fixes 3 years ago
haroon amjad a58e4452b8 ancillary changes 3 years ago
haroon amjad 38661621e3 updates & fixes 3 years ago
haroon amjad 6f20f1b871 InPatient Discharge Medications 3 years ago
haroon amjad 72ee34f9a7 Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 275c99a4ce updates 3 years ago
haroon amjad 0f863cd259 Updates & fixes 3 years ago
haroon amjad 652c19cdf8 updates 3 years ago
haroon amjad 5ddf8d4b7a View Dr response fix 3 years ago
haroon amjad 66600fe66c Medical report CR implemented 3 years ago
haroon amjad fb9a4d5297 Laser clinic changes 3 years ago
haroon amjad 6b121e7f39 Store build version 4.5.026 3 years ago
haroon amjad 75685b1f61 Project selection added in Laser & advance payment 3 years ago
haroon amjad e64a91855f fixes 3 years ago
haroon amjad 7702960bb5 InPatient medical report & view medical report commented out 3 years ago
haroon amjad 3642ca6a47 InPatient advance payment updates 3 years ago
haroon amjad 1300dadce1 Inpatient advance payment 3 years ago
haroon amjad 4a7ca9cd46 InPatient advance payment history implemented 3 years ago
haroon amjad 5c5ed35df8 Clinic & Doctor ID added 3 years ago
haroon amjad 2bf8d454f5 updates 3 years ago
haroon amjad c58e180c91 Updates 3 years ago
haroon amjad 965df33253 Appointment actions fixes 3 years ago
haroon amjad 7c68779324 Nphies integration 3 years ago
haroon amjad 3e63d80655 Ancillary order updates 3 years ago
haroon amjad ae0fca865d InPatient Advance payment API implemented 3 years ago
haroon amjad a9ae44ca89 Implemented checks for InPatient CR 3 years ago
haroon amjad 2455f48fe1 View medical report done 3 years ago
haroon amjad dd79b1dfca InPatient pending advance payment done 3 years ago
haroon amjad 4afdf5545e Translations added 3 years ago
haroon amjad d251ca0e1c Inpatient medical instructions implemented 3 years ago
haroon amjad 786dd76f57 updates 3 years ago
haroon amjad e4e3377c5c update 3 years ago
haroon amjad 3353c93de9 fixes 3 years ago
haroon amjad 44d8f0efe2 InPatient medical report contd. 3 years ago
haroon amjad da0a164b0e updates 3 years ago
haroon amjad a17b941c63 InPatient Medical Report continued 3 years ago
haroon amjad 9b3c07d3b1 Added AED in advance payment 3 years ago
haroon amjad 657248803f Ask doc disabled for LiveCare appointments 3 years ago
haroon amjad d261557cd7 Admitted patient API changed 3 years ago
haroon amjad ff23f3a8cb fixes 3 years ago
haroon amjad b2ec6c76bf ancillary fix 3 years ago
haroon amjad f624c70cee Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad b92e45aa93 Updates & fixes 3 years ago
haroon amjad a60f66a069 Updates 3 years ago
haroon amjad 3fb8876c31 Manual Insurance Card Update 3 years ago
haroon amjad fe606b7823 InPatient Advance Payment 3 years ago
haroon amjad 1eccaf0aac Regex added to allow characters only. 3 years ago
haroon amjad 1a45dd57e9 LiveCare Fix 3 years ago
haroon amjad 047877fb08 Add Doctor response rate comments validation 3 years ago
haroon amjad 20572f463a meal plan dev completed 3 years ago
Sultan khan 5d6b50a1da Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3 3 years ago
Sultan khan 83859e05f1 family file approve reject button refresh 3 years ago
haroon amjad 0e054429ef Meal Plan implementation completed 3 years ago
haroon amjad d9404d3abe Medical Report changes 3 years ago
haroon amjad bc27121c4e meal plan updates 3 years ago
haroon amjad 96f948a8c8 updates 3 years ago
haroon amjad 4b0a41d7d8 updates 3 years ago
haroon amjad 94296cec0d meal plan continued 3 years ago
haroon amjad 38648df897 Meal Plan development continued 3 years ago
haroon amjad d073eb9d5f MealPlan implementation continued 3 years ago
haroon amjad 77ab9373f8 Meal Plan APIs implementation continued 3 years ago
haroon amjad b337343df3 Project ID fix in ancillary orders 3 years ago
Sultan khan 27373b6972 doctor header. 3 years ago
Sultan khan 5e4ca336c2 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3 3 years ago
Sultan khan 68f39d965c Merge branch 'sultan_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
#	pubspec.yaml
3 years ago
haroon amjad 710e6274db mealplan updates 3 years ago
Sultan khan 0306c777ed rating bug fixed 3 years ago
haroon amjad 31d8443f87 insert call info updates 3 years ago
haroon amjad f2ab76eb24 updates 3 years ago
haroon amjad 9f44b25353 Meal Plan API integration in progress 3 years ago
haroon amjad 7bc105c6c7 updates 3 years ago
haroon amjad 12af8bb8a9 updates 3 years ago
haroon amjad 6877244d0e CR# 5805 Ask Doc Improvements dev completed. 3 years ago
haroon amjad 792b3ea249 no message 3 years ago
Sultan khan f29d33d7e7 Changes for voice command search 3 years ago
haroon amjad e4fe4baa27 nearest appo crash fixed 3 years ago
haroon amjad 3fda1da16a updates 3 years ago
haroon amjad 83ca5e8e4c ask doctor date param added 3 years ago
haroon amjad 58e598843b sickleave 3 years ago
haroon amjad 2d93b9753d Ask doctor improvements 3 years ago
haroon amjad f28fcbd006 AdvanceNumber_VP added 3 years ago
haroon amjad 17acae0a95 updates 3 years ago
haroon amjad 101f2dcab8 updates 3 years ago
haroon amjad 60d5ba4a9e Birth Notification implemented 3 years ago
haroon amjad 078482c21d updates 3 years ago
haroon amjad cf30762eec updates 3 years ago
haroon amjad 420aef3195 Updates 3 years ago
haroon amjad 2437d2da9c Updates 3 years ago
haroon amjad 01ee9a2710 Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 77f3d0a238 radiology API fixes 3 years ago
haroon amjad e098705374 localized strings 3 years ago
haroon amjad 7280e2a1d7 Birth Notification UI Implemented 3 years ago
haroon amjad 17e7886907 VidaPlus Project changes 3 years ago
haroon amjad a7a06f4083 Home page change 3 years ago
haroon amjad b64ba9211e Inpatient services in dev 3 years ago
haroon amjad 906fd5fd6a Inpatient services in dev 3 years ago
haroon amjad 2fea4b2b07 Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
#	lib/pages/landing/widgets/services_view.dart
3 years ago
haroon amjad 15c4f016df update to stores for version 10.5 3 years ago
haroon amjad 3675d05911 config changes 3 years ago
Sultan khan 0514fecae2 lab report email change 3 years ago
haroon amjad badc13d41a sickleave CR Enabled 3 years ago
haroon amjad 555898c822 updates 3 years ago
Sultan khan 83c15196c8 VIDA PLUS CHANGE 3 years ago
Sultan khan ddcd0bb73c Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into PatientApp_VIDA_Plus_3.3
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
#	lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/push-notification-handler.dart
#	lib/widgets/others/bottom_bar.dart
#	lib/widgets/others/floating_button_search.dart
#	pubspec.yaml
3 years ago
haroon amjad fcf0c589a0 Updates & fixes 3 years ago
haroon amjad b304332526 Patient app release to stores 10.4 3 years ago
haroon amjad 872095c51f Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v3.3 3 years ago
haroon amjad 5a741bf270 Sickleave changes 3 years ago
Sultan khan ad068d4f09 Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v3.3 3 years ago
Sultan khan d59e436a97 dubai arabic change 3 years ago
haroon amjad 907d05c3d0 register 3 years ago
haroon amjad 9d2df00d87 Get General instructions implemented 3 years ago
Sultan khan baec968ae0 Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v3.3
# Conflicts:
#	lib/pages/login/register-info.dart
3 years ago
Sultan khan c48f393f95 Dubai registration fixed 3 years ago
haroon amjad 0e4e285954 InPatient CR dev 3 years ago
haroon amjad 701eedf147 updates 3 years ago
haroon amjad 670991eca4 Lab result fix 3 years ago
haroon amjad e79454973c InPatient API 3 years ago
haroon amjad 9a7d0af6ea InPatient API implemented 3 years ago
haroon amjad af90ab3aa3 Sickleave & chart changes 3 years ago
haroon amjad 128bd2ec54 Inpatient services implementation 3 years ago
haroon amjad dc859b01f7 updates & fixes 3 years ago
haroon amjad dfc2889df7 dental reschedule fix 3 years ago
haroon amjad f45c5de526 Merge branch 'sultan_v3.3' into development_v3.3 3 years ago
Sultan khan 47702b5c01 Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_v3.3
# Conflicts:
#	lib/config/config.dart
3 years ago
Sultan khan ea82219e9e Appointment logs 3 years ago
haroon amjad 6e9cc39269 Dental fixes 3 years ago
haroon amjad 1eed379889 Lab result flowchart fix 3 years ago
haroon amjad 62b9b3e35c calendar permission handled in iOS 3 years ago
haroon amjad e81a1b8bcc iOS Firebase fix 3 years ago
haroon amjad 63426a691d Ancillary orders family members issue resolved 3 years ago
haroon amjad 5045cc6faa Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices 3 years ago
haroon amjad 3bc09f792a Pharma LiveCare fixes 3 years ago
haroon amjad bc8a979438 Upload to stores 3 years ago
haroon amjad a20d6c7c28 Livecare updates 3 years ago
haroon amjad 4ecab57173 Pharma LiveCare updates 3 years ago
haroon amjad da423fe12a Pharma LiveCare updates 3 years ago
haroon amjad f686013692 Pharma LiveCare updates 3 years ago
haroon amjad 4f50c3ff8e Pharmacy LiveCare revamped 3 years ago
haroon amjad 74b0acefd3 Updates & fixes 3 years ago
haroon amjad 8e14084467 updates 3 years ago
haroon amjad 98abc5a069 updates 3 years ago
Sultan khan 9683b3f42f Dubai Reminder fixed. 3 years ago
haroon amjad 6bdb7a3305 Updates & fixes 3 years ago
haroon amjad 0e01835327 Target SDK & Compile SDK bumped to 33 3 years ago
haroon amjad e50a67ea12 Vida Plus changes 3 years ago
haroon amjad 2e72d6a550 LiveCare contact added 3 years ago
haroon amjad aafdf3760d added sick leave status text & color 3 years ago
haroon amjad c8ec536267 Sickleave CR done 3 years ago
haroon amjad e5e5bb5352 Dental book appointment changes 3 years ago
haroon amjad 25af2c23ef Sick leave CR, LiveCare support call, Appo calendar changes 3 years ago
haroon amjad c289afb186 Opentok fixes 3 years ago
haroon amjad 22274ebbb0 updates & fixes 3 years ago
Zohaib Iqbal Kambrani 35b129fb68 migrated project to latest flutter sdk 3 years ago
haroon amjad 22a0e456bc Manual Insurance Updates, Service ID fixes, Tamara Fixes 3 years ago
haroon amjad 52070c8f94 Updates & fixes 3 years ago
haroon amjad e80ac2481a Ancillary order & manual insurance update 3 years ago
haroon amjad 442a94ac08 Updates & fixes 3 years ago
haroon amjad 3709ebcb32 Updates 3 years ago
haroon amjad f6191d9bf7 updates & fixes 3 years ago
haroon amjad 7ae4e7d616 updates & fixes 3 years ago
haroon amjad d75615a2eb Updates & fixes 3 years ago
haroon amjad e03412214e Ambulance request fixes 3 years ago
haroon amjad 106334c9cf updates & fixes 4 years ago
haroon amjad dfa88b7de7 Updates, fixes & release VersionID 9.1 4 years ago
haroon amjad 21cf9da900 HMS Core & LiveCare Schedule fixes 4 years ago
haroon amjad 58a6dc6a6f Tamara & Apple Pay Fixes + Other Updates 4 years ago
haroon amjad 8be9d3ae6e Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 4 years ago
haroon amjad 721abb3156 Merge branch 'zik_webrtc_dev_v2.5' into 'development_v2.5'
WebRTC or OpenTok

See merge request Cloud_Solution/diplomatic-quarter!605
4 years ago
haroon amjad 833818e6e3 Rad & Lab email issues fixes 4 years ago
Zohaib Iqbal Kambrani 8c29b5f8e6 WebRTC or Opentok 4 years ago
Zohaib Iqbal Kambrani 8bd5a71318 Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
  Timezone fixes & Activate/Deactivate file changes
  Updates
  Timezone Updates
  CMC Updates
  updates
  Updates
  Laser Male back image added
  Updates & fixes
  E-Cens sign off
  Analtyics at registration and liveacare payment fail
  analytics events update
  Analytics
  no message
  Updates & fixes
  ED Online Check-In
  Calendar fixes
  updates & fixes
  Analytics statements align to bottom of block
  Analytics for login registration
  updates

# Conflicts: Fixed
#	lib/analytics/flows/appointments.dart
4 years ago
Zohaib Iqbal Kambrani 1aabf08417 no message 4 years ago
haroon amjad 2ba744c3a6 Timezone fixes & Activate/Deactivate file changes 4 years ago
haroon amjad b756bf8caf Updates 4 years ago
haroon amjad 3896f02d13 Timezone Updates 4 years ago
haroon amjad ca43849d9d CMC Updates 4 years ago
haroon amjad 11529c65c5 updates 4 years ago
haroon amjad 4ba229c436 Updates 4 years ago
haroon amjad b641f5b6a3 Laser Male back image added 4 years ago
haroon amjad eb3f5b5cb5 Updates & fixes 4 years ago
Zohaib Iqbal Kambrani e615ca1a16 no message 4 years ago
haroon amjad 8e27cfba9b Merge branch 'zik_development_v2.5' into 'development_v2.5'
Analtyics at registration and liveacare payment fail

See merge request Cloud_Solution/diplomatic-quarter!604
4 years ago
haroon amjad 72654757c4 Merge branch 'development_v2.5' into 'zik_development_v2.5'
# Conflicts:
#   lib/pages/login/confirm-login.dart
4 years ago
haroon amjad 7018696328 E-Cens sign off 4 years ago
Zohaib Iqbal Kambrani a69e0da77d Merge branch 'development_v2.5' into zik_development_v2.5
* development_v2.5:
  analytics events update
4 years ago
Zohaib Iqbal Kambrani 7051b3ed63 Analtyics at registration and liveacare payment fail 4 years ago
haroon amjad 4cbccd8efb analytics events update 4 years ago
haroon amjad 2d366bcf7b Merge branch 'zik_development_v2.5' into 'development_v2.5'
Zik development v2.5

See merge request Cloud_Solution/diplomatic-quarter!603
4 years ago
Zohaib Iqbal Kambrani 29c6841888 Analytics 4 years ago
Zohaib Iqbal Kambrani a01b8b82da no message 4 years ago
Zohaib Iqbal Kambrani 86363a15d6 Merge branch 'development_v2.5' into zik_development_v2.5
* development_v2.5:
  Updates & fixes
  ED Online Check-In
  Calendar fixes
  updates & fixes
4 years ago
Zohaib Iqbal Kambrani 5c32e488d0 no message 4 years ago
haroon amjad 3396b4253b Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 6cd660184a no message 4 years ago
haroon amjad 8b7a6e7689 ED Online Check-In 4 years ago
Zohaib Iqbal Kambrani f42e2fb652 Revert "no message"
This reverts commit da7884ff61.
4 years ago
haroon amjad bbb99667f8 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 4 years ago
haroon amjad 6403c8f831 Merge branch 'zik_development_v2.5' into 'development_v2.5'
Zik development v2.5

See merge request Cloud_Solution/diplomatic-quarter!602
4 years ago
haroon amjad f9a733884d Calendar fixes 4 years ago
haroon amjad 27c6837f25 updates & fixes 4 years ago
Zohaib Iqbal Kambrani 1c6a62776c Analytics statements align to bottom of block 4 years ago
Zohaib Iqbal Kambrani 1523fd5ade Analytics for login registration 4 years ago
Zohaib Iqbal Kambrani da7884ff61 no message 4 years ago
haroon amjad f50bfda330 updates 4 years ago
haroon amjad d43d6c686b Merge branch 'zik_webrtc_dev_v2.5' into 'development_v2.5'
Project Filter  Applied on Packages & Offers

See merge request Cloud_Solution/diplomatic-quarter!599
4 years ago
Zohaib Iqbal Kambrani a0e619eec6 fixes 4 years ago
Zohaib Iqbal Kambrani 88b904a4b8 analytics changes 4 years ago
Zohaib Iqbal Kambrani fb4fb8d29e Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
  Google analytics events update
  Updates
  Updates & fixes
  DateTime Fixes
  HHC Fixes
  updates & fixes
  Updates & fixes

# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
Zohaib Iqbal Kambrani 8a95daff7c Google analytics events update 4 years ago
Zohaib Iqbal Kambrani e107d8a1a4 no message 4 years ago
haroon amjad 1faf27959a Updates 4 years ago
haroon amjad 9057a96d7f Updates & fixes 4 years ago
haroon amjad 842e099953 DateTime Fixes 4 years ago
haroon amjad a9e48e487f HHC Fixes 4 years ago
haroon amjad f1129cc14c updates & fixes 4 years ago
Zohaib Iqbal Kambrani 612d9eb019 Project Filter Applied on Packages & Offers 4 years ago
haroon amjad fd96869d89 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
# Conflicts:
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
haroon amjad c3538ebdb6 Updates & fixes 4 years ago
haroon amjad 1fbbd0aed1 Merge branch 'zik_webrtc_dev_v2.5' into 'development_v2.5'
Offer And Packages (View Only)

See merge request Cloud_Solution/diplomatic-quarter!598
4 years ago
Zohaib Iqbal Kambrani 94a99a911e Offer And Packages (View Only) 4 years ago
haroon amjad 8d988ba994 updates & fixes 4 years ago
haroon amjad 4ba37d342c RRT Updates 4 years ago
haroon amjad 72e5d0a2be Pharma LiveCare 4 years ago
haroon amjad 33329f5c8a base app client update 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
haroon amjad 887303fcde updates 4 years ago
haroon amjad 643763764d family files fixes 4 years ago
haroon amjad be2a9380df Analytics change 4 years ago
haroon amjad 9464d543fc updates 4 years ago
haroon amjad bc97cfa95b Update Insurance changes 4 years ago
haroon amjad 6ba695f2c9 Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
Zik new design flutter v2.5

See merge request Cloud_Solution/diplomatic-quarter!596
4 years ago
haroon amjad 54a48a4bff Merge branch 'sikander_family_profile_switch' into 'development_v2.5'
Sikander family profile switch

See merge request Cloud_Solution/diplomatic-quarter!597
4 years ago
Sikander Saleem 27d0d80017 Merge branch 'development_v2.5' into sikander_family_profile_switch
# Conflicts:
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Sikander Saleem bcf746aa0b Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5 4 years ago
haroon amjad 72e2707d4b updates 4 years ago
Sikander Saleem 1b82146303 my family switch profile on dashboard. 4 years ago
Sikander Saleem 230444803d Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5 4 years ago
Sikander Saleem fd73c248e2 my family switch profile improvement. 4 years ago
Zohaib Iqbal Kambrani e2f3a6ab20 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
4 years ago
Zohaib Iqbal Kambrani d7931ac7da Analytics: update set user 4 years ago
haroon amjad d344169399 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookSuccess.dart
4 years ago
haroon amjad a918d409fb updates & fixes 4 years ago
haroon amjad 18c9a6fb91 Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
Zik new design flutter v2.5

See merge request Cloud_Solution/diplomatic-quarter!595
4 years ago
Zohaib Iqbal Kambrani 40af551f59 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
4 years ago
Zohaib Iqbal Kambrani 99bdd25bd3 added more analytics logs 4 years ago
haroon amjad 60a44f9a42 OpenTok fixes 4 years ago
haroon amjad 61d0d52c59 Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
Zik new design flutter v2.5

See merge request Cloud_Solution/diplomatic-quarter!593
4 years ago
Zohaib Iqbal Kambrani 9890d2caec Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  mobile number updates
  video call setup with flutter 2.8, firebase modifications
4 years ago
Zohaib Iqbal Kambrani 687bc543ab OpenTok Video Call 4 years ago
haroon amjad ce8a7c07de Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 4 years ago
haroon amjad 438dc5c88f Merge branch 'sikander_video_call_improvements' into 'development_v2.5'
Sikander video call improvements

See merge request Cloud_Solution/diplomatic-quarter!592
4 years ago
haroon amjad ff72b4b31e mobile number updates 4 years ago
Sikander Saleem 7490d238e4 Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5
# Conflicts:
#	lib/uitl/push-notification-handler.dart
4 years ago
Sikander Saleem 67b87449a9 video call setup with flutter 2.8, firebase modifications 4 years ago
Zohaib Iqbal Kambrani bf7c1d1610 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  updates
  livecare changes
  updates
4 years ago
Zohaib Iqbal Kambrani aac15c5a4a partial analytics fixes and updates 4 years ago
haroon amjad 8c96de866b updates 4 years ago
haroon amjad 7d7864a1eb livecare changes 4 years ago
haroon amjad 0ea2550246 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 4 years ago
haroon amjad 32edb2e71e updates 4 years ago
haroon amjad 10bb7a8b66 Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
Zik new design flutter v2.5

See merge request Cloud_Solution/diplomatic-quarter!591
4 years ago
Zohaib Iqbal Kambrani c61de7cfdc no message 4 years ago
Zohaib Iqbal Kambrani 0f7301d7e0 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
4 years ago
Zohaib Iqbal Kambrani 23404b4495 Video call at InAppWebView 4 years ago
haroon amjad 0117de61e7 Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
Zik new design flutter v2.5

See merge request Cloud_Solution/diplomatic-quarter!590
4 years ago
Zohaib Iqbal Kambrani 936b7c28f9 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Covid updates & other fixes

# Conflicts: Resolved
#	lib/config/config.dart
#	lib/pages/webRTC/signaling.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
haroon amjad 927db41068 Covid updates & other fixes 4 years ago
Zohaib Iqbal Kambrani a398220033 no message 4 years ago
Zohaib Iqbal Kambrani a26b17f52d Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Translation fixes
  OBGyne updates
  updates
  OB Gyne appo updates
  no message
  updates & fixes
  no message
  no message
  Ancillary Orders completed
  updates & fixes

# Conflicts: Resolved
#	lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
#	lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Zohaib Iqbal Kambrani a8e1ba6b86 no message 4 years ago
haroon amjad ac5077e9e7 Translation fixes 4 years ago
haroon amjad f879991b50 OBGyne updates 4 years ago
haroon amjad cbf49e31a1 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 4 years ago
haroon amjad 2a343db335 updates 4 years ago
haroon amjad 65ea5522f9 Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!587
4 years ago
haroon amjad 736edad018 OB Gyne appo updates 4 years ago
haroon amjad 907181a56c Merge branch 'development_v2.5' into haroon_development_2.5
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 4b4ac4819f no message 4 years ago
haroon amjad 3eb7a4325b updates & fixes 4 years ago
haroon amjad 9852811983 Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
Zik new design flutter v2.5

See merge request Cloud_Solution/diplomatic-quarter!586
4 years ago
Zohaib Iqbal Kambrani ff508de9f7 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Updates & fixes

# Conflicts: resolved
#	lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
haroon amjad aa36154764 Updates & fixes 4 years ago
Zohaib Iqbal 364ff3344a Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/BookAppointment/QRCode.dart
#   lib/pages/login/register-info.dart
#   lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
Zohaib Iqbal Kambrani a2efbf6494 no message 4 years ago
Zohaib Iqbal Kambrani 81a3d1ce87 no message 4 years ago
Zohaib Iqbal Kambrani 940a19d4d7 Merge branch 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into zik_new_design_flutter_v2.5
* 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  ancillary orders update
  Updates & fixes
  fix category issue
  fixes & updates
  lakum fix
  Updates & fixes
  fix translation issue
  Compare duplication fixed
  Updates & fixes
  Updates & fixes
  fix compare issue
  pharmacy fixes
  fix categories & cantact design
  pharmacy fixes
  Updates & fixes
  fix conflict
  Updates & fixes
  Updates & fixes
  Login fixes

# Conflicts: Resolved
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/BookAppointment/SearchResults.dart
4 years ago
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 4 years ago
haroon amjad 742d06976f no message 4 years ago
haroon amjad 4bc67b37e0 no message 4 years ago
Haroon Amjad 1cb7eb2afb CS branch changes 4 years ago
haroon amjad f8b3847d0a Ancillary Orders completed 4 years ago
haroon amjad ea8d700d22 updates & fixes 4 years ago
haroon amjad ceeb6c1bb7 Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!583
4 years ago
haroon amjad efced34ffa Updates 4 years ago
haroon amjad 2a22edfdd0 no message 4 years ago
haroon amjad 19dadd2b35 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad a6c6651363 Updates & fixes 4 years ago
haroon amjad 9674376163 Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
Packages and offers fixes, HMG Internet work in progress,

See merge request Cloud_Solution/diplomatic-quarter!582
4 years ago
Zohaib Iqbal 259e27d4a7 Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/landing/fragments/home_page_fragment2.dart
#   lib/uitl/app_shared_preferences.dart
#   lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
Zohaib Iqbal Kambrani ab8b62bc3a Packages and offers fixes, HMG Internet work in progress, 4 years ago
haroon amjad 7f5f3ababe Registration fix 4 years ago
haroon amjad 0acc134e6e Updates & fixes 4 years ago
haroon amjad e45c2c5652 covid & pharmacy updates 4 years ago
haroon amjad eb6b0aefc0 Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!580
4 years ago
haroon amjad 7f34a1fe71 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad 7dbc00a864 ancillary orders update 4 years ago
haroon amjad 693f8cb090 Updates & fixes 4 years ago
Fatimah Alshammari f83adbc6ff Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 4 years ago
Fatimah Alshammari 0b21252ae7 fix category issue 4 years ago
haroon amjad 4acdad0e99 fixes & updates 4 years ago
haroon amjad 56b640ff91 Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!579
4 years ago
haroon amjad 8f91d0a0dc lakum fix 4 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
haroon amjad e53ba65ddd Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad cd797123a3 Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!578
4 years ago
Fatimah Alshammari 55cc5dae4f Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 4 years ago
Fatimah Alshammari 0985436a10 fix translation issue 4 years ago
haroon amjad 28107f9a48 Compare duplication fixed 4 years ago
haroon amjad 8c3b443f79 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad 4e3d99b007 Updates & fixes 4 years ago
haroon amjad bac6774534 Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!576
4 years ago
Fatimah Alshammari e5f0f5777b Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
# Conflicts:
#	lib/services/pharmacy_services/product_detail_service.dart
4 years ago
haroon amjad 1fc45e3f7c Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!577
4 years ago
haroon amjad 6d88607631 Updates & fixes 4 years ago
Fatimah Alshammari 9740f88e6b Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 4 years ago
Fatimah Alshammari 57d10d9e1f fix compare issue 4 years ago
haroon amjad 1f19af01c4 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad c175139a29 pharmacy fixes 4 years ago
haroon amjad 0ac937aa7d Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!575
4 years ago
Fatimah Alshammari 71a28e2ed6 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 4 years ago
Fatimah Alshammari cc783045bb fix categories & cantact design 4 years ago
haroon amjad 3fcad86ef3 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad 5ae5f75b4f Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!574
4 years ago
haroon amjad c05772c63a pharmacy fixes 4 years ago
haroon amjad 432ed4172a Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!573
4 years ago
haroon amjad 2ebff634c4 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad b15bd2362b Updates & fixes 4 years ago
Fatimah Alshammari 7634c35e3d Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
# Conflicts:
#	lib/widgets/input/text_field.dart
4 years ago
Fatimah Alshammari d7c3cb3dbc fix conflict 4 years ago
haroon amjad 98d50a9b42 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad d624136eab Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!572
4 years ago
haroon amjad c2b0326676 Updates & fixes 4 years ago
haroon amjad 98d9839ac2 Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!571
4 years ago
haroon amjad 3107d1e86d Updates & fixes 4 years ago
haroon amjad eea701907d Login fixes 4 years ago
haroon amjad 0ae4a13c02 Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
Zik new design flutter v2.5

See merge request Cloud_Solution/diplomatic-quarter!570
4 years ago
Zohaib Iqbal Kambrani 1a6a26be75 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5: (36 commits)
  merge improvements
  Health plugin updated
  fix search issue
  JIRA bug fixes
  updates & fixes
  Fixes & updates
  six issues
  nfc plugin improvement.
  disable lakum on check out page
  fix issue
  fix lakum issues
  Smartwatch fixes
  screen plugin improvement.
  Updates & fixes
  video call camera view issue fix, barcode plugin change, smart watches improvements.
  add quantity filed fixed
  pharmacy uo fix
  Fixes
  fix issue
  Speech to text fix in iOS
  ...

# Conflicts: Resolved
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
#	android/build.gradle
#	android/gradle/wrapper/gradle-wrapper.properties
#	lib/pages/conference/web_rtc/widgets/cam_view_widget.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/incoming_call.dart
4 years ago
Sikander Saleem c8b5602d8e flutter 2.8 improvements. 4 years ago
Sikander Saleem 3ad90f1a01 Merge branch 'development_new_design_2.0' into development_v2.5 4 years ago
haroon amjad 35d1d0998a Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!568
4 years ago
haroon amjad 7733c74f00 Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 63ffabcc86 no message 4 years ago
Sikander Saleem 684add0090 merge improvements 4 years ago
Sikander Saleem 9ba7b3b44b Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/medical/smart_watch_health_data/syncHealthData.dart
#	lib/pages/vaccine/my_vaccines_screen.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	pubspec.yaml
4 years ago
haroon amjad c379c6a37b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 4a0997cf49 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!567
4 years ago
haroon amjad e5703586ec Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!566
4 years ago
haroon amjad 4c2410cfd5 Health plugin updated 4 years ago
Fatimah Alshammari 216cc4a7e3 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari d767febcd0 fix search issue 4 years ago
haroon amjad 7bc8f69dfb JIRA bug fixes 4 years ago
haroon amjad f2001e9877 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!565
4 years ago
haroon amjad 2670d0be57 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 0fb6e9897a Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!564
4 years ago
haroon amjad 9c0337aa01 updates & fixes 4 years ago
haroon amjad 330f2d6c86 Fixes & updates 4 years ago
Fatimah Alshammari b09b1e4732 six issues 4 years ago
Sikander Saleem 2a92478d01 nfc plugin improvement. 4 years ago
Fatimah Alshammari f9d1bbe2ee disable lakum on check out page 4 years ago
Fatimah Alshammari cf7dd13a83 fix issue 4 years ago
Fatimah Alshammari ff7146e259 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart
#	lib/pages/pharmacy/pharmacyContacts.dart
4 years ago
Fatimah Alshammari de86cffb8c fix lakum issues 4 years ago
haroon amjad d5b58c07ca Smartwatch fixes 4 years ago
Sikander Saleem 2fd0fd3f85 screen plugin improvement. 4 years ago
haroon amjad b76183040c Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!563
4 years ago
haroon amjad a60e878fef Updates & fixes 4 years ago
Sikander Saleem 628439ddf8 video call camera view issue fix, barcode plugin change, smart watches improvements. 4 years ago
haroon amjad 0b4e674097 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 03e554b1af Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!562
4 years ago
hussam al-habibeh cf556c66b0 add quantity filed fixed 4 years ago
haroon amjad bb9aaf9945 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/availability_info.dart
4 years ago
haroon amjad a7c052cda8 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!561
4 years ago
hussam al-habibeh 516fddf962 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
hussam al-habibeh e291d46af7 pharmacy uo fix 4 years ago
haroon amjad 207525e31a Fixes 4 years ago
Fatimah Alshammari 10b96979a3 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari 749b89b67d fix issue 4 years ago
haroon amjad 94aab4a737 Speech to text fix in iOS 4 years ago
haroon amjad 8e00c59746 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!560
4 years ago
Fatimah Alshammari a1b4e1c8a3 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari 7ffb431454 added map luncher 4 years ago
haroon amjad 323f32267b Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!559
4 years ago
haroon amjad 3b9c1eb9ed Appointment booking fix 4 years ago
Sikander Saleem caec2c4ca4 video call improvements. 4 years ago
haroon amjad 302e9dbadd Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 76984a4ef6 Fixes 4 years ago
haroon amjad 8afe041b2d Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!558
4 years ago
Fatimah Alshammari 1b9e3b75bd fix issue of navigation 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
Fatimah Alshammari c84d1cadad fix address issue 4 years ago
Fatimah Alshammari a55ca33c1b Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
#	lib/widgets/pharmacy/product_tile.dart
4 years ago
Fatimah Alshammari bc9fc5a878 fix issue 4 years ago
Fatimah Alshammari 9d9377d59f fix issues 4 years ago
haroon amjad eb64962d7c Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad b0ae08d6a5 updates & fixes 4 years ago
haroon amjad d7de2d6802 Merge branch 'products_tails' into 'development_new_design_2.0'
Products tails

See merge request Cloud_Solution/diplomatic-quarter!557
4 years ago
haroon amjad 18c5b53b30 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
pharmacy design home page

See merge request Cloud_Solution/diplomatic-quarter!556
4 years ago
Elham Rababh b2814d0183 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into products_tails 4 years ago
hussam al-habibeh 9c8bd64142 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
hussam al-habibeh 6b1c0e04d0 pharmacy design home page 4 years ago
Elham Rababh 16c1064a45 PMAU-19 4 years ago
haroon amjad c1b194d15d Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
pharmacy home design

See merge request Cloud_Solution/diplomatic-quarter!555
4 years ago
Elham Rababh 3e667d6b87 fix arabic language 4 years ago
Elham Rababh f623828d78 fix arabic language 4 years ago
hussam al-habibeh 01433963bd pharmacy home design 4 years ago
Elham Rababh 8f044a635a fix footer design 4 years ago
haroon amjad 1a90698a99 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
fix ontap on prodcut card

See merge request Cloud_Solution/diplomatic-quarter!554
4 years ago
hussam al-habibeh 1984400239 fix ontap on prodcut card 4 years ago
haroon amjad 6c20bf50b5 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!553
4 years ago
hussam al-habibeh 3c97122308 pharmacy home dsign 4 years ago
haroon amjad 14b0c4c125 Merge branch 'products_tails' into 'development_new_design_2.0'
fix on design

See merge request Cloud_Solution/diplomatic-quarter!550
4 years ago
haroon amjad f06122d084 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!551
4 years ago
haroon amjad 2a01ec94ca Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!552
4 years ago
haroon amjad 75423e5501 Updates 4 years ago
Fatimah Alshammari 4d8271c45d fix product details issue 4 years ago
Fatimah Alshammari 169ebac076 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
4 years ago
Elham Rababh d6eeb02c91 fix on design 4 years ago
Fatimah Alshammari fb974af726 fix issues 4 years ago
haroon amjad d1fcdcc898 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
haroon amjad 908bf8b634 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!549
4 years ago
hussam al-habibeh 01a56da151 merge conflict resolved 4 years ago
hussam al-habibeh 141e650276 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
4 years ago
hussam al-habibeh 8c4af92832 pharmacy new design home 4 years ago
haroon amjad bbcba1fca0 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!548
4 years ago
hussam al-habibeh a5e7541394 new design pharmacy home 4 years ago
haroon amjad cf27c3e796 Incoming call & LiveCare pending UI revamped 4 years ago
hussam al-habibeh af0316367d Merge branch 'products_tails' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
Elham Rababh c5be1472e7 first step from product details 4 years ago
Fatimah Alshammari dbe74b3eb4 fix desing 4 years ago
Fatimah Alshammari bc49d0d7c0 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari db3ea448f6 fix design 4 years ago
Elham Rababh c6be53d800 first step from product details 4 years ago
Elham Rababh a71e7e4075 first step from product details 4 years ago
haroon amjad a46677f98e Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 38aa0fac61 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
LiveCare permissions

See merge request Cloud_Solution/diplomatic-quarter!547
4 years ago
haroon amjad fe7baeab3c LiveCare permissions 4 years ago
haroon amjad 39190681c6 Updates 4 years ago
haroon amjad 078300168c Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!546
4 years ago
haroon amjad e3b7069aa2 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/webRTC/call_page.dart
#	lib/pages/webRTC/signaling.dart
4 years ago
haroon amjad 2274c6affe Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0

See merge request Cloud_Solution/diplomatic-quarter!531
4 years ago
haroon amjad 8b1733e917 no message 4 years ago
haroon amjad 003375b12f Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!543
4 years ago
haroon amjad 68b443905e Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!544
4 years ago
haroon amjad d291c4ef2b Merge branch 'login_design_sikander' into 'development_new_design_2.0'
video call improvements for android

See merge request Cloud_Solution/diplomatic-quarter!545
4 years ago
Elham Rababh 34596163d1 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
Sikander Saleem 4518a26ff1 video call improvement. 4 years ago
Fatimah Alshammari 127096ec04 fixed wishlist design 4 years ago
Fatimah Alshammari 21c315c1a3 fix wishlist issue 4 years ago
hussam al-habibeh e6fd5293ca fix filited produvts API 4 years ago
Fatimah Alshammari 7bbabd798a fix issue 4 years ago
Fatimah Alshammari e640f41c35 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacies/widgets/ProductOrderItem.dart
4 years ago
Fatimah Alshammari 12b20831df fix app bar 4 years ago
Elham Rababh 12e47aba82 fix as first step 4 years ago
haroon amjad 998614cfe7 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!541
4 years ago
haroon amjad 816dfe4a12 Pharmacy fixes 4 years ago
haroon amjad 2c198ed224 no message 4 years ago
haroon amjad a88889ec1d Merge branch 'nov_fixes' into 'development_new_design_2.0'
small fix in order details

See merge request Cloud_Solution/diplomatic-quarter!540
4 years ago
Elham Rababh 6439fe264a small fix in order details 4 years ago
haroon amjad 17d569216d Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!539
4 years ago
haroon amjad 51915be699 Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page

See merge request Cloud_Solution/diplomatic-quarter!538
4 years ago
Fatimah Alshammari 2992ca4f70 fix translation 4 years ago
Fatimah Alshammari bd93395d0f fix order details issue 4 years ago
Fatimah Alshammari c60cf72640 fix lakum design 4 years ago
Fatimah Alshammari 5ae7471d3e fix issue 4 years ago
Fatimah Alshammari 7b44f3487f fix lakum design 4 years ago
Fatimah Alshammari e9a86b4e1c fix lakum 4 years ago
Fatimah Alshammari d25f888c3e Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/lakum-main-page.dart
4 years ago
Fatimah Alshammari a858d8764a fixed issues 4 years ago
devmirza121 f9e98c5fa4 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 7d2a6c794b Clinic Search Dialog 4 years ago
haroon amjad e683fe18b8 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!537
4 years ago
haroon amjad 4b446bb6d0 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad b2bb201a34 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
haroon amjad 333b41632c fixes 4 years ago
haroon amjad f52ae6b07f Merge branch 'login_design_sikander' into 'development_new_design_2.0'
laser images change & offer and packages

See merge request Cloud_Solution/diplomatic-quarter!536
4 years ago
Sikander Saleem 53e0165286 improvements. 4 years ago
Sikander Saleem 407fb81038 Merge branch 'development_new_design_2.0' into new_design_sikander 4 years ago
Sikander Saleem 7df0fc59df laser images change & offer and packages 4 years ago
haroon amjad 5bb20ea9a2 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 5f0985adaa Updates 4 years ago
haroon amjad 13a07ea7ae Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!535
4 years ago
Fatimah Alshammari ffc2f2b4bb fix issues 4 years ago
Fatimah Alshammari 1539945a29 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari c87a391a23 fixed wishlist issue 4 years ago
haroon amjad 0bbb3e5372 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!534
4 years ago
haroon amjad e67e17c2ba Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 7d29ee4468 cart order page fixes 4 years ago
haroon amjad 6d970800f9 Book Appo fix 4 years ago
haroon amjad e463b4fd25 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!533
4 years ago
Fatimah Alshammari a2a6da1527 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari 5dc1561992 fixed notify issue 4 years ago
haroon amjad 7f3340cace Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!532
4 years ago
haroon amjad d0c96d245b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 009abd0440 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!530
4 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 4 years ago
Zohaib Iqbal Kambrani 3bd94ee05e Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  fix issues
  Base app client updates
  prescription reminders added
  Medical Reminder 1.0
  lakum fixes
  Medical Reminder
4 years ago
Zohaib Iqbal Kambrani b596b1b61d WebRTC and Packages Offer | Merge 4 years ago
Fatimah Alshammari 08a895732c Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari 468d64a1e0 fix design issue 4 years ago
haroon amjad 7c6fa89d63 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 7ffc467552 Lakum fixes 4 years ago
haroon amjad 91fd8f8078 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!529
4 years ago
Fatimah Alshammari 998c1af0f7 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari ae3bb1bb2d fix issues 4 years ago
haroon amjad ed65b38dd9 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!528
4 years ago
haroon amjad ab7162f164 Base app client updates 4 years ago
haroon amjad 68294690a1 prescription reminders added 4 years ago
haroon amjad ff0e878bf2 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad a400bc965d Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page

See merge request Cloud_Solution/diplomatic-quarter!527
4 years ago
devmirza121 7f8a0320a7 Medical Reminder 1.0 4 years ago
haroon amjad 61a406085b lakum fixes 4 years ago
devmirza121 f3b7a5c318 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 69b1dd6533 Medical Reminder 4 years ago
haroon amjad 975fe6ca7b Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!525
4 years ago
haroon amjad 47b7b0db58 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacy/order/Order.dart
4 years ago
haroon amjad 943f9425cb Merge branch 'login_design_sikander' into 'development_new_design_2.0'
Laser & Clinic (Conflict Resolved)

See merge request Cloud_Solution/diplomatic-quarter!524
4 years ago
Sikander Saleem 044c442ce0 Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
#	lib/pages/parent_categorise_page.dart
4 years ago
Sikander Saleem 5a8c887117 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 4 years ago
haroon amjad 615e39baf0 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!523
4 years ago
Fatimah Alshammari bdf3429502 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacy/order/Order.dart
4 years ago
haroon amjad 8c9ff27515 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 777d88be30 updates 4 years ago
haroon amjad 87a997d156 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!521
4 years ago
haroon amjad 1d5898d071 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!520
4 years ago
Fatimah Alshammari 54ff9931cb fixed arrow issue order page 4 years ago
Sikander Saleem 084c82d7a8 improvements 4 years ago
Sikander Saleem 00f63cd288 Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
#	lib/pages/DrawerPages/notifications/notification_details_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem 014074c414 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
hussam al-habibeh 7607631052 sub categories pagnation 4 years ago
hussam al-habibeh c0e86721f6 Merge branch 'nov_fixes' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
	lib/pages/pharmacies/widgets/ProductOrderItem.dart
4 years ago
hussam al-habibeh db1820fda4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
Sikander Saleem 9a82b9c369 laser clinic added. 4 years ago
haroon amjad fb6183a48b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 79d99dd48a Pharmacy security updates applied 4 years ago
Fatimah Alshammari 3bfca80ab9 fixed issue 4 years ago
Elham Rababh 258e107e1b fix cart order page 4 years ago
hussam al-habibeh ff86dcbdc0 sub categories pagnation 4 years ago
Elham Rababh 7b6622ee4c fix cart order page 4 years ago
Fatimah Alshammari e3adbe4199 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
haroon amjad a7dccb76bf Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Pharmacy fixes

See merge request Cloud_Solution/diplomatic-quarter!517
4 years ago
haroon amjad 4823919fcb Pharmacy fixes 4 years ago
haroon amjad f4ccecc1af Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fix issue

See merge request Cloud_Solution/diplomatic-quarter!516
4 years ago
Fatimah Alshammari cd37941109 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari adfa707eda fix issue 4 years ago
haroon amjad f533dd5356 Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix cart order page

See merge request Cloud_Solution/diplomatic-quarter!515
4 years ago
Elham Rababh 6ff829ab91 fix cart order page 4 years ago
haroon amjad d78d1f1068 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
sub categorise fix

See merge request Cloud_Solution/diplomatic-quarter!511
4 years ago
haroon amjad 6db5577a12 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fixed issues

See merge request Cloud_Solution/diplomatic-quarter!513
4 years ago
haroon amjad d4e71fd8ec Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix cart back button

See merge request Cloud_Solution/diplomatic-quarter!514
4 years ago
Elham Rababh 275871bc39 fix addcustomeraddress 4 years ago
hussam al-habibeh e917da9183 sub Categorise fixed 4 years ago
hussam al-habibeh 80c6be239e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/pages/sub_categorise_page.dart
4 years ago
hussam al-habibeh 300668cc81 sub Categorise fixed 4 years ago
Fatimah Alshammari 333247faa2 fixed issues 4 years ago
Elham Rababh fb1d07fcba fix cart back button 4 years ago
haroon amjad 93517788f5 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Pharmacy fixes

See merge request Cloud_Solution/diplomatic-quarter!512
4 years ago
haroon amjad d630c6c45f Pharmacy fixes 4 years ago
hussam al-habibeh d7b32df024 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
hussam al-habibeh 9ccb155761 sub categorise fix 4 years ago
haroon amjad 6495e931d7 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Shopping cart fix

See merge request Cloud_Solution/diplomatic-quarter!509
4 years ago
Haroon Amjad 464ad9a3cb Shopping cart fix 4 years ago
haroon amjad cbc578250a Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!508
4 years ago
haroon amjad 67b6fd4ab6 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Elham Ali f0bb496df5 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!506
4 years ago
haroon amjad 7a8ed5b014 Total amount calculation fixes 4 years ago
hussam al-habibeh b09bc3bef9 merge dev to hussam pharmacy fix 4 years ago
haroon amjad c29aee46dd Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
4 years ago
haroon amjad a3fdb35c30 fixes 4 years ago
Elham Ali 110672fada Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix calling missing APi

See merge request Cloud_Solution/diplomatic-quarter!507
4 years ago
Elham Rababh f88864efd4 fix calling missing APi 4 years ago
hussam al-habibeh 1a382bfc80 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/config/config.dart
	lib/pages/parent_categorise_page.dart
	lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
	lib/pages/pharmacies/screens/product-details/product-detail.dart
	lib/pages/sub_categorise_page.dart
4 years ago
hussam al-habibeh 307e488a0e pharmacy product pagination 4 years ago
hussam al-habibeh a35e149088 product pagination 4 years ago
Elham Ali a9bd9f1fdf Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix bottom bar  in cart page

See merge request Cloud_Solution/diplomatic-quarter!504
4 years ago
haroon amjad 1686c10851 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
fixes

See merge request Cloud_Solution/diplomatic-quarter!505
4 years ago
haroon amjad 289e74fd0a fixes 4 years ago
Elham Rababh 05e4e7be45 fix bottom bar in cart page 4 years ago
haroon amjad 08f0f7b660 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fix issue

See merge request Cloud_Solution/diplomatic-quarter!501
4 years ago
Elham Ali 47c2c80b36 Merge branch 'nov_fixes' into 'development_new_design_2.0'
Nov fixes

See merge request Cloud_Solution/diplomatic-quarter!502
4 years ago
Elham Rababh 65aac99806 fix Availabilty part 4 years ago
Fatimah Alshammari d1e0b6ccd9 fix issue 4 years ago
haroon amjad a74a6d5bc8 Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page

See merge request Cloud_Solution/diplomatic-quarter!499
4 years ago
haroon amjad f1b44e9f0b Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!500
4 years ago
devmirza121 6575456d3b Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
4 years ago
devmirza121 dc3d3bc772 Health Calculator 5.0 4 years ago
Elham Rababh 8a168386da fix black screen which is appear in cart page 4 years ago
Fatimah Alshammari f5de786745 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari 96ec3f2926 fix issues 4 years ago
Elham Rababh dc7a5d3dca Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
haroon amjad 62c0333dbd Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!498
4 years ago
haroon amjad 3ec2f990b1 product detail page updates 4 years ago
Fatimah Alshammari c4e185ea60 fixed issues 4 years ago
Elham Rababh 2c3c270c43 finish steps inside payment 4 years ago
Elham Rababh b7dc6ee4b1 change model 4 years ago
Fatimah Alshammari 444bc7383d Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari 62d904aa68 fixed issues 4 years ago
Elham Rababh 41097f119c Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
haroon amjad 70304427f9 Doc specialty fix 4 years ago
haroon amjad 11d37d26e5 Product Detail page fix 4 years ago
Elham Rababh 45d167fc5e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
haroon amjad fd3d2b588b Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!497
4 years ago
haroon amjad 338c646a43 updates 4 years ago
haroon amjad 534b82461a Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 14b85cc407 Family files API changes 4 years ago
haroon amjad 740cb79df0 Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page

See merge request Cloud_Solution/diplomatic-quarter!496
4 years ago
devmirza121 590b795356 Health Calculator 4.0 marge 4 years ago
devmirza121 a131f24952 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart
#	lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart
#	lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
#	lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart
#	lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart
#	lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
devmirza121 1d1708bdcc Health Calculator 4.0 4 years ago
Elham Rababh 4e54349e3b Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
Elham Rababh df9e58402d first step from update design 4 years ago
hussam al-habibeh b2b786d157 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
haroon amjad 6ffa07392c Product detail page updates 4 years ago
haroon amjad 9563998fc3 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Product detail page updates

See merge request Cloud_Solution/diplomatic-quarter!495
4 years ago
Elham Rababh f8883f5439 first step from fixing check out process 4 years ago
hussam al-habibeh 5927f3e35f pharmacy home page update 4 years ago
haroon amjad 75989bdc01 Health Calculators translations 4 years ago
haroon amjad 0c870385ee Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!494
4 years ago
haroon amjad db7bc11893 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 90b821a37d Offers & packages UI completed 4 years ago
haroon amjad f7aafcda1a Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!493
4 years ago
haroon amjad d2834bb3dd Health calculator fixes 4 years ago
haroon amjad ea745f1b9f Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad efe8dea9a9 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!489
4 years ago
haroon amjad 502c7fd3de Offers & discounts UI updating 4 years ago
haroon amjad e7ec613cd4 Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page

See merge request Cloud_Solution/diplomatic-quarter!492
4 years ago
devmirza121 566de7936a Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 6225f2468d Health Calculator 3.0 4 years ago
Fatimah Alshammari ce0dff11b2 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari eb4801c7ee fixed rating issues 4 years ago
Haroon Amjad d5c68c5032 Packages & offers design 4 years ago
haroon amjad 464df82da0 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!491
4 years ago
haroon amjad b752b42a34 Updates & fixes 4 years ago
devmirza121 d4eab13982 Health Calculator 2.0 4 years ago
devmirza121 e13d64dbf7 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 0b8600605b Health Calculator 1.0 4 years ago
Fatimah Alshammari 77c8c85e88 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
haroon amjad eb12c8301c Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!488
4 years ago
haroon amjad 9ce77b56b9 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Fatimah Alshammari ca11fe3134 fix issues 4 years ago
haroon amjad 75056478fc Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!487
4 years ago
haroon amjad 30e67bbe3e updates 4 years ago
haroon amjad c253ec3110 LiveCare UI revamped 4 years ago
haroon amjad f995a9fa8e Ambulance request UI revamped 4 years ago
Fatimah Alshammari 239d2c1036 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
haroon amjad caab3339e3 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!486
4 years ago
Fatimah Alshammari 23acdfd494 fix loader issue and design 4 years ago
haroon amjad 894cc0e336 Updates & fixes 4 years ago
Fatimah Alshammari 6f63250252 fix issues 4 years ago
haroon amjad 96684d77e0 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!485
4 years ago
haroon amjad e1e31de818 Lakum fixes 4 years ago
haroon amjad 72784f68b9 Fixes & updates 4 years ago
haroon amjad 2e6ebc2933 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!483
4 years ago
haroon amjad be771917f0 pharmacy fixes 4 years ago
haroon amjad bebcd85557 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 5943522163 UI fixes 4 years ago
haroon amjad e3f720e68e Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!482
4 years ago
Fatimah Alshammari 28678633e7 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/lakum-main-page.dart
4 years ago
Fatimah Alshammari 78fc77159c fix lakum issues 4 years ago
haroon amjad 8d6278a59b Pharmacy fixes 4 years ago
haroon amjad 541f5f06e7 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!481
4 years ago
haroon amjad 925e3cb686 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/login/login.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/screens/product-details/product-detail.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacy/profile/profile.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
haroon amjad 585e26b091 Registration fix 4 years ago
Mohammad Aljammal fd46259701 Merge branch 'bottom_nav_pharmacy' into 'development'
show bottom nav in pharmacy all pages

See merge request Cloud_Solution/diplomatic-quarter!479
4 years ago
hussam al-habibeh cb85085969 show bottom nav in pharmacy all pages 4 years ago
Sikander Saleem d6a5f68312 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
Mohammad Aljammal c0cf2f71a2 Merge branch 'bottom_nav_pharmacy' into 'development'
Bottom nav pharmacy

See merge request Cloud_Solution/diplomatic-quarter!478
4 years ago
hussam al-habibeh 46d7e7ee14 show bottom nav in pharmacy all pages 4 years ago
Sikander Saleem cd81f05a8d laser clinic design (cont.) 4 years ago
haroon amjad 52fba56bc3 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!476
4 years ago
haroon amjad f15090c634 Merge branch 'development_new_design_2.0' into 'sultan_new_design'
# Conflicts:
#   lib/pages/login/register.dart
4 years ago
haroon amjad ecfbc3efab Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!477
4 years ago
haroon amjad 8c99bba17b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad e7f5fc8434 Blood donation fixes 4 years ago
haroon amjad be2854c906 Merge branch 'mirza_home_page' into 'development_new_design_2.0'
feedback status bar

See merge request Cloud_Solution/diplomatic-quarter!475
4 years ago
Sultan Khan 64e62235c4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan a471824507 register issues 4 years ago
Mirza.Shafique fa986476ee feedback status bar 4 years ago
haroon amjad e82b8d4439 Lakum & other fixes 4 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 4 years ago
Mohammad Aljammal f9e33e7212 Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0

See merge request Cloud_Solution/diplomatic-quarter!467
4 years ago
Mohammad Aljammal 8a0d0282ce Merge branch 'pharmacy_fix_bugs' into 'development'
pharmacy cart fixe counter

See merge request Cloud_Solution/diplomatic-quarter!470
4 years ago
Mohammad Aljammal 60d2496f0a Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!472
4 years ago
Mohammad Aljammal f424315a19 last commit 😄 4 years ago
Mohammad Aljammal d4283c0116 fix merge issue 4 years ago
Mohammad Aljammal 4cb63e353b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-detail.dart
4 years ago
Mohammad Aljammal 0d29ba70f5 Merge branch 'Oct_fixes' into 'development_new_design_2.0'
fix proceed button

See merge request Cloud_Solution/diplomatic-quarter!471
4 years ago
Fatimah Alshammari 9cececf3f1 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari 044f74865e fixed issues 4 years ago
haroon amjad 5692bc66a9 Removing anatomy pub from project 4 years ago
Elham Rababh d486b76116 fix merge issue 4 years ago
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 4 years ago
haroon amjad 668d725b25 Laser booking 4 years ago
Elham Rababh c97c39ea11 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Oct_fixes
 Conflicts:
	lib/config/config.dart
	lib/pages/pharmacies/screens/cart-page/select_payment_option_widget.dart
4 years ago
haroon amjad fa5fd8e323 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 0853ecdc27 Body added 4 years ago
mosazaid 4939fe63d1 pharmacy cart fixe counter 4 years ago
haroon amjad 0c2e3f772b Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page

See merge request Cloud_Solution/diplomatic-quarter!468
4 years ago
haroon amjad 89505510e3 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!469
4 years ago
Mirza.Shafique f547dc105c Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique 69db41364f icon fixs 4 years ago
Fatimah Alshammari 42e74759e4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
4 years ago
haroon amjad 62974b7b72 Updates & fixes 4 years ago
Fatimah Alshammari e6378b7ada fix issues 4 years ago
Elham Rababh 616748dc6f fix proceed button 4 years ago
Zohaib Iqbal Kambrani 94a5cac27d Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  LiveCare Schedule fixes
  improvements.
  live care design 3.0
  dialog ui changes in wallet & improvements.
  LiveCare Schedule API fix
  live care design 2.0
  Health converters UI done
  Health Calculators APIs updated
  Translation updates
  SessionID update
  live care design 1.0
  Updates & fixes
  blood sugar dialog improvement.

# Conflicts: Rseloved
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Zohaib Iqbal Kambrani 9d71793e88 no message 4 years ago
haroon amjad c8e62e986c Merge branch 'haroon-new-design' into 'development_new_design_2.0'
LiveCare Schedule fixes

See merge request Cloud_Solution/diplomatic-quarter!466
4 years ago
haroon amjad 57ea450662 LiveCare Schedule fixes 4 years ago
Sikander Saleem 455f65a5e5 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem d2223da3c2 improvements. 4 years ago
Mirza.Shafique f56ae8ff5b Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique 6af1747f12 live care design 3.0 4 years ago
Sikander Saleem 8c27773f7f Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem 40c63ae53b dialog ui changes in wallet & improvements. 4 years ago
haroon amjad 853ca033d2 LiveCare Schedule API fix 4 years ago
Mirza.Shafique a805273049 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 4a8fc38626 live care design 2.0 4 years ago
haroon amjad ccc08c00ae Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!465
4 years ago
haroon amjad 3a7d5e3d66 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 2a212149ed Health converters UI done 4 years ago
haroon amjad 73822300f9 Health Calculators APIs updated 4 years ago
haroon amjad d4ffc76733 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Health Calculators APIs updated

See merge request Cloud_Solution/diplomatic-quarter!464
4 years ago
haroon amjad b7bf99c862 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!463
4 years ago
haroon amjad 7123ed34ab Translation updates 4 years ago
haroon amjad fd07d543fa Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad cb69684bb8 SessionID update 4 years ago
Mirza.Shafique cacdd5907c Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique fd26a59b2d live care design 1.0 4 years ago
haroon amjad 360acd487e Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!462
4 years ago
haroon amjad 5e5f540431 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
haroon amjad b08dfb117c Updates & fixes 4 years ago
Zohaib Iqbal 9c1f5ab465 Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0

See merge request Cloud_Solution/diplomatic-quarter!461
4 years ago
Zohaib Iqbal Kambrani 4c5b9b4244 Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  Translation update
  Fixes & updates
  Blood donation fixes
  Pharmacy Payment method design fix, Blood Donation fix
  improvements
  blood donation dialog change & improvements.
  Pharmacy updates
  Pharmacy prescriptions page design
  LiveCare design fixes
4 years ago
Zohaib Iqbal Kambrani 9fd2304d33 tamara. 4 years ago
Sikander Saleem c1ce3a0489 blood sugar dialog improvement. 4 years ago
Elham Rababh 2c30b5a494 fix issues 4 years ago
Fatimah Alshammari c242910aa2 fixed issues 4 years ago
haroon amjad d38de8c494 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!460
4 years ago
haroon amjad 5474ecf2cc Translation update 4 years ago
haroon amjad b53d912996 Fixes & updates 4 years ago
haroon amjad df7d8a8603 Blood donation fixes 4 years ago
haroon amjad 924f685342 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
4 years ago
haroon amjad ddf764897a Pharmacy Payment method design fix, Blood Donation fix 4 years ago
Sikander Saleem ebb4c026c6 improvements 4 years ago
Sikander Saleem d8476df6dd Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_home_health_care_page.dart
4 years ago
Sikander Saleem 4858f8883a blood donation dialog change & improvements. 4 years ago
Fatimah Alshammari 428791c725 fixed design 4 years ago
Fatimah Alshammari 5e75860d43 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/cart-order-page.dart
#	lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
4 years ago
Fatimah Alshammari 1089ce3aa3 Updates 4 years ago
haroon amjad 3dc82a0547 Pharmacy updates 4 years ago
haroon amjad 62b29b4904 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!459
4 years ago
haroon amjad eed4fd2509 Pharmacy prescriptions page design 4 years ago
haroon amjad 20076f2f2b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 2cff7c3246 LiveCare design fixes 4 years ago
Zohaib Iqbal 222635ec79 Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0

See merge request Cloud_Solution/diplomatic-quarter!458
4 years ago
Zohaib Iqbal Kambrani ebfa9cd630 Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  Layout files
  pharmacy updates
  fixed issues
  Updates
  UI fixes
  Updates
  Smartwatch updates
  Smartwatch updates
  fixed issues
  fixed loader issue
4 years ago
Zohaib Iqbal Kambrani f3462dfc19 Applied cost from api at cart 4 years ago
haroon amjad 3b4e12a5de Layout files 4 years ago
haroon amjad 7350745a1e Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Layout files

See merge request Cloud_Solution/diplomatic-quarter!457
4 years ago
haroon amjad ce3d3a69cc Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!456
4 years ago
haroon amjad 6f92a093ab Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
haroon amjad 9dbe922259 pharmacy updates 4 years ago
haroon amjad e58b925382 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/screens/cart-order-page.dart
4 years ago
haroon amjad 6f25f79d86 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!455
4 years ago
Fatimah Alshammari 8bb3fe62c4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari a4f404386b fixed issues 4 years ago
haroon amjad 41822d2cf1 Merge branch 'development' into haroon-new-design 4 years ago
haroon amjad e913316c54 Updates 4 years ago
Zohaib Iqbal d6d85092ee Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0

See merge request Cloud_Solution/diplomatic-quarter!454
4 years ago
Zohaib Iqbal Kambrani 8b1ac05012 Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0: (105 commits)
  app bar back icon issue
  improvements
  emergency nearest ui changes
  Zoom Avatar implementation
  no message
  Child Vaccine 3
  register
  register page
  Working on Health data
  Child Vaccine 2
  registration
  Ereferral fixed, HHC moved to new APIs, Notification new design implemented
  registration done
  Child Vaccine 1.0
  In App Review
  In App Review
  oder log merge fix
  design fixes 3
  Chart fix & In-App update implemented
  design fixes 1.1
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
haroon amjad 68829d0986 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Mirza.Shafique 0be197a782 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique e3bfe83ea2 app bar back icon issue 4 years ago
haroon amjad a40cd6ccd2 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!451
4 years ago
haroon amjad 940441106a UI fixes 4 years ago
haroon amjad be91844868 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 30c6f1dedb Updates 4 years ago
Sikander Saleem de43c6bfa4 improvements 4 years ago
Sikander Saleem 7641da8122 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/hospital_location.dart
4 years ago
Sikander Saleem 7c4edf971a emergency nearest ui changes 4 years ago
Mirza.Shafique fe1a287070 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 5514753288 Zoom Avatar implementation 4 years ago
haroon amjad 1fff2dad25 Smartwatch updates 4 years ago
Zohaib Iqbal Kambrani aad071ac67 Packages and Offers apply token 4 years ago
haroon amjad d409875741 Smartwatch updates 4 years ago
haroon amjad b4591f8d15 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!452
4 years ago
haroon amjad b52c719351 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 1f077f71f8 no message 4 years ago
Mirza.Shafique 957ff9039b Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 1a6802ce24 Child Vaccine 3 4 years ago
Fatimah Alshammari e494c9304d fixed issues 4 years ago
haroon amjad 76fb93fe9b Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!450
4 years ago
haroon amjad 5287260b85 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
haroon amjad 745b167c47 register 4 years ago
Sultan khan 4264c905d9 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!449
4 years ago
Sultan Khan 58ab90f6d3 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan c14f40dae2 register page 4 years ago
haroon amjad 983fb55747 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 2032053cb7 Working on Health data 4 years ago
Mirza.Shafique 4f7666cfd8 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique ce115e1037 Child Vaccine 2 4 years ago
Sultan khan 5df3350125 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!448
4 years ago
Sultan Khan eaea14ce3d registration 4 years ago
haroon amjad 2062b96652 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 3db4094585 Ereferral fixed, HHC moved to new APIs, Notification new design implemented 4 years ago
Sultan Khan a59c60f79a Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 496c6ce32e registration done 4 years ago
Mirza.Shafique a766c2522e Child Vaccine 1.0 4 years ago
haroon amjad 3d22cdb17c Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 5b1f0c163e In App Review 4 years ago
haroon amjad 680dcfc255 In App Review 4 years ago
Mirza.Shafique 41db218e9a oder log merge fix 4 years ago
Mirza.Shafique d3698a0e74 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart
4 years ago
Mirza.Shafique 3d480bac5c design fixes 3 4 years ago
haroon amjad 0eeaa5e301 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!447
4 years ago
haroon amjad 4b0382d7c4 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 12a58856e5 Chart fix & In-App update implemented 4 years ago
Mirza.Shafique a273bacc17 design fixes 1.1 4 years ago
Sikander Saleem 4dca22bec1 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem afad83182d h20 dialog ui changes 4 years ago
haroon amjad 0c895348e7 my family fix 4 years ago
haroon amjad a710406317 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
#	lib/pages/DrawerPages/family/my-family.dart
4 years ago
haroon amjad 75d3751719 Offers API 4 years ago
haroon amjad 494b1f221d Updates & fixes 4 years ago
Mirza.Shafique 792bb4df0b Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart
#	lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
#	lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart
4 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 4 years ago
haroon amjad 8001c0140c Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
4 years ago
haroon amjad 1858be18b7 Feedback Status fixes 4 years ago
Sikander Saleem 554b9558b1 add reminder & send mail button color change. 4 years ago
Sikander Saleem 14ccae993e my tracker tabs switching issue fixed. 4 years ago
Haroon Amjad 59dac89118 updates 4 years ago
haroon amjad ade3cb0899 File no & UI changes 4 years ago
haroon amjad 1dcfe44e96 Translations 4 years ago
Zohaib Iqbal Kambrani d0986fcaf6 OpenTok SDK applied and method channels written to native 4 years ago
haroon amjad 2ed8008790 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
haroon amjad 832d48971f updates 4 years ago
Mirza.Shafique 4cf9a9b2c2 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
Mirza.Shafique 3dbef4095f Payment page design 4 years ago
Sikander Saleem ba4792cd38 merge improvements. 4 years ago
Sikander Saleem 706832a1cb Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/locator.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/widgets/ProductTileItem.dart
#	lib/pages/search_products_page.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/buttons/secondary_button.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/others/app_scafold_detail_page.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
haroon amjad a4800ce7ca Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!446
4 years ago
haroon amjad 43a672cc68 Updates & fixes 4 years ago
haroon amjad 5d44fff28d Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 4 years ago
Mirza.Shafique ab6f7b8915 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
Mirza.Shafique eeaf7d9d2f HMG Services Detail View 4 years ago
Sikander Saleem f13871de9a find us and prescription availability hospital location ui changes, 4 years ago
Zohaib Iqbal Kambrani 57a3c2a04c Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0: (33 commits)
  base app client changes
  Translation & UI updates
  FAMILY FILE
  family files
  localisation update
  family file change
  E-Refreal design
  blood pressure, blood sugar, weight, order log & send feedback dialog changes and improvements (cont).
  Updates & fixes
  all dialog changes and improvements (cont).
  UI fixes & updates
  family files changes
  Notification page fix
  Notifications UI fix
  feedback status added.
  Notifications UI redesigned
  Blood pressure chart fix
  My tracker fixes
  my family
  fixes
  ...
4 years ago
Fatimah Alshammari f649701276 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari 3be7f7f899 fixed loader issue 4 years ago
haroon amjad ed4fca2d4c Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!444
4 years ago
haroon amjad 2709b177c6 Merge branch 'pharmacy_fix' into 'development'
add to cart fix

See merge request Cloud_Solution/diplomatic-quarter!435
4 years ago
haroon amjad babb48b1db base app client changes 4 years ago
haroon amjad 68642c3ba4 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!445
4 years ago
haroon amjad cf7291e379 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
haroon amjad 03882c166c Translation & UI updates 4 years ago
haroon amjad 90843252c3 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
#	lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Fatimah Alshammari 9cf0794cf6 Fixed out of stuck items issues 4 years ago
Sultan khan e4c8575a7f Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!443
4 years ago
Sultan Khan 18f35a22bb FAMILY FILE 4 years ago
Sultan Khan 5a9ab457e5 family files 4 years ago
haroon amjad 6d3ead24e1 localisation update 4 years ago
Sultan Khan a31f55aaa7 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 4780039cc7 family file change 4 years ago
Mirza.Shafique 05a6860081 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique e1b79ef5c1 E-Refreal design 4 years ago
Sikander Saleem ecb6315f9c blood pressure, blood sugar, weight, order log & send feedback dialog changes and improvements (cont). 4 years ago
haroon amjad 2db050a228 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad e564cdc7e5 Updates & fixes 4 years ago
Sikander Saleem 0b4305de03 all dialog changes and improvements (cont). 4 years ago
haroon amjad fc67d0d14d Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!442
4 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 4 years ago
Sultan Khan 448a3aaa48 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 881644a22e family files changes 4 years ago
Fatimah Alshammari e2763a5bd5 fixed cart shopping issues 4 years ago
haroon amjad 6cd2f65ce8 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 9d30bf63d0 Notification page fix 4 years ago
Sikander Saleem ae85f75e81 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/feedback/status_feedback_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 43c67a5a84 Notifications UI fix 4 years ago
Sikander Saleem a026fbf940 feedback status added. 4 years ago
haroon amjad f60684ad08 Notifications UI redesigned 4 years ago
haroon amjad 8cf6642c79 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 803f5a786b Blood pressure chart fix 4 years ago
Sultan khan f5b17444fe Merge branch 'sultan_new_design' into 'development_new_design_2.0'
my family

See merge request Cloud_Solution/diplomatic-quarter!441
4 years ago
haroon amjad a996f83ee1 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!440
4 years ago
haroon amjad 07a98d75c6 My tracker fixes 4 years ago
Sultan Khan a39658206d my family 4 years ago
haroon amjad 40cbca565a fixes 4 years ago
haroon amjad e1f5eb8b83 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
haroon amjad 8ea6a5de04 localization fix 4 years ago
Sultan khan f2397246f9 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!439
4 years ago
Sultan Khan 160049973e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan e3a7c08e7c blood type changes 4 years ago
Sikander Saleem 54c3beadf2 improvements. 4 years ago
Sikander Saleem 8f371f87d2 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 58c78656bf Rating dialog updates 4 years ago
Mirza.Shafique dde16a13fe General page in profile 4 years ago
Sikander Saleem 21863cfe06 improvements. 4 years ago
Sikander Saleem ad98dfce67 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
4 years ago
Sikander Saleem 1223ab7a17 h20 week & month graph updated & improvements. 4 years ago
haroon amjad 32e5f43e96 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
HarHaroon new design

See merge request Cloud_Solution/diplomatic-quarter!438
4 years ago
haroon amjad 4a2e01b8b1 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad b475adb5c3 Updates & fixes 4 years ago
Zohaib Iqbal Kambrani b1244f0bf3 Huawei MapTiles loading issue fix by apply signing on App and AGConnect 4 years ago
Sultan khan c88399c751 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
family file fixes

See merge request Cloud_Solution/diplomatic-quarter!436
4 years ago
Sultan Khan 5c8b809e39 family file fixes 4 years ago
Fatimah Alshammari d8db5ad590 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/pharmacies/screens/cart-order-page.dart
4 years ago
Fatimah Alshammari 30a1353be6 fixed brands design and recommended products issues 4 years ago
hussam al-habibeh a8fb7152b1 add to cart fix 4 years ago
hussam al-habibeh 75ef3fde80 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
 Conflicts:
	lib/widgets/pharmacy/bottom_nav_pharmacy_item.dart
4 years ago
Mirza.Shafique d664a216c6 Profile Page and Back Button Click 4 years ago
Mohammad Aljammal 0590642854 Merge branch 'cart' into 'development'
Cart

See merge request Cloud_Solution/diplomatic-quarter!434
4 years ago
hussam al-habibeh 66acda38a3 add to cart fix 4 years ago
Elham Rababh 75fdadafbd refactor widget in the cart preview 4 years ago
Elham Rababh 2526d6bc6f fix issue in cart page 4 years ago
haroon amjad e62e3dae1b CMC APIs coverting to RC 4 years ago
haroon amjad 6902e6529c Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sultan khan 5dbb257194 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!433
4 years ago
Sikander Saleem f6b96dcb7b Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/BookAppointment/components/SearchByDoctor.dart
4 years ago
Sultan Khan 3b4e03c618 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan b5cd6afa4b family file fixs 4 years ago
Sikander Saleem c9662c7451 schedule appointment navigation fix. 4 years ago
haroon amjad 0a9d0e5eaa fixes 4 years ago
Mirza.Shafique 6261f01ab6 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique 9c7e8e3637 Back Button on Landing Page 1 4 years ago
haroon amjad 6d725f807b Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!432
4 years ago
haroon amjad 3f3ddd7af0 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/SchedulePage.dart
4 years ago
Mohammad Aljammal 26c83cd93d Merge branch 'pharmacy_fix_bugs' into 'development'
Pharmacy fix bugs

See merge request Cloud_Solution/diplomatic-quarter!430
4 years ago
Sikander Saleem f509679173 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
haroon amjad cbf2e84959 fixes 4 years ago
Sikander Saleem 1346eab593 h2o today page, prescription & schedule appointment improvements. 4 years ago
Sultan khan c99e32e129 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!431
4 years ago
haroon amjad 022b1bd000 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sultan Khan 02f5b43b64 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan ca70926050 family file fixes 4 years ago
haroon amjad cb220031dd Updates & fixes 4 years ago
mosazaid b779c250a4 pharmacy cart and wishlist fixes 4 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 4 years ago
Mirza.Shafique 3a07d39bff Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Sultan Khan 549ddfdbb9 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 4 years ago
haroon amjad 6c4afaf114 Advance payment API updates 4 years ago
Fatimah Alshammari 10f75191c6 added shopping cart to categories 4 years ago
mosazaid c7f558b92e Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 4 years ago
haroon amjad b37944866e Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!429
4 years ago
Mirza.Shafique 4d372bffb2 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique e788f09ed9 Show Chart Widget 4 years ago
Haroon Amjad 1fa6a4409b Family files fixes 4 years ago
Haroon Amjad 134ccb7ee1 Merge branch 'haroon-new-design' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon-new-design 4 years ago
haroon amjad 587210ee58 UI fixes 4 years ago
haroon amjad a819660536 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
haroon amjad 01ccd484f4 Calendar plugin changed 4 years ago
Sultan khan 7e095248c5 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
family files changes

See merge request Cloud_Solution/diplomatic-quarter!428
4 years ago
Sultan Khan 9b94fe33cf Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sikander Saleem 8aa1fbfb4a localized_values fixed. 4 years ago
Sultan Khan 9010558dc9 family files changes 4 years ago
Sikander Saleem 08960867f7 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem 2aa6ad5d6b h20 today ui (cont.)1 4 years ago
Sikander Saleem 55df00dcd4 h20 today ui (cont.) 4 years ago
haroon amjad 7264d03818 Family Files previleges fix 4 years ago
Sikander Saleem 763c16ddd0 h2o setting ui redesigned. 4 years ago
haroon amjad 870da89aec Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 259581c4f8 updates & fixes 4 years ago
Mohammad Aljammal 29d0afdea4 Merge branch 'product_detail_page' into 'development'
fix bottom sheet functions

See merge request Cloud_Solution/diplomatic-quarter!424
4 years ago
Mohammad Aljammal 0e5fd1d1ec Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!425
4 years ago
Elham Rababh be21cb352b return recommended products 4 years ago
haroon amjad fa929adfd9 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!427
4 years ago
haroon amjad a7ccc73c36 updates 4 years ago
haroon amjad 96c290c3f3 Localization file updates 4 years ago
haroon amjad 829fcd1461 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
4 years ago
haroon amjad 2c4ff16f0c updates & fixes 4 years ago
Sultan khan 0db34ed226 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!426
4 years ago
Sultan Khan 821a9b5ade Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 2c1d7c511e family file changes 4 years ago
haroon amjad 230d87c473 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
4 years ago
haroon amjad 01ca8b8f84 updates & fixes 4 years ago
Mirza.Shafique cb230db0c5 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique a9773e81e7 Bug Fixes prescription 4 years ago
Sikander Saleem 8b49eed6ae hospital text replaced with branch 4 years ago
Fatimah Alshammari ac63f09633 edit arabic version 4 years ago
Fatimah Alshammari 8baad999c5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/config/config.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/wishlist.dart
4 years ago
Elham Rababh 8fac62bcb1 fix bottom sheet functions 4 years ago
Fatimah Alshammari 74929f76e5 edit home page 4 years ago
Mohammad Aljammal bcd99555e3 Merge branch 'pharmacy_fix_bugs' into 'development'
Pharmacy fix bugs

See merge request Cloud_Solution/diplomatic-quarter!423
4 years ago
mosazaid 988625e4f1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 4 years ago
mosazaid c1f3d3cc1c fixes 4 years ago
Mohammad Aljammal ad8fd65f75 Merge branch 'product_detail_page' into 'development'
add count to cart

See merge request Cloud_Solution/diplomatic-quarter!422
4 years ago
Elham Rababh 944bbce1bf add count to cart 4 years ago
Elham Rababh bfbd04e35d add count to cart 4 years ago
mosazaid acdd19eeed calling cart from pharmacy home and add provider to it 4 years ago
Mohammad Aljammal f736ab5365 Merge branch 'fix_product_tile' into 'development'
Fix product tile

See merge request Cloud_Solution/diplomatic-quarter!421
4 years ago
Mohammad Aljammal 0150bc4684 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
 Conflicts:
	lib/pages/pharmacies/ProductCheckTypeWidget.dart
	lib/pages/pharmacies/screens/cart-order-page.dart
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
Mohammad Aljammal d2be206d6c Merge branch 'product_detail_page' into 'development'
Product detail page

See merge request Cloud_Solution/diplomatic-quarter!420
4 years ago
Mohammad Aljammal eb19daa98f fix car count 4 years ago
Elham Rababh 3dc28d318a fix bugs on wish list 4 years ago
Fatimah Alshammari 4309952b17 fixed subCategories 4 years ago
Sikander Saleem b4031e973e chevron icon to arrow forward 4 years ago
Elham Rababh b0b278a7e3 fix bugs 4 years ago
haroon amjad 503ab739ca prescription availability design revamped 4 years ago
Elham Rababh 145117aa63 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
4 years ago
Elham Rababh 9254004125 fix coloring issue 4 years ago
Mohammad Aljammal 0e373059a0 Merge branch 'pharmacy_fix_bugs' into 'development'
Pharmacy fix bugs

See merge request Cloud_Solution/diplomatic-quarter!419
4 years ago
mosazaid 8b5e1e57c7 fix bugs pharmacy wishlist 4 years ago
mosazaid 4d37bc2958 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-detail.dart
	lib/pages/pharmacies/screens/product-details/recommended_products.dart
	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
	lib/widgets/others/app_scafold_detail_page.dart
4 years ago
mosazaid a41980b252 fix bugs pharmacy wishlist 4 years ago
Elham Rababh 7de8c2588f fix coloring issue 4 years ago
haroon amjad 46a572674f Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 69af6799c4 updates 4 years ago
Mirza.Shafique 3a40eb92be Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Sultan khan 51cab0928a Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!418
4 years ago
Mirza.Shafique 06c5ee269b Bug Fixes 4 years ago
Sultan Khan f53f2f7cab Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 1b387c2dbf changes pushed 4 years ago
Mohammad Aljammal 00a0e34347 Merge branch 'product_detail_page' into 'development'
add loader and cache on images

See merge request Cloud_Solution/diplomatic-quarter!415
4 years ago
Elham Rababh 58d43f7e46 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 4 years ago
Mohammad Aljammal e578b1e759 Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home and increase performance

See merge request Cloud_Solution/diplomatic-quarter!416
4 years ago
Elham Rababh 2981eb3236 fix public card issues 4 years ago
haroon amjad 2690bddcac Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 5163c826ad Updates & fixes 4 years ago
Sultan khan 23d11c2160 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!417
4 years ago
Sultan Khan d514f64870 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 76e16594ba FAMILY FILES 4 years ago
Sikander Saleem 6099738a5c improvements 4 years ago
mosazaid 0d2d4c64c2 fix bugs pharmacy home and increase performance 4 years ago
Elham Rababh 7dfc700d26 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 4 years ago
Sikander Saleem df31c82fd5 doctor header review on tap improvement. 4 years ago
Elham Rababh 055b888ba2 fix address 4 years ago
Elham Rababh 3b79d0ac41 return the disable colors 4 years ago
Elham Rababh 47e19c4ab5 add loader and cache on images 4 years ago
Sikander Saleem 5410b826c3 prescriptions new ui updated. 4 years ago
haroon amjad cbb9151b62 Merge branch 'haroon-new-design' into development_new_design_2.0 4 years ago
haroon amjad 4593396f6c Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Mohammad Aljammal 48642a3c7c Merge branch 'product_detail_page' into 'development'
Product detail page

See merge request Cloud_Solution/diplomatic-quarter!414
4 years ago
Mohammad Aljammal b175fb7ce0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile 4 years ago
Haroon Amjad 202e81f7c6 images added in pubspec 4 years ago
Haroon Amjad 19edcc210e Rate appointment UI implemented 4 years ago
haroon amjad 89e1aa70c0 updates 4 years ago
Elham Rababh 1e1e230908 fix call service in case not login 4 years ago
Mohammad Aljammal b539ff5851 Merge branch 'pharmacy_fix' into 'development'
cart fix

See merge request Cloud_Solution/diplomatic-quarter!413
4 years ago
Elham Rababh a5751f0d70 handel un login cases 4 years ago
hussam al-habibeh c56e4a1a5c cart fix 4 years ago
Mohammad Aljammal 6339e30369 Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home

See merge request Cloud_Solution/diplomatic-quarter!412
4 years ago
mosazaid a9d0b7a14b fix bugs pharmacy home 4 years ago
Elham Rababh 19cb48e133 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 4 years ago
Elham Rababh 338901d423 remove add to cart 4 years ago
Elham Rababh 7c15bca746 fix item 4 years ago
mosazaid 6acb8031d0 fix bugs pharmacy home 4 years ago
Mohammad Aljammal 76eef8625d Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home

See merge request Cloud_Solution/diplomatic-quarter!411
4 years ago
mosazaid 594b2710b3 fix bugs pharmacy home 4 years ago
haroon amjad 22c6a8ce42 no message 4 years ago
haroon amjad 85d68b0388 ereferral fixes 4 years ago
Mohammad Aljammal 1f9e7563a9 Merge branch 'product_detail_page' into 'development'
fix scaffold

See merge request Cloud_Solution/diplomatic-quarter!409
4 years ago
Sultan khan d3f564b896 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!410
4 years ago
Sultan Khan fed33ae4dc Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan fee23de1fd hhc changes 4 years ago
Elham Rababh ad0c8eaffb fix scaffold 4 years ago
Mohammad Aljammal b64a5b29c5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
 Conflicts:
	lib/pages/pharmacy/profile/profile.dart
4 years ago
Mohammad Aljammal 9e31d497ed fix wish list issue 4 years ago
Mohammad Aljammal 361b72624b Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!407
4 years ago
Mohammad Aljammal 73f2fd33d4 Merge branch 'product_detail_page' into 'development'
Product detail page

See merge request Cloud_Solution/diplomatic-quarter!408
4 years ago
Elham Rababh 65cf4316ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Elham Rababh bb96201c2e remove the custom scaffold 4 years ago
Sikander Saleem 28c0450544 lab result filterName improvement. 4 years ago
hussam al-habibeh f3000d0ee3 My account design fix 4 years ago
Elham Rababh e20e90c20c fix quantity_box 4 years ago
haroon amjad 99b87b1f84 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
fixes

See merge request Cloud_Solution/diplomatic-quarter!406
4 years ago
haroon amjad f6d779431a fixes 4 years ago
haroon amjad ba79baa803 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!405
4 years ago
haroon amjad 8133f8a23a Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 13debe83f0 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!404
4 years ago
haroon amjad 46cc73bdd7 CMC changes 4 years ago
Sultan Khan 6159be0f75 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 5fe0214e04 bug fixes 4 years ago
haroon amjad 8cc36ae848 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad dfafb6b664 fixes 4 years ago
Mirza.Shafique c23478b838 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 205b4d6b21 Photo view in CMC 4 years ago
Mohammad Aljammal 424552d672 Merge branch 'pharmacy_fix' into 'development'
add pharmacy icons for bottom nav

See merge request Cloud_Solution/diplomatic-quarter!403
4 years ago
Elham Rababh d5f1a162c0 replace bottom sheet button 4 years ago
hussam al-habibeh 85e6032875 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix 4 years ago
Mohammad Aljammal 1c1fcb00cb Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home

See merge request Cloud_Solution/diplomatic-quarter!402
4 years ago
mosazaid 185d66e342 fix bugs pharmacy home 4 years ago
hussam al-habibeh d4fd95606e add pharmacy icons for bottom nav 4 years ago
Sikander Saleem d1f3428def Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem df32ae0142 lab order clinic/hospital name, prescription reminder ui, prescription availibility 4 years ago
haroon amjad 879ce4ee06 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 7675a4496a my vaccine & lab result fix 4 years ago
Sultan Khan a4ab22a4aa Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 5b988dff4f BUG FIXES 4 years ago
Mirza.Shafique 5e383e57d9 CMC error Fixes 4 years ago
Elham Rababh 6fe41382c0 first step from design 4 years ago
Sikander Saleem 3403e07aba recall prescription order log when refill or cancel order. 4 years ago
mosazaid c558fe6bd9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 4 years ago
mosazaid f47d59c43f fix bugs pharmacy home 4 years ago
Haroon Amjad 062ca5c11c EReferral fixes 4 years ago
Haroon Amjad abcb71e86e Invoice details UI revamped 4 years ago
haroon amjad c91b8ce777 My Vaccines design revamped 4 years ago
Elham Rababh 2839af658a fix issues 4 years ago
haroon amjad dfeb249a54 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad a4a2389a78 updates & fixes 4 years ago
Sikander Saleem f63293ef3e login input rtl 4 years ago
mosazaid fdb61c78c5 fix bugs pharmacy home 4 years ago
Mohammad Aljammal 8e30860fc2 Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!401
4 years ago
Sultan khan d63f0cd1a3 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!400
4 years ago
Sultan Khan fc9f2fc34e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 08933632d3 tracker services done rrt in progress 4 years ago
Sultan Khan 1205f93c8a tracker services done rrt in progress 4 years ago
hussam al-habibeh 9a2d52309c products categories page fix 4 years ago
Sikander Saleem 5bdb56df60 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem aff7b25566 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 4 years ago
Sikander Saleem 2bf28e3bef imp files added 4 years ago
Sikander Saleem 5fda70decf cmc & hhc order log ui improvements. 4 years ago
hussam al-habibeh cb2b9db0ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix 4 years ago
Mirza.Shafique bc246b2f9f Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique f0566fb069 CMC Images 4 years ago
Mohammad Aljammal 767a4fc835 Merge branch 'fix_product_tile' into 'development'
Fix product tile

See merge request Cloud_Solution/diplomatic-quarter!399
4 years ago
Mohammad Aljammal b53bd5fd62 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
 Conflicts:
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
Mohammad Aljammal 43e7bb9ff3 fix bottom navigation bar 4 years ago
Mohammad Aljammal 7cc5ec58d1 Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy

See merge request Cloud_Solution/diplomatic-quarter!398
4 years ago
mosazaid a398ede172 fix bugs pharmacy home 4 years ago
hussam al-habibeh 2265487ccd remove cart cout & icon from AppBar 4 years ago
Elham Rababh 769dc4e0ac first step of ProductDetailPage refactor 4 years ago
Elham Rababh a269b514a9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/config/config.dart
4 years ago
Elham Rababh c7a0d39aab first step of ProductDetailPage refactor 4 years ago
haroon amjad 184942e891 Covid Payment fixes 4 years ago
haroon amjad ab8030416c Updates & fixes 4 years ago
hussam al-habibeh 806e07e4e6 products categories page fix 4 years ago
Mirza.Shafique 9b160958bb Covid New Design 3 4 years ago
mosazaid f329eea798 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 4 years ago
mosazaid 01a77d5352 fix bugs pharmacy 4 years ago
Mohammad Aljammal d64e2a469f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile 4 years ago
Mohammad Aljammal 8ecd4a24d8 fix product tile 4 years ago
Mohammad Aljammal 8c7f397ac8 Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!397
4 years ago
hussam al-habibeh dbf7ebf287 fix most viewed & best sellers moduls 4 years ago
Mohammad Aljammal edffa96925 Merge branch 'brands' into 'development'
Brands

See merge request Cloud_Solution/diplomatic-quarter!396
4 years ago
Elham Rababh db277a62f5 fix brand design 4 years ago
Elham Rababh a6a7ed4e1b remove cart from product details 4 years ago
Elham Rababh 9b42d411ca remove cart from product details 4 years ago
haroon amjad 0955a22616 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad fa8c739b2c updates & fixes 4 years ago
Mirza.Shafique 6e244a55f5 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 4 years ago
Mirza.Shafique 7563a2870b Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique b80e2ea16e Covid New Design 2 4 years ago
Sikander Saleem 74432b6bbb cmc order log ui changes 4 years ago
haroon amjad 46d800c0c6 UI updates & fixes 4 years ago
Mirza.Shafique ef8006efd8 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
#	lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
#	lib/pages/Covid-DriveThru/covid-payment-alert.dart
#	lib/pages/Covid-DriveThru/covid-payment-details.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
4 years ago
Mirza.Shafique 5b330b2a25 Covid New Design 4 years ago
Elham Rababh cc88f0f81e first step of fixing 4 years ago
Sikander Saleem 9f8bcc63f3 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/medical/prescriptions/prescriptions_history_details_page.dart
4 years ago
Sikander Saleem 4ce941e01e prescription order log detail view change on arabic 4 years ago
Sikander Saleem c96fa62363 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem e36e0ce0b7 h20 bottom nav bar bug fix (happen in release mode) 4 years ago
hussam al-habibeh 7427cd68ff fix bottom nav bar ui 4 years ago
haroon amjad 19e6954bc8 updates 4 years ago
haroon amjad c3feed771c merge conflicts resolved 4 years ago
haroon amjad 5c64ce4795 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/MyAppointments/SchedulePage.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan khan 2ae5c8f657 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!395
4 years ago
haroon amjad b0f4cfcff3 Family file fixes 4 years ago
Sultan Khan e48d4e5eb2 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan c54146b3ba sechedule fix 4 years ago
haroon amjad 2fc5425884 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad f55fbd1cc2 UI fixes 4 years ago
Sultan khan 4fb2c24072 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!394
4 years ago
haroon amjad 4b1a2d4f3d Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ContactUs/findus/hospitrals_page.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
4 years ago
haroon amjad a075d53dd5 UI updates & fixes 4 years ago
Sultan Khan 54ac31a74c Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan a57facb876 family file fix 4 years ago
Sultan Khan c58023efc3 family file fixes 4 years ago
Sikander Saleem 7b8093b7ba Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem c1b23b7c2a improvements 4 years ago
Mirza.Shafique e24eaa791b Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 5b47aaac6f icon and find us distance 4 years ago
haroon amjad 728c22cc68 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/insurance/insurance_approval_screen.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem 0348397df3 insurance approval detail company name added. 4 years ago
Sikander Saleem 4a30c59f83 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem e37781c3a6 insurance approval screen and detail screen ui changes. 4 years ago
haroon amjad ba7d0329c3 Dental Invoices UI 4 years ago
haroon amjad af7b27258c Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sultan khan ed468c6fad Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!393
4 years ago
Sultan Khan 0e43ca173a Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan d535cb421d bug fixes 4 years ago
haroon amjad f9b57ce4aa Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 4ac0845003 updates & fixes 4 years ago
Mirza.Shafique 719cdbd2e4 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 8a4cf9f23b Line Chart Fix in Vital Signs 4 years ago
Sikander Saleem baf4eab604 prescription order detail ui changes 4 years ago
haroon amjad bbcf22ddfa Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
haroon amjad 92bfe27a6e updates & fixes 4 years ago
Sikander Saleem 4caacb968b Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem d9405b2bd0 prescription order log ui changes 4 years ago
Sikander Saleem 8e27d8210a prescription detail ui changes. 4 years ago
Mirza.Shafique 350882b1d2 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique ef2bcc1c65 Web RTC Design implementation 4 years ago
haroon amjad ad3463bbfc active medication design revamped 4 years ago
haroon amjad bf4709fef6 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/prescriptions/prescription_details_page.dart
4 years ago
haroon amjad 304ba8afa4 bas app client fixes 4 years ago
Sikander Saleem 8cb342cb24 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem 9d67704c67 prescription detail ui changes(cont). 4 years ago
Sultan khan dfd01d3033 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
login issue fixed

See merge request Cloud_Solution/diplomatic-quarter!392
4 years ago
Sultan Khan 2ebfdcfdd7 login issue fixed 4 years ago
Sikander Saleem 259163481c Merge branch 'development_new_design_2.0' into new_design_sikander 4 years ago
haroon amjad 05354f72cc pharmacy import fixes 4 years ago
haroon amjad b51989e798 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/compare.dart
#	lib/pages/pharmacies/my_reviews.dart
#	lib/pages/pharmacies/wishlist.dart
4 years ago
haroon amjad b3dffc992c App expandable fixes 4 years ago
haroon amjad a2e25f7a7a Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 98837b2298 WebRTC implementation 4 years ago
Sikander Saleem f0bb94c422 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem 4e0197965c prescription ui changes(cont). 4 years ago
Mirza.Shafique 999a45c711 App Expendable Design Change 4 years ago
haroon amjad 1200dbeb70 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 322a32be21 WebRTC Implementing 4 years ago
haroon amjad d9d4720ded pubspec updated 4 years ago
haroon amjad c050633671 SignalR Updates 4 years ago
Sultan khan 01f88229d3 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!391
4 years ago
Sultan Khan a53d51a899 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan f9f5a886a9 VITAL SIGN FIXED 4 years ago
haroon amjad 0a90791aca Push notification fixes 4 years ago
haroon amjad eeb20073cb Medicine prescriptions fixes from appointment details page 4 years ago
haroon amjad 298a8f4cff Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
#	lib/pages/DrawerPages/family/my-family.dart
4 years ago
haroon amjad b1128be94f Updates & fixes 4 years ago
Sultan khan 585d8067ad Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!390
4 years ago
Sultan Khan 1d36076320 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan dd58b8637b bug fixs 4 years ago
haroon amjad e5a636b704 Covid Test changes 4 years ago
Fatimah Alshammari b3285f4528 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/sub_categorise_page.dart
5 years ago
Fatimah Alshammari bdededa397 fixed arabic version 5 years ago
Mohammad Aljammal cfe9e35c38 Merge branch 'blood_pressure' into 'development'
parent product and sub product update

See merge request Cloud_Solution/diplomatic-quarter!389
5 years ago
hussam al-habibeh e4d54f0c0b parent product and sub product update 5 years ago
hussam al-habibeh f1c2dbbbfc Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into blood_pressure
 Conflicts:
	lib/pages/parent_categorise_page.dart
	lib/pages/sub_categorise_page.dart
5 years ago
hussam al-habibeh 0a1db70229 parent product and sub product update 5 years ago
haroon amjad e8bb4e962c Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
5 years ago
Mirza.Shafique ad3fbdf323 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique 717c7b3be4 Lab results designs enhancements 5 years ago
Zohaib Iqbal Kambrani 581bbe63bb Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
* 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  Images deleted from assets
  CMC 1.7
  CMC 1.6
  CMC 1.5
5 years ago
Zohaib Iqbal Kambrani 3f178e3e3f Google_Huawei Map -> AppMap 5 years ago
Mohammad Aljammal 1d7e97a9af Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!386
5 years ago
Fatimah Alshammari a4bf52818e Merge branch 'development' into fatima-new 5 years ago
Fatimah Alshammari 7ebeb8cb4b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/parent_categorise_page.dart
#	lib/pages/sub_categorise_page.dart
5 years ago
Fatimah Alshammari bcfbca98a1 fixed arabic version 5 years ago
Mohammad Aljammal 473f372a85 Merge branch 'blood_pressure' into 'development'
fix pharmacy products filtering

See merge request Cloud_Solution/diplomatic-quarter!388
5 years ago
hussam al-habibeh cb9d8cb9d9 fix pharmacy products filtering 5 years ago
hussam al-habibeh b0165c0d29 fix pharmacy products filtering 5 years ago
Mirza.Shafique 275b95be99 Images deleted from assets 5 years ago
haroon amjad 7467da7409 Imports organized 5 years ago
Fatimah Alshammari 2caf4d4837 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 5 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 5 years ago
Mirza.Shafique dfc6e3bbc1 CMC 1.7 5 years ago
haroon amjad c186c9f186 Merge branch 'development_new_design_2.0' into haroon-new-design 5 years ago
haroon amjad 0fe4a21388 updates & fixes 5 years ago
Mirza.Shafique d7314f7555 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 5 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 5 years ago
haroon amjad 32462ff5ba covid translation updates 5 years ago
haroon amjad f946a7be4d updates & fixes 5 years ago
Mirza.Shafique f20883184e CMC 1.5 5 years ago
Sultan Khan 32f62fbe56 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 5 years ago
Sultan Khan c6fd52aad2 home health care 5 years ago
haroon amjad 948f4fc6b8 CMC Add address fixes 5 years ago
Sultan Khan 4d00664045 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 5 years ago
Sultan Khan c6404a2a0b tracker services 5 years ago
haroon amjad 74ca9995c9 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart
5 years ago
haroon amjad 2d7c7239c5 Health Converters fixes 5 years ago
Mirza.Shafique 2d38e8905b CMC 1.4 5 years ago
haroon amjad 2bba42b574 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 5 years ago
haroon amjad f795ba24c5 updates & fixes 5 years ago
Mirza.Shafique d1bc46f451 CMC Marge 5 years ago
Mirza.Shafique a67c5afcfb Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique e890c80831 CMC 1.3 5 years ago
Mohammad Aljammal 9fb4e79c34 Merge branch 'sep_fixes' into 'development'
Sep fixes

See merge request Cloud_Solution/diplomatic-quarter!387
5 years ago
Elham Rababh bb372210e0 PAP-938: fix Referral sent 5 years ago
Elham Rababh bff7020b78 PAP-939: fixes 5 years ago
haroon amjad f33272f8d9 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 5 years ago
haroon amjad ec646a7039 My Invoice fixes, Prescription page fixes 5 years ago
Mirza.Shafique b3f3558eac CMC 1.2 5 years ago
Mirza.Shafique 82a1d410db Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/landing/widgets/logged_slider_view.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan 2019e804f0 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 5 years ago
Sultan Khan 169aafa26b hmc services design fixed 5 years ago
Mirza.Shafique 831780555c CMC 1.0 5 years ago
haroon amjad 2669378da4 Insurance Approval API updated 5 years ago
haroon amjad aadcfdc7bc Insurance Approval fixes 5 years ago
haroon amjad 5396138962 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
#	lib/pages/ToDoList/payment_method_select.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
5 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 5 years ago
Sikander Saleem aa047afef7 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/BookAppointment/components/SearchByClinic.dart
5 years ago
Mirza.Shafique afb08fcd0a Booking Filters Update 5 years ago
Mirza.Shafique 3af1676730 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/insurance/insurance_card_screen.dart
#	lib/pages/medical/balance/advance_payment_page.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
5 years ago
Mirza.Shafique a234618df8 Update, Insurance card and My Balance Design 5 years ago
Sikander Saleem 1db8c96ed7 title improvement for book appointment clinic search. 5 years ago
haroon amjad ebcc2559ce Ask doctor issue resolved, Translation & font family issues resolved 5 years ago
haroon amjad 25fb5decc0 Ask Doctor page fixes 5 years ago
haroon amjad 106489b085 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 5 years ago
haroon amjad d4a4165ef3 Minor fixes in Eye Measurements 5 years ago
Sultan Khan 671c432cd7 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 5 years ago
Sultan Khan 0086875d0d Design Updated for tracker 5 years ago
Sikander Saleem a09b43ef8c monthly report ui redesigned. 5 years ago
Sikander Saleem 120e6c166d Merge branch 'new_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem c84707ba3f monthly report request & sick leaves ui redesigned. 5 years ago
haroon amjad 9ffe064a3b updates & fixes 5 years ago
Sikander Saleem cd85ad4f8a feedback ui redesigned. 5 years ago
haroon amjad 45272d251c Updates & fixes 5 years ago
haroon amjad 8e7786cb96 updates & fixes 5 years ago
Fatimah Alshammari 62167baec5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 5 years ago
Fatimah Alshammari 6d72be2a73 fixed cart order issues 5 years ago
Sikander Saleem 1b7b7b6334 live chat ui redesigned. 5 years ago
Sultan Khan d2d22ff1fc Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 5 years ago
Sikander Saleem d1b7c94d6e improvement. 5 years ago
Sultan Khan 73ff5c4707 Bug fixes 5 years ago
Sikander Saleem d9c1b8b8ea Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/main.dart
#	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
#	lib/pages/medical/eye/EyeMeasurementsPage.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
5 years ago
haroon amjad ab0e388cbe Merge branch 'Haroon' into 'development'
updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!385
5 years ago
haroon amjad 4469ae1209 updates & fixes 5 years ago
Sikander Saleem ef5f737084 Merge branch 'development' into development_new_design_2.0 5 years ago
Mirza.Shafique 4f85652562 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique f577905dcb eye measurment new design 5 years ago
haroon amjad e679c7df0d updates & fixes 5 years ago
haroon amjad b90c189b6d Merge branch 'Haroon' into 'development'
updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!384
5 years ago
haroon amjad a10253736a Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/pages/login/confirm-login.dart
#	lib/pages/login/login.dart
5 years ago
haroon amjad 75c0de091f Merge branch 'Haroon' into 'development'
updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!383
5 years ago
haroon amjad 44d59ed01a updates & fixes 5 years ago
Sikander Saleem e3758cfbba Merge branch 'new_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem ff5fbbdf7c Service info app bar fixed. 5 years ago
Sikander Saleem fab051f9e7 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Sikander Saleem 6a86d8d1c1 Merge branch 'new_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem 62ca009404 improvement. 5 years ago
Sultan Khan c6e7c8cd37 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 5 years ago
Sultan Khan 52665fe217 login issue fixed 5 years ago
Mohammad Aljammal 55f9bbcba4 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!379
5 years ago
Sikander Saleem 7df76842b2 Merge branch 'development_new_design_2.0' into new_design_sikander 5 years ago
Sikander Saleem a61fea551c Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem f3d7686a10 improvement. 5 years ago
Sultan Khan ad7527ee65 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 5 years ago
Sultan Khan 233a273316 shcedule page 5 years ago
Mirza.Shafique 3f0d8626e7 Marge issue 5 years ago
Mirza.Shafique 590ea48ea9 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/BookAppointment/book_reminder_page.dart
#	lib/pages/MyAppointments/SchedulePage.dart
5 years ago
Mirza.Shafique e1e3741abf Event Reminder 5 years ago
haroon amjad b83318faf8 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!382
5 years ago
haroon amjad f8c295defe Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!381
5 years ago
haroon amjad 8cb9a5e619 updates 5 years ago
haroon amjad faff3b90cb Merge branch 'development' into Haroon
# Conflicts:
#	lib/core/service/er/am_service.dart
5 years ago
haroon amjad e9ec2e2faf Ambulance request APIs revamped 5 years ago
Zohaib Iqbal Kambrani d9672c47a0 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  BUG FIXES
  fix issues  PAP-910,PAP-911
  fix bugs pharmacy
  Dental procedures implemented
  Revert "Merge branch 'foote_in_all_pages' into 'development'"
  fixed products issues
  calendar events changes
  Covid passport CR implemented in Covid test flow
  doctor schedule
  Covid certificate passport CR implemented
  Covid Lab result generate certificate implemented
  return bottom sheet inside appointments list
  fix issues related to footer
  remove unused code
  remove footer from pharmacy pages
  first step from add footer for all pages

# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan abcd207554 schedule page fix 5 years ago
haroon amjad 3abd7227ec fixes 5 years ago
haroon amjad 9cf9e297cf Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
#	lib/pages/MyAppointments/AppointmentDetails.dart
5 years ago
haroon amjad 4560037f97 updates 5 years ago
Fatimah Alshammari f09cdd944d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
5 years ago
Fatimah Alshammari 827d8733a1 fixed shopping cart issue 5 years ago
Sikander Saleem 402cf5936a improvement. 5 years ago
Sikander Saleem 1a0e1f47a6 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/components/DocAvailableAppointments.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem bf920d4188 find us redesigned. 5 years ago
Sultan khan ba245fdfef Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!378
5 years ago
Sultan Khan 1726f8cc11 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan d1fc4751ad BUG FIXES 5 years ago
Mirza.Shafique ebf293736d Booking appointment Marge 5 years ago
Zohaib Iqbal Kambrani d1c99d1d82 ER Average waiting time label applied 5 years ago
haroon amjad 4c2b70fcb5 Merge branch 'development' into Haroon 5 years ago
haroon amjad 21c3686e05 Ambulance request services revamping 5 years ago
Sikander Saleem 363cf78884 improvement. 5 years ago
Sikander Saleem b78f8f76db improvement. 5 years ago
Sikander Saleem 1c020134e8 Merge branch 'new_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem bdb7f29d4c Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/login/login.dart
5 years ago
Mohammad Aljammal d2d27631ac Merge branch 'fix_30_Aug' into 'development'
fix issues  PAP-910,PAP-911

See merge request Cloud_Solution/diplomatic-quarter!376
5 years ago
Mirza.Shafique 089ad0d321 Booking appointment 1.3 5 years ago
Elham Rababh 2e2f7334d5 fix issues PAP-910,PAP-911 5 years ago
Sikander Saleem cfa3ca62b6 prescription tab bar improvement. 5 years ago
Sikander Saleem 3cc18cfb24 medical reports ui redesigned. 5 years ago
Sikander Saleem 9fdebc2db7 ask doctor ui redesigned 5 years ago
Fatimah Alshammari b6981299d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 5 years ago
Fatimah Alshammari 239ad530ce fixed isuues 5 years ago
Mohammad Aljammal 36142f0f6d Merge branch 'fix_bug_pharmacy' into 'development'
fix bugs pharmacy

See merge request Cloud_Solution/diplomatic-quarter!375
5 years ago
Mohammad Aljammal 8abbb04f02 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!373
5 years ago
mosazaid a2e60e7584 fix bugs pharmacy 5 years ago
haroon amjad e9c26ee85f Dental procedures implemented 5 years ago
Sikander Saleem ca363adee2 merge & improvements 5 years ago
Sikander Saleem 6191377914 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
5 years ago
Mohammad Aljammal e97354e574 Merge branch 'revert-68491631' into 'development'
Revert "Merge branch 'foote_in_all_pages' into 'development'"

See merge request Cloud_Solution/diplomatic-quarter!374
5 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
5 years ago
Fatimah Alshammari 72ba0c7c74 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 5 years ago
Fatimah Alshammari f3b545ff74 fixed products issues 5 years ago
Sikander Saleem 9e75a45cd5 improvement. 5 years ago
Sikander Saleem 8367fc09f3 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
5 years ago
Sikander Saleem d605084a91 appointment list and detail ui changed 5 years ago
Sultan Khan b116079843 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 1a501a3b2a calendar events changes 5 years ago
Mirza.Shafique ad025f3d8e Booking appointment 1.2 5 years ago
haroon amjad 1db2f9ab03 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!372
5 years ago
haroon amjad 0d1d68273b Covid passport CR implemented in Covid test flow 5 years ago
Sultan Khan 4325bd3448 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 5fe6a6c3dd doctor schedule 5 years ago
Mirza.Shafique ba0c0beef6 Merge branch 'development_new_design_2.0' into mirza_home_page 5 years ago
Mirza.Shafique d2b2b4063d Booking appointment 1.1 5 years ago
haroon amjad 72dbdd2c2b Merge branch 'development' into Haroon 5 years ago
haroon amjad e96157c74a Covid certificate passport CR implemented 5 years ago
Mohammad Aljammal 68491631f3 Merge branch 'foote_in_all_pages' into 'development'
Foote in all pages

See merge request Cloud_Solution/diplomatic-quarter!369
5 years ago
Mohammad Aljammal 79430e2243 Merge branch 'ZohaibIqbalKambrani' into 'development'
Covid Drive-Thru Questions Screen

See merge request Cloud_Solution/diplomatic-quarter!371
5 years ago
Zohaib Iqbal Kambrani d33432d238 Covid Drive-Thru Questions Screen 5 years ago
haroon amjad 73097d15de Covid Lab result generate certificate implemented 5 years ago
haroon amjad d83a611d95 FCM Permission fix 5 years ago
Mirza.Shafique bd1cf9bcc7 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/BookAppointment/components/SearchByClinic.dart
#	lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mirza.Shafique 62631677ad Booking appointment 1.0 5 years ago
Sikander Saleem 4152eafa17 Merge branch 'development_new_design_2.0' into new_design_sikander 5 years ago
Sikander Saleem 2ba91e54ab merge-changes 5 years ago
Sikander Saleem 94ff5cff40 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem 970887b0c5 changes 5 years ago
Elham Rababh 9777b3f2ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 5 years ago
haroon amjad 6a692ebd08 Merge branch 'Haroon' into 'development'
Dental flow fixes

See merge request Cloud_Solution/diplomatic-quarter!368
5 years ago
Elham Rababh ceeda154d5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
haroon amjad 5f521556dc Dental flow fixes 5 years ago
Sikander Saleem acd3855c77 Merge branch 'development' into development_new_design_2.0 5 years ago
Sikander Saleem 71f888ea9b improvements 5 years ago
Sikander Saleem 288d64214e improvements 5 years ago
Sikander Saleem bb18645d85 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sultan khan 7348baa62c Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!367
5 years ago
haroon amjad 3235f489b9 Merge branch 'development' into Haroon 5 years ago
Sikander Saleem 51c398e84a Merge branch 'new_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem e9db30d3da otp clear when wrong code entered. 5 years ago
haroon amjad 5009e48f64 Updates in Ambulance Request & Covid test 5 years ago
Sultan khan 66f6b403c0 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!366
5 years ago
Sultan Khan 301728ed3d family file fix 5 years ago
Mirza.Shafique ca3495d71c Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique 0a83cf8241 Bug Fixis 5 years ago
Sultan Khan 59892870e2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 9e31a3c560 bug fixes 5 years ago
Sikander Saleem 5ab9dd1761 Appointment screen Changes & improvements. 5 years ago
Mirza.Shafique 374a14eac4 Merge branch 'development_new_design_2.0' into mirza_home_page 5 years ago
Mirza.Shafique 2a4e0a604a Medical Perscription 1.1 5 years ago
haroon amjad 3f29bbd6b3 Updates & fixes 5 years ago
Mohammad Aljammal db128e5091 Merge branch 'blood_pressure' into 'development'
fix prescription add reminder

See merge request Cloud_Solution/diplomatic-quarter!363
5 years ago
Elham Rababh 1fefbfb76e return bottom sheet inside appointments list 5 years ago
Sultan Khan 57d87dfc03 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 11ffed2ae3 bug fixes 5 years ago
Elham Rababh 13737548bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 5 years ago
haroon amjad f98f1dae88 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!364
5 years ago
haroon amjad cbbca5ce86 Merge branch 'development' into Haroon 5 years ago
Sikander Saleem 458dc2474b Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem 047941fffc Merge branch 'new_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem 5647ab75e5 improvements. 5 years ago
Mirza.Shafique b2bba050e8 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
5 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 5 years ago
hussam al-habibeh 428b45528b fix prescription add reminder 5 years ago
Mirza.Shafique 8c8a9c7ce2 Medical Perscription 1.0 5 years ago
Sikander Saleem 350ff20a1a my doctor screen. 5 years ago
Mohammad Aljammal b98a84bcac Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!361
5 years ago
Mohammad Aljammal 41f1704790 Merge branch 'blood_pressure' into 'development'
Blood pressure

See merge request Cloud_Solution/diplomatic-quarter!362
5 years ago
Sikander Saleem ec6693c55e improvement. 5 years ago
haroon amjad 0121337d1b LiveCare Flow from book appointment flow implemented 5 years ago
Mirza.Shafique 24b7a8a4c4 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Sikander Saleem 6c8f1c6185 merge improvement. 5 years ago
Mirza.Shafique cbadcd5feb Vital Sings Detail Page 1.0 5 years ago
Sikander Saleem 197e7d5742 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
5 years ago
Elham Rababh f85c359cf4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
Elham Rababh d028ce22dc remove unused code 5 years ago
hussam al-habibeh fe83b91602 body fat texfield fix 5 years ago
Elham Rababh 69df61afb1 remove footer from pharmacy pages 5 years ago
Mirza.Shafique e91cf4762a Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 5 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 5 years ago
Sikander Saleem b3fd1cb93d lab result detail flow chart screen & improvement. 5 years ago
hussam al-habibeh 864f849425 Baby age in ovulation period 5 years ago
Fatimah Alshammari 787b55a803 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Fatimah Alshammari 34ccb132dc fixed issues 5 years ago
Mohammad Aljammal 10f4a30921 Merge branch 'fix_feedback' into 'development'
Fix feedback

See merge request Cloud_Solution/diplomatic-quarter!360
5 years ago
Mohammad Aljammal d9fabbab17 Fix feedback 5 years ago
Fatimah Alshammari d3eeaa15ac Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Fatimah Alshammari 74d0826342 fixed issues 5 years ago
Sultan khan 04a68c5bd3 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!358
5 years ago
Sultan khan b8d75b5604 Merge branch 'blood_pressure' into 'development'
add blood pressure translation issue

See merge request Cloud_Solution/diplomatic-quarter!356
5 years ago
Sultan khan 6a0acd8afb Merge branch 'fix-bugs' into 'development'
Fix bugs

See merge request Cloud_Solution/diplomatic-quarter!355
5 years ago
Sultan Khan 5b656b0b51 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 9610ff640e feedback changes 5 years ago
haroon amjad 335bc9a673 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!357
5 years ago
haroon amjad cbbef80bd5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad eadba3f767 Working on livecare appointment booking page 5 years ago
hussam al-habibeh b9d4195e20 Blood pressure translation issue 5 years ago
hussam al-habibeh 9c6f83600b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into blood_pressure
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
5 years ago
mosazaid 3077624c58 fix bugs 5 years ago
Sultan khan 3c2a89cd8e Merge branch 'Aug_fixes' into 'development'
fix issues related to wight and  sugar blood

See merge request Cloud_Solution/diplomatic-quarter!354
5 years ago
Sultan khan cd56881d7a Merge branch 'pharmacy-bugs' into 'development'
hide Covid19-driveThrow for patient out of KSA

See merge request Cloud_Solution/diplomatic-quarter!353
5 years ago
Sultan khan 8eb67791ca Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!349
5 years ago
Sultan khan d321f07e82 Merge branch 'medication_availability' into 'development'
Medication availability

See merge request Cloud_Solution/diplomatic-quarter!348
5 years ago
Elham Rababh 8629b62fcb fix issue 5 years ago
Elham Rababh 1568698b98 fix issues related to wight and sugar blood 5 years ago
Sikander Saleem 6ee56cba0d Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/data_display/medical/doctor_card.dart
#	lib/widgets/new_design/doctor_header.dart
5 years ago
Sikander Saleem bb20d65b40 lab result detail screen. 5 years ago
Mirza.Shafique 66efbc1bac Radiology Implementation 5 years ago
hussam al-habibeh 8f5fef87e9 add blood pressure translation issue 5 years ago
Mirza.Shafique 26c30038c9 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 5 years ago
Mirza.Shafique 29fd552874 Weight, height and blood pressure on Home Page 5 years ago
Sikander Saleem 35b5d38b82 Merge branch 'login_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem 3a1af590ff lab result detail screen (cont.) 5 years ago
hussam al-habibeh a33a6b0b2f push request after conflict resolve 5 years ago
hussam al-habibeh 0a3c44b5e8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh 352cda4c70 hide Covid19-driveThrow for patient out of KSA 5 years ago
Elham Rababh 8626b4f269 first step from add footer for all pages 5 years ago
mosazaid b59ca8dedd Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-bugs 5 years ago
haroon amjad 5c8e9f4e19 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!352
5 years ago
haroon amjad 2242b78116 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
5 years ago
haroon amjad a3984a7c1a Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!351
5 years ago
haroon amjad e28fdaade1 Dental Invoices implementation completed 5 years ago
Zohaib Iqbal Kambrani c215b22cf7 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fixes
  registration
5 years ago
Zohaib Iqbal Kambrani f442cc251c Pre Post Images Dental Doctor Profile 5 years ago
Mirza.Shafique 876463c945 Home Page Font weight 5 years ago
Sikander Saleem d1b45c8bcc Merge branch 'login_design_sikander' into development_new_design_2.0 5 years ago
Mirza.Shafique 85c759a4a5 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Sikander Saleem 5b778f0493 appointment ui (cont.) & improvement. 5 years ago
Sultan khan 91a363a1ef Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!350
5 years ago
Sultan Khan 1586f02542 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 6b7eaaafb9 fixes 5 years ago
Mirza.Shafique a699740897 Medical File Fonts Implementation 5 years ago
Mirza.Shafique 5f44dece71 Ganaric Font and font implementaion 5 years ago
Fatimah Alshammari bf4cbaefbd Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Fatimah Alshammari bbb8e04066 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 5 years ago
Sultan khan ce867b85f2 Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!347
5 years ago
haroon amjad a32501f3dc My invoices implementation continued 5 years ago
Sikander Saleem ff55ae1908 improvements 5 years ago
Sikander Saleem bb3d11ccf8 remove spaces. 5 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
5 years ago
Sikander Saleem bb9d1bfcd5 improvements 5 years ago
hussam al-habibeh 4b90f16ab9 baby age in ovulation period 5 years ago
Fatimah Alshammari e86dfd1a34 Merge branch 'development' into fatima-new 5 years ago
Fatimah Alshammari 86d67247be Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Fatimah Alshammari 0d3f6237ce fixed issues 5 years ago
Sikander Saleem 80c50e29bf Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/landing_page.dart
5 years ago
Sikander Saleem 4db432b351 lab results working(cont.) & improvements 5 years ago
Sultan Khan b1453b52e3 registration 5 years ago
Mirza.Shafique 38465eaafb Home page icons and drawer 5 years ago
Zohaib Iqbal Kambrani 429fcb1e60 Merge branch 'development' into ZohaibIqbalKambrani
* development: (32 commits)
  changes
  package name changed
  Jira Fixes
  Jira fixes
  PAP-664
  PAP-664
  PAP-664
  langauge issue
  bug fix
  PAP-777
  PAP-729
  fix button
  fix translate issues
  CONFIG
  PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
  bug fixes
  fix bugs
  fixing dashboard issue
  fixing dashboard issue
  jira bugs
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
5 years ago
hussam al-habibeh d3868844de Medication availability 5 years ago
Mirza.Shafique 1bea9d39b5 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique 06f877b8d4 Home page new design & drawer 5 years ago
Sultan Khan 57864f949d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Sultan Khan bd85854fa4 changes 5 years ago
Zohaib Iqbal Kambrani 10a147860c no message 5 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 5 years ago
Sultan khan 1f52794185 Merge branch 'sultan-patientapp' into 'development'
package name changed

See merge request Cloud_Solution/diplomatic-quarter!345
5 years ago
Sultan Khan 97d7f9225e package name changed 5 years ago
haroon amjad b5f180f16c Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!344
5 years ago
haroon amjad 709877b5f1 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/login/forgot-password.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
5 years ago
haroon amjad cf32d9f0ff Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
haroon amjad 90db04cee1 Jira Fixes 5 years ago
Sultan khan 69e957929d Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!343
5 years ago
Fatimah Alshammari b8ba80b361 Merge branch 'fatima-new' into development 5 years ago
Fatimah Alshammari 39ba2cfde7 fixed issues. 5 years ago
Sikander Saleem 2d64426cd4 Merge branch 'login_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem 70614d3555 merge improvements-1. 5 years ago
haroon amjad 5007064105 Jira fixes 5 years ago
Mirza.Shafique 99c6318410 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique 2d62822536 Medical Profile Page improvements 5 years ago
Sikander Saleem f482595d6b merge improvements. 5 years ago
Sikander Saleem 083d696c62 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Mirza.Shafique 4ebf5f900b improvements. 5 years ago
Mirza.Shafique 32e867421f Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/uitl/date_uitl.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Mirza.Shafique e9e3b079b3 Medical Profile Complete 1.1 5 years ago
hussam al-habibeh 02df6f4d85 PAP-664 5 years ago
hussam al-habibeh 60aaf2a31a Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
5 years ago
hussam al-habibeh 352fd912de PAP-664 5 years ago
hussam al-habibeh 29249dc9a9 PAP-664 5 years ago
Sultan khan b2349394ff Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!342
5 years ago
Sultan Khan e1750ce24c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan e5fb16ad69 langauge issue 5 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 5 years ago
Sikander Saleem 6575adda42 merge changes-5 5 years ago
Sikander Saleem f6ae7ed770 merge changes-4 5 years ago
Sikander Saleem 889ae24f07 merge changes-3 5 years ago
Sikander Saleem c07a8f54c7 merge changes-2 5 years ago
Sikander Saleem 14561d0ac6 merge changes-1 5 years ago
Sultan khan 08f7736030 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!341
5 years ago
Sultan Khan c9fe036b99 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan khan 1898c12ec3 Merge branch 'fix_merge_issues' into 'development'
fix translate issues

See merge request Cloud_Solution/diplomatic-quarter!340
5 years ago
Sultan Khan 7c398ba40d bug fix 5 years ago
Sikander Saleem a5d40f090a improvements-test 5 years ago
hussam al-habibeh 146fc5d2b2 PAP-777 5 years ago
Mirza.Shafique 2665e4cd0c Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 5 years ago
Mirza.Shafique a20185b2b9 Home page 1.4 (Homepage changes) 5 years ago
Sikander Saleem 2cb59a286f Merge branch 'login_design_sikander' into development_new_design_2.0 5 years ago
haroon amjad 037a887e5c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Sikander Saleem 473315f8a1 improvements 5 years ago
hussam al-habibeh 6ea06ce442 PAP-729 5 years ago
Mirza.Shafique 3c438406b5 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem 53e4815866 no auth ui modifications 5 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 5 years ago
Elham Rababh 8b8e239d3f fix button 5 years ago
Zohaib Iqbal Kambrani e4256d6874 RRT in progress (Service implementations) 5 years ago
Elham Rababh b01961e45f fix translate issues 5 years ago
Sultan Khan d88e3faa6b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan d6fd03b571 CONFIG 5 years ago
Sultan khan 772dcba287 Merge branch 'Aug_fixes' into 'development'
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.

See merge request Cloud_Solution/diplomatic-quarter!338
5 years ago
Sultan khan ba32a37a17 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!339
5 years ago
Zohaib Iqbal Kambrani 4da163d186 RRT in progress in stage 5 years ago
Sultan Khan 6534ca8349 Merge branches 'sultan-patientapp' and 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan khan 54e1d51f18 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!337
5 years ago
Zohaib Iqbal Kambrani 5f1d753895 no message 5 years ago
Sikander Saleem 907d90b987 login ui and forgot password ui added. 5 years ago
Sultan Khan ed20ba65b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Elham Rababh 7ad4e03c1a PAP-715 : Y –axis and X –axis values should be display in the yearly graph details. 5 years ago
Sultan Khan 23ca95b9b6 bug fixes 5 years ago
Mohammad Aljammal 9b3a679948 Merge branch 'fix-bugs' into 'development'
fix bugs

See merge request Cloud_Solution/diplomatic-quarter!336
5 years ago
Mohammad Aljammal b34402ffa8 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!335
5 years ago
Mohammad Aljammal ed5079e3a0 Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!334
5 years ago
mosazaid a8413750c3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-bugs 5 years ago
mosazaid e9dbc4be7a fix bugs 5 years ago
Haroon Amjad 47e521fe1d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/landing/home_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
hussam al-habibeh 50d3a42743 fixing dashboard issue 5 years ago
hussam al-habibeh 1ed76e91aa fixing dashboard issue 5 years ago
Sultan Khan 6442ce178d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan khan a67e320a8e Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!333
5 years ago
Sultan Khan 8766a69928 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan khan d83ae18d7b Merge branch 'pharmacy-bugs' into 'development'
jira bugs

See merge request Cloud_Solution/diplomatic-quarter!332
5 years ago
hussam al-habibeh d5c76b5400 jira bugs 5 years ago
hussam al-habibeh 6dc0d89f61 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
	lib/uitl/utils.dart
5 years ago
hussam al-habibeh 981e78936e jira bugs 5 years ago
Zohaib Iqbal Kambrani 08e0ce52c8 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fix bugs
5 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 5 years ago
Mohammad Aljammal 4ac6bf628b Merge branch 'fix-bugs' into 'development'
fix bugs

See merge request Cloud_Solution/diplomatic-quarter!331
5 years ago
Zohaib Iqbal Kambrani 882d5f090a Merge branch 'zik-analytics' into ZohaibIqbalKambrani
* zik-analytics:
  no message
5 years ago
mosazaid 2e33c2b240 fix bugs 5 years ago
Mirza.Shafique b0dfbef52a Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
5 years ago
Mirza.Shafique d37f225c1b Home page 1.2 5 years ago
Sikander Saleem 3707b13986 login type ui & icons added. 5 years ago
Sultan Khan 446f86dbcf Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan khan 9f355440fc Merge branch 'Aug_fixes' into 'development'
Aug fixes

See merge request Cloud_Solution/diplomatic-quarter!330
5 years ago
Elham Rababh 5d05b09345 PAP-712 : fixes on Blood sugar 5 years ago
Sultan Khan c88bea4461 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 9acb5b087d bug fixes 5 years ago
Mirza.Shafique 090556f4d1 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique 5dc88f51c3 Home Page 1.0 5 years ago
Sikander Saleem 8b2feb03ea last login and login options ui. 5 years ago
Elham Rababh 86414b46fd PAP-304 : show CBC details 5 years ago
Elham Rababh 52816a9cfe PAP-723 : system should display the empty graph in the blood pressure screen. 5 years ago
Elham Rababh f824063e82 PAP-726 : fix show Arabic values for the select Arm 5 years ago
Elham Rababh f92567f877 PAP-718 : fix show data after save 5 years ago
Elham Rababh f830bfdb19 PAP-722 : fix send email 5 years ago
Sikander Saleem 1ec48b9598 Poppins font added. 5 years ago
Sultan khan 9196367da4 Merge branch 'bug_fix_mirza' into 'development'
Medical Profile Buttons Lock

See merge request Cloud_Solution/diplomatic-quarter!329
5 years ago
Sultan khan f54b9a63aa Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!328
5 years ago
Mirza.Shafique 2fda47baf6 Medical Profile Buttons Lock 5 years ago
Zohaib Iqbal Kambrani dbf525c484 no message 5 years ago
Haroon Amjad 213d104d57 Covid test procedure selection implemented 5 years ago
Sultan khan 487d63ec7f Merge branch 'bug_fix_mirza' into 'development'
Check-In NFC

See merge request Cloud_Solution/diplomatic-quarter!326
5 years ago
Sultan khan 6c77edfa08 Merge branch 'bug_fixing' into 'development'
bug fixes and insurance approvals improvements.

See merge request Cloud_Solution/diplomatic-quarter!327
5 years ago
Sikander Saleem eb9005510d bug fixes and insurance approvals improvements. 5 years ago
Sultan Khan 3c2539d5b9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 14ef096c32 changes and fixes 5 years ago
Mirza.Shafique b31813770e Check-In NFC done 5 years ago
Haroon Amjad fde658fd5d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
5 years ago
Mirza.Shafique c3229b1dd8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into bug_fix_mirza 5 years ago
Mirza.Shafique 107d50826c nfc package test 5 years ago
Mirza.Shafique fb0a67e5bd PAP 828 and 792 issue fix 5 years ago
haroon amjad 96f1d9a1c1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Sultan khan 2447d006d2 Merge branch 'bug_fix_mirza' into 'development'
Merge fix mirza

See merge request Cloud_Solution/diplomatic-quarter!325
5 years ago
Mirza.Shafique e934e7cd2c Merge Fix 5 years ago
Mirza.Shafique 947b25a68c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into bug_fix_mirza 5 years ago
haroon amjad 7cf66934bc Merge branch 'Haroon' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad 4504b4bf75 config 5 years ago
haroon amjad f310f9d0ab config 5 years ago
haroon amjad 0d2a91c124 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
Sultan khan 81f751f552 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!324
5 years ago
Sultan khan 683e94edea Merge branch 'pharmacy-bugs' into 'development'
jira bugs

See merge request Cloud_Solution/diplomatic-quarter!323
5 years ago
hussam al-habibeh 8d8fbc3edc jira bugs 5 years ago
Sultan khan 15f620d720 Merge branch 'Jul_fixes' into 'development'
Jul fixes

See merge request Cloud_Solution/diplomatic-quarter!322
5 years ago
Sultan Khan ce58141166 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan khan bf78518c15 Merge branch 'pharmacy-bugs' into 'development'
jira bugs

See merge request Cloud_Solution/diplomatic-quarter!318
5 years ago
Sultan Khan 29c43e9757 splash image added 5 years ago
hussam al-habibeh fefde8f575 jira bugs 5 years ago
Mirza.Shafique f7b1e7f573 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into bug_fix_mirza 5 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad bcb4f48785 build fix 5 years ago
Sultan khan f048f5229b Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!321
5 years ago
Sultan khan 924f9bedc0 Merge branch 'bug_fixing' into 'development'
Bug fixing

See merge request Cloud_Solution/diplomatic-quarter!319
5 years ago
Sultan khan 10f8ee5e81 Merge branch 'bug_fix_mirza' into 'development'
Bug Fix: 873, 878 to 881

See merge request Cloud_Solution/diplomatic-quarter!320
5 years ago
Mirza.Shafique 0bd5c8e649 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into bug_fix_mirza 5 years ago
Sultan Khan 33465b04e5 permission 5 years ago
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 5 years ago
Sultan Khan d5d48703f9 camera permission fixed 5 years ago
Sultan Khan 85e803651c permission issue fixed 5 years ago
Sikander Saleem 38f134b6ff Bug PAP-884 fixed, email was not updating. 5 years ago
Sultan Khan b4a7235fc8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
hussam al-habibeh 446021eb90 adding doctor list to health calculator 5 years ago
hussam al-habibeh 854352d9ce jira bugs 5 years ago
Sikander Saleem d0c8c4f017 Bug PAP-671, PAP-672 fixed, bottom nav added on H2O screen. 5 years ago
Sikander Saleem b2e9060c3f Bug PAP-877 fixed, blood tracker exception. 5 years ago
Mohammad Aljammal 07d603e52c Merge branch 'bug_fixing' into 'development'
H2O Bug fixing

See merge request Cloud_Solution/diplomatic-quarter!317
5 years ago
Elham Rababh 2e1c9780d7 PAP-610: prevent show send email button if user have no vaccine 5 years ago
Elham Rababh c6a68083a4 PAP-667: fix blood type 5 years ago
Elham Rababh c14adccb49 PAP-667: add unit to home page 5 years ago
Elham Rababh dd1dff01d6 PAP-790: fix Alignment of mobile number 5 years ago
Elham Rababh 4217fc0826 PAP-685: fix issue 5 years ago
Sikander Saleem 3128810fb0 improvements. 5 years ago
Sikander Saleem b7fbee3252 improvements 5 years ago
Sikander Saleem d6566d4abf PAP-678 fixed, month & days in axis are aligned now. 5 years ago
Sikander Saleem 1f01f40ad8 PAP-681 fixed, H2O Unit changing & reflection. 5 years ago
Sikander Saleem e41040b1b9 PAP-675 fixed, H2O Week chart vales from -1 to 1. 5 years ago
Sikander Saleem 7771b8f320 PAP-886 fixed, Insurance image button added. 5 years ago
Sikander Saleem db84090694 PAP-872 & PAP-593 fixed, Water addition was not visible. 5 years ago
Sultan Khan da2df9b348 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan bcabd81f88 BUG FIXES 5 years ago
Haroon Amjad e13a13189c Merge branch 'development' into Haroon
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 81ce399e85 Merge branch 'fix-bugs' into 'development'
fix bugs

See merge request Cloud_Solution/diplomatic-quarter!316
5 years ago
mosazaid 865afd7761 fix bugs 5 years ago
Mohammad Aljammal 234e69c02d Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!315
5 years ago
hussam al-habibeh bb6e7e931b pharmacy-bugs 5 years ago
Mohammad Aljammal b37dd57804 Merge branch 'pharmacy-Fatima' into 'development'
fixed prescription issue

See merge request Cloud_Solution/diplomatic-quarter!313
5 years ago
Mohammad Aljammal 25d5105caf Merge branch 'Apr-fixes' into 'development'
PAP-607: fix issue

See merge request Cloud_Solution/diplomatic-quarter!312
5 years ago
Fatimah Alshammari b98d8b3a46 fixed prescription issue 5 years ago
Elham Rababah 2a47564c37 PAP-607: fix issue 5 years ago
Mohammad Aljammal 268f0c8fa4 Merge branch 'fix-bugs' into 'development'
fix-design

See merge request Cloud_Solution/diplomatic-quarter!311
5 years ago
Mohammad Aljammal bd451f1283 Merge branch 'Apr-fixes' into 'development'
Apr fixes

See merge request Cloud_Solution/diplomatic-quarter!310
5 years ago
Mohammad Aljammal 50f84f318a Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!309
5 years ago
mosazaid 116a4af845 fix-design 5 years ago
Elham Rababah 36d422c7aa PAP-563: fix pickup location from hospital 5 years ago
Elham Rababah aa1c92c142 PAP-562: fix status 5 years ago
hussam al-habibeh 14939d3513 jira bugs (Health Calculator) 5 years ago
Elham Rababah 8c5b3742b6 PAP-643: fix button 5 years ago
Elham Rababah aab33b3e03 PAP-609: fix text align 5 years ago
Fatimah Alshammari 174e0d9673 Merge branch 'development' into pharmacy-Fatima 5 years ago
Fatimah Alshammari 2481e4c9ea fixed categories issues and home page button 5 years ago
Elham Rababah 1f70d086e0 PAP-634: Add search button. 5 years ago
Elham Rababah 9588b134fb PAP-645: resized calculator 5 years ago
Mohammad Aljammal f4f4a0977e Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!307
5 years ago
Fatimah Alshammari ef53338971 Merge branch 'development' into pharmacy-Fatima 5 years ago
Fatimah Alshammari faa8a13778 fixed isuue-product details 5 years ago
Sultan Khan 9adc4a974c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 8c9c309abb bug fixes 5 years ago
Mohammad Aljammal 1607aecb4a Merge branch 'pharmacy-Fatima' into 'development'
fixed an issue in recommended page

See merge request Cloud_Solution/diplomatic-quarter!304
5 years ago
Mohammad Aljammal bfc687d161 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!305
5 years ago
Sultan Khan 3a8b889b74 bug fixes 5 years ago
Sultan Khan 724e0098fb bug fixes 5 years ago
Sultan Khan 1cd4d93488 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan cd7845b1a4 bug fix 5 years ago
Fatimah Alshammari 265d13b970 fixed an issue in recommended page 5 years ago
Mohammad Aljammal 2a484ec857 Merge branch 'ZohaibIqbalKambrani' into 'development'
Huawei Location Implementation -> LocationUtils.getCurrentLocation((coordinates){})

See merge request Cloud_Solution/diplomatic-quarter!302
5 years ago
Zohaib Iqbal Kambrani c7c96f913f no message 5 years ago
haroon amjad 6b675acc94 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
5 years ago
haroon amjad 353a5157f2 fixes 5 years ago
Mohammad Aljammal e04421079e Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!301
5 years ago
Sultan Khan 0245875358 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 3d6858d0ec bug fixes 5 years ago
Elham Rababah 96117fd191 PAP-625: add option “not classified”. 5 years ago
Elham Rababah 6e7f62ca21 PAP-612: show ok and cancel options 5 years ago
Mohammad Aljammal 6fa79ef8d0 Merge branch 'pharmacy-bugs' into 'development'
jira bug PAP-530

See merge request Cloud_Solution/diplomatic-quarter!300
5 years ago
Elham Rababah 66a9239698 PAP-558: Remove the choose Drop-off 5 years ago
Elham Rababah 1b393d6601 PAP-559: remove the km 5 years ago
Elham Rababah 5dd2e9986e PAP-559: fix hospital_service 5 years ago
hussam al-habibeh 1ce10f4d78 jira bug PAP-530 5 years ago
Mohammad Aljammal 0a4f17dc88 Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!298
5 years ago
Mohammad Aljammal dcc98a35ac Merge branch 'fix_advance_payment' into 'development'
fix advance payment

See merge request Cloud_Solution/diplomatic-quarter!299
5 years ago
Mohammad Aljammal 9a850d0ca3 fix advance payment 5 years ago
haroon amjad a6a9a92c6f JIRA bug fixes 5 years ago
Fatimah Alshammari bb622f248c Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/pages/pharmacy_categorise.dart
5 years ago
Fatimah Alshammari 235fdfba54 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Fatimah Alshammari 71a393df68 fixed categories issue 5 years ago
haroon amjad f754e48034 Merge branch 'development' into Haroon
# Conflicts:
#	lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
haroon amjad 49c454b132 fixes 5 years ago
Mohammad Aljammal 008a39f043 Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!297
5 years ago
Mohammad Aljammal 565dbf7c33 Merge branch 'sultan-patientapp' into 'development'
bug fix

See merge request Cloud_Solution/diplomatic-quarter!296
5 years ago
Sultan Khan 8e255f1f22 bug fix 5 years ago
Elham Rababah 86dda2b6d6 PAP-560: fix design 5 years ago
Elham Rababah a1ecfbf16a PAP-560: fix design 5 years ago
Elham Rababah efb6ea68b8 PAP-561: fix design 5 years ago
Mohammad Aljammal f2c5c93e2a Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!295
5 years ago
Sultan Khan d4c3b03a5f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 1b770420be bug fixes 5 years ago
Elham Rababah 2e035e2c6b PAP-576: fix design 5 years ago
Elham Rababah fa23c607bd Merge branches 'development' and 'fix_bugs_Mar' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_bugs_Mar 5 years ago
Mohammad Aljammal e5bcc5403a Merge branch 'fix_bugs' into 'development'
Fix bugs

See merge request Cloud_Solution/diplomatic-quarter!294
5 years ago
mosazaid b623bd0dce Merge branch 'development' into fix_bugs 5 years ago
mosazaid e5474b3062 fix perscription pages bugs 5 years ago
Fatimah Alshammari 39daaa16a7 added buttens in categories page 5 years ago
Mohammad Aljammal 256ffd05ea Merge branch 'fix_eye_balance' into 'development'
Fix eye balance

See merge request Cloud_Solution/diplomatic-quarter!293
5 years ago
Mohammad Aljammal 126fad61c0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_eye_balance
 Conflicts:
	lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal 53e4dfa99d Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!292
5 years ago
Mohammad Aljammal 3468f847d3 Merge branch 'pharmacy-bugs' into 'development'
jira bugs

See merge request Cloud_Solution/diplomatic-quarter!291
5 years ago
Mohammad Aljammal 7c1fd8043b fix chart and eye and balance 5 years ago
Elham Rababah 7bdf31000f PAP-356: fix chart design 5 years ago
Zohaib Iqbal Kambrani b91ce441e2 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts: Resolved
#	lib/core/model/pharmacies/order_model.dart
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/order/TrackDriver.dart
#	lib/routes.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
5 years ago
hussam al-habibeh a6ec7326b2 jira bugs 5 years ago
hussam al-habibeh f9b8191a5e jira bugs 5 years ago
Zohaib Iqbal Kambrani 6f2c947687 Packages And offers.. 5 years ago
haroon amjad 9c1fdf96f4 Merge branch 'development' into Haroon 5 years ago
haroon amjad 33e1bf8103 Jira fixes 5 years ago
Mohammad Aljammal a613fe08e4 Merge branch 'fix_theme_issues' into 'development'
fix the line chart issues

See merge request Cloud_Solution/diplomatic-quarter!289
5 years ago
haroon amjad accc39d972 jira bug fixes 5 years ago
Mohammad Aljammal ced7761a32 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_theme_issues 5 years ago
Mohammad Aljammal b36e00d2a5 fix the line chart issues 5 years ago
Mohammad Aljammal a018eab316 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!288
5 years ago
Sultan Khan 60b1688bb4 chatbot 5 years ago
Sultan Khan 9bfd725e4f bug fixes 5 years ago
Sultan Khan ca2a48e860 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 0445011e53 bug fixes 5 years ago
Mohammad Aljammal 0574161ad3 Merge branch 'fix_theme_issues' into 'development'
fix theme issues

See merge request Cloud_Solution/diplomatic-quarter!287
5 years ago
Mohammad Aljammal ad88f6de04 fix theme issues 5 years ago
haroon amjad 8d16d0a69d Merge branch 'development' into Haroon 5 years ago
haroon amjad 12c4250654 home page ereferral fix 5 years ago
Mohammad Aljammal 7e37d6824e Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!285
5 years ago
Sultan Khan 35c940a209 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 80d96ba785 Privilege issue fixed 5 years ago
haroon amjad 573f5110f5 Merge branch 'development' into Haroon 5 years ago
haroon amjad 454957ebba Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
5 years ago
Mohammad Aljammal bf3ea4c3a9 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!284
5 years ago
Sultan Khan 616212828d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 66acce3b40 ancillary order pages added 5 years ago
haroon amjad db0fcd51cc pharmacy updates 5 years ago
haroon amjad 74671d2f25 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/order-preview-service.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
5 years ago
haroon amjad e0ebb922ed pharmacy fixes 5 years ago
Mohammad Aljammal 17fa2b5e20 Merge branch 'fix_order_checkout_payment' into 'development'
Fix order checkout payment

See merge request Cloud_Solution/diplomatic-quarter!283
5 years ago
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 5 years ago
mosazaid ed1626f8ee Merge branch 'development' into fix_order_checkout_payment 5 years ago
mosazaid 74dd274502 working on pharmacy some fixes on cart page and request body 5 years ago
haroon amjad ed3dba3eb3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad b9a12341d5 updates & fixes 5 years ago
Mohammad Aljammal 4dcb70d7eb Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!282
5 years ago
Mohammad Aljammal a0a217acc5 Merge branch 'ed_online' into 'development'
Done Ed online

See merge request Cloud_Solution/diplomatic-quarter!281
5 years ago
hussam al-habibeh a534b1415e products filtering fix 5 years ago
hussam al-habibeh b39e88d9c8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs 5 years ago
haroon amjad 798840ee2f Merge branch 'development' into Haroon 5 years ago
haroon amjad 44b041d499 Merge branch 'development' into Haroon 5 years ago
haroon amjad 5fb92c7816 covid drive-thru 5 years ago
Zohaib Iqbal Kambrani 15ec3ec9b9 Translation Track Driver, enhancement, initial camera 5 years ago
Zohaib Iqbal Kambrani 63663f1b24 Track Delivery Driver Completed 5 years ago
Zohaib Iqbal Kambrani 516df96e21 no message 5 years ago

1
.gitignore vendored

@ -25,6 +25,7 @@
.dart_tool/
.flutter-plugins
pubspec.lock
/ios/Podfile.lock
.flutter-plugins-dependencies
.packages
.pub-cache/

@ -0,0 +1,35 @@
//package com.cloud.diplomaticquarterapp
package com.ejada.hmg
import io.flutter.app.FlutterApplication
import io.flutter.plugin.common.PluginRegistry
import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
import io.flutter.plugins.GeneratedPluginRegistrant
import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService
class Application : FlutterApplication(), PluginRegistrantCallback {
override fun onCreate() {
super.onCreate()
FlutterFirebaseMessagingService.setPluginRegistrant(this)
}
override fun registerWith(registry: PluginRegistry) {
io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin.registerWith(registry?.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"));
}
}
//import io.flutter.app.FlutterApplication
//import io.flutter.plugin.common.PluginRegistry
//import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
//import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService
//
//class Application : FlutterApplication(), PluginRegistrantCallback {
// override fun onCreate() {
// super.onCreate()
// FlutterFirebaseMessagingService.setPluginRegistrant(this)
// }
//
// override fun registerWith(registry: PluginRegistry?) {
// FirebaseCloudMessagingPluginRegistrant.registerWith(registry)
// }
//}

@ -0,0 +1,16 @@
-----BEGIN CERTIFICATE REQUEST-----
MIICgjCCAWoCAQAwPTEjMCEGCSqGSIb3DQEJARYUSGFyb29uNjEzOEBnbWFpbC5j
b20xCTAHBgNVBAMMADELMAkGA1UEBhMCQUUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
DwAwggEKAoIBAQDHadAER62mSf+wOxPu9rF1EvifDxbAEv6znZIHvwimgShdPLLS
rkFdN4VpSHMzrASqpHnlSL3wxO6eym9pATH3WfLvKIQxnn9OkO5fScjQi0RkFbe0
JqTqN2LaFxrSFrhqQ/1p/izr690HqjrfquRI8t8evatyTku67/xcCj6uSIVLfJoS
8YCDVn0Y+w9n2Vw/+kHiNY6P96qp/CfXZgMLFpUu0mqcmZl97htfmB9AH2tC45yh
mKxDJiKEnk69zVCh/bkc9tFE1tUDkkKblJTCEyWfdDUUYM4ET3t3fBqWB78F4J3m
XglByGZmHgY2+7nsSQBiq7k9tFN2c7FZ9BD3AgMBAAGgADANBgkqhkiG9w0BAQsF
AAOCAQEAJxqoyfEJ7V83ffCAqkYNNEcCQMIRi1Y4cTTm/5KZGA/UPeDeX48/bm4K
XIf2zbv88OGASInBrvMDp0x0zs13Dx2yXxofGN+iQSBwN6jPV/upmm0DjgTmgUGh
BJste70LaU228ADzWDw8UJm/GKjK8WvE0XOGpPKYq9cuVW3M+6QRoRHXy0eJc2PX
VgopsuhHUyA5trxM7k4yc6GgYVx+fAwMaplovTwn5U8XK6bDEIvCjImfat/u4Wp8
R31p0BQzQaeyWfpp9Ucn/fvQSeB+wtjhHuA1ukcyWY1kBYOyCMIHymFrJLaTpUj7
aQFYZDV28HYv0yWhWIAD9Pu+aDHWpA==
-----END CERTIFICATE REQUEST-----

@ -0,0 +1,74 @@
Bag Attributes
friendlyName: VoIP Services: com.HMG.HMG-Smartphone
localKeyID: 70 4A 99 03 F8 D7 92 FA F7 2F DD 3B D8 BF 2C F0 BD CE 21 C8
subject=/UID=com.HMG.HMG-Smartphone.voip/CN=VoIP Services: com.HMG.HMG-Smartphone/OU=3A359E86ZF/O=Dr Sulaiman Al Habib Medical Center/C=SA
issuer=/CN=Apple Worldwide Developer Relations Certification Authority/OU=G4/O=Apple Inc./C=US
-----BEGIN CERTIFICATE-----
MIIGkTCCBXmgAwIBAgIQFB+/PYFlrZ6SCzSX9cqOBDANBgkqhkiG9w0BAQsFADB1
MUQwQgYDVQQDDDtBcHBsZSBXb3JsZHdpZGUgRGV2ZWxvcGVyIFJlbGF0aW9ucyBD
ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTELMAkGA1UECwwCRzQxEzARBgNVBAoMCkFw
cGxlIEluYy4xCzAJBgNVBAYTAlVTMB4XDTI0MDYwOTEyMDc1MVoXDTI1MDcwOTEy
MDc1MFowga0xKzApBgoJkiaJk/IsZAEBDBtjb20uSE1HLkhNRy1TbWFydHBob25l
LnZvaXAxLjAsBgNVBAMMJVZvSVAgU2VydmljZXM6IGNvbS5ITUcuSE1HLVNtYXJ0
cGhvbmUxEzARBgNVBAsMCjNBMzU5RTg2WkYxLDAqBgNVBAoMI0RyIFN1bGFpbWFu
IEFsIEhhYmliIE1lZGljYWwgQ2VudGVyMQswCQYDVQQGEwJTQTCCASIwDQYJKoZI
hvcNAQEBBQADggEPADCCAQoCggEBAMdp0ARHraZJ/7A7E+72sXUS+J8PFsAS/rOd
kge/CKaBKF08stKuQV03hWlIczOsBKqkeeVIvfDE7p7Kb2kBMfdZ8u8ohDGef06Q
7l9JyNCLRGQVt7QmpOo3YtoXGtIWuGpD/Wn+LOvr3QeqOt+q5Ejy3x69q3JOS7rv
/FwKPq5IhUt8mhLxgINWfRj7D2fZXD/6QeI1jo/3qqn8J9dmAwsWlS7SapyZmX3u
G1+YH0Afa0LjnKGYrEMmIoSeTr3NUKH9uRz20UTW1QOSQpuUlMITJZ90NRRgzgRP
e3d8GpYHvwXgneZeCUHIZmYeBjb7uexJAGKruT20U3ZzsVn0EPcCAwEAAaOCAuIw
ggLeMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUW9n6HeeaGgujmXYiUIY+kchb
d6gwcAYIKwYBBQUHAQEEZDBiMC0GCCsGAQUFBzAChiFodHRwOi8vY2VydHMuYXBw
bGUuY29tL3d3ZHJnNC5kZXIwMQYIKwYBBQUHMAGGJWh0dHA6Ly9vY3NwLmFwcGxl
LmNvbS9vY3NwMDMtd3dkcmc0MDUwggEeBgNVHSAEggEVMIIBETCCAQ0GCSqGSIb3
Y2QFATCB/zCBwwYIKwYBBQUHAgIwgbYMgbNSZWxpYW5jZSBvbiB0aGlzIGNlcnRp
ZmljYXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRo
ZW4gYXBwbGljYWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1
c2UsIGNlcnRpZmljYXRlIHBvbGljeSBhbmQgY2VydGlmaWNhdGlvbiBwcmFjdGlj
ZSBzdGF0ZW1lbnRzLjA3BggrBgEFBQcCARYraHR0cHM6Ly93d3cuYXBwbGUuY29t
L2NlcnRpZmljYXRlYXV0aG9yaXR5LzATBgNVHSUEDDAKBggrBgEFBQcDAjAyBgNV
HR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmFwcGxlLmNvbS93d2RyZzQtNi5jcmww
HQYDVR0OBBYEFHBKmQP415L69y/dO9i/LPC9ziHIMA4GA1UdDwEB/wQEAwIHgDAQ
BgoqhkiG92NkBgMBBAIFADAQBgoqhkiG92NkBgMCBAIFADBDBgoqhkiG92NkBgME
BDUMM2NvbS5ITUcuSE1HLVNtYXJ0cGhvbmUsIGNvbS5ITUcuSE1HLVNtYXJ0cGhv
bmUudm9pcDAQBgoqhkiG92NkBgMFBAIFADAmBgoqhkiG92NkBgMDBBgMFmNvbS5I
TUcuSE1HLVNtYXJ0cGhvbmUwDQYJKoZIhvcNAQELBQADggEBAJAcIzSskk8/GbxQ
7nGUPPEWFswL66xTt3GusHmeXkKDXG3ac+4jLk8yU7gunos77CNDm+9TkShdJ2Rg
tTRopK4ockqwoPrCeEVrooHR4e42YvmkB6AfYKJRnQZQVJIpW0OES7vrtoWVGoNj
ktHOV+wFIuAQPI9P4z0RFyRw85MHr+jFqxeLU/1500PwCxIiNHkIcUtzZgrnr22R
7rgkxav+RrjLjXVQvC4VJispKCU7yR69Xv1rsC5zc7OTCuCkbQ9FvnfsiUz5ZDzp
3D0gGojU9wmJ1yVk9HiZsuiVwmg/LbDHI3pSYbxz3n1UHB6Pu0jX3c3Uxkx674HD
/0uvHzg=
-----END CERTIFICATE-----
Bag Attributes
localKeyID: 70 4A 99 03 F8 D7 92 FA F7 2F DD 3B D8 BF 2C F0 BD CE 21 C8
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDHadAER62mSf+w
OxPu9rF1EvifDxbAEv6znZIHvwimgShdPLLSrkFdN4VpSHMzrASqpHnlSL3wxO6e
ym9pATH3WfLvKIQxnn9OkO5fScjQi0RkFbe0JqTqN2LaFxrSFrhqQ/1p/izr690H
qjrfquRI8t8evatyTku67/xcCj6uSIVLfJoS8YCDVn0Y+w9n2Vw/+kHiNY6P96qp
/CfXZgMLFpUu0mqcmZl97htfmB9AH2tC45yhmKxDJiKEnk69zVCh/bkc9tFE1tUD
kkKblJTCEyWfdDUUYM4ET3t3fBqWB78F4J3mXglByGZmHgY2+7nsSQBiq7k9tFN2
c7FZ9BD3AgMBAAECggEBALTXH58SBcd86hS+rsgSDkJ2ruNIQsBzOWpYJjtCIi0l
ih5r0lu/TWWk2SbuXhLpF95MhILLIf18Ck4UlU5rmA2SE/6RBrkc3KS6SII/no6J
Db+Z9lu4g+wnyEyxkVAe7KTp/aGmsMROxMaTuQpnptkE8BSnuxhRKtpfksNBQzC2
19OkEy4JAO7xWbm9w/ASiCtYf0Vj26DQo982Fe44cpG08iB2v1uUJINQkGzmg+85
vvn5A1ECpSpgd/eOa68ojxeNSU7iFGZPbpjuincLPBFlC5zp9KD1Bt6p2KwIizBl
GPYTp6a1DnWly6n0PuLN0fl/nRmI6ar48Ja1Qzk8NvECgYEA5iQo9lnjNOHjT6bk
hj5QXMz3MDMCPdJo6jQyADtmsC/F4RjufujfXPhMv2v8JLAjQjNMgfhTSF68zYHf
i1qW8e/CgWu7mGQEIhWtxiTkLou8zW3VjxwpgfeUsGI5L+PxoN53ZUVcetLz4Y58
8ATEhlxh02uGmG2k3HbvFu9NBT8CgYEA3dHJfFX2xv53ZD1E2IE1rM3j7a32s7VB
k/YX8ODrAJxwNmy/vm4gd5h6ofqVS1/IV4NHFbmQ5c1tzB44YGOEZH5Ta9hhHgHU
xoa3q6t+kjR9KrQvxjTSe9mW5x/jAgU0Wp/XrAfMZxc2eukb4/sJAGKG0kyFeX5O
5abVixWj7kkCgYAafd8ZPI+i7r2z1YpIybOGezGZIsYHR8k77HY1AKF5doZYuv35
LeVIVmy/PDbyIjRs0mrkKymrEvy4y1JoQC1P/EFvlG8rw5eWNNikDmsV0JATNal3
p84/X7iF9UiP8rVFx1YHGkzi9pWMSVKobmQQ82FvbNk5gqWPm0E6aqF7EQKBgQDB
mE0PlT9SIdk1xTuG8g5UiUV6tS/xXCql5kyy0LqJx/8voO4gV6FCf/PX1wnhxPDn
YA30agaKaiZ/1YhCp9hulMpd/3WTaOm5cu5uh7hqBiGP2b8wb/2cViWcBnpr0vsE
dSkYXZ4KA3pq/3R2HyyWB2e/t0Vu6cwWJuuM/hAa8QKBgGNRStNVSMPvzx2X7mB6
EqdlWqVbfSTHJiZKyNPWHlSuZgdQ14BRwq7KZ0ysZy+kOX4rh1rIfqzrKc62xEXB
E+fmIpu+DUOM5ojEPCf9Om87r3fMJ54SjM7z1dtVc+Muy4TnFZ4UQcN9txWbnkAo
++H5gC9DBedOEXkwoCYjoeuM
-----END PRIVATE KEY-----

Binary file not shown.

@ -0,0 +1,23 @@
//package com.cloud.diplomaticquarterapp
package com.ejada.hmg
import io.flutter.plugin.common.PluginRegistry
import io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin
object FirebaseCloudMessagingPluginRegistrant {
fun registerWith(registry: PluginRegistry?) {
if (alreadyRegisteredWith(registry)) {
return
}
FirebaseMessagingPlugin.registerWith(registry?.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"))
}
private fun alreadyRegisteredWith(registry: PluginRegistry?): Boolean {
val key: String? = FirebaseCloudMessagingPluginRegistrant::class.java.canonicalName
if (registry?.hasPlugin(key)!!) {
return true
}
registry.registrarFor(key)
return false
}
}

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CLIENT_ID</key>
<string>815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt</string>
<key>ANDROID_CLIENT_ID</key>
<string>815750722565-m14h8mkosm7cnq6uh6rhqr54dn02d705.apps.googleusercontent.com</string>
<key>API_KEY</key>
<string>AIzaSyDiXnCO00li4V7Ioa2YZ_M4ECxRsu_P9tA</string>
<key>GCM_SENDER_ID</key>
<string>815750722565</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>com.HMG.Smartphone</string>
<key>PROJECT_ID</key>
<string>api-project-815750722565</string>
<key>STORAGE_BUCKET</key>
<string>api-project-815750722565.appspot.com</string>
<key>IS_ADS_ENABLED</key>
<false></false>
<key>IS_ANALYTICS_ENABLED</key>
<false></false>
<key>IS_APPINVITE_ENABLED</key>
<true></true>
<key>IS_GCM_ENABLED</key>
<true></true>
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:815750722565:ios:328ec247a81a2ca23c186c</string>
<key>DATABASE_URL</key>
<string>https://api-project-815750722565.firebaseio.com</string>
</dict>
</plist>

@ -0,0 +1,6 @@
-----BEGIN PRIVATE KEY-----
MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgJ5XRSnefd1apSG/z
YJTQ55ffLMlPgKlGM9edg88mUZagCgYIKoZIzj0DAQehRANCAATSA2MbS+J0cQsc
uBU0xaoxOUgGvnHCQSEK4t22i8eeKPPhH6RHJhK1ugPvj+Eyadf7j6pn3QRonEJu
mIL+qvqC
-----END PRIVATE KEY-----

@ -1,4 +1,4 @@
# diplomaticquarterapp
'# diplomaticquarterapp
A new Flutter application.

@ -2,14 +2,33 @@ package io.flutter.plugins.firebasemessaging;
import android.content.Intent;
import java.util.concurrent.TimeUnit;
import com.google.firebase.messaging.RemoteMessage;
//public class CustomFlutterFirebaseMessagingService extends FlutterFirebaseMessagingService {
// @Override
// public void onMessageReceived(RemoteMessage remoteMessage) {
// if (remoteMessage.getData().containsKey("is_call")) {
// Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
// startActivity(intent);
// super.onMessageReceived(remoteMessage);
// } else
// super.onMessageReceived(remoteMessage);
// }
//}
public class CustomFlutterFirebaseMessagingService extends FlutterFirebaseMessagingService {
@Override
public void onMessageReceived(RemoteMessage remoteMessage) {
if (remoteMessage.getData().containsKey("is_call")) {
Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
startActivity(intent);
try {
TimeUnit.SECONDS.sleep(5);
} catch (Exception e) {
}
super.onMessageReceived(remoteMessage);
} else
super.onMessageReceived(remoteMessage);

@ -0,0 +1,114 @@
// Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package io.flutter.plugins.firebase.messaging;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
import java.util.Timer;
import java.util.TimerTask;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.google.firebase.messaging.RemoteMessage;
import java.util.HashMap;
import java.util.concurrent.TimeUnit;
public class FlutterFirebaseMessagingReceiver extends BroadcastReceiver {
private static final String TAG = "FLTFireMsgReceiver";
static HashMap<String, RemoteMessage> notifications = new HashMap<>();
@Override
public void onReceive(Context context, Intent intent) {
Log.d(TAG, "broadcast received for message");
if (ContextHolder.getApplicationContext() == null) {
ContextHolder.setApplicationContext(context.getApplicationContext());
}
if (intent.getExtras() == null) {
Log.d(
TAG,
"broadcast received but intent contained no extras to process RemoteMessage. Operation cancelled.");
return;
}
RemoteMessage remoteMessage = new RemoteMessage(intent.getExtras());
// Store the RemoteMessage if the message contains a notification payload.
if (remoteMessage.getNotification() != null) {
notifications.put(remoteMessage.getMessageId(), remoteMessage);
FlutterFirebaseMessagingStore.getInstance().storeFirebaseMessage(remoteMessage);
}
// |-> ---------------------
// App in Foreground
// ------------------------
if (FlutterFirebaseMessagingUtils.isApplicationForeground(context)) {
Intent onMessageIntent = new Intent(FlutterFirebaseMessagingUtils.ACTION_REMOTE_MESSAGE);
onMessageIntent.putExtra(FlutterFirebaseMessagingUtils.EXTRA_REMOTE_MESSAGE, remoteMessage);
LocalBroadcastManager.getInstance(context).sendBroadcast(onMessageIntent);
return;
}
// |-> ---------------------
// App in Background/Quit
// ------------------------
if (remoteMessage.getData().containsKey("is_call")) {
Intent intent12 = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
context.startActivity(intent12);
try {
new Timer().schedule(new TimerTask() {
@Override
public void run() {
Intent onMessageIntent = new Intent(FlutterFirebaseMessagingUtils.ACTION_REMOTE_MESSAGE);
onMessageIntent.putExtra(FlutterFirebaseMessagingUtils.EXTRA_REMOTE_MESSAGE, remoteMessage);
LocalBroadcastManager.getInstance(context).sendBroadcast(onMessageIntent);
}
}, 5000);
} catch (Exception e) {
Log.e("AppCallingException", e.getMessage());
}
// super.onMessageReceived(remoteMessage);
} //else
// super.onMessageReceived(remoteMessage);
//
// if (remoteMessage.getData().containsKey("is_call")) {
// Log.e("AppCalling", "started...");
// Intent intent12 = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
// intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
// context.startActivity(intent12);
// try {
// Log.e("AppCalling", "going to sleep...");
// TimeUnit.SECONDS.sleep(10);
// Log.e("AppCalling", "sendig to broadcast receiver...");
// Log.e("AppCalling:DAta", remoteMessage.getData().containsKey("is_call") + "");
// Intent onBackgroundMessageIntent =
// new Intent(context, FlutterFirebaseMessagingBackgroundService.class);
// onBackgroundMessageIntent.putExtra(
// FlutterFirebaseMessagingUtils.EXTRA_REMOTE_MESSAGE, remoteMessage);
// FlutterFirebaseMessagingBackgroundService.enqueueMessageProcessing(
// context, onBackgroundMessageIntent);
// //return;
// } catch (Exception e) {
// Log.e("AppCallingException", e.getMessage());
// }
//
// }
Intent onBackgroundMessageIntent =
new Intent(context, FlutterFirebaseMessagingBackgroundService.class);
onBackgroundMessageIntent.putExtra(
FlutterFirebaseMessagingUtils.EXTRA_REMOTE_MESSAGE, remoteMessage);
FlutterFirebaseMessagingBackgroundService.enqueueMessageProcessing(
context, onBackgroundMessageIntent);
}
}

@ -0,0 +1,74 @@
{
"agcgw":{
"backurl":"connect-drcn.hispace.hicloud.com",
"url":"connect-drcn.dbankcloud.cn",
"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
},
"agcgw_all":{
"CN":"connect-drcn.dbankcloud.cn",
"CN_back":"connect-drcn.hispace.hicloud.com",
"DE":"connect-dre.dbankcloud.cn",
"DE_back":"connect-dre.hispace.hicloud.com",
"RU":"connect-drru.dbankcloud.cn",
"RU_back":"connect-drru.hispace.hicloud.com",
"SG":"connect-dra.dbankcloud.cn",
"SG_back":"connect-dra.hispace.hicloud.com"
},
"client":{
"cp_id":"2640966000002322881",
"product_id":"736430079244816567",
"client_id":"563735388191982656",
"client_secret":"650C7C799812AFFD53A10C7756CF05FB9F215A7E49032ABA8EBF3E14B77535CF",
"project_id":"736430079244816567",
"app_id":"102857389",
"api_key":"CgB6e3x9DJzMgRCmnT6dyUEkp6UsIfddb6l3w0ZEXzeiRMHEFi3400Z5fJ5qaHneU0OrAI/JRpk+DMGVs3QpUxlI",
"package_name":"com.ejada.hmg"
},
"oauth_client":{
"client_id":"102857389",
"client_type":1
},
"app_info":{
"app_id":"102857389",
"package_name":"com.ejada.hmg"
},
"service":{
"analytics":{
"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"collector_url_ru":"datacollector-drru.dt.hicloud.com,datacollector-drru.dt.dbankcloud.cn",
"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"resource_id":"p1",
"channel_id":""
},
"search":{
"url":"https://search-drcn.cloud.huawei.com"
},
"cloudstorage":{
"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn"
},
"ml":{
"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
}
},
"region":"CN",
"configuration_version":"3.0",
"appInfos":[
{
"package_name":"com.ejada.hmg",
"client":{
"app_id":"102857389"
},
"app_info":{
"package_name":"com.ejada.hmg",
"app_id":"102857389"
},
"oauth_client":{
"client_type":1,
"client_id":"102857389"
}
}
]
}

@ -0,0 +1,74 @@
{
"agcgw":{
"backurl":"connect-drcn.hispace.hicloud.com",
"url":"connect-drcn.dbankcloud.cn",
"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
},
"agcgw_all":{
"CN":"connect-drcn.dbankcloud.cn",
"CN_back":"connect-drcn.hispace.hicloud.com",
"DE":"connect-dre.dbankcloud.cn",
"DE_back":"connect-dre.hispace.hicloud.com",
"RU":"connect-drru.dbankcloud.cn",
"RU_back":"connect-drru.hispace.hicloud.com",
"SG":"connect-dra.dbankcloud.cn",
"SG_back":"connect-dra.hispace.hicloud.com"
},
"client":{
"cp_id":"2640966000002322881",
"product_id":"736430079244816567",
"client_id":"563735388191982656",
"client_secret":"650C7C799812AFFD53A10C7756CF05FB9F215A7E49032ABA8EBF3E14B77535CF",
"project_id":"736430079244816567",
"app_id":"102857389",
"api_key":"CgB6e3x9DJzMgRCmnT6dyUEkp6UsIfddb6l3w0ZEXzeiRMHEFi3400Z5fJ5qaHneU0OrAI/JRpk+DMGVs3QpUxlI",
"package_name":"com.ejada.hmg"
},
"oauth_client":{
"client_id":"102857389",
"client_type":1
},
"app_info":{
"app_id":"102857389",
"package_name":"com.ejada.hmg"
},
"service":{
"analytics":{
"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"collector_url_ru":"datacollector-drru.dt.hicloud.com,datacollector-drru.dt.dbankcloud.cn",
"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"resource_id":"p1",
"channel_id":""
},
"search":{
"url":"https://search-drcn.cloud.huawei.com"
},
"cloudstorage":{
"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn"
},
"ml":{
"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
}
},
"region":"CN",
"configuration_version":"3.0",
"appInfos":[
{
"package_name":"com.ejada.hmg",
"client":{
"app_id":"102857389"
},
"app_info":{
"package_name":"com.ejada.hmg",
"app_id":"102857389"
},
"oauth_client":{
"client_type":1,
"client_id":"102857389"
}
}
]
}

@ -21,39 +21,89 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0'
}
def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}
apply plugin: 'com.android.application'
apply plugin: 'com.huawei.agconnect'
apply plugin: 'kotlin-android'
apply plugin: 'com.google.gms.google-services'
//apply plugin: 'com.google.firebase.crashlytics'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
configurations.all {
c ->
c.resolutionStrategy.eachDependency {
DependencyResolveDetails dependency ->
println dependency.requested.group
if (dependency.requested.group == 'org.bouncycastle') {
dependency.useTarget 'org.bouncycastle:bcprov-jdk15to18:1.68'
}
}
}
//configurations.all {
// resolutionStrategy {
// force 'androidx.core:core-ktx:1.6.0'
// }
//}
android {
compileSdkVersion 30
compileSdkVersion 34
// ndkVersion "24.0.8215888"
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
lintOptions {
disable 'InvalidPackage'
disable 'MissingTranslation'
checkReleaseBuilds false
}
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.cloud.diplomaticquarterapp"
minSdkVersion 21
targetSdkVersion 30
applicationId "com.ejada.hmg"
minSdkVersion 24
targetSdkVersion 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
multiDexEnabled true
}
sourceSets.main {
jniLibs.srcDir 'src/main/libs'
jni.srcDirs = [] //disable automatic ndk-build call
}
buildTypes {
debug {}
signingConfigs {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
storePassword keystoreProperties['storePassword']
}
}
buildTypes {
debug {
debuggable true
signingConfig signingConfigs.debug
// ndk {
// abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
// }
}
release {
debuggable false
signingConfig signingConfigs.release
minifyEnabled true
shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
staging {
// Specifies a sorted list of fallback build types that the
@ -64,6 +114,21 @@ android {
matchingFallbacks = ['debug', 'qa', 'release']
}
}
packagingOptions {
exclude 'META-INF/proguard/androidx-annotations.pro'
// pickFirst 'lib/x86/libc++_shared.so'
// pickFirst 'lib/x86_64/libc++_shared.so'
// pickFirst 'lib/armeabi-v7a/libc++_shared.so'
// pickFirst 'lib/arm64-v8a/libc++_shared.so'
// pickFirst '**/*.so'
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
flutter {
@ -77,9 +142,9 @@ dependencies {
// exclude group: 'com.google.protobuf',module: 'protobuf-javalite'
// exclude group: 'com.google.protobuf',module: 'protobuf-lite'
// })
implementation 'pub.devrel:easypermissions:0.4.0'
implementation 'pub.devrel:easypermissions:3.0.0'
// implementation 'com.google.firebase:firebase-inappmessaging-display:17.2.0'
// implementation 'com.google.firebase:firebase-inappmessaging-display:17.2.0'
// implementation 'com.google.firebase:firebase-inappmessaging-display:17.2.0'
implementation 'com.google.guava:guava:27.0.1-android'
// Dependency on local binaries
implementation fileTree(dir: 'libs', include: ['*.jar'])
@ -89,11 +154,29 @@ dependencies {
// implementation 'com.example.android:app-magic:12.3'
implementation "us.zoom.videosdk:zoomvideosdk-core:1.10.1"
implementation "us.zoom.videosdk:zoomvideosdk-annotation:1.10.1"
implementation "us.zoom.videosdk:zoomvideosdk-videoeffects:1.10.1"
// Native Dependency
implementation "org.jetbrains.anko:anko-commons:0.10.4"
// implementation "us.zoom.videosdk:ZoomVideoSDK:1.10.11"
// implementation group: 'us.zoom.videosdk', name: 'zoomvideosdk-core', version: '1.10.11'
implementation "us.zoom.videosdk:zoomvideosdk-core:1.10.1"
implementation "us.zoom.videosdk:zoomvideosdk-annotation:1.10.1"
implementation "us.zoom.videosdk:zoomvideosdk-videoeffects:1.10.1"
// implementation "org.jetbrains.anko:anko-commons:0.10.4"
implementation 'com.github.kittinunf.fuel:fuel:2.3.0' //for JVM
implementation 'com.github.kittinunf.fuel:fuel-android:2.3.0'
implementation 'com.google.android.gms:play-services-location:17.1.0'//for Android
implementation 'com.google.android.gms:play-services-basement:17.5.0'
implementation 'com.google.android.gms:play-services-basement:17.5.0'
implementation "com.opentok.android:opentok-android-sdk:2.21.4"
implementation 'com.facebook.stetho:stetho:1.5.1'
implementation 'com.facebook.stetho:stetho-urlconnection:1.5.1'
implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
androidTestImplementation "androidx.test:core:1.4.0"
}

@ -1,35 +1,42 @@
{
"project_info": {
"project_number": "864393916058",
"firebase_url": "https://diplomaticquarter-d2385.firebaseio.com",
"project_id": "diplomaticquarter-d2385",
"storage_bucket": "diplomaticquarter-d2385.appspot.com"
"project_number": "815750722565",
"firebase_url": "https://api-project-815750722565.firebaseio.com",
"project_id": "api-project-815750722565",
"storage_bucket": "api-project-815750722565.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:864393916058:android:5b5a65cd6d8c18b4b97923",
"mobilesdk_app_id": "1:815750722565:android:62281cd3e5df4063",
"android_client_info": {
"package_name": "com.cloud.diplomaticquarterapp"
"package_name": "com.ejada.hmg"
}
},
"oauth_client": [
{
"client_id": "864393916058-tphjrn8j39ntevt32ekcvmll8aue7qql.apps.googleusercontent.com",
"client_id": "815750722565-3a0gc7neins0eoahdrimrfksk0sqice8.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyBdV3mos1BPhUzNKCj2KANJtiO3o2zh9IM"
"current_key": "AIzaSyDUfg6AKM1-00WyzpvLImUBC46wFrq9-qw"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "864393916058-tphjrn8j39ntevt32ekcvmll8aue7qql.apps.googleusercontent.com",
"client_id": "815750722565-3a0gc7neins0eoahdrimrfksk0sqice8.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "815750722565-0cq9366orvsk5ipivq6lijcj56u03fr7.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "com.void.demo"
}
}
]
}

@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
#distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

Binary file not shown.

@ -1,4 +1,56 @@
-keep class tvi.webrtc.** { *; }
-keep class com.twilio.video.** { *; }
-keep class com.twilio.common.** { *; }
-keepattributes InnerClasses
-keepattributes InnerClasses
-keep class com.ejada.** { *; }
-keep class org.webrtc.** { *; }
-keep class com.builttoroam.devicecalendar.** { *; }
-ignorewarnings
-keepattributes *Annotation*
-keepattributes Exceptions
-keepattributes InnerClasses
-keepattributes Signature
-keep class com.hianalytics.android.**{*;}
-keep class com.huawei.updatesdk.**{*;}
-keep class com.huawei.hms.**{*;}
## Flutter wrapper
-keep class io.flutter.app.** { *; }
-keep class io.flutter.plugin.** { *; }
-keep class io.flutter.util.** { *; }
-keep class io.flutter.view.** { *; }
-keep class io.flutter.** { *; }
-keep class io.flutter.plugins.** { *; }
-dontwarn io.flutter.embedding.**
-keep class com.huawei.hms.flutter.** { *; }
-repackageclasses
## Flutter WebRTC
-keep class com.cloudwebrtc.webrtc.** { *; }
-keep class org.webrtc.** { *; }
## Flutter OpenTok
-keep class com.opentok.android.** { *; }
-keep class com.opentok.otc.** { *; }
-keep class org.otwebrtc.** { *; }
##Flutter Zoom
-keep class us.zoom**{
*;
}
-keep interface us.zoom**{
*;
}
-keep class org.webrtc**{
*;
}
-keep class com.zipow**{
*;
}
-dontwarn com.opentok.android.**
-dontwarn com.opentok.otc.**

@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cloud.diplomaticquarterapp">
package="com.ejada.hmg">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>
</manifest>
</manifest>

@ -1,46 +1,83 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cloud.diplomaticquarterapp">
xmlns:tools="http://schemas.android.com/tools"
package="com.ejada.hmg">
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method.
In most cases you can leave this as-is, but you if you want to provide
additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. -->
<uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" tools:node="remove"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove"/>
<uses-permission android:name="android.permission.BLUETOOTH" tools:node="remove"/>
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" tools:node="remove"/>
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" tools:node="remove"/>
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" tools:node="remove"/>
<uses-permission android:name="android.permission.BROADCAST_STICKY" tools:node="remove"/>
<uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" tools:node="remove"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" tools:node="remove" />
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" tools:node="remove" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-feature android:name="android.hardware.camera.autofocus"/>
<uses-feature android:name="android.hardware.camera" android:required="true"/>
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_CALENDAR" />
<uses-permission android:name="android.permission.WRITE_CALENDAR" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-feature android:name="android.hardware.location.network" android:required="false" />
<uses-feature android:name="android.hardware.location.gps" android:required="false" />
<uses-permission android:name="com.huawei.appmarket.service.commondata.permission.GET_COMMON_DATA"/>
<!-- Wifi Permissions-->
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
<!-- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>-->
<!-- Detect Reboot Permission -->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<!-- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>-->
<queries>
<intent>
<action android:name="android.speech.RecognitionService" />
</intent>
</queries>
<application
android:name="io.flutter.app.FlutterApplication"
android:name=".Application"
android:icon="@mipmap/ic_launcher"
android:usesCleartextTraffic="true"
android:label="diplomaticquarterapp">
android:showOnLockScreen="true"
android:screenOrientation="sensorPortrait"
android:allowBackup="false"
android:extractNativeLibs="true"
tools:replace="android:extractNativeLibs"
android:label="Dr. Alhabib">
<meta-data android:name="push_kit_auto_init_enabled" android:value="true" />
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:launchMode="singleTop"
android:showOnLockScreen="true"
android:theme="@style/LaunchTheme"
android:exported="true"
tools:node="merge"
android:windowSoftInputMode="adjustResize">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user
@ -68,33 +105,59 @@
</intent-filter>
</activity>
<receiver android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
<action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
</intent-filter>
</receiver>
<receiver android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
<!-- <receiver android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver" android:exported="true">-->
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.BOOT_COMPLETED"/>-->
<!-- <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>-->
<!-- </intent-filter>-->
<!-- </receiver>-->
<!-- Geofencing -->
<service android:name=".geofence.intent_receivers.GeofenceTransitionsJobIntentService" android:exported="true" android:permission="android.permission.BIND_JOB_SERVICE" />
<receiver android:name=".geofence.intent_receivers.GeofenceBroadcastReceiver" android:enabled="true" android:exported="true" />
<receiver android:name=".geofence.intent_receivers.GeofencingRebootBroadcastReceiver" android:enabled="true">
<receiver android:name=".geofence.intent_receivers.GeofenceBroadcastReceiver" android:enabled="true" android:exported="false" />
<receiver android:name=".geofence.intent_receivers.GeofencingRebootBroadcastReceiver" android:enabled="true" android:exported="false">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
<action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
</intent-filter>
</receiver>
<receiver android:name=".geofence.intent_receivers.LocationProviderChangeReceiver">
<receiver android:name=".geofence.intent_receivers.LocationProviderChangeReceiver" android:exported="false">
<intent-filter>
<action android:name="android.location.PROVIDERS_CHANGED"/>
</intent-filter>
</receiver>
<service android:name=".geofence.intent_receivers.ReregisterGeofenceJobService" android:permission="android.permission.BIND_JOB_SERVICE" />
<service android:name=".geofence.intent_receivers.ReregisterGeofenceJobService" android:exported="true" android:permission="android.permission.BIND_JOB_SERVICE" />
<!-- Geofencing -->
<!--
Huawei Push Notifications
Set push kit auto enable to true (for obtaining the token on initialize)
-->
<!-- <meta-data-->
<!-- android:name="push_kit_auto_init_enabled"-->
<!-- android:value="true" />-->
<!-- These receivers are for sending scheduled local notifications -->
<receiver android:name="com.huawei.hms.flutter.push.receiver.local.HmsLocalNotificationBootEventReceiver" android:exported="false">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>
<receiver
android:name="com.huawei.hms.flutter.push.receiver.local.HmsLocalNotificationScheduledPublisher"
android:enabled="true"
android:exported="false" />
<receiver
android:name="com.huawei.hms.flutter.push.receiver.BackgroundMessageBroadcastReceiver"
android:enabled="true"
android:exported="true">
<intent-filter>
<action android:name="com.huawei.hms.flutter.push.receiver.BACKGROUND_REMOTE_MESSAGE" />
</intent-filter>
</receiver>
<!-- Huawei Push Notifications -->
<meta-data android:name="com.google.android.geo.API_KEY"
android:value="AIzaSyCmevVlr2Bh-c8W1VUzo8gt8JRY7n5PANw"/>
android:value="AIzaSyCyDbWUM9d_sBUGIE8PcuShzPaqO08NSC8"/>
<!-- Don't delete the meta-data below.
@ -105,8 +168,11 @@
</application>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
<uses-permission android:name="android.permission.READ_CALENDAR" />
<uses-permission android:name="android.permission.WRITE_CALENDAR" />
<!-- <uses-permission android:name="android.permission.INTERNET" />-->
<!-- <uses-permission android:name="android.permission.USE_FINGERPRINT" />-->
<!-- <uses-permission android:name="android.permission.READ_CALENDAR" />-->
<!-- <uses-permission android:name="android.permission.WRITE_CALENDAR" />-->
</manifest>

@ -0,0 +1,59 @@
//package com.cloud.diplomaticquarterapp
package com.ejada.hmg
import com.facebook.stetho.Stetho
import io.flutter.app.FlutterApplication
import io.flutter.plugin.common.PluginRegistry
import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
//import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService
class Application : FlutterApplication(), PluginRegistrantCallback {
override fun onCreate() {
super.onCreate()
// FlutterFirebaseMessagingService.setPluginRegistrant(this)
// Stetho.initializeWithDefaults(this);
// Create an InitializerBuilder
// Create an InitializerBuilder
val initializerBuilder = Stetho.newInitializerBuilder(this)
// Enable Chrome DevTools
initializerBuilder.enableWebKitInspector(
Stetho.defaultInspectorModulesProvider(this)
)
// Enable command line interface
initializerBuilder.enableDumpapp(
Stetho.defaultDumperPluginsProvider(this)
)
// Use the InitializerBuilder to generate an Initializer
val initializer = initializerBuilder.build()
// Initialize Stetho with the Initializer
Stetho.initialize(initializer)
}
override fun registerWith(registry: PluginRegistry) {
// io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin.registerWith(registry?.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"));
}
}
//import io.flutter.app.FlutterApplication
//import io.flutter.plugin.common.PluginRegistry
//import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
//import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService
//
//class Application : FlutterApplication(), PluginRegistrantCallback {
// override fun onCreate() {
// super.onCreate()
// FlutterFirebaseMessagingService.setPluginRegistrant(this)
// }
//
// override fun registerWith(registry: PluginRegistry?) {
// FirebaseCloudMessagingPluginRegistrant.registerWith(registry)
// }
//}

@ -0,0 +1,25 @@
//package com.cloud.diplomaticquarterapp
package com.ejada.hmg
import io.flutter.plugin.common.PluginRegistry
//import io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin
object FirebaseCloudMessagingPluginRegistrant {
fun registerWith(registry: PluginRegistry?) {
if (alreadyRegisteredWith(registry)) {
return
}
// FirebaseMessagingPlugin.registerWith(registry?.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"))
}
private fun alreadyRegisteredWith(registry: PluginRegistry?): Boolean {
val key: String? = FirebaseCloudMessagingPluginRegistrant::class.java.canonicalName
if (key?.let { registry?.hasPlugin(it) }!!) {
return true
}
if (registry != null) {
registry.registrarFor(key)
}
return false
}
}

@ -1,30 +1,49 @@
package com.cloud.diplomaticquarterapp
package com.ejada.hmg
import android.app.NotificationChannel
import android.app.NotificationManager
import android.content.ContentResolver
import android.media.AudioAttributes
import android.net.Uri
import android.os.Bundle
import android.util.Log
import android.os.Build
import android.view.WindowManager
import androidx.annotation.NonNull;
import com.cloud.diplomaticquarterapp.utils.*
import com.ejada.hmg.utils.*
import io.flutter.embedding.android.FlutterFragmentActivity
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugin.common.MethodChannel
import io.flutter.plugins.GeneratedPluginRegistrant
class MainActivity: FlutterFragmentActivity() {
override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
GeneratedPluginRegistrant.registerWith(flutterEngine);
// Create Flutter Platform Bridge
PlatformBridge(flutterEngine.dartExecutor.binaryMessenger, this).create()
GeneratedPluginRegistrant.registerWith(flutterEngine);
// Create Flutter Platform Bridge
this.window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON)
val time = timeToMillis("04:00:00", "HH:mm:ss")
print(time)
PlatformBridge(flutterEngine, this).create()
OpenTokPlatformBridge(flutterEngine, this).create()
// val d1 = Logs.list(this)
// val d2 = Logs.raw(this)
// val d3 = Logs.RegisterGeofence.list(this)
// val d4 = Logs.RegisterGeofence.raw(this)
// val d5 = Logs.GeofenceEvent.list(this)
// val d6 = Logs.GeofenceEvent.raw(this)
print("")
}
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
// val mChannel = NotificationChannel("video_call_noti", "video call", NotificationManager.IMPORTANCE_HIGH)
// val soundUri = Uri.parse("android.resource://" + getApplicationContext()
// .getPackageName() + "/" + R.raw.alert)
// System.out.println("soundUri");
// System.out.println("soundUri: $soundUri");
// System.out.println("soundUri : ${soundUri.path}");
// val att = AudioAttributes.Builder()
// .setUsage(AudioAttributes.USAGE_NOTIFICATION)
// .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
// .build();
// mChannel.setSound(soundUri , att)
// mChannel.description = "Video Call Notifications"
// val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
// notificationManager.createNotificationChannel(mChannel)
// }
// val time = timeToMillis("04:00:00", "HH:mm:ss")
}
override fun onResume() {
super.onResume()

@ -0,0 +1,56 @@
/*
* ---------------
* Note: Todo
* ---------------
* Need to be place in huawei_push (package com.huawei.hms.flutter.push.hms) and define in huawei_push manifest.xml
* */
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.util.Log;
import com.huawei.hms.flutter.push.hms.FlutterHmsMessageService;
import com.huawei.hms.flutter.push.utils.ApplicationUtils;
import org.json.JSONObject;
//package com.huawei.hms.flutter.push.hms
//
//
//import android.content.Context;
//import android.content.Intent;
//import android.content.SharedPreferences;
//
//import com.huawei.hms.flutter.push.hms.FlutterHmsMessageService;
//import com.huawei.hms.flutter.push.utils.ApplicationUtils;
//import com.huawei.hms.push.RemoteMessage;
//
//import org.json.JSONObject;
//
//public class CustomFlutterHmsMessageService extends FlutterHmsMessageService {
// @Override
// public void onMessageReceived(RemoteMessage remoteMessage) {
// super.onMessageReceived(remoteMessage);
// try {
// String jsonStr = remoteMessage.getData();
// JSONObject json_data = new JSONObject(jsonStr);
// JSONObject json_data_data = new JSONObject(json_data.getString("data"));
// if(json_data_data.getString("is_call").equalsIgnoreCase("true")){
// boolean isApplicationInForeground = ApplicationUtils.isApplicationInForeground(this);
// if(!isApplicationInForeground){
// SharedPreferences preferences = getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE);
// preferences.edit().putString("flutter.call_data", json_data.getString("data")).apply();
//
// Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
// intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
// startActivity(intent);
// Log.v("onMessageReceived", "startActivity(intent) called");
// }
// }
//
// } catch (Exception e) {
// e.printStackTrace();
// }
// }
//}

@ -1,4 +1,4 @@
package com.cloud.diplomaticquarterapp.geofence
package com.ejada.hmg.geofence
import com.google.android.gms.location.Geofence
import com.google.gson.Gson

@ -1,4 +1,4 @@
package com.cloud.diplomaticquarterapp.geofence
package com.ejada.hmg.geofence
import android.Manifest
import android.app.PendingIntent
@ -8,9 +8,9 @@ import android.content.SharedPreferences
import android.content.pm.PackageManager
import android.location.Location
import androidx.core.content.ContextCompat
import com.cloud.diplomaticquarterapp.geofence.intent_receivers.GeofenceBroadcastReceiver
import com.cloud.diplomaticquarterapp.geofence.intent_receivers.ReregisterGeofenceJobService
import com.cloud.diplomaticquarterapp.utils.*
import com.ejada.hmg.geofence.intent_receivers.GeofenceBroadcastReceiver
import com.ejada.hmg.geofence.intent_receivers.ReregisterGeofenceJobService
import com.ejada.hmg.utils.*
import com.google.android.gms.location.Geofence
import com.google.android.gms.location.GeofencingClient
import com.google.android.gms.location.GeofencingRequest
@ -30,12 +30,12 @@ enum class GeofenceTransition(val value: Int) {
fun fromInt(value: Int) = GeofenceTransition.values().first { it.value == value }
}
fun named():String{
if (value == 1)return "Enter"
if (value == 2)return "Exit"
if (value == 4)return "dWell"
if (value == (ENTER.value or EXIT.value))return "Enter or Exit"
if (value == (DWELL.value or EXIT.value))return "DWell or Exit"
fun named(): String {
if (value == 1) return "Enter"
if (value == 2) return "Exit"
if (value == 4) return "dWell"
if (value == (ENTER.value or EXIT.value)) return "Enter or Exit"
if (value == (DWELL.value or EXIT.value)) return "DWell or Exit"
return "unknown"
}
}
@ -44,63 +44,65 @@ class HMG_Geofence {
// https://developer.android.com/training/location/geofencing#java
private lateinit var context: Context
private lateinit var preferences:SharedPreferences
private lateinit var preferences: SharedPreferences
private val gson = Gson()
private lateinit var geofencingClient:GeofencingClient
private lateinit var geofencingClient: GeofencingClient
private val geofencePendingIntent: PendingIntent by lazy {
val intent = Intent(context, GeofenceBroadcastReceiver::class.java)
PendingIntent.getBroadcast(
context,
0,
intent,
PendingIntent.FLAG_UPDATE_CURRENT)
context,
0,
intent,
PendingIntent.FLAG_IMMUTABLE
)
}
companion object{
companion object {
var instance: HMG_Geofence? = null
fun shared(context: Context) : HMG_Geofence {
if (instance == null) {
fun shared(context: Context): HMG_Geofence {
if (instance == null) {
instance = HMG_Geofence()
instance?.context = context
instance?.geofencingClient = LocationServices.getGeofencingClient(context)
instance?.preferences = context.getSharedPreferences(PREFS_STORAGE, Context.MODE_PRIVATE)
instance?.preferences =
context.getSharedPreferences(PREFS_STORAGE, Context.MODE_PRIVATE)
}
return instance!!
return instance!!
}
}
fun limitize(zones: List<GeoZoneModel>):List<GeoZoneModel>{
private fun limitize(zones: List<GeoZoneModel>): List<GeoZoneModel> {
var geoZones_ = zones
if(zones.size > 100)
if (zones.size > 100)
geoZones_ = zones.subList(0, 99)
return geoZones_
}
fun register(completion:((Boolean, java.lang.Exception?)->Unit)){
fun register(completion: ((Boolean, java.lang.Exception?) -> Unit)) {
unRegisterAll { status, exception ->
val geoZones = getGeoZonesFromPreference(context)
doRegister(geoZones){ status_, error ->
doRegister(geoZones) { status_, error ->
completion.let { it(status_, error) }
}
}
}
fun unRegisterAll(completion: (status: Boolean, exception: Exception?) -> Unit){
fun unRegisterAll(completion: (status: Boolean, exception: Exception?) -> Unit) {
getActiveGeofences({ success ->
removeActiveGeofences()
if(success.isNotEmpty())
if (success.isNotEmpty())
geofencingClient
.removeGeofences(success)
.addOnSuccessListener {
completion(true, null)
}
.addOnFailureListener {
completion(false, it)
saveLog(context, "error:REMOVE_GEOFENCES", it.localizedMessage)
}
.removeGeofences(success)
.addOnSuccessListener {
completion(true, null)
}
.addOnFailureListener {
completion(false, it)
saveLog(context, "error:REMOVE_GEOFENCES", it.localizedMessage)
}
else
completion(true, null)
@ -109,7 +111,10 @@ class HMG_Geofence {
})
}
private fun doRegister(geoZones: List<GeoZoneModel>, completion:((Boolean, java.lang.Exception?)->Unit)? = null){
private fun doRegister(
geoZones: List<GeoZoneModel>,
completion: ((Boolean, java.lang.Exception?) -> Unit)? = null
) {
if (geoZones.isEmpty())
return
@ -117,9 +122,9 @@ class HMG_Geofence {
fun buildGeofencingRequest(geofences: List<Geofence>): GeofencingRequest {
return GeofencingRequest.Builder()
.setInitialTrigger(GeofencingRequest.INITIAL_TRIGGER_DWELL)
.addGeofences(geofences)
.build()
.setInitialTrigger(GeofencingRequest.INITIAL_TRIGGER_DWELL)
.addGeofences(geofences)
.build()
}
getActiveGeofences({ active ->
@ -135,26 +140,41 @@ class HMG_Geofence {
if (checkPermission() && geofences.isNotEmpty()) {
geofencingClient
.addGeofences(buildGeofencingRequest(geofences), geofencePendingIntent)
.addOnSuccessListener {
Logs.RegisterGeofence.save(context,"SUCCESS", "Successfuly registered the geofences", Logs.STATUS.SUCCESS)
saveActiveGeofence(geofences.map { it.requestId }, listOf())
completion?.let { it(true,null) }
}
.addOnFailureListener { exc ->
Logs.RegisterGeofence.save(context,"FAILED_TO_REGISTER", "Failed to register geofence",Logs.STATUS.ERROR)
completion?.let { it(false,exc) }
}
.addGeofences(buildGeofencingRequest(geofences), geofencePendingIntent)
.addOnSuccessListener {
Logs.RegisterGeofence.save(
context,
"SUCCESS",
"Successfuly registered the geofences",
Logs.STATUS.SUCCESS
)
saveActiveGeofence(geofences.map { it.requestId }, listOf())
completion?.let { it(true, null) }
}
.addOnFailureListener { exc ->
Logs.RegisterGeofence.save(
context,
"FAILED_TO_REGISTER",
"Failed to register geofence",
Logs.STATUS.ERROR
)
completion?.let { it(false, exc) }
}
// Schedule the job to register after specified duration (due to: events not calling after long period.. days or days [Needs to register fences again])
HMGUtils.scheduleJob(context, ReregisterGeofenceJobService::class.java,ReregisterGeofenceJobService.JobID, ReregisterGeofenceJobService.TriggerIntervalDuration)
HMGUtils.scheduleJob(
context,
ReregisterGeofenceJobService::class.java,
ReregisterGeofenceJobService.JobID,
ReregisterGeofenceJobService.TriggerIntervalDuration
)
}
}, null)
}
fun getGeoZonesFromPreference(context: Context):List<GeoZoneModel>{
fun getGeoZonesFromPreference(context: Context): List<GeoZoneModel> {
val pref = context.getSharedPreferences(PREFS_STORAGE, Context.MODE_PRIVATE)
val json = pref.getString(PREF_KEY_HMG_ZONES, "[]")
@ -162,26 +182,29 @@ class HMG_Geofence {
return geoZones
}
fun saveActiveGeofence(success: List<String>, failed: List<String>){
fun saveActiveGeofence(success: List<String>, failed: List<String>) {
val jsonSuccess = gson.toJson(success)
val jsonFailure = gson.toJson(failed)
preferences.edit().putString(PREF_KEY_SUCCESS, jsonSuccess).apply()
preferences.edit().putString(PREF_KEY_FAILED, jsonFailure).apply()
}
fun removeActiveGeofences(){
fun removeActiveGeofences() {
preferences.edit().putString(PREF_KEY_SUCCESS, "[]").apply()
preferences.edit().putString(PREF_KEY_FAILED, "[]").apply()
}
fun getActiveGeofences(success: (success: List<String>) -> Unit, failure: ((failed: List<String>) -> Unit)?){
val type = object : TypeToken<List<String?>?>() {}.type
fun getActiveGeofences(
success: (success: List<String>) -> Unit,
failure: ((failed: List<String>) -> Unit)?
) {
val type = object : TypeToken<List<String?>?>() {}.type
val jsonSuccess = preferences.getString(PREF_KEY_SUCCESS, "[]")
val success = gson.fromJson<List<String>>(jsonSuccess, type)
success(success)
if(failure != null){
if (failure != null) {
val jsonFailure = preferences.getString(PREF_KEY_FAILED, "[]")
val failed = gson.fromJson<List<String>>(jsonFailure, type)
failure(failed)
@ -189,47 +212,74 @@ class HMG_Geofence {
}
private fun checkPermission() : Boolean{
return ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
private fun checkPermission(): Boolean {
return ContextCompat.checkSelfPermission(
context,
Manifest.permission.ACCESS_FINE_LOCATION
) == PackageManager.PERMISSION_GRANTED
}
fun getPatientID():Int?{
fun getPatientID(): Int? {
var profileJson = preferences.getString("flutter.imei-user-data", null)
if (profileJson == null)
profileJson = preferences.getString("flutter.user-profile", null)
val type = object : TypeToken<Map<String?, Any?>?>() {}.type
return gson.fromJson<Map<String?, Any?>?>(profileJson, type)
?.get("PatientID")
.toString()
.toDoubleOrNull()
?.toInt()
?.get("PatientID")
.toString()
.toDoubleOrNull()
?.toInt()
}
fun handleEvent(triggerGeofences: List<Geofence>, location: Location, transition: GeofenceTransition) {
fun handleEvent(
triggerGeofences: List<Geofence>,
location: Location,
transition: GeofenceTransition
) {
getPatientID()?.let { patientId ->
getActiveGeofences({ activeGeofences ->
triggerGeofences.forEach { geofence ->
// Extract PointID from 'geofence.requestId' and find from active geofences
val pointID = activeGeofences.firstOrNull { it == geofence.requestId }?.split('_')?.first()
val pointID =
activeGeofences.firstOrNull { it == geofence.requestId }?.split('_')
?.first()
if (!pointID.isNullOrEmpty() && pointID.toIntOrNull() != null) {
val body = mutableMapOf<String, Any?>(
"PointsID" to pointID.toIntOrNull(),
"GeoType" to transition.value,
"PatientID" to patientId
"PointsID" to pointID.toIntOrNull(),
"GeoType" to transition.value,
"PatientID" to patientId
)
body.putAll(HMGUtils.defaultHTTPParams(context))
httpPost<Map<String, Any>>(API.LOG_GEOFENCE, body, { response ->
saveLog(context, "HMG_GEOFENCE_NOTIFY", "Success: Notified to server\uD83D\uDE0E.")
sendNotification(context, transition.named(), geofence.requestId, "Notified to server.😎")
saveLog(
context,
"HMG_GEOFENCE_NOTIFY",
"Success: Notified to server\uD83D\uDE0E."
)
sendNotification(
context,
transition.named(),
geofence.requestId,
"Notified to server.😎"
)
}, { exception ->
val errorMessage = "${transition.named()}, ${geofence.requestId}"
saveLog(context, "HMG_GEOFENCE_NOTIFY", "failed: $errorMessage | error: ${exception.localizedMessage}")
sendNotification(context, transition.named(), geofence.requestId, "Failed to notify server😔 -> ${exception.localizedMessage}")
saveLog(
context,
"HMG_GEOFENCE_NOTIFY",
"failed: $errorMessage | error: ${exception.localizedMessage}"
)
sendNotification(
context,
transition.named(),
geofence.requestId,
"Failed to notify server😔 -> ${exception.localizedMessage}"
)
})
}

@ -1,49 +1,71 @@
package com.ejada.hmg.geofence.intent_receivers
package com.cloud.diplomaticquarterapp.geofence.intent_receivers
import android.annotation.SuppressLint
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.util.Log
import com.cloud.diplomaticquarterapp.geofence.GeofenceTransition
import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
import com.cloud.diplomaticquarterapp.utils.Logs
import com.ejada.hmg.geofence.GeofenceTransition
import com.ejada.hmg.geofence.HMG_Geofence
import com.ejada.hmg.utils.Logs
import com.google.android.gms.location.GeofenceStatusCodes
import com.google.android.gms.location.GeofencingEvent
class GeofenceBroadcastReceiver : BroadcastReceiver() {
private val LOG_TAG = "GeofenceBroadcastReceiver"
override fun onReceive(context: Context, intent: Intent) {
val geofencingEvent = GeofencingEvent.fromIntent(intent)
if (geofencingEvent.hasError()) {
val errorMessage = GeofenceErrorMessages.getErrorString(context, geofencingEvent.errorCode)
Log.e(LOG_TAG, errorMessage)
Logs.GeofenceEvent.save(context,LOG_TAG,"Error while triggering geofence event",Logs.STATUS.ERROR)
doReRegisterIfRequired(context,geofencingEvent.errorCode)
return
}
private val LOG_TAG = "GeofenceBroadcastReceiver"
@SuppressLint("LongLogTag")
override fun onReceive(context: Context, intent: Intent) {
val geofencingEvent = GeofencingEvent.fromIntent(intent)
if (geofencingEvent != null) {
if (geofencingEvent.hasError()) {
val errorMessage =
GeofenceErrorMessages.getErrorString(context, geofencingEvent.errorCode)
Log.e(LOG_TAG, errorMessage)
Logs.GeofenceEvent.save(context,LOG_TAG,"Geofence event triggered: ${GeofenceTransition.fromInt(geofencingEvent.geofenceTransition).value} for ${geofencingEvent.triggeringGeofences.map {it.requestId}}",Logs.STATUS.SUCCESS)
HMG_Geofence.shared(context).handleEvent(geofencingEvent.triggeringGeofences,geofencingEvent.triggeringLocation, GeofenceTransition.fromInt(geofencingEvent.geofenceTransition));
}
Logs.GeofenceEvent.save(
context,
LOG_TAG,
"Error while triggering geofence event",
Logs.STATUS.ERROR
)
doReRegisterIfRequired(context, geofencingEvent.errorCode)
fun doReRegisterIfRequired(context: Context, errorCode: Int){
val errorRequiredReregister = listOf(
return
}
}
if (geofencingEvent != null) {
Logs.GeofenceEvent.save(
context,
LOG_TAG,
"Geofence event triggered: ${GeofenceTransition.fromInt(geofencingEvent.geofenceTransition).value} for ${geofencingEvent.triggeringGeofences?.map { it.requestId }}",
Logs.STATUS.SUCCESS
)
geofencingEvent.triggeringLocation?.let {
geofencingEvent.triggeringGeofences?.let { it1 ->
HMG_Geofence.shared(context).handleEvent(
it1,
it, GeofenceTransition.fromInt(geofencingEvent.geofenceTransition)
)
}
}
};
}
fun doReRegisterIfRequired(context: Context, errorCode: Int) {
val errorRequiredReregister = listOf(
GeofenceStatusCodes.GEOFENCE_NOT_AVAILABLE,
GeofenceStatusCodes.GEOFENCE_TOO_MANY_GEOFENCES,
GeofenceStatusCodes.GEOFENCE_TOO_MANY_PENDING_INTENTS,
GeofenceStatusCodes.GEOFENCE_REQUEST_TOO_FREQUENT
)
)
if(errorRequiredReregister.contains(errorCode))
HMG_Geofence.shared(context).register(){ status, error ->
if (errorRequiredReregister.contains(errorCode))
HMG_Geofence.shared(context).register() { status, error ->
}
}
}
}
}

@ -1,11 +1,11 @@
package com.cloud.diplomaticquarterapp.geofence.intent_receivers
package com.ejada.hmg.geofence.intent_receivers
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
import com.ejada.hmg.geofence.HMG_Geofence
import com.google.android.gms.location.GeofenceStatusCodes
class GeofenceBroadcastReceiverWithJobService : BroadcastReceiver() {

@ -1,10 +1,10 @@
package com.cloud.diplomaticquarterapp.geofence.intent_receivers
package com.ejada.hmg.geofence.intent_receivers
import android.content.Context
import com.cloud.diplomaticquarterapp.R
import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
import com.ejada.hmg.R
import com.ejada.hmg.geofence.HMG_Geofence
import com.google.android.gms.common.api.ApiException
import com.google.android.gms.location.GeofenceStatusCodes

@ -29,15 +29,15 @@
*/
package com.cloud.diplomaticquarterapp.geofence.intent_receivers
package com.ejada.hmg.geofence.intent_receivers
import android.content.Context
import android.content.Intent
import android.util.Log
import androidx.core.app.JobIntentService
import com.cloud.diplomaticquarterapp.geofence.GeofenceTransition
import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
import com.cloud.diplomaticquarterapp.utils.saveLog
import com.ejada.hmg.geofence.GeofenceTransition
import com.ejada.hmg.geofence.HMG_Geofence
import com.ejada.hmg.utils.saveLog
import com.google.android.gms.location.GeofenceStatusCodes
import com.google.android.gms.location.GeofencingEvent
@ -59,18 +59,25 @@ class GeofenceTransitionsJobIntentService : JobIntentService() {
override fun onHandleWork(intent: Intent) {
val geofencingEvent = GeofencingEvent.fromIntent(intent)
if (geofencingEvent.hasError()) {
val errorMessage = GeofenceErrorMessages.getErrorString(context_!!, geofencingEvent.errorCode)
Log.e(LOG_TAG, errorMessage)
if (geofencingEvent != null) {
if (geofencingEvent.hasError()) {
val errorMessage = GeofenceErrorMessages.getErrorString(context_!!, geofencingEvent.errorCode)
Log.e(LOG_TAG, errorMessage)
saveLog(context_!!,LOG_TAG,errorMessage)
doReRegisterIfRequired(context_!!, geofencingEvent.errorCode)
saveLog(context_!!,LOG_TAG,errorMessage)
doReRegisterIfRequired(context_!!, geofencingEvent.errorCode)
return
}
return
}
}
HMG_Geofence.shared(context_!!).handleEvent(geofencingEvent.triggeringGeofences,geofencingEvent.triggeringLocation, GeofenceTransition.fromInt(geofencingEvent.geofenceTransition));
if (geofencingEvent != null) {
geofencingEvent.triggeringGeofences?.let { geofencingEvent.triggeringLocation?.let { it1 ->
HMG_Geofence.shared(context_!!).handleEvent(it,
it1, GeofenceTransition.fromInt(geofencingEvent.geofenceTransition))
} }
};
}

@ -1,12 +1,12 @@
package com.cloud.diplomaticquarterapp.geofence.intent_receivers
package com.ejada.hmg.geofence.intent_receivers
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
import com.cloud.diplomaticquarterapp.utils.PREFS_STORAGE
import com.ejada.hmg.geofence.HMG_Geofence
import com.ejada.hmg.utils.PREFS_STORAGE
class GeofencingRebootBroadcastReceiver : BroadcastReceiver(){
override fun onReceive(context: Context, intent: Intent) {

@ -1,14 +1,14 @@
package com.cloud.diplomaticquarterapp.geofence.intent_receivers
package com.ejada.hmg.geofence.intent_receivers
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.location.LocationManager
import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
import com.cloud.diplomaticquarterapp.utils.HMGUtils
import com.cloud.diplomaticquarterapp.utils.PREFS_STORAGE
import com.ejada.hmg.geofence.HMG_Geofence
import com.ejada.hmg.utils.HMGUtils
import com.ejada.hmg.utils.PREFS_STORAGE
class LocationProviderChangeReceiver : BroadcastReceiver() {
private val LOG_TAG = "LocationProviderChangeReceiver"

@ -1,9 +1,9 @@
package com.cloud.diplomaticquarterapp.geofence.intent_receivers
package com.ejada.hmg.geofence.intent_receivers
import android.app.job.JobParameters
import android.app.job.JobService
import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
import com.cloud.diplomaticquarterapp.utils.Logs
import com.ejada.hmg.geofence.HMG_Geofence
import com.ejada.hmg.utils.Logs
class ReregisterGeofenceJobService : JobService(){
companion object{

@ -1,26 +1,29 @@
package com.cloud.diplomaticquarterapp.hmgwifi
package com.ejada.hmg.hmgwifi
import android.annotation.SuppressLint
import android.content.Context
import android.net.ConnectivityManager
import android.net.wifi.WifiConfiguration
import android.net.wifi.WifiInfo
import android.net.wifi.WifiManager
import android.content.Intent
import android.net.*
import android.net.wifi.*
import android.os.Build
import android.os.PatternMatcher
import android.provider.Settings
import android.util.Log
import android.widget.Toast
import com.cloud.diplomaticquarterapp.MainActivity
import com.cloud.diplomaticquarterapp.utils.FlutterText
import com.cloud.diplomaticquarterapp.utils.HMGUtils
import androidx.annotation.RequiresApi
import com.ejada.hmg.MainActivity
import com.ejada.hmg.utils.HMGUtils
class HMG_Guest(context: MainActivity) {
private var wifiManager: WifiManager? = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager?
private var connectivityManager: ConnectivityManager? = context.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager?
private var context = context
class HMG_Guest(private var context: MainActivity, ssid: String) {
private val TAG = "HMG_Guest"
private val TEST = false
private var SSID = """"HMG-MobileApp""""
private var SSID = ssid
// private var SSID = "HMG-MOHEMM"
val wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager?
private lateinit var completionListener: ((status: Boolean, message: String) -> Unit)
@ -28,126 +31,189 @@ class HMG_Guest(context: MainActivity) {
completionListener(status, message)
}
fun enableWifi(){
if(Build.VERSION.SDK_INT < Build.VERSION_CODES.Q){
wifiManager?.setWifiEnabled(true)
HMGUtils.popFlutterText(context,"enablingWifi");
HMGUtils.timer(2000,false){
connectApiLessThen29()
}
}else {
val panelIntent = Intent(Settings.Panel.ACTION_WIFI)
context.startActivityForResult(panelIntent, 1)
}
}
/*
* Helpful:
* http://stackoverflow.com/questions/8818290/how-to-connect-to-a-specific-wifi-network-in-android-programmatically
*/
fun connectToHMGGuestNetwork(completion: (status: Boolean, message: String) -> Unit) {
completionListener = completion
wifiManager?.let { wm ->
completionListener = completion
if (!wm.isWifiEnabled){
wm.isWifiEnabled = true
HMGUtils.popFlutterText(context,"enablingWifi");
enableWifi()
}else{
connectWifi()
}
}
}
private fun errorConnecting(){
completionOnUiThread(false, "errorConnectingHmgNetwork")
}
fun connectWifi(){
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q){
connectApiGreaterThen28()
}else {
connectApiLessThen29()
}
}
// I }else{f CompileSDK is greater and equals to APILevel 29
@RequiresApi(Build.VERSION_CODES.Q)
private fun connectApiGreaterThen28(){
Log.e(TAG, "connection wifi with Android Q+")
val networkRequest: NetworkRequest = NetworkRequest.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
.removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) //removeCapability added for hotspots without internet
.setNetworkSpecifier(
WifiNetworkSpecifier.Builder()
.setSsid(SSID)
.build()
).build()
val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
val networkCallback = object : ConnectivityManager.NetworkCallback() {
override fun onAvailable(network: Network) {
super.onAvailable(network)
connectivityManager.bindProcessToNetwork(network)
HMGUtils.timer(2000,false){
connect()
completionListener(true, "Success")
}
}else{
connect()
Log.e(TAG, "onAvailable")
}
override fun onLosing(network: Network, maxMsToLive: Int) {
super.onLosing(network, maxMsToLive)
Log.e(TAG, "onLosing")
completionListener(false, "fail")
}
override fun onLost(network: Network) {
super.onLost(network)
Log.e(TAG, "onLosing")
Log.e(TAG, "losing active connection")
completionListener(false, "fail")
}
override fun onUnavailable() {
super.onUnavailable()
Log.e(TAG, "onUnavailable")
completionListener(false, "fail")
}
}
//timeout add because "No devices found" wasn't handled correct and doesn't throw Unavailable
connectivityManager.requestNetwork(networkRequest, networkCallback, 30000)
}
private fun connect(){
val security = "OPEN"
val networkPass = ""
Log.d(TAG, "Connecting to SSID \"$SSID\" with password \"$networkPass\" and with security \"$security\" ...")
// You need to create WifiConfiguration instance like this:
val conf = WifiConfiguration()
conf.SSID = SSID
conf.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE)
conf.networkId = ssidToNetworkId(SSID)
fun connectApiLessThen29(){
val wifi = WifiConfiguration()
wifi.SSID = """"$SSID""""
wifi.status = WifiConfiguration.Status.ENABLED
wifi.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE)
val wm = wifiManager!!
if (conf.networkId == -1) {
wm.addNetwork(conf)
wifi.networkId = ssidToNetworkId(wifi.SSID)
if (wifi.networkId == -1) {
wifiManager?.addNetwork(wifi)
} else {
Log.v(TAG, "WiFi found - updating it.\n")
wm.updateNetwork(conf)
wifiManager?.updateNetwork(wifi)
}
conf.networkId = ssidToNetworkId(SSID)
Log.d(TAG, "Network ID: ${conf.networkId}")
Log.v(TAG, "saving config.\n")
wifiManager?.saveConfiguration()
wifi.networkId = ssidToNetworkId(wifi.SSID)
val networkIdToConnect = conf.networkId
Log.v(TAG, "wifi ID in device = " + wifi.networkId)
var supState: SupplicantState
val networkIdToConnect = wifi.networkId
if (networkIdToConnect >= 0) {
Log.v(TAG, "Start connecting to $SSID Wifi...")
Log.v(TAG, "Start connecting...\n")
// We disable the network before connecting, because if this was the last connection before
// a disconnect(), this will not reconnect.
wm.disableNetwork(networkIdToConnect)
val result = wm.enableNetwork(networkIdToConnect, true)
if(result){
HMGUtils.timer(8000,false){
if(wm.getConnectionInfo().getSSID() == SSID){
completionOnUiThread(true, "successConnectingHmgNetwork")
}else{
errorConnecting()
}
}
}else{
errorConnecting()
}
wifiManager?.disableNetwork(networkIdToConnect)
wifiManager?.enableNetwork(networkIdToConnect, true)
val wifiInfo: WifiInfo = wifiManager!!.connectionInfo
HMGUtils.timer(5000,false){
supState = wifiInfo.supplicantState
Log.i(TAG, "Done connect to network : status = $supState")
val successStates = listOf(SupplicantState.COMPLETED, SupplicantState.ASSOCIATED)
if (successStates.contains(supState))
completionListener(true,"Connected to internet Wifi")
else
completionListener(false,"errorConnectingHmgNetwork")
}
}else{
Log.v(TAG, "Cannot connect to $SSID network")
errorConnecting()
} else {
Log.v(TAG, "WifiWizard: cannot connect to network")
completionListener(false,"errorConnectingHmgNetwork")
}
}
private fun errorConnecting(){
completionOnUiThread(false, "errorConnectingHmgNetwork")
}
// If CompileSDK is greater and equals to APILevel 29
private fun connectNewer(wm:WifiManager){
// Log.e(TAG, "connection wifi Q")
// val wifi = WifiConfiguration()
// wifi.SSID = SSID
// wifi.status = WifiConfiguration.Status.ENABLED
// wifi.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
//
// val wifiNetworkSpecifier: WifiNetworkSpecifier = WifiNetworkSpecifier.Builder()
// .setSsid(ssid)
// .setWpa2Passphrase(password)
// .build()
// wifi.networkId = ssidToNetworkId(SSID)
//
// val networkRequest: NetworkRequest = NetworkRequest.Builder()
// .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
// .setNetworkSpecifier(wifiNetworkSpecifier)
// .build()
// // Set network to highest priority (deprecated in API >= 26)
// if(Build.VERSION.SDK_INT < 26) {
// wifi.priority = getMaxWifiPriority(wifiManager!!) + 1;
// }
//
// var connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
// var networkCallback = object : ConnectivityManager.NetworkCallback() {
// override fun onAvailable(network: Network) {
// super.onAvailable(network)
// connectivityManager.bindProcessToNetwork(network)
// Log.e(TAG, "onAvailable")
// }
// // After processing authentication types, add or update network
// if(wifi.networkId == -1) { // -1 means SSID configuration does not exist yet
//
// override fun onLosing(network: Network, maxMsToLive: Int) {
// super.onLosing(network, maxMsToLive)
// Log.e(TAG, "onLosing")
// }
// val newNetId = wifiManager?.addNetwork(wifi)!!
// if( newNetId > -1 ){
// completionListener(true,"Success")
// } else {
// completionListener(false, "ERROR_ADDING_NETWORK" )
// }
//
// override fun onLost(network: Network) {
// super.onLost(network)
// Log.e(TAG, "onLosing")
// Log.e(TAG, "losing active connection")
// }
// } else {
//
// override fun onUnavailable() {
// super.onUnavailable()
// Log.e(TAG, "onUnavailable")
// }
// var updatedNetID = wifiManager?.updateNetwork(wifi)
//
// if(updatedNetID == -1)
// updatedNetID = wifiManager?.addNetwork(wifi)
//
// if(updatedNetID > -1) {
// callbackContext.success( updatedNetID )
// } else {
// callbackContext.error("ERROR_UPDATING_NETWORK")
// }
// connectivityManager.requestNetwork(networkRequest, networkCallback)
//
// }
//
// // WifiManager configurations are presistent for API 26+
// if(Build.VERSION.SDK_INT < 26) {
// wifiManager?.saveConfiguration(); // Call saveConfiguration for older < 26 API
// }
}
@ -156,6 +222,7 @@ class HMG_Guest(context: MainActivity) {
* networks, and returns the networkId for the network if the SSID matches. If not,
* it returns -1.
*/
@SuppressLint("MissingPermission")
private fun ssidToNetworkId(ssid: String): Int {
val currentNetworks = wifiManager!!.configuredNetworks
var networkId = -1
@ -169,4 +236,22 @@ class HMG_Guest(context: MainActivity) {
}
return networkId
}
}
companion object{
/**
* Figure out what the highest priority network in the network list is and return that priority
*/
@RequiresApi(Build.VERSION_CODES.S)
fun getMaxWifiPriority(wifiManager:WifiManager) : Int {
val configurations = wifiManager.callerConfiguredNetworks
var maxPriority = 0
configurations.forEach {
if (it.priority > maxPriority) {
maxPriority = it.priority;
}
}
return maxPriority;
}
}
}

@ -1,9 +1,8 @@
package com.cloud.diplomaticquarterapp.hmgwifi
package com.ejada.hmg.hmgwifi
import android.annotation.SuppressLint
import com.cloud.diplomaticquarterapp.utils.API
import com.cloud.diplomaticquarterapp.MainActivity
import com.cloud.diplomaticquarterapp.utils.FlutterText
import com.ejada.hmg.utils.API
import com.ejada.hmg.MainActivity
import com.github.kittinunf.fuel.core.extensions.jsonBody
import com.github.kittinunf.fuel.httpGet
import com.github.kittinunf.fuel.httpPost
@ -14,21 +13,18 @@ import java.util.*
@SuppressLint("MissingPermission")
class HMG_Internet(flutterMainActivity: MainActivity) {
private val TAG = "HMG_Wifi"
private val TEST = false
private val TEST = true
private var context = flutterMainActivity;
private lateinit var completionListener: ((status: Boolean, message: String) -> Unit)
private var SSID = "GUEST-POC"
private var USER_NAME = ""
private var PASSWORD = ""
fun completionOnUiThread(status: Boolean, message: String){
completionListener(status, message)
// context.runOnUiThread {
//
// FlutterText.with(message){localized ->
// .with(message){localized ->
// completionListener(status, localized)
// }
// }
@ -38,12 +34,10 @@ class HMG_Internet(flutterMainActivity: MainActivity) {
* Helpful:
* http://stackoverflow.com/questions/8818290/how-to-connect-to-a-specific-wifi-network-in-android-programmatically
*/
fun connectToHMGGuestNetwork(patientId: String, completion: (status: Boolean, message: String) -> Unit): HMG_Internet {
fun connectToHMGGuestNetwork(username: String, password: String, completion: (status: Boolean, message: String) -> Unit): HMG_Internet {
completionListener = completion
getWifiCredentials(patientId) {
WPA(context,SSID).connect(USER_NAME,PASSWORD) { status, message ->
completionOnUiThread(status,message)
}
WpaEnterprise(context,SSID).connect(username,username) { status, message ->
completionOnUiThread(status,message)
}
return this
}
@ -66,16 +60,28 @@ class HMG_Internet(flutterMainActivity: MainActivity) {
}
}
private fun getWifiCredentials(patientId:String, success: (() -> Unit)){
private fun getWifiCredentials(patientId:String, success: ((String?,String?) -> Unit)){
if (TEST){
SSID = "GUEST-POC"
USER_NAME = "0696"
PASSWORD = "0000"
success()
success("2300", "0000")
return
}
val jsonBody = """{"PatientID":$patientId}"""
val jsonBody = """{
"PatientID":$patientId
"VersionID": 8.8,
"Channel": 3,
"LanguageID": 2,
"IPAdress": "10.20.10.20",
"generalid": "Cs2020@2016$2958",
"PatientOutSA": 0,
"SessionID": "@admin",
"isDentalAllowedBackend": false,
"DeviceTypeID": 2,
"TokenID": "@admin",
"PatientTypeID": 1,
"PatientType": 1
}""".trimMargin()
API.WIFI_CREDENTIALS.
httpPost()
.jsonBody(jsonBody, Charsets.UTF_8)
@ -92,9 +98,13 @@ class HMG_Internet(flutterMainActivity: MainActivity) {
jsonObject.getJSONArray("Hmg_SMS_Get_By_ProjectID_And_PatientIDList").let { array ->
array.getJSONObject(0).let { object_ ->
if (object_.has("UserName") && object_.has("UserName")){
USER_NAME = object_.getString("UserName")
PASSWORD = object_.getString("Password")
success()
try {
val userName = object_.getString("UserName")
val password = object_.getString("Password")
success(userName, password)
}catch (e:Exception){
success(null, null)
}
}else{
completionOnUiThread(false, "somethingWentWrong")
}

@ -1,4 +1,4 @@
package com.cloud.diplomaticquarterapp.hmgwifi
package com.ejada.hmg.hmgwifi
import android.annotation.SuppressLint
import android.content.Context
@ -7,8 +7,8 @@ import android.net.wifi.*
import android.net.wifi.SupplicantState.ASSOCIATED
import android.net.wifi.SupplicantState.COMPLETED
import android.util.Log
import com.cloud.diplomaticquarterapp.MainActivity
import com.cloud.diplomaticquarterapp.utils.HMGUtils
import com.ejada.hmg.MainActivity
import com.ejada.hmg.utils.HMGUtils
class WPA(mainActivity: MainActivity, SSID:String) {
private var TAG = "WPA"

@ -0,0 +1,166 @@
package com.ejada.hmg.hmgwifi
import android.annotation.SuppressLint
import android.content.Context
import android.net.ConnectivityManager
import android.net.Network
import android.net.NetworkCapabilities
import android.net.NetworkRequest
import android.net.wifi.*
import android.net.wifi.SupplicantState.ASSOCIATED
import android.net.wifi.SupplicantState.COMPLETED
import android.os.Build
import android.util.Log
import androidx.annotation.RequiresApi
import com.ejada.hmg.MainActivity
import com.ejada.hmg.utils.HMGUtils
import java.security.cert.X509Certificate
class WpaEnterprise(private val mainActivity: MainActivity, private var SSID: String) {
private var TAG = "WpaEnterprise"
private lateinit var identity:String
private lateinit var password:String
private lateinit var completion:((status: Boolean, message: String) -> Unit)
fun connect(identity:String, password:String, completion: (status: Boolean, message: String) -> Unit) {
this.password = password
this.identity = identity
this.completion = completion
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q){
apiGreaterThen28()
}else if(Build.VERSION.SDK_INT < Build.VERSION_CODES.Q){
apiLessThen29()
}
}
@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
fun apiLessThen29(){
val wifiManager = mainActivity.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
val wifi = WifiConfiguration()
wifi.SSID = """"$SSID""""
wifi.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_EAP)
wifi.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.IEEE8021X)
wifi.enterpriseConfig = enterpriseConfig()
wifi.networkId = ssidToNetworkId(wifi.SSID, wifiManager)
if (wifi.networkId == -1) {
wifiManager.addNetwork(wifi)
} else {
Log.v(TAG, "WiFi found - updating it.\n")
wifiManager.updateNetwork(wifi)
}
Log.v(TAG, "saving config.\n")
wifiManager.saveConfiguration()
wifi.networkId = ssidToNetworkId(wifi.SSID, wifiManager)
Log.v(TAG, "wifi ID in device = " + wifi.networkId)
var supState: SupplicantState
val networkIdToConnect = wifi.networkId
if (networkIdToConnect >= 0) {
Log.v(TAG, "Start connecting...\n")
// We disable the network before connecting, because if this was the last connection before
// a disconnect(), this will not reconnect.
wifiManager.disableNetwork(networkIdToConnect)
wifiManager.enableNetwork(networkIdToConnect, true)
val wifiInfo: WifiInfo = wifiManager.connectionInfo
HMGUtils.timer(5000,false){
supState = wifiInfo.supplicantState
Log.i(TAG, "Done connect to network : status = $supState")
val successStates = listOf(COMPLETED, ASSOCIATED)
if (successStates.contains(supState))
completion(true,"Connected to internet Wifi")
else
completion(false,"errorConnectingHmgNetwork")
}
} else {
Log.v(TAG, "WifiWizard: cannot connect to network")
completion(false,"errorConnectingHmgNetwork")
}
}
/**
* This method takes a given String, searches the current list of configured WiFi
* networks, and returns the networkId for the network if the SSID matches. If not,
* it returns -1.
*/
@SuppressLint("MissingPermission")
private fun ssidToNetworkId(ssid: String, wifiManager: WifiManager): Int {
val currentNetworks = wifiManager.configuredNetworks
var networkId = -1
// For each network in the list, compare the SSID with the given one
for (test in currentNetworks) {
if (test.SSID == ssid) {
networkId = test.networkId
break
}
}
return networkId
}
@RequiresApi(Build.VERSION_CODES.Q)
fun apiGreaterThen28(){
val connectivityManager = mainActivity.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
Log.e(TAG, "connection wifi with Android Q+")
val wifiNetworkSpecifier: WifiNetworkSpecifier = WifiNetworkSpecifier.Builder()
.setSsid(SSID)
.setWpa2EnterpriseConfig(enterpriseConfig())
.build()
val networkRequest: NetworkRequest = NetworkRequest.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
.setNetworkSpecifier(wifiNetworkSpecifier)
.removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) //removeCapability added for hotspots without internet
.build()
val networkCallback = object : ConnectivityManager.NetworkCallback() {
override fun onAvailable(network: Network) {
super.onAvailable(network)
connectivityManager.bindProcessToNetwork(network)
completion(true, "200")
Log.e(TAG, "onAvailable")
}
override fun onLosing(network: Network, maxMsToLive: Int) {
super.onLosing(network, maxMsToLive)
Log.e(TAG, "onLosing")
}
override fun onLost(network: Network) {
super.onLost(network)
Log.e(TAG, "onLosing")
Log.e(TAG, "losing active connection")
}
override fun onUnavailable() {
super.onUnavailable()
completion(false, "401")
Log.e(TAG, "onUnavailable")
}
}
//timeout add because "No devices found" wasn't handled correct and doesn't throw Unavailable
connectivityManager.requestNetwork(networkRequest, networkCallback, 30000)
}
fun enterpriseConfig() : WifiEnterpriseConfig{
// Initialize the WifiConfiguration object
val enterpriseConfig = WifiEnterpriseConfig()
enterpriseConfig.eapMethod = WifiEnterpriseConfig.Eap.PEAP
enterpriseConfig.identity = identity
enterpriseConfig.password = password
enterpriseConfig.phase2Method = WifiEnterpriseConfig.Phase2.NONE
// enterpriseConfig.caCertificates = WifiEnterpriseConfig.Phase2.
return enterpriseConfig;
}
}

@ -0,0 +1,58 @@
package com.ejada.hmg.opentok
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.View
import android.widget.FrameLayout
import android.widget.LinearLayout
import com.ejada.hmg.R
import io.flutter.plugin.common.StandardMessageCodec
import io.flutter.plugin.platform.PlatformView
import io.flutter.plugin.platform.PlatformViewFactory
class LocalVideoFactory : PlatformViewFactory(StandardMessageCodec.INSTANCE) {
companion object {
private lateinit var view: LocalVideoPlatformView
fun getViewInstance(context: Context): LocalVideoPlatformView {
if(!this::view.isInitialized) {
view = LocalVideoPlatformView(context)
}
return view
}
}
override fun create(context: Context, viewId: Int, args: Any?): PlatformView {
return getViewInstance(context)
}
}
class LocalVideoPlatformView(context: Context) : PlatformView {
private val videoContainer: LocalVideoContainer = LocalVideoContainer(context)
val container get() = videoContainer.publisherContainer
override fun getView(): View {
return videoContainer
}
override fun dispose() {}
}
class LocalVideoContainer @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyle: Int = 0,
defStyleRes: Int = 0
) : LinearLayout(context, attrs, defStyle, defStyleRes) {
var publisherContainer: FrameLayout private set
init {
val view = LayoutInflater.from(context).inflate(R.layout.local_video, this, true)
publisherContainer = view.findViewById(R.id.publisher_container)
}
}

@ -0,0 +1,181 @@
package com.ejada.hmg.opentok
import android.content.Context
import android.os.Handler
import android.os.Looper
import android.util.Log
import android.view.ViewGroup
import com.facebook.stetho.urlconnection.StethoURLConnectionManager
import com.opentok.android.*
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.embedding.engine.plugins.util.GeneratedPluginRegister
import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel
enum class OpenTokSDKState {
LOGGED_OUT,
LOGGED_IN,
WAIT,
ERROR
}
class OpenTok(private var context: Context, private var flutterEngine: FlutterEngine){
private lateinit var remoteVideoPlatformView: RemoteVideoPlatformView
private lateinit var localVideoPlatformView: LocalVideoPlatformView
init {
remoteVideoPlatformView = RemoteVideoFactory.getViewInstance(context)
flutterEngine
.platformViewsController
.registry
.registerViewFactory("remote-video-container", RemoteVideoFactory())
localVideoPlatformView = LocalVideoFactory.getViewInstance(context)
flutterEngine
.platformViewsController
.registry
.registerViewFactory("local-video-container", LocalVideoFactory())
}
private var session: Session? = null
private var publisher: Publisher? = null
private var subscriber: Subscriber? = null
private val sessionListener: Session.SessionListener = object: Session.SessionListener {
override fun onConnected(session: Session) {
// Connected to session
Log.d("MainActivity", "Connected to session ${session.sessionId}")
publisher = Publisher.Builder(context).build().apply {
setPublisherListener(publisherListener)
renderer?.setStyle(BaseVideoRenderer.STYLE_VIDEO_SCALE, BaseVideoRenderer.STYLE_VIDEO_FILL)
view.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
localVideoPlatformView.container.addView(view)
}
notifyFlutter(OpenTokSDKState.LOGGED_IN)
session.publish(publisher)
}
override fun onDisconnected(session: Session) {
notifyFlutter(OpenTokSDKState.LOGGED_OUT)
}
override fun onStreamReceived(session: Session, stream: Stream) {
Log.d(
"MainActivity",
"onStreamReceived: New Stream Received " + stream.streamId + " in session: " + session.sessionId
)
if (subscriber == null) {
subscriber = Subscriber.Builder(context, stream).build().apply {
renderer?.setStyle(BaseVideoRenderer.STYLE_VIDEO_SCALE, BaseVideoRenderer.STYLE_VIDEO_FILL)
setSubscriberListener(subscriberListener)
session.subscribe(this)
remoteVideoPlatformView.container.addView(view)
}
}
}
override fun onStreamDropped(session: Session, stream: Stream) {
Log.d(
"MainActivity",
"onStreamDropped: Stream Dropped: " + stream.streamId + " in session: " + session.sessionId
)
if (subscriber != null) {
subscriber = null
remoteVideoPlatformView.container.removeAllViews()
}
}
override fun onError(session: Session, opentokError: OpentokError) {
Log.d("MainActivity", "Session error: " + opentokError.message)
notifyFlutter(OpenTokSDKState.ERROR)
}
}
private val publisherListener: PublisherKit.PublisherListener = object : PublisherKit.PublisherListener {
override fun onStreamCreated(publisherKit: PublisherKit, stream: Stream) {
Log.d("MainActivity", "onStreamCreated: Publisher Stream Created. Own stream " + stream.streamId)
}
override fun onStreamDestroyed(publisherKit: PublisherKit, stream: Stream) {
Log.d("MainActivity", "onStreamDestroyed: Publisher Stream Destroyed. Own stream " + stream.streamId)
}
override fun onError(publisherKit: PublisherKit, opentokError: OpentokError) {
Log.d("MainActivity", "PublisherKit onError: " + opentokError.message)
notifyFlutter(OpenTokSDKState.ERROR)
}
}
var subscriberListener: SubscriberKit.SubscriberListener = object : SubscriberKit.SubscriberListener {
override fun onConnected(subscriberKit: SubscriberKit) {
Log.d("MainActivity", "onConnected: Subscriber connected. Stream: " + subscriberKit.stream.streamId)
}
override fun onDisconnected(subscriberKit: SubscriberKit) {
Log.d("MainActivity", "onDisconnected: Subscriber disconnected. Stream: " + subscriberKit.stream.streamId)
notifyFlutter(OpenTokSDKState.LOGGED_OUT)
}
override fun onError(subscriberKit: SubscriberKit, opentokError: OpentokError) {
Log.d("MainActivity", "SubscriberKit onError: " + opentokError.message)
notifyFlutter(OpenTokSDKState.ERROR)
}
}
fun initSession(call: MethodCall, result: MethodChannel.Result) {
val apiKey = requireNotNull(call.argument<String>("apiKey"))
val sessionId = requireNotNull(call.argument<String>("sessionId"))
val token = requireNotNull(call.argument<String>("token"))
notifyFlutter(OpenTokSDKState.WAIT)
session = Session.Builder(context, apiKey, sessionId).build()
session?.setSessionListener(sessionListener)
session?.connect(token)
result.success("")
}
fun swapCamera(call: MethodCall, result: MethodChannel.Result) {
publisher?.cycleCamera()
result.success(true)
}
fun toggleAudio(call: MethodCall, result: MethodChannel.Result) {
if (publisher != null) {
publisher?.publishAudio = !(publisher!!.publishAudio)
result.success(true)
}else{
result.success(false)
}
}
fun toggleVideo(call: MethodCall, result: MethodChannel.Result) {
if (publisher != null) {
publisher?.publishVideo = !(publisher!!.publishVideo)
result.success(true)
}else{
result.success(false)
}
}
fun hangupCall(call: MethodCall, result: MethodChannel.Result) {
session?.disconnect()
result.success(true)
}
private fun notifyFlutter(state: OpenTokSDKState) {
Handler(Looper.getMainLooper()).post {
MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "OpenTok-Platform-Bridge")
.invokeMethod("updateState", state.toString())
}
}
}

@ -0,0 +1,58 @@
package com.ejada.hmg.opentok
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.View
import android.widget.FrameLayout
import android.widget.LinearLayout
import com.ejada.hmg.R
import io.flutter.plugin.common.StandardMessageCodec
import io.flutter.plugin.platform.PlatformView
import io.flutter.plugin.platform.PlatformViewFactory
class RemoteVideoFactory : PlatformViewFactory(StandardMessageCodec.INSTANCE) {
companion object {
private lateinit var view: RemoteVideoPlatformView
fun getViewInstance(context: Context): RemoteVideoPlatformView {
if(!this::view.isInitialized) {
view = RemoteVideoPlatformView(context)
}
return view
}
}
override fun create(context: Context, viewId: Int, args: Any?): PlatformView {
return getViewInstance(context)
}
}
class RemoteVideoPlatformView(context: Context) : PlatformView {
private val videoContainer: RemoteVideoContainer = RemoteVideoContainer(context)
val container get() = videoContainer.subscriberContainer
override fun getView(): View {
return videoContainer
}
override fun dispose() {}
}
class RemoteVideoContainer @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyle: Int = 0,
defStyleRes: Int = 0
) : LinearLayout(context, attrs, defStyle, defStyleRes) {
var subscriberContainer: FrameLayout private set
init {
val view = LayoutInflater.from(context).inflate(R.layout.remote_video, this, true)
subscriberContainer = view.findViewById(R.id.subscriber_container)
}
}

@ -1,4 +1,4 @@
package com.cloud.diplomaticquarterapp.utils
package com.ejada.hmg.utils
class API {
companion object{

@ -1,4 +1,4 @@
package com.cloud.diplomaticquarterapp.utils
package com.ejada.hmg.utils
const val PREFS_STORAGE = "FlutterSharedPreferences"

@ -1,4 +1,4 @@
package com.cloud.diplomaticquarterapp.utils
package com.ejada.hmg.utils
import io.flutter.plugin.common.MethodChannel
import io.flutter.plugin.common.MethodChannel.Result
@ -17,7 +17,7 @@ class FlutterText{
}
}
override fun error(errorCode: String?, errorMessage: String?, errorDetails: Any?) {
override fun error(errorCode: String, errorMessage: String?, errorDetails: Any?) {
completion(key)
require(false){
"'localizedValue' $errorMessage"

@ -1,4 +1,4 @@
package com.cloud.diplomaticquarterapp.utils
package com.ejada.hmg.utils
import android.app.NotificationChannel
import android.app.NotificationManager
@ -13,16 +13,15 @@ import android.widget.Toast
import androidx.annotation.Nullable
import androidx.core.app.NotificationCompat
import androidx.core.app.TaskStackBuilder
import com.cloud.diplomaticquarterapp.BuildConfig
import com.cloud.diplomaticquarterapp.MainActivity
import com.cloud.diplomaticquarterapp.R
import com.cloud.diplomaticquarterapp.geofence.GeoZoneModel
import com.ejada.hmg.BuildConfig
import com.ejada.hmg.MainActivity
import com.ejada.hmg.R
import com.ejada.hmg.geofence.GeoZoneModel
import com.github.kittinunf.fuel.core.extensions.jsonBody
import com.github.kittinunf.fuel.httpPost
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import io.flutter.plugin.common.MethodChannel
import org.jetbrains.anko.doAsyncResult
import org.json.JSONArray
import org.json.JSONException
import org.json.JSONObject
@ -208,7 +207,6 @@ fun <T>httpPost(url: String, body: Map<String, Any?>, onSuccess: (response: HTTP
.header("Content-Type", "application/json")
.header("Allow", "*/*")
.response { request, response, result ->
result.doAsyncResult { }
result.fold({ data ->
val dataString = String(data)
if (isJSONValid(dataString)) {

@ -1,4 +1,4 @@
//package com.cloud.diplomaticquarterapp.utils
//package com.ejada.hmg.utils
//
//import android.annotation.SuppressLint
//import android.content.Context
@ -10,8 +10,8 @@
//import android.net.wifi.WifiConfiguration
//import android.net.wifi.WifiManager
//import android.util.Log
//import com.cloud.diplomaticquarterapp.utils.API
//import com.cloud.diplomaticquarterapp.FlutterMainActivity
//import com.ejada.hmg.utils.API
//import com.ejada.hmg.FlutterMainActivity
//import com.github.kittinunf.fuel.core.extensions.jsonBody
//import com.github.kittinunf.fuel.httpGet
//import com.github.kittinunf.fuel.httpPost

@ -1,9 +1,9 @@
package com.cloud.diplomaticquarterapp.utils
package com.ejada.hmg.utils
import android.content.Context
import android.content.SharedPreferences
import android.os.Build
import com.cloud.diplomaticquarterapp.BuildConfig
import com.ejada.hmg.BuildConfig
import com.google.gson.Gson
class Logs {

@ -0,0 +1,45 @@
package com.ejada.hmg.utils
import com.ejada.hmg.MainActivity
import com.ejada.hmg.opentok.OpenTok
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel
class OpenTokPlatformBridge(private var flutterEngine: FlutterEngine, private var mainActivity: MainActivity) {
private lateinit var channel: MethodChannel
private lateinit var openTok: OpenTok
companion object {
private const val CHANNEL = "OpenTok-Platform-Bridge"
}
fun create(){
openTok = OpenTok(mainActivity, flutterEngine)
channel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL)
channel.setMethodCallHandler { call: MethodCall, result: MethodChannel.Result ->
when (call.method) {
"initSession" -> {
openTok.initSession(call, result)
}
"swapCamera" -> {
openTok.swapCamera(call, result)
}
"toggleAudio" -> {
openTok.toggleAudio(call, result)
}
"toggleVideo" -> {
openTok.toggleVideo(call, result)
}
"hangupCall" -> {
openTok.hangupCall(call, result)
}
else -> {
result.notImplemented()
}
}
}
}
}

@ -1,20 +1,26 @@
package com.cloud.diplomaticquarterapp.utils
package com.ejada.hmg.utils
import android.content.Context
import android.content.Intent
import android.content.Intent.getIntent
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.provider.Settings
import android.widget.Toast
import androidx.core.app.ActivityCompat.startActivityForResult
import android.net.wifi.WifiManager
import android.util.Log
import com.cloud.diplomaticquarterapp.MainActivity
import com.cloud.diplomaticquarterapp.hmgwifi.HMG_Guest
import com.cloud.diplomaticquarterapp.hmgwifi.HMG_Internet
import com.cloud.diplomaticquarterapp.geofence.GeoZoneModel
import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
import io.flutter.plugin.common.BinaryMessenger
import com.ejada.hmg.MainActivity
import com.ejada.hmg.hmgwifi.HMG_Guest
import com.ejada.hmg.geofence.GeoZoneModel
import com.ejada.hmg.geofence.HMG_Geofence
import com.ejada.hmg.hmgwifi.WpaEnterprise
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel
class PlatformBridge(binaryMessenger: BinaryMessenger, flutterMainActivity: MainActivity) {
private var binaryMessenger = binaryMessenger
private var mainActivity = flutterMainActivity
class PlatformBridge(private var flutterEngine: FlutterEngine, private var mainActivity: MainActivity) {
private lateinit var channel: MethodChannel
@ -25,103 +31,169 @@ class PlatformBridge(binaryMessenger: BinaryMessenger, flutterMainActivity: Main
private const val ENABLE_WIFI_IF_NOT = "enableWifiIfNot"
private const val REGISTER_HMG_GEOFENCES = "registerHmgGeofences"
private const val UN_REGISTER_HMG_GEOFENCES = "unRegisterHmgGeofences"
private const val IS_DRAW_OVER_APPS_PERMISSION_ALLOWED = "isDrawOverAppsPermissionAllowed"
private const val ASK_DRAW_OVER_APPS_PERMISSION = "askDrawOverAppsPermission"
private const val GET_INTENT = "getIntent"
}
fun create(){
channel = MethodChannel(binaryMessenger, CHANNEL)
fun create() {
channel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL)
HMGUtils.setPlatformChannel(channel)
channel.setMethodCallHandler { methodCall: MethodCall, result: MethodChannel.Result ->
if (methodCall.method == HMG_INTERNET_WIFI_CONNECT_METHOD) {
connectHMGInternetWifi(methodCall,result)
}else if (methodCall.method == HMG_GUEST_WIFI_CONNECT_METHOD) {
connectHMGGuestWifi(methodCall,result)
}else if (methodCall.method == ENABLE_WIFI_IF_NOT) {
enableWifiIfNot(methodCall,result)
}else if (methodCall.method == REGISTER_HMG_GEOFENCES) {
registerHmgGeofences(methodCall,result)
}else if (methodCall.method == UN_REGISTER_HMG_GEOFENCES) {
unRegisterHmgGeofences(methodCall,result)
}else{
connectHMGInternetWifi(methodCall, result)
} else if (methodCall.method == HMG_GUEST_WIFI_CONNECT_METHOD) {
connectHMGGuestWifi(methodCall, result)
} else if (methodCall.method == ENABLE_WIFI_IF_NOT) {
enableWifiIfNot(methodCall, result)
} else if (methodCall.method == REGISTER_HMG_GEOFENCES) {
registerHmgGeofences(methodCall, result)
} else if (methodCall.method == UN_REGISTER_HMG_GEOFENCES) {
unRegisterHmgGeofences(methodCall, result)
} else if (methodCall.method == IS_DRAW_OVER_APPS_PERMISSION_ALLOWED) {
isDrawOverAppsPermissionAllowed(methodCall, result)
} else if (methodCall.method == ASK_DRAW_OVER_APPS_PERMISSION) {
askDrawOverAppsPermission(methodCall, result)
} else if (methodCall.method == GET_INTENT) {
getIntentData(methodCall, result)
} else {
result.notImplemented()
}
}
val res = channel.invokeMethod("localizedValue","errorConnectingHmgNetwork")
print(res)
val res = channel.invokeMethod("localizedValue", "errorConnectingHmgNetwork")
}
private fun connectHMGInternetWifi(methodCall: MethodCall, result: MethodChannel.Result){
private fun connectHMGInternetWifi(methodCall: MethodCall, result: MethodChannel.Result) {
(methodCall.arguments as ArrayList<*>).let {
require(it.size > 0 && (it[0] is String),lazyMessage = {
"Missing or invalid arguments (Must have one argument 'String at 0'"
require(it.size == 3 && (it[0] is String) && (it[1] is String), lazyMessage = {
"Missing or invalid arguments (Must have three argument of 'String'"
})
val patientId = it[0].toString()
HMG_Internet(mainActivity)
.connectToHMGGuestNetwork(patientId){ status, message ->
mainActivity.runOnUiThread {
result.success(if(status) 1 else 0)
HMGUtils.popFlutterText(mainActivity, message)
Log.v(this.javaClass.simpleName, "$status | $message")
}
val ssid = it[0].toString()
val username = it[1].toString()
val password = it[2].toString()
WpaEnterprise(mainActivity,ssid).connect(username,password) { status, message ->
HMGUtils.timer(2000,false){
mainActivity.runOnUiThread {
if(status)
result.success(if (status) 1 else 0)
else
result.error(message, null, null)
}
}
}
// HMG_Internet(mainActivity)
// .connectToHMGGuestNetwork(username, password) { status, message ->
// mainActivity.runOnUiThread {
// result.success(if (status) 1 else 0)
//
// HMGUtils.popFlutterText(mainActivity, message)
// Log.v(this.javaClass.simpleName, "$status | $message")
// }
//
// }
}
}
private fun connectHMGGuestWifi(methodCall: MethodCall, result: MethodChannel.Result){
HMG_Guest(mainActivity).connectToHMGGuestNetwork { status, message ->
mainActivity.runOnUiThread {
result.success(if(status) 1 else 0)
private fun connectHMGGuestWifi(methodCall: MethodCall, result: MethodChannel.Result) {
(methodCall.arguments as ArrayList<*>).let {
require(it.size == 1 && (it[0] is String), lazyMessage = {
"Missing or invalid arguments (Must have one argument 'String at 0'"
})
val ssid = it[0].toString()
HMG_Guest(mainActivity, ssid).connectToHMGGuestNetwork { status, message ->
mainActivity.runOnUiThread {
result.success(if (status) 1 else 0)
HMGUtils.popFlutterText(mainActivity, message)
Log.v(this.javaClass.simpleName, "$status | $message")
HMGUtils.popFlutterText(mainActivity, message)
Log.v(this.javaClass.simpleName, "$status | $message")
}
}
}
}
private fun enableWifiIfNot(methodCall: MethodCall, result: MethodChannel.Result) {
val wm = mainActivity.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager?
if (wm != null){
if (wm != null) {
if (!wm.isWifiEnabled)
wm.isWifiEnabled = true
result.success(true)
}else
result.error("101","Error while opening wifi, Please try to open wifi yourself and try again","'WifiManager' service failed");
} else
result.error("101", "Error while opening wifi, Please try to open wifi yourself and try again", "'WifiManager' service failed");
}
private fun registerHmgGeofences(methodCall: MethodCall, result: MethodChannel.Result) {
channel.invokeMethod("getGeoZones",null, object : MethodChannel.Result{
channel.invokeMethod("getGeoZones", null, object : MethodChannel.Result {
override fun success(result: Any?) {
if(result is String) {
if (result is String) {
val geoZones = GeoZoneModel().listFrom(result)
HMG_Geofence.shared(mainActivity).register(){ s, e -> }
HMG_Geofence.shared(mainActivity).register() { s, e -> }
}
}
override fun error(errorCode: String?, errorMessage: String?, errorDetails: Any?) { print(result) }
override fun notImplemented() { print(result) }
override fun error(errorCode: String, errorMessage: String?, errorDetails: Any?) {}
override fun notImplemented() {}
})
}
private fun unRegisterHmgGeofences(methodCall: MethodCall, result: MethodChannel.Result) {
HMG_Geofence.shared(mainActivity).unRegisterAll { status, exception ->
if(status)
if (status)
result.success(true)
else
result.error("101", exception?.localizedMessage, exception);
}
}
private fun isDrawOverAppsPermissionAllowed(methodCall: MethodCall, result: MethodChannel.Result) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (
Settings.canDrawOverlays(mainActivity)
) {
result.success(true)
} else {
result.success(false)
}
} else {
result.success(false)
}
}
private fun askDrawOverAppsPermission(methodCall: MethodCall, result: MethodChannel.Result) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION)
val uri = Uri.parse("package:" + mainActivity.getPackageName())
intent.setData(uri)
startActivityForResult(mainActivity, intent, 102, null)
result.success(true)
} else {
result.success(false)
}
}
private fun getIntentData(methodCall: MethodCall, result: MethodChannel.Result) {
val bundle: Bundle? = getIntent("").extras
if (bundle != null) {
val message = bundle.getString("notification") // 1
System.out.println("BundleExtra:" + message)
Toast.makeText(this.mainActivity, message + "", Toast.LENGTH_SHORT).show()
} else {
Toast.makeText(this.mainActivity, "Bundle Null", Toast.LENGTH_SHORT).show();
}
result.success(true);
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center_horizontal"
android:layout_gravity="center_horizontal">
<FrameLayout
android:id="@+id/publisher_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FF9800" />
</LinearLayout>

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center_horizontal"
android:layout_gravity="center_horizontal">
<FrameLayout
android:id="@+id/subscriber_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#3F51B5" />
<TextView
android:text="Remote"
android:textColor="#FFFFFF"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</LinearLayout>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 544 B

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 442 B

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 721 B

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cloud.diplomaticquarterapp">
package="com.ejada.hmg">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->

@ -1,24 +1,49 @@
buildscript {
ext.kotlin_version = '1.3.50'
ext.kotlin_version = '1.8.0'
// if (System.properties['os.arch'] == "aarch64") {
// // For M1 Users we need to use the NDK 24 which added support for aarch64
// ndkVersion = "24.0.8215888"
// } else {
// // Otherwise we default to the side-by-side NDK version from AGP.
// ndkVersion = "21.4.7075529"
// }
repositories {
google()
jcenter()
// jcenter()
mavenCentral()
maven { url 'https://developer.huawei.com/repo/' }
// maven {
// url "https://dl.bintray.com/kotlin/kotlin-eap/"
// }
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.android.tools.build:gradle:7.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.4'
classpath 'com.google.gms:google-services:4.3.8'
// classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
classpath 'com.huawei.agconnect:agcp:1.5.2.300'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12'
}
}
allprojects {
repositories {
google()
jcenter()
// jcenter()
mavenCentral()
maven {
url 'https://developer.huawei.com/repo/'
}
maven {
url 'https://mvnrepository.com/artifact/'
}
maven {
url "https://artifactory.ess-dev.com/artifactory/gradle-dev-local"
}
}
}
@ -30,6 +55,12 @@ subprojects {
project.evaluationDependsOn(':app')
}
task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
configurations.all {
resolutionStrategy {
force 'androidx.core:core-ktx:1.6.0'
}
}

@ -1,37 +1,39 @@
{
"project_info": {
"project_number": "864393916058",
"firebase_url": "https://diplomaticquarter-d2385.firebaseio.com",
"project_id": "diplomaticquarter-d2385",
"storage_bucket": "diplomaticquarter-d2385.appspot.com"
"project_number": "815750722565",
"firebase_url": "https://api-project-815750722565.firebaseio.com",
"project_id": "api-project-815750722565",
"storage_bucket": "api-project-815750722565.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:864393916058:android:5b5a65cd6d8c18b4b97923",
"mobilesdk_app_id": "1:815750722565:android:62281cd3e5df4063",
"android_client_info": {
"package_name": "com.cloud.diplomaticquarterapp"
"package_name": "com.ejada.hmg"
}
},
"oauth_client": [
{
"client_id": "864393916058-tphjrn8j39ntevt32ekcvmll8aue7qql.apps.googleusercontent.com",
"client_id": "815750722565-3a0gc7neins0eoahdrimrfksk0sqice8.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyBdV3mos1BPhUzNKCj2KANJtiO3o2zh9IM"
"current_key": "AIzaSyDUfg6AKM1-00WyzpvLImUBC46wFrq9-qw"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "864393916058-tphjrn8j39ntevt32ekcvmll8aue7qql.apps.googleusercontent.com",
"client_type": 3
}
]
"status": 1,
"other_platform_oauth_client": []
},
"ads_service": {
"status": 2
}
}
}

@ -1,4 +1,5 @@
org.gradle.jvmargs=-Xmx1536M
android.enableR8=true
org.gradle.jvmargs=-Xmx4096m
#android.enableR8=true
android.useAndroidX=true
android.enableJetifier=true
android.suppressUnsupportedCompileSdk=33

@ -1,6 +1,6 @@
#Thu Sep 03 16:26:30 EEST 2020
#Wed Jul 14 15:55:18 AST 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

@ -0,0 +1,22 @@
{
"provider": "apple_pay",
"data": {
"merchantIdentifier": "merchant.com.hmgwebservices",
"displayName": "Sulaiman Al Habib",
"merchantCapabilities": [
"3DS",
"debit",
"credit"
],
"supportedNetworks": [
"amex",
"visa",
"discover",
"masterCard"
],
"countryCode": "SA",
"currencyCode": "SAR",
"requiredBillingContactFields": null,
"requiredShippingContactFields": null
}
}

@ -1,3 +1,4 @@
{
"name": "DQIcons",
"css_prefix_text": "",
@ -271,6 +272,184 @@
"search": [
"roboticon"
]
},
{
"uid": "8ce732688587909ad0a9d8323eaca8ad",
"css": "marquee",
"code": 59590,
"src": "fontelico"
},
{
"uid": "ec8496ef645f3be7b28147ec60cd9ab1",
"css": "crown-minus",
"code": 59589,
"src": "fontelico"
},
{
"uid": "36ef9feb0754335302784521267a9ad4",
"css": "crown-plus",
"code": 59588,
"src": "fontelico"
},
{
"uid": "186dec7a13156bbe2550790c158fb85d",
"css": "crown",
"code": 59587,
"src": "fontelico"
},
{
"uid": "2a46f1d1c9bd036e17a74e46613c1636",
"css": "ie",
"code": 59586,
"src": "fontelico"
},
{
"uid": "9c2b737b16ae2c8d66b7bfd29ba5ecd8",
"css": "chrome",
"code": 59584,
"src": "fontelico"
},
{
"uid": "45861dd1e5ce4fde338bcccf01eeb808",
"css": "opera",
"code": 59585,
"src": "fontelico"
},
{
"uid": "2bd5f98482d86649958312ea2ab5bb40",
"css": "emo-laugh",
"code": 59576,
"src": "fontelico"
},
{
"uid": "fc92480dedc439d274d4e3e4b425edf4",
"css": "emo-squint",
"code": 59575,
"src": "fontelico"
},
{
"uid": "4843d0d6050dd508d4c101a334f46db2",
"css": "emo-shoot",
"code": 59574,
"src": "fontelico"
},
{
"uid": "04688d76a33ce7a7950e40fae79c08ac",
"css": "emo-cry",
"code": 59573,
"src": "fontelico"
},
{
"uid": "e4b163acaaa08255819f2f78afe8f075",
"css": "cart_menu_icon",
"code": 59412,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M367.1 624.3H972.6A33.2 33.2 0 0 0 1004.7 601.7L1138.2 164.7A29.6 29.6 0 0 0 1132.9 137.3 34.3 34.3 0 0 0 1106.3 124.9H289.9L266.3 24.5A33 33 0 0 0 233.7 0H33.4A32.4 32.4 0 0 0 0 31.2 32.4 32.4 0 0 0 33.4 62.4H206.9L327.4 569.6A93.8 93.8 0 0 0 267.1 655.5 97.1 97.1 0 0 0 367.2 749.1H972.6A31.3 31.3 0 1 0 972.6 686.7H367.2A31.3 31.3 0 1 1 367.2 624.3ZM1061.9 187.3L947.4 561.9H394L305 187.3ZM1061.9 187.3M315.3 894.6A105.4 105.4 0 1 0 420.7 789.2 105.4 105.4 0 0 0 315.3 894.6ZM420.7 859.4A35.2 35.2 0 1 1 385.6 894.6 35.2 35.2 0 0 1 420.7 859.4ZM420.7 859.4M735.4 894.6A105.4 105.4 0 1 0 840.9 789.2 105.4 105.4 0 0 0 735.4 894.6ZM840.9 859.4A35.2 35.2 0 1 1 805.7 894.6 35.2 35.2 0 0 1 840.9 859.4ZM840.9 859.4",
"width": 1140
},
"search": [
"cart_menu_icon"
]
},
{
"uid": "45f50872f02e050e19f0910ca3e0e8e6",
"css": "categories_menu_icon",
"code": 59413,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M332.7 458.9H126.3A126.3 126.3 0 0 1 0 332.7V126.3A126.3 126.3 0 0 1 126.3 0H332.7A126.3 126.3 0 0 1 459 126.3V332.7A126.3 126.3 0 0 1 332.7 458.9ZM126.3 61.2A65.1 65.1 0 0 0 61.2 126.3V332.7A65.1 65.1 0 0 0 126.3 397.8H332.7A65.1 65.1 0 0 0 397.8 332.7V126.3A65.1 65.1 0 0 0 332.7 61.2ZM873.8 458.9H667.3A126.3 126.3 0 0 1 541 332.6V126.3A126.3 126.3 0 0 1 667.3 0H873.9A126.3 126.3 0 0 1 1000.2 126.3V332.7A126.3 126.3 0 0 1 873.8 458.9ZM667.3 61.2A65.1 65.1 0 0 0 602.2 126.3V332.7A65.1 65.1 0 0 0 667.3 397.8H873.9A65.1 65.1 0 0 0 938.9 332.7V126.3A65.1 65.1 0 0 0 873.9 61.3ZM332.7 999.9H126.3A126.3 126.3 0 0 1 0 873.7V667.3A126.3 126.3 0 0 1 126.3 541H332.7A126.3 126.3 0 0 1 459 667.3V873.9A126.3 126.3 0 0 1 332.7 999.9ZM126.3 602.2A65.1 65.1 0 0 0 61.2 667.3V873.9A65.1 65.1 0 0 0 126.3 938.8H332.7A65.1 65.1 0 0 0 397.8 873.8V667.3A65.1 65.1 0 0 0 332.7 602.3ZM873.8 999.9H667.3A126.3 126.3 0 0 1 541 873.7V667.3A126.3 126.3 0 0 1 667.3 541H873.8A126.3 126.3 0 0 1 1000.1 667.3V873.9A126.3 126.3 0 0 1 873.8 999.9ZM667.3 602.2A65.1 65.1 0 0 0 602.2 667.3V873.9A65.1 65.1 0 0 0 667.3 938.8H873.8A65.1 65.1 0 0 0 938.8 873.8V667.3A65.1 65.1 0 0 0 873.8 602.3Z",
"width": 1000
},
"search": [
"categories_menu_icon"
]
},
{
"uid": "de65d94899c08a719eb8f9b723f73fc4",
"css": "hmg_logo_icon",
"code": 59414,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M146 835.7S180.9 835.5 205.5 835.5L392.2 836.4C414.4 836.4 433 812.7 434 778.5L434 622.5C434 589.3 448.9 563.3 472 561.7L529.2 561.2C552.3 562.7 568.1 588.9 568.1 622L568.1 778.9C569.2 813.1 584.7 835.5 607.1 835.5L858.4 836.1 858.8 643.3C858.8 610.2 842.9 584.4 819.8 583L718.8 582.5C696.5 582.5 678.9 558.9 677.9 524.7L677.5 472.6C678.6 438.4 696.4 414.8 718.7 414.8L820.2 415.1C843.3 413.6 858.3 386.4 858.3 353.3L858.5 112.8A102.4 102.4 0 0 1 780.8 161.4L610.2 161.4C587.9 161.4 569.4 185.7 568.3 219.9V374.6C567.2 408.8 549.8 432.9 527.5 432.9L475.8 432C453.4 432 435.6 408.6 434.5 374.7L434.5 218.4C433.4 184.3 415.6 161.2 393.4 161.2L145.6 161.2 145.6 353.4C145.6 386.6 161.2 413.1 184.3 414.7L285.8 414.3C308.8 415.8 325.1 443.2 325.1 476.2L324.8 520.7C324.8 553.8 309.1 580.4 286 581.9L184.3 581.7C161.2 583.3 145.6 609.5 145.6 642.6ZM999.3 99.1V902.8A102.2 102.2 0 0 1 896 1000H102.8A101.9 101.9 0 0 1 0 902.8L0 97.6A102.3 102.3 0 0 1 103 0L895.4 0.3A104 104 0 0 1 999.3 99.1Z",
"width": 999
},
"search": [
"hmg_logo_icon"
]
},
{
"uid": "baf8798b7336aad03b1d61cacc015142",
"css": "user_menu_icon",
"code": 59415,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M853.6 146.4A500 500 0 0 0 146.4 853.6 500 500 0 0 0 853.6 146.4ZM217 838.5A286.1 286.1 0 0 1 500 586.7 285 285 0 0 1 783 838.5 440.5 440.5 0 0 1 217 838.5ZM500 526.3A151.8 151.8 0 1 1 651.8 374.5 152.1 152.1 0 0 1 500 526.3ZM833.4 788.8A344.4 344.4 0 0 0 617.6 548.7 210.5 210.5 0 1 0 382.1 548.7 344.2 344.2 0 0 0 166.3 788.7 441.4 441.4 0 1 1 833.2 788.7ZM833.4 788.8",
"width": 1000
},
"search": [
"user_menu_icon"
]
},
{
"uid": "d3f621623139837ff2fb5fe09cf16994",
"css": "cart_menu_icon-1",
"code": 59416,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M367.1 624.3H972.6A33.2 33.2 0 0 0 1004.7 601.7L1138.2 164.7A29.6 29.6 0 0 0 1132.9 137.3 34.3 34.3 0 0 0 1106.3 124.9H289.9L266.3 24.5A33 33 0 0 0 233.7 0H33.4A32.4 32.4 0 0 0 0 31.2 32.4 32.4 0 0 0 33.4 62.4H206.9L327.4 569.6A93.8 93.8 0 0 0 267.1 655.5 97.1 97.1 0 0 0 367.2 749.1H972.6A31.3 31.3 0 1 0 972.6 686.7H367.2A31.3 31.3 0 1 1 367.2 624.3ZM1061.9 187.3L947.4 561.9H394L305 187.3ZM1061.9 187.3M315.3 894.6A105.4 105.4 0 1 0 420.7 789.2 105.4 105.4 0 0 0 315.3 894.6ZM420.7 859.4A35.2 35.2 0 1 1 385.6 894.6 35.2 35.2 0 0 1 420.7 859.4ZM420.7 859.4M735.4 894.6A105.4 105.4 0 1 0 840.9 789.2 105.4 105.4 0 0 0 735.4 894.6ZM840.9 859.4A35.2 35.2 0 1 1 805.7 894.6 35.2 35.2 0 0 1 840.9 859.4ZM840.9 859.4",
"width": 1140
},
"search": [
"cart_menu_icon"
]
},
{
"uid": "6aac6f399374da0b9c4811b6a7110627",
"css": "categories_menu_icon-1",
"code": 59417,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M332.7 458.9H126.3A126.3 126.3 0 0 1 0 332.7V126.3A126.3 126.3 0 0 1 126.3 0H332.7A126.3 126.3 0 0 1 459 126.3V332.7A126.3 126.3 0 0 1 332.7 458.9ZM126.3 61.2A65.1 65.1 0 0 0 61.2 126.3V332.7A65.1 65.1 0 0 0 126.3 397.8H332.7A65.1 65.1 0 0 0 397.8 332.7V126.3A65.1 65.1 0 0 0 332.7 61.2ZM873.8 458.9H667.3A126.3 126.3 0 0 1 541 332.6V126.3A126.3 126.3 0 0 1 667.3 0H873.9A126.3 126.3 0 0 1 1000.2 126.3V332.7A126.3 126.3 0 0 1 873.8 458.9ZM667.3 61.2A65.1 65.1 0 0 0 602.2 126.3V332.7A65.1 65.1 0 0 0 667.3 397.8H873.9A65.1 65.1 0 0 0 938.9 332.7V126.3A65.1 65.1 0 0 0 873.9 61.3ZM332.7 999.9H126.3A126.3 126.3 0 0 1 0 873.7V667.3A126.3 126.3 0 0 1 126.3 541H332.7A126.3 126.3 0 0 1 459 667.3V873.9A126.3 126.3 0 0 1 332.7 999.9ZM126.3 602.2A65.1 65.1 0 0 0 61.2 667.3V873.9A65.1 65.1 0 0 0 126.3 938.8H332.7A65.1 65.1 0 0 0 397.8 873.8V667.3A65.1 65.1 0 0 0 332.7 602.3ZM873.8 999.9H667.3A126.3 126.3 0 0 1 541 873.7V667.3A126.3 126.3 0 0 1 667.3 541H873.8A126.3 126.3 0 0 1 1000.1 667.3V873.9A126.3 126.3 0 0 1 873.8 999.9ZM667.3 602.2A65.1 65.1 0 0 0 602.2 667.3V873.9A65.1 65.1 0 0 0 667.3 938.8H873.8A65.1 65.1 0 0 0 938.8 873.8V667.3A65.1 65.1 0 0 0 873.8 602.3Z",
"width": 1000
},
"search": [
"categories_menu_icon"
]
},
{
"uid": "0a4cf1ff2671b9ea852d635e27df1e69",
"css": "hmg_logo_icon-1",
"code": 59418,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M146 835.7S180.9 835.5 205.5 835.5L392.2 836.4C414.4 836.4 433 812.7 434 778.5L434 622.5C434 589.3 448.9 563.3 472 561.7L529.2 561.2C552.3 562.7 568.1 588.9 568.1 622L568.1 778.9C569.2 813.1 584.7 835.5 607.1 835.5L858.4 836.1 858.8 643.3C858.8 610.2 842.9 584.4 819.8 583L718.8 582.5C696.5 582.5 678.9 558.9 677.9 524.7L677.5 472.6C678.6 438.4 696.4 414.8 718.7 414.8L820.2 415.1C843.3 413.6 858.3 386.4 858.3 353.3L858.5 112.8A102.4 102.4 0 0 1 780.8 161.4L610.2 161.4C587.9 161.4 569.4 185.7 568.3 219.9V374.6C567.2 408.8 549.8 432.9 527.5 432.9L475.8 432C453.4 432 435.6 408.6 434.5 374.7L434.5 218.4C433.4 184.3 415.6 161.2 393.4 161.2L145.6 161.2 145.6 353.4C145.6 386.6 161.2 413.1 184.3 414.7L285.8 414.3C308.8 415.8 325.1 443.2 325.1 476.2L324.8 520.7C324.8 553.8 309.1 580.4 286 581.9L184.3 581.7C161.2 583.3 145.6 609.5 145.6 642.6ZM999.3 99.1V902.8A102.2 102.2 0 0 1 896 1000H102.8A101.9 101.9 0 0 1 0 902.8L0 97.6A102.3 102.3 0 0 1 103 0L895.4 0.3A104 104 0 0 1 999.3 99.1Z",
"width": 999
},
"search": [
"hmg_logo_icon"
]
},
{
"uid": "d19eb878f1dee49848276b6d0faa6602",
"css": "wishlist_menu_icon",
"code": 59411,
"src": "custom_icons",
"selected": false,
"svg": {
"path": "M877.6 0A394.8 394.8 0 0 0 600.7 112.2 394.8 394.8 0 0 0 323.8 0 332.4 332.4 0 0 0 0 349 515.4 515.4 0 0 0 138.3 679.5 1351.1 1351.1 0 0 0 580.3 995.3 46.9 46.9 0 0 0 621.1 995.3 1351.1 1351.1 0 0 0 1063.1 679.5 515.4 515.4 0 0 0 1201.4 349 332.5 332.5 0 0 0 877.6 0ZM991.8 618.5A1233.8 1233.8 0 0 1 600.7 900.8 1233.7 1233.7 0 0 1 209.5 618.5 418.4 418.4 0 0 1 93.8 349 239.1 239.1 0 0 1 323.8 93.8 297.2 297.2 0 0 1 500.6 150.7 283.5 283.5 0 0 1 562 209.5 46.5 46.5 0 0 0 600.5 230H600.5A46.9 46.9 0 0 0 639.1 209.3 301.2 301.2 0 0 1 877.2 93.8 239.2 239.2 0 0 1 1107.1 349 418.4 418.4 0 0 1 991.8 618.5Z",
"width": 1201
},
"search": [
"wishlist_menu_icon"
]
}
]
}

@ -0,0 +1,21 @@
{
"provider": "apple_pay",
"data": {
"merchantIdentifier": "merchant.com.hmgwebservices",
"displayName": "Sulaiman Al Habib",
"merchantCapabilities": [
"3DS",
"debit",
"credit"
],
"supportedNetworks": [
"visa",
"masterCard",
"mada"
],
"countryCode": "SA",
"currencyCode": "SAR",
"requiredBillingContactFields": null,
"requiredShippingContactFields": null
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save