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

إصلاح توافق فلاتر مع Theme الجديد

Browse Source
This commit is contained in:
Hamza-Ayed
2026-07-26 11:33:20 +03:00
parent 7830efead7
commit 3af99cc18a
31 changed files with 4256 additions and 2833 deletions
Download Patch File Download Diff File Expand all files Collapse all files
siro_admin/lib/views/admin/captain/captain.dart
+257 -197
View File
@@ -2,10 +2,8 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../../constant/box_name.dart';
import '../../../main.dart';
import '../../widgets/my_scafold.dart';
import '../../widgets/mycircular.dart';
import '../../../controller/admin/captain_admin_controller.dart';
import '../../../main.dart';
import 'captain_details.dart';
class CaptainsPage extends StatelessWidget {
@@ -21,159 +19,84 @@ class CaptainsPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
return MyScafolld(
title: 'Search for Captain'.tr,
isleading: true,
body: [
Container(
height: MediaQuery.of(context).size.height,
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Theme.of(context).primaryColor.withOpacity(0.03),
Colors.white,
],
return Scaffold(
backgroundColor: cs.surface,
body: Column(
children: [
_buildAppBar(context, cs),
_buildSearchSection(context, cs),
Expanded(
child: GetBuilder<CaptainAdminController>(
builder: (controller) {
if (controller.isLoading) {
return _buildLoadingState(cs);
}
final message = controller.captainData['message'];
if (message == null) {
return _buildEmptyState(cs);
}
final List<dynamic> captains =
message is List ? message : [message];
if (captains.isEmpty) {
return _buildEmptyState(cs);
}
return _buildResultsList(context, captains, cs);
},
),
),
child: Column(
children: [
_buildHeaderSection(context),
Expanded(
child: GetBuilder<CaptainAdminController>(
builder: (controller) {
if (controller.isLoading) {
return _buildLoadingState();
}
final message = controller.captainData['message'];
if (message == null) {
return _buildEmptyState();
}
// 🔥 الحل هنا: توحيد الشكل إلى List
final List<dynamic> captains =
message is List ? message : [message];
if (captains.isEmpty) {
return _buildEmptyState();
}
return _buildResultsList(context, captains);
},
),
),
],
),
),
],
);
}
// ================= HEADER =================
Widget _buildHeaderSection(BuildContext context) {
return Container(
padding: const EdgeInsets.fromLTRB(20, 20, 20, 16),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.04),
blurRadius: 10,
offset: const Offset(0, 2),
),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Container(
padding: const EdgeInsets.all(10),
decoration: BoxDecoration(
color: Theme.of(context).primaryColor.withOpacity(0.1),
borderRadius: BorderRadius.circular(12),
),
child: Icon(
Icons.manage_search_rounded,
color: Theme.of(context).primaryColor,
size: 24,
),
),
const SizedBox(width: 12),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Find Captain'.tr,
style: const TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.black87,
),
),
Text(
'Search by phone number'.tr,
style: TextStyle(
fontSize: 13,
color: Colors.grey[600],
),
),
],
),
],
),
const SizedBox(height: 20),
_buildModernSearchBar(context),
],
),
);
}
Widget _buildModernSearchBar(BuildContext context) {
Widget _buildAppBar(BuildContext context, ColorScheme cs) {
return Container(
padding: const EdgeInsets.fromLTRB(16, 50, 16, 16),
decoration: BoxDecoration(
color: Colors.grey[50],
borderRadius: BorderRadius.circular(16),
border: Border.all(color: Colors.grey[200]!),
color: cs.surface,
border: Border(bottom: BorderSide(color: cs.outline)),
),
child: Row(
children: [
Expanded(
child: TextField(
controller: searchController,
keyboardType: TextInputType.phone,
style: const TextStyle(fontSize: 15),
decoration: InputDecoration(
hintText: '0990000000'.tr,
hintStyle: TextStyle(color: Colors.grey[400], fontSize: 14),
prefixIcon: Icon(Icons.phone_android_rounded,
color: Colors.grey[400], size: 22),
border: InputBorder.none,
contentPadding:
const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
GestureDetector(
onTap: () => Get.back(),
child: Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: cs.surfaceContainerHighest,
borderRadius: BorderRadius.circular(10),
border: Border.all(color: cs.outline),
),
onSubmitted: (_) => _performSearch(),
child: Icon(Icons.arrow_back_ios_new_rounded,
color: cs.onSurfaceVariant, size: 16),
),
),
Padding(
padding: const EdgeInsets.all(6.0),
child: Material(
color: Theme.of(context).primaryColor,
borderRadius: BorderRadius.circular(12),
child: InkWell(
onTap: _performSearch,
borderRadius: BorderRadius.circular(12),
child: const Padding(
padding: EdgeInsets.all(12),
child: Icon(Icons.search, color: Colors.white, size: 24),
),
),
const SizedBox(width: 12),
Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: cs.primary.withValues(alpha: 0.12),
borderRadius: BorderRadius.circular(10),
border: Border.all(
color: cs.primary.withValues(alpha: 0.25)),
),
child: Icon(Icons.drive_eta_rounded,
color: cs.primary, size: 18),
),
const SizedBox(width: 10),
Text(
'قائمة الكباتن',
style: TextStyle(
color: cs.onSurface,
fontSize: 18,
fontWeight: FontWeight.w700,
),
),
],
@@ -181,6 +104,58 @@ class CaptainsPage extends StatelessWidget {
);
}
Widget _buildSearchSection(BuildContext context, ColorScheme cs) {
return Container(
padding: const EdgeInsets.fromLTRB(16, 16, 16, 16),
child: Container(
decoration: BoxDecoration(
color: cs.surfaceContainerHighest,
borderRadius: BorderRadius.circular(14),
border: Border.all(color: cs.outline),
),
child: Row(
children: [
Expanded(
child: TextField(
controller: searchController,
keyboardType: TextInputType.phone,
style: TextStyle(color: cs.onSurface, fontSize: 14),
cursorColor: cs.primary,
decoration: InputDecoration(
hintText: '0990000000',
hintStyle: TextStyle(
color: cs.onSurfaceVariant, fontSize: 13),
prefixIcon: Icon(Icons.phone_android_rounded,
color: cs.onSurfaceVariant, size: 20),
border: InputBorder.none,
contentPadding: const EdgeInsets.symmetric(
horizontal: 16, vertical: 14),
),
onSubmitted: (_) => _performSearch(),
),
),
Padding(
padding: const EdgeInsets.all(6.0),
child: Material(
color: cs.primary,
borderRadius: BorderRadius.circular(10),
child: InkWell(
onTap: _performSearch,
borderRadius: BorderRadius.circular(10),
child: const Padding(
padding: EdgeInsets.all(10),
child: Icon(Icons.search_rounded,
color: Colors.white, size: 20),
),
),
),
),
],
),
),
);
}
void _performSearch() {
final phone = searchController.text.trim();
if (phone.isNotEmpty) {
@@ -188,37 +163,98 @@ class CaptainsPage extends StatelessWidget {
}
}
// ================= RESULTS =================
Widget _buildLoadingState(ColorScheme cs) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
SizedBox(
width: 40,
height: 40,
child: CircularProgressIndicator(
color: cs.primary,
strokeWidth: 2,
backgroundColor: cs.primary.withValues(alpha: 0.1),
),
),
const SizedBox(height: 16),
Text('جاري التحميل...',
style: TextStyle(
color: cs.onSurfaceVariant, fontSize: 13)),
],
),
);
}
Widget _buildResultsList(BuildContext context, List<dynamic> captains) {
Widget _buildEmptyState(ColorScheme cs) {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
padding: const EdgeInsets.all(20),
decoration: BoxDecoration(
color: cs.surfaceContainerHighest,
shape: BoxShape.circle,
),
child: Icon(Icons.person_off_outlined,
size: 48, color: cs.onSurfaceVariant),
),
const SizedBox(height: 16),
Text('لا يوجد كباتن',
style: TextStyle(
color: cs.onSurfaceVariant, fontSize: 14)),
],
),
);
}
Widget _buildResultsList(
BuildContext context, List<dynamic> captains, ColorScheme cs) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.fromLTRB(20, 20, 20, 12),
padding: const EdgeInsets.fromLTRB(20, 8, 20, 8),
child: Row(
children: [
Text(
'Search Results'.tr,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: Colors.black87,
Container(
width: 3,
height: 14,
decoration: BoxDecoration(
color: cs.primary,
borderRadius: BorderRadius.circular(2),
),
),
const SizedBox(width: 8),
Text(
'نتائج البحث',
style: TextStyle(
color: cs.onSurface,
fontSize: 15,
fontWeight: FontWeight.w600,
),
),
const SizedBox(width: 10),
Expanded(
child: Container(height: 1, color: cs.outline),
),
const SizedBox(width: 8),
Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
padding: const EdgeInsets.symmetric(
horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: Theme.of(context).primaryColor.withOpacity(0.1),
borderRadius: BorderRadius.circular(12),
color: cs.primary.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(10),
border: Border.all(
color: cs.primary.withValues(alpha: 0.2)),
),
child: Text(
'${captains.length}',
style: TextStyle(
fontSize: 13,
fontWeight: FontWeight.bold,
color: Theme.of(context).primaryColor,
color: cs.primary,
fontSize: 12,
fontWeight: FontWeight.w700,
),
),
),
@@ -228,12 +264,12 @@ class CaptainsPage extends StatelessWidget {
Expanded(
child: ListView.separated(
physics: const BouncingScrollPhysics(),
padding: const EdgeInsets.fromLTRB(20, 0, 20, 80),
padding: const EdgeInsets.fromLTRB(16, 0, 16, 80),
itemCount: captains.length,
separatorBuilder: (_, __) => const SizedBox(height: 12),
separatorBuilder: (_, __) => const SizedBox(height: 10),
itemBuilder: (context, index) {
final captain = captains[index] as Map<String, dynamic>;
return _buildModernCaptainCard(context, captain);
return _buildCaptainCard(context, captain, cs);
},
),
),
@@ -241,10 +277,10 @@ class CaptainsPage extends StatelessWidget {
);
}
// ================= CARD =================
Widget _buildModernCaptainCard(
BuildContext context, Map<String, dynamic> captain) {
Widget _buildCaptainCard(
BuildContext context,
Map<String, dynamic> captain,
ColorScheme cs) {
final String fullName =
'${captain['first_name'] ?? ''} ${captain['last_name'] ?? ''}';
final String phone = captain['phone']?.toString() ?? '';
@@ -252,67 +288,103 @@ class CaptainsPage extends StatelessWidget {
return Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(20),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.04),
blurRadius: 12,
offset: const Offset(0, 4),
),
],
color: cs.surfaceContainerHighest,
borderRadius: BorderRadius.circular(16),
border: Border.all(color: cs.outline),
),
child: Material(
color: Colors.transparent,
child: InkWell(
borderRadius: BorderRadius.circular(20),
borderRadius: BorderRadius.circular(16),
onTap: () {
Get.to(() => const CaptainDetailsPage(),
arguments: {'data': captain});
},
child: Padding(
padding: const EdgeInsets.all(16.0),
padding: const EdgeInsets.all(14),
child: Row(
children: [
Container(
width: 56,
height: 56,
width: 52,
height: 52,
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
Theme.of(context).primaryColor.withOpacity(0.8),
Theme.of(context).primaryColor,
cs.primary.withValues(alpha: 0.8),
cs.primary,
],
),
borderRadius: BorderRadius.circular(16),
borderRadius: BorderRadius.circular(14),
boxShadow: [
BoxShadow(
color: cs.primary.withValues(alpha: 0.2),
blurRadius: 10,
offset: const Offset(0, 4),
),
],
),
child: const Icon(
Icons.person_rounded,
color: Colors.white,
size: 28,
size: 26,
),
),
const SizedBox(width: 16),
const SizedBox(width: 14),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
fullName,
style: const TextStyle(
fontSize: 16,
style: TextStyle(
color: cs.onSurface,
fontSize: 15,
fontWeight: FontWeight.w600,
),
),
const SizedBox(height: 6),
Text(phone),
Row(
children: [
Icon(Icons.phone_rounded,
size: 13, color: cs.onSurfaceVariant),
const SizedBox(width: 4),
Text(
phone,
style: TextStyle(
color: cs.onSurfaceVariant,
fontSize: 12,
fontFamily: 'monospace',
),
),
],
),
if (isSuperAdmin && email != null) ...[
const SizedBox(height: 4),
Text(email),
const SizedBox(height: 3),
Row(
children: [
Icon(Icons.email_outlined,
size: 12,
color: cs.onSurfaceVariant),
const SizedBox(width: 4),
Text(
email,
style: TextStyle(
color: cs.onSurfaceVariant,
fontSize: 11,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
],
),
],
],
),
),
Icon(Icons.arrow_forward_ios_rounded,
size: 14, color: cs.onSurfaceVariant),
],
),
),
@@ -320,16 +392,4 @@ class CaptainsPage extends StatelessWidget {
),
);
}
// ================= STATES =================
Widget _buildLoadingState() {
return const Center(child: MyCircularProgressIndicator());
}
Widget _buildEmptyState() {
return const Center(
child: Text("No captains found"),
);
}
}
siro_admin/lib/views/admin/captain/syrian_driver_not_active.dart
+251 -32
View File
@@ -1,14 +1,12 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:secure_string_operations/secure_string_operations.dart';
import 'package:siro_admin/constant/box_name.dart';
import '../../../constant/info.dart';
import '../../../constant/char_map.dart';
import '../../../controller/drivers/driver_not_active_controller.dart';
import '../../../main.dart';
import '../../../print.dart';
import 'package:siro_admin/constant/info.dart';
import 'package:siro_admin/constant/char_map.dart';
import 'package:siro_admin/controller/drivers/driver_not_active_controller.dart';
import 'package:siro_admin/main.dart';
import 'package:siro_admin/print.dart';
import 'package:siro_admin/constant/theme.dart';
import 'driver_details_not_active_page.dart';
class DriversPendingPage extends StatelessWidget {
@@ -18,35 +16,256 @@ class DriversPendingPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
controller.getDriversPending();
Log.print(
': ${X.r(X.r(X.r(box.read(BoxName.jwt), cn), cC), cs).toString().split(AppInformation.addd)[0]}');
return Scaffold(
appBar: AppBar(title: const Text("Drivers Pending")),
body: GetBuilder<DriverController>(
id: 'drivers',
builder: (c) {
if (c.drivers.isEmpty) {
return Center(
child: const Text('no drivers found yet',
style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold)),
);
}
return ListView.builder(
itemCount: c.drivers.length,
itemBuilder: (ctx, i) {
final d = c.drivers[i];
return ListTile(
title: Text(d["first_name"] + d['last_name'] ?? ""),
subtitle: Text(d["phone"] ?? ""),
onTap: () {
Get.to(() => DriverDetailsPage(driverId: d["id"].toString()));
},
);
},
);
},
backgroundColor: cs.surface,
body: Column(
children: [
_buildAppBar(context, cs),
Expanded(
child: GetBuilder<DriverController>(
id: 'drivers',
builder: (c) {
if (c.isLoading) {
return _buildLoadingState(cs);
}
if (c.drivers.isEmpty) {
return _buildEmptyState(cs);
}
return RefreshIndicator(
onRefresh: () => controller.getDriversPending(),
color: cs.primary,
child: ListView.separated(
padding: const EdgeInsets.fromLTRB(16, 8, 16, 80),
physics: const BouncingScrollPhysics(),
itemCount: c.drivers.length,
separatorBuilder: (_, __) => const SizedBox(height: 10),
itemBuilder: (ctx, i) {
final d = c.drivers[i];
return _buildDriverCard(d, cs);
},
),
);
},
),
),
],
),
);
}
Widget _buildAppBar(BuildContext context, ColorScheme cs) {
return Container(
padding: const EdgeInsets.fromLTRB(16, 50, 16, 16),
decoration: BoxDecoration(
color: cs.surface,
border: Border(bottom: BorderSide(color: cs.outline)),
),
child: Row(
children: [
GestureDetector(
onTap: () => Get.back(),
child: Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: cs.surfaceContainerHighest,
borderRadius: BorderRadius.circular(10),
border: Border.all(color: cs.outline),
),
child: Icon(Icons.arrow_back_ios_new_rounded,
color: cs.onSurfaceVariant, size: 16),
),
),
const SizedBox(width: 12),
Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: const Color(0xFFF59E0B).withValues(alpha: 0.12),
borderRadius: BorderRadius.circular(10),
border: Border.all(
color: const Color(0xFFF59E0B).withValues(alpha: 0.25)),
),
child: Icon(Icons.hourglass_top_rounded,
color: const Color(0xFFF59E0B), size: 18),
),
const SizedBox(width: 10),
Text(
'طلبات الكباتن المعلقة',
style: TextStyle(
color: cs.onSurface,
fontSize: 18,
fontWeight: FontWeight.w700,
),
),
],
),
);
}
Widget _buildLoadingState(ColorScheme cs) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
SizedBox(
width: 40,
height: 40,
child: CircularProgressIndicator(
color: cs.primary,
strokeWidth: 2,
backgroundColor: cs.primary.withValues(alpha: 0.1),
),
),
const SizedBox(height: 16),
Text('جاري تحميل الطلبات...',
style: TextStyle(color: cs.onSurfaceVariant, fontSize: 13)),
],
),
);
}
Widget _buildEmptyState(ColorScheme cs) {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
padding: const EdgeInsets.all(20),
decoration: BoxDecoration(
color: cs.surfaceContainerHighest,
shape: BoxShape.circle,
),
child: Icon(Icons.how_to_reg_rounded,
size: 48, color: cs.onSurfaceVariant),
),
const SizedBox(height: 16),
Text('لا يوجد طلبات تسجيل حالياً',
style: TextStyle(color: cs.onSurfaceVariant, fontSize: 14)),
],
),
);
}
Widget _buildDriverCard(dynamic driver, ColorScheme cs) {
final String fullName =
'${driver['first_name'] ?? ''} ${driver['last_name'] ?? ''}'.trim();
final String phone = driver['phone'] ?? '';
return Container(
decoration: BoxDecoration(
color: cs.surfaceContainerHighest,
borderRadius: BorderRadius.circular(16),
border: Border.all(color: cs.outline),
),
child: Material(
color: Colors.transparent,
child: InkWell(
borderRadius: BorderRadius.circular(16),
onTap: () {
Get.to(() => DriverDetailsPage(driverId: driver['id'].toString()));
},
child: Padding(
padding: const EdgeInsets.all(14),
child: Row(
children: [
Container(
width: 48,
height: 48,
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
const Color(0xFFF59E0B).withValues(alpha: 0.20),
const Color(0xFFF59E0B).withValues(alpha: 0.08),
],
),
borderRadius: BorderRadius.circular(14),
border: Border.all(
color: const Color(0xFFF59E0B).withValues(alpha: 0.2)),
),
child: Center(
child: Text(
fullName.isNotEmpty ? fullName[0].toUpperCase() : 'D',
style: const TextStyle(
color: Color(0xFFF59E0B),
fontWeight: FontWeight.w800,
fontSize: 18,
),
),
),
),
const SizedBox(width: 14),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
fullName,
style: TextStyle(
color: cs.onSurface,
fontWeight: FontWeight.w600,
fontSize: 15,
),
),
const SizedBox(height: 4),
Row(
children: [
Container(
padding: const EdgeInsets.symmetric(
horizontal: 6, vertical: 2),
decoration: BoxDecoration(
color: const Color(0xFFF59E0B)
.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(6),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.hourglass_top_rounded,
size: 11,
color: const Color(0xFFF59E0B)),
const SizedBox(width: 3),
const Text(
'معلق',
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w700,
color: Color(0xFFF59E0B),
),
),
],
),
),
const SizedBox(width: 8),
Icon(Icons.phone_rounded,
size: 12, color: cs.onSurfaceVariant),
const SizedBox(width: 4),
Text(
phone,
style: TextStyle(
color: cs.onSurfaceVariant,
fontSize: 12,
fontFamily: 'monospace',
),
),
],
),
],
),
),
Icon(Icons.arrow_forward_ios_rounded,
size: 14, color: cs.onSurfaceVariant),
],
),
),
),
),
);
}