From 13a7c3db81d2b55127886639c52e1621304350c4 Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Fri, 31 Jan 2025 14:57:17 +0300 Subject: [PATCH] 25-1/31/1 --- lib/constant/links.dart | 12 ++-- lib/constant/notification.dart | 38 ++++++------ lib/controller/auth/google_sign.dart | 8 +-- lib/controller/auth/login_controller.dart | 26 ++++---- .../auth/onboarding_controller.dart | 6 +- lib/controller/auth/register_controller.dart | 32 +++++----- .../auth/verify_email_controller.dart | 4 +- lib/controller/firebase/firbase_messge.dart | 10 ++-- lib/controller/firebase/live_activity.dart | 59 +++++++++++++++++++ lib/controller/functions/crud.dart | 8 +-- .../functions/location_controller.dart | 10 ++-- lib/controller/functions/log_out.dart | 16 ++--- lib/controller/functions/secure_storage.dart | 2 +- lib/controller/functions/sms_controller.dart | 16 ++--- lib/controller/functions/toast.dart | 4 +- lib/controller/functions/tts.dart | 2 +- lib/controller/functions/upload_image.dart | 2 +- .../home/map_passenger_controller.dart | 56 +++++++++--------- .../payment/captain_wallet_controller.dart | 8 +-- .../home/points_for_rider_controller.dart | 4 +- .../home/profile/complaint_controller.dart | 16 ++--- .../home/profile/invit_controller.dart | 12 ++-- .../profile/order_history_controller.dart | 8 +-- .../home/profile/promos_controller.dart | 6 +- .../home/splash_screen_controlle.dart | 2 +- .../home/trip_monitor_controller.dart | 4 +- lib/controller/home/vip_waitting_page.dart | 18 +++--- .../phone_intel/country_picker_dialog.dart | 2 +- .../notification_captain_controller.dart | 4 +- .../passenger_notification_controller.dart | 2 +- .../ride_available_controller.dart | 4 +- .../payment/driver_payment_controller.dart | 10 ++-- .../passenger_wallet_history_controller.dart | 8 +-- .../payment/payment_controller.dart | 16 ++--- lib/controller/payment/paymob.dart | 2 +- .../payment/paymob/paymob_response.dart | 4 +- .../payment/paymob/paymob_wallet.dart | 4 +- .../profile/captain_profile_controller.dart | 8 +-- .../profile/profile_controller.dart | 14 ++--- .../profile/setting_controller.dart | 4 +- lib/controller/rate/rate_conroller.dart | 20 +++---- lib/controller/themes/themes.dart | 2 +- lib/main.dart | 2 +- lib/models/db_sql.dart | 2 +- lib/models/model/painter_copoun.dart | 12 ++-- lib/onbording_page.dart | 2 +- lib/splash_screen_page.dart | 6 +- lib/views/Rate/rate_captain.dart | 4 +- lib/views/auth/login_page.dart | 15 ++--- lib/views/auth/register_page.dart | 8 +-- lib/views/auth/sms_verfy_page.dart | 10 ++-- lib/views/auth/verify_email_page.dart | 10 ++-- lib/views/home/HomePage/about_page.dart | 6 +- lib/views/home/HomePage/contact_us.dart | 12 ++-- .../HomePage/frequentlyQuestionsPage.dart | 14 ++--- lib/views/home/HomePage/share_app_page.dart | 3 - .../trip_monitor/trip_link_monitor.dart | 4 +- .../HomePage/trip_monitor/trip_monitor.dart | 4 +- lib/views/home/HomePage/trip_record_page.dart | 2 +- lib/views/home/drawer_menu_page.dart | 2 +- lib/views/home/map_page_passenger.dart | 1 - .../map_widget.dart/apply_order_widget.dart | 12 ++-- .../buttom_sheet_map_show.dart | 2 +- .../map_widget.dart/cancel_raide_page.dart | 6 +- .../car_details_widget_to_go.dart | 16 ++--- .../cash_confirm_bottom_page.dart | 8 +-- .../form_search_places_destenation.dart | 6 +- .../map_widget.dart/form_search_start.dart | 2 +- .../form_serch_multiy_point.dart | 2 +- .../google_map_passenger_widget.dart | 2 +- .../map_widget.dart/left_main_menu_icons.dart | 4 -- .../map_widget.dart/main_bottom_Menu_map.dart | 16 ++--- .../home/map_widget.dart/map_menu_widget.dart | 14 ++--- .../new_main_bottom_sheet.dart | 8 +-- .../passengerRideLoctionWidget.dart | 4 +- .../map_widget.dart/payment_method.page.dart | 8 +-- .../picker_animation_container.dart | 2 +- .../points_page_for_rider.dart | 2 +- .../map_widget.dart/ride_begin_passenger.dart | 10 ++-- .../searching_captain_window.dart | 10 ++-- .../select_driver_mishwari.dart | 12 ++-- .../timer_to_passenger_from_driver.dart | 2 +- lib/views/home/map_widget.dart/vip_begin.dart | 10 ++-- .../home/my_wallet/passenger_wallet.dart | 8 +-- .../my_wallet/passenger_wallet_dialoge.dart | 10 ++-- .../payment_history_driver_page.dart | 8 +-- .../payment_history_passenger_page.dart | 10 ++-- lib/views/home/profile/budgets_ads.dart | 6 +- lib/views/home/profile/complaint_page.dart | 7 +-- lib/views/home/profile/order_history.dart | 6 +- .../home/profile/passenger_profile_page.dart | 22 +++---- lib/views/home/profile/profile_captain.dart | 12 ++-- .../home/profile/promos_passenger_page.dart | 8 +-- lib/views/home/profile/taarif_page.dart | 8 +-- lib/views/home/setting_page.dart | 6 +- lib/views/lang/languages.dart | 6 +- .../notification/notification_captain.dart | 10 ++-- lib/views/notification/notification_page.dart | 4 +- pubspec.yaml | 2 +- test/widget_test.dart | 2 +- 100 files changed, 469 insertions(+), 436 deletions(-) create mode 100644 lib/controller/firebase/live_activity.dart diff --git a/lib/constant/links.dart b/lib/constant/links.dart index 1031013..3c2615f 100644 --- a/lib/constant/links.dart +++ b/lib/constant/links.dart @@ -1,6 +1,6 @@ -import 'package:SEFER/constant/box_name.dart'; -import 'package:SEFER/env/env.dart'; -import 'package:SEFER/main.dart'; +import 'package:Tripz/constant/box_name.dart'; +import 'package:Tripz/env/env.dart'; +import 'package:Tripz/main.dart'; class AppLink { // static final String seferPaymentServer0 = Env.seferPaymentServer; @@ -27,9 +27,9 @@ class AppLink { box.read(BoxName.serverChosen) ?? box.read(BoxName.basicLink); // 'https://server.sefer.live/sefer.click/sefer'; static final String server = endPoint; - static String seferCairoServer = endPoint; - static String seferGizaServer = box.read('Giza'); - static String seferAlexandriaServer = box.read('Alexandria'); + static String tripzCairoServer = endPoint; + static String tripzGizaServer = box.read('Giza'); + static String tripzAlexandriaServer = box.read('Alexandria'); static String googleMapsLink = 'https://maps.googleapis.com/maps/api/'; static String searcMaps = diff --git a/lib/constant/notification.dart b/lib/constant/notification.dart index 7ede7a2..d5a173e 100644 --- a/lib/constant/notification.dart +++ b/lib/constant/notification.dart @@ -1,22 +1,22 @@ List messages = [ - "🚗 عروض مميزة: استمتع بأقل الأسعار وأفضل العروض! افتح تطبيق سفر الآن لتحصل على المزيد من الخيارات. 🌟", - "💸 وفر الآن: وفر مع تطبيق سفر! عروض مستمرة وخيارات متعددة تناسب احتياجاتك. 🔥", - "🔒 أمان وراحة: مع تطبيق سفر، احصل على أمان وراحة بأفضل الأسعار! 🚕", - "💼 خيارات متنوعة: استفد من خيارات متنوعة وأسعار تنافسية على تطبيق سفر، الأفضل دائماً. 🌐", - "💵 توفير مضمون: حافظ على ميزانيتك وسافر بأمان مع تطبيق سفر – العروض لا تتوقف! 🎉", - "🌍 وجهات مميزة: أفضل وجهات السفر، بأقل الأسعار مع تطبيق سفر – تابعنا الآن! 🛤️", + "🚗 عروض مميزة: استمتع بأقل الأسعار وأفضل العروض! افتح تطبيق Tripz الآن لتحصل على المزيد من الخيارات. 🌟", + "💸 وفر الآن: وفر مع تطبيق Tripz! عروض مستمرة وخيارات متعددة تناسب احتياجاتك. 🔥", + "🔒 أمان وراحة: مع تطبيق Tripz، احصل على أمان وراحة بأفضل الأسعار! 🚕", + "💼 خيارات متنوعة: استفد من خيارات متنوعة وأسعار تنافسية على تطبيق Tripz، الأفضل دائماً. 🌐", + "💵 توفير مضمون: حافظ على ميزانيتك وسافر بأمان مع تطبيق Tripz – العروض لا تتوقف! 🎉", + "🌍 وجهات مميزة: أفضل وجهات الTripz، بأقل الأسعار مع تطبيق Tripz – تابعنا الآن! 🛤️", "🛣️ سهولة وراحة: رحلاتك أصبحت أسهل وأرخص – سافر معنا وتمتع بأفضل التجارب. 🎊", - "📲 حجز سهل: احجز رحلتك بسهولة وأمان مع سفر – المزيد من الخصومات في انتظارك! 🎁", - "👑 فئة مميزة: خليك من الفئة المميزة واستفد بأفضل الأسعار مع تطبيق سفر. 💯", - "💡 خيارات متعددة: نوفر لك خيارات متعددة وسعر مناسب – جرب تطبيق سفر الآن! 🚖", - "✨ عروض متجددة: العروض لا تتوقف على تطبيق سفر – احجز رحلتك الآن وتمتع بالمزيد! 📅", - "🚀 سهولة الوصول: السفر أصبح أسهل وأسرع مع تطبيق سفر – كن مستعدًا لأفضل التجارب! 🌠", - "🧳 راحة وأمان: تطبيق سفر يقدم لك أمان وراحة بأقل الأسعار! 📉", - "🔥 عروض فورية: احجز الآن واستمتع بعروض لا تُفوّت على تطبيق سفر! 🚘", - "🚖 أسعار تنافسية: اختر رحلتك الآن بأسعار تنافسية وتمتع بالراحة والأمان مع تطبيق سفر. ✅", - "💥 أسعار خاصة: أسعار خاصة بانتظارك على تطبيق سفر! افتح التطبيق الآن واحجز رحلتك. 🌐", - "🌟 راحة البال: انطلق بأمان وراحة مع تطبيق سفر – استمتع بأفضل الأسعار. 💸", - "📍 خصومات حصرية: استفد من الخصومات الحصرية والعروض المستمرة على تطبيق سفر! 🛤️", - "🛫 تجربة سهلة: رحلاتك أصبحت أفضل وأسهل مع تطبيق سفر – افتح التطبيق واستمتع بالتجربة. ✨", - "🔔 عروض لا مثيل لها: كن جاهزًا لعروض لا مثيل لها! تطبيق سفر يقدم لك أفضل الخيارات بأقل الأسعار. 🎉", + "📲 حجز سهل: احجز رحلتك بسهولة وأمان مع Tripz – المزيد من الخصومات في انتظارك! 🎁", + "👑 فئة مميزة: خليك من الفئة المميزة واستفد بأفضل الأسعار مع تطبيق Tripz. 💯", + "💡 خيارات متعددة: نوفر لك خيارات متعددة وسعر مناسب – جرب تطبيق Tripz الآن! 🚖", + "✨ عروض متجددة: العروض لا تتوقف على تطبيق Tripz – احجز رحلتك الآن وتمتع بالمزيد! 📅", + "🚀 سهولة الوصول: الTripz أصبح أسهل وأسرع مع تطبيق Tripz – كن مستعدًا لأفضل التجارب! 🌠", + "🧳 راحة وأمان: تطبيق Tripz يقدم لك أمان وراحة بأقل الأسعار! 📉", + "🔥 عروض فورية: احجز الآن واستمتع بعروض لا تُفوّت على تطبيق Tripz! 🚘", + "🚖 أسعار تنافسية: اختر رحلتك الآن بأسعار تنافسية وتمتع بالراحة والأمان مع تطبيق Tripz. ✅", + "💥 أسعار خاصة: أسعار خاصة بانتظارك على تطبيق Tripz! افتح التطبيق الآن واحجز رحلتك. 🌐", + "🌟 راحة البال: انطلق بأمان وراحة مع تطبيق Tripz – استمتع بأفضل الأسعار. 💸", + "📍 خصومات حصرية: استفد من الخصومات الحصرية والعروض المستمرة على تطبيق Tripz! 🛤️", + "🛫 تجربة سهلة: رحلاتك أصبحت أفضل وأسهل مع تطبيق Tripz – افتح التطبيق واستمتع بالتجربة. ✨", + "🔔 عروض لا مثيل لها: كن جاهزًا لعروض لا مثيل لها! تطبيق Tripz يقدم لك أفضل الخيارات بأقل الأسعار. 🎉", ]; diff --git a/lib/controller/auth/google_sign.dart b/lib/controller/auth/google_sign.dart index df206c3..8db0dd7 100644 --- a/lib/controller/auth/google_sign.dart +++ b/lib/controller/auth/google_sign.dart @@ -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'; diff --git a/lib/controller/auth/login_controller.dart b/lib/controller/auth/login_controller.dart index 6afcac1..162e904 100644 --- a/lib/controller/auth/login_controller.dart +++ b/lib/controller/auth/login_controller.dart @@ -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() diff --git a/lib/controller/auth/onboarding_controller.dart b/lib/controller/auth/onboarding_controller.dart index 2746e84..1219091 100644 --- a/lib/controller/auth/onboarding_controller.dart +++ b/lib/controller/auth/onboarding_controller.dart @@ -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'; diff --git a/lib/controller/auth/register_controller.dart b/lib/controller/auth/register_controller.dart index d9e26dc..7646be1 100644 --- a/lib/controller/auth/register_controller.dart +++ b/lib/controller/auth/register_controller.dart @@ -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 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 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, ) ]; diff --git a/lib/controller/auth/verify_email_controller.dart b/lib/controller/auth/verify_email_controller.dart index 3ca4247..152b4a2 100644 --- a/lib/controller/auth/verify_email_controller.dart +++ b/lib/controller/auth/verify_email_controller.dart @@ -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(); diff --git a/lib/controller/firebase/firbase_messge.dart b/lib/controller/firebase/firbase_messge.dart index b43a99b..82f2e25 100644 --- a/lib/controller/firebase/firbase_messge.dart +++ b/lib/controller/firebase/firbase_messge.dart @@ -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().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'); } diff --git a/lib/controller/firebase/live_activity.dart b/lib/controller/firebase/live_activity.dart new file mode 100644 index 0000000..2054bfc --- /dev/null +++ b/lib/controller/firebase/live_activity.dart @@ -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 { + static const platform = MethodChannel('live_activity_channel'); + + Future _startLiveActivity() async { + try { + await platform.invokeMethod('startLiveActivity'); + } on PlatformException catch (e) { + print("Failed to start Live Activity: '${e.message}'."); + } + } + + Future _updateLiveActivity(double progress) async { + try { + await platform.invokeMethod('updateLiveActivity', {"progress": progress}); + } on PlatformException catch (e) { + print("Failed to update Live Activity: '${e.message}'."); + } + } + + Future _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"), + ), + ], + ), + ); + } +} diff --git a/lib/controller/functions/crud.dart b/lib/controller/functions/crud.dart index e0ffa5d..fe8380d 100644 --- a/lib/controller/functions/crud.dart +++ b/lib/controller/functions/crud.dart @@ -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'; diff --git a/lib/controller/functions/location_controller.dart b/lib/controller/functions/location_controller.dart index 7646718..b95f0df 100644 --- a/lib/controller/functions/location_controller.dart +++ b/lib/controller/functions/location_controller.dart @@ -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 { diff --git a/lib/controller/functions/log_out.dart b/lib/controller/functions/log_out.dart index 1f7056b..586baf2 100644 --- a/lib/controller/functions/log_out.dart +++ b/lib/controller/functions/log_out.dart @@ -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'; diff --git a/lib/controller/functions/secure_storage.dart b/lib/controller/functions/secure_storage.dart index e08e6f4..86843b8 100644 --- a/lib/controller/functions/secure_storage.dart +++ b/lib/controller/functions/secure_storage.dart @@ -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'; diff --git a/lib/controller/functions/sms_controller.dart b/lib/controller/functions/sms_controller.dart index 09b0b63..c20f61c 100644 --- a/lib/controller/functions/sms_controller.dart +++ b/lib/controller/functions/sms_controller.dart @@ -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; diff --git a/lib/controller/functions/toast.dart b/lib/controller/functions/toast.dart index 931d767..b6c244f 100644 --- a/lib/controller/functions/toast.dart +++ b/lib/controller/functions/toast.dart @@ -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) { diff --git a/lib/controller/functions/tts.dart b/lib/controller/functions/tts.dart index 5bd1b6a..22ec2d8 100644 --- a/lib/controller/functions/tts.dart +++ b/lib/controller/functions/tts.dart @@ -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'; diff --git a/lib/controller/functions/upload_image.dart b/lib/controller/functions/upload_image.dart index e01cb1c..4425081 100644 --- a/lib/controller/functions/upload_image.dart +++ b/lib/controller/functions/upload_image.dart @@ -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'; diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index 0f94ffd..0e7ed8c 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -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); diff --git a/lib/controller/home/payment/captain_wallet_controller.dart b/lib/controller/home/payment/captain_wallet_controller.dart index 24068b8..ef9ee10 100644 --- a/lib/controller/home/payment/captain_wallet_controller.dart +++ b/lib/controller/home/payment/captain_wallet_controller.dart @@ -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; diff --git a/lib/controller/home/points_for_rider_controller.dart b/lib/controller/home/points_for_rider_controller.dart index bfcd851..1abaaac 100644 --- a/lib/controller/home/points_for_rider_controller.dart +++ b/lib/controller/home/points_for_rider_controller.dart @@ -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'; diff --git a/lib/controller/home/profile/complaint_controller.dart b/lib/controller/home/profile/complaint_controller.dart index ce02477..afca74e 100644 --- a/lib/controller/home/profile/complaint_controller.dart +++ b/lib/controller/home/profile/complaint_controller.dart @@ -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 diff --git a/lib/controller/home/profile/invit_controller.dart b/lib/controller/home/profile/invit_controller.dart index 7d3dc88..1e87511 100644 --- a/lib/controller/home/profile/invit_controller.dart +++ b/lib/controller/home/profile/invit_controller.dart @@ -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'; diff --git a/lib/controller/home/profile/order_history_controller.dart b/lib/controller/home/profile/order_history_controller.dart index 7bebdc3..4df6866 100644 --- a/lib/controller/home/profile/order_history_controller.dart +++ b/lib/controller/home/profile/order_history_controller.dart @@ -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 orderHistoryListPassenger = []; diff --git a/lib/controller/home/profile/promos_controller.dart b/lib/controller/home/profile/promos_controller.dart index 8fe0e36..94467f4 100644 --- a/lib/controller/home/profile/promos_controller.dart +++ b/lib/controller/home/profile/promos_controller.dart @@ -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'; diff --git a/lib/controller/home/splash_screen_controlle.dart b/lib/controller/home/splash_screen_controlle.dart index 8c0e304..93fe3f2 100644 --- a/lib/controller/home/splash_screen_controlle.dart +++ b/lib/controller/home/splash_screen_controlle.dart @@ -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'; diff --git a/lib/controller/home/trip_monitor_controller.dart b/lib/controller/home/trip_monitor_controller.dart index 40be11e..38cdd50 100644 --- a/lib/controller/home/trip_monitor_controller.dart +++ b/lib/controller/home/trip_monitor_controller.dart @@ -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'; diff --git a/lib/controller/home/vip_waitting_page.dart b/lib/controller/home/vip_waitting_page.dart index dff33a7..266aec7 100644 --- a/lib/controller/home/vip_waitting_page.dart +++ b/lib/controller/home/vip_waitting_page.dart @@ -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'; diff --git a/lib/controller/local/phone_intel/country_picker_dialog.dart b/lib/controller/local/phone_intel/country_picker_dialog.dart index e6d2523..67b2af5 100644 --- a/lib/controller/local/phone_intel/country_picker_dialog.dart +++ b/lib/controller/local/phone_intel/country_picker_dialog.dart @@ -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'; diff --git a/lib/controller/notification/notification_captain_controller.dart b/lib/controller/notification/notification_captain_controller.dart index d29650b..c9d3916 100644 --- a/lib/controller/notification/notification_captain_controller.dart +++ b/lib/controller/notification/notification_captain_controller.dart @@ -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'; diff --git a/lib/controller/notification/passenger_notification_controller.dart b/lib/controller/notification/passenger_notification_controller.dart index c942672..db43990 100644 --- a/lib/controller/notification/passenger_notification_controller.dart +++ b/lib/controller/notification/passenger_notification_controller.dart @@ -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'; diff --git a/lib/controller/notification/ride_available_controller.dart b/lib/controller/notification/ride_available_controller.dart index 45e0df0..6b8fba3 100644 --- a/lib/controller/notification/ride_available_controller.dart +++ b/lib/controller/notification/ride_available_controller.dart @@ -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'; diff --git a/lib/controller/payment/driver_payment_controller.dart b/lib/controller/payment/driver_payment_controller.dart index 14e41aa..6c3625c 100644 --- a/lib/controller/payment/driver_payment_controller.dart +++ b/lib/controller/payment/driver_payment_controller.dart @@ -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; diff --git a/lib/controller/payment/passenger_wallet_history_controller.dart b/lib/controller/payment/passenger_wallet_history_controller.dart index 0ba5ba0..9a18a15 100644 --- a/lib/controller/payment/passenger_wallet_history_controller.dart +++ b/lib/controller/payment/passenger_wallet_history_controller.dart @@ -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'; diff --git a/lib/controller/payment/payment_controller.dart b/lib/controller/payment/payment_controller.dart index 8e789e7..1824439 100644 --- a/lib/controller/payment/payment_controller.dart +++ b/lib/controller/payment/payment_controller.dart @@ -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'; diff --git a/lib/controller/payment/paymob.dart b/lib/controller/payment/paymob.dart index cabea7c..b107f7b 100644 --- a/lib/controller/payment/paymob.dart +++ b/lib/controller/payment/paymob.dart @@ -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'; diff --git a/lib/controller/payment/paymob/paymob_response.dart b/lib/controller/payment/paymob/paymob_response.dart index 2294a58..2af4aff 100644 --- a/lib/controller/payment/paymob/paymob_response.dart +++ b/lib/controller/payment/paymob/paymob_response.dart @@ -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'; diff --git a/lib/controller/payment/paymob/paymob_wallet.dart b/lib/controller/payment/paymob/paymob_wallet.dart index a16d280..8f20019 100644 --- a/lib/controller/payment/paymob/paymob_wallet.dart +++ b/lib/controller/payment/paymob/paymob_wallet.dart @@ -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'; diff --git a/lib/controller/profile/captain_profile_controller.dart b/lib/controller/profile/captain_profile_controller.dart index d933ff6..bed83d5 100644 --- a/lib/controller/profile/captain_profile_controller.dart +++ b/lib/controller/profile/captain_profile_controller.dart @@ -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; diff --git a/lib/controller/profile/profile_controller.dart b/lib/controller/profile/profile_controller.dart index d74117f..229d16b 100644 --- a/lib/controller/profile/profile_controller.dart +++ b/lib/controller/profile/profile_controller.dart @@ -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'; diff --git a/lib/controller/profile/setting_controller.dart b/lib/controller/profile/setting_controller.dart index 3df53bc..7a6a13d 100644 --- a/lib/controller/profile/setting_controller.dart +++ b/lib/controller/profile/setting_controller.dart @@ -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 { diff --git a/lib/controller/rate/rate_conroller.dart b/lib/controller/rate/rate_conroller.dart index 4d5ef26..4388c59 100644 --- a/lib/controller/rate/rate_conroller.dart +++ b/lib/controller/rate/rate_conroller.dart @@ -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: { diff --git a/lib/controller/themes/themes.dart b/lib/controller/themes/themes.dart index e6f6156..02089af 100644 --- a/lib/controller/themes/themes.dart +++ b/lib/controller/themes/themes.dart @@ -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'; diff --git a/lib/main.dart b/lib/main.dart index f7f42db..26e3f53 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'dart:math'; -import 'package:SEFER/controller/payment/paymob/paymob_response.dart'; +import 'package:Tripz/controller/payment/paymob/paymob_response.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter/material.dart'; diff --git a/lib/models/db_sql.dart b/lib/models/db_sql.dart index 8cc4c85..d235c0e 100644 --- a/lib/models/db_sql.dart +++ b/lib/models/db_sql.dart @@ -1,4 +1,4 @@ -import 'package:SEFER/constant/table_names.dart'; +import 'package:Tripz/constant/table_names.dart'; import 'package:sqflite/sqflite.dart'; import 'package:path/path.dart'; diff --git a/lib/models/model/painter_copoun.dart b/lib/models/model/painter_copoun.dart index 6149857..587b9ba 100644 --- a/lib/models/model/painter_copoun.dart +++ b/lib/models/model/painter_copoun.dart @@ -1,7 +1,7 @@ import 'dart:math' as math; -import 'package:SEFER/constant/box_name.dart'; -import 'package:SEFER/main.dart'; -import 'package:SEFER/splash_screen_page.dart'; +import 'package:Tripz/constant/box_name.dart'; +import 'package:Tripz/main.dart'; +import 'package:Tripz/splash_screen_page.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; @@ -174,11 +174,7 @@ class PromoBanner extends StatelessWidget { } } - - - - -// import 'package:SEFER/constant/colors.dart'; +// import 'package:Tripz/constant/colors.dart'; // import 'package:flutter/cupertino.dart'; // import 'package:flutter/material.dart'; diff --git a/lib/onbording_page.dart b/lib/onbording_page.dart index 70a4b8f..f40e43d 100644 --- a/lib/onbording_page.dart +++ b/lib/onbording_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/views/widgets/elevated_btn.dart'; +import 'package:Tripz/views/widgets/elevated_btn.dart'; import 'constant/colors.dart'; import 'controller/auth/onboarding_controller.dart'; diff --git a/lib/splash_screen_page.dart b/lib/splash_screen_page.dart index 0c37bdb..9f40599 100644 --- a/lib/splash_screen_page.dart +++ b/lib/splash_screen_page.dart @@ -1,9 +1,9 @@ import 'package:animated_text_kit/animated_text_kit.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/info.dart'; -import 'package:SEFER/constant/style.dart'; +import 'package:Tripz/constant/colors.dart'; +import 'package:Tripz/constant/info.dart'; +import 'package:Tripz/constant/style.dart'; import 'constant/box_name.dart'; import 'controller/home/splash_screen_controlle.dart'; diff --git a/lib/views/Rate/rate_captain.dart b/lib/views/Rate/rate_captain.dart index e3be4bd..e323f01 100644 --- a/lib/views/Rate/rate_captain.dart +++ b/lib/views/Rate/rate_captain.dart @@ -1,4 +1,4 @@ -import 'package:SEFER/controller/home/map_passenger_controller.dart'; +import 'package:Tripz/controller/home/map_passenger_controller.dart'; import 'package:flutter/material.dart'; import 'package:flutter_rating_bar/flutter_rating_bar.dart'; import 'package:get/get.dart'; @@ -98,7 +98,7 @@ class RateDriverFromPassenger extends StatelessWidget { Padding( padding: const EdgeInsets.all(4.0), child: Text( - 'Exclusive offers and discounts always with the Sefer app' + 'Exclusive offers and discounts always with the Tripz app' .tr, style: AppStyle.title.copyWith( color: AppColor.redColor, diff --git a/lib/views/auth/login_page.dart b/lib/views/auth/login_page.dart index ca88a55..037b15f 100644 --- a/lib/views/auth/login_page.dart +++ b/lib/views/auth/login_page.dart @@ -1,19 +1,17 @@ import 'dart:io'; -import 'package:SEFER/controller/functions/encrypt_decrypt.dart'; +import 'package:Tripz/controller/functions/encrypt_decrypt.dart'; import 'package:firebase_auth/firebase_auth.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_font_icons/flutter_font_icons.dart'; import 'package:flutter_widget_from_html/flutter_widget_from_html.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/box_name.dart'; -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/main.dart'; -import 'package:SEFER/views/widgets/elevated_btn.dart'; -import 'package:SEFER/views/widgets/my_scafold.dart'; -import 'package:permission_handler/permission_handler.dart'; +import 'package:Tripz/constant/box_name.dart'; +import 'package:Tripz/constant/colors.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/main.dart'; +import 'package:Tripz/views/widgets/my_scafold.dart'; import '../../constant/info.dart'; import '../../controller/auth/apple_signin_controller.dart'; @@ -21,7 +19,6 @@ import '../../controller/auth/google_sign.dart'; import '../../controller/auth/login_controller.dart'; import '../home/HomePage/contact_us.dart'; import '../home/profile/passenger_profile_page.dart'; -import '../widgets/mycircular.dart'; class LoginPage extends StatelessWidget { final controller = Get.put(LoginController()); diff --git a/lib/views/auth/register_page.dart b/lib/views/auth/register_page.dart index 17f9fa2..ffc566d 100644 --- a/lib/views/auth/register_page.dart +++ b/lib/views/auth/register_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/auth/register_controller.dart'; -import 'package:SEFER/views/widgets/elevated_btn.dart'; -import 'package:SEFER/views/widgets/my_scafold.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/controller/auth/register_controller.dart'; +import 'package:Tripz/views/widgets/elevated_btn.dart'; +import 'package:Tripz/views/widgets/my_scafold.dart'; import '../../constant/colors.dart'; diff --git a/lib/views/auth/sms_verfy_page.dart b/lib/views/auth/sms_verfy_page.dart index 981d721..113c978 100644 --- a/lib/views/auth/sms_verfy_page.dart +++ b/lib/views/auth/sms_verfy_page.dart @@ -1,8 +1,8 @@ -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/auth/register_controller.dart'; -import 'package:SEFER/views/widgets/elevated_btn.dart'; -import 'package:SEFER/views/widgets/my_scafold.dart'; -import 'package:SEFER/views/widgets/my_textField.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/controller/auth/register_controller.dart'; +import 'package:Tripz/views/widgets/elevated_btn.dart'; +import 'package:Tripz/views/widgets/my_scafold.dart'; +import 'package:Tripz/views/widgets/my_textField.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/views/auth/verify_email_page.dart b/lib/views/auth/verify_email_page.dart index 64cdc19..16eac90 100644 --- a/lib/views/auth/verify_email_page.dart +++ b/lib/views/auth/verify_email_page.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/auth/register_controller.dart'; -import 'package:SEFER/views/widgets/elevated_btn.dart'; -import 'package:SEFER/views/widgets/my_scafold.dart'; +import 'package:Tripz/constant/colors.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/controller/auth/register_controller.dart'; +import 'package:Tripz/views/widgets/elevated_btn.dart'; +import 'package:Tripz/views/widgets/my_scafold.dart'; class VerifyEmailPage extends StatelessWidget { const VerifyEmailPage({super.key}); diff --git a/lib/views/home/HomePage/about_page.dart b/lib/views/home/HomePage/about_page.dart index 04f219d..dde7d4c 100644 --- a/lib/views/home/HomePage/about_page.dart +++ b/lib/views/home/HomePage/about_page.dart @@ -1,5 +1,3 @@ -import 'package:SEFER/constant/box_name.dart'; -import 'package:SEFER/main.dart'; import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; @@ -30,7 +28,7 @@ class AboutPage extends StatelessWidget { // Company Name and Introduction Text( - 'SEFER LLC', + 'Tripz LLC', style: CupertinoTheme.of(context).textTheme.navTitleTextStyle, textAlign: TextAlign.center, ), @@ -45,7 +43,7 @@ class AboutPage extends StatelessWidget { // Key Features Section Text( - 'Why Choose SEFER?'.tr, + 'Why Choose Tripz?'.tr, style: CupertinoTheme.of(context).textTheme.navTitleTextStyle, textAlign: TextAlign.center, ), diff --git a/lib/views/home/HomePage/contact_us.dart b/lib/views/home/HomePage/contact_us.dart index e7012dc..d1d781b 100644 --- a/lib/views/home/HomePage/contact_us.dart +++ b/lib/views/home/HomePage/contact_us.dart @@ -1,8 +1,8 @@ -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/style.dart'; +import 'package:Tripz/constant/colors.dart'; +import 'package:Tripz/constant/style.dart'; // ignore: unused_import -import 'package:SEFER/controller/functions/launch.dart'; -import 'package:SEFER/views/widgets/my_scafold.dart'; +import 'package:Tripz/controller/functions/launch.dart'; +import 'package:Tripz/views/widgets/my_scafold.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_font_icons/flutter_font_icons.dart'; @@ -37,7 +37,7 @@ class ContactUsPage extends StatelessWidget { IconButton( onPressed: () async { Get.put(TextToSpeechController()).speakText( - 'SEFER is the safest ride-sharing app that introduces many features for both captains and passengers. We offer the lowest commission rate of just 8%, ensuring you get the best value for your rides. Our app includes insurance for the best captains, regular maintenance of cars with top engineers, and on-road services to ensure a respectful and high-quality experience for all users.' + 'Tripz is the safest ride-sharing app that introduces many features for both captains and passengers. We offer the lowest commission rate of just 8%, ensuring you get the best value for your rides. Our app includes insurance for the best captains, regular maintenance of cars with top engineers, and on-road services to ensure a respectful and high-quality experience for all users.' .tr); }, icon: const Icon(Icons.headphones), @@ -45,7 +45,7 @@ class ContactUsPage extends StatelessWidget { Padding( padding: const EdgeInsets.all(8.0), child: Text( - 'SEFER is the safest ride-sharing app that introduces many features for both captains and passengers. We offer the lowest commission rate of just 8%, ensuring you get the best value for your rides. Our app includes insurance for the best captains, regular maintenance of cars with top engineers, and on-road services to ensure a respectful and high-quality experience for all users.' + 'Tripz is the safest ride-sharing app that introduces many features for both captains and passengers. We offer the lowest commission rate of just 8%, ensuring you get the best value for your rides. Our app includes insurance for the best captains, regular maintenance of cars with top engineers, and on-road services to ensure a respectful and high-quality experience for all users.' .tr, style: AppStyle.title, textAlign: TextAlign.center, diff --git a/lib/views/home/HomePage/frequentlyQuestionsPage.dart b/lib/views/home/HomePage/frequentlyQuestionsPage.dart index b612441..a6b7902 100644 --- a/lib/views/home/HomePage/frequentlyQuestionsPage.dart +++ b/lib/views/home/HomePage/frequentlyQuestionsPage.dart @@ -1,4 +1,4 @@ -import 'package:SEFER/views/home/HomePage/contact_us.dart'; +import 'package:Tripz/views/home/HomePage/contact_us.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -56,7 +56,7 @@ class FrequentlyQuestionsPage extends StatelessWidget { onTap: () => _showAnswerDialog( context, 'How do I request a ride?'.tr, - 'Simply open the Sefer app, enter your destination, and tap "Request Ride". The app will connect you with a nearby driver.' + 'Simply open the Tripz app, enter your destination, and tap "Request Ride". The app will connect you with a nearby driver.' .tr, ), ), @@ -78,7 +78,7 @@ class FrequentlyQuestionsPage extends StatelessWidget { onTap: () => _showAnswerDialog( context, 'What types of vehicles are available?'.tr, - 'Sefer offers a variety of options including Economy, Comfort, and Luxury to suit your needs and budget.' + 'Tripz offers a variety of options including Economy, Comfort, and Luxury to suit your needs and budget.' .tr, ), ), @@ -149,7 +149,7 @@ class FrequentlyQuestionsPage extends StatelessWidget { fontWeight: FontWeight.bold, color: Colors.indigo)), content: Text( - 'To register as a driver or learn about the requirements, please visit our website or contact Sefer support directly.' + 'To register as a driver or learn about the requirements, please visit our website or contact Tripz support directly.' .tr), actions: [ CupertinoDialogAction( @@ -208,12 +208,12 @@ class FrequentlyQuestionsPage extends StatelessWidget { CupertinoIcons.shield_fill, color: Colors.teal, ), - title: Text('What safety measures does Sefer offer?'.tr), + title: Text('What safety measures does Tripz offer?'.tr), trailing: const CupertinoListTileChevron(), onTap: () => _showAnswerDialog( context, - 'What safety measures does Sefer offer?'.tr, - 'Sefer offers various safety features including driver verification, in-app trip tracking, emergency contact options, and the ability to share your trip status with trusted contacts.' + 'What safety measures does Tripz offer?'.tr, + 'Tripz offers various safety features including driver verification, in-app trip tracking, emergency contact options, and the ability to share your trip status with trusted contacts.' .tr, ), ), diff --git a/lib/views/home/HomePage/share_app_page.dart b/lib/views/home/HomePage/share_app_page.dart index c5b28d2..bd85525 100644 --- a/lib/views/home/HomePage/share_app_page.dart +++ b/lib/views/home/HomePage/share_app_page.dart @@ -1,12 +1,9 @@ -import 'package:SEFER/constant/style.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import '../../../constant/box_name.dart'; import '../../../constant/colors.dart'; import '../../../controller/home/profile/invit_controller.dart'; -import '../../../main.dart'; import '../../../print.dart'; class ShareAppPage extends StatelessWidget { diff --git a/lib/views/home/HomePage/trip_monitor/trip_link_monitor.dart b/lib/views/home/HomePage/trip_monitor/trip_link_monitor.dart index d458f6d..e9164df 100644 --- a/lib/views/home/HomePage/trip_monitor/trip_link_monitor.dart +++ b/lib/views/home/HomePage/trip_monitor/trip_link_monitor.dart @@ -1,7 +1,7 @@ import 'dart:io'; -import 'package:SEFER/controller/home/trip_monitor_controller.dart'; -import 'package:SEFER/views/widgets/my_scafold.dart'; +import 'package:Tripz/controller/home/trip_monitor_controller.dart'; +import 'package:Tripz/views/widgets/my_scafold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; diff --git a/lib/views/home/HomePage/trip_monitor/trip_monitor.dart b/lib/views/home/HomePage/trip_monitor/trip_monitor.dart index 861fae2..761caee 100644 --- a/lib/views/home/HomePage/trip_monitor/trip_monitor.dart +++ b/lib/views/home/HomePage/trip_monitor/trip_monitor.dart @@ -1,7 +1,7 @@ import 'dart:io'; -import 'package:SEFER/controller/home/trip_monitor_controller.dart'; -import 'package:SEFER/views/widgets/my_scafold.dart'; +import 'package:Tripz/controller/home/trip_monitor_controller.dart'; +import 'package:Tripz/views/widgets/my_scafold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; diff --git a/lib/views/home/HomePage/trip_record_page.dart b/lib/views/home/HomePage/trip_record_page.dart index c3d9ee5..d93691c 100644 --- a/lib/views/home/HomePage/trip_record_page.dart +++ b/lib/views/home/HomePage/trip_record_page.dart @@ -1,4 +1,4 @@ -import 'package:SEFER/views/widgets/my_scafold.dart'; +import 'package:Tripz/views/widgets/my_scafold.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/views/home/drawer_menu_page.dart b/lib/views/home/drawer_menu_page.dart index 21eb298..33d789f 100644 --- a/lib/views/home/drawer_menu_page.dart +++ b/lib/views/home/drawer_menu_page.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:SEFER/constant/colors.dart'; +import 'package:Tripz/constant/colors.dart'; class DrawerMenuPage extends StatelessWidget { const DrawerMenuPage({super.key}); diff --git a/lib/views/home/map_page_passenger.dart b/lib/views/home/map_page_passenger.dart index a7b55d8..1719acc 100644 --- a/lib/views/home/map_page_passenger.dart +++ b/lib/views/home/map_page_passenger.dart @@ -5,7 +5,6 @@ import '../../constant/colors.dart'; import '../../controller/functions/package_info.dart'; import '../../controller/home/map_passenger_controller.dart'; import '../../main.dart'; -import '../../views/home/map_widget.dart/cancel_raide_page.dart'; import '../../views/home/map_widget.dart/ride_begin_passenger.dart'; import '../../controller/home/menu_controller.dart'; diff --git a/lib/views/home/map_widget.dart/apply_order_widget.dart b/lib/views/home/map_widget.dart/apply_order_widget.dart index 37d23de..a368708 100644 --- a/lib/views/home/map_widget.dart/apply_order_widget.dart +++ b/lib/views/home/map_widget.dart/apply_order_widget.dart @@ -1,9 +1,9 @@ -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/links.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/firebase/firbase_messge.dart'; -import 'package:SEFER/controller/home/map_passenger_controller.dart'; -import 'package:SEFER/main.dart'; +import 'package:Tripz/constant/colors.dart'; +import 'package:Tripz/constant/links.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/controller/firebase/firbase_messge.dart'; +import 'package:Tripz/controller/home/map_passenger_controller.dart'; +import 'package:Tripz/main.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; diff --git a/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart b/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart index 8b7f213..d8dc166 100644 --- a/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart +++ b/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/controller/payment/payment_controller.dart'; +import 'package:Tripz/controller/payment/payment_controller.dart'; import '../../../constant/style.dart'; import '../../../controller/home/map_passenger_controller.dart'; diff --git a/lib/views/home/map_widget.dart/cancel_raide_page.dart b/lib/views/home/map_widget.dart/cancel_raide_page.dart index a7592dc..848ac7c 100644 --- a/lib/views/home/map_widget.dart/cancel_raide_page.dart +++ b/lib/views/home/map_widget.dart/cancel_raide_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/home/map_passenger_controller.dart'; +import 'package:Tripz/constant/colors.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/controller/home/map_passenger_controller.dart'; import '../../widgets/elevated_btn.dart'; void showCancelRideBottomSheet() { diff --git a/lib/views/home/map_widget.dart/car_details_widget_to_go.dart b/lib/views/home/map_widget.dart/car_details_widget_to_go.dart index d2da59d..0de2bf0 100644 --- a/lib/views/home/map_widget.dart/car_details_widget_to_go.dart +++ b/lib/views/home/map_widget.dart/car_details_widget_to_go.dart @@ -1,11 +1,11 @@ -import 'package:SEFER/constant/box_name.dart'; -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/home/blinking_promo_controller.dart.dart'; -import 'package:SEFER/main.dart'; -import 'package:SEFER/views/home/profile/passenger_profile_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/style.dart'; +import 'package:Tripz/controller/home/blinking_promo_controller.dart.dart'; +import 'package:Tripz/main.dart'; +import 'package:Tripz/views/home/profile/passenger_profile_page.dart'; +import 'package:Tripz/views/widgets/elevated_btn.dart'; +import 'package:Tripz/views/widgets/my_textField.dart'; import 'package:flutter/material.dart'; import 'package:flutter_confetti/flutter_confetti.dart'; import 'package:get/get.dart'; diff --git a/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart b/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart index 63a997d..c4a7171 100644 --- a/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart +++ b/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart @@ -1,9 +1,9 @@ -import 'package:SEFER/constant/info.dart'; +import 'package:Tripz/constant/info.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/box_name.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/views/home/my_wallet/passenger_wallet.dart'; +import 'package:Tripz/constant/box_name.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/views/home/my_wallet/passenger_wallet.dart'; import '../../../constant/colors.dart'; import '../../../controller/home/map_passenger_controller.dart'; diff --git a/lib/views/home/map_widget.dart/form_search_places_destenation.dart b/lib/views/home/map_widget.dart/form_search_places_destenation.dart index f7fe836..5953960 100644 --- a/lib/views/home/map_widget.dart/form_search_places_destenation.dart +++ b/lib/views/home/map_widget.dart/form_search_places_destenation.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; -import 'package:SEFER/constant/box_name.dart'; -import 'package:SEFER/constant/table_names.dart'; -import 'package:SEFER/views/widgets/elevated_btn.dart'; +import 'package:Tripz/constant/box_name.dart'; +import 'package:Tripz/constant/table_names.dart'; +import 'package:Tripz/views/widgets/elevated_btn.dart'; import '../../../constant/colors.dart'; import '../../../constant/style.dart'; diff --git a/lib/views/home/map_widget.dart/form_search_start.dart b/lib/views/home/map_widget.dart/form_search_start.dart index ab7afe1..ccdf396 100644 --- a/lib/views/home/map_widget.dart/form_search_start.dart +++ b/lib/views/home/map_widget.dart/form_search_start.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/table_names.dart'; +import 'package:Tripz/constant/table_names.dart'; import '../../../constant/colors.dart'; import '../../../constant/style.dart'; diff --git a/lib/views/home/map_widget.dart/form_serch_multiy_point.dart b/lib/views/home/map_widget.dart/form_serch_multiy_point.dart index fed2274..b9c1a6c 100644 --- a/lib/views/home/map_widget.dart/form_serch_multiy_point.dart +++ b/lib/views/home/map_widget.dart/form_serch_multiy_point.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/table_names.dart'; +import 'package:Tripz/constant/table_names.dart'; import '../../../constant/colors.dart'; import '../../../constant/style.dart'; diff --git a/lib/views/home/map_widget.dart/google_map_passenger_widget.dart b/lib/views/home/map_widget.dart/google_map_passenger_widget.dart index 74c6ecf..f5a2d21 100644 --- a/lib/views/home/map_widget.dart/google_map_passenger_widget.dart +++ b/lib/views/home/map_widget.dart/google_map_passenger_widget.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; -import 'package:SEFER/controller/home/points_for_rider_controller.dart'; +import 'package:Tripz/controller/home/points_for_rider_controller.dart'; import '../../../constant/colors.dart'; import '../../../constant/style.dart'; diff --git a/lib/views/home/map_widget.dart/left_main_menu_icons.dart b/lib/views/home/map_widget.dart/left_main_menu_icons.dart index 5b10ff5..2652b23 100644 --- a/lib/views/home/map_widget.dart/left_main_menu_icons.dart +++ b/lib/views/home/map_widget.dart/left_main_menu_icons.dart @@ -1,12 +1,8 @@ -import 'package:SEFER/main.dart'; import 'package:flutter/material.dart'; 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/box_name.dart'; import '../../../constant/colors.dart'; -import '../../../constant/table_names.dart'; -import '../../../controller/functions/encrypt_decrypt.dart'; import '../../../controller/functions/tts.dart'; import '../../../controller/home/map_passenger_controller.dart'; import '../../../controller/home/vip_waitting_page.dart'; diff --git a/lib/views/home/map_widget.dart/main_bottom_Menu_map.dart b/lib/views/home/map_widget.dart/main_bottom_Menu_map.dart index 7f4ff14..fe0f958 100644 --- a/lib/views/home/map_widget.dart/main_bottom_Menu_map.dart +++ b/lib/views/home/map_widget.dart/main_bottom_Menu_map.dart @@ -1,14 +1,14 @@ -import 'package:SEFER/controller/functions/encrypt_decrypt.dart'; -import 'package:SEFER/views/widgets/my_textField.dart'; +import 'package:Tripz/controller/functions/encrypt_decrypt.dart'; +import 'package:Tripz/views/widgets/my_textField.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/style.dart'; -import 'package:SEFER/controller/home/map_passenger_controller.dart'; -import 'package:SEFER/main.dart'; -import 'package:SEFER/views/home/map_widget.dart/form_search_places_destenation.dart'; -import 'package:SEFER/views/widgets/elevated_btn.dart'; +import 'package:Tripz/constant/box_name.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/home/map_widget.dart/form_search_places_destenation.dart'; +import 'package:Tripz/views/widgets/elevated_btn.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import '../../../constant/colors.dart'; diff --git a/lib/views/home/map_widget.dart/map_menu_widget.dart b/lib/views/home/map_widget.dart/map_menu_widget.dart index 7bfa879..782cb89 100644 --- a/lib/views/home/map_widget.dart/map_menu_widget.dart +++ b/lib/views/home/map_widget.dart/map_menu_widget.dart @@ -1,15 +1,15 @@ -import 'package:SEFER/views/home/HomePage/contact_us.dart'; +import 'package:Tripz/views/home/HomePage/contact_us.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_font_icons/flutter_font_icons.dart'; import 'package:get/get.dart'; import 'package:get/get_rx/src/rx_typedefs/rx_typedefs.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/views/home/my_wallet/passenger_wallet.dart'; -import 'package:SEFER/views/home/profile/complaint_page.dart'; -import 'package:SEFER/views/home/profile/order_history.dart'; -import 'package:SEFER/views/home/profile/promos_passenger_page.dart'; -import 'package:SEFER/views/home/profile/taarif_page.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/views/home/my_wallet/passenger_wallet.dart'; +import 'package:Tripz/views/home/profile/complaint_page.dart'; +import 'package:Tripz/views/home/profile/order_history.dart'; +import 'package:Tripz/views/home/profile/promos_passenger_page.dart'; +import 'package:Tripz/views/home/profile/taarif_page.dart'; import 'package:url_launcher/url_launcher.dart'; import '../../../constant/colors.dart'; diff --git a/lib/views/home/map_widget.dart/new_main_bottom_sheet.dart b/lib/views/home/map_widget.dart/new_main_bottom_sheet.dart index 2cd9248..b56233e 100644 --- a/lib/views/home/map_widget.dart/new_main_bottom_sheet.dart +++ b/lib/views/home/map_widget.dart/new_main_bottom_sheet.dart @@ -1,7 +1,7 @@ -import 'package:SEFER/constant/box_name.dart'; -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/main.dart'; +import 'package:Tripz/constant/box_name.dart'; +import 'package:Tripz/constant/colors.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/main.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/views/home/map_widget.dart/passengerRideLoctionWidget.dart b/lib/views/home/map_widget.dart/passengerRideLoctionWidget.dart index a463e19..c2b73bc 100644 --- a/lib/views/home/map_widget.dart/passengerRideLoctionWidget.dart +++ b/lib/views/home/map_widget.dart/passengerRideLoctionWidget.dart @@ -1,5 +1,5 @@ -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 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/views/home/map_widget.dart/payment_method.page.dart b/lib/views/home/map_widget.dart/payment_method.page.dart index 284c3ee..250cfa0 100644 --- a/lib/views/home/map_widget.dart/payment_method.page.dart +++ b/lib/views/home/map_widget.dart/payment_method.page.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/box_name.dart'; -import 'package:SEFER/controller/functions/secure_storage.dart'; -import 'package:SEFER/controller/home/payment/credit_card_controller.dart'; -import 'package:SEFER/views/widgets/elevated_btn.dart'; +import 'package:Tripz/constant/box_name.dart'; +import 'package:Tripz/controller/functions/secure_storage.dart'; +import 'package:Tripz/controller/home/payment/credit_card_controller.dart'; +import 'package:Tripz/views/widgets/elevated_btn.dart'; import '../../../constant/colors.dart'; import '../../../constant/style.dart'; diff --git a/lib/views/home/map_widget.dart/picker_animation_container.dart b/lib/views/home/map_widget.dart/picker_animation_container.dart index 92742bb..2e3ccb5 100644 --- a/lib/views/home/map_widget.dart/picker_animation_container.dart +++ b/lib/views/home/map_widget.dart/picker_animation_container.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/table_names.dart'; +import 'package:Tripz/constant/table_names.dart'; import '../../../constant/colors.dart'; import '../../../constant/style.dart'; diff --git a/lib/views/home/map_widget.dart/points_page_for_rider.dart b/lib/views/home/map_widget.dart/points_page_for_rider.dart index de97751..1c7d2d6 100644 --- a/lib/views/home/map_widget.dart/points_page_for_rider.dart +++ b/lib/views/home/map_widget.dart/points_page_for_rider.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/style.dart'; +import 'package:Tripz/constant/style.dart'; import '../../../constant/colors.dart'; import '../../../controller/home/map_passenger_controller.dart'; diff --git a/lib/views/home/map_widget.dart/ride_begin_passenger.dart b/lib/views/home/map_widget.dart/ride_begin_passenger.dart index 2e177bc..bd98cb8 100644 --- a/lib/views/home/map_widget.dart/ride_begin_passenger.dart +++ b/lib/views/home/map_widget.dart/ride_begin_passenger.dart @@ -1,11 +1,11 @@ -import 'package:SEFER/constant/links.dart'; -import 'package:SEFER/views/home/profile/complaint_page.dart'; +import 'package:Tripz/constant/links.dart'; +import 'package:Tripz/views/home/profile/complaint_page.dart'; import 'package:flutter/material.dart'; import 'package:flutter_font_icons/flutter_font_icons.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/box_name.dart'; -import 'package:SEFER/controller/profile/profile_controller.dart'; -import 'package:SEFER/main.dart'; +import 'package:Tripz/constant/box_name.dart'; +import 'package:Tripz/controller/profile/profile_controller.dart'; +import 'package:Tripz/main.dart'; import '../../../constant/colors.dart'; import '../../../constant/style.dart'; diff --git a/lib/views/home/map_widget.dart/searching_captain_window.dart b/lib/views/home/map_widget.dart/searching_captain_window.dart index 86a8ab3..8197fbb 100644 --- a/lib/views/home/map_widget.dart/searching_captain_window.dart +++ b/lib/views/home/map_widget.dart/searching_captain_window.dart @@ -1,10 +1,10 @@ import 'dart:async'; -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/home/map_passenger_controller.dart'; -import 'package:SEFER/views/widgets/elevated_btn.dart'; -import 'package:SEFER/views/widgets/my_textField.dart'; +import 'package:Tripz/constant/colors.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/controller/home/map_passenger_controller.dart'; +import 'package:Tripz/views/widgets/elevated_btn.dart'; +import 'package:Tripz/views/widgets/my_textField.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/views/home/map_widget.dart/select_driver_mishwari.dart b/lib/views/home/map_widget.dart/select_driver_mishwari.dart index 59e3546..4156b8d 100644 --- a/lib/views/home/map_widget.dart/select_driver_mishwari.dart +++ b/lib/views/home/map_widget.dart/select_driver_mishwari.dart @@ -1,7 +1,7 @@ -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/home/map_passenger_controller.dart'; -import 'package:SEFER/views/widgets/elevated_btn.dart'; +import 'package:Tripz/constant/colors.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/controller/home/map_passenger_controller.dart'; +import 'package:Tripz/views/widgets/elevated_btn.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -47,12 +47,12 @@ class CupertinoDriverListWidget extends StatelessWidget { leading: CircleAvatar( radius: 25, backgroundImage: NetworkImage( - '${AppLink.seferCairoServer}/portrate_captain_image/${driver['id']}.jpg', + '${AppLink.tripzCairoServer}/portrate_captain_image/${driver['id']}.jpg', ), child: Builder( builder: (context) { return Image.network( - '${AppLink.seferCairoServer}/portrate_captain_image/${driver['id']}.jpg', + '${AppLink.tripzCairoServer}/portrate_captain_image/${driver['id']}.jpg', fit: BoxFit.cover, loadingBuilder: (BuildContext context, Widget child, diff --git a/lib/views/home/map_widget.dart/timer_to_passenger_from_driver.dart b/lib/views/home/map_widget.dart/timer_to_passenger_from_driver.dart index f705ca2..20157c4 100644 --- a/lib/views/home/map_widget.dart/timer_to_passenger_from_driver.dart +++ b/lib/views/home/map_widget.dart/timer_to_passenger_from_driver.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/views/widgets/elevated_btn.dart'; +import 'package:Tripz/views/widgets/elevated_btn.dart'; import '../../../constant/colors.dart'; import '../../../constant/style.dart'; diff --git a/lib/views/home/map_widget.dart/vip_begin.dart b/lib/views/home/map_widget.dart/vip_begin.dart index b124710..fd38408 100644 --- a/lib/views/home/map_widget.dart/vip_begin.dart +++ b/lib/views/home/map_widget.dart/vip_begin.dart @@ -1,11 +1,11 @@ -import 'package:SEFER/constant/links.dart'; -import 'package:SEFER/views/home/profile/complaint_page.dart'; +import 'package:Tripz/constant/links.dart'; +import 'package:Tripz/views/home/profile/complaint_page.dart'; import 'package:flutter/material.dart'; import 'package:flutter_font_icons/flutter_font_icons.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/box_name.dart'; -import 'package:SEFER/controller/profile/profile_controller.dart'; -import 'package:SEFER/main.dart'; +import 'package:Tripz/constant/box_name.dart'; +import 'package:Tripz/controller/profile/profile_controller.dart'; +import 'package:Tripz/main.dart'; import '../../../constant/colors.dart'; import '../../../constant/style.dart'; diff --git a/lib/views/home/my_wallet/passenger_wallet.dart b/lib/views/home/my_wallet/passenger_wallet.dart index 8725496..c2a645f 100644 --- a/lib/views/home/my_wallet/passenger_wallet.dart +++ b/lib/views/home/my_wallet/passenger_wallet.dart @@ -2,7 +2,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/views/home/my_wallet/payment_history_passenger_page.dart'; +import 'package:Tripz/views/home/my_wallet/payment_history_passenger_page.dart'; import '../../../constant/box_name.dart'; import '../../../constant/colors.dart'; import '../../../constant/info.dart'; @@ -32,7 +32,7 @@ class PassengerWallet extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - const CardSeferWallet(), + const CardTripzWallet(), const SizedBox( height: 20, ), @@ -168,8 +168,8 @@ class PassengerWallet extends StatelessWidget { } } -class CardSeferWallet extends StatelessWidget { - const CardSeferWallet({super.key}); +class CardTripzWallet extends StatelessWidget { + const CardTripzWallet({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/views/home/my_wallet/passenger_wallet_dialoge.dart b/lib/views/home/my_wallet/passenger_wallet_dialoge.dart index af85f94..45d570b 100644 --- a/lib/views/home/my_wallet/passenger_wallet_dialoge.dart +++ b/lib/views/home/my_wallet/passenger_wallet_dialoge.dart @@ -1,11 +1,11 @@ -import 'package:SEFER/constant/style.dart'; +import 'package:Tripz/constant/style.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/colors.dart'; -import 'package:SEFER/controller/functions/toast.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/controller/functions/toast.dart'; +import 'package:Tripz/controller/payment/payment_controller.dart'; import '../../../main.dart'; diff --git a/lib/views/home/my_wallet/payment_history_driver_page.dart b/lib/views/home/my_wallet/payment_history_driver_page.dart index c9c4b13..06b4fbe 100644 --- a/lib/views/home/my_wallet/payment_history_driver_page.dart +++ b/lib/views/home/my_wallet/payment_history_driver_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/views/widgets/my_scafold.dart'; -import 'package:SEFER/views/widgets/mycircular.dart'; +import 'package:Tripz/constant/colors.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/views/widgets/my_scafold.dart'; +import 'package:Tripz/views/widgets/mycircular.dart'; import '../../../controller/payment/driver_payment_controller.dart'; diff --git a/lib/views/home/my_wallet/payment_history_passenger_page.dart b/lib/views/home/my_wallet/payment_history_passenger_page.dart index f3ab954..af3e5d7 100644 --- a/lib/views/home/my_wallet/payment_history_passenger_page.dart +++ b/lib/views/home/my_wallet/payment_history_passenger_page.dart @@ -1,11 +1,11 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/payment/passenger_wallet_history_controller.dart'; -import 'package:SEFER/views/widgets/my_scafold.dart'; -import 'package:SEFER/views/widgets/mycircular.dart'; +import 'package:Tripz/constant/colors.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/controller/payment/passenger_wallet_history_controller.dart'; +import 'package:Tripz/views/widgets/my_scafold.dart'; +import 'package:Tripz/views/widgets/mycircular.dart'; class PaymentHistoryPassengerPage extends StatelessWidget { const PaymentHistoryPassengerPage({super.key}); diff --git a/lib/views/home/profile/budgets_ads.dart b/lib/views/home/profile/budgets_ads.dart index aca87a0..362dd76 100644 --- a/lib/views/home/profile/budgets_ads.dart +++ b/lib/views/home/profile/budgets_ads.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/payment/payment_controller.dart'; +import 'package:Tripz/constant/colors.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/controller/payment/payment_controller.dart'; import '../../../constant/box_name.dart'; import '../../../main.dart'; diff --git a/lib/views/home/profile/complaint_page.dart b/lib/views/home/profile/complaint_page.dart index 4fcc390..2b33284 100644 --- a/lib/views/home/profile/complaint_page.dart +++ b/lib/views/home/profile/complaint_page.dart @@ -1,9 +1,8 @@ import 'dart:convert'; -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/functions/crud.dart'; -import 'package:SEFER/controller/home/profile/complaint_controller.dart'; +import 'package:Tripz/constant/colors.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/controller/home/profile/complaint_controller.dart'; import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'dart:io'; diff --git a/lib/views/home/profile/order_history.dart b/lib/views/home/profile/order_history.dart index 68eb910..20b482b 100644 --- a/lib/views/home/profile/order_history.dart +++ b/lib/views/home/profile/order_history.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/views/widgets/my_scafold.dart'; -import 'package:SEFER/views/widgets/mycircular.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/views/widgets/my_scafold.dart'; +import 'package:Tripz/views/widgets/mycircular.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import '../../../constant/colors.dart'; diff --git a/lib/views/home/profile/passenger_profile_page.dart b/lib/views/home/profile/passenger_profile_page.dart index 93e0602..51212ec 100644 --- a/lib/views/home/profile/passenger_profile_page.dart +++ b/lib/views/home/profile/passenger_profile_page.dart @@ -1,17 +1,17 @@ -import 'package:SEFER/controller/functions/encrypt_decrypt.dart'; -import 'package:SEFER/views/auth/login_page.dart'; +import 'package:Tripz/controller/functions/encrypt_decrypt.dart'; +import 'package:Tripz/views/auth/login_page.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/colors.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/profile/profile_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/my_textField.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/style.dart'; +import 'package:Tripz/controller/profile/profile_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/my_textField.dart'; +import 'package:Tripz/views/widgets/mycircular.dart'; import '../../../controller/auth/login_controller.dart'; import '../../../controller/functions/log_out.dart'; diff --git a/lib/views/home/profile/profile_captain.dart b/lib/views/home/profile/profile_captain.dart index 2c75372..07628c6 100644 --- a/lib/views/home/profile/profile_captain.dart +++ b/lib/views/home/profile/profile_captain.dart @@ -1,12 +1,12 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/box_name.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/profile/captain_profile_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:Tripz/constant/box_name.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/controller/profile/captain_profile_controller.dart'; +import 'package:Tripz/main.dart'; +import 'package:Tripz/views/widgets/elevated_btn.dart'; +import 'package:Tripz/views/widgets/my_scafold.dart'; import '../../../constant/api_key.dart'; import '../../widgets/my_textField.dart'; diff --git a/lib/views/home/profile/promos_passenger_page.dart b/lib/views/home/profile/promos_passenger_page.dart index 923478b..22b5f81 100644 --- a/lib/views/home/profile/promos_passenger_page.dart +++ b/lib/views/home/profile/promos_passenger_page.dart @@ -3,15 +3,11 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; -import 'package:SEFER/controller/home/profile/promos_controller.dart'; -import 'package:SEFER/views/widgets/my_scafold.dart'; +import 'package:Tripz/controller/home/profile/promos_controller.dart'; +import 'package:Tripz/views/widgets/my_scafold.dart'; -import '../../../constant/box_name.dart'; -import '../../../constant/colors.dart'; import '../../../constant/style.dart'; -import '../../../main.dart'; import '../../widgets/mycircular.dart'; -import 'budgets_ads.dart'; class PromosPassengerPage extends StatelessWidget { const PromosPassengerPage({super.key}); diff --git a/lib/views/home/profile/taarif_page.dart b/lib/views/home/profile/taarif_page.dart index 5090573..7f77772 100644 --- a/lib/views/home/profile/taarif_page.dart +++ b/lib/views/home/profile/taarif_page.dart @@ -1,9 +1,9 @@ -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:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/views/widgets/my_scafold.dart'; +import 'package:Tripz/constant/style.dart'; +import 'package:Tripz/views/widgets/my_scafold.dart'; class TaarifPage extends StatelessWidget { const TaarifPage({super.key}); diff --git a/lib/views/home/setting_page.dart b/lib/views/home/setting_page.dart index 3920785..5b649bb 100644 --- a/lib/views/home/setting_page.dart +++ b/lib/views/home/setting_page.dart @@ -1,8 +1,8 @@ -import 'package:SEFER/controller/home/home_page_controller.dart'; +import 'package:Tripz/controller/home/home_page_controller.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/views/lang/languages.dart'; +import 'package:Tripz/views/lang/languages.dart'; import 'HomePage/about_page.dart'; import 'HomePage/frequentlyQuestionsPage.dart'; @@ -104,7 +104,7 @@ class SettingPage extends StatelessWidget { color: CupertinoColors.activeBlue), title: Text('Share App'.tr), subtitle: Text( - 'You can share the SEFER App with your friends and earn rewards for rides they take using your code' + 'You can share the Tripz App with your friends and earn rewards for rides they take using your code' .tr), trailing: const CupertinoListTileChevron(), ), diff --git a/lib/views/lang/languages.dart b/lib/views/lang/languages.dart index 2f9d734..ed5eb6d 100644 --- a/lib/views/lang/languages.dart +++ b/lib/views/lang/languages.dart @@ -1,13 +1,9 @@ -import 'package:SEFER/constant/style.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/views/widgets/elevated_btn.dart'; +import 'package:Tripz/views/widgets/elevated_btn.dart'; -import '../../constant/box_name.dart'; import '../../controller/local/local_controller.dart'; -import '../../main.dart'; -import '../auth/login_page.dart'; import '../home/map_page_passenger.dart'; class Language extends StatelessWidget { diff --git a/lib/views/notification/notification_captain.dart b/lib/views/notification/notification_captain.dart index cd4c6b9..131b23e 100644 --- a/lib/views/notification/notification_captain.dart +++ b/lib/views/notification/notification_captain.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/notification/notification_captain_controller.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/style.dart'; +import 'package:Tripz/controller/notification/notification_captain_controller.dart'; +import 'package:Tripz/views/widgets/elevated_btn.dart'; +import 'package:Tripz/views/widgets/my_scafold.dart'; +import 'package:Tripz/views/widgets/mycircular.dart'; class NotificationCaptain extends StatelessWidget { const NotificationCaptain({super.key}); diff --git a/lib/views/notification/notification_page.dart b/lib/views/notification/notification_page.dart index 5752137..ad5e309 100644 --- a/lib/views/notification/notification_page.dart +++ b/lib/views/notification/notification_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/cupertino.dart'; 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'; import '../../controller/notification/passenger_notification_controller.dart'; import '../widgets/my_scafold.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index 450e234..559ef82 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: SEFER +name: Tripz description: A new Flutter project. publish_to: "none" # Remove this line if you wish to publish to pub.dev diff --git a/test/widget_test.dart b/test/widget_test.dart index 71168b6..772617e 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:SEFER/main.dart'; +import 'package:Tripz/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async {