From 0626d5e0e17fd5bb76fb24fa624613eb0d22d814 Mon Sep 17 00:00:00 2001 From: tahaalam Date: Mon, 18 May 2026 15:41:38 +0300 Subject: [PATCH] rsg changes --- .../gradle/wrapper/gradle-wrapper.properties | 4 +- lib/analytics/google-analytics.dart | 5 +- .../PharmacyAddressesViewModel.dart | 1 - lib/core/viewModels/project_view_model.dart | 9 +- .../NewCMC/cmc_location_page.dart | 2 +- .../NewCMC/new_cmc_step_tow_page.dart | 2 +- .../NewHomeHealthCare/location_page.dart | 2 +- .../new_Home_health_care_step_one_page.dart | 2 +- .../new_Home_health_care_step_tow_page.dart | 2 +- .../notifications/notifications_page.dart | 2 +- .../rrt-order-list-item.dart | 4 +- lib/pages/feedback/send_feedback_page.dart | 4 +- lib/pages/login/forgot-password.dart | 7 +- .../widget/CurvedChartBloodPressure.dart | 2 +- .../my_trackers/widget/LineChartCurved.dart | 2 +- .../widget/MonthCurvedChartBloodPressure.dart | 2 +- .../widget/MonthLineChartCurved.dart | 2 +- .../medical/vital_sign/LineChartCurved.dart | 2 +- .../LineChartCurvedBloodPressure.dart | 2 +- lib/pages/pharmacies/compare.dart | 2 +- .../shared/product_details_app_bar.dart | 2 +- .../pharmacies/widgets/ProductOrderItem.dart | 2 +- .../js_wrapper/multistreammixer-wrapper.dart | 3 +- .../permission/permission_service.dart | 2 +- lib/splashPage.dart | 1 + lib/theme/colors.dart | 2 +- lib/theme/theme_value.dart | 2 +- lib/uitl/LocalNotification.dart | 6 +- lib/uitl/app_toast.dart | 2 +- lib/uitl/utils.dart | 4 +- lib/widgets/Loader/gif_loader_container.dart | 2 +- lib/widgets/buttons/defaultButton.dart | 4 +- lib/widgets/charts/show_chart.dart | 2 +- .../medical/LabResult/LineChartCurved.dart | 4 +- .../data_display/medical/doctor_card.dart | 6 +- lib/widgets/habib_logo_widget.dart | 2 +- lib/widgets/new_design/my_tab_view.dart | 2 +- .../others/app_expandable_notifier.dart | 2 +- lib/widgets/others/app_scaffold_widget.dart | 2 +- lib/widgets/others/not_auh_page.dart | 2 +- lib/widgets/otp/sms-popup.dart | 2 +- lib/widgets/pharmacy/product_tile.dart | 2 +- .../pickupLocation/PickupLocationFromMap.dart | 2 +- pubspec.yaml | 206 +++++++----------- 44 files changed, 142 insertions(+), 184 deletions(-) diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index f0c638fd..c2d6a202 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 14 15:55:18 AST 2021 +#Mon May 18 15:37:56 AST 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/lib/analytics/google-analytics.dart b/lib/analytics/google-analytics.dart index 46ae7f80..484efc12 100644 --- a/lib/analytics/google-analytics.dart +++ b/lib/analytics/google-analytics.dart @@ -28,12 +28,13 @@ var _analytics = FirebaseAnalytics.instance; _logger(String name, {Map? parameters}) async { // return; + Map parameter={}; if (name != null && name.isNotEmpty) { if (name.contains(' ')) name = name.replaceAll(' ', '_'); // To LowerCase if (parameters != null && parameters.isNotEmpty) - parameters = parameters.map((key, value) { + parameter = parameters.map((key, value) { final key_ = key.toLowerCase(); var value_ = value; if (value is String) value_ = value.toLowerCase(); @@ -41,7 +42,7 @@ _logger(String name, {Map? parameters}) async { }); try { - _analytics.logEvent(name: name.trim().toLowerCase(), parameters: parameters).then((value) { + _analytics.logEvent(name: name.trim().toLowerCase(), parameters: parameter).then((value) { // debugPrint('SUCCESS: Google analytics event "$name" sent with parameters $parameters'); }).catchError((error) { // debugPrint('ERROR: Google analytics event "$name" sent failed'); diff --git a/lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart b/lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart index d920f1e3..ecef969f 100644 --- a/lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart +++ b/lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart @@ -5,7 +5,6 @@ import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer import 'package:diplomaticquarterapp/services/pharmacy_services/pharmacyAddress_service.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:geocoding/geocoding.dart'; -import 'package:google_maps_place_picker_mb/google_maps_place_picker.dart'; import '../../../locator.dart'; import '../base_view_model.dart'; diff --git a/lib/core/viewModels/project_view_model.dart b/lib/core/viewModels/project_view_model.dart index 238ee0f5..b2f0db44 100644 --- a/lib/core/viewModels/project_view_model.dart +++ b/lib/core/viewModels/project_view_model.dart @@ -118,11 +118,12 @@ class ProjectViewModel extends BaseViewModel { ProjectViewModel() { try { loadSharedPrefLanguage(); - subscription = Connectivity().onConnectivityChanged.listen((ConnectivityResult result) { - if (result == ConnectivityResult.mobile) { + subscription = Connectivity().onConnectivityChanged.listen((List result) { + if (result.contains( ConnectivityResult.mobile)) { isInternetConnection = true; - } else if (result == ConnectivityResult.wifi) { - } else if (result == ConnectivityResult.none) { + } else if (result.contains( ConnectivityResult.wifi)) { + isInternetConnection = true; + } else if (result.contains( ConnectivityResult.none)) { isInternetConnection = false; } notifyListeners(); diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/cmc_location_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/cmc_location_page.dart index d0dd1094..0d5e245e 100644 --- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/cmc_location_page.dart +++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/cmc_location_page.dart @@ -25,7 +25,7 @@ import 'package:flutter/material.dart'; import 'package:geocoding/geocoding.dart'; import 'package:geolocator/geolocator.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart' as gmaps; -import 'package:google_maps_place_picker_mb/google_maps_place_picker.dart'; +import 'package:google_maps_place_picker_mb_v2/google_maps_place_picker.dart'; import 'package:huawei_hmsavailability/huawei_hmsavailability.dart'; import 'package:provider/provider.dart'; diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart index d75aecaa..c1408e62 100644 --- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart +++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart @@ -20,7 +20,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:geolocator/geolocator.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart' as gmaps; -import 'package:google_maps_place_picker_mb/google_maps_place_picker.dart'; +import 'package:google_maps_place_picker_mb_v2/google_maps_place_picker.dart'; import 'package:permission_handler/permission_handler.dart'; import 'cmc_location_page.dart'; diff --git a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart index 1ac2f90d..312f2bfe 100644 --- a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart +++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart @@ -23,7 +23,7 @@ import 'package:flutter/material.dart'; import 'package:geocoding/geocoding.dart'; import 'package:geolocator/geolocator.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; -import 'package:google_maps_place_picker_mb/google_maps_place_picker.dart'; +import 'package:google_maps_place_picker_mb_v2/google_maps_place_picker.dart'; import 'package:huawei_hmsavailability/huawei_hmsavailability.dart'; import 'package:provider/provider.dart'; diff --git a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart index 14085fd9..c7d74616 100644 --- a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart +++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart @@ -13,7 +13,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:google_maps_place_picker_mb/google_maps_place_picker.dart'; +import 'package:google_maps_place_picker_mb_v2/google_maps_place_picker.dart'; import 'package:provider/provider.dart'; class NewHomeHealthCareStepOnePage extends StatefulWidget { diff --git a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart index ee8f5b92..4d6b6acb 100644 --- a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart +++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart @@ -22,7 +22,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:geolocator/geolocator.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; -import 'package:google_maps_place_picker_mb/google_maps_place_picker.dart'; +import 'package:google_maps_place_picker_mb_v2/google_maps_place_picker.dart'; import 'location_page.dart'; diff --git a/lib/pages/DrawerPages/notifications/notifications_page.dart b/lib/pages/DrawerPages/notifications/notifications_page.dart index b5373131..c5b6e1d4 100644 --- a/lib/pages/DrawerPages/notifications/notifications_page.dart +++ b/lib/pages/DrawerPages/notifications/notifications_page.dart @@ -118,7 +118,7 @@ class NotificationsPage extends StatelessWidget { ), if (model.notifications[index].messageType == "image") Icon( - FontAwesomeIcons.image, + FontAwesomeIcons.image.data, color: Color(0xffC9C9C9), ) ], diff --git a/lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart b/lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart index 50df1033..a4679b59 100644 --- a/lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart +++ b/lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart @@ -50,7 +50,7 @@ class RRTLogListItemState extends State { _color = Color(0xff359846); } else if (status == 4 || status == 6 || status == 7) { //cancel // Rejected - _color = Color(0xffD02127); + _color = Color(0xFF14384B); } return BaseView( onModelReady: (vm) => { @@ -155,7 +155,7 @@ class RRTLogListItemState extends State { child: Container( padding: EdgeInsets.symmetric(vertical: 8, horizontal: 14), decoration: BoxDecoration( - color: Color(0xffD02127), + color: Color(0xFF14384B), border: Border.all(color: Colors.white, width: 1), borderRadius: BorderRadius.circular(10), ), diff --git a/lib/pages/feedback/send_feedback_page.dart b/lib/pages/feedback/send_feedback_page.dart index 595f6cd6..b2bcce49 100644 --- a/lib/pages/feedback/send_feedback_page.dart +++ b/lib/pages/feedback/send_feedback_page.dart @@ -282,7 +282,7 @@ class _SendFeedbackPageState extends State { Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Icon(FontAwesomeIcons.paperclip), + Icon(FontAwesomeIcons.paperclip.data), SizedBox( width: 8, ), @@ -298,7 +298,7 @@ class _SendFeedbackPageState extends State { }); }, child: Icon( - FontAwesomeIcons.trashAlt, + FontAwesomeIcons.trashAlt.data, color: Colors.red[300], )) ], diff --git a/lib/pages/login/forgot-password.dart b/lib/pages/login/forgot-password.dart index 529d0b8f..f3ab307a 100644 --- a/lib/pages/login/forgot-password.dart +++ b/lib/pages/login/forgot-password.dart @@ -86,20 +86,19 @@ class _ForgotPassword extends State { }); }), const SizedBox(height: 12.0), - CloudFlareTurnstile( + CloudflareTurnstile( siteKey: '0x4AAAAAAAkmbvEy63pcxBBt', baseUrl: BASE_URL, options: _options, controller: _controller, - onTokenRecived: (token) { + onTokenReceived: (token) { setState(() { print("Cloudflare token: $token"); _token = token; }); }, onTokenExpired: () {}, - mode: TurnstileMode.managed, - errorBuilder: (context, error) { + onError: (error) { return Text(error.message); }, ), diff --git a/lib/pages/medical/my_trackers/widget/CurvedChartBloodPressure.dart b/lib/pages/medical/my_trackers/widget/CurvedChartBloodPressure.dart index 5f093eb7..609c645a 100644 --- a/lib/pages/medical/my_trackers/widget/CurvedChartBloodPressure.dart +++ b/lib/pages/medical/my_trackers/widget/CurvedChartBloodPressure.dart @@ -112,7 +112,7 @@ class CurvedChartBloodPressure extends StatelessWidget { return LineChartData( lineTouchData: LineTouchData( touchTooltipData: LineTouchTooltipData( - tooltipBgColor: Colors.white, + getTooltipColor: (tooltip)=>Colors.white, ), touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, handleBuiltInTouches: true, diff --git a/lib/pages/medical/my_trackers/widget/LineChartCurved.dart b/lib/pages/medical/my_trackers/widget/LineChartCurved.dart index 882cf034..ad6f5a5a 100644 --- a/lib/pages/medical/my_trackers/widget/LineChartCurved.dart +++ b/lib/pages/medical/my_trackers/widget/LineChartCurved.dart @@ -161,7 +161,7 @@ class LineChartCurved extends StatelessWidget { return LineChartData( lineTouchData: LineTouchData( touchTooltipData: LineTouchTooltipData( - tooltipBgColor: Colors.white, + getTooltipColor: (tooltip)=>Colors.white, ), touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, handleBuiltInTouches: true, diff --git a/lib/pages/medical/my_trackers/widget/MonthCurvedChartBloodPressure.dart b/lib/pages/medical/my_trackers/widget/MonthCurvedChartBloodPressure.dart index 54228d1e..1b1066c5 100644 --- a/lib/pages/medical/my_trackers/widget/MonthCurvedChartBloodPressure.dart +++ b/lib/pages/medical/my_trackers/widget/MonthCurvedChartBloodPressure.dart @@ -111,7 +111,7 @@ class MonthCurvedChartBloodPressure extends StatelessWidget { return LineChartData( lineTouchData: LineTouchData( touchTooltipData: LineTouchTooltipData( - tooltipBgColor: Colors.white, + getTooltipColor: (tooltip)=>Colors.white, ), touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, handleBuiltInTouches: true, diff --git a/lib/pages/medical/my_trackers/widget/MonthLineChartCurved.dart b/lib/pages/medical/my_trackers/widget/MonthLineChartCurved.dart index 9a6616f9..900f9e65 100644 --- a/lib/pages/medical/my_trackers/widget/MonthLineChartCurved.dart +++ b/lib/pages/medical/my_trackers/widget/MonthLineChartCurved.dart @@ -85,7 +85,7 @@ class MonthLineChartCurved extends StatelessWidget { return LineChartData( lineTouchData: LineTouchData( touchTooltipData: LineTouchTooltipData( - tooltipBgColor: Colors.white, + getTooltipColor: (tooltip)=>Colors.white, ), touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, handleBuiltInTouches: true, diff --git a/lib/pages/medical/vital_sign/LineChartCurved.dart b/lib/pages/medical/vital_sign/LineChartCurved.dart index e86f31bf..5b8944af 100644 --- a/lib/pages/medical/vital_sign/LineChartCurved.dart +++ b/lib/pages/medical/vital_sign/LineChartCurved.dart @@ -99,7 +99,7 @@ class LineChartCurved extends StatelessWidget { return LineChartData( lineTouchData: LineTouchData( touchTooltipData: LineTouchTooltipData( - tooltipBgColor: Colors.white, + getTooltipColor: (tooltip)=>Colors.white, ), touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, handleBuiltInTouches: true, diff --git a/lib/pages/medical/vital_sign/LineChartCurvedBloodPressure.dart b/lib/pages/medical/vital_sign/LineChartCurvedBloodPressure.dart index 7bcf8977..2e1dcaa0 100644 --- a/lib/pages/medical/vital_sign/LineChartCurvedBloodPressure.dart +++ b/lib/pages/medical/vital_sign/LineChartCurvedBloodPressure.dart @@ -140,7 +140,7 @@ class LineChartCurvedBloodPressure extends StatelessWidget { return LineChartData( lineTouchData: LineTouchData( touchTooltipData: LineTouchTooltipData( - tooltipBgColor: Colors.white, + getTooltipColor: (tooltip)=>Colors.white, ), touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, handleBuiltInTouches: true, diff --git a/lib/pages/pharmacies/compare.dart b/lib/pages/pharmacies/compare.dart index f4f3e98d..c8e74823 100644 --- a/lib/pages/pharmacies/compare.dart +++ b/lib/pages/pharmacies/compare.dart @@ -128,7 +128,7 @@ class _slideDetailState extends State { child: Align( alignment: Alignment.topRight, child: IconButton( - icon: Icon(FontAwesomeIcons.trashAlt, size: 15), + icon: Icon(FontAwesomeIcons.trashAlt.data, size: 15), onPressed: () { setState(() { Provider.of(context, listen: false).deleteItem(widget.data[index].id); diff --git a/lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart b/lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart index afb2cd3a..4ce90461 100644 --- a/lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart +++ b/lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart @@ -125,7 +125,7 @@ class ProductAppBar extends StatelessWidget implements PreferredSizeWidget { width: 10, ), IconWithBg( - icon: FontAwesomeIcons.ellipsisV, + icon: FontAwesomeIcons.ellipsisV.data, color: Color(0xFF2B353E), onPress: () { settingModalBottomSheet(context); diff --git a/lib/pages/pharmacies/widgets/ProductOrderItem.dart b/lib/pages/pharmacies/widgets/ProductOrderItem.dart index 6a22cc84..d7985c4b 100644 --- a/lib/pages/pharmacies/widgets/ProductOrderItem.dart +++ b/lib/pages/pharmacies/widgets/ProductOrderItem.dart @@ -44,7 +44,7 @@ class _ProductOrderItemState extends State { leading: InkWell( onTap: () => {widget.deleteCartItems!()}, child: Icon( - FontAwesomeIcons.trashAlt, + FontAwesomeIcons.trashAlt.data, size: 15, color: Colors.grey.shade700, ), diff --git a/lib/pages/videocall-webrtc-rnd/js_wrapper/multistreammixer-wrapper.dart b/lib/pages/videocall-webrtc-rnd/js_wrapper/multistreammixer-wrapper.dart index b21a345d..a086f80c 100644 --- a/lib/pages/videocall-webrtc-rnd/js_wrapper/multistreammixer-wrapper.dart +++ b/lib/pages/videocall-webrtc-rnd/js_wrapper/multistreammixer-wrapper.dart @@ -1,6 +1,7 @@ @JS() library streammixer.js; -import 'package:js/js.dart'; +import 'dart:js_interop'; + @JS('multiStreamsMixerFlutter') diff --git a/lib/services/permission/permission_service.dart b/lib/services/permission/permission_service.dart index cc73c303..274f394e 100644 --- a/lib/services/permission/permission_service.dart +++ b/lib/services/permission/permission_service.dart @@ -7,7 +7,7 @@ import 'package:permission_handler/permission_handler.dart'; import 'package:geolocator/geolocator.dart' as geo; class PermissionService extends BaseService { - final LocalStorage storage = new LocalStorage("permission"); + final LocalStorage storage = localStorage; geo.LocationPermission? locationPermission; AppGlobal appGlobal = new AppGlobal(); diff --git a/lib/splashPage.dart b/lib/splashPage.dart index 3d9b2927..7fcd5e24 100644 --- a/lib/splashPage.dart +++ b/lib/splashPage.dart @@ -18,6 +18,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_zoom_videosdk/native/zoom_videosdk.dart'; +import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:provider/provider.dart'; import 'core/service/AuthenticatedUserObject.dart'; diff --git a/lib/theme/colors.dart b/lib/theme/colors.dart index a9d4e437..e3ed7dd6 100644 --- a/lib/theme/colors.dart +++ b/lib/theme/colors.dart @@ -10,7 +10,7 @@ class CustomColors { static const Color darkGrey = Color(0xFF222222); static const Color black = Color(0xFF141414); static const Color white = Color(0xFFFFFFFF); - static const Color accentColor = Color(0xFFD02127); + static const Color accentColor = Color(0xFF14384B); static const Color lightGreyColor = Color(0xFFE2E2E2); static const Color devider = Color(0xFFE5E5E5); static const Color darkGreyColor = Color(0xFFC9C9C9); diff --git a/lib/theme/theme_value.dart b/lib/theme/theme_value.dart index 4fd06d9c..beba8bf0 100644 --- a/lib/theme/theme_value.dart +++ b/lib/theme/theme_value.dart @@ -120,7 +120,7 @@ bwThemes({fontName}) { // subtitle1: TextStyle(color: Colors.red[900]), ), - tabBarTheme: TabBarTheme(labelColor: Colors.red[900]), + tabBarTheme: TabBarThemeData(labelColor: Colors.red[900]), disabledColor: Colors.grey[800], // errorColor: Color.fromRGBO(235, 80, 60, 1.0), diff --git a/lib/uitl/LocalNotification.dart b/lib/uitl/LocalNotification.dart index aba01f85..4680a591 100644 --- a/lib/uitl/LocalNotification.dart +++ b/lib/uitl/LocalNotification.dart @@ -32,7 +32,7 @@ class LocalNotification { var initializationSettingsIOS = DarwinInitializationSettings(); var initializationSettings = InitializationSettings(android: initializationSettingsAndroid, iOS: initializationSettingsIOS); await flutterLocalNotificationsPlugin.initialize( - initializationSettings, + settings: initializationSettings, onDidReceiveNotificationResponse: (NotificationResponse notificationResponse) { switch (notificationResponse.notificationResponseType) { case NotificationResponseType.selectedNotification: @@ -112,7 +112,7 @@ class LocalNotification { ); var iOSPlatformChannelSpecifics = DarwinNotificationDetails(); var platformChannelSpecifics = NotificationDetails(android: androidPlatformChannelSpecifics, iOS: iOSPlatformChannelSpecifics); - await flutterLocalNotificationsPlugin.show(25613, title, subtitle, platformChannelSpecifics, payload: payload).catchError((err) { + await flutterLocalNotificationsPlugin.show(id:25613, title:title, body:subtitle, notificationDetails:platformChannelSpecifics, payload: payload).catchError((err) { print(err); }); }); @@ -182,7 +182,7 @@ class LocalNotification { } Future cancelNotification() async { - await flutterLocalNotificationsPlugin.cancel(0); + await flutterLocalNotificationsPlugin.cancel(id:0); } Future cancelAllNotifications() async { diff --git a/lib/uitl/app_toast.dart b/lib/uitl/app_toast.dart index bbeebe5d..3e1f08b5 100644 --- a/lib/uitl/app_toast.dart +++ b/lib/uitl/app_toast.dart @@ -70,7 +70,7 @@ class AppToast { child: toast, gravity: ToastGravity.TOP, toastDuration: Duration(seconds: timeInSeconds), - positionedToastBuilder: (context, child) { + positionedToastBuilder: (context, child,_) { return Positioned(top: 50, left: 10, right: 10, child: child); }); // Fluttertoast.showToast(msg: message, toastLength: toastLength, gravity: toastGravity, timeInSecForIosWeb: timeInSeconds, backgroundColor: Colors.red, textColor: textColor, fontSize: fontSize); diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart index 77059a65..699b75b5 100644 --- a/lib/uitl/utils.dart +++ b/lib/uitl/utils.dart @@ -105,8 +105,8 @@ class Utils { static Future checkConnection({bool bypassConnectionCheck = false}) async { if (bypassConnectionCheck) return true; //return true; - ConnectivityResult connectivityResult = await (Connectivity().checkConnectivity()); - if ((connectivityResult == ConnectivityResult.mobile) || (connectivityResult == ConnectivityResult.wifi)) { + List connectivityResult = await (Connectivity().checkConnectivity()); + if ((connectivityResult.contains(ConnectivityResult.mobile) ) || (connectivityResult.contains(ConnectivityResult.wifi))) { return true; } else { return false; diff --git a/lib/widgets/Loader/gif_loader_container.dart b/lib/widgets/Loader/gif_loader_container.dart index ccc986c7..f48e9778 100644 --- a/lib/widgets/Loader/gif_loader_container.dart +++ b/lib/widgets/Loader/gif_loader_container.dart @@ -19,7 +19,7 @@ class _GifLoaderContainerState extends State with TickerProv WidgetsBinding.instance.addPostFrameCallback((_) { try { - controller = GifController(autoPlay: true, onFinish: () {}, loop: true); + controller = GifController()..init(autoPlay: true, onFinish: () {}, loop: true); // controller.repeat(min: 0, max: 11, period: Duration(milliseconds: 750), reverse: true); } catch (ex) {} }); diff --git a/lib/widgets/buttons/defaultButton.dart b/lib/widgets/buttons/defaultButton.dart index 4b2b50fb..4653785a 100644 --- a/lib/widgets/buttons/defaultButton.dart +++ b/lib/widgets/buttons/defaultButton.dart @@ -64,14 +64,14 @@ class DefaultButton extends StatelessWidget { child: Text( "$count", textAlign: TextAlign.center, - style: TextStyle(fontSize: 12, fontWeight: FontWeight.w700, color: Color(0xffD02127), letterSpacing: -0.6), + style: TextStyle(fontSize: 12, fontWeight: FontWeight.w700, color: Color(0xFF14384B), letterSpacing: -0.6), ), ), ) ], ), style: TextButton.styleFrom( - backgroundColor: color ?? const Color(0xffD02127), + backgroundColor: color ?? const Color(0xFF14384B), disabledForegroundColor: disabledColor, disabledBackgroundColor: disabledColor, shape: RoundedRectangleBorder( diff --git a/lib/widgets/charts/show_chart.dart b/lib/widgets/charts/show_chart.dart index e07dfeee..729c21b5 100644 --- a/lib/widgets/charts/show_chart.dart +++ b/lib/widgets/charts/show_chart.dart @@ -101,7 +101,7 @@ class ShowChart extends StatelessWidget { return LineChartData( lineTouchData: LineTouchData( touchTooltipData: LineTouchTooltipData( - tooltipBgColor: Colors.white, + getTooltipColor:(touchedSpot) => Colors.white, ), touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, handleBuiltInTouches: true, diff --git a/lib/widgets/data_display/medical/LabResult/LineChartCurved.dart b/lib/widgets/data_display/medical/LabResult/LineChartCurved.dart index 8d7ebda5..8457761b 100644 --- a/lib/widgets/data_display/medical/LabResult/LineChartCurved.dart +++ b/lib/widgets/data_display/medical/LabResult/LineChartCurved.dart @@ -74,7 +74,7 @@ class LineChartCurvedState extends State { return LineChartData( lineTouchData: LineTouchData( touchTooltipData: LineTouchTooltipData( - tooltipBgColor: Colors.white, + getTooltipColor:(tooltip)=> Colors.white, ), touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, handleBuiltInTouches: true, @@ -219,7 +219,7 @@ class LineChartCurvedState extends State { spots: spots, isCurved: true, //preventCurveOverShooting : true, - color: Color(0xffD02127), + color: Color(0xFF14384B), barWidth: 1.5, isStrokeCapRound: true, dotData: FlDotData( diff --git a/lib/widgets/data_display/medical/doctor_card.dart b/lib/widgets/data_display/medical/doctor_card.dart index efa489f2..bcc75e32 100644 --- a/lib/widgets/data_display/medical/doctor_card.dart +++ b/lib/widgets/data_display/medical/doctor_card.dart @@ -102,7 +102,7 @@ class DoctorCard extends StatelessWidget { : isLiveCareAppointment != null && isLiveCareAppointment == true ? Color(0xff2E303A) : isInOutPatient != null && isInOutPatient == false - ? Color(0xffD02127) + ? Color(0xFF14384B) : Color(0xffa9a089), borderRadius: BorderRadius.only( topLeft: projectViewModel!.isArabic ? Radius.circular(0) : Radius.circular(10), @@ -238,7 +238,7 @@ class DoctorCard extends StatelessWidget { return time != null ? Text( "${time.days ?? 0}:${time.hours ?? 0}:${time.min}:${time.sec}", - style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xffD02127), letterSpacing: -0.48, height: 18 / 12), + style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xFF14384B), letterSpacing: -0.48, height: 18 / 12), ) : Container(); }, @@ -330,7 +330,7 @@ class DoctorCard extends StatelessWidget { } else if (sickLeaveStatus == 2) { statusColor = Color(0xff359846); } else if (sickLeaveStatus == 3) { - statusColor = Color(0xffD02127); + statusColor = Color(0xFF14384B); } else { statusColor = Colors.white; } diff --git a/lib/widgets/habib_logo_widget.dart b/lib/widgets/habib_logo_widget.dart index 84aaa076..ce1b2584 100644 --- a/lib/widgets/habib_logo_widget.dart +++ b/lib/widgets/habib_logo_widget.dart @@ -30,7 +30,7 @@ class HabibLogoWidget extends StatelessWidget { ), Text( TranslationBase.of(context).patientApp, - style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xffD02127), letterSpacing: -0.72), + style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xFF14384B), letterSpacing: -0.72), ), SizedBox(height: 2), ], diff --git a/lib/widgets/new_design/my_tab_view.dart b/lib/widgets/new_design/my_tab_view.dart index 911f8da8..926ace9d 100644 --- a/lib/widgets/new_design/my_tab_view.dart +++ b/lib/widgets/new_design/my_tab_view.dart @@ -36,7 +36,7 @@ class MyTabView extends StatelessWidget { Container( margin: EdgeInsets.only(top: 13), height: 3, - color: value == groupValue ? Color(0xffD02127) : Colors.transparent, + color: value == groupValue ? Color(0xFF14384B) : Colors.transparent, ) ], ), diff --git a/lib/widgets/others/app_expandable_notifier.dart b/lib/widgets/others/app_expandable_notifier.dart index a1d9393e..4e3c9edd 100644 --- a/lib/widgets/others/app_expandable_notifier.dart +++ b/lib/widgets/others/app_expandable_notifier.dart @@ -219,7 +219,7 @@ class _AppExpandableNotifier extends State { FontWeight.w700, color: widget.isHMC ? Color(0xFF40ACC9) - : Color(0xFFD02127), + : Color(0xFF14384B), letterSpacing: -1.44, height: 25 / 24), ), diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index 1103b31b..4708fd84 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -535,7 +535,7 @@ class AppBarWidgetState extends State { : Container(), if (widget.showHomeAppBarIcon!) IconButton( - icon: Icon(FontAwesomeIcons.home), + icon: Icon(FontAwesomeIcons.home.data), color: Colors.white, onPressed: () { Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (context) => LandingPage()), (Route r) => false); diff --git a/lib/widgets/others/not_auh_page.dart b/lib/widgets/others/not_auh_page.dart index 6389ba00..9059ad44 100644 --- a/lib/widgets/others/not_auh_page.dart +++ b/lib/widgets/others/not_auh_page.dart @@ -114,7 +114,7 @@ class _NotAutPageState extends State { style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white, letterSpacing: -0.48), ), style: TextButton.styleFrom( - backgroundColor: Color(0xffD02127), + backgroundColor: Color(0xFF14384B), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(6), ), diff --git a/lib/widgets/otp/sms-popup.dart b/lib/widgets/otp/sms-popup.dart index 66bdb936..5a9c4a3c 100644 --- a/lib/widgets/otp/sms-popup.dart +++ b/lib/widgets/otp/sms-popup.dart @@ -175,7 +175,7 @@ class SMSOTP { children: [ TextSpan( text: displayTime, - style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xffD02127), letterSpacing: -0.48), + style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xFF14384B), letterSpacing: -0.48), ), ], ), diff --git a/lib/widgets/pharmacy/product_tile.dart b/lib/widgets/pharmacy/product_tile.dart index e6b6f350..5dbceb61 100644 --- a/lib/widgets/pharmacy/product_tile.dart +++ b/lib/widgets/pharmacy/product_tile.dart @@ -177,7 +177,7 @@ class productTile extends StatelessWidget { child: Column( children: [ IconButton( - icon: Icon(FontAwesomeIcons.trashAlt, size: 15), + icon: Icon(FontAwesomeIcons.trashAlt.data, size: 15), onPressed: () { GifLoaderDialogUtils.showMyDialog(context); // deleteFromWishlistFunction(productID); diff --git a/lib/widgets/pickupLocation/PickupLocationFromMap.dart b/lib/widgets/pickupLocation/PickupLocationFromMap.dart index 2f2276ae..5777c934 100644 --- a/lib/widgets/pickupLocation/PickupLocationFromMap.dart +++ b/lib/widgets/pickupLocation/PickupLocationFromMap.dart @@ -14,7 +14,7 @@ import 'package:flutter/material.dart'; import 'package:geocoding/geocoding.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart' as googleMap; import 'package:google_maps_flutter/google_maps_flutter.dart'; -import 'package:google_maps_place_picker_mb/google_maps_place_picker.dart'; +import 'package:google_maps_place_picker_mb_v2/google_maps_place_picker.dart'; import 'package:huawei_hmsavailability/huawei_hmsavailability.dart'; import 'package:provider/provider.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index dc3da8dc..ce5bcc48 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,201 +1,157 @@ name: diplomaticquarterapp description: A new Flutter application. -version: 4.6.014+1 +#version: 4.6.030+1 +version: 4.6.0984+40500984 environment: - sdk: ">=3.0.0 <3.13.0" + # sdk: ">=3.0.0 <3.13.0" + sdk: ">=3.6.0 <4.0.0" dependencies: flutter: sdk: flutter + # Localizations flutter_localizations: sdk: flutter - # intl: ^0.18.1 - intl: ^0.19.0 - # webview_flutter: ^2.0.4 webview_flutter: ^4.8.0 - - # http client - http: ^0.13.4 - #connectivity: ^3.0.6 - connectivity_plus: ^5.0.1 + app_links: ^6.4.0 + http: ^1.4.0 + connectivity_plus: 6.1.0 async: ^2.8.1 - audio_wave: ^0.1.4 - # audio_session: ^0.1.13 - # State Management provider: ^6.0.5 #Dependency Injection - get_it: ^7.2.0 - - #Google Fit & Apple HealthKit - # health: ^3.0.3 - health: ^11.1.0 - # pedometer: ^4.0.2 - - #chart - fl_chart: ^0.64.0 - - - #Camera Preview - camera: ^0.10.1 - - # Permissions - permission_handler: ^11.1.0 - - # Flutter Html View + get_it: ^8.0.3 + health: ^13.1.1 + fl_chart: ^1.0.0 + camera: ^0.11.2 + permission_handler: ^12.0.0+1 flutter_html: ^3.0.0-beta.2 - - flutter_widget_from_html: ^0.15.3 - + flutter_widget_from_html: ^0.17.0 # Pagnation pull_to_refresh: ^2.0.0 - - # Native local_auth: ^2.1.7 - localstorage: ^4.0.0+1 - maps_launcher: ^2.0.1 - # url_launcher: ^6.0.15 + localstorage: ^6.0.0 + maps_launcher: ^3.0.0+1 url_launcher: ^6.3.1 url_launcher_ios: ^6.3.2 - shared_preferences: ^2.0.0 - # flutter_flexible_toast: ^0.1.4 - fluttertoast: ^8.0.8 - firebase_messaging: 14.1.0 - firebase_analytics: ^10.0.5 - # Progress bar + shared_preferences: ^2.5.3 + # fluttertoast: ^8.0.8 + fluttertoast: ^8.2.12 + flutter_progress_hud: ^2.0.2 percent_indicator: ^4.2.3 # Icons font_awesome_flutter: any cupertino_icons: ^1.0.0 - - # Image Attachments - image_picker: ^1.0.4 - - #GIF image - # flutter_gifimage: ^1.0.1 - #flutter_gif: any + image_picker: ^1.1.2 photo_view: any - gif_view: ^0.3.1 - # flutter_webrtc: any - - # UI Reqs + gif_view: ^1.0.3 expandable: ^5.0.1 - - # charts flutter_charts: ^0.5.2 - google_maps_flutter: ^2.1.1 - - # Huawei - huawei_map: ^6.11.0+304 - huawei_push: ^6.5.0+300 - - # Qr code Scanner TODO fix it - location: ^5.0.3 - barcode_scan2: 4.3.2 - - # Rating Stars + google_maps_flutter: ^2.12.3 + # huawei_map: ^6.11.2+304 + huawei_map: + git: + url: https://github.com/fleoparra/hms-flutter-plugin.git + path: flutter-hms-map + huawei_push: + git: + url: https://github.com/crasowas/hms-flutter-plugin.git + path: flutter-hms-push + # huawei_push: ^6.12.0+303 + # hijri_gregorian_calendar: + # path: /Users/aamir/StudioProjects/hijri_gregorian_calendar + hijri_gregorian_calendar: ^0.0.3 + + # Qr code Scanner + location: ^8.0.1 + barcode_scan2: ^4.5.1 flutter_rating_bar: ^4.0.1 - - # Calendar - # syncfusion_flutter_calendar: ^23.1.42 - syncfusion_flutter_calendar: ^24.1.47 + syncfusion_flutter_calendar: ^29.2.11+1 + # timezone: 0.10.1 # SVG Images flutter_svg: ^2.0.8 - - #Calendar Events manage_calendar_events: 2.0.3 - - #InAppBrowser + # icalendar_plus: ^0.0.6 flutter_inappwebview: ^6.1.5 - - #Circular progress bar for reverse timer circular_countdown_timer: ^0.2.0 - - #Just Audio to play ringing for incoming video call - just_audio: ^0.9.30 - - #hijri + just_audio: ^0.10.4 hijri: ^3.0.0 - - #datetime_picker flutter_datetime_picker_plus: ^2.1.0 carousel_pro_nullsafety: ^2.0.0 flutter_local_notifications: any device_calendar: ^4.3.3 - geolocator: ^9.0.2 - geocoding: ^2.0.1 + geolocator: ^14.0.2 + geolocator_android: ^5.0.2 + geocoding: ^4.0.0 jiffy: ^6.2.1 #Flutter WebRTC - #flutter_webrtc: ^0.9.7 - screen_brightness: ^0.2.2+1 - google_maps_place_picker_mb: ^3.0.0 + screen_brightness: ^2.1.5 map_launcher: ^3.0.1 flutter_countdown_timer: ^4.1.0 carousel_slider: ^5.0.0 #Dependencies for video call implementation - native_device_orientation: ^1.0.0 + native_device_orientation: ^2.0.3 # wakelock: ^0.6.2 - wakelock_plus: ^1.1.4 + wakelock_plus: ^1.3.2 after_layout: ^1.1.0 - cached_network_image: ^3.3.0 - flutter_tts: ^3.6.1 - # vibration: ^1.7.3 - flutter_nfc_kit: ^3.3.1 - #geofencing: any - speech_to_text: ^6.1.1 + cached_network_image: ^3.4.1 + flutter_tts: ^4.2.3 + flutter_nfc_kit: ^3.6.0 + #geofencing: any + speech_to_text: ^7.2.0 in_app_update: ^4.2.2 - - in_app_review: ^2.0.3 - + in_app_review: ^2.0.10 badges: ^3.1.2 - # flutter_app_icon_badge: ^2.0.0 - # dropdown_search: 5.0.6 youtube_player_flutter: ^9.1.0 # shimmer: ^3.0.0 - # carousel_slider: ^4.0.0 - # flutter_staggered_grid_view: ^0.7.0 huawei_hmsavailability: ^6.11.0+301 huawei_location: ^6.11.0+301 - share_plus: ^10.0.2 - # Marker Animation + share_plus: ^11.0.0 auto_size_text: ^3.0.0 equatable: ^2.0.3 wave: ^0.2.0 - sms_otp_auto_verify: ^2.1.0 - # flutter_ios_voip_kit: ^0.1.0 - google_api_availability: ^4.0.0 - open_filex: ^4.3.2 + sms_otp_auto_verify: ^2.2.0 + google_api_availability: ^5.0.1 + open_filex: ^4.7.0 path_provider: ^2.0.8 - amazon_payfort: ^1.1.3 + amazon_payfort: ^1.1.4 logger: ^2.0.2+1 network_info_plus: any flutter_zoom_videosdk: 1.12.10 - dart_jsonwebtoken: ^2.14.0 + dart_jsonwebtoken: ^3.2.0 win32: ^5.5.4 - - firebase_crashlytics: ^3.0.0 - - cloudflare_turnstile: ^2.0.1 - app_links: ^6.4.0 - device_info_plus: ^10.1.2 -# app_links: ^6.4.0 -# vital_sign_camera: -# path: ./packages/vital_sign_camera + firebase_crashlytics: ^4.3.8 + firebase_messaging: ^15.2.8 + firebase_analytics: ^11.5.1 + cloudflare_turnstile: ^3.2.0 + device_info_plus: ^11.5.0 + lottie: ^3.3.1 + google_fonts: ^6.2.1 + + google_maps_place_picker_mb_v2: ^1.0.1 + # vital_sign_camera: + # path: ./packages/vital_sign_camera + readmore: ^3.0.0 dependency_overrides: + intl: ^0.20.2 + flutter_plugin_android_lifecycle: 2.0.27 + image_picker_android: 0.8.12+22 + video_player_android: 2.8.10 + timezone: ^0.10.1 dev_dependencies: flutter_test: @@ -270,9 +226,9 @@ flutter: # - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.eot # - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.otf - asset: assets/fonts/ar/Cairo-Regular/Cairo-Regular.ttf - # - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.woff weight: 400 - + - asset: assets/fonts/ar/Cairo-Regular/Cairo-Regular.ttf + weight: 500 - asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.eot - asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.otf - asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.ttf