Commit Graph

21 Commits (afd7c5db815f6c8ef2cd64e145674c47e97408a2)

Author SHA1 Message Date
haroon amjad f265c605ca Merge branch 'merge-update-with-lab-changes' into update-to-3.32-sdk
# Conflicts:
#	android/app/local.properties
#	android/app/src/main/AndroidManifest.xml
#	android/gradle.properties
#	android/gradle/wrapper/gradle-wrapper.properties
#	ios/Podfile
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
#	ios/Runner/Info.plist
#	ios/Runner/Runner.entitlements
#	lib/config/localized_values.dart
#	lib/core/model/labs/LabOrderResult.dart
#	lib/core/model/labs/lab_result.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/new_ui/exception_widget/ExceptionBottomSheet.dart
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/cmc_location_page.dart
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/forgot-password.dart
#	lib/pages/login/register_new.dart
#	lib/pages/login/saved_login.dart
#	lib/pages/login/welcome.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/uitl/app_toast.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/Loader/gif_loader_container.dart
#	lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
#	lib/widgets/data_display/medical/LabResult/Lab_Result_details_wideget.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/pickupLocation/PickupLocationFromMap.dart
#	pubspec.yaml
9 months ago
haroon amjad e748712954 Initial Commit 9 months ago
Aamir Muhammad 8f8769d99a updated app to latest flutter sdk with android native changes. 10 months ago
Aamir Muhammad 5fb40a7c5f updated app to latest flutter sdk. 10 months ago
haroon amjad 9eb0947d12 Initial Commit 10 months ago
devamirsaleemahmad 2c9e51aef0 changes 3 years ago
devamirsaleemahmad dfc6e86442 models updates -> 3.13.6 3 years ago
haroon amjad 0e01835327 Target SDK & Compile SDK bumped to 33 3 years ago
haroon amjad dfa88b7de7 Updates, fixes & release VersionID 9.1 4 years ago
haroon amjad 21cf9da900 HMS Core & LiveCare Schedule fixes 4 years ago
haroon amjad 842e099953 DateTime Fixes 4 years ago
haroon amjad a9e48e487f HHC Fixes 4 years ago
haroon amjad c3538ebdb6 Updates & fixes 4 years ago
haroon amjad a6c6651363 Updates & fixes 4 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
Sultan Khan 169aafa26b hmc services design fixed 5 years ago
Elham Rababh 2e2f7334d5 fix issues PAP-910,PAP-911 5 years ago
Mohammad Aljammal 7c1fd8043b fix chart and eye and balance 5 years ago
haroon amjad e0ebb922ed pharmacy fixes 5 years ago
Mohammad Aljammal b63025a9b3 return CMC HHC 5 years ago