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
|
f5aa12a04b
|
Android zoom fixes
|
3 weeks 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
|
1 month ago |
tahaalam
|
bfeb3dce4e
|
data integration along with the data representation
|
1 month ago |
haroon amjad
|
ec506869cc
|
Android package name updated to new package details
|
1 month ago |
tahaalam
|
4912f686f9
|
platform channel added.
|
1 month ago |
haroon amjad
|
44ce353dac
|
updates
|
2 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
|
3060c57201
|
updates
|
3 months ago |
tahaalam
|
1f852f63cf
|
penguin sdk added
|
4 months ago |
Haroon Amjad
|
2b22e17743
|
android fixes
|
7 months ago |
aamir-csol
|
59054df238
|
android / ios folder push
|
7 months ago |