diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index cea03f4b..b2cab5a3 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -286,14 +286,12 @@ "${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework", "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework", "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", - "${BUILT_PRODUCTS_DIR}/MTBBarcodeScanner/MTBBarcodeScanner.framework", "${BUILT_PRODUCTS_DIR}/OrderedSet/OrderedSet.framework", "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", "${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework", "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", "${BUILT_PRODUCTS_DIR}/SwiftyGif/SwiftyGif.framework", "${BUILT_PRODUCTS_DIR}/Try/Try.framework", - "${BUILT_PRODUCTS_DIR}/barcode_scan_fix/barcode_scan_fix.framework", "${BUILT_PRODUCTS_DIR}/connectivity/connectivity.framework", "${BUILT_PRODUCTS_DIR}/device_info/device_info.framework", "${BUILT_PRODUCTS_DIR}/file_picker/file_picker.framework", @@ -327,14 +325,12 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MTBBarcodeScanner.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OrderedSet.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyGif.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Try.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/barcode_scan_fix.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_picker.framework", @@ -501,7 +497,10 @@ ); INFOPLIST_FILE = Runner/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -636,7 +635,10 @@ ); INFOPLIST_FILE = Runner/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -667,7 +669,10 @@ ); INFOPLIST_FILE = Runner/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", diff --git a/lib/core/service/AnalyticsService.dart b/lib/core/service/AnalyticsService.dart index b5ffb318..88128375 100644 --- a/lib/core/service/AnalyticsService.dart +++ b/lib/core/service/AnalyticsService.dart @@ -1,16 +1,16 @@ -import 'package:firebase_analytics/firebase_analytics.dart'; -import 'package:firebase_analytics/observer.dart'; +// import 'package:firebase_analytics/firebase_analytics.dart'; +// import 'package:firebase_analytics/observer.dart'; import 'package:flutter/cupertino.dart'; class AnalyticsService { - final FirebaseAnalytics _analytics = FirebaseAnalytics(); - - FirebaseAnalyticsObserver getAnalyticsObserver() => FirebaseAnalyticsObserver(analytics: _analytics); - + // final FirebaseAnalytics _analytics = FirebaseAnalytics(); + // + // FirebaseAnalyticsObserver getAnalyticsObserver() => FirebaseAnalyticsObserver(analytics: _analytics); + // Future logEvent({required String eventCategory, required String eventAction}) async { - await _analytics.logEvent(name: 'event', parameters: { - "eventCategory": eventCategory, - "eventAction": eventAction, - }); + // await _analytics.logEvent(name: 'event', parameters: { + // "eventCategory": eventCategory, + // "eventAction": eventAction, + // }); } } diff --git a/lib/main.dart b/lib/main.dart index 450c046f..6b98916e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,8 +2,8 @@ import 'package:doctor_app_flutter/core/provider/robot_provider.dart'; import 'package:doctor_app_flutter/core/viewModel/livecare_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; -import 'package:firebase_analytics/firebase_analytics.dart'; -import 'package:firebase_analytics/observer.dart'; +// import 'package:firebase_analytics/firebase_analytics.dart'; +// import 'package:firebase_analytics/observer.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -74,7 +74,7 @@ class MyApp extends StatelessWidget { ), navigatorKey: locator().navigatorKey, navigatorObservers: [ - locator().getAnalyticsObserver(), + // locator().getAnalyticsObserver(), ], initialRoute: INIT_ROUTE, routes: routes, diff --git a/lib/screens/qr_reader/QR_reader_screen.dart b/lib/screens/qr_reader/QR_reader_screen.dart index c0b905fe..5e84d968 100644 --- a/lib/screens/qr_reader/QR_reader_screen.dart +++ b/lib/screens/qr_reader/QR_reader_screen.dart @@ -1,4 +1,4 @@ -import 'package:barcode_scan_fix/barcode_scan.dart'; +// import 'package:barcode_scan_fix/barcode_scan.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart'; @@ -82,7 +82,8 @@ class _QrReaderScreenState extends State { } _scanQrAndGetPatient(BuildContext context, ScanQrViewModel model) async { - var result = await BarcodeScanner.scan(); + // var result = await BarcodeScanner.scan(); + var result=""; if (result != "") { List listOfParams = result.split(','); int patientID = 0; diff --git a/pubspec.yaml b/pubspec.yaml index 619a24b4..0505b652 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,7 +32,7 @@ dependencies: flutter_device_type: ^0.4.0 intl: ^0.17.0 http: ^0.13.0 - provider: ^5.0.0 + provider: ^6.0.1 shared_preferences: ^2.0.6 imei_plugin: ^1.2.0 flutter_flexible_toast: ^0.1.4 @@ -53,7 +53,7 @@ dependencies: expandable: ^5.0.1 # Qr code Scanner - barcode_scan_fix: ^1.0.2 +# barcode_scan_fix: ^1.0.2 # permissions permission_handler: ^8.0.1 device_info: ^2.0.2 @@ -73,7 +73,7 @@ dependencies: # Firebase firebase_messaging: ^10.0.1 - firebase_analytics : ^8.3.4 +# firebase_analytics : ^8.3.4 #GIF image flutter_gifimage: ^1.0.1 @@ -111,6 +111,9 @@ dependencies: # hijri: ^2.0.3 hijri_picker: ^3.0.0 + # flutter_math_fork: ^0.6.0 +# flutter_math_fork: ^0.6.0 + dev_dependencies: