This commit is contained in:
Hamza-Ayed
2025-08-09 15:52:48 +03:00
parent 3742d5b417
commit d71686d9f1
12 changed files with 863 additions and 187 deletions

View File

@@ -2658,8 +2658,8 @@ class MapPassengerController extends GetxController {
} else {
noCarString = false;
dataCarsLocationByPassenger = jsonDecode(res);
Log.print(
'dataCarsLocationByPassenger:getCarsLocationByPassengerAndReloadMarker $dataCarsLocationByPassenger');
// Log.print(
// 'dataCarsLocationByPassenger:getCarsLocationByPassengerAndReloadMarker $dataCarsLocationByPassenger');
// Check if 'message' is present and not null
if (dataCarsLocationByPassenger != null &&
@@ -4101,7 +4101,7 @@ class MapPassengerController extends GetxController {
i < dataCarsLocationByPassenger['message'].length;
i++) {
var carLocation = dataCarsLocationByPassenger['message'][i];
Log.print('carLocation: $carLocation');
// Log.print('carLocation: $carLocation');
try {
// Calculate distance between passenger's location and current driver's location
@@ -4114,12 +4114,12 @@ class MapPassengerController extends GetxController {
// Calculate duration assuming an average speed of 25 km/h (adjust as needed)
int durationToPassenger = (distance / 1000 / 25 * 3600).round();
Log.print('distance: $distance');
Log.print('durationToPassenger: $durationToPassenger');
Log.print('passengerLocation: $passengerLocation');
Log.print('carLocation: $carLocation');
Log.print('distance: $distance meters');
Log.print('durationToPassenger: $durationToPassenger seconds');
// Log.print('distance: $distance');
// Log.print('durationToPassenger: $durationToPassenger');
// Log.print('passengerLocation: $passengerLocation');
// Log.print('carLocation: $carLocation');
// Log.print('distance: $distance meters');
// Log.print('durationToPassenger: $durationToPassenger seconds');
// Update the UI with the distance and duration for each car
update();
@@ -4134,7 +4134,7 @@ class MapPassengerController extends GetxController {
latitude: double.parse(carLocation['latitude']),
longitude: double.parse(carLocation['longitude']),
);
Log.print('nearestCar: $nearestCar');
// Log.print('nearestCar: $nearestCar');
// Update the UI with the nearest driver
update();
}

View File

@@ -9,7 +9,7 @@ import 'package:Intaleq/controller/payment/payment_controller.dart';
import 'package:flutter/material.dart';
import 'package:flutter_contacts/flutter_contacts.dart';
import 'package:get/get.dart';
import 'package:share/share.dart';
import 'package:share_plus/share_plus.dart';
import '../../../main.dart';
import '../../../print.dart';

View File

@@ -14,7 +14,7 @@ ThemeData lightThemeEnglish = ThemeData(
bodyMedium: AppStyle.subtitle,
),
primarySwatch: Colors.blue,
dialogTheme: DialogTheme(
dialogTheme: DialogThemeData(
backgroundColor: AppColor.secondaryColor,
contentTextStyle: AppStyle.title,
titleTextStyle: AppStyle.headTitle2,
@@ -50,7 +50,7 @@ ThemeData darkThemeEnglish = ThemeData(
bodyMedium: AppStyle.subtitle,
),
primarySwatch: Colors.blue,
dialogTheme: DialogTheme(
dialogTheme: DialogThemeData(
backgroundColor: AppColor.secondaryColor,
contentTextStyle: AppStyle.title,
titleTextStyle: AppStyle.headTitle2,
@@ -86,7 +86,7 @@ ThemeData lightThemeArabic = ThemeData(
bodyMedium: AppStyle.subtitle,
),
primarySwatch: Colors.blue,
dialogTheme: DialogTheme(
dialogTheme: DialogThemeData(
backgroundColor: AppColor.secondaryColor,
contentTextStyle: AppStyle.title,
titleTextStyle: AppStyle.headTitle2,
@@ -122,7 +122,7 @@ ThemeData darkThemeArabic = ThemeData(
bodyMedium: AppStyle.subtitle,
),
primarySwatch: Colors.blue,
dialogTheme: DialogTheme(
dialogTheme: DialogThemeData(
backgroundColor: AppColor.secondaryColor,
contentTextStyle: AppStyle.title,
titleTextStyle: AppStyle.headTitle2,

View File

@@ -2,8 +2,8 @@ import 'package:Intaleq/views/widgets/my_scafold.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:share/share.dart';
import 'package:path/path.dart' as path;
import 'package:share_plus/share_plus.dart';
import '../../../controller/functions/audio_record1.dart';
@@ -194,7 +194,8 @@ class TripsRecordedPage extends StatelessWidget {
padding: EdgeInsets.zero,
child: const Icon(CupertinoIcons.share),
onPressed: () {
Share.shareFiles([audio.selectedFilePath!]);
Share.shareXFiles(
[XFile(audio.selectedFilePath!)]);
},
),
],