Commit Graph

17 Commits (f84d5c67692db3124dc07cfbe78d8977426436d8)

Author SHA1 Message Date
tahaalam dda4dbeba9 merge issue resolution some import were missing from master. 2 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
2 weeks ago
haroon amjad f46b3f745f Dark mode enabled 3 weeks ago
tahaalam d137e1166d watch integration ui added. 1 month ago
haroon amjad 450f07d39d updates & fixes 3 months ago
haroon amjad 8dcc8dfbe3 updates 5 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
5 months ago
faizatflutter b698b74eb5 Design Updates 5 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
5 months ago
faizatflutter 8c956fc052 Design changes 5 months ago
haroon amjad 65220270c2 Size utils & fixes 5 months ago
faizatflutter eabfaf8182 Design Updates 5 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 7 months ago
haroon amjad 542de41a82 updates & fixes 7 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 7 months ago
Sikander Saleem ac0b7bec44 custom tab bar added in medical file section. 7 months ago
Sikander Saleem 38d37fd407 custom tab bar added. 7 months ago