Compare commits

...

840 Commits

Author SHA1 Message Date
Elham Ali bc7f3e9f35 Merge branch 'Er_signin' into 'development'
Er signin

See merge request Cloud_Solution/doctor_app_flutter!999
4 years ago
Elham Rababh 3a9c64779e small fix 4 years ago
Elham Ali 4fe2a4444d Merge branch 'add_doctor_id' into 'development'
Add doctor

See merge request Cloud_Solution/doctor_app_flutter!997
4 years ago
Elham Rababh bcb1e90ae6 ER Done form our side 4 years ago
Elham Rababh 6bdb2a1600 fix operation_report_servive.dart 4 years ago
Elham Rababh 092cfbc891 fix some issue in prescription 4 years ago
Elham Rababh f2bb245c25 return insert back 4 years ago
Elham Rababh 8b79b0041c design issue 4 years ago
Elham Rababh 5f7b52a529 fix issue 4 years ago
Elham Rababh 17f32c4dc8 fixes on procedure 4 years ago
Elham Rababh 986af6ba9c fix issue 4 years ago
Elham Rababh d717d9e0cf fix in patient_service 4 years ago
Elham Rababh 10798f73de Merge branch 'add_doctor_id' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_doctor_id 4 years ago
Elham Rababh d4f01c19f7 session management update 4 years ago
Elham Ali 6c1425ad5a Merge branch 'procedures_refactoring' into 'add_doctor_id'
Procedures refactoring

See merge request Cloud_Solution/doctor_app_flutter!994
4 years ago
Elham Rababh 46760ffc77 session management update 4 years ago
Elham Rababh 8069e89a61 session management update 4 years ago
Elham Rababh c30d6bebd8 session management update 4 years ago
Elham Rababh 5422472ccc update procedure 4 years ago
Elham Rababh 33b8d6d78d update procedure 4 years ago
Elham Rababh 1a3ad32aa5 Fix issue on procedure_card.dart 4 years ago
Elham Rababh 70573d190a first step from procedures 4 years ago
RoaaGhali98 379bfd5bb3 Merge branch 'procedures_refactoring' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedures_refactoring 4 years ago
RoaaGhali98 041c652b86 Fixing some issues in procedure pages 4 years ago
ruaa ghali 89d4a7aacb Merge branch 'DAPP_9_less_25' into 'procedures_refactoring'
DAPP-9: remove 25 letter validation

See merge request Cloud_Solution/doctor_app_flutter!995
4 years ago
RoaaGhali98 9ecfe896f9 DAPP-9: remove 25 letter validation 4 years ago
RoaaGhali98 f84ae8b4e7 Delete add-procedure-page.dart 4 years ago
RoaaGhali98 447ca6d4dc Merge branch 'procedures_refactoring' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedures_refactoring
 Conflicts:
	lib/screens/procedures/add-procedure-page.dart
	lib/screens/procedures/favorite_procedure/add_favourite_procedure.dart
4 years ago
Elham Ali 4b7b4fda7f Merge branch 'hot_fix' into 'development'
hot fix the progress_note_screen.dart

See merge request Cloud_Solution/doctor_app_flutter!993
4 years ago
Elham Rababh e242aa19bc hot fix the progress_note_screen.dart 4 years ago
RoaaGhali98 9f7cdba8b7 Refactoring procedure pages 4 years ago
Elham Ali 8bdde45d81 Merge branch 'hot_fix' into 'development'
fix the keyborad issue on real device

See merge request Cloud_Solution/doctor_app_flutter!991
4 years ago
Elham Rababh 8c93d5c450 fix the keyborad issue on real device 4 years ago
RoaaGhali98 28defc2582 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedures_refactoring
 Conflicts:
	lib/screens/patients/profile/lab_result/labs_home_page.dart
4 years ago
RoaaGhali98 f1dd50d7bf Doing some refactoring 4 years ago
Elham Ali 31082249e5 Merge branch 'renaming_file_1' into 'development'
DAPP-100 : renames file

See merge request Cloud_Solution/doctor_app_flutter!990
4 years ago
Elham Rababh 5ec07bb931 DAPP-100 : renames file 4 years ago
Elham Ali 36e245dd7d Merge branch 'renaming_file_1' into 'development'
refactor names

See merge request Cloud_Solution/doctor_app_flutter!989
4 years ago
Elham Rababh 077cad7df5 refactor names 4 years ago
Elham Rababh a019319589 some fixes 4 years ago
Elham Ali 323e3f3538 Merge branch 'DAPP_99_soap_model' into 'development'
episode refactor names  part 2

See merge request Cloud_Solution/doctor_app_flutter!987
4 years ago
Elham Rababh e73271cb29 episode refactor names part 2 4 years ago
RoaaGhali98 1ac24bee90 Refactoring some issues in procedures screen 4 years ago
RoaaGhali98 e85a32274a Refactoring some issues in procedures screen 4 years ago
Elham Ali 010310eb48 Merge branch 'DAPP_99_soap_model' into 'development'
Dapp 99 soap model

See merge request Cloud_Solution/doctor_app_flutter!984
4 years ago
Elham Rababh 47352ae77d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into DAPP_99_soap_model
 Conflicts:
	lib/config/config.dart
4 years ago
Elham Rababh 4e6c940cdf fix issues 4 years ago
Elham Rababh 1ca7b28590 first step from refactor soap 4 years ago
Elham Rababh e935014776 add todo 4 years ago
Elham Ali e3a71945de Merge branch 'fix_refere_desgin' into 'development'
Fix some design issues in admission request screens

See merge request Cloud_Solution/doctor_app_flutter!982
4 years ago
RoaaGhali98 d743c2c99c Rename to bottom_sheet_dialog_button and two_bottom_sheet_dialog_buttons 4 years ago
RoaaGhali98 e1c635a911 Rename to bottom_sheet_dialog_button and two_bottom_sheet_dialog_buttons 4 years ago
Elham Rababh 7fc52ecad4 finish fix lab result 4 years ago
RoaaGhali98 31cf229763 Fixing the comments 4 years ago
Elham Rababh 286dbe0a3f refactor the lab result structure 4 years ago
RoaaGhali98 dfc792ce64 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin 4 years ago
RoaaGhali98 fa4e4b0dfd Rename to files name of admission request screens to match our standard 4 years ago
RoaaGhali98 b7892fc18e Rename to files name of admission request screens to match our standard 4 years ago
Elham Ali 6107639ecd Merge branch 'refactor_part' into 'development'
refactor some name and add todos

See merge request Cloud_Solution/doctor_app_flutter!983
4 years ago
RoaaGhali98 3f41ff267a Fix some design issue in admission request screens and make new component called two_bottom_sheet_dialog_buttons and use it in admission-request_second-screen.dart and admission-request-third-screen 4 years ago
Elham Rababh c96939e6b0 refactor some name and add todos 4 years ago
RoaaGhali98 fcdec6dbf7 Fix some design issue in admission request screens 4 years ago
Elham Ali 9a1a7ed247 Merge branch 'fix_refere_desgin' into 'development'
Fix refere desgin

See merge request Cloud_Solution/doctor_app_flutter!981
4 years ago
RoaaGhali98 7dc71d01de Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin 4 years ago
RoaaGhali98 4eaa62a48c convert text in dailog-list-select to titleCase to match the app texts theme 4 years ago
Elham Ali 1dd66803fa Merge branch 'fix_refere_desgin' into 'development'
Fixing small design issues in admission-request-first-screen

See merge request Cloud_Solution/doctor_app_flutter!980
4 years ago
RoaaGhali98 4d820728e8 Fixing small design issues in admission-request-first-screen 4 years ago
Elham Ali eaea16e480 Merge branch 'fix_refere_desgin' into 'development'
Fix refere desgin

See merge request Cloud_Solution/doctor_app_flutter!979
4 years ago
RoaaGhali98 65ae00cec2 fix the remark validation, make the bottomSheet show after loading and edit the order numbers of priority refer-patient-screen-in-patient 4 years ago
RoaaGhali98 41e79d5e00 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin 4 years ago
RoaaGhali98 7962d9b1be fix the remark validation, make the bottomSheet show after loading and edit the order numbers of priority refer-patient-screen-in-patient 4 years ago
RoaaGhali98 8980f6f440 replace the TabBar in refer-patient-screen-in-patient with our dropDownList 4 years ago
RoaaGhali98 39c64779aa Merge branch 'fix_refere_desgin' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin 4 years ago
Elham Rababh 95321a9305 fix the bug 4 years ago
Elham Rababh ed6af7f26e change the file structure 4 years ago
Elham Ali f7770c0315 Merge branch 'roaa_prescription' into 'development'
Fixing update in update_note

See merge request Cloud_Solution/doctor_app_flutter!972
4 years ago
RoaaGhali98 505c3f470f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin 4 years ago
RoaaGhali98 dc37e2e559 replace the TabBar in refer-patient-screen-in-patient with our dropDownList 4 years ago
Elham Rababh 47dd2ecf56 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_prescription
 Conflicts:
	lib/screens/patients/profile/notes/note/update_note.dart
4 years ago
Elham Ali d32731451c Merge branch 'ucaf_design_refactor' into 'development'
ucaf design refactor  finished

See merge request Cloud_Solution/doctor_app_flutter!978
4 years ago
Elham Rababh 208aa9dd6e ucaf design refactor finished 4 years ago
RoaaGhali98 4c7db58489 replace the TabBar in refer-patient-screen-in-patient with our custom TabBar in tab_utils 4 years ago
Elham Ali 63b6a957b6 Merge branch 'fix_refere_desgin' into 'development'
Fix refere desgin

See merge request Cloud_Solution/doctor_app_flutter!976
4 years ago
RoaaGhali98 e61d1e78f6 Refactoring 4 years ago
RoaaGhali98 c93ea2f285 Refactoring 4 years ago
RoaaGhali98 240c9aa411 Refactoring 4 years ago
Elham Ali c083f9ffa3 Merge branch 'release_info' into 'development'
add the release key values

See merge request Cloud_Solution/doctor_app_flutter!977
4 years ago
Elham Rababh e732f9e61c add the release key values 4 years ago
RoaaGhali98 81d3aa5ad1 Fixing some design issues in refer-patient-screen-in-patient and refer-patient-screen 4 years ago
RoaaGhali98 177a2e8bc4 Fixing some design issues in refer-patient-screen-in-patient and refer-patient-screen 4 years ago
RoaaGhali98 01cd91ef93 Fixing some design issues in refer-patient-screen-in-patient and refer-patient-screen 4 years ago
RoaaGhali98 c4f2543471 Fixing some design issues 4 years ago
Elham Ali 40faef136d Merge branch 'hot_fix' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!973
4 years ago
Elham Rababh 70fa365377 hot fix
hot fix
4 years ago
RoaaGhali98 e5fe12f26b Fixing some issues 4 years ago
RoaaGhali98 9f7dbf5ec7 Fixing update in update_note 4 years ago
Elham Ali d22ea2e2fa Merge branch 'roaa_schedule_design' into 'development'
Fixing update in update_note

See merge request Cloud_Solution/doctor_app_flutter!971
4 years ago
RoaaGhali98 17a6ec5795 Fixing update in update_note 4 years ago
Elham Ali d4cef7ba5f Merge branch 'roaa_schedule_design' into 'development'
Delete repeated API's

See merge request Cloud_Solution/doctor_app_flutter!970
4 years ago
RoaaGhali98 7812d5081e Fixing some issues in progress_note_screen and update_note 4 years ago
RoaaGhali98 dceefadc06 Fixing some issues in progress_note_screen and update_note 4 years ago
RoaaGhali98 f3b39906f5 Add DropDownText to add progress note screen 4 years ago
RoaaGhali98 22c26c02de Delete repeated API's 4 years ago
Elham Ali 4505ef9d02 Merge branch 'roaa_schedule_design' into 'development'
add translation

See merge request Cloud_Solution/doctor_app_flutter!969
4 years ago
RoaaGhali98 40c1502a9b add translation 4 years ago
Elham Ali f4c7be6cc2 Merge branch 'new_prescreption' into 'development'
New prescreption

See merge request Cloud_Solution/doctor_app_flutter!968
4 years ago
Elham Rababh b1ddd9935c finish add Prescription 4 years ago
Elham Rababh ada10f595a finish add Prescription 4 years ago
Elham Rababh ba62056c4d finish add Prescription 4 years ago
Elham Rababh 954402fe52 show the list of prescription 4 years ago
Elham Rababh 9461d3d4a1 add new prescription 4 years ago
Elham Rababh 1f770793fd fix issue 4 years ago
RoaaGhali98 85a6f4965f Fix some issues in prescription pages 4 years ago
RoaaGhali98 cdc0d2f4a9 Finish prescription refactoring 4 years ago
RoaaGhali98 34f658a166 Add Translation to prescription pages 4 years ago
RoaaGhali98 f266f54be0 Fix the prescriptions pages 4 years ago
RoaaGhali98 c76900a868 Refactor add_prescription_form 4 years ago
RoaaGhali98 8cb5171bc9 Refactor add_prescription_form 4 years ago
RoaaGhali98 0147481c27 Fix the drug to drug page 4 years ago
RoaaGhali98 5f3f509b8c fix the DOCTYPE html error in getPrescription service 4 years ago
RoaaGhali98 e10c07f6a4 fix loader in prescriptions_page 4 years ago
RoaaGhali98 ce978db2dd Fix add medication button 4 years ago
RoaaGhali98 d5e3a79f85 Fix add medication button 4 years ago
RoaaGhali98 5b8211eec4 Refactor add_prescription_form 4 years ago
RoaaGhali98 c1956aee9b Refactor add_prescription_form 4 years ago
RoaaGhali98 2b38293d61 Refactor add_prescription_form 4 years ago
RoaaGhali98 113fb42d68 refactor some files in prescription screen 4 years ago
RoaaGhali98 3f25acda8f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design 4 years ago
RoaaGhali98 f769189bee Refactor add_prescription_form 4 years ago
RoaaGhali98 7afe24c2bc Refactor add_prescription_form 4 years ago
Elham Ali 11652e448d Merge branch 'pharmacy_redesign' into 'development'
fix issues in lab order

See merge request Cloud_Solution/doctor_app_flutter!966
4 years ago
Elham Rababh 65e9840418 fix issues in lab order 4 years ago
RoaaGhali98 228237bf96 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design
 Conflicts:
	lib/widgets/patients/dynamic_elements.dart
4 years ago
RoaaGhali98 182f890e92 Fix the form in prescription screen 4 years ago
Elham Ali d0bdf8c1e8 Merge branch 'pharmacy_redesign' into 'development'
Pharmacy redesign

See merge request Cloud_Solution/doctor_app_flutter!965
4 years ago
Elham Rababh cb19a5fcfe move models to the core file 4 years ago
Elham Rababh f8371f71a1 fix intervention_medication 4 years ago
RoaaGhali98 0257bb1f16 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design 4 years ago
Elham Ali 2a0148467e Merge branch 'pharmacy_redesign' into 'development'
first step form redesign pharmacy page

See merge request Cloud_Solution/doctor_app_flutter!964
4 years ago
Elham Rababh 1789eb8c5b first step form redesign pharmacy page 4 years ago
RoaaGhali98 994b43a590 Fix the form in prescription screen 4 years ago
Elham Ali b22023cdbc Merge branch 'pharmacy_redesign' into 'development'
Pharmacy redesign

See merge request Cloud_Solution/doctor_app_flutter!963
4 years ago
Elham Rababh 6905ed702e first step form redesign pharmacy page 4 years ago
Elham Rababh 25f902487c small fix in referal 4 years ago
Elham Ali 17998cbbf3 Merge branch 'roaa_schedule_design' into 'development'
fix referred-patient-screen

See merge request Cloud_Solution/doctor_app_flutter!962
4 years ago
RoaaGhali98 83ea30303b fix referred-patient-screen 4 years ago
Elham Ali df3ba10a54 Merge branch 'roaa_schedule_design' into 'development'
Roaa schedule design

See merge request Cloud_Solution/doctor_app_flutter!961
4 years ago
RoaaGhali98 e8b5165953 Fix some issues 4 years ago
RoaaGhali98 b8076f177b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design 4 years ago
RoaaGhali98 db83bec292 Fix referred-patient-screen design 4 years ago
Elham Ali 1ae6c4682b Merge branch 'hot_fixes' into 'development'
Hot fixes

See merge request Cloud_Solution/doctor_app_flutter!960
4 years ago
Elham Rababh 5ed3084130 fix clinic name 4 years ago
Elham Rababh 45f30a8d61 small fixes 4 years ago
Elham Rababh bbdc243f0f fix main issues 4 years ago
RoaaGhali98 06b2e7f194 Fixing the height in my_schedule_widget 4 years ago
Elham Ali 8f1d4f80bd Merge branch 'roaa_schedule_design' into 'development'
Roaa schedule design

See merge request Cloud_Solution/doctor_app_flutter!959
4 years ago
RoaaGhali98 47a077bd52 Edit some issues in the my_schedule_screen 4 years ago
RoaaGhali98 b1a65425c5 Edit the my_schedule_screen design 4 years ago
Elham Ali e6e5d8e03b Merge branch 'roaa2.8_addnewmedicationservice' into 'development'
add translations to pharmacy_intervention_screen, intervention_medication and...

See merge request Cloud_Solution/doctor_app_flutter!958
4 years ago
RoaaGhali98 af72810b26 Merge remote-tracking branch 'origin/roaa2.8_addnewmedicationservice' into roaa2.8_addnewmedicationservice 4 years ago
RoaaGhali98 2ffa745e73 add translations to pharmacy_intervention_screen, intervention_medication and intervention_medication_history_screen 4 years ago
Elham Ali c6a091ae32 Merge branch 'roaa2.8_addnewmedicationservice' into 'development'
Wrapping the Row cards with CustomRow in intervention_medication.dart and...

See merge request Cloud_Solution/doctor_app_flutter!957
4 years ago
Elham Rababh 90c74c2f06 small fix issues 4 years ago
RoaaGhali98 f7e509d967 Merge remote-tracking branch 'origin/roaa2.8_addnewmedicationservice' into roaa2.8_addnewmedicationservice 4 years ago
RoaaGhali98 8464c70f35 Replace static data 4 years ago
RoaaGhali98 4ef41e0c5a Replace static data 4 years ago
Elham Rababh fdc39f28e3 small change 4 years ago
RoaaGhali98 19d981d9e0 Wrapping the Row cards with CustomRow in intervention_medication.dart and intervention_medication_history_screen.dart and fix the accept or reject issue, fix the lable in intervention_medication_history_screen.dart and edit the initial date in pharmacy_intervention_screen.dart 4 years ago
Elham Ali 63e94e0d7b Merge branch 'roaa2.8_addnewmedicationservice' into 'development'
Roaa2.8 addnewmedicationservice

See merge request Cloud_Solution/doctor_app_flutter!953
4 years ago
Elham Rababh a829532717 call service after accept or reject 4 years ago
RoaaGhali98 211990518f Editing the accept_or_reject_req_model 4 years ago
RoaaGhali98 9f77d080c0 Editing the schedule page 4 years ago
Elham Ali 74501dbf07 Merge branch 'jan_fix_bugs' into 'development'
plan for refactor prescriptions

See merge request Cloud_Solution/doctor_app_flutter!956
4 years ago
RoaaGhali98 de9dc0cb8c Merge branch 'roaa2.8_addnewmedicationservice' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa2.8_addnewmedicationservice 4 years ago
RoaaGhali98 b38a153e22 Fix some issues 4 years ago
Elham Rababh 694be7315b fix issue on loading 4 years ago
RoaaGhali98 fec899ebb7 Add static data 4 years ago
RoaaGhali98 d3f0f1a141 Fix the date format in intervention_medication_view_model 4 years ago
Elham Rababh 0895a80d16 fix issues with date 4 years ago
RoaaGhali98 fde96fbce7 Fix some issues 4 years ago
Elham Rababh ad8d0f32b6 plan for refactor prescriptions 4 years ago
Elham Rababh 37928c1757 fix issues 4 years ago
Elham Ali 44bc3f1c3c Merge branch 'jan_fix_bugs' into 'development'
fix issues

See merge request Cloud_Solution/doctor_app_flutter!955
4 years ago
Elham Rababh 23e1fed349 fix issues 4 years ago
RoaaGhali98 be40076def Add new function in intervention_medication_service called accepted or rejected 4 years ago
RoaaGhali98 65d04b2d0f fix some issues 4 years ago
Elham Ali a5974ad584 Merge branch 'jan_fix_bugs' into 'development'
Jan fix bugs

See merge request Cloud_Solution/doctor_app_flutter!954
4 years ago
Elham Rababh b79eff7f6b fix issues 4 years ago
RoaaGhali98 e165ec5b1d add new service called intervention_medication_history_screen 4 years ago
RoaaGhali98 af9e8dd095 we edit a date format 4 years ago
RoaaGhali98 0d542a862e add new service 4 years ago
RoaaGhali98 6d0ff69386 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa2.8_addnewmedicationservice 4 years ago
Elham Rababh d9b2a618f5 small fix 4 years ago
Elham Ali f300dbf315 Merge branch 'jan_fix_bugs' into 'development'
small fix

See merge request Cloud_Solution/doctor_app_flutter!952
4 years ago
Elham Rababh 05b656416d small fix 4 years ago
Elham Ali 278bd5e23f Merge branch 'jan_fix_bugs' into 'development'
Jan fix bugs

See merge request Cloud_Solution/doctor_app_flutter!951
4 years ago
Elham Rababh ed447f6b17 fix issue DAPP-48 4 years ago
Elham Rababh 0d61d0febc fix issues 4 years ago
Elham Rababh ed9c77465f fix chart issues 4 years ago
Elham Rababh 1b12354581 DAPP-66: fix date with design improvement 4 years ago
Elham Rababh 26fa1aec62 DAPP-66: fix date with design improvement 4 years ago
RoaaGhali98 79372b86c1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa2.8_addnewmedicationservice
 Conflicts:
	lib/locator.dart
	lib/routes.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
4 years ago
RoaaGhali98 0a0aa6ba77 we add a new service called new_medication_screen 4 years ago
Elham Ali fec10319bf Merge branch 'point10' into 'development'
Point10

See merge request Cloud_Solution/doctor_app_flutter!950
4 years ago
Elham Rababh af1217dd67 finish assessment screen 4 years ago
RoaaGhali98 42feae9a2e add new medication service 4 years ago
RoaaGhali98 406165c348 we fix some issues -in-patient 4 years ago
Elham Rababh 5ed5a266e9 vte assessment fix path 4 years ago
Elham Rababh da63af6db3 vte assessment 4 years ago
Elham Rababh 810cda1f9b fix header 4 years ago
Elham Rababh c8fde6e869 hide registration service 4 years ago
Elham Ali 956afab2b4 Merge branch 'dev_v2.8_roaa' into 'development'
Redesign for my_schedule_screen and make it responsive to any device

See merge request Cloud_Solution/doctor_app_flutter!948
4 years ago
RoaaGhali98 afbd389925 edit the gradles version 4 years ago
Elham Ali 0f71025e31 Merge branch 'improve_code_stander' into 'development'
Improve code stander

See merge request Cloud_Solution/doctor_app_flutter!949
4 years ago
Elham Rababh 294d979255 small fix 4 years ago
Elham Rababh 1755650304 fix add progress note 4 years ago
RoaaGhali98 268c637316 Redesign for my_schedule_screen and make it responsive to any device 4 years ago
Elham Rababh 94b86ee4b9 fix the size of the button inside the app 4 years ago
RoaaGhali98 5ff270858d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into dev_v2.8_roaa 4 years ago
RoaaGhali98 6e976c4597 Redesign for my_schedule_screen and make it responsive to any device 4 years ago
Elham Ali 66637345e9 Merge branch 'improve_code_stander' into 'development'
Improve code stander

See merge request Cloud_Solution/doctor_app_flutter!947
4 years ago
Elham Rababh 71ce8d22e3 fix the size of the button inside the app 4 years ago
Elham Rababh edbb99e445 small fix 4 years ago
Elham Ali 5526380da7 Merge branch 'improve_code_stander' into 'development'
small fixes

See merge request Cloud_Solution/doctor_app_flutter!946
4 years ago
Elham Rababh 1088a0ef27 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into improve_code_stander 4 years ago
Elham Rababh eb5d2f3def small fixes 4 years ago
Elham Ali bc4b271d0c Merge branch 'dev_v2.8_roaa' into 'development'
delete unused images from assets/images

See merge request Cloud_Solution/doctor_app_flutter!945
4 years ago
Elham Ali b70ccf66be Merge branch 'improve_code_stander' into 'development'
Improve code stander

See merge request Cloud_Solution/doctor_app_flutter!944
4 years ago
RoaaGhali98 88ade7546a deleted unused images from assets/images 4 years ago
Elham Rababh fb610d21b0 reformat code 4 years ago
Elham Rababh d37d10639a optimize imports 4 years ago
Elham Ali b9f3eefcbd Merge branch 'dev_v2.8_roaa' into 'development'
fixed the errorMessage inside many pages

See merge request Cloud_Solution/doctor_app_flutter!943
4 years ago
RoaaGhali98 17eeaf2cc6 fixed the errorMessage inside many pages 4 years ago
Elham Ali 06855665b5 Merge branch 'dev_v2.8_withouth_null_ckecking' into 'development'
we fix some issues in pharmacies_items_request_model, refer-patient-screen and...

See merge request Cloud_Solution/doctor_app_flutter!942
4 years ago
Elham Ali d23e725794 Merge branch 'dev_v2.8_roaa' into 'dev_v2.8_withouth_null_ckecking'
fixed some issues in localized_values and progress_note_screen

See merge request Cloud_Solution/doctor_app_flutter!941
4 years ago
RoaaGhali98 0901a2e39c fixed some issues in localized_values and progress_note_screen 4 years ago
Elham Ali e360ff5596 Merge branch 'dev_v2.8_roaa' into 'dev_v2.8_withouth_null_ckecking'
we fix some issues in pharmacies_items_request_model, refer-patient-screen and...

See merge request Cloud_Solution/doctor_app_flutter!939
4 years ago
RoaaGhali98 746c2fdddb fixed some issues in localized_values and out_patient_screen 4 years ago
RoaaGhali98 bfeb1ac047 Fixed some issues in patient_sick_leave_screen and vital_sing_chart_blood_pressure 4 years ago
RoaaGhali98 d9d2e40927 we fix some issues in pharmacies_items_request_model, refer-patient-screen and refer-patient-screen-in-patient 4 years ago
Elham Ali f02a6f3f30 Merge branch 'v2.8_elham_fixes' into 'dev_v2.8_withouth_null_ckecking'
fix issues on html editor

See merge request Cloud_Solution/doctor_app_flutter!938
4 years ago
Elham Rababh d66bc3ea2a fix issues on html editor 4 years ago
Elham Ali f8051cda0a Merge branch 'v2.8_elham_fixes' into 'dev_v2.8_withouth_null_ckecking'
fix button inside our app

See merge request Cloud_Solution/doctor_app_flutter!937
4 years ago
Elham Rababh c54015c5c1 fix button inside our app 4 years ago
Elham Ali bce6dc6f63 Merge branch 'v2.8_elham_fixes' into 'dev_v2.8_withouth_null_ckecking'
V2.8 elham fixes

See merge request Cloud_Solution/doctor_app_flutter!936
4 years ago
Elham Rababh 558de8ec75 fix issues with text fields 4 years ago
Elham Rababh 4dc93f7c31 fix issues with text fields 4 years ago
Elham Rababh 73cc5e4b00 fix issues 4 years ago
Elham Rababh 0c4d6da3f4 update gradel 4 years ago
Elham Rababh 26e80356e1 first change 4 years ago
Elham Ali 480017f887 Merge branch 'doctor-app-design' into 'development'
Doctor app design

See merge request Cloud_Solution/doctor_app_flutter!929
4 years ago
hussam al-habibeh a4aa695f25 TextField & page header design fix 4 years ago
Elham Ali 0116de2454 Merge branch 'Dec_fixes' into 'development'
Dec fixes

See merge request Cloud_Solution/doctor_app_flutter!928
4 years ago
Elham Rababh a578d92cb7 fix the arabic issues 4 years ago
Elham Rababh 74540f054a fix sms pop up 4 years ago
Elham Rababh 5d20480e9b fix issues in home design 4 years ago
Elham Rababh 3431c353e9 fix issues in design 4 years ago
Elham Rababh 4dcc20b681 fix issues related to card 4 years ago
Elham Rababh 3e1ac71a48 fix some design issues 4 years ago
Elham Rababh 56fbc47835 fix home page 4 years ago
Elham Rababh 34b4484972 fix tabs 4 years ago
Elham Rababh ae5c9170a7 fix patient gird 4 years ago
hussam al-habibeh fca6990938 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into doctor-app-design 4 years ago
hussam al-habibeh 6f1790d71e Insurance Approval design fix 4 years ago
Elham Ali b8b943e3d9 Merge branch 'Dec_fixes' into 'development'
Dec fixes

See merge request Cloud_Solution/doctor_app_flutter!927
4 years ago
Elham Rababh bd133f8f31 fix issues on Patient card 4 years ago
Elham Rababh f68c0fe426 fix issues on Patient card 4 years ago
Elham Rababh 35279405af Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Dec_fixes 4 years ago
Elham Ali 933ecea67c Merge branch 'doctor-app-design' into 'development'
adding appText to the bottom navagation

See merge request Cloud_Solution/doctor_app_flutter!926
4 years ago
Elham Rababh ad1ae99707 fix bottom_nav_bar 4 years ago
hussam al-habibeh 75a10939fb adding appText to the bottom navagation 4 years ago
Elham Ali 63af889e2f Merge branch 'doctor-app-design' into 'development'
Doctor app design

See merge request Cloud_Solution/doctor_app_flutter!925
4 years ago
hussam al-habibeh 4c1ed7f931 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into doctor-app-design 4 years ago
hussam al-habibeh 46ec7d4c99 app drawer design 4 years ago
Elham Ali 10bbf51c52 Merge branch 'Dec_fixes' into 'development'
Dec fixes

See merge request Cloud_Solution/doctor_app_flutter!924
4 years ago
Elham Rababh c2fbd99ced small fixes 4 years ago
Elham Rababh af10c60a7e fix merge issue in patient_referral_screen.dart 4 years ago
Elham Rababh 3200a7a351 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Dec_fixes
 Conflicts:
	lib/screens/patients/profile/referral/patient_referral_screen.dart
4 years ago
Elham Rababh 70b3776aa7 fix tabs 4 years ago
Elham Ali 6375d9fb2d Merge branch 'doctor-app-design' into 'development'
referral screen design fix

See merge request Cloud_Solution/doctor_app_flutter!923
4 years ago
hussam al-habibeh c6635397bb referral screen design fix 4 years ago
Elham Ali bff995ecfa Merge branch 'Dec_fixes' into 'development'
Dec fixes

See merge request Cloud_Solution/doctor_app_flutter!922
4 years ago
Elham Ali 4049b0e066 Merge branch 'doctor-app-design' into 'development'
app button color fix in multiple screens

See merge request Cloud_Solution/doctor_app_flutter!921
4 years ago
Elham Rababh fb51325188 fix tabs inside doctor replay 4 years ago
Elham Rababh 25e09fa105 fix taps inside in patient 4 years ago
hussam al-habibeh c6a77563cc app button color match 4 years ago
hussam al-habibeh 85e6f63094 app button color fix in multiple screens 4 years ago
Elham Rababh efe25b898d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Dec_fixes 4 years ago
Elham Ali fc81370b0a Merge branch 'doctor-app-design' into 'development'
referal patient card design fix

See merge request Cloud_Solution/doctor_app_flutter!920
4 years ago
Elham Rababh 9e4a9c4b6a fix in patient 4 years ago
hussam al-habibeh 658a28e558 referal patient card design fix 4 years ago
Elham Rababh f97b0bee14 add gradiant to home page 4 years ago
Elham Rababh 6b0e790cd2 add gradiant to home page 4 years ago
Elham Rababh 753a72b85e add missing code 4 years ago
Elham Rababh fc126caddf first step from patient profile 4 years ago
Elham Rababh 98bc33042f add icons to bottom sheet 4 years ago
Elham Rababh 9a1b9eb50b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Dec_fixes 4 years ago
Elham Rababh b54b4d96e9 add assets 4 years ago
Elham Ali d3e90ed984 Merge branch 'Dec_fixes' into 'development'
add  svgs

See merge request Cloud_Solution/doctor_app_flutter!919
4 years ago
Elham Rababh 279004b58b add svgs 4 years ago
Elham Ali f256527302 Merge branch 'Dec_fixes' into 'development'
Dec fixes

See merge request Cloud_Solution/doctor_app_flutter!918
4 years ago
Elham Rababh a02e89febb add verfication svgs 4 years ago
Elham Rababh 6c78fda392 fix in slider 4 years ago
Elham Rababh 47357fe84e bottom nav and dashboard_referral_patient 4 years ago
Elham Ali adc9f8b4dc Merge branch 'doctor-app-design' into 'development'
Doctor app design

See merge request Cloud_Solution/doctor_app_flutter!917
4 years ago
hussam al-habibeh 2b763e954a bottom_sheet_title design fix 4 years ago
hussam al-habibeh b265210565 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into doctor-app-design 4 years ago
hussam al-habibeh 67a5bcff91 patient header & app drawer desigining 4 years ago
Elham Ali 3c8d1fdf39 Merge branch 'Dec_fixes' into 'development'
Dec fixes

See merge request Cloud_Solution/doctor_app_flutter!916
4 years ago
Elham Rababh ecffe99f19 small fixes 4 years ago
Elham Rababh fedb4533c7 second step from home page. 4 years ago
Elham Rababh 5f2e0be78c first step from home page. 4 years ago
Elham Rababh 9e1aeb857f Patient card 4 years ago
Elham Ali 5d710054ea Merge branch 'Dec_fixes' into 'development'
Dec fixes

See merge request Cloud_Solution/doctor_app_flutter!915
4 years ago
Elham Rababh 98f6d63fcd add simibold 4 years ago
Elham Rababh 52bd1511e8 fix patient card 4 years ago
Elham Ali 4760d4ae50 Merge branch 'Dec_fixes' into 'development'
change the green color

See merge request Cloud_Solution/doctor_app_flutter!914
4 years ago
Elham Ali 2ff5fbad7c Merge branch 'doctor-app-design' into 'development'
Doctor app design

See merge request Cloud_Solution/doctor_app_flutter!913
4 years ago
Elham Rababh 3d379b3b84 change the green color 4 years ago
hussam al-habibeh 3bfee08b9d textfiled and app button design change 4 years ago
hussam al-habibeh bd7e683900 textfiled design 4 years ago
Elham Ali fbaeb1b361 Merge branch 'registration' into 'development'
ui fix discharged patient card

See merge request Cloud_Solution/doctor_app_flutter!909
4 years ago
hussam al-habibeh 118d367b4c ui fix discharged patient card 4 years ago
Elham Ali 1f893042db Merge branch 'fixes_nov' into 'development'
fix issue

See merge request Cloud_Solution/doctor_app_flutter!908
4 years ago
Elham Rababh 72df25d949 fix issue 4 years ago
Elham Ali 00e0680c95 Merge branch 'registration' into 'development'
translation and ui fixes

See merge request Cloud_Solution/doctor_app_flutter!906
4 years ago
hussam al-habibeh e2cde9a39f translation and ui fixes 4 years ago
hussam al-habibeh e59220d1b7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into registration
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Ali b0de660325 Merge branch 'fixes_nov' into 'development'
small fix

See merge request Cloud_Solution/doctor_app_flutter!907
4 years ago
hussam al-habibeh f16f54fee2 translation and ui fixes 4 years ago
Elham Rababh e31fadc9be small fix 4 years ago
Elham Ali 8e795535b8 Merge branch 'fixes_nov' into 'development'
Fixes nov

See merge request Cloud_Solution/doctor_app_flutter!905
4 years ago
Elham Ali 83bea13b8d Merge branch 'registration' into 'development'
translation and ui fixes

See merge request Cloud_Solution/doctor_app_flutter!904
4 years ago
Elham Rababh 92ceb99212 translation for in patient 4 years ago
hussam al-habibeh f3462385fd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into registration
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababh 14a43ab53a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fixes_nov 4 years ago
Elham Rababh cce0a8377c small fix 4 years ago
hussam al-habibeh 999c2a920d translation and ui fixes 4 years ago
Elham Ali b3bfda9128 Merge branch 'fixes_nov' into 'development'
fix operation reports

See merge request Cloud_Solution/doctor_app_flutter!903
4 years ago
Elham Ali 5d8b521941 Merge branch 'registration' into 'development'
adding countries to registration

See merge request Cloud_Solution/doctor_app_flutter!902
4 years ago
Elham Rababh c17397bf5e fix operation reports 4 years ago
hussam al-habibeh 1c8d25c95c adding countries to registration 4 years ago
Elham Ali 13c05e87dc Merge branch 'fixes_nov' into 'development'
Fixes nov

See merge request Cloud_Solution/doctor_app_flutter!901
4 years ago
Elham Rababh 6ae4d3a7cd small fixes 4 years ago
Elham Rababh eda9aeb26b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fixes_nov 4 years ago
Elham Rababh d1060ba27a small fixes 4 years ago
Elham Rababh bfd86f533a small fixes 4 years ago
Elham Ali 189864f4ba Merge branch 'revert-8a1d88c1' into 'development'
Revert "Merge branch 'hussam_flutter_2' into 'development'"

See merge request Cloud_Solution/doctor_app_flutter!894
4 years ago
Elham Ali 81ae0b04d3 Revert "Merge branch 'hussam_flutter_2' into 'development'"
This reverts merge request !893
4 years ago
Elham Ali 8a1d88c1f6 Merge branch 'hussam_flutter_2' into 'development'
Hussam flutter 2

See merge request Cloud_Solution/doctor_app_flutter!893
4 years ago
hussam al-habibeh 24618e5232 flutter 2 models 4 years ago
hussam al-habibeh 1146f613df flutter 2 models 4 years ago
hussam al-habibeh a8adacfc5c Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam_flutter_2
 Conflicts:
	pubspec.lock
4 years ago
Elham Ali 43c670e5b1 Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'
4 step from fix screen

See merge request Cloud_Solution/doctor_app_flutter!891
4 years ago
hussam al-habibeh 948b8c877d flutter 2 models 4 years ago
Elham Rababh d808f8b2ac 4 step from fix screen 4 years ago
Elham Ali 1eb2221a00 Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'
Flutter vervion 2 by elham

See merge request Cloud_Solution/doctor_app_flutter!890
4 years ago
Elham Rababh f4a9ab14c8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
 Conflicts:
	lib/core/service/patient/profile/discharge_summary_servive.dart
	lib/core/viewModel/profile/discharge_summary_view_model.dart
	lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart
	lib/screens/patients/profile/discharge_summary/discharge_summary.dart
	lib/screens/patients/profile/discharge_summary/pending_discharge_summary.dart
4 years ago
Elham Rababh 1f28a09043 first step from fix screen 4 years ago
Elham Rababh ec83d72038 first step from fix screen 4 years ago
Elham Ali cb29b1021e Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'
Flutter vervion 2 by elham

See merge request Cloud_Solution/doctor_app_flutter!889
4 years ago
Elham Rababh dc0f3e7235 fix utils && widget 4 years ago
Elham Rababh ced1c9b392 first step from fix service 4 years ago
Elham Ali ede9574084 Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'
Flutter vervion 2 by elham

See merge request Cloud_Solution/doctor_app_flutter!888
4 years ago
Elham Rababh 7f9969b6cf some fixes to go flutter 2 4 years ago
Elham Rababh 47437c8637 some fixes to go flutter 2 4 years ago
Elham Ali f99ce10edf Merge branch 'discharge_report' into 'development'
Discharge report

See merge request Cloud_Solution/doctor_app_flutter!887
4 years ago
Elham Ali 3974586bc9 Merge branch 'get_pending_orders' into 'development'
Get pending orders

See merge request Cloud_Solution/doctor_app_flutter!886
4 years ago
hussam al-habibeh dfce0d20e2 discharge summary card 4 years ago
Elham Rababh eceb3976ad fix issues happend after merge 4 years ago
hussam al-habibeh 37d4dfffa2 all discharge summary 4 years ago
Elham Rababh a6153db2f9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/localized_values.dart
	lib/config/size_config.dart
	lib/core/model/Prescriptions/prescription_report.dart
	lib/core/model/Prescriptions/prescription_report_enh.dart
	lib/core/model/auth/activation_Code_req_model.dart
	lib/core/model/auth/activation_code_for_verification_screen_model.dart
	lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
	lib/core/model/auth/check_activation_code_request_model.dart
	lib/core/model/labs/lab_result.dart
	lib/core/model/patient_muse/PatientSearchRequestModel.dart
	lib/core/model/procedure/get_ordered_procedure_request_model.dart
	lib/core/model/referral/MyReferralPatientModel.dart
	lib/core/model/sick_leave/sick_leave_patient_model.dart
	lib/core/model/sick_leave/sick_leave_patient_request_model.dart
	lib/core/service/VideoCallService.dart
	lib/core/service/base/base_service.dart
	lib/core/service/home/scan_qr_service.dart
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/service/patient/MyReferralPatientService.dart
	lib/core/service/patient/patient-doctor-referral-service.dart
	lib/core/service/patient_medical_file/lab_order/labs_service.dart
	lib/core/service/patient_medical_file/medical_report/PatientMedicalReportService.dart
	lib/core/service/patient_medical_file/prescription/prescriptions_service.dart
	lib/core/service/patient_medical_file/procedure/procedure_service.dart
	lib/core/service/patient_medical_file/radiology/radiology_service.dart
	lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart
	lib/core/service/patient_medical_file/soap/SOAP_service.dart
	lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/core/viewModel/SOAP_view_model.dart
	lib/core/viewModel/authentication_view_model.dart
	lib/core/viewModel/base_view_model.dart
	lib/core/viewModel/dashboard_view_model.dart
	lib/core/viewModel/doctor_replay_view_model.dart
	lib/core/viewModel/labs_view_model.dart
	lib/core/viewModel/patient-referral-viewmodel.dart
	lib/core/viewModel/patient-ucaf-viewmodel.dart
	lib/core/viewModel/prescription_view_model.dart
	lib/core/viewModel/prescriptions_view_model.dart
	lib/core/viewModel/procedure_View_model.dart
	lib/core/viewModel/sick_leave_view_model.dart
	lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart
	lib/models/SOAP/GetPhysicalExamReqModel.dart
	lib/models/SOAP/my_selected_allergy.dart
	lib/models/SOAP/my_selected_assement.dart
	lib/models/SOAP/my_selected_examination.dart
	lib/models/SOAP/my_selected_history.dart
	lib/models/SOAP/post_chief_complaint_request_model.dart
	lib/models/SOAP/post_physical_exam_request_model.dart
	lib/models/doctor/list_gt_my_patients_question_model.dart
	lib/models/doctor/profile_req_Model.dart
	lib/models/doctor/replay/request_doctor_reply.dart
	lib/models/livecare/start_call_res.dart
	lib/models/patient/patiant_info_model.dart
	lib/models/patient/progress_note_request.dart
	lib/models/patient/vital_sign/vital_sign_req_model.dart
	lib/models/pharmacies/pharmacies_items_request_model.dart
	lib/screens/auth/verification_methods_screen.dart
	lib/screens/doctor/doctor_repaly_chat.dart
	lib/screens/doctor/doctor_replay/doctor_reply_widget.dart
	lib/screens/doctor/doctor_reply_screen.dart
	lib/screens/doctor/my_referral_patient_screen.dart
	lib/screens/home/dashboard_swipe_widget.dart
	lib/screens/home/home_patient_card.dart
	lib/screens/home/home_screen.dart
	lib/screens/live_care/end_call_screen.dart
	lib/screens/live_care/live_care_patient_screen.dart
	lib/screens/live_care/video_call.dart
	lib/screens/medical-file/health_summary_page.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/screens/patients/DischargedPatientPage.dart
	lib/screens/patients/InPatientPage.dart
	lib/screens/patients/PatientsInPatientScreen.dart
	lib/screens/patients/insurance_approval_screen_patient.dart
	lib/screens/patients/out_patient/out_patient_screen.dart
	lib/screens/patients/patient_search/patient_search_header.dart
	lib/screens/patients/patient_search/patient_search_result_screen.dart
	lib/screens/patients/patient_search/patient_search_screen.dart
	lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart
	lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
	lib/screens/patients/profile/UCAF/page-stepper-widget.dart
	lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
	lib/screens/patients/profile/admission-request/admission-request-third-screen.dart
	lib/screens/patients/profile/admission-request/admission-request_second-screen.dart
	lib/screens/patients/profile/lab_result/FlowChartPage.dart
	lib/screens/patients/profile/lab_result/LabResultWidget.dart
	lib/screens/patients/profile/lab_result/laboratory_result_page.dart
	lib/screens/patients/profile/lab_result/laboratory_result_widget.dart
	lib/screens/patients/profile/lab_result/labs_home_page.dart
	lib/screens/patients/profile/medical_report/AddVerifyMedicalReport.dart
	lib/screens/patients/profile/medical_report/MedicalReportPage.dart
	lib/screens/patients/profile/notes/note/progress_note_screen.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
	lib/screens/patients/profile/radiology/radiology_details_page.dart
	lib/screens/patients/profile/radiology/radiology_home_page.dart
	lib/screens/patients/profile/referral/my-referral-detail-screen.dart
	lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart
	lib/screens/patients/profile/referral/refer-patient-screen-in-patient.dart
	lib/screens/patients/profile/referral/refer-patient-screen.dart
	lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
	lib/screens/patients/profile/referral/referred-patient-screen.dart
	lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart
	lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
	lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart
	lib/screens/patients/profile/soap_update/objective/add_examination_page.dart
	lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart
	lib/screens/patients/profile/soap_update/objective/examination_item_card.dart
	lib/screens/patients/profile/soap_update/objective/examinations_list_search_widget.dart
	lib/screens/patients/profile/soap_update/objective/update_objective_page.dart
	lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_open_items.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/steps_widget.dart
	lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart
	lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart
	lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart
	lib/screens/patients/profile/soap_update/subjective/history/priority_bar.dart
	lib/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart
	lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
	lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
	lib/screens/patients/profile/soap_update/update_soap_index.dart
	lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
	lib/screens/prescription/add_prescription_form.dart
	lib/screens/prescription/prescription_item_in_patient_page.dart
	lib/screens/prescription/prescription_text_filed.dart
	lib/screens/prescription/prescriptions_page.dart
	lib/screens/procedures/ProcedureCard.dart
	lib/screens/procedures/add-favourite-procedure.dart
	lib/screens/procedures/procedure_checkout_screen.dart
	lib/screens/procedures/procedure_screen.dart
	lib/screens/reschedule-leaves/add-rescheduleleave.dart
	lib/screens/reschedule-leaves/reschedule_leave.dart
	lib/screens/sick-leave/add-sickleave.dart
	lib/screens/sick-leave/show-sickleave.dart
	lib/screens/sick-leave/sick_leave.dart
	lib/util/VideoChannel.dart
	lib/util/date-utils.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/patient-referral-item-widget.dart
	lib/widgets/patients/patient_card/PatientCard.dart
	lib/widgets/patients/profile/PatientProfileButton.dart
	lib/widgets/patients/profile/patient-profile-app-bar.dart
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
	lib/widgets/patients/profile/profile-welcome-widget.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
	lib/widgets/patients/profile/profile_medical_info_widget_search.dart
	lib/widgets/patients/profile/profile_status_info_widget.dart
	lib/widgets/shared/app_texts_widget.dart
	lib/widgets/shared/bottom_nav_bar.dart
	lib/widgets/shared/bottom_navigation_item.dart
	lib/widgets/shared/buttons/app_buttons_widget.dart
	lib/widgets/shared/card_with_bg_widget.dart
	lib/widgets/shared/dialogs/dailog-list-select.dart
	lib/widgets/shared/dialogs/master_key_dailog.dart
	lib/widgets/shared/doctor_card.dart
	lib/widgets/shared/doctor_card_insurance.dart
	lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart
	lib/widgets/shared/master_key_checkbox_search_widget.dart
	lib/widgets/shared/rounded_container_widget.dart
	lib/widgets/shared/text_fields/app-textfield-custom.dart
	lib/widgets/shared/text_fields/text_fields_utils.dart
	lib/widgets/shared/user-guid/custom_validation_error.dart
	lib/widgets/transitions/fade_page.dart
	lib/widgets/transitions/slide_up_page.dart
	pubspec.lock
	pubspec.yaml
4 years ago
Elham Rababh 8f0e69df3a fix text fields 4 years ago
hussam al-habibeh ff1cffc24d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders 4 years ago
hussam al-habibeh bc92f9b9f5 contries model 4 years ago
Elham Ali 49205f797d Merge branch 'discharge_summary' into 'development'
Discharge summary

See merge request Cloud_Solution/doctor_app_flutter!885
4 years ago
Elham Rababh 6ffbf92d43 finish pending discharge summary 4 years ago
Elham Rababh f23607b6e4 first step form discharge summary 4 years ago
Elham Ali f98c34fcc6 Merge branch 'nov_fixes' into 'development'
fix issues inside diff pages

See merge request Cloud_Solution/doctor_app_flutter!884
4 years ago
Elham Rababh 2e884c4a35 fix issues inside diff pages 4 years ago
Elham Ali 101bc9f1b6 Merge branch 'hijri_calender' into 'development'
Hijri calender

See merge request Cloud_Solution/doctor_app_flutter!883
4 years ago
Elham Rababh ca854638e5 fix merge issue 4 years ago
Elham Rababh 0bdb15b14e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hijri_calender
 Conflicts:
	lib/screens/patients/register_patient/RegisterSearchPatientPage.dart
4 years ago
Elham Ali c4617250ae Merge branch 'get_pending_orders' into 'development'
Get pending orders

See merge request Cloud_Solution/doctor_app_flutter!882
4 years ago
Elham Rababh 8d2b6e9b08 finish hijri calender 4 years ago
hussam al-habibeh 132d781eb5 conflect resorved 4 years ago
hussam al-habibeh aaabae5900 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
 Conflicts:
	lib/models/doctor/profile_req_Model.dart
4 years ago
hussam al-habibeh 92d81700e1 adding country option to register page 4 years ago
Elham Rababh 8e85bb239e first step from hijri Calender 4 years ago
hussam al-habibeh 25f65802a5 register search page change 4 years ago
Elham Ali 61d2c6cdad Merge branch 'register_patient_services' into 'development'
Register patient services

See merge request Cloud_Solution/doctor_app_flutter!881
4 years ago
Elham Rababh eb89dc3395 fix navigator issues 4 years ago
Elham Rababh 52ec3fc0e3 fix navigator issues 4 years ago
Elham Ali ffba0ae352 Merge branch 'register_patient_services' into 'development'
fix version id

See merge request Cloud_Solution/doctor_app_flutter!880
4 years ago
Elham Rababh 03acd233cf fix version id 4 years ago
Elham Ali 26ffd7cb7a Merge branch 'register_patient_services' into 'development'
Register patient services

See merge request Cloud_Solution/doctor_app_flutter!879
4 years ago
Elham Rababh 515297ebf6 finish confirmation page 4 years ago
Elham Rababh cf498de70f finish confirmation page 4 years ago
Elham Rababh 5567b31daf Merge branch 'get_pending_orders' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into register_patient_services 4 years ago
Elham Rababh ad845b882c finish confirmation page 4 years ago
Elham Rababh 4fe53ef71e add hijri converter 4 years ago
Elham Rababh 3eddf2eab5 first step from service part 4 years ago
hussam al-habibeh 13c42b297a check activation code 4 years ago
hussam al-habibeh 9eadc0f0b1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
 Conflicts:
	lib/core/viewModel/PatientRegistrationViewModel.dart
	lib/screens/patients/register_patient/RegisterPatientPage.dart
4 years ago
hussam al-habibeh fd9e8ddb28 actaivation code page 4 years ago
Elham Ali 482feece26 Merge branch 'register_patient_services' into 'development'
mock the calling the second service

See merge request Cloud_Solution/doctor_app_flutter!877
4 years ago
Elham Ali 75e944427c Merge branch 'lap_result_fix' into 'development'
fix lap result special

See merge request Cloud_Solution/doctor_app_flutter!876
4 years ago
Elham Rababh 514fb71c51 mock the calling the second service 4 years ago
hussam al-habibeh 08df479b37 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
 Conflicts:
	lib/screens/patients/register_patient/RegisterPatientPage.dart
4 years ago
hussam al-habibeh d4927873d5 fix lap result special 4 years ago
Elham Ali 6f29a70991 Merge branch 'register_patient_services' into 'development'
Register patient services

See merge request Cloud_Solution/doctor_app_flutter!875
4 years ago
Elham Rababh 324f515253 first step form register patient service 4 years ago
Elham Rababh f4311b4106 first step form register patient service 4 years ago
Elham Rababh 4f123b0af2 first step form register patient service 4 years ago
hussam al-habibeh 1a35201f27 regstration activtion code 4 years ago
Elham Rababh 3229a1ff99 remove red color 4 years ago
Elham Ali 4d01c74bf8 Merge branch 'rig_page' into 'development'
Rig page

See merge request Cloud_Solution/doctor_app_flutter!874
4 years ago
Elham Rababh cb223be8b3 fix issue in Register Patient Page 4 years ago
Elham Rababh 5e4b2d8202 showModalBottomSheet in confirmation page 4 years ago
Mohammad Aljammal 9de1085b49 Merge branch 'get_pending_orders' into 'development'
admission orders changes

See merge request Cloud_Solution/doctor_app_flutter!872
4 years ago
hussam al-habibeh d0e6532814 admission orders changes 4 years ago
Mohammad Aljammal 45822d16d1 Merge branch 'operation_details' into 'development'
fix merge conflict

See merge request Cloud_Solution/doctor_app_flutter!871
4 years ago
Elham Rababh a9d097da54 fix merge conflict 4 years ago
Mohammad Aljammal e371d105c4 Merge branch 'operation_details' into 'development'
Operation details

See merge request Cloud_Solution/doctor_app_flutter!869
4 years ago
Elham Rababh 6b09276c93 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into operation_details
 Conflicts:
	lib/core/service/operation_report_servive.dart
4 years ago
Mohammad Aljammal ac1b4d9865 Merge branch 'confirmation_page' into 'development'
first step form confirmation page

See merge request Cloud_Solution/doctor_app_flutter!870
4 years ago
Mohammad Aljammal 5e976367f0 Merge branch 'get_pending_orders' into 'development'
admission orders change

See merge request Cloud_Solution/doctor_app_flutter!868
4 years ago
Elham Rababh 04583d8c42 finish operation details report 4 years ago
Elham Rababh 22b424515c finish operation details report 4 years ago
Elham Rababh 97a15bfb35 first step form confirmation page 4 years ago
hussam al-habibeh 2fe475d98a admission orders change 4 years ago
hussam al-habibeh 9270f58615 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
 Conflicts:
	lib/core/service/operation_report_servive.dart
4 years ago
Mohammad Aljammal 6e61bd8c1d Merge branch 'diabetic_chart_values' into 'development'
Diabetic chart values

See merge request Cloud_Solution/doctor_app_flutter!867
4 years ago
Elham Rababh 230ebaf445 operation report 4 years ago
Elham Rababh 93bcfff7a0 fix doctors name 4 years ago
Mohammad Aljammal 2a677cd5d5 Merge branch 'patient_registration' into 'development'
Patient registration

See merge request Cloud_Solution/doctor_app_flutter!866
4 years ago
Mohammad Aljammal 331b27c3ec fix merge issue 4 years ago
Mohammad Aljammal 5ad9976c40 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_registration
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
4 years ago
Mohammad Aljammal 9689044be7 Add models and create vm, services for patient registration 4 years ago
Mohammad Aljammal 7723ee2ec1 Merge branch 'register_patient_feature' into 'development'
make register patient feature

See merge request Cloud_Solution/doctor_app_flutter!865
4 years ago
mosazaid faa7c08266 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into register_patient_feature
 Conflicts:
	lib/locator.dart
4 years ago
mosazaid 7b8312fe26 make register patient feature 4 years ago
Elham Rababh 9e2b72a7cb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into diabetic_chart_values
 Conflicts:
	lib/config/config.dart
	lib/routes.dart
4 years ago
Elham Rababh 514e6c81c7 finish diabetic 4 years ago
Mohammad Aljammal 60a15d1a60 Merge branch 'get_pending_orders' into 'development'
Get pending orders

See merge request Cloud_Solution/doctor_app_flutter!864
4 years ago
hussam al-habibeh 056b0bbd78 admission orders change 4 years ago
hussam al-habibeh 9b87ea8c22 get admission orders 4 years ago
hussam al-habibeh 3f7a839950 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
 Conflicts:
	lib/routes.dart
	lib/screens/patients/profile/operation_report/operation_report.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
4 years ago
hussam al-habibeh ae0c588d32 get admission orders 4 years ago
Elham Rababh dd971ffddb first step from get diabetic 4 years ago
Mohammad Aljammal b355545549 Merge branch 'get_nursing_progress_note' into 'development'
Get nursing progress note

See merge request Cloud_Solution/doctor_app_flutter!863
4 years ago
Elham Rababh 45f4aa9a22 fix issues related to design 4 years ago
Elham Rababh b21acfd2c6 fix route issues 4 years ago
Mohammad Aljammal 52e5b86f6c Merge branch 'get_operation_report' into 'development'
Get operation report

See merge request Cloud_Solution/doctor_app_flutter!862
4 years ago
Mohammad Aljammal 7aa2c9f3ad Merge branch 'get_nursing_progress_note' into 'development'
Get nursing progress note

See merge request Cloud_Solution/doctor_app_flutter!861
4 years ago
hussam al-habibeh 64b5652c8d Pending Orders Service 4 years ago
Elham Rababh 35acd1f21f finish the nursing DiagnosisScreen 4 years ago
Elham Rababh 1a3567f917 finish the nursing DiagnosisScreen 4 years ago
Elham Rababh 72c948371a finish the nursing progress_note_screen 4 years ago
Elham Rababh 4ebecc4277 Merge branch 'get_operation_report' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_operation_report
 Conflicts:
	lib/core/viewModel/operation_report_view_model.dart
4 years ago
Elham Rababh a44a207116 finish the operation Reports from our side 4 years ago
Mohammad Aljammal d7b1212b54 Merge branch 'get_operation_report' into 'development'
Get operation report

See merge request Cloud_Solution/doctor_app_flutter!860
4 years ago
Mohammad Aljammal 26663b9666 Merge branch 'refer-hot-fix' into 'development'
home page design fix

See merge request Cloud_Solution/doctor_app_flutter!859
4 years ago
hussam al-habibeh ee3d207795 get operation report 4 years ago
Elham Rababh 231614e914 Merge branch 'get_operation_report' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_operation_report
 Conflicts:
	lib/core/service/operation_report_servive.dart
	lib/core/viewModel/operation_report_view_model.dart
	lib/screens/patients/profile/operation_report/update_operation_report.dart
4 years ago
Elham Rababh fbf1cd29ee add some fiels 4 years ago
hussam al-habibeh d035f1ba37 opertion report screen 4 years ago
Elham Rababh 7684b65e8a first step from update_operation_report.dart 4 years ago
Elham Rababh 469556758b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_operation_report 4 years ago
hussam al-habibeh d4363aeefb opertion report screen 4 years ago
hussam al-habibeh 318560b1d7 opertion report screen 4 years ago
mosazaid efbe6ae76b home page design fix 4 years ago
Mohammad Aljammal 6003df7f63 Merge branch 'special_clinic_fixes' into 'development'
fix special clinic issue

See merge request Cloud_Solution/doctor_app_flutter!858
4 years ago
Elham Rababh 93da7b8118 fix special clinic issue 4 years ago
Mohammad Aljammal 4e52155342 Merge branch 'all_special_lab_result' into 'development'
fix in-patient prescription

See merge request Cloud_Solution/doctor_app_flutter!857
4 years ago
Mohammad Aljammal 54f1bbf184 Merge branch 'refer-hot-fix' into 'development'
refer inpatient hot fix

See merge request Cloud_Solution/doctor_app_flutter!856
4 years ago
Mohammad Aljammal e15be3f09d Merge branch 'special_clinic_fixes' into 'development'
Special clinic fixes

See merge request Cloud_Solution/doctor_app_flutter!855
4 years ago
mosazaid bb8ffbf63b refer inpatient hot fix 4 years ago
Elham Rababh 96cfc3d659 fix specialClinic it suppose to be fixed 4 years ago
hussam al-habibeh 2f65546ff6 fix in-patient prescription 4 years ago
Elham Rababh 9c6cebcffd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sick_leave 4 years ago
Elham Rababh a4654e9bce add isCopyable on progress note 4 years ago
Mohammad Aljammal 7436cdb5be Merge branch 'all_special_lab_result' into 'development'
adding slide up to prescription and procedure

See merge request Cloud_Solution/doctor_app_flutter!854
4 years ago
hussam al-habibeh 7d4f6d5264 adding slide up to prescription and procedure 4 years ago
Mohammad Aljammal 737f9f6389 Merge branch 'release_6.4' into 'development'
change server url

See merge request Cloud_Solution/doctor_app_flutter!852
4 years ago
Mohammad Aljammal 96ee21b15f change server url 4 years ago
Mohammad Aljammal 35bfa85a1a Merge branch 'all_special_lab_result' into 'development'
fix reschedule

See merge request Cloud_Solution/doctor_app_flutter!851
4 years ago
hussam al-habibeh 6dd8f62b2a fix reschedule 4 years ago
Mohammad Aljammal b9ebde0ec8 Merge branch 'sick_leave' into 'development'
fix issue

See merge request Cloud_Solution/doctor_app_flutter!850
4 years ago
Elham Rababh 17ee942de1 fix issue 4 years ago
Mohammad Aljammal 65f8f061db Merge branch 'fix_inpatient' into 'development'
Fix inpatient

See merge request Cloud_Solution/doctor_app_flutter!849
4 years ago
Mohammad Aljammal 8ae51c3580 Merge branch 'sick_leave' into 'development'
fix last

See merge request Cloud_Solution/doctor_app_flutter!848
4 years ago
Elham Rababh d1ccb3c433 fix last 4 years ago
Mohammad Aljammal c231ae378a Merge branch 'sick_leave' into 'development'
Sick leave

See merge request Cloud_Solution/doctor_app_flutter!847
4 years ago
Elham Rababh 8be6bd257d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sick_leave
 Conflicts:
	pubspec.lock
4 years ago
Elham Rababh b23fe5ee1b add selected date 4 years ago
Elham Rababh 87b70ff905 fix last issue 4 years ago
Mohammad Aljammal dd4eb2f76d Merge branch 'design-fixes' into 'development'
design fixes

See merge request Cloud_Solution/doctor_app_flutter!846
4 years ago
Elham Rababh 9a5eff8c8b sick leave fixes 4 years ago
mosazaid 495c8fb3b0 change lab result design 4 years ago
Elham Rababh 4711b6264c rename files 4 years ago
Elham Rababh 8a0e94c854 match the design as xd 4 years ago
Elham Rababh f05455fddf finish sick leave design 4 years ago
Elham Rababh ff07686bf7 fix sick leave design 4 years ago
mosazaid 2274affd9a design fixes 4 years ago
Elham Rababh 29336a9ef3 fix the design of all sick leave 4 years ago
Mohammad Aljammal cec3a78d94 Merge branch 'all_special_lab_result' into 'development'
All special lab result

See merge request Cloud_Solution/doctor_app_flutter!845
4 years ago
hussam al-habibeh b86bc33266 fix scroll in special lab result 4 years ago
hussam al-habibeh fe5456db2a fix prescription 4 years ago
Mohammad Aljammal 640dc239b0 Merge branch 'search_text_fields' into 'development'
Search text fields

See merge request Cloud_Solution/doctor_app_flutter!844
4 years ago
Elham Rababh 71463dc459 remove margin top form DischargedPatient 4 years ago
Elham Rababh aaca94e93c first step form sick leave 4 years ago
Mohammad Aljammal 3cd4973eab Merge branch 'design-fixes' into 'development'
design fixes for lab result

See merge request Cloud_Solution/doctor_app_flutter!843
4 years ago
mosazaid 62ee6dff3a design fixes for lab result 4 years ago
Mohammad Aljammal f095da8943 fix inpatient issue 4 years ago
Mohammad Aljammal 771d94ff4c Merge branch 'search_text_fields' into 'development'
Search text fields

See merge request Cloud_Solution/doctor_app_flutter!842
4 years ago
Elham Rababh 0ab0570bc6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_text_fields 4 years ago
Elham Rababh dac8f90a8a rename file related to custom search 4 years ago
Mohammad Aljammal faf8c8ede7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 4 years ago
Elham Rababh b27cc6ae9a serach-text_fields 4 years ago
Mohammad Aljammal 6002e22d6d Merge branch 'design-fixes' into 'development'
design fixes

See merge request Cloud_Solution/doctor_app_flutter!841
4 years ago
Mohammad Aljammal 1a7fd766d5 Merge branch 'all_special_lab_result' into 'development'
All special lab result

See merge request Cloud_Solution/doctor_app_flutter!839
4 years ago
Mohammad Aljammal 062194ba01 Merge branch 'sep_fixes' into 'development'
fix in patient issues

See merge request Cloud_Solution/doctor_app_flutter!840
4 years ago
mosazaid 136313ac72 design fixes for lab result 4 years ago
mosazaid 4663a65fd6 design fixes 4 years ago
Elham Rababh 47df7e5919 fix in patient issues 4 years ago
hussam al-habibeh 7be6ef6ed6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into all_special_lab_result
 Conflicts:
	pubspec.lock
4 years ago
hussam al-habibeh 288bef5a5f fix all special result 4 years ago
Mohammad Aljammal f56a23aad9 fix lab issue 4 years ago
Mohammad Aljammal b2ce970195 Merge branch 'replay_taps' into 'development'
fix cashing issue

See merge request Cloud_Solution/doctor_app_flutter!838
4 years ago
Elham Rababh 4923b66065 fix cashing issue 4 years ago
Mohammad Aljammal 57d34425ba Merge branch 'replay_taps' into 'development'
Replay taps

See merge request Cloud_Solution/doctor_app_flutter!837
4 years ago
Elham Rababh b119590e39 Doctor replay add info status 99 4 years ago
Mohammad Aljammal 6b7fc1bf56 Merge branch 'in-patient-medication' into 'development'
favorite prescription hot fix

See merge request Cloud_Solution/doctor_app_flutter!836
4 years ago
Mohammad Aljammal 8a07dfda15 Merge branch 'inpatient_scroll' into 'development'
remove create episode in case of in patinet

See merge request Cloud_Solution/doctor_app_flutter!834
4 years ago
hussam al-habibeh 8d8200ab9b favorite prescription hot fix 4 years ago
Elham Rababh 28140b6ca4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into replay_taps 4 years ago
Mohammad Aljammal 942bcd1bd3 Merge branch 'episode_inpatient_changes' into 'development'
fix login issue

See merge request Cloud_Solution/doctor_app_flutter!835
4 years ago
Mohammad Aljammal 777bdb8a0d fix login issue 4 years ago
Elham Rababh 5a821e3d64 remove create episode in case of in patinet 4 years ago
Mohammad Aljammal 8383ce17bd Merge branch 'in-patient-medication' into 'development'
Medication for in-patient hot fix

See merge request Cloud_Solution/doctor_app_flutter!833
4 years ago
Mohammad Aljammal 66bdf11b1f Merge branch 'hot_fix_bugs' into 'development'
Hot fix bugs

See merge request Cloud_Solution/doctor_app_flutter!832
4 years ago
hussam al-habibeh a731851a92 Medication for in-patient hot fix 4 years ago
mosazaid 702bb5b8da fix design 4 years ago
mosazaid d70ad7f2c3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hot_fix_bugs 4 years ago
mosazaid 6ca3baf7cb solve lab results design issue 4 years ago
Mohammad Aljammal b62d4d1dad Merge branch 'inpatient_scroll' into 'development'
fix in patient issues

See merge request Cloud_Solution/doctor_app_flutter!831
4 years ago
Elham Rababh c74dca1404 fix select clinic 4 years ago
Elham Rababh 5e90f14a89 add translation 4 years ago
Elham Rababh 99868a058c fix in patient issues 4 years ago
Mohammad Aljammal ca3dddd581 Merge branch 'episode_inpatient_changes' into 'development'
Episode inpatient changes

See merge request Cloud_Solution/doctor_app_flutter!829
5 years ago
Mohammad Aljammal c1103f26fa Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_inpatient_changes
 Conflicts:
	lib/widgets/patients/patient_card/PatientCard.dart
5 years ago
Mohammad Aljammal 02109a40e1 Merge branch 'in-patient-medication' into 'development'
In patient medication

See merge request Cloud_Solution/doctor_app_flutter!830
5 years ago
hussam al-habibeh 6eecb4a614 adding cashed network image 5 years ago
Elham Rababh f2dbfaf2be fix issue after merge the dev 5 years ago
Elham Rababh de5621a629 fix issue after merge the dev 5 years ago
Elham Rababh cdc3b36174 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_inpatient_changes
 Conflicts:
	lib/screens/patients/In_patient/in_patient_list_page.dart
5 years ago
Elham Rababh ce199f7d98 separate in patient and my in patient to 2 files 5 years ago
Mohammad Aljammal 3d7f8b5997 Merge branch 'app_bug_fixes' into 'development'
fix bug sick leave

See merge request Cloud_Solution/doctor_app_flutter!828
5 years ago
mosazaid 9598c09ea2 scroll problem 5 years ago
hussam al-habibeh 696b8b89ec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in-patient-medication
 Conflicts:
	lib/widgets/patients/patient_card/PatientCard.dart
5 years ago
hussam al-habibeh ba275eaed4 adding cashed network image 5 years ago
Elham Rababh 37cd34f568 move no data widget to separate file 5 years ago
mosazaid 6a96a9cb28 fix bug sick leave 5 years ago
Elham Rababh a1f9729091 in patient list improve performace 5 years ago
Mohammad Aljammal 0ff08801f1 Merge branch 'in-patient-medication' into 'development'
adding missing fields for medication

See merge request Cloud_Solution/doctor_app_flutter!827
5 years ago
hussam al-habibeh 763686fc76 adding missing fields for medication 5 years ago
Elham Rababh 9317173c05 add filtration on level of clinic 5 years ago
Mohammad Aljammal 09c8d9c09e Merge branch 'procedure_changes' into 'development'
dilog list & procedure changes

See merge request Cloud_Solution/doctor_app_flutter!826
5 years ago
Mohammad Aljammal fe193f4084 Merge branch 'episode_inpatient_changes' into 'development'
Episode inpatient changes

See merge request Cloud_Solution/doctor_app_flutter!825
5 years ago
hussam al-habibeh c5eac79522 dilog list & procedure changes 5 years ago
Elham Rababh 8fc4b1596b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_inpatient_changes
 Conflicts:
	lib/screens/patients/InPatientPage.dart
5 years ago
Elham Rababh e9e86e4d8c add filter on in patient screen by clinic and by all clinic 5 years ago
Mohammad Aljammal 680ba27bbc Merge branch 'list-performance' into 'development'
re-design UCAF to pager

See merge request Cloud_Solution/doctor_app_flutter!824
5 years ago
mosazaid 96ad55b552 re-design UCAF to pager 5 years ago
Elham Rababh 1fd192e4bc add pagination on in patient 5 years ago
mosazaid aae1cba405 re-design UCAF to pager 5 years ago
Mohammad Aljammal 3762e60552 Merge branch 'sick_leave_fix' into 'development'
Sick leave fix

See merge request Cloud_Solution/doctor_app_flutter!823
5 years ago
Mohammad Aljammal 353743b1b6 Merge branch 'all_special_lab_result' into 'development'
medication for in patient

See merge request Cloud_Solution/doctor_app_flutter!820
5 years ago
Elham Rababh a014e0140d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into replay_status 5 years ago
Elham Rababh a855dfca23 fix create episode design 5 years ago
Elham Rababh 92c791dd72 improve add subjective info 5 years ago
hussam al-habibeh 00b7aaf32a fix sick leave 5 years ago
Mohammad Aljammal 9297ea037d Merge branch 'list-performance' into 'development'
add arrow to patient card

See merge request Cloud_Solution/doctor_app_flutter!822
5 years ago
mosazaid c608b5601d add arrow to patient card 5 years ago
Mohammad Aljammal e334dbd221 Merge branch 'replay_status' into 'development'
fix replay status

See merge request Cloud_Solution/doctor_app_flutter!821
5 years ago
Mohammad Aljammal ba2d97f96e Merge branch 'list-performance' into 'development'
changing lists from list.generator to list builder

See merge request Cloud_Solution/doctor_app_flutter!819
5 years ago
Elham Rababh 7ef7c8225c fix replay status 5 years ago
hussam al-habibeh 8fc25538b0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into all_special_lab_result
 Conflicts:
	lib/config/config.dart
5 years ago
hussam al-habibeh 1ba47515c6 changing list genrate to list builder 5 years ago
mosazaid c9fe9ccb63 changing lists from list.generator to list builder to make it faster in big size 5 years ago
Mohammad Aljammal ee41f2f494 Merge branch 'soap_improve_performance' into 'development'
Soap improve performance

See merge request Cloud_Solution/doctor_app_flutter!818
5 years ago
Elham Rababh 95a694a85f improve update assessment details 5 years ago
hussam al-habibeh b461af1be2 medication for in patient 5 years ago
Elham Rababh 449206c6e8 improve performance for Update Subject 5 years ago
Mohammad Aljammal ae190d8802 Merge branch 'home_screen_parallel' into 'development'
home parallel calling services

See merge request Cloud_Solution/doctor_app_flutter!817
5 years ago
Mohammad Aljammal 382d6935ba Merge branch 'create_episode_inpatient' into 'development'
Create episode inpatient

See merge request Cloud_Solution/doctor_app_flutter!816
5 years ago
mosazaid 26f37893a1 home parallel calling services 5 years ago
Elham Rababh 5bbb2049ce fix create episode url 5 years ago
Elham Rababh 4c2d55015f add loading 5 years ago
Elham Rababh cc26053bc1 episode to inpatient 5 years ago
Elham Rababh 46698a4382 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into create_episode_inpatient
 Conflicts:
	lib/config/config.dart
5 years ago
Elham Rababh b707857526 first step from get episode id 5 years ago
Mohammad Aljammal 441d319a9e Merge branch 'inpatient_issues' into 'development'
fix inpatient issues

See merge request Cloud_Solution/doctor_app_flutter!815
5 years ago
Mohammad Aljammal 835c8cd77d Merge branch 'fix_bugs_new' into 'development'
UI fix design

See merge request Cloud_Solution/doctor_app_flutter!814
5 years ago
Elham Rababh a4c8178695 fix inpatient issues 5 years ago
mosazaid 4ce6ff8d7d ui lab result history chart page 5 years ago
Elham Rababh 478900d4fd fix inpatient issues 5 years ago
mosazaid cdbd905a62 ui fix design 5 years ago
Mohammad Aljammal 68e37ddf86 Merge branch 'all_special_lab_result' into 'development'
patient profile aligment fix

See merge request Cloud_Solution/doctor_app_flutter!813
5 years ago
hussam al-habibeh 41ed593707 patient profile aligment fix 5 years ago
Mohammad Aljammal fdc4e52980 Merge branch 'replay_status' into 'development'
change the status of replay

See merge request Cloud_Solution/doctor_app_flutter!811
5 years ago
Elham Rababh 99a4838044 add key 5 years ago
Elham Rababh 8eb9401941 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into replay_status
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababh b1294a863c fix issues 5 years ago
Mohammad Aljammal 6b146ed00b Merge branch 'all_special_lab_result' into 'development'
All special lab result

See merge request Cloud_Solution/doctor_app_flutter!812
5 years ago
Elham Rababh 1f3d1f68fb change the status of replay 5 years ago
Mohammad Aljammal 766b563550 Merge branch 'fix_bugs_new' into 'development'
fix lap result design issue

See merge request Cloud_Solution/doctor_app_flutter!810
5 years ago
mosazaid 2acad4e5dc fix lap result design issue 5 years ago
hussam al-habibeh 0deca4f624 patient profile aligment fix 5 years ago
hussam al-habibeh a0bc5b73de patient profile aligment fix 5 years ago
Mohammad Aljammal e5e7452dad Merge branch 'fix_bugs_new' into 'development'
Fix in patient screen bug

See merge request Cloud_Solution/doctor_app_flutter!809
5 years ago
mosazaid 632e930c6b fix my inpatient issue 5 years ago
Mohammad Aljammal 2a570b98be Merge branch 'all_special_lab_result' into 'development'
All special lab result

See merge request Cloud_Solution/doctor_app_flutter!807
5 years ago
hussam al-habibeh 19487ba435 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into all_special_lab_result 5 years ago
Elham Rababh df40a2dc09 first step from create episode inpatint 5 years ago
hussam al-habibeh 5241273303 all lab special result 5 years ago
mosazaid a4ba2de459 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_bugs_new 5 years ago
mosazaid dba43fb7bd bug fixes 5 years ago
Mohammad Aljammal ce6ec576dd Merge branch 'transaltion_issues' into 'development'
fix issues

See merge request Cloud_Solution/doctor_app_flutter!806
5 years ago
Elham Rababh 5a91f6a25b fix issues 5 years ago
hussam al-habibeh e4f350fad3 adding special lab result details 5 years ago
Mohammad Aljammal 680ac7a4e9 Merge branch 'pagination_doctor_repay' into 'development'
Pagination doctor repay

See merge request Cloud_Solution/doctor_app_flutter!805
5 years ago
Elham Rababh 50e8e7b0d6 add translation to text status 5 years ago
Elham Rababh 7e552cccd4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into pagination_doctor_repay 5 years ago
Elham Rababh ae70fe1bdf first step from doctor replay 5 years ago
Mohammad Aljammal d4fec5080c Merge branch 'fix_bugs_new' into 'development'
working on lab result detail page

See merge request Cloud_Solution/doctor_app_flutter!804
5 years ago
mosazaid 829d7b9be7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_bugs_new 5 years ago
mosazaid 547eb430db working on lab result detail page 5 years ago
hussam al-habibeh 792c7aea9b all special lab result 5 years ago
Mohammad Aljammal 844629c8bd Merge branch 'fix_login' into 'development'
fix login issue and add  new localizedValues

See merge request Cloud_Solution/doctor_app_flutter!803
5 years ago
Mohammad Aljammal d5cff77743 fix login issue and add new localizedValues 5 years ago
Mohammad Aljammal a33c0312b7 Merge branch 'pagination_doctor_repay' into 'development'
fix issue

See merge request Cloud_Solution/doctor_app_flutter!802
5 years ago
Mohammad Aljammal f03a6d0982 Merge branch 'in_patient_soap' into 'development'
fix add prescription

See merge request Cloud_Solution/doctor_app_flutter!801
5 years ago
Elham Rababh ff979c725e fix issue 5 years ago
hussam al-habibeh 393943a19b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_soap 5 years ago
hussam al-habibeh a845f5b48d fix add prescription 5 years ago
Mohammad Aljammal 2210a0445c Merge branch 'fix_bugs_new' into 'development'
working on lab result new service

See merge request Cloud_Solution/doctor_app_flutter!800
5 years ago
mosazaid 5ba26692c1 working on lab result new service 5 years ago
mosazaid 0625de2b15 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_bugs_new
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/patient_card/PatientCard.dart
5 years ago
mosazaid ac4a68600c working on lab result new service 5 years ago
Mohammad Aljammal b3e350ecaa Merge branch 'pagination_doctor_repay' into 'development'
Pagination doctor repay

See merge request Cloud_Solution/doctor_app_flutter!799
5 years ago
Elham Rababh 076301e91a fix error happen while scrolling 5 years ago
Elham Rababh bf12203e81 fix error happen while scrolling 5 years ago
Elham Rababh 66e33b7085 fix error happen while scrolling 5 years ago
Mohammad Aljammal 047acd7116 Merge branch 'pagination_doctor_repay' into 'development'
add pagination to doctor replay

See merge request Cloud_Solution/doctor_app_flutter!798
5 years ago
Elham Rababh 64c98ba128 modify pagination to make works on scroll 5 years ago
Elham Rababh 943463b1d9 add pagination to doctor replay 5 years ago
Mohammad Aljammal b0a92d560d Merge branch 'implement_copy' into 'development'
Implement copy

See merge request Cloud_Solution/doctor_app_flutter!797
5 years ago
Elham Rababh 1c2ccd9149 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fixes_before_live
 Conflicts:
	lib/widgets/patients/profile/patient-profile-app-bar.dart
5 years ago
Elham Rababh c17f9fb91d add copy to patient cart 5 years ago
Mohammad Aljammal 68e1a2b399 Merge branch 'in_patient_soap' into 'development'
In patient soap

See merge request Cloud_Solution/doctor_app_flutter!796
5 years ago
Elham Rababh a5f3731b9a first step from fixing header 5 years ago
hussam al-habibeh de6936efb8 Profile app bar copying & lab result 5 years ago
hussam al-habibeh 0535566232 lab result & railogy fix 5 years ago
hussam al-habibeh 8d493f40fa Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_soap 5 years ago
hussam al-habibeh 528e16c3dc lab result & radiolgy fix 5 years ago
Mohammad Aljammal 794c935d05 Merge branch 'fixes_before_live' into 'development'
fix show count in home page

See merge request Cloud_Solution/doctor_app_flutter!794
5 years ago
Mohammad Aljammal 6882a327c0 Merge branch 'fix_bugs_new' into 'development'
add copy to selected texts

See merge request Cloud_Solution/doctor_app_flutter!795
5 years ago
mosazaid 0fb4b4a890 add copy to selected texts 5 years ago
Elham Rababh 1712874c87 fix show count in home page 5 years ago
Mohammad Aljammal fa9942ac24 Merge branch 'fix_login' into 'development'
Fix login issue

See merge request Cloud_Solution/doctor_app_flutter!793
5 years ago
Mohammad Aljammal 0489e9584f fix login issue 5 years ago
Mohammad Aljammal 1d6026f9fd Merge branch 'fix_login' into 'development'
fix issue in login and inpatient

See merge request Cloud_Solution/doctor_app_flutter!792
5 years ago
Mohammad Aljammal 800d6a1011 Merge branch 'fixes_before_live' into 'development'
fix show count in home page

See merge request Cloud_Solution/doctor_app_flutter!791
5 years ago
Mohammad Aljammal 94f7d7773f fix issue in login and inpatient 5 years ago
Elham Rababh e8c0281913 fix show count in home page 5 years ago
Mohammad Aljammal f25c93f7a2 Merge branch 'video-stream-new' into 'development'
video stream and notification

See merge request Cloud_Solution/doctor_app_flutter!779
5 years ago
Mohammad Aljammal abfba6e292 Merge branch 'fixes_before_live' into 'development'
remove loader from InPatientPage.dart

See merge request Cloud_Solution/doctor_app_flutter!790
5 years ago
Elham Rababh 2c0cdff0dc remove loader from InPatientPage.dart 5 years ago
Mohammad Aljammal 9bcfd0587a Merge branch 'fixes_before_live' into 'development'
some fixes before live

See merge request Cloud_Solution/doctor_app_flutter!789
5 years ago
Elham Rababh e2caebde8b some fixes before live 5 years ago
Mohammad Aljammal 8b7d61ba03 Merge branch 'episode_fixes_dev_merge' into 'development'
Episode fixes dev merge

See merge request Cloud_Solution/doctor_app_flutter!788
5 years ago
Elham Ali d362793fb4 Merge branch 'episode_fixes_dev' into 'episode_fixes_dev_merge'
fix issues related to add progress exam

See merge request Cloud_Solution/doctor_app_flutter!786
5 years ago
Elham Rababh 947fc7f8f8 fix issues related to add progress exam 5 years ago
Mohammad Aljammal 4bfcca230e Merge branch 'replied_count' into 'development'
add badge on bottom bar in order to show number of un replied msg

See merge request Cloud_Solution/doctor_app_flutter!784
5 years ago
Elham Ali 3d7cd70df6 Merge branch 'episode_fixes_dev' into 'episode_fixes_dev_merge'
fix issue related to outpatient

See merge request Cloud_Solution/doctor_app_flutter!785
5 years ago
Elham Rababh 79a0e0917f fix issue related to outpatient 5 years ago
Elham Rababh 53d7d68012 add badge on bottom bar in order to show number of un replied msg 5 years ago
Elham Rababh 539d8500f1 Merge branch 'in_patient_soap' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes_dev_merge
 Conflicts:
	lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
5 years ago
hussam al-habibeh 4abd005499 SOAP For in patient 5 years ago
Elham Rababh 74a6ebebdc remove unnecessary step for inpatient 5 years ago
hussam al-habibeh 26a1758af9 Soap for in Patient chef complint 5 years ago
Elham Rababh 42ecf9a0fb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes_dev 5 years ago
Elham Rababh 80b976dff3 first step from change steper 5 years ago
Elham Rababh 13be1c6a00 fix issue in the model 5 years ago
hussam al-habibeh 562fd1b515 chef complint for in patient 5 years ago
Elham Ali c49827dec5 Merge branch 'doctor_res' into 'development'
Doctor res

See merge request Cloud_Solution/doctor_app_flutter!783
5 years ago
Elham Rababh 64697b82a6 fix issue 5 years ago
Elham Rababh c31db4890b finish doctor response 5 years ago
Elham Rababh a1aa1d5689 small on in patient cases 5 years ago
Elham Ali 09ca6d2454 Merge branch 'special_clinical' into 'development'
Special clinical

See merge request Cloud_Solution/doctor_app_flutter!782
5 years ago
Elham Rababh 7b65f1bade small fix on in patient 5 years ago
Elham Rababh 3626857317 finish fix Special Clinical 5 years ago
Elham Rababh 21f3ab9ac8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into special_clinical 5 years ago
Elham Rababh 0ae0650acb fix id 5 years ago
Elham Rababh 300ad103d3 move error to model 5 years ago
Elham Rababh 41190bc501 move error to model 5 years ago
Elham Rababh 6db5191e07 return the function code back 5 years ago
Elham Rababh 8147d20fc6 Merge branch 'in_patient_soap' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes_dev
 Conflicts:
	lib/screens/patients/profile/soap_update/objective/update_objective_page.dart
	lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
5 years ago
Elham Rababh 7830c41d02 show update button in case of in patient 5 years ago
hussam al-habibeh 8c3fc3a6f7 chief complaint in in patient 5 years ago
hussam al-habibeh ab584c792a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_soap
 Conflicts:
	lib/config/config.dart
	lib/screens/patients/profile/soap_update/objective/update_objective_page.dart
	lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
5 years ago
Elham Rababh 1c45fcea22 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes
 Conflicts:
	lib/core/viewModel/authentication_view_model.dart
5 years ago
Elham Ali 2f89eebffe Merge branch 'doctor_res' into 'development'
Doctor res

See merge request Cloud_Solution/doctor_app_flutter!780
5 years ago
Elham Rababh ebea54f2cc change info status 5 years ago
Elham Rababh 8a4e0db113 commit config 5 years ago
Elham Rababh 369eecb0a3 return special Clinical function 5 years ago
Elham Rababh 854f42ce96 Create Doctor Response working fine 5 years ago
mosazaid e046928e3e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into video-stream-new
 Conflicts:
	android/app/build.gradle
	lib/core/viewModel/authentication_view_model.dart
5 years ago
mosazaid 0d3b64af7d uncomment livecare services 5 years ago
mosazaid a020c9865b video stream clean code 5 years ago
Elham Rababh ae30e23d4d rename call back files 5 years ago
Elham Rababh a502308a8a finish update on soap 5 years ago
hussam al-habibeh 36786a3079 chinging chief complaint in the soap 5 years ago
mosazaid 9f1631ba4c video stream notification fix 5 years ago
Elham Rababh e58ce34aa4 move bottom sheet to index page 5 years ago
Elham Rababh b341bd5f47 fixes issues in small devices 5 years ago
mosazaid e06bd6a4f8 working on videoCall notification 5 years ago
Mohammad Aljammal bf8ac21122 Merge branch 'analytics_service' into 'development'
Apply the new authentication logic

See merge request Cloud_Solution/doctor_app_flutter!778
5 years ago
Mohammad Aljammal 243108e81a Apply the new authentication logic 5 years ago
Elham Rababh 0780cafcca fixes issues in small devices 5 years ago
Elham Rababh 6b65de77e9 fix design issues on diff pages inside soap 5 years ago
Elham Rababh 7227679081 fix design 5 years ago
Elham Rababh 14a0911aec fix first step from Soap 5 years ago
Mohammad Aljammal 36f34226bd Merge branch 'medical_report_changes' into 'development'
adding google anlyatic to doctor app

See merge request Cloud_Solution/doctor_app_flutter!777
5 years ago
mosazaid 529711d2ce video stream crash working to fix 5 years ago
Elham Rababh 88b04a8f5d fix stepper labels and translate it. 5 years ago
Elham Rababh 8a69becab3 fix header issues && exam issues 5 years ago
Elham Rababh 3b1a493d76 fix design issues on create episode and prevent exam from keep it state 5 years ago
Elham Rababh 7e57882349 fix design issues on first step form create episode 5 years ago
Elham Rababh 25d0a08105 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes 5 years ago
Elham Rababh d301c2a3f4 add new and old part form examination 5 years ago
Elham Rababh d0d6874159 create mapper for the selected items 5 years ago
mosazaid 8a4dcf2334 try fixing error that was originally registered here. Are you missing a call to unregisterReceiver()? 5 years ago
mosazaid a84027ad6f Merge branch 'development' into video-stream-floating
# Conflicts:
#	lib/core/service/VideoCallService.dart
5 years ago
mosazaid adab2d47d3 video stream bug disconnect fixes 5 years ago
mosazaid a1ab1e4f43 notification with timer and bug fixes 5 years ago
mosazaid d0f1f9e17f notification with timer and bug fixes 5 years ago
mosazaid 057a06fffb adding custom notification with actions 5 years ago
mosazaid 73cadb1c00 make floating video screen 5 years ago
mosazaid 23ccbbe806 make floating video screen 5 years ago
mosazaid 7cc25f6101 make floating video screen 5 years ago
hussam al-habibeh c9a95188ce Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_2_developemt 5 years ago
hussam al-habibeh 6c6b043571 flutter 2 migration fix 5 years ago
Mohammad Aljammal b85d507781 Merge branch 'flutter_vervion_2_elham' into 'flutter_2_developemt'
Flutter vervion 2 elham

See merge request Cloud_Solution/doctor_app_flutter!752
5 years ago
Elham Rababah b8c7ce2920 fix header 5 years ago
Elham Rababah d4ff42ad88 Merge branches 'flutter_2_developemt' and 'flutter_vervion_2_elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_elham 5 years ago
Elham Rababah 02307e8fac fix header and verification method 5 years ago
hussam al-habibeh e5056c5d93 fix flutter 2 migration 5 years ago
Elham Rababah 57178d3633 fix soap issue on flutter 2 5 years ago
Elham Rababah 9a2ce62216 first step from fixing Soap 5 years ago
hussam al-habibeh 550d54c034 flutter 2 migration fix 5 years ago
Mohammad Aljammal eb2b614f74 Merge branch 'flutter_vervion_2_elham' into 'flutter_2_developemt'
Flutter vervion 2 elham

See merge request Cloud_Solution/doctor_app_flutter!748
5 years ago
Mohammad Aljammal 95c7161987 fix flutter 2 issue 5 years ago
Elham Rababah a1ef722954 fix yaml 5 years ago
Elham Rababah 329711a002 fix error to make the code work with flutter 2 5 years ago
Elham Rababah ca6306950d Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_elham
 Conflicts:
	ios/Podfile
	lib/client/base_app_client.dart
	lib/core/model/patient_muse/PatientSearchRequestModel.dart
	lib/core/model/referral/MyReferralPatientModel.dart
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/service/patient/MyReferralPatientService.dart
	lib/core/service/patient/patient_service.dart
	lib/core/viewModel/LiveCarePatientViewModel.dart
	lib/core/viewModel/PatientMedicalReportViewModel.dart
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/core/viewModel/authentication_view_model.dart
	lib/core/viewModel/dashboard_view_model.dart
	lib/core/viewModel/patient-referral-viewmodel.dart
	lib/core/viewModel/procedure_View_model.dart
	lib/core/viewModel/referred_view_model.dart
	lib/models/livecare/start_call_req.dart
	lib/models/patient/patiant_info_model.dart
	lib/screens/auth/login_screen.dart
	lib/screens/auth/verification_methods_screen.dart
	lib/screens/home/dashboard_slider-item-widget.dart
	lib/screens/home/dashboard_swipe_widget.dart
	lib/screens/home/home_page_card.dart
	lib/screens/home/home_patient_card.dart
	lib/screens/home/home_screen.dart
	lib/screens/live_care/end_call_screen.dart
	lib/screens/live_care/live-care_transfer_to_admin.dart
	lib/screens/live_care/live_care_patient_screen.dart
	lib/screens/medical-file/health_summary_page.dart
	lib/screens/medical-file/medical_file_details.dart
	lib/screens/patients/ECGPage.dart
	lib/screens/patients/insurance_approval_screen_patient.dart
	lib/screens/patients/insurance_approvals_details.dart
	lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart
	lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
	lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
	lib/screens/patients/profile/admission-request/admission-request-third-screen.dart
	lib/screens/patients/profile/admission-request/admission-request_second-screen.dart
	lib/screens/patients/profile/medical_report/AddVerifyMedicalReport.dart
	lib/screens/patients/profile/medical_report/MedicalReportPage.dart
	lib/screens/patients/profile/note/progress_note_screen.dart
	lib/screens/patients/profile/profile_screen/PatientProfileCardModel.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/screens/patients/profile/radiology/radiology_details_page.dart
	lib/screens/patients/profile/radiology/radiology_home_page.dart
	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
	lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart
	lib/screens/patients/profile/referral/refer-patient-screen-in-patient.dart
	lib/screens/patients/profile/referral/refer-patient-screen.dart
	lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
	lib/screens/patients/profile/referral/referred-patient-screen.dart
	lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart
	lib/screens/patients/profile/soap_update/update_soap_index.dart
	lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
	lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart
	lib/screens/prescription/add_favourite_prescription.dart
	lib/screens/prescription/add_prescription_form.dart
	lib/screens/prescription/prescription_home_screen.dart
	lib/screens/prescription/prescription_item_in_patient_page.dart
	lib/screens/prescription/prescription_items_page.dart
	lib/screens/prescription/prescription_screen.dart
	lib/screens/prescription/prescription_screen_history.dart
	lib/screens/prescription/prescriptions_page.dart
	lib/screens/procedures/ProcedureCard.dart
	lib/screens/procedures/add-favourite-procedure.dart
	lib/screens/procedures/add-procedure-form.dart
	lib/screens/procedures/add_lab_home_screen.dart
	lib/screens/procedures/add_lab_orders.dart
	lib/screens/procedures/add_radiology_order.dart
	lib/screens/procedures/add_radiology_screen.dart
	lib/screens/procedures/base_add_procedure_tab_page.dart
	lib/screens/procedures/entity_list_procedure_widget.dart
	lib/screens/qr_reader/QR_reader_screen.dart
	lib/util/VideoChannel.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/auth/sms-popup.dart
	lib/widgets/auth/verification_methods_list.dart
	lib/widgets/dashboard/out_patient_stack.dart
	lib/widgets/patients/patient-referral-item-widget.dart
	lib/widgets/patients/patient_card/PatientCard.dart
	lib/widgets/patients/profile/PatientHeaderWidgetNoAvatar.dart
	lib/widgets/patients/profile/PatientProfileButton.dart
	lib/widgets/patients/profile/patient-page-header-widget.dart
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
	lib/widgets/patients/profile/patient-profile-header-new-design.dart
	lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
	lib/widgets/patients/profile/profile-welcome-widget.dart
	lib/widgets/shared/app_drawer_widget.dart
	lib/widgets/shared/app_scaffold_widget.dart
	lib/widgets/shared/app_texts_widget.dart
	lib/widgets/shared/bottom_navigation_item.dart
	lib/widgets/shared/buttons/app_buttons_widget.dart
	lib/widgets/shared/drawer_item_widget.dart
	pubspec.lock
5 years ago
Mohammad Aljammal ac5ec049da Merge branch 'video_call_and_app_bar' into 'flutter_2_developemt'
Merge video call into flutter_2_development

See merge request Cloud_Solution/doctor_app_flutter!747
5 years ago
Mohammad Aljammal 7f6128b458 fix app bar issues 5 years ago
Mohammad Aljammal 4d3371e882 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/screens/live_care/end_call_screen.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/util/helpers.dart
	lib/widgets/patients/profile/patient-profile-app-bar.dart
	lib/widgets/shared/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal 327d392f6b Merge branch 'headers_refactor' into 'flutter_2_developemt'
Headers refactor

See merge request Cloud_Solution/doctor_app_flutter!738
5 years ago
Mohammad Aljammal 47dfde6e78 fix patient app bar 5 years ago
Mohammad Aljammal 737d0e9bec Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into headers_refactor
 Conflicts:
	lib/screens/patients/profile/lab_result/laboratory_result_page.dart
	lib/screens/patients/profile/lab_result/labs_home_page.dart
	lib/widgets/patients/profile/patient-profile-app-bar.dart
5 years ago
Mohammad Aljammal 3990ba6ff7 Merge branch 'login_home_design' into 'flutter_2_developemt'
Login home design

See merge request Cloud_Solution/doctor_app_flutter!723
5 years ago
Mohammad Aljammal 387f75b36c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_home_design
 Conflicts:
	lib/screens/home/home_patient_card.dart
	lib/screens/home/home_screen.dart
5 years ago
Elham Rababah bf54139647 first procedure 5 years ago
Elham Rababah 8940de50d6 Merge branch 'flutter_vervion_2' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2 5 years ago
Elham Rababah 764e2e29f5 first fix from procedure 5 years ago
hussam al-habibeh e4ef47213d Merge branch 'flutter_vervion_2' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2 5 years ago
hussam al-habibeh 73f2abbea2 flutter 2 migration 5 years ago
Elham Rababah e4fb83826a fix referral screen in out patient 5 years ago
Elham Rababah 2140f0a229 fix add sick leave 5 years ago
Elham Rababah 46d09ee55d Merge branch 'flutter_vervion_2' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2 5 years ago
hussam al-habibeh daf125b995 flutter 2 migration 5 years ago
Elham Rababah 52eef31e2e change ios file to make it version 2 works on ios 5 years ago
hussam al-habibeh bb20b4d582 flutter 2 migration 5 years ago
Elham Rababah 148657e06b small fix 5 years ago
Elham Rababah 9328724167 fix height patient app header 5 years ago
Elham Rababah 6fd9af9b26 change the name of the file 5 years ago
Elham Rababah 07857b28cd change the code of header profile to new implementation 5 years ago
Mohammad Aljammal ea2a635925 hot fix 5 years ago
hussam al-habibeh 110a1983c7 flutter vervion 2 migration 5 years ago
Elham Rababah ecb600c4fc small fixes 5 years ago
Elham Rababah f81e0b58cb Merge branches 'development' and 'login_home_design' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_home_design
 Conflicts:
	lib/screens/home/home_screen.dart
5 years ago
hussam al-habibeh 9b3c0af555 Merge branches 'flutter_vervion_2' and 'migrate_flutter_2' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2 5 years ago
hussam al-habibeh 6e6a7deba5 migration Services to flutter 2 5 years ago
Elham Rababah 39887f3ead fix issue on design 5 years ago
Mohammad Aljammal 5a477848db Migrate view model to flutter 2 5 years ago
Mohammad Aljammal 931e21ed5e Migrate models to flutter 2 5 years ago
Mohammad Aljammal d784310c82 Migrate models to flutter 2 5 years ago
Elham Rababah 1f8a90e47b add letterspaceing 5 years ago
Elham Rababah 60b5d474c1 home design fixes for small and large screen 5 years ago
Mohammad Aljammal 0747dfb1e0 Migrate to flutter 2 5 years ago
Elham Rababah c671b60097 home design fixes 5 years ago
Elham Rababah d0173bd061 home design fixes 5 years ago
Elham Rababah 259ea53319 home design 5 years ago
Elham Rababah 3d5bb08adf fix sms popup 5 years ago
Elham Rababah a5ea23c38e improve home page to match the xd 5 years ago
Elham Rababah cc7fedc8f5 add middle screen height size 5 years ago
Elham Rababah 08e104ca56 fix referral issues 5 years ago
Elham Rababah 01abd02d19 move referral patient 5 years ago
Elham Rababah 4a9748739e improve home design 5 years ago
Elham Rababah 4dc72d6f35 Merge branches 'development' and 'login_design_fixes' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_design_fixes
 Conflicts:
	lib/core/viewModel/authentication_view_model.dart
	lib/widgets/shared/app_drawer_widget.dart
5 years ago
Elham Rababah 00aa2c3752 fix homepage screen 5 years ago
Elham Rababah 19bac417c4 fix login issue 5 years ago
Elham Rababah 49afc338d6 fix drawer in big screen 5 years ago
Elham Rababah 8d2252ecdf fixes 5 years ago
Elham Rababah 70020f35c9 fixes in dashboard 5 years ago
Elham Rababah 8e656dbc0d some design fixes 5 years ago
Elham Rababah 97f7426aee fix drawer design 5 years ago
Elham Rababah acffc72f56 prevent scrolling on home page 5 years ago
Elham Rababah dc22e3f46e fix bottom sheet 5 years ago
Elham Rababah 2bff3a594c first step from fix home page design 5 years ago
Elham Rababah 0c0062091a Merge branches 'development' and 'login_design_fixes' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_design_fixes 5 years ago
Elham Rababah 2fa8fa6177 fix back icon place 5 years ago
Elham Rababah 8f6de2e02b fix login 5 years ago
Elham Rababah 362d9425cd fix scrolling in verification 5 years ago
Elham Rababah 2b8caab71d fix sms pop up scrolling 5 years ago
Elham Rababah 837ff69c82 fix design 5 years ago
Mohammad Aljammal 2b429e6679 Merge branch 'development' into 'master'
Fix bugs

See merge request Cloud_Solution/doctor_app_flutter!664
5 years ago
Mohammad Aljammal 1051a704bc Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!644
5 years ago
Mohammad Aljammal 368d94168b Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!632
5 years ago
Mohammad Aljammal 361596a973 Merge branch 'development' into 'master'
hot fixes

See merge request Cloud_Solution/doctor_app_flutter!624
5 years ago
Mohammad Aljammal e5de65bc82 Merge branch 'development' into 'master'
Release 2

See merge request Cloud_Solution/doctor_app_flutter!615
5 years ago
Mohammad Aljammal 947423a285 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!582
5 years ago
Mohammad Aljammal 4136546550 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!390
5 years ago
Mohammad Aljammal a12ae0e0d1 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!187
5 years ago
Elham e341a6eb4d Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!185
5 years ago
Mohammad Aljammal 8e5316a0b0 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!183
5 years ago

@ -28,14 +28,14 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 30
// signingConfigs {
// release {
// storeFile file('C:\\Users\\admin\\Downloads\\DQKey.jks')
// storePassword 'HmGsa123'
// keyAlias 'key'
// keyPassword 'HmGsa123'
// }
// }
signingConfigs {
release {
storeFile file('/Users/nextwo/Desktop/Elham/keys/doctor app key')
storePassword 'Hmgdoctor1234'
keyAlias 'hmgdoctor'
keyPassword 'Hmgdoctor1234'
}
}
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
@ -59,7 +59,8 @@ android {
buildTypes {
release {
// TODO: Add your own signing config for the release build.
signingConfig signingConfigs.debug
signingConfig signingConfigs.release
}
debug {
// Signing with the debug keys for now, so `flutter run --release` works.
@ -108,6 +109,8 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp:4.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.6.2'
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'
implementation 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
implementation 'com.google.firebase:firebase-analytics:17.4.1'
}
apply plugin: 'com.google.gms.google-services'

@ -1,7 +0,0 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.hmg.hmgDr">
<!-- 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>

@ -10,22 +10,30 @@
FlutterApplication and put your custom class here.
-->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.CALL_PHONE" />
<!-- Permission required to draw floating widget over other apps -->
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="28"
tools:ignore="ScopedStorage"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" />
<application
android:name="io.flutter.app.FlutterApplication"
android:name=".AppApplication"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
tools:replace="android:name"
android:label="HMG Doctor">
<activity
android:name=".MainActivity"
@ -41,7 +49,9 @@
</intent-filter>
</activity>
<service android:name = ".Service.VideoStreamContainerService"/>
<service android:name = ".Service.VideoStreamFloatingWidgetService"
android:enabled="true"
android:exported="false"/>
<!--
Don't delete the meta-data below.
@ -50,6 +60,22 @@
<meta-data
android:name="flutterEmbedding"
android:value="2" />
<activity
android:name="com.hmg.hmgDr.globalErrorHandler.UCEDefaultActivity"
android:process=":error_activity" />
<provider
android:name="com.hmg.hmgDr.globalErrorHandler.UCEFileProvider"
android:authorities="${applicationId}.provider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths" />
</provider>
</application>
</manifest>

@ -0,0 +1,12 @@
package com.hmg.hmgDr
import com.hmg.hmgDr.globalErrorHandler.LoggingExceptionHandler
import io.flutter.app.FlutterApplication
class AppApplication : FlutterApplication() {
override fun onCreate() {
super.onCreate()
// LoggingExceptionHandler(this, "ErrorFile")
}
}

@ -1,43 +1,55 @@
package com.hmg.hmgDr
import android.Manifest
import android.app.Activity
import android.content.ComponentName
import android.content.Context
import android.content.Intent
import android.content.ServiceConnection
import android.content.pm.PackageManager
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.os.IBinder
import android.provider.Settings
import android.util.Log
import android.view.inputmethod.InputMethodManager
import android.widget.EditText
import android.widget.Toast
import androidx.annotation.NonNull
import com.google.gson.GsonBuilder
import com.hmg.hmgDr.Model.GetSessionStatusModel
import com.hmg.hmgDr.Model.SessionStatusModel
import com.hmg.hmgDr.Service.VideoStreamContainerService
import com.hmg.hmgDr.Service.VideoStreamFloatingWidgetService
import com.hmg.hmgDr.model.GetSessionStatusModel
import com.hmg.hmgDr.model.SessionStatusModel
import com.hmg.hmgDr.ui.VideoCallResponseListener
import com.hmg.hmgDr.ui.fragment.VideoCallFragment
import io.flutter.embedding.android.FlutterFragmentActivity
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel
import io.flutter.plugins.GeneratedPluginRegistrant
import pub.devrel.easypermissions.AfterPermissionGranted
import pub.devrel.easypermissions.AppSettingsDialog
import pub.devrel.easypermissions.EasyPermissions
class MainActivity : FlutterFragmentActivity(), MethodChannel.MethodCallHandler,
VideoCallResponseListener {
/* Permission request code to draw over other apps */
private val DRAW_OVER_OTHER_APP_PERMISSION_REQUEST_CODE = 1222
private val CHANNEL = "Dr.cloudSolution/videoCall"
private lateinit var methodChannel: MethodChannel
private var result: MethodChannel.Result? = null
private var call: MethodCall? = null
private val LAUNCH_VIDEO: Int = 1
private var dialogFragment: VideoCallFragment? = null
private var serviceIntent: Intent? = null
private var videoStreamService: VideoStreamContainerService? = null
private var videoStreamService: VideoStreamFloatingWidgetService? = null
private var bound = false
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
}
override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
GeneratedPluginRegistrant.registerWith(flutterEngine)
@ -67,18 +79,21 @@ class MainActivity : FlutterFragmentActivity(), MethodChannel.MethodCallHandler,
val isRecording = call.argument<Boolean>("isRecording")
val sessionStatusModel =
GetSessionStatusModel(VC_ID, tokenID, generalId, doctorId, patientName, isRecording!!)
GetSessionStatusModel(
VC_ID,
tokenID,
generalId,
doctorId,
patientName,
isRecording!!
)
openVideoCall(apiKey, sessionId, token, appLang, baseUrl, sessionStatusModel)
}
"closeVideoCall" -> {
dialogFragment?.onCallClicked()
// videoStreamService?.closeVideoCall()
}
"onCallConnected" -> {
videoStreamService?.closeVideoCall()
}
else -> {
result.notImplemented()
@ -86,91 +101,87 @@ class MainActivity : FlutterFragmentActivity(), MethodChannel.MethodCallHandler,
}
}
private fun openVideoCall(apiKey: String?, sessionId: String?, token: String?, appLang: String?, baseUrl: String?, sessionStatusModel: GetSessionStatusModel) {
if (dialogFragment == null) {
val arguments = Bundle()
arguments.putString("apiKey", apiKey)
arguments.putString("sessionId", sessionId)
arguments.putString("token", token)
arguments.putString("appLang", appLang)
arguments.putString("baseUrl", baseUrl)
arguments.putParcelable("sessionStatusModel", sessionStatusModel)
val transaction = supportFragmentManager.beginTransaction()
dialogFragment = VideoCallFragment.newInstance(arguments)
dialogFragment?.let {
it.setCallListener(this)
it.isCancelable = true
if (it.isAdded){
it.dismiss()
}else {
it.show(transaction, "dialog")
}
private fun openVideoCall(
apiKey: String?,
sessionId: String?,
token: String?,
appLang: String?,
baseUrl: String?,
sessionStatusModel: GetSessionStatusModel
) {
val arguments = Bundle()
arguments.putString("apiKey", apiKey)
arguments.putString("sessionId", sessionId)
arguments.putString("token", token)
arguments.putString("appLang", appLang)
arguments.putString("baseUrl", baseUrl)
arguments.putParcelable("sessionStatusModel", sessionStatusModel)
// start service
// serviceIntent = Intent(this@MainActivity, VideoStreamContainerService::class.java)
if (videoStreamService == null || videoStreamService?.serviceRunning == false) {
serviceIntent = Intent(this@MainActivity, VideoStreamFloatingWidgetService::class.java)
serviceIntent?.run {
putExtras(arguments)
action = VideoStreamFloatingWidgetService.ACTION_START_CALL
}
} else if (!dialogFragment!!.isVisible) {
val transaction = supportFragmentManager.beginTransaction()
dialogFragment!!.show(transaction, "dialog")
checkFloatingWidgetPermission()
}
}
// private fun openVideoCall(
// apiKey: String?,
// sessionId: String?,
// token: String?,
// appLang: String?,
// baseUrl: String?,
// sessionStatusModel: GetSessionStatusModel
// ) {
//
// val arguments = Bundle()
// arguments.putString("apiKey", apiKey)
// arguments.putString("sessionId", sessionId)
// arguments.putString("token", token)
// arguments.putString("appLang", appLang)
// arguments.putString("baseUrl", baseUrl)
// arguments.putParcelable("sessionStatusModel", sessionStatusModel)
//
//// showSoftKeyBoard(null)
// // start service
// serviceIntent = Intent(this@MainActivity, VideoStreamContainerService::class.java)
// serviceIntent?.run {
// putExtras(arguments)
// startService(this)
// }
//// bindService()
// }
/* override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
var asd = "";
if (requestCode == LAUNCH_VIDEO) {
if (resultCode == Activity.RESULT_OK) {
val result : SessionStatusModel? = data?.getParcelableExtra("sessionStatusNotRespond")
val callResponse : HashMap<String, String> = HashMap()
val sessionStatus : HashMap<String, String> = HashMap()
val gson = GsonBuilder().serializeNulls().create()
private fun checkFloatingWidgetPermission() {
// Check if the application has draw over other apps permission or not?
// This permission is by default available for API<23. But for API > 23
// you have to ask for the permission in runtime.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !Settings.canDrawOverlays(this)) {
//If the draw over permission is not available open the settings screen
//to grant the permission.
val intent = Intent(
Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
Uri.parse("package:$packageName")
)
startActivityForResult(intent, DRAW_OVER_OTHER_APP_PERMISSION_REQUEST_CODE)
} else { //If permission is granted start floating widget service
startFloatingWidgetService()
}
}
callResponse["callResponse"] = "CallNotRespond"
val jsonRes = gson.toJson(result)
callResponse["sessionStatus"] = jsonRes
private fun startFloatingWidgetService() {
startService(serviceIntent)
bindService()
}
this.result?.success(callResponse)
}
if (resultCode == Activity.RESULT_CANCELED) {
val callResponse : HashMap<String, String> = HashMap()
callResponse["callResponse"] = "CallEnd"
override fun onDestroy() {
super.onDestroy()
if (bound) {
unbindService()
}
}
result?.success(callResponse)
}
}
}*/
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (requestCode == DRAW_OVER_OTHER_APP_PERMISSION_REQUEST_CODE) {
//Check if the permission is granted or not.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (Settings.canDrawOverlays(this)) {
startFloatingWidgetService()
} else {
//Permission is not available then display toast
Toast.makeText(
this,
"Draw over other app permission not available. App won\\'t work without permission. Please try again.",
Toast.LENGTH_SHORT
).show()
}
} else {
startFloatingWidgetService()
}
} else {
super.onActivityResult(requestCode, resultCode, data)
}
}
override fun onCallFinished(resultCode: Int, intent: Intent?) {
dialogFragment = null
if (resultCode == Activity.RESULT_OK) {
val result: SessionStatusModel? = intent?.getParcelableExtra("sessionStatusNotRespond")
val callResponse: HashMap<String, String> = HashMap()
@ -197,25 +208,33 @@ class MainActivity : FlutterFragmentActivity(), MethodChannel.MethodCallHandler,
}
}
// stopService(serviceIntent)
// unbindService()
// videoStreamService!!.serviceRunning = false
}
override fun errorHandle(message: String) {
dialogFragment = null
// Toast.makeText(this, message, Toast.LENGTH_LONG).show()
stopService(serviceIntent)
}
override fun minimizeVideoEvent(isMinimize: Boolean) {
if (isMinimize)
methodChannel.invokeMethod("onCallConnected", null)
else
else {
methodChannel.invokeMethod("onCallDisconnected", null)
unbindService()
videoStreamService?.serviceRunning = false
videoStreamService = null
}
}
override fun onBackPressed() {
super.onBackPressed()
if (videoStreamService != null && videoStreamService?.serviceRunning == true && videoStreamService?.isFullScreen!!) {
videoStreamService!!.onMinimizedClicked()
} else {
super.onBackPressed()
}
}
override fun onPause() {
if (videoStreamService != null && videoStreamService?.serviceRunning == true && videoStreamService?.isFullScreen!!) {
videoStreamService!!.onMinimizedClicked()
}
super.onPause()
}
// override fun onStart() {
@ -228,53 +247,38 @@ class MainActivity : FlutterFragmentActivity(), MethodChannel.MethodCallHandler,
// unbindService()
// }
// private fun bindService() {
// serviceIntent?.run {
// if (videoStreamService != null && !videoStreamService!!.serviceRunning){
// startService(this)
// }
// bindService(this, serviceConnection, Context.BIND_AUTO_CREATE)
// videoStreamService?.serviceRunning = true
// }
// }
//
// private fun unbindService() {
// if (bound) {
// videoStreamService!!.videoCallResponseListener = null // unregister
// videoStreamService!!.mActivity = null
// unbindService(serviceConnection)
// bound = false
// }
// }
//
// private val serviceConnection: ServiceConnection = object : ServiceConnection {
// override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
// val binder: VideoStreamContainerService.VideoStreamBinder =
// service as VideoStreamContainerService.VideoStreamBinder
// videoStreamService = binder.service
// bound = true
// videoStreamService!!.videoCallResponseListener = this@MainActivity // register
// videoStreamService!!.mActivity = this@MainActivity // register
// }
//
// override fun onServiceDisconnected(name: ComponentName?) {
// bound = false
// }
//
// }
private fun bindService() {
serviceIntent?.run {
if (videoStreamService != null && !videoStreamService!!.serviceRunning) {
startService(this)
}
bindService(this, serviceConnection, Context.BIND_AUTO_CREATE)
}
}
// code to hide soft keyboard
fun hideSoftKeyBoard(editBox: EditText?) {
val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
imm.hideSoftInputFromWindow(editBox?.windowToken, 0)
private fun unbindService() {
if (bound) {
videoStreamService?.videoCallResponseListener = null // unregister
unbindService(serviceConnection)
bound = false
}
}
private val serviceConnection: ServiceConnection = object : ServiceConnection {
override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
// val binder: VideoStreamContainerService.VideoStreamBinder =
// service as VideoStreamContainerService.VideoStreamBinder
val binder: VideoStreamFloatingWidgetService.VideoStreamBinder =
service as VideoStreamFloatingWidgetService.VideoStreamBinder
videoStreamService = binder.service
bound = true
videoStreamService!!.videoCallResponseListener = this@MainActivity // register
videoStreamService?.serviceRunning = true
}
// code to show soft keyboard
private fun showSoftKeyBoard(editBox: EditText?) {
val inputMethodManager = this.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
editBox?.requestFocus()
inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0)
}
override fun onServiceDisconnected(name: ComponentName?) {
bound = false
}
}
}

@ -0,0 +1,234 @@
package com.hmg.hmgDr.Service
import android.annotation.SuppressLint
import android.app.Service
import android.content.Context
import android.graphics.PixelFormat
import android.graphics.Point
import android.os.Build
import android.os.CountDownTimer
import android.util.Log
import android.view.*
import androidx.core.view.GestureDetectorCompat
import com.hmg.hmgDr.R
import com.hmg.hmgDr.util.ViewsUtil
abstract class BaseMovingFloatingWidget : Service() {
val szWindow = Point()
lateinit var windowManagerParams: WindowManager.LayoutParams
var mWindowManager: WindowManager? = null
var floatingWidgetView: View? = null
lateinit var floatingViewContainer: View
lateinit var mDetector: GestureDetectorCompat
private var xInitCord = 0
private var yInitCord: Int = 0
private var xInitMargin: Int = 0
private var yInitMargin: Int = 0
/* Add Floating Widget View to Window Manager */
open fun addFloatingWidgetView() {
mWindowManager = getSystemService(Context.WINDOW_SERVICE) as WindowManager
//Init LayoutInflater
val inflater = getSystemService(LAYOUT_INFLATER_SERVICE) as LayoutInflater
//Inflate the removing view layout we created
floatingWidgetView = inflater.inflate(R.layout.activity_video_call, null)
//Add the view to the window.
windowManagerParams =
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
WindowManager.LayoutParams(
WindowManager.LayoutParams.WRAP_CONTENT,
WindowManager.LayoutParams.WRAP_CONTENT,
WindowManager.LayoutParams.TYPE_PHONE,
WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
PixelFormat.TRANSLUCENT
)
} else {
WindowManager.LayoutParams(
WindowManager.LayoutParams.WRAP_CONTENT,
WindowManager.LayoutParams.WRAP_CONTENT,
WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,
WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
PixelFormat.TRANSLUCENT
)
}
//Specify the view position
windowManagerParams.gravity = Gravity.TOP or Gravity.START
}
@SuppressLint("ClickableViewAccessibility")
val dragListener: View.OnTouchListener = View.OnTouchListener { _, event ->
mDetector.onTouchEvent(event)
//Get Floating widget view params
val layoutParams: WindowManager.LayoutParams =
floatingWidgetView!!.layoutParams as WindowManager.LayoutParams
//get the touch location coordinates
val x_cord = event.rawX.toInt()
val y_cord = event.rawY.toInt()
val x_cord_Destination: Int
var y_cord_Destination: Int
when (event.action) {
MotionEvent.ACTION_DOWN -> {
xInitCord = x_cord
yInitCord = y_cord
//remember the initial position.
xInitMargin = layoutParams.x
yInitMargin = layoutParams.y
}
MotionEvent.ACTION_UP -> {
//Get the difference between initial coordinate and current coordinate
val x_diff: Int = x_cord - xInitCord
val y_diff: Int = y_cord - yInitCord
y_cord_Destination = yInitMargin + y_diff
val barHeight: Int = ViewsUtil.getStatusBarHeight(applicationContext)
if (y_cord_Destination < 0) {
y_cord_Destination = 0
// y_cord_Destination =
// -(szWindow.y - (videoCallContainer.height /*+ barHeight*/))
// y_cord_Destination = -(szWindow.y / 2)
} else if (y_cord_Destination + (floatingViewContainer.height + barHeight) > szWindow.y) {
y_cord_Destination = szWindow.y - (floatingViewContainer.height + barHeight)
// y_cord_Destination = (szWindow.y / 2)
}
layoutParams.y = y_cord_Destination
//reset position if user drags the floating view
resetPosition(x_cord)
}
MotionEvent.ACTION_MOVE -> {
val x_diff_move: Int = x_cord - xInitCord
val y_diff_move: Int = y_cord - yInitCord
x_cord_Destination = xInitMargin + x_diff_move
y_cord_Destination = yInitMargin + y_diff_move
layoutParams.x = x_cord_Destination
layoutParams.y = y_cord_Destination
//Update the layout with new X & Y coordinate
mWindowManager?.updateViewLayout(floatingWidgetView, layoutParams)
}
}
true
}
/**
* OnTouch actions
*/
class MyGestureListener(
val onTabCall: () -> Unit,
val miniCircleDoubleTap: () -> Unit
) : GestureDetector.SimpleOnGestureListener() {
override fun onSingleTapConfirmed(event: MotionEvent): Boolean {
// onTabCall()
return true
}
override fun onDoubleTap(e: MotionEvent?): Boolean {
miniCircleDoubleTap()
return super.onDoubleTap(e)
}
}
/* Reset position of Floating Widget view on dragging */
fun resetPosition(x_cord_now: Int) {
if (x_cord_now <= szWindow.x / 2) {
moveToLeft(x_cord_now)
} else {
moveToRight(x_cord_now)
}
}
/* Method to move the Floating widget view to Left */
private fun moveToLeft(current_x_cord: Int) {
val mParams: WindowManager.LayoutParams =
floatingWidgetView!!.layoutParams as WindowManager.LayoutParams
mParams.x =
(szWindow.x - current_x_cord * current_x_cord - floatingViewContainer.width).toInt()
try {
mWindowManager?.updateViewLayout(floatingWidgetView, mParams)
} catch (e: Exception) {
Log.e("windowManagerUpdate", "${e.localizedMessage}.")
}
val x = szWindow.x - current_x_cord
object : CountDownTimer(500, 5) {
//get params of Floating Widget view
val mParams: WindowManager.LayoutParams =
floatingWidgetView!!.layoutParams as WindowManager.LayoutParams
override fun onTick(t: Long) {
val step = (500 - t) / 5
// mParams.x = 0 - (current_x_cord * current_x_cord * step).toInt()
mParams.x =
(szWindow.x - current_x_cord * current_x_cord * step - floatingViewContainer.width).toInt()
try {
mWindowManager?.updateViewLayout(floatingWidgetView, mParams)
} catch (e: Exception) {
Log.e("windowManagerUpdate", "${e.localizedMessage}.")
}
}
override fun onFinish() {
mParams.x = -(szWindow.x - floatingViewContainer.width)
try {
mWindowManager?.updateViewLayout(floatingWidgetView, mParams)
} catch (e: Exception) {
Log.e("windowManagerUpdate", "${e.localizedMessage}.")
}
}
}.start()
}
/* Method to move the Floating widget view to Right */
private fun moveToRight(current_x_cord: Int) {
object : CountDownTimer(500, 5) {
//get params of Floating Widget view
val mParams: WindowManager.LayoutParams =
floatingWidgetView!!.layoutParams as WindowManager.LayoutParams
override fun onTick(t: Long) {
val step = (500 - t) / 5
mParams.x =
(szWindow.x + current_x_cord * current_x_cord * step - floatingViewContainer.width).toInt()
try {
mWindowManager?.updateViewLayout(floatingWidgetView, mParams)
} catch (e: Exception) {
Log.e("windowManagerUpdate", "${e.localizedMessage}.")
}
}
override fun onFinish() {
mParams.x = szWindow.x - floatingViewContainer.width
mWindowManager?.updateViewLayout(floatingWidgetView, mParams)
}
}.start()
}
/***
* Utils
*/
fun getWindowManagerDefaultDisplay() {
val w = mWindowManager!!.defaultDisplay.width
val h = mWindowManager!!.defaultDisplay.height
szWindow[w] = h
}
}

@ -1,8 +1,8 @@
package com.hmg.hmgDr.Service;
import com.hmg.hmgDr.Model.ChangeCallStatusRequestModel;
import com.hmg.hmgDr.Model.GetSessionStatusModel;
import com.hmg.hmgDr.Model.SessionStatusModel;
import com.hmg.hmgDr.model.ChangeCallStatusRequestModel;
import com.hmg.hmgDr.model.GetSessionStatusModel;
import com.hmg.hmgDr.model.SessionStatusModel;
import retrofit2.Call;

@ -0,0 +1,39 @@
package com.hmg.hmgDr.globalErrorHandler
import android.os.Environment
import java.io.BufferedWriter
import java.io.File
import java.io.FileWriter
import java.io.IOException
import java.text.SimpleDateFormat
import java.util.*
object FileUtil {
val sdf = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS")
fun pushLog(body: String?) {
try {
val date = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(Date())
val time = SimpleDateFormat("HH:MM:SS", Locale.getDefault()).format(Date())
val root =
File(Environment.getExternalStorageDirectory(),"error_log_dir")
// if external memory exists and folder with name Notes
if (!root.exists()) {
root.mkdirs() // this will create folder.
}
val oldFile = File(root, "error" + sdf.format(Date()).toString() + ".txt") // old file
if (oldFile.exists()) oldFile.delete()
val filepath = File(root, "error$date.txt") // file path to save
val bufferedWriter = BufferedWriter(FileWriter(filepath, true))
bufferedWriter.append("\r\n")
bufferedWriter.append("\r\n").append(body).append(" Time : ").append(time)
bufferedWriter.flush()
} catch (e: IOException) {
e.printStackTrace()
} catch (e: IllegalStateException) {
e.printStackTrace()
}
}
}

@ -0,0 +1,39 @@
package com.hmg.hmgDr.globalErrorHandler
import android.content.Context
import android.content.Intent
import com.hmg.hmgDr.MainActivity
import com.hmg.hmgDr.globalErrorHandler.FileUtil.pushLog
class LoggingExceptionHandler(private val context: Context, ErrorFile: String) :
Thread.UncaughtExceptionHandler {
private val rootHandler: Thread.UncaughtExceptionHandler
override fun uncaughtException(t: Thread, e: Throwable) {
object : Thread() {
override fun run() {
pushLog("UnCaught Exception is thrown in $error$e")
try {
sleep(500)
val intent = Intent(context, MainActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
context.startActivity(intent)
} catch (e1: Exception) {
e1.printStackTrace()
}
}
}.start()
rootHandler.uncaughtException(t, e)
}
companion object {
private val TAG = LoggingExceptionHandler::class.java.simpleName
lateinit var error: String
}
init {
error = "$ErrorFile.error "
rootHandler = Thread.getDefaultUncaughtExceptionHandler()
Thread.setDefaultUncaughtExceptionHandler(this)
}
}

@ -0,0 +1,6 @@
package com.hmg.hmgDr.globalErrorHandler
import androidx.appcompat.app.AppCompatActivity
class UCEDefaultActivity : AppCompatActivity() {
}

@ -0,0 +1,6 @@
package com.hmg.hmgDr.globalErrorHandler
import androidx.core.content.FileProvider
class UCEFileProvider : FileProvider() {
}

@ -0,0 +1,280 @@
package com.hmg.hmgDr.globalErrorHandler
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.Application;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.ref.WeakReference;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayDeque;
import java.util.Date;
import java.util.Deque;
import java.util.Locale;
import kotlin.system.exitProcess
class UCEHandler(val builder: Builder) {
val EXTRA_STACK_TRACE = "EXTRA_STACK_TRACE"
val EXTRA_ACTIVITY_LOG = "EXTRA_ACTIVITY_LOG"
private val TAG = "UCEHandler"
private val UCE_HANDLER_PACKAGE_NAME = "com.rohitss.uceh"
private val DEFAULT_HANDLER_PACKAGE_NAME = "com.android.internal.os"
private val MAX_STACK_TRACE_SIZE = 131071 //128 KB - 1
private val MAX_ACTIVITIES_IN_LOG = 50
private val SHARED_PREFERENCES_FILE = "uceh_preferences"
private val SHARED_PREFERENCES_FIELD_TIMESTAMP = "last_crash_timestamp"
private val activityLog: Deque<String> = ArrayDeque(MAX_ACTIVITIES_IN_LOG)
var COMMA_SEPARATED_EMAIL_ADDRESSES: String? = null
@SuppressLint("StaticFieldLeak")
private var application: Application? = null
private var isInBackground = true
private var isBackgroundMode = false
private var isUCEHEnabled = false
private var isTrackActivitiesEnabled = false
private var lastActivityCreated: WeakReference<Activity?> = WeakReference(null)
fun UCEHandler(builder: Builder) {
isUCEHEnabled = builder.isUCEHEnabled
isTrackActivitiesEnabled = builder.isTrackActivitiesEnabled
isBackgroundMode = builder.isBackgroundModeEnabled
COMMA_SEPARATED_EMAIL_ADDRESSES = builder.commaSeparatedEmailAddresses
setUCEHandler(builder.context)
}
private fun setUCEHandler(context: Context?) {
try {
if (context != null) {
val oldHandler = Thread.getDefaultUncaughtExceptionHandler()
if (oldHandler != null && oldHandler.javaClass.name.startsWith(
UCE_HANDLER_PACKAGE_NAME
)
) {
Log.e(TAG, "UCEHandler was already installed, doing nothing!")
} else {
if (oldHandler != null && !oldHandler.javaClass.name.startsWith(
DEFAULT_HANDLER_PACKAGE_NAME
)
) {
Log.e(
TAG,
"You already have an UncaughtExceptionHandler. If you use a custom UncaughtExceptionHandler, it should be initialized after UCEHandler! Installing anyway, but your original handler will not be called."
)
}
application = context.getApplicationContext() as Application
//Setup UCE Handler.
Thread.setDefaultUncaughtExceptionHandler(Thread.UncaughtExceptionHandler { thread, throwable ->
if (isUCEHEnabled) {
Log.e(
TAG,
"App crashed, executing UCEHandler's UncaughtExceptionHandler",
throwable
)
if (hasCrashedInTheLastSeconds(application!!)) {
Log.e(
TAG,
"App already crashed recently, not starting custom error activity because we could enter a restart loop. Are you sure that your app does not crash directly on init?",
throwable
)
if (oldHandler != null) {
oldHandler.uncaughtException(thread, throwable)
return@UncaughtExceptionHandler
}
} else {
setLastCrashTimestamp(application!!, Date().getTime())
if (!isInBackground || isBackgroundMode) {
val intent = Intent(application, UCEDefaultActivity::class.java)
val sw = StringWriter()
val pw = PrintWriter(sw)
throwable.printStackTrace(pw)
var stackTraceString: String = sw.toString()
if (stackTraceString.length > MAX_STACK_TRACE_SIZE) {
val disclaimer = " [stack trace too large]"
stackTraceString = stackTraceString.substring(
0,
MAX_STACK_TRACE_SIZE - disclaimer.length
) + disclaimer
}
intent.putExtra(EXTRA_STACK_TRACE, stackTraceString)
if (isTrackActivitiesEnabled) {
val activityLogStringBuilder = StringBuilder()
while (!activityLog.isEmpty()) {
activityLogStringBuilder.append(activityLog.poll())
}
intent.putExtra(
EXTRA_ACTIVITY_LOG,
activityLogStringBuilder.toString()
)
}
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
application!!.startActivity(intent)
} else {
if (oldHandler != null) {
oldHandler.uncaughtException(thread, throwable)
return@UncaughtExceptionHandler
}
//If it is null (should not be), we let it continue and kill the process or it will be stuck
}
}
val lastActivity: Activity? = lastActivityCreated.get()
if (lastActivity != null) {
lastActivity.finish()
lastActivityCreated.clear()
}
killCurrentProcess()
} else oldHandler?.uncaughtException(thread, throwable)
})
application!!.registerActivityLifecycleCallbacks(object :
Application.ActivityLifecycleCallbacks {
val dateFormat: DateFormat =
SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US)
var currentlyStartedActivities = 0
override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
if (activity.javaClass !== UCEDefaultActivity::class.java) {
lastActivityCreated = WeakReference(activity)
}
if (isTrackActivitiesEnabled) {
activityLog.add(
dateFormat.format(Date())
.toString() + ": " + activity.javaClass
.getSimpleName() + " created\n"
)
}
}
override fun onActivityStarted(activity: Activity) {
currentlyStartedActivities++
isInBackground = currentlyStartedActivities == 0
}
override fun onActivityResumed(activity: Activity) {
if (isTrackActivitiesEnabled) {
activityLog.add(
dateFormat.format(Date())
.toString() + ": " + activity.javaClass
.simpleName + " resumed\n"
)
}
}
override fun onActivityPaused(activity: Activity) {
if (isTrackActivitiesEnabled) {
activityLog.add(
dateFormat.format(Date())
.toString() + ": " + activity.javaClass
.simpleName + " paused\n"
)
}
}
override fun onActivityStopped(activity: Activity) {
currentlyStartedActivities--
isInBackground = currentlyStartedActivities == 0
}
override fun onActivitySaveInstanceState(
activity: Activity,
outState: Bundle
) {}
override fun onActivityDestroyed(activity: Activity) {
if (isTrackActivitiesEnabled) {
activityLog.add(
dateFormat.format(Date())
.toString() + ": " + activity.javaClass
.simpleName + " destroyed\n"
)
}
}
})
}
Log.i(TAG, "UCEHandler has been installed.")
} else {
Log.e(TAG, "Context can not be null")
}
} catch (throwable: Throwable) {
Log.e(
TAG,
"UCEHandler can not be initialized. Help making it better by reporting this as a bug.",
throwable
)
}
}
/**
* INTERNAL method that tells if the app has crashed in the last seconds.
* This is used to avoid restart loops.
*
* @return true if the app has crashed in the last seconds, false otherwise.
*/
private fun hasCrashedInTheLastSeconds(context: Context): Boolean {
val lastTimestamp = getLastCrashTimestamp(context)
val currentTimestamp: Long = Date().getTime()
return lastTimestamp <= currentTimestamp && currentTimestamp - lastTimestamp < 3000
}
@SuppressLint("ApplySharedPref")
private fun setLastCrashTimestamp(context: Context, timestamp: Long) {
context.getSharedPreferences(SHARED_PREFERENCES_FILE, Context.MODE_PRIVATE).edit()
.putLong(SHARED_PREFERENCES_FIELD_TIMESTAMP, timestamp).commit()
}
private fun killCurrentProcess() {
// Process.killProcess(Process.myPid())
exitProcess(10)
}
private fun getLastCrashTimestamp(context: Context): Long {
return context.getSharedPreferences(SHARED_PREFERENCES_FILE, Context.MODE_PRIVATE)
.getLong(SHARED_PREFERENCES_FIELD_TIMESTAMP, -1)
}
fun closeApplication(activity: Activity) {
activity.finish()
killCurrentProcess()
}
inner class Builder(context: Context) {
val context: Context
var isUCEHEnabled = true
var commaSeparatedEmailAddresses: String? = null
var isTrackActivitiesEnabled = false
var isBackgroundModeEnabled = true
fun setUCEHEnabled(isUCEHEnabled: Boolean): Builder {
this.isUCEHEnabled = isUCEHEnabled
return this
}
fun setTrackActivitiesEnabled(isTrackActivitiesEnabled: Boolean): Builder {
this.isTrackActivitiesEnabled = isTrackActivitiesEnabled
return this
}
fun setBackgroundModeEnabled(isBackgroundModeEnabled: Boolean): Builder {
this.isBackgroundModeEnabled = isBackgroundModeEnabled
return this
}
fun addCommaSeparatedEmailAddresses(commaSeparatedEmailAddresses: String?): Builder {
this.commaSeparatedEmailAddresses = commaSeparatedEmailAddresses ?: ""
return this
}
fun build() {
return UCEHandler(this)
}
init {
this.context = context
}
}
}

@ -1,4 +1,4 @@
package com.hmg.hmgDr.Model;
package com.hmg.hmgDr.model;
import android.os.Parcel;
import android.os.Parcelable;

@ -0,0 +1,16 @@
package com.hmg.hmgDr.model
/** Represents standard data needed for a Notification. */
open class NotificationDataModel(
// Standard notification values:
var mContentTitle: String,
var mContentText: String,
var mPriority: Int ,
// Notification channel values (O and above):
var mChannelId: String,
var mChannelName: CharSequence,
var mChannelDescription: String,
var mChannelImportance: Int ,
var mChannelEnableVibrate: Boolean ,
var mChannelLockscreenVisibility: Int
)

@ -0,0 +1,35 @@
package com.hmg.hmgDr.model
import android.app.Notification
import android.app.NotificationManager
import android.os.Build
import androidx.annotation.RequiresApi
import androidx.core.app.NotificationCompat
class NotificationVideoModel constructor(
mContentTitle: String,
mContentText: String,
mChannelId: String,
mChannelName: CharSequence,
mChannelDescription: String,
mPriority: Int = Notification.PRIORITY_MAX,
mChannelImportance: Int = NotificationManager.IMPORTANCE_LOW,
mChannelEnableVibrate: Boolean = true,
mChannelLockscreenVisibility: Int = NotificationCompat.VISIBILITY_PUBLIC,
// Unique data for this Notification.Style:
var mBigContentTitle: String = mContentTitle,
val mBigText: String = mContentText,
var mSummaryText: String
) : NotificationDataModel(
mContentTitle,
mContentText,
mPriority,
mChannelId,
mChannelName,
mChannelDescription,
mChannelImportance,
mChannelEnableVibrate,
mChannelLockscreenVisibility
) {
}

@ -1,4 +1,4 @@
package com.hmg.hmgDr.Model;
package com.hmg.hmgDr.model;
import android.os.Parcel;
import android.os.Parcelable;

@ -1,8 +1,8 @@
package com.hmg.hmgDr.ui;
import com.hmg.hmgDr.Model.ChangeCallStatusRequestModel;
import com.hmg.hmgDr.Model.GetSessionStatusModel;
import com.hmg.hmgDr.Model.SessionStatusModel;
import com.hmg.hmgDr.model.ChangeCallStatusRequestModel;
import com.hmg.hmgDr.model.GetSessionStatusModel;
import com.hmg.hmgDr.model.SessionStatusModel;
public interface VideoCallContract {

@ -1,8 +1,8 @@
package com.hmg.hmgDr.ui;
import com.hmg.hmgDr.Model.ChangeCallStatusRequestModel;
import com.hmg.hmgDr.Model.GetSessionStatusModel;
import com.hmg.hmgDr.Model.SessionStatusModel;
import com.hmg.hmgDr.model.ChangeCallStatusRequestModel;
import com.hmg.hmgDr.model.GetSessionStatusModel;
import com.hmg.hmgDr.model.SessionStatusModel;
import com.hmg.hmgDr.Service.AppRetrofit;
import com.hmg.hmgDr.Service.SessionStatusAPI;

@ -11,7 +11,6 @@ import android.graphics.Point
import android.graphics.drawable.ColorDrawable
import android.opengl.GLSurfaceView
import android.os.*
import android.util.DisplayMetrics
import android.util.Log
import android.view.*
import android.widget.*
@ -21,15 +20,15 @@ import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.ContextCompat
import androidx.core.view.GestureDetectorCompat
import androidx.fragment.app.DialogFragment
import com.hmg.hmgDr.Model.ChangeCallStatusRequestModel
import com.hmg.hmgDr.Model.GetSessionStatusModel
import com.hmg.hmgDr.Model.SessionStatusModel
import com.hmg.hmgDr.model.ChangeCallStatusRequestModel
import com.hmg.hmgDr.model.GetSessionStatusModel
import com.hmg.hmgDr.model.SessionStatusModel
import com.hmg.hmgDr.R
import com.hmg.hmgDr.ui.VideoCallContract.VideoCallPresenter
import com.hmg.hmgDr.ui.VideoCallContract.VideoCallView
import com.hmg.hmgDr.ui.VideoCallPresenterImpl
import com.hmg.hmgDr.ui.VideoCallResponseListener
import com.hmg.hmgDr.util.DynamicVideoRenderer
import com.hmg.hmgDr.util.opentok.DynamicVideoRenderer
import com.hmg.hmgDr.util.ViewsUtil
import com.opentok.android.*
import com.opentok.android.PublisherKit.PublisherListener
@ -98,16 +97,17 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
private lateinit var mSwitchCameraBtn: ImageView
private lateinit var mspeckerBtn: ImageView
private lateinit var mMicBtn: ImageView
private lateinit var patientName: TextView
private lateinit var cmTimer: Chronometer
private var elapsedTime: Long = 0
private var resume = false
private val progressBar: ProgressBar? = null
private val countDownTimer: CountDownTimer? = null
private val progressBarTextView: TextView? = null
private val progressBarLayout: RelativeLayout? = null
private val
progressBarLayout: RelativeLayout? = null
private var isConnected = false
@ -199,6 +199,7 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
}
}
fun setCallListener(videoCallResponseListener: VideoCallResponseListener) {
this.videoCallResponseListener = videoCallResponseListener
}
@ -293,7 +294,7 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
recordContainer.visibility = View.GONE
}
cmTimer = view.findViewById(R.id.cmTimer)
// cmTimer = view.findViewById(R.id.cmTimer)
cmTimer.format = "mm:ss"
cmTimer.onChronometerTickListener =
Chronometer.OnChronometerTickListener { arg0: Chronometer? ->
@ -354,6 +355,8 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
checkClientConnected()
handleVideoViewHeight(true)
if (appLang == "ar") {
progressBarLayout!!.layoutDirection = View.LAYOUT_DIRECTION_RTL
}
@ -481,10 +484,7 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
}
override fun onStreamReceived(session: Session, stream: Stream) {
Log.d(
TAG,
"onStreamReceived: New stream " + stream.streamId + " in session " + session.sessionId
)
Log.d(TAG, "onStreamReceived: New stream " + stream.streamId + " in session " + session.sessionId)
if (mSubscriber != null) {
isConnected = true
return

@ -0,0 +1,38 @@
package com.hmg.hmgDr.util
import java.text.SimpleDateFormat
import java.util.*
object DateUtils {
var simpleDateFormat: SimpleDateFormat = SimpleDateFormat("hh:mm:ss", Locale.ENGLISH)
fun differentDateTimeBetweenDateAndNow(firstDate: Date): String {
val now: Date = Calendar.getInstance().time
//1 minute = 60 seconds
//1 hour = 60 x 60 = 3600
//1 day = 3600 x 24 = 86400
var different: Long = now.time - firstDate.time
val secondsInMilli: Long = 1000
val minutesInMilli = secondsInMilli * 60
val hoursInMilli = minutesInMilli * 60
val daysInMilli = hoursInMilli * 24
val elapsedDays = different / daysInMilli
different %= daysInMilli
val elapsedHours = different / hoursInMilli
different %= hoursInMilli
val elapsedMinutes = different / minutesInMilli
different %= minutesInMilli
val elapsedSeconds = different / secondsInMilli
val format = "%1$02d:%2$02d" // two digits
return String.format(format, elapsedMinutes, elapsedSeconds)
}
}

@ -0,0 +1,77 @@
package com.hmg.hmgDr.util
import android.app.NotificationChannel
import android.app.NotificationManager
import android.content.Context
import android.content.Intent
import android.graphics.Color
import android.os.Build
import androidx.core.app.NotificationCompat
import com.hmg.hmgDr.model.NotificationDataModel
import com.hmg.hmgDr.model.NotificationVideoModel
object NotificationUtil {
fun createNotificationChannel(
context: Context,
notificationDataModel: NotificationDataModel
): String {
// The id of the channel.
val channelId: String = notificationDataModel.mChannelId
// NotificationChannels are required for Notifications on O (API 26) and above.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
// The user-visible name of the channel.
val channelName: CharSequence = notificationDataModel.mChannelName
// The user-visible description of the channel.
val channelDescription: String = notificationDataModel.mChannelDescription
val channelImportance: Int = notificationDataModel.mChannelImportance
val channelEnableVibrate: Boolean = notificationDataModel.mChannelEnableVibrate
val channelLockscreenVisibility: Int =
notificationDataModel.mChannelLockscreenVisibility
// Initializes NotificationChannel.
val notificationChannel = NotificationChannel(channelId, channelName, channelImportance)
notificationChannel.description = channelDescription
notificationChannel.lightColor = Color.BLUE
notificationChannel.lockscreenVisibility = channelLockscreenVisibility
// no vibration
notificationChannel.vibrationPattern = longArrayOf(0)
notificationChannel.enableVibration(channelEnableVibrate)
// Adds NotificationChannel to system. Attempting to create an existing notification
// channel with its original values performs no operation, so it's safe to perform the
// below sequence.
val notificationManager =
context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
notificationManager.createNotificationChannel(notificationChannel)
}
return channelId
}
fun setNotificationBigStyle(notificationData : NotificationVideoModel): NotificationCompat.BigTextStyle {
return NotificationCompat.BigTextStyle() // Overrides ContentText in the big form of the template.
.bigText(notificationData.mBigText) // Overrides ContentTitle in the big form of the template.
.setBigContentTitle(notificationData.mBigContentTitle) // Summary line after the detail section in the big form of the template.
// Note: To improve readability, don't overload the user with info. If Summary Text
// doesn't add critical information, you should skip it.
.setSummaryText(notificationData.mSummaryText)
}
/**
* IMPORTANT NOTE: You should not do this action unless the user takes an action to see your
* Notifications like this sample demonstrates. Spamming users to re-enable your notifications
* is a bad idea.
*/
fun openNotificationSettingsForApp(context: Context) {
// Links to this app's notification settings.
val intent = Intent()
intent.action = "android.settings.APP_NOTIFICATION_SETTINGS"
intent.putExtra("app_package", context.packageName)
intent.putExtra("app_uid", context.applicationInfo.uid)
// for Android 8 and above
intent.putExtra("android.provider.extra.APP_PACKAGE", context.packageName)
context.startActivity(intent)
}
}

@ -0,0 +1,467 @@
package com.hmg.hmgDr.util.audio
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.media.AudioFormat
import android.media.AudioManager
import android.media.AudioRecord
import android.media.AudioTrack
import android.media.MediaRecorder.AudioSource
import android.os.Process
import android.util.Log
import com.opentok.android.BaseAudioDevice
import java.nio.ByteBuffer
import java.util.concurrent.locks.Condition
import java.util.concurrent.locks.ReentrantLock
class CustomAudioDevice(context: Context) : BaseAudioDevice() {
private val m_context: Context = context
private var m_audioTrack: AudioTrack? = null
private var m_audioRecord: AudioRecord? = null
// Capture & render buffers
private var m_playBuffer: ByteBuffer? = null
private var m_recBuffer: ByteBuffer? = null
private val m_tempBufPlay: ByteArray
private val m_tempBufRec: ByteArray
private val m_rendererLock: ReentrantLock = ReentrantLock(true)
private val m_renderEvent: Condition = m_rendererLock.newCondition()
@Volatile
private var m_isRendering = false
@Volatile
private var m_shutdownRenderThread = false
private val m_captureLock: ReentrantLock = ReentrantLock(true)
private val m_captureEvent: Condition = m_captureLock.newCondition()
@Volatile
private var m_isCapturing = false
@Volatile
private var m_shutdownCaptureThread = false
private val m_captureSettings: AudioSettings
private val m_rendererSettings: AudioSettings
// Capturing delay estimation
private var m_estimatedCaptureDelay = 0
// Rendering delay estimation
private var m_bufferedPlaySamples = 0
private var m_playPosition = 0
private var m_estimatedRenderDelay = 0
private val m_audioManager: AudioManager
private var isRendererMuted = false
companion object {
private const val LOG_TAG = "opentok-defaultaudio"
private const val SAMPLING_RATE = 44100
private const val NUM_CHANNELS_CAPTURING = 1
private const val NUM_CHANNELS_RENDERING = 1
private const val MAX_SAMPLES = 2 * 480 * 2 // Max 10 ms @ 48 kHz
}
init {
try {
m_playBuffer = ByteBuffer.allocateDirect(MAX_SAMPLES)
m_recBuffer = ByteBuffer.allocateDirect(MAX_SAMPLES)
} catch (e: Exception) {
Log.e(LOG_TAG, "${e.message}.")
}
m_tempBufPlay = ByteArray(MAX_SAMPLES)
m_tempBufRec = ByteArray(MAX_SAMPLES)
m_captureSettings = AudioSettings(
SAMPLING_RATE,
NUM_CHANNELS_CAPTURING
)
m_rendererSettings = AudioSettings(
SAMPLING_RATE,
NUM_CHANNELS_RENDERING
)
m_audioManager = m_context
.getSystemService(Context.AUDIO_SERVICE) as AudioManager
m_audioManager.mode = AudioManager.MODE_IN_COMMUNICATION
}
override fun initCapturer(): Boolean {
// get the minimum buffer size that can be used
val minRecBufSize: Int = AudioRecord.getMinBufferSize(
m_captureSettings
.sampleRate,
if (NUM_CHANNELS_CAPTURING == 1) AudioFormat.CHANNEL_IN_MONO else AudioFormat.CHANNEL_IN_STEREO,
AudioFormat.ENCODING_PCM_16BIT
)
// double size to be more safe
val recBufSize = minRecBufSize * 2
// release the object
if (m_audioRecord != null) {
m_audioRecord!!.release()
m_audioRecord = null
}
try {
m_audioRecord = AudioRecord(
AudioSource.VOICE_COMMUNICATION,
m_captureSettings.sampleRate,
if (NUM_CHANNELS_CAPTURING == 1) AudioFormat.CHANNEL_IN_MONO else AudioFormat.CHANNEL_IN_STEREO,
AudioFormat.ENCODING_PCM_16BIT, recBufSize
)
} catch (e: Exception) {
Log.e(LOG_TAG, "${e.message}.")
return false
}
// check that the audioRecord is ready to be used
if (m_audioRecord!!.state != AudioRecord.STATE_INITIALIZED) {
Log.i(
LOG_TAG, "Audio capture is not initialized "
+ m_captureSettings.sampleRate
)
return false
}
m_shutdownCaptureThread = false
Thread(m_captureThread).start()
return true
}
override fun destroyCapturer(): Boolean {
m_captureLock.lock()
// release the object
m_audioRecord?.release()
m_audioRecord = null
m_shutdownCaptureThread = true
m_captureEvent.signal()
m_captureLock.unlock()
return true
}
override fun getEstimatedCaptureDelay(): Int {
return m_estimatedCaptureDelay
}
override fun startCapturer(): Boolean {
// start recording
try {
m_audioRecord!!.startRecording()
} catch (e: IllegalStateException) {
e.printStackTrace()
return false
}
m_captureLock.lock()
m_isCapturing = true
m_captureEvent.signal()
m_captureLock.unlock()
return true
}
override fun stopCapturer(): Boolean {
m_captureLock.lock()
try {
// only stop if we are recording
if (m_audioRecord!!.recordingState == AudioRecord.RECORDSTATE_RECORDING) {
// stop recording
try {
m_audioRecord!!.stop()
} catch (e: IllegalStateException) {
e.printStackTrace()
return false
}
}
} finally {
// Ensure we always unlock
m_isCapturing = false
m_captureLock.unlock()
}
return true
}
private val m_captureThread = Runnable {
val samplesToRec = SAMPLING_RATE / 100
var samplesRead = 0
try {
Process.setThreadPriority(Process.THREAD_PRIORITY_URGENT_AUDIO)
} catch (e: Exception) {
e.printStackTrace()
}
while (!m_shutdownCaptureThread) {
m_captureLock.lock()
samplesRead = try {
if (!m_isCapturing) {
m_captureEvent.await()
continue
} else {
if (m_audioRecord == null) {
continue
}
val lengthInBytes = ((samplesToRec shl 1)
* NUM_CHANNELS_CAPTURING)
val readBytes: Int = m_audioRecord!!.read(
m_tempBufRec, 0,
lengthInBytes
)
m_recBuffer!!.rewind()
m_recBuffer!!.put(m_tempBufRec)
(readBytes shr 1) / NUM_CHANNELS_CAPTURING
}
} catch (e: Exception) {
Log.e(LOG_TAG, "RecordAudio try failed: " + e.message)
continue
} finally {
// Ensure we always unlock
m_captureLock.unlock()
}
audioBus.writeCaptureData(m_recBuffer, samplesRead)
m_estimatedCaptureDelay = samplesRead * 1000 / SAMPLING_RATE
}
}
override fun initRenderer(): Boolean {
// get the minimum buffer size that can be used
val minPlayBufSize: Int = AudioTrack.getMinBufferSize(
m_rendererSettings
.sampleRate,
if (NUM_CHANNELS_RENDERING == 1) AudioFormat.CHANNEL_OUT_MONO else AudioFormat.CHANNEL_OUT_STEREO,
AudioFormat.ENCODING_PCM_16BIT
)
var playBufSize = minPlayBufSize
if (playBufSize < 6000) {
playBufSize *= 2
}
// release the object
if (m_audioTrack != null) {
m_audioTrack!!.release()
m_audioTrack = null
}
try {
m_audioTrack = AudioTrack(
AudioManager.STREAM_VOICE_CALL,
m_rendererSettings.sampleRate,
if (NUM_CHANNELS_RENDERING == 1) AudioFormat.CHANNEL_OUT_MONO else AudioFormat.CHANNEL_OUT_STEREO,
AudioFormat.ENCODING_PCM_16BIT, playBufSize,
AudioTrack.MODE_STREAM
)
} catch (e: Exception) {
Log.e(LOG_TAG, "${e.message}.")
return false
}
// check that the audioRecord is ready to be used
if (m_audioTrack!!.state != AudioTrack.STATE_INITIALIZED) {
Log.i(
LOG_TAG, "Audio renderer not initialized "
+ m_rendererSettings.sampleRate
)
return false
}
m_bufferedPlaySamples = 0
outputMode = OutputMode.SpeakerPhone
m_shutdownRenderThread = false
Thread(m_renderThread).start()
return true
}
override fun destroyRenderer(): Boolean {
m_rendererLock.lock()
// release the object
m_audioTrack!!.release()
m_audioTrack = null
m_shutdownRenderThread = true
m_renderEvent.signal()
m_rendererLock.unlock()
unregisterHeadsetReceiver()
m_audioManager.isSpeakerphoneOn = false
m_audioManager.mode = AudioManager.MODE_NORMAL
return true
}
override fun getEstimatedRenderDelay(): Int {
return m_estimatedRenderDelay
}
override fun startRenderer(): Boolean {
// start playout
try {
m_audioTrack!!.play()
} catch (e: IllegalStateException) {
e.printStackTrace()
return false
}
m_rendererLock.lock()
m_isRendering = true
m_renderEvent.signal()
m_rendererLock.unlock()
return true
}
override fun stopRenderer(): Boolean {
m_rendererLock.lock()
try {
// only stop if we are playing
if (m_audioTrack!!.getPlayState() == AudioTrack.PLAYSTATE_PLAYING) {
// stop playout
try {
m_audioTrack!!.stop()
} catch (e: IllegalStateException) {
e.printStackTrace()
return false
}
// flush the buffers
m_audioTrack!!.flush()
}
} finally {
// Ensure we always unlock, both for success, exception or error
// return.
m_isRendering = false
m_rendererLock.unlock()
}
return true
}
private val m_renderThread = Runnable {
val samplesToPlay = SAMPLING_RATE / 100
try {
Process
.setThreadPriority(Process.THREAD_PRIORITY_URGENT_AUDIO)
} catch (e: Exception) {
e.printStackTrace()
}
while (!m_shutdownRenderThread) {
m_rendererLock.lock()
try {
if (!m_isRendering) {
m_renderEvent.await()
continue
} else {
m_rendererLock.unlock()
// Don't lock on audioBus calls
m_playBuffer!!.clear()
val samplesRead: Int = audioBus.readRenderData(
m_playBuffer, samplesToPlay
)
// Log.d(LOG_TAG, "Samples read: " + samplesRead);
m_rendererLock.lock()
if (!isRendererMuted) {
// After acquiring the lock again
// we must check if we are still playing
if (m_audioTrack == null
|| !m_isRendering
) {
continue
}
val bytesRead = ((samplesRead shl 1)
* NUM_CHANNELS_RENDERING)
m_playBuffer!!.get(m_tempBufPlay, 0, bytesRead)
val bytesWritten: Int = m_audioTrack!!.write(
m_tempBufPlay, 0,
bytesRead
)
// increase by number of written samples
m_bufferedPlaySamples += ((bytesWritten shr 1)
/ NUM_CHANNELS_RENDERING)
// decrease by number of played samples
val pos: Int = m_audioTrack!!.getPlaybackHeadPosition()
if (pos < m_playPosition) {
// wrap or reset by driver
m_playPosition = 0
}
m_bufferedPlaySamples -= pos - m_playPosition
m_playPosition = pos
// we calculate the estimated delay based on the
// buffered samples
m_estimatedRenderDelay = (m_bufferedPlaySamples * 1000
/ SAMPLING_RATE)
}
}
} catch (e: Exception) {
Log.e(LOG_TAG, "Exception: " + e.message)
e.printStackTrace()
} finally {
m_rendererLock.unlock()
}
}
}
override fun getCaptureSettings(): AudioSettings {
return m_captureSettings
}
override fun getRenderSettings(): AudioSettings {
return m_rendererSettings
}
/**
* Communication modes handling
*/
override fun setOutputMode(mode: OutputMode): Boolean {
super.setOutputMode(mode)
if (mode == OutputMode.Handset) {
unregisterHeadsetReceiver()
m_audioManager.isSpeakerphoneOn = false
} else {
m_audioManager.isSpeakerphoneOn = true
registerHeadsetReceiver()
}
return true
}
private val m_headsetReceiver: BroadcastReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent) {
if (intent.action!!.compareTo(Intent.ACTION_HEADSET_PLUG) == 0) {
val state: Int = intent.getIntExtra("state", 0)
m_audioManager.isSpeakerphoneOn = state == 0
}
}
}
private var m_receiverRegistered = false
private fun registerHeadsetReceiver() {
if (!m_receiverRegistered) {
val receiverFilter = IntentFilter(
Intent.ACTION_HEADSET_PLUG
)
m_context.registerReceiver(m_headsetReceiver, receiverFilter)
m_receiverRegistered = true
}
}
private fun unregisterHeadsetReceiver() {
if (m_receiverRegistered) {
try {
m_context.unregisterReceiver(m_headsetReceiver)
} catch (e: IllegalArgumentException) {
e.printStackTrace()
}
m_receiverRegistered = false
}
}
override fun onPause() {
if (outputMode == OutputMode.SpeakerPhone) {
unregisterHeadsetReceiver()
}
}
override fun onResume() {
if (outputMode == OutputMode.SpeakerPhone) {
registerHeadsetReceiver()
}
}
fun setRendererMute(isRendererMuted: Boolean) {
this.isRendererMuted = isRendererMuted
}
}

@ -1,4 +1,4 @@
package com.hmg.hmgDr.util
package com.hmg.hmgDr.util.opentok
import android.content.Context
import android.content.res.Resources

@ -1,4 +1,4 @@
package com.hmg.hmgDr.util
package com.hmg.hmgDr.util.opentok
import android.content.Context
import android.content.res.Resources

@ -2,9 +2,20 @@ package com.hmg.hmgDr.util
import android.content.Context
import android.util.DisplayMetrics
import android.view.inputmethod.InputMethodManager
import android.widget.EditText
import io.flutter.embedding.android.FlutterFragmentActivity
import kotlin.math.ceil
object ViewsUtil {
/* return status bar height on basis of device display metrics */
fun getStatusBarHeight(context: Context): Int {
return ceil(
(25 * context.resources.displayMetrics.density).toDouble()
).toInt()
}
/**
* @param context
* @return the Screen height in DP
@ -30,4 +41,18 @@ object ViewsUtil {
displayMetrics.widthPixels.toFloat()
}
}
// code to hide soft keyboard
fun hideSoftKeyBoard(context: Context, editBox: EditText?) {
val imm = context.getSystemService(FlutterFragmentActivity.INPUT_METHOD_SERVICE) as InputMethodManager
imm.hideSoftInputFromWindow(editBox?.windowToken, 0)
}
// code to show soft keyboard
private fun showSoftKeyBoard(context: Context, editBox: EditText?) {
val inputMethodManager = context.getSystemService(FlutterFragmentActivity.INPUT_METHOD_SERVICE) as InputMethodManager
editBox?.requestFocus()
inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0)
}
}

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z"/>
</vector>

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
</vector>

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M12,9c-1.6,0 -3.15,0.25 -4.6,0.72v3.1c0,0.39 -0.23,0.74 -0.56,0.9 -0.98,0.49 -1.87,1.12 -2.66,1.85 -0.18,0.18 -0.43,0.28 -0.7,0.28 -0.28,0 -0.53,-0.11 -0.71,-0.29L0.29,13.08c-0.18,-0.17 -0.29,-0.42 -0.29,-0.7 0,-0.28 0.11,-0.53 0.29,-0.71C3.34,8.78 7.46,7 12,7s8.66,1.78 11.71,4.67c0.18,0.18 0.29,0.43 0.29,0.71 0,0.28 -0.11,0.53 -0.29,0.71l-2.48,2.48c-0.18,0.18 -0.43,0.29 -0.71,0.29 -0.27,0 -0.52,-0.11 -0.7,-0.28 -0.79,-0.74 -1.69,-1.36 -2.67,-1.85 -0.33,-0.16 -0.56,-0.5 -0.56,-0.9v-3.1C15.15,9.25 13.6,9 12,9z"/>
</vector>

@ -33,15 +33,15 @@
android:background="@drawable/shape_capsule"
android:padding="@dimen/padding_space_small">
<Chronometer
android:id="@+id/cmTimer"
<TextView
android:id="@+id/tv_timer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="4dp"
android:textColor="@color/white"
android:textSize="16sp"
android:textSize="@dimen/text_size_medium"
android:textStyle="bold"
tools:text="25:45" />
android:text="00:00" />
</FrameLayout>

@ -0,0 +1,81 @@
<?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:gravity="center"
android:orientation="vertical"
android:padding="16dp">
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:fadeScrollbars="false"
android:scrollbars="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/ask_for_error_log"
android:textColor="#212121"
android:textSize="18sp"/>
<Button
android:id="@+id/button_view_error_log"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="View Error Log"
android:textColor="#212121"/>
<Button
android:id="@+id/button_copy_error_log"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="Copy Error Log"
android:textColor="#212121"/>
<Button
android:id="@+id/button_share_error_log"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="Share Error Log"
android:textColor="#212121"/>
<Button
android:id="@+id/button_email_error_log"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="Email Error Log"
android:textColor="#212121"/>
<Button
android:id="@+id/button_save_error_log"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="Save Error Log"
android:textColor="#212121"/>
<Button
android:id="@+id/button_close_app"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Close App"
android:textColor="#212121"/>
</LinearLayout>
</ScrollView>
</LinearLayout>

@ -0,0 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="88dp"
android:background="@android:color/holo_blue_dark"
android:orientation="vertical"
android:padding="@dimen/padding_space_medium">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_icon"
android:layout_width="22dp"
android:layout_height="22dp"
android:src="@mipmap/ic_launcher" />
<TextView
style="@style/TextAppearance.Compat.Notification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/padding_space_small"
android:paddingEnd="@dimen/padding_space_small"
android:text="HMG Doctor"
android:textColor="@color/white"
android:textSize="@dimen/text_size_small" />
<Chronometer
android:id="@+id/notify_timer"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
style="@style/TextAppearance.Compat.Notification"
android:paddingStart="@dimen/padding_space_small"
android:paddingEnd="@dimen/padding_space_small"
android:textColor="@color/white"
android:textSize="@dimen/text_size_small"
android:format="MM:SS"
tools:text="25:45" />
<ImageView
android:id="@+id/iv_Arrow"
android:layout_width="22dp"
android:layout_height="22dp"
android:src="@drawable/ic_arrow_bottom" />
</LinearLayout>
<TextView
android:id="@+id/notify_title"
style="@style/TextAppearance.Compat.Notification.Title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/padding_space_medium"
android:paddingStart="@dimen/padding_space_small"
android:paddingEnd="@dimen/padding_space_small"
android:textColor="@color/white"
android:textSize="@dimen/text_size_small"
android:textStyle="bold"
tools:text="Mosa zaid mosa abuzaid" />
<TextView
android:id="@+id/notify_content"
style="@style/TextAppearance.Compat.Notification.Title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/padding_space_small"
android:paddingEnd="@dimen/padding_space_small"
android:textColor="@color/white"
android:textSize="@dimen/text_size_small"
android:text="Tap to return to call" />
</LinearLayout>

@ -0,0 +1,94 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/holo_blue_dark"
android:orientation="vertical"
android:padding="@dimen/padding_space_medium">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_icon"
android:layout_width="22dp"
android:layout_height="22dp"
android:src="@mipmap/ic_launcher" />
<TextView
style="@style/TextAppearance.Compat.Notification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/padding_space_small"
android:paddingEnd="@dimen/padding_space_small"
android:text="HMG Doctor"
android:textColor="@color/white"
android:textSize="@dimen/text_size_small" />
<Chronometer
android:id="@+id/notify_timer"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
style="@style/TextAppearance.Compat.Notification"
android:paddingStart="@dimen/padding_space_small"
android:paddingEnd="@dimen/padding_space_small"
android:textColor="@color/white"
android:textSize="@dimen/text_size_small"
android:format="MM:SS"
tools:text="25:45" />
<ImageView
android:id="@+id/iv_Arrow"
android:layout_width="22dp"
android:layout_height="22dp"
android:src="@drawable/ic_arrow_top" />
</LinearLayout>
<TextView
android:id="@+id/notify_title"
style="@style/TextAppearance.Compat.Notification.Title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/padding_space_big"
android:paddingStart="@dimen/padding_space_small"
android:paddingEnd="@dimen/padding_space_small"
android:textColor="@color/white"
android:textSize="@dimen/text_size_medium"
android:textStyle="bold"
tools:text="Mosa zaid mosa abuzaid" />
<TextView
android:id="@+id/notify_content"
style="@style/TextAppearance.Compat.Notification.Title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/padding_space_small"
android:paddingEnd="@dimen/padding_space_small"
android:textColor="@color/white"
android:textSize="@dimen/text_size_medium"
android:text="Tap to return to call" />
<TextView
android:id="@+id/btn_end"
style="@style/TextAppearance.Compat.Notification.Title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/padding_space_medium"
android:layout_marginBottom="@dimen/padding_space_medium"
android:paddingStart="@dimen/padding_space_small"
android:paddingEnd="@dimen/padding_space_small"
android:textColor="@color/white"
android:textSize="@dimen/text_size_medium"
android:textStyle="bold"
android:text="End call" />
</LinearLayout>

@ -4,7 +4,6 @@
<string name="remaining_ar">الوقت المتبقي بالثانيه: </string>
<string name="setting">Settings</string>
<string name="cancel">Cancel</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="ask_for_error_log">An unexpected error has occurred.\nHelp developers by providing error details.\nThank you for your support.</string>
</resources>

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
<style name="LaunchTheme" parent="Theme.AppCompat.NoActionBar">
<!-- Show a splash screen on the activity. Automatically removed when
Flutter draws its first frame -->
<item name="android:windowBackground">@drawable/launch_background</item>

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<paths>
<external-path name="external_files" path="."/>
</paths>

@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:7.0.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.3'
}
@ -17,7 +17,8 @@ allprojects {
google()
jcenter()
mavenCentral()
maven { url 'https://tokbox.bintray.com/maven' }
maven { url 'https://developer.huawei.com/repo/' }
// maven { url 'https://tokbox.bintray.com/maven' }
}
}

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

@ -0,0 +1 @@
include ':app'

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 348 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 412 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 946 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 655 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 577 KiB

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 73 74" style="enable-background:new 0 0 73 74;" xml:space="preserve">
<style type="text/css">
.st0{fill:#E3E3E3;}
.st1{fill:none;stroke:#CCCCCC;}
.st2{fill:#B4B4B4;}
</style>
<g id="Ellipse_123-2" transform="translate(2933 475)">
<circle class="st0" cx="-2896.5" cy="-437.5" r="35"/>
<circle class="st1" cx="-2896.5" cy="-437.5" r="34.5"/>
</g>
<path class="st2" d="M40.25,43.44c-0.02-0.24-0.04-0.63-0.05-1.04c3.94-0.38,6.7-1.26,6.7-2.29c-0.01,0-0.01-0.04-0.01-0.06
c-2.94-2.48,2.55-20.09-7.68-19.73c-0.64-0.51-1.77-0.96-3.38-0.96c-13.86,0.98-7.73,17.61-10.89,20.75c0,0,0,0-0.01,0
c0,0,0,0,0,0.01c0,0,0,0,0,0s0,0,0,0c0.01,1.01,2.68,1.87,6.51,2.26c-0.01,0.25-0.03,0.55-0.08,1.06
c-1.59,3.99-12.3,2.87-12.8,10.56H53C52.51,46.31,41.84,47.43,40.25,43.44z"/>
</svg>

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

@ -1,7 +0,0 @@
<svg id="enter" xmlns="http://www.w3.org/2000/svg" width="42" height="42" viewBox="0 0 42 42">
<path id="Path_1146" data-name="Path 1146" d="M17.938,210.625H1.313a1.313,1.313,0,1,1,0-2.625H17.938a1.313,1.313,0,1,1,0,2.625Zm0,0" transform="translate(22.749 -190.938)"/>
<path id="Path_1147" data-name="Path 1147" d="M123.984,143.736a1.313,1.313,0,0,1-.928-2.242l5.635-5.635-5.635-5.633a1.313,1.313,0,0,1,1.857-1.857l6.563,6.562a1.313,1.313,0,0,1,0,1.857l-6.562,6.562A1.31,1.31,0,0,1,123.984,143.736Zm0,0" transform="translate(-89.86 -117.486)"/>
<path id="Path_1148" data-name="Path 1148" d="M312.668,42.076a3.5,3.5,0,0,0,3.5-3.5V7.076A3.522,3.522,0,0,0,313.8,3.753L303.284.248a3.537,3.537,0,0,0-4.616,3.329v31.5a3.524,3.524,0,0,0,2.368,3.321L311.553,41.9A3.662,3.662,0,0,0,312.668,42.076ZM302.168,2.7a1.03,1.03,0,0,1,.313.046l10.47,3.491a.9.9,0,0,1,.592.838v31.5a.922.922,0,0,1-1.188.83l-10.47-3.491a.905.905,0,0,1-.591-.838V3.576A.876.876,0,0,1,302.168,2.7Zm0,0" transform="translate(-298.668 -0.076)"/>
<path id="Path_1149" data-name="Path 1149" d="M195.168,8.75a1.313,1.313,0,0,0,1.313-1.312V4.813A4.816,4.816,0,0,0,191.668,0H171.98a1.313,1.313,0,0,0,0,2.625h19.688a2.19,2.19,0,0,1,2.187,2.188V7.438A1.313,1.313,0,0,0,195.168,8.75Zm0,0" transform="translate(-168.48)"/>
<path id="Path_1150" data-name="Path 1150" d="M171.98,350.082h7a4.816,4.816,0,0,0,4.812-4.813v-2.625a1.313,1.313,0,0,0-2.625,0v2.625a2.19,2.19,0,0,1-2.187,2.188h-7a1.313,1.313,0,0,0,0,2.625Zm0,0" transform="translate(-155.793 -313.332)"/>
</svg>

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 753 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 206 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 987 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 409 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 942 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 765 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 616 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1007 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 819 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 631 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 940 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 969 B

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 73 74" style="enable-background:new 0 0 73 74;" xml:space="preserve">
<style type="text/css">
.st0{fill:#E3E3E3;}
.st1{fill:none;stroke:#CCCCCC;}
.st2{fill:#B4B4B4;}
</style>
<g id="Ellipse_123-2" transform="translate(2933 475)">
<circle class="st0" cx="-2896.5" cy="-437.5" r="35"/>
<circle class="st1" cx="-2896.5" cy="-437.5" r="34.5"/>
</g>
<path id="Icon_awesome-user-alt" class="st2" d="M36.5,39.75c5.59,0,10.13-4.53,10.13-10.13S42.09,19.5,36.5,19.5
s-10.13,4.53-10.13,10.13C26.38,35.22,30.91,39.75,36.5,39.75z M45.5,42h-3.87c-3.25,1.5-7,1.5-10.25,0H27.5c-4.97,0-9,4.03-9,9
v1.13c0,1.86,1.51,3.37,3.38,3.38h29.25c1.86,0,3.37-1.51,3.38-3.38V51C54.5,46.03,50.47,42,45.5,42z"/>
</svg>

Before

Width:  |  Height:  |  Size: 970 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="28.123" height="26.245" viewBox="0 0 28.123 26.245">
<path id="XMLID_219_" d="M28.984,15.637A2.077,2.077,0,0,1,27.025,17h-.716V27.309a.938.938,0,0,1-.937.937H19.748V21.685a4.687,4.687,0,0,0-9.374,0v6.562H4.749a.938.938,0,0,1-.937-.937V17H3.095a2.1,2.1,0,0,1-1.378-3.675L12.665,2.955a3.486,3.486,0,0,1,4.792,0L28.431,13.347A2.066,2.066,0,0,1,28.984,15.637Z" transform="translate(-0.999 -2.001)" fill="#2e303a"/>
</svg>

After

Width:  |  Height:  |  Size: 467 B

@ -0,0 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24.899" height="24.899" viewBox="0 0 24.899 24.899">
<g id="Layer_76" data-name="Layer 76" transform="translate(-2 -2)">
<path id="Path_4380" data-name="Path 4380" d="M3.245,11.96A1.245,1.245,0,0,0,4.49,10.715V5.735A1.245,1.245,0,0,1,5.735,4.49h4.98a1.245,1.245,0,1,0,0-2.49H5.735A3.735,3.735,0,0,0,2,5.735v4.98A1.245,1.245,0,0,0,3.245,11.96Z" transform="translate(0 0)" fill="#2e303a"/>
<path id="Path_4381" data-name="Path 4381" d="M20.225,2h-4.98a1.245,1.245,0,0,0,0,2.49h4.98A1.245,1.245,0,0,1,21.47,5.735v4.98a1.245,1.245,0,1,0,2.49,0V5.735A3.735,3.735,0,0,0,20.225,2Z" transform="translate(2.94 0)" fill="#2e303a"/>
<path id="Path_4382" data-name="Path 4382" d="M22.715,14a1.245,1.245,0,0,0-1.245,1.245v4.98a1.245,1.245,0,0,1-1.245,1.245h-4.98a1.245,1.245,0,0,0,0,2.49h4.98a3.735,3.735,0,0,0,3.735-3.735v-4.98A1.245,1.245,0,0,0,22.715,14Z" transform="translate(2.94 2.94)" fill="#2e303a"/>
<path id="Path_4383" data-name="Path 4383" d="M10.715,21.47H5.735A1.245,1.245,0,0,1,4.49,20.225v-4.98a1.245,1.245,0,0,0-2.49,0v4.98A3.735,3.735,0,0,0,5.735,23.96h4.98a1.245,1.245,0,1,0,0-2.49Z" transform="translate(0 2.94)" fill="#2e303a"/>
<rect id="Rectangle_17370" data-name="Rectangle 17370" width="15" height="15" rx="2" transform="translate(7 6.899)" fill="#2e303a"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="26.552" height="20.755" viewBox="0 0 26.552 20.755">
<g id="mail-reply" transform="translate(0 -40.338)">
<path id="Path_4384" data-name="Path 4384" d="M21.236,51.705h.129a1.8,1.8,0,0,1,2.761-2.272l.788.788V42.437a2.1,2.1,0,0,0-2.1-2.1H2.1a2.1,2.1,0,0,0-2.1,2.1V56.921a2.1,2.1,0,0,0,2.1,2.1H16.575a5.14,5.14,0,0,1,4.66-7.314ZM5.213,43.167H19.7l-7.244,5.312Z" fill="#2e303a"/>
<path id="Path_4385" data-name="Path 4385" d="M245.767,175.159l-2.8-2.8a.9.9,0,1,0-1.27,1.27l1.265,1.265h-2.25a4.245,4.245,0,0,0,0,8.489.9.9,0,1,0,0-1.8,2.448,2.448,0,0,1,0-4.9h2.25l-1.265,1.265a.9.9,0,0,0,1.27,1.27l2.8-2.8a.9.9,0,0,0,0-1.27Z" transform="translate(-219.478 -122.292)" fill="#2e303a"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 749 B

@ -0,0 +1,3 @@
<svg id="weekly-calendar-page-symbol" xmlns="http://www.w3.org/2000/svg" width="25.034" height="25.034" viewBox="0 0 25.034 25.034">
<path id="Path_4379" data-name="Path 4379" d="M22.53,0H2.5A2.511,2.511,0,0,0,0,2.5V22.53a2.512,2.512,0,0,0,2.5,2.5H22.53a2.512,2.512,0,0,0,2.5-2.5V2.5A2.511,2.511,0,0,0,22.53,0ZM6.756,22.031H2.921V18.62H6.756v3.411Zm0-4.555H2.921v-3.41H6.756v3.41ZM6.467,3.794A1.063,1.063,0,1,1,7.529,2.731,1.062,1.062,0,0,1,6.467,3.794Zm5.406,18.237H8.039V18.62h3.834Zm0-4.555H8.039v-3.41h3.834Zm0-4.552H8.039V9.514h3.834ZM11.455,2.731a1.062,1.062,0,1,1,1.062,1.062A1.062,1.062,0,0,1,11.455,2.731Zm5.54,14.745H13.159v-3.41H17v3.41Zm0-4.552H13.159V9.514H17v3.41ZM17.5,2.731a1.062,1.062,0,1,1,1.062,1.062A1.062,1.062,0,0,1,17.5,2.731Zm4.609,14.745H18.278v-3.41h3.835Zm0-4.552H18.278V9.514h3.835Z" fill="#2e303a"/>
</svg>

After

Width:  |  Height:  |  Size: 838 B

@ -0,0 +1,57 @@
<svg id="woman_2_" data-name="woman (2)" xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48">
<g id="Group_7145" data-name="Group 7145">
<g id="Group_7144" data-name="Group 7144">
<g id="Group_7143" data-name="Group 7143">
<g id="Group_7142" data-name="Group 7142">
<g id="XMLID_2114_">
<g id="XMLID_2115_">
<g id="XMLID_2116_">
<g id="XMLID_2117_">
<g id="XMLID_2118_">
<g id="XMLID_2119_">
<g id="XMLID_2120_">
<g id="XMLID_2121_">
<g id="XMLID_2122_">
<g id="XMLID_2123_">
<g id="XMLID_2124_">
<g id="XMLID_2125_">
<g id="XMLID_2126_">
<g id="XMLID_2127_">
<g id="Group_7141" data-name="Group 7141">
<path id="Path_4450" data-name="Path 4450" d="M48,24a23.928,23.928,0,0,1-6.947,16.887C36.7,45.279,30.669,42.776,24,42.776s-12.7,2.5-17.053-1.889A24,24,0,1,1,48,24Z" fill="#e2e2e2"/>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
<path id="Path_4451" data-name="Path 4451" d="M48,24q0-1.087-.1-2.151L33.541,7.485,14.75,23.632,31.62,40.5l1.688,2.974c2.921.089,5.548-.37,7.745-2.589A23.928,23.928,0,0,0,48,24Z" fill="#c4c4c4"/>
<path id="Path_4452" data-name="Path 4452" d="M24,3.287C20.723,2.9,8.986,6.052,12.5,19.837c.924,3.622,4.646,5.913,6.284,6.51,2.5.913,2.742-.517,5.214-2.007,2.472,1.49,2.71,2.919,5.214,2.007,1.638-.6,5.36-2.888,6.284-6.51C39.014,6.052,27.277,2.9,24,3.287Z" fill="#515151"/>
<path id="Path_4453" data-name="Path 4453" d="M35.5,19.838c-.924,3.622-4.646,5.913-6.284,6.51-2.5.913-2.742-.517-5.213-2.007V3.287C27.277,2.9,39.014,6.052,35.5,19.837Z" fill="#3d3d3d"/>
<path id="Path_4454" data-name="Path 4454" d="M18.747,23.459H29.253V34.6H18.747Z" fill="#eaa678"/>
<path id="Path_4455" data-name="Path 4455" d="M24,23.46h5.253V34.6H24Z" fill="#d38c5b"/>
<path id="Path_4456" data-name="Path 4456" d="M18.747,30.452H29.253V41.593H18.747Z" fill="#ffc397"/>
<path id="Path_4457" data-name="Path 4457" d="M24,30.452h5.253V41.593H24Z" fill="#eaa678"/>
<path id="Path_4458" data-name="Path 4458" d="M41.053,35.918v4.969a24,24,0,0,1-34.106,0V35.918a5.466,5.466,0,0,1,5.466-5.467h6.335L24,37.18l5.253-6.728h6.335A5.466,5.466,0,0,1,41.053,35.918Z" fill="#d02127"/>
<path id="Path_4459" data-name="Path 4459" d="M41.053,35.918v4.969A23.925,23.925,0,0,1,24,48V37.18l5.253-6.728h6.335A5.466,5.466,0,0,1,41.053,35.918Z" fill="#aa191e"/>
<path id="Path_4460" data-name="Path 4460" d="M28.256,39.447a2.908,2.908,0,0,0-1.3,2.649c.172,1.751,2.3,3.292,2.3,3.292s3.4-3.062,2.069-5.94l-1.446-.556Z" fill="#3d3d3d"/>
<path id="Path_4461" data-name="Path 4461" d="M32.274,14.271C31.924,8.965,27.632,7,24,7s-7.924,1.961-8.274,7.267a2.285,2.285,0,0,0-1.5,2.409l.161,2.267a1.875,1.875,0,0,0,2.043,1.7l.175-.019c2.076,5.573,5.33,6.154,7.4,6.48,2.066-.326,5.321-.907,7.4-6.48l.175.019a1.875,1.875,0,0,0,2.043-1.7l.161-2.267A2.285,2.285,0,0,0,32.274,14.271Z" fill="#ffc397"/>
<path id="Path_4462" data-name="Path 4462" d="M33.775,16.681l-.161,2.267a1.875,1.875,0,0,1-2.043,1.7l-.175-.019a11.863,11.863,0,0,1-2.445,4.151A7.942,7.942,0,0,1,24,27.1V7c3.632,0,7.924,1.961,8.274,7.267a2.285,2.285,0,0,1,1.5,2.409Z" fill="#eaa678"/>
<path id="Path_4463" data-name="Path 4463" d="M24,4.977c-5.521-1.2-9.452,2.277-9.539,6.282a10.3,10.3,0,0,0,3.027,6.969c-.053-3.326,1-4.7,3.062-5.438A8.7,8.7,0,0,0,24,9.96a8.7,8.7,0,0,0,3.45,2.83c2.059.739,3.115,2.112,3.062,5.438a10.3,10.3,0,0,0,3.027-6.969C33.452,7.253,29.521,3.772,24,4.977Z" fill="#515151"/>
<path id="Path_4464" data-name="Path 4464" d="M33.539,11.259a10.305,10.305,0,0,1-3.027,6.968c.052-3.326-1-4.7-3.062-5.437A8.7,8.7,0,0,1,24,9.96V4.976C29.521,3.772,33.452,7.253,33.539,11.259Z" fill="#3d3d3d"/>
<path id="Path_4465" data-name="Path 4465" d="M33.389,27.8a6.76,6.76,0,0,0-.026-5.35l-3.618,2.514a2.626,2.626,0,0,0-.524.48,2.882,2.882,0,0,0-.2,3.919,3.365,3.365,0,0,0-.367.422,2.833,2.833,0,0,0,.006,3.69c-.043.042-.085.086-.124.132-2.549,2.97.917,5.083.917,5.083a5.421,5.421,0,0,0,3.554-6.78A6.03,6.03,0,0,0,33.389,27.8Z" fill="#3d3d3d"/>
<path id="Path_4466" data-name="Path 4466" d="M31.27,39.657H28.377a.7.7,0,0,1-.7-.7V37.87a.7.7,0,0,1,.7-.7H31.27a.7.7,0,0,1,.7.7v1.087A.7.7,0,0,1,31.27,39.657Z" fill="#d02127"/>
</svg>

After

Width:  |  Height:  |  Size: 4.9 KiB

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="12.179" height="12.188" viewBox="0 0 12.179 12.188">
<path id="Path_4406" data-name="Path 4406" d="M12.039,10.586c1.24-1.24,1.644-1.48,1.348-1.776L12.38,7.8a.3.3,0,0,0-.427,0L10.6,9.152l-.976-.976A4.378,4.378,0,1,0,8.2,9.615l.973.972c-1.24,1.24-1.644,1.48-1.348,1.776L8.828,13.37a.3.3,0,0,0,.427,0L10.6,12.022c1.457,1.457,1.679,1.847,1.977,1.55.97-.97,1.1-1.02,1.1-1.222s-.058-.183-1.638-1.764ZM5.892,8.77a2.9,2.9,0,1,1,2.9-2.9A2.9,2.9,0,0,1,5.892,8.77Z" transform="translate(-1.498 -1.476)" fill="#f0448d"/>
</svg>

After

Width:  |  Height:  |  Size: 565 B

@ -0,0 +1,4 @@
<svg id="hospital_3_" data-name="hospital (3)" xmlns="http://www.w3.org/2000/svg" width="20.5" height="20.5" viewBox="0 0 20.5 20.5">
<path id="Path_4585" data-name="Path 4585" d="M19.9,182.442a.6.6,0,0,0-.6.6v3H18a2.982,2.982,0,0,0-2.921-2.4H8.648v.578L7.413,184.2a3.059,3.059,0,0,0-2.577-.643,1.8,1.8,0,1,0-3.512-.652l-.123-.077V180.6a.6.6,0,0,0-1.2,0v12.092a.6.6,0,0,0,1.2,0v-3H19.3v3a.6.6,0,0,0,1.2,0v-9.649A.6.6,0,0,0,19.9,182.442Zm-18.7,3.6v-1.8l2.853,1.8Z" transform="translate(0 -172.793)" fill="#28323a"/>
<path id="Path_4586" data-name="Path 4586" d="M136.6,1.842h1.2v1.2h-.6a.6.6,0,0,0-.6.6v1.2a1.8,1.8,0,0,0,3.6,0v-1.2a.6.6,0,0,0-.6-.6H139v-1.2h2.4V9.649h1.2V.6a.6.6,0,1,0-1.2.04h-4.8a.6.6,0,0,0,0,1.2Z" transform="translate(-130.555)" fill="#28323a"/>
</svg>

After

Width:  |  Height:  |  Size: 776 B

@ -0,0 +1,56 @@
<svg id="man_5_" data-name="man (5)" xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48">
<g id="Group_7139" data-name="Group 7139">
<g id="Group_7138" data-name="Group 7138">
<g id="Group_7137" data-name="Group 7137">
<g id="Group_7136" data-name="Group 7136">
<g id="XMLID_2211_">
<g id="XMLID_2212_">
<g id="XMLID_2213_">
<g id="XMLID_2214_">
<g id="XMLID_2215_">
<g id="XMLID_2216_">
<g id="XMLID_2217_">
<g id="XMLID_2218_">
<g id="XMLID_2219_">
<g id="XMLID_2220_">
<g id="XMLID_2221_">
<g id="XMLID_2222_">
<g id="XMLID_2223_">
<g id="XMLID_2224_">
<g id="XMLID_2225_">
<path id="Path_4436" data-name="Path 4436" d="M0,24A24,24,0,1,1,42.887,38.81c-4.394,5.6-11.221,3.983-18.887,3.983S9.507,44.405,5.113,38.81A23.9,23.9,0,0,1,0,24Z" fill="#e2e2e2"/>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
<path id="Path_4437" data-name="Path 4437" d="M42.887,38.81A23.9,23.9,0,0,0,48,24q0-.493-.02-.982L34.651,9.689C26.856,6.362,15.212,20.337,15.212,20.337l9.778,9.778,4.217,12.829C34.718,43.153,39.518,43.1,42.887,38.81Z" fill="#c4c4c4"/>
<g id="Group_7140" data-name="Group 7140">
<path id="Path_4438" data-name="Path 4438" d="M18.747,23.459H29.253V34.6H18.747Z" fill="#eaa678"/>
<path id="Path_4439" data-name="Path 4439" d="M24,23.46h5.253V34.6H24Z" fill="#d38c5b"/>
<path id="Path_4440" data-name="Path 4440" d="M32.43,46.477a23.683,23.683,0,0,1-3.177.946,24.178,24.178,0,0,1-10.506,0,23.683,23.683,0,0,1-3.177-.946l3.177-16.024L24,33.857l5.253-3.4Z" fill="#d02127"/>
<path id="Path_4441" data-name="Path 4441" d="M32.43,46.477a23.683,23.683,0,0,1-3.177.946A24,24,0,0,1,24,48V33.857l5.253-3.4Z" fill="#aa191e"/>
<path id="Path_4442" data-name="Path 4442" d="M18.747,30.452V47.423A24,24,0,0,1,5.113,38.81V35.741A5.289,5.289,0,0,1,10.4,30.452Z" fill="#2b353e"/>
<path id="Path_4443" data-name="Path 4443" d="M42.887,35.741V38.81a24,24,0,0,1-13.634,8.613V30.452H37.6A5.289,5.289,0,0,1,42.887,35.741Z" fill="#2b353e"/>
<path id="Path_4444" data-name="Path 4444" d="M13.7,39.923v5.761a23.726,23.726,0,0,1-3.023-1.717V39.923Z" fill="#989898"/>
<path id="Path_4445" data-name="Path 4445" d="M37.362,39.923v4.016a23.888,23.888,0,0,1-3.023,1.725V39.923Z" fill="#989898"/>
<path id="Path_4446" data-name="Path 4446" d="M32.274,14.271C31.924,8.965,27.632,7,24,7s-7.924,1.961-8.274,7.267a2.285,2.285,0,0,0-1.5,2.409l.161,2.267a1.875,1.875,0,0,0,2.043,1.7l.175-.019c2.075,5.573,5.33,6.154,7.4,6.48,2.066-.326,5.321-.907,7.4-6.48l.175.019a1.875,1.875,0,0,0,2.043-1.7l.161-2.267A2.285,2.285,0,0,0,32.274,14.271Z" fill="#ffc397"/>
<path id="Path_4447" data-name="Path 4447" d="M33.775,16.681l-.161,2.267a1.875,1.875,0,0,1-2.043,1.7l-.175-.019a11.863,11.863,0,0,1-2.445,4.151A7.942,7.942,0,0,1,24,27.1V7c3.632,0,7.924,1.961,8.274,7.267a2.285,2.285,0,0,1,1.5,2.409Z" fill="#eaa678"/>
<path id="Path_4448" data-name="Path 4448" d="M34.651,9.689A13.957,13.957,0,0,0,24,4.41a8.424,8.424,0,0,0-4.772,1.436c-.026,0-3.178-.265-4.44,1.943s-.107,6.613,1.16,8.619L17.426,17.7l.68-4.473a17.48,17.48,0,0,0,11.514-.762l.8,5.234,1.478-1.294A12.875,12.875,0,0,0,33.6,10.422C34.277,9.986,34.651,9.689,34.651,9.689Z" fill="#515151"/>
<path id="Path_4449" data-name="Path 4449" d="M29.619,12.467l.8,5.234,1.478-1.294A12.875,12.875,0,0,0,33.6,10.422c.677-.436,1.051-.733,1.051-.733A13.956,13.956,0,0,0,24,4.41v9.415A19.77,19.77,0,0,0,29.619,12.467Z" fill="#3d3d3d"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.2 KiB

@ -0,0 +1,3 @@
<svg id="_14._Men_sign" data-name="14. Men sign" xmlns="http://www.w3.org/2000/svg" width="12.739" height="12.739" viewBox="0 0 12.739 12.739">
<path id="Path_4403" data-name="Path 4403" d="M13.928,1.5H8.757a.313.313,0,0,0-.313.313V3.2a.313.313,0,0,0,.313.313h1.988l-2.3,2.3A4.553,4.553,0,1,0,9.93,7.3l2.3-2.3V6.984a.313.313,0,0,0,.313.313h1.383a.313.313,0,0,0,.313-.313V1.813a.313.313,0,0,0-.313-.313ZM6.057,12.687a3,3,0,1,1,3-3,3,3,0,0,1-3,3Z" transform="translate(-1.502 -1.5)" fill="#1474d5"/>
</svg>

After

Width:  |  Height:  |  Size: 507 B

@ -0,0 +1,19 @@
<svg xmlns="http://www.w3.org/2000/svg" width="22.631" height="6.466" viewBox="0 0 22.631 6.466">
<g id="more_1_" data-name="more (1)" transform="translate(0 -170.666)">
<g id="Group_7031" data-name="Group 7031" transform="translate(0 170.666)">
<g id="Group_7030" data-name="Group 7030" transform="translate(0 0)">
<circle id="Ellipse_145" data-name="Ellipse 145" cx="3.233" cy="3.233" r="3.233"/>
</g>
</g>
<g id="Group_7033" data-name="Group 7033" transform="translate(8.082 170.666)">
<g id="Group_7032" data-name="Group 7032" transform="translate(0 0)">
<circle id="Ellipse_146" data-name="Ellipse 146" cx="3.233" cy="3.233" r="3.233"/>
</g>
</g>
<g id="Group_7035" data-name="Group 7035" transform="translate(16.165 170.666)">
<g id="Group_7034" data-name="Group 7034" transform="translate(0 0)">
<circle id="Ellipse_147" data-name="Ellipse 147" cx="3.233" cy="3.233" r="3.233"/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 996 B

@ -0,0 +1,69 @@
<svg xmlns="http://www.w3.org/2000/svg" width="118.141" height="107.644" viewBox="0 0 118.141 107.644">
<g id="content" transform="translate(0 -22.748)">
<g id="Group_7442" data-name="Group 7442" transform="translate(1.731 28.436)">
<g id="Group_7439" data-name="Group 7439" transform="translate(0 8.932)">
<g id="Group_7438" data-name="Group 7438">
<g id="Group_7434" data-name="Group 7434" transform="translate(0 21.014)">
<g id="Group_7430" data-name="Group 7430" transform="translate(63.164)">
<g id="Group_7429" data-name="Group 7429">
<path id="Path_4552" data-name="Path 4552" d="M332.756,179.321v66a2.139,2.139,0,0,1-2.141,2.139H283.381a2.141,2.141,0,0,1-2.141-2.139v-66a2.143,2.143,0,0,1,2.141-2.141h47.233a2.141,2.141,0,0,1,2.141,2.141Z" transform="translate(-281.24 -177.18)" fill="#fff"/>
<g id="Group_7428" data-name="Group 7428">
<path id="Path_4553" data-name="Path 4553" d="M304.644,177.18v63.254a2.475,2.475,0,0,1-2.476,2.476H281.24V179.321a2.143,2.143,0,0,1,2.141-2.141Z" transform="translate(-281.24 -177.18)" fill="#dbdbdb"/>
<path id="Path_4554" data-name="Path 4554" d="M332.758,195.96V179.322a2.141,2.141,0,0,0-2.141-2.141H283.384a2.141,2.141,0,0,0-2.141,2.141V195.96Z" transform="translate(-281.242 -177.18)" fill="#dbdbdb"/>
<path id="Path_4555" data-name="Path 4555" d="M473.157,179.319v66a2.14,2.14,0,0,1-2.141,2.141h-7.26a2.14,2.14,0,0,0,2.141-2.141v-66a2.141,2.141,0,0,0-2.141-2.141h7.26A2.141,2.141,0,0,1,473.157,179.319Z" transform="translate(-421.642 -177.178)" fill="#dbdbdb"/>
</g>
<path id="Path_4556" data-name="Path 4556" d="M332.756,179.321V189.4H281.24V179.321a2.143,2.143,0,0,1,2.141-2.141h47.233A2.141,2.141,0,0,1,332.756,179.321Z" transform="translate(-281.24 -177.18)" fill="#d02127"/>
<path id="Path_4557" data-name="Path 4557" d="M371.453,179.57a6.171,6.171,0,1,1-11.863-2.391h11.383A6.141,6.141,0,0,1,371.453,179.57Z" transform="translate(-341.142 -177.18)" fill="#d02127"/>
<path id="Path_4558" data-name="Path 4558" d="M473.157,179.319v10.075H465.9V179.319a2.141,2.141,0,0,0-2.141-2.141h7.26A2.141,2.141,0,0,1,473.157,179.319Z" transform="translate(-421.642 -177.178)" fill="#d02127"/>
</g>
</g>
<g id="Group_7433" data-name="Group 7433">
<g id="Group_7432" data-name="Group 7432">
<path id="Path_4559" data-name="Path 4559" d="M59.016,179.321v66a2.141,2.141,0,0,1-2.141,2.139H9.641A2.139,2.139,0,0,1,7.5,245.319v-66a2.141,2.141,0,0,1,2.141-2.141H56.875a2.143,2.143,0,0,1,2.141,2.141Z" transform="translate(-7.5 -177.18)" fill="#fff"/>
<g id="Group_7431" data-name="Group 7431" transform="translate(0)">
<path id="Path_4560" data-name="Path 4560" d="M148.988,179.321V242.91H126.936a2.476,2.476,0,0,1-2.476-2.476V177.18h22.387a2.143,2.143,0,0,1,2.141,2.141Z" transform="translate(-97.472 -177.18)" fill="#dbdbdb"/>
<path id="Path_4561" data-name="Path 4561" d="M59.015,195.96V179.322a2.141,2.141,0,0,0-2.141-2.141H9.641A2.141,2.141,0,0,0,7.5,179.322V195.96Z" transform="translate(-7.5 -177.18)" fill="#dbdbdb"/>
<path id="Path_4562" data-name="Path 4562" d="M199.413,179.319v66a2.14,2.14,0,0,1-2.141,2.141h-7.26a2.14,2.14,0,0,0,2.141-2.141v-66a2.141,2.141,0,0,0-2.141-2.141h7.26A2.141,2.141,0,0,1,199.413,179.319Z" transform="translate(-147.898 -177.178)" fill="#dbdbdb"/>
</g>
<path id="Path_4563" data-name="Path 4563" d="M59.015,189.4H7.5V179.323a2.141,2.141,0,0,1,2.141-2.141H56.875a2.141,2.141,0,0,1,2.141,2.141Z" transform="translate(-7.5 -177.181)" fill="#d02127"/>
<path id="Path_4564" data-name="Path 4564" d="M199.413,179.319v10.075h-7.26V179.319a2.141,2.141,0,0,0-2.141-2.141h7.26A2.141,2.141,0,0,1,199.413,179.319Z" transform="translate(-147.898 -177.178)" fill="#20bfd5"/>
</g>
</g>
</g>
<g id="Group_7437" data-name="Group 7437" transform="translate(26.988)">
<g id="Group_7436" data-name="Group 7436">
<path id="Path_4565" data-name="Path 4565" d="M181.569,167.391H126.94a2.476,2.476,0,0,1-2.476-2.476V88.586a2.476,2.476,0,0,1,2.476-2.476h54.629a2.476,2.476,0,0,1,2.476,2.476v76.329A2.476,2.476,0,0,1,181.569,167.391Z" transform="translate(-124.463 -86.109)" fill="#fff"/>
<path id="Path_4566" data-name="Path 4566" d="M184.044,106.725V88.586a2.476,2.476,0,0,0-2.476-2.476H126.94a2.476,2.476,0,0,0-2.476,2.476v18.14Z" transform="translate(-124.463 -86.109)" fill="#dbdbdb"/>
<path id="Path_4567" data-name="Path 4567" d="M346.423,88.582v76.33a2.475,2.475,0,0,1-2.476,2.476h-8.4a2.475,2.475,0,0,0,2.476-2.476V88.582a2.476,2.476,0,0,0-2.476-2.476h8.4A2.476,2.476,0,0,1,346.423,88.582Z" transform="translate(-286.842 -86.106)" fill="#dbdbdb"/>
<path id="Path_4568" data-name="Path 4568" d="M184.041,88.586v11.653H124.46V88.586a2.476,2.476,0,0,1,2.476-2.476h54.629A2.475,2.475,0,0,1,184.041,88.586Z" transform="translate(-124.46 -86.109)" fill="#d02127"/>
<g id="Group_7435" data-name="Group 7435" transform="translate(37.747)">
<path id="Path_4569" data-name="Path 4569" d="M299.01,88.138a5.48,5.48,0,1,1-10.57-2.028h10.18A5.435,5.435,0,0,1,299.01,88.138Z" transform="translate(-288.05 -86.109)" fill="#d02127"/>
<path id="Path_4570" data-name="Path 4570" d="M346.423,88.582v11.653h-8.4V88.582a2.476,2.476,0,0,0-2.476-2.476h8.4A2.476,2.476,0,0,1,346.423,88.582Z" transform="translate(-324.59 -86.106)" fill="#d02127"/>
</g>
</g>
</g>
</g>
</g>
<g id="Group_7440" data-name="Group 7440" transform="translate(81.132 21.147)">
<path id="Path_4571" data-name="Path 4571" d="M359.11,145.215a6.171,6.171,0,1,1,6.171,6.171,6.171,6.171,0,0,1-6.171-6.171" transform="translate(-359.11 -139.044)" fill="#d02127"/>
<path id="Path_4572" data-name="Path 4572" d="M372.29,150.533a5.46,5.46,0,0,0,0-10.638,6.173,6.173,0,1,1,0,10.638" transform="translate(-369.249 -139.044)" fill="#d02127"/>
</g>
<g id="Group_7441" data-name="Group 7441" transform="translate(64.735)">
<path id="Path_4573" data-name="Path 4573" d="M288.05,52.878a5.48,5.48,0,1,1,5.48,5.48,5.48,5.48,0,0,1-5.48-5.48" transform="translate(-288.05 -47.398)" fill="#d02127"/>
<path id="Path_4574" data-name="Path 4574" d="M299.754,57.6a4.849,4.849,0,0,0,0-9.446,5.481,5.481,0,1,1,0,9.446" transform="translate(-297.053 -47.397)" fill="#d02127"/>
</g>
</g>
<g id="Group_7443" data-name="Group 7443" transform="translate(0 22.748)">
<path id="Path_4575" data-name="Path 4575" d="M114.27,69.844H96.883a7.887,7.887,0,0,0-6.853-8.735V53.036a4.211,4.211,0,0,0-4.206-4.206H78.948a7.211,7.211,0,1,0-14,0H31.2a4.211,4.211,0,0,0-4.206,4.206V69.844H21.93a1.731,1.731,0,0,0,0,3.461h5.058V82.06H3.461V73.716a.411.411,0,0,1,.41-.41h9.515a1.731,1.731,0,0,0,0-3.461H3.871A3.876,3.876,0,0,0,0,73.716v66a3.876,3.876,0,0,0,3.871,3.871H51.105a3.876,3.876,0,0,0,3.871-3.871v-6.14h8.188v6.14a3.876,3.876,0,0,0,3.871,3.871H81.123a1.731,1.731,0,0,0,0-3.461H67.036a.41.41,0,0,1-.41-.41v-6.14h19.2a4.211,4.211,0,0,0,4.206-4.206V85.521h24.65v54.191a.41.41,0,0,1-.41.41h-24.6a1.731,1.731,0,0,0,0,3.461h24.6a3.876,3.876,0,0,0,3.871-3.871v-66a3.876,3.876,0,0,0-3.871-3.871Zm-20.8-.9a4.441,4.441,0,1,1-4.441-4.441A4.446,4.446,0,0,1,93.475,68.946ZM71.946,43.358a3.75,3.75,0,1,1-3.75,3.75A3.754,3.754,0,0,1,71.946,43.358ZM31.2,52.291H66.941a7.192,7.192,0,0,0,10.011,0h8.873a.746.746,0,0,1,.745.745v8.4a7.9,7.9,0,0,0-2.683,1.519H30.45V53.036a.746.746,0,0,1,.745-.745Zm54.629,77.82H31.2a.746.746,0,0,1-.745-.745V109.979a1.731,1.731,0,0,0-3.461,0v19.386a4.211,4.211,0,0,0,4.206,4.206h20.32v6.14a.41.41,0,0,1-.41.41H3.871a.41.41,0,0,1-.41-.41V85.521H26.989v15.915a1.731,1.731,0,1,0,3.461,0V66.419h51.1a7.895,7.895,0,0,0,5.021,10.033v52.913A.746.746,0,0,1,85.824,130.111ZM90.03,82.06V76.783a7.909,7.909,0,0,0,5.59-3.478h18.65a.41.41,0,0,1,.41.41V82.06H90.03Z" transform="translate(0 -35.94)" fill="#2e303a"/>
<path id="Path_4576" data-name="Path 4576" d="M238.224,296.64a8.143,8.143,0,0,0-5.276-1.877h-.027a8.138,8.138,0,0,0-5.261,1.846,1.73,1.73,0,1,0,2.231,2.646,4.746,4.746,0,0,1,3.03-1.03h.015a4.75,4.75,0,0,1,3.04,1.048,1.731,1.731,0,0,0,2.247-2.633Z" transform="translate(-174.656 -231.997)"/>
<path id="Path_4577" data-name="Path 4577" d="M288.664,267.015l-.045,0h-.03a1.73,1.73,0,0,0-.156,3.452l.039,0c.042,0,.085.007.128.007h.01a1.73,1.73,0,0,0,.054-3.459Z" transform="translate(-220.675 -210.65)"/>
<path id="Path_4578" data-name="Path 4578" d="M207.009,267.012h-.03a1.731,1.731,0,0,0,.011,3.461H207a1.731,1.731,0,0,0,.009-3.461Z" transform="translate(-157.897 -210.65)"/>
<path id="Path_4579" data-name="Path 4579" d="M156.674,112.612h.009c.038,0,.077,0,.115.006l.062,0h.009a1.73,1.73,0,0,0,.346-3.426h-.007c-.053-.011-.108-.019-.162-.025-.02,0-.04,0-.06,0-.036,0-.072-.006-.109-.006h-.031a1.721,1.721,0,0,0-1.722,1.731,1.738,1.738,0,0,0,1.549,1.719Z" transform="translate(-119.331 -89.223)"/>
<path id="Path_4580" data-name="Path 4580" d="M179.553,112.623a1.731,1.731,0,0,0,0-3.461h-.021a1.722,1.722,0,0,0-1.72,1.731A1.74,1.74,0,0,0,179.553,112.623Z" transform="translate(-136.783 -89.223)"/>
<path id="Path_4581" data-name="Path 4581" d="M202.243,112.623a1.731,1.731,0,0,0,0-3.461h-.021a1.722,1.722,0,0,0-1.72,1.731A1.74,1.74,0,0,0,202.243,112.623Z" transform="translate(-154.237 -89.223)"/>
<path id="Path_4582" data-name="Path 4582" d="M53.4,116.408a1.73,1.73,0,0,0,2.447,0l.922-.922.922.922a1.73,1.73,0,0,0,2.447-2.447l-.922-.922.922-.922A1.73,1.73,0,0,0,57.7,109.67l-.922.922-.922-.922a1.73,1.73,0,0,0-2.447,2.447l.922.922-.922.922A1.73,1.73,0,0,0,53.4,116.408Z" transform="translate(-40.692 -89.223)"/>
<path id="Path_4583" data-name="Path 4583" d="M428.867,107.109a1.73,1.73,0,0,0,2.447,0l.922-.922.922.922a1.73,1.73,0,0,0,2.447-2.447l-.922-.922.922-.922a1.73,1.73,0,0,0-2.447-2.447l-.922.922-.922-.922a1.73,1.73,0,1,0-2.447,2.447l.922.922-.922.922A1.73,1.73,0,0,0,428.867,107.109Z" transform="translate(-329.518 -82.07)"/>
<path id="Path_4584" data-name="Path 4584" d="M237.941,29.993a1.73,1.73,0,0,0,2.447,0l.922-.922.922.922a1.73,1.73,0,0,0,2.447-2.447l-.922-.922.922-.922a1.73,1.73,0,0,0-2.447-2.447l-.922.922-.922-.922a1.73,1.73,0,1,0-2.447,2.447l.922.922-.922.922A1.73,1.73,0,0,0,237.941,29.993Z" transform="translate(-182.648 -22.748)"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 10 KiB

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="25.347" height="25.347" viewBox="0 0 25.347 25.347">
<path id="ekg-monitor" d="M.878,0H24.471a.878.878,0,0,1,.877.877V11.77l-7.647,0a.906.906,0,0,0-.845.582l-1.678,4.393L10.98,5.741a.9.9,0,0,0-.846-.583h0a.9.9,0,0,0-.846.582L6.982,11.774,0,11.77V.878A.878.878,0,0,1,.878,0ZM24.471,25.348a.878.878,0,0,0,.877-.877V13.58l-7.023,0-2.3,6.026a.905.905,0,0,1-1.692,0L10.133,8.6,8.451,13a.906.906,0,0,1-.846.582h0l-7.6,0V24.471a.878.878,0,0,0,.877.877H24.471Z" transform="translate(-0.001 -0.001)" fill="#28323a" fill-rule="evenodd"/>
</svg>

After

Width:  |  Height:  |  Size: 584 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="33.043" height="27.106" viewBox="0 0 33.043 27.106">
<path id="process" d="M28.2,19.555,27.042,21.1l1.549,1.162H25.1a3.868,3.868,0,0,0-3.735-2.9H11.681a3.868,3.868,0,0,0-3.735,2.9H5.808a3.872,3.872,0,0,1,0-7.744H7.946a3.868,3.868,0,0,0,3.735,2.9h9.681a3.868,3.868,0,0,0,3.735-2.9h2.138a5.808,5.808,0,1,0,0-11.617H25.1A3.868,3.868,0,0,0,21.362,0H11.681A3.868,3.868,0,0,0,7.946,2.9H7.1L3.485.194,2.324,1.742,3.872,2.9H0V4.84H3.872L2.324,6,3.485,7.551,7.1,4.84h.847a3.868,3.868,0,0,0,3.735,2.9h9.681A3.868,3.868,0,0,0,25.1,4.84h2.138a3.872,3.872,0,1,1,0,7.744H25.1a3.868,3.868,0,0,0-3.735-2.9H11.681a3.868,3.868,0,0,0-3.735,2.9H5.808a5.808,5.808,0,1,0,0,11.617H7.946a3.868,3.868,0,0,0,3.735,2.9h9.681A3.868,3.868,0,0,0,25.1,24.2h3.494l-1.549,1.162L28.2,26.912l4.84-3.678Zm0,0" fill="#28323a"/>
</svg>

After

Width:  |  Height:  |  Size: 847 B

@ -0,0 +1,13 @@
<svg xmlns="http://www.w3.org/2000/svg" width="31.83" height="27.976" viewBox="0 0 31.83 27.976">
<g id="sticky-note" transform="translate(0 -31.001)">
<g id="Group_7171" data-name="Group 7171" transform="translate(11.19 31.001)">
<path id="Path_4476" data-name="Path 4476" d="M180,38.461V31.934a.933.933,0,0,1,1.865,0v6.528Z" transform="translate(-180 -31.001)" fill="#28323a"/>
</g>
<g id="Group_7172" data-name="Group 7172" transform="translate(0 46.403)">
<path id="Path_4477" data-name="Path 4477" d="M8.393,289.46a2.779,2.779,0,0,1-1.978-.819A28.3,28.3,0,0,1,0,278.751v11.641a.933.933,0,0,0,.933.933H23.313a.933.933,0,0,0,.933-.933v-.933Z" transform="translate(0 -278.751)" fill="#28323a"/>
</g>
<g id="Group_7173" data-name="Group 7173" transform="translate(0 34.731)">
<path id="Path_4478" data-name="Path 4478" d="M31.557,109.924a24.777,24.777,0,0,1-7.312-17.351v-.64A.933.933,0,0,0,23.313,91H14.92v4.663a.933.933,0,0,1-.933.933h-3.73a.933.933,0,0,1-.933-.933V91H.933A.933.933,0,0,0,0,91.934v.64a26.393,26.393,0,0,0,7.733,18.67.934.934,0,0,0,.66.273H30.9a.933.933,0,0,0,.66-1.592ZM12.123,98.461h7.46a.933.933,0,0,1,0,1.865h-7.46a.933.933,0,0,1,0-1.865Zm7.46,9.325H10.258a.933.933,0,0,1,0-1.865h9.325a.933.933,0,0,1,0,1.865Zm1.865-3.73H8.393a.933.933,0,1,1,0-1.865H21.448a.933.933,0,1,1,0,1.865Z" transform="translate(0 -91.001)" fill="#28323a"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="35.842" height="28.675" viewBox="0 0 35.842 28.675">
<path id="Path_4336" data-name="Path 4336" d="M38.948,34.883H29.987V31.3c5.825,0,5.771.134,6.12-.4l1.559-2.285A2.688,2.688,0,0,0,38,23.422a5.377,5.377,0,0,0-5.323-4.669H28.956A12.545,12.545,0,0,0,16.545,8C4.3,8-.668,23.843,9.377,30.823v4.059H6.688a.9.9,0,1,0,0,1.792H38.948a.9.9,0,1,0,0-1.792ZM8.561,21.656a8.065,8.065,0,0,1,14.92-5.224,7.832,7.832,0,0,1,.9,2.321c-2.1,0-1.577.806-1.792.054.161.484.09.224-.367.627a3.584,3.584,0,0,0-6.066,3.8,2.689,2.689,0,0,0,.134,5.377,8.065,8.065,0,0,1-7.724-6.954Zm28.594,3.369a.9.9,0,0,1,.618,1.532c-.367.385,1.174.26-21.228.26a.9.9,0,0,1-.618-1.532C16.286,24.9,14.825,25.026,37.155,25.026Zm-16.542,4.48-.6-.9h4.749a2.841,2.841,0,0,0-.152.9Zm-3.172-8.065a1.792,1.792,0,1,1,1.792,1.792A1.792,1.792,0,0,1,17.442,21.441ZM23.714,31.3h.9v3.584h-.9Zm11.165-1.792H29.987a2.688,2.688,0,0,0-.152-.9H35.48Zm1.263-6.273c-12.993,0-12.249.09-12.706-.215a1.335,1.335,0,0,1-.224-2.079c.5-.565.547-.394,9.463-.394a3.584,3.584,0,0,1,3.468,2.688ZM15.649,32.194h1.792v2.688H15.649Z" transform="translate(-4.002 -8)" fill="#28323a"/>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30">
<path id="Path_4487" data-name="Path 4487" d="M15.879,1.8V0H14.121V1.8C6.047,2.2,0,8.143,0,15.879V17.3l1.27-.629a8.69,8.69,0,0,1,3.182-.787,5.156,5.156,0,0,1,2.9,1.5l.621.615.62-.615a5.156,5.156,0,0,1,2.9-1.5,4.774,4.774,0,0,1,2.637,1.267V27.363a2.637,2.637,0,0,0,5.273,0V25.605H17.637v1.758a.879.879,0,0,1-1.758,0V17.146a4.774,4.774,0,0,1,2.637-1.267,5.156,5.156,0,0,1,2.9,1.5l.621.615.62-.615a5.344,5.344,0,0,1,2.954-1.5,8.222,8.222,0,0,1,3.123.787L30,17.3V15.879C30,8.143,23.953,2.2,15.879,1.8Z" fill="#28323a"/>
</svg>

After

Width:  |  Height:  |  Size: 609 B

@ -0,0 +1,11 @@
<svg xmlns="http://www.w3.org/2000/svg" width="33.112" height="30.051" viewBox="0 0 33.112 30.051">
<g id="reception" transform="translate(0 -23.667)">
<path id="Path_4479" data-name="Path 4479" d="M0,313.745H33.112V301.673H0Zm15.586-9.318h1.94v2.183h2.183v1.94H17.526v2.183h-1.94V308.55H13.4v-1.94h2.183Z" transform="translate(0 -260.027)" fill="#28323a"/>
<path id="Path_4480" data-name="Path 4480" d="M30,236.668H59.234v2.264H30Z" transform="translate(-28.062 -199.226)" fill="#28323a"/>
<path id="Path_4481" data-name="Path 4481" d="M108.058,103.919c0-.057,0-.113-.005-.169h-6.1c0,.056-.005.112-.005.169a3.057,3.057,0,0,0,2.717,3.034h.672A3.057,3.057,0,0,0,108.058,103.919Z" transform="translate(-95.358 -74.904)" fill="#28323a"/>
<path id="Path_4482" data-name="Path 4482" d="M65.158,153.293h-.911a3.888,3.888,0,0,0-3.86,3.452h4.771v-3.452Z" transform="translate(-56.482 -121.243)" fill="#28323a"/>
<path id="Path_4483" data-name="Path 4483" d="M165.076,153.293h-.911v3.452h4.771a3.888,3.888,0,0,0-3.86-3.452Z" transform="translate(-153.548 -121.243)" fill="#28323a"/>
<path id="Path_4484" data-name="Path 4484" d="M98.828,26.906,99.4,24.35a10.351,10.351,0,0,0-7.394,0l.569,2.556Z" transform="translate(-86.054)" fill="#28323a"/>
<path id="Path_4485" data-name="Path 4485" d="M296.991,135.98h10.025v4.572H296.991Z" transform="translate(-277.784 -105.049)" fill="#28323a"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

@ -0,0 +1,10 @@
<svg xmlns="http://www.w3.org/2000/svg" width="17.016" height="15.893" viewBox="0 0 17.016 15.893">
<g id="Layer_2" data-name="Layer 2" transform="translate(-1 -1.98)">
<path id="Path_4511" data-name="Path 4511" d="M15.429,21.777H3.586A2.592,2.592,0,0,1,1,19.2V11H18.016v8.2a2.592,2.592,0,0,1-2.586,2.581ZM2.134,12.134V19.2a1.458,1.458,0,0,0,1.452,1.446H15.429A1.458,1.458,0,0,0,16.881,19.2V12.134Z" transform="translate(0 -3.904)" fill="#28323a"/>
<path id="Path_4512" data-name="Path 4512" d="M18.016,9.1H1V6.6A2.592,2.592,0,0,1,3.586,4H15.429a2.592,2.592,0,0,1,2.586,2.6ZM2.134,7.97H16.881V6.6a1.458,1.458,0,0,0-1.452-1.463H3.586A1.458,1.458,0,0,0,2.134,6.6Z" transform="translate(0 -0.874)" fill="#28323a"/>
<rect id="Rectangle_17397" data-name="Rectangle 17397" width="1.134" height="3.437" rx="0.567" transform="translate(4.369 1.98)" fill="#28323a"/>
<rect id="Rectangle_17398" data-name="Rectangle 17398" width="1.134" height="3.437" rx="0.567" transform="translate(13.512 1.98)" fill="#28323a"/>
<rect id="Rectangle_17399" data-name="Rectangle 17399" width="1.134" height="3.437" rx="0.567" transform="translate(8.941 1.98)" fill="#28323a"/>
<path id="Path_4513" data-name="Path 4513" d="M2.31,12v9.217H17.732V12Zm4.929,5.717a.567.567,0,1,1,.567-.567A.567.567,0,0,1,7.239,17.717Zm2.836,0a.567.567,0,1,1,.567-.567A.567.567,0,0,1,10.075,17.717Zm2.836,0a.567.567,0,1,1,.567-.567A.567.567,0,0,1,12.911,17.717Z" transform="translate(-0.567 -4.337)" fill="#28323a"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

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

Loading…
Cancel
Save