diff --git a/lib/services/firebase_service.dart b/lib/services/firebase_service.dart index 3d8a22e..5e70d57 100644 --- a/lib/services/firebase_service.dart +++ b/lib/services/firebase_service.dart @@ -50,9 +50,20 @@ class FirebaseMessagingServiceImp implements FirebaseMessagingService { // initialise the plugin. app_icon needs to be a added as a drawable resource to the Android head project const AndroidInitializationSettings initializationSettingsAndroid = AndroidInitializationSettings('ic_launcher'); - final DarwinInitializationSettings initializationSettingsDarwin = DarwinInitializationSettings(onDidReceiveLocalNotification: _onDidReceiveLocalNotification); + DarwinInitializationSettings initializationSettingsDarwin = const DarwinInitializationSettings( + requestAlertPermission: true, + requestBadgePermission: true, + requestCriticalPermission: true, + requestProvisionalPermission: true, + requestSoundPermission: true, + defaultPresentAlert: true, + defaultPresentBadge: true, + defaultPresentBanner: true, + defaultPresentList: true, + defaultPresentSound: true, + ); final InitializationSettings initializationSettings = InitializationSettings(android: initializationSettingsAndroid, iOS: initializationSettingsDarwin); - await flutterLocalNotifications.initialize(initializationSettings, onDidReceiveNotificationResponse: (notificationResponse) {}); + await flutterLocalNotifications.initialize(initializationSettings, onDidReceiveNotificationResponse: (notificationResponse) {}, ); RemoteMessage? initialMessage = await FirebaseMessaging.instance.getInitialMessage(); diff --git a/lib/services/payments_service.dart b/lib/services/payments_service.dart index 36f5c91..c10306f 100644 --- a/lib/services/payments_service.dart +++ b/lib/services/payments_service.dart @@ -27,10 +27,12 @@ abstract class PaymentService { class PaymentServiceImp implements PaymentService { MyInAppBrowser? myInAppBrowser; var inAppBrowserOptions = InAppBrowserClassOptions( - inAppWebViewGroupOptions: InAppWebViewGroupOptions(crossPlatform: InAppWebViewOptions(useShouldOverrideUrlLoading: true, transparentBackground: false), ios: IOSInAppWebViewOptions(applePayAPIEnabled: true)), + inAppWebViewGroupOptions: + InAppWebViewGroupOptions(crossPlatform: InAppWebViewOptions(useShouldOverrideUrlLoading: true, transparentBackground: false), ios: IOSInAppWebViewOptions(applePayAPIEnabled: true)), crossPlatform: InAppBrowserOptions(hideUrlBar: true, toolbarTopBackgroundColor: Colors.black), android: AndroidInAppBrowserOptions(), - ios: IOSInAppBrowserOptions(hideToolbarBottom: true, toolbarBottomBackgroundColor: Colors.white, closeButtonColor: Colors.white, presentationStyle: IOSUIModalPresentationStyle.OVER_FULL_SCREEN)); + ios: + IOSInAppBrowserOptions(hideToolbarBottom: true, toolbarBottomBackgroundColor: Colors.white, closeButtonColor: Colors.white, presentationStyle: IOSUIModalPresentationStyle.OVER_FULL_SCREEN)); String getUrlRequestByPaymentId({required int id, List? appointmentIds, required PaymentTypes paymentType}) { String urlRequest = ""; @@ -87,7 +89,8 @@ class PaymentServiceImp implements PaymentService { onBrowserLoadStart(onFailure: onFailure, onSuccess: onSuccess, url: url); }); await myInAppBrowser!.openUrlRequest( - urlRequest: URLRequest(url: Uri.parse(urlRequest)), + // Uri.parse(urlRequest) + urlRequest: URLRequest(url: WebUri(urlRequest)), options: inAppBrowserOptions, ); } diff --git a/pubspec.yaml b/pubspec.yaml index 7f0efeb..264a106 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -13,28 +13,28 @@ dependencies: cupertino_icons: ^1.0.2 path_provider: ^2.0.4 - injector: ^2.0.0 + injector: ^4.0.0 provider: ^6.0.0 easy_localization: ^3.0.3 - http: ^0.13.3 + http: ^1.2.2 permission_handler: ^11.3.1 - flutter_svg: ^1.0.3 - sizer: ^2.0.15 + flutter_svg: ^2.0.14 + sizer: any fluttertoast: ^8.0.8 shared_preferences: ^2.0.6 - file_picker: ^6.1.1 - image_picker: ^0.8.4+4 + file_picker: ^8.0.7 + image_picker: ^1.1.2 equatable: ^2.0.3 - logger: 2.3.0 + logger: ^2.4.0 auto_size_text: any - shimmer: ^2.0.0 + shimmer: ^3.0.0 hexcolor: ^3.0.1 cached_network_image: any url_launcher: ^6.1.14 badges: ^3.0.2 carousel_slider: 5.0.0 dropdown_button2: ^2.0.0 - flutter_inappwebview: ^5.7.2+3 + flutter_inappwebview: ^6.0.0 country_code_picker: ^3.0.0 table_calendar: ^3.0.9 intl: any @@ -49,7 +49,7 @@ dependencies: firebase_messaging: ^15.0.4 firebase_core: ^3.3.0 - flutter_local_notifications: ^17.2.1+2 + flutter_local_notifications: ^18.0.0 # google @@ -69,7 +69,7 @@ dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 + flutter_lints: ^4.0.0 flutter: