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

4/11/8

Browse Source
This commit is contained in:
Hamza Aleghwairyeen
2024-04-12 03:13:24 +03:00
parent 40ec1a5362
commit a84a304c72
7 changed files with 92 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart
View File

@@ -32,8 +32,8 @@ class PassengerInfoWindow extends StatelessWidget {
child: AnimatedContainer(
duration: const Duration(milliseconds: 300),
height: controller.passengerInfoWindowHeight,
width: Get.width * .99,
decoration: AppStyle.boxDecoration,
width: Get.width * .9,
decoration: AppStyle.boxDecoration1,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
@@ -112,42 +112,86 @@ class PassengerInfoWindow extends StatelessWidget {
)),
Row(
children: [
Text(
controller.hours > 1
? '⌚️ ${controller.hours}h ${controller.minutes}m' // Ride Duration with emoji
: '⌚️ ${controller.minutes}m', // Short ride duration
style: AppStyle.title,
Container(
decoration: AppStyle.boxDecoration1,
width: Get.width * .2,
child: Padding(
padding: const EdgeInsets.all(4.0),
child: Text(
controller.hours > 1
? '⌚️ ${controller.hours}h ${controller.minutes}m' // Ride Duration with emoji
: '⌚️ ${controller.minutes}m', // Short ride duration
style: AppStyle.number,
),
),
),
const SizedBox(
width: 16.0), // Add spacing between sections
Text(
' ${controller.distance}km', // Distance with emoji
style: AppStyle.title,
Container(
decoration: AppStyle.boxDecoration1,
width: Get.width * .2,
child: Padding(
padding: const EdgeInsets.all(4),
child: Text(
' ${controller.distance} km', // Distance with emoji
style: AppStyle.number,
),
),
),
const SizedBox(
width: 16.0), // Add spacing between sections
Text(
' ${controller.passengerName}', // Passenger name with emoji
style: AppStyle.title,
Container(
decoration: AppStyle.boxDecoration1,
width: Get.width * .2,
child: Padding(
padding: const EdgeInsets.all(4.0),
child: Text(
controller
.passengerName, // Passenger name with emoji
style: AppStyle.title,
),
),
),
],
),
Card(
elevation: 5,
color: AppColor.greenColor,
child: Padding(
padding: const EdgeInsets.all(4),
child: Row(
children: [
Text('Total Cost is '.tr,
style: AppStyle.title),
Text(
controller.totalPassenger.toString(),
style: AppStyle.title,
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
Container(
decoration: AppStyle.boxDecoration1,
width: Get.width * .5,
child: Padding(
padding: const EdgeInsets.all(4),
child: Row(
children: [
Text('Total Cost is '.tr,
style: AppStyle.title),
Text(
controller.totalPassenger.toString(),
style: AppStyle.title,
),
],
),
],
),
),
),
Container(
decoration: AppStyle.boxDecoration1,
width: Get.width * .2,
child: Padding(
padding: const EdgeInsets.all(4),
child: Row(
children: [
Text(controller.carType,
style: AppStyle.title),
Text(
controller.totalPassenger.toString(),
style: AppStyle.title,
),
],
),
),
),
],
),
controller.remainingTimeToPassenger != 0
? Stack(

7
lib/views/home/Captin/orderCaptin/order_request_page.dart
View File

@@ -251,7 +251,8 @@ class OrderRequestPage extends StatelessWidget {
padding: const EdgeInsets.all(8.0),
child: RichText(
text: TextSpan(
text: 'Passenger: '.tr, // Changed text to be more generic
text: 'Passenger name : '
.tr, // Changed text to be more generic
style: AppStyle.subtitle,
children: [
TextSpan(
@@ -279,9 +280,7 @@ class OrderRequestPage extends StatelessWidget {
style: AppStyle.title,
children: [
TextSpan(
text:
orderRequestController.mpg.toStringAsFixed(0),
style: AppStyle.headTitle2),
text: myList[27], style: AppStyle.headTitle2),
],
),
),

7
lib/views/home/Captin/orderCaptin/order_speed_request.dart
View File

@@ -266,7 +266,8 @@ class OrderSpeedRequest extends StatelessWidget {
padding: const EdgeInsets.all(8.0),
child: RichText(
text: TextSpan(
text: 'Passenger: '.tr, // Changed text to be more generic
text: 'Passenger name : '
.tr, // Changed text to be more generic
style: AppStyle.subtitle,
children: [
TextSpan(
@@ -292,9 +293,7 @@ class OrderSpeedRequest extends StatelessWidget {
text: 'Cost Of Trip IS '.tr,
style: AppStyle.title,
children: [
TextSpan(
text: orderRequestController.mpg.toStringAsFixed(0),
style: AppStyle.headTitle2),
TextSpan(text: myList[27], style: AppStyle.headTitle2),
],
),
),

2
lib/views/home/map_widget.dart/ride_from_start_app.dart
View File

@@ -155,7 +155,7 @@ class RideFromStartApp extends StatelessWidget {
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);
}
},