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

3/27/4

Browse Source
This commit is contained in:
Hamza Aleghwairyeen
2024-03-27 22:36:16 +03:00
parent 112ba96f91
commit 2c279a3c78
8 changed files with 93 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart
View File

@@ -1,4 +1,3 @@
import 'package:flutter/material.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
import 'package:get/get.dart';

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

@@ -208,15 +208,18 @@ class OrderRequestPage extends StatelessWidget {
Icons.arrow_circle_up,
color: AppColor.greenColor,
),
Text(myList[12] +
' ' +
'KM'.tr +
' ${myList[11]} ' +
'm'.tr),
Text(
myList[12] +
' ' +
'KM'.tr +
' ${myList[11]} ' +
'm'.tr,
style: AppStyle.title,
),
],
),
Text(
myList[30],
myList[29],
style: AppStyle.title,
),
],
@@ -224,20 +227,32 @@ class OrderRequestPage extends StatelessWidget {
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
const Icon(
Icons.arrow_circle_down,
color: AppColor.redColor,
Column(
children: [
const Icon(
Icons.arrow_circle_down,
color: AppColor.redColor,
),
Text(
myList[5] +
' ' +
'KM'.tr +
' ${myList[11]} ' +
'm'.tr,
style: AppStyle.title,
),
],
),
Text(
myList[30] + ' ' + 'KM'.tr,
style: AppStyle.title,
),
Text(myList[5] + ' ' + 'KM'.tr),
],
),
Text(
myList[31],
style: AppStyle.title,
),
],
),
],
@@ -300,36 +315,36 @@ class OrderRequestPage extends StatelessWidget {
),
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: RichText(
text: TextSpan(
text: 'Distance from Passenger to destination is '.tr,
style: AppStyle.title,
children: [
TextSpan(
text: myList[5].toString(),
style: AppStyle.headTitle2),
TextSpan(text: ' KM'.tr, style: AppStyle.title),
]),
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: RichText(
text: TextSpan(
text: 'Duration of Trip is '.tr,
style: AppStyle.title,
children: [
TextSpan(
text: hours > 1
? '${'Your Ride Duration is '.tr}$hours${' H and'.tr} $minutes m'
: '${'Your Ride Duration is '.tr} $minutes m',
style: AppStyle.title),
TextSpan(text: ' Minutes'.tr, style: AppStyle.title),
]),
),
),
// Padding(
// padding: const EdgeInsets.all(8.0),
// child: RichText(
// text: TextSpan(
// text: 'Distance from Passenger to destination is '.tr,
// style: AppStyle.title,
// children: [
// TextSpan(
// text: myList[5].toString(),
// style: AppStyle.headTitle2),
// TextSpan(text: ' KM'.tr, style: AppStyle.title),
// ]),
// ),
// ),
// Padding(
// padding: const EdgeInsets.all(8.0),
// child: RichText(
// text: TextSpan(
// text: 'Duration of Trip is '.tr,
// style: AppStyle.title,
// children: [
// TextSpan(
// text: hours > 1
// ? '${'Your Ride Duration is '.tr}$hours${' H and'.tr} $minutes m'
// : '${'Your Ride Duration is '.tr} $minutes m',
// style: AppStyle.title),
// TextSpan(text: ' Minutes'.tr, style: AppStyle.title),
// ]),
// ),
// ),
Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
@@ -365,8 +380,8 @@ class OrderRequestPage extends StatelessWidget {
// print(bodyToPassenger);
FirebaseMessagesController()
.sendNotificationToPassengerToken(
'Apply Ride',
arguments['DriverList'][9].toString(),
'Apply Ride','your ride is applied'.tr,
// arguments['DriverList'][9].toString(),
arguments['DriverList'][9].toString(),
// box.read(BoxName.tokenDriver).toString(),
bodyToPassenger,

3
lib/views/home/map_widget.dart/left_main_menu_icons.dart
View File

@@ -115,7 +115,8 @@ GetBuilder<MapPassengerController> leftMainMenuIcons() {
// NotificationController()
// .showNotification('Order', 'hi this is', 'tone1');
// Get.to(() => DriverCallPage());
print(controller.carLocationsModels);
// print(controller.carLocationsModels);
controller.getKazanPercent();
// PassengerCallPage(
// channelName: '',
// token: '',