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
|
7 months ago |
haroon amjad
|
34d298a81a
|
lab results updates & fixes
|
7 months ago |
Sultan khan
|
c0d3bd569b
|
no message
|
7 months ago |
haroon amjad
|
97c7b1c225
|
updates & fixes
|
7 months ago |
Sultan khan
|
e689826730
|
login fixes
|
7 months ago |
Aamir Muhammad
|
24a4020f5c
|
fixes
|
7 months ago |
Aamir Muhammad
|
c3b8ec6067
|
fixes
|
7 months ago |
Sultan khan
|
80b8084a7f
|
no message
|
7 months ago |
Aamir Muhammad
|
e64d1088a6
|
changes
|
7 months ago |
Aamir Muhammad
|
ff12e832ab
|
fixes
|
7 months ago |
Aamir Muhammad
|
2245135316
|
changes
|
7 months ago |
Aamir Muhammad
|
3c7c738b12
|
changes
|
7 months ago |
Aamir Muhammad
|
a7e310226e
|
Exception Widget & Fixes
|
7 months ago |
Aamir Muhammad
|
2e01429221
|
Exception Widget & Fixes
|
7 months ago |
Aamir Muhammad
|
f04928c3e8
|
fixes for login & register (Points)
|
7 months ago |
Aamir Muhammad
|
ee4ae657b0
|
fixes
|
7 months ago |
Sultan khan
|
ef8532b1c5
|
updated login flow
|
7 months ago |
Aamir Muhammad
|
e306bfd69b
|
saved login fixes & design changes.
|
7 months ago |
Aamir Muhammad
|
23fc89b40a
|
font changes
|
7 months ago |
Aamir Muhammad
|
6b96b6fc9e
|
ui fixes
|
7 months ago |
Aamir Muhammad
|
9704ef232f
|
caleder changes
|
7 months ago |
Sultan khan
|
890ff874e3
|
registration updated.
|
7 months ago |
Aamir Muhammad
|
a05cea7c8b
|
registration fixes
|
7 months ago |
Aamir Muhammad
|
f2059aa00e
|
otp Design.
|
7 months ago |
Sultan khan
|
5b45855cf6
|
saved login created
|
7 months ago |
Aamir Muhammad
|
16b37b847d
|
translation & register Design changes.
|
7 months ago |
Aamir Muhammad
|
2d5b4342a1
|
tweaks
|
7 months ago |
Aamir Muhammad
|
dac43376e0
|
tweaks
|
7 months ago |
Aamir Muhammad
|
801a2578ab
|
lottie & bottom sheet
|
7 months ago |
Aamir Muhammad
|
90eea4d0d7
|
consumer on welcome & language & font
|
7 months ago |
Aamir Muhammad
|
dbfa3c7cee
|
consumer on welcome & language & font
|
7 months ago |
Aamir Muhammad
|
1282b5a415
|
consumer on welcome & language & font
|
7 months ago |
Aamir Muhammad
|
6578baaf34
|
login using sms done
|
7 months ago |
Aamir Muhammad
|
7ff7f88e24
|
updated app to latest flutter sdk with android native changes.
|
7 months ago |
haroon amjad
|
e748712954
|
Initial Commit
|
7 months ago |
Sultan khan
|
8881e9c0c7
|
login fixes
|
7 months ago |
Aamir Muhammad
|
2346195844
|
fixes
|
7 months ago |
Aamir Muhammad
|
297eef9558
|
fixes
|
7 months ago |
Sultan khan
|
334508963c
|
no message
|
7 months ago |
Aamir Muhammad
|
c666ba219c
|
changes
|
7 months ago |
Aamir Muhammad
|
e571248b8d
|
fixes
|
7 months ago |
Aamir Muhammad
|
0fadf3e49c
|
changes
|
7 months ago |
Aamir Muhammad
|
bd4400e32f
|
changes
|
7 months ago |
Aamir Muhammad
|
4d4e7e5a5b
|
Exception Widget & Fixes
|
7 months ago |
Aamir Muhammad
|
5dfa9bafb9
|
Exception Widget & Fixes
|
7 months ago |
Aamir Muhammad
|
bdaef7f89c
|
fixes for login & register (Points)
|
8 months ago |
Aamir Muhammad
|
fd0635764d
|
fixes
|
8 months ago |
Sultan khan
|
dd97a27494
|
updated login flow
|
8 months ago |
Aamir Muhammad
|
da32bd8df1
|
saved login fixes & design changes.
|
8 months ago |
Aamir Muhammad
|
54d17d2c16
|
font changes
|
8 months ago |