Hamza/tripz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4/11/7

Browse Source
This commit is contained in:
Hamza Aleghwairyeen
2024-04-12 01:19:00 +03:00
parent 0e91e389e5
commit 40ec1a5362
4 changed files with 168 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/controller/home/map_passenger_controller.dart
View File

@@ -838,13 +838,24 @@ class MapPassengerController extends GetxController {
title: title,
titleStyle: AppStyle.title,
middleTextStyle: AppStyle.title,
content: IconButton(
content: Column(
children: [
IconButton(
onPressed: () async {
await textToSpeechController.speakText(midTitle);
},
icon: const Icon(Icons.headphones)),
middleText: midTitle,
confirm: MyElevatedButton(title: 'Ok'.tr, onPressed: onPressed),
Text(
midTitle,
style: AppStyle.title,
)
],
),
confirm: MyElevatedButton(
title: 'Ok'.tr,
onPressed: onPressed,
kolor: AppColor.greenColor,
),
cancel: MyElevatedButton(
title: 'Cancel',
onPressed: () {

2
lib/controller/local/translations.dart
View File

@@ -442,6 +442,8 @@ class MyTranslation extends Translations {
'Total points is ': "إجمالي النقاط هو",
'Total Connection Duration:': "إجمالي مدة الإتصال:",
' H and': "ساعة و",
'Arrival time': 'وقت الوصول ',
'arrival time to reach your point': 'الوقت المتوقع للوصول إلى وجهتك ',
'For Speed and Delivery trips, the price is calculated dynamically. For Comfort trips, the price is based on time and distance':
'بالنسبة لرحلات Speed والتوصيل، يتم حساب السعر بشكل ديناميكي. أما بالنسبة لرحلات الراحة، فيتم حساب السعر بناءً على الوقت والمسافة.',
'Hello this is Driver': "مرحبا هذا السائق",

17
lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
View File

@@ -62,7 +62,9 @@ GetBuilder<MapDriverController> driverEndRideBar() {
],
)
: const SizedBox(),
Row(
mapDriverController.carType != 'Mashwari' ||
mapDriverController.carType != 'Comfort'
? Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
Container(
@@ -106,7 +108,8 @@ GetBuilder<MapDriverController> driverEndRideBar() {
children: [
const Icon(Icons.attach_money),
Text(
mapDriverController.price.toStringAsFixed(2),
mapDriverController.price
.toStringAsFixed(2),
style: AppStyle.number,
),
],
@@ -114,7 +117,8 @@ GetBuilder<MapDriverController> driverEndRideBar() {
),
),
],
),
)
: const SizedBox(),
(mapDriverController.carType == 'Mashwari' ||
mapDriverController.carType == 'Comfort') &&
mapDriverController.remainingTimeTimerRideBegin > 60
@@ -163,7 +167,9 @@ GetBuilder<MapDriverController> driverEndRideBar() {
mapDriverController.carType != 'Mashwari'
? Stack(
children: [
LinearProgressIndicator(
SizedBox(
width: Get.width * .9,
child: LinearProgressIndicator(
backgroundColor: AppColor.accentColor,
color: mapDriverController
.remainingTimeTimerRideBegin <
@@ -171,11 +177,12 @@ GetBuilder<MapDriverController> driverEndRideBar() {
? AppColor.redColor
: AppColor.greenColor,
minHeight: 25,
borderRadius: BorderRadius.circular(15),
borderRadius: BorderRadius.circular(6),
value: mapDriverController
.progressTimerRideBegin
.toDouble(),
),
),
Center(
child: Text(
mapDriverController

37
lib/views/home/map_widget.dart/ride_begin_passenger.dart
View File

@@ -73,6 +73,16 @@ class RideBeginPassenger extends StatelessWidget {
),
],
),
Container(
decoration: AppStyle.boxDecoration1,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 4),
child: Text(
controller.licensePlate,
style: AppStyle.title,
),
),
),
Column(
children: [
Container(
@@ -99,7 +109,12 @@ class RideBeginPassenger extends StatelessWidget {
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
Container(
InkWell(
onTap: () {
controller.getDialog('Arrival time'.tr,
'arrival time to reach your point'.tr, () {});
},
child: Container(
width: Get.width * .15,
decoration: AppStyle.boxDecoration1,
child: Column(
@@ -115,6 +130,7 @@ class RideBeginPassenger extends StatelessWidget {
],
),
),
),
InkWell(
onTap: () {
controller.getDialog(
@@ -208,7 +224,10 @@ class RideBeginPassenger extends StatelessWidget {
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
IconButton(
Container(
decoration: AppStyle.boxDecoration1,
width: Get.width * .15,
child: IconButton(
onPressed: () async {
if (box.read(BoxName.sosPhonePassenger) == null) {
{
@@ -227,7 +246,11 @@ class RideBeginPassenger extends StatelessWidget {
color: AppColor.redColor,
),
),
IconButton(
),
Container(
decoration: AppStyle.boxDecoration1,
width: Get.width * .15,
child: IconButton(
onPressed: () async {
print(box.read(BoxName.sosPhonePassenger));
if (box.read(BoxName.sosPhonePassenger) == null ||
@@ -239,13 +262,14 @@ class RideBeginPassenger extends StatelessWidget {
profileController.prfoileData['sosPhone']);
}
} else {
String phoneNumber =
box.read(BoxName.sosPhonePassenger).toString();
String phoneNumber = box
.read(BoxName.sosPhonePassenger)
.toString();
// phoneNumber = phoneNumber.replaceAll('0', '');
print(phoneNumber); // Output: 798583061
var phone =
// '+${box.read(BoxName.countryCode)}${box.read(BoxName.sosPhonePassenger)}';
'+20${box.read(BoxName.sosPhonePassenger)}';
'${box.read(BoxName.sosPhonePassenger)}';
controller.sendWhatsapp(phone);
}
},
@@ -254,6 +278,7 @@ class RideBeginPassenger extends StatelessWidget {
color: AppColor.greenColor,
),
),
),
],
)
],