diff --git a/.env b/.env index 4d4691d..d3728c0 100644 --- a/.env +++ b/.env @@ -13,4 +13,5 @@ secretKey=zg_cjzc_57I0TCIYNJPlIFQ5ZXkqiZZ28bBULsuMd1Cr5IYztSseaRvf3LdXWT9wwfV94C stripe_publishableKe=vg_cjzc_57I0TCIYNJPlIFQ5ZB5j2x4vQpU5FVYF9f9Vou74a60BJAQvH5QunMMJB8D1TOqsuOlHCeeh7vHqpnkijRkx9UL5g33vb0iNWKIXrXlBl llamaKey=LL-JfdiCXFpcLXNe87cSGQwGE0piZ9Zw179tVjEP1KMxQgVWGxD9Ixz3m8kkKaO5Kdi serverPHP=https://ride.mobile-app.store -Cohere=Qfrhx9d5YVHiy4uEuK4wiFc9kIuFFlvc5A6WVzPK \ No newline at end of file +Cohere=Qfrhx9d5YVHiy4uEuK4wiFc9kIuFFlvc5A6WVzPK +ClaudeAiAPI=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 \ No newline at end of file diff --git a/lib/constant/box_name.dart b/lib/constant/box_name.dart index 50aafdc..256256f 100644 --- a/lib/constant/box_name.dart +++ b/lib/constant/box_name.dart @@ -11,6 +11,9 @@ class BoxName { static const String passengerID = "pasengerID"; static const String phone = "phone"; static const String phoneDriver = "phoneDriver"; + static const String dobDriver = "dobDriver"; + static const String sexDriver = "sexDriver"; + static const String lastNameDriver = "lastNameDriver"; static const String name = "name"; static const String nameDriver = "nameDriver"; static const String email = "email"; @@ -44,4 +47,12 @@ class BoxName { static const String chatGPTkeySefer = 'chatGPTkeySefer'; static const String transactionCloude = 'transactionCloude'; static const String visionApi = 'visionApi'; + static const String vin = "vin"; + static const String make = "make"; + static const String model = "model"; + static const String year = "year"; + static const String expirationDate = "expirationDate"; + static const String color = "color"; + static const String owner = "owner"; + static const String registrationDate = "registrationDate"; } diff --git a/lib/constant/links.dart b/lib/constant/links.dart index 4753ec8..87cb514 100644 --- a/lib/constant/links.dart +++ b/lib/constant/links.dart @@ -1,121 +1,121 @@ import 'package:ride/env/env.dart'; class AppLink { - static const String server = 'https://ride.mobile-app.store'; //Env.serverPHP; - static const String googleMapsLink = 'https://maps.googleapis.com/maps/api/'; - static const String llama = 'https://api.llama-api.com/chat/completions'; + static final String server = Env.serverPHP; //Env.serverPHP; + static String googleMapsLink = 'https://maps.googleapis.com/maps/api/'; + static String llama = 'https://api.llama-api.com/chat/completions'; - static const String test = "$server/test.php"; + static String test = "$server/test.php"; //===============firebase========================== - static const String getTokens = "$server/ride/firebase/get.php"; - static const String addTokens = "$server/ride/firebase/add.php"; - static const String addTokensDriver = "$server/ride/firebase/addDriver.php"; + static String getTokens = "$server/ride/firebase/get.php"; + static String addTokens = "$server/ride/firebase/add.php"; + static String addTokensDriver = "$server/ride/firebase/addDriver.php"; //=======================Wallet=================== - static const String wallet = '$server/ride/passengerWallet/'; - static const String getAllPassengerTransaction = + static String wallet = '$server/ride/passengerWallet/'; + static String getAllPassengerTransaction = "$wallet/getAllPassengerTransaction.php"; - static const String getWalletByPassenger = "$wallet/getWalletByPassenger.php"; - static const String getPassengersWallet = "$wallet/get.php"; - static const String addPassengersWallet = "$wallet/add.php"; - static const String deletePassengersWallet = "$wallet/delete.php"; - static const String updatePassengersWallet = "$wallet/update.php"; + static String getWalletByPassenger = "$wallet/getWalletByPassenger.php"; + static String getPassengersWallet = "$wallet/get.php"; + static String addPassengersWallet = "$wallet/add.php"; + static String deletePassengersWallet = "$wallet/delete.php"; + static String updatePassengersWallet = "$wallet/update.php"; //=======================promo===================ride.mobile-app.store/ride/promo/get.php - static const String promo = '$server/ride/promo'; - static const String getPassengersPromo = "$promo/get.php"; - static const String getPromoBytody = "$promo/getPromoBytody.php"; - static const String addPassengersPromo = "$promo/add.php"; - static const String deletePassengersPromo = "$promo/delete.php"; - static const String updatePassengersPromo = "$promo/update.php"; + static String promo = '$server/ride/promo'; + static String getPassengersPromo = "$promo/get.php"; + static String getPromoBytody = "$promo/getPromoBytody.php"; + static String addPassengersPromo = "$promo/add.php"; + static String deletePassengersPromo = "$promo/delete.php"; + static String updatePassengersPromo = "$promo/update.php"; ////=======================cancelRide=================== - static const String ride = '$server/ride'; - static const String addCancelRideFromPassenger = - "$server/ride/cancelRide/add.php"; - static const String cancelRide = "$server/ride/cancelRide/get.php"; + static String ride = '$server/ride'; + static String addCancelRideFromPassenger = "$server/ride/cancelRide/add.php"; + static String cancelRide = "$server/ride/cancelRide/get.php"; //-----------------ridessss------------------ - static const String addRides = "$ride/rides/add.php"; - static const String getRides = "$ride/rides/get.php"; - static const String getRideStatus = "$ride/rides/getRideStatus.php"; - static const String getRideStatusBegin = "$ride/rides/getRideStatusBegin.php"; - static const String updateRides = "$ride/rides/update.php"; - static const String deleteRides = "$ride/rides/delete.php"; + static String addRides = "$ride/rides/add.php"; + static String getRides = "$ride/rides/get.php"; + static String getRideOrderID = "$ride/rides/getRideOrderID.php"; + static String getRideStatus = "$ride/rides/getRideStatus.php"; + static String getRideStatusBegin = "$ride/rides/getRideStatusBegin.php"; + static String updateRides = "$ride/rides/update.php"; + static String deleteRides = "$ride/rides/delete.php"; //-----------------DriverPayment------------------ - static const String addDriverpayment = "$ride/payment/add.php"; - static const String getDriverpaymentToday = "$ride/payment/get.php"; - static const String getAllPayment = "$ride/payment/getAllPayment.php"; + static String addDriverpayment = "$ride/payment/add.php"; + static String getDriverpaymentToday = "$ride/payment/get.php"; + static String getAllPayment = "$ride/payment/getAllPayment.php"; //-----------------Api Key------------------ - static const String addApiKey = "$ride/apiKey/add.php"; - static const String getApiKey = "$ride/apiKey/get.php"; - static const String updateApiKey = "$ride/apiKey/update.php"; - static const String deleteApiKey = "$ride/apiKey/delete.php"; + static String addApiKey = "$ride/apiKey/add.php"; + static String getApiKey = "$ride/apiKey/get.php"; + static String updateApiKey = "$ride/apiKey/update.php"; + static String deleteApiKey = "$ride/apiKey/delete.php"; //-----------------Feed Back------------------ - static const String addFeedBack = "$ride/feedBack/add.php"; - static const String getFeedBack = "$ride/feedBack/get.php"; - static const String updateFeedBack = "$ride/feedBack/updateFeedBack.php"; + static String addFeedBack = "$ride/feedBack/add.php"; + static String getFeedBack = "$ride/feedBack/get.php"; + static String updateFeedBack = "$ride/feedBack/updateFeedBack.php"; //-----------------license------------------ - static const String addLicense = "$ride/license/add.php"; - static const String getLicense = "$ride/license/get.php"; - static const String updateLicense = "$ride/license/updateFeedBack.php"; + static String addLicense = "$ride/license/add.php"; + static String getLicense = "$ride/license/get.php"; + static String updateLicense = "$ride/license/updateFeedBack.php"; //-----------------RegisrationCar------------------ - static const String addRegisrationCar = "$ride/RegisrationCar/add.php"; - static const String getRegisrationCar = "$ride/RegisrationCar/get.php"; - static const String updateRegisrationCar = + static String addRegisrationCar = "$ride/RegisrationCar/add.php"; + static String getRegisrationCar = "$ride/RegisrationCar/get.php"; + static String updateRegisrationCar = "$ride/RegisrationCar/updateFeedBack.php"; //-----------------DriverOrder------------------ - static const String addDriverOrder = "$ride/driver_order/add.php"; - static const String getDriverOrder = "$ride/driver_order/get.php"; - static const String getOrderCancelStatus = + static String addDriverOrder = "$ride/driver_order/add.php"; + static String getDriverOrder = "$ride/driver_order/get.php"; + static String getOrderCancelStatus = "$ride/driver_order/getOrderCancelStatus.php"; - static const String updateDriverOrder = "$ride/driver_order/update.php"; - static const String deleteDriverOrder = "$ride/driver_order/delete.php"; + static String updateDriverOrder = "$ride/driver_order/update.php"; + static String deleteDriverOrder = "$ride/driver_order/delete.php"; // ===================================== - static const String addRateToPassenger = "$ride/rate/add.php"; - static const String addRateToDriver = "$ride/rate/addRateToDriver.php"; + static String addRateToPassenger = "$ride/rate/add.php"; + static String addRateToDriver = "$ride/rate/addRateToDriver.php"; // =========================================== - static const String pathImage = "$server/upload/types/"; - static const String uploadImage = "$server/uploadImage.php"; - static const String uploadImageType = "$server/uploadImageType.php"; + static String pathImage = "$server/upload/types/"; + static String uploadImage = "$server/uploadImage.php"; + static String uploadImagePortrate = "$server/uploadImagePortrate.php"; + static String uploadImageType = "$server/uploadImageType.php"; //==================certifcate========== - static const String location = '$server/ride/location'; - static const String getCarsLocationByPassenger = "$location/get.php"; - static const String getDriverCarsLocationToPassengerAfterApplied = + static String location = '$server/ride/location'; + static String getCarsLocationByPassenger = "$location/get.php"; + static String getDriverCarsLocationToPassengerAfterApplied = "$location/getDriverCarsLocationToPassengerAfterApplied.php"; - static const String addCarsLocationByPassenger = "$location/add.php"; - static const String deleteCarsLocationByPassenger = "$location/delete.php"; - static const String updateCarsLocationByPassenger = "$location/update.php"; - static const String getTotalDriverDuration = - "$location/getTotalDriverDuration.php"; - static const String getTotalDriverDurationToday = + static String addCarsLocationByPassenger = "$location/add.php"; + static String deleteCarsLocationByPassenger = "$location/delete.php"; + static String updateCarsLocationByPassenger = "$location/update.php"; + static String getTotalDriverDuration = "$location/getTotalDriverDuration.php"; + static String getTotalDriverDurationToday = "$location/getTotalDriverDurationToday.php"; //==================Blog============= - static const String profile = '$server/ride/profile'; - static const String getprofile = "$profile/get.php"; - static const String addprofile = "$profile/add.php"; - static const String deleteprofile = "$profile/delete.php"; - static const String updateprofile = "$profile/update.php"; + static String profile = '$server/ride/profile'; + static String getprofile = "$profile/get.php"; + static String addprofile = "$profile/add.php"; + static String deleteprofile = "$profile/delete.php"; + static String updateprofile = "$profile/update.php"; //===================Auth============ - static const String auth = 'https://ride.mobile-app.store/auth'; - static const String login = "$auth/login.php"; - static const String signUp = "$auth/signup.php"; - static const String sendVerifyEmail = "$auth/sendVerifyEmail.php"; - static const String verifyEmail = "$auth/verifyEmail.php"; + static String auth = 'https://ride.mobile-app.store/auth'; + static String login = "$auth/login.php"; + static String signUp = "$auth/signup.php"; + static String sendVerifyEmail = "$auth/sendVerifyEmail.php"; + static String verifyEmail = "$auth/verifyEmail.php"; //===================Auth Captin============ - static const String authCaptin = 'https://ride.mobile-app.store/auth/captin'; - static const String loginCaptin = "$authCaptin/login.php"; - static const String signUpCaptin = "$authCaptin/register.php"; - static const String sendVerifyEmailCaptin = "$authCaptin/sendVerifyEmail.php"; - static const String verifyEmailCaptin = "$authCaptin/verifyEmail.php"; - static const String removeUser = "$authCaptin/removeAccount.php"; + static String authCaptin = 'https://ride.mobile-app.store/auth/captin'; + static String loginCaptin = "$authCaptin/login.php"; + static String signUpCaptin = "$authCaptin/register.php"; + static String sendVerifyEmailCaptin = "$authCaptin/sendVerifyEmail.php"; + static String verifyEmailCaptin = "$authCaptin/verifyEmail.php"; + static String removeUser = "$authCaptin/removeAccount.php"; } diff --git a/lib/controller/auth/captin/history_captain.dart b/lib/controller/auth/captin/history_captain.dart new file mode 100644 index 0000000..9e1a80a --- /dev/null +++ b/lib/controller/auth/captin/history_captain.dart @@ -0,0 +1,48 @@ +import 'dart:convert'; + +import 'package:get/get.dart'; + +import '../../../constant/box_name.dart'; +import '../../../constant/links.dart'; +import '../../../main.dart'; +import '../../../views/home/Captin/history/history_details_page.dart'; +import '../../functions/crud.dart'; + +class HistoryCaptainController extends GetxController { + bool isloading = false; + Map historyData = {}; + Map historyDetailsData = {}; + late String orderID; + getOrderId(String orderId) { + orderID = orderId; + update(); + } + + getHistory() async { + isloading = true; + var res = await CRUD().get( + link: AppLink.getDriverOrder, + payload: {'driver_id': box.read(BoxName.driverID)}); + historyData = jsonDecode(res); + print(historyData); + isloading = false; + update(); + } + + getHistoryDetails(String orderId) async { + isloading = true; + var res = await CRUD() + .get(link: AppLink.getRideOrderID, payload: {'id': orderId}); + historyDetailsData = jsonDecode(res); + print(historyDetailsData); + isloading = false; + update(); + Get.to(() => HistoryDetailsPage()); + } + + @override + void onInit() { + getHistory(); + super.onInit(); + } +} diff --git a/lib/controller/auth/captin/register_captin_controller.dart b/lib/controller/auth/captin/register_captin_controller.dart index ced9102..5aa8079 100644 --- a/lib/controller/auth/captin/register_captin_controller.dart +++ b/lib/controller/auth/captin/register_captin_controller.dart @@ -3,9 +3,11 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; +import 'package:ride/constant/box_name.dart'; import 'package:ride/constant/links.dart'; import 'package:ride/controller/functions/crud.dart'; import 'package:ride/controller/functions/ocr_controller.dart'; +import 'package:ride/main.dart'; import 'package:ride/views/auth/captin/login_captin.dart'; import 'package:ride/views/auth/captin/verify_email_captain.dart'; @@ -139,6 +141,14 @@ class RegisterCaptainController extends GetxController { 'registrationDate': registrationDate, }); print(jsonDecode(res)); + box.write(BoxName.vin, vin); + box.write(BoxName.make, make); + box.write(BoxName.model, model); + box.write(BoxName.year, year); + box.write(BoxName.expirationDate, expirationDate); + box.write(BoxName.color, color); + box.write(BoxName.owner, owner); + box.write(BoxName.registrationDate, registrationDate); isLoading = false; update(); if (jsonDecode(res)['status'] == 'success') { @@ -166,6 +176,10 @@ class RegisterCaptainController extends GetxController { update(); if (jsonDecode(res)['status'] == 'success') { print('sdfffffffffff'); + box.write(BoxName.dobDriver, dob); + box.write(BoxName.sexDriver, sex); + box.write(BoxName.phoneDriver, phoneController.text); + box.write(BoxName.lastNameDriver, name.split(' ')[0]); int randomNumber = Random().nextInt(100000) + 1; await CRUD().post(link: AppLink.sendVerifyEmail, payload: { 'email': emailController.text, diff --git a/lib/controller/functions/crud.dart b/lib/controller/functions/crud.dart index afc2e9d..f282cf2 100644 --- a/lib/controller/functions/crud.dart +++ b/lib/controller/functions/crud.dart @@ -26,14 +26,13 @@ class CRUD { // 'Basic ${base64Encode(utf8.encode(basicAuthCredentials.toString()))}', }, ); - //print("-----basicAuthCredentials----" + AK.basicAuthCredentials.toString()); - //print("-----request----" + response.request.toString()); - //print("-----headers-----" + response.headers.toString()); - //print("-----payload-----" + payload.toString()); + // print("-----request----" + response.request.toString()); + // print("-----headers-----" + response.headers.toString()); + // print("-----payload-----" + payload.toString()); if (response.statusCode == 200) { var jsonData = jsonDecode(response.body); if (jsonData['status'] == 'success') { - // //print(jsonData); + // print(jsonData); return response.body; } diff --git a/lib/controller/functions/ocr_controller.dart b/lib/controller/functions/ocr_controller.dart index cd72bc2..2289fb3 100644 --- a/lib/controller/functions/ocr_controller.dart +++ b/lib/controller/functions/ocr_controller.dart @@ -6,20 +6,16 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:image_picker/image_picker.dart'; import 'package:http/http.dart' as http; -import 'package:path/path.dart' as path; -import 'package:path_provider/path_provider.dart' as path_provider; import 'package:ride/constant/api_key.dart'; import 'package:ride/constant/box_name.dart'; import 'package:ride/constant/colors.dart'; -import 'package:ride/constant/credential.dart'; import 'package:ride/constant/info.dart'; +import 'package:ride/constant/links.dart'; import 'package:ride/constant/style.dart'; import 'package:ride/constant/table_names.dart'; -import 'package:ride/env/env.dart'; import 'package:ride/main.dart'; import 'package:ride/views/widgets/elevated_btn.dart'; -import '../../constant/links.dart'; import '../../views/auth/captin/car_license_page.dart'; import 'launch.dart'; @@ -232,6 +228,7 @@ class ScanDocumentsByApi extends GetxController { late Uint8List imageDocumentFrontSide; XFile? image; XFile? imageFace; + late File tempFile; late String imagePath; DateTime now = DateTime.now(); late String name; @@ -326,7 +323,7 @@ class ScanDocumentsByApi extends GetxController { responseMap['data']['image']['portrait'] != null) { imagePortrait = base64Decode(responseMap['data']['image']['portrait']); String tempPath = Directory.systemTemp.path; - File tempFile = File('$tempPath/image.jpg'); + tempFile = File('$tempPath/image.jpg'); await tempFile.writeAsBytes(imagePortrait); imagePath = tempFile.path; @@ -480,7 +477,11 @@ class ScanDocumentsByApi extends GetxController { ) : MyElevatedButton( title: 'Next'.tr, - onPressed: () => Get.to(() => CarLicensePage()), + onPressed: () async { + await uploadImage( + tempFile, AppLink.uploadImagePortrate); + Get.to(() => CarLicensePage()); + }, kolor: AppColor.greenColor, )); } else { @@ -489,12 +490,12 @@ class ScanDocumentsByApi extends GetxController { } // Todo upload images and fields - Future uploadImage(File imageFile) async { + Future uploadImage(File imageFile, String link) async { String? basicAuthCredentials = await storage.read(key: BoxName.basicAuthCredentials); var request = http.MultipartRequest( 'POST', - Uri.parse(AppLink.uploadImage), + Uri.parse(link), //AppLink.uploadImage ); // Attach the image file to the request diff --git a/lib/controller/home/captin/map_driver_controller.dart b/lib/controller/home/captin/map_driver_controller.dart index 14f2eb5..63dc323 100644 --- a/lib/controller/home/captin/map_driver_controller.dart +++ b/lib/controller/home/captin/map_driver_controller.dart @@ -1,5 +1,6 @@ import 'dart:async'; import 'dart:convert'; +import 'dart:math'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -61,6 +62,7 @@ class MapDriverController extends GetxController { late Timer timer; String? mapAPIKEY; final zones = []; + void onMapCreated(GoogleMapController controller) { LocationController locationController = Get.find(); myLocation = locationController.myLocation; diff --git a/lib/controller/home/captin/widget/left_menu_map_captain.dart b/lib/controller/home/captin/widget/left_menu_map_captain.dart index a696c44..af3df5e 100644 --- a/lib/controller/home/captin/widget/left_menu_map_captain.dart +++ b/lib/controller/home/captin/widget/left_menu_map_captain.dart @@ -2,6 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_font_icons/flutter_font_icons.dart'; import 'package:get/get.dart'; import 'package:ride/controller/home/captin/home_captain_controller.dart'; +import 'package:ride/controller/home/captin/map_driver_controller.dart'; +import 'package:ride/controller/home/captin/widget/zones_controller.dart'; import '../../../../constant/colors.dart'; import '../../../../views/Rate/ride_calculate_driver.dart'; @@ -21,7 +23,11 @@ GetBuilder leftMainMenuCaptainIcons() { color: AppColor.secondaryColor, borderRadius: BorderRadius.circular(15)), child: IconButton( - onPressed: () {}, + onPressed: () { + ZonesController mapDriverController = + Get.put(ZonesController()); + mapDriverController.getJsonOfZones(); + }, icon: const Icon( FontAwesome.map_signs, size: 24, diff --git a/lib/controller/home/captin/widget/zones_controller.dart b/lib/controller/home/captin/widget/zones_controller.dart new file mode 100644 index 0000000..0278e91 --- /dev/null +++ b/lib/controller/home/captin/widget/zones_controller.dart @@ -0,0 +1,73 @@ +import 'dart:convert'; +import 'dart:math'; + +import 'package:get/get.dart'; +import 'package:google_maps_flutter/google_maps_flutter.dart'; + +class ZonesController extends GetxController { + Map> generateZoneMap( + LatLng southwest, LatLng southEast, LatLng northeast) { + const double desiredZoneArea = 4; // in square kilometers + + final double width = (southEast.longitude - southwest.longitude) * 100; + final double height = (northeast.latitude - southEast.latitude) * 100; + final double totalArea = width * height; + print(width); + print(height); + + // final int numZones = (totalArea / desiredZoneArea).ceil(); + + final double zoneWidth = width / sqrt(desiredZoneArea); + final double zoneHeight = height / sqrt(desiredZoneArea); + final numRows = + ((northeast.latitude - southwest.latitude) / zoneHeight).ceil(); + final numCols = + ((southEast.longitude - southwest.longitude) / zoneWidth).ceil(); + print('zoneWidth = $zoneWidth'); + print('zoneHeight = $zoneHeight'); + List zoneNames = []; + List zoneCoordinates = []; + + for (int row = 0; row < numRows; row++) { + for (int col = 0; col < numCols; col++) { + final double zoneSouthwestLat = + southwest.latitude + (row * zoneHeight / 100); + final double zoneSouthwestLng = + southwest.longitude + (col * zoneWidth / 100); + final double zoneNortheastLat = zoneSouthwestLat + zoneHeight / 100; + final double zoneNortheastLng = zoneSouthwestLng + zoneWidth / 100; + + LatLng zoneSouthwest = LatLng(zoneSouthwestLat, zoneSouthwestLng); + LatLng zoneNortheast = LatLng(zoneNortheastLat, zoneNortheastLng); + + String zoneName = + 'Zone${row + col}'; // Assign a unique name to each zone + + zoneNames.add(zoneName); + zoneCoordinates.add(zoneSouthwest); + zoneCoordinates.add(zoneNortheast); + } + } + + Map> zoneMap = {}; + for (int i = 0; i < zoneNames.length; i++) { + zoneMap[zoneNames[i]] = [ + zoneCoordinates[i], // Southwest LatLng + zoneCoordinates[i + 1], // Northeast LatLng + ]; + } + + return zoneMap; + } + + void getJsonOfZones() { + LatLng southwest = const LatLng(32.111107, 36.062222); + LatLng southEast = const LatLng(32.108333, 36.101667); + LatLng northeast = const LatLng(32.143889, 36.058889); + Map> zoneMap = + generateZoneMap(southwest, southEast, northeast); + String jsonMap = json.encode(zoneMap); + + print(jsonMap); + } +} diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index fbf57c9..6f2c54d 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -312,7 +312,8 @@ class MapPassengerController extends GetxController { totalDriver.toString(), duration.toString(), distance.toString(), - dataCarsLocationByPassenger['message'][carsOrder]['id'].toString(), + dataCarsLocationByPassenger['message'][carsOrder]['driver_id'] + .toString(), box.read(BoxName.passengerID).toString(), box.read(BoxName.name).toString(), box.read(BoxName.tokenFCM).toString(), diff --git a/lib/views/auth/captin/car_license_page.dart b/lib/views/auth/captin/car_license_page.dart index 77b8ae2..160556a 100644 --- a/lib/views/auth/captin/car_license_page.dart +++ b/lib/views/auth/captin/car_license_page.dart @@ -9,7 +9,6 @@ import '../../../constant/box_name.dart'; import '../../../constant/style.dart'; import '../../../controller/auth/captin/ml_google_doc.dart'; import '../../../controller/auth/captin/register_captin_controller.dart'; -import '../../../main.dart'; import '../../widgets/elevated_btn.dart'; import '../../widgets/my_scafold.dart'; diff --git a/lib/views/home/Captin/history/history_captain.dart b/lib/views/home/Captin/history/history_captain.dart new file mode 100644 index 0000000..1fa8337 --- /dev/null +++ b/lib/views/home/Captin/history/history_captain.dart @@ -0,0 +1,102 @@ +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:ride/constant/colors.dart'; +import 'package:ride/constant/style.dart'; +import 'package:ride/controller/auth/captin/history_captain.dart'; +import 'package:ride/views/home/Captin/history/history_details_page.dart'; +import 'package:ride/views/widgets/elevated_btn.dart'; +import 'package:ride/views/widgets/my_scafold.dart'; +import 'package:ride/views/widgets/mycircular.dart'; + +class HistoryCaptain extends StatelessWidget { + const HistoryCaptain({super.key}); + + @override + Widget build(BuildContext context) { + Get.put(HistoryCaptainController()); + return MyScafolld( + title: 'History Page'.tr, + body: [ + GetBuilder( + builder: (historyCaptainController) => Expanded( + child: historyCaptainController.isloading + ? const MyCircularProgressIndicator() + : ListView.builder( + itemCount: historyCaptainController + .historyData['message'].length, + itemBuilder: (BuildContext context, int index) { + var list = historyCaptainController + .historyData['message'][index]; + return InkWell( + onTap: () { + list['status'] != 'Cancel' + ? historyCaptainController + .getHistoryDetails(list['order_id']) + : Get.defaultDialog( + title: 'This Trip Cancelled'.tr, + middleText: '', + titleStyle: AppStyle.title, + confirm: MyElevatedButton( + title: 'Ok'.tr, + onPressed: () => Get.back())); + }, + child: Card( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Text( + 'OrderID', + style: AppStyle.title, + ), + Text( + list['order_id'], + style: AppStyle.subtitle, + ), + ], + ), + Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Text( + 'created_at', + style: AppStyle.title, + ), + Text( + list['created_at'], + style: AppStyle.subtitle, + ), + ], + ), + Text( + list['status'], + style: list['status'] == 'Apply' + ? AppStyle.title.copyWith( + color: AppColor.greenColor) + : list['status'] == 'Refused' + ? AppStyle.title.copyWith( + color: AppColor.redColor) + : AppStyle.title.copyWith( + color: + AppColor.yellowColor), + ), + ], + ), + ), + ), + ); + }, + ), + )) + ], + isleading: true, + ); + } +} diff --git a/lib/views/home/Captin/history/history_details_page.dart b/lib/views/home/Captin/history/history_details_page.dart new file mode 100644 index 0000000..1c40f95 --- /dev/null +++ b/lib/views/home/Captin/history/history_details_page.dart @@ -0,0 +1,155 @@ +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:ride/constant/colors.dart'; +import 'package:ride/constant/style.dart'; +import 'package:ride/controller/auth/captin/history_captain.dart'; +import 'package:ride/controller/functions/launch.dart'; +import 'package:ride/views/widgets/my_scafold.dart'; + +import '../../../widgets/mycircular.dart'; + +class HistoryDetailsPage extends StatelessWidget { + HistoryDetailsPage({super.key}); + HistoryCaptainController historyCaptainController = + Get.put(HistoryCaptainController()); + @override + Widget build(BuildContext context) { + return MyScafolld( + title: 'Trip Detail'.tr, + body: [ + GetBuilder( + builder: (historyCaptainController) { + var res = historyCaptainController.historyDetailsData['data']; + return Expanded( + child: historyCaptainController.isloading + ? const MyCircularProgressIndicator() + : SingleChildScrollView( + child: Column( + children: [ + Container( + width: Get.width * .8, + decoration: BoxDecoration( + border: Border.all( + color: AppColor.blueColor, width: 2)), + child: TextButton( + onPressed: () { + String mapUrl = + 'https://www.google.com/maps/dir/${res['start_location']}/${res['end_location']}/'; + print(mapUrl); + launchUrl1(mapUrl); + }, + child: Text( + 'Trip on Map Click here'.tr, + style: AppStyle.title, + ), + ), + ), + const SizedBox( + height: 10, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Text( + 'Order ID ${res['id']}', + style: AppStyle.title, + ), + Text( + res['date'].toString(), + style: AppStyle.title, + ), + ], + ), + const SizedBox( + height: 10, + ), + Container( + width: Get.width * .8, + decoration: BoxDecoration( + border: Border.all( + color: AppColor.greenColor, width: 2)), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Text( + 'Price is ${res['price_for_driver']}', + style: AppStyle.title, + ), + Text( + 'Distance is ${res['distance']} KM', + style: AppStyle.title, + ), + ], + ), + ), + const SizedBox( + height: 10, + ), + Text( + 'Times of Trip'.tr, + style: AppStyle.title, + ), + const SizedBox( + height: 10, + ), + Container( + width: Get.width * .8, + decoration: BoxDecoration( + border: Border.all( + color: AppColor.redColor, width: 2)), + child: Column( + children: [ + Text( + 'To Passenger is ${res['DriverIsGoingToPassenger']}', + style: AppStyle.title, + ), + Text( + 'TimeStart is ${res['rideTimeStart']}', + style: AppStyle.title, + ), + Text( + 'Time Finish is ${res['rideTimeFinish']}', + style: AppStyle.title, + ), + ], + ), + ), + const SizedBox( + height: 10, + ), + Container( + width: Get.width * .8, + decoration: BoxDecoration( + border: Border.all( + color: AppColor.greenColor, width: 2)), + child: Center( + child: Text( + 'Passenger Name is ${res['first_name']} ${res['last_name']} ', + style: AppStyle.title, + ), + ), + ), + const SizedBox( + height: 10, + ), + Container( + width: Get.width * .8, + decoration: BoxDecoration( + border: Border.all( + color: AppColor.yellowColor, width: 2)), + child: Center( + child: Text( + 'Status is ${res['status']}', + style: AppStyle.title, + ), + ), + ), + ], + ), + )); + }) + ], + isleading: true, + ); + } +} diff --git a/lib/views/home/Captin/history_captain.dart b/lib/views/home/Captin/history_captain.dart deleted file mode 100644 index 93cc59f..0000000 --- a/lib/views/home/Captin/history_captain.dart +++ /dev/null @@ -1,16 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:ride/views/widgets/my_scafold.dart'; - -class HistoryCaptain extends StatelessWidget { - const HistoryCaptain({super.key}); - - @override - Widget build(BuildContext context) { - return MyScafolld( - title: 'History Page'.tr, - body: [], - isleading: true, - ); - } -} diff --git a/lib/views/home/Captin/home_captain/drawer_captain.dart b/lib/views/home/Captin/home_captain/drawer_captain.dart index 2bac614..e3ffb74 100644 --- a/lib/views/home/Captin/home_captain/drawer_captain.dart +++ b/lib/views/home/Captin/home_captain/drawer_captain.dart @@ -4,7 +4,7 @@ import 'package:ride/constant/box_name.dart'; import 'package:ride/constant/colors.dart'; import 'package:ride/main.dart'; import 'package:ride/views/auth/captin/logout_captain.dart'; -import 'package:ride/views/home/Captin/history_captain.dart'; +import 'package:ride/views/home/Captin/history/history_captain.dart'; import 'package:ride/views/home/Captin/home_captain/help_captain.dart'; import 'package:ride/views/home/Captin/settings_captain.dart'; import 'package:ride/views/home/my_wallet/walet_captain.dart'; diff --git a/lib/views/home/profile/profile_captain.dart b/lib/views/home/profile/profile_captain.dart index 4b2d85a..6493df0 100644 --- a/lib/views/home/profile/profile_captain.dart +++ b/lib/views/home/profile/profile_captain.dart @@ -1,5 +1,11 @@ +import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; +import 'package:path/path.dart'; +import 'package:ride/constant/box_name.dart'; +import 'package:ride/constant/style.dart'; +import 'package:ride/env/env.dart'; +import 'package:ride/main.dart'; import 'package:ride/views/widgets/my_scafold.dart'; class ProfileCaptain extends StatelessWidget { @@ -9,7 +15,73 @@ class ProfileCaptain extends StatelessWidget { Widget build(BuildContext context) { return MyScafolld( title: 'My Profile'.tr, - body: [], + body: [ + Padding( + padding: const EdgeInsets.all(16.0), + child: SingleChildScrollView( + child: Center( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + CircleAvatar( + radius: Get.width * 0.26, + backgroundColor: Colors.white, + backgroundImage: CachedNetworkImageProvider( + "${Env.serverPHP}/card_image/${box.read(BoxName.driverID)}.jpg", + ), + ), + const SizedBox(height: 8.0), + Text( + box.read(BoxName.nameDriver) + + ' ' + + box.read(BoxName.lastNameDriver).toString(), + style: AppStyle.title), + const SizedBox(height: 8.0), + Text('Email is :${box.read(BoxName.emailDriver)}', + style: AppStyle.title), + const SizedBox(height: 8.0), + Text('Phone Number is :${box.read(BoxName.phoneDriver)}', + style: AppStyle.title), + const SizedBox(height: 8.0), + Text('Date of Birth is :${box.read(BoxName.dobDriver)}', + style: AppStyle.title), + const SizedBox(height: 8.0), + Text('Sex is :${box.read(BoxName.sexDriver)}', + style: AppStyle.title), + const SizedBox(height: 8.0), + const Divider( + // height: 2, + endIndent: 1, + indent: 2, + thickness: 2, + ), + const SizedBox(height: 8.0), + Text('Car Details'.tr, style: AppStyle.headtitle2), + const SizedBox(height: 8.0), + Text('VIN is :${box.read(BoxName.vin)}', + style: AppStyle.title), + const SizedBox(height: 8.0), + Text('Color is :${box.read(BoxName.color)}', + style: AppStyle.title), + const SizedBox(height: 8.0), + Text('Make is :${box.read(BoxName.make)}', + style: AppStyle.title), + const SizedBox(height: 8.0), + Text('Model is :${box.read(BoxName.model)}', + style: AppStyle.title), + const SizedBox(height: 8.0), + Text('Year is :${box.read(BoxName.year)}', + style: AppStyle.title), + const SizedBox(height: 8.0), + Text('Expiration Date :${box.read(BoxName.expirationDate)}', + style: AppStyle.title), + const SizedBox(height: 8.0), + ], + ), + ), + ), + ), + ], isleading: true, ); } diff --git a/pubspec.lock b/pubspec.lock index 4c46a8c..20fb1d2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "1a5e13736d59235ce0139621b4bbe29bc89839e202409081bc667eb3cd20674c" + sha256: dd68ecea9f1e3556d385521bd21c7bafd6311a8c1e11abe2595ca27974f468ee url: "https://pub.dev" source: hosted - version: "1.3.5" + version: "1.3.13" analyzer: dependency: transitive description: @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: audio_session - sha256: "8a2bc5e30520e18f3fb0e366793d78057fb64cd5287862c76af0c8771f2a52ad" + sha256: "6fdf255ed3af86535c96452c33ecff1245990bb25a605bfb1958661ccc3d467f" url: "https://pub.dev" source: hosted - version: "0.1.16" + version: "0.1.18" boolean_selector: dependency: transitive description: @@ -133,12 +133,12 @@ packages: dependency: transitive description: name: built_value - sha256: "723b4021e903217dfc445ec4cf5b42e27975aece1fc4ebbc1ca6329c2d9fb54e" + sha256: "69acb7007eb2a31dc901512bfe0f7b767168be34cb734835d54c070bfa74c1b2" url: "https://pub.dev" source: hosted - version: "8.7.0" + version: "8.8.0" cached_network_image: - dependency: transitive + dependency: "direct main" description: name: cached_network_image sha256: f98972704692ba679db144261172a8e20feb145636c617af0eb4022132a6797f @@ -181,10 +181,10 @@ packages: dependency: transitive description: name: camera_avfoundation - sha256: "9495e633cda700717bbe299b0979e6c4a08cee45f298945973dc9cf3e4c1cba5" + sha256: "3b6d9f550cfd658c71f34a99509528501e5e5d4fa79f11e3a4d6ef380d8e0254" url: "https://pub.dev" source: hosted - version: "0.9.13+6" + version: "0.9.13+7" camera_platform_interface: dependency: transitive description: @@ -245,18 +245,18 @@ packages: dependency: transitive description: name: code_builder - sha256: "1be9be30396d7e4c0db42c35ea6ccd7cc6a1e19916b5dc64d6ac216b5544d677" + sha256: b2151ce26a06171005b379ecff6e08d34c470180ffe16b8e14b6d52be292b55f url: "https://pub.dev" source: hosted - version: "4.7.0" + version: "4.8.0" collection: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -269,10 +269,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "445db18de832dba8d851e287aff8ccf169bed30d2e94243cb54c7d2f1ed2142c" + sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" url: "https://pub.dev" source: hosted - version: "0.3.3+6" + version: "0.3.3+7" crypto: dependency: "direct main" description: @@ -293,10 +293,10 @@ packages: dependency: "direct main" description: name: cupertino_icons - sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.6" custom_searchable_dropdown: dependency: "direct main" description: @@ -309,26 +309,26 @@ packages: dependency: transitive description: name: dart_style - sha256: abd7625e16f51f554ea244d090292945ec4d4be7bfbaf2ec8cccea568919d334 + sha256: "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368" url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.3.4" dbus: dependency: transitive description: name: dbus - sha256: "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263" + sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac" url: "https://pub.dev" source: hosted - version: "0.7.8" + version: "0.7.10" device_info_plus: dependency: "direct main" description: name: device_info_plus - sha256: "7035152271ff67b072a211152846e9f1259cf1be41e34cd3e0b5463d2d6b8419" + sha256: "0042cb3b2a76413ea5f8a2b40cec2a33e01d0c937e91f0f7c211fde4f7739ba6" url: "https://pub.dev" source: hosted - version: "9.1.0" + version: "9.1.1" device_info_plus_platform_interface: dependency: transitive description: @@ -413,50 +413,50 @@ packages: dependency: "direct main" description: name: firebase_core - sha256: c78132175edda4bc532a71e01a32964e4b4fcf53de7853a422d96dac3725f389 + sha256: "471b46ea6a9af503184d4de691566887daedd312aec5baac5baa42d819f56446" url: "https://pub.dev" source: hosted - version: "2.15.1" + version: "2.23.0" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - sha256: b63e3be6c96ef5c33bdec1aab23c91eb00696f6452f0519401d640938c94cba2 + sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63 url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "5.0.0" firebase_core_web: dependency: transitive description: name: firebase_core_web - sha256: "4cf4d2161530332ddc3c562f19823fb897ff37a9a774090d28df99f47370e973" + sha256: "0631a2ec971dbc540275e2fa00c3a8a2676f0a7adbc3c197d6fba569db689d97" url: "https://pub.dev" source: hosted - version: "2.7.0" + version: "2.8.1" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - sha256: "6c1a2a047d6f165b7c5f947467ac5138731a2af82c7af1c12d691dbb834f6b73" + sha256: f4576000e749c906d44649feadb2449ada39eab9777650319bdd6fa69a3044f5 url: "https://pub.dev" source: hosted - version: "14.6.7" + version: "14.7.5" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: bcba58d28f8cda607a323240c6d314c2c62b62ebfbb0f2d704ebefef07b52b5f + sha256: dcf065ecb9518ddc671477f9b8592274df7ccf74c6aaa15f02fc92b1f2b9c8a8 url: "https://pub.dev" source: hosted - version: "4.5.6" + version: "4.5.14" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: "962d09ec9dfa486cbbc218258ad41e8ec7997a2eba46919049496e1cafd960c5" + sha256: "11b7920273367ce2cb272d29153bb7aaae93577eba1eba423c7af61d7f2a3eb2" url: "https://pub.dev" source: hosted - version: "3.5.6" + version: "3.5.14" fixnum: dependency: transitive description: @@ -498,18 +498,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493 + sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "3.0.1" flutter_local_notifications: dependency: "direct main" description: name: flutter_local_notifications - sha256: "3002092e5b8ce2f86c3361422e52e6db6776c23ee21e0b2f71b892bf4259ef04" + sha256: bb5cd63ff7c91d6efe452e41d0d0ae6348925c82eafd10ce170ef585ea04776e url: "https://pub.dev" source: hosted - version: "15.1.1" + version: "16.2.0" flutter_local_notifications_linux: dependency: transitive description: @@ -538,10 +538,10 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360" + sha256: b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.0.17" flutter_rating_bar: dependency: "direct main" description: @@ -554,50 +554,50 @@ packages: dependency: "direct main" description: name: flutter_secure_storage - sha256: "98352186ee7ad3639ccc77ad7924b773ff6883076ab952437d20f18a61f0a7c5" + sha256: ffdbb60130e4665d2af814a0267c481bcf522c41ae2e43caf69fa0146876d685 url: "https://pub.dev" source: hosted - version: "8.0.0" + version: "9.0.0" flutter_secure_storage_linux: dependency: transitive description: name: flutter_secure_storage_linux - sha256: "0912ae29a572230ad52d8a4697e5518d7f0f429052fd51df7e5a7952c7efe2a3" + sha256: "3d5032e314774ee0e1a7d0a9f5e2793486f0dff2dd9ef5a23f4e3fb2a0ae6a9e" url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "1.2.0" flutter_secure_storage_macos: dependency: transitive description: name: flutter_secure_storage_macos - sha256: "083add01847fc1c80a07a08e1ed6927e9acd9618a35e330239d4422cd2a58c50" + sha256: bd33935b4b628abd0b86c8ca20655c5b36275c3a3f5194769a7b3f37c905369c url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" flutter_secure_storage_platform_interface: dependency: transitive description: name: flutter_secure_storage_platform_interface - sha256: b3773190e385a3c8a382007893d678ae95462b3c2279e987b55d140d3b0cb81b + sha256: "0d4d3a5dd4db28c96ae414d7ba3b8422fd735a8255642774803b2532c9a61d7e" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" flutter_secure_storage_web: dependency: transitive description: name: flutter_secure_storage_web - sha256: "42938e70d4b872e856e678c423cc0e9065d7d294f45bc41fc1981a4eb4beaffe" + sha256: "30f84f102df9dcdaa2241866a958c2ec976902ebdaa8883fbfe525f1f2f3cf20" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" flutter_secure_storage_windows: dependency: transitive description: name: flutter_secure_storage_windows - sha256: fc2910ec9b28d60598216c29ea763b3a96c401f0ce1d13cdf69ccb0e5c93c3ee + sha256: "5809c66f9dd3b4b93b0a6e2e8561539405322ee767ac2f64d084e2ab5429d108" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "3.0.0" flutter_spinkit: dependency: transitive description: @@ -636,18 +636,18 @@ packages: dependency: "direct main" description: name: flutter_widget_from_html - sha256: "6f2578397aa8efed3267cd4243b68acfc2e38c51d7381fc31a6860ea6eef4e1e" + sha256: "507041cc84d0c26316ac08fa0393ad4e7516c7b20a9ef387898a6ccd5f7f9c34" url: "https://pub.dev" source: hosted - version: "0.14.6" + version: "0.14.7" flutter_widget_from_html_core: dependency: transitive description: name: flutter_widget_from_html_core - sha256: dd585321db498911414a9b08659b8aa965f8f0375b39856429220fbcacdf59bd + sha256: d3239b1670e83fafb209d0ddccfd19bb1cd5382b3ac9a507eb1b36274df78fec url: "https://pub.dev" source: hosted - version: "0.14.6" + version: "0.14.7" freezed_annotation: dependency: transitive description: @@ -676,10 +676,10 @@ packages: dependency: transitive description: name: fwfh_chewie - sha256: b74673d1b2f8710df5addd0ceb82c148f28b9fca9fe619048eebc734d055d55b + sha256: bbb036cd322ab77dc0edd34cbbf76181681f5e414987ece38745dc4f3d7408ed url: "https://pub.dev" source: hosted - version: "0.14.2" + version: "0.14.7" fwfh_just_audio: dependency: transitive description: @@ -716,58 +716,58 @@ packages: dependency: "direct main" description: name: geolocator - sha256: "9d6eff112971b9f195271834b390fc0e1899a9a6c96225ead72efd5d4aaa80c7" + sha256: e946395fc608842bb2f6c914807e9183f86f3cb787f6b8f832753e5251036f02 url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.1.0" geolocator_android: dependency: transitive description: name: geolocator_android - sha256: "835ff5b4888a2f8eba128996494faf9c5d422785322a81dc0565b99e0f6c379d" + sha256: "741579fa6c9e412984d2bdb2fbaa54e3c3f7587c60aeacfe6e058358a11f40f8" url: "https://pub.dev" source: hosted - version: "4.2.2" + version: "4.4.0" geolocator_apple: dependency: transitive description: name: geolocator_apple - sha256: "36527c555f4c425f7d8fa8c7c07d67b78e3ff7590d40448051959e1860c1cfb4" + sha256: ab90ae811c42ec2f6021e01eca71df00dee6ff1e69d2c2dafd4daeb0b793f73d url: "https://pub.dev" source: hosted - version: "2.2.7" + version: "2.3.2" geolocator_platform_interface: dependency: transitive description: name: geolocator_platform_interface - sha256: af4d69231452f9620718588f41acc4cb58312368716bfff2e92e770b46ce6386 + sha256: "6c8d494d6948757c56720b778af742f6973f31fca1f702a7539b8917e4a2468a" url: "https://pub.dev" source: hosted - version: "4.0.7" + version: "4.2.0" geolocator_web: dependency: transitive description: name: geolocator_web - sha256: f68a122da48fcfff68bbc9846bb0b74ef651afe84a1b1f6ec20939de4d6860e1 + sha256: "59083f7e0871b78299918d92bf930a14377f711d2d1156c558cd5ebae6c20d58" url: "https://pub.dev" source: hosted - version: "2.1.6" + version: "2.2.0" geolocator_windows: dependency: transitive description: name: geolocator_windows - sha256: "463045515b08bd83f73e014359c4ad063b902eb3899952cfb784497ae6c6583b" + sha256: a92fae29779d5c6dc60e8411302f5221ade464968fe80a36d330e80a71f087af url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.2.2" get: dependency: "direct main" description: name: get - sha256: "2ba20a47c8f1f233bed775ba2dd0d3ac97b4cf32fc17731b3dfc672b06b0e92a" + sha256: e4e7335ede17452b391ed3b2ede016545706c01a02292a6c97619705e7d2a85e url: "https://pub.dev" source: hosted - version: "4.6.5" + version: "4.6.6" get_storage: dependency: "direct main" description: @@ -796,10 +796,10 @@ packages: dependency: transitive description: name: google_identity_services_web - sha256: "7940fdc3b1035db4d65d387c1bdd6f9574deaa6777411569c05ecc25672efacd" + sha256: "000b7a31e1fa17ee04b6c0553a2b2ea18f9f9352e4dcc0c9fcc785cf10f2484e" url: "https://pub.dev" source: hosted - version: "0.2.1" + version: "0.2.2" google_maps: dependency: transitive description: @@ -820,50 +820,50 @@ packages: dependency: transitive description: name: google_maps_flutter_android - sha256: "0a3db57610487c5dc133b28b8025933148bacc007d0af500ec66e1ecdf304b96" + sha256: "4023e79184c762e63efe04da629d876085e0c296a7ca26745fb5750d4acd0aa2" url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.5.3" google_maps_flutter_ios: dependency: transitive description: name: google_maps_flutter_ios - sha256: "954083b0b8ef60d059b41a37382afb22d7eea565002bf0bbf093fe748b5cef82" + sha256: "2aa28eb9b9d5dfdce6932a7b7f096430bf83a1a09b4e21e81939351f407c787f" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.2" google_maps_flutter_platform_interface: dependency: transitive description: name: google_maps_flutter_platform_interface - sha256: b363e9a1ef7d063fb21ec8eef5a450db4b0500cc39712c9410b5cc64013d6fc6 + sha256: a3e9e6896501e566d902c6c69f010834d410ef4b7b5c18b90c77e871c86b7907 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" google_maps_flutter_web: dependency: transitive description: name: google_maps_flutter_web - sha256: a0a7f40aad00dd07e76abb80b7d28213b5f62c6d7d56e7e85efc15849fabcfbb + sha256: f893d1542c6562bc8299ef768fbbe92ade83c220ab3209b9477ec9f81ad585e4 url: "https://pub.dev" source: hosted - version: "0.5.4" + version: "0.5.4+2" google_mlkit_commons: dependency: transitive description: name: google_mlkit_commons - sha256: "42173a8ba89f386486cc5b8249e84da4a4b861daa70498373627d985eb418689" + sha256: "046586b381cdd139f7f6a05ad6998f7e339d061bd70158249907358394b5f496" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.6.1" google_mlkit_text_recognition: dependency: "direct main" description: name: google_mlkit_text_recognition - sha256: "588021c99536fdfb173eeecc4ee1b60ea4e0bd4be9787f52363c85346ae20364" + sha256: d484de2a10961a6f0ff8b54cc92b71bfbb0e65509be0903edca0e1f9256ca4c2 url: "https://pub.dev" source: hosted - version: "0.10.0" + version: "0.11.0" google_polyline_algorithm: dependency: "direct main" description: @@ -876,42 +876,42 @@ packages: dependency: "direct main" description: name: google_sign_in - sha256: aab6fdc41374014494f9e9026b9859e7309639d50a0bf4a2a412467a5ae4abc6 + sha256: "8f8b94880f2753ccb796744259da529674e49b9af2e372abf6978c590c0ebfef" url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "6.1.6" google_sign_in_android: dependency: transitive description: name: google_sign_in_android - sha256: "8d60a787b29cb7d2bcf29230865f4a91f17323c6ac5b6b9027a6418e48d9ffc3" + sha256: "6031f59074a337fdd81be821aba84cee3a41338c6e958499a5cd34d3e1db80ef" url: "https://pub.dev" source: hosted - version: "6.1.18" + version: "6.1.20" google_sign_in_ios: dependency: transitive description: name: google_sign_in_ios - sha256: "6ec0e13a4c5c646471b9f6a25ceb3ae76d339889d4c0f79b729bf0714215a63e" + sha256: "8edfde9698b5951f3d02632eceb39cc283865c3cff0b03216bf951089f10345b" url: "https://pub.dev" source: hosted - version: "5.6.2" + version: "5.6.3" google_sign_in_platform_interface: dependency: transitive description: name: google_sign_in_platform_interface - sha256: e69553c0fc6a76216e9d06a8c3767e291ad9be42171f879aab7ab708569d4393 + sha256: "35ceee5f0eadc1c07b0b4af7553246e315c901facbb7d3dadf734ba2693ceec4" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" google_sign_in_web: dependency: transitive description: name: google_sign_in_web - sha256: c4ef88c4033797908b8533e97216f51442909162bafc03dd42e8d1a057561c52 + sha256: "6b08be471f82ff84058d528e1cb01f4f53084fa648b751310cdd1ac39b612d8e" url: "https://pub.dev" source: hosted - version: "0.12.0+3" + version: "0.12.1" graphs: dependency: transitive description: @@ -940,10 +940,10 @@ packages: dependency: transitive description: name: http_auth - sha256: b63ab2b2874970e92b76b7d23c805e74d7c534e8528088da75cf32c18e9abe25 + sha256: b7625acba2987fa69140d9600c679819f33227d665f525fbb2f394e08cf917d1 url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.4" http_multi_server: dependency: transitive description: @@ -1004,10 +1004,10 @@ packages: dependency: transitive description: name: image_picker_android - sha256: "0c7b83bbe2980c8a8e36e974f055e11e51675784e13a4762889feed0f3937ff2" + sha256: d6a6e78821086b0b737009b09363018309bbc6de3fd88cc5c26bc2bb44a4957f url: "https://pub.dev" source: hosted - version: "0.8.8+1" + version: "0.8.8+2" image_picker_for_web: dependency: transitive description: @@ -1020,10 +1020,10 @@ packages: dependency: transitive description: name: image_picker_ios - sha256: c5538cacefacac733c724be7484377923b476216ad1ead35a0d2eadcdc0fc497 + sha256: "76ec722aeea419d03aa915c2c96bf5b47214b053899088c9abb4086ceecf97a7" url: "https://pub.dev" source: hosted - version: "0.8.8+2" + version: "0.8.8+4" image_picker_linux: dependency: transitive description: @@ -1100,34 +1100,34 @@ packages: dependency: transitive description: name: just_audio - sha256: "5ed0cd723e17dfd8cd4b0253726221e67f6546841ea4553635cf895061fc335b" + sha256: b607cd1a43bac03d85c3aaee00448ff4a589ef2a77104e3d409889ff079bf823 url: "https://pub.dev" source: hosted - version: "0.9.35" + version: "0.9.36" just_audio_platform_interface: dependency: transitive description: name: just_audio_platform_interface - sha256: d8409da198bbc59426cd45d4c92fca522a2ec269b576ce29459d6d6fcaeb44df + sha256: c3dee0014248c97c91fe6299edb73dc4d6c6930a2f4f713579cd692d9e47f4a1 url: "https://pub.dev" source: hosted - version: "4.2.1" + version: "4.2.2" just_audio_web: dependency: transitive description: name: just_audio_web - sha256: ff62f733f437b25a0ff590f0e295fa5441dcb465f1edbdb33b3dea264705bc13 + sha256: "134356b0fe3d898293102b33b5fd618831ffdc72bb7a1b726140abdf22772b70" url: "https://pub.dev" source: hosted - version: "0.4.8" + version: "0.4.9" lints: dependency: transitive description: name: lints - sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "3.0.0" local_auth: dependency: "direct main" description: @@ -1204,10 +1204,10 @@ packages: dependency: "direct main" description: name: lottie - sha256: b8bdd54b488c54068c57d41ae85d02808da09e2bee8b8dd1f59f441e7efa60cd + sha256: a93542cc2d60a7057255405f62252533f8e8956e7e06754955669fd32fb4b216 url: "https://pub.dev" source: hosted - version: "2.6.0" + version: "2.7.0" matcher: dependency: transitive description: @@ -1228,10 +1228,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -1300,74 +1300,74 @@ packages: dependency: transitive description: name: path_provider - sha256: "909b84830485dbcd0308edf6f7368bc8fd76afa26a270420f34cabea2a6467a0" + sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "5d44fc3314d969b84816b569070d7ace0f1dea04bd94a83f74c4829615d22ad8" + sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72 url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.2.1" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "1b744d3d774e5a879bb76d6cd1ecee2ba2c6960c03b1020cd35212f6aa267ac5" + sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.1" path_provider_linux: dependency: transitive description: name: path_provider_linux - sha256: ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3 + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84 + sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da + sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" petitparser: dependency: transitive description: name: petitparser - sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + sha256: eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6 url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "6.0.1" platform: dependency: transitive description: name: platform - sha256: "57c07bf82207aee366dfaa3867b3164e4f03a238a461a11b0e8a3a510d51203d" + sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.3" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd" + sha256: f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8 url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.1.7" pointycastle: dependency: transitive description: @@ -1388,10 +1388,10 @@ packages: dependency: transitive description: name: provider - sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f + sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096" url: "https://pub.dev" source: hosted - version: "6.0.5" + version: "6.1.1" pub_semver: dependency: transitive description: @@ -1436,10 +1436,10 @@ packages: dependency: transitive description: name: sanitize_html - sha256: "0a445f19bbaa196f5a4f93461aa066b94e6e025622eb1e9bc77872a5e25233a5" + sha256: "12669c4a913688a26555323fb9cec373d8f9fbe091f2d01c40c723b33caa8989" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" shelf: dependency: transitive description: @@ -1477,6 +1477,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" sqflite: dependency: "direct main" description: @@ -1489,26 +1497,26 @@ packages: dependency: transitive description: name: sqflite_common - sha256: "1b92f368f44b0dee2425bb861cfa17b6f6cf3961f762ff6f941d20b33355660a" + sha256: bb4738f15b23352822f4c42a531677e5c6f522e079461fd240ead29d8d8a54a6 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.5.0+2" stack_trace: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: transitive description: @@ -1569,10 +1577,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" timezone: dependency: transitive description: @@ -1601,74 +1609,74 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e" + sha256: b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba url: "https://pub.dev" source: hosted - version: "6.1.12" + version: "6.2.1" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "3dd2388cc0c42912eee04434531a26a82512b9cb1827e0214430c9bcbddfe025" + sha256: "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def" url: "https://pub.dev" source: hosted - version: "6.0.38" + version: "6.2.0" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2" + sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3 url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "6.2.1" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5" + sha256: "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.1.0" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1" + sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234 url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "3.1.0" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - sha256: bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea + sha256: "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.2.0" url_launcher_web: dependency: transitive description: name: url_launcher_web - sha256: cc26720eefe98c1b71d85f9dc7ef0cada5132617046369d9dc296b3ecaa5cbb4 + sha256: "138bd45b3a456dcfafc46d1a146787424f8d2edfbf2809c9324361e58f851cf7" url: "https://pub.dev" source: hosted - version: "2.0.18" + version: "2.2.1" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "7967065dd2b5fccc18c653b97958fdf839c5478c28e767c61ee879f4e7882422" + sha256: "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc" url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "3.1.0" uuid: dependency: transitive description: name: uuid - sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + sha256: df5a4d8f22ee4ccd77f8839ac7cb274ebc11ef9adcce8b92be14b797fe889921 url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "4.2.1" vector_graphics: dependency: transitive description: @@ -1721,10 +1729,10 @@ packages: dependency: transitive description: name: video_player_avfoundation - sha256: fe73d636f82286a3739f5e644f95f09442cacdc436ebbe5436521dc915f3ecac + sha256: bc923884640d6dc403050586eb40713cdb8d1d84e6886d8aca50ab04c59124c2 url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.5.2" video_player_platform_interface: dependency: transitive description: @@ -1769,10 +1777,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -1785,42 +1793,42 @@ packages: dependency: transitive description: name: webview_flutter - sha256: "04a0782fb058b7c71f2048935583488f4d32e9147ca403abc4e58f1de9964629" + sha256: "42393b4492e629aa3a88618530a4a00de8bb46e50e7b3993fedbfdc5352f0dbf" url: "https://pub.dev" source: hosted - version: "4.2.3" + version: "4.4.2" webview_flutter_android: dependency: transitive description: name: webview_flutter_android - sha256: ddc167c6676f57c8b367d19fcbee267d6dc6adf81bd6c3cb87981d30746e0a6d + sha256: "8326ee235f87605a2bfc444a4abc897f4abc78d83f054ba7d3d1074ce82b4fbf" url: "https://pub.dev" source: hosted - version: "3.10.1" + version: "3.12.1" webview_flutter_platform_interface: dependency: transitive description: name: webview_flutter_platform_interface - sha256: "0ca3cfcc6781a7de701d580917af4a9efc4e3e129f8ead95a80587f0a749480a" + sha256: adb8c03c2be231bea5a8ed0e9039e9d18dbb049603376beaefa15393ede468a5 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.7.0" webview_flutter_wkwebview: dependency: transitive description: name: webview_flutter_wkwebview - sha256: ed749f94ac9e814d04a258a9255cf69cfa4cc6006ff59542aea7fb4590144972 + sha256: accdaaa49a2aca2dc3c3230907988954cdd23fed0a19525d6c9789d380f4dc76 url: "https://pub.dev" source: hosted - version: "3.7.3" + version: "3.9.4" win32: dependency: transitive description: name: win32 - sha256: "9e82a402b7f3d518fb9c02d0e9ae45952df31b9bf34d77baf19da2de03fc2aaa" + sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f" url: "https://pub.dev" source: hosted - version: "5.0.7" + version: "5.1.0" win32_registry: dependency: transitive description: @@ -1833,18 +1841,18 @@ packages: dependency: transitive description: name: xdg_directories - sha256: f0c26453a2d47aa4c2570c6a033246a3fc62da2fe23c7ffdd0a7495086dc0247 + sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.3" xml: dependency: transitive description: name: xml - sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + sha256: af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556 url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.4.2" yaml: dependency: transitive description: @@ -1854,5 +1862,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.1.0 <4.0.0" - flutter: ">=3.13.0" + dart: ">=3.2.0 <4.0.0" + flutter: ">=3.16.0" diff --git a/pubspec.yaml b/pubspec.yaml index ab3938a..0266a4d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,14 +14,14 @@ dependencies: cupertino_icons: ^1.0.2 firebase_messaging: ^14.6.7 firebase_core: ^2.15.0 - flutter_local_notifications: ^15.1.0+1 + flutter_local_notifications: ^16.2.0 google_maps_flutter: ^2.5.0 sqflite: ^2.3.0 path: ^1.8.3 google_sign_in: ^6.1.4 lottie: ^2.5.0 intl: ^0.18.1 - google_fonts: ^4.0.4 + google_fonts: ^ 4.0.4 http: ^0.13.6 get: ^4.6.5 get_storage: ^2.1.1 @@ -30,7 +30,7 @@ dependencies: google_polyline_algorithm: ^3.1.0 custom_searchable_dropdown: ^2.1.1 animated_text_kit: ^4.2.2 - flutter_secure_storage: ^8.0.0 + flutter_secure_storage: ^9.0.0 # credit_card_scanner: ^1.0.5 geolocator: ^10.0.0 flutter_paypal: ^0.2.0 @@ -40,7 +40,7 @@ dependencies: flutter_font_icons: ^2.2.5 device_info_plus: ^9.1.0 image_picker: ^1.0.4 - google_mlkit_text_recognition: ^0.10.0 + google_mlkit_text_recognition: ^0.11.0 flutter_stripe: ^9.5.0+1 camera: ^0.10.5+5 flutter_widget_from_html: ^0.14.6 @@ -48,6 +48,7 @@ dependencies: image: ^4.1.3 image_cropper: ^4.0.1 envied: ^0.5.2 + cached_network_image: ^3.3.0 @@ -56,7 +57,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^1.0.0 + flutter_lints: ^ 3.0.1 envied_generator: ^0.5.2 build_runner: ^2.4.6