diff --git a/android/app/build.gradle b/android/app/build.gradle index 0443558..f607986 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -54,8 +54,8 @@ android { // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdk = 23 targetSdk = flutter.targetSdkVersion - versionCode = 95 - versionName = '1.5.95' + versionCode = 101 + versionName = '1.5.01' multiDexEnabled =true } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 9b28459..d1e44f5 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -33,22 +33,6 @@ android:icon="@mipmap/launcher_icon" android:label="Sefer Driver" android:theme="@style/LaunchTheme"> - - - - - - - - - - - @@ -75,7 +59,6 @@ android:name="com.yalantis.ucrop.UCropActivity" android:screenOrientation="portrait" android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> - @@ -91,7 +74,14 @@ android:exported="false" android:foregroundServiceType="location" /> - + + + + + + + + + + + + + + - + - - - - + + \ No newline at end of file diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 16654b8..31fb492 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -7,9 +7,9 @@ Notifications from Firebase Cloud Messaging - 1749628025888168 + \ No newline at end of file diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index b49c983..14408e4 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -33,7 +33,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 61 + 62 CFBundleSignature ???? CFBundleURLTypes @@ -48,7 +48,7 @@ CFBundleVersion - 4.0.61 + 4.0.62 FirebaseAppDelegateProxyEnabled NO GMSApiKey diff --git a/lib/controller/auth/captin/register_captin_controller.dart b/lib/controller/auth/captin/register_captin_controller.dart index 333a131..1b7dc1d 100644 --- a/lib/controller/auth/captin/register_captin_controller.dart +++ b/lib/controller/auth/captin/register_captin_controller.dart @@ -263,7 +263,7 @@ class RegisterCaptainController extends GetxController { ); // Get.snackbar('', ''); - // await smsEgyptController.sendSmsEgypt(phoneNumber, randomNumber.toString()); + await smsEgyptController.sendSmsEgypt(phoneNumber, randomNumber.toString()); lastOtpSentTime = DateTime.now(); // Update the last OTP sent time isSent = true; diff --git a/lib/controller/auth/facebook_login.dart b/lib/controller/auth/facebook_login.dart index 0741ba4..693b0eb 100644 --- a/lib/controller/auth/facebook_login.dart +++ b/lib/controller/auth/facebook_login.dart @@ -1,30 +1,30 @@ -import 'package:firebase_auth/firebase_auth.dart'; -import 'package:flutter_facebook_auth/flutter_facebook_auth.dart'; +// import 'package:firebase_auth/firebase_auth.dart'; +// import 'package:flutter_facebook_auth/flutter_facebook_auth.dart'; -class FacebookSignIn { - Future signInWithFacebook() async { - final LoginResult result = await FacebookAuth.instance.login(); - if (result.status == LoginStatus.success) { - // Create a credential from the access token - final OAuthCredential credential = - FacebookAuthProvider.credential(result.accessToken!.tokenString); - // Once signed in, return the UserCredential - return await FirebaseAuth.instance.signInWithCredential(credential); - } - return null; - } +// class FacebookSignIn { +// Future signInWithFacebook() async { +// final LoginResult result = await FacebookAuth.instance.login(); +// if (result.status == LoginStatus.success) { +// // Create a credential from the access token +// final OAuthCredential credential = +// FacebookAuthProvider.credential(result.accessToken!.tokenString); +// // Once signed in, return the UserCredential +// return await FirebaseAuth.instance.signInWithCredential(credential); +// } +// return null; +// } - Future signOut() async { - try { - await FacebookAuth.instance.logOut(); - print('Facebook Sign Out Successful'); - } catch (e) { - print('Error during Facebook Sign Out: $e'); - } - } +// Future signOut() async { +// try { +// await FacebookAuth.instance.logOut(); +// print('Facebook Sign Out Successful'); +// } catch (e) { +// print('Error during Facebook Sign Out: $e'); +// } +// } - Future isSignedIn() async { - final accessToken = await FacebookAuth.instance.accessToken; - return accessToken != null; - } -} +// Future isSignedIn() async { +// final accessToken = await FacebookAuth.instance.accessToken; +// return accessToken != null; +// } +// } diff --git a/lib/controller/firebase/local_notification.dart b/lib/controller/firebase/local_notification.dart index b031846..cc4fa69 100644 --- a/lib/controller/firebase/local_notification.dart +++ b/lib/controller/firebase/local_notification.dart @@ -61,7 +61,7 @@ class NotificationController extends GetxController { priority: Priority.high, styleInformation: bigTextStyleInformation, playSound: true, - sound: RawResourceAndroidNotificationSound(tone == '' ? 'ding' : tone), + sound: RawResourceAndroidNotificationSound(tone), // audioAttributesUsage: AudioAttributesUsage.alarm, visibility: NotificationVisibility.public, autoCancel: false, diff --git a/lib/controller/home/captin/map_driver_controller.dart b/lib/controller/home/captin/map_driver_controller.dart index 1c2d624..fbf0754 100644 --- a/lib/controller/home/captin/map_driver_controller.dart +++ b/lib/controller/home/captin/map_driver_controller.dart @@ -328,7 +328,7 @@ class MapDriverController extends GetxController { double _distance = await calculateDistanceBetweenDriverAndPassengerLocation(); - if (_distance < 50) { + if (_distance < 60) { changeRideToBeginToPassenger(); isPassengerInfoWindow = false; isRideStarted = true; @@ -347,6 +347,19 @@ class MapDriverController extends GetxController { 'rideTimeStart': DateTime.now().toString(), 'status': 'Begin', }); + CRUD().post( + link: "${AppLink.seferAlexandriaServer}/rides/update.php", + payload: { + 'id': rideId, + 'rideTimeStart': DateTime.now().toString(), + 'status': 'Begin', + }); + CRUD() + .post(link: "${AppLink.seferGizaServer}/rides/update.php", payload: { + 'id': rideId, + 'rideTimeStart': DateTime.now().toString(), + 'status': 'Begin', + }); FirebaseMessagesController().sendNotificationToAnyWithoutData( 'RideIsBegin', @@ -586,6 +599,23 @@ class MapDriverController extends GetxController { 'status': 'Finished', 'price': totalCost, }); + CRUD().post( + link: "${AppLink.seferGizaServer}/rides/update.php", + payload: { + 'id': rideId, + 'rideTimeFinish': DateTime.now().toString(), + 'status': 'Finished', + 'price': totalCost, + }, + ); + CRUD().post( + link: "${AppLink.seferAlexandriaServer}/rides/update.php", + payload: { + 'id': rideId, + 'rideTimeFinish': DateTime.now().toString(), + 'status': 'Finished', + 'price': totalCost, + }); if (walletChecked == 'true') { paymentToken = await generateTokenPassenger( ((-1) * double.parse(paymentAmount)).toString()); @@ -652,9 +682,11 @@ class MapDriverController extends GetxController { } void cancelCheckRideFromPassenger() async { - var res = await CRUD().get(link: AppLink.getOrderCancelStatus, payload: { - 'order_id': rideId, - }); //.then((value) { + var res = await CRUD().get( + link: "${AppLink.endPoint}/ride/driver_order/getOrderCancelStatus.php", + payload: { + 'order_id': rideId, + }); //.then((value) { var response = jsonDecode(res); canelString = response['data']['status']; update(); @@ -687,6 +719,7 @@ class MapDriverController extends GetxController { DateTime currentTime = DateTime.now(); void rideIsBeginPassengerTimer() async { int durationOfRide = int.parse(durationOfRideValue); + double latePrice = Get.find().latePrice; update(); int infinity = 40000; if (carType == 'Comfort' || @@ -716,60 +749,26 @@ class MapDriverController extends GetxController { endNameLocation.contains('مطار') || endNameLocation.contains('المطار')) { price = carType == 'Comfort' // || carType == 'Free Ride' - ? (i ~/ 60) * Get.find().latePrice + - (price) - - int.parse(duration) * - Get.find().latePrice - - // : carType == 'Speed' - // ? (i ~/ 60) + - // (recentDistanceToDash * - // Get.find().speedPrice) + ? price + ((i ~/ 60) - int.parse(duration)) * latePrice : carType == 'Lady' - ? (i ~/ 60) * Get.find().latePrice + - (price) - - int.parse(duration) * - Get.find().latePrice - // : carType == 'Delivery' - // ? (i ~/ 60) + - // (recentDistanceToDash * - // Get.find().deliveryPrice) + ? price + ((i ~/ 60) - int.parse(duration)) * latePrice : carType == 'RayehGaiComfort' - ? (i ~/ 60) * - Get.find().latePrice + + ? (i ~/ 60) * latePrice + (recentDistanceToDash * Get.find().comfortPrice) - : (i ~/ 60) * - Get.find().latePrice + + : (i ~/ 60) * latePrice + (recentDistanceToDash * Get.find().mashwariPrice); } else if (currentTime.hour >= 21 && currentTime.hour < 0) { price = carType == 'Comfort' // || carType == 'Free Ride' - ? (i ~/ 60) * Get.find().latePrice + - (price) - - int.parse(duration) * - Get.find().latePrice - - // : carType == 'Speed' - // ? (i ~/ 60) + - // (recentDistanceToDash * - // Get.find().speedPrice) + ? price + ((i ~/ 60) - int.parse(duration)) * latePrice : carType == 'Lady' - ? (i ~/ 60) * Get.find().latePrice + - (price) - - int.parse(duration) * - Get.find().latePrice - // : carType == 'Delivery' - // ? (i ~/ 60) + - // (recentDistanceToDash * - // Get.find().deliveryPrice) + ? price + ((i ~/ 60) - int.parse(duration)) * latePrice : carType == 'RayehGaiComfort' - ? (i ~/ 60) * - Get.find().latePrice + + ? (i ~/ 60) * latePrice + (recentDistanceToDash * Get.find().comfortPrice) - : (i ~/ 60) * - Get.find().latePrice + + : (i ~/ 60) * latePrice + (recentDistanceToDash * Get.find().mashwariPrice); } else if (currentTime.hour >= 1 && currentTime.hour < 5) { @@ -779,51 +778,29 @@ class MapDriverController extends GetxController { startNameLocation.contains('ملهى ليلي') || startNameLocation.contains('Night club')) { price = carType == 'Comfort' // || carType == 'Free Ride' - ? (i ~/ 60) * - (Get.find().latePrice + .5) * - 2 + + ? (i ~/ 60) * (latePrice + .5) * 2 + (price) - - int.parse(duration) * - (Get.find().latePrice + .5) * - 2 + int.parse(duration) * (latePrice + .5) * 2 : carType == 'Lady' - ? (i ~/ 60) * - (Get.find().latePrice + .5) * - 2 + + ? (i ~/ 60) * (latePrice + .5) * 2 + (price) - - int.parse(duration) * - (Get.find().latePrice + .5) * - 2 + int.parse(duration) * (latePrice + .5) * 2 : carType == 'RayehGaiComfort' - ? (i ~/ 60) * - (Get.find().latePrice + - .5) * - 2 + - (price) - : (i ~/ 60) * - (Get.find().latePrice + - .5) * - 2 + - (price); + ? (i ~/ 60) * (latePrice + .5) * 2 + (price) + : (i ~/ 60) * (latePrice + .5) * 2 + (price); } price = carType == 'Comfort' // || carType == 'Free Ride' - ? (i ~/ 60) * (Get.find().latePrice + .5) + + ? (i ~/ 60) * (latePrice + .5) + (price) - - int.parse(duration) * - (Get.find().latePrice + .5) + int.parse(duration) * (latePrice + .5) : carType == 'Lady' - ? (i ~/ 60) * - (Get.find().latePrice + .5) + + ? (i ~/ 60) * (latePrice + .5) + (price) - - int.parse(duration) * - (Get.find().latePrice + .5) + int.parse(duration) * (latePrice + .5) : carType == 'RayehGaiComfort' - ? (i ~/ 60) * - (Get.find().latePrice + - .5) + + ? (i ~/ 60) * (latePrice + .5) + (price) - - int.parse(duration) * - (Get.find().latePrice + .5) + int.parse(duration) * (latePrice + .5) : price; } else if (currentTime.hour >= 14 && currentTime.hour <= 17) { price = carType == 'Comfort' // || carType == 'Free Ride' diff --git a/lib/main.dart b/lib/main.dart index da1abe7..352cc25 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -7,7 +7,6 @@ import 'package:SEFER/views/home/Captin/orderCaptin/order_request_page.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_facebook_auth/flutter_facebook_auth.dart'; import 'package:flutter_overlay_window/flutter_overlay_window.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:flutter_stripe/flutter_stripe.dart'; @@ -110,14 +109,7 @@ void main() async { await GetStorage.init(); Stripe.publishableKey = AK.publishableKeyStripe; - // Request location permission - // PermissionStatus status = await Permission.location.request(); - // if (status.isDenied) { - // WidgetsBinding.instance.addPostFrameCallback((_) { - // getPermissionLocation(); - // }); - // return; - // } + PermissionStatus status1 = await Permission.location.status; if (status1.isGranted) { await LocationController().startLocationUpdates(); @@ -130,7 +122,7 @@ void main() async { await FirebaseMessagesController().requestFirebaseMessagingPermission(); FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler); - // NotificationController1().initNotifications(); + NotificationController().initNotifications(); NotificationController().initNotifications(); await Future.wait([ diff --git a/lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart b/lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart index 21e6ced..ea1648a 100644 --- a/lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart +++ b/lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart @@ -177,129 +177,129 @@ GetBuilder leftMainMenuCaptainIcons() { ), ), ), - // AnimatedContainer( - // duration: const Duration(microseconds: 200), - // width: controller.widthMapTypeAndTraffic, - // decoration: BoxDecoration( - // color: AppColor.secondaryColor, - // border: Border.all(color: AppColor.blueColor), - // borderRadius: BorderRadius.circular(15)), - // child: Builder(builder: (context) { - // return IconButton( - // onPressed: () async { - // // Get.to(() => EgyptCardAI()); - // // print(box.read(BoxName.myList)); + AnimatedContainer( + duration: const Duration(microseconds: 200), + width: controller.widthMapTypeAndTraffic, + decoration: BoxDecoration( + color: AppColor.secondaryColor, + border: Border.all(color: AppColor.blueColor), + borderRadius: BorderRadius.circular(15)), + child: Builder(builder: (context) { + return IconButton( + onPressed: () async { + // Get.to(() => EgyptCardAI()); + // print(box.read(BoxName.myList)); - // List d = [ - // "30.003028,31.2419628", - // "30.0955661,31.2665336", - // "160.00", - // "25.92", - // "1488", - // "16.93", - // "114243034311436865474", - // "113172279072358305645", - // "hamza ayed", - // "rlMbi4Hc8L1STMPE99iPKqK4Gddwv8r9qZOCadsz9qTEJZ6KLEE9ruTJI6N8dKfK4CXez5pme5WIs14-1QGo29s07fQOniZgIlJV5XFL3yqzPRSUmn3", - // "+201023248456", - // "1 min", - // "1 m", - // "false", - // "QwUMoyUtZ0J3oR6yXKUavrB_gBl9npUZe-qZtax-Raq4QBbdKv0AmtLKm0BfBd6N_592HBv4CVa41ii4122W3hr-BCUKKzJhzZcK8m0YjbWbtpvgJRD8uD_nuMk9", - // "0", - // "238", - // "false", - // "114243034311436865474", - // "1488", - // "startEnd", - // "30.049307749732176,31.274291574954987", - // "", - // "", - // "", - // "", - // "17.73", - // "0", - // "hamzaayedflutter@gmail.com", - // "الفسطاط، حي مصر القديمة، مصر", - // " الزاوية الحمراء، محافظة القاهرة، مصر", - // "Speed", - // "8", - // "5.00" - // ]; - // FirebaseMessagesController().sendNotificationToDriverMAP( - // 'Order'.tr, - // 'from: ', - // // jsonDecode(value)['message'].toString(), - // 'dUEVBJDPQfKiMuGgDjdyfX:APA91bE3DKYAYs3LIxGmzy55-ojLAZWv0ym4a9Zy9UxdkyRUOgQP8bf1WwU9LJAof0DjfaIxciVYPnue7EdwhujzQe67SImfOF9yI1YgGsKLDH6yo6FsFaAYpsbrSCqlaoRp14lLqymi', - // d, - // 'order.wav'); - // // NotificationController() - // // .showNotification('VIP Order'.tr, '', 'order', ''); - // // try {} catch (e) { - // // print('Error showing overlay: $e'); - // // } - // // final Bubble _bubble = Bubble(showCloseButton: true); - // // try { - // // await _bubble.startBubbleHead(sendAppToBackground: false); - // // } on PlatformException { - // // print('Failed to call startBubbleHead'); - // // } + List d = [ + "30.003028,31.2419628", + "30.0955661,31.2665336", + "160.00", + "25.92", + "1488", + "16.93", + "114243034311436865474", + "113172279072358305645", + "hamza ayed", + "rlMbi4Hc8L1STMPE99iPKqK4Gddwv8r9qZOCadsz9qTEJZ6KLEE9ruTJI6N8dKfK4CXez5pme5WIs14-1QGo29s07fQOniZgIlJV5XFL3yqzPRSUmn3", + "+201023248456", + "1 min", + "1 m", + "false", + "QwUMoyUtZ0J3oR6yXKUavrB_gBl9npUZe-qZtax-Raq4QBbdKv0AmtLKm0BfBd6N_592HBv4CVa41ii4122W3hr-BCUKKzJhzZcK8m0YjbWbtpvgJRD8uD_nuMk9", + "0", + "238", + "false", + "114243034311436865474", + "1488", + "startEnd", + "30.049307749732176,31.274291574954987", + "", + "", + "", + "", + "17.73", + "0", + "hamzaayedflutter@gmail.com", + "الفسطاط، حي مصر القديمة، مصر", + " الزاوية الحمراء، محافظة القاهرة، مصر", + "Speed", + "8", + "5.00" + ]; + FirebaseMessagesController().sendNotificationToDriverMAP( + 'Order'.tr, + 'from: ', + // jsonDecode(value)['message'].toString(), + 'fKBBB4_1R0q18-byySHUeG:APA91bHk2RmjjMt6eKr7KQnqh4CK02yW3H5E8g_beVcQFgiCG50j9KCtSU1O8PtvS_gA5xuJLhaorDV9AeslcyLFJFf302tICKMiKgsDP5pWkF5WXNw0-4NsoD-BnJxf0-Do9Vs1Zbpq', + d, + 'order.wav'); + // NotificationController() + // .showNotification('VIP Order'.tr, '', 'order', ''); + // try {} catch (e) { + // print('Error showing overlay: $e'); + // } + // final Bubble _bubble = Bubble(showCloseButton: true); + // try { + // await _bubble.startBubbleHead(sendAppToBackground: false); + // } on PlatformException { + // print('Failed to call startBubbleHead'); + // } - // // Bubble().startBubbleHead(sendAppToBackground: true); - // // } + // Bubble().startBubbleHead(sendAppToBackground: true); + // } - // // Future stopBubbleHead() async { - // // try { - // // await _bubble.stopBubbleHead(); - // // } on PlatformException { - // // print('Failed to call stopBubbleHead'); - // // } - // // } - // // - // // // // send data to ovelay - // }, - // icon: const Icon( - // FontAwesome5.grin_tears, - // size: 29, - // color: AppColor.blueColor, - // ), - // ); - // }), - // ), - // AnimatedContainer( - // duration: const Duration(microseconds: 200), - // width: controller.widthMapTypeAndTraffic, - // decoration: BoxDecoration( - // color: AppColor.secondaryColor, - // border: Border.all(color: AppColor.blueColor), - // borderRadius: BorderRadius.circular(15)), - // child: Builder(builder: (context) { - // return IconButton( - // onPressed: () async { - // // FirebaseMessagesController().sendNotificationToAnyWithoutData( - // 'Order'.tr, - // 'from: ', - // // jsonDecode(value)['message'].toString(), - // 'dqK5wNrPTr20HQ8qa5KsgL:APA91bHwPW_XzCIxQtg_IkJmHg1JRd8NRMquvsgedBaHAIgErTs6Uzpw1IX0EIJqkTaZq5dxd1u2z7NVdLlvcmEzrpjjWt1pUsZaa5UU7Cpx6hUzJMUdXvhNlAYFGklM8bWUG4ZXSRf1', - // 'order.wav'); - // NotificationController1().showNotification( - // 'sdf'.tr, - // 'We regret to inform you that another driver has accepted this order.' - // .tr, - // '', - // ''); - // requestLocationPermission(); - // Get.to(() => LoginCaptin()); - // print(box.read(BoxName.tokenDriver)); - // }, - // icon: const Icon( - // FontAwesome5.closed_captioning, - // size: 29, - // color: AppColor.blueColor, - // ), - // ); - // }), - // ), + // Future stopBubbleHead() async { + // try { + // await _bubble.stopBubbleHead(); + // } on PlatformException { + // print('Failed to call stopBubbleHead'); + // } + // } + // + // // // send data to ovelay + }, + icon: const Icon( + FontAwesome5.grin_tears, + size: 29, + color: AppColor.blueColor, + ), + ); + }), + ), + AnimatedContainer( + duration: const Duration(microseconds: 200), + width: controller.widthMapTypeAndTraffic, + decoration: BoxDecoration( + color: AppColor.secondaryColor, + border: Border.all(color: AppColor.blueColor), + borderRadius: BorderRadius.circular(15)), + child: Builder(builder: (context) { + return IconButton( + onPressed: () async { + // FirebaseMessagesController().sendNotificationToAnyWithoutData( + // 'Order'.tr, + // 'from: ', + // // jsonDecode(value)['message'].toString(), + // 'fKBBB4_1R0q18-byySHUeG:APA91bHk2RmjjMt6eKr7KQnqh4CK02yW3H5E8g_beVcQFgiCG50j9KCtSU1O8PtvS_gA5xuJLhaorDV9AeslcyLFJFf302tICKMiKgsDP5pWkF5WXNw0-4NsoD-BnJxf0-Do9Vs1Zbpq', + // 'order.wav'); + // NotificationController1().showNotification( + // 'sdf'.tr, + // 'We regret to inform you that another driver has accepted this order.' + // .tr, + // '', + // ''); + // requestLocationPermission(); + Get.to(() => SmsSignupEgypt()); + print(box.read(BoxName.tokenDriver)); + }, + icon: const Icon( + FontAwesome5.closed_captioning, + size: 29, + color: AppColor.blueColor, + ), + ); + }), + ), ], )), ); diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index c935bf0..1a3c0b5 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,7 +7,6 @@ import Foundation import audio_session import device_info_plus -import facebook_auth_desktop import file_selector_macos import firebase_auth import firebase_core @@ -32,7 +31,6 @@ import wakelock_plus func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FacebookAuthDesktopPlugin.register(with: registry.registrar(forPlugin: "FacebookAuthDesktopPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) FLTFirebaseAuthPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAuthPlugin")) FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin")) diff --git a/pubspec.lock b/pubspec.lock index f61820b..022a572 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -409,14 +409,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.5" - facebook_auth_desktop: - dependency: transitive - description: - name: facebook_auth_desktop - sha256: "219d559a33891e937c1913430505eae01fb946cb35729167bbdc747e3ebbd9ff" - url: "https://pub.dev" - source: hosted - version: "2.1.1" fake_async: dependency: transitive description: @@ -582,30 +574,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.8" - flutter_facebook_auth: - dependency: "direct main" - description: - name: flutter_facebook_auth - sha256: faa92fb7626c230837f30d02de7d92b6af334b77ba744867c63545d4ad7e171f - url: "https://pub.dev" - source: hosted - version: "7.1.0" - flutter_facebook_auth_platform_interface: - dependency: transitive - description: - name: flutter_facebook_auth_platform_interface - sha256: e04b8dbfa77702bea45a79993163ad5d20b2c0084109bec591fdc2b9ee505779 - url: "https://pub.dev" - source: hosted - version: "6.1.2" - flutter_facebook_auth_web: - dependency: transitive - description: - name: flutter_facebook_auth_web - sha256: "8a6890a98522604169ca9f958d7189c9f579dbf05ba4d3d7adf26eca4c4c4c93" - url: "https://pub.dev" - source: hosted - version: "6.1.1" flutter_font_icons: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index a7d8a8d..b1b39a9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -85,10 +85,6 @@ dependencies: flutter_contacts: ^1.1.8 flutter_overlay_window: ^0.4.4 googleapis_auth: ^1.6.0 - flutter_facebook_auth: ^7.1.0 - # dash_bubble: ^2.0.0 - # bubble_head: ^0.0.4 - # google_mlkit_face_detection: ^0.11.0 dev_dependencies: flutter_test: