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

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

Browse Source
This commit is contained in:
Hamza-Ayed
2026-08-03 00:20:40 +03:00
parent c23c3c0721
commit 2b9f696372
39 changed files with 38513 additions and 38217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
siro_admin/lib/views/admin/analytics/live_analytics_page.dart
+6 -10
View File
@@ -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),
],
),
siro_admin/lib/views/admin/captain/captain_details.dart
+21 -20
View File
@@ -1,3 +1,4 @@
import 'package:siro_admin/constant/theme.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
@@ -75,12 +76,12 @@ class CaptainDetailsPage extends StatelessWidget {
children: [
_buildDetailTile(Icons.star_rate_rounded, 'Rating',
'${data['ratingPassenger'] ?? 0.0} / 5.0',
valueColor: Colors.amber[700]),
valueColor: cs.warning[700]),
_buildDetailTile(Icons.directions_car_filled_outlined,
'Total Rides', data['countPassengerRide']),
_buildDetailTile(Icons.cancel_outlined,
'Canceled Rides', data['countPassengerCancel'],
valueColor: Colors.redAccent),
valueColor: cs.danger),
],
),
const SizedBox(height: 30),
@@ -107,7 +108,7 @@ class CaptainDetailsPage extends StatelessWidget {
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.1),
color: cs.onSurfaceVariant.withValues(alpha: 0.1),
blurRadius: 10,
offset: const Offset(0, 5),
)
@@ -118,7 +119,7 @@ class CaptainDetailsPage extends StatelessWidget {
children: [
CircleAvatar(
radius: 45,
backgroundColor: AppColor.primaryColor.withOpacity(0.1),
backgroundColor: AppColor.primaryColor.withValues(alpha: 0.1),
child: Text(
data['first_name'] != null
? data['first_name'][0].toUpperCase()
@@ -141,14 +142,14 @@ class CaptainDetailsPage extends StatelessWidget {
Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
decoration: BoxDecoration(
color: Colors.green.withOpacity(0.1),
color: cs.success.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(20),
),
child: Text(
'Active Captain'.tr,
style: const TextStyle(
fontSize: 12,
color: Colors.green,
color: cs.success,
fontWeight: FontWeight.w600),
),
),
@@ -168,11 +169,11 @@ class CaptainDetailsPage extends StatelessWidget {
borderRadius: BorderRadius.circular(16),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.05),
color: cs.onSurfaceVariant.withValues(alpha: 0.05),
spreadRadius: 2,
blurRadius: 10)
],
border: Border.all(color: Colors.grey.withOpacity(0.1)),
border: Border.all(color: cs.onSurfaceVariant.withValues(alpha: 0.1)),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -186,7 +187,7 @@ class CaptainDetailsPage extends StatelessWidget {
fontSize: 17, fontWeight: FontWeight.bold)),
],
),
Divider(height: 25, color: Colors.grey.withOpacity(0.2)),
Divider(height: 25, color: cs.onSurfaceVariant.withValues(alpha: 0.2)),
...children,
],
),
@@ -202,9 +203,9 @@ class CaptainDetailsPage extends StatelessWidget {
Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: Colors.grey[100],
color: cs.onSurfaceVariant,
borderRadius: BorderRadius.circular(8)),
child: Icon(icon, color: Colors.grey[600], size: 18),
child: Icon(icon, color: cs.onSurfaceVariant, size: 18),
),
const SizedBox(width: 14),
Expanded(
@@ -212,7 +213,7 @@ class CaptainDetailsPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(label.tr,
style: TextStyle(fontSize: 12, color: Colors.grey[500])),
style: TextStyle(fontSize: 12, color: cs.onSurfaceVariant)),
Text(
value?.toString() ?? 'N/A',
style: TextStyle(
@@ -244,7 +245,7 @@ class CaptainDetailsPage extends StatelessWidget {
label: Text("بطاقة الأداء (Scorecard)",
style: const TextStyle(color: Colors.white, fontSize: 16)),
style: ElevatedButton.styleFrom(
backgroundColor: Colors.blueAccent,
backgroundColor: cs.info,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12)),
),
@@ -306,8 +307,8 @@ class CaptainDetailsPage extends StatelessWidget {
icon: const Icon(Icons.delete_outline_rounded, size: 20),
label: Text("Delete".tr),
style: ElevatedButton.styleFrom(
backgroundColor: Colors.red[50],
foregroundColor: Colors.red,
backgroundColor: cs.danger[50],
foregroundColor: cs.danger,
elevation: 0,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12)),
@@ -324,7 +325,7 @@ class CaptainDetailsPage extends StatelessWidget {
Text(
"Only Super Admins can edit or delete captains.",
style: TextStyle(
color: Colors.grey[400],
color: cs.onSurfaceVariant,
fontSize: 12,
fontStyle: FontStyle.italic),
)
@@ -394,7 +395,7 @@ class CaptainDetailsPage extends StatelessWidget {
),
cancel: TextButton(
onPressed: () => Get.back(),
child: Text('Cancel'.tr, style: const TextStyle(color: Colors.grey))),
child: Text('Cancel'.tr, style: const TextStyle(color: cs.onSurfaceVariant))),
);
}
@@ -402,12 +403,12 @@ class CaptainDetailsPage extends StatelessWidget {
Get.defaultDialog(
title: 'Confirm Deletion'.tr,
titleStyle:
const TextStyle(color: Colors.redAccent, fontWeight: FontWeight.bold),
const TextStyle(color: cs.danger, fontWeight: FontWeight.bold),
middleText:
'Are you sure you want to delete ${user['first_name']}? This action cannot be undone.'
.tr,
confirm: ElevatedButton(
style: ElevatedButton.styleFrom(backgroundColor: Colors.redAccent),
style: ElevatedButton.styleFrom(backgroundColor: cs.danger),
onPressed: () {
// Call delete function here
// controller.deleteCaptain(user['id']);
@@ -418,7 +419,7 @@ class CaptainDetailsPage extends StatelessWidget {
),
cancel: TextButton(
onPressed: () => Get.back(),
child: Text('Cancel'.tr, style: const TextStyle(color: Colors.grey))),
child: Text('Cancel'.tr, style: const TextStyle(color: cs.onSurfaceVariant))),
);
}
}
siro_admin/lib/views/admin/captain/register_captain.dart
+4 -3
View File
@@ -1,3 +1,4 @@
import 'package:siro_admin/constant/theme.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_admin/controller/admin/register_captain_controller.dart';
@@ -614,7 +615,7 @@ Please fill in the JSON object with the extracted information, following these g
Text(
'${'License Expiry Date'.tr}: ${licenseExpiryDate.toString().substring(0, 10)}',
style: TextStyle(
color: isLicenseExpired ? Colors.red : Colors.green,
color: isLicenseExpired ? cs.danger : cs.success,
),
),
// Removed Fuel as it's not available
@@ -795,7 +796,7 @@ Please fill in the JSON object with the extracted information, following these g
Text(
'${'Tax Expiry Date'.tr}: $taxExpiryDate',
style: TextStyle(
color: isExpired ? Colors.red : Colors.green,
color: isExpired ? cs.danger : cs.success,
),
),
const SizedBox(height: 8.0),
@@ -806,7 +807,7 @@ Please fill in the JSON object with the extracted information, following these g
'${'Inspection Date'.tr}: $carBackLicenseExpired',
style: TextStyle(
color:
isInspectionExpired ? Colors.red : Colors.green,
isInspectionExpired ? cs.danger : cs.success,
),
),
],
siro_admin/lib/views/admin/dashboard_widget.dart
+3 -2
View File
@@ -1,3 +1,4 @@
import 'package:siro_admin/constant/theme.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart'; // For Get.width if needed, and .tr
import 'package:siro_admin/constant/colors.dart'; // Assuming AppColor is here
@@ -38,7 +39,7 @@ class DashboardStatCard extends StatelessWidget {
borderRadius: finalBorderRadius,
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.1),
color: cs.onSurfaceVariant.withValues(alpha: 0.1),
spreadRadius: 1,
blurRadius: 6,
offset: const Offset(0, 2),
@@ -72,7 +73,7 @@ class DashboardStatCard extends StatelessWidget {
Icon(
icon,
size: 24,
color: iconColor ?? AppColor.primaryColor.withOpacity(0.7),
color: iconColor ?? AppColor.primaryColor.withValues(alpha: 0.7),
),
],
),
siro_admin/lib/views/admin/drivers/driver_the_best.dart
+36 -35
View File
@@ -1,3 +1,4 @@
import 'package:siro_admin/constant/theme.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart'; // Ensure get_storage is in pubspec.yaml
@@ -164,14 +165,14 @@ class DriverTheBestRedesigned extends StatelessWidget {
Row(
children: [
const Icon(Icons.access_time,
color: Colors.grey, size: 12),
color: cs.onSurfaceVariant, size: 12),
const SizedBox(width: 4),
Text(
ctrl.lastUpdated.isNotEmpty
? 'Updated: ${ctrl.lastUpdated}'
: 'Data Live',
style: TextStyle(
color: Colors.grey[400], fontSize: 12),
color: cs.onSurfaceVariant, fontSize: 12),
),
],
),
@@ -190,7 +191,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
textConfirm: "Yes, Clear",
textCancel: "Cancel",
confirmTextColor: Colors.white,
buttonColor: Colors.red,
buttonColor: cs.danger,
onConfirm: () {
ctrl.clearPaidStorage();
Get.back();
@@ -198,7 +199,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
);
},
icon: const Icon(Icons.delete_forever,
color: Colors.redAccent),
color: cs.danger),
tooltip: "Clear Paid Storage",
style: IconButton.styleFrom(
backgroundColor: Colors.white10),
@@ -209,7 +210,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
ctrl.fetchData();
},
icon: const Icon(Icons.refresh,
color: Colors.blueAccent),
color: cs.info),
style: IconButton.styleFrom(
backgroundColor: Colors.white10),
),
@@ -232,11 +233,11 @@ class DriverTheBestRedesigned extends StatelessWidget {
children: [
Expanded(
child: _buildStatCard('Total',
totalDrivers.toString(), Colors.blue)),
totalDrivers.toString(), cs.info)),
const SizedBox(width: 8),
Expanded(
child: _buildStatCard('Elite',
eliteCount.toString(), Colors.amber)),
eliteCount.toString(), cs.warning)),
],
),
),
@@ -247,13 +248,13 @@ class DriverTheBestRedesigned extends StatelessWidget {
children: [
Expanded(
child: _buildStatCard('Inactive',
inactiveCount.toString(), Colors.red)),
inactiveCount.toString(), cs.danger)),
const SizedBox(width: 8),
Expanded(
child: _buildStatCard(
'Max Time',
'${maxTime.toStringAsFixed(1)}h',
Colors.green)),
cs.success)),
],
),
),
@@ -266,7 +267,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
decoration: InputDecoration(
hintText: 'Search by phone number...',
prefixIcon:
const Icon(Icons.search, color: Colors.grey),
const Icon(Icons.search, color: cs.onSurfaceVariant),
filled: true,
fillColor: Colors.white,
border: OutlineInputBorder(
@@ -275,7 +276,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide(color: Colors.grey.shade200),
borderSide: BorderSide(color: cs.onSurfaceVariant.shade200),
),
),
),
@@ -291,7 +292,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
ctrl.searchQuery.isNotEmpty
? "No drivers found with this number"
: "No drivers available",
style: TextStyle(color: Colors.grey[400])),
style: TextStyle(color: cs.onSurfaceVariant)),
))
else
ListView.separated(
@@ -354,7 +355,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
border: Border(right: BorderSide(color: color, width: 4)),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.1),
color: cs.onSurfaceVariant.withValues(alpha: 0.1),
blurRadius: 4,
offset: const Offset(0, 2))
],
@@ -366,13 +367,13 @@ class DriverTheBestRedesigned extends StatelessWidget {
Text(title,
style: const TextStyle(
fontSize: 12,
color: Colors.grey,
color: cs.onSurfaceVariant,
fontWeight: FontWeight.bold)),
const SizedBox(height: 4),
Text(value,
style: TextStyle(
fontSize: 22,
color: color.withOpacity(0.8),
color: color.withValues(alpha: 0.8),
fontWeight: FontWeight.bold)),
],
),
@@ -390,21 +391,21 @@ class DriverTheBestRedesigned extends StatelessWidget {
Color statusColor;
if (hours >= 50) {
statusText = "Elite";
statusColor = Colors.amber;
statusColor = cs.warning;
} else if (hours >= 20) {
statusText = "Stable";
statusColor = Colors.green;
statusColor = cs.success;
} else if (hours >= 5) {
statusText = "Experimental";
statusColor = Colors.blue;
statusColor = cs.info;
} else {
statusText = "Inactive";
statusColor = Colors.red;
statusColor = cs.danger;
}
// Override colors if paid
Color cardBackground = isPaid ? Colors.teal.shade50 : Colors.white;
Color borderColor = isPaid ? Colors.teal : Colors.transparent;
Color cardBackground = isPaid ? cs.tertiary.shade50 : Colors.white;
Color borderColor = isPaid ? cs.tertiary : Colors.transparent;
// Calculate progress (max assumed 60 hours for 100% bar)
double progress = (hours / 60).clamp(0.0, 1.0);
@@ -417,7 +418,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
borderRadius: BorderRadius.circular(12),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.05),
color: cs.onSurfaceVariant.withValues(alpha: 0.05),
blurRadius: 10,
offset: const Offset(0, 4))
],
@@ -432,7 +433,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
padding:
const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
decoration: BoxDecoration(
color: Colors.teal,
color: cs.tertiary,
borderRadius: BorderRadius.circular(4)),
child: const Text("PAID",
style: TextStyle(
@@ -447,7 +448,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
children: [
// Avatar
CircleAvatar(
backgroundColor: statusColor.withOpacity(0.1),
backgroundColor: statusColor.withValues(alpha: 0.1),
radius: 24,
child: Text(
hours.toStringAsFixed(0),
@@ -468,7 +469,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
fontWeight: FontWeight.bold,
fontSize: 16,
color: isPaid
? Colors.teal.shade900
? cs.tertiary.shade900
: const Color(0xFF334155)),
),
const SizedBox(height: 4),
@@ -477,12 +478,12 @@ class DriverTheBestRedesigned extends StatelessWidget {
style: const TextStyle(
fontFamily: 'monospace',
fontSize: 12,
color: Colors.grey),
color: cs.onSurfaceVariant),
),
const SizedBox(height: 2),
Text(
driver['active_time'] ?? '',
style: TextStyle(fontSize: 10, color: Colors.grey[400]),
style: TextStyle(fontSize: 10, color: cs.onSurfaceVariant),
),
],
),
@@ -492,9 +493,9 @@ class DriverTheBestRedesigned extends StatelessWidget {
Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: statusColor.withOpacity(0.1),
color: statusColor.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(4),
border: Border.all(color: statusColor.withOpacity(0.2)),
border: Border.all(color: statusColor.withValues(alpha: 0.2)),
),
child: Text(
statusText,
@@ -517,7 +518,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Performance",
style: TextStyle(fontSize: 10, color: Colors.grey[600])),
style: TextStyle(fontSize: 10, color: cs.onSurfaceVariant)),
Text("${hours.toStringAsFixed(2)} hrs",
style: const TextStyle(
fontSize: 10, fontWeight: FontWeight.bold)),
@@ -526,7 +527,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
const SizedBox(height: 4),
LinearProgressIndicator(
value: progress,
backgroundColor: Colors.grey[100],
backgroundColor: cs.onSurfaceVariant,
color: statusColor,
minHeight: 6,
borderRadius: BorderRadius.circular(3),
@@ -546,7 +547,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
isPaid
? const Text("Payment Completed",
style: TextStyle(
color: Colors.teal, fontWeight: FontWeight.bold))
color: cs.tertiary, fontWeight: FontWeight.bold))
: ElevatedButton.icon(
onPressed: () {
_showPayDialog(driver, controller);
@@ -554,7 +555,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
icon: const Icon(Icons.card_giftcard, size: 16),
label: Text("Pay Gift".tr),
style: ElevatedButton.styleFrom(
backgroundColor: Colors.indigo, // Dark blue/purple
backgroundColor: cs.info, // Dark blue/purple
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(
horizontal: 16, vertical: 8),
@@ -588,7 +589,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
color: Color(0xFF0F172A), fontWeight: FontWeight.bold),
content: Column(
children: [
const Icon(Icons.wallet_giftcard, size: 50, color: Colors.indigo),
const Icon(Icons.wallet_giftcard, size: 50, color: cs.info),
const SizedBox(height: 10),
Text(
'Sending gift to ${driver['name_arabic']}',
@@ -609,7 +610,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
),
textConfirm: 'Pay Now',
confirmTextColor: Colors.white,
buttonColor: Colors.indigo,
buttonColor: cs.info,
onConfirm: () async {
final wallet = Get.put(WalletController());
siro_admin/lib/views/admin/drivers/driver_tracker_screen.dart
+2 -4
View File
@@ -1,3 +1,4 @@
import 'package:siro_admin/constant/map_tiles.dart';
import 'package:siro_admin/constant/theme.dart';
import 'dart:async';
import 'dart:convert';
@@ -515,10 +516,7 @@ class _SiroTrackerScreenState extends State<SiroTrackerScreen>
initialZoom: 10.0,
),
children: [
TileLayer(
urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
userAgentPackageName: 'com.siromove.admin',
),
MapTiles.layer(context),
MarkerLayer(markers: _markers),
],
),
siro_admin/lib/views/admin/drivers/monitor_ride.dart
+2 -4
View File
@@ -1,3 +1,4 @@
import 'package:siro_admin/constant/map_tiles.dart';
import 'package:siro_admin/constant/theme.dart';
import 'dart:async';
import 'package:flutter/material.dart';
@@ -404,10 +405,7 @@ class RideMonitorScreen extends StatelessWidget {
initialZoom: 12.0,
),
children: [
TileLayer(
urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
userAgentPackageName: 'com.siromove.admin',
),
MapTiles.layer(context),
if (controller.routePolyline.isNotEmpty)
PolylineLayer(
polylines: [
siro_admin/lib/views/admin/employee/employee_page.dart
+1 -1
View File
@@ -132,7 +132,7 @@ class _EmployeeCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
bool isExcellent = employee['status'].toString().contains('ممتاز');
Color statusColor = isExcellent ? cs.success : Colors.amber;
Color statusColor = isExcellent ? cs.success : cs.warning;
return Container(
margin: const EdgeInsets.only(bottom: 16),
siro_admin/lib/views/admin/enceypt/encrypt.dart
+7 -7
View File
@@ -339,7 +339,7 @@ class _EncryptToolPageState extends State<EncryptToolPage>
color: _AppColors.accentGlow,
borderRadius: BorderRadius.circular(20),
border: Border.all(
color: _AppColors.accent.withOpacity(0.3)),
color: _AppColors.accent.withValues(alpha: 0.3)),
),
child: const Text(
'AES-256',
@@ -368,7 +368,7 @@ class _EncryptToolPageState extends State<EncryptToolPage>
children: [
// ─── Input Card ─────────────────────────────────────
_GlassCard(
borderColor: _AppColors.accent.withOpacity(0.2),
borderColor: _AppColors.accent.withValues(alpha: 0.2),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -503,7 +503,7 @@ class _EncryptToolPageState extends State<EncryptToolPage>
borderRadius: BorderRadius.circular(14),
border: Border.all(
color: _AppColors.error
.withOpacity(0.4)),
.withValues(alpha: 0.4)),
),
child: Row(
children: [
@@ -532,7 +532,7 @@ class _EncryptToolPageState extends State<EncryptToolPage>
const SizedBox(height: 20),
_GlassCard(
borderColor:
_AppColors.accentDecrypt.withOpacity(0.25),
_AppColors.accentDecrypt.withValues(alpha: 0.25),
headerWidget: Container(
padding: const EdgeInsets.symmetric(
horizontal: 20, vertical: 14),
@@ -671,7 +671,7 @@ class _GlassCard extends StatelessWidget {
border: Border.all(color: borderColor, width: 1.2),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.35),
color: Colors.black.withValues(alpha: 0.35),
blurRadius: 24,
offset: const Offset(0, 8),
),
@@ -826,9 +826,9 @@ class _MiniIconButton extends StatelessWidget {
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
decoration: BoxDecoration(
color: color.withOpacity(0.1),
color: color.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(8),
border: Border.all(color: color.withOpacity(0.25)),
border: Border.all(color: color.withValues(alpha: 0.25)),
),
child: Row(
mainAxisSize: MainAxisSize.min,
siro_admin/lib/views/admin/error/error/error_page.dart
+2 -2
View File
@@ -597,14 +597,14 @@ class _ErrorTile extends StatelessWidget {
icon: Icons.devices,
label: 'Path',
value: item.device,
color: Colors.orange,
color: cs.warning,
cs: cs,
),
_buildInfoBadge(
icon: Icons.schedule,
label: 'التاريخ',
value: item.createdAt,
color: Colors.teal,
color: cs.tertiary,
cs: cs,
),
],
siro_admin/lib/views/admin/marketing/heatmap_page.dart
+9 -10
View File
@@ -1,3 +1,5 @@
import 'package:siro_admin/constant/theme.dart';
import 'package:siro_admin/constant/map_tiles.dart';
import 'package:flutter/material.dart';
import 'package:flutter_map/flutter_map.dart';
import 'package:latlong2/latlong.dart';
@@ -62,14 +64,14 @@ class _HeatmapPageState extends State<HeatmapPage> {
Color markerColor;
switch (source) {
case 'geofence':
markerColor = Colors.green.withValues(alpha: 0.65);
markerColor = cs.success.withValues(alpha: 0.65);
break;
case 'silent_push':
markerColor = Colors.orange.withValues(alpha: 0.55);
markerColor = cs.warning.withValues(alpha: 0.55);
break;
case 'app_usage':
default:
markerColor = Colors.blue.withValues(alpha: 0.5);
markerColor = cs.info.withValues(alpha: 0.5);
}
return CircleMarker(
@@ -249,10 +251,7 @@ class _HeatmapPageState extends State<HeatmapPage> {
initialZoom: 12.0,
),
children: [
TileLayer(
urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
userAgentPackageName: 'com.siromove.admin',
),
MapTiles.layer(context),
CircleLayer(circles: _markers),
],
),
@@ -270,11 +269,11 @@ class _HeatmapPageState extends State<HeatmapPage> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_LegendItem(color: Colors.green, label: 'دخل منطقة سياج', cs: cs),
_LegendItem(color: cs.success, label: 'دخل منطقة سياج', cs: cs),
const SizedBox(height: 4),
_LegendItem(color: Colors.blue, label: 'فتح عادي للتطبيق', cs: cs),
_LegendItem(color: cs.info, label: 'فتح عادي للتطبيق', cs: cs),
const SizedBox(height: 4),
_LegendItem(color: Colors.orange, label: 'إيقاظ صامت', cs: cs),
_LegendItem(color: cs.warning, label: 'إيقاظ صامت', cs: cs),
],
),
),
siro_admin/lib/views/admin/passenger/form_passenger.dart
+2 -1
View File
@@ -1,3 +1,4 @@
import 'package:siro_admin/constant/theme.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
@@ -73,7 +74,7 @@ GetBuilder<PassengerAdminController> formSearchPassengers() {
},
icon: Icon(
Icons.clear,
color: Colors.red[300],
color: cs.danger[300],
),
),
),
siro_admin/lib/views/admin/passenger/passenger_details_page.dart
+21 -20
View File
@@ -1,3 +1,4 @@
import 'package:siro_admin/constant/theme.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
@@ -79,7 +80,7 @@ class PassengerDetailsPage extends StatelessWidget {
Icons.sos,
'SOS Phone',
data['sosPhone'] ?? 'N/A',
valueColor: Colors.redAccent,
valueColor: cs.danger,
),
],
),
@@ -94,7 +95,7 @@ class PassengerDetailsPage extends StatelessWidget {
Icons.star_rate_rounded,
'Rating',
'${data['ratingPassenger'] ?? 0.0}',
valueColor: Colors.amber[700],
valueColor: cs.warning[700],
),
_buildDetailTile(
Icons.directions_car_filled_outlined,
@@ -105,7 +106,7 @@ class PassengerDetailsPage extends StatelessWidget {
Icons.cancel_outlined,
'Canceled Rides',
data['countPassengerCancel'],
valueColor: Colors.redAccent,
valueColor: cs.danger,
),
_buildDetailTile(
Icons.rate_review_outlined,
@@ -143,7 +144,7 @@ class PassengerDetailsPage extends StatelessWidget {
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.1),
color: cs.onSurfaceVariant.withValues(alpha: 0.1),
blurRadius: 10,
offset: const Offset(0, 5),
)
@@ -154,7 +155,7 @@ class PassengerDetailsPage extends StatelessWidget {
children: [
CircleAvatar(
radius: 45,
backgroundColor: AppColor.primaryColor.withOpacity(0.1),
backgroundColor: AppColor.primaryColor.withValues(alpha: 0.1),
child: Text(
fullName[0].toUpperCase(),
style: TextStyle(
@@ -175,14 +176,14 @@ class PassengerDetailsPage extends StatelessWidget {
Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
decoration: BoxDecoration(
color: Colors.blue.withOpacity(0.1),
color: cs.info.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(20),
),
child: Text(
data['status'] ?? 'Active',
style: const TextStyle(
fontSize: 12,
color: Colors.blue,
color: cs.info,
fontWeight: FontWeight.w600),
),
),
@@ -202,11 +203,11 @@ class PassengerDetailsPage extends StatelessWidget {
borderRadius: BorderRadius.circular(16),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.05),
color: cs.onSurfaceVariant.withValues(alpha: 0.05),
spreadRadius: 2,
blurRadius: 10)
],
border: Border.all(color: Colors.grey.withOpacity(0.1)),
border: Border.all(color: cs.onSurfaceVariant.withValues(alpha: 0.1)),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -220,7 +221,7 @@ class PassengerDetailsPage extends StatelessWidget {
fontSize: 17, fontWeight: FontWeight.bold)),
],
),
Divider(height: 25, color: Colors.grey.withOpacity(0.2)),
Divider(height: 25, color: cs.onSurfaceVariant.withValues(alpha: 0.2)),
...children,
],
),
@@ -236,9 +237,9 @@ class PassengerDetailsPage extends StatelessWidget {
Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: Colors.grey[100],
color: cs.onSurfaceVariant,
borderRadius: BorderRadius.circular(8)),
child: Icon(icon, color: Colors.grey[600], size: 18),
child: Icon(icon, color: cs.onSurfaceVariant, size: 18),
),
const SizedBox(width: 14),
Expanded(
@@ -246,7 +247,7 @@ class PassengerDetailsPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(label.tr,
style: TextStyle(fontSize: 12, color: Colors.grey[500])),
style: TextStyle(fontSize: 12, color: cs.onSurfaceVariant)),
Text(
value?.toString() ?? 'N/A',
style: TextStyle(
@@ -320,8 +321,8 @@ class PassengerDetailsPage extends StatelessWidget {
icon: const Icon(Icons.delete_outline_rounded, size: 20),
label: Text("Delete".tr),
style: ElevatedButton.styleFrom(
backgroundColor: Colors.red[50],
foregroundColor: Colors.red,
backgroundColor: cs.danger[50],
foregroundColor: cs.danger,
elevation: 0,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12)),
@@ -338,7 +339,7 @@ class PassengerDetailsPage extends StatelessWidget {
Text(
"Only Super Admins can edit or delete passengers.",
style: TextStyle(
color: Colors.grey[400],
color: cs.onSurfaceVariant,
fontSize: 12,
fontStyle: FontStyle.italic),
)
@@ -405,7 +406,7 @@ class PassengerDetailsPage extends StatelessWidget {
),
cancel: TextButton(
onPressed: () => Get.back(),
child: Text('Cancel'.tr, style: const TextStyle(color: Colors.grey))),
child: Text('Cancel'.tr, style: const TextStyle(color: cs.onSurfaceVariant))),
);
}
@@ -413,12 +414,12 @@ class PassengerDetailsPage extends StatelessWidget {
Get.defaultDialog(
title: 'Confirm Deletion'.tr,
titleStyle:
const TextStyle(color: Colors.redAccent, fontWeight: FontWeight.bold),
const TextStyle(color: cs.danger, fontWeight: FontWeight.bold),
middleText:
'Are you sure you want to delete ${user['first_name']}? This action cannot be undone.'
.tr,
confirm: ElevatedButton(
style: ElevatedButton.styleFrom(backgroundColor: Colors.redAccent),
style: ElevatedButton.styleFrom(backgroundColor: cs.danger),
onPressed: () async {
// 1. Close Dialog
Get.back();
@@ -447,7 +448,7 @@ class PassengerDetailsPage extends StatelessWidget {
),
cancel: TextButton(
onPressed: () => Get.back(),
child: Text('Cancel'.tr, style: const TextStyle(color: Colors.grey)),
child: Text('Cancel'.tr, style: const TextStyle(color: cs.onSurfaceVariant)),
),
);
}
siro_admin/lib/views/admin/pricing/kazan_editor_page.dart
+10 -9
View File
@@ -1,3 +1,4 @@
import 'package:siro_admin/constant/theme.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:get/get.dart';
@@ -164,12 +165,12 @@ class KazanEditorPage extends StatelessWidget {
'speedPrice': {
'label': 'Speed ⚡',
'icon': Icons.flash_on_rounded,
'color': Colors.amber.shade700
'color': cs.warning.shade700
},
'comfortPrice': {
'label': 'Comfort ❄️',
'icon': Icons.chair_rounded,
'color': Colors.blue.shade700
'color': cs.info.shade700
},
'ladyPrice': {
'label': 'Lady 👩',
@@ -179,7 +180,7 @@ class KazanEditorPage extends StatelessWidget {
'electricPrice': {
'label': 'Electric 🔋',
'icon': Icons.electric_car_rounded,
'color': Colors.green.shade700
'color': cs.success.shade700
},
'vanPrice': {
'label': 'Van 🚐',
@@ -189,17 +190,17 @@ class KazanEditorPage extends StatelessWidget {
'deliveryPrice': {
'label': 'Delivery 📦',
'icon': Icons.delivery_dining_rounded,
'color': Colors.orange.shade700
'color': cs.warning.shade700
},
'mishwarVipPrice': {
'label': 'Mishwar Vip ⭐',
'icon': Icons.star_rounded,
'color': Colors.amber.shade900
'color': cs.warning.shade900
},
'fixedPrice': {
'label': 'Fixed Price 💰',
'icon': Icons.money_rounded,
'color': Colors.teal.shade700
'color': cs.tertiary.shade700
},
'awfarPrice': {
'label': 'Awfar Car 🚗',
@@ -294,19 +295,19 @@ class KazanEditorPage extends StatelessWidget {
'label': 'Normal (سعر الدقيقة العادي)',
'desc': '9 ص - 2 م / 6 م - 9 م',
'icon': Icons.wb_sunny_rounded,
'color': Colors.orange
'color': cs.warning
},
'peakMinPrice': {
'label': 'Peak (سعر الدقيقة ذروة)',
'desc': '2 م - 5 م',
'icon': Icons.whatshot_rounded,
'color': Colors.red
'color': cs.danger
},
'lateMinPrice': {
'label': 'Late (سعر الدقيقة ليلي)',
'desc': '9 م - 1 ص',
'icon': Icons.nightlight_round,
'color': Colors.indigo
'color': cs.info
},
};
siro_admin/lib/views/admin/quality/blacklist_page.dart
+37 -23
View File
@@ -9,32 +9,46 @@ class BlacklistPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
Get.put(QualityController()).fetchBlacklist();
return Scaffold(
backgroundColor: cs.surface,
body: Column(
children: [
_buildAppBar(context, cs),
_buildTabBar(context, cs),
Expanded(
child: GetBuilder<QualityController>(
builder: (controller) {
if (controller.isLoading) {
return _buildLoadingState(cs);
}
// كان `Get.put(...).fetchBlacklist()` يُستدعى هنا مباشرة، فيُعاد الجلب مع
// كل إعادة بناء للشجرة. نسجّل المتحكّم مرة واحدة ونترك الجلب لـ onInit.
final controller = Get.isRegistered<QualityController>()
? Get.find<QualityController>()
: Get.put(QualityController());
return TabBarView(
controller: DefaultTabController.of(context),
children: [
_buildDriverList(controller, cs),
_buildPassengerList(controller, cs),
],
);
},
),
// الشاشة تستدعي DefaultTabController.of(context) في مكانين (TabBar
// و TabBarView) دون أن يوجد DefaultTabController في الشجرة إطلاقاً —
// فكان الاستدعاء يرمي استثناءً وتظهر الصفحة رمادية فارغة.
return DefaultTabController(
length: 2,
child: Builder(
builder: (context) => Scaffold(
backgroundColor: cs.surface,
body: Column(
children: [
_buildAppBar(context, cs),
_buildTabBar(context, cs),
Expanded(
child: GetBuilder<QualityController>(
init: controller,
builder: (controller) {
if (controller.isLoading) {
return _buildLoadingState(cs);
}
return TabBarView(
controller: DefaultTabController.of(context),
children: [
_buildDriverList(controller, cs),
_buildPassengerList(controller, cs),
],
);
},
),
),
],
),
],
),
),
);
}
siro_admin/lib/views/admin/quality/driver_scorecard_page.dart
+15 -14
View File
@@ -1,3 +1,4 @@
import 'package:siro_admin/constant/theme.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../../controller/admin/quality_controller.dart';
@@ -18,7 +19,7 @@ class DriverScorecardPage extends StatelessWidget {
appBar: AppBar(
title: const Text('بطاقة أداء السائق',
style: TextStyle(fontWeight: FontWeight.bold)),
backgroundColor: Colors.blueAccent,
backgroundColor: cs.info,
),
body: GetBuilder<QualityController>(
builder: (controller) {
@@ -56,7 +57,7 @@ class DriverScorecardPage extends StatelessWidget {
children: [
CircleAvatar(
radius: 40,
backgroundColor: Colors.grey.shade300,
backgroundColor: cs.onSurfaceVariant.shade300,
child: const Icon(Icons.person,
size: 50, color: Colors.white),
),
@@ -66,11 +67,11 @@ class DriverScorecardPage extends StatelessWidget {
style: const TextStyle(
fontSize: 22, fontWeight: FontWeight.bold)),
Text('هاتف: ${basicInfo['phone']}',
style: const TextStyle(color: Colors.grey)),
style: const TextStyle(color: cs.onSurfaceVariant)),
const Divider(height: 30),
Text('التقييم الشامل (Score)',
style: TextStyle(
fontSize: 18, color: Colors.grey.shade700)),
fontSize: 18, color: cs.onSurfaceVariant.shade700)),
const SizedBox(height: 5),
Stack(
alignment: Alignment.center,
@@ -81,7 +82,7 @@ class DriverScorecardPage extends StatelessWidget {
child: CircularProgressIndicator(
value: overallScore / 100,
strokeWidth: 10,
backgroundColor: Colors.grey.shade200,
backgroundColor: cs.onSurfaceVariant.shade200,
color: scoreColor,
),
),
@@ -103,7 +104,7 @@ class DriverScorecardPage extends StatelessWidget {
Card(
elevation: 2,
child: ListTile(
leading: const Icon(Icons.drive_eta, color: Colors.blue),
leading: const Icon(Icons.drive_eta, color: cs.info),
title: const Text('نسبة الإنجاز'),
trailing: Text('${ridesStats['completion_rate']}%',
style: const TextStyle(
@@ -128,7 +129,7 @@ class DriverScorecardPage extends StatelessWidget {
child: Column(
children: [
const Icon(Icons.star,
color: Colors.orange, size: 30),
color: cs.warning, size: 30),
const SizedBox(height: 5),
Text('${rating.toString()}/5.0',
style: const TextStyle(
@@ -136,7 +137,7 @@ class DriverScorecardPage extends StatelessWidget {
fontWeight: FontWeight.bold)),
const Text('متوسط التقييم',
style: TextStyle(
fontSize: 12, color: Colors.grey)),
fontSize: 12, color: cs.onSurfaceVariant)),
],
),
),
@@ -150,7 +151,7 @@ class DriverScorecardPage extends StatelessWidget {
child: Column(
children: [
const Icon(Icons.warning,
color: Colors.redAccent, size: 30),
color: cs.danger, size: 30),
const SizedBox(height: 5),
Text('${complaints['total_complaints']} شكوى',
style: const TextStyle(
@@ -158,7 +159,7 @@ class DriverScorecardPage extends StatelessWidget {
fontWeight: FontWeight.bold)),
Text('${complaints['open_complaints']} مفتوحة',
style: const TextStyle(
fontSize: 12, color: Colors.red)),
fontSize: 12, color: cs.danger)),
],
),
),
@@ -221,7 +222,7 @@ class DriverScorecardPage extends StatelessWidget {
children: [
Row(
children: [
Icon(icon, size: 20, color: Colors.grey.shade600),
Icon(icon, size: 20, color: cs.onSurfaceVariant.shade600),
const SizedBox(width: 8),
Text(title, style: const TextStyle(fontSize: 15)),
],
@@ -233,8 +234,8 @@ class DriverScorecardPage extends StatelessWidget {
}
Color _getScoreColor(num score) {
if (score >= 80) return Colors.green;
if (score >= 60) return Colors.orange;
return Colors.red;
if (score >= 80) return cs.success;
if (score >= 60) return cs.warning;
return cs.danger;
}
}
siro_admin/lib/views/admin/rides/ride_lookup_page.dart
+81 -83
View File
@@ -1,3 +1,4 @@
import 'package:siro_admin/constant/map_tiles.dart';
import 'package:siro_admin/constant/theme.dart';
import 'dart:async';
import 'package:flutter/material.dart';
@@ -237,67 +238,65 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
physics: const BouncingScrollPhysics(),
slivers: [
// 1. Sliver AppBar (المتحرك الذكي الذي يصغر عند التمرير)
// الرأس: سطح هادئ بدل الكتلة الملوّنة المشبعة.
// النسخة السابقة كانت شريحة بلون primary بارتفاع 310 مع تدرّج
// وظل — تسحب الانتباه إلى الإطار بدل الأرقام، وهي أول ما يجعل
// اللوحة تبدو غير احترافية. اللون الآن يميّز الحالة داخل البطاقات
// فقط، حيث يحمل معنى.
SliverAppBar(
pinned: true,
floating: false,
expandedHeight: 310.0,
backgroundColor: cs.primary,
elevation: 4,
shadowColor: cs.primary.withValues(alpha: 0.4),
iconTheme: IconThemeData(color: cs.onPrimary),
centerTitle: true,
expandedHeight: 268.0,
backgroundColor: cs.surface,
surfaceTintColor: Colors.transparent,
elevation: 0,
scrolledUnderElevation: 0,
iconTheme: IconThemeData(color: cs.onSurface),
centerTitle: false,
titleSpacing: 20,
title: Text(
'إدارة الرحلات',
style: TextStyle(
color: cs.onPrimary,
fontWeight: FontWeight.bold,
fontSize: 20,
color: cs.onSurface,
fontWeight: FontWeight.w700,
fontSize: 19,
),
),
actions: [
Container(
margin:
const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
padding: const EdgeInsets.symmetric(horizontal: 14),
const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
padding: const EdgeInsets.symmetric(horizontal: 12),
decoration: BoxDecoration(
color: cs.onPrimary.withValues(alpha: 0.2),
borderRadius: BorderRadius.circular(12),
color: cs.primary.withValues(alpha: 0.10),
borderRadius: BorderRadius.circular(10),
border: Border.all(
color: cs.primary.withValues(alpha: 0.22)),
),
alignment: Alignment.center,
child: Text(
'اليوم',
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.bold,
color: cs.onPrimary,
fontWeight: FontWeight.w700,
color: cs.primary,
),
),
),
],
flexibleSpace: FlexibleSpaceBar(
background: Container(
decoration: BoxDecoration(
gradient: LinearGradient(
colors: [
cs.primary,
cs.primary.withValues(alpha: 0.8),
],
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
),
),
color: cs.surface,
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
children: [
// الإحصائيات تختفي عند التمرير لأعلى
_buildStatisticsSection(cs),
const SizedBox(height: 12),
// شريط البحث يختفي عند التمرير لأعلى
const SizedBox(height: 14),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: _buildSearchBar(cs),
),
const SizedBox(height: 60), // مساحة للـ TabBar بالأسفل
const SizedBox(height: 62), // مساحة للـ TabBar بالأسفل
],
),
),
@@ -308,8 +307,8 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
child: Container(
decoration: BoxDecoration(
color: cs.surface,
borderRadius:
const BorderRadius.vertical(top: Radius.circular(24)),
border: Border(
bottom: BorderSide(color: cs.outline, width: 1)),
),
child: TabBar(
controller: _tabController,
@@ -318,8 +317,9 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
unselectedLabelColor: cs.onSurfaceVariant,
indicatorColor: cs.primary,
indicatorWeight: 3,
indicatorSize: TabBarIndicatorSize.label,
labelStyle: const TextStyle(
fontWeight: FontWeight.bold, fontSize: 14),
fontWeight: FontWeight.w700, fontSize: 14),
tabAlignment: TabAlignment.center,
dividerColor: Colors.transparent,
tabs: const [
@@ -403,9 +403,11 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
child: Text(
'نظرة عامة',
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.bold,
color: Colors.white.withOpacity(0.8),
fontSize: 13,
fontWeight: FontWeight.w700,
// كان Colors.white ثابتاً — يصلح فوق الرأس الملوّن السابق فقط،
// ويصبح غير مقروء إطلاقاً على سطح الوضع الفاتح.
color: cs.onSurfaceVariant,
),
),
),
@@ -426,7 +428,7 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
'مكتملة',
controller.completedCount.toString(),
Icons.check_circle_rounded,
const Color(0xFF14B8A6), cs)),
cs.tertiary, cs)),
Obx(() => _buildStatCard(
'ملغاة',
controller.canceledCount.toString(),
@@ -446,25 +448,28 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
Widget _buildStatCard(
String label, String value, IconData icon, Color iconColor, ColorScheme cs) {
// البطاقة تُبنى على سطح مرتفع بحدّ رفيع وشارة لونية للأيقونة، بدل
// بطاقة بيضاء عائمة بظل ثقيل. اللون يعرّف الحالة ولا يملأ المساحة.
return Container(
width: 105,
width: 108,
margin: const EdgeInsets.only(left: 10),
padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8),
padding: const EdgeInsets.symmetric(vertical: 14, horizontal: 10),
decoration: BoxDecoration(
color: cs.surface,
color: cs.surfaceContainerHighest,
borderRadius: BorderRadius.circular(16),
boxShadow: [
BoxShadow(
color: cs.shadow.withValues(alpha: 0.1),
blurRadius: 10,
offset: const Offset(0, 4),
)
],
border: Border.all(color: iconColor.withValues(alpha: 0.22)),
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Icon(icon, color: iconColor, size: 24),
Container(
padding: const EdgeInsets.all(7),
decoration: BoxDecoration(
color: iconColor.withValues(alpha: 0.12),
borderRadius: BorderRadius.circular(9),
),
child: Icon(icon, color: iconColor, size: 18),
),
const SizedBox(height: 8),
Text(
value,
@@ -489,15 +494,9 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
Widget _buildSearchBar(ColorScheme cs) {
return Container(
decoration: BoxDecoration(
color: cs.surface,
borderRadius: BorderRadius.circular(16),
boxShadow: [
BoxShadow(
color: cs.shadow.withValues(alpha: 0.05),
blurRadius: 8,
offset: const Offset(0, 4),
)
],
color: cs.surfaceContainerHighest,
borderRadius: BorderRadius.circular(14),
border: Border.all(color: cs.outline),
),
child: TextField(
controller: controller.searchController,
@@ -600,7 +599,7 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
padding: const EdgeInsets.symmetric(
horizontal: 10, vertical: 4),
decoration: BoxDecoration(
color: statusColor.withOpacity(0.1),
color: statusColor.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(8),
),
child: Text(
@@ -630,7 +629,7 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
Container(
width: 2,
height: 16,
color: Colors.grey.withOpacity(0.3),
color: cs.outline,
margin: const EdgeInsets.symmetric(vertical: 2)),
Icon(Icons.location_on_rounded,
size: 14, color: cs.danger),
@@ -645,20 +644,20 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
ride.startLocation,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
style: TextStyle(
fontSize: 13,
fontWeight: FontWeight.w600,
color: Colors.black87),
color: cs.onSurface),
),
const SizedBox(height: 12),
Text(
ride.endLocation,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
style: TextStyle(
fontSize: 13,
fontWeight: FontWeight.w600,
color: Colors.black87),
color: cs.onSurface),
),
],
),
@@ -736,10 +735,10 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
width: double.infinity,
padding: const EdgeInsets.all(10),
decoration: BoxDecoration(
color: cs.danger.withOpacity(0.08),
color: cs.danger.withValues(alpha: 0.08),
borderRadius: BorderRadius.circular(8),
border: Border.all(
color: cs.danger.withOpacity(0.2)),
color: cs.danger.withValues(alpha: 0.2)),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -777,6 +776,7 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
required Color color,
required bool isAdmin,
}) {
final cs = Theme.of(context).colorScheme;
String displayPhone = phone;
if (!isAdmin && phone.length > 4) {
displayPhone =
@@ -791,7 +791,7 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
'$title:',
style: TextStyle(
fontSize: 11,
color: Colors.grey[600],
color: cs.onSurfaceVariant,
fontWeight: FontWeight.bold),
),
const SizedBox(width: 6),
@@ -800,16 +800,16 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.bold,
color: Colors.black87),
color: cs.onSurface),
),
),
Text(
displayPhone,
style: TextStyle(
fontSize: 11, color: Colors.grey[500], letterSpacing: 0.5),
fontSize: 11, color: cs.onSurfaceVariant, letterSpacing: 0.5),
),
if (isAdmin && phone.isNotEmpty) ...[
const SizedBox(width: 8),
@@ -835,7 +835,7 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
child: Container(
padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 4),
decoration: BoxDecoration(
color: color.withOpacity(0.08),
color: color.withValues(alpha: 0.08),
borderRadius: BorderRadius.circular(8),
),
child: Row(
@@ -869,7 +869,7 @@ class _RidesDashboardScreenState extends State<RidesDashboardScreen>
return cs.danger;
}
if (status == 'New') return cs.info;
return Colors.grey;
return cs.onSurfaceVariant;
}
String _getStatusText(String status) {
@@ -1000,10 +1000,7 @@ class _RideMapMonitorScreenState extends State<RideMapMonitorScreen> {
initialZoom: 13,
),
children: [
TileLayer(
urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
userAgentPackageName: 'com.siromove.admin',
),
MapTiles.layer(context),
// Route Polyline
if (startPos != null && endPos != null)
PolylineLayer(
@@ -1011,7 +1008,7 @@ class _RideMapMonitorScreenState extends State<RideMapMonitorScreen> {
Polyline(
points: [startPos!, endPos!],
strokeWidth: 5,
color: const Color(0xFF4318FF).withOpacity(0.8),
color: cs.primary.withValues(alpha: 0.8),
),
],
),
@@ -1030,7 +1027,7 @@ class _RideMapMonitorScreenState extends State<RideMapMonitorScreen> {
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.2),
color: Colors.black.withValues(alpha: 0.2),
blurRadius: 5),
],
),
@@ -1051,7 +1048,7 @@ class _RideMapMonitorScreenState extends State<RideMapMonitorScreen> {
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.2),
color: Colors.black.withValues(alpha: 0.2),
blurRadius: 5),
],
),
@@ -1072,7 +1069,7 @@ class _RideMapMonitorScreenState extends State<RideMapMonitorScreen> {
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: cs.info.withOpacity(0.3),
color: cs.info.withValues(alpha: 0.3),
blurRadius: 8),
],
),
@@ -1096,7 +1093,7 @@ class _RideMapMonitorScreenState extends State<RideMapMonitorScreen> {
borderRadius: BorderRadius.circular(24),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.1),
color: Colors.black.withValues(alpha: 0.1),
blurRadius: 20,
offset: const Offset(0, 10),
),
@@ -1152,12 +1149,13 @@ class _RideMapMonitorScreenState extends State<RideMapMonitorScreen> {
required String phone,
required Color color,
}) {
final cs = Theme.of(context).colorScheme;
return Row(
children: [
Container(
padding: const EdgeInsets.all(10),
decoration: BoxDecoration(
color: color.withOpacity(0.1),
color: color.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(12),
),
child: Icon(icon, size: 20, color: color),
@@ -1171,7 +1169,7 @@ class _RideMapMonitorScreenState extends State<RideMapMonitorScreen> {
title,
style: TextStyle(
fontSize: 11,
color: Colors.grey[600],
color: cs.onSurfaceVariant,
fontWeight: FontWeight.bold),
),
const SizedBox(height: 2),
@@ -1200,11 +1198,11 @@ class _RideMapMonitorScreenState extends State<RideMapMonitorScreen> {
child: Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: Colors.green.withOpacity(0.1),
color: cs.success.withValues(alpha: 0.1),
shape: BoxShape.circle,
),
child:
const Icon(Icons.call_rounded, size: 20, color: Colors.green),
Icon(Icons.call_rounded, size: 20, color: cs.success),
),
),
],
siro_admin/lib/views/admin/server/monitor_server_page.dart
+9 -9
View File
@@ -232,7 +232,7 @@ class _HeaderInfo extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.timer_outlined,
size: 16, color: Colors.greenAccent.withValues(alpha: 0.8)),
size: 16, color: cs.success.withValues(alpha: 0.8)),
const SizedBox(width: 8),
Text(
"Uptime: ${data.uptime.formatted}",
@@ -247,7 +247,7 @@ class _HeaderInfo extends StatelessWidget {
color: Colors.white24,
margin: const EdgeInsets.symmetric(horizontal: 12)),
Icon(Icons.update,
size: 16, color: Colors.blueAccent.withValues(alpha: 0.8)),
size: 16, color: cs.info.withValues(alpha: 0.8)),
const SizedBox(width: 8),
Text(
"Last Update: ${data.timestamp.split(' ')[1]}",
@@ -375,7 +375,7 @@ class _ServicesCard extends StatelessWidget {
CircleAvatar(
radius: 4,
backgroundColor:
isActive ? Colors.greenAccent : Colors.redAccent,
isActive ? cs.success : cs.danger,
),
const SizedBox(width: 12),
Expanded(
@@ -397,7 +397,7 @@ class _ServicesCard extends StatelessWidget {
child: Text(
isActive ? "Running" : "Stopped",
style: TextStyle(
color: isActive ? Colors.greenAccent : Colors.redAccent,
color: isActive ? cs.success : cs.danger,
fontSize: 10,
fontWeight: FontWeight.bold,
),
@@ -489,10 +489,10 @@ class _TopProcessesCard extends StatelessWidget {
Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: Colors.orange.withValues(alpha: 0.1),
color: cs.warning.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(8)),
child: const Icon(Icons.analytics_rounded,
color: Colors.orange, size: 18),
color: cs.warning, size: 18),
),
const SizedBox(width: 12),
Text("Top Processes",
@@ -550,13 +550,13 @@ class _TopProcessesCard extends StatelessWidget {
padding:
const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
decoration: BoxDecoration(
color: Colors.orange.withValues(alpha: 0.1),
color: cs.warning.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(20),
),
child: Text(
process.usage,
style: const TextStyle(
color: Colors.orangeAccent,
color: cs.warning,
fontSize: 12,
fontWeight: FontWeight.bold),
),
@@ -655,7 +655,7 @@ class _ErrorState extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(Icons.cloud_off_rounded,
size: 60, color: Colors.redAccent),
size: 60, color: cs.danger),
const SizedBox(height: 16),
Text(controller.errorMessage.value,
textAlign: TextAlign.center,
siro_admin/lib/views/admin/static/notes_driver_page.dart
+13 -12
View File
@@ -1,3 +1,4 @@
import 'package:siro_admin/constant/theme.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_admin/controller/functions/launch.dart';
@@ -46,10 +47,10 @@ class DailyNotesView extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(Icons.note_alt_outlined,
size: 80, color: Colors.grey.shade300),
size: 80, color: cs.onSurfaceVariant.shade300),
const SizedBox(height: 10),
Text("لا توجد سجلات لهذا اليوم",
style: TextStyle(color: Colors.grey.shade600)),
style: TextStyle(color: cs.onSurfaceVariant.shade600)),
],
),
);
@@ -73,7 +74,7 @@ class DailyNotesView extends StatelessWidget {
borderRadius: BorderRadius.circular(16),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.03),
color: Colors.black.withValues(alpha: 0.03),
blurRadius: 10,
offset: const Offset(0, 4),
)
@@ -92,7 +93,7 @@ class DailyNotesView extends StatelessWidget {
CircleAvatar(
radius: 14,
backgroundColor:
_getEmployeeColor(name).withOpacity(0.1),
_getEmployeeColor(name).withValues(alpha: 0.1),
child: Icon(Icons.person,
size: 16, color: _getEmployeeColor(name)),
),
@@ -101,7 +102,7 @@ class DailyNotesView extends StatelessWidget {
name.toUpperCase(),
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.grey.shade800,
color: cs.onSurfaceVariant.shade800,
fontSize: 14),
),
const SizedBox(width: 100),
@@ -115,7 +116,7 @@ class DailyNotesView extends StatelessWidget {
phone,
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.grey.shade800,
color: cs.onSurfaceVariant.shade800,
fontSize: 14),
),
Icon(Icons.phone)
@@ -126,7 +127,7 @@ class DailyNotesView extends StatelessWidget {
Text(
time.split(' ').last, // عرض الوقت فقط
style: TextStyle(
color: Colors.grey.shade400, fontSize: 12),
color: cs.onSurfaceVariant.shade400, fontSize: 12),
textDirection: TextDirection.ltr,
),
],
@@ -138,7 +139,7 @@ class DailyNotesView extends StatelessWidget {
content,
style: TextStyle(
fontSize: 14,
color: Colors.grey.shade700,
color: cs.onSurfaceVariant.shade700,
height: 1.5),
),
],
@@ -153,10 +154,10 @@ class DailyNotesView extends StatelessWidget {
Color _getEmployeeColor(String name) {
String n = name.toLowerCase().trim();
if (n.contains('shahd')) return Colors.redAccent;
if (n.contains('mayar')) return Colors.amber.shade700;
if (n.contains('rama2')) return Colors.green;
if (n.contains('rama1')) return Colors.blue;
if (n.contains('shahd')) return cs.danger;
if (n.contains('mayar')) return cs.warning.shade700;
if (n.contains('rama2')) return cs.success;
if (n.contains('rama1')) return cs.info;
return Colors.blueGrey;
}
}
siro_admin/lib/views/auth/login_page.dart
+4 -4
View File
@@ -180,10 +180,10 @@ class _AdminLoginPageState extends State<AdminLoginPage>
color: _C.card,
borderRadius: BorderRadius.circular(24),
border: Border.all(
color: _C.accent.withOpacity(0.18), width: 1.2),
color: _C.accent.withValues(alpha: 0.18), width: 1.2),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.4),
color: Colors.black.withValues(alpha: 0.4),
blurRadius: 32,
offset: const Offset(0, 12),
),
@@ -468,12 +468,12 @@ class _AdminLoginPageState extends State<AdminLoginPage>
shape: BoxShape.circle,
color: _C.card,
border: Border.all(
color: _C.accent.withOpacity(0.3 + _glowAnim.value * 0.3),
color: _C.accent.withValues(alpha: 0.3 + _glowAnim.value * 0.3),
width: 1.5,
),
boxShadow: [
BoxShadow(
color: _C.accentGlow.withOpacity(_glowAnim.value * 0.6),
color: _C.accentGlow.withValues(alpha: _glowAnim.value * 0.6),
blurRadius: 30,
spreadRadius: 4,
),
siro_admin/lib/views/auth/register_page.dart
+1 -1
View File
@@ -60,7 +60,7 @@ class AdminRegisterPage extends StatelessWidget {
decoration: BoxDecoration(
color: _C.card,
borderRadius: BorderRadius.circular(24),
border: Border.all(color: _C.accent.withOpacity(0.18), width: 1.2),
border: Border.all(color: _C.accent.withValues(alpha: 0.18), width: 1.2),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
siro_admin/lib/views/invoice/add_invoice_page.dart
+12 -11
View File
@@ -1,3 +1,4 @@
import 'package:siro_admin/constant/theme.dart';
import 'dart:convert';
import 'dart:io';
import 'package:flutter/material.dart';
@@ -170,7 +171,7 @@ class _AddInvoicePageState extends State<AddInvoicePage> {
borderRadius: BorderRadius.circular(20),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.05),
color: Colors.black.withValues(alpha: 0.05),
blurRadius: 15,
offset: const Offset(0, 5),
),
@@ -202,7 +203,7 @@ class _AddInvoicePageState extends State<AddInvoicePage> {
Text(
'صورة الفاتورة',
style: TextStyle(
color: Colors.grey[700],
color: cs.onSurfaceVariant,
fontWeight: FontWeight.bold,
fontSize: 16,
),
@@ -221,7 +222,7 @@ class _AddInvoicePageState extends State<AddInvoicePage> {
border: Border.all(
color: _imageFile != null
? primaryColor
: Colors.grey.shade300,
: cs.onSurfaceVariant.shade300,
width: 2,
style: _imageFile != null
? BorderStyle.solid
@@ -241,7 +242,7 @@ class _AddInvoicePageState extends State<AddInvoicePage> {
Container(
padding: const EdgeInsets.all(15),
decoration: BoxDecoration(
color: primaryColor.withOpacity(0.05),
color: primaryColor.withValues(alpha: 0.05),
shape: BoxShape.circle,
),
child: Icon(Icons.add_a_photo_rounded,
@@ -251,7 +252,7 @@ class _AddInvoicePageState extends State<AddInvoicePage> {
Text(
'اضغط لرفع صورة الفاتورة',
style: TextStyle(
color: Colors.grey[500],
color: cs.onSurfaceVariant,
fontWeight: FontWeight.w500,
),
),
@@ -265,7 +266,7 @@ class _AddInvoicePageState extends State<AddInvoicePage> {
child: Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.9),
color: Colors.white.withValues(alpha: 0.9),
shape: BoxShape.circle,
),
child: Icon(Icons.edit,
@@ -296,7 +297,7 @@ class _AddInvoicePageState extends State<AddInvoicePage> {
decoration: BoxDecoration(
gradient: LinearGradient(
colors: _isLoading
? [Colors.grey, Colors.grey]
? [cs.onSurfaceVariant, cs.onSurfaceVariant]
: [primaryColor, secondaryColor],
begin: Alignment.centerLeft,
end: Alignment.centerRight,
@@ -305,7 +306,7 @@ class _AddInvoicePageState extends State<AddInvoicePage> {
boxShadow: [
if (!_isLoading)
BoxShadow(
color: primaryColor.withOpacity(0.4),
color: primaryColor.withValues(alpha: 0.4),
blurRadius: 10,
offset: const Offset(0, 4),
),
@@ -369,16 +370,16 @@ class _AddInvoicePageState extends State<AddInvoicePage> {
decoration: InputDecoration(
labelText: label,
hintText: hint,
prefixIcon: Icon(icon, color: primaryColor.withOpacity(0.7)),
prefixIcon: Icon(icon, color: primaryColor.withValues(alpha: 0.7)),
filled: true,
fillColor: Colors.grey[50],
fillColor: cs.onSurfaceVariant,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide.none,
),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide(color: Colors.grey.shade200),
borderSide: BorderSide(color: cs.onSurfaceVariant.shade200),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
siro_admin/lib/views/transit/route_approval_page.dart
+4 -4
View File
@@ -54,7 +54,7 @@ class _RouteApprovalPageState extends State<RouteApprovalPage> {
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.check_circle_outline_rounded,
size: 64, color: AppColor.success.withOpacity(0.6)),
size: 64, color: AppColor.success.withValues(alpha: 0.6)),
const SizedBox(height: 16),
const Text(
'لا توجد خطوط تنتظر الاعتماد',
@@ -197,7 +197,7 @@ class _RouteCard extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Text('المحطات:',
style: TextStyle(
color: AppColor.textSecondary.withOpacity(0.8),
color: AppColor.textSecondary.withValues(alpha: 0.8),
fontSize: 12,
fontWeight: FontWeight.w600)),
),
@@ -273,9 +273,9 @@ class _TagChip extends StatelessWidget {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
decoration: BoxDecoration(
color: color.withOpacity(0.12),
color: color.withValues(alpha: 0.12),
borderRadius: BorderRadius.circular(20),
border: Border.all(color: color.withOpacity(0.3)),
border: Border.all(color: color.withValues(alpha: 0.3)),
),
child: Text(label,
style: TextStyle(color: color, fontSize: 11, fontWeight: FontWeight.bold)),
siro_admin/lib/views/widgets/elevated_btn.dart
+1 -1
View File
@@ -28,7 +28,7 @@ class MyElevatedButton extends StatelessWidget {
borderRadius: BorderRadius.circular(16),
boxShadow: [
BoxShadow(
color: (kolor ?? AppColor.accent).withOpacity(0.3),
color: (kolor ?? AppColor.accent).withValues(alpha: 0.3),
blurRadius: 12,
offset: const Offset(0, 4),
),
siro_admin/lib/views/widgets/snackbar.dart
+3 -2
View File
@@ -1,3 +1,4 @@
import 'package:siro_admin/constant/theme.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
@@ -167,13 +168,13 @@ class _SnackContentState extends State<_SnackContent>
height: 30,
margin: const EdgeInsets.only(left: 6),
decoration: BoxDecoration(
color: Colors.grey.withAlpha(25),
color: cs.onSurfaceVariant.withAlpha(25),
shape: BoxShape.circle,
),
child: Icon(
Icons.close_rounded,
size: 16,
color: Colors.grey[500],
color: cs.onSurfaceVariant,
),
),
),