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

25-1/31/1

Browse Source
This commit is contained in:
Hamza-Ayed
2025-01-31 14:57:17 +03:00
parent fd0002ce97
commit 13a7c3db81
100 changed files with 469 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/controller/auth/google_sign.dart
+4 -4
View File
@@ -1,9 +1,9 @@
import 'dart:io';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/controller/auth/login_controller.dart';
import 'package:SEFER/controller/functions/encrypt_decrypt.dart';
import 'package:SEFER/main.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/controller/auth/login_controller.dart';
import 'package:Tripz/controller/functions/encrypt_decrypt.dart';
import 'package:Tripz/main.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
lib/controller/auth/login_controller.dart
+13 -13
View File
@@ -1,19 +1,19 @@
import 'dart:convert';
import 'dart:io';
import 'package:SEFER/constant/info.dart';
import 'package:SEFER/controller/firebase/firbase_messge.dart';
import 'package:SEFER/controller/functions/add_error.dart';
import 'package:SEFER/views/auth/login_page.dart';
import 'package:SEFER/views/auth/sms_verfy_page.dart';
import 'package:SEFER/views/widgets/mydialoug.dart';
import 'package:Tripz/constant/info.dart';
import 'package:Tripz/controller/firebase/firbase_messge.dart';
import 'package:Tripz/controller/functions/add_error.dart';
import 'package:Tripz/views/auth/login_page.dart';
import 'package:Tripz/views/auth/sms_verfy_page.dart';
import 'package:Tripz/views/widgets/mydialoug.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:SEFER/main.dart';
import 'package:SEFER/views/home/map_page_passenger.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/controller/functions/crud.dart';
import 'package:Tripz/main.dart';
import 'package:Tripz/views/home/map_page_passenger.dart';
import 'package:location/location.dart';
import '../../print.dart';
@@ -135,13 +135,13 @@ class LoginController extends GetxController {
}),
CRUD().post(
link:
"${AppLink.seferAlexandriaServer}/ride/firebase/add.php",
"${AppLink.tripzAlexandriaServer}/ride/firebase/add.php",
payload: {
'token': box.read(BoxName.tokenFCM),
'passengerID': box.read(BoxName.passengerID).toString()
}),
CRUD().post(
link: "${AppLink.seferGizaServer}/ride/firebase/add.php",
link: "${AppLink.tripzGizaServer}/ride/firebase/add.php",
payload: {
'token': box.read(BoxName.tokenFCM),
'passengerID': box.read(BoxName.passengerID).toString()
lib/controller/auth/onboarding_controller.dart
+3 -3
View File
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/main.dart';
import 'package:SEFER/views/auth/login_page.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/main.dart';
import 'package:Tripz/views/auth/login_page.dart';
import '../../models/model/onboarding_model.dart';
lib/controller/auth/register_controller.dart
+16 -16
View File
@@ -2,18 +2,18 @@ import 'dart:async';
import 'dart:convert';
import 'dart:math';
import 'package:SEFER/constant/colors.dart';
import 'package:SEFER/controller/auth/login_controller.dart';
import 'package:SEFER/controller/functions/add_error.dart';
import 'package:SEFER/controller/functions/encrypt_decrypt.dart';
import 'package:SEFER/views/home/map_page_passenger.dart';
import 'package:Tripz/constant/colors.dart';
import 'package:Tripz/controller/auth/login_controller.dart';
import 'package:Tripz/controller/functions/add_error.dart';
import 'package:Tripz/controller/functions/encrypt_decrypt.dart';
import 'package:Tripz/views/home/map_page_passenger.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/constant/style.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:SEFER/views/auth/login_page.dart';
import 'package:SEFER/views/widgets/elevated_btn.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/constant/style.dart';
import 'package:Tripz/controller/functions/crud.dart';
import 'package:Tripz/views/auth/login_page.dart';
import 'package:Tripz/views/widgets/elevated_btn.dart';
import '../../constant/box_name.dart';
import '../../main.dart';
@@ -229,14 +229,14 @@ class RegisterController extends GetxController {
);
if (res1 != 'failure') {
if (AppLink.seferAlexandriaServer != AppLink.seferCairoServer) {
if (AppLink.tripzAlexandriaServer != AppLink.tripzCairoServer) {
List<Future> signUp = [
CRUD().post(
link: '${AppLink.seferAlexandriaServer}/auth/signup.php',
link: '${AppLink.tripzAlexandriaServer}/auth/signup.php',
payload: payload,
),
CRUD().post(
link: '${AppLink.seferGizaServer}/auth/signup.php',
link: '${AppLink.tripzGizaServer}/auth/signup.php',
payload: payload,
)
];
@@ -301,14 +301,14 @@ class RegisterController extends GetxController {
);
if (res1 != 'failure') {
if (AppLink.seferAlexandriaServer != AppLink.seferCairoServer) {
if (AppLink.tripzAlexandriaServer != AppLink.tripzCairoServer) {
List<Future> signUp = [
CRUD().post(
link: '${AppLink.seferAlexandriaServer}/auth/signup.php',
link: '${AppLink.tripzAlexandriaServer}/auth/signup.php',
payload: payload,
),
CRUD().post(
link: '${AppLink.seferGizaServer}/auth/signup.php',
link: '${AppLink.tripzGizaServer}/auth/signup.php',
payload: payload,
)
];
lib/controller/auth/verify_email_controller.dart
+2 -2
View File
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/controller/functions/crud.dart';
class VerifyEmailController extends GetxController {
TextEditingController verfyCode = TextEditingController();
lib/controller/firebase/firbase_messge.dart
+5 -5
View File
@@ -1,12 +1,12 @@
import 'dart:convert';
import 'dart:io';
import 'package:SEFER/controller/functions/encrypt_decrypt.dart';
import 'package:Tripz/controller/functions/encrypt_decrypt.dart';
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:http/http.dart' as http;
import 'package:SEFER/controller/functions/toast.dart';
import 'package:SEFER/views/widgets/elevated_btn.dart';
import 'package:Tripz/controller/functions/toast.dart';
import 'package:Tripz/views/widgets/elevated_btn.dart';
import '../../constant/api_key.dart';
import '../../constant/box_name.dart';
@@ -266,7 +266,7 @@ class FirebaseMessagesController extends GetxController {
Get.find<MapPassengerController>().tripFinishedFromDriver();
NotificationController().showNotification(
'Don’t forget your personal belongings.'.tr,
'Please make sure you have all your personal belongings and that any remaining fare, if applicable, has been added to your wallet before leaving. Thank you for choosing the Sefer app'
'Please make sure you have all your personal belongings and that any remaining fare, if applicable, has been added to your wallet before leaving. Thank you for choosing the Tripz app'
.tr,
'ding');
print(267);
@@ -351,7 +351,7 @@ class FirebaseMessagesController extends GetxController {
if (Platform.isAndroid) {
notificationController.showNotification(
'Driver Cancelled Your Trip'.tr,
'you will pay to Driver you will be pay the cost of driver time look to your SEFER Wallet'
'you will pay to Driver you will be pay the cost of driver time look to your Tripz Wallet'
.tr,
'cancel');
}
lib/controller/firebase/live_activity.dart
+59
View File
@@ -0,0 +1,59 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
class LiveActivityScreen extends StatefulWidget {
@override
_LiveActivityScreenState createState() => _LiveActivityScreenState();
}
class _LiveActivityScreenState extends State<LiveActivityScreen> {
static const platform = MethodChannel('live_activity_channel');
Future<void> _startLiveActivity() async {
try {
await platform.invokeMethod('startLiveActivity');
} on PlatformException catch (e) {
print("Failed to start Live Activity: '${e.message}'.");
}
}
Future<void> _updateLiveActivity(double progress) async {
try {
await platform.invokeMethod('updateLiveActivity', {"progress": progress});
} on PlatformException catch (e) {
print("Failed to update Live Activity: '${e.message}'.");
}
}
Future<void> _endLiveActivity() async {
try {
await platform.invokeMethod('endLiveActivity');
} on PlatformException catch (e) {
print("Failed to end Live Activity: '${e.message}'.");
}
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(title: Text("Live Activity Test")),
body: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
ElevatedButton(
onPressed: _startLiveActivity,
child: Text("Start Live Activity"),
),
ElevatedButton(
onPressed: () => _updateLiveActivity(0.5),
child: Text("Update Progress to 50%"),
),
ElevatedButton(
onPressed: _endLiveActivity,
child: Text("End Live Activity"),
),
],
),
);
}
}
lib/controller/functions/crud.dart
+4 -4
View File
@@ -1,10 +1,10 @@
import 'dart:convert';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/main.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/main.dart';
import 'package:get/get.dart';
import 'package:http/http.dart' as http;
import 'package:SEFER/env/env.dart';
import 'package:Tripz/env/env.dart';
import '../../constant/api_key.dart';
lib/controller/functions/location_controller.dart
+5 -5
View File
@@ -3,11 +3,11 @@ import 'dart:async';
import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:location/location.dart';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:SEFER/controller/home/payment/captain_wallet_controller.dart';
import 'package:SEFER/main.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/controller/functions/crud.dart';
import 'package:Tripz/controller/home/payment/captain_wallet_controller.dart';
import 'package:Tripz/main.dart';
// LocationController.dart
class LocationController extends GetxController {
lib/controller/functions/log_out.dart
+8 -8
View File
@@ -2,14 +2,14 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/constant/colors.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:SEFER/main.dart';
import 'package:SEFER/onbording_page.dart';
import 'package:SEFER/views/widgets/elevated_btn.dart';
import 'package:SEFER/views/widgets/my_textField.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/constant/colors.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/controller/functions/crud.dart';
import 'package:Tripz/main.dart';
import 'package:Tripz/onbording_page.dart';
import 'package:Tripz/views/widgets/elevated_btn.dart';
import 'package:Tripz/views/widgets/my_textField.dart';
import '../../constant/style.dart';
lib/controller/functions/secure_storage.dart
+1 -1
View File
@@ -1,6 +1,6 @@
import 'dart:convert';
import 'package:SEFER/constant/box_name.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import '../../constant/links.dart';
lib/controller/functions/sms_controller.dart
+8 -8
View File
@@ -1,13 +1,13 @@
import 'dart:convert';
import 'package:SEFER/constant/api_key.dart';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/constant/info.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/controller/auth/login_controller.dart';
import 'package:SEFER/env/env.dart';
import 'package:SEFER/main.dart';
import 'package:SEFER/views/widgets/elevated_btn.dart';
import 'package:Tripz/constant/api_key.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/constant/info.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/controller/auth/login_controller.dart';
import 'package:Tripz/env/env.dart';
import 'package:Tripz/main.dart';
import 'package:Tripz/views/widgets/elevated_btn.dart';
import 'package:get/get.dart';
import 'package:http/http.dart' as http;
lib/controller/functions/toast.dart
+2 -2
View File
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:SEFER/constant/colors.dart';
import 'package:SEFER/constant/style.dart';
import 'package:Tripz/constant/colors.dart';
import 'package:Tripz/constant/style.dart';
class Toast {
static void show(BuildContext context, String message, Color color) {
lib/controller/functions/tts.dart
+1 -1
View File
@@ -1,4 +1,4 @@
import 'package:SEFER/constant/box_name.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:flutter/material.dart';
import 'package:flutter_tts/flutter_tts.dart';
import 'package:get/get.dart';
lib/controller/functions/upload_image.dart
+1 -1
View File
@@ -1,7 +1,7 @@
import 'dart:convert';
import 'dart:io';
import 'package:SEFER/constant/api_key.dart';
import 'package:Tripz/constant/api_key.dart';
import 'package:get/get.dart';
import 'package:http/http.dart' as http;
import 'package:image_cropper/image_cropper.dart';
lib/controller/home/map_passenger_controller.dart
+28 -28
View File
@@ -3,16 +3,16 @@ import 'dart:convert';
import 'dart:math' show Random, cos, max, min, pi, pow, sin, sqrt;
import 'dart:math' as math;
import 'dart:ui';
import 'package:SEFER/constant/univeries_polygon.dart';
import 'package:SEFER/controller/firebase/local_notification.dart';
import 'package:SEFER/controller/functions/encrypt_decrypt.dart';
import 'package:Tripz/constant/univeries_polygon.dart';
import 'package:Tripz/controller/firebase/local_notification.dart';
import 'package:Tripz/controller/functions/encrypt_decrypt.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_confetti/flutter_confetti.dart';
import 'package:vector_math/vector_math.dart' show radians, degrees;
import 'package:SEFER/controller/functions/tts.dart';
import 'package:SEFER/views/home/map_page_passenger.dart';
import 'package:SEFER/views/widgets/my_textField.dart';
import 'package:Tripz/controller/functions/tts.dart';
import 'package:Tripz/views/home/map_page_passenger.dart';
import 'package:Tripz/views/widgets/my_textField.dart';
import 'package:flutter/material.dart';
import 'package:geolocator/geolocator.dart';
import 'package:get/get.dart';
@@ -20,10 +20,10 @@ import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:google_polyline_algorithm/google_polyline_algorithm.dart';
import 'package:intl/intl.dart';
import 'package:location/location.dart';
import 'package:SEFER/constant/colors.dart';
import 'package:SEFER/constant/style.dart';
import 'package:SEFER/controller/home/points_for_rider_controller.dart';
import 'package:SEFER/views/home/map_widget.dart/form_serch_multiy_point.dart';
import 'package:Tripz/constant/colors.dart';
import 'package:Tripz/constant/style.dart';
import 'package:Tripz/controller/home/points_for_rider_controller.dart';
import 'package:Tripz/views/home/map_widget.dart/form_serch_multiy_point.dart';
import '../../constant/api_key.dart';
import '../../constant/box_name.dart';
import '../../constant/info.dart';
@@ -370,7 +370,7 @@ class MapPassengerController extends GetxController {
"order_id": rideId.toString(), // Convert to String
"status": 'waiting'
});
if (AppLink.endPoint != AppLink.seferCairoServer) {
if (AppLink.endPoint != AppLink.tripzCairoServer) {
CRUD().post(
link: "${AppLink.endPoint}/ride/driver_order/update.php",
payload: {
@@ -382,7 +382,7 @@ class MapPassengerController extends GetxController {
"id": rideId.toString(), // Convert to String
"status": 'waiting'
});
if (AppLink.endPoint != AppLink.seferCairoServer) {
if (AppLink.endPoint != AppLink.tripzCairoServer) {
CRUD().post(
link: "${AppLink.endPoint}/ride/rides/update.php",
payload: {
@@ -394,7 +394,7 @@ class MapPassengerController extends GetxController {
"id": rideId.toString(), // Convert to String
"status": 'wait'
});
if (AppLink.endPoint != AppLink.seferCairoServer) {
if (AppLink.endPoint != AppLink.tripzCairoServer) {
CRUD().post(
link:
"${AppLink.endPoint}/ride/notificationCaptain/updateWaitingTrip.php",
@@ -1354,7 +1354,7 @@ class MapPassengerController extends GetxController {
'duration': duration.toStringAsFixed(1),
});
if (AppLink.endPoint != AppLink.seferCairoServer) {
if (AppLink.endPoint != AppLink.tripzCairoServer) {
CRUD().post(
link: '${AppLink.endPoint}/notificationCaptain/addWaitingRide.php',
payload: {
@@ -1441,7 +1441,7 @@ class MapPassengerController extends GetxController {
// // Add ride to database
// await CRUD()
// .post(link: "${AppLink.seferCairoServer}/ride/rides/add.php", payload: {
// .post(link: "${AppLink.TripzCairoServer}/ride/rides/add.php", payload: {
// "start_location":
// '${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
// "end_location":
@@ -1544,7 +1544,7 @@ class MapPassengerController extends GetxController {
// });
// // If an additional endpoint is available, post data there as well
// if (AppLink.endPoint != AppLink.seferCairoServer) {
// if (AppLink.endPoint != AppLink.TripzCairoServer) {
// CRUD().post(link: '${AppLink.endPoint}/ride/rides/add.php', payload: {
// "start_location":
// '${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
@@ -1876,7 +1876,7 @@ class MapPassengerController extends GetxController {
try {
final response = await CRUD().post(
link: "${AppLink.seferCairoServer}/ride/rides/add.php",
link: "${AppLink.tripzCairoServer}/ride/rides/add.php",
payload: payload);
if (response is String) {
final parsedValue = jsonDecode(response);
@@ -2460,7 +2460,7 @@ class MapPassengerController extends GetxController {
}
// Default case
box.write(BoxName.serverChosen, AppLink.seferCairoServer);
box.write(BoxName.serverChosen, AppLink.tripzCairoServer);
return 'Cairo';
}
@@ -2468,23 +2468,23 @@ class MapPassengerController extends GetxController {
// latitude <= 30.198857 &&
// longitude >= 31.215009 &&
// longitude <= 31.532186) {
// box.write(BoxName.serverChosen, AppLink.seferCairoServer);
// box.write(BoxName.serverChosen, AppLink.TripzCairoServer);
// return 'Cairo';
// } else if (latitude >= 29.904975 &&
// latitude <= 30.143372 &&
// longitude >= 30.787030 &&
// longitude <= 31.215009) {
// box.write(BoxName.serverChosen, AppLink.seferGizaServer);
// box.write(BoxName.serverChosen, AppLink.TripzGizaServer);
// return 'Giza';
// } else if (latitude >= 30.396286 &&
// latitude <= 31.654458 &&
// longitude >= 29.041139 &&
// longitude <= 32.626259) {
// box.write(BoxName.serverChosen, AppLink.seferAlexandriaServer);
// box.write(BoxName.serverChosen, AppLink.TripzAlexandriaServer);
// return 'Alexandria';
// } else {
// box.write(BoxName.serverChosen, AppLink.seferCairoServer);
// box.write(BoxName.serverChosen, AppLink.TripzCairoServer);
// return 'Cairo';
// }
// }
@@ -3097,7 +3097,7 @@ class MapPassengerController extends GetxController {
"id": rideId.toString(), // Convert to String
"status": 'notApplyFromAnyDriver'
});
if (AppLink.endPoint != AppLink.seferCairoServer) {
if (AppLink.endPoint != AppLink.tripzCairoServer) {
CRUD().post(link: "${AppLink.endPoint}/ride/rides/update.php", payload: {
"id": rideId.toString(), // Convert to String
"status": 'notApplyFromAnyDriver'
@@ -3154,7 +3154,7 @@ class MapPassengerController extends GetxController {
}),
]);
if (AppLink.endPoint != AppLink.seferCairoServer) {
if (AppLink.endPoint != AppLink.tripzCairoServer) {
CRUD().post(
link: "${AppLink.endPoint}/ride/driver_order/update.php",
payload: {
@@ -4878,13 +4878,13 @@ class MapPassengerController extends GetxController {
'passengerID': box.read(BoxName.passengerID).toString()
});
CRUD().post(
link: "${AppLink.seferAlexandriaServer}/ride/firebase/add.php",
link: "${AppLink.tripzAlexandriaServer}/ride/firebase/add.php",
payload: {
'token': box.read(BoxName.tokenFCM),
'passengerID': box.read(BoxName.passengerID).toString()
});
CRUD().post(
link: "${AppLink.seferGizaServer}/ride/firebase/add.php",
link: "${AppLink.tripzGizaServer}/ride/firebase/add.php",
payload: {
'token': box.read(BoxName.tokenFCM),
'passengerID': box.read(BoxName.passengerID).toString()
@@ -5070,7 +5070,7 @@ class MapPassengerController extends GetxController {
// Get.snackbar('Success'.tr, 'Trip booked successfully'.tr);
var id = response['message']['id'].toString();
await CRUD().post(
link: '${AppLink.seferCairoServer}/ride/rides/add.php',
link: '${AppLink.tripzCairoServer}/ride/rides/add.php',
payload: {
"start_location":
'${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
@@ -5099,7 +5099,7 @@ class MapPassengerController extends GetxController {
Log.print('Unexpected response type: ${value.runtimeType}');
}
});
if (AppLink.endPoint != AppLink.seferCairoServer) {
if (AppLink.endPoint != AppLink.tripzCairoServer) {
await CRUD().post(
link: "${AppLink.endPoint}/ride/mishwari/add.php",
payload: tripData);
lib/controller/home/payment/captain_wallet_controller.dart
+4 -4
View File
@@ -2,10 +2,10 @@ import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:SEFER/main.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/controller/functions/crud.dart';
import 'package:Tripz/main.dart';
class CaptainWalletController extends GetxController {
bool isLoading = false;
lib/controller/home/points_for_rider_controller.dart
+2 -2
View File
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:SEFER/constant/style.dart';
import 'package:SEFER/controller/home/map_passenger_controller.dart';
import 'package:Tripz/constant/style.dart';
import 'package:Tripz/controller/home/map_passenger_controller.dart';
import '../../constant/api_key.dart';
import '../../constant/links.dart';
lib/controller/home/profile/complaint_controller.dart
+8 -8
View File
@@ -4,13 +4,13 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:http/http.dart' as http;
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/constant/colors.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/constant/style.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:SEFER/main.dart';
import 'package:SEFER/views/widgets/elevated_btn.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/constant/colors.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/constant/style.dart';
import 'package:Tripz/controller/functions/crud.dart';
import 'package:Tripz/main.dart';
import 'package:Tripz/views/widgets/elevated_btn.dart';
import 'package:http_parser/http_parser.dart';
import 'package:mime/mime.dart';
@@ -80,7 +80,7 @@ class ComplaintController extends GetxController {
isUploading.value = true;
// Prepare the file upload
var uri = Uri.parse('${AppLink.seferCairoServer}/upload_audio.php');
var uri = Uri.parse('${AppLink.tripzCairoServer}/upload_audio.php');
var request = http.MultipartRequest('POST', uri);
// Add the file to the request with MIME type
lib/controller/home/profile/invit_controller.dart
+6 -6
View File
@@ -1,11 +1,11 @@
import 'dart:convert';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/constant/colors.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:SEFER/controller/functions/encrypt_decrypt.dart';
import 'package:SEFER/controller/payment/payment_controller.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/constant/colors.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/controller/functions/crud.dart';
import 'package:Tripz/controller/functions/encrypt_decrypt.dart';
import 'package:Tripz/controller/payment/payment_controller.dart';
import 'package:flutter/material.dart';
import 'package:flutter_contacts/flutter_contacts.dart';
import 'package:get/get.dart';
lib/controller/home/profile/order_history_controller.dart
+4 -4
View File
@@ -1,10 +1,10 @@
import 'dart:convert';
import 'package:get/get.dart';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:SEFER/main.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/controller/functions/crud.dart';
import 'package:Tripz/main.dart';
class OrderHistoryController extends GetxController {
List<dynamic> orderHistoryListPassenger = [];
lib/controller/home/profile/promos_controller.dart
+3 -3
View File
@@ -1,9 +1,9 @@
import 'dart:convert';
import 'package:SEFER/constant/box_name.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:get/get.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/controller/functions/crud.dart';
import '../../../main.dart';
lib/controller/home/splash_screen_controlle.dart
+1 -1
View File
@@ -3,7 +3,7 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
import 'package:SEFER/views/auth/login_page.dart';
import 'package:Tripz/views/auth/login_page.dart';
import 'package:package_info_plus/package_info_plus.dart';
// import 'package:uni_links/uni_links.dart';
lib/controller/home/trip_monitor_controller.dart
+2 -2
View File
@@ -1,8 +1,8 @@
import 'dart:async';
import 'dart:convert';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/controller/functions/crud.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
lib/controller/home/vip_waitting_page.dart
+9 -9
View File
@@ -1,15 +1,15 @@
import 'dart:async';
import 'dart:convert';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/constant/colors.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/constant/style.dart';
import 'package:SEFER/controller/home/map_passenger_controller.dart';
import 'package:SEFER/main.dart';
import 'package:SEFER/views/widgets/elevated_btn.dart';
import 'package:SEFER/views/widgets/my_scafold.dart';
import 'package:SEFER/views/widgets/mycircular.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/constant/colors.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/constant/style.dart';
import 'package:Tripz/controller/home/map_passenger_controller.dart';
import 'package:Tripz/main.dart';
import 'package:Tripz/views/widgets/elevated_btn.dart';
import 'package:Tripz/views/widgets/my_scafold.dart';
import 'package:Tripz/views/widgets/mycircular.dart';
import 'package:flutter/material.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
import 'package:get/get.dart';
lib/controller/local/phone_intel/country_picker_dialog.dart
+1 -1
View File
@@ -1,4 +1,4 @@
import 'package:SEFER/controller/local/phone_intel/helpers.dart';
import 'package:Tripz/controller/local/phone_intel/helpers.dart';
import 'package:flutter/foundation.dart' show kIsWeb;
import 'package:flutter/material.dart';
lib/controller/notification/notification_captain_controller.dart
+2 -2
View File
@@ -1,8 +1,8 @@
import 'dart:convert';
import 'package:get/get.dart';
import 'package:SEFER/constant/style.dart';
import 'package:SEFER/views/widgets/elevated_btn.dart';
import 'package:Tripz/constant/style.dart';
import 'package:Tripz/views/widgets/elevated_btn.dart';
import '../../constant/box_name.dart';
import '../../constant/links.dart';
lib/controller/notification/passenger_notification_controller.dart
+1 -1
View File
@@ -1,7 +1,7 @@
import 'dart:convert';
import 'package:get/get.dart';
import 'package:SEFER/controller/firebase/firbase_messge.dart';
import 'package:Tripz/controller/firebase/firbase_messge.dart';
import '../../constant/box_name.dart';
import '../../constant/links.dart';
lib/controller/notification/ride_available_controller.dart
+2 -2
View File
@@ -1,7 +1,7 @@
import 'dart:convert';
import 'package:SEFER/constant/style.dart';
import 'package:SEFER/views/widgets/elevated_btn.dart';
import 'package:Tripz/constant/style.dart';
import 'package:Tripz/views/widgets/elevated_btn.dart';
import 'package:get/get.dart';
import '../../constant/links.dart';
lib/controller/payment/driver_payment_controller.dart
+5 -5
View File
@@ -1,11 +1,11 @@
import 'dart:convert';
import 'package:SEFER/views/widgets/elevated_btn.dart';
import 'package:Tripz/views/widgets/elevated_btn.dart';
import 'package:get/get.dart';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:SEFER/main.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/controller/functions/crud.dart';
import 'package:Tripz/main.dart';
class DriverWalletHistoryController extends GetxController {
bool isLoading = false;
lib/controller/payment/passenger_wallet_history_controller.dart
+4 -4
View File
@@ -1,10 +1,10 @@
import 'dart:convert';
import 'package:get/get.dart';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:SEFER/main.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/controller/functions/crud.dart';
import 'package:Tripz/main.dart';
import '../../views/widgets/mydialoug.dart';
lib/controller/payment/payment_controller.dart
+8 -8
View File
@@ -1,18 +1,18 @@
import 'dart:convert';
import 'package:SEFER/constant/api_key.dart';
import 'package:SEFER/constant/style.dart';
import 'package:SEFER/controller/firebase/firbase_messge.dart';
import 'package:SEFER/controller/functions/tts.dart';
import 'package:SEFER/controller/payment/paymob/paymob_response.dart';
import 'package:SEFER/views/home/map_page_passenger.dart';
import 'package:SEFER/views/widgets/elevated_btn.dart';
import 'package:Tripz/constant/api_key.dart';
import 'package:Tripz/constant/style.dart';
import 'package:Tripz/controller/firebase/firbase_messge.dart';
import 'package:Tripz/controller/functions/tts.dart';
import 'package:Tripz/controller/payment/paymob/paymob_response.dart';
import 'package:Tripz/views/home/map_page_passenger.dart';
import 'package:Tripz/views/widgets/elevated_btn.dart';
import 'package:http/http.dart' as http;
import 'package:flutter/material.dart';
import 'package:flutter_paypal/flutter_paypal.dart';
import 'package:flutter_stripe/flutter_stripe.dart';
import 'package:get/get.dart';
import 'package:local_auth/local_auth.dart';
import 'package:SEFER/controller/home/map_passenger_controller.dart';
import 'package:Tripz/controller/home/map_passenger_controller.dart';
import '../../constant/box_name.dart';
import '../../constant/colors.dart';
lib/controller/payment/paymob.dart
+1 -1
View File
@@ -1,4 +1,4 @@
import 'package:SEFER/constant/box_name.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:dio/dio.dart' as dio;
import 'package:dio/dio.dart';
import 'package:get/get.dart';
lib/controller/payment/paymob/paymob_response.dart
+2 -2
View File
@@ -1,5 +1,5 @@
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/main.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/main.dart';
import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
import 'package:webview_flutter/webview_flutter.dart';
lib/controller/payment/paymob/paymob_wallet.dart
+2 -2
View File
@@ -1,5 +1,5 @@
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/main.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/main.dart';
import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
import 'package:webview_flutter/webview_flutter.dart';
lib/controller/profile/captain_profile_controller.dart
+4 -4
View File
@@ -2,10 +2,10 @@ import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:SEFER/main.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/controller/functions/crud.dart';
import 'package:Tripz/main.dart';
class CaptainProfileController extends GetxController {
bool isLoading = false;
lib/controller/profile/profile_controller.dart
+7 -7
View File
@@ -1,15 +1,15 @@
import 'dart:convert';
import 'package:SEFER/constant/colors.dart';
import 'package:SEFER/controller/functions/encrypt_decrypt.dart';
import 'package:Tripz/constant/colors.dart';
import 'package:Tripz/controller/functions/encrypt_decrypt.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:SEFER/main.dart';
import 'package:SEFER/views/widgets/my_textField.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/controller/functions/crud.dart';
import 'package:Tripz/main.dart';
import 'package:Tripz/views/widgets/my_textField.dart';
import '../../views/widgets/elevated_btn.dart';
lib/controller/profile/setting_controller.dart
+2 -2
View File
@@ -1,5 +1,5 @@
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/main.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/main.dart';
import 'package:get/get.dart';
class SettingController extends GetxController {
lib/controller/rate/rate_conroller.dart
+10 -10
View File
@@ -1,13 +1,13 @@
import 'package:flutter/cupertino.dart';
import 'package:get/get.dart';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/constant/style.dart';
import 'package:SEFER/controller/functions/crud.dart';
import 'package:SEFER/controller/home/map_passenger_controller.dart';
import 'package:SEFER/main.dart';
import 'package:SEFER/views/home/map_page_passenger.dart';
import 'package:SEFER/views/widgets/elevated_btn.dart';
import 'package:Tripz/constant/box_name.dart';
import 'package:Tripz/constant/links.dart';
import 'package:Tripz/constant/style.dart';
import 'package:Tripz/controller/functions/crud.dart';
import 'package:Tripz/controller/home/map_passenger_controller.dart';
import 'package:Tripz/main.dart';
import 'package:Tripz/views/home/map_page_passenger.dart';
import 'package:Tripz/views/widgets/elevated_btn.dart';
import '../firebase/firbase_messge.dart';
import '../payment/payment_controller.dart';
@@ -81,7 +81,7 @@ class RateController extends GetxController {
}
}
await CRUD().post(
link: "${AppLink.seferCairoServer}/ride/rate/addRateToDriver.php",
link: "${AppLink.tripzCairoServer}/ride/rate/addRateToDriver.php",
payload: {
'passenger_id': box.read(BoxName.passengerID).toString(),
'driver_id': driverId.toString(),
@@ -90,7 +90,7 @@ class RateController extends GetxController {
'comment': comment.text,
});
if (AppLink.endPoint != AppLink.seferCairoServer) {
if (AppLink.endPoint != AppLink.tripzCairoServer) {
CRUD().post(
link: "${AppLink.endPoint}/ride/rate/addRateToDriver.php",
payload: {
lib/controller/themes/themes.dart
+1 -1
View File
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:SEFER/constant/style.dart';
import 'package:Tripz/constant/style.dart';
import '../../constant/colors.dart';