Update: 2026-07-10 17:26:15

siro_rider/lib/controller/home/map/ride_lifecycle_controller.dart

@@ -3719,18 +3719,24 @@ class RideLifecycleController extends GetxController {
 
       // بناء الـ markers أولاً ثم وضعها معاً مع polylines في تحديث واحد
       final Set<Marker> newMarkers = {
-        // لا نمرر InfoWindow هنا: صور A/B تحتوي الحرف أصلاً، وأي textField
-        // إضافي يرسم حرفاً مكرراً فوق الدبوس بعد إصلاح الخطوط في الـ SDK.
         Marker(
           markerId: const MarkerId('start'),
           position: startLoc,
           icon: InlqBitmap.fromStyleImage('start_icon'),
+          infoWindow: InfoWindow(
+            title: startNameAddress.split('،').first.trim(),
+            snippet: 'start',
+          ),
           anchor: const Offset(0.5, 1.0),
         ),
         Marker(
           markerId: const MarkerId('end'),
           position: endLoc,
           icon: InlqBitmap.fromStyleImage('end_icon'),
+          infoWindow: InfoWindow(
+            title: endNameAddress.split('،').first.trim(),
+            snippet: 'end',
+          ),
           anchor: const Offset(0.5, 1.0),
         ),
       };
@@ -3745,6 +3751,10 @@ class RideLifecycleController extends GetxController {
             icon: InlqBitmap.fromStyleImage(isFirstWaypoint
                 ? 'start_icon'
                 : 'end_icon'),
+            infoWindow: InfoWindow(
+              title: 'توقف ${i + 1}',
+              snippet: 'stop_$i',
+            ),
             anchor: const Offset(0.5, 1.0),
           ));
         }

siro_rider/lib/controller/themes/themes.dart

@@ -5,7 +5,7 @@ import '../../constant/colors.dart';
 
 ThemeData lightThemeEnglish = ThemeData(
   brightness: Brightness.light,
-  fontFamily: "SFPro",
+  fontFamily: 'CupertinoSystemText',
   textTheme: TextTheme(
     displaySmall: AppStyle.title,
     displayLarge: AppStyle.headTitle,
@@ -41,7 +41,7 @@ ThemeData lightThemeEnglish = ThemeData(
 
 ThemeData darkThemeEnglish = ThemeData(
   brightness: Brightness.dark,
-  fontFamily: "SFPro",
+  fontFamily: 'CupertinoSystemText',
   primaryColor: AppColor.primaryColor,
   scaffoldBackgroundColor: const Color(0xFF121212),
   cardColor: const Color(0xFF1E1E1E),
@@ -75,7 +75,7 @@ ThemeData darkThemeEnglish = ThemeData(
 
 ThemeData lightThemeArabic = ThemeData(
   brightness: Brightness.light,
-  fontFamily: 'SFArabic',
+  fontFamily: 'CupertinoSystemText',
   textTheme: TextTheme(
     displaySmall: AppStyle.title,
     displayLarge: AppStyle.headTitle,
@@ -111,7 +111,7 @@ ThemeData lightThemeArabic = ThemeData(
 
 ThemeData darkThemeArabic = ThemeData(
   brightness: Brightness.dark,
-  fontFamily: 'SFArabic',
+  fontFamily: 'CupertinoSystemText',
   primaryColor: AppColor.primaryColor,
   scaffoldBackgroundColor: const Color(0xFF121212),
   cardColor: const Color(0xFF1E1E1E),