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

10/14/1

Browse Source
This commit is contained in:
Hamza-Ayed
2023-10-14 15:03:19 +03:00
parent c1e4c74356
commit 642820c55b
24 changed files with 191 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
lib/views/Rate/rate_captain.dart
View File

@@ -8,9 +8,9 @@ import '../../controller/rate/rate_conroller.dart';
import '../widgets/elevated_btn.dart';
import '../widgets/my_scafold.dart';
class RateCaptain extends StatelessWidget {
RateCaptain({super.key});
final RatePassengerController controller = Get.put(RatePassengerController());
class RateCaptainFromPassenger extends StatelessWidget {
RateCaptainFromPassenger({super.key});
final RateController controller = Get.put(RateController());
@override
Widget build(BuildContext context) {
return MyScafolld(
@@ -72,45 +72,43 @@ class RateCaptain extends StatelessWidget {
const SizedBox(
height: 20,
),
Form(
child: SizedBox(
width: Get.width * .75,
child: TextFormField(
maxLines: 4,
minLines: 1,
keyboardType: TextInputType.multiline,
controller: controller.comment,
decoration: InputDecoration(
labelText: 'Enter your Note'.tr,
hintText: 'Type something...',
prefixIcon: const Icon(
Icons.rate_review), // Add an icon as a prefix
suffixIcon: IconButton(
icon: const Icon(
Icons.clear,
color: AppColor.redColor,
), // Add an icon as a suffix
onPressed: () {
controller.comment.clear();
},
),
border:
const OutlineInputBorder(), // Add a border around the input field
enabledBorder: const OutlineInputBorder(
borderSide: BorderSide(
color: Colors
.blue), // Customize the border color
),
focusedBorder: const OutlineInputBorder(
borderSide: BorderSide(
color: Colors
.green), // Customize the border color when focused
),
errorBorder: const OutlineInputBorder(
borderSide: BorderSide(
color: Colors
.red), // Customize the border color when there's an error
),
SizedBox(
width: Get.width * .75,
child: TextFormField(
maxLines: 4,
minLines: 1,
keyboardType: TextInputType.multiline,
controller: controller.comment,
decoration: InputDecoration(
labelText: 'Enter your Note'.tr,
hintText: 'Type something...',
prefixIcon: const Icon(
Icons.rate_review), // Add an icon as a prefix
suffixIcon: IconButton(
icon: const Icon(
Icons.clear,
color: AppColor.redColor,
), // Add an icon as a suffix
onPressed: () {
controller.comment.clear();
},
),
border:
const OutlineInputBorder(), // Add a border around the input field
enabledBorder: const OutlineInputBorder(
borderSide: BorderSide(
color:
Colors.blue), // Customize the border color
),
focusedBorder: const OutlineInputBorder(
borderSide: BorderSide(
color: Colors
.green), // Customize the border color when focused
),
errorBorder: const OutlineInputBorder(
borderSide: BorderSide(
color: Colors
.red), // Customize the border color when there's an error
),
),
),
@@ -120,7 +118,7 @@ class RateCaptain extends StatelessWidget {
),
MyElevatedButton(
title: 'Submit rating'.tr,
onPressed: () => controller.addRateToPassenger())
onPressed: () => controller.addRateToDriver())
],
),
)),

77
lib/views/Rate/rate_passenger.dart
View File

@@ -10,7 +10,7 @@ import '../../constant/style.dart';
import '../../controller/rate/rate_conroller.dart';
class RatePassenger extends StatelessWidget {
final RatePassengerController controller = Get.put(RatePassengerController());
final RateController controller = Get.put(RateController());
RatePassenger({super.key});
@@ -75,45 +75,42 @@ class RatePassenger extends StatelessWidget {
const SizedBox(
height: 20,
),
Form(
child: SizedBox(
width: Get.width * .75,
child: TextFormField(
maxLines: 4,
minLines: 1,
keyboardType: TextInputType.multiline,
controller: controller.comment,
decoration: InputDecoration(
labelText: 'Enter your Note'.tr,
hintText: 'Type something...',
prefixIcon: const Icon(
Icons.rate_review), // Add an icon as a prefix
suffixIcon: IconButton(
icon: const Icon(
Icons.clear,
color: AppColor.redColor,
), // Add an icon as a suffix
onPressed: () {
controller.comment.clear();
},
),
border:
const OutlineInputBorder(), // Add a border around the input field
enabledBorder: const OutlineInputBorder(
borderSide: BorderSide(
color:
Colors.blue), // Customize the border color
),
focusedBorder: const OutlineInputBorder(
borderSide: BorderSide(
color: Colors
.green), // Customize the border color when focused
),
errorBorder: const OutlineInputBorder(
borderSide: BorderSide(
color: Colors
.red), // Customize the border color when there's an error
),
SizedBox(
width: Get.width * .75,
child: TextFormField(
maxLines: 4,
minLines: 1,
keyboardType: TextInputType.multiline,
controller: controller.comment,
decoration: InputDecoration(
labelText: 'Enter your Note'.tr,
hintText: 'Type something...',
prefixIcon: const Icon(
Icons.rate_review), // Add an icon as a prefix
suffixIcon: IconButton(
icon: const Icon(
Icons.clear,
color: AppColor.redColor,
), // Add an icon as a suffix
onPressed: () {
controller.comment.clear();
},
),
border:
const OutlineInputBorder(), // Add a border around the input field
enabledBorder: const OutlineInputBorder(
borderSide: BorderSide(
color: Colors.blue), // Customize the border color
),
focusedBorder: const OutlineInputBorder(
borderSide: BorderSide(
color: Colors
.green), // Customize the border color when focused
),
errorBorder: const OutlineInputBorder(
borderSide: BorderSide(
color: Colors
.red), // Customize the border color when there's an error
),
),
),

34
lib/views/home/map_page.dart
View File

@@ -1,5 +1,3 @@
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
@@ -8,7 +6,6 @@ import 'package:ride/constant/style.dart';
import 'package:ride/controller/home/map_passenger_controller.dart';
import 'package:ride/views/home/map_widget.dart/cancel_raide_page.dart';
import 'package:ride/views/home/map_widget.dart/ride_begin_passenger.dart';
import 'package:ride/views/widgets/circle_container.dart';
import 'package:ride/views/widgets/elevated_btn.dart';
import 'package:ride/views/widgets/mycircular.dart';
@@ -16,12 +13,10 @@ import '../../controller/home/menu_controller.dart';
import 'map_widget.dart/buttom_sheet_map_show.dart';
import 'map_widget.dart/cash_confirm_bottom_page.dart';
import 'map_widget.dart/driver_card_from_passenger.dart';
import 'map_widget.dart/driver_time_arrive_passenger.dart';
import 'map_widget.dart/left_main_menu_icons.dart';
import 'map_widget.dart/main_bottom_Menu_map.dart';
import 'map_widget.dart/map_menu_widget.dart';
import 'map_widget.dart/menu_map_page.dart';
import 'map_widget.dart/passenger_info_window.dart';
import 'map_widget.dart/payment_method.page.dart';
import 'map_widget.dart/timer_for_cancell_trip_from_passenger.dart';
import 'map_widget.dart/timer_to_passenger_from_driver.dart';
@@ -34,35 +29,6 @@ class MapPage extends StatelessWidget {
Get.put(MapPassengerController());
Get.put(MyMenuController());
return Scaffold(
// appBar: AppBar(),
// drawer: Drawer(
// child: ListView(
// padding: EdgeInsets.zero,
// children: [
// ListTile(
// onTap: () {
// Get.to(() => const PassengerWallet());
// },
// leading: Icon(Icons.wallet),
// title: Text('My Wallet'),
// ),
// ListTile(
// onTap: () async {
// // await OrderHistoryController().getOrderHistoryByPassenger();
// Get.to(() => const OrderHistory());
// },
// leading: Icon(Icons.history),
// title: Text('Order History'),
// ),
// ListTile(
// onTap: () {},
// leading: Icon(Icons.money),
// title: Text('Tariff'),
// ),
// ],
// ),
// ),
body: SafeArea(
child: Stack(
children: [

35
lib/views/home/map_widget.dart/driver_card_from_passenger.dart
View File

@@ -43,8 +43,8 @@ GetBuilder<MapPassengerController> hexagonClipper() {
// icon: const Icon(Icons.add),
// ),
Text(
controller.dataCarsLocationByPassenger['message'][0]
['phone']
controller.dataCarsLocationByPassenger['message']
[controller.carsOrder]['phone']
.toString(),
style: AppStyle.title,
),
@@ -52,21 +52,21 @@ GetBuilder<MapPassengerController> hexagonClipper() {
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Text(
controller.dataCarsLocationByPassenger['message'][0]
['first_name']
controller.dataCarsLocationByPassenger['message']
[controller.carsOrder]['first_name']
.toString() +
' ' +
controller
.dataCarsLocationByPassenger['message'][0]
['last_name']
.dataCarsLocationByPassenger['message']
[controller.carsOrder]['last_name']
.toString(),
style: AppStyle.title,
),
Text(
'Age is '.tr +
controller
.dataCarsLocationByPassenger['message'][0]
['age']
.dataCarsLocationByPassenger['message']
[controller.carsOrder]['age']
.toString(),
style: AppStyle.title,
),
@@ -76,29 +76,30 @@ GetBuilder<MapPassengerController> hexagonClipper() {
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Text(
controller.dataCarsLocationByPassenger['message'][0]
['make']
controller.dataCarsLocationByPassenger['message']
[controller.carsOrder]['make']
.toString(),
style: AppStyle.title,
),
Text(
controller.dataCarsLocationByPassenger['message'][0]
['model']
controller.dataCarsLocationByPassenger['message']
[controller.carsOrder]['model']
.toString(),
style: AppStyle.title,
),
Text(
controller.dataCarsLocationByPassenger['message'][0]
['seats']
controller.dataCarsLocationByPassenger['message']
[controller.carsOrder]['seats']
.toString(),
style: AppStyle.title,
),
],
),
Text(
controller.dataCarsLocationByPassenger['message'][0]
['model']
.toString(),
'Rating is '.tr +
controller.dataCarsLocationByPassenger['message']
[controller.carsOrder]['ratingDriver']
.toString(),
style: AppStyle.title,
),
],

1
lib/views/home/map_widget.dart/passenger_info_window.dart
View File

@@ -177,6 +177,7 @@ class PassengerInfoWindow extends StatelessWidget {
? const SizedBox()
: MyElevatedButton(
title: 'Start the Ride'.tr,
kolor: AppColor.greenColor,
onPressed: () {
controller.startRideFromDriver();
}),

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

@@ -1,15 +1,10 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/constant/links.dart';
import 'package:ride/views/widgets/elevated_btn.dart';
import '../../../constant/box_name.dart';
import '../../../constant/colors.dart';
import '../../../constant/style.dart';
import '../../../controller/firebase/firbase_messge.dart';
import '../../../controller/functions/crud.dart';
import '../../../controller/home/map_passenger_controller.dart';
import '../../../main.dart';
class RideBeginPassenger extends StatelessWidget {
const RideBeginPassenger({

2
lib/views/home/my_wallet/passenger_wallet.dart
View File

@@ -388,7 +388,7 @@ class PassengerWallet extends StatelessWidget {
payload: {
'passenger_id': box
.read(BoxName
.pasengerID)
.passengerID)
.toString(),
'balance': controller
.selectedAmount

2
lib/views/home/profile/passenger_profile_page.dart
View File

@@ -22,7 +22,7 @@ class PassengerProfilePage extends StatelessWidget {
action: MyElevatedButton(
title: 'Delete My Account'.tr,
onPressed: () {
LogOut().deleteMyAccount(box.read(BoxName.pasengerID).toString());
LogOut().deleteMyAccount(box.read(BoxName.passengerID).toString());
}),
title: 'My Profile'.tr,
body: [

2
lib/views/orderCaptin/driver_map_page.dart
View File

@@ -7,10 +7,8 @@ import 'package:ride/views/widgets/my_scafold.dart';
import '../../constant/colors.dart';
import '../../constant/style.dart';
import '../../controller/functions/launch.dart';
import '../../controller/functions/location_controller.dart';
import '../home/map_widget.dart/passenger_info_window.dart';
import '../home/map_widget.dart/timer_to_passenger_from_driver.dart';
class PassengerLocationDirection extends StatelessWidget {
PassengerLocationDirection({super.key});

5
lib/views/orderCaptin/order_request_page.dart
View File

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/constant/box_name.dart';
import 'package:ride/controller/firebase/firbase_messge.dart';
import 'package:ride/controller/home/captin/map_driver_controller.dart';
import 'package:ride/main.dart';
import 'package:ride/views/orderCaptin/driver_map_page.dart';
import 'package:ride/views/widgets/my_scafold.dart';
@@ -162,6 +163,8 @@ class OrderRequestPage extends StatelessWidget {
MyElevatedButton(
title: 'Apply Order'.tr,
onPressed: () async {
box.write(BoxName.statusDriverLocation, 'on');
orderRequestController.changeApplied();
await CRUD().postFromDialogue(
link: AppLink.addDriverOrder,
@@ -234,7 +237,7 @@ class OrderRequestPage extends StatelessWidget {
box.read(BoxName.tokenDriver).toString(),
];
orderRequestController.refuseOrder(
myList[6].toString(), body.toString());
myList[16].toString(), body.toString());
FirebaseMessagesController()
.sendNotificationToPassengerToken(