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

Update: 2026-07-02 05:27:04

Browse Source
This commit is contained in:
Hamza-Ayed
2026-07-02 05:27:05 +03:00
parent d2ce4bdb16
commit 05d047d871
25 changed files with 1625 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
siro_driver/lib/controller/home/captin/map_driver_controller.dart
+5
View File
@@ -186,6 +186,11 @@ class MapDriverController extends GetxController
_navigationTimer?.cancel();
_navigationTimer = null;
// [Fix Leak-1] إيقاف تايمر تحديث الكاميرا أثناء الرحلة لمنع crash
// بعد إغلاق الكنترولر كان يحاول استدعاء mapController!.animateCamera()
_updateLocationTimer?.cancel();
_updateLocationTimer = null;
_posSub?.cancel();
_posSub = null;
siro_driver/lib/views/home/Captin/orderCaptin/order_request_page.dart
+12
View File
@@ -5,6 +5,7 @@ import 'package:siro_driver/constant/api_key.dart';
import 'package:siro_driver/constant/colors.dart';
import 'package:siro_driver/controller/home/captin/order_request_controller.dart';
import 'package:siro_driver/constant/currency.dart';
import 'package:siro_driver/views/widgets/driver_earnings_badge.dart';
class OrderRequestPage extends StatelessWidget {
const OrderRequestPage({super.key});
@@ -236,6 +237,17 @@ class OrderRequestPage extends StatelessWidget {
],
),
// ── Earnings Compare Badge ──────────────────
// يتم جلبه من API مشابه أو يمكن ربطه ببيانات الكنترولر لاحقاً.
// نتركه متاحاً للتحديث عبر الكنترولر (controller.driverBadgeText, controller.extraEarnings).
// سنستخدم قيم افتراضية للتأكد من الريندر (UI render) الآن
// سيتم تفعيله من الباك إند
const SizedBox(height: 5),
const DriverEarningsBadge(
earningsLabel: "أرباحك أعلى هنا مقارنة بـ المنافسين",
extraAmount: 2.50, // القيمة هنا ستُسحب من الـ Socket / API قريباً
),
const SizedBox(height: 15),
// الصف الثاني: شريط المعلومات
siro_driver/lib/views/notification/available_rides_page.dart
+25 -9
View File
@@ -17,6 +17,7 @@ import '../home/Captin/driver_map_page.dart';
import '../widgets/my_scafold.dart';
import '../widgets/mycircular.dart';
import '../widgets/mydialoug.dart';
import '../widgets/driver_earnings_badge.dart'; // ── إضافة ويدجت الأرباح ──
class AvailableRidesPage extends StatelessWidget {
const AvailableRidesPage({super.key});
@@ -126,7 +127,13 @@ class RideAvailableCard extends StatelessWidget {
_buildRouteInfo(),
const Divider(height: 24, thickness: 0.5),
_buildRideDetails(),
const SizedBox(height: 20),
const SizedBox(height: 12),
// ── إضافة شارة الأرباح هنا ──
const DriverEarningsBadge(
earningsLabel: "أرباحك أعلى هنا مقارنة بـ المنافسين",
extraAmount: 2.50, // القيمة هنا ستُسحب من الـ Socket / API قريباً
),
const SizedBox(height: 12),
_buildAcceptButton(),
],
),
@@ -237,14 +244,23 @@ class RideAvailableCard extends StatelessWidget {
}
Widget _buildRideDetails() {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
_infoItem(Icons.social_distance, '${rideInfo['distance']} KM'),
_infoItem(Icons.access_time, '${rideInfo['duration']} Min'),
_infoItem(Icons.star, '${rideInfo['passengerRate'] ?? 5.0}',
iconColor: Colors.amber),
],
return Container(
padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8),
decoration: BoxDecoration(
color: Theme.of(Get.context!).colorScheme.surfaceVariant.withOpacity(0.3),
borderRadius: BorderRadius.circular(12),
border: Border.all(color: Theme.of(Get.context!).dividerColor.withOpacity(0.5)),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
_infoItem(Icons.social_distance_rounded, '${rideInfo['distance']} KM', iconColor: AppColor.primaryColor),
Container(height: 20, width: 1, color: Theme.of(Get.context!).dividerColor),
_infoItem(Icons.access_time_filled_rounded, '${rideInfo['duration']} Min', iconColor: Colors.blueAccent),
Container(height: 20, width: 1, color: Theme.of(Get.context!).dividerColor),
_infoItem(Icons.star_rounded, '${rideInfo['passengerRate'] ?? 5.0}', iconColor: Colors.amber),
],
),
);
}
siro_driver/lib/views/widgets/driver_earnings_badge.dart
+101
View File
@@ -0,0 +1,101 @@
import 'package:flutter/material.dart';
/// DriverEarningsBadge
/// ─────────────────────
/// ويدجت يعرض للسائق مقارنة أرباحه مع سيرو مقارنةً بالمنافسين.
/// يُستخدم في شاشة قبول الطلب ليحفّز السائق على القبول.
class DriverEarningsBadge extends StatelessWidget {
/// النص الكامل الجاهز من السيرفر
final String? earningsLabel;
/// المبلغ الإضافي الذي يكسبه السائق (موجب = أكثر مع سيرو)
final double? extraAmount;
/// رمز العملة
final String currency;
const DriverEarningsBadge({
super.key,
this.earningsLabel,
this.extraAmount,
this.currency = 'ل.س',
});
@override
Widget build(BuildContext context) {
if (earningsLabel == null || earningsLabel!.isEmpty) {
return const SizedBox.shrink();
}
final double extra = extraAmount ?? 0;
final bool isPositive = extra >= 0;
return AnimatedOpacity(
opacity: 1.0,
duration: const Duration(milliseconds: 350),
child: Container(
margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
decoration: BoxDecoration(
gradient: LinearGradient(
colors: isPositive
? [const Color(0xFF064E3B), const Color(0xFF065F46)]
: [const Color(0xFF1E1B4B), const Color(0xFF312E81)],
begin: Alignment.centerLeft,
end: Alignment.centerRight,
),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: isPositive
? const Color(0xFF10B981).withOpacity(0.4)
: const Color(0xFF818CF8).withOpacity(0.4),
),
),
child: Row(
children: [
Icon(
isPositive ? Icons.attach_money_rounded : Icons.info_outline_rounded,
color: isPositive
? const Color(0xFF34D399)
: const Color(0xFFA5B4FC),
size: 22,
),
const SizedBox(width: 10),
Expanded(
child: Text(
earningsLabel!,
style: TextStyle(
color: isPositive
? const Color(0xFF34D399)
: const Color(0xFFA5B4FC),
fontSize: 11.5,
fontWeight: FontWeight.w700,
height: 1.4,
),
),
),
if (extra > 0)
Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: const Color(0xFF10B981).withOpacity(0.15),
borderRadius: BorderRadius.circular(20),
border: Border.all(
color: const Color(0xFF10B981).withOpacity(0.3),
),
),
child: Text(
'+${extra.toStringAsFixed(2)} $currency',
style: const TextStyle(
color: Color(0xFF34D399),
fontSize: 11,
fontWeight: FontWeight.w800,
),
),
),
],
),
),
);
}
}