diff --git a/apps/driver/README.md b/apps/driver/README.md index bac9f0c..a8e3a31 100644 --- a/apps/driver/README.md +++ b/apps/driver/README.md @@ -1,4 +1,4 @@ -# siro_driver +# tripz_driver A new Flutter project. diff --git a/apps/driver/analyze_report.txt b/apps/driver/analyze_report.txt index 82e23f5..cb6b0fd 100644 --- a/apps/driver/analyze_report.txt +++ b/apps/driver/analyze_report.txt @@ -1,4 +1,4 @@ -Analyzing siro_driver... +Analyzing tripz_driver... error - trip_overlay_plugin/example/integration_test/plugin_integration_test.dart:11:8 - Target of URI doesn't exist: 'package:integration_test/integration_test.dart'. Try creating the file referenced by the URI, or try using a URI for a file that does exist. - uri_does_not_exist error - trip_overlay_plugin/example/integration_test/plugin_integration_test.dart:16:3 - Undefined name 'IntegrationTestWidgetsFlutterBinding'. Try correcting the name to one that is defined, or defining the name. - undefined_identifier @@ -13,8 +13,8 @@ warning - lib/controller/auth/captin/ml_google_doc.dart:1:8 - Unused import: 'da warning - lib/controller/auth/captin/ml_google_doc.dart:3:8 - Unused import: 'package:get/get.dart'. Try removing the import directive. - unused_import warning - lib/controller/auth/captin/ml_google_doc.dart:5:8 - Unused import: 'package:image_cropper/image_cropper.dart'. Try removing the import directive. - unused_import warning - lib/controller/auth/captin/ml_google_doc.dart:6:8 - Unused import: 'package:image_picker/image_picker.dart'. Try removing the import directive. - unused_import -warning - lib/controller/auth/captin/ml_google_doc.dart:7:8 - Unused import: 'package:siro_driver/constant/colors.dart'. Try removing the import directive. - unused_import -warning - lib/controller/auth/captin/ml_google_doc.dart:8:8 - Unused import: 'package:siro_driver/controller/functions/llama_ai.dart'. Try removing the import directive. - unused_import +warning - lib/controller/auth/captin/ml_google_doc.dart:7:8 - Unused import: 'package:tripz_driver/constant/colors.dart'. Try removing the import directive. - unused_import +warning - lib/controller/auth/captin/ml_google_doc.dart:8:8 - Unused import: 'package:tripz_driver/controller/functions/llama_ai.dart'. Try removing the import directive. - unused_import warning - lib/controller/auth/captin/opt_token_controller.dart:11:8 - Unused import: '../../firebase/firbase_messge.dart'. Try removing the import directive. - unused_import warning - lib/controller/auth/captin/register_captin_controller.dart:97:24 - The value of the local variable 'smsEgyptController' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/controller/auth/captin/register_captin_controller.dart:223:8 - The declaration '_isPhoneVerified' isn't referenced. Try removing the declaration of '_isPhoneVerified'. - unused_element @@ -36,7 +36,7 @@ warning - lib/controller/auth/syria/registration_controller.dart:611:61 - The '! warning - lib/controller/auth/syria/registration_controller.dart:612:57 - The '!' will have no effect because the receiver can't be null. Try removing the '!' operator. - unnecessary_non_null_assertion warning - lib/controller/auth/syria/registration_controller.dart:613:55 - The '!' will have no effect because the receiver can't be null. Try removing the '!' operator. - unnecessary_non_null_assertion warning - lib/controller/firebase/access_token.dart:4:8 - Unused import: '../../print.dart'. Try removing the import directive. - unused_import -warning - lib/controller/firebase/firbase_messge.dart:4:8 - Unused import: 'package:siro_driver/views/home/Captin/orderCaptin/order_speed_request.dart'. Try removing the import directive. - unused_import +warning - lib/controller/firebase/firbase_messge.dart:4:8 - Unused import: 'package:tripz_driver/views/home/Captin/orderCaptin/order_speed_request.dart'. Try removing the import directive. - unused_import warning - lib/controller/firebase/firbase_messge.dart:20:8 - Unused import: '../../views/home/Captin/orderCaptin/order_request_page.dart'. Try removing the import directive. - unused_import warning - lib/controller/firebase/firbase_messge.dart:56:28 - The value of the local variable 'settings' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/controller/firebase/firbase_messge.dart:100:28 - The value of the local variable 'android' isn't used. Try removing the variable or using it. - unused_local_variable @@ -52,10 +52,10 @@ warning - lib/controller/functions/encrypt_decrypt.dart:7:8 - Unused import: '.. warning - lib/controller/functions/encrypt_decrypt.dart:8:8 - Unused import: '../../print.dart'. Try removing the import directive. - unused_import warning - lib/controller/functions/encrypt_decrypt.dart:38:36 - The '!' will have no effect because the receiver can't be null. Try removing the '!' operator. - unnecessary_non_null_assertion warning - lib/controller/functions/encrypt_decrypt.dart:39:47 - The '!' will have no effect because the receiver can't be null. Try removing the '!' operator. - unnecessary_non_null_assertion -warning - lib/controller/functions/face_detect.dart:3:8 - Unused import: 'package:siro_driver/constant/api_key.dart'. Try removing the import directive. - unused_import +warning - lib/controller/functions/face_detect.dart:3:8 - Unused import: 'package:tripz_driver/constant/api_key.dart'. Try removing the import directive. - unused_import warning - lib/controller/functions/face_detect.dart:10:8 - Unused import: 'encrypt_decrypt.dart'. Try removing the import directive. - unused_import warning - lib/controller/functions/gemeni.dart:4:8 - Duplicate import. Try removing all but one import of the library. - duplicate_import -warning - lib/controller/functions/gemeni.dart:12:8 - Unused import: 'package:siro_driver/controller/firebase/firbase_messge.dart'. Try removing the import directive. - unused_import +warning - lib/controller/functions/gemeni.dart:12:8 - Unused import: 'package:tripz_driver/controller/firebase/firbase_messge.dart'. Try removing the import directive. - unused_import warning - lib/controller/functions/gemeni.dart:31:8 - Unused import: '../../print.dart'. Try removing the import directive. - unused_import warning - lib/controller/functions/gemeni.dart:157:11 - The value of the local variable 'inspExpired' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/controller/functions/gemeni.dart:158:11 - The value of the local variable 'taxExpired' isn't used. Try removing the variable or using it. - unused_local_variable @@ -76,7 +76,7 @@ warning - lib/controller/functions/gemeni.dart:1361:13 - The value of the local warning - lib/controller/functions/gemeni.dart:1441:13 - The value of the local variable 'result' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/controller/functions/gemeni.dart:1522:13 - The value of the local variable 'result' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/controller/functions/gemeni.dart:1599:13 - The value of the local variable 'result' isn't used. Try removing the variable or using it. - unused_local_variable -warning - lib/controller/functions/llama_ai.dart:5:8 - Unused import: 'package:siro_driver/controller/functions/gemeni.dart'. Try removing the import directive. - unused_import +warning - lib/controller/functions/llama_ai.dart:5:8 - Unused import: 'package:tripz_driver/controller/functions/gemeni.dart'. Try removing the import directive. - unused_import warning - lib/controller/functions/location_controller.dart:54:36 - The value of the field '_homeCtrl' isn't used. Try removing the field, or using it. - unused_field warning - lib/controller/functions/location_controller.dart:55:38 - The value of the field '_walletCtrl' isn't used. Try removing the field, or using it. - unused_field warning - lib/controller/functions/location_controller.dart:64:8 - The value of the field '_isReady' isn't used. Try removing the field, or using it. - unused_field @@ -97,12 +97,12 @@ warning - lib/controller/functions/sms_egypt_controller.dart:31:12 - The value o warning - lib/controller/functions/sms_egypt_controller.dart:66:9 - The value of the local variable 'res' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/controller/functions/sms_egypt_controller.dart:77:9 - The value of the local variable 'res' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/controller/functions/sms_egypt_controller.dart:94:9 - The value of the local variable 'res' isn't used. Try removing the variable or using it. - unused_local_variable -warning - lib/controller/functions/upload_image.dart:3:8 - Unused import: 'package:siro_driver/constant/api_key.dart'. Try removing the import directive. - unused_import +warning - lib/controller/functions/upload_image.dart:3:8 - Unused import: 'package:tripz_driver/constant/api_key.dart'. Try removing the import directive. - unused_import warning - lib/controller/functions/upload_image.dart:9:8 - Unused import: 'package:path/path.dart'. Try removing the import directive. - unused_import -warning - lib/controller/home/captin/duration_controller .dart:3:8 - Unused import: 'package:siro_driver/views/widgets/elevated_btn.dart'. Try removing the import directive. - unused_import +warning - lib/controller/home/captin/duration_controller .dart:3:8 - Unused import: 'package:tripz_driver/views/widgets/elevated_btn.dart'. Try removing the import directive. - unused_import warning - lib/controller/home/captin/duration_controller .dart:105:26 - Unnecessary cast. Try removing the cast. - unnecessary_cast warning - lib/controller/home/captin/help/help_controller.dart:12:8 - Unused import: '../../../functions/encrypt_decrypt.dart'. Try removing the import directive. - unused_import -warning - lib/controller/home/captin/help/video_controller.dart:5:8 - Unused import: 'package:siro_driver/print.dart'. Try removing the import directive. - unused_import +warning - lib/controller/home/captin/help/video_controller.dart:5:8 - Unused import: 'package:tripz_driver/print.dart'. Try removing the import directive. - unused_import warning - lib/controller/home/captin/home_captain_controller.dart:20:8 - Unused import: '../../functions/background_service.dart'. Try removing the import directive. - unused_import warning - lib/controller/home/captin/home_captain_controller.dart:22:8 - Unused import: '../../functions/location_background_controller.dart'. Try removing the import directive. - unused_import warning - lib/controller/home/captin/home_captain_controller.dart:514:33 - The operand can't be 'null', so the condition is always 'true'. Remove the condition. - unnecessary_null_comparison @@ -141,11 +141,11 @@ warning - lib/controller/home/navigation/navigation_controller.dart:1318:10 - Th warning - lib/controller/home/navigation/navigation_controller.dart:1319:10 - The declaration '_kmToLngDelta' isn't referenced. Try removing the declaration of '_kmToLngDelta'. - unused_element warning - lib/controller/home/navigation/navigation_view.dart:31:29 - The value of the local variable 's' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/controller/home/navigation/route_matcher_worker.dart:2:8 - Unused import: 'dart:async'. Try removing the import directive. - unused_import -warning - lib/controller/home/navigation/route_matcher_worker.dart:5:8 - Unused import: 'package:intaleq_maps/intaleq_maps.dart'. Try removing the import directive. - unused_import +warning - lib/controller/home/navigation/route_matcher_worker.dart:5:8 - Unused import: 'package:tripz_maps/tripz_maps.dart'. Try removing the import directive. - unused_import warning - lib/controller/home/payment/captain_wallet_controller.dart:3:8 - Unused import: 'package:local_auth/local_auth.dart'. Try removing the import directive. - unused_import -warning - lib/controller/home/payment/captain_wallet_controller.dart:5:8 - Unused import: 'package:siro_driver/controller/firebase/firbase_messge.dart'. Try removing the import directive. - unused_import +warning - lib/controller/home/payment/captain_wallet_controller.dart:5:8 - Unused import: 'package:tripz_driver/controller/firebase/firbase_messge.dart'. Try removing the import directive. - unused_import warning - lib/controller/home/payment/captain_wallet_controller.dart:16:8 - Unused import: '../../../views/widgets/mydialoug.dart'. Try removing the import directive. - unused_import -warning - lib/controller/home/payment/paymob_payout.dart:5:8 - Unused import: 'package:siro_driver/controller/payment/smsPaymnet/payment_services.dart'. Try removing the import directive. - unused_import +warning - lib/controller/home/payment/paymob_payout.dart:5:8 - Unused import: 'package:tripz_driver/controller/payment/smsPaymnet/payment_services.dart'. Try removing the import directive. - unused_import warning - lib/controller/home/splash_screen_controlle.dart:14:8 - Unused import: '../../onbording_page.dart'. Try removing the import directive. - unused_import warning - lib/controller/local/local_controller.dart:7:8 - Unused import: '../profile/setting_controller.dart'. Try removing the import directive. - unused_import warning - lib/controller/local/translations.dart:349:11 - Two keys in a map literal shouldn't be equal. Change or remove the duplicate key. - equal_keys_in_map @@ -179,15 +179,15 @@ warning - lib/controller/local/translations.dart:2632:11 - Two keys in a map lit warning - lib/controller/local/translations.dart:2633:11 - Two keys in a map literal shouldn't be equal. Change or remove the duplicate key. - equal_keys_in_map warning - lib/controller/local/translations.dart:2635:11 - Two keys in a map literal shouldn't be equal. Change or remove the duplicate key. - equal_keys_in_map warning - lib/controller/local/translations.dart:2636:11 - Two keys in a map literal shouldn't be equal. Change or remove the duplicate key. - equal_keys_in_map -warning - lib/controller/notification/notification_captain_controller.dart:5:8 - Unused import: 'package:siro_driver/constant/style.dart'. Try removing the import directive. - unused_import -warning - lib/controller/notification/notification_captain_controller.dart:6:8 - Unused import: 'package:siro_driver/views/widgets/elevated_btn.dart'. Try removing the import directive. - unused_import -warning - lib/controller/notification/notification_captain_controller.dart:7:8 - Unused import: 'package:siro_driver/views/widgets/mydialoug.dart'. Try removing the import directive. - unused_import -warning - lib/controller/notification/passenger_notification_controller.dart:4:8 - Unused import: 'package:siro_driver/controller/firebase/firbase_messge.dart'. Try removing the import directive. - unused_import +warning - lib/controller/notification/notification_captain_controller.dart:5:8 - Unused import: 'package:tripz_driver/constant/style.dart'. Try removing the import directive. - unused_import +warning - lib/controller/notification/notification_captain_controller.dart:6:8 - Unused import: 'package:tripz_driver/views/widgets/elevated_btn.dart'. Try removing the import directive. - unused_import +warning - lib/controller/notification/notification_captain_controller.dart:7:8 - Unused import: 'package:tripz_driver/views/widgets/mydialoug.dart'. Try removing the import directive. - unused_import +warning - lib/controller/notification/passenger_notification_controller.dart:4:8 - Unused import: 'package:tripz_driver/controller/firebase/firbase_messge.dart'. Try removing the import directive. - unused_import warning - lib/controller/notification/passenger_notification_controller.dart:53:9 - The value of the local variable 'res' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/controller/notification/ride_available_controller.dart:2:8 - Unused import: 'package:flutter/material.dart'. Try removing the import directive. - unused_import warning - lib/controller/payment/mtn_new/mtn_payment_new_screen.dart:103:11 - The value of the field '_invoiceNumber' isn't used. Try removing the field, or using it. - unused_field -warning - lib/controller/payment/payment_controller.dart:2:8 - Unused import: 'package:siro_driver/constant/api_key.dart'. Try removing the import directive. - unused_import -warning - lib/controller/payment/payment_controller.dart:7:8 - Unused import: 'package:siro_driver/views/widgets/error_snakbar.dart'. Try removing the import directive. - unused_import +warning - lib/controller/payment/payment_controller.dart:2:8 - Unused import: 'package:tripz_driver/constant/api_key.dart'. Try removing the import directive. - unused_import +warning - lib/controller/payment/payment_controller.dart:7:8 - Unused import: 'package:tripz_driver/views/widgets/error_snakbar.dart'. Try removing the import directive. - unused_import warning - lib/controller/payment/payment_controller.dart:8:8 - Unused import: 'package:http/http.dart'. Try removing the import directive. - unused_import warning - lib/controller/payment/payment_controller.dart:16:8 - Unused import: '../../constant/info.dart'. Try removing the import directive. - unused_import warning - lib/controller/payment/paymob.dart:4:8 - Unused import: 'package:flutter/material.dart'. Try removing the import directive. - unused_import @@ -195,18 +195,18 @@ warning - lib/controller/payment/paymob.dart:10:8 - Unused import: '../functions warning - lib/controller/payment/paymob.dart:46:27 - The exception variable 'e' isn't used, so the 'catch' clause can be removed. Try removing the catch clause. - unused_catch_clause warning - lib/controller/payment/paymob.dart:77:26 - The exception variable 'e' isn't used, so the 'catch' clause can be removed. Try removing the catch clause. - unused_catch_clause warning - lib/controller/payment/paymob.dart:82:18 - The declaration '_getStatusAfterPaid' isn't referenced. Try removing the declaration of '_getStatusAfterPaid'. - unused_element -warning - lib/controller/payment/paymob/paymob_response.dart:2:8 - Unused import: 'package:siro_driver/controller/functions/encrypt_decrypt.dart'. Try removing the import directive. - unused_import -warning - lib/controller/payment/paymob/paymob_wallet.dart:2:8 - Unused import: 'package:siro_driver/controller/functions/encrypt_decrypt.dart'. Try removing the import directive. - unused_import +warning - lib/controller/payment/paymob/paymob_response.dart:2:8 - Unused import: 'package:tripz_driver/controller/functions/encrypt_decrypt.dart'. Try removing the import directive. - unused_import +warning - lib/controller/payment/paymob/paymob_wallet.dart:2:8 - Unused import: 'package:tripz_driver/controller/functions/encrypt_decrypt.dart'. Try removing the import directive. - unused_import warning - lib/controller/payment/paymob/paymob_wallet.dart:43:15 - The value of the field '_iFrameURL' isn't used. Try removing the field, or using it. - unused_field warning - lib/controller/payment/paymob/paymob_wallet.dart:169:26 - The exception variable 'e' isn't used, so the 'catch' clause can be removed. Try removing the catch clause. - unused_catch_clause warning - lib/controller/payment/paymob/paymob_wallet.dart:451:8 - The declaration '_showSuccessDialog' isn't referenced. Try removing the declaration of '_showSuccessDialog'. - unused_element warning - lib/controller/rate/rate_app_controller.dart:1:8 - Unused import: 'dart:convert'. Try removing the import directive. - unused_import -warning - lib/controller/rate/rate_conroller.dart:1:8 - Unused import: 'package:siro_driver/controller/firebase/firbase_messge.dart'. Try removing the import directive. - unused_import +warning - lib/controller/rate/rate_conroller.dart:1:8 - Unused import: 'package:tripz_driver/controller/firebase/firbase_messge.dart'. Try removing the import directive. - unused_import warning - lib/controller/rate/rate_conroller.dart:120:36 - The left operand can't be null, so the right operand is never executed. Try removing the operator and the right operand. - dead_null_aware_expression warning - lib/main.dart:21:8 - Unused import: 'constant/api_key.dart'. Try removing the import directive. - unused_import warning - lib/print.dart:10:18 - This function has a nullable return type of 'Object?', but ends without returning a value. Try adding a return statement, or if no value is ever returned, try changing the return type to 'void'. - body_might_complete_normally_nullable warning - lib/services/offline_map_service.dart:6:8 - Unused import: '../main.dart'. Try removing the import directive. - unused_import -warning - lib/splash_screen_page.dart:3:8 - Unused import: 'package:siro_driver/constant/box_name.dart'. Try removing the import directive. - unused_import +warning - lib/splash_screen_page.dart:3:8 - Unused import: 'package:tripz_driver/constant/box_name.dart'. Try removing the import directive. - unused_import warning - lib/splash_screen_page.dart:5:8 - Unused import: 'main.dart'. Try removing the import directive. - unused_import warning - lib/views/Rate/rate_passenger.dart:10:8 - Unused import: '../../constant/style.dart'. Try removing the import directive. - unused_import warning - lib/views/Rate/ride_calculate_driver.dart:9:8 - Unused import: 'package:intl/intl.dart'. Try removing the import directive. - unused_import @@ -216,7 +216,7 @@ warning - lib/views/auth/captin/ai_page.dart:26:12 - The value of the local vari warning - lib/views/auth/captin/car_license_page.dart:1:8 - Unused import: 'dart:io'. Try removing the import directive. - unused_import warning - lib/views/auth/captin/car_license_page.dart:3:8 - Unused import: 'package:flutter/material.dart'. Try removing the import directive. - unused_import warning - lib/views/auth/captin/car_license_page.dart:4:8 - Unused import: 'package:get/get.dart'. Try removing the import directive. - unused_import -warning - lib/views/auth/captin/car_license_page.dart:5:8 - Unused import: 'package:siro_driver/controller/functions/ocr_controller.dart'. Try removing the import directive. - unused_import +warning - lib/views/auth/captin/car_license_page.dart:5:8 - Unused import: 'package:tripz_driver/controller/functions/ocr_controller.dart'. Try removing the import directive. - unused_import warning - lib/views/auth/captin/car_license_page.dart:7:8 - Unused import: '../../../constant/style.dart'. Try removing the import directive. - unused_import warning - lib/views/auth/captin/car_license_page.dart:8:8 - Unused import: '../../../controller/auth/captin/ml_google_doc.dart'. Try removing the import directive. - unused_import warning - lib/views/auth/captin/car_license_page.dart:9:8 - Unused import: '../../../controller/auth/captin/register_captin_controller.dart'. Try removing the import directive. - unused_import @@ -248,35 +248,35 @@ warning - lib/views/auth/captin/otp_page.dart:13:8 - Unused import: '../../../ma warning - lib/views/auth/captin/register_captin.dart:9:8 - Unused import: '../../../controller/auth/google_sign.dart'. Try removing the import directive. - unused_import warning - lib/views/auth/captin/verify_email_captain.dart:9:7 - This class (or a class that this class inherits from) is marked as '@immutable', but one or more of its instance fields aren't final: VerifyEmailCaptainPage.registerCaptinController - must_be_immutable warning - lib/views/auth/syria/registration_view.dart:1:8 - Unused import: 'dart:io'. Try removing the import directive. - unused_import -warning - lib/views/home/Captin/About Us/about_us.dart:1:8 - Unused import: 'package:siro_driver/constant/box_name.dart'. Try removing the import directive. - unused_import -warning - lib/views/home/Captin/About Us/about_us.dart:3:8 - Unused import: 'package:siro_driver/main.dart'. Try removing the import directive. - unused_import +warning - lib/views/home/Captin/About Us/about_us.dart:1:8 - Unused import: 'package:tripz_driver/constant/box_name.dart'. Try removing the import directive. - unused_import +warning - lib/views/home/Captin/About Us/about_us.dart:3:8 - Unused import: 'package:tripz_driver/main.dart'. Try removing the import directive. - unused_import warning - lib/views/home/Captin/About Us/frequantly_question.dart:14:12 - The value of the local variable 'selectedPayment' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/views/home/Captin/About Us/frequantly_question.dart:15:10 - The value of the local variable 'canCancelRide' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/views/home/Captin/About Us/settings_captain.dart:11:8 - Unused import: '../../../auth/country_widget.dart'. Try removing the import directive. - unused_import warning - lib/views/home/Captin/bottom_bar.dart:69:26 - The value of the local variable 'data' isn't used. Try removing the variable or using it. - unused_local_variable -warning - lib/views/home/Captin/driver_map_page.dart:4:8 - Unused import: 'package:siro_driver/constant/box_name.dart'. Try removing the import directive. - unused_import +warning - lib/views/home/Captin/driver_map_page.dart:4:8 - Unused import: 'package:tripz_driver/constant/box_name.dart'. Try removing the import directive. - unused_import warning - lib/views/home/Captin/driver_map_page.dart:10:8 - Unused import: '../../../main.dart'. Try removing the import directive. - unused_import warning - lib/views/home/Captin/driver_map_page.dart:18:8 - Unused import: 'mapDriverWidgets/sped_circle.dart'. Try removing the import directive. - unused_import warning - lib/views/home/Captin/home_captain/drawer_captain.dart:1:8 - Unused import: 'dart:io'. Try removing the import directive. - unused_import -warning - lib/views/home/Captin/home_captain/drawer_captain.dart:20:8 - Unused import: 'package:siro_driver/views/gamification/referral_center_page.dart'. Try removing the import directive. - unused_import +warning - lib/views/home/Captin/home_captain/drawer_captain.dart:20:8 - Unused import: 'package:tripz_driver/views/gamification/referral_center_page.dart'. Try removing the import directive. - unused_import warning - lib/views/home/Captin/home_captain/drawer_captain.dart:33:8 - Unused import: '../assurance_health_page.dart'. Try removing the import directive. - unused_import warning - lib/views/home/Captin/home_captain/drawer_captain.dart:34:8 - Unused import: '../maintain_center_page.dart'. Try removing the import directive. - unused_import -warning - lib/views/home/Captin/home_captain/help_details_replay_page.dart:3:8 - Unused import: 'package:siro_driver/constant/style.dart'. Try removing the import directive. - unused_import +warning - lib/views/home/Captin/home_captain/help_details_replay_page.dart:3:8 - Unused import: 'package:tripz_driver/constant/style.dart'. Try removing the import directive. - unused_import warning - lib/views/home/Captin/home_captain/home_captin.dart:575:34 - A value for optional parameter 'key' isn't ever given. Try removing the unused parameter. - unused_element_parameter warning - lib/views/home/Captin/home_captain/widget/connect.dart:22:9 - The value of the local variable 'refusedRidesToday' isn't used. Try removing the variable or using it. - unused_local_variable -warning - lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart:6:8 - Unused import: 'package:siro_driver/views/auth/syria/registration_view.dart'. Try removing the import directive. - unused_import +warning - lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart:6:8 - Unused import: 'package:tripz_driver/views/auth/syria/registration_view.dart'. Try removing the import directive. - unused_import warning - lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart:224:21 - Dead code. Try removing the code, or fixing the code before it so that it can be reached. - dead_code warning - lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart:243:13 - The value of the local variable 'customerToken' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart:244:13 - The value of the local variable 'orderId' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart:304:6 - The declaration '_sendAcceptanceNotification' isn't referenced. Try removing the declaration of '_sendAcceptanceNotification'. - unused_element warning - lib/views/home/Captin/home_captain/widget/zones_controller.dart:14:18 - The value of the local variable 'totalArea' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/views/home/Captin/home_captain/widget/zones_controller.dart:65:12 - The value of the local variable 'jsonMap' isn't used. Try removing the variable or using it. - unused_local_variable -warning - lib/views/home/Captin/maintain_center_page.dart:2:8 - Unused import: 'package:siro_driver/constant/style.dart'. Try removing the import directive. - unused_import +warning - lib/views/home/Captin/maintain_center_page.dart:2:8 - Unused import: 'package:tripz_driver/constant/style.dart'. Try removing the import directive. - unused_import warning - lib/views/home/Captin/mapDriverWidgets/google_driver_map_page.dart:20:31 - The value of the local variable 'controller' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/views/home/Captin/mapDriverWidgets/google_driver_map_page.dart:23:18 - The value of the local variable 'mapPaddingBottom' isn't used. Try removing the variable or using it. - unused_local_variable -warning - lib/views/home/Captin/mapDriverWidgets/google_map_app.dart:2:8 - Unused import: 'package:siro_driver/constant/style.dart'. Try removing the import directive. - unused_import +warning - lib/views/home/Captin/mapDriverWidgets/google_map_app.dart:2:8 - Unused import: 'package:tripz_driver/constant/style.dart'. Try removing the import directive. - unused_import warning - lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart:17:8 - Unused import: '../../../widgets/my_textField.dart'. Try removing the import directive. - unused_import -warning - lib/views/home/Captin/mapDriverWidgets/sos_connect.dart:3:8 - Unused import: 'package:siro_driver/views/widgets/error_snakbar.dart'. Try removing the import directive. - unused_import +warning - lib/views/home/Captin/mapDriverWidgets/sos_connect.dart:3:8 - Unused import: 'package:tripz_driver/views/widgets/error_snakbar.dart'. Try removing the import directive. - unused_import warning - lib/views/home/Captin/mapDriverWidgets/sos_connect.dart:10:8 - Unused import: '../../../../constant/style.dart'. Try removing the import directive. - unused_import warning - lib/views/home/Captin/mapDriverWidgets/sos_connect.dart:11:8 - Unused import: '../../../../controller/firebase/notification_service.dart'. Try removing the import directive. - unused_import warning - lib/views/home/Captin/mapDriverWidgets/sped_circle.dart:19:14 - The value of the local variable 'isSpeeding' isn't used. Try removing the variable or using it. - unused_local_variable @@ -291,8 +291,8 @@ warning - lib/views/home/my_wallet/bank_account_egypt.dart:127:52 - The operand warning - lib/views/home/my_wallet/card_wallet_widget.dart:13:8 - Unused import: '../../../controller/home/payment/paymob_payout.dart'. Try removing the import directive. - unused_import warning - lib/views/home/my_wallet/points_captain.dart:15:8 - Unused import: '../../../controller/payment/mtn_new/mtn_payment_new_screen.dart'. Try removing the import directive. - unused_import warning - lib/views/home/on_boarding_page.dart:8:7 - This class (or a class that this class inherits from) is marked as '@immutable', but one or more of its instance fields aren't final: OnBoardingPage.onBoardingControllerImp - must_be_immutable -warning - lib/views/home/profile/captains_cars.dart:3:8 - Unused import: 'package:siro_driver/constant/style.dart'. Try removing the import directive. - unused_import -warning - lib/views/home/profile/captains_cars.dart:4:8 - Unused import: 'package:siro_driver/controller/functions/encrypt_decrypt.dart'. Try removing the import directive. - unused_import +warning - lib/views/home/profile/captains_cars.dart:3:8 - Unused import: 'package:tripz_driver/constant/style.dart'. Try removing the import directive. - unused_import +warning - lib/views/home/profile/captains_cars.dart:4:8 - Unused import: 'package:tripz_driver/controller/functions/encrypt_decrypt.dart'. Try removing the import directive. - unused_import warning - lib/views/home/profile/cars_inserting_page.dart:9:8 - Unused import: '../../../controller/functions/encrypt_decrypt.dart'. Try removing the import directive. - unused_import warning - lib/views/home/profile/cars_inserting_page.dart:187:70 - The left operand can't be null, so the right operand is never executed. Try removing the operator and the right operand. - dead_null_aware_expression warning - lib/views/home/profile/feed_back_page.dart:9:7 - This class (or a class that this class inherits from) is marked as '@immutable', but one or more of its instance fields aren't final: FeedBackPage.feedBackController - must_be_immutable @@ -300,7 +300,7 @@ warning - lib/views/home/profile/passenger_profile_page.dart:16:7 - This class ( warning - lib/views/home/profile/profile_captain.dart:22:11 - The value of the local variable 'controller' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/views/home/profile/promos_passenger_page.dart:8:8 - Unused import: '../../../constant/style.dart'. Try removing the import directive. - unused_import warning - lib/views/notification/available_rides_page.dart:1:8 - Unused import: 'dart:convert'. Try removing the import directive. - unused_import -warning - lib/views/notification/available_rides_page.dart:5:8 - Unused import: 'package:intaleq_maps/intaleq_maps.dart'. Try removing the import directive. - unused_import +warning - lib/views/notification/available_rides_page.dart:5:8 - Unused import: 'package:tripz_maps/tripz_maps.dart'. Try removing the import directive. - unused_import warning - lib/views/widgets/error_snakbar.dart:5:8 - Unused import: '../../constant/colors.dart'. Try removing the import directive. - unused_import warning - lib/views/widgets/my_scafold.dart:2:8 - Unused import: 'package:get/get.dart'. Try removing the import directive. - unused_import warning - lib/views/widgets/my_scafold.dart:5:8 - Unused import: '../../constant/style.dart'. Try removing the import directive. - unused_import diff --git a/apps/driver/android/app/build.gradle b/apps/driver/android/app/build.gradle index 7cf79cf..f34b874 100644 --- a/apps/driver/android/app/build.gradle +++ b/apps/driver/android/app/build.gradle @@ -34,7 +34,7 @@ if (flutterVersionName == null) { } android { - namespace = "com.siro.siro_driver" + namespace = "com.tripz.tripz_driver" compileSdk = 36 ndkVersion "29.0.14033849" @@ -63,7 +63,7 @@ android { } defaultConfig { - applicationId = "com.siro.siro_driver" + applicationId = "com.sefer_driver" minSdkVersion = 30 targetSdk = 36 versionCode = flutterVersionCode.toInteger() diff --git a/apps/driver/android/app/proguard-rules.pro b/apps/driver/android/app/proguard-rules.pro index c15175d..b87fcec 100755 --- a/apps/driver/android/app/proguard-rules.pro +++ b/apps/driver/android/app/proguard-rules.pro @@ -32,11 +32,11 @@ # Android Auto Car App Library -keep class androidx.car.app.** { *; } --keep class com.siro.siro_driver.MyCarAppService { *; } --keep class com.siro.siro_driver.MyCarSession { *; } --keep class com.siro.siro_driver.MyCarScreen { *; } --keep class com.siro.siro_driver.CarNavigationData { *; } --keep class com.siro.siro_driver.MapPresentation { *; } +-keep class com.tripz.tripz_driver.MyCarAppService { *; } +-keep class com.tripz.tripz_driver.MyCarSession { *; } +-keep class com.tripz.tripz_driver.MyCarScreen { *; } +-keep class com.tripz.tripz_driver.CarNavigationData { *; } +-keep class com.tripz.tripz_driver.MapPresentation { *; } # MapLibre Native SDK -keep class org.maplibre.android.** { *; } diff --git a/apps/driver/android/app/src/main/AndroidManifest.xml b/apps/driver/android/app/src/main/AndroidManifest.xml index 417c300..55679a1 100644 --- a/apps/driver/android/app/src/main/AndroidManifest.xml +++ b/apps/driver/android/app/src/main/AndroidManifest.xml @@ -80,21 +80,21 @@ - + - + - + - - + + @@ -129,7 +129,7 @@ android:exported="true" /> @@ -168,7 +168,7 @@ android:exported="true" android:permission="com.google.android.c2dm.permission.SEND"> - + diff --git a/apps/driver/android/app/src/main/cpp/CMakeLists.txt b/apps/driver/android/app/src/main/cpp/CMakeLists.txt index 2ce63e4..789da16 100755 --- a/apps/driver/android/app/src/main/cpp/CMakeLists.txt +++ b/apps/driver/android/app/src/main/cpp/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10.2) # 3.10.2 is fine, but no need to go as high as 3.31.5 -project(siro_driver) # Good +project(tripz_driver) # Good # Add your C++ source file(s) to create a SHARED library. add_library(native-lib SHARED native-lib.cpp) diff --git a/apps/driver/android/app/src/main/cpp/native-lib.cpp b/apps/driver/android/app/src/main/cpp/native-lib.cpp index 997fc64..7fab86e 100755 --- a/apps/driver/android/app/src/main/cpp/native-lib.cpp +++ b/apps/driver/android/app/src/main/cpp/native-lib.cpp @@ -158,7 +158,7 @@ bool checkLoadedModules() //} extern "C" JNIEXPORT jboolean JNICALL -Java_com_siro_siro_1driver_RootDetection_isNativeRooted(JNIEnv *env, jobject /* this */) +Java_com_sefer_1driver_RootDetection_isNativeRooted(JNIEnv *env, jobject /* this */) { if (isRooted()) diff --git a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/CarNavigationData.kt b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/CarNavigationData.kt similarity index 98% rename from apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/CarNavigationData.kt rename to apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/CarNavigationData.kt index 6a7ad95..b40ac31 100644 --- a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/CarNavigationData.kt +++ b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/CarNavigationData.kt @@ -1,4 +1,4 @@ -package com.siro.siro_driver +package com.tripz.tripz_driver import android.os.Handler import android.os.Looper diff --git a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MainActivity.kt b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MainActivity.kt similarity index 97% rename from apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MainActivity.kt rename to apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MainActivity.kt index 2ce553e..e3cd310 100644 --- a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MainActivity.kt +++ b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MainActivity.kt @@ -1,4 +1,4 @@ -package com.siro.siro_driver +package com.tripz.tripz_driver import android.app.AlertDialog import android.content.Intent @@ -18,8 +18,8 @@ import java.util.Timer import kotlin.concurrent.schedule class MainActivity : FlutterFragmentActivity() { - private val SECURITY_CHANNEL = "com.siro.siro_driver/security" - private val APP_CONTROL_CHANNEL = "com.siro.siro_driver/app_control" + private val SECURITY_CHANNEL = "com.tripz.tripz_driver/security" + private val APP_CONTROL_CHANNEL = "com.tripz.tripz_driver/app_control" private var appControlChannel: MethodChannel? = null override fun configureFlutterEngine(flutterEngine: FlutterEngine) { @@ -63,7 +63,7 @@ class MainActivity : FlutterFragmentActivity() { } // ✅ Channel for Android Auto Navigation Updates - MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "com.siro.siro_driver/car_navigation") + MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "com.tripz.tripz_driver/car_navigation") .setMethodCallHandler { call, result -> when (call.method) { "updateNavState" -> { diff --git a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MapPresentation.kt b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MapPresentation.kt similarity index 90% rename from apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MapPresentation.kt rename to apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MapPresentation.kt index abcc7a7..5195361 100644 --- a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MapPresentation.kt +++ b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MapPresentation.kt @@ -1,4 +1,4 @@ -package com.siro.siro_driver +package com.tripz.tripz_driver import android.app.Presentation import android.content.Context @@ -16,7 +16,7 @@ import org.maplibre.android.maps.Style /** * شاشة عرض وهمية (Presentation) تُرسم على VirtualDisplay الخاص بشاشة السيارة. - * تستخدم MapLibre Native SDK لعرض الخريطة بنفس ستايل تطبيق سيرو. + * تستخدم MapLibre Native SDK لعرض الخريطة بنفس ستايل تطبيق تريبز. */ class MapPresentation(outerContext: Context, display: Display) : Presentation(outerContext, display) { lateinit var mapView: MapView @@ -32,9 +32,9 @@ class MapPresentation(outerContext: Context, display: Display) : Presentation(ou private fun reloadStyleIfNeeded() { val expectedStyle = if (CarNavigationData.isMapDarkMode) - "asset://packages/intaleq_maps/assets/style_dark.json" + "asset://packages/tripz_maps/assets/style_dark.json" else - "asset://packages/intaleq_maps/assets/style.json" + "asset://packages/tripz_maps/assets/style.json" if (currentStyleLoaded != expectedStyle && isMapReady) { currentStyleLoaded = expectedStyle @@ -66,11 +66,11 @@ class MapPresentation(outerContext: Context, display: Display) : Presentation(ou mapView.getMapAsync { map -> mapboxMap = map - // تحميل ستايل خرائط سيرو من حزمة intaleq_maps حسب الوضعية + // تحميل ستايل خرائط تريبز من حزمة tripz_maps حسب الوضعية currentStyleLoaded = if (CarNavigationData.isMapDarkMode) - "asset://packages/intaleq_maps/assets/style_dark.json" + "asset://packages/tripz_maps/assets/style_dark.json" else - "asset://packages/intaleq_maps/assets/style.json" + "asset://packages/tripz_maps/assets/style.json" map.setStyle(Style.Builder().fromUri(currentStyleLoaded!!)) { isMapReady = true updateCameraPosition() diff --git a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MyApplication.kt b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MyApplication.kt similarity index 93% rename from apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MyApplication.kt rename to apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MyApplication.kt index e5fa943..ce1d1f5 100755 --- a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MyApplication.kt +++ b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MyApplication.kt @@ -1,4 +1,4 @@ -package com.siro.siro_driver +package com.tripz.tripz_driver import android.app.Application import android.content.Intent @@ -24,7 +24,7 @@ class MyApplication : Application() { MethodChannel( flutterEngine.dartExecutor.binaryMessenger, - "com.siro.siro_driver/app_lifecycle" + "com.tripz.tripz_driver/app_lifecycle" ) .setMethodCallHandler { call, result -> if (call.method == "bringAppToForeground") { diff --git a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MyCarAppService.kt b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MyCarAppService.kt similarity index 96% rename from apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MyCarAppService.kt rename to apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MyCarAppService.kt index e63255a..4343af8 100644 --- a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MyCarAppService.kt +++ b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MyCarAppService.kt @@ -1,4 +1,4 @@ -package com.siro.siro_driver +package com.tripz.tripz_driver import android.content.pm.ApplicationInfo import androidx.car.app.CarAppService diff --git a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MyCarScreen.kt b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MyCarScreen.kt similarity index 87% rename from apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MyCarScreen.kt rename to apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MyCarScreen.kt index 6f5b51c..cb631e8 100644 --- a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MyCarScreen.kt +++ b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MyCarScreen.kt @@ -1,4 +1,4 @@ -package com.siro.siro_driver +package com.tripz.tripz_driver import androidx.car.app.CarContext import androidx.car.app.Screen @@ -24,14 +24,14 @@ class MyCarScreen(carContext: CarContext) : Screen(carContext) { override fun onGetTemplate(): Template { // إذا لم يكن التوجيه نشطاً بعد، نعرض شاشة ترحيبية if (!CarNavigationData.isNavigating) { - return MessageTemplate.Builder("مرحباً بك في سيرو درايفر\nبانتظار بدء رحلة جديدة...") - .setTitle("Siro Driver") + return MessageTemplate.Builder("مرحباً بك في تريبز درايفر\nبانتظار بدء رحلة جديدة...") + .setTitle("Tripz Driver") .setHeaderAction(Action.APP_ICON) .build() } // --- بناء معلومات التوجيه (Turn-by-Turn) --- - val maneuverType = mapSiroManeuverToCarManeuver(CarNavigationData.maneuverType) + val maneuverType = mapTripzManeuverToCarManeuver(CarNavigationData.maneuverType) val maneuver = Maneuver.Builder(maneuverType).build() val step = Step.Builder(CarNavigationData.currentInstruction) @@ -60,11 +60,11 @@ class MyCarScreen(carContext: CarContext) : Screen(carContext) { } /** - * تحويل أكواد الانعطاف الخاصة بتطبيق سيرو (NavigationController.currentManeuverModifier) + * تحويل أكواد الانعطاف الخاصة بتطبيق تريبز (NavigationController.currentManeuverModifier) * إلى أكواد Maneuver الرسمية من مكتبة Android for Cars. */ - private fun mapSiroManeuverToCarManeuver(siroCode: Int): Int { - return when (siroCode) { + private fun mapTripzManeuverToCarManeuver(tripzCode: Int): Int { + return when (tripzCode) { 0 -> Maneuver.TYPE_STRAIGHT // مستقيم 2 -> Maneuver.TYPE_TURN_NORMAL_RIGHT // يمين 3 -> Maneuver.TYPE_TURN_SLIGHT_RIGHT // يمين خفيف diff --git a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MyCarSession.kt b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MyCarSession.kt similarity index 98% rename from apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MyCarSession.kt rename to apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MyCarSession.kt index 358a593..3bf3121 100644 --- a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/MyCarSession.kt +++ b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/MyCarSession.kt @@ -1,4 +1,4 @@ -package com.siro.siro_driver +package com.tripz.tripz_driver import android.content.Intent import android.hardware.display.DisplayManager diff --git a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/RootDetection.kt b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/RootDetection.kt similarity index 85% rename from apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/RootDetection.kt rename to apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/RootDetection.kt index 2be3f14..25370d7 100755 --- a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/RootDetection.kt +++ b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/RootDetection.kt @@ -1,4 +1,4 @@ -package com.siro.siro_driver +package com.tripz.tripz_driver object RootDetection { init { diff --git a/apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/SafetyNetCheck.kt b/apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/SafetyNetCheck.kt similarity index 100% rename from apps/driver/android/app/src/main/kotlin/com/example/intaleq_driver/SafetyNetCheck.kt rename to apps/driver/android/app/src/main/kotlin/com/example/tripz_driver/SafetyNetCheck.kt diff --git a/apps/driver/android/app/src/main/res/drawable/app_icon.png b/apps/driver/android/app/src/main/res/drawable/app_icon.png index 8b07675..764591e 100644 Binary files a/apps/driver/android/app/src/main/res/drawable/app_icon.png and b/apps/driver/android/app/src/main/res/drawable/app_icon.png differ diff --git a/apps/driver/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/apps/driver/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index db77bb4..382ec16 100644 Binary files a/apps/driver/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/apps/driver/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/apps/driver/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/apps/driver/android/app/src/main/res/mipmap-hdpi/launcher_icon.png index 3962f46..382ec16 100644 Binary files a/apps/driver/android/app/src/main/res/mipmap-hdpi/launcher_icon.png and b/apps/driver/android/app/src/main/res/mipmap-hdpi/launcher_icon.png differ diff --git a/apps/driver/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/apps/driver/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 17987b7..74da631 100644 Binary files a/apps/driver/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/apps/driver/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/apps/driver/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/apps/driver/android/app/src/main/res/mipmap-mdpi/launcher_icon.png index 3a61ede..74da631 100644 Binary files a/apps/driver/android/app/src/main/res/mipmap-mdpi/launcher_icon.png and b/apps/driver/android/app/src/main/res/mipmap-mdpi/launcher_icon.png differ diff --git a/apps/driver/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/apps/driver/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 09d4391..3734d9e 100644 Binary files a/apps/driver/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/apps/driver/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/apps/driver/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/apps/driver/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png index 639d661..3734d9e 100644 Binary files a/apps/driver/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png and b/apps/driver/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png differ diff --git a/apps/driver/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/apps/driver/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index d5f1c8d..764591e 100644 Binary files a/apps/driver/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/apps/driver/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/apps/driver/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/apps/driver/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png index 84f5bed..764591e 100644 Binary files a/apps/driver/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png and b/apps/driver/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png differ diff --git a/apps/driver/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/apps/driver/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 4d6372e..11ed74f 100644 Binary files a/apps/driver/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/apps/driver/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/apps/driver/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/apps/driver/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png index af9142f..11ed74f 100644 Binary files a/apps/driver/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png and b/apps/driver/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png differ diff --git a/apps/driver/android/app/src/main/res/values-ar/strings.xml b/apps/driver/android/app/src/main/res/values-ar/strings.xml index af58dc9..7328b19 100755 --- a/apps/driver/android/app/src/main/res/values-ar/strings.xml +++ b/apps/driver/android/app/src/main/res/values-ar/strings.xml @@ -4,5 +4,5 @@ تشغيل التطبيق على هذا الجهاز. إغلاق التطبيق الجهاز آمن. الاستمرار بشكل طبيعي. - سيرو درايفر + تريبز درايفر \ No newline at end of file diff --git a/apps/driver/android/app/src/main/res/values/strings.xml b/apps/driver/android/app/src/main/res/values/strings.xml index ef164d3..f08cae9 100755 --- a/apps/driver/android/app/src/main/res/values/strings.xml +++ b/apps/driver/android/app/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ e Security Warning AIzaSyB04YNW3LbvmQ5lX1t2bOwEU18- - Siro Driver + Tripz Driver A security issue or modification has been detected on this device. The app cannot run on this device. diff --git a/apps/driver/android/app/src/main/res/xml/network_security_config.xml b/apps/driver/android/app/src/main/res/xml/network_security_config.xml index 9c5b8f6..998f7d6 100644 --- a/apps/driver/android/app/src/main/res/xml/network_security_config.xml +++ b/apps/driver/android/app/src/main/res/xml/network_security_config.xml @@ -7,8 +7,8 @@ - intaleq.xyz - siromove.com + tripz.xyz + tripzmove.com diff --git a/apps/driver/assets/images/logo.gif b/apps/driver/assets/images/logo.gif index f505c82..7c8ef84 100644 Binary files a/apps/driver/assets/images/logo.gif and b/apps/driver/assets/images/logo.gif differ diff --git a/apps/driver/assets/images/logo.png b/apps/driver/assets/images/logo.png index 9852116..7c8ef84 100644 Binary files a/apps/driver/assets/images/logo.png and b/apps/driver/assets/images/logo.png differ diff --git a/apps/driver/assets/images/logo1.png b/apps/driver/assets/images/logo1.png index eb862d0..7c8ef84 100644 Binary files a/apps/driver/assets/images/logo1.png and b/apps/driver/assets/images/logo1.png differ diff --git a/apps/driver/firebase.json b/apps/driver/firebase.json index ae1d9ad..4e61b0d 100644 --- a/apps/driver/firebase.json +++ b/apps/driver/firebase.json @@ -1 +1 @@ -{"flutter":{"platforms":{"android":{"default":{"projectId":"siro-a6957","appId":"1:825988584191:android:492d9bc1df6b40c51632ca","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"siro-a6957","appId":"1:825988584191:ios:a86f1a54f0b1aaa21632ca","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"siro-a6957","configurations":{"android":"1:825988584191:android:492d9bc1df6b40c51632ca","ios":"1:825988584191:ios:a86f1a54f0b1aaa21632ca"}}}}}} \ No newline at end of file +{"flutter":{"platforms":{"android":{"default":{"projectId":"tripz-a6957","appId":"1:825988584191:android:492d9bc1df6b40c51632ca","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"tripz-a6957","appId":"1:825988584191:ios:a86f1a54f0b1aaa21632ca","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"tripz-a6957","configurations":{"android":"1:825988584191:android:492d9bc1df6b40c51632ca","ios":"1:825988584191:ios:a86f1a54f0b1aaa21632ca"}}}}}} \ No newline at end of file diff --git a/apps/driver/ios/README.md b/apps/driver/ios/README.md index 2a2a81e..76f11de 100644 --- a/apps/driver/ios/README.md +++ b/apps/driver/ios/README.md @@ -1 +1 @@ -# siro-driver +# tripz-driver diff --git a/apps/driver/ios/Runner.xcodeproj/project.pbxproj b/apps/driver/ios/Runner.xcodeproj/project.pbxproj index a710e33..59d2edc 100644 --- a/apps/driver/ios/Runner.xcodeproj/project.pbxproj +++ b/apps/driver/ios/Runner.xcodeproj/project.pbxproj @@ -521,7 +521,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.siro.siro-driver"; + PRODUCT_BUNDLE_IDENTIFIER = "com.sefer.driver"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -538,7 +538,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.siroDriver.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.tripzDriver.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -556,7 +556,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.siroDriver.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.tripzDriver.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -572,7 +572,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.siroDriver.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.tripzDriver.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -706,7 +706,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.siro.siro-driver"; + PRODUCT_BUNDLE_IDENTIFIER = "com.sefer.driver"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -731,7 +731,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.siro.siro-driver"; + PRODUCT_BUNDLE_IDENTIFIER = "com.sefer.driver"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/apps/driver/ios/Runner/AppDelegate.swift b/apps/driver/ios/Runner/AppDelegate.swift index 20538b1..ffb27b1 100644 --- a/apps/driver/ios/Runner/AppDelegate.swift +++ b/apps/driver/ios/Runner/AppDelegate.swift @@ -44,7 +44,7 @@ import CoreLocation return } - let channel = FlutterMethodChannel(name: "com.siro.siro_driver/security", + let channel = FlutterMethodChannel(name: "com.tripz.tripz_driver/security", binaryMessenger: controller.binaryMessenger) channel.setMethodCallHandler { call, result in switch call.method { diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png index 2901dbe..c0db852 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png index 6f286c2..0b59670 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png index 26c5e16..3b2fec7 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png index 74e5af9..4ee2787 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png index 84f5bed..764591e 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png index 8a48943..92b2622 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png index 0f2d72b..4f23b0a 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png index fd974b8..2ce41e8 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png index 4a804bd..33c0925 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png index c75c9e6..b8aeb78 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png index d94f99a..d037021 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png index 2be6e4b..304597c 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png index 63df0bf..0d839f4 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png index b9b6d84..187bf2c 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png index 4468ee0..9535a39 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png index 3962f46..382ec16 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png index 6845d01..95fd23c 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png index 48fdd8e..1cf0242 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png differ diff --git a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png index a762921..f1b7019 100644 Binary files a/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png and b/apps/driver/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png differ diff --git a/apps/driver/ios/Runner/Info.plist b/apps/driver/ios/Runner/Info.plist index 8e8e6ca..6e33945 100644 --- a/apps/driver/ios/Runner/Info.plist +++ b/apps/driver/ios/Runner/Info.plist @@ -11,7 +11,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - Siro Driver + Tripz Driver CFBundleExecutable $(EXECUTABLE_NAME) CFBundleGetInfoString @@ -23,7 +23,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - siro_driver + tripz_driver CFBundlePackageType APPL CFBundleShortVersionString @@ -38,10 +38,10 @@ CFBundleTypeRole Editor CFBundleURLName - siromove.com + tripzmove.com CFBundleURLSchemes - siromove + tripzmove diff --git a/apps/driver/knowledge/driver_lifecycle.md b/apps/driver/knowledge/driver_lifecycle.md index 71d0a38..a0901c1 100644 --- a/apps/driver/knowledge/driver_lifecycle.md +++ b/apps/driver/knowledge/driver_lifecycle.md @@ -1,7 +1,7 @@ # 🚗 دورة حياة الرحلة - تطبيق السائق (Driver Ride Lifecycle)
-هذا الملف هو مرجع هندسي شامل ودقيق (Source of Truth) يوضح كافة تفاصيل دورة حياة الرحلة (Ride Lifecycle) في تطبيق السائق (Siro Driver). تمت كتابته وتوثيقه ليكون دليلاً استرشادياً كاملاً لأي مهندس برمجي أو نموذج ذكاء اصطناعي (AI Agent) يرغب في فهم أو تعديل منطق الرحلات، تتبع المواقع، أو معالجة الحالات الفعالة. +هذا الملف هو مرجع هندسي شامل ودقيق (Source of Truth) يوضح كافة تفاصيل دورة حياة الرحلة (Ride Lifecycle) في تطبيق السائق (Tripz Driver). تمت كتابته وتوثيقه ليكون دليلاً استرشادياً كاملاً لأي مهندس برمجي أو نموذج ذكاء اصطناعي (AI Agent) يرغب في فهم أو تعديل منطق الرحلات، تتبع المواقع، أو معالجة الحالات الفعالة.
--- @@ -10,7 +10,7 @@
يعد الكنترولر -[LocationController](file:///Users/hamzaaleghwairyeen/development/App/Siro/siro_driver/lib/controller/functions/location_controller.dart) +[LocationController](file:///Users/hamzaaleghwairyeen/development/App/Tripz/tripz_driver/lib/controller/functions/location_controller.dart) هو المصدر الوحيد والمركزى (Single Source of Truth) لكافة تحديثات نظام التموضع العالمي (GPS). يُمنع منعاً باتاً إنشاء اشتراكات أو فتح قنوات استماع موازية مع Geolocator أو Location في أي مكان آخر.
@@ -56,7 +56,7 @@ void initSocket() ```
-تقوم بفتح قناة اتصال مع خادم المواقع (`https://location.intaleq.xyz`) وتجهيز معلمات الاتصال (`driver_id`, `token`). تحتوي الدالة على حماية ضد الاستدعاءات المتداخلة (Debounce Flag: `_isInitializingSocket`). +تقوم بفتح قناة اتصال مع خادم المواقع (`https://location.tripz.xyz`) وتجهيز معلمات الاتصال (`driver_id`, `token`). تحتوي الدالة على حماية ضد الاستدعاءات المتداخلة (Debounce Flag: `_isInitializingSocket`).
@@ -132,7 +132,7 @@ Future _subscribeLocationStream()
يتحكم -[MapDriverController](file:///Users/hamzaaleghwairyeen/development/App/Siro/siro_driver/lib/controller/home/captin/map_driver_controller.dart) +[MapDriverController](file:///Users/hamzaaleghwairyeen/development/App/Tripz/tripz_driver/lib/controller/home/captin/map_driver_controller.dart) في مراحل تنفيذ الطلب بعد القبول، ورسم المسارات، وعمليات الوصول والإنهاء.
diff --git a/apps/driver/lib/constant/country_polygons.dart b/apps/driver/lib/constant/country_polygons.dart index ab69315..d3e39eb 100644 --- a/apps/driver/lib/constant/country_polygons.dart +++ b/apps/driver/lib/constant/country_polygons.dart @@ -69,14 +69,14 @@ class CountryPolygons { static String getRoutingApiUrl(String countryName) { switch (countryName) { case 'Jordan': - return 'https://routec.intaleq.xyz/route-jo'; + return 'https://routec.tripz.xyz/route-jo'; case 'Syria': - return 'https://routec.intaleq.xyz/route'; + return 'https://routec.tripz.xyz/route'; case 'Egypt': - return 'https://routec.intaleq.xyz/route-eg'; + return 'https://routec.tripz.xyz/route-eg'; default: // الافتراضي في حالة لم يقع الموقع ضمن أي من المضلعات - return 'https://routec.intaleq.xyz/route'; + return 'https://routec.tripz.xyz/route'; } } @@ -88,7 +88,7 @@ class CountryPolygons { if (_isPointInPolygon(point, syriaBoundary)) return "Syria"; if (_isPointInPolygon(point, egyptBoundary)) return "Egypt"; - return "unsupported"; + return "unsupported"; } /// خوارزمية Ray Casting للتحقق من وقوع نقطة داخل مضلع diff --git a/apps/driver/lib/constant/currency.dart b/apps/driver/lib/constant/currency.dart index f6a2b75..1a56530 100644 --- a/apps/driver/lib/constant/currency.dart +++ b/apps/driver/lib/constant/currency.dart @@ -1,5 +1,5 @@ -import 'package:siro_driver/main.dart'; -import 'package:siro_driver/constant/box_name.dart'; +import 'package:tripz_driver/main.dart'; +import 'package:tripz_driver/constant/box_name.dart'; import 'package:get/get.dart'; class CurrencyHelper { diff --git a/apps/driver/lib/constant/info.dart b/apps/driver/lib/constant/info.dart index 88688b5..4347478 100755 --- a/apps/driver/lib/constant/info.dart +++ b/apps/driver/lib/constant/info.dart @@ -1,12 +1,12 @@ class AppInformation { - static const String companyName = 'Siro'; - static const String appName = 'Siro DRIVER'; - static const String appVersion = 'Siro DRIVER'; + static const String companyName = 'Tripz'; + static const String appName = 'Tripz DRIVER'; + static const String appVersion = 'Tripz DRIVER'; static const String phoneNumber = ''; static const String linkedInProfile = 'https://www.linkedin.com/in/hamza-ayed/'; - static const String website = 'https://intaleqapp.com'; - static const String email = 'support@intaleqapp.com'; + static const String website = 'https://tripzapp.com'; + static const String email = 'support@tripzapp.com'; static const String complaintPrompt = 'for this data for complaint from driver or passenger i collect all data i want you analyze this complaint and show what is reason and what is solution .this data collected from many table to find solution if payment in visa not complete and if ride status is finished it will be paymnet in payment table if ride status is not finished there is no need to pay and payment table is null for this ride and if paymentFromPaymentTable not null and visa type not cash the payment sucssessed . if ratingpassenger is low or passengr rating drivers low grade then dont mine of this passenger ,look at driver too like passengerratingdriver with rating or ratingtopassenger .in json add status of complaint and message to passenger and message to driver and message to call center write in arabic in json output with key in english .for output please just json i want'; static const String addd = 'BlBlNl'; @@ -16,7 +16,7 @@ class AppInformation { - Siro - Privacy Policy & Terms of Use + Tripz - Privacy Policy & Terms of Use - - -
-

🚕 Tripz — لوحة الأدمن

- - - -
- - - -
- - -

دخول الأدمن

-

هاتف + رمز تحقّق (OTP).

- - -
- - -
-
- - - - diff --git a/dashboards/admin/README.md b/dashboards/admin/README.md index a0622a9..7f062ac 100644 --- a/dashboards/admin/README.md +++ b/dashboards/admin/README.md @@ -1,4 +1,4 @@ -# siro_admin +# tripz_admin A new Flutter project. diff --git a/dashboards/admin/analyze_report.txt b/dashboards/admin/analyze_report.txt index f4bf5af..5ffc5a8 100644 --- a/dashboards/admin/analyze_report.txt +++ b/dashboards/admin/analyze_report.txt @@ -1,4 +1,4 @@ -Analyzing siro_admin... +Analyzing tripz_admin... warning - lib/controller/admin/quality_controller.dart:1:8 - Unused import: 'package:flutter/material.dart'. Try removing the import directive. - unused_import warning - lib/controller/admin/register_captain_controller.dart:2:8 - Unused import: 'dart:ffi'. Try removing the import directive. - unused_import @@ -41,10 +41,10 @@ warning - lib/views/admin/enceypt/encrypt.dart:16:16 - The value of the field 'a warning - lib/views/admin/enceypt/encrypt.dart:19:16 - The value of the field 'accentDecryptDim' isn't used. Try removing the field, or using it. - unused_field warning - lib/views/admin/enceypt/fingerprint_migration.dart:20:8 - Unused import: 'dart:convert'. Try removing the import directive. - unused_import warning - lib/views/admin/enceypt/fingerprint_migration.dart:22:8 - Unused import: 'package:http/http.dart'. Try removing the import directive. - unused_import -warning - lib/views/admin/enceypt/fingerprint_migration.dart:23:8 - Unused import: 'package:siro_admin/controller/functions/encrypt_decrypt.dart'. Try removing the import directive. - unused_import +warning - lib/views/admin/enceypt/fingerprint_migration.dart:23:8 - Unused import: 'package:tripz_admin/controller/functions/encrypt_decrypt.dart'. Try removing the import directive. - unused_import warning - lib/views/admin/enceypt/fingerprint_migration.dart:25:8 - Unused import: '../../../constant/char_map.dart'. Try removing the import directive. - unused_import -warning - lib/views/admin/error/error/error_page.dart:2:8 - Unused import: 'package:siro_admin/constant/colors.dart'. Try removing the import directive. - unused_import -warning - lib/views/admin/packages.dart:6:8 - Unused import: 'package:siro_admin/views/widgets/my_textField.dart'. Try removing the import directive. - unused_import +warning - lib/views/admin/error/error/error_page.dart:2:8 - Unused import: 'package:tripz_admin/constant/colors.dart'. Try removing the import directive. - unused_import +warning - lib/views/admin/packages.dart:6:8 - Unused import: 'package:tripz_admin/views/widgets/my_textField.dart'. Try removing the import directive. - unused_import warning - lib/views/admin/passenger/passenger_details_page.dart:14:8 - Unused import: 'form_passenger.dart'. Try removing the import directive. - unused_import warning - lib/views/admin/rides/ride_lookup_page.dart:1150:12 - The value of the local variable 'displayPhone' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/views/admin/rides/rides.dart:10:7 - This class (or a class that this class inherits from) is marked as '@immutable', but one or more of its instance fields aren't final: Rides.rideAdminController - must_be_immutable @@ -54,7 +54,7 @@ warning - lib/views/admin/static/advanced_analytics_page.dart:6:8 - Unused impor warning - lib/views/admin/static/notes_driver_page.dart:3:8 - Unused import: 'package:intl/intl.dart'. Try removing the import directive. - unused_import warning - lib/views/admin/static/static.dart:29:11 - The value of the local variable 'controller' isn't used. Try removing the variable or using it. - unused_local_variable warning - lib/views/admin/wallet/wallet.dart:10:7 - This class (or a class that this class inherits from) is marked as '@immutable', but one or more of its instance fields aren't final: Wallet.walletAdminController - must_be_immutable -warning - lib/views/auth/login_page.dart:3:8 - Unused import: 'package:siro_admin/env/env.dart'. Try removing the import directive. - unused_import +warning - lib/views/auth/login_page.dart:3:8 - Unused import: 'package:tripz_admin/env/env.dart'. Try removing the import directive. - unused_import warning - lib/views/auth/login_page.dart:5:8 - Unused import: '../../controller/auth/login_controller.dart'. Try removing the import directive. - unused_import warning - lib/views/auth/login_page.dart:7:8 - Unused import: '../../controller/functions/crud.dart'. Try removing the import directive. - unused_import warning - lib/views/auth/login_page.dart:8:8 - Unused import: '../../print.dart'. Try removing the import directive. - unused_import diff --git a/dashboards/admin/android/app/build.gradle b/dashboards/admin/android/app/build.gradle index 546a19b..4601893 100644 --- a/dashboards/admin/android/app/build.gradle +++ b/dashboards/admin/android/app/build.gradle @@ -14,7 +14,7 @@ if (keystorePropertiesFile.exists()) { keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) } android { - namespace = "com.siro.siro_admin" + namespace = "com.tripz.tripz_admin" compileSdk = flutter.compileSdkVersion ndkVersion = "27.0.12077973" @@ -40,7 +40,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId = "com.siro.siro_admin" + applicationId = "com.tripz.tripz_admin" // You can update the following values to match your application needs. // For more information, see: https://flutter.dev/to/review-gradle-config. minSdk = 30 diff --git a/dashboards/admin/android/app/src/main/AndroidManifest.xml b/dashboards/admin/android/app/src/main/AndroidManifest.xml index c1a90d9..54b460a 100644 --- a/dashboards/admin/android/app/src/main/AndroidManifest.xml +++ b/dashboards/admin/android/app/src/main/AndroidManifest.xml @@ -18,7 +18,7 @@ android:maxSdkVersion="28" /> if (call.method == "bringAppToForeground") { diff --git a/dashboards/service/android/app/src/main/kotlin/com/example/service_intaleq/RootDetection.kt b/dashboards/admin/android/app/src/main/kotlin/com/tripz/tripz_admin/RootDetection.kt similarity index 86% rename from dashboards/service/android/app/src/main/kotlin/com/example/service_intaleq/RootDetection.kt rename to dashboards/admin/android/app/src/main/kotlin/com/tripz/tripz_admin/RootDetection.kt index 13903d7..4820367 100755 --- a/dashboards/service/android/app/src/main/kotlin/com/example/service_intaleq/RootDetection.kt +++ b/dashboards/admin/android/app/src/main/kotlin/com/tripz/tripz_admin/RootDetection.kt @@ -1,4 +1,4 @@ -package com.siro.siro_service +package com.tripz.tripz_admin object RootDetection { init { diff --git a/dashboards/admin/android/app/src/main/kotlin/com/siro/siro_admin/SafetyNetCheck.kt b/dashboards/admin/android/app/src/main/kotlin/com/tripz/tripz_admin/SafetyNetCheck.kt similarity index 100% rename from dashboards/admin/android/app/src/main/kotlin/com/siro/siro_admin/SafetyNetCheck.kt rename to dashboards/admin/android/app/src/main/kotlin/com/tripz/tripz_admin/SafetyNetCheck.kt diff --git a/dashboards/admin/android/app/src/main/res/xml/network_security_config.xml b/dashboards/admin/android/app/src/main/res/xml/network_security_config.xml index 9c5b8f6..998f7d6 100644 --- a/dashboards/admin/android/app/src/main/res/xml/network_security_config.xml +++ b/dashboards/admin/android/app/src/main/res/xml/network_security_config.xml @@ -7,8 +7,8 @@ - intaleq.xyz - siromove.com + tripz.xyz + tripzmove.com diff --git a/dashboards/admin/firebase.json b/dashboards/admin/firebase.json index 317d0f3..58e6d67 100644 --- a/dashboards/admin/firebase.json +++ b/dashboards/admin/firebase.json @@ -1 +1 @@ -{"flutter":{"platforms":{"android":{"default":{"projectId":"siro-a6957","appId":"1:825988584191:android:caa30eaac3524de51632ca","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"siro-a6957","appId":"1:825988584191:ios:8426fcf68fcc470e1632ca","uploadDebugSymbols":true,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"siro-a6957","configurations":{"android":"1:825988584191:android:caa30eaac3524de51632ca","ios":"1:825988584191:ios:8426fcf68fcc470e1632ca"}}}}}} \ No newline at end of file +{"flutter":{"platforms":{"android":{"default":{"projectId":"tripz-a6957","appId":"1:825988584191:android:caa30eaac3524de51632ca","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"tripz-a6957","appId":"1:825988584191:ios:8426fcf68fcc470e1632ca","uploadDebugSymbols":true,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"tripz-a6957","configurations":{"android":"1:825988584191:android:caa30eaac3524de51632ca","ios":"1:825988584191:ios:8426fcf68fcc470e1632ca"}}}}}} \ No newline at end of file diff --git a/dashboards/admin/ios/Runner.xcodeproj/project.pbxproj b/dashboards/admin/ios/Runner.xcodeproj/project.pbxproj index ff6f8d2..4ccf5c2 100644 --- a/dashboards/admin/ios/Runner.xcodeproj/project.pbxproj +++ b/dashboards/admin/ios/Runner.xcodeproj/project.pbxproj @@ -521,7 +521,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.siro.siroAdmin; + PRODUCT_BUNDLE_IDENTIFIER = com.tripz.tripzAdmin; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -538,7 +538,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.siro.siroAdmin.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.tripz.tripzAdmin.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -556,7 +556,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.siro.siroAdmin.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.tripz.tripzAdmin.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -572,7 +572,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.siro.siroAdmin.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.tripz.tripzAdmin.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -705,7 +705,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.siro.siroAdmin; + PRODUCT_BUNDLE_IDENTIFIER = com.tripz.tripzAdmin; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -729,7 +729,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.siro.siroAdmin; + PRODUCT_BUNDLE_IDENTIFIER = com.tripz.tripzAdmin; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/dashboards/admin/ios/Runner/Info.plist b/dashboards/admin/ios/Runner/Info.plist index 5c566d5..d7ffa00 100644 --- a/dashboards/admin/ios/Runner/Info.plist +++ b/dashboards/admin/ios/Runner/Info.plist @@ -7,7 +7,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - Siro Admin + Tripz Admin CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -15,7 +15,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - siro_admin + tripz_admin CFBundlePackageType APPL CFBundleShortVersionString diff --git a/dashboards/admin/lib/constant/info.dart b/dashboards/admin/lib/constant/info.dart index 04ea597..6948d7c 100644 --- a/dashboards/admin/lib/constant/info.dart +++ b/dashboards/admin/lib/constant/info.dart @@ -5,7 +5,7 @@ class AppInformation { static const String linkedInProfile = 'https://www.linkedin.com/in/hamza-ayed/'; static const String website = 'https://mobile-app.store'; - static const String email = 'support@intaleqapp.com'; + static const String email = 'support@tripzapp.com'; static const String complaintPrompt = 'for this data for complaint from driver or passenger i collect all data i want you analyze this complaint and show what is reason and what is solution .this data collected from many table to find solution if payment in visa not complete and if ride status is finished it will be paymnet in payment table if ride status is not finished there is no need to pay and payment table is null for this ride and if paymentFromPaymentTable not null and visa type not cash the payment sucssessed . if ratingpassenger is low or passengr rating drivers low grade then dont mine of this passenger ,look at driver too like passengerratingdriver with rating or ratingtopassenger .in json add status of complaint and message to passenger and message to driver and message to call center write in arabic in json output with key in english .for output please just json i want'; static const String addd = 'BlBlNl'; diff --git a/dashboards/admin/lib/constant/links.dart b/dashboards/admin/lib/constant/links.dart index 92b4db7..4d5a52c 100644 --- a/dashboards/admin/lib/constant/links.dart +++ b/dashboards/admin/lib/constant/links.dart @@ -3,7 +3,7 @@ import '../main.dart'; class AppLink { static String seferPaymentServer = - 'https://walletintaleq.intaleq.xyz/v1/main'; + 'https://wallettripz.tripz.xyz/v1/main'; static final String tripzPaymentServer0 = seferPaymentServer; static final String tripzPaymentServer = '$seferPaymentServer/ride'; static final String tripzAlexandriaServer = Env.seferAlexandriaServer; @@ -17,43 +17,43 @@ class AppLink { static String get server { switch (currentCountry) { case 'Syria': - return 'https://api-syria.siromove.com/siro_v3'; + return 'https://api-syria.tripzmove.com/tripz_v3'; case 'Egypt': - return 'https://api-egypt.siromove.com/siro_v3'; + return 'https://api-egypt.tripzmove.com/tripz_v3'; case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/backend'; + return 'https://jordan-tripz.tripzapp.com/backend'; default: - return 'https://api.siromove.com/siro_v3'; + return 'https://api.tripzmove.com/tripz_v3'; } } static String get endPoint => server; - static String get syria => 'https://api-syria.siromove.com/siro'; + static String get syria => 'https://api-syria.tripzmove.com/tripz'; static String get paymentServer { switch (currentCountry) { case 'Syria': - return 'https://wallet-syria.siromove.com/v1/main'; + return 'https://wallet-syria.tripzmove.com/v1/main'; case 'Egypt': - return 'https://wallet-egypt.siromove.com/v1/main'; + return 'https://wallet-egypt.tripzmove.com/v1/main'; case 'Jordan': // TODO: Change to new subdomain when fully migrated - return 'https://walletintaleq.intaleq.xyz/v2/main'; + return 'https://wallettripz.tripz.xyz/v2/main'; default: - return 'https://wallet.siromove.com/v1/main'; + return 'https://wallet.tripzmove.com/v1/main'; } } static String get locationServer { switch (currentCountry) { case 'Syria': - return 'https://location-syria.siromove.com/siro/ride/location'; + return 'https://location-syria.tripzmove.com/tripz/ride/location'; case 'Egypt': - return 'https://location-egypt.siromove.com/siro/ride/location'; + return 'https://location-egypt.tripzmove.com/tripz/ride/location'; case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/loction_server/siro/ride/location'; + return 'https://jordan-tripz.tripzapp.com/loction_server/tripz/ride/location'; default: - return 'https://location.siromove.com/siro/ride/location'; + return 'https://location.tripzmove.com/tripz/ride/location'; } } @@ -62,42 +62,42 @@ class AppLink { static String get mapSaasRoute { switch (currentCountry) { case 'Syria': - return 'https://map-syria.siromove.com/api/maps/route'; + return 'https://map-syria.tripzmove.com/api/maps/route'; case 'Egypt': - return 'https://map-egypt.siromove.com/api/maps/route'; + return 'https://map-egypt.tripzmove.com/api/maps/route'; case 'Jordan': // TODO: Change to new subdomain when fully migrated - return 'https://map-saas.intaleqapp.com/api/maps/route'; + return 'https://map-saas.tripzapp.com/api/maps/route'; default: - return 'https://map-saas.intaleqapp.com/api/maps/route'; + return 'https://map-saas.tripzapp.com/api/maps/route'; } } static String get mapSaasPlaces { switch (currentCountry) { case 'Syria': - return 'https://map-syria.siromove.com/api/geocoding/places'; + return 'https://map-syria.tripzmove.com/api/geocoding/places'; case 'Egypt': - return 'https://map-egypt.siromove.com/api/geocoding/places'; + return 'https://map-egypt.tripzmove.com/api/geocoding/places'; case 'Jordan': // TODO: Change to new subdomain when fully migrated - return 'https://map-saas.intaleqapp.com/api/geocoding/places'; + return 'https://map-saas.tripzapp.com/api/geocoding/places'; default: - return 'https://map-saas.intaleqapp.com/api/geocoding/places'; + return 'https://map-saas.tripzapp.com/api/geocoding/places'; } } static String get routeApiBaseUrl { switch (currentCountry) { case 'Syria': - return 'https://routes-syria.siromove.com/route/v1/driving'; + return 'https://routes-syria.tripzmove.com/route/v1/driving'; case 'Egypt': - return 'https://routes-egypt.siromove.com/route/v1/driving'; + return 'https://routes-egypt.tripzmove.com/route/v1/driving'; case 'Jordan': // TODO: Change to new subdomain when fully migrated - return 'https://routesjo.intaleq.xyz'; + return 'https://routesjo.tripz.xyz'; default: - return 'https://routes.siromove.com/route/v1/driving'; + return 'https://routes.tripzmove.com/route/v1/driving'; } } @@ -392,7 +392,7 @@ class AppLink { "$server/Admin/marketing/ai_price_prediction.php"; static String saveDriverDestination = "$server/ride/location/save_driver_destination.php"; - static String paymentServerV2 = 'https://walletintaleq.intaleq.xyz/v2/main'; + static String paymentServerV2 = 'https://wallettripz.tripz.xyz/v2/main'; static String realtimeDashboardV2 = "$server/Admin/v2/realtime_dashboard.php"; static String smartAlertsV2 = "$server/Admin/v2/smart_alerts.php"; static String growthV2 = "$server/Admin/v2/analytics/growth.php"; diff --git a/dashboards/admin/lib/controller/admin/analytics_v2_controller.dart b/dashboards/admin/lib/controller/admin/analytics_v2_controller.dart index 2430b0a..960808e 100644 --- a/dashboards/admin/lib/controller/admin/analytics_v2_controller.dart +++ b/dashboards/admin/lib/controller/admin/analytics_v2_controller.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:get/get.dart'; -import 'package:siro_admin/constant/links.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/constant/links.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; import '../../print.dart'; class AnalyticsV2Controller extends GetxController { diff --git a/dashboards/admin/lib/controller/admin/dashboard_controller.dart b/dashboards/admin/lib/controller/admin/dashboard_controller.dart index 1f482a4..0dc8439 100644 --- a/dashboards/admin/lib/controller/admin/dashboard_controller.dart +++ b/dashboards/admin/lib/controller/admin/dashboard_controller.dart @@ -2,9 +2,9 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/constant/links.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; -import 'package:siro_admin/controller/auth/otp_helper.dart'; +import 'package:tripz_admin/constant/links.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/controller/auth/otp_helper.dart'; import '../../constant/box_name.dart'; import '../../main.dart'; diff --git a/dashboards/admin/lib/controller/admin/dashboard_v2_controller.dart b/dashboards/admin/lib/controller/admin/dashboard_v2_controller.dart index ed943b2..9b00950 100644 --- a/dashboards/admin/lib/controller/admin/dashboard_v2_controller.dart +++ b/dashboards/admin/lib/controller/admin/dashboard_v2_controller.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:convert'; import 'package:get/get.dart'; -import 'package:siro_admin/constant/links.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/constant/links.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; import '../../print.dart'; class DashboardV2Controller extends GetxController { diff --git a/dashboards/admin/lib/controller/admin/financial_v2_controller.dart b/dashboards/admin/lib/controller/admin/financial_v2_controller.dart index 659d51d..01a8c23 100644 --- a/dashboards/admin/lib/controller/admin/financial_v2_controller.dart +++ b/dashboards/admin/lib/controller/admin/financial_v2_controller.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:get/get.dart'; -import 'package:siro_admin/constant/links.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/constant/links.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; import '../../print.dart'; class FinancialV2Controller extends GetxController { diff --git a/dashboards/admin/lib/controller/admin/live_analytics_controller.dart b/dashboards/admin/lib/controller/admin/live_analytics_controller.dart index 0c4793e..d4e67ed 100644 --- a/dashboards/admin/lib/controller/admin/live_analytics_controller.dart +++ b/dashboards/admin/lib/controller/admin/live_analytics_controller.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:get/get.dart'; -import 'package:siro_admin/constant/links.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/constant/links.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; import '../../print.dart'; class LiveAnalyticsController extends GetxController { diff --git a/dashboards/admin/lib/controller/admin/marketing_controller.dart b/dashboards/admin/lib/controller/admin/marketing_controller.dart index 49db614..377c48d 100644 --- a/dashboards/admin/lib/controller/admin/marketing_controller.dart +++ b/dashboards/admin/lib/controller/admin/marketing_controller.dart @@ -11,7 +11,7 @@ class MarketingController extends GetxController { // --- Dynamic Dashboard Configurations --- String selectedCountry = 'All'; // 'All', 'SY', 'JO', 'EG', 'IQ' bool isAutopilotEnabled = true; - String systemPrompt = "أنت المحلل الذكي لتطبيق Siro لخدمات نقل الركاب. قمنا برصد قراءات أسعار المنافسين لتقديم عروض وحملات تسويقية ملائمة ومخصصة."; + String systemPrompt = "أنت المحلل الذكي لتطبيق Tripz لخدمات نقل الركاب. قمنا برصد قراءات أسعار المنافسين لتقديم عروض وحملات تسويقية ملائمة ومخصصة."; // --- AI API Token & Cost Telemetry --- int apiRequestsCount = 0; @@ -21,7 +21,7 @@ class MarketingController extends GetxController { // --- Price Comparison Data --- List hourlyPriceData = []; List pciRegions = []; - Map siroBasePrices = {}; + Map tripzBasePrices = {}; // --- Country Selection Handler --- void changeCountry(String countryCode) { @@ -142,8 +142,8 @@ class MarketingController extends GetxController { if (data is Map) { hourlyPriceData = data['hourly_competitor_prices'] ?? []; pciRegions = data['pci_regions'] ?? []; - siroBasePrices = data['siro_base_prices'] is Map - ? data['siro_base_prices'] as Map + tripzBasePrices = data['tripz_base_prices'] is Map + ? data['tripz_base_prices'] as Map : {}; update(); } @@ -229,7 +229,7 @@ class MarketingController extends GetxController { // --- Heatmap State --- List heatmapData = []; - double currentSiroPriceHeatmap = 0.0; + double currentTripzPriceHeatmap = 0.0; Future fetchPriceGapHeatmap() async { try { @@ -248,7 +248,7 @@ class MarketingController extends GetxController { final data = res['message']; if (data is Map) { heatmapData = data['heatmap_data'] ?? []; - currentSiroPriceHeatmap = (data['current_siro_price_per_km'] ?? 0.0).toDouble(); + currentTripzPriceHeatmap = (data['current_tripz_price_per_km'] ?? 0.0).toDouble(); update(); } } diff --git a/dashboards/admin/lib/controller/admin/security_v2_controller.dart b/dashboards/admin/lib/controller/admin/security_v2_controller.dart index 241799d..c13a453 100644 --- a/dashboards/admin/lib/controller/admin/security_v2_controller.dart +++ b/dashboards/admin/lib/controller/admin/security_v2_controller.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'package:get/get.dart'; -import 'package:siro_admin/constant/links.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; -import 'package:siro_admin/views/widgets/snackbar.dart'; +import 'package:tripz_admin/constant/links.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/views/widgets/snackbar.dart'; import '../../print.dart'; class SecurityV2Controller extends GetxController { diff --git a/dashboards/admin/lib/controller/auth/otp_helper.dart b/dashboards/admin/lib/controller/auth/otp_helper.dart index 27fb8c2..740c5e1 100644 --- a/dashboards/admin/lib/controller/auth/otp_helper.dart +++ b/dashboards/admin/lib/controller/auth/otp_helper.dart @@ -5,8 +5,8 @@ import 'package:flutter/material.dart'; import 'package:jwt_decoder/jwt_decoder.dart'; import 'package:get/get.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; -import 'package:siro_admin/controller/functions/device_info.dart'; -import 'package:siro_admin/views/auth/login_page.dart'; +import 'package:tripz_admin/controller/functions/device_info.dart'; +import 'package:tripz_admin/views/auth/login_page.dart'; import '../../constant/box_name.dart'; import '../../constant/links.dart'; diff --git a/dashboards/admin/lib/controller/auth/register_controller.dart b/dashboards/admin/lib/controller/auth/register_controller.dart index c544de0..21aff53 100644 --- a/dashboards/admin/lib/controller/auth/register_controller.dart +++ b/dashboards/admin/lib/controller/auth/register_controller.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/constant/links.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; -import 'package:siro_admin/main.dart'; -import 'package:siro_admin/views/widgets/snackbar.dart'; +import 'package:tripz_admin/constant/links.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/main.dart'; +import 'package:tripz_admin/views/widgets/snackbar.dart'; class AdminRegisterController extends GetxController { final nameCtrl = TextEditingController(); diff --git a/dashboards/admin/lib/controller/employee_controller/employee_controller.dart b/dashboards/admin/lib/controller/employee_controller/employee_controller.dart index cfb3df4..6925ebb 100644 --- a/dashboards/admin/lib/controller/employee_controller/employee_controller.dart +++ b/dashboards/admin/lib/controller/employee_controller/employee_controller.dart @@ -3,9 +3,9 @@ import 'dart:math'; import 'package:flutter/widgets.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/constant/links.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; -import 'package:siro_admin/views/widgets/snackbar.dart'; +import 'package:tripz_admin/constant/links.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/views/widgets/snackbar.dart'; class EmployeeController extends GetxController { List employee = []; diff --git a/dashboards/admin/lib/controller/firebase/firbase_messge.dart b/dashboards/admin/lib/controller/firebase/firbase_messge.dart index dd25d04..b76828f 100644 --- a/dashboards/admin/lib/controller/firebase/firbase_messge.dart +++ b/dashboards/admin/lib/controller/firebase/firbase_messge.dart @@ -5,7 +5,7 @@ import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:get/get.dart'; import 'package:http/http.dart' as http; import 'package:secure_string_operations/secure_string_operations.dart'; -import 'package:siro_admin/constant/info.dart'; +import 'package:tripz_admin/constant/info.dart'; import '../../constant/api_key.dart'; import '../../constant/box_name.dart'; diff --git a/dashboards/admin/lib/controller/functions/security_checks.dart b/dashboards/admin/lib/controller/functions/security_checks.dart index e485f7c..6b23c4e 100755 --- a/dashboards/admin/lib/controller/functions/security_checks.dart +++ b/dashboards/admin/lib/controller/functions/security_checks.dart @@ -6,7 +6,7 @@ import 'package:get/get.dart'; class SecurityChecks { static const platform = MethodChannel( - 'com.siro.siro_admin/security'); // Choose a unique channel name + 'com.tripz.tripz_admin/security'); // Choose a unique channel name static Future isDeviceCompromised() async { try { diff --git a/dashboards/admin/lib/controller/functions/ssl_pinning.dart b/dashboards/admin/lib/controller/functions/ssl_pinning.dart index d79a100..caf835e 100644 --- a/dashboards/admin/lib/controller/functions/ssl_pinning.dart +++ b/dashboards/admin/lib/controller/functions/ssl_pinning.dart @@ -9,11 +9,11 @@ class SslPinning { SslPinning._(); static final Map> _pins = { - 'intaleq.xyz': [ + 'tripz.xyz': [ '/tNRUeeLxUhQU5gbgdpVWC6QBGAqc/ujg8Kcf0wQiAM=', 'Hlx/0EWNDH5Xkt2KzvqxUzbw0vvEsyZSlibialSyGqI=', ], - 'siromove.com': [ + 'tripzmove.com': [ 'C5+lpZ7tcVwmwQIMcRtPbsQtWLABXhQzejna0wHESsl=', 'diGVwiVYbubAI3RW4hB9xU8e/CH2GnkuvVFZE8zmgzI=', ], diff --git a/dashboards/admin/lib/controller/server/server_monitor_controller.dart b/dashboards/admin/lib/controller/server/server_monitor_controller.dart index 7763b2b..b6bd45e 100644 --- a/dashboards/admin/lib/controller/server/server_monitor_controller.dart +++ b/dashboards/admin/lib/controller/server/server_monitor_controller.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:get/get.dart'; -import 'package:siro_admin/constant/links.dart'; +import 'package:tripz_admin/constant/links.dart'; // --- Models --- diff --git a/dashboards/admin/lib/controller/transit/transit_admin_controller.dart b/dashboards/admin/lib/controller/transit/transit_admin_controller.dart index 0c8de35..6a8ba32 100644 --- a/dashboards/admin/lib/controller/transit/transit_admin_controller.dart +++ b/dashboards/admin/lib/controller/transit/transit_admin_controller.dart @@ -1,4 +1,4 @@ -// transit_admin_controller.dart — تحكم شاشات مواصلاتي (لوحة إدارة سيرو) +// transit_admin_controller.dart — تحكم شاشات مواصلاتي (لوحة إدارة تريبز) import 'package:get/get.dart'; import 'transit_admin_models.dart'; diff --git a/dashboards/admin/lib/controller/transit/transit_admin_models.dart b/dashboards/admin/lib/controller/transit/transit_admin_models.dart index e26d2e0..f699e2b 100644 --- a/dashboards/admin/lib/controller/transit/transit_admin_models.dart +++ b/dashboards/admin/lib/controller/transit/transit_admin_models.dart @@ -1,4 +1,4 @@ -// transit_admin_models.dart — نماذج بيانات مواصلاتي (لوحة إدارة سيرو) +// transit_admin_models.dart — نماذج بيانات مواصلاتي (لوحة إدارة تريبز) class TransitOrgSummary { final int id; diff --git a/dashboards/admin/lib/controller/transit/transit_admin_service.dart b/dashboards/admin/lib/controller/transit/transit_admin_service.dart index 546e8c4..fe92baf 100644 --- a/dashboards/admin/lib/controller/transit/transit_admin_service.dart +++ b/dashboards/admin/lib/controller/transit/transit_admin_service.dart @@ -1,4 +1,4 @@ -// transit_admin_service.dart — طبقة الاتصال بـ backend/Admin/transit (لوحة إدارة سيرو) +// transit_admin_service.dart — طبقة الاتصال بـ backend/Admin/transit (لوحة إدارة تريبز) import '../functions/crud.dart'; import '../../constant/links.dart'; import 'transit_admin_models.dart'; diff --git a/dashboards/admin/lib/debug_jwt.dart b/dashboards/admin/lib/debug_jwt.dart index 41b8260..5718cba 100644 --- a/dashboards/admin/lib/debug_jwt.dart +++ b/dashboards/admin/lib/debug_jwt.dart @@ -1,5 +1,5 @@ -import 'package:siro_admin/controller/functions/encrypt_decrypt.dart'; -import 'package:siro_admin/constant/info.dart'; +import 'package:tripz_admin/controller/functions/encrypt_decrypt.dart'; +import 'package:tripz_admin/constant/info.dart'; void main() { String testJwt = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiYWRtaW4ifQ.signature"; diff --git a/dashboards/admin/lib/env/env.dart b/dashboards/admin/lib/env/env.dart index ab78131..5b3bc3d 100644 --- a/dashboards/admin/lib/env/env.dart +++ b/dashboards/admin/lib/env/env.dart @@ -9,8 +9,6 @@ abstract class Env { @EnviedField(varName: 'initializationVector', obfuscate: true) static final String initializationVector = _Env.initializationVector; - @EnviedField(varName: 'ALLOWED_ADMIN_PHONES', obfuscate: true) - static final String ALLOWED_ADMIN_PHONES = _Env.ALLOWED_ADMIN_PHONES; @EnviedField(varName: 'passnpassenger', obfuscate: true) static final String passnpassenger = _Env.passnpassenger; diff --git a/dashboards/admin/lib/firebase_options.dart b/dashboards/admin/lib/firebase_options.dart index a768c1d..586d0b4 100644 --- a/dashboards/admin/lib/firebase_options.dart +++ b/dashboards/admin/lib/firebase_options.dart @@ -53,15 +53,15 @@ class DefaultFirebaseOptions { apiKey: 'AIzaSyAEoply_UcEP6KaCu_ziCy_ZDIjAKvi7b8', appId: '1:825988584191:android:caa30eaac3524de51632ca', messagingSenderId: '825988584191', - projectId: 'siro-a6957', - storageBucket: 'siro-a6957.firebasestorage.app', + projectId: 'tripz-a6957', + storageBucket: 'tripz-a6957.firebasestorage.app', ); static const FirebaseOptions ios = FirebaseOptions( apiKey: 'AIzaSyDk6x6KZUY0IQtxoCMXX0F7N_yik8O19eA', appId: '1:825988584191:ios:8426fcf68fcc470e1632ca', messagingSenderId: '825988584191', - projectId: 'siro-a6957', - storageBucket: 'siro-a6957.firebasestorage.app', - iosBundleId: 'com.siro.admin', + projectId: 'tripz-a6957', + storageBucket: 'tripz-a6957.firebasestorage.app', + iosBundleId: 'com.tripz.admin', ); } diff --git a/dashboards/admin/lib/main.dart b/dashboards/admin/lib/main.dart index 69e5999..852d189 100644 --- a/dashboards/admin/lib/main.dart +++ b/dashboards/admin/lib/main.dart @@ -64,7 +64,7 @@ class MainApp extends StatelessWidget { Widget build(BuildContext context) { return GetMaterialApp( debugShowCheckedModeBanner: false, - title: 'Siro Admin', + title: 'Tripz Admin', locale: const Locale('ar'), fallbackLocale: const Locale('en'), themeMode: ThemeMode.system, diff --git a/dashboards/admin/lib/views/admin/admin_home_page.dart b/dashboards/admin/lib/views/admin/admin_home_page.dart index 58c2bf3..4168637 100644 --- a/dashboards/admin/lib/views/admin/admin_home_page.dart +++ b/dashboards/admin/lib/views/admin/admin_home_page.dart @@ -4,9 +4,9 @@ import 'package:fl_chart/fl_chart.dart'; import 'package:flutter/material.dart'; import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/views/admin/drivers/driver_gift_check_page.dart'; -import 'package:siro_admin/views/admin/drivers/driver_tracker_screen.dart'; -import 'package:siro_admin/views/admin/quality/blacklist_page.dart'; +import 'package:tripz_admin/views/admin/drivers/driver_gift_check_page.dart'; +import 'package:tripz_admin/views/admin/drivers/driver_tracker_screen.dart'; +import 'package:tripz_admin/views/admin/quality/blacklist_page.dart'; import '../../constant/box_name.dart'; import '../../controller/admin/dashboard_controller.dart'; @@ -36,10 +36,10 @@ import 'static/advanced_analytics_page.dart'; import 'financial/financial_v2_page.dart'; import 'security/audit_logs_page.dart'; import 'analytics/live_analytics_page.dart'; -import 'package:siro_admin/views/widgets/responsive_layout.dart'; -import 'package:siro_admin/views/widgets/web_sidebar.dart'; +import 'package:tripz_admin/views/widgets/responsive_layout.dart'; +import 'package:tripz_admin/views/widgets/web_sidebar.dart'; import '../transit/org_list_page.dart'; -import 'package:siro_admin/views/widgets/glass_container.dart'; +import 'package:tripz_admin/views/widgets/glass_container.dart'; class AdminHomePage extends StatefulWidget { const AdminHomePage({super.key}); @@ -329,7 +329,7 @@ class _AdminHomePageState extends State colors: [cs.primary, cs.tertiary], ).createShader(bounds), child: const Text( - 'Siro Admin', + 'Tripz Admin', style: TextStyle( color: Colors.white, fontWeight: FontWeight.w700, @@ -1148,7 +1148,7 @@ class _AdminHomePageState extends State ActionItem('السائقون', Icons.drive_eta_rounded, const Color(0xFFF59E0B), () => Get.to(() => CaptainsPage())), ActionItem('المراقب', Icons.track_changes_rounded, const Color(0xFFEF4444), - () => Get.to(() => SiroTrackerScreen())), + () => Get.to(() => TripzTrackerScreen())), ], ), ActionCategory( diff --git a/dashboards/admin/lib/views/admin/analytics/live_analytics_page.dart b/dashboards/admin/lib/views/admin/analytics/live_analytics_page.dart index 8da8287..20f12c0 100644 --- a/dashboards/admin/lib/views/admin/analytics/live_analytics_page.dart +++ b/dashboards/admin/lib/views/admin/analytics/live_analytics_page.dart @@ -502,7 +502,7 @@ class _MapTabState extends State<_MapTab> with AutomaticKeepAliveClientMixin { urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png', subdomains: const ['a', 'b', 'c', 'd'], - userAgentPackageName: 'com.siromove.admin', + userAgentPackageName: 'com.tripzmove.admin', ), CircleLayer(circles: markers), ], diff --git a/dashboards/admin/lib/views/admin/captain/drivers_cant_registe.dart b/dashboards/admin/lib/views/admin/captain/drivers_cant_registe.dart index c87217f..3b91334 100644 --- a/dashboards/admin/lib/views/admin/captain/drivers_cant_registe.dart +++ b/dashboards/admin/lib/views/admin/captain/drivers_cant_registe.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/views/admin/captain/register_captain.dart'; -import 'package:siro_admin/views/widgets/my_scafold.dart'; +import 'package:tripz_admin/views/admin/captain/register_captain.dart'; +import 'package:tripz_admin/views/widgets/my_scafold.dart'; import '../../../constant/colors.dart'; import '../../../controller/admin/register_captain_controller.dart'; diff --git a/dashboards/admin/lib/views/admin/captain/form_captain.dart b/dashboards/admin/lib/views/admin/captain/form_captain.dart index 0d91415..1269833 100644 --- a/dashboards/admin/lib/views/admin/captain/form_captain.dart +++ b/dashboards/admin/lib/views/admin/captain/form_captain.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; import '../../../constant/links.dart'; import '../../../controller/admin/captain_admin_controller.dart'; import '../../widgets/elevated_btn.dart'; diff --git a/dashboards/admin/lib/views/admin/captain/register_captain.dart b/dashboards/admin/lib/views/admin/captain/register_captain.dart index 2103352..6b2c053 100644 --- a/dashboards/admin/lib/views/admin/captain/register_captain.dart +++ b/dashboards/admin/lib/views/admin/captain/register_captain.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/controller/admin/register_captain_controller.dart'; +import 'package:tripz_admin/controller/admin/register_captain_controller.dart'; import '../../../../constant/colors.dart'; import '../../../../constant/links.dart'; import '../../../../constant/style.dart'; diff --git a/dashboards/admin/lib/views/admin/captain/syrian_driver_not_active.dart b/dashboards/admin/lib/views/admin/captain/syrian_driver_not_active.dart index 66946f5..4068f38 100644 --- a/dashboards/admin/lib/views/admin/captain/syrian_driver_not_active.dart +++ b/dashboards/admin/lib/views/admin/captain/syrian_driver_not_active.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/controller/drivers/driver_not_active_controller.dart'; +import 'package:tripz_admin/controller/drivers/driver_not_active_controller.dart'; import 'driver_details_not_active_page.dart'; class DriversPendingPage extends StatelessWidget { diff --git a/dashboards/admin/lib/views/admin/dashboard_v2_widget.dart b/dashboards/admin/lib/views/admin/dashboard_v2_widget.dart index 2c4c379..cc776c2 100644 --- a/dashboards/admin/lib/views/admin/dashboard_v2_widget.dart +++ b/dashboards/admin/lib/views/admin/dashboard_v2_widget.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/controller/admin/dashboard_v2_controller.dart'; +import 'package:tripz_admin/controller/admin/dashboard_v2_controller.dart'; import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; -import 'package:siro_admin/views/widgets/glass_container.dart'; +import 'package:tripz_admin/views/widgets/glass_container.dart'; class DashboardV2Widget extends StatelessWidget { const DashboardV2Widget({super.key}); diff --git a/dashboards/admin/lib/views/admin/dashboard_widget.dart b/dashboards/admin/lib/views/admin/dashboard_widget.dart index d65ce8e..474bbe6 100644 --- a/dashboards/admin/lib/views/admin/dashboard_widget.dart +++ b/dashboards/admin/lib/views/admin/dashboard_widget.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; // For Get.width if needed, and .tr -import 'package:siro_admin/constant/colors.dart'; // Assuming AppColor is here -import 'package:siro_admin/constant/style.dart'; // Assuming AppStyle is here +import 'package:tripz_admin/constant/colors.dart'; // Assuming AppColor is here +import 'package:tripz_admin/constant/style.dart'; // Assuming AppStyle is here class DashboardStatCard extends StatelessWidget { final String title; diff --git a/dashboards/admin/lib/views/admin/drivers/alexandria.dart b/dashboards/admin/lib/views/admin/drivers/alexandria.dart index b1aa1dd..d34ce30 100644 --- a/dashboards/admin/lib/views/admin/drivers/alexandria.dart +++ b/dashboards/admin/lib/views/admin/drivers/alexandria.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/constant/links.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; -import 'package:siro_admin/controller/functions/wallet.dart'; -import 'package:siro_admin/views/widgets/my_scafold.dart'; +import 'package:tripz_admin/constant/links.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/controller/functions/wallet.dart'; +import 'package:tripz_admin/views/widgets/my_scafold.dart'; import '../../../controller/drivers/driverthebest.dart'; diff --git a/dashboards/admin/lib/views/admin/drivers/driver_gift_check_page.dart b/dashboards/admin/lib/views/admin/drivers/driver_gift_check_page.dart index 15eb365..084f112 100644 --- a/dashboards/admin/lib/views/admin/drivers/driver_gift_check_page.dart +++ b/dashboards/admin/lib/views/admin/drivers/driver_gift_check_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; -import 'package:siro_admin/controller/functions/wallet.dart'; -import 'package:siro_admin/views/widgets/snackbar.dart'; -import 'package:siro_admin/constant/links.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/controller/functions/wallet.dart'; +import 'package:tripz_admin/views/widgets/snackbar.dart'; +import 'package:tripz_admin/constant/links.dart'; class DriverGiftCheckerController extends GetxController { final TextEditingController phoneController = TextEditingController(); diff --git a/dashboards/admin/lib/views/admin/drivers/driver_the_best.dart b/dashboards/admin/lib/views/admin/drivers/driver_the_best.dart index 08a1042..bd67e7c 100644 --- a/dashboards/admin/lib/views/admin/drivers/driver_the_best.dart +++ b/dashboards/admin/lib/views/admin/drivers/driver_the_best.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:get_storage/get_storage.dart'; // Ensure get_storage is in pubspec.yaml -import 'package:siro_admin/controller/functions/wallet.dart'; -import 'package:siro_admin/views/widgets/snackbar.dart'; +import 'package:tripz_admin/controller/functions/wallet.dart'; +import 'package:tripz_admin/views/widgets/snackbar.dart'; -import 'package:siro_admin/constant/links.dart'; +import 'package:tripz_admin/constant/links.dart'; // --- New Controller to handle the specific JSON URL --- class DriverCacheController extends GetxController { diff --git a/dashboards/admin/lib/views/admin/drivers/driver_tracker_screen.dart b/dashboards/admin/lib/views/admin/drivers/driver_tracker_screen.dart index a78b4de..6a774de 100644 --- a/dashboards/admin/lib/views/admin/drivers/driver_tracker_screen.dart +++ b/dashboards/admin/lib/views/admin/drivers/driver_tracker_screen.dart @@ -5,21 +5,21 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:latlong2/latlong.dart'; import 'package:http/http.dart' as http; -import 'package:siro_admin/constant/links.dart'; +import 'package:tripz_admin/constant/links.dart'; import 'package:url_launcher/url_launcher.dart'; import '../../../constant/box_name.dart'; import '../../../controller/functions/crud.dart'; import '../../../main.dart'; -class SiroTrackerScreen extends StatefulWidget { - const SiroTrackerScreen({super.key}); +class TripzTrackerScreen extends StatefulWidget { + const TripzTrackerScreen({super.key}); @override - State createState() => _SiroTrackerScreenState(); + State createState() => _TripzTrackerScreenState(); } -class _SiroTrackerScreenState extends State +class _TripzTrackerScreenState extends State with TickerProviderStateMixin { final MapController _mapController = MapController(); List _markers = []; @@ -516,7 +516,7 @@ class _SiroTrackerScreenState extends State children: [ TileLayer( urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', - userAgentPackageName: 'com.siromove.admin', + userAgentPackageName: 'com.tripzmove.admin', ), MarkerLayer(markers: _markers), ], diff --git a/dashboards/admin/lib/views/admin/drivers/giza.dart b/dashboards/admin/lib/views/admin/drivers/giza.dart index 33608a9..634ffa6 100644 --- a/dashboards/admin/lib/views/admin/drivers/giza.dart +++ b/dashboards/admin/lib/views/admin/drivers/giza.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/constant/links.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; -import 'package:siro_admin/controller/functions/wallet.dart'; -import 'package:siro_admin/views/widgets/my_scafold.dart'; +import 'package:tripz_admin/constant/links.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/controller/functions/wallet.dart'; +import 'package:tripz_admin/views/widgets/my_scafold.dart'; import '../../../controller/drivers/driverthebest.dart'; diff --git a/dashboards/admin/lib/views/admin/drivers/monitor_ride.dart b/dashboards/admin/lib/views/admin/drivers/monitor_ride.dart index cd75c1f..56c4db6 100644 --- a/dashboards/admin/lib/views/admin/drivers/monitor_ride.dart +++ b/dashboards/admin/lib/views/admin/drivers/monitor_ride.dart @@ -3,9 +3,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:latlong2/latlong.dart'; -import 'package:siro_admin/constant/links.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; -import 'package:siro_admin/views/widgets/snackbar.dart'; +import 'package:tripz_admin/constant/links.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/views/widgets/snackbar.dart'; class DriverLocation { final double latitude; @@ -405,7 +405,7 @@ class RideMonitorScreen extends StatelessWidget { children: [ TileLayer( urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', - userAgentPackageName: 'com.siromove.admin', + userAgentPackageName: 'com.tripzmove.admin', ), if (controller.routePolyline.isNotEmpty) PolylineLayer( diff --git a/dashboards/admin/lib/views/admin/employee/employee_page.dart b/dashboards/admin/lib/views/admin/employee/employee_page.dart index 8932c83..422bf7d 100644 --- a/dashboards/admin/lib/views/admin/employee/employee_page.dart +++ b/dashboards/admin/lib/views/admin/employee/employee_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/constant/links.dart'; -import 'package:siro_admin/controller/employee_controller/employee_controller.dart'; -import 'package:siro_admin/controller/functions/upload_image copy.dart'; +import 'package:tripz_admin/constant/links.dart'; +import 'package:tripz_admin/controller/employee_controller/employee_controller.dart'; +import 'package:tripz_admin/controller/functions/upload_image copy.dart'; import 'package:url_launcher/url_launcher.dart'; class EmployeePage extends StatelessWidget { diff --git a/dashboards/admin/lib/views/admin/enceypt/encrypt.dart b/dashboards/admin/lib/views/admin/enceypt/encrypt.dart index 3ee58b5..e6d177c 100644 --- a/dashboards/admin/lib/views/admin/enceypt/encrypt.dart +++ b/dashboards/admin/lib/views/admin/enceypt/encrypt.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:siro_admin/constant/links.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; -import 'package:siro_admin/main.dart'; +import 'package:tripz_admin/constant/links.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/main.dart'; import '../../../constant/box_name.dart'; diff --git a/dashboards/admin/lib/views/admin/error/error/error_page.dart b/dashboards/admin/lib/views/admin/error/error/error_page.dart index 1a6c345..74182b2 100644 --- a/dashboards/admin/lib/views/admin/error/error/error_page.dart +++ b/dashboards/admin/lib/views/admin/error/error/error_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/constant/links.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/constant/links.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; class ErrorLog { final String id; diff --git a/dashboards/admin/lib/views/admin/financial/financial_v2_page.dart b/dashboards/admin/lib/views/admin/financial/financial_v2_page.dart index df28283..9779aae 100644 --- a/dashboards/admin/lib/views/admin/financial/financial_v2_page.dart +++ b/dashboards/admin/lib/views/admin/financial/financial_v2_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/controller/admin/financial_v2_controller.dart'; +import 'package:tripz_admin/controller/admin/financial_v2_controller.dart'; class FinancialV2Page extends StatelessWidget { const FinancialV2Page({super.key}); diff --git a/dashboards/admin/lib/views/admin/marketing/heatmap_page.dart b/dashboards/admin/lib/views/admin/marketing/heatmap_page.dart index f3a7a98..febb17e 100644 --- a/dashboards/admin/lib/views/admin/marketing/heatmap_page.dart +++ b/dashboards/admin/lib/views/admin/marketing/heatmap_page.dart @@ -3,7 +3,7 @@ import 'package:flutter_map/flutter_map.dart'; import 'package:latlong2/latlong.dart'; import 'package:dio/dio.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/constant/links.dart'; +import 'package:tripz_admin/constant/links.dart'; class HeatmapPage extends StatefulWidget { const HeatmapPage({super.key}); @@ -251,7 +251,7 @@ class _HeatmapPageState extends State { children: [ TileLayer( urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', - userAgentPackageName: 'com.siromove.admin', + userAgentPackageName: 'com.tripzmove.admin', ), CircleLayer(circles: _markers), ], diff --git a/dashboards/admin/lib/views/admin/marketing/marketing_page.dart b/dashboards/admin/lib/views/admin/marketing/marketing_page.dart index 3281c87..49e1e85 100644 --- a/dashboards/admin/lib/views/admin/marketing/marketing_page.dart +++ b/dashboards/admin/lib/views/admin/marketing/marketing_page.dart @@ -43,7 +43,7 @@ class MarketingPage extends StatelessWidget { ), ), const SizedBox(width: 12), - Text('أتمتة التسويق الذكي (Siro AI Marketing)', style: TextStyle(color: cs.onSurface, fontSize: 18, fontWeight: FontWeight.w700)), + Text('أتمتة التسويق الذكي (Tripz AI Marketing)', style: TextStyle(color: cs.onSurface, fontSize: 18, fontWeight: FontWeight.w700)), ], ), ), @@ -260,9 +260,9 @@ class MarketingPage extends StatelessWidget { Widget _buildComparisonChart(MarketingController c, ColorScheme cs) { final hourlyData = c.hourlyPriceData; - final siroBase = c.siroBasePrices; - final double siroSpeedPrice = (siroBase['speedPrice'] != null) - ? double.tryParse(siroBase['speedPrice'].toString()) ?? 0.0 + final tripzBase = c.tripzBasePrices; + final double tripzSpeedPrice = (tripzBase['speedPrice'] != null) + ? double.tryParse(tripzBase['speedPrice'].toString()) ?? 0.0 : 0.0; List competitorSpots = []; @@ -280,10 +280,10 @@ class MarketingPage extends StatelessWidget { final double maxY = competitorSpots.fold(0, (p, s) => s.y > p ? s.y : p); final double chartMaxY = maxY > 0 ? maxY * 1.3 : 10; - List siroSpots = []; - if (siroSpeedPrice > 0) { + List tripzSpots = []; + if (tripzSpeedPrice > 0) { for (int i = 0; i < hourlyData.length; i++) { - siroSpots.add(FlSpot(i.toDouble(), siroSpeedPrice)); + tripzSpots.add(FlSpot(i.toDouble(), tripzSpeedPrice)); } } @@ -306,8 +306,8 @@ class MarketingPage extends StatelessWidget { const SizedBox(height: 4), Text( hourlyData.isNotEmpty - ? 'مقارنة أسعار Siro مقابل متوسط المنافسين لآخر ${hourlyData.length} ساعة' - : 'مقارنة أسعار Siro مقابل متوسط المنافسين لآخر 24 ساعة', + ? 'مقارنة أسعار Tripz مقابل متوسط المنافسين لآخر ${hourlyData.length} ساعة' + : 'مقارنة أسعار Tripz مقابل متوسط المنافسين لآخر 24 ساعة', style: TextStyle(fontSize: 10, color: cs.onSurfaceVariant), ), const SizedBox(height: 24), @@ -352,9 +352,9 @@ class MarketingPage extends StatelessWidget { minY: 0, maxY: chartMaxY, lineBarsData: [ - if (siroSpots.length > 1) + if (tripzSpots.length > 1) LineChartBarData( - spots: siroSpots, + spots: tripzSpots, isCurved: true, color: cs.primary, barWidth: 3, @@ -902,7 +902,7 @@ class MarketingPage extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text('توقعات الذكاء الاصطناعي (Siro AI Prediction)', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 13, color: cs.tertiary)), + Text('توقعات الذكاء الاصطناعي (Tripz AI Prediction)', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 13, color: cs.tertiary)), const SizedBox(height: 6), Text( c.aiPredictionMessage!, diff --git a/dashboards/admin/lib/views/admin/packages.dart b/dashboards/admin/lib/views/admin/packages.dart index d0d654f..6cb163b 100644 --- a/dashboards/admin/lib/views/admin/packages.dart +++ b/dashboards/admin/lib/views/admin/packages.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'dart:convert'; -import 'package:siro_admin/constant/links.dart'; -import 'package:siro_admin/controller/functions/crud.dart'; -import 'package:siro_admin/views/widgets/snackbar.dart'; +import 'package:tripz_admin/constant/links.dart'; +import 'package:tripz_admin/controller/functions/crud.dart'; +import 'package:tripz_admin/views/widgets/snackbar.dart'; import '../../print.dart'; diff --git a/dashboards/admin/lib/views/admin/rides/ride_lookup_page.dart b/dashboards/admin/lib/views/admin/rides/ride_lookup_page.dart index a7676d1..d27fde5 100644 --- a/dashboards/admin/lib/views/admin/rides/ride_lookup_page.dart +++ b/dashboards/admin/lib/views/admin/rides/ride_lookup_page.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:latlong2/latlong.dart'; -import 'package:siro_admin/constant/links.dart'; +import 'package:tripz_admin/constant/links.dart'; import 'package:url_launcher/url_launcher.dart'; import '../../../controller/functions/crud.dart'; import '../../../constant/box_name.dart'; @@ -999,7 +999,7 @@ class _RideMapMonitorScreenState extends State { children: [ TileLayer( urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', - userAgentPackageName: 'com.siromove.admin', + userAgentPackageName: 'com.tripzmove.admin', ), // Route Polyline if (startPos != null && endPos != null) diff --git a/dashboards/admin/lib/views/admin/security/audit_logs_page.dart b/dashboards/admin/lib/views/admin/security/audit_logs_page.dart index 7c1bffc..92289e3 100644 --- a/dashboards/admin/lib/views/admin/security/audit_logs_page.dart +++ b/dashboards/admin/lib/views/admin/security/audit_logs_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/controller/admin/security_v2_controller.dart'; +import 'package:tripz_admin/controller/admin/security_v2_controller.dart'; class AuditLogsPage extends StatelessWidget { const AuditLogsPage({super.key}); diff --git a/dashboards/admin/lib/views/admin/static/advanced_analytics_page.dart b/dashboards/admin/lib/views/admin/static/advanced_analytics_page.dart index 4ab91ef..f6aeaf7 100644 --- a/dashboards/admin/lib/views/admin/static/advanced_analytics_page.dart +++ b/dashboards/admin/lib/views/admin/static/advanced_analytics_page.dart @@ -1,7 +1,7 @@ import 'package:fl_chart/fl_chart.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/controller/admin/analytics_v2_controller.dart'; +import 'package:tripz_admin/controller/admin/analytics_v2_controller.dart'; class AdvancedAnalyticsPage extends StatelessWidget { const AdvancedAnalyticsPage({super.key}); diff --git a/dashboards/admin/lib/views/admin/static/notes_driver_page.dart b/dashboards/admin/lib/views/admin/static/notes_driver_page.dart index 6b7d834..53e2ff1 100644 --- a/dashboards/admin/lib/views/admin/static/notes_driver_page.dart +++ b/dashboards/admin/lib/views/admin/static/notes_driver_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/controller/functions/launch.dart'; +import 'package:tripz_admin/controller/functions/launch.dart'; import '../../../controller/admin/static_controller.dart'; import '../../widgets/mycircular.dart'; diff --git a/dashboards/admin/lib/views/admin/static/static.dart b/dashboards/admin/lib/views/admin/static/static.dart index 52b4117..2f4dc29 100644 --- a/dashboards/admin/lib/views/admin/static/static.dart +++ b/dashboards/admin/lib/views/admin/static/static.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart' hide TextDirection; -import 'package:siro_admin/controller/admin/static_controller.dart'; +import 'package:tripz_admin/controller/admin/static_controller.dart'; import 'notes_driver_page.dart'; class StaticDash extends StatelessWidget { diff --git a/dashboards/admin/lib/views/auth/register_page.dart b/dashboards/admin/lib/views/auth/register_page.dart index e943acb..83b90c0 100644 --- a/dashboards/admin/lib/views/auth/register_page.dart +++ b/dashboards/admin/lib/views/auth/register_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/controller/auth/register_controller.dart'; +import 'package:tripz_admin/controller/auth/register_controller.dart'; class _C { static const bg = Color(0xFF0A0D14); diff --git a/dashboards/admin/lib/views/invoice/add_invoice_page.dart b/dashboards/admin/lib/views/invoice/add_invoice_page.dart index dcb8ff4..100fbf3 100644 --- a/dashboards/admin/lib/views/invoice/add_invoice_page.dart +++ b/dashboards/admin/lib/views/invoice/add_invoice_page.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:http/http.dart' as http; import 'package:image_picker/image_picker.dart'; -import 'package:siro_admin/constant/links.dart'; +import 'package:tripz_admin/constant/links.dart'; import '../../constant/box_name.dart'; import '../../constant/info.dart'; diff --git a/dashboards/admin/lib/views/transit/org_admins_page.dart b/dashboards/admin/lib/views/transit/org_admins_page.dart index 0e6f8d6..927c66a 100644 --- a/dashboards/admin/lib/views/transit/org_admins_page.dart +++ b/dashboards/admin/lib/views/transit/org_admins_page.dart @@ -1,4 +1,4 @@ -// org_admins_page.dart — متابعة إدارة المؤسسة وإضافة المشرفين (لوحة إدارة سيرو) +// org_admins_page.dart — متابعة إدارة المؤسسة وإضافة المشرفين (لوحة إدارة تريبز) import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/dashboards/admin/lib/views/transit/org_create_page.dart b/dashboards/admin/lib/views/transit/org_create_page.dart index 019c129..f89cc48 100644 --- a/dashboards/admin/lib/views/transit/org_create_page.dart +++ b/dashboards/admin/lib/views/transit/org_create_page.dart @@ -1,4 +1,4 @@ -// org_create_page.dart — إضافة مؤسسة جديدة (لوحة إدارة سيرو) +// org_create_page.dart — إضافة مؤسسة جديدة (لوحة إدارة تريبز) import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/dashboards/admin/lib/views/transit/org_details_page.dart b/dashboards/admin/lib/views/transit/org_details_page.dart index b38deb7..b6f6595 100644 --- a/dashboards/admin/lib/views/transit/org_details_page.dart +++ b/dashboards/admin/lib/views/transit/org_details_page.dart @@ -1,4 +1,4 @@ -// org_details_page.dart — تفاصيل وتحليلات مؤسسة (لوحة إدارة سيرو) +// org_details_page.dart — تفاصيل وتحليلات مؤسسة (لوحة إدارة تريبز) import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/dashboards/admin/lib/views/transit/route_approval_page.dart b/dashboards/admin/lib/views/transit/route_approval_page.dart index 7231070..d85a0f6 100644 --- a/dashboards/admin/lib/views/transit/route_approval_page.dart +++ b/dashboards/admin/lib/views/transit/route_approval_page.dart @@ -1,4 +1,4 @@ -// route_approval_page.dart — اعتماد خطوط مواصلاتي المسودة (لوحة سيرو آدمن) +// route_approval_page.dart — اعتماد خطوط مواصلاتي المسودة (لوحة تريبز آدمن) import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/dashboards/admin/lib/views/widgets/web_sidebar.dart b/dashboards/admin/lib/views/widgets/web_sidebar.dart index da3a275..d1db95f 100644 --- a/dashboards/admin/lib/views/widgets/web_sidebar.dart +++ b/dashboards/admin/lib/views/widgets/web_sidebar.dart @@ -1,30 +1,30 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_admin/main.dart'; -import 'package:siro_admin/constant/box_name.dart'; -import 'package:siro_admin/views/admin/captain/captain.dart'; -import 'package:siro_admin/views/admin/passenger/passenger.dart'; -import 'package:siro_admin/views/admin/drivers/driver_tracker_screen.dart'; -import 'package:siro_admin/views/transit/org_list_page.dart'; -import 'package:siro_admin/views/admin/static/static.dart'; -import 'package:siro_admin/controller/admin/static_controller.dart'; -import 'package:siro_admin/views/admin/drivers/monitor_ride.dart'; -import 'package:siro_admin/views/admin/rides/ride_lookup_page.dart'; -import 'package:siro_admin/views/admin/packages.dart'; -import 'package:siro_admin/views/admin/wallet/wallet.dart'; -import 'package:siro_admin/views/admin/captain/syrian_driver_not_active.dart'; -import 'package:siro_admin/views/admin/drivers/driver_gift_check_page.dart'; -import 'package:siro_admin/views/admin/quality/blacklist_page.dart'; -import 'package:siro_admin/views/admin/employee/employee_page.dart'; -import 'package:siro_admin/views/admin/server/monitor_server_page.dart'; -import 'package:siro_admin/views/admin/error/error/error_page.dart'; -import 'package:siro_admin/views/invoice/invoice_list_page.dart'; -import 'package:siro_admin/views/admin/staff/add_staff_page.dart'; -import 'package:siro_admin/views/admin/staff/pending_admins_page.dart'; -import 'package:siro_admin/views/admin/static/advanced_analytics_page.dart'; -import 'package:siro_admin/views/admin/financial/financial_v2_page.dart'; -import 'package:siro_admin/views/admin/security/audit_logs_page.dart'; -import 'package:siro_admin/views/admin/analytics/live_analytics_page.dart'; +import 'package:tripz_admin/main.dart'; +import 'package:tripz_admin/constant/box_name.dart'; +import 'package:tripz_admin/views/admin/captain/captain.dart'; +import 'package:tripz_admin/views/admin/passenger/passenger.dart'; +import 'package:tripz_admin/views/admin/drivers/driver_tracker_screen.dart'; +import 'package:tripz_admin/views/transit/org_list_page.dart'; +import 'package:tripz_admin/views/admin/static/static.dart'; +import 'package:tripz_admin/controller/admin/static_controller.dart'; +import 'package:tripz_admin/views/admin/drivers/monitor_ride.dart'; +import 'package:tripz_admin/views/admin/rides/ride_lookup_page.dart'; +import 'package:tripz_admin/views/admin/packages.dart'; +import 'package:tripz_admin/views/admin/wallet/wallet.dart'; +import 'package:tripz_admin/views/admin/captain/syrian_driver_not_active.dart'; +import 'package:tripz_admin/views/admin/drivers/driver_gift_check_page.dart'; +import 'package:tripz_admin/views/admin/quality/blacklist_page.dart'; +import 'package:tripz_admin/views/admin/employee/employee_page.dart'; +import 'package:tripz_admin/views/admin/server/monitor_server_page.dart'; +import 'package:tripz_admin/views/admin/error/error/error_page.dart'; +import 'package:tripz_admin/views/invoice/invoice_list_page.dart'; +import 'package:tripz_admin/views/admin/staff/add_staff_page.dart'; +import 'package:tripz_admin/views/admin/staff/pending_admins_page.dart'; +import 'package:tripz_admin/views/admin/static/advanced_analytics_page.dart'; +import 'package:tripz_admin/views/admin/financial/financial_v2_page.dart'; +import 'package:tripz_admin/views/admin/security/audit_logs_page.dart'; +import 'package:tripz_admin/views/admin/analytics/live_analytics_page.dart'; class WebSidebar extends StatelessWidget { final int selectedIndex; @@ -158,7 +158,7 @@ class WebSidebar extends StatelessWidget { title: 'تتبع الكباتن (المراقب)', icon: Icons.track_changes_rounded, index: 3, - onTap: () => Get.to(() => SiroTrackerScreen()), + onTap: () => Get.to(() => TripzTrackerScreen()), ), _buildSectionHeader(context, 'نظام مواصلاتي'), @@ -321,7 +321,7 @@ class WebSidebar extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - 'SIRO ADMIN', + 'TRIPZ ADMIN', style: TextStyle( color: cs.onSurface, fontWeight: FontWeight.bold, diff --git a/dashboards/admin/linux/CMakeLists.txt b/dashboards/admin/linux/CMakeLists.txt index 3ac5670..c33ef8a 100644 --- a/dashboards/admin/linux/CMakeLists.txt +++ b/dashboards/admin/linux/CMakeLists.txt @@ -4,10 +4,10 @@ project(runner LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "siro_admin") +set(BINARY_NAME "tripz_admin") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.siro.siro_admin") +set(APPLICATION_ID "com.tripz.tripz_admin") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/dashboards/admin/linux/runner/my_application.cc b/dashboards/admin/linux/runner/my_application.cc index 2bdeb80..8d9c297 100644 --- a/dashboards/admin/linux/runner/my_application.cc +++ b/dashboards/admin/linux/runner/my_application.cc @@ -45,11 +45,11 @@ static void my_application_activate(GApplication* application) { if (use_header_bar) { GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); gtk_widget_show(GTK_WIDGET(header_bar)); - gtk_header_bar_set_title(header_bar, "siro_admin"); + gtk_header_bar_set_title(header_bar, "tripz_admin"); gtk_header_bar_set_show_close_button(header_bar, TRUE); gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); } else { - gtk_window_set_title(window, "siro_admin"); + gtk_window_set_title(window, "tripz_admin"); } gtk_window_set_default_size(window, 1280, 720); diff --git a/dashboards/admin/macos/Runner.xcodeproj/project.pbxproj b/dashboards/admin/macos/Runner.xcodeproj/project.pbxproj index f0a54bb..bf537dc 100644 --- a/dashboards/admin/macos/Runner.xcodeproj/project.pbxproj +++ b/dashboards/admin/macos/Runner.xcodeproj/project.pbxproj @@ -67,7 +67,7 @@ 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* siro_admin.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = siro_admin.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* tripz_admin.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = tripz_admin.app; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; @@ -144,7 +144,7 @@ 33CC10EE2044A3C60003C045 /* Products */ = { isa = PBXGroup; children = ( - 33CC10ED2044A3C60003C045 /* siro_admin.app */, + 33CC10ED2044A3C60003C045 /* tripz_admin.app */, 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, ); name = Products; @@ -250,7 +250,7 @@ ); name = Runner; productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* siro_admin.app */; + productReference = 33CC10ED2044A3C60003C045 /* tripz_admin.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -497,10 +497,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.siro.siroAdmin.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.tripz.tripzAdmin.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/siro_admin.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/siro_admin"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tripz_admin.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/tripz_admin"; }; name = Debug; }; @@ -512,10 +512,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.siro.siroAdmin.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.tripz.tripzAdmin.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/siro_admin.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/siro_admin"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tripz_admin.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/tripz_admin"; }; name = Release; }; @@ -527,10 +527,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.siro.siroAdmin.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.tripz.tripzAdmin.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/siro_admin.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/siro_admin"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tripz_admin.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/tripz_admin"; }; name = Profile; }; diff --git a/dashboards/admin/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/dashboards/admin/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index aa9f24d..62ff22a 100644 --- a/dashboards/admin/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/dashboards/admin/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -15,7 +15,7 @@ @@ -31,7 +31,7 @@ @@ -66,7 +66,7 @@ @@ -83,7 +83,7 @@ diff --git a/dashboards/admin/macos/Runner/Configs/AppInfo.xcconfig b/dashboards/admin/macos/Runner/Configs/AppInfo.xcconfig index 818a706..1263a02 100644 --- a/dashboards/admin/macos/Runner/Configs/AppInfo.xcconfig +++ b/dashboards/admin/macos/Runner/Configs/AppInfo.xcconfig @@ -5,10 +5,10 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = siro_admin +PRODUCT_NAME = tripz_admin // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.siro.siroAdmin +PRODUCT_BUNDLE_IDENTIFIER = com.tripz.tripzAdmin // The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2025 com.siro. All rights reserved. +PRODUCT_COPYRIGHT = Copyright © 2025 com.tripz. All rights reserved. diff --git a/dashboards/admin/pubspec.lock b/dashboards/admin/pubspec.lock index dc0c512..fa70eb6 100644 --- a/dashboards/admin/pubspec.lock +++ b/dashboards/admin/pubspec.lock @@ -892,10 +892,10 @@ packages: dependency: transitive description: name: matcher - sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 + sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6" url: "https://pub.dev" source: hosted - version: "0.12.19" + version: "0.12.18" material_color_utilities: dependency: transitive description: @@ -908,10 +908,10 @@ packages: dependency: transitive description: name: meta - sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.17.0" mgrs_dart: dependency: transitive description: @@ -1232,10 +1232,10 @@ packages: dependency: transitive description: name: test_api - sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" + sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636" url: "https://pub.dev" source: hosted - version: "0.7.11" + version: "0.7.9" typed_data: dependency: transitive description: @@ -1413,5 +1413,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.10.0-0 <4.0.0" + dart: ">=3.9.0-0 <4.0.0" flutter: ">=3.32.0" diff --git a/dashboards/admin/pubspec.yaml b/dashboards/admin/pubspec.yaml index 96a7495..ed1ef7a 100644 --- a/dashboards/admin/pubspec.yaml +++ b/dashboards/admin/pubspec.yaml @@ -1,4 +1,4 @@ -name: siro_admin +name: tripz_admin description: "A new Flutter project." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. diff --git a/dashboards/admin/web/index.html b/dashboards/admin/web/index.html index 231cbbd..30215d6 100644 --- a/dashboards/admin/web/index.html +++ b/dashboards/admin/web/index.html @@ -23,13 +23,13 @@ - + - siro_admin + tripz_admin diff --git a/dashboards/admin/web/manifest.json b/dashboards/admin/web/manifest.json index 2431843..79d68a1 100644 --- a/dashboards/admin/web/manifest.json +++ b/dashboards/admin/web/manifest.json @@ -1,6 +1,6 @@ { - "name": "siro_admin", - "short_name": "siro_admin", + "name": "tripz_admin", + "short_name": "tripz_admin", "start_url": ".", "display": "standalone", "background_color": "#ffffff", diff --git a/dashboards/admin/windows/CMakeLists.txt b/dashboards/admin/windows/CMakeLists.txt index 163ad76..7cff2c1 100644 --- a/dashboards/admin/windows/CMakeLists.txt +++ b/dashboards/admin/windows/CMakeLists.txt @@ -1,10 +1,10 @@ # Project-level configuration. cmake_minimum_required(VERSION 3.14) -project(siro_admin LANGUAGES CXX) +project(tripz_admin LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "siro_admin") +set(BINARY_NAME "tripz_admin") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/dashboards/admin/windows/runner/Runner.rc b/dashboards/admin/windows/runner/Runner.rc index 1bbad9b..c29b40d 100644 --- a/dashboards/admin/windows/runner/Runner.rc +++ b/dashboards/admin/windows/runner/Runner.rc @@ -89,13 +89,13 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "CompanyName", "com.siro" "\0" - VALUE "FileDescription", "siro_admin" "\0" + VALUE "CompanyName", "com.tripz" "\0" + VALUE "FileDescription", "tripz_admin" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "siro_admin" "\0" - VALUE "LegalCopyright", "Copyright (C) 2026 com.siro. All rights reserved." "\0" - VALUE "OriginalFilename", "siro_admin.exe" "\0" - VALUE "ProductName", "siro_admin" "\0" + VALUE "InternalName", "tripz_admin" "\0" + VALUE "LegalCopyright", "Copyright (C) 2026 com.tripz. All rights reserved." "\0" + VALUE "OriginalFilename", "tripz_admin.exe" "\0" + VALUE "ProductName", "tripz_admin" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" END END diff --git a/dashboards/admin/windows/runner/main.cpp b/dashboards/admin/windows/runner/main.cpp index 547bbf4..cb2ae71 100644 --- a/dashboards/admin/windows/runner/main.cpp +++ b/dashboards/admin/windows/runner/main.cpp @@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); - if (!window.Create(L"siro_admin", origin, size)) { + if (!window.Create(L"tripz_admin", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true); diff --git a/dashboards/service-web-archive/index.html b/dashboards/service-web-archive/index.html deleted file mode 100644 index ef25406..0000000 --- a/dashboards/service-web-archive/index.html +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - Tripz — خدمة العملاء - - - - -
-

🎧 Tripz — خدمة العملاء

- - - -
- - -
- -

دخول خدمة العملاء

-

هاتف + رمز تحقّق.

- - -
-
- - - - diff --git a/dashboards/service/README.md b/dashboards/service/README.md index 24f2fd4..159e588 100644 --- a/dashboards/service/README.md +++ b/dashboards/service/README.md @@ -1,4 +1,4 @@ -# siro_service +# tripz_service A new Flutter project. diff --git a/dashboards/service/analyze_report.txt b/dashboards/service/analyze_report.txt index 990ff74..443b9aa 100644 --- a/dashboards/service/analyze_report.txt +++ b/dashboards/service/analyze_report.txt @@ -1,4 +1,4 @@ -Analyzing siro_service... +Analyzing tripz_service... warning - lib/constant/links.dart:3:8 - Unused import: 'box_name.dart'. Try removing the import directive. - unused_import warning - lib/controller/best_driver_controllers.dart:1:8 - Unused import: 'dart:convert'. Try removing the import directive. - unused_import @@ -105,7 +105,7 @@ warning - lib/controller/login_controller.dart:1:8 - Unused import: 'dart:conver warning - lib/controller/mainController/pages/add_car.dart:12:8 - Unused import: '../../functions/encrypt_decrypt.dart'. Try removing the import directive. - unused_import warning - lib/controller/mainController/pages/alexandria_besr_driver.dart:6:8 - Unused import: '../../functions/encrypt_decrypt.dart'. Try removing the import directive. - unused_import warning - lib/controller/mainController/pages/best_driver_page.dart:1:8 - Unused import: 'dart:convert'. Try removing the import directive. - unused_import -warning - lib/controller/mainController/pages/best_driver_page.dart:5:8 - Unused import: 'package:siro_service/controller/functions/encrypt_decrypt.dart'. Try removing the import directive. - unused_import +warning - lib/controller/mainController/pages/best_driver_page.dart:5:8 - Unused import: 'package:tripz_service/controller/functions/encrypt_decrypt.dart'. Try removing the import directive. - unused_import warning - lib/controller/mainController/pages/edit_car_plate.dart:7:8 - Unused import: '../../functions/encrypt_decrypt.dart'. Try removing the import directive. - unused_import warning - lib/controller/mainController/pages/edit_car_plate.dart:9:8 - Duplicate import. Try removing all but one import of the library. - duplicate_import warning - lib/controller/mainController/pages/edit_car_plate.dart:10:8 - Duplicate import. Try removing all but one import of the library. - duplicate_import diff --git a/dashboards/service/android/app/build.gradle.kts b/dashboards/service/android/app/build.gradle.kts index f7b8050..d84f799 100644 --- a/dashboards/service/android/app/build.gradle.kts +++ b/dashboards/service/android/app/build.gradle.kts @@ -26,12 +26,12 @@ if (keystorePropertiesFile.exists()) { } android { - namespace = "com.siro.siro_service" + namespace = "com.tripz.tripz_service" compileSdk = 36 ndkVersion = "28.2.13676358" defaultConfig { - applicationId = "com.siro.siro_service" + applicationId = "com.tripz.tripz_service" minSdk = 30 targetSdk = 36 versionCode = 1 diff --git a/dashboards/service/android/app/src/main/cpp/CMakeLists.txt b/dashboards/service/android/app/src/main/cpp/CMakeLists.txt index 40a4efe..28620fb 100755 --- a/dashboards/service/android/app/src/main/cpp/CMakeLists.txt +++ b/dashboards/service/android/app/src/main/cpp/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10.2) # 3.10.2 is fine, but no need to go as high as 3.31.5 -project(siro_service) # Good +project(tripz_service) # Good # Add your C++ source file(s) to create a SHARED library. add_library(native-lib SHARED native-lib.cpp) diff --git a/dashboards/service/android/app/src/main/cpp/native-lib.cpp b/dashboards/service/android/app/src/main/cpp/native-lib.cpp index d3c5fe4..304e7e9 100755 --- a/dashboards/service/android/app/src/main/cpp/native-lib.cpp +++ b/dashboards/service/android/app/src/main/cpp/native-lib.cpp @@ -158,7 +158,7 @@ bool checkLoadedModules() //} extern "C" JNIEXPORT jboolean JNICALL -Java_com_siro_siro_1service_RootDetection_isNativeRooted(JNIEnv *env, jobject /* this */) +Java_com_tripz_tripz_1service_RootDetection_isNativeRooted(JNIEnv *env, jobject /* this */) { if (isRooted()) diff --git a/dashboards/service/android/app/src/main/kotlin/com/example/service_intaleq/MainActivity.kt b/dashboards/service/android/app/src/main/kotlin/com/example/service_tripz/MainActivity.kt similarity index 97% rename from dashboards/service/android/app/src/main/kotlin/com/example/service_intaleq/MainActivity.kt rename to dashboards/service/android/app/src/main/kotlin/com/example/service_tripz/MainActivity.kt index edf91a6..5e14295 100644 --- a/dashboards/service/android/app/src/main/kotlin/com/example/service_intaleq/MainActivity.kt +++ b/dashboards/service/android/app/src/main/kotlin/com/example/service_tripz/MainActivity.kt @@ -1,4 +1,4 @@ -package com.siro.siro_service +package com.tripz.tripz_service import android.app.AlertDialog import android.content.Intent @@ -17,8 +17,8 @@ import java.util.Timer import kotlin.concurrent.schedule class MainActivity : FlutterFragmentActivity() { - private val SECURITY_CHANNEL = "com.siro.siro_service/security" - private val APP_CONTROL_CHANNEL = "com.siro.siro_service/app_control" + private val SECURITY_CHANNEL = "com.tripz.tripz_service/security" + private val APP_CONTROL_CHANNEL = "com.tripz.tripz_service/app_control" override fun configureFlutterEngine(flutterEngine: FlutterEngine) { super.configureFlutterEngine(flutterEngine) diff --git a/dashboards/service/android/app/src/main/kotlin/com/example/service_intaleq/MyApplication.kt b/dashboards/service/android/app/src/main/kotlin/com/example/service_tripz/MyApplication.kt similarity index 93% rename from dashboards/service/android/app/src/main/kotlin/com/example/service_intaleq/MyApplication.kt rename to dashboards/service/android/app/src/main/kotlin/com/example/service_tripz/MyApplication.kt index 173f305..b546584 100755 --- a/dashboards/service/android/app/src/main/kotlin/com/example/service_intaleq/MyApplication.kt +++ b/dashboards/service/android/app/src/main/kotlin/com/example/service_tripz/MyApplication.kt @@ -1,4 +1,4 @@ -package com.siro.siro_service +package com.tripz.tripz_service import android.app.Application import android.content.Intent @@ -24,7 +24,7 @@ class MyApplication : Application() { MethodChannel( flutterEngine.dartExecutor.binaryMessenger, - "com.siro.siro_service/app_lifecycle" + "com.tripz.tripz_service/app_lifecycle" ) .setMethodCallHandler { call, result -> if (call.method == "bringAppToForeground") { diff --git a/dashboards/admin/android/app/src/main/kotlin/com/siro/siro_admin/RootDetection.kt b/dashboards/service/android/app/src/main/kotlin/com/example/service_tripz/RootDetection.kt similarity index 85% rename from dashboards/admin/android/app/src/main/kotlin/com/siro/siro_admin/RootDetection.kt rename to dashboards/service/android/app/src/main/kotlin/com/example/service_tripz/RootDetection.kt index 8483685..2c8e3d0 100755 --- a/dashboards/admin/android/app/src/main/kotlin/com/siro/siro_admin/RootDetection.kt +++ b/dashboards/service/android/app/src/main/kotlin/com/example/service_tripz/RootDetection.kt @@ -1,4 +1,4 @@ -package com.siro.siro_admin +package com.tripz.tripz_service object RootDetection { init { diff --git a/dashboards/service/android/app/src/main/kotlin/com/example/service_intaleq/SafetyNetCheck.kt b/dashboards/service/android/app/src/main/kotlin/com/example/service_tripz/SafetyNetCheck.kt similarity index 100% rename from dashboards/service/android/app/src/main/kotlin/com/example/service_intaleq/SafetyNetCheck.kt rename to dashboards/service/android/app/src/main/kotlin/com/example/service_tripz/SafetyNetCheck.kt diff --git a/dashboards/service/android/app/src/main/res/xml/network_security_config.xml b/dashboards/service/android/app/src/main/res/xml/network_security_config.xml index b20c418..6d12c02 100644 --- a/dashboards/service/android/app/src/main/res/xml/network_security_config.xml +++ b/dashboards/service/android/app/src/main/res/xml/network_security_config.xml @@ -7,8 +7,8 @@ - intaleq.xyz - siromove.com + tripz.xyz + tripzmove.com diff --git a/dashboards/service/firebase.json b/dashboards/service/firebase.json index 688c847..c9a5d6d 100644 --- a/dashboards/service/firebase.json +++ b/dashboards/service/firebase.json @@ -1 +1 @@ -{"flutter":{"platforms":{"android":{"default":{"projectId":"siro-a6957","appId":"1:825988584191:android:be08180beef7d65e1632ca","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"siro-a6957","appId":"1:825988584191:ios:9d50158dc7a09e851632ca","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"siro-a6957","configurations":{"android":"1:825988584191:android:be08180beef7d65e1632ca","ios":"1:825988584191:ios:9d50158dc7a09e851632ca"}}}}}} \ No newline at end of file +{"flutter":{"platforms":{"android":{"default":{"projectId":"tripz-a6957","appId":"1:825988584191:android:be08180beef7d65e1632ca","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"tripz-a6957","appId":"1:825988584191:ios:9d50158dc7a09e851632ca","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"tripz-a6957","configurations":{"android":"1:825988584191:android:be08180beef7d65e1632ca","ios":"1:825988584191:ios:9d50158dc7a09e851632ca"}}}}}} \ No newline at end of file diff --git a/dashboards/service/ios/Runner.xcodeproj/project.pbxproj b/dashboards/service/ios/Runner.xcodeproj/project.pbxproj index b91c6ea..1bb7eed 100644 --- a/dashboards/service/ios/Runner.xcodeproj/project.pbxproj +++ b/dashboards/service/ios/Runner.xcodeproj/project.pbxproj @@ -500,7 +500,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceSiro; + PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceTripz; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -517,7 +517,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceSiro.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceTripz.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -535,7 +535,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceSiro.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceTripz.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -551,7 +551,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceSiro.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceTripz.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -683,7 +683,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceSiro; + PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceTripz; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -706,7 +706,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceSiro; + PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceTripz; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/dashboards/service/ios/Runner/AppDelegate.swift b/dashboards/service/ios/Runner/AppDelegate.swift index 4da40aa..bbaf0f3 100644 --- a/dashboards/service/ios/Runner/AppDelegate.swift +++ b/dashboards/service/ios/Runner/AppDelegate.swift @@ -8,7 +8,7 @@ import UIKit didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { let controller : FlutterViewController = window?.rootViewController as! FlutterViewController - let securityChannel = FlutterMethodChannel(name: "com.siro.siro_service/security", + let securityChannel = FlutterMethodChannel(name: "com.tripz.tripz_service/security", binaryMessenger: controller.binaryMessenger) securityChannel.setMethodCallHandler({ diff --git a/dashboards/service/ios/Runner/Info.plist b/dashboards/service/ios/Runner/Info.plist index 5f2142e..b2da929 100644 --- a/dashboards/service/ios/Runner/Info.plist +++ b/dashboards/service/ios/Runner/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - Siro Service + Tripz Service CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - siro_service + tripz_service CFBundlePackageType APPL CFBundleShortVersionString diff --git a/dashboards/service/lib/constant/info.dart b/dashboards/service/lib/constant/info.dart index 04ea597..6948d7c 100644 --- a/dashboards/service/lib/constant/info.dart +++ b/dashboards/service/lib/constant/info.dart @@ -5,7 +5,7 @@ class AppInformation { static const String linkedInProfile = 'https://www.linkedin.com/in/hamza-ayed/'; static const String website = 'https://mobile-app.store'; - static const String email = 'support@intaleqapp.com'; + static const String email = 'support@tripzapp.com'; static const String complaintPrompt = 'for this data for complaint from driver or passenger i collect all data i want you analyze this complaint and show what is reason and what is solution .this data collected from many table to find solution if payment in visa not complete and if ride status is finished it will be paymnet in payment table if ride status is not finished there is no need to pay and payment table is null for this ride and if paymentFromPaymentTable not null and visa type not cash the payment sucssessed . if ratingpassenger is low or passengr rating drivers low grade then dont mine of this passenger ,look at driver too like passengerratingdriver with rating or ratingtopassenger .in json add status of complaint and message to passenger and message to driver and message to call center write in arabic in json output with key in english .for output please just json i want'; static const String addd = 'BlBlNl'; diff --git a/dashboards/service/lib/constant/links.dart b/dashboards/service/lib/constant/links.dart index 4bf13f1..0f6eef8 100644 --- a/dashboards/service/lib/constant/links.dart +++ b/dashboards/service/lib/constant/links.dart @@ -14,26 +14,26 @@ class AppLink { static String get paymentServer { switch (currentCountry) { case 'Syria': - return 'https://wallet-syria.siromove.com/v1/main'; + return 'https://wallet-syria.tripzmove.com/v1/main'; case 'Egypt': - return 'https://wallet-egypt.siromove.com/v1/main'; + return 'https://wallet-egypt.tripzmove.com/v1/main'; case 'Jordan': - return 'https://walletintaleq.intaleq.xyz/v2/main'; + return 'https://wallettripz.tripz.xyz/v2/main'; default: - return 'https://wallet.siromove.com/v1/main'; + return 'https://wallet.tripzmove.com/v1/main'; } } static String get locationServer { switch (currentCountry) { case 'Syria': - return 'https://location-syria.siromove.com/siro/ride/location'; + return 'https://location-syria.tripzmove.com/tripz/ride/location'; case 'Egypt': - return 'https://location-egypt.siromove.com/siro/ride/location'; + return 'https://location-egypt.tripzmove.com/tripz/ride/location'; case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/loction_server/siro/ride/location'; + return 'https://jordan-tripz.tripzapp.com/loction_server/tripz/ride/location'; default: - return 'https://location.siromove.com/siro/ride/location'; + return 'https://location.tripzmove.com/tripz/ride/location'; } } @@ -43,69 +43,69 @@ class AppLink { static String get mapSaasRoute { switch (currentCountry) { case 'Syria': - return 'https://map-syria.siromove.com/api/maps/route'; + return 'https://map-syria.tripzmove.com/api/maps/route'; case 'Egypt': - return 'https://map-egypt.siromove.com/api/maps/route'; + return 'https://map-egypt.tripzmove.com/api/maps/route'; case 'Jordan': - return 'https://map-saas.intaleqapp.com/api/maps/route'; + return 'https://map-saas.tripzapp.com/api/maps/route'; default: - return 'https://map-saas.intaleqapp.com/api/maps/route'; + return 'https://map-saas.tripzapp.com/api/maps/route'; } } static String get mapSaasPlaces { switch (currentCountry) { case 'Syria': - return 'https://map-syria.siromove.com/api/geocoding/places'; + return 'https://map-syria.tripzmove.com/api/geocoding/places'; case 'Egypt': - return 'https://map-egypt.siromove.com/api/geocoding/places'; + return 'https://map-egypt.tripzmove.com/api/geocoding/places'; case 'Jordan': - return 'https://map-saas.intaleqapp.com/api/geocoding/places'; + return 'https://map-saas.tripzapp.com/api/geocoding/places'; default: - return 'https://map-saas.intaleqapp.com/api/geocoding/places'; + return 'https://map-saas.tripzapp.com/api/geocoding/places'; } } static String get routeApiBaseUrl { switch (currentCountry) { case 'Syria': - return 'https://routes-syria.siromove.com/route/v1/driving'; + return 'https://routes-syria.tripzmove.com/route/v1/driving'; case 'Egypt': - return 'https://routes-egypt.siromove.com/route/v1/driving'; + return 'https://routes-egypt.tripzmove.com/route/v1/driving'; case 'Jordan': - return 'https://routesjo.intaleq.xyz/route/v1/driving'; + return 'https://routesjo.tripz.xyz/route/v1/driving'; default: - return 'https://routes.siromove.com/route/v1/driving'; + return 'https://routes.tripzmove.com/route/v1/driving'; } } - static String get syria => 'https://api-syria.siromove.com/siro'; + static String get syria => 'https://api-syria.tripzmove.com/tripz'; static String seferPaymentServer0 = box.read('seferPaymentServer'); static String get endPoint { switch (currentCountry) { case 'Syria': - return 'https://api-syria.siromove.com/siro_v3'; + return 'https://api-syria.tripzmove.com/tripz_v3'; case 'Egypt': - return 'https://api-egypt.siromove.com/siro_v3'; + return 'https://api-egypt.tripzmove.com/tripz_v3'; case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/backend'; + return 'https://jordan-tripz.tripzapp.com/backend'; default: - return 'https://api.siromove.com/siro_v3'; + return 'https://api.tripzmove.com/tripz_v3'; } } static String get rideServer { switch (currentCountry) { case 'Syria': - return 'https://api-syria.siromove.com/siro'; + return 'https://api-syria.tripzmove.com/tripz'; case 'Egypt': - return 'https://api-egypt.siromove.com/siro'; + return 'https://api-egypt.tripzmove.com/tripz'; case 'Jordan': - return 'https://rides.intaleq.xyz/intaleq'; + return 'https://rides.tripz.xyz/tripz'; default: - return 'https://api.siromove.com/siro'; + return 'https://api.tripzmove.com/tripz'; } } diff --git a/dashboards/service/lib/controller/auth/register_controller.dart b/dashboards/service/lib/controller/auth/register_controller.dart index 9072097..fed4b02 100644 --- a/dashboards/service/lib/controller/auth/register_controller.dart +++ b/dashboards/service/lib/controller/auth/register_controller.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/views/widgets/mycircular.dart'; -import 'package:siro_service/constant/links.dart'; -import 'package:siro_service/controller/functions/crud.dart'; -import 'package:siro_service/controller/functions/device_helper.dart'; -import 'package:siro_service/print.dart'; +import 'package:tripz_service/views/widgets/mycircular.dart'; +import 'package:tripz_service/constant/links.dart'; +import 'package:tripz_service/controller/functions/crud.dart'; +import 'package:tripz_service/controller/functions/device_helper.dart'; +import 'package:tripz_service/print.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; diff --git a/dashboards/service/lib/controller/firbase_messge.dart b/dashboards/service/lib/controller/firbase_messge.dart index 00e775b..3721fac 100644 --- a/dashboards/service/lib/controller/firbase_messge.dart +++ b/dashboards/service/lib/controller/firbase_messge.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:get/get.dart'; -import 'package:siro_service/controller/local_notification.dart'; +import 'package:tripz_service/controller/local_notification.dart'; import '../../constant/box_name.dart'; import '../../main.dart'; import '../../print.dart'; diff --git a/dashboards/service/lib/controller/firebase.dart b/dashboards/service/lib/controller/firebase.dart index 345df16..444cd3d 100644 --- a/dashboards/service/lib/controller/firebase.dart +++ b/dashboards/service/lib/controller/firebase.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/views/widgets/mycircular.dart'; +import 'package:tripz_service/views/widgets/mycircular.dart'; import 'package:http/http.dart' as http; import '../../constant/api_key.dart'; diff --git a/dashboards/service/lib/controller/functions/crud.dart b/dashboards/service/lib/controller/functions/crud.dart index 9c45418..4659f51 100644 --- a/dashboards/service/lib/controller/functions/crud.dart +++ b/dashboards/service/lib/controller/functions/crud.dart @@ -5,14 +5,14 @@ import 'dart:io'; import 'package:crypto/crypto.dart'; import 'package:get/get.dart'; import 'package:http/http.dart' as http; -import 'package:siro_service/constant/box_name.dart'; -import 'package:siro_service/constant/links.dart'; -import 'package:siro_service/controller/functions/encrypt_decrypt.dart'; -import 'package:siro_service/env/env.dart'; -import 'package:siro_service/controller/functions/security_helper.dart'; -import 'package:siro_service/controller/functions/session_manager.dart'; -import 'package:siro_service/main.dart'; -import 'package:siro_service/print.dart'; +import 'package:tripz_service/constant/box_name.dart'; +import 'package:tripz_service/constant/links.dart'; +import 'package:tripz_service/controller/functions/encrypt_decrypt.dart'; +import 'package:tripz_service/env/env.dart'; +import 'package:tripz_service/controller/functions/security_helper.dart'; +import 'package:tripz_service/controller/functions/session_manager.dart'; +import 'package:tripz_service/main.dart'; +import 'package:tripz_service/print.dart'; import '../../constant/api_key.dart'; import 'ssl_pinning.dart'; diff --git a/dashboards/service/lib/controller/functions/device_helper.dart b/dashboards/service/lib/controller/functions/device_helper.dart index b12cc9b..891accf 100644 --- a/dashboards/service/lib/controller/functions/device_helper.dart +++ b/dashboards/service/lib/controller/functions/device_helper.dart @@ -1,8 +1,8 @@ import 'dart:io'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/foundation.dart'; -import 'package:siro_service/constant/box_name.dart'; -import 'package:siro_service/controller/functions/encrypt_decrypt.dart'; +import 'package:tripz_service/constant/box_name.dart'; +import 'package:tripz_service/controller/functions/encrypt_decrypt.dart'; import '../../main.dart'; import '../../print.dart'; diff --git a/dashboards/service/lib/controller/functions/encrypt_decrypt.dart b/dashboards/service/lib/controller/functions/encrypt_decrypt.dart index 5c9a69f..c9f786e 100644 --- a/dashboards/service/lib/controller/functions/encrypt_decrypt.dart +++ b/dashboards/service/lib/controller/functions/encrypt_decrypt.dart @@ -1,10 +1,10 @@ import 'package:encrypt/encrypt.dart' as encrypt; import 'package:flutter/foundation.dart'; -import 'package:siro_service/env/env.dart'; +import 'package:tripz_service/env/env.dart'; import 'package:secure_string_operations/secure_string_operations.dart'; -import 'package:siro_service/constant/char_map.dart'; -import 'package:siro_service/print.dart'; +import 'package:tripz_service/constant/char_map.dart'; +import 'package:tripz_service/print.dart'; class EncryptionHelper { diff --git a/dashboards/service/lib/controller/functions/image.dart b/dashboards/service/lib/controller/functions/image.dart index 69938e3..24d797b 100644 --- a/dashboards/service/lib/controller/functions/image.dart +++ b/dashboards/service/lib/controller/functions/image.dart @@ -15,8 +15,8 @@ import '../../constant/box_name.dart'; import '../../constant/colors.dart'; import '../../views/widgets/mycircular.dart'; import '../../main.dart'; -import 'package:siro_service/controller/functions/encrypt_decrypt.dart'; -import 'package:siro_service/env/env.dart'; +import 'package:tripz_service/controller/functions/encrypt_decrypt.dart'; +import 'package:tripz_service/env/env.dart'; class ImageController extends GetxController { diff --git a/dashboards/service/lib/controller/functions/initilize.dart b/dashboards/service/lib/controller/functions/initilize.dart index 63ff0ee..613c4d8 100644 --- a/dashboards/service/lib/controller/functions/initilize.dart +++ b/dashboards/service/lib/controller/functions/initilize.dart @@ -1,17 +1,3 @@ -import 'dart:convert'; - -import 'package:jwt_decoder/jwt_decoder.dart'; -import 'package:secure_string_operations/secure_string_operations.dart'; -import 'package:siro_service/controller/functions/crud.dart'; - -import '../../constant/box_name.dart'; -import '../../constant/char_map.dart'; -import '../../constant/info.dart'; -import '../../constant/links.dart'; -import '../../env/env.dart'; -import '../../main.dart'; -import '../../print.dart'; - class AppInitializer { List> links = []; @@ -28,16 +14,4 @@ class AppInitializer { // } // } // } - - getAIKey(String key1) async { - if (box.read(BoxName.firstTimeLoadKey) == null) { - var res = - await CRUD().get(link: Env.getapiKey, payload: {"keyName": key1}); - if (res != 'failure') { - var d = res['message']; - await storage.write(key: key1, value: d[key1].toString()); - await Future.delayed(Duration.zero); - } else {} - } - } } diff --git a/dashboards/service/lib/controller/functions/launch.dart b/dashboards/service/lib/controller/functions/launch.dart index 9a1ebcc..2abd612 100644 --- a/dashboards/service/lib/controller/functions/launch.dart +++ b/dashboards/service/lib/controller/functions/launch.dart @@ -1,6 +1,6 @@ import 'package:url_launcher/url_launcher.dart'; import 'dart:io'; -import 'package:siro_service/main.dart'; +import 'package:tripz_service/main.dart'; String _formatPhoneNumberForCommunication(String rawPhone, String country) { String digits = rawPhone.replaceAll(RegExp(r'[^0-9]'), ''); diff --git a/dashboards/service/lib/controller/functions/security_helper.dart b/dashboards/service/lib/controller/functions/security_helper.dart index 0717c32..20976e8 100644 --- a/dashboards/service/lib/controller/functions/security_helper.dart +++ b/dashboards/service/lib/controller/functions/security_helper.dart @@ -1,9 +1,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; -import 'package:siro_service/print.dart'; +import 'package:tripz_service/print.dart'; class SecurityHelper { - static const platform = MethodChannel('com.service_siro/security'); + static const platform = MethodChannel('com.service_tripz/security'); static Future getAppSignature() async { try { diff --git a/dashboards/service/lib/controller/functions/session_manager.dart b/dashboards/service/lib/controller/functions/session_manager.dart index c4e5711..035f270 100644 --- a/dashboards/service/lib/controller/functions/session_manager.dart +++ b/dashboards/service/lib/controller/functions/session_manager.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/constant/box_name.dart'; -import 'package:siro_service/controller/functions/crud.dart'; -import 'package:siro_service/main.dart'; -import 'package:siro_service/print.dart'; -import 'package:siro_service/controller/functions/encrypt_decrypt.dart'; -import 'package:siro_service/env/env.dart'; +import 'package:tripz_service/constant/box_name.dart'; +import 'package:tripz_service/controller/functions/crud.dart'; +import 'package:tripz_service/main.dart'; +import 'package:tripz_service/print.dart'; +import 'package:tripz_service/controller/functions/encrypt_decrypt.dart'; +import 'package:tripz_service/env/env.dart'; /// مدير الجلسة - مسؤول عن مراقبة صلاحية الجلسة /// وتجديدها تلقائياً عند انتهائها class SessionManager extends GetxController { diff --git a/dashboards/service/lib/controller/functions/ssl_pinning.dart b/dashboards/service/lib/controller/functions/ssl_pinning.dart index 761b3c9..f49596e 100644 --- a/dashboards/service/lib/controller/functions/ssl_pinning.dart +++ b/dashboards/service/lib/controller/functions/ssl_pinning.dart @@ -8,11 +8,11 @@ class SslPinning { SslPinning._(); static final Map> _pins = { - 'intaleq.xyz': [ + 'tripz.xyz': [ '/tNRUeeLxUhQU5gbgdpVWC6QBGAqc/ujg8Kcf0wQiAM=', 'Hlx/0EWNDH5Xkt2KzvqxUzbw0vvEsyZSlibialSyGqI=', ], - 'siromove.com': [ + 'tripzmove.com': [ 'C5+lpZ7tcVwmwQIMcRtPbsQtWLABXhQzejna0wHESsl=', 'diGVwiVYbubAI3RW4hB9xU8e/CH2GnkuvVFZE8zmgzI=', ], diff --git a/dashboards/service/lib/controller/local/ar_eg.dart b/dashboards/service/lib/controller/local/ar_eg.dart index e4925b7..de74570 100644 --- a/dashboards/service/lib/controller/local/ar_eg.dart +++ b/dashboards/service/lib/controller/local/ar_eg.dart @@ -596,7 +596,7 @@ final Map ar_eg = { "Sign In by Google": "Sign In by Google", "Sign Out": "Sign Out", "Sign in with Google for easier email and name entry": "Sign in with Google for easier email and name entry", - "Siro Service": "سيرو سيرفس", + "Tripz Service": "تريبز سيرفس", "Sky Blue": "أزرق سماوي", "So go and gain your money": "So go and gain your money", "Speed Over": "Speed Over", diff --git a/dashboards/service/lib/controller/local/ar_jo.dart b/dashboards/service/lib/controller/local/ar_jo.dart index 18a8e10..9e95196 100644 --- a/dashboards/service/lib/controller/local/ar_jo.dart +++ b/dashboards/service/lib/controller/local/ar_jo.dart @@ -596,7 +596,7 @@ final Map ar_jo = { "Sign In by Google": "Sign In by Google", "Sign Out": "Sign Out", "Sign in with Google for easier email and name entry": "Sign in with Google for easier email and name entry", - "Siro Service": "سيرو سيرفس", + "Tripz Service": "تريبز سيرفس", "Sky Blue": "أزرق سماوي", "So go and gain your money": "So go and gain your money", "Speed Over": "Speed Over", diff --git a/dashboards/service/lib/controller/local/ar_sy.dart b/dashboards/service/lib/controller/local/ar_sy.dart index fd8a0da..c71bd0e 100644 --- a/dashboards/service/lib/controller/local/ar_sy.dart +++ b/dashboards/service/lib/controller/local/ar_sy.dart @@ -596,7 +596,7 @@ final Map ar_sy = { "Sign In by Google": "Sign In by Google", "Sign Out": "Sign Out", "Sign in with Google for easier email and name entry": "Sign in with Google for easier email and name entry", - "Siro Service": "سيرو سيرفس", + "Tripz Service": "تريبز سيرفس", "Sky Blue": "أزرق سماوي", "So go and gain your money": "So go and gain your money", "Speed Over": "Speed Over", diff --git a/dashboards/service/lib/controller/login_controller.dart b/dashboards/service/lib/controller/login_controller.dart index 4f898c9..61a4593 100644 --- a/dashboards/service/lib/controller/login_controller.dart +++ b/dashboards/service/lib/controller/login_controller.dart @@ -1,10 +1,10 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/constant/links.dart'; -import 'package:siro_service/controller/functions/crud.dart'; -import 'package:siro_service/controller/functions/device_helper.dart'; -import 'package:siro_service/controller/functions/encrypt_decrypt.dart'; +import 'package:tripz_service/constant/links.dart'; +import 'package:tripz_service/controller/functions/crud.dart'; +import 'package:tripz_service/controller/functions/device_helper.dart'; +import 'package:tripz_service/controller/functions/encrypt_decrypt.dart'; import '../constant/box_name.dart'; import '../main.dart'; diff --git a/dashboards/service/lib/controller/mainController/main_controller.dart b/dashboards/service/lib/controller/mainController/main_controller.dart index b4c36f6..97bdb32 100644 --- a/dashboards/service/lib/controller/mainController/main_controller.dart +++ b/dashboards/service/lib/controller/mainController/main_controller.dart @@ -2,12 +2,12 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/constant/colors.dart'; -import 'package:siro_service/constant/links.dart'; -import 'package:siro_service/controller/functions/crud.dart'; -import 'package:siro_service/controller/mainController/pages/driver_page.dart'; -import 'package:siro_service/main.dart'; -import 'package:siro_service/views/widgets/my_dialog.dart'; +import 'package:tripz_service/constant/colors.dart'; +import 'package:tripz_service/constant/links.dart'; +import 'package:tripz_service/controller/functions/crud.dart'; +import 'package:tripz_service/controller/mainController/pages/driver_page.dart'; +import 'package:tripz_service/main.dart'; +import 'package:tripz_service/views/widgets/my_dialog.dart'; import 'package:url_launcher/url_launcher.dart'; import '../../print.dart'; @@ -51,7 +51,7 @@ class MainController extends GetxController { void onInit() { super.onInit(); final country = box.read('countryCode')?.toString() ?? 'Jordan'; - Log.print('🌍 [SIRO-SERVICE-STARTUP] Current countryCode stored in box: $country'); + Log.print('🌍 [TRIPZ-SERVICE-STARTUP] Current countryCode stored in box: $country'); } Future refreshDashboardStats() async { diff --git a/dashboards/service/lib/controller/mainController/pages/add_car.dart b/dashboards/service/lib/controller/mainController/pages/add_car.dart index 35ec905..9188706 100644 --- a/dashboards/service/lib/controller/mainController/pages/add_car.dart +++ b/dashboards/service/lib/controller/mainController/pages/add_car.dart @@ -2,9 +2,9 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:siro_service/constant/style.dart'; -import 'package:siro_service/controller/functions/launch.dart'; -import 'package:siro_service/views/widgets/my_scafold.dart'; +import 'package:tripz_service/constant/style.dart'; +import 'package:tripz_service/controller/functions/launch.dart'; +import 'package:tripz_service/views/widgets/my_scafold.dart'; import '../../../constant/colors.dart'; import '../../../constant/links.dart'; diff --git a/dashboards/service/lib/controller/mainController/pages/alexandria_besr_driver.dart b/dashboards/service/lib/controller/mainController/pages/alexandria_besr_driver.dart index aeea290..fd170e6 100644 --- a/dashboards/service/lib/controller/mainController/pages/alexandria_besr_driver.dart +++ b/dashboards/service/lib/controller/mainController/pages/alexandria_besr_driver.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/views/widgets/my_scafold.dart'; +import 'package:tripz_service/views/widgets/my_scafold.dart'; import '../../best_driver_controllers.dart'; import '../../functions/encrypt_decrypt.dart'; diff --git a/dashboards/service/lib/controller/mainController/pages/best_driver_page.dart b/dashboards/service/lib/controller/mainController/pages/best_driver_page.dart index 846c233..7e1e84e 100644 --- a/dashboards/service/lib/controller/mainController/pages/best_driver_page.dart +++ b/dashboards/service/lib/controller/mainController/pages/best_driver_page.dart @@ -2,9 +2,9 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/views/widgets/mycircular.dart'; -import 'package:siro_service/controller/functions/encrypt_decrypt.dart'; -import 'package:siro_service/views/widgets/my_scafold.dart'; +import 'package:tripz_service/views/widgets/mycircular.dart'; +import 'package:tripz_service/controller/functions/encrypt_decrypt.dart'; +import 'package:tripz_service/views/widgets/my_scafold.dart'; import '../../../constant/colors.dart'; import '../../../constant/links.dart'; diff --git a/dashboards/service/lib/controller/mainController/pages/complaint.dart b/dashboards/service/lib/controller/mainController/pages/complaint.dart index 74e54c3..d64a7d0 100644 --- a/dashboards/service/lib/controller/mainController/pages/complaint.dart +++ b/dashboards/service/lib/controller/mainController/pages/complaint.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/views/widgets/my_scafold.dart'; +import 'package:tripz_service/views/widgets/my_scafold.dart'; class Complaint extends StatelessWidget { const Complaint({super.key}); diff --git a/dashboards/service/lib/controller/mainController/pages/driver_page.dart b/dashboards/service/lib/controller/mainController/pages/driver_page.dart index cc0a6b6..3bd006c 100644 --- a/dashboards/service/lib/controller/mainController/pages/driver_page.dart +++ b/dashboards/service/lib/controller/mainController/pages/driver_page.dart @@ -196,7 +196,7 @@ class DriverPage extends StatelessWidget { onTap: () => mainController.launchCommunication( 'whatsapp', phone, - 'أهلاً بك يا كابتن $name في سيرو! تم تفعيل حسابك بنجاح وأصبحت مستعداً لاستقبال الرحلات.', + 'أهلاً بك يا كابتن $name في تريبز! تم تفعيل حسابك بنجاح وأصبحت مستعداً لاستقبال الرحلات.', ), ), CupertinoListTile( @@ -214,7 +214,7 @@ class DriverPage extends StatelessWidget { onTap: () => mainController.launchCommunication( 'whatsapp', phone, - 'مرحباً كابتن $name، معك الدعم الفني من شركة سيرو. كيف يمكنني مساعدتك اليوم؟', + 'مرحباً كابتن $name، معك الدعم الفني من شركة تريبز. كيف يمكنني مساعدتك اليوم؟', ), ), diff --git a/dashboards/service/lib/controller/mainController/pages/drivers_cant_register.dart b/dashboards/service/lib/controller/mainController/pages/drivers_cant_register.dart index 7dbf62b..67c8546 100644 --- a/dashboards/service/lib/controller/mainController/pages/drivers_cant_register.dart +++ b/dashboards/service/lib/controller/mainController/pages/drivers_cant_register.dart @@ -1,11 +1,11 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/constant/colors.dart'; -import 'package:siro_service/controller/mainController/main_controller.dart'; -import 'package:siro_service/views/widgets/my_scafold.dart'; -import 'package:siro_service/main.dart'; -import 'package:siro_service/constant/box_name.dart'; +import 'package:tripz_service/constant/colors.dart'; +import 'package:tripz_service/controller/mainController/main_controller.dart'; +import 'package:tripz_service/views/widgets/my_scafold.dart'; +import 'package:tripz_service/main.dart'; +import 'package:tripz_service/constant/box_name.dart'; import 'review_driver_page.dart'; @@ -129,12 +129,12 @@ class DriversCantRegister extends StatelessWidget { color: const Color(0xFF25D366), onPressed: () { String message = "مرحباً،\n\n" - "يظهر لدينا في نظام تطبيق *سيرو* أنك لم تكمل عملية التسجيل بعد.\n" + "يظهر لدينا في نظام تطبيق *تريبز* أنك لم تكمل عملية التسجيل بعد.\n" "ندعوك لإكمال التسجيل للاستفادة من مزايا التطبيق والبدء بالعمل معنا.\n\n" "إذا احتجت لأي مساعدة، تواصل معنا على خدمة العملاء:\n" "+963 952 475 742\n\n" "+963 952 475 740\n\n" - "فريق سيرو يتمنى لك يوماً سعيداً."; + "فريق تريبز يتمنى لك يوماً سعيداً."; mainController.launchCommunication( 'whatsapp', diff --git a/dashboards/service/lib/controller/mainController/pages/edit_car.dart b/dashboards/service/lib/controller/mainController/pages/edit_car.dart index 1a3324d..86e5c2c 100644 --- a/dashboards/service/lib/controller/mainController/pages/edit_car.dart +++ b/dashboards/service/lib/controller/mainController/pages/edit_car.dart @@ -2,8 +2,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:siro_service/controller/mainController/main_controller.dart'; -import 'package:siro_service/views/widgets/my_scafold.dart'; +import 'package:tripz_service/controller/mainController/main_controller.dart'; +import 'package:tripz_service/views/widgets/my_scafold.dart'; import '../../../constant/colors.dart'; import '../../../constant/links.dart'; diff --git a/dashboards/service/lib/controller/mainController/pages/edit_car_plate.dart b/dashboards/service/lib/controller/mainController/pages/edit_car_plate.dart index 9dc8b29..c82596d 100644 --- a/dashboards/service/lib/controller/mainController/pages/edit_car_plate.dart +++ b/dashboards/service/lib/controller/mainController/pages/edit_car_plate.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/constant/style.dart'; -import 'package:siro_service/controller/mainController/pages/edit_car.dart'; -import 'package:siro_service/views/widgets/my_scafold.dart'; +import 'package:tripz_service/constant/style.dart'; +import 'package:tripz_service/controller/mainController/pages/edit_car.dart'; +import 'package:tripz_service/views/widgets/my_scafold.dart'; import '../../functions/encrypt_decrypt.dart'; import '../main_controller.dart'; diff --git a/dashboards/service/lib/controller/mainController/pages/giza_best_driver.dart b/dashboards/service/lib/controller/mainController/pages/giza_best_driver.dart index a5409cd..b8d764c 100644 --- a/dashboards/service/lib/controller/mainController/pages/giza_best_driver.dart +++ b/dashboards/service/lib/controller/mainController/pages/giza_best_driver.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/views/widgets/my_scafold.dart'; +import 'package:tripz_service/views/widgets/my_scafold.dart'; import '../../best_driver_controllers.dart'; import '../../functions/encrypt_decrypt.dart'; diff --git a/dashboards/service/lib/controller/mainController/pages/new_driver.dart b/dashboards/service/lib/controller/mainController/pages/new_driver.dart index bdb12d6..0c0b718 100644 --- a/dashboards/service/lib/controller/mainController/pages/new_driver.dart +++ b/dashboards/service/lib/controller/mainController/pages/new_driver.dart @@ -1,11 +1,11 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/constant/colors.dart'; +import 'package:tripz_service/constant/colors.dart'; // Importa tu nuevo controlador de servicio -import 'package:siro_service/controller/mainController/ragister_service_controller.dart'; -import 'package:siro_service/views/widgets/elevated_btn.dart'; -import 'package:siro_service/views/widgets/my_scafold.dart'; +import 'package:tripz_service/controller/mainController/ragister_service_controller.dart'; +import 'package:tripz_service/views/widgets/elevated_btn.dart'; +import 'package:tripz_service/views/widgets/my_scafold.dart'; // El import del antiguo controlador ya no es necesario // import '../registration_captain_controller.dart'; diff --git a/dashboards/service/lib/controller/mainController/pages/passengers_cant_regster.dart b/dashboards/service/lib/controller/mainController/pages/passengers_cant_regster.dart index b57282d..f785b6c 100644 --- a/dashboards/service/lib/controller/mainController/pages/passengers_cant_regster.dart +++ b/dashboards/service/lib/controller/mainController/pages/passengers_cant_regster.dart @@ -1,8 +1,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/controller/mainController/main_controller.dart'; -import 'package:siro_service/views/widgets/my_scafold.dart'; +import 'package:tripz_service/controller/mainController/main_controller.dart'; +import 'package:tripz_service/views/widgets/my_scafold.dart'; import '../../functions/encrypt_decrypt.dart'; diff --git a/dashboards/service/lib/controller/mainController/pages/passengers_page.dart b/dashboards/service/lib/controller/mainController/pages/passengers_page.dart index 106cad1..9779e92 100644 --- a/dashboards/service/lib/controller/mainController/pages/passengers_page.dart +++ b/dashboards/service/lib/controller/mainController/pages/passengers_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/constant/colors.dart'; -import 'package:siro_service/controller/mainController/main_controller.dart'; -import 'package:siro_service/views/widgets/my_scafold.dart'; +import 'package:tripz_service/constant/colors.dart'; +import 'package:tripz_service/controller/mainController/main_controller.dart'; +import 'package:tripz_service/views/widgets/my_scafold.dart'; class PassengersPage extends StatelessWidget { PassengersPage({super.key}); @@ -120,7 +120,7 @@ class PassengersPage extends StatelessWidget { onTap: () => mainController.launchCommunication( 'whatsapp', phone, - 'مرحباً $name، معك الدعم الفني من شركة سيرو. كيف يمكنني مساعدتك اليوم؟', + 'مرحباً $name، معك الدعم الفني من شركة تريبز. كيف يمكنني مساعدتك اليوم؟', ), isLast: true, ), diff --git a/dashboards/service/lib/controller/mainController/pages/registration_captain_page.dart b/dashboards/service/lib/controller/mainController/pages/registration_captain_page.dart index 698a4a5..7cfd0f2 100644 --- a/dashboards/service/lib/controller/mainController/pages/registration_captain_page.dart +++ b/dashboards/service/lib/controller/mainController/pages/registration_captain_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/constant/colors.dart'; -import 'package:siro_service/views/widgets/elevated_btn.dart'; -import 'package:siro_service/views/widgets/my_scafold.dart'; +import 'package:tripz_service/constant/colors.dart'; +import 'package:tripz_service/views/widgets/elevated_btn.dart'; +import 'package:tripz_service/views/widgets/my_scafold.dart'; import '../registration_captain_controller.dart'; diff --git a/dashboards/service/lib/controller/mainController/pages/review_driver_page.dart b/dashboards/service/lib/controller/mainController/pages/review_driver_page.dart index f894bd0..020114a 100644 --- a/dashboards/service/lib/controller/mainController/pages/review_driver_page.dart +++ b/dashboards/service/lib/controller/mainController/pages/review_driver_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/constant/colors.dart'; -import 'package:siro_service/controller/mainController/review_driver_controller.dart'; -import 'package:siro_service/views/widgets/elevated_btn.dart'; -import 'package:siro_service/views/widgets/my_scafold.dart'; +import 'package:tripz_service/constant/colors.dart'; +import 'package:tripz_service/controller/mainController/review_driver_controller.dart'; +import 'package:tripz_service/views/widgets/elevated_btn.dart'; +import 'package:tripz_service/views/widgets/my_scafold.dart'; class ReviewDriverPage extends StatelessWidget { const ReviewDriverPage({super.key}); diff --git a/dashboards/service/lib/controller/mainController/pages/ride_monitor_page.dart b/dashboards/service/lib/controller/mainController/pages/ride_monitor_page.dart index fb17c02..940924a 100644 --- a/dashboards/service/lib/controller/mainController/pages/ride_monitor_page.dart +++ b/dashboards/service/lib/controller/mainController/pages/ride_monitor_page.dart @@ -1,10 +1,10 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/views/widgets/mycircular.dart'; -import 'package:siro_service/constant/links.dart'; -import 'package:siro_service/controller/functions/crud.dart'; -import 'package:siro_service/views/widgets/my_scafold.dart'; +import 'package:tripz_service/views/widgets/mycircular.dart'; +import 'package:tripz_service/constant/links.dart'; +import 'package:tripz_service/controller/functions/crud.dart'; +import 'package:tripz_service/views/widgets/my_scafold.dart'; /// -------------------------------------------------------------------------- /// نموذج بيانات الرحلة diff --git a/dashboards/service/lib/controller/mainController/pages/welcome_call.dart b/dashboards/service/lib/controller/mainController/pages/welcome_call.dart index cab1627..b953743 100644 --- a/dashboards/service/lib/controller/mainController/pages/welcome_call.dart +++ b/dashboards/service/lib/controller/mainController/pages/welcome_call.dart @@ -1,11 +1,11 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/views/widgets/mycircular.dart'; -import 'package:siro_service/constant/colors.dart'; -import 'package:siro_service/constant/style.dart'; -import 'package:siro_service/views/widgets/elevated_btn.dart'; -import 'package:siro_service/views/widgets/my_scafold.dart'; +import 'package:tripz_service/views/widgets/mycircular.dart'; +import 'package:tripz_service/constant/colors.dart'; +import 'package:tripz_service/constant/style.dart'; +import 'package:tripz_service/views/widgets/elevated_btn.dart'; +import 'package:tripz_service/views/widgets/my_scafold.dart'; import '../main_controller.dart'; @@ -150,13 +150,13 @@ class DriverCard extends StatelessWidget { } String message = "مرحباً،\n\n" - "يعطيك العافية أستاذ. نرحب بك في شركة *سيرو* للنقل الذكي.\n" + "يعطيك العافية أستاذ. نرحب بك في شركة *تريبز* للنقل الذكي.\n" "نود تعريفك بالتطبيق ومميزاته لتتمكن من الاستفادة الكاملة وبدء العمل معنا بسهولة.\n\n" "لأي استفسار أو مساعدة، يمكنك التواصل معنا على الأرقام التالية:\n\n" "+963 952 475 742\n" "+963 952 475 740\n" "+963 952 475 734\n\n" - "فريق سيرو يتمنى لك تجربة موفقة ويوم سعيد."; + "فريق تريبز يتمنى لك تجربة موفقة ويوم سعيد."; Get.find().launchCommunication( 'whatsapp', diff --git a/dashboards/service/lib/controller/mainController/ragister_service_controller.dart b/dashboards/service/lib/controller/mainController/ragister_service_controller.dart index 97c6c2a..9a381b7 100644 --- a/dashboards/service/lib/controller/mainController/ragister_service_controller.dart +++ b/dashboards/service/lib/controller/mainController/ragister_service_controller.dart @@ -4,13 +4,13 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:siro_service/constant/box_name.dart'; -import 'package:siro_service/constant/links.dart'; -import 'package:siro_service/controller/functions/crud.dart'; -import 'package:siro_service/main.dart'; -import 'package:siro_service/print.dart'; -import 'package:siro_service/views/widgets/my_dialog.dart'; -import 'package:siro_service/views/widgets/mycircular.dart'; +import 'package:tripz_service/constant/box_name.dart'; +import 'package:tripz_service/constant/links.dart'; +import 'package:tripz_service/controller/functions/crud.dart'; +import 'package:tripz_service/main.dart'; +import 'package:tripz_service/print.dart'; +import 'package:tripz_service/views/widgets/my_dialog.dart'; +import 'package:tripz_service/views/widgets/mycircular.dart'; import 'pages/registration_captain_page.dart'; @@ -71,7 +71,7 @@ class RegisterCaptainServiceController extends GetxController { void _initializeDocUrls() { const baseUrl = - "https://syria.intaleq.xyz/siro/auth/syria/driversDocs/syria.intaleq.xyz-"; + "https://syria.tripz.xyz/tripz/auth/syria/driversDocs/syria.tripz.xyz-"; docUrls['driver_license_front']!.value = "$baseUrl${driverId.value}-driver_license_front.jpg"; docUrls['driver_license_back']!.value = diff --git a/dashboards/service/lib/controller/mainController/registration_captain_controller.dart b/dashboards/service/lib/controller/mainController/registration_captain_controller.dart index ec2362e..80b46fb 100644 --- a/dashboards/service/lib/controller/mainController/registration_captain_controller.dart +++ b/dashboards/service/lib/controller/mainController/registration_captain_controller.dart @@ -3,13 +3,13 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:siro_service/constant/box_name.dart'; -import 'package:siro_service/constant/links.dart'; -import 'package:siro_service/controller/functions/crud.dart'; -import 'package:siro_service/main.dart'; -import 'package:siro_service/print.dart'; -import 'package:siro_service/views/widgets/my_dialog.dart'; -import 'package:siro_service/views/widgets/mycircular.dart'; +import 'package:tripz_service/constant/box_name.dart'; +import 'package:tripz_service/constant/links.dart'; +import 'package:tripz_service/controller/functions/crud.dart'; +import 'package:tripz_service/main.dart'; +import 'package:tripz_service/print.dart'; +import 'package:tripz_service/views/widgets/my_dialog.dart'; +import 'package:tripz_service/views/widgets/mycircular.dart'; import 'pages/registration_captain_page.dart'; @@ -70,7 +70,7 @@ class RegisterCaptainController extends GetxController { void _initializeDocUrls() { const baseUrl = - "https://syria.intaleq.xyz/siro/auth/syria/driversDocs/syria.intaleq.xyz-"; + "https://syria.tripz.xyz/tripz/auth/syria/driversDocs/syria.tripz.xyz-"; docUrls['driver_license_front']!.value = "$baseUrl${driverId.value}-driver_license_front.jpg"; docUrls['driver_license_back']!.value = diff --git a/dashboards/service/lib/controller/mainController/review_driver_controller.dart b/dashboards/service/lib/controller/mainController/review_driver_controller.dart index 43e3179..70ea7c2 100644 --- a/dashboards/service/lib/controller/mainController/review_driver_controller.dart +++ b/dashboards/service/lib/controller/mainController/review_driver_controller.dart @@ -2,10 +2,10 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:siro_service/constant/links.dart'; -import 'package:siro_service/controller/functions/crud.dart'; -import 'package:siro_service/main.dart'; -import 'package:siro_service/views/widgets/mycircular.dart'; +import 'package:tripz_service/constant/links.dart'; +import 'package:tripz_service/controller/functions/crud.dart'; +import 'package:tripz_service/main.dart'; +import 'package:tripz_service/views/widgets/mycircular.dart'; class ReviewDriverController extends GetxController { var isLoading = true.obs; @@ -252,7 +252,7 @@ class ReviewDriverController extends GetxController { String reconstructDocumentUrl(String originalLink, String docType) { if (originalLink.isEmpty) { - return "${AppLink.server}/auth/syria/driversDocs/syria.intaleq.xyz-${driverId.value}-$docType.jpg"; + return "${AppLink.server}/auth/syria/driversDocs/syria.tripz.xyz-${driverId.value}-$docType.jpg"; } try { diff --git a/dashboards/service/lib/env/env.dart b/dashboards/service/lib/env/env.dart index 0b2e7c4..85a9636 100644 --- a/dashboards/service/lib/env/env.dart +++ b/dashboards/service/lib/env/env.dart @@ -7,9 +7,10 @@ abstract class Env { @EnviedField(varName: 'addd', obfuscate: true) static final String addd = _Env.addd; - @EnviedField(varName: 'getapiKey', obfuscate: true) + @EnviedField(varName: 'getapiKey', obfuscate: true, defaultValue: 'DEFAULT_KEY') static final String getapiKey = _Env.getapiKey; + @EnviedField(varName: 'passnpassenger', obfuscate: true) static final String passnpassenger = _Env.passnpassenger; diff --git a/dashboards/service/lib/firebase_options.dart b/dashboards/service/lib/firebase_options.dart index cc059ab..de892dc 100644 --- a/dashboards/service/lib/firebase_options.dart +++ b/dashboards/service/lib/firebase_options.dart @@ -53,15 +53,15 @@ class DefaultFirebaseOptions { apiKey: 'AIzaSyAEoply_UcEP6KaCu_ziCy_ZDIjAKvi7b8', appId: '1:825988584191:android:be08180beef7d65e1632ca', messagingSenderId: '825988584191', - projectId: 'siro-a6957', - storageBucket: 'siro-a6957.firebasestorage.app', + projectId: 'tripz-a6957', + storageBucket: 'tripz-a6957.firebasestorage.app', ); static const FirebaseOptions ios = FirebaseOptions( apiKey: 'AIzaSyDk6x6KZUY0IQtxoCMXX0F7N_yik8O19eA', appId: '1:825988584191:ios:9d50158dc7a09e851632ca', messagingSenderId: '825988584191', - projectId: 'siro-a6957', - storageBucket: 'siro-a6957.firebasestorage.app', - iosBundleId: 'com.siro.service', + projectId: 'tripz-a6957', + storageBucket: 'tripz-a6957.firebasestorage.app', + iosBundleId: 'com.tripz.service', ); } diff --git a/dashboards/service/lib/login_page.dart b/dashboards/service/lib/login_page.dart index fdace61..ffc59dc 100644 --- a/dashboards/service/lib/login_page.dart +++ b/dashboards/service/lib/login_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/constant/colors.dart'; -import 'package:siro_service/views/auth/register_page.dart'; -import 'package:siro_service/views/widgets/my_textField.dart'; +import 'package:tripz_service/constant/colors.dart'; +import 'package:tripz_service/views/auth/register_page.dart'; +import 'package:tripz_service/views/widgets/my_textField.dart'; import 'controller/login_controller.dart'; class LoginPage extends StatelessWidget { @@ -55,7 +55,7 @@ class LoginPage extends StatelessWidget { const SizedBox(height: 24), Center( child: Text( - 'Siro Service'.tr, + 'Tripz Service'.tr, style: TextStyle( fontSize: 28, fontWeight: FontWeight.bold, diff --git a/dashboards/service/lib/main.dart b/dashboards/service/lib/main.dart index 8cb813e..cba40f7 100644 --- a/dashboards/service/lib/main.dart +++ b/dashboards/service/lib/main.dart @@ -5,9 +5,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:get/get.dart'; import 'package:get_storage/get_storage.dart'; -import 'package:siro_service/controller/firbase_messge.dart'; -import 'package:siro_service/controller/functions/session_manager.dart'; -import 'package:siro_service/firebase_options.dart'; +import 'package:tripz_service/controller/firbase_messge.dart'; +import 'package:tripz_service/controller/functions/session_manager.dart'; +import 'package:tripz_service/firebase_options.dart'; import 'controller/functions/encrypt_decrypt.dart'; import 'controller/local/local_controller.dart'; diff --git a/dashboards/service/lib/views/auth/register_page.dart b/dashboards/service/lib/views/auth/register_page.dart index 47a9d1e..eb9ac77 100644 --- a/dashboards/service/lib/views/auth/register_page.dart +++ b/dashboards/service/lib/views/auth/register_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/constant/colors.dart'; -import 'package:siro_service/controller/auth/register_controller.dart'; -import 'package:siro_service/views/widgets/my_textField.dart'; +import 'package:tripz_service/constant/colors.dart'; +import 'package:tripz_service/controller/auth/register_controller.dart'; +import 'package:tripz_service/views/widgets/my_textField.dart'; class RegisterPage extends StatelessWidget { const RegisterPage({super.key}); diff --git a/dashboards/service/lib/views/home/main.dart b/dashboards/service/lib/views/home/main.dart index 47f6fd3..773a683 100644 --- a/dashboards/service/lib/views/home/main.dart +++ b/dashboards/service/lib/views/home/main.dart @@ -1,16 +1,16 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:siro_service/constant/colors.dart'; -import 'package:siro_service/constant/links.dart'; -import 'package:siro_service/controller/functions/crud.dart'; -import 'package:siro_service/controller/mainController/main_controller.dart'; -import 'package:siro_service/controller/mainController/pages/best_driver_page.dart'; -import 'package:siro_service/controller/mainController/pages/complaint.dart'; -import 'package:siro_service/controller/mainController/pages/edit_car_plate.dart'; -import 'package:siro_service/controller/mainController/pages/passengers_cant_regster.dart'; -import 'package:siro_service/views/widgets/elevated_btn.dart'; -import 'package:siro_service/views/widgets/my_dialog.dart'; -import 'package:siro_service/views/widgets/my_textField.dart'; +import 'package:tripz_service/constant/colors.dart'; +import 'package:tripz_service/constant/links.dart'; +import 'package:tripz_service/controller/functions/crud.dart'; +import 'package:tripz_service/controller/mainController/main_controller.dart'; +import 'package:tripz_service/controller/mainController/pages/best_driver_page.dart'; +import 'package:tripz_service/controller/mainController/pages/complaint.dart'; +import 'package:tripz_service/controller/mainController/pages/edit_car_plate.dart'; +import 'package:tripz_service/controller/mainController/pages/passengers_cant_regster.dart'; +import 'package:tripz_service/views/widgets/elevated_btn.dart'; +import 'package:tripz_service/views/widgets/my_dialog.dart'; +import 'package:tripz_service/views/widgets/my_textField.dart'; import '../../constant/style.dart'; import '../../controller/mainController/pages/ride_monitor_page.dart'; @@ -30,7 +30,7 @@ class Main extends StatelessWidget { @override Widget build(BuildContext context) { - return MyScaffold(title: 'Siro Service'.tr, isleading: false, body: [ + return MyScaffold(title: 'Tripz Service'.tr, isleading: false, body: [ Container( color: AppColor.surfaceColor, child: SingleChildScrollView( diff --git a/dashboards/service/linux/CMakeLists.txt b/dashboards/service/linux/CMakeLists.txt index 92dc9b1..b8809fa 100644 --- a/dashboards/service/linux/CMakeLists.txt +++ b/dashboards/service/linux/CMakeLists.txt @@ -4,10 +4,10 @@ project(runner LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "siro_service") +set(BINARY_NAME "tripz_service") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.siro.siro_service") +set(APPLICATION_ID "com.tripz.tripz_service") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/dashboards/service/linux/runner/my_application.cc b/dashboards/service/linux/runner/my_application.cc index 96718a8..32303cb 100644 --- a/dashboards/service/linux/runner/my_application.cc +++ b/dashboards/service/linux/runner/my_application.cc @@ -45,11 +45,11 @@ static void my_application_activate(GApplication* application) { if (use_header_bar) { GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); gtk_widget_show(GTK_WIDGET(header_bar)); - gtk_header_bar_set_title(header_bar, "siro_service"); + gtk_header_bar_set_title(header_bar, "tripz_service"); gtk_header_bar_set_show_close_button(header_bar, TRUE); gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); } else { - gtk_window_set_title(window, "siro_service"); + gtk_window_set_title(window, "tripz_service"); } gtk_window_set_default_size(window, 1280, 720); diff --git a/dashboards/service/macos/Runner.xcodeproj/project.pbxproj b/dashboards/service/macos/Runner.xcodeproj/project.pbxproj index 6bcadd5..a703198 100644 --- a/dashboards/service/macos/Runner.xcodeproj/project.pbxproj +++ b/dashboards/service/macos/Runner.xcodeproj/project.pbxproj @@ -64,7 +64,7 @@ 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* service_siro.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "service_siro.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* service_tripz.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "service_tripz.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; @@ -131,7 +131,7 @@ 33CC10EE2044A3C60003C045 /* Products */ = { isa = PBXGroup; children = ( - 33CC10ED2044A3C60003C045 /* service_siro.app */, + 33CC10ED2044A3C60003C045 /* service_tripz.app */, 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, ); name = Products; @@ -217,7 +217,7 @@ ); name = Runner; productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* service_siro.app */; + productReference = 33CC10ED2044A3C60003C045 /* service_tripz.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -385,10 +385,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceSiro.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceTripz.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/service_siro.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/service_siro"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/service_tripz.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/service_tripz"; }; name = Debug; }; @@ -399,10 +399,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceSiro.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceTripz.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/service_siro.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/service_siro"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/service_tripz.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/service_tripz"; }; name = Release; }; @@ -413,10 +413,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceSiro.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceTripz.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/service_siro.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/service_siro"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/service_tripz.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/service_tripz"; }; name = Profile; }; diff --git a/dashboards/service/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/dashboards/service/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 64dac9b..df73e8b 100644 --- a/dashboards/service/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/dashboards/service/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -15,7 +15,7 @@ @@ -31,7 +31,7 @@ @@ -66,7 +66,7 @@ @@ -83,7 +83,7 @@ diff --git a/dashboards/service/macos/Runner/Configs/AppInfo.xcconfig b/dashboards/service/macos/Runner/Configs/AppInfo.xcconfig index 95b015e..80658c1 100644 --- a/dashboards/service/macos/Runner/Configs/AppInfo.xcconfig +++ b/dashboards/service/macos/Runner/Configs/AppInfo.xcconfig @@ -5,10 +5,10 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = service_siro +PRODUCT_NAME = service_tripz // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceSiro +PRODUCT_BUNDLE_IDENTIFIER = com.example.serviceTripz // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2025 com.example. All rights reserved. diff --git a/dashboards/service/pubspec.lock b/dashboards/service/pubspec.lock index 87e2c93..b81db1e 100644 --- a/dashboards/service/pubspec.lock +++ b/dashboards/service/pubspec.lock @@ -804,10 +804,10 @@ packages: dependency: transitive description: name: matcher - sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 + sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6" url: "https://pub.dev" source: hosted - version: "0.12.19" + version: "0.12.18" material_color_utilities: dependency: transitive description: @@ -820,10 +820,10 @@ packages: dependency: transitive description: name: meta - sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.17.0" mime: dependency: transitive description: @@ -1168,10 +1168,10 @@ packages: dependency: transitive description: name: test_api - sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" + sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636" url: "https://pub.dev" source: hosted - version: "0.7.11" + version: "0.7.9" timezone: dependency: transitive description: @@ -1365,5 +1365,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.10.0-0 <4.0.0" + dart: ">=3.9.0-0 <4.0.0" flutter: ">=3.32.0" diff --git a/dashboards/service/pubspec.yaml b/dashboards/service/pubspec.yaml index 077b4b8..292976c 100644 --- a/dashboards/service/pubspec.yaml +++ b/dashboards/service/pubspec.yaml @@ -1,4 +1,4 @@ -name: siro_service +name: tripz_service description: "A new Flutter project." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. diff --git a/dashboards/service/web/index.html b/dashboards/service/web/index.html index f0c202f..f14123c 100644 --- a/dashboards/service/web/index.html +++ b/dashboards/service/web/index.html @@ -23,13 +23,13 @@ - + - service_siro + service_tripz diff --git a/dashboards/service/web/manifest.json b/dashboards/service/web/manifest.json index af37f6e..d1b7aae 100644 --- a/dashboards/service/web/manifest.json +++ b/dashboards/service/web/manifest.json @@ -1,6 +1,6 @@ { - "name": "service_siro", - "short_name": "service_siro", + "name": "service_tripz", + "short_name": "service_tripz", "start_url": ".", "display": "standalone", "background_color": "#hexcode", diff --git a/dashboards/service/windows/CMakeLists.txt b/dashboards/service/windows/CMakeLists.txt index b7dc960..822f4e1 100644 --- a/dashboards/service/windows/CMakeLists.txt +++ b/dashboards/service/windows/CMakeLists.txt @@ -1,10 +1,10 @@ # Project-level configuration. cmake_minimum_required(VERSION 3.14) -project(siro_service LANGUAGES CXX) +project(tripz_service LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "siro_service") +set(BINARY_NAME "tripz_service") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/dashboards/service/windows/runner/Runner.rc b/dashboards/service/windows/runner/Runner.rc index 1c502b3..31714dc 100644 --- a/dashboards/service/windows/runner/Runner.rc +++ b/dashboards/service/windows/runner/Runner.rc @@ -89,13 +89,13 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "CompanyName", "com.siro" "\0" - VALUE "FileDescription", "siro_service" "\0" + VALUE "CompanyName", "com.tripz" "\0" + VALUE "FileDescription", "tripz_service" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "siro_service" "\0" - VALUE "LegalCopyright", "Copyright (C) 2026 com.siro. All rights reserved." "\0" - VALUE "OriginalFilename", "siro_service.exe" "\0" - VALUE "ProductName", "siro_service" "\0" + VALUE "InternalName", "tripz_service" "\0" + VALUE "LegalCopyright", "Copyright (C) 2026 com.tripz. All rights reserved." "\0" + VALUE "OriginalFilename", "tripz_service.exe" "\0" + VALUE "ProductName", "tripz_service" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" END END diff --git a/dashboards/service/windows/runner/main.cpp b/dashboards/service/windows/runner/main.cpp index 0c115d4..cf1816c 100644 --- a/dashboards/service/windows/runner/main.cpp +++ b/dashboards/service/windows/runner/main.cpp @@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); - if (!window.Create(L"siro_service", origin, size)) { + if (!window.Create(L"tripz_service", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true); diff --git a/docker/.env.example b/docker/.env.example index 602fcf7..bee3608 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -4,8 +4,8 @@ # --- 1. Core Settings --- PHP_VERSION=8.2 -HTTP_PORT=8181 -APP_DOMAIN=jordan-siro.intaleqapp.com +HTTP_PORT=8083 +APP_DOMAIN=api.tripz-egypt.com APP_ISSUER=SiroApp APP_DEBUG=true APP_COUNTRY=Jordan diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 46e1fc1..f3ff9c4 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -8,13 +8,13 @@ # التشغيل: docker compose up -d --build (انظر README.md) # ============================================================ -name: siro +name: tripz services: nginx: image: nginx:1.27-alpine ports: - - "${HTTP_PORT:-8080}:80" + - "${HTTP_PORT:-8083}:80" volumes: - ./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro - ../backend:/var/www/backend:ro diff --git a/rename_brand.py b/rename_brand.py new file mode 100644 index 0000000..0ddb61b --- /dev/null +++ b/rename_brand.py @@ -0,0 +1,89 @@ +import os + +# Target directories relative to script +TARGET_DIRS = ["dashboards/admin", "dashboards/service"] + +# Text replacements +REPLACEMENTS = { + "Siro": "Tripz", + "siro": "tripz", + "SIRO": "TRIPZ", + "Intaleq": "Tripz", + "intaleq": "tripz", + "INTALEQ": "TRIPZ", + "سيرو": "تريبز", + "انطلق": "تريبز" +} + +# Directories and files to ignore +IGNORE_DIRS = { + ".git", ".dart_tool", "build", "Pods", ".symlinks", ".pub-cache", + "node_modules", "vendor", ".gradle", "xcuserdata", ".idea" +} + +IGNORE_EXTS = { + ".png", ".jpg", ".jpeg", ".gif", ".webp", ".ttf", ".otf", ".woff", ".woff2", + ".mp3", ".mp4", ".mov", ".zip", ".tar", ".gz", ".pdf", ".so", ".dylib", ".dll", + ".class", ".jar", ".keystore", ".jks", ".dex", ".o", ".a" +} + +def rename_files_and_dirs(root_dir): + # Pass 1: Rename files and directories bottom-up + for root, dirs, files in os.walk(root_dir, topdown=False): + # Skip if in ignored directory path + if any(ignored in root.split(os.sep) for ignored in IGNORE_DIRS): + continue + + for name in files + dirs: + new_name = name + for old, new in REPLACEMENTS.items(): + # For filenames, mostly focus on english names + if old in ["Siro", "siro", "SIRO", "Intaleq", "intaleq", "INTALEQ"]: + new_name = new_name.replace(old, new) + + if new_name != name: + old_path = os.path.join(root, name) + new_path = os.path.join(root, new_name) + print(f"Renaming: {old_path} -> {new_path}") + os.rename(old_path, new_path) + +def replace_in_files(root_dir): + for root, dirs, files in os.walk(root_dir): + # Modify dirs in-place to skip ignored directories + dirs[:] = [d for d in dirs if d not in IGNORE_DIRS] + + for file in files: + ext = os.path.splitext(file)[1].lower() + if ext in IGNORE_EXTS: + continue + + file_path = os.path.join(root, file) + + try: + with open(file_path, 'r', encoding='utf-8') as f: + content = f.read() + except UnicodeDecodeError: + # Might be a binary file without known extension, skip it + continue + except Exception as e: + print(f"Could not read {file_path}: {e}") + continue + + new_content = content + for old, new in REPLACEMENTS.items(): + new_content = new_content.replace(old, new) + + if new_content != content: + print(f"Updating content in: {file_path}") + with open(file_path, 'w', encoding='utf-8') as f: + f.write(new_content) + +if __name__ == "__main__": + for d in TARGET_DIRS: + print(f"Processing {d}...") + abs_d = os.path.join("/Users/hamzaaleghwairyeen/development/App/Tripz", d) + if os.path.exists(abs_d): + rename_files_and_dirs(abs_d) + replace_in_files(abs_d) + + print("Replacement complete.") diff --git a/sync-to-server.sh b/sync-to-server.sh index d9f86f2..572495d 100755 --- a/sync-to-server.sh +++ b/sync-to-server.sh @@ -15,6 +15,6 @@ git push origin main echo "==> تمت عملية الرفع بنجاح!" echo "الآن يمكنك الذهاب إلى تيرمينال السيرفر وتشغيل الأوامر التالية:" -echo " cd /home/tripz-llc" +echo " cd /home/tripz-egypt-api/htdocs/api.tripz-egypt.com/tripz" echo " git pull origin main" -echo " cd backend && docker compose up -d --build" +echo " cd docker && docker compose up -d --build"