health calculator design & timer & bell icon switch changes #236

Merged
khansultan1 merged 7 commits from dev_aamir into master 2 days ago

7 Commits (main)

Author SHA1 Message Date
aamir-csol f0b8db0318 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/medical_file/medical_file_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
2 days ago
aamir-csol f199fca859 health calculator design & timer & bell icon switch changes 2 days ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 2 days ago
aamir-csol 90bcdf674d Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
2 days ago
aamir-csol 2b0f8b45b0 appointment reminder & weather 3 days ago
aamir-csol 7bf69c52f0 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/generated/codegen_loader.g.dart
3 days ago
aamir-csol 2c7c71c566 codegen 3 days ago