11/21/1
This commit is contained in:
@@ -148,8 +148,8 @@ android {
|
|||||||
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
|
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
|
||||||
minSdk = 23
|
minSdk = 23
|
||||||
targetSdk = flutter.targetSdkVersion
|
targetSdk = flutter.targetSdkVersion
|
||||||
versionCode = 98
|
versionCode = 99
|
||||||
versionName = '1.5.98'
|
versionName = '1.5.99'
|
||||||
multiDexEnabled =true
|
multiDexEnabled =true
|
||||||
|
|
||||||
// manifestPlaceholders can be specified here if needed
|
// manifestPlaceholders can be specified here if needed
|
||||||
|
|||||||
@@ -41,11 +41,11 @@
|
|||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>70</string>
|
<string>71</string>
|
||||||
<key>CFBundleSignature</key>
|
<key>CFBundleSignature</key>
|
||||||
<string>????</string>
|
<string>????</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>4.3.70</string>
|
<string>4.3.71</string>
|
||||||
<key>NSHumanReadableCopyright</key>
|
<key>NSHumanReadableCopyright</key>
|
||||||
<string></string>
|
<string></string>
|
||||||
<key>FirebaseAppDelegateProxyEnabled</key>
|
<key>FirebaseAppDelegateProxyEnabled</key>
|
||||||
|
|||||||
@@ -146,6 +146,7 @@ class MapPassengerController extends GetxController {
|
|||||||
double naturePrice = 0;
|
double naturePrice = 0;
|
||||||
bool heightMenuBool = false;
|
bool heightMenuBool = false;
|
||||||
String statusRide = 'wait';
|
String statusRide = 'wait';
|
||||||
|
String statusRideVip = 'wait';
|
||||||
bool statusRideFromStart = false;
|
bool statusRideFromStart = false;
|
||||||
bool isPickerShown = false;
|
bool isPickerShown = false;
|
||||||
bool isPointsPageForRider = false;
|
bool isPointsPageForRider = false;
|
||||||
@@ -747,9 +748,91 @@ class MapPassengerController extends GetxController {
|
|||||||
// update();
|
// update();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int progressTimerRideBeginVip = 0;
|
||||||
|
int elapsedTimeInSeconds = 0; // Timer starts from 0
|
||||||
|
String stringElapsedTimeRideBegin = '0:00';
|
||||||
|
String stringElapsedTimeRideBeginVip = '0:00';
|
||||||
|
bool rideInProgress = true; // To control when to stop the timer
|
||||||
|
|
||||||
|
void rideIsBeginPassengerTimerVIP() async {
|
||||||
|
rideInProgress = true; // Start the ride timer
|
||||||
|
bool sendSOS = false;
|
||||||
|
while (rideInProgress) {
|
||||||
|
await Future.delayed(const Duration(seconds: 1));
|
||||||
|
|
||||||
|
// Increment elapsed time
|
||||||
|
elapsedTimeInSeconds++;
|
||||||
|
|
||||||
|
// Update the time display
|
||||||
|
int minutes = (elapsedTimeInSeconds / 60).floor();
|
||||||
|
int seconds = elapsedTimeInSeconds % 60;
|
||||||
|
stringElapsedTimeRideBeginVip =
|
||||||
|
'$minutes:${seconds.toString().padLeft(2, '0')}';
|
||||||
|
|
||||||
|
// Check for speed and SOS conditions
|
||||||
|
if (speed > 100 && !sendSOS) {
|
||||||
|
Get.defaultDialog(
|
||||||
|
barrierDismissible: false,
|
||||||
|
title: "Warning: Speeding detected!".tr,
|
||||||
|
titleStyle: AppStyle.title,
|
||||||
|
content: Text(
|
||||||
|
"We noticed the speed is exceeding 100 km/h. Please slow down for your safety. If you feel unsafe, you can share your trip details with a contact or call the police using the red SOS button."
|
||||||
|
.tr,
|
||||||
|
style: AppStyle.title,
|
||||||
|
),
|
||||||
|
confirm: MyElevatedButton(
|
||||||
|
title: "Share Trip Details".tr,
|
||||||
|
onPressed: () {
|
||||||
|
Get.back();
|
||||||
|
// Implement sharing trip details logic here
|
||||||
|
String message = "**Emergency SOS from Passenger:**\n";
|
||||||
|
|
||||||
|
// Get trip details from GetX or relevant provider
|
||||||
|
String origin = passengerLocation.toString();
|
||||||
|
String destination = myDestination.toString();
|
||||||
|
String driverName = firstName;
|
||||||
|
String driverCarPlate = licensePlate;
|
||||||
|
|
||||||
|
// Add trip details to the message
|
||||||
|
message += "* ${'Origin'.tr}: $origin\n";
|
||||||
|
message += "* ${'Destination'.tr}: $destination\n";
|
||||||
|
message += "* ${'Driver Name'.tr}: $driverName\n";
|
||||||
|
message += "* ${'Driver Car Plate'.tr}: $driverCarPlate\n\n";
|
||||||
|
message += "* ${'Driver Phone'.tr}: $driverPhone\n\n";
|
||||||
|
|
||||||
|
// Add current location
|
||||||
|
message +=
|
||||||
|
"${'Current Location'.tr}:https://www.google.com/maps/place/${passengerLocation.latitude},${passengerLocation.longitude} \n";
|
||||||
|
|
||||||
|
// Append a call to action
|
||||||
|
message += "Please help! Contact me as soon as possible.".tr;
|
||||||
|
|
||||||
|
// Launch WhatsApp communication
|
||||||
|
launchCommunication(
|
||||||
|
'whatsapp', box.read(BoxName.sosPhonePassenger), message);
|
||||||
|
sendSOS = true;
|
||||||
|
},
|
||||||
|
kolor: AppColor.redColor,
|
||||||
|
),
|
||||||
|
cancel: MyElevatedButton(
|
||||||
|
title: "Cancel".tr,
|
||||||
|
onPressed: () {
|
||||||
|
Get.back();
|
||||||
|
},
|
||||||
|
kolor: AppColor.greenColor,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update the UI
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void tripFinishedFromDriver() async {
|
void tripFinishedFromDriver() async {
|
||||||
isRideFinished = true;
|
isRideFinished = true;
|
||||||
rideTimerBegin = false;
|
rideTimerBegin = false;
|
||||||
|
statusRideVip = 'Finished';
|
||||||
box.write(BoxName.arrivalTime, '');
|
box.write(BoxName.arrivalTime, '');
|
||||||
remainingTimeTimerRideBegin = 0;
|
remainingTimeTimerRideBegin = 0;
|
||||||
box.write(BoxName.passengerWalletTotal, '0');
|
box.write(BoxName.passengerWalletTotal, '0');
|
||||||
@@ -795,6 +878,22 @@ class MapPassengerController extends GetxController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
begiVIPTripFromPassenger() async {
|
||||||
|
timeToPassengerFromDriverAfterApplied = 0;
|
||||||
|
remainingTime = 0;
|
||||||
|
isBottomSheetShown = false;
|
||||||
|
remainingTimeToPassengerFromDriverAfterApplied = 0;
|
||||||
|
remainingTimeDriverWaitPassenger5Minute = 0;
|
||||||
|
rideTimerBegin = true;
|
||||||
|
statusRideVip = 'Begin';
|
||||||
|
isDriverInPassengerWay = false;
|
||||||
|
isDriverArrivePassenger = false;
|
||||||
|
update();
|
||||||
|
// isCancelRidePageShown = true;
|
||||||
|
rideIsBeginPassengerTimerVIP();
|
||||||
|
runWhenRideIsBegin();
|
||||||
|
}
|
||||||
|
|
||||||
Map rideStatusFromStartApp = {};
|
Map rideStatusFromStartApp = {};
|
||||||
getRideStatusFromStartApp() async {
|
getRideStatusFromStartApp() async {
|
||||||
try {
|
try {
|
||||||
@@ -1053,6 +1152,7 @@ class MapPassengerController extends GetxController {
|
|||||||
late String driverRate = '';
|
late String driverRate = '';
|
||||||
late String firstName = '';
|
late String firstName = '';
|
||||||
late String carColor = '';
|
late String carColor = '';
|
||||||
|
late String colorHex = '';
|
||||||
late String carYear = '';
|
late String carYear = '';
|
||||||
late String model = '';
|
late String model = '';
|
||||||
late String make = '';
|
late String make = '';
|
||||||
@@ -1099,6 +1199,8 @@ class MapPassengerController extends GetxController {
|
|||||||
.toString();
|
.toString();
|
||||||
carColor =
|
carColor =
|
||||||
dataCarsLocationByPassenger['data'][carsOrder]['color'].toString();
|
dataCarsLocationByPassenger['data'][carsOrder]['color'].toString();
|
||||||
|
colorHex = dataCarsLocationByPassenger['data'][carsOrder]['color_hex'] ??
|
||||||
|
'#A52A2A';
|
||||||
driverRate = dataCarsLocationByPassenger['data'][carsOrder]
|
driverRate = dataCarsLocationByPassenger['data'][carsOrder]
|
||||||
['ratingDriver']
|
['ratingDriver']
|
||||||
.toString();
|
.toString();
|
||||||
@@ -1971,7 +2073,10 @@ class MapPassengerController extends GetxController {
|
|||||||
return jsonDecode(response)['data'];
|
return jsonDecode(response)['data'];
|
||||||
}
|
}
|
||||||
|
|
||||||
late String driverCarModel, driverCarMake, driverLicensePlate, driverName;
|
late String driverCarModel,
|
||||||
|
driverCarMake,
|
||||||
|
driverLicensePlate,
|
||||||
|
driverName = '';
|
||||||
getUpdatedRideForDriverApply(String rideId) async {
|
getUpdatedRideForDriverApply(String rideId) async {
|
||||||
// if (isDriversTokensSend) {
|
// if (isDriversTokensSend) {
|
||||||
final res = await CRUD().get(
|
final res = await CRUD().get(
|
||||||
@@ -4597,12 +4702,13 @@ class MapPassengerController extends GetxController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future mishwariOption() async {
|
Future mishwariOption() async {
|
||||||
// isBottomSheetShown = false;
|
isLoading = true;
|
||||||
update();
|
update();
|
||||||
// add dialoug for select driver and car
|
// add dialoug for select driver and car
|
||||||
await selectDriverAndCarForMishwariTrip();
|
await selectDriverAndCarForMishwariTrip();
|
||||||
Future.delayed(Duration.zero);
|
Future.delayed(Duration.zero);
|
||||||
|
isLoading = false;
|
||||||
|
update();
|
||||||
Get.to(() => CupertinoDriverListWidget());
|
Get.to(() => CupertinoDriverListWidget());
|
||||||
|
|
||||||
// changeCashConfirmPageShown();
|
// changeCashConfirmPageShown();
|
||||||
@@ -4651,13 +4757,62 @@ class MapPassengerController extends GetxController {
|
|||||||
if (response != 'failure') {
|
if (response != 'failure') {
|
||||||
// Trip saved successfully
|
// Trip saved successfully
|
||||||
// Get.snackbar('Success'.tr, 'Trip booked successfully'.tr);
|
// Get.snackbar('Success'.tr, 'Trip booked successfully'.tr);
|
||||||
var id = response['message'].toString();
|
var id = response['message']['id'].toString();
|
||||||
|
await CRUD().post(
|
||||||
|
link: '${AppLink.seferCairoServer}/ride/rides/add.php',
|
||||||
|
payload: {
|
||||||
|
"start_location":
|
||||||
|
'${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
|
||||||
|
"end_location":
|
||||||
|
'${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
|
||||||
|
"date": DateTime.now().toString(),
|
||||||
|
"time": DateTime.now().toString(),
|
||||||
|
"endtime":
|
||||||
|
DateTime.now().add(const Duration(hours: 2)).toString(),
|
||||||
|
"price": '50',
|
||||||
|
"passenger_id": box.read(BoxName.passengerID).toString(),
|
||||||
|
"driver_id": driver['driver_id'].toString(),
|
||||||
|
"status": "waiting",
|
||||||
|
'carType': 'vip',
|
||||||
|
"price_for_driver": '50',
|
||||||
|
"price_for_passenger": '50',
|
||||||
|
"distance": '20',
|
||||||
|
"paymentMethod": 'cash',
|
||||||
|
}).then((value) {
|
||||||
|
if (value is String) {
|
||||||
|
final parsedValue = jsonDecode(value);
|
||||||
|
rideId = parsedValue['message'];
|
||||||
|
} else if (value is Map) {
|
||||||
|
rideId = value['message'];
|
||||||
|
} else {
|
||||||
|
Log.print('Unexpected response type: ${value.runtimeType}');
|
||||||
|
}
|
||||||
|
});
|
||||||
if (AppLink.endPoint != AppLink.seferCairoServer) {
|
if (AppLink.endPoint != AppLink.seferCairoServer) {
|
||||||
await CRUD().post(
|
await CRUD().post(
|
||||||
link: "${AppLink.endPoint}/ride/mishwari/add.php",
|
link: "${AppLink.endPoint}/ride/mishwari/add.php",
|
||||||
payload: tripData);
|
payload: tripData);
|
||||||
|
CRUD().post(link: '${AppLink.endPoint}/ride/rides/add.php', payload: {
|
||||||
|
"start_location":
|
||||||
|
'${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
|
||||||
|
"end_location":
|
||||||
|
'${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
|
||||||
|
"date": DateTime.now().toString(),
|
||||||
|
"time": DateTime.now().toString(),
|
||||||
|
"endtime": DateTime.now().add(const Duration(hours: 2)).toString(),
|
||||||
|
"price": '50',
|
||||||
|
"passenger_id": box.read(BoxName.passengerID).toString(),
|
||||||
|
"driver_id": driver['driver_id'].toString(),
|
||||||
|
"status": "waiting",
|
||||||
|
'carType': 'vip',
|
||||||
|
"price_for_driver": '50',
|
||||||
|
"price_for_passenger": '50',
|
||||||
|
"distance": '20',
|
||||||
|
"paymentMethod": 'cash',
|
||||||
|
});
|
||||||
}
|
}
|
||||||
driverIdVip = driver['driver_id'];
|
driverIdVip = driver['driver_id'].toString();
|
||||||
|
driverId = driver['driver_id'].toString();
|
||||||
|
|
||||||
DateTime timeSelected = DateTime.parse(tripDateTime.toIso8601String());
|
DateTime timeSelected = DateTime.parse(tripDateTime.toIso8601String());
|
||||||
Get.find<NotificationController>().scheduleNotificationsForTimeSelected(
|
Get.find<NotificationController>().scheduleNotificationsForTimeSelected(
|
||||||
@@ -4667,35 +4822,41 @@ class MapPassengerController extends GetxController {
|
|||||||
timeSelected);
|
timeSelected);
|
||||||
// Optionally, set up local notification or send a push notification
|
// Optionally, set up local notification or send a push notification
|
||||||
|
|
||||||
// await FirebaseMessagesController().sendNotificationToDriverMAP(
|
await FirebaseMessagesController().sendNotificationToDriverMAP(
|
||||||
// 'OrderVIP',
|
'OrderVIP',
|
||||||
// rideId.toString(),
|
rideId.toString(),
|
||||||
// driver['token'].toString(),
|
driver['token'].toString(),
|
||||||
// [
|
[
|
||||||
// id,
|
id,
|
||||||
// driver['id'],
|
driver['id'],
|
||||||
// passengerLocation.latitude.toString(),
|
passengerLocation.latitude.toString(),
|
||||||
// passengerLocation.longitude.toString(),
|
passengerLocation.longitude.toString(),
|
||||||
// box.read(BoxName.name).toString(),
|
box.read(BoxName.name).toString(),
|
||||||
// box.read(BoxName.passengerID).toString(),
|
box.read(BoxName.passengerID).toString(),
|
||||||
// box.read(BoxName.phone).toString(),
|
box.read(BoxName.phone).toString(),
|
||||||
// box.read(BoxName.email).toString(),
|
box.read(BoxName.email).toString(),
|
||||||
// box.read(BoxName.passengerPhotoUrl).toString(),
|
box.read(BoxName.passengerPhotoUrl).toString(),
|
||||||
// box.read(BoxName.tokenFCM).toString(),
|
box.read(BoxName.tokenFCM).toString(),
|
||||||
// driver['token'].toString(),
|
driver['token'].toString(),
|
||||||
// ],
|
],
|
||||||
// 'order.wav');
|
'order.wav');
|
||||||
if (response['message'] == "Trip updated successfully") {
|
if (response['message'] == "Trip updated successfully") {
|
||||||
mySnackbarSuccess("Trip updated successfully".tr);
|
mySnackbarSuccess("Trip updated successfully".tr);
|
||||||
// FirebaseMessagesController().sendNotificationToDriverMAP(
|
Log.print(
|
||||||
// 'Order VIP Canceld'.tr,
|
'previous_driver_token: ${response['previous_driver_token']}');
|
||||||
// 'Passenger cancel order'.tr,
|
|
||||||
// token,
|
FirebaseMessagesController().sendNotificationToDriverMAP(
|
||||||
// [],
|
'Order VIP Canceld'.tr,
|
||||||
// 'cancel.wav',
|
'Passenger cancel order'.tr,
|
||||||
// );
|
response['previous_driver_token'].toString(),
|
||||||
|
[],
|
||||||
|
'cancel.wav',
|
||||||
|
);
|
||||||
}
|
}
|
||||||
Get.to(() => const VipWaittingPage());
|
// data = [];
|
||||||
|
isBottomSheetShown = false;
|
||||||
|
update();
|
||||||
|
Get.to(() => VipWaittingPage());
|
||||||
} else {
|
} else {
|
||||||
throw Exception('Failed to save trip');
|
throw Exception('Failed to save trip');
|
||||||
}
|
}
|
||||||
@@ -4723,6 +4884,16 @@ class MapPassengerController extends GetxController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sendToDriverAgain(String token) {
|
||||||
|
FirebaseMessagesController().sendNotificationToDriverMAP(
|
||||||
|
'Order VIP Canceld'.tr,
|
||||||
|
'Passenger cancel order'.tr,
|
||||||
|
token,
|
||||||
|
[],
|
||||||
|
'cancel.wav',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
initilizeGetStorage() async {
|
initilizeGetStorage() async {
|
||||||
if (box.read(BoxName.addWork) == null) {
|
if (box.read(BoxName.addWork) == null) {
|
||||||
box.write(BoxName.addWork, 'addWork');
|
box.write(BoxName.addWork, 'addWork');
|
||||||
|
|||||||
@@ -1,29 +1,125 @@
|
|||||||
|
import 'dart:async';
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
|
||||||
|
import 'package:SEFER/constant/box_name.dart';
|
||||||
import 'package:SEFER/constant/colors.dart';
|
import 'package:SEFER/constant/colors.dart';
|
||||||
|
import 'package:SEFER/constant/links.dart';
|
||||||
import 'package:SEFER/constant/style.dart';
|
import 'package:SEFER/constant/style.dart';
|
||||||
import 'package:SEFER/controller/home/map_passenger_controller.dart';
|
import 'package:SEFER/controller/home/map_passenger_controller.dart';
|
||||||
|
import 'package:SEFER/main.dart';
|
||||||
import 'package:SEFER/views/widgets/elevated_btn.dart';
|
import 'package:SEFER/views/widgets/elevated_btn.dart';
|
||||||
|
import 'package:SEFER/views/widgets/my_scafold.dart';
|
||||||
import 'package:SEFER/views/widgets/mycircular.dart';
|
import 'package:SEFER/views/widgets/mycircular.dart';
|
||||||
|
import 'package:SEFER/views/widgets/mysnakbar.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_font_icons/flutter_font_icons.dart';
|
import 'package:flutter_font_icons/flutter_font_icons.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:intl/intl.dart';
|
import 'package:intl/intl.dart';
|
||||||
|
|
||||||
import '../../constant/links.dart';
|
|
||||||
import '../functions/crud.dart';
|
import '../functions/crud.dart';
|
||||||
|
|
||||||
|
class VipOrderController extends GetxController {
|
||||||
|
RxBool isLoading = false.obs;
|
||||||
|
final arguments = Get.arguments;
|
||||||
|
RxList<dynamic> tripData = <dynamic>[].obs;
|
||||||
|
RxBool isButtonVisible = false.obs;
|
||||||
|
RxInt countdown = 60.obs;
|
||||||
|
Timer? _countdownTimer;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void onInit() {
|
||||||
|
super.onInit();
|
||||||
|
fetchOrder();
|
||||||
|
startCountdown();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void onClose() {
|
||||||
|
_countdownTimer?.cancel();
|
||||||
|
super.onClose();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> fetchOrder() async {
|
||||||
|
try {
|
||||||
|
isLoading.value = true;
|
||||||
|
var mapPassengerController = Get.find<MapPassengerController>();
|
||||||
|
|
||||||
|
var res = await CRUD().get(
|
||||||
|
link: AppLink.getMishwari,
|
||||||
|
payload: {
|
||||||
|
// 'driverId': mapPassengerController.driverIdVip.toString(),
|
||||||
|
'driverId': box.read(BoxName.passengerID).toString(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
if (res != 'failure') {
|
||||||
|
var decodedResponse = jsonDecode(res);
|
||||||
|
if (decodedResponse['message'] is List) {
|
||||||
|
tripData.value = decodedResponse['message'];
|
||||||
|
} else {
|
||||||
|
tripData.clear(); // Ensure empty list if no data
|
||||||
|
mySnackeBarError('No trip data found');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
tripData.clear();
|
||||||
|
mySnackeBarError('Failed to fetch trip data');
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
tripData.clear();
|
||||||
|
mySnackeBarError('An error occurred: $e');
|
||||||
|
} finally {
|
||||||
|
isLoading.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void startCountdown() {
|
||||||
|
_countdownTimer?.cancel(); // Cancel any existing timer
|
||||||
|
countdown.value = 60;
|
||||||
|
|
||||||
|
_countdownTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
|
||||||
|
if (countdown.value > 0) {
|
||||||
|
countdown.value--;
|
||||||
|
} else {
|
||||||
|
timer.cancel();
|
||||||
|
isButtonVisible.value = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void sendToDriverAgain() {
|
||||||
|
// Reset states
|
||||||
|
isButtonVisible.value = false;
|
||||||
|
fetchOrder(); // Refresh order
|
||||||
|
startCountdown(); // Restart countdown
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
class VipWaittingPage extends StatelessWidget {
|
class VipWaittingPage extends StatelessWidget {
|
||||||
const VipWaittingPage({super.key});
|
VipWaittingPage({super.key});
|
||||||
|
final VipOrderController vipOrderController = Get.put(VipOrderController());
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
Get.put(VipOrderController());
|
return MyScafolld(
|
||||||
return Scaffold(
|
title: "Waiting VIP".tr,
|
||||||
appBar: AppBar(
|
body: [
|
||||||
title: Text("Waiting VIP".tr),
|
Obx(() {
|
||||||
|
// Loading state
|
||||||
|
if (vipOrderController.isLoading.value) {
|
||||||
|
return const Center(child: MyCircularProgressIndicator());
|
||||||
|
}
|
||||||
|
|
||||||
|
// No data state
|
||||||
|
if (vipOrderController.tripData.isEmpty) {
|
||||||
|
return Center(
|
||||||
|
child: Text(
|
||||||
|
'No trip data available'.tr,
|
||||||
|
style: AppStyle.title,
|
||||||
),
|
),
|
||||||
body: GetBuilder<VipOrderController>(builder: (vipOrderController) {
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Data available
|
||||||
var data = vipOrderController.tripData[0];
|
var data = vipOrderController.tripData[0];
|
||||||
|
|
||||||
// Function to get the localized status string
|
// Function to get the localized status string
|
||||||
@@ -33,10 +129,14 @@ class VipWaittingPage extends StatelessWidget {
|
|||||||
return 'pending'.tr;
|
return 'pending'.tr;
|
||||||
case 'accepted':
|
case 'accepted':
|
||||||
return 'accepted'.tr;
|
return 'accepted'.tr;
|
||||||
|
case 'begin':
|
||||||
|
return 'begin'.tr;
|
||||||
case 'rejected':
|
case 'rejected':
|
||||||
return 'rejected'.tr;
|
return 'rejected'.tr;
|
||||||
|
case 'cancelled':
|
||||||
|
return 'cancelled'.tr;
|
||||||
default:
|
default:
|
||||||
return 'unknown'.tr; // Fallback for unexpected statuses
|
return 'unknown'.tr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -47,16 +147,18 @@ class VipWaittingPage extends StatelessWidget {
|
|||||||
return Colors.yellow;
|
return Colors.yellow;
|
||||||
case 'accepted':
|
case 'accepted':
|
||||||
return Colors.green;
|
return Colors.green;
|
||||||
|
case 'begin':
|
||||||
|
return Colors.green;
|
||||||
case 'rejected':
|
case 'rejected':
|
||||||
return Colors.red;
|
return Colors.red;
|
||||||
|
case 'cancelled':
|
||||||
|
return Colors.red;
|
||||||
default:
|
default:
|
||||||
return Colors.grey; // Default color for unknown statuses
|
return Colors.grey;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return vipOrderController.isLoading
|
return Card(
|
||||||
? const MyCircularProgressIndicator()
|
|
||||||
: Card(
|
|
||||||
elevation: 4,
|
elevation: 4,
|
||||||
shape: RoundedRectangleBorder(
|
shape: RoundedRectangleBorder(
|
||||||
borderRadius: BorderRadius.circular(12),
|
borderRadius: BorderRadius.circular(12),
|
||||||
@@ -99,30 +201,28 @@ class VipWaittingPage extends StatelessWidget {
|
|||||||
SizedBox(
|
SizedBox(
|
||||||
width: 100,
|
width: 100,
|
||||||
height: 100,
|
height: 100,
|
||||||
child: Icon(Fontisto.car,
|
child: Icon(
|
||||||
|
Fontisto.car,
|
||||||
size: 80,
|
size: 80,
|
||||||
color: Color(int.parse(data['color_hex']
|
color: Color(
|
||||||
.replaceFirst('#', '0xff'))))),
|
int.parse(
|
||||||
|
data['color_hex'].replaceFirst('#', '0xff'),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
// Text(
|
|
||||||
// "${'Driver Phone:'.tr} ${data['phone']}",
|
|
||||||
// style: AppStyle.title,
|
|
||||||
// ),
|
|
||||||
const SizedBox(height: 12),
|
const SizedBox(height: 12),
|
||||||
const Divider(),
|
const Divider(),
|
||||||
const SizedBox(height: 12),
|
const SizedBox(height: 12),
|
||||||
|
|
||||||
Container(
|
Container(
|
||||||
color: getStatusColor(
|
color: getStatusColor(data['status']),
|
||||||
data['status']), // Correctly assigns a Color
|
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.all(8.0),
|
padding: const EdgeInsets.all(8.0),
|
||||||
child: Text(
|
child: Text(
|
||||||
"${'Trip Status:'.tr} ${getLocalizedStatus(data['status'])}", // Uses the String function
|
"${'Trip Status:'.tr} ${getLocalizedStatus(data['status'])}",
|
||||||
style: const TextStyle(
|
style: const TextStyle(fontSize: 16),
|
||||||
fontSize: 16,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -134,7 +234,8 @@ class VipWaittingPage extends StatelessWidget {
|
|||||||
Row(
|
Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
children: [
|
children: [
|
||||||
MyElevatedButton(
|
data['status'].toString() != 'begin'
|
||||||
|
? MyElevatedButton(
|
||||||
title: "Cancel Trip".tr,
|
title: "Cancel Trip".tr,
|
||||||
kolor: AppColor.redColor,
|
kolor: AppColor.redColor,
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
@@ -143,48 +244,80 @@ class VipWaittingPage extends StatelessWidget {
|
|||||||
data['id'].toString(),
|
data['id'].toString(),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
)
|
||||||
|
: const SizedBox(),
|
||||||
|
Obx(() {
|
||||||
|
// If countdown is still running, show countdown
|
||||||
|
if (!vipOrderController.isButtonVisible.value) {
|
||||||
|
return Column(
|
||||||
|
children: [
|
||||||
|
CircularProgressIndicator(
|
||||||
|
value: 1 -
|
||||||
|
(vipOrderController.countdown.value / 60),
|
||||||
|
strokeWidth: 6.0,
|
||||||
|
color: AppColor.greenColor,
|
||||||
|
backgroundColor: AppColor.accentColor,
|
||||||
),
|
),
|
||||||
// MyElevatedButton(
|
const SizedBox(height: 10),
|
||||||
// title: "Accept Trip".tr,
|
Text(
|
||||||
// kolor: AppColor.greenColor,
|
"${vipOrderController.countdown.value}s ${'remaining'.tr}",
|
||||||
// onPressed: () {
|
style: const TextStyle(fontSize: 16),
|
||||||
// // Add your cancel trip logic here
|
),
|
||||||
// },
|
],
|
||||||
// ),
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Once countdown is complete, show "Send to Driver Again" button
|
||||||
|
return MyElevatedButton(
|
||||||
|
title: "Send to Driver Again".tr,
|
||||||
|
kolor: AppColor.greenColor,
|
||||||
|
onPressed: () {
|
||||||
|
Get.find<MapPassengerController>()
|
||||||
|
.sendToDriverAgain(data['token']);
|
||||||
|
vipOrderController.fetchOrder();
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
const SizedBox(
|
||||||
|
height: 30,
|
||||||
|
),
|
||||||
|
data['status'].toString() == 'begin'
|
||||||
|
? MyElevatedButton(
|
||||||
|
title: "Click here to begin your trip\n\nGood luck, "
|
||||||
|
.tr +
|
||||||
|
box.read(BoxName.name).toString(),
|
||||||
|
kolor: AppColor.greenColor,
|
||||||
|
onPressed: () {
|
||||||
|
final mapPassengerController =
|
||||||
|
Get.find<MapPassengerController>();
|
||||||
|
mapPassengerController.make = data['make'];
|
||||||
|
mapPassengerController.licensePlate =
|
||||||
|
data['car_plate'];
|
||||||
|
mapPassengerController.model = data['model'];
|
||||||
|
mapPassengerController.driverId = data['driverId'];
|
||||||
|
mapPassengerController.carColor = data['color'];
|
||||||
|
mapPassengerController.driverRate = data['rating'];
|
||||||
|
mapPassengerController.colorHex = data['color_hex'];
|
||||||
|
mapPassengerController.driverPhone = data['phone'];
|
||||||
|
mapPassengerController.driverToken = data['token'];
|
||||||
|
mapPassengerController.driverName =
|
||||||
|
data['name'].toString().split(' ')[0];
|
||||||
|
|
||||||
|
Get.back();
|
||||||
|
|
||||||
|
mapPassengerController.begiVIPTripFromPassenger();
|
||||||
|
},
|
||||||
|
)
|
||||||
|
: const SizedBox()
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}),
|
}),
|
||||||
|
],
|
||||||
|
isleading: true,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class VipOrderController extends GetxController {
|
|
||||||
bool isLoading = false;
|
|
||||||
final arguments = Get.arguments;
|
|
||||||
late String body;
|
|
||||||
List tripData = [];
|
|
||||||
|
|
||||||
fetchOrder() async {
|
|
||||||
isLoading = true;
|
|
||||||
update();
|
|
||||||
var res = await CRUD().get(link: AppLink.getMishwari, payload: {
|
|
||||||
'driverId': Get.find<MapPassengerController>().driverIdVip.toString(),
|
|
||||||
});
|
|
||||||
isLoading = false;
|
|
||||||
update();
|
|
||||||
if (res != 'failure') {
|
|
||||||
tripData = jsonDecode(res)['message'];
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
void onInit() async {
|
|
||||||
fetchOrder();
|
|
||||||
super.onInit();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -4,8 +4,10 @@ class MyTranslation extends Translations {
|
|||||||
@override
|
@override
|
||||||
Map<String, Map<String, String>> get keys => {
|
Map<String, Map<String, String>> get keys => {
|
||||||
"ar": {
|
"ar": {
|
||||||
|
"Send to Driver Again": "إرسال إلى السائق مرة أخرى",
|
||||||
"Driver Name:": "اسم السائق:",
|
"Driver Name:": "اسم السائق:",
|
||||||
"Car Plate:": "رقم اللوحة:",
|
'No trip data available': "لا توجد بيانات رحلة متاحة",
|
||||||
|
"Car Plate:": "رقم اللوحة:", "remaining": "متبقي",
|
||||||
"Order Cancelled": "تم إلغاء الطلب",
|
"Order Cancelled": "تم إلغاء الطلب",
|
||||||
'You canceled VIP trip': "ألغيت الرحلة",
|
'You canceled VIP trip': "ألغيت الرحلة",
|
||||||
"Passenger cancelled order": "الراكب قام بإلغاء الطلب",
|
"Passenger cancelled order": "الراكب قام بإلغاء الطلب",
|
||||||
@@ -797,7 +799,7 @@ iOS [https://getapp.cc/app/6458734951]
|
|||||||
'Selected Date and Time': "التاريخ والوقت المحددان",
|
'Selected Date and Time': "التاريخ والوقت المحددان",
|
||||||
"Lets check Car license ":
|
"Lets check Car license ":
|
||||||
"دَعْنَا نَتَحَقَّق مِن رُخْصَة السَّيَّارَة ",
|
"دَعْنَا نَتَحَقَّق مِن رُخْصَة السَّيَّارَة ",
|
||||||
'Driver List': 'قائمة السائقين',
|
// 'Driver List': 'قائمة السائقين',
|
||||||
'Car': 'السيارة',
|
'Car': 'السيارة',
|
||||||
'Plate': 'لوحة السيارة',
|
'Plate': 'لوحة السيارة',
|
||||||
'N/A': 'غير متوفر',
|
'N/A': 'غير متوفر',
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import 'map_widget.dart/payment_method.page.dart';
|
|||||||
import 'map_widget.dart/points_page_for_rider.dart';
|
import 'map_widget.dart/points_page_for_rider.dart';
|
||||||
import 'map_widget.dart/ride_from_start_app.dart';
|
import 'map_widget.dart/ride_from_start_app.dart';
|
||||||
import 'map_widget.dart/searching_captain_window.dart';
|
import 'map_widget.dart/searching_captain_window.dart';
|
||||||
|
import 'map_widget.dart/vip_begin.dart';
|
||||||
|
|
||||||
class MapPagePassenger extends StatelessWidget {
|
class MapPagePassenger extends StatelessWidget {
|
||||||
const MapPagePassenger({super.key});
|
const MapPagePassenger({super.key});
|
||||||
@@ -63,6 +64,7 @@ class MapPagePassenger extends StatelessWidget {
|
|||||||
// const TimerToPassengerFromDriver(),
|
// const TimerToPassengerFromDriver(),
|
||||||
const PassengerRideLocationWidget(),
|
const PassengerRideLocationWidget(),
|
||||||
const RideBeginPassenger(),
|
const RideBeginPassenger(),
|
||||||
|
const VipRideBeginPassenger(),
|
||||||
const RideFromStartApp(),
|
const RideFromStartApp(),
|
||||||
cancelRidePage(),
|
cancelRidePage(),
|
||||||
const MenuIconMapPageWidget(),
|
const MenuIconMapPageWidget(),
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_font_icons/flutter_font_icons.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||||
import '../../../constant/colors.dart';
|
import '../../../constant/colors.dart';
|
||||||
import '../../../controller/functions/crud.dart';
|
|
||||||
import '../../../controller/functions/tts.dart';
|
import '../../../controller/functions/tts.dart';
|
||||||
import '../../../controller/home/map_passenger_controller.dart';
|
import '../../../controller/home/map_passenger_controller.dart';
|
||||||
import '../../../controller/home/vip_waitting_page.dart';
|
import '../../../controller/home/vip_waitting_page.dart';
|
||||||
@@ -91,14 +91,32 @@ GetBuilder<MapPassengerController> leftMainMenuIcons() {
|
|||||||
borderRadius: BorderRadius.circular(15)),
|
borderRadius: BorderRadius.circular(15)),
|
||||||
child: IconButton(
|
child: IconButton(
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
Get.to(() => const VipWaittingPage());
|
Get.to(() => VipWaittingPage());
|
||||||
},
|
},
|
||||||
icon: const Icon(
|
icon: const Icon(
|
||||||
Icons.voice_chat,
|
Octicons.watch, // Replace this with your desired VIP icon
|
||||||
size: 29,
|
size: 29,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
// AnimatedContainer(
|
||||||
|
// duration: const Duration(microseconds: 200),
|
||||||
|
// width: controller.widthMapTypeAndTraffic,
|
||||||
|
// decoration: BoxDecoration(
|
||||||
|
// color: AppColor.secondaryColor,
|
||||||
|
// border: Border.all(),
|
||||||
|
// borderRadius: BorderRadius.circular(15)),
|
||||||
|
// child: IconButton(
|
||||||
|
// onPressed: () async {
|
||||||
|
// print(Get.put(MapPassengerController()).data);
|
||||||
|
// },
|
||||||
|
// icon: const Icon(
|
||||||
|
// Octicons
|
||||||
|
// .telescope, // Replace this with your desired VIP icon
|
||||||
|
// size: 29,
|
||||||
|
// ),
|
||||||
|
// ),
|
||||||
|
// ),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
})),
|
})),
|
||||||
|
|||||||
319
lib/views/home/map_widget.dart/vip_begin.dart
Normal file
319
lib/views/home/map_widget.dart/vip_begin.dart
Normal file
@@ -0,0 +1,319 @@
|
|||||||
|
import 'package:SEFER/constant/links.dart';
|
||||||
|
import 'package:SEFER/views/home/profile/complaint_page.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_font_icons/flutter_font_icons.dart';
|
||||||
|
import 'package:get/get.dart';
|
||||||
|
import 'package:SEFER/constant/box_name.dart';
|
||||||
|
import 'package:SEFER/controller/profile/profile_controller.dart';
|
||||||
|
import 'package:SEFER/main.dart';
|
||||||
|
|
||||||
|
import '../../../constant/colors.dart';
|
||||||
|
import '../../../constant/style.dart';
|
||||||
|
import '../../../controller/functions/audio_record1.dart';
|
||||||
|
import '../../../controller/functions/launch.dart';
|
||||||
|
import '../../../controller/functions/toast.dart';
|
||||||
|
import '../../../controller/home/map_passenger_controller.dart';
|
||||||
|
|
||||||
|
class VipRideBeginPassenger extends StatelessWidget {
|
||||||
|
const VipRideBeginPassenger({
|
||||||
|
super.key,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
ProfileController profileController = Get.put(ProfileController());
|
||||||
|
AudioRecorderController audioController =
|
||||||
|
Get.put(AudioRecorderController());
|
||||||
|
// Get.put(MapPassengerController());
|
||||||
|
return GetBuilder<MapPassengerController>(builder: (controller) {
|
||||||
|
if (controller.statusRideVip == 'Begin' ||
|
||||||
|
!controller.statusRideFromStart) {
|
||||||
|
return Positioned(
|
||||||
|
left: 10,
|
||||||
|
right: 10,
|
||||||
|
bottom: 10,
|
||||||
|
child: Container(
|
||||||
|
decoration: AppStyle.boxDecoration,
|
||||||
|
height: controller.statusRideVip == 'Begin' ? Get.height * .33 : 0,
|
||||||
|
// width: 100,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(8.0),
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceAround,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
CircleAvatar(
|
||||||
|
radius: 30,
|
||||||
|
backgroundImage: NetworkImage(
|
||||||
|
'${AppLink.server}/portrate_captain_image/${controller.driverId}.jpg',
|
||||||
|
),
|
||||||
|
onBackgroundImageError: (_, __) {
|
||||||
|
// Handle error here
|
||||||
|
},
|
||||||
|
backgroundColor: Colors.grey,
|
||||||
|
child: const Icon(
|
||||||
|
Icons.person, // Default icon or placeholder
|
||||||
|
size: 30,
|
||||||
|
color: Colors.white,
|
||||||
|
), // Placeholder background color
|
||||||
|
),
|
||||||
|
Column(
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
decoration: AppStyle.boxDecoration,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: 6, vertical: 2),
|
||||||
|
child: Text(
|
||||||
|
controller.driverName,
|
||||||
|
style: AppStyle.title,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(
|
||||||
|
height: 10,
|
||||||
|
),
|
||||||
|
Container(
|
||||||
|
decoration: AppStyle.boxDecoration,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: 6, vertical: 2),
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment:
|
||||||
|
MainAxisAlignment.spaceAround,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
controller.make,
|
||||||
|
style: AppStyle.title,
|
||||||
|
),
|
||||||
|
const SizedBox(
|
||||||
|
width: 10,
|
||||||
|
),
|
||||||
|
Text(
|
||||||
|
controller.model,
|
||||||
|
style: AppStyle.title,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Column(
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
decoration: AppStyle.boxDecoration,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(3),
|
||||||
|
child: Text(
|
||||||
|
'vip',
|
||||||
|
style: AppStyle.title,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Text(
|
||||||
|
'${controller.driverRate} 📈',
|
||||||
|
style: AppStyle.title,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
// SizedBox(
|
||||||
|
// height: 5,
|
||||||
|
// ),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceAround,
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
width: Get.width * .15,
|
||||||
|
decoration: AppStyle.boxDecoration,
|
||||||
|
child: IconButton(
|
||||||
|
onPressed: () => Get.to(
|
||||||
|
() => ComplaintPage(),
|
||||||
|
transition: Transition.downToUp,
|
||||||
|
),
|
||||||
|
icon: const Icon(
|
||||||
|
Icons.note_add,
|
||||||
|
color: AppColor.redColor,
|
||||||
|
),
|
||||||
|
tooltip: ' Add Note', // Optional tooltip for clarity
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Container(
|
||||||
|
width: Get.width * .15,
|
||||||
|
decoration: AppStyle.boxDecoration,
|
||||||
|
child: audioController.isRecording == false
|
||||||
|
? IconButton(
|
||||||
|
onPressed: () async {
|
||||||
|
await audioController.startRecording();
|
||||||
|
Toast.show(context, 'Start Record'.tr,
|
||||||
|
AppColor.greenColor);
|
||||||
|
},
|
||||||
|
icon: const Icon(
|
||||||
|
Icons.play_circle_fill_outlined,
|
||||||
|
color: AppColor.greenColor,
|
||||||
|
),
|
||||||
|
tooltip:
|
||||||
|
' Add Note', // Optional tooltip for clarity
|
||||||
|
)
|
||||||
|
: IconButton(
|
||||||
|
onPressed: () async {
|
||||||
|
await audioController.stopRecording();
|
||||||
|
Toast.show(context, 'Record saved'.tr,
|
||||||
|
AppColor.greenColor);
|
||||||
|
},
|
||||||
|
icon: const Icon(
|
||||||
|
Icons.stop_circle,
|
||||||
|
color: AppColor.greenColor,
|
||||||
|
),
|
||||||
|
tooltip:
|
||||||
|
' Add Note', // Optional tooltip for clarity
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceAround,
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
decoration: AppStyle.boxDecoration,
|
||||||
|
width: Get.width * .15,
|
||||||
|
child: IconButton(
|
||||||
|
onPressed: () async {
|
||||||
|
if (box.read(BoxName.sosPhonePassenger) == null) {
|
||||||
|
{
|
||||||
|
await profileController.updatField(
|
||||||
|
'sosPhone', TextInputType.phone);
|
||||||
|
box.write(BoxName.sosPhonePassenger,
|
||||||
|
profileController.prfoileData['sosPhone']);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
makePhoneCall('122');
|
||||||
|
// box.read(BoxName.sosPhonePassenger));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
icon: const Icon(
|
||||||
|
Icons.sos_rounded,
|
||||||
|
color: AppColor.redColor,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Container(
|
||||||
|
decoration: AppStyle.boxDecoration,
|
||||||
|
width: Get.width * .15,
|
||||||
|
child: IconButton(
|
||||||
|
onPressed: () async {
|
||||||
|
if (box.read(BoxName.sosPhonePassenger) == null ||
|
||||||
|
box.read(BoxName.sosPhonePassenger) == 'sos') {
|
||||||
|
{
|
||||||
|
await profileController.updatField(
|
||||||
|
'sosPhone', TextInputType.phone);
|
||||||
|
box.write(BoxName.sosPhonePassenger,
|
||||||
|
profileController.prfoileData['sosPhone']);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
String phoneNumber = box
|
||||||
|
.read(BoxName.sosPhonePassenger)
|
||||||
|
.toString();
|
||||||
|
// phoneNumber = phoneNumber.replaceAll('0', '');
|
||||||
|
var phone = box.read(BoxName.countryCode) ==
|
||||||
|
'Egypt'
|
||||||
|
? '+2${box.read(BoxName.sosPhonePassenger)}'
|
||||||
|
: '+962${box.read(BoxName.sosPhonePassenger)}';
|
||||||
|
controller.sendWhatsapp(phone);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
icon: const Icon(
|
||||||
|
FontAwesome.whatsapp,
|
||||||
|
color: AppColor.greenColor,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Container(
|
||||||
|
decoration: AppStyle.boxDecoration,
|
||||||
|
width: Get.width * .15,
|
||||||
|
child: IconButton(
|
||||||
|
onPressed: () async {
|
||||||
|
await controller.getTokenForParent();
|
||||||
|
},
|
||||||
|
icon: const Icon(
|
||||||
|
AntDesign.Safety,
|
||||||
|
color: AppColor.blueColor,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Stack(
|
||||||
|
children: [
|
||||||
|
// StreamCounter(),
|
||||||
|
LinearProgressIndicator(
|
||||||
|
backgroundColor: AppColor.accentColor,
|
||||||
|
color:
|
||||||
|
// controller.remainingTimeTimerRideBegin < 60
|
||||||
|
// ? AppColor.redColor
|
||||||
|
// :
|
||||||
|
AppColor.greenColor,
|
||||||
|
minHeight: 25,
|
||||||
|
borderRadius: BorderRadius.circular(15),
|
||||||
|
value:
|
||||||
|
24 //controller.progressTimerRideBegin.toDouble(),
|
||||||
|
),
|
||||||
|
Center(
|
||||||
|
child: Text(
|
||||||
|
controller.stringElapsedTimeRideBeginVip,
|
||||||
|
style: AppStyle.title,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return const SizedBox();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class StreamCounter extends StatelessWidget {
|
||||||
|
const StreamCounter({Key? key}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
// Build the UI based on the timer value
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
Get.put(MapPassengerController());
|
||||||
|
return GetBuilder<MapPassengerController>(builder: (controller) {
|
||||||
|
return StreamBuilder<int>(
|
||||||
|
initialData: 0,
|
||||||
|
stream: controller.timerController.stream,
|
||||||
|
builder: (context, snapshot) {
|
||||||
|
// Calculate the remaining time based on the current tick
|
||||||
|
final remainingTime = controller.durationToRide - snapshot.data!;
|
||||||
|
|
||||||
|
// Format the remaining time as a string
|
||||||
|
final formattedRemainingTime =
|
||||||
|
'${(remainingTime / 60).floor()}:${(remainingTime % 60).toString().padLeft(2, '0')}';
|
||||||
|
|
||||||
|
// Return the UI widgets based on the remaining time
|
||||||
|
return Column(
|
||||||
|
children: [
|
||||||
|
Text(formattedRemainingTime),
|
||||||
|
// ElevatedButton(
|
||||||
|
// onPressed: () {
|
||||||
|
// // Handle button press here
|
||||||
|
// },
|
||||||
|
// ),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user