This commit is contained in:
Hamza-Ayed
2024-11-09 10:49:04 +02:00
parent fc81405b7a
commit 213c2724aa
44 changed files with 3009 additions and 1130 deletions

View File

@@ -27,7 +27,7 @@ class ApplyOrderWidget extends StatelessWidget {
right: 0,
child: Container(
decoration: AppStyle.boxDecoration,
height: Get.height * .35,
height: Get.height * .36,
child: ListView(
children: [
InkWell(
@@ -87,11 +87,11 @@ class ApplyOrderWidget extends StatelessWidget {
width: 10,
),
Container(
height: Get.height * .3,
height: Get.height * .34,
width: Get.width * .9,
decoration: AppStyle.boxDecoration,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.end,
@@ -241,12 +241,13 @@ class ApplyOrderWidget extends StatelessWidget {
InkWell(
onTap: () {
FirebaseMessagesController()
.sendNotificationToAnyWithoutData(
'message From passenger',
.sendNotificationToDriverMAP(
'message From passenger'.tr,
'Hello, I\'m at the agreed-upon location'
.tr,
controller.driverToken
.toString(),
[],
'ding.wav',
);
Get.back();
@@ -272,11 +273,12 @@ class ApplyOrderWidget extends StatelessWidget {
InkWell(
onTap: () {
FirebaseMessagesController()
.sendNotificationToAnyWithoutData(
.sendNotificationToDriverMAP(
'message From passenger'.tr,
'My location is correct. You can search for me using the navigation app'
.tr,
controller.driverToken,
[],
'ding.wav',
);
Get.back();
@@ -302,11 +304,12 @@ class ApplyOrderWidget extends StatelessWidget {
InkWell(
onTap: () {
FirebaseMessagesController()
.sendNotificationToAnyWithoutData(
.sendNotificationToDriverMAP(
'message From passenger',
'My location is correct. You can search for me using the navigation app'
.tr,
controller.driverToken,
[],
'ding.wav',
);
Get.back();
@@ -331,11 +334,12 @@ class ApplyOrderWidget extends StatelessWidget {
InkWell(
onTap: () {
FirebaseMessagesController()
.sendNotificationToAnyWithoutData(
.sendNotificationToDriverMAP(
'message From passenger',
"How much longer will you be?"
.tr,
controller.driverToken,
[],
'ding.wav',
);
Get.back();
@@ -385,13 +389,14 @@ class ApplyOrderWidget extends StatelessWidget {
IconButton(
onPressed: () {
FirebaseMessagesController()
.sendNotificationToAnyWithoutData(
.sendNotificationToDriverMAP(
'message From passenger',
controller
.messageToDriver
.text,
controller
.driverToken,
[],
'ding.wav');
controller
.messageToDriver
@@ -466,7 +471,7 @@ class DriverArrivePassengerAndWaitMinute extends StatelessWidget {
color: controller.remainingTimeDriverWaitPassenger5Minute < 60
? AppColor.redColor
: AppColor.greenColor,
minHeight: 25,
minHeight: 15,
borderRadius: BorderRadius.circular(15),
value:
controller.progressTimerDriverWaitPassenger5Minute.toDouble(),
@@ -513,7 +518,7 @@ class TimeDriverToPassenger extends StatelessWidget {
Container(
decoration: AppStyle.boxDecoration,
width: Get.width * .7,
height: 35,
height: 15,
// color: AppColor.yellowColor,
),
Stack(