Commit Graph

45 Commits (9703e23a32e6718b845cd1ab53e9780ed21aabee)

Author SHA1 Message Date
Sultan khan 18331f077e 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: (41 commits)
  pull down to refresh in appointment queue implemented
  Pull to refresh implemented
  Updates & fixes
  updates
  Updates
  Updates
  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.
  Updates
  Font changes, Updates & fixes
  map type is added to the maps already present
  family switch parent child and child 2
  translation service changes
  Updates
  updates
  print statement removed
  graph reference low nd high value address. * if the referenncehigh is 0 then it will be neglected * if the referencelow is 0 then it will be neglected.
  family switch parent child and child 2
  updates
  remote localization files added
  Updates
  ...

# Conflicts:
#	android/app/build.gradle.kts
#	lib/presentation/rate_appointment/rate_appointment_doctor.dart
2 days ago
Sultan khan 287dcf3482 updates 2 days ago
haroon amjad 13a4c9e0f8 updates 2 days ago
haroon amjad e3f5bb69ac Updates 2 days ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 2 days ago
haroon amjad 4959392f74 Updates 4 days ago
haroon amjad a13d0cf0e4 updates 1 week ago
tahaalam dda4dbeba9 merge issue resolution some import were missing from master. 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 8de8039096 updates 1 month ago
haroon amjad f5aa12a04b Android zoom fixes 1 month ago
tahaalam 7100283a9d package change activity 2 months 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 b334f631bd samsung sdk health aar 2 months ago
tahaalam bfeb3dce4e data integration along with the data representation 2 months ago
haroon amjad dc0e4e5eb6 Updates & fixes, Filter issues fixed for lab & rad 2 months ago
haroon amjad ec506869cc Android package name updated to new package details 2 months ago
tahaalam 5ea70397e2 samsung integration addded 2 months ago
tahaalam df0b926e59 heart rate sleep data and steps count obtained 2 months ago
tahaalam 4912f686f9 platform channel added. 2 months ago
haroon amjad 2ab3e178a2 Indoor navigation implemented 2 months ago
haroon amjad 44ce353dac updates 3 months ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 3 months ago
haroon amjad 685eec6a52 updates & fixes 3 months ago
tahaalam 699ef2f672 Merge remote-tracking branch 'origin/ambulance_service' into ambulance_service
# Conflicts:
#	android/settings.gradle.kts
3 months ago
tahaalam 85f9609cbb Merge remote-tracking branch 'origin/master' into ambulance_service
# Conflicts:
#	android/app/libs/PenNavUI.aar
#	android/app/libs/Penguin.aar
#	android/app/libs/PenguinRenderer.aar
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	android/app/src/main/res/values/strings.xml
#	android/build/reports/problems/problems-report.html
#	ios/Runner/AppDelegate.swift
3 months ago
haroon amjad 1c883764ac updates 3 months ago
Sultan khan 40638cfec4 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:
  collapsing_list_view improvement
  Updated design for HHC
  updates & fixes
  QLine API implementation enhancements
  LiveCare flow from clinic selection implemented

# Conflicts:
#	lib/presentation/home/landing_page.dart
4 months ago
haroon amjad 575a534f5e PenguinIn fixes 4 months ago
haroon amjad 3060c57201 updates 4 months ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 4 months ago
haroon amjad 3699163579 PenguinIn SDK changes 4 months ago
haroon amjad b37804d012 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/prescriptions/prescriptions_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
4 months ago
haroon amjad 2b7379c1c3 Waiting appointment implementation in progress 4 months ago
haroon amjad 36bf63dcde Incoming call updates 4 months ago
tahaalam fc0f98da1d calender reminder added 4 months ago
tahaalam fbe5d35013 merge issues resolve for the ambulance request. 5 months ago
tahaalam 1f852f63cf penguin sdk added 5 months ago
Haroon6138 622851a1a0 Merge pull request 'Design Fixes for Responsiveness (faiz_dev)' (#88) from faiz_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/88
6 months ago
faizatflutter 495eb13153 Updated README.md 6 months ago
tahaalam 90128a812b call ambulance module design added. 6 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 7 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 7 months ago
Haroon Amjad 2b22e17743 android fixes 7 months ago
aamir-csol 59054df238 android / ios folder push 7 months ago