From 52070c8f940427aa1f9cce06a12fc944eaef2e7e Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 2 Nov 2022 10:13:34 +0300 Subject: [PATCH] Updates & fixes --- android/FlutterFirebaseMessagingReceiver.java | 12 +- android/app/build.gradle | 9 +- android/app/google-services.json | 21 +- android/app/src/main/AndroidManifest.xml | 5 +- android/build.gradle | 1 + assets/app_icons/config.json | 1 + ios/Podfile.lock | 296 +++++++++--------- ios/Runner.xcodeproj/project.pbxproj | 124 ++++---- .../xcshareddata/xcschemes/Runner.xcscheme | 6 +- ios/Runner/AppDelegate.swift | 2 +- ios/Runner/GoogleService-Info.plist | 12 +- ios/Runner/Info.plist | 35 +-- ios/Runner/Runner.entitlements | 5 +- lib/config/config.dart | 4 +- lib/core/service/client/base_app_client.dart | 2 +- .../livecare_services/livecare_provider.dart | 2 +- 16 files changed, 263 insertions(+), 274 deletions(-) diff --git a/android/FlutterFirebaseMessagingReceiver.java b/android/FlutterFirebaseMessagingReceiver.java index 35b19b37..8226a09b 100644 --- a/android/FlutterFirebaseMessagingReceiver.java +++ b/android/FlutterFirebaseMessagingReceiver.java @@ -104,11 +104,11 @@ public class FlutterFirebaseMessagingReceiver extends BroadcastReceiver { // } -// Intent onBackgroundMessageIntent = -// new Intent(context, FlutterFirebaseMessagingBackgroundService.class); -// onBackgroundMessageIntent.putExtra( -// FlutterFirebaseMessagingUtils.EXTRA_REMOTE_MESSAGE, remoteMessage); -// FlutterFirebaseMessagingBackgroundService.enqueueMessageProcessing( -// context, onBackgroundMessageIntent); + Intent onBackgroundMessageIntent = + new Intent(context, FlutterFirebaseMessagingBackgroundService.class); + onBackgroundMessageIntent.putExtra( + FlutterFirebaseMessagingUtils.EXTRA_REMOTE_MESSAGE, remoteMessage); + FlutterFirebaseMessagingBackgroundService.enqueueMessageProcessing( + context, onBackgroundMessageIntent); } } diff --git a/android/app/build.gradle b/android/app/build.gradle index e5f46421..f3d50c70 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -25,6 +25,7 @@ apply plugin: 'com.android.application' apply plugin: 'com.huawei.agconnect' apply plugin: 'kotlin-android' apply plugin: 'com.google.gms.google-services' +//apply plugin: 'com.google.firebase.crashlytics' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" configurations.all { @@ -43,7 +44,6 @@ android { lintOptions { disable 'MissingTranslation' checkReleaseBuilds false - } @@ -55,7 +55,6 @@ android { versionCode flutterVersionCode.toInteger() versionName flutterVersionName multiDexEnabled true - } signingConfigs { @@ -128,12 +127,10 @@ dependencies { implementation 'com.github.kittinunf.fuel:fuel-android:2.3.0' implementation 'com.google.android.gms:play-services-location:17.1.0'//for Android implementation 'com.google.android.gms:play-services-basement:17.5.0' - - implementation "com.opentok.android:opentok-android-sdk:2.19.1" - implementation 'com.facebook.stetho:stetho:1.5.1' implementation 'com.facebook.stetho:stetho-urlconnection:1.5.1' - + implementation 'androidx.core:core-ktx:1.6.0' + implementation 'androidx.appcompat:appcompat:1.3.1' } diff --git a/android/app/google-services.json b/android/app/google-services.json index dd4038cf..5806fa5f 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -25,15 +25,20 @@ } ], "services": { - "analytics_service": { - "status": 1 - }, "appinvite_service": { - "status": 1, - "other_platform_oauth_client": [] - }, - "ads_service": { - "status": 2 + "other_platform_oauth_client": [ + { + "client_id": "815750722565-3a0gc7neins0eoahdrimrfksk0sqice8.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "815750722565-0cq9366orvsk5ipivq6lijcj56u03fr7.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "com.void.demo" + } + } + ] } } } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index ee04df20..e6601b40 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -6,8 +6,6 @@ In most cases you can leave this as-is, but you if you want to provide additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - - @@ -51,6 +49,7 @@ android:showOnLockScreen="true" android:screenOrientation="sensorPortrait" android:allowBackup="false" + tools:replace="android:allowBackup,android:label" android:label="Dr. Alhabib"> @@ -90,7 +89,7 @@ - + diff --git a/android/build.gradle b/android/build.gradle index b514b78d..1b8d995f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -14,6 +14,7 @@ buildscript { classpath 'com.android.tools.build:gradle:7.0.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.8' +// classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' classpath 'com.huawei.agconnect:agcp:1.5.2.300' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12' } diff --git a/assets/app_icons/config.json b/assets/app_icons/config.json index ceb65b05..7c2dda56 100644 --- a/assets/app_icons/config.json +++ b/assets/app_icons/config.json @@ -1,3 +1,4 @@ + { "name": "DQIcons", "css_prefix_text": "", diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 21716fd1..f68aa28b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -5,7 +5,7 @@ PODS: - Flutter - MTBBarcodeScanner - SwiftProtobuf - - camera (0.0.1): + - camera_avfoundation (0.0.1): - Flutter - connectivity (0.0.1): - Flutter @@ -14,14 +14,14 @@ PODS: - Flutter - device_info_plus (0.0.1): - Flutter - - DKImagePickerController/Core (4.3.2): + - DKImagePickerController/Core (4.3.4): - DKImagePickerController/ImageDataManager - DKImagePickerController/Resource - - DKImagePickerController/ImageDataManager (4.3.2) - - DKImagePickerController/PhotoGallery (4.3.2): + - DKImagePickerController/ImageDataManager (4.3.4) + - DKImagePickerController/PhotoGallery (4.3.4): - DKImagePickerController/Core - DKPhotoGallery - - DKImagePickerController/Resource (4.3.2) + - DKImagePickerController/Resource (4.3.4) - DKPhotoGallery (0.0.17): - DKPhotoGallery/Core (= 0.0.17) - DKPhotoGallery/Model (= 0.0.17) @@ -48,73 +48,71 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter - - Firebase/Analytics (8.9.0): + - Firebase/Analytics (8.11.0): - Firebase/Core - - Firebase/Core (8.9.0): + - Firebase/Core (8.11.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 8.9.0) - - Firebase/CoreOnly (8.9.0): - - FirebaseCore (= 8.9.0) - - Firebase/Messaging (8.9.0): + - FirebaseAnalytics (~> 8.11.0) + - Firebase/CoreOnly (8.11.0): + - FirebaseCore (= 8.11.0) + - Firebase/Messaging (8.11.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 8.9.0) + - FirebaseMessaging (~> 8.11.0) - firebase_analytics (8.3.4): - - Firebase/Analytics (= 8.9.0) + - Firebase/Analytics (= 8.11.0) - firebase_core - Flutter - - firebase_core (1.10.6): - - Firebase/CoreOnly (= 8.9.0) + - firebase_core (1.12.0): + - Firebase/CoreOnly (= 8.11.0) - Flutter - - firebase_messaging (11.2.4): - - Firebase/Messaging (= 8.9.0) + - firebase_messaging (11.2.7): + - Firebase/Messaging (= 8.11.0) - firebase_core - Flutter - - FirebaseAnalytics (8.9.1): - - FirebaseAnalytics/AdIdSupport (= 8.9.1) + - FirebaseAnalytics (8.11.0): + - FirebaseAnalytics/AdIdSupport (= 8.11.0) - FirebaseCore (~> 8.0) - FirebaseInstallations (~> 8.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/MethodSwizzler (~> 7.6) - - GoogleUtilities/Network (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" - nanopb (~> 2.30908.0) - - FirebaseAnalytics/AdIdSupport (8.9.1): + - FirebaseAnalytics/AdIdSupport (8.11.0): - FirebaseCore (~> 8.0) - FirebaseInstallations (~> 8.0) - - GoogleAppMeasurement (= 8.9.1) - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/MethodSwizzler (~> 7.6) - - GoogleUtilities/Network (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" + - GoogleAppMeasurement (= 8.11.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" - nanopb (~> 2.30908.0) - - FirebaseCore (8.9.0): + - FirebaseCore (8.11.0): - FirebaseCoreDiagnostics (~> 8.0) - - GoogleUtilities/Environment (~> 7.6) - - GoogleUtilities/Logger (~> 7.6) - - FirebaseCoreDiagnostics (8.10.0): + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/Logger (~> 7.7) + - FirebaseCoreDiagnostics (8.15.0): - GoogleDataTransport (~> 9.1) - - GoogleUtilities/Environment (~> 7.6) - - GoogleUtilities/Logger (~> 7.6) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/Logger (~> 7.7) - nanopb (~> 2.30908.0) - - FirebaseInstallations (8.10.0): + - FirebaseInstallations (8.15.0): - FirebaseCore (~> 8.0) - - GoogleUtilities/Environment (~> 7.6) - - GoogleUtilities/UserDefaults (~> 7.6) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/UserDefaults (~> 7.7) - PromisesObjC (< 3.0, >= 1.2) - - FirebaseMessaging (8.9.0): + - FirebaseMessaging (8.11.0): - FirebaseCore (~> 8.0) - FirebaseInstallations (~> 8.0) - GoogleDataTransport (~> 9.1) - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/Environment (~> 7.6) - - GoogleUtilities/Reachability (~> 7.6) - - GoogleUtilities/UserDefaults (~> 7.6) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/Reachability (~> 7.7) + - GoogleUtilities/UserDefaults (~> 7.7) - nanopb (~> 2.30908.0) - Flutter (1.0.0) - flutter_app_icon_badge (0.0.1): - Flutter - - flutter_hms_gms_availability (0.0.1): - - Flutter - flutter_inappwebview (0.0.1): - Flutter - flutter_inappwebview/Core (= 0.0.1) @@ -132,10 +130,9 @@ PODS: - Flutter - flutter_tts (0.0.1): - Flutter - - flutter_webrtc (0.7.1): + - flutter_webrtc (0.9.4): - Flutter - - Libyuv (= 1703) - - WebRTC-SDK (= 92.4515.11) + - WebRTC-SDK (= 104.5112.02) - fluttertoast (0.0.2): - Flutter - Toast @@ -146,66 +143,65 @@ PODS: - Flutter - geolocator_apple (1.2.0): - Flutter - - google_maps_flutter (0.0.1): + - google_maps_flutter_ios (0.0.1): - Flutter - GoogleMaps - - GoogleAppMeasurement (8.9.1): - - GoogleAppMeasurement/AdIdSupport (= 8.9.1) - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/MethodSwizzler (~> 7.6) - - GoogleUtilities/Network (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" - - nanopb (~> 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (8.9.1): - - GoogleAppMeasurement/WithoutAdIdSupport (= 8.9.1) - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/MethodSwizzler (~> 7.6) - - GoogleUtilities/Network (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" + - GoogleAppMeasurement (8.11.0): + - GoogleAppMeasurement/AdIdSupport (= 8.11.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" - nanopb (~> 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (8.9.1): - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/MethodSwizzler (~> 7.6) - - GoogleUtilities/Network (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" + - GoogleAppMeasurement/AdIdSupport (8.11.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 8.11.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" - nanopb (~> 2.30908.0) - - GoogleDataTransport (9.1.2): - - GoogleUtilities/Environment (~> 7.2) + - GoogleAppMeasurement/WithoutAdIdSupport (8.11.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" - nanopb (~> 2.30908.0) + - GoogleDataTransport (9.2.0): + - GoogleUtilities/Environment (~> 7.7) + - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleMaps (5.2.0): - - GoogleMaps/Maps (= 5.2.0) - - GoogleMaps/Base (5.2.0) - - GoogleMaps/Maps (5.2.0): + - GoogleMaps (7.1.0): + - GoogleMaps/Maps (= 7.1.0) + - GoogleMaps/Base (7.1.0) + - GoogleMaps/Maps (7.1.0): - GoogleMaps/Base - - GoogleUtilities/AppDelegateSwizzler (7.6.0): + - GoogleUtilities/AppDelegateSwizzler (7.8.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.6.0): + - GoogleUtilities/Environment (7.8.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.6.0): + - GoogleUtilities/Logger (7.8.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.6.0): + - GoogleUtilities/MethodSwizzler (7.8.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.6.0): + - GoogleUtilities/Network (7.8.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.6.0)" - - GoogleUtilities/Reachability (7.6.0): + - "GoogleUtilities/NSData+zlib (7.8.0)" + - GoogleUtilities/Reachability (7.8.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.6.0): + - GoogleUtilities/UserDefaults (7.8.0): - GoogleUtilities/Logger - health (1.0.4): - Flutter - - image_picker (0.0.1): + - image_picker_ios (0.0.1): - Flutter - in_app_review (0.2.0): - Flutter - just_audio (0.0.1): - Flutter - - Libyuv (1703) - local_auth (0.0.1): - Flutter - location (0.0.1): @@ -224,24 +220,22 @@ PODS: - nanopb/encode (2.30908.0) - native_device_orientation (0.0.1): - Flutter - - OpenTok (2.22.0): - - VonageWebRTC (= 84.0.20) + - OpenTok (2.22.3): + - VonageWebRTC (= 84.0.21) - OrderedSet (5.0.0) - package_info_plus (0.4.5): - Flutter - path_provider_ios (0.0.1): - Flutter - - pay_ios (0.0.1): - - Flutter - "permission_handler (5.1.0+2)": - Flutter - - PromisesObjC (2.0.0) + - PromisesObjC (2.1.1) - Reachability (3.2) - - screen_brightness_ios (0.0.1): + - screen_brightness_ios (0.0.5): - Flutter - - SDWebImage (5.12.1): - - SDWebImage/Core (= 5.12.1) - - SDWebImage/Core (5.12.1) + - SDWebImage (5.13.3): + - SDWebImage/Core (= 5.13.3) + - SDWebImage/Core (5.13.3) - searchable_dropdown (1.1.1): - Flutter - shared_preferences_ios (0.0.1): @@ -252,20 +246,20 @@ PODS: - sqflite (0.0.2): - Flutter - FMDB (>= 2.7.5) - - SwiftProtobuf (1.18.0) - - SwiftyGif (5.4.1) + - SwiftProtobuf (1.20.1) + - SwiftyGif (5.4.3) - Toast (4.0.0) - Try (2.1.1) - url_launcher_ios (0.0.1): - Flutter - - vibration (1.7.3): + - vibration (1.7.5): - Flutter - - video_player (0.0.1): + - video_player_avfoundation (0.0.1): - Flutter - - VonageWebRTC (84.0.20) + - VonageWebRTC (84.0.21) - wakelock (0.0.1): - Flutter - - WebRTC-SDK (92.4515.11) + - WebRTC-SDK (104.5112.02) - webview_flutter_wkwebview (0.0.1): - Flutter - wifi (0.0.1): @@ -274,7 +268,7 @@ PODS: DEPENDENCIES: - audio_session (from `.symlinks/plugins/audio_session/ios`) - barcode_scan2 (from `.symlinks/plugins/barcode_scan2/ios`) - - camera (from `.symlinks/plugins/camera/ios`) + - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`) - connectivity (from `.symlinks/plugins/connectivity/ios`) - device_calendar (from `.symlinks/plugins/device_calendar/ios`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) @@ -284,7 +278,6 @@ DEPENDENCIES: - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`) - Flutter (from `Flutter`) - flutter_app_icon_badge (from `.symlinks/plugins/flutter_app_icon_badge/ios`) - - flutter_hms_gms_availability (from `.symlinks/plugins/flutter_hms_gms_availability/ios`) - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`) - flutter_ios_voip_kit (from `.symlinks/plugins/flutter_ios_voip_kit/ios`) - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) @@ -295,9 +288,9 @@ DEPENDENCIES: - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - geocoding (from `.symlinks/plugins/geocoding/ios`) - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`) - - google_maps_flutter (from `.symlinks/plugins/google_maps_flutter/ios`) + - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`) - health (from `.symlinks/plugins/health/ios`) - - image_picker (from `.symlinks/plugins/image_picker/ios`) + - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) - in_app_review (from `.symlinks/plugins/in_app_review/ios`) - just_audio (from `.symlinks/plugins/just_audio/ios`) - local_auth (from `.symlinks/plugins/local_auth/ios`) @@ -309,7 +302,6 @@ DEPENDENCIES: - OpenTok (~> 2.22.0) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - - pay_ios (from `.symlinks/plugins/pay_ios/ios`) - permission_handler (from `.symlinks/plugins/permission_handler/ios`) - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`) - searchable_dropdown (from `.symlinks/plugins/searchable_dropdown/ios`) @@ -318,7 +310,7 @@ DEPENDENCIES: - sqflite (from `.symlinks/plugins/sqflite/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - vibration (from `.symlinks/plugins/vibration/ios`) - - video_player (from `.symlinks/plugins/video_player/ios`) + - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`) - wakelock (from `.symlinks/plugins/wakelock/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) - wifi (from `.symlinks/plugins/wifi/ios`) @@ -338,7 +330,6 @@ SPEC REPOS: - GoogleDataTransport - GoogleMaps - GoogleUtilities - - Libyuv - MTBBarcodeScanner - nanopb - OpenTok @@ -358,8 +349,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/audio_session/ios" barcode_scan2: :path: ".symlinks/plugins/barcode_scan2/ios" - camera: - :path: ".symlinks/plugins/camera/ios" + camera_avfoundation: + :path: ".symlinks/plugins/camera_avfoundation/ios" connectivity: :path: ".symlinks/plugins/connectivity/ios" device_calendar: @@ -378,8 +369,6 @@ EXTERNAL SOURCES: :path: Flutter flutter_app_icon_badge: :path: ".symlinks/plugins/flutter_app_icon_badge/ios" - flutter_hms_gms_availability: - :path: ".symlinks/plugins/flutter_hms_gms_availability/ios" flutter_inappwebview: :path: ".symlinks/plugins/flutter_inappwebview/ios" flutter_ios_voip_kit: @@ -400,12 +389,12 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/geocoding/ios" geolocator_apple: :path: ".symlinks/plugins/geolocator_apple/ios" - google_maps_flutter: - :path: ".symlinks/plugins/google_maps_flutter/ios" + google_maps_flutter_ios: + :path: ".symlinks/plugins/google_maps_flutter_ios/ios" health: :path: ".symlinks/plugins/health/ios" - image_picker: - :path: ".symlinks/plugins/image_picker/ios" + image_picker_ios: + :path: ".symlinks/plugins/image_picker_ios/ios" in_app_review: :path: ".symlinks/plugins/in_app_review/ios" just_audio: @@ -426,8 +415,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/package_info_plus/ios" path_provider_ios: :path: ".symlinks/plugins/path_provider_ios/ios" - pay_ios: - :path: ".symlinks/plugins/pay_ios/ios" permission_handler: :path: ".symlinks/plugins/permission_handler/ios" screen_brightness_ios: @@ -444,8 +431,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/url_launcher_ios/ios" vibration: :path: ".symlinks/plugins/vibration/ios" - video_player: - :path: ".symlinks/plugins/video_player/ios" + video_player_avfoundation: + :path: ".symlinks/plugins/video_player_avfoundation/ios" wakelock: :path: ".symlinks/plugins/wakelock/ios" webview_flutter_wkwebview: @@ -456,47 +443,45 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: audio_session: 4f3e461722055d21515cf3261b64c973c062f345 barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0 - camera: fe33292aff715a981eb34d7ce7b35b54337ff34c + camera_avfoundation: 07c77549ea54ad95d8581be86617c094a46280d9 connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467 device_calendar: 9cb33f88a02e19652ec7b8b122ca778f751b1f7b device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed - DKImagePickerController: b5eb7f7a388e4643264105d648d01f727110fc3d + DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - file_picker: 3e6c3790de664ccf9b882732d9db5eaf6b8d4eb1 - Firebase: 13d8d96499e2635428d5bf0ec675df21f95d9a95 - firebase_analytics: 7a7528bb2abf4ca22cff7a57bbf909dcab73e13d - firebase_core: c263d7daf1dc92fcd9895e6abdc04872b0ee07ff - firebase_messaging: dff5cd08781ee1de988565a83c977e435405cd7e - FirebaseAnalytics: 4ab446ce08a3fe52e8a4303dd997cf26276bf968 - FirebaseCore: 599ee609343eaf4941bd188f85e3aa077ffe325b - FirebaseCoreDiagnostics: 56fb7216d87e0e6ec2feddefa9d8a392fe8b2c18 - FirebaseInstallations: 830327b45345ffc859eaa9c17bcd5ae893fd5425 - FirebaseMessaging: 82c4a48638f53f7b184f3cc9f6cd2cbe533ab316 + file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95 + Firebase: 44dd9724c84df18b486639e874f31436eaa9a20c + firebase_analytics: 7f755057493ac8fc386f987c9233a037fb0a8a81 + firebase_core: 443bccfd6aa6b42f07be365b500773dc69db2d87 + firebase_messaging: ad581310adcd3c9ab493d6f394c935af45a8f07b + FirebaseAnalytics: 4e4b13031034e6561ed3bd1d47b6fdabbd6487c6 + FirebaseCore: 2f4f85b453cc8fea4bb2b37e370007d2bcafe3f0 + FirebaseCoreDiagnostics: 92e07a649aeb66352b319d43bdd2ee3942af84cb + FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd + FirebaseMessaging: 02e248e8997f71fa8cc9d78e9d49ec1a701ba14a Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a flutter_app_icon_badge: 844847adbd7a1c6f325d6b41b942428981b839cc - flutter_hms_gms_availability: babc50b18670e99780270bc18d9b17d0a07cd77e flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721 flutter_ios_voip_kit: a3b4c5bd0cfda5069b5605a6d1dc60ecf99c6299 flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 flutter_native_timezone: 5f05b2de06c9776b4cc70e1839f03de178394d22 flutter_nfc_kit: 965c98c3fa68f5609f1cc89abb968fe1b8ffdbaa flutter_tts: 0f492aab6accf87059b72354fcb4ba934304771d - flutter_webrtc: a5a79904f0bca0ea23aff49c51ca765f70a0f703 - fluttertoast: 6122fa75143e992b1d3470f61000f591a798cc58 + flutter_webrtc: aa130dfe1eca6625c2e2e51ce830abb495bdb06e + fluttertoast: 16fbe6039d06a763f3533670197d01fc73459037 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a geocoding: 32cfcdb16d38d907caaba65e2e42ad10d38bee58 geolocator_apple: b741765c55dc21950e3e106e8b3584e55cf81ce5 - google_maps_flutter: abdb8dee6c52d4be36ad131ee6ebfacd14417c5a - GoogleAppMeasurement: 837649ad3987936c232f6717c5680216f6243d24 - GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940 - GoogleMaps: 025272d5876d3b32604e5c080dc25eaf68764693 - GoogleUtilities: 684ee790a24f73ebb2d1d966e9711c203f2a4237 + google_maps_flutter_ios: 66201f392bf62d500f07670a30488a247b9bb5b9 + GoogleAppMeasurement: aa3cb422fab2b05d2efac543a5720d1a85b9dea5 + GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f + GoogleMaps: bc56ffb0324e345a2d91bac1a64a920f9c8f1b20 + GoogleUtilities: 1d20a6ad97ef46f67bbdec158ce00563a671ebb7 health: e7a5807e45ec58fe6b89a730c97abc6caafe94a0 - image_picker: 9aa50e1d8cdacdbed739e925b7eea16d014367e6 + image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb in_app_review: 4a97249f7a2f539a0f294c2d9196b7fe35e49541 just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa - Libyuv: 5f79ced0ee66e60a612ca97de1e6ccacd187a437 - local_auth: ef62030a2731330b95df7ef1331bd15f6a64b8a6 + local_auth: 1740f55d7af0a2e2a8684ce225fe79d8931e808c location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740 manage_calendar_events: 0338d505ea26cdfd20cd883279bc28afa11eca34 map_launcher: e325db1261d029ff33e08e03baccffe09593ffea @@ -504,33 +489,32 @@ SPEC CHECKSUMS: MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 native_device_orientation: 3b4cfc9565a7b879cc4fde282b3e27745e852d0d - OpenTok: 481bc2ea0affccdd721b4cd41fa8c7e6a6e1f200 + OpenTok: 532cdb6254b7bf41c64f8ad761469d6f7a154c7b OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5 - pay_ios: 8c7beb9c61d885f3f51b61f75f8793023fc8843a + path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 - PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58 + PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 - screen_brightness_ios: e2f4c3492ec238bb8ea1f5558f67ea22557cf997 - SDWebImage: 4dc3e42d9ec0c1028b960a33ac6b637bb432207b + screen_brightness_ios: dd110ebfe9602013ea863d59770a9192ebbb7ac7 + SDWebImage: af5bbffef2cde09f148d826f9733dcde1a9414cd searchable_dropdown: 5058be32fdc5e0481d300ff2087129072e71bd62 - shared_preferences_ios: aef470a42dc4675a1cdd50e3158b42e3d1232b32 + shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad speech_to_text: b43a7d99aef037bd758ed8e45d79bbac035d2dfe sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 - SwiftProtobuf: c3c12645230d9b09c72267e0de89468c5543bd86 - SwiftyGif: 6895c887f5551618a3c5dd3ecb512419105bacca + SwiftProtobuf: e40a7684079620e84ba522dbaeab0cddb0ec7ffd + SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780 Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 Try: 5ef669ae832617b3cee58cb2c6f99fb767a4ff96 - url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af - vibration: b5a33e764c3f609a975b9dca73dce20fdde627dc - video_player: ecd305f42e9044793efd34846e1ce64c31ea6fcb - VonageWebRTC: 20e0e56f656ddbf49287cacbd33e69dbbe5736f8 + url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de + vibration: 7d883d141656a1c1a6d8d238616b2042a51a1241 + video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff + VonageWebRTC: cfa7aefc3fe6e95bcbd778e8973af90fe9bfd497 wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f - WebRTC-SDK: 21dbc6028a68f3a89718057a2caa970a4da8ebb7 - webview_flutter_wkwebview: 005fbd90c888a42c5690919a1527ecc6649e1162 + WebRTC-SDK: e0589abeb63db07a4ca1f45c82ba0f1a72e61622 + webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f wifi: d7d77c94109e36c4175d845f0a5964eadba71060 -PODFILE CHECKSUM: 87c85be30da5343f66afbb978b1a421a87b82b01 +PODFILE CHECKSUM: 3e4579e32c44e559af72298957c8f84f38c31bd1 COCOAPODS: 1.11.3 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 33a2b9c6..84f27c8d 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -13,11 +13,13 @@ 306FE6C8271D790C002D6EFC /* OpenTokPlatformBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 306FE6C7271D790C002D6EFC /* OpenTokPlatformBridge.swift */; }; 306FE6CB271D8B73002D6EFC /* OpenTok.swift in Sources */ = {isa = PBXBuildFile; fileRef = 306FE6CA271D8B73002D6EFC /* OpenTok.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 475592F05034141EC172233D /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 784F1093F853B573C176EC8E /* Pods_Runner.framework */; }; + 459C7EBFE08DE418BBC8A1E0 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 335762278E275DF4071BE8C7 /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 762D738E274E42650063CE73 /* ring_30Sec.caf in Resources */ = {isa = PBXBuildFile; fileRef = 762D738C274E42650063CE73 /* ring_30Sec.caf */; }; 762D738F274E42650063CE73 /* ring_30Sec.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 762D738D274E42650063CE73 /* ring_30Sec.mp3 */; }; 76815B27275F381C00E66E94 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76815B26275F381C00E66E94 /* HealthKit.framework */; }; + 76962ECE28AE5C10004EAE09 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 76962ECD28AE5C10004EAE09 /* GoogleService-Info.plist */; }; + 76F2556127F1FFED0062C1CD /* PassKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76F2556027F1FFED0062C1CD /* PassKit.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; @@ -35,7 +37,6 @@ E923EFD62587443800E3E751 /* HMGPlatformBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = E923EFD52587443800E3E751 /* HMGPlatformBridge.swift */; }; E923EFD82588D17700E3E751 /* gpx.gpx in Resources */ = {isa = PBXBuildFile; fileRef = E923EFD72588D17700E3E751 /* gpx.gpx */; }; E9620805255C2ED100D3A35D /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9620804255C2ED100D3A35D /* NetworkExtension.framework */; }; - E9A35329258B8E8F00CBA688 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = E9A35328258B8E8F00CBA688 /* GoogleService-Info.plist */; }; E9C8C136256BACDA00EFFB62 /* HMG_Guest.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9C8C135256BACDA00EFFB62 /* HMG_Guest.swift */; }; E9E27168256E3A4000F49B69 /* LocalizedFromFlutter.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9E27167256E3A4000F49B69 /* LocalizedFromFlutter.swift */; }; E9F7623B25922BCE00FB5CCF /* FlutterConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F7623A25922BCE00FB5CCF /* FlutterConstants.swift */; }; @@ -55,21 +56,23 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0E1B56877369D77C273A75CC /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 215757156BD432313B5BCA8C /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 301C79AD27200D9F0016307B /* OpenTokRemoteVideoFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenTokRemoteVideoFactory.swift; sourceTree = ""; }; 301C79AF27200DED0016307B /* OpenTokLocalVideoFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenTokLocalVideoFactory.swift; sourceTree = ""; }; 306FE6C7271D790C002D6EFC /* OpenTokPlatformBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenTokPlatformBridge.swift; sourceTree = ""; }; 306FE6CA271D8B73002D6EFC /* OpenTok.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenTok.swift; sourceTree = ""; }; + 335762278E275DF4071BE8C7 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 578C284DFF3E98A58F201401 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 6512C00D7013854F8BCDC4A9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 762D738C274E42650063CE73 /* ring_30Sec.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = ring_30Sec.caf; path = ../../assets/sounds/ring_30Sec.caf; sourceTree = ""; }; 762D738D274E42650063CE73 /* ring_30Sec.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = ring_30Sec.mp3; path = ../../assets/sounds/ring_30Sec.mp3; sourceTree = ""; }; 76815B26275F381C00E66E94 /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; }; - 784F1093F853B573C176EC8E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 76962ECD28AE5C10004EAE09 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; + 76F2556027F1FFED0062C1CD /* PassKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PassKit.framework; path = System/Library/Frameworks/PassKit.framework; sourceTree = SDKROOT; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; @@ -78,7 +81,7 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - CA034E94472F7A2E6ADD99A0 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + B804B2962280EC6806915776 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; E91B538D256AAA6500E96549 /* GlobalHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlobalHelper.swift; sourceTree = ""; }; E91B538E256AAA6500E96549 /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = ""; }; E91B538F256AAA6500E96549 /* API.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = API.swift; sourceTree = ""; }; @@ -94,7 +97,6 @@ E923EFD72588D17700E3E751 /* gpx.gpx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = gpx.gpx; sourceTree = ""; }; E9620803255C2ED100D3A35D /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; E9620804255C2ED100D3A35D /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; }; - E9A35328258B8E8F00CBA688 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; E9C8C135256BACDA00EFFB62 /* HMG_Guest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMG_Guest.swift; sourceTree = ""; }; E9E27167256E3A4000F49B69 /* LocalizedFromFlutter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizedFromFlutter.swift; sourceTree = ""; }; E9F7623A25922BCE00FB5CCF /* FlutterConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlutterConstants.swift; sourceTree = ""; }; @@ -105,9 +107,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 76F2556127F1FFED0062C1CD /* PassKit.framework in Frameworks */, 76815B27275F381C00E66E94 /* HealthKit.framework in Frameworks */, E9620805255C2ED100D3A35D /* NetworkExtension.framework in Frameworks */, - 475592F05034141EC172233D /* Pods_Runner.framework in Frameworks */, + 459C7EBFE08DE418BBC8A1E0 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -127,9 +130,10 @@ 555EAAA626EFB641859EF0BE /* Frameworks */ = { isa = PBXGroup; children = ( + 76F2556027F1FFED0062C1CD /* PassKit.framework */, 76815B26275F381C00E66E94 /* HealthKit.framework */, E9620804255C2ED100D3A35D /* NetworkExtension.framework */, - 784F1093F853B573C176EC8E /* Pods_Runner.framework */, + 335762278E275DF4071BE8C7 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -137,9 +141,9 @@ 605039E5DDF72C245F9765FE /* Pods */ = { isa = PBXGroup; children = ( - 0E1B56877369D77C273A75CC /* Pods-Runner.debug.xcconfig */, - 578C284DFF3E98A58F201401 /* Pods-Runner.release.xcconfig */, - CA034E94472F7A2E6ADD99A0 /* Pods-Runner.profile.xcconfig */, + 215757156BD432313B5BCA8C /* Pods-Runner.debug.xcconfig */, + 6512C00D7013854F8BCDC4A9 /* Pods-Runner.release.xcconfig */, + B804B2962280EC6806915776 /* Pods-Runner.profile.xcconfig */, ); path = Pods; sourceTree = ""; @@ -158,7 +162,7 @@ 97C146E51CF9000F007C117D = { isa = PBXGroup; children = ( - E9A35328258B8E8F00CBA688 /* GoogleService-Info.plist */, + 76962ECD28AE5C10004EAE09 /* GoogleService-Info.plist */, E923EFD72588D17700E3E751 /* gpx.gpx */, 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, @@ -242,15 +246,15 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 90E681C38D6D36A73BF84E03 /* [CP] Check Pods Manifest.lock */, + 184E1D7629A8D4001ABBA325 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - F4F7FCCC462E347C2D580F43 /* [CP] Embed Pods Frameworks */, - D767F6DDC3BD13ECA410CBAD /* [CP] Copy Pods Resources */, + 1EF1154EA3B2E3847B26E3EF /* [CP] Embed Pods Frameworks */, + AE8C06E63B2E8822D80BB151 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -301,10 +305,10 @@ files = ( E91B53A0256AAC1400E96549 /* GuestPOC_Certificate.cer in Resources */, 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, - E9A35329258B8E8F00CBA688 /* GoogleService-Info.plist in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, E923EFD82588D17700E3E751 /* gpx.gpx in Resources */, E91B539F256AAC1400E96549 /* GuestPOC_Certificate.p12 in Resources */, + 76962ECE28AE5C10004EAE09 /* GoogleService-Info.plist in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, E91B53A3256AAD8200E96549 /* Main_Custom.storyboard in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, @@ -316,88 +320,88 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + 184E1D7629A8D4001ABBA325 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( ); - name = "Thin Binary"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; }; - 90E681C38D6D36A73BF84E03 /* [CP] Check Pods Manifest.lock */ = { + 1EF1154EA3B2E3847B26E3EF /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 9740EEB61CF901F6004384FC /* Run Script */ = { + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Run Script"; + name = "Thin Binary"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n"; }; - D767F6DDC3BD13ECA410CBAD /* [CP] Copy Pods Resources */ = { + 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + inputPaths = ( ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + name = "Run Script"; + outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; - showEnvVarsInLog = 0; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - F4F7FCCC462E347C2D580F43 /* [CP] Embed Pods Frameworks */ = { + AE8C06E63B2E8822D80BB151 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -499,7 +503,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -517,7 +521,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 3A359E86ZF; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -525,7 +529,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -534,10 +538,11 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 4.5.17; + MARKETING_VERSION = 4.5.55; PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_COMPILATION_MODE = singlefile; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -591,7 +596,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -640,7 +645,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -660,7 +665,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 3A359E86ZF; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -668,7 +673,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -677,10 +682,11 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 4.5.17; + MARKETING_VERSION = 4.5.55; PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_COMPILATION_MODE = singlefile; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -697,7 +703,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 3A359E86ZF; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -705,7 +711,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -714,10 +720,12 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 4.5.17; + MARKETING_VERSION = 4.5.55; PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_COMPILATION_MODE = singlefile; + "SWIFT_COMPILATION_MODE[arch=*]" = singlefile; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 0ce7eafd..ea96fe5f 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -40,7 +40,7 @@ + isEnabled = "NO"> + isEnabled = "NO"> diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 35a3c022..d8e5e0f6 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -15,7 +15,7 @@ var userNotificationCenterDelegate:UNUserNotificationCenterDelegate? = nil GeneratedPluginRegistrant.register(with: self) initializePlatformChannels() - + if let _ = launchOptions?[.location] { HMG_Geofence.initGeofencing() } diff --git a/ios/Runner/GoogleService-Info.plist b/ios/Runner/GoogleService-Info.plist index 633037cb..c179ec60 100644 --- a/ios/Runner/GoogleService-Info.plist +++ b/ios/Runner/GoogleService-Info.plist @@ -21,18 +21,18 @@ STORAGE_BUCKET api-project-815750722565.appspot.com IS_ADS_ENABLED - + IS_ANALYTICS_ENABLED - + IS_APPINVITE_ENABLED - + IS_GCM_ENABLED - + IS_SIGNIN_ENABLED - + GOOGLE_APP_ID 1:815750722565:ios:328ec247a81a2ca23c186c DATABASE_URL https://api-project-815750722565.firebaseio.com - \ No newline at end of file + diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 77d0dc81..533f04ef 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -2,6 +2,8 @@ + CADisableMinimumFrameDurationOnPhone + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleExecutable @@ -19,25 +21,20 @@ CFBundleSignature ???? CFBundleVersion - $(FLUTTER_BUILD_NUMBER) + $(CURRENT_PROJECT_VERSION) + FIVKIconName + AppIcon-VoIPKit + FIVKLocalizedName + VoIP-Kit + FIVKSkipRecallScreen + + FIVKSupportVideo + LSApplicationQueriesSchemes - googlechromes comgooglemaps - iosamap - http - https baidumap iosamap - waze - yandexmaps - yandexnavi - citymapper - mapswithme - osmandmaps - dgis - qqmap - here-location LSRequiresIPhoneOS @@ -93,8 +90,10 @@ UIBackgroundModes audio + fetch location remote-notification + voip UILaunchStoryboardName LaunchScreen @@ -115,13 +114,5 @@ io.flutter.embedded_views_preview - LSApplicationQueriesSchemes - - comgooglemaps - baidumap - iosamap - - - diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements index 38553e31..0821ccf0 100644 --- a/ios/Runner/Runner.entitlements +++ b/ios/Runner/Runner.entitlements @@ -14,8 +14,11 @@ com.apple.developer.nfc.readersession.formats - NDEF TAG + com.apple.developer.pass-type-identifiers + + $(TeamIdentifierPrefix)* + diff --git a/lib/config/config.dart b/lib/config/config.dart index a2d3ecac..3589e93d 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -20,8 +20,8 @@ var PACKAGES_ORDERS = '/api/orders'; var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; // var BASE_URL = 'http://10.50.100.198:3334/'; - var BASE_URL = 'https://uat.hmgwebservices.com/'; -// var BASE_URL = 'https://hmgwebservices.com/'; +// var BASE_URL = 'https://uat.hmgwebservices.com/'; +var BASE_URL = 'https://hmgwebservices.com/'; // Pharmacy UAT URLs // var BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index b73dce48..ca78d802 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -149,7 +149,7 @@ class BaseAppClient { // body['IdentificationNo'] = 1023854217; // body['MobileNo'] = "531940021"; - // body['PatientID'] = 2222149; //3844083 + // body['PatientID'] = 4136917; //3844083 // body['TokenID'] = "@dm!n"; // Patient ID: 3027574 diff --git a/lib/services/livecare_services/livecare_provider.dart b/lib/services/livecare_services/livecare_provider.dart index e97ca7af..e6a2a49d 100644 --- a/lib/services/livecare_services/livecare_provider.dart +++ b/lib/services/livecare_services/livecare_provider.dart @@ -320,7 +320,7 @@ class LiveCareService extends BaseService { localRes = response; }, onFailure: (String error, int statusCode) { throw error; - }, body: tamaraInsertRequest.toJson(), isAllowAny: true); + }, body: tamaraInsertRequest.toJson()); return Future.value(localRes); }