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

Update: 2026-07-12 18:53:59

Browse Source
This commit is contained in:
Hamza-Ayed
2026-07-12 18:53:59 +03:00
parent 8cd4a4b57e
commit 653d73422f
54 changed files with 2078 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
siro_rider/lib/controller/firebase/firbase_messge.dart
+9 -3
View File
@@ -74,11 +74,17 @@ class FirebaseMessagesController extends GetxController {
// Log.print('fcmToken: ${token}');
box.write(BoxName.tokenFCM, (token.toString()));
});
// 🔹 الاشتراك في topic
await fcmToken
.subscribeToTopic("passengers"); // أو "users" حسب نوع المستخدم
// 🔹 الاشتراك في topic العام
await fcmToken.subscribeToTopic("passengers");
Log.print("Subscribed to 'passengers' topic ✅");
// اشتراك شخصي بـ passenger_{id} لاستقبال إشعارات العضوية في مواصلاتي
final passengerId = box.read(BoxName.passengerID);
if (passengerId != null && passengerId.toString().isNotEmpty) {
await fcmToken.subscribeToTopic('passenger_${passengerId}');
Log.print("Subscribed to 'passenger_${passengerId}' topic ✅");
}
FirebaseMessaging.onMessage.listen((RemoteMessage message) {
// If the app is in the background or terminated, show a system tray message
RemoteNotification? notification = message.notification;
siro_rider/lib/controller/home/map/location_search_controller.dart
+13 -24
View File
@@ -297,30 +297,19 @@ class LocationSearchController extends GetxController {
newMyLocation = passengerLocation;
if (!CountryPolygons.isServiceSupported(passengerLocation)) {
Get.bottomSheet(
Container(
padding: const EdgeInsets.all(20),
decoration: const BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.location_off, size: 60, color: Colors.redAccent),
const SizedBox(height: 15),
Text(
'service_unavailable_area'.tr,
style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
textAlign: TextAlign.center,
),
const SizedBox(height: 10),
],
),
),
isDismissible: false,
enableDrag: false,
);
if (!Get.isSnackbarOpen) {
Get.snackbar(
'Alert'.tr,
'service_unavailable_area'.tr,
snackPosition: SnackPosition.BOTTOM,
backgroundColor: Colors.redAccent,
colorText: Colors.white,
icon: const Icon(Icons.location_off, color: Colors.white),
margin: const EdgeInsets.all(15),
duration: const Duration(seconds: 5),
isDismissible: true,
);
}
}
if (Get.isRegistered<RideLifecycleController>()) {
siro_rider/lib/controller/home/map/map_socket_controller.dart
+13
View File
@@ -24,6 +24,7 @@ class MapSocketController extends GetxController {
// 🚌 مواصلاتي — الخط الحالي المشترَك فيه + مستمع تحديث موقع الباص
int? _subscribedTransitRouteId;
void Function(Map<String, dynamic> data)? onBusLocationUpdate;
void Function(String errorCode)? onTransitError;
DateTime? get lastDriverLocationTime => _lastSocketLocationTime;
int get socketLocationUpdatesCount => _socketLocationUpdatesCount;
@@ -154,6 +155,18 @@ class MapSocketController extends GetxController {
Log.print('Error parsing bus_location_update: $e');
}
});
socket.on('transit_error', (data) {
if (data == null) return;
try {
final map = Map<String, dynamic>.from(data as Map);
final code = map['code']?.toString() ?? '';
Log.print('⚠️ transit_error: $code');
onTransitError?.call(code);
} catch (e) {
Log.print('Error parsing transit_error: $e');
}
});
}
// ── مواصلاتي: اشتراك/إلغاء اشتراك ببثّ موقع خط ─────────────
siro_rider/lib/controller/local/ar_eg.dart
+1
View File
@@ -21,6 +21,7 @@ final Map<String, String> ar_eg = {
"Stops": "محطات",
"No bus running on this route right now": "لا يوجد باص يعمل على هذا الخط الآن",
"Bus is delayed": "الباص متأخر",
"Missed the bus? Book a ride now": "فاتك الأتوبيس؟ احجز سيارة دلوقتي",
" ')[0]).toString()}.\\n\${' I am using": " ')[0]).toString()}.\\n\${' I am using",
" I am currently located at ": " أنا حالياً في ",
" I am using": " أنا استخدم",
siro_rider/lib/controller/local/ar_jo.dart
+1
View File
@@ -21,6 +21,7 @@ final Map<String, String> ar_jo = {
"Stops": "محطات",
"No bus running on this route right now": "لا يوجد باص يعمل على هذا الخط الآن",
"Bus is delayed": "الباص متأخر",
"Missed the bus? Book a ride now": "فاتك الباص؟ اطلب سيارة الآن",
" ')[0]).toString()}.\\n\${' I am using": " ')[0]).toString()}.\\n\${' I am using",
" I am currently located at ": " أنا حالياً في ",
" I am using": " أنا استخدم",
siro_rider/lib/controller/local/ar_sy.dart
+1
View File
@@ -21,6 +21,7 @@ final Map<String, String> ar_sy = {
"Stops": "محطات",
"No bus running on this route right now": "لا يوجد باص يعمل على هذا الخط الآن",
"Bus is delayed": "الباص متأخر",
"Missed the bus? Book a ride now": "فاتك الباص؟ اطلب سيارة هلق",
" ')[0]).toString()}.\\n\${' I am using": " ')[0]).toString()}.\\n\${' I am using",
" I am currently located at ": " أنا حالياً في ",
" I am using": " أنا استخدم",
siro_rider/lib/controller/transit/transit_controller.dart
+33
View File
@@ -1,4 +1,5 @@
// transit_controller.dart — تحكم شاشات مواصلاتي (جهة الراكب)
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:get/get.dart';
import '../home/map/map_socket_controller.dart';
import '../../print.dart';
@@ -55,12 +56,31 @@ class TransitController extends GetxController {
);
if (res.success) {
await fetchMyEnrollments();
// اشترك في topic المؤسسة لاستقبال إشعارات الانطلاق والتأخير
try {
await FirebaseMessaging.instance.subscribeToTopic('transit_org_$orgId');
Log.print('Subscribed to transit_org_$orgId ✅');
} catch (_) {}
return true;
}
Get.snackbar('مواصلاتي', res.message);
return false;
}
// اشتراك/إلغاء اشتراك في topic الخط المحدد
Future<void> subscribeToRouteTopic(int routeId) async {
try {
await FirebaseMessaging.instance.subscribeToTopic('transit_route_$routeId');
Log.print('Subscribed to transit_route_$routeId ✅');
} catch (_) {}
}
Future<void> unsubscribeFromRouteTopic(int routeId) async {
try {
await FirebaseMessaging.instance.unsubscribeFromTopic('transit_route_$routeId');
} catch (_) {}
}
Future<void> openOrgRoutes(int orgId) async {
currentOrgId = orgId;
isLoadingRoutes = true;
@@ -101,6 +121,7 @@ class TransitController extends GetxController {
if (Get.isRegistered<MapSocketController>()) {
final ms = Get.find<MapSocketController>();
ms.onBusLocationUpdate = _handleLiveBusUpdate;
ms.onTransitError = _handleTransitError;
ms.subscribeToTransitRoute(routeId);
}
}
@@ -122,11 +143,23 @@ class TransitController extends GetxController {
update();
}
void _handleTransitError(String errorCode) {
if (errorCode == 'NOT_ENROLLED') {
liveError = 'غير مشترك في هذا الخط. فعّل عضويتك أولاً.';
} else if (errorCode == 'ROUTE_NOT_FOUND') {
liveError = 'الخط غير متاح حالياً.';
} else {
liveError = 'خطأ في الاتصال بالخط: $errorCode';
}
update();
}
void closeLiveRoute() {
if (liveRouteId != null && Get.isRegistered<MapSocketController>()) {
final ms = Get.find<MapSocketController>();
ms.unsubscribeFromTransitRoute(liveRouteId!);
ms.onBusLocationUpdate = null;
ms.onTransitError = null;
}
liveRouteId = null;
liveTripId = null;
siro_rider/lib/views/transit/transit_live_map_page.dart
+3 -152
View File
@@ -1,152 +1,3 @@
// transit_live_map_page.dart — تتبع الباص الحي على الخريطة
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:intaleq_maps/intaleq_maps.dart';
import '../../constant/colors.dart';
import '../../constant/style.dart';
import '../../env/env.dart';
import '../../controller/transit/transit_controller.dart';
import '../widgets/my_scafold.dart';
class TransitLiveMapPage extends StatefulWidget {
final int routeId;
final String routeName;
const TransitLiveMapPage({super.key, required this.routeId, required this.routeName});
@override
State<TransitLiveMapPage> createState() => _TransitLiveMapPageState();
}
class _TransitLiveMapPageState extends State<TransitLiveMapPage> {
IntaleqMapController? _mapController;
@override
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) {
Get.find<TransitController>().openLiveRoute(widget.routeId);
});
}
@override
void dispose() {
Get.find<TransitController>().closeLiveRoute();
super.dispose();
}
@override
Widget build(BuildContext context) {
return GetBuilder<TransitController>(
builder: (c) {
final stops = (c.liveTripData?['stops'] is List)
? List<Map>.from(c.liveTripData!['stops'])
: <Map>[];
final markers = <Marker>{};
for (final s in stops) {
final lat = double.tryParse(s['latitude']?.toString() ?? '') ?? 0;
final lng = double.tryParse(s['longitude']?.toString() ?? '') ?? 0;
if (lat == 0 && lng == 0) continue;
markers.add(Marker(
markerId: MarkerId('stop_${s['id']}'),
position: LatLng(lat, lng),
infoWindow: InfoWindow(title: s['name_ar']?.toString() ?? ''),
icon: InlqBitmap.defaultMarkerWithHue(
(s['is_major']?.toString() ?? '0') == '1' ? 30 : 200),
));
}
LatLng? busLatLng;
if (c.liveBusPosition != null) {
busLatLng = LatLng(c.liveBusPosition!.lat, c.liveBusPosition!.lng);
markers.add(Marker(
markerId: const MarkerId('bus'),
position: busLatLng,
rotation: c.liveBusPosition!.heading,
anchor: const Offset(0.5, 0.5),
icon: InlqBitmap.defaultMarkerWithHue(120),
));
if (_mapController != null) {
_mapController!.animateCamera(CameraUpdate.newLatLng(busLatLng));
}
}
final initialTarget = busLatLng ??
(markers.isNotEmpty ? markers.first.position : const LatLng(31.95, 35.93));
return MyScafolld(
title: widget.routeName,
isleading: true,
body: [
Column(
children: [
Expanded(
child: Stack(
children: [
IntaleqMap(
apiKey: Env.mapSaasKey,
initialCameraPosition: CameraPosition(target: initialTarget, zoom: 14),
markers: markers,
onMapCreated: (ctrl) => _mapController = ctrl,
),
if (c.isLoadingLiveTrip)
const Positioned.fill(
child: ColoredBox(
color: Colors.black12,
child: Center(child: CircularProgressIndicator()),
),
),
if (!c.isLoadingLiveTrip && c.liveError.isNotEmpty)
Positioned(
top: 16,
left: 16,
right: 16,
child: _statusBanner(c.liveError, AppColor.redColor),
),
if (!c.isLoadingLiveTrip &&
c.liveError.isEmpty &&
c.liveBusPosition == null)
Positioned(
top: 16,
left: 16,
right: 16,
child: _statusBanner(
'No bus running on this route right now'.tr, AppColor.yellowColor),
),
if (c.liveTripData?['trip']?['delay_minutes'] != null &&
(int.tryParse(c.liveTripData!['trip']['delay_minutes'].toString()) ?? 0) > 0)
Positioned(
bottom: 24,
left: 16,
right: 16,
child: _statusBanner(
'${'Bus is delayed'.tr} ${c.liveTripData!['trip']['delay_minutes']} ${'min'.tr}',
AppColor.yellowColor,
),
),
],
),
),
],
),
],
);
},
);
}
Widget _statusBanner(String text, Color color) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
decoration: BoxDecoration(
color: AppColor.cardColor,
borderRadius: BorderRadius.circular(12),
border: Border(right: BorderSide(color: color, width: 4)),
boxShadow: [BoxShadow(color: Colors.black12, blurRadius: 6)],
),
child: Text(text, style: AppStyle.title.copyWith(color: color, fontWeight: FontWeight.bold)),
);
}
}
// transit_live_map_page.dart — محوّل إلى transit_map_page الجديدة
// احتُفظ بهذا الملف للتوافق مع أي مرجع موجود
export 'transit_map_page.dart';
siro_rider/lib/views/transit/transit_map_page.dart
+510
View File
@@ -0,0 +1,510 @@
// transit_map_page.dart — خريطة الباص الحي (مواصلاتي)
// خريطة مستقلة داخل مجلد transit — لا تمس home_captain ولا passenger map
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:intaleq_maps/intaleq_maps.dart';
import '../../constant/colors.dart';
import '../../constant/style.dart';
import '../../env/env.dart';
import '../../controller/transit/transit_controller.dart';
// ── ألوان الصفحة ──────────────────────────────────────────────────────────────
Color get _bg =>
Get.isDarkMode ? const Color(0xFF0A0F1E) : const Color(0xFFF0F4FF);
Color get _card =>
Get.isDarkMode ? const Color(0xFF151C2E) : Colors.white;
Color get _text =>
Get.isDarkMode ? const Color(0xFFEEF2FF) : const Color(0xFF1E293B);
Color get _sub =>
Get.isDarkMode ? const Color(0xFF94A3B8) : const Color(0xFF64748B);
const Color _accent = Color(0xFF2563EB);
class TransitMapPage extends StatefulWidget {
final int routeId;
final String routeName;
const TransitMapPage({super.key, required this.routeId, required this.routeName});
@override
State<TransitMapPage> createState() => _TransitMapPageState();
}
class _TransitMapPageState extends State<TransitMapPage> {
IntaleqMapController? _mapCtrl;
InlqBitmap _busIcon = InlqBitmap.defaultMarkerWithHue(120);
bool _busIconLoaded = false;
bool _cameraLocked = true;
@override
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) async {
// تحميل أيقونة الباص من الأصول (bus.png: 499×499، size يضبط الحجم المرئي ~80dp)
try {
_busIcon = InlqBitmap.fromAsset(
'assets/images/bus.png',
size: 0.40,
);
_busIconLoaded = true;
} catch (_) {
_busIcon = InlqBitmap.defaultMarkerWithHue(120);
}
// تحميل بيانات الرحلة + اشتراك السوكيت
await Get.find<TransitController>().openLiveRoute(widget.routeId);
// اشتراك FCM لتنبيهات الخط
Get.find<TransitController>().subscribeToRouteTopic(widget.routeId);
});
}
@override
void dispose() {
Get.find<TransitController>().closeLiveRoute();
Get.find<TransitController>().unsubscribeFromRouteTopic(widget.routeId);
super.dispose();
}
@override
Widget build(BuildContext context) {
final bottomPad = MediaQuery.of(context).padding.bottom;
return Scaffold(
backgroundColor: _bg,
body: GetBuilder<TransitController>(
builder: (c) {
// ── بناء ماركرات المحطات والباص ─────────────────────────
final stops = (c.liveTripData?['stops'] is List)
? List<Map>.from(c.liveTripData!['stops'])
: <Map>[];
final markers = <Marker>{};
// ماركر المحطات
for (final s in stops) {
final lat = double.tryParse(s['latitude']?.toString() ?? '') ?? 0;
final lng = double.tryParse(s['longitude']?.toString() ?? '') ?? 0;
if (lat == 0 && lng == 0) continue;
final isMajor = (s['is_major']?.toString() ?? '0') == '1';
markers.add(Marker(
markerId: MarkerId('stop_${s['id']}'),
position: LatLng(lat, lng),
infoWindow: InfoWindow(title: s['name_ar']?.toString() ?? ''),
icon: InlqBitmap.defaultMarkerWithHue(isMajor ? 30 : 200),
zIndex: 1,
));
}
// ماركر الباص — أيقونة مخصصة 80×80 بدون خلفية
LatLng? busPos;
if (c.liveBusPosition != null) {
busPos = LatLng(c.liveBusPosition!.lat, c.liveBusPosition!.lng);
markers.add(Marker(
markerId: const MarkerId('transit_bus'),
position: busPos,
rotation: c.liveBusPosition!.heading,
anchor: const Offset(0.5, 0.5),
flat: true,
zIndex: 3,
icon: _busIconLoaded ? _busIcon : InlqBitmap.defaultMarkerWithHue(120),
));
// تتبع الكاميرا للباص
if (_cameraLocked && _mapCtrl != null) {
_mapCtrl!.animateCamera(CameraUpdate.newLatLng(busPos));
}
}
// ── polyline الخط ──────────────────────────────────────
final polylines = <Polyline>{};
final encodedPolyline =
c.liveTripData?['trip']?['route_polyline']?.toString() ?? '';
if (encodedPolyline.isNotEmpty) {
final coords = PolylineUtils.decode(encodedPolyline);
if (coords.isNotEmpty) {
polylines.add(Polyline(
polylineId: const PolylineId('transit_route'),
points: coords,
color: _accent.withOpacity(0.7),
width: 4,
));
}
}
final initialTarget = busPos ??
(markers.isNotEmpty
? markers.first.position
: const LatLng(31.95, 35.93));
// ── معلومات البطاقة السفلية ────────────────────────────
final trip = c.liveTripData?['trip'];
final driverName = trip?['driver_name']?.toString() ?? '';
final departure = trip?['departure_time']?.toString() ?? '';
final delayMin =
int.tryParse(trip?['delay_minutes']?.toString() ?? '0') ?? 0;
final currentStopSeq = c.liveBusPosition?.currentStopSeq;
final currentStopName = currentStopSeq != null && stops.isNotEmpty
? stops
.where((s) =>
int.tryParse(s['sequence']?.toString() ?? '') ==
currentStopSeq)
.map((s) => s['name_ar']?.toString() ?? '')
.firstOrNull
: null;
return Stack(
children: [
// ── 1. الخريطة ─────────────────────────────────────
Listener(
onPointerDown: (_) {
if (_cameraLocked) setState(() => _cameraLocked = false);
},
child: IntaleqMap(
apiKey: Env.mapSaasKey,
initialCameraPosition:
CameraPosition(target: initialTarget, zoom: 14.5),
markers: markers,
polylines: polylines,
onMapCreated: (ctrl) => _mapCtrl = ctrl,
mapType: Get.isDarkMode
? IntaleqMapType.normal
: IntaleqMapType.light,
myLocationEnabled: true,
),
),
// ── 2. شريط العنوان ────────────────────────────────
Positioned(
top: MediaQuery.of(context).padding.top + 8,
left: 12,
right: 12,
child: Row(
children: [
// زر الرجوع
GestureDetector(
onTap: () => Get.back(),
child: Container(
width: 42,
height: 42,
decoration: BoxDecoration(
color: _card,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.12),
blurRadius: 10,
offset: const Offset(0, 3))
],
),
child: Icon(Icons.arrow_back_ios_rounded,
color: _text, size: 18),
),
),
const SizedBox(width: 10),
// اسم الخط
Expanded(
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: 14, vertical: 10),
decoration: BoxDecoration(
color: _card,
borderRadius: BorderRadius.circular(16),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.08),
blurRadius: 10,
offset: const Offset(0, 3))
],
),
child: Row(
children: [
Container(
width: 8,
height: 8,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: c.liveBusPosition != null
? Colors.greenAccent.shade400
: Colors.grey,
),
),
const SizedBox(width: 8),
Expanded(
child: Text(
widget.routeName,
style: AppStyle.title.copyWith(
fontSize: 14,
color: _text,
fontWeight: FontWeight.bold),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
],
),
),
),
const SizedBox(width: 10),
// زر إعادة تثبيت الكاميرا
if (!_cameraLocked)
GestureDetector(
onTap: () {
setState(() => _cameraLocked = true);
if (busPos != null && _mapCtrl != null) {
_mapCtrl!.animateCamera(
CameraUpdate.newLatLngZoom(busPos!, 15));
}
},
child: Container(
width: 42,
height: 42,
decoration: BoxDecoration(
color: _accent,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: _accent.withOpacity(0.4),
blurRadius: 10,
offset: const Offset(0, 3))
],
),
child: const Icon(Icons.my_location_rounded,
color: Colors.white, size: 20),
),
),
],
),
),
// ── 3. بانر التأخير ────────────────────────────────
if (delayMin > 0)
Positioned(
top: MediaQuery.of(context).padding.top + 66,
left: 12,
right: 12,
child: _statusBanner(
'🕐 ${'Bus is delayed'.tr} $delayMin ${'min'.tr}',
const Color(0xFFF59E0B),
),
),
// ── 4. حالة التحميل أو الخطأ ─────────────────────
if (c.isLoadingLiveTrip)
Positioned.fill(
child: Container(
color: Colors.black26,
child: const Center(child: CircularProgressIndicator()),
),
),
if (!c.isLoadingLiveTrip && c.liveError.isNotEmpty)
Positioned(
top: MediaQuery.of(context).padding.top + 70,
left: 16,
right: 16,
child: _statusBanner(c.liveError, Colors.redAccent),
),
if (!c.isLoadingLiveTrip &&
c.liveError.isEmpty &&
c.liveBusPosition == null &&
!c.isLoadingLiveTrip)
Positioned(
top: MediaQuery.of(context).padding.top + 70,
left: 16,
right: 16,
child: _statusBanner(
'No bus running on this route right now'.tr,
const Color(0xFFF59E0B),
),
),
// ── 5. بطاقة المعلومات السفلية ─────────────────────
if (!c.isLoadingLiveTrip && trip != null)
Positioned(
bottom: bottomPad + 12,
left: 12,
right: 12,
child: _InfoCard(
driverName: driverName,
departure: departure,
currentStopName: currentStopName,
totalStops: stops.length,
currentStopSeq: currentStopSeq,
onMissedBus: () {
// CTA: فاتك الباص؟ اطلب رحلة
Get.back();
Get.toNamed('/home');
},
),
),
],
);
},
),
);
}
Widget _statusBanner(String text, Color color) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
decoration: BoxDecoration(
color: _card,
borderRadius: BorderRadius.circular(14),
border: Border(right: BorderSide(color: color, width: 4)),
boxShadow: [
BoxShadow(color: Colors.black.withOpacity(0.08), blurRadius: 8)
],
),
child: Text(text,
style: AppStyle.subtitle.copyWith(
color: color, fontWeight: FontWeight.bold, fontSize: 13)),
);
}
}
// ── بطاقة معلومات الرحلة ────────────────────────────────────────────────────
class _InfoCard extends StatelessWidget {
final String driverName;
final String departure;
final String? currentStopName;
final int totalStops;
final int? currentStopSeq;
final VoidCallback onMissedBus;
const _InfoCard({
required this.driverName,
required this.departure,
required this.currentStopName,
required this.totalStops,
required this.currentStopSeq,
required this.onMissedBus,
});
@override
Widget build(BuildContext context) {
return Container(
decoration: BoxDecoration(
color: _card,
borderRadius: BorderRadius.circular(20),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.12),
blurRadius: 20,
offset: const Offset(0, -4))
],
),
padding: const EdgeInsets.all(16),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
// ── صف المعلومات ─────────────────────────────
Row(
children: [
Container(
width: 44,
height: 44,
decoration: BoxDecoration(
color: _accent.withOpacity(0.12),
borderRadius: BorderRadius.circular(12),
),
child: const Icon(Icons.directions_bus_rounded,
color: _accent, size: 26),
),
const SizedBox(width: 12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (driverName.isNotEmpty)
Text(driverName,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 14,
color: _text)),
const SizedBox(height: 2),
Row(
children: [
if (departure.isNotEmpty) ...[
Icon(Icons.schedule_rounded, size: 13, color: _sub),
const SizedBox(width: 3),
Text(departure,
style: TextStyle(fontSize: 12, color: _sub)),
const SizedBox(width: 12),
],
if (currentStopSeq != null) ...[
Icon(Icons.location_on_rounded,
size: 13, color: Colors.greenAccent.shade400),
const SizedBox(width: 3),
Text(
currentStopName ??
'${'Stop'.tr} $currentStopSeq',
style:
TextStyle(fontSize: 12, color: _sub),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
],
],
),
],
),
),
// عداد المحطات
if (totalStops > 0 && currentStopSeq != null)
Column(
children: [
Text(
'$currentStopSeq/$totalStops',
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 16,
color: _accent),
),
Text('Stops'.tr,
style: TextStyle(fontSize: 10, color: _sub)),
],
),
],
),
// ── شريط التقدم بين المحطات ─────────────────
if (totalStops > 0 && currentStopSeq != null) ...[
const SizedBox(height: 12),
ClipRRect(
borderRadius: BorderRadius.circular(4),
child: LinearProgressIndicator(
value: currentStopSeq! / totalStops,
backgroundColor: _accent.withOpacity(0.12),
valueColor: const AlwaysStoppedAnimation<Color>(_accent),
minHeight: 6,
),
),
],
const SizedBox(height: 12),
// ── زر "فاتك الباص؟" ─────────────────────────
SizedBox(
width: double.infinity,
child: OutlinedButton.icon(
onPressed: onMissedBus,
style: OutlinedButton.styleFrom(
side: BorderSide(color: _accent.withOpacity(0.5)),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12)),
padding: const EdgeInsets.symmetric(vertical: 10),
),
icon: const Icon(Icons.local_taxi_rounded, size: 18),
label: Text(
'Missed the bus? Book a ride now'.tr,
style: const TextStyle(fontSize: 13),
),
),
),
],
),
);
}
}
siro_rider/lib/views/transit/transit_routes_page.dart
+2 -2
View File
@@ -6,7 +6,7 @@ import '../../constant/colors.dart';
import '../../constant/style.dart';
import '../../controller/transit/transit_controller.dart';
import '../widgets/my_scafold.dart';
import 'transit_live_map_page.dart';
import 'transit_map_page.dart';
class TransitRoutesPage extends StatefulWidget {
final int orgId;
@@ -64,7 +64,7 @@ class _TransitRoutesPageState extends State<TransitRoutesPage> {
subtitle: Text('${r.stopCount} ${'Stops'.tr}', style: AppStyle.subtitle),
trailing: const Icon(Icons.arrow_forward_ios, size: 16),
onTap: () => Get.to(
() => TransitLiveMapPage(routeId: r.id, routeName: r.nameAr),
() => TransitMapPage(routeId: r.id, routeName: r.nameAr),
),
),
);