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

6/9/1

Browse Source
This commit is contained in:
Hamza-Ayed
2024-06-15 21:10:06 +03:00
parent e04b594860
commit 03cd18dae0
30 changed files with 710 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/views/home/map_widget.dart/apply_order_widget.dart
View File

@@ -33,8 +33,9 @@ class ApplyOrderWidget extends StatelessWidget {
if (box.read(BoxName.carType) == 'Speed' ||
box.read(BoxName.carType) == 'Delivery') {
Get.snackbar(
'This price is ${controller.totalPassenger.toStringAsFixed(2)}'
.tr,
'This price is'.tr +
' ${controller.totalPassenger.toStringAsFixed(2)}'
.tr,
'This ride type does not allow changes to the destination or additional stops'
.tr,
snackPosition: SnackPosition.BOTTOM,
@@ -108,7 +109,7 @@ class ApplyOrderWidget extends StatelessWidget {
children: [
Image.asset(
'assets/images/blob.png',
width: 100,
width: 80,
),
Column(
children: [
@@ -165,7 +166,7 @@ class ApplyOrderWidget extends StatelessWidget {
Get.defaultDialog(
title: 'Select one message'.tr,
titleStyle: AppStyle.title,
content: Container(
content: SizedBox(
height: Get.height * .5,
child: Column(
mainAxisAlignment:
@@ -391,6 +392,8 @@ class TimeDriverToPassenger extends StatelessWidget {
children: [
Text(
'The driver on your way'.tr,
style: AppStyle.title
.copyWith(color: AppColor.yellowColor),
textAlign: TextAlign.center,
),
const SizedBox(

6
lib/views/home/map_widget.dart/map_menu_widget.dart
View File

@@ -7,7 +7,7 @@ import 'package:get/get.dart';
import 'package:get/get_rx/src/rx_typedefs/rx_typedefs.dart';
import 'package:SEFER/constant/style.dart';
import 'package:SEFER/views/home/my_wallet/passenger_wallet.dart';
import 'package:SEFER/views/home/profile/feed_back_page.dart';
import 'package:SEFER/views/home/profile/complaint_page.dart';
import 'package:SEFER/views/home/profile/order_history.dart';
import 'package:SEFER/views/home/profile/promos_passenger_page.dart';
import 'package:SEFER/views/home/profile/taarif_page.dart';
@@ -188,9 +188,9 @@ class MapMenuWidget extends StatelessWidget {
),
IconMainPageMap(
onTap: () {
Get.to(() => FeedBackPage());
Get.to(() => ComplaintPage());
},
title: 'Feed Back'.tr,
title: 'Complaint'.tr,
icon: Icons.feedback,
),
IconMainPageMap(

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

@@ -1,5 +1,5 @@
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/views/home/profile/feed_back_page.dart';
import 'package:SEFER/views/home/profile/complaint_page.dart';
import 'package:SEFER/views/widgets/elevated_btn.dart';
import 'package:flutter/material.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
@@ -32,7 +32,7 @@ class RideBeginPassenger extends StatelessWidget {
right: 10,
bottom: 4,
child: Container(
decoration: AppStyle.boxDecoration,
decoration: AppStyle.boxDecoration1,
height: controller.statusRide == 'Begin' ? Get.height * .33 : 0,
// width: 100,
child: Padding(
@@ -51,14 +51,14 @@ class RideBeginPassenger extends StatelessWidget {
Column(
children: [
Container(
decoration: AppStyle.boxDecoration1,
decoration: AppStyle.boxDecoration,
child: Text(
controller.firstName,
style: AppStyle.title,
),
),
Container(
decoration: AppStyle.boxDecoration1,
decoration: AppStyle.boxDecoration,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
@@ -79,7 +79,7 @@ class RideBeginPassenger extends StatelessWidget {
children: <Widget>[
const Text(''),
Container(
decoration: AppStyle.boxDecoration1,
decoration: AppStyle.boxDecoration,
child: Padding(
padding:
const EdgeInsets.symmetric(horizontal: 4),
@@ -94,7 +94,7 @@ class RideBeginPassenger extends StatelessWidget {
Column(
children: [
Container(
decoration: AppStyle.boxDecoration1,
decoration: AppStyle.boxDecoration,
child: Padding(
padding: const EdgeInsets.all(3),
child: Text(
@@ -124,7 +124,7 @@ class RideBeginPassenger extends StatelessWidget {
},
child: Container(
width: Get.width * .15,
decoration: AppStyle.boxDecoration1,
decoration: AppStyle.boxDecoration,
child: Column(
children: [
Text(
@@ -150,7 +150,7 @@ class RideBeginPassenger extends StatelessWidget {
},
child: Container(
width: Get.width * .15,
decoration: AppStyle.boxDecoration1,
decoration: AppStyle.boxDecoration,
child: Column(
children: [
Text(
@@ -167,10 +167,10 @@ class RideBeginPassenger extends StatelessWidget {
),
Container(
width: Get.width * .15,
decoration: AppStyle.boxDecoration1,
decoration: AppStyle.boxDecoration,
child: IconButton(
onPressed: () => Get.to(
() => FeedBackPage(),
() => ComplaintPage(),
transition: Transition.downToUp,
),
icon: const Icon(
@@ -182,7 +182,7 @@ class RideBeginPassenger extends StatelessWidget {
),
Container(
width: Get.width * .15,
decoration: AppStyle.boxDecoration1,
decoration: AppStyle.boxDecoration,
child: audioController.isRecording == false
? IconButton(
onPressed: () async {
@@ -237,7 +237,7 @@ class RideBeginPassenger extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
Container(
decoration: AppStyle.boxDecoration1,
decoration: AppStyle.boxDecoration,
width: Get.width * .15,
child: IconButton(
onPressed: () async {
@@ -260,7 +260,7 @@ class RideBeginPassenger extends StatelessWidget {
),
),
Container(
decoration: AppStyle.boxDecoration1,
decoration: AppStyle.boxDecoration,
width: Get.width * .15,
child: IconButton(
onPressed: () async {
@@ -292,6 +292,19 @@ class RideBeginPassenger extends StatelessWidget {
),
),
),
Container(
decoration: AppStyle.boxDecoration,
width: Get.width * .15,
child: IconButton(
onPressed: () async {
await controller.getTokenForParent();
},
icon: const Icon(
Foundation.record,
color: AppColor.yellowColor,
),
),
),
],
)
],

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

@@ -115,7 +115,7 @@ Widget _buildTimer(MapPassengerController mapPassengerController) {
SizedBox(
width: 100,
child: Form(
key: mapPassengerController.increasFeeFormKey,
key: mapPassengerController.increaseFeeFormKey,
child: MyTextForm(
controller: mapPassengerController
.increasFeeFromPassenger,