Update: 2026-08-03 00:20:40

siro_admin/lib/views/admin/analytics/live_analytics_page.dart

@@ -1,3 +1,4 @@
+import 'package:siro_admin/constant/map_tiles.dart';
 import 'package:siro_admin/constant/theme.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
@@ -377,9 +378,9 @@ class _MapTabState extends State<_MapTab> with AutomaticKeepAliveClientMixin {
       spacing: 8,
       runSpacing: 8,
       children: [
-        _LayerChip('فجوة العرض/الطلب', showGap, Colors.redAccent,
+        _LayerChip('فجوة العرض/الطلب', showGap, cs.danger,
             (v) => setState(() => showGap = v)),
-        _LayerChip('كثافة الطلب', showHeatmap, Colors.orange,
+        _LayerChip('كثافة الطلب', showHeatmap, cs.warning,
             (v) => setState(() => showHeatmap = v)),
         _LayerChip('مواقع الكباتن', showSupply, cs.success,
             (v) => setState(() => showSupply = v)),
@@ -409,7 +410,7 @@ class _MapTabState extends State<_MapTab> with AutomaticKeepAliveClientMixin {
         markers.add(CircleMarker(
           point: LatLng(lat, lng),
           color: gap > 0
-              ? Colors.redAccent.withValues(alpha: 0.3 + intensity * 0.5)
+              ? cs.danger.withValues(alpha: 0.3 + intensity * 0.5)
               : cs.success.withValues(alpha: 0.4),
           borderStrokeWidth: 0,
           radius: 12 + intensity * 8,
@@ -426,7 +427,7 @@ class _MapTabState extends State<_MapTab> with AutomaticKeepAliveClientMixin {
           if (lat == 0 || lng == 0) continue;
           markers.add(CircleMarker(
             point: LatLng(lat, lng),
-            color: Colors.orange.withValues(alpha: 0.35),
+            color: cs.warning.withValues(alpha: 0.35),
             borderStrokeWidth: 0,
             radius: 5,
           ));
@@ -499,12 +500,7 @@ class _MapTabState extends State<_MapTab> with AutomaticKeepAliveClientMixin {
         child: FlutterMap(
           options: MapOptions(initialCenter: center, initialZoom: 11),
           children: [
-            TileLayer(
-              urlTemplate:
-                  'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png',
-              subdomains: const ['a', 'b', 'c', 'd'],
-              userAgentPackageName: 'com.siromove.admin',
-            ),
+            MapTiles.layer(context),
             CircleLayer(circles: markers),
           ],
         ),