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

25-7-1/1

Browse Source
This commit is contained in:
Hamza-Ayed
2025-07-01 18:30:08 +03:00
parent cf8966ea29
commit 322e4b9788
11 changed files with 1445 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/views/home/map_page_passenger.dart
View File

@@ -55,7 +55,7 @@ class MapPagePassenger extends StatelessWidget {
// const HeaderDestination(),
const BurcMoney(),
const PromoCode(),
const ApplyOrderWidget(),
ApplyOrderWidget(),
const MapMenuWidget(),
// hexagonClipper(),
const CancelRidePageShow(),

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

@@ -13,8 +13,11 @@ import '../../../controller/functions/launch.dart';
import '../../widgets/my_textField.dart';
class ApplyOrderWidget extends StatelessWidget {
const ApplyOrderWidget({super.key});
ApplyOrderWidget({super.key});
final firebaseMessagesController =
Get.isRegistered<FirebaseMessagesController>()
? Get.find<FirebaseMessagesController>()
: Get.put(FirebaseMessagesController());
@override
Widget build(BuildContext context) {
Color _parseColor(String colorHex) {
@@ -26,6 +29,8 @@ class ApplyOrderWidget extends StatelessWidget {
}
return GetBuilder<MapPassengerController>(builder: (controller) {
Get.put(
FirebaseMessagesController()); // Ensure FirebaseMessagesController is initialized
if (controller.statusRide == 'Apply' && !controller.isSearchingWindow) {
return Positioned(
bottom: 0,
@@ -257,8 +262,7 @@ class ApplyOrderWidget extends StatelessWidget {
padding: const EdgeInsets.only(bottom: 8.0),
child: ElevatedButton(
onPressed: () {
Get.find<FirebaseMessagesController>()
.sendNotificationToDriverMAP(
firebaseMessagesController.sendNotificationToDriverMAP(
'message From passenger',
message.tr,
controller.driverToken.toString(),
@@ -291,8 +295,7 @@ class ApplyOrderWidget extends StatelessWidget {
IconButton(
onPressed: () {
if (controller.messagesFormKey.currentState!.validate()) {
Get.find<FirebaseMessagesController>()
.sendNotificationToDriverMAP(
firebaseMessagesController.sendNotificationToDriverMAP(
'message From passenger',
controller.messageToDriver.text,
controller.driverToken,

56
lib/views/home/map_widget.dart/left_main_menu_icons.dart
View File

@@ -1,3 +1,5 @@
import 'package:Tripz/controller/firebase/firbase_messge.dart';
import 'package:Tripz/controller/functions/encrypt_decrypt.dart';
import 'package:Tripz/views/auth/sms_verfy_page.dart';
import 'package:flutter/services.dart';
import 'package:flutter/material.dart';
@@ -5,9 +7,13 @@ import 'package:flutter_font_icons/flutter_font_icons.dart';
import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import '../../../constant/colors.dart';
import '../../../constant/table_names.dart';
import '../../../controller/functions/secure_storage.dart';
import '../../../controller/functions/tts.dart';
import '../../../controller/home/map_passenger_controller.dart';
import '../../../controller/home/vip_waitting_page.dart';
import '../../../main.dart';
import '../../../print.dart';
GetBuilder<MapPassengerController> leftMainMenuIcons() {
Get.put(TextToSpeechController());
@@ -77,12 +83,60 @@ class TestPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
final firebaseMessagesController =
Get.isRegistered<FirebaseMessagesController>()
? Get.find<FirebaseMessagesController>()
: Get.put(FirebaseMessagesController());
return Scaffold(
appBar: AppBar(),
body: Center(
child: TextButton(
onPressed: () async {
Get.to(SmsSignupEgypt());
firebaseMessagesController.sendNotificationToDriverMAP(
'Order',
'body',
'c2tXiuBJQCSg4CU4IfqYOL:APA91bFA0f8R3QMnPQnPEEdNyjY-jcoKt4nLBHxcLLsmDSuJn5yd4jSvwq7qDIZpkkPkjfjdwdKsGL0-G0aHpPyjfiBvbCwFmlRMCUKftNMNT7MJx2Bp16Y',
[
"32.1117875",
"36.0669891",
"32.1364001",
"36.0707479",
"24.84",
"7.56",
"436",
"4.38",
"109270481246447459618",
"113172279072358305645",
"hamza",
"e4QWqe7K607luM7qUMOPCL:APA91bFjX4XBM4I5COJl9fyxCTKJ1ZQpT3vzY7iEbOTuT4uo0-OSCAt5zgVhlhw4aC33s-VhyucDnP1tQGFd9svaazQ8A_SKgolPk3owzug8dCsiXoPeJ0k",
"+201010101010",
"6",
"43",
"true",
"c2tXiuBJQCSg4CU4IfqYOL:APA91bFA0f8R3QMnPQnPEEdNyjY-jcoKt4nLBHxcLLsmDSuJn5yd4jSvwq7qDIZpkkPkjfjdwdKsGL0-G0aHpPyjfiBvbCwFmlRMCUKftNMNT7MJx2Bp16Y",
"6",
"1188",
"false",
"109270481246447459618",
"436",
"startEnd",
"32.12404505187645",
"36.06566168367863",
"",
"",
"",
"",
"5.42",
"0",
"hamzaayedflutter@gmail.com",
"4368+PPP، السخنة، الأردن",
"43PC+C4G، السخنة، الأردن",
"Speed",
"8",
"5.00"
],
'ding.wav');
// await AppInitializer().getAIKey(Pasenger.FCM_PRIVATE_KEY);
},
child: Text(
"Text Button",

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

@@ -17,7 +17,7 @@ class SearchingCaptainWindow extends StatelessWidget {
builder: (mapPassengerController) {
return mapPassengerController.isSearchingWindow
? Positioned(
bottom: 0,
bottom: 34,
left: 0,
right: 0,
child: Container(
@@ -78,7 +78,7 @@ class SearchingCaptainWindow extends StatelessWidget {
const Icon(Icons.timer_outlined,
size: 16, color: Colors.grey),
const SizedBox(width: 4),
_buildTimer(mapPassengerController),
buildTimerForIncrease(mapPassengerController),
],
),
// const SizedBox(height: 8),
@@ -124,7 +124,7 @@ class SearchingCaptainWindow extends StatelessWidget {
// });
// }
Widget _buildTimer(MapPassengerController mapPassengerController) {
Widget buildTimerForIncrease(MapPassengerController mapPassengerController) {
// Start timer at 0
Timer? timer;

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

@@ -311,13 +311,14 @@ class CountryPicker extends StatelessWidget {
final List<String> countryOptions = [
'Jordan',
'USA',
'Syria',
'Egypt',
'Turkey',
'Saudi Arabia',
'Qatar',
'Bahrain',
'Kuwait',
'USA'
];
CountryPicker({Key? key}) : super(key: key);