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

إضافة الهوية الجديدة Tripz

Browse Source
This commit is contained in:
Hamza-Ayed
2026-07-29 02:31:04 +03:00
parent ecbe245b77
commit b9a97effe5
634 changed files with 5149 additions and 5294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/rider/lib/views/home/HomePage/about_page.dart
+2 -2
View File
@@ -28,7 +28,7 @@ class AboutPage extends StatelessWidget {
// Company Name and Introduction
Text(
'Siro LLC',
'Tripz LLC',
style: CupertinoTheme.of(context).textTheme.navTitleTextStyle,
textAlign: TextAlign.center,
),
@@ -43,7 +43,7 @@ class AboutPage extends StatelessWidget {
// Key Features Section
Text(
'Why Choose Siro?'.tr,
'Why Choose Tripz?'.tr,
style: CupertinoTheme.of(context).textTheme.navTitleTextStyle,
textAlign: TextAlign.center,
),
apps/rider/lib/views/home/HomePage/contact_us.dart
+7 -7
View File
@@ -1,6 +1,6 @@
import 'package:siro_rider/constant/colors.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/views/widgets/my_scafold.dart';
import 'package:tripz_rider/constant/colors.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/views/widgets/my_scafold.dart';
import 'package:flutter/material.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
import 'package:get/get.dart';
@@ -107,7 +107,7 @@ class ContactUsPage extends StatelessWidget {
),
const SizedBox(height: 16),
Text(
"Siro Support".tr,
"Tripz Support".tr,
style: AppStyle.headTitle2.copyWith(
fontSize: 22,
fontWeight: FontWeight.bold,
@@ -229,7 +229,7 @@ class ContactUsPage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"About Siro".tr,
"About Tripz".tr,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 18,
@@ -239,7 +239,7 @@ class ContactUsPage extends StatelessWidget {
IconButton(
onPressed: () {
Get.find<TextToSpeechController>().speakText(
'Siro is the safest and most reliable ride-sharing app designed especially for passengers in Syria. We provide a comfortable, respectful, and affordable riding experience with features that prioritize your safety and convenience.'
'Tripz is the safest and most reliable ride-sharing app designed especially for passengers in Syria. We provide a comfortable, respectful, and affordable riding experience with features that prioritize your safety and convenience.'
.tr,
);
},
@@ -249,7 +249,7 @@ class ContactUsPage extends StatelessWidget {
),
const SizedBox(height: 12),
Text(
'Siro is the safest and most reliable ride-sharing app designed especially for passengers in Syria. We provide a comfortable, respectful, and affordable riding experience with features that prioritize your safety and convenience. Our trusted captains are verified, insured, and supported by regular car maintenance carried out by top engineers. We also offer on-road support services to make sure every trip is smooth and worry-free. With Siro, you enjoy quality, safety, and peace of mind—every time you ride.'
'Tripz is the safest and most reliable ride-sharing app designed especially for passengers in Syria. We provide a comfortable, respectful, and affordable riding experience with features that prioritize your safety and convenience. Our trusted captains are verified, insured, and supported by regular car maintenance carried out by top engineers. We also offer on-road support services to make sure every trip is smooth and worry-free. With Tripz, you enjoy quality, safety, and peace of mind—every time you ride.'
.tr,
style: TextStyle(
color: isDark ? Colors.white70 : Colors.black54,
apps/rider/lib/views/home/HomePage/frequentlyQuestionsPage.dart
+7 -7
View File
@@ -1,4 +1,4 @@
import 'package:siro_rider/views/home/HomePage/contact_us.dart';
import 'package:tripz_rider/views/home/HomePage/contact_us.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
@@ -56,7 +56,7 @@ class FrequentlyQuestionsPage extends StatelessWidget {
onTap: () => _showAnswerDialog(
context,
'How do I request a ride?'.tr,
'Simply open the Siro app, enter your destination, and tap "Request Ride". The app will connect you with a nearby driver.'
'Simply open the Tripz app, enter your destination, and tap "Request Ride". The app will connect you with a nearby driver.'
.tr,
),
),
@@ -78,7 +78,7 @@ class FrequentlyQuestionsPage extends StatelessWidget {
onTap: () => _showAnswerDialog(
context,
'What types of vehicles are available?'.tr,
'Siro offers a variety of options including Economy, Comfort, and Luxury to suit your needs and budget.'
'Tripz offers a variety of options including Economy, Comfort, and Luxury to suit your needs and budget.'
.tr,
),
),
@@ -149,7 +149,7 @@ class FrequentlyQuestionsPage extends StatelessWidget {
fontWeight: FontWeight.bold,
color: Colors.indigo)),
content: Text(
'To register as a driver or learn about the requirements, please visit our website or contact Siro support directly.'
'To register as a driver or learn about the requirements, please visit our website or contact Tripz support directly.'
.tr),
actions: <CupertinoDialogAction>[
CupertinoDialogAction(
@@ -208,12 +208,12 @@ class FrequentlyQuestionsPage extends StatelessWidget {
CupertinoIcons.shield_fill,
color: Colors.teal,
),
title: Text('What safety measures does Siro offer?'.tr),
title: Text('What safety measures does Tripz offer?'.tr),
trailing: const CupertinoListTileChevron(),
onTap: () => _showAnswerDialog(
context,
'What safety measures does Siro offer?'.tr,
'Siro offers various safety features including driver verification, in-app trip tracking, emergency contact options, and the ability to share your trip status with trusted contacts.'
'What safety measures does Tripz offer?'.tr,
'Tripz offers various safety features including driver verification, in-app trip tracking, emergency contact options, and the ability to share your trip status with trusted contacts.'
.tr,
),
),
apps/rider/lib/views/home/HomePage/share_app_page.dart
+1 -1
View File
@@ -744,7 +744,7 @@ class ShareAppPage extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
borderRadius: BorderRadius.circular(8),
onPressed: () {
final appName = 'Siro';
final appName = 'Tripz';
final shareText = 'Get a ride with $appName! Use my referral code: ${rc.referralCode} for a discount.\nDownload: ${AppLink.inviteRedirectUrl}?code=${rc.referralCode}&app=rider\n\n💡 Note: If the link is not clickable, save this number or reply to activate links!';
Share.share(shareText);
},
apps/rider/lib/views/home/HomePage/trip_monitor/trip_link_monitor.dart
+3 -3
View File
@@ -1,7 +1,7 @@
import 'dart:io';
import 'package:siro_rider/controller/home/trip_monitor_controller.dart';
import 'package:siro_rider/env/env.dart';
import 'package:siro_rider/views/widgets/my_scafold.dart';
import 'package:tripz_rider/controller/home/trip_monitor_controller.dart';
import 'package:tripz_rider/env/env.dart';
import 'package:tripz_rider/views/widgets/my_scafold.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
apps/rider/lib/views/home/HomePage/trip_monitor/trip_monitor.dart
+3 -3
View File
@@ -1,8 +1,8 @@
import 'dart:io';
import 'package:siro_rider/controller/home/trip_monitor_controller.dart';
import 'package:siro_rider/env/env.dart';
import 'package:siro_rider/views/widgets/my_scafold.dart';
import 'package:tripz_rider/controller/home/trip_monitor_controller.dart';
import 'package:tripz_rider/env/env.dart';
import 'package:tripz_rider/views/widgets/my_scafold.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
apps/rider/lib/views/home/drawer_menu_page.dart
+1 -1
View File
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:siro_rider/constant/colors.dart';
import 'package:tripz_rider/constant/colors.dart';
class DrawerMenuPage extends StatelessWidget {
const DrawerMenuPage({super.key});
apps/rider/lib/views/home/map_page_passenger.dart
+1 -1
View File
@@ -113,7 +113,7 @@ class AttributionMap extends StatelessWidget {
),
const SizedBox(width: 4),
Text(
"Intaleq Maps",
"Tripz Maps",
style: TextStyle(
fontSize: 9,
color: Colors.grey.shade500,
apps/rider/lib/views/home/map_widget.dart/apply_order_widget.dart
+8 -8
View File
@@ -1,10 +1,10 @@
import 'package:siro_rider/constant/currency.dart';
import 'package:siro_rider/constant/colors.dart';
import 'package:siro_rider/constant/links.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/controller/home/map/ride_lifecycle_controller.dart';
import 'package:siro_rider/controller/home/map/ride_state.dart';
import 'package:siro_rider/controller/voice_call_controller.dart';
import 'package:tripz_rider/constant/currency.dart';
import 'package:tripz_rider/constant/colors.dart';
import 'package:tripz_rider/constant/links.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/controller/home/map/ride_lifecycle_controller.dart';
import 'package:tripz_rider/controller/home/map/ride_state.dart';
import 'package:tripz_rider/controller/voice_call_controller.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
@@ -47,7 +47,7 @@ class ApplyOrderWidget extends StatelessWidget {
bottom: isVisible ? 0 : -400,
left: 0,
right: 0,
child: SiroSheetSurface(
child: TripzSheetSurface(
color: Theme.of(context).cardColor,
padding: const EdgeInsets.fromLTRB(
AppSpacing.lg, AppSpacing.sm, AppSpacing.lg, AppSpacing.lg),
apps/rider/lib/views/home/map_widget.dart/cancel_raide_page.dart
+3 -3
View File
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/colors.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/controller/home/map/ride_lifecycle_controller.dart';
import 'package:tripz_rider/constant/colors.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/controller/home/map/ride_lifecycle_controller.dart';
import '../../widgets/elevated_btn.dart';
// دالة لإظهار الشيت
apps/rider/lib/views/home/map_widget.dart/car_details_widget_to_go.dart
+9 -9
View File
@@ -1,13 +1,13 @@
import 'package:siro_rider/constant/currency.dart';
import 'package:tripz_rider/constant/currency.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/box_name.dart';
import 'package:siro_rider/constant/colors.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/main.dart';
import 'package:siro_rider/views/home/profile/passenger_profile_page.dart';
import 'package:siro_rider/views/widgets/elevated_btn.dart';
import 'package:siro_rider/views/widgets/my_textField.dart';
import 'package:tripz_rider/constant/box_name.dart';
import 'package:tripz_rider/constant/colors.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/main.dart';
import 'package:tripz_rider/views/home/profile/passenger_profile_page.dart';
import 'package:tripz_rider/views/widgets/elevated_btn.dart';
import 'package:tripz_rider/views/widgets/my_textField.dart';
import 'dart:ui';
import '../../../constant/design.dart';
@@ -142,7 +142,7 @@ class CarDetailsTypeToChoose extends StatelessWidget {
// ── Drag Handle ──────────────────────────────────────
const Padding(
padding: EdgeInsets.only(top: AppSpacing.sm),
child: SiroSheetHandle(),
child: TripzSheetHandle(),
),
AppSpacing.vGapXs,
apps/rider/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart
+5 -5
View File
@@ -1,9 +1,9 @@
import 'package:siro_rider/constant/currency.dart';
import 'package:tripz_rider/constant/currency.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/box_name.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/views/home/my_wallet/passenger_wallet.dart';
import 'package:tripz_rider/constant/box_name.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/views/home/my_wallet/passenger_wallet.dart';
import '../../../constant/colors.dart';
import '../../../constant/design.dart';
@@ -31,7 +31,7 @@ class CashConfirmPageShown extends StatelessWidget {
// التحكم في ظهور اللوحة لم يتغير
transform: Matrix4.translationValues(
0, controller.isCashConfirmPageShown ? 0 : Get.height, 0),
child: SiroSheetSurface(
child: TripzSheetSurface(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
apps/rider/lib/views/home/map_widget.dart/google_map_passenger_widget.dart
+4 -4
View File
@@ -1,10 +1,10 @@
import 'package:siro_rider/print.dart';
import 'package:tripz_rider/print.dart';
import 'package:flutter/material.dart';
import 'package:siro_rider/env/env.dart';
import 'package:tripz_rider/env/env.dart';
import 'package:get/get.dart';
import 'package:intaleq_maps/intaleq_maps.dart';
import 'package:siro_rider/controller/home/points_for_rider_controller.dart';
import 'package:siro_rider/services/offline_map_service.dart';
import 'package:tripz_rider/controller/home/points_for_rider_controller.dart';
import 'package:tripz_rider/services/offline_map_service.dart';
import '../../../controller/home/map/location_search_controller.dart';
import '../../../controller/home/map/map_engine_controller.dart';
apps/rider/lib/views/home/map_widget.dart/left_main_menu_icons.dart
+2 -2
View File
@@ -1,7 +1,7 @@
import 'dart:math';
import 'package:siro_rider/views/widgets/elevated_btn.dart';
import 'package:siro_rider/views/widgets/mycircular.dart';
import 'package:tripz_rider/views/widgets/elevated_btn.dart';
import 'package:tripz_rider/views/widgets/mycircular.dart';
import 'package:flutter/material.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
import 'package:get/get.dart';
apps/rider/lib/views/home/map_widget.dart/legacy_destination_bottom_sheet.dart
+1 -1
View File
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/controller/payment/payment_controller.dart';
import 'package:tripz_rider/controller/payment/payment_controller.dart';
import '../../../constant/style.dart';
import '../../../controller/home/map/ride_lifecycle_controller.dart';
apps/rider/lib/views/home/map_widget.dart/map_menu_widget.dart
+10 -10
View File
@@ -1,16 +1,16 @@
import 'dart:ui';
import 'package:siro_rider/constant/box_name.dart';
import 'package:siro_rider/main.dart';
import 'package:tripz_rider/constant/box_name.dart';
import 'package:tripz_rider/main.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/views/home/my_wallet/passenger_wallet.dart';
import 'package:siro_rider/views/home/profile/complaint_page.dart';
import 'package:siro_rider/views/home/profile/order_history.dart';
import 'package:siro_rider/views/home/profile/promos_passenger_page.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/views/home/my_wallet/passenger_wallet.dart';
import 'package:tripz_rider/views/home/profile/complaint_page.dart';
import 'package:tripz_rider/views/home/profile/order_history.dart';
import 'package:tripz_rider/views/home/profile/promos_passenger_page.dart';
import 'package:url_launcher/url_launcher.dart';
import '../../../constant/colors.dart';
@@ -319,7 +319,7 @@ class MapMenuWidget extends StatelessWidget {
),
const SizedBox(width: 6),
Text(
"Siro Passenger".tr,
"Tripz Passenger".tr,
style: TextStyle(
color: _kTextMuted,
fontSize: 12,
@@ -384,9 +384,9 @@ class MapMenuWidget extends StatelessWidget {
final String driverAppUrl;
if (defaultTargetPlatform == TargetPlatform.android) {
driverAppUrl =
'https://play.google.com/store/apps/details?id=com.siro_driver';
'https://play.google.com/store/apps/details?id=com.tripz_driver';
} else if (defaultTargetPlatform == TargetPlatform.iOS) {
driverAppUrl = 'https://apps.apple.com/st/app/siro-driver/id6482995159';
driverAppUrl = 'https://apps.apple.com/st/app/tripz-driver/id6482995159';
} else {
return;
}
apps/rider/lib/views/home/map_widget.dart/payment_method_page.dart
+4 -4
View File
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/box_name.dart';
import 'package:siro_rider/controller/functions/secure_storage.dart';
import 'package:siro_rider/controller/home/payment/credit_card_controller.dart';
import 'package:siro_rider/views/widgets/elevated_btn.dart';
import 'package:tripz_rider/constant/box_name.dart';
import 'package:tripz_rider/controller/functions/secure_storage.dart';
import 'package:tripz_rider/controller/home/payment/credit_card_controller.dart';
import 'package:tripz_rider/views/widgets/elevated_btn.dart';
import '../../../constant/colors.dart';
import '../../../constant/style.dart';
apps/rider/lib/views/home/map_widget.dart/points_page_for_rider.dart
+1 -1
View File
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:tripz_rider/constant/style.dart';
import '../../../constant/colors.dart';
import '../../../controller/home/map/location_search_controller.dart';
apps/rider/lib/views/home/map_widget.dart/ride_begin_passenger.dart
+3 -3
View File
@@ -1,4 +1,4 @@
import 'package:siro_rider/constant/currency.dart';
import 'package:tripz_rider/constant/currency.dart';
import 'package:flutter/material.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
import 'package:get/get.dart';
@@ -9,7 +9,7 @@ import '../../../constant/box_name.dart';
import '../../../constant/colors.dart';
import '../../../constant/design.dart';
import '../../../constant/links.dart';
import 'package:siro_rider/controller/functions/country_logic.dart';
import 'package:tripz_rider/controller/functions/country_logic.dart';
import '../../../controller/functions/audio_record1.dart';
import '../../../controller/functions/launch.dart';
import '../../../controller/functions/toast.dart';
@@ -44,7 +44,7 @@ class RideBeginPassenger extends StatelessWidget {
bottom: isVisible ? 0 : -300,
left: 0,
right: 0,
child: SiroSheetSurface(
child: TripzSheetSurface(
padding: const EdgeInsets.symmetric(
horizontal: AppSpacing.lg, vertical: AppSpacing.md),
child: Column(
apps/rider/lib/views/home/map_widget.dart/ride_from_start_app.dart
+2 -2
View File
@@ -1,5 +1,5 @@
import 'package:siro_rider/constant/currency.dart';
import 'package:siro_rider/controller/functions/launch.dart';
import 'package:tripz_rider/constant/currency.dart';
import 'package:tripz_rider/controller/functions/launch.dart';
import 'package:flutter/material.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
import 'package:get/get.dart';
apps/rider/lib/views/home/map_widget.dart/searching_captain_window.dart
+6 -6
View File
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/colors.dart';
import 'package:siro_rider/constant/design.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/controller/home/map/ride_lifecycle_controller.dart';
import 'package:siro_rider/controller/home/map/ride_state.dart';
import 'package:tripz_rider/constant/colors.dart';
import 'package:tripz_rider/constant/design.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/controller/home/map/ride_lifecycle_controller.dart';
import 'package:tripz_rider/controller/home/map/ride_state.dart';
// --- نافذة البحث عن كابتن ---
class SearchingCaptainWindow extends StatefulWidget {
@@ -50,7 +50,7 @@ class _SearchingCaptainWindowState extends State<SearchingCaptainWindow>
left: 0,
right: 0,
// لا يوجد مقبض سحب: هذه الحالة لا تُغلق بالسحب بل بزر الإلغاء فقط
child: SiroSheetSurface(
child: TripzSheetSurface(
showHandle: false,
child: Column(
mainAxisSize: MainAxisSize.min,
apps/rider/lib/views/home/map_widget.dart/select_driver_mishwari.dart
+4 -4
View File
@@ -1,7 +1,7 @@
import 'package:siro_rider/constant/colors.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/controller/home/map/ride_lifecycle_controller.dart';
import 'package:siro_rider/views/widgets/elevated_btn.dart';
import 'package:tripz_rider/constant/colors.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/controller/home/map/ride_lifecycle_controller.dart';
import 'package:tripz_rider/views/widgets/elevated_btn.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
apps/rider/lib/views/home/map_widget.dart/vip_begin.dart
+5 -5
View File
@@ -1,11 +1,11 @@
import 'package:siro_rider/constant/links.dart';
import 'package:siro_rider/views/home/profile/complaint_page.dart';
import 'package:tripz_rider/constant/links.dart';
import 'package:tripz_rider/views/home/profile/complaint_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/box_name.dart';
import 'package:siro_rider/controller/profile/profile_controller.dart';
import 'package:siro_rider/main.dart';
import 'package:tripz_rider/constant/box_name.dart';
import 'package:tripz_rider/controller/profile/profile_controller.dart';
import 'package:tripz_rider/main.dart';
import '../../../constant/colors.dart';
import '../../../constant/style.dart';
apps/rider/lib/views/home/map_widget.dart/waypoint_stops_list.dart
+6 -7
View File
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/table_names.dart';
import 'package:tripz_rider/constant/table_names.dart';
import 'package:intaleq_maps/intaleq_maps.dart';
import '../../../constant/colors.dart';
@@ -67,8 +67,7 @@ GetBuilder<LocationSearchController> formSearchPlaces(int index) {
},
child: Text(
'Choose from Map'.tr + ' $index'.tr,
style:
AppStyle.title.copyWith(color: AppColor.blueColor),
style: AppStyle.title.copyWith(color: AppColor.blueColor),
),
)
: const SizedBox(),
@@ -127,10 +126,10 @@ GetBuilder<LocationSearchController> formSearchPlaces(int index) {
IconButton(
onPressed: () async {
await sql.insertMapLocation({
'latitude': res['geometry']
['location']['lat'],
'longitude': res['geometry']
['location']['lng'],
'latitude': res['geometry']['location']
['lat'],
'longitude': res['geometry']['location']
['lng'],
'name': res['name'].toString(),
'rate': res['rating'].toString(),
}, TableName.placesFavorite);
apps/rider/lib/views/home/my_wallet/cliq_payment_sheet.dart
+8 -8
View File
@@ -1,13 +1,13 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/box_name.dart';
import 'package:siro_rider/constant/colors.dart';
import 'package:siro_rider/constant/currency.dart';
import 'package:siro_rider/constant/payment_tiers.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/controller/functions/country_logic.dart';
import 'package:siro_rider/controller/payment/payment_controller.dart';
import 'package:siro_rider/main.dart';
import 'package:tripz_rider/constant/box_name.dart';
import 'package:tripz_rider/constant/colors.dart';
import 'package:tripz_rider/constant/currency.dart';
import 'package:tripz_rider/constant/payment_tiers.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/controller/functions/country_logic.dart';
import 'package:tripz_rider/controller/payment/payment_controller.dart';
import 'package:tripz_rider/main.dart';
class CliqPaymentSheet extends StatefulWidget {
final double amount;
apps/rider/lib/views/home/my_wallet/passenger_wallet.dart
+8 -8
View File
@@ -1,9 +1,9 @@
import 'package:siro_rider/constant/currency.dart';
import 'package:tripz_rider/constant/currency.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/views/home/my_wallet/payment_history_passenger_page.dart';
import 'package:siro_rider/views/home/my_wallet/siro_prime_page.dart';
import 'package:tripz_rider/views/home/my_wallet/payment_history_passenger_page.dart';
import 'package:tripz_rider/views/home/my_wallet/tripz_prime_page.dart';
import 'dart:ui'; // لاستخدام تأثيرات متقدمة
import '../../../constant/box_name.dart';
@@ -79,7 +79,7 @@ class PassengerWallet extends StatelessWidget {
Get.find<PaymentController>()), // نفس دالتك القديمة
),
// 👑 Siro Prime Banner
// 👑 Tripz Prime Banner
const SizedBox(height: 8),
_buildPrimeBanner(),
],
@@ -266,14 +266,14 @@ class PassengerWallet extends StatelessWidget {
);
}
// 👑 Siro Prime Banner Widget
// 👑 Tripz Prime Banner Widget
Widget _buildPrimeBanner() {
return GetBuilder<PrimeController>(
builder: (ctrl) {
final bool isPrime = ctrl.isPrime;
return GestureDetector(
onTap: () => Get.to(
() => const SiroPrimePage(),
() => const TripzPrimePage(),
transition: Transition.rightToLeftWithFade,
),
child: Container(
@@ -313,7 +313,7 @@ class PassengerWallet extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
isPrime ? 'Siro Prime Active'.tr : 'Siro Prime'.tr,
isPrime ? 'Tripz Prime Active'.tr : 'Tripz Prime'.tr,
style: const TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
@@ -346,4 +346,4 @@ class PassengerWallet extends StatelessWidget {
}
}
// الكلاس القديم CardSiroWallet لم نعد بحاجة إليه لأنه تم دمجه وتطويره
// الكلاس القديم CardTripzWallet لم نعد بحاجة إليه لأنه تم دمجه وتطويره
apps/rider/lib/views/home/my_wallet/passenger_wallet_dialoge.dart
+8 -8
View File
@@ -1,14 +1,14 @@
import 'package:siro_rider/constant/currency.dart';
import 'package:siro_rider/constant/payment_tiers.dart';
import 'package:siro_rider/print.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:tripz_rider/constant/currency.dart';
import 'package:tripz_rider/constant/payment_tiers.dart';
import 'package:tripz_rider/print.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/box_name.dart';
import 'package:siro_rider/constant/colors.dart';
import 'package:siro_rider/controller/functions/toast.dart';
import 'package:siro_rider/controller/payment/payment_controller.dart';
import 'package:tripz_rider/constant/box_name.dart';
import 'package:tripz_rider/constant/colors.dart';
import 'package:tripz_rider/controller/functions/toast.dart';
import 'package:tripz_rider/controller/payment/payment_controller.dart';
import 'package:local_auth/local_auth.dart';
import '../../../main.dart';
apps/rider/lib/views/home/my_wallet/payment_history_driver_page.dart
+4 -4
View File
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/colors.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/views/widgets/my_scafold.dart';
import 'package:siro_rider/views/widgets/mycircular.dart';
import 'package:tripz_rider/constant/colors.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/views/widgets/my_scafold.dart';
import 'package:tripz_rider/views/widgets/mycircular.dart';
import '../../../controller/payment/driver_payment_controller.dart';
apps/rider/lib/views/home/my_wallet/payment_history_passenger_page.dart
+5 -5
View File
@@ -1,11 +1,11 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/colors.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/controller/payment/passenger_wallet_history_controller.dart';
import 'package:siro_rider/views/widgets/my_scafold.dart';
import 'package:siro_rider/views/widgets/mycircular.dart';
import 'package:tripz_rider/constant/colors.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/controller/payment/passenger_wallet_history_controller.dart';
import 'package:tripz_rider/views/widgets/my_scafold.dart';
import 'package:tripz_rider/views/widgets/mycircular.dart';
class PaymentHistoryPassengerPage extends StatelessWidget {
const PaymentHistoryPassengerPage({super.key});
apps/rider/lib/views/home/my_wallet/siro_prime_page.dart → apps/rider/lib/views/home/my_wallet/tripz_prime_page.dart
+10 -10
View File
@@ -1,20 +1,20 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/box_name.dart';
import 'package:siro_rider/constant/colors.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/controller/payment/prime_controller.dart';
import 'package:siro_rider/main.dart';
import 'package:tripz_rider/constant/box_name.dart';
import 'package:tripz_rider/constant/colors.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/controller/payment/prime_controller.dart';
import 'package:tripz_rider/main.dart';
import 'dart:math' as math;
class SiroPrimePage extends StatefulWidget {
const SiroPrimePage({super.key});
class TripzPrimePage extends StatefulWidget {
const TripzPrimePage({super.key});
@override
State<SiroPrimePage> createState() => _SiroPrimePageState();
State<TripzPrimePage> createState() => _TripzPrimePageState();
}
class _SiroPrimePageState extends State<SiroPrimePage>
class _TripzPrimePageState extends State<TripzPrimePage>
with TickerProviderStateMixin {
late AnimationController _shimmerController;
late AnimationController _pulseController;
@@ -225,7 +225,7 @@ class _SiroPrimePageState extends State<SiroPrimePage>
],
).createShader(bounds),
child: const Text(
'SIRO PRIME',
'TRIPZ PRIME',
style: TextStyle(
fontSize: 30,
fontWeight: FontWeight.w900,
apps/rider/lib/views/home/navigation/navigation_controller.dart
+2 -2
View File
@@ -2,7 +2,7 @@ import 'dart:async';
import 'dart:convert';
import 'dart:math';
import 'dart:ui' show lerpDouble;
import 'package:siro_rider/views/widgets/error_snakbar.dart';
import 'package:tripz_rider/views/widgets/error_snakbar.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@@ -1329,7 +1329,7 @@ class NavigationController extends GetxController
if (mapController == null) return;
try {
// ✅ Use searchPlaces from intaleq_maps SDK
// ✅ Use searchPlaces from tripz_maps SDK
final results = await mapController!.searchPlaces(q);
if (myLocation != null) {
apps/rider/lib/views/home/navigation/navigation_view.dart
+1 -1
View File
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
import 'package:intaleq_maps/intaleq_maps.dart';
import 'package:siro_rider/env/env.dart';
import 'package:tripz_rider/env/env.dart';
import '../../../constant/box_name.dart';
import '../../../constant/colors.dart';
apps/rider/lib/views/home/profile/budgets_ads.dart
+3 -3
View File
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/colors.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/controller/payment/payment_controller.dart';
import 'package:tripz_rider/constant/colors.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/controller/payment/payment_controller.dart';
import '../../../constant/box_name.dart';
import '../../../main.dart';
apps/rider/lib/views/home/profile/complaint_page.dart
+7 -7
View File
@@ -2,12 +2,12 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/controller/home/profile/complaint_controller.dart';
import 'package:siro_rider/views/widgets/my_scafold.dart'; // سنستخدم السكافولد الخاص بك
import 'package:siro_rider/views/widgets/mycircular.dart';
import 'package:siro_rider/views/widgets/mydialoug.dart';
import 'package:siro_rider/views/widgets/elevated_btn.dart'; // سنستخدم الزر الخاص بك
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/controller/home/profile/complaint_controller.dart';
import 'package:tripz_rider/views/widgets/my_scafold.dart'; // سنستخدم السكافولد الخاص بك
import 'package:tripz_rider/views/widgets/mycircular.dart';
import 'package:tripz_rider/views/widgets/mydialoug.dart';
import 'package:tripz_rider/views/widgets/elevated_btn.dart'; // سنستخدم الزر الخاص بك
import '../../../constant/colors.dart';
import '../../../controller/functions/audio_record1.dart';
@@ -145,7 +145,7 @@ class ComplaintPage extends StatelessWidget {
ListTile(
leading: const Icon(Icons.support_agent_outlined,
color: AppColor.primaryColor),
title: Text("Siro's Response".tr,
title: Text("Tripz's Response".tr,
style: AppStyle.title),
subtitle: Text(
// --- تعديل هنا لعرض الرد من الخادم ---
apps/rider/lib/views/home/profile/order_history.dart
+2 -2
View File
@@ -1,8 +1,8 @@
import 'package:siro_rider/constant/currency.dart';
import 'package:tripz_rider/constant/currency.dart';
import 'dart:math' as math;
import 'dart:typed_data';
import 'package:siro_rider/env/env.dart';
import 'package:tripz_rider/env/env.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
apps/rider/lib/views/home/profile/passenger_profile_page.dart
+8 -8
View File
@@ -5,13 +5,13 @@ import 'package:get/get.dart';
import 'package:image_cropper/image_cropper.dart';
import 'package:image_picker/image_picker.dart';
import 'package:http/http.dart' as http;
import 'package:siro_rider/constant/api_key.dart';
import 'package:siro_rider/constant/box_name.dart';
import 'package:siro_rider/constant/colors.dart';
import 'package:siro_rider/controller/profile/profile_controller.dart';
import 'package:siro_rider/main.dart';
import 'package:siro_rider/views/widgets/mycircular.dart';
import 'package:siro_rider/views/widgets/error_snakbar.dart';
import 'package:tripz_rider/constant/api_key.dart';
import 'package:tripz_rider/constant/box_name.dart';
import 'package:tripz_rider/constant/colors.dart';
import 'package:tripz_rider/controller/profile/profile_controller.dart';
import 'package:tripz_rider/main.dart';
import 'package:tripz_rider/views/widgets/mycircular.dart';
import 'package:tripz_rider/views/widgets/error_snakbar.dart';
import '../../../constant/style.dart';
import '../../../controller/functions/country_logic.dart';
@@ -320,7 +320,7 @@ class _PassengerProfilePageState extends State<PassengerProfilePage> {
final passengerId = box.read(BoxName.passengerID)?.toString() ?? '';
String email = box.read(BoxName.email) ?? '';
if (email.contains('intaleqapp.com')) email = '';
if (email.contains('tripzapp.com')) email = '';
final initials = fullName.isNotEmpty
? fullName
apps/rider/lib/views/home/profile/profile_captain.dart
+6 -6
View File
@@ -1,12 +1,12 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/box_name.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/controller/profile/captain_profile_controller.dart';
import 'package:siro_rider/main.dart';
import 'package:siro_rider/views/widgets/elevated_btn.dart';
import 'package:siro_rider/views/widgets/my_scafold.dart';
import 'package:tripz_rider/constant/box_name.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/controller/profile/captain_profile_controller.dart';
import 'package:tripz_rider/main.dart';
import 'package:tripz_rider/views/widgets/elevated_btn.dart';
import 'package:tripz_rider/views/widgets/my_scafold.dart';
import '../../../constant/api_key.dart';
import '../../widgets/my_textField.dart';
apps/rider/lib/views/home/profile/promos_passenger_page.dart
+3 -3
View File
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
import 'package:siro_rider/controller/home/profile/promos_controller.dart';
import 'package:siro_rider/views/widgets/my_scafold.dart';
import 'package:siro_rider/views/widgets/error_snakbar.dart';
import 'package:tripz_rider/controller/home/profile/promos_controller.dart';
import 'package:tripz_rider/views/widgets/my_scafold.dart';
import 'package:tripz_rider/views/widgets/error_snakbar.dart';
import 'dart:ui'; // لاستخدامه في الفاصل
import '../../../constant/colors.dart';
apps/rider/lib/views/home/profile/taarif_page.dart
+4 -4
View File
@@ -1,9 +1,9 @@
import 'package:siro_rider/constant/box_name.dart';
import 'package:siro_rider/main.dart';
import 'package:tripz_rider/constant/box_name.dart';
import 'package:tripz_rider/main.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/views/widgets/my_scafold.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:tripz_rider/views/widgets/my_scafold.dart';
class TaarifPage extends StatelessWidget {
const TaarifPage({super.key});
apps/rider/lib/views/home/route_planner/rp_actions.dart
+8 -4
View File
@@ -132,10 +132,12 @@ class RpActions {
isScrollControlled: true,
builder: (context) {
return Container(
padding: const EdgeInsets.only(top: 12, left: 16, right: 16, bottom: 24),
padding:
const EdgeInsets.only(top: 12, left: 16, right: 16, bottom: 24),
decoration: BoxDecoration(
color: RP.sheetElevated,
borderRadius: const BorderRadius.vertical(top: Radius.circular(RP.rSheet)),
borderRadius:
const BorderRadius.vertical(top: Radius.circular(RP.rSheet)),
),
child: Column(
mainAxisSize: MainAxisSize.min,
@@ -172,8 +174,10 @@ class RpActions {
final modifiedPlace = Map<String, dynamic>.from(place);
modifiedPlace['latitude'] = gate['latitude'];
modifiedPlace['longitude'] = gate['longitude'];
modifiedPlace['name_ar'] = '${place['name_ar'] ?? place['name'] ?? ''} - $gateName';
modifiedPlace['name'] = '${place['name'] ?? place['name_ar'] ?? ''} - $gateName';
modifiedPlace['name_ar'] =
'${place['name_ar'] ?? place['name'] ?? ''} - $gateName';
modifiedPlace['name'] =
'${place['name'] ?? place['name_ar'] ?? ''} - $gateName';
if (isOrigin) {
selectStart(modifiedPlace);
apps/rider/lib/views/home/route_planner/rp_map_pick_overlay.dart
+3 -4
View File
@@ -37,8 +37,7 @@ class RpMapPickOverlay extends StatelessWidget {
String _title(_PickMode m, LocationSearchController s) {
switch (m) {
case _PickMode.stop:
return 'Move map to set stop'.tr +
' ${s.pickingWaypointIndex + 1}'.tr;
return 'Move map to set stop'.tr + ' ${s.pickingWaypointIndex + 1}'.tr;
case _PickMode.pickupOther:
return 'Now set the pickup point for the other person'.tr;
case _PickMode.pickup:
@@ -339,8 +338,8 @@ class RpMapPickOverlay extends StatelessWidget {
s.newStartPointLocation.longitude)));
} else {
await mapEngine.mapController?.animateCamera(CameraUpdate.newLatLng(
LatLng(s.passengerLocation.latitude,
s.passengerLocation.longitude)));
LatLng(
s.passengerLocation.latitude, s.passengerLocation.longitude)));
}
} catch (e) {
Log.print('RP confirm animate error: $e');
apps/rider/lib/views/home/route_planner/rp_search_dialog.dart
+3 -3
View File
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/controller/home/map/location_search_controller.dart';
import 'package:siro_rider/controller/home/map/map_engine_controller.dart';
import 'package:siro_rider/controller/home/map/ride_lifecycle_controller.dart';
import 'package:tripz_rider/controller/home/map/location_search_controller.dart';
import 'package:tripz_rider/controller/home/map/map_engine_controller.dart';
import 'package:tripz_rider/controller/home/map/ride_lifecycle_controller.dart';
import 'rp_actions.dart';
import 'rp_location_field.dart';
apps/rider/lib/views/home/setting_page.dart
+5 -5
View File
@@ -1,10 +1,10 @@
import 'package:siro_rider/controller/home/home_page_controller.dart';
import 'package:siro_rider/controller/local/local_controller.dart';
import 'package:siro_rider/constant/colors.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:tripz_rider/controller/home/home_page_controller.dart';
import 'package:tripz_rider/controller/local/local_controller.dart';
import 'package:tripz_rider/constant/colors.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_rider/views/lang/languages.dart';
import 'package:tripz_rider/views/lang/languages.dart';
import 'HomePage/about_page.dart';
import 'HomePage/frequentlyQuestionsPage.dart';