This commit is contained in:
Hamza-Ayed
2023-10-06 12:02:34 +03:00
parent edc3a4348d
commit 54e948e93b
14 changed files with 505 additions and 75 deletions

View File

@@ -74,7 +74,7 @@ class OrderRequestPage extends StatelessWidget {
padding: const EdgeInsets.all(8.0),
child: RichText(
text: TextSpan(
text: 'Tatal From Passenger is '.tr,
text: 'Total From Passenger is '.tr,
style: AppStyle.title,
children: [
TextSpan(
@@ -116,7 +116,7 @@ class OrderRequestPage extends StatelessWidget {
padding: const EdgeInsets.all(8.0),
child: RichText(
text: TextSpan(
text: 'Tatal For You is '.tr,
text: 'Total For You is '.tr,
style: AppStyle.title,
children: [
TextSpan(
@@ -179,7 +179,7 @@ class OrderRequestPage extends StatelessWidget {
];
// print(bodyToPassenger);
FirebaseMessagesController()
.sendNotificanToPassengerToken(
.sendNotificationToPassengerToken(
'Apply Ride',
arguments['DriverList'][9].toString(),
arguments['DriverList'][9].toString(),
@@ -189,6 +189,16 @@ class OrderRequestPage extends StatelessWidget {
Get.back();
Get.to(() => PassengerLocationDirection(), arguments: {
'passengerLocation': myList[0].toString(),
'Duration': myList[4].toString(),
'Distance': myList[5].toString(),
'name': myList[8].toString(),
'phone': myList[10].toString(),
'WalletChecked': myList[13].toString(),
'tokenPassenger': myList[9].toString(),
'direction':
'https://www.google.com/maps/dir/${myList[0]}/${myList[1]}/',
'DurationToPassenger': myList[15].toString(),
'rideId': myList[16].toString(),
});
},
),
@@ -225,7 +235,7 @@ class OrderRequestPage extends StatelessWidget {
myList[6].toString(), body.toString());
FirebaseMessagesController()
.sendNotificanToPassengerToken(
.sendNotificationToPassengerToken(
'Refused Ride',
arguments['DriverList'][9].toString(),
arguments['DriverList'][9].toString(),

View File

@@ -5,6 +5,8 @@ import 'package:ride/controller/home/captin/map_dirction.dart';
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';
@@ -24,10 +26,18 @@ class PassengerLocationDirection extends StatelessWidget {
padding: const EdgeInsets.all(8.0),
child: GetBuilder<MapDirection>(
builder: (controller) => GoogleMap(
onMapCreated: controller.onMapCreated,
initialCameraPosition: CameraPosition(
target: locationController.myLocation,
zoom: 15,
),
// onCameraMove: (position) {
// locationController.myLocation = position.target;
// print(position);
// },
minMaxZoomPreference: const MinMaxZoomPreference(6, 18),
buildingsEnabled: true,
mapToolbarEnabled: true,
polylines: {
Polyline(
zIndex: 2,
@@ -55,14 +65,10 @@ class PassengerLocationDirection extends StatelessWidget {
),
),
},
onCameraMove: (cameraPosition) {
controller.updateMarker();
},
),
),
),
// const TimerToPassengerFromDriver(),
const PassengerInfoWindow()
const PassengerInfoWindow(),
],
isleading: true);
}