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

Update codebase

Browse Source
This commit is contained in:
Hamza-Ayed
2026-08-09 16:56:13 +03:00
parent 95e2e4f35d
commit b64debaa88
1058 changed files with 164327 additions and 113928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/rider/lib/views/home/map_widget.dart/apply_order_widget.dart
+8 -8
View File
@@ -1,10 +1,10 @@
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: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: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: TripzSheetSurface(
child: SiroSheetSurface(
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: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:siro_rider/constant/colors.dart';
import 'package:siro_rider/constant/style.dart';
import 'package:siro_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:tripz_rider/constant/currency.dart';
import 'package:siro_rider/constant/currency.dart';
import 'package:flutter/material.dart';
import 'package:get/get.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 '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 '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: TripzSheetHandle(),
child: SiroSheetHandle(),
),
AppSpacing.vGapXs,
apps/rider/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart
+51 -14
View File
@@ -1,9 +1,9 @@
import 'package:tripz_rider/constant/currency.dart';
import 'package:siro_rider/constant/currency.dart';
import 'package:flutter/material.dart';
import 'package:get/get.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 '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 '../../../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: TripzSheetSurface(
child: SiroSheetSurface(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
@@ -120,15 +120,52 @@ class CashConfirmPageShown extends StatelessWidget {
}
// في كل الحالات الأخرى (كاش، أو محفظة برصيد كافٍ)
else {
return MyElevatedButton(
title: 'Confirm & Find a Ride'.tr,
onPressed: () {
// --- نفس منطقك القديم بالضبط ---
controller.changeCashConfirmPageShown();
// controller.isSearchingWindow = true;
controller.startSearchingForDriver();
// controller.update();
},
return Row(
children: [
Expanded(
flex: 1,
child: MyElevatedButton(
title: 'Confirm & Find a Ride'.tr,
onPressed: () {
// --- نفس منطقك القديم بالضبط ---
controller.changeCashConfirmPageShown();
// controller.isSearchingWindow = true;
controller.startSearchingForDriver();
// controller.update();
},
),
),
const SizedBox(width: 8),
// ‏مسار موازٍ لا بديل: الحجز لا يفتح نافذة بحث ولا
// ‏ينتظر سائقاً — يسجّل موعداً ويتولّاه الخادم.
// ‏ثانوي بصرياً عمداً: الرحلة الفورية تبقى الافتراض.
Expanded(
flex: 1,
child: SizedBox(
height: 52,
child: TextButton.icon(
style: TextButton.styleFrom(
padding: const EdgeInsets.symmetric(horizontal: 4),
),
onPressed: () {
controller.changeCashConfirmPageShown();
controller.scheduleRideForLater();
},
icon: Icon(Icons.schedule,
size: 18, color: AppColor.primaryColor),
label: FittedBox(
child: Text(
'Schedule for Later'.tr,
style: TextStyle(
color: AppColor.primaryColor,
fontWeight: FontWeight.bold,
fontSize: 14),
),
),
),
),
),
],
);
}
}),
apps/rider/lib/views/home/map_widget.dart/google_map_passenger_widget.dart
+4 -4
View File
@@ -1,10 +1,10 @@
import 'package:tripz_rider/print.dart';
import 'package:siro_rider/print.dart';
import 'package:flutter/material.dart';
import 'package:tripz_rider/env/env.dart';
import 'package:siro_rider/env/env.dart';
import 'package:get/get.dart';
import 'package:intaleq_maps/intaleq_maps.dart';
import 'package:tripz_rider/controller/home/points_for_rider_controller.dart';
import 'package:tripz_rider/services/offline_map_service.dart';
import 'package:siro_rider/controller/home/points_for_rider_controller.dart';
import 'package:siro_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:tripz_rider/views/widgets/elevated_btn.dart';
import 'package:tripz_rider/views/widgets/mycircular.dart';
import 'package:siro_rider/views/widgets/elevated_btn.dart';
import 'package:siro_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:tripz_rider/controller/payment/payment_controller.dart';
import 'package:siro_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
+22 -10
View File
@@ -1,16 +1,17 @@
import 'dart:ui';
import 'package:tripz_rider/constant/box_name.dart';
import 'package:tripz_rider/main.dart';
import 'package:siro_rider/constant/box_name.dart';
import 'package:siro_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: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: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/scheduled/scheduled_rides_page.dart';
import 'package:siro_rider/views/home/profile/promos_passenger_page.dart';
import 'package:url_launcher/url_launcher.dart';
import '../../../constant/colors.dart';
@@ -23,6 +24,7 @@ import '../HomePage/share_app_page.dart';
import '../setting_page.dart';
import '../profile/passenger_profile_page.dart';
import '../../transit/transit_home_page.dart';
import '../../food/food_home_page.dart';
// ─── ألوان النظام (Integrated with AppColor) ──────────────────────────────────
Color get _kCyan => AppColor.cyanBlue;
@@ -157,6 +159,11 @@ class MapMenuWidget extends StatelessWidget {
onTap: () =>
Get.to(() => const TransitHomePage()),
),
MenuListItem(
title: 'Food'.tr,
icon: Icons.restaurant_rounded,
onTap: () => Get.to(() => const FoodHomePage()),
),
MenuListItem(
title: 'My Balance'.tr,
icon: Icons.account_balance_wallet_outlined,
@@ -168,6 +175,11 @@ class MapMenuWidget extends StatelessWidget {
icon: Icons.history_rounded,
onTap: () => Get.to(() => const OrderHistory()),
),
MenuListItem(
title: 'Scheduled Rides'.tr,
icon: Icons.schedule_rounded,
onTap: () => Get.to(() => const ScheduledRidesPage()),
),
MenuListItem(
title: 'Promos'.tr,
icon: Icons.local_offer_outlined,
@@ -319,7 +331,7 @@ class MapMenuWidget extends StatelessWidget {
),
const SizedBox(width: 6),
Text(
"Tripz Passenger".tr,
"Siro Passenger".tr,
style: TextStyle(
color: _kTextMuted,
fontSize: 12,
@@ -384,9 +396,9 @@ class MapMenuWidget extends StatelessWidget {
final String driverAppUrl;
if (defaultTargetPlatform == TargetPlatform.android) {
driverAppUrl =
'https://play.google.com/store/apps/details?id=com.tripz_driver';
'https://play.google.com/store/apps/details?id=com.siro_driver';
} else if (defaultTargetPlatform == TargetPlatform.iOS) {
driverAppUrl = 'https://apps.apple.com/st/app/tripz-driver/id6482995159';
driverAppUrl = 'https://apps.apple.com/st/app/siro-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: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 '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 '../../../constant/colors.dart';
import '../../../constant/style.dart';
apps/rider/lib/views/home/map_widget.dart/points_page_for_rider.dart
+4 -5
View File
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:tripz_rider/constant/style.dart';
import 'package:siro_rider/constant/style.dart';
import '../../../constant/colors.dart';
import '../../../controller/home/map/location_search_controller.dart';
@@ -56,8 +56,7 @@ class PointsPageForRider extends StatelessWidget {
wayPointController.wayPoints.length > 1
? ElevatedButton(
onPressed: () async {
locationSearch
.getMapPointsForAllMethods();
locationSearch.getMapPointsForAllMethods();
},
child: const Text('Get Direction'),
)
@@ -108,8 +107,8 @@ class PointsPageForRider extends StatelessWidget {
child: Container(
decoration: BoxDecoration(
border: Border.all(),
color:
AppColor.accentColor.withValues(alpha: 0.5)),
color: AppColor.accentColor
.withValues(alpha: 0.5)),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
apps/rider/lib/views/home/map_widget.dart/ride_begin_passenger.dart
+3 -3
View File
@@ -1,4 +1,4 @@
import 'package:tripz_rider/constant/currency.dart';
import 'package:siro_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:tripz_rider/controller/functions/country_logic.dart';
import 'package:siro_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: TripzSheetSurface(
child: SiroSheetSurface(
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:tripz_rider/constant/currency.dart';
import 'package:tripz_rider/controller/functions/launch.dart';
import 'package:siro_rider/constant/currency.dart';
import 'package:siro_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: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';
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';
// --- نافذة البحث عن كابتن ---
class SearchingCaptainWindow extends StatefulWidget {
@@ -50,7 +50,7 @@ class _SearchingCaptainWindowState extends State<SearchingCaptainWindow>
left: 0,
right: 0,
// لا يوجد مقبض سحب: هذه الحالة لا تُغلق بالسحب بل بزر الإلغاء فقط
child: TripzSheetSurface(
child: SiroSheetSurface(
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: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: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: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:tripz_rider/constant/links.dart';
import 'package:tripz_rider/views/home/profile/complaint_page.dart';
import 'package:siro_rider/constant/links.dart';
import 'package:siro_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:tripz_rider/constant/box_name.dart';
import 'package:tripz_rider/controller/profile/profile_controller.dart';
import 'package:tripz_rider/main.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 '../../../constant/colors.dart';
import '../../../constant/style.dart';
apps/rider/lib/views/home/map_widget.dart/waypoint_stops_list.dart
+7 -6
View File
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:tripz_rider/constant/table_names.dart';
import 'package:siro_rider/constant/table_names.dart';
import 'package:intaleq_maps/intaleq_maps.dart';
import '../../../constant/colors.dart';
@@ -67,7 +67,8 @@ 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(),
@@ -126,10 +127,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);