Commit Graph

20 Commits (171a6a2d74aeb0e9093e8abc56f360e90896808b)

Author SHA1 Message Date
haroon amjad e3f5bb69ac Updates 2 months ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 2 months ago
haroon amjad edeae70aa0 Updates 3 months ago
tahaalam dda4dbeba9 merge issue resolution some import were missing from master. 3 months 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
3 months ago
haroon amjad f46b3f745f Dark mode enabled 4 months ago
tahaalam d137e1166d watch integration ui added. 4 months ago
haroon amjad 450f07d39d updates & fixes 6 months ago
haroon amjad 8dcc8dfbe3 updates 8 months ago
haroon amjad 8976f4db9d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/medical_file/medical_file_page.dart
8 months ago
faizatflutter b698b74eb5 Design Updates 8 months ago
Haroon Amjad 2e16622cc3 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/utils/size_utils.dart
#	lib/presentation/home/widgets/large_service_card.dart
8 months ago
faizatflutter 8c956fc052 Design changes 8 months ago
haroon amjad 65220270c2 Size utils & fixes 8 months ago
faizatflutter eabfaf8182 Design Updates 8 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 9 months ago
haroon amjad 542de41a82 updates & fixes 9 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 10 months ago
Sikander Saleem ac0b7bec44 custom tab bar added in medical file section. 10 months ago
Sikander Saleem 38d37fd407 custom tab bar added. 10 months ago