Commit Graph

356 Commits (0d4563542ad0bf997db1179419a4256834d45dd1)

Author SHA1 Message Date
Sultan khan 0d4563542a WD:map issues resolved:
1. map type added to the screen along with the translation
2. null shown for the arabic name of the fixed to show the actual name.
3. if the user opens the locationBottomsheet and close it without input of the area the screen freezes with no action on the location.
4. Gms And Hms Maps handled.
5. theme handled inside the maps screen.
1 day ago
tahaalam c716490b0e map type is added to the maps already present 1 day ago
haroon amjad 3d39190c62 updates & fixes 3 days ago
haroon amjad 3703afe8bd updates 4 days ago
haroon amjad edeae70aa0 Updates 4 days ago
haroon amjad 1f290c5bfe updates 4 days ago
haroon amjad deca29b423 updates & fixes 5 days ago
haroon amjad 93af246700 updates 5 days ago
haroon amjad db89408185 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/generated/locale_keys.g.dart
1 week ago
haroon amjad 78a6d55b35 Merge branch 'master' into watch_integration
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
1 week ago
haroon amjad 841fca027c updates 1 week ago
tahaalam a8138ba231 Merge remote-tracking branch 'origin/master' into reminer 1 week ago
tahaalam 8b829b9101 reminder start time added to the prescription 1 week ago
tahaalam 2babda2d63 Merge remote-tracking branch 'origin/master' into labs_graph_pdf 1 week ago
tahaalam 1d1c756412 graph values fix and comparision with the pdf 1 week ago
haroon amjad 1709b80e84 Updates 1 week ago
haroon amjad d053f58b7d Updates 2 weeks ago
haroon amjad 3d877ed28d Updates 2 weeks ago
Haroon Amjad 55b8bc162c Updates 3 weeks ago
tahaalam f84d5c6769 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	lib/splashPage.dart
3 weeks ago
tahaalam dda4dbeba9 merge issue resolution some import were missing from master. 4 weeks ago
Sultan khan f51e37db55 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  updates
  updates
  lab test description update

# Conflicts:
#	lib/core/api/api_client.dart
#	lib/presentation/authentication/login.dart
4 weeks ago
Sultan khan 4f303d8496 other country login done. 4 weeks ago
tahaalam 151fcf23d1 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	android/app/build.gradle.kts
#	android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xxxhdpi/ic_launcher.png
#	android/build/reports/problems/problems-report.html
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	pubspec.yaml
4 weeks ago
haroon amjad 47b50e35a1 updates 4 weeks ago
haroon amjad 29447cc9fa updates 4 weeks ago
haroon amjad 6e71aa7f13 updates & fixes 1 month ago
Haroon Amjad 8de8039096 updates 1 month ago
Haroon Amjad 040ff6a80d Dark mode persistence added in the app 1 month ago
haroon amjad f46b3f745f Dark mode enabled 1 month ago
tahaalam 3f9046f1e4 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/core/api_consts.dart
#	lib/generated/locale_keys.g.dart
2 months ago
tahaalam bfeb3dce4e data integration along with the data representation 2 months ago
haroon amjad 9413e54d3a NPHIES Eligibility checks implemented 2 months ago
Haroon Amjad 105ab2326a updates 2 months ago
haroon amjad 530b87282f updates & fixes 2 months ago
aamir-csol 7296bfb6fc family fil fixes 2 months ago
haroon amjad 01c21377aa Updates & fixes 2 months ago
tahaalam 02398d3bb4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
2 months ago
tahaalam d137e1166d watch integration ui added. 2 months ago
aamir-csol a105d87241 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/features/authentication/authentication_view_model.dart
#	lib/generated/locale_keys.g.dart
2 months ago
aamir-csol 2c7f4ddc48 Ai Analysis & PMA-(1078,1079) 2 months ago
Haroon Amjad a4573c8710 arabic fixes 2 months ago
Haroon Amjad 4ce1e912ce Vital sign data connected to Symptom checker 2 months ago
haroon amjad 9ed016ad8b updates & fixes 2 months ago
Sikander Saleem b9350afead ui improvements 2 months ago
faizatflutter 9c7cfde5f4 ui improvements 2 months ago
Sikander Saleem 6e1eb0d0bb ui improvements 2 months ago
Sikander Saleem 6e4d7519fb Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/widgets/habib_wallet_card.dart
3 months ago
Sikander Saleem 2648f304f6 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/data/landing_page_data.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
3 months ago
haroon amjad b0708d85d9 updates & fixes 3 months ago