Update: 2026-08-02 22:51:18

siro_admin/lib/views/admin/drivers/monitor_ride.dart

@@ -1,3 +1,4 @@
+import 'package:siro_admin/constant/theme.dart';
 import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -428,14 +429,14 @@ class RideMonitorScreen extends StatelessWidget {
                     point: controller.startPoint.value!,
                     width: 30,
                     height: 30,
-                    child: _buildPointMarker(const Color(0xFF10B981), cs),
+                    child: _buildPointMarker(cs.success, cs),
                   ),
                 if (controller.endPoint.value != null)
                   Marker(
                     point: controller.endPoint.value!,
                     width: 30,
                     height: 30,
-                    child: _buildPointMarker(const Color(0xFFEF4444), cs),
+                    child: _buildPointMarker(cs.danger, cs),
                   ),
                 if (controller.driverLocation.value != null)
                   Marker(
@@ -666,8 +667,8 @@ class RideMonitorScreen extends StatelessWidget {
                                       color: controller.rideStatus.value
                                                   .toLowerCase() ==
                                               'begin'
-                                          ? const Color(0xFF10B981)
-                                          : const Color(0xFFF59E0B),
+                                          ? cs.success
+                                          : cs.warning,
                                     ),
                                   ),
                                   const SizedBox(width: 6),
@@ -697,7 +698,7 @@ class RideMonitorScreen extends StatelessWidget {
                           _buildModernInfoBadge(
                             Icons.speed_rounded,
                             "${controller.driverLocation.value!.speed.toStringAsFixed(1)} كم/س",
-                            const Color(0xFF3B82F6),
+                            cs.info,
                             cs,
                           ),
                           Container(