Hamza/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

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: [