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

2026-07-26 11:33:20 +03:00
parent 7830efead7
commit 3af99cc18a
31 changed files with 4256 additions and 2833 deletions
@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
 import 'package:get/get.dart';
-import '../../../constant/colors.dart';
-import '../../../constant/style.dart';
 import '../../../controller/admin/complaint_controller.dart';
-import '../../widgets/my_scafold.dart';
 import '../../widgets/elevated_btn.dart';
 import '../../widgets/my_textField.dart';

@@ -14,81 +12,101 @@ class ComplaintListPage extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return MyScafolld(
-      title: 'إدارة الشكاوى'.tr,
-      isleading: true,
-      body: [
-        Obx(() {
-          if (controller.delayedComplaints.isNotEmpty) {
-            return Container(
-              margin: const EdgeInsets.all(16),
-              padding: const EdgeInsets.all(16),
-              decoration: BoxDecoration(
-                color: AppColor.danger.withOpacity(0.1),
-                borderRadius: BorderRadius.circular(16),
-                border: Border.all(color: AppColor.danger.withOpacity(0.3)),
-              ),
-              child: Column(
-                children: [
-                  Row(
-                    children: [
-                      const Icon(Icons.warning_amber_rounded, color: AppColor.danger),
-                      const SizedBox(width: 12),
-                      Expanded(
-                        child: Text(
-                          'هناك ${controller.delayedComplaints.length} شكاوى لم يتم حلها منذ أكثر من أسبوع!',
-                          style: AppStyle.body.copyWith(color: AppColor.danger, fontWeight: FontWeight.bold),
+    final cs = Theme.of(context).colorScheme;
+
+    return Scaffold(
+      backgroundColor: cs.surface,
+      appBar: AppBar(
+        backgroundColor: cs.surface,
+        elevation: 0,
+        centerTitle: true,
+        title: Text('إدارة الشكاوى'.tr, style: GoogleFonts.inter(fontWeight: FontWeight.w600, color: cs.onSurface)),
+        leading: GestureDetector(
+          onTap: () => Get.back(),
+          child: Icon(Icons.arrow_back_ios_new_rounded, color: cs.onSurface),
+        ),
+      ),
+      body: Column(
+        children: [
+          Obx(() {
+            if (controller.delayedComplaints.isNotEmpty) {
+              return Container(
+                margin: const EdgeInsets.all(16),
+                padding: const EdgeInsets.all(16),
+                decoration: BoxDecoration(
+                  color: cs.error.withValues(alpha: 0.1),
+                  borderRadius: BorderRadius.circular(16),
+                  border: Border.all(color: cs.error.withValues(alpha: 0.3)),
+                ),
+                child: Column(
+                  children: [
+                    Row(
+                      children: [
+                        Icon(Icons.warning_amber_rounded, color: cs.error),
+                        const SizedBox(width: 12),
+                        Expanded(
+                          child: Text(
+                            'هناك ${controller.delayedComplaints.length} شكاوى لم يتم حلها منذ أكثر من أسبوع!',
+                            style: GoogleFonts.inter(color: cs.error, fontSize: 14, fontWeight: FontWeight.bold),
+                          ),
                        ),
-                      ),
-                    ],
-                  ),
-                  const SizedBox(height: 12),
-                  Obx(() => MyElevatedButton(
-                    title: controller.showOnlyDelayed.value ? 'عرض جميع الشكاوى' : 'عرض الشكاوى المتأخرة فقط',
-                    onPressed: () => controller.showOnlyDelayed.toggle(),
-                    kolor: AppColor.danger,
-                  )),
-                ],
-              ),
-            );
-          }
-          return const SizedBox.shrink();
-        }),
-        Obx(() {
-          final list = controller.showOnlyDelayed.value ? controller.delayedComplaints : controller.complaintList;
-          if (controller.isLoading.value && list.isEmpty) {
-            return const Center(child: CircularProgressIndicator());
-          }
-          return RefreshIndicator(
-            onRefresh: () => controller.getComplaints(),
-            child: ListView.builder(
-              padding: const EdgeInsets.fromLTRB(16, 16, 16, 80),
-              itemCount: list.length,
-              itemBuilder: (context, index) {
-                final complaint = list[index];
-                return _buildComplaintCard(context, complaint);
-              },
-            ),
-          );
-        }),
-      ],
+                      ],
+                    ),
+                    const SizedBox(height: 12),
+                    Obx(() => MyElevatedButton(
+                      title: controller.showOnlyDelayed.value ? 'عرض جميع الشكاوى' : 'عرض الشكاوى المتأخرة فقط',
+                      onPressed: () => controller.showOnlyDelayed.toggle(),
+                      kolor: cs.error,
+                    )),
+                  ],
+                ),
+              );
+            }
+            return const SizedBox.shrink();
+          }),
+          Expanded(
+            child: Obx(() {
+              final list = controller.showOnlyDelayed.value ? controller.delayedComplaints : controller.complaintList;
+              if (controller.isLoading.value && list.isEmpty) {
+                return Center(child: CircularProgressIndicator(color: cs.primary));
+              }
+              return RefreshIndicator(
+                onRefresh: () => controller.getComplaints(),
+                child: ListView.builder(
+                  padding: const EdgeInsets.fromLTRB(16, 16, 16, 80),
+                  itemCount: list.length,
+                  itemBuilder: (context, index) {
+                    final complaint = list[index];
+                    return _buildComplaintCard(context, complaint);
+                  },
+                ),
+              );
+            }),
+          ),
+        ],
+      ),
    );
  }

  Widget _buildComplaintCard(BuildContext context, dynamic c) {
-    Color statusColor = _getStatusColor(c['statusComplaint']);
-    
+    final cs = Theme.of(context).colorScheme;
+    Color statusColor = _getStatusColor(c['statusComplaint'], cs);
+
    return Container(
      margin: const EdgeInsets.only(bottom: 16),
-      decoration: AppStyle.cardDecoration,
+      decoration: BoxDecoration(
+        color: cs.surfaceContainerHighest,
+        borderRadius: BorderRadius.circular(16),
+        border: Border.all(color: cs.outline),
+      ),
      child: ExpansionTile(
        tilePadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-        leading: _buildStatusIndicator(c['statusComplaint'], statusColor),
+        leading: _buildStatusIndicator(c['statusComplaint'], statusColor, cs),
        title: Text(
          c['description']?.toString() ?? 'بدون وصف',
          maxLines: 1,
          overflow: TextOverflow.ellipsis,
-          style: AppStyle.title,
+          style: GoogleFonts.inter(fontWeight: FontWeight.w600, color: cs.onSurface),
        ),
        subtitle: Column(
          crossAxisAlignment: CrossAxisAlignment.start,
@@ -96,18 +114,18 @@ class ComplaintListPage extends StatelessWidget {
            const SizedBox(height: 4),
            Text(
              'النوع: ${c['complaint_type'] ?? 'عام'} | الرحلة: ${c['ride_id']}',
-              style: AppStyle.caption,
+              style: GoogleFonts.inter(color: cs.onSurfaceVariant, fontSize: 12),
            ),
            const SizedBox(height: 4),
            Row(
              children: [
-                Icon(Icons.person_rounded, size: 12, color: AppColor.textSecondary),
+                Icon(Icons.person_rounded, size: 12, color: cs.onSurfaceVariant),
                const SizedBox(width: 4),
-                Text(c['passengerName'] ?? 'غير معروف', style: AppStyle.caption),
+                Text(c['passengerName'] ?? 'غير معروف', style: GoogleFonts.inter(color: cs.onSurfaceVariant, fontSize: 12)),
                const SizedBox(width: 12),
-                Icon(Icons.drive_eta_rounded, size: 12, color: AppColor.textSecondary),
+                Icon(Icons.drive_eta_rounded, size: 12, color: cs.onSurfaceVariant),
                const SizedBox(width: 4),
-                Text(c['driverName'] ?? 'غير معروف', style: AppStyle.caption),
+                Text(c['driverName'] ?? 'غير معروف', style: GoogleFonts.inter(color: cs.onSurfaceVariant, fontSize: 12)),
              ],
            ),
          ],
@@ -118,12 +136,12 @@ class ComplaintListPage extends StatelessWidget {
            child: Column(
              crossAxisAlignment: CrossAxisAlignment.start,
              children: [
-                const Divider(color: AppColor.divider),
-                _buildInfoRow('الوصف', c['description'] ?? 'لا يوجد وصف'),
+                Divider(color: cs.outline),
+                _buildInfoRow('الوصف', c['description'] ?? 'لا يوجد وصف', cs),
                const SizedBox(height: 12),
-                _buildInfoRow('الحل الحالي', c['resolution'] ?? 'لم يتم الحل بعد'),
+                _buildInfoRow('الحل الحالي', c['resolution'] ?? 'لم يتم الحل بعد', cs),
                const SizedBox(height: 12),
-                _buildRideDetails(c),
+                _buildRideDetails(c, cs),
                const SizedBox(height: 24),
                Row(
                  children: [
@@ -131,7 +149,7 @@ class ComplaintListPage extends StatelessWidget {
                      child: MyElevatedButton(
                        title: 'تحديث الحالة / حل الشكوى',
                        onPressed: () => _showResolveDialog(context, c),
-                        kolor: AppColor.accent,
+                        kolor: cs.primary,
                      ),
                    ),
                  ],
@@ -144,14 +162,14 @@ class ComplaintListPage extends StatelessWidget {
    );
  }

-  Widget _buildStatusIndicator(String? status, Color color) {
+  Widget _buildStatusIndicator(String? status, Color color, ColorScheme cs) {
    return Container(
      width: 40,
      height: 40,
      decoration: BoxDecoration(
-        color: color.withOpacity(0.12),
+        color: color.withValues(alpha: 0.12),
        shape: BoxShape.circle,
-        border: Border.all(color: color.withOpacity(0.25)),
+        border: Border.all(color: color.withValues(alpha: 0.25)),
      ),
      child: Icon(
        status == 'Resolved' ? Icons.check_circle_rounded : Icons.pending_rounded,
@@ -161,33 +179,33 @@ class ComplaintListPage extends StatelessWidget {
    );
  }

-  Widget _buildInfoRow(String label, String value) {
+  Widget _buildInfoRow(String label, String value, ColorScheme cs) {
    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
      children: [
-        Text(label, style: AppStyle.caption.copyWith(color: AppColor.accent)),
+        Text(label, style: GoogleFonts.inter(color: cs.primary, fontSize: 12)),
        const SizedBox(height: 4),
-        Text(value, style: AppStyle.body),
+        Text(value, style: GoogleFonts.inter(color: cs.onSurface, fontSize: 14)),
      ],
    );
  }

-  Widget _buildRideDetails(dynamic c) {
+  Widget _buildRideDetails(dynamic c, ColorScheme cs) {
    return Container(
      padding: const EdgeInsets.all(12),
      decoration: BoxDecoration(
-        color: AppColor.surfaceElevated,
+        color: cs.surfaceContainerHighest,
        borderRadius: BorderRadius.circular(12),
-        border: Border.all(color: AppColor.divider),
+        border: Border.all(color: cs.outline),
      ),
      child: Column(
        children: [
          Row(
            mainAxisAlignment: MainAxisAlignment.spaceBetween,
            children: [
-              _buildSmallStat('السعر', '${c['priceOfRide']} ل.س'),
-              _buildSmallStat('التقييم', '${c['avgRatingDriverFromPassengers'] ?? 0}★'),
-              _buildSmallStat('النوع', c['ascarType'] ?? 'N/A'),
+              _buildSmallStat('السعر', '${c['priceOfRide']} ل.س', cs),
+              _buildSmallStat('التقييم', '${c['avgRatingDriverFromPassengers'] ?? 0}★', cs),
+              _buildSmallStat('النوع', c['ascarType'] ?? 'N/A', cs),
            ],
          ),
        ],
@@ -195,26 +213,27 @@ class ComplaintListPage extends StatelessWidget {
    );
  }

-  Widget _buildSmallStat(String label, String value) {
+  Widget _buildSmallStat(String label, String value, ColorScheme cs) {
    return Column(
      children: [
-        Text(label, style: AppStyle.caption.copyWith(fontSize: 10)),
+        Text(label, style: GoogleFonts.inter(color: cs.onSurfaceVariant, fontSize: 10)),
        const SizedBox(height: 2),
-        Text(value, style: AppStyle.number.copyWith(fontSize: 12)),
+        Text(value, style: GoogleFonts.jetBrainsMono(fontWeight: FontWeight.bold, fontSize: 12, color: cs.onSurface)),
      ],
    );
  }

-  Color _getStatusColor(String? status) {
+  Color _getStatusColor(String? status, ColorScheme cs) {
    switch (status) {
-      case 'Open': return AppColor.danger;
-      case 'In Progress': return AppColor.warning;
-      case 'Resolved': return AppColor.success;
-      default: return AppColor.textSecondary;
+      case 'Open': return cs.error;
+      case 'In Progress': return cs.tertiary;
+      case 'Resolved': return const Color(0xFF10B981);
+      default: return cs.onSurfaceVariant;
    }
  }

  void _showResolveDialog(BuildContext context, dynamic c) {
+    final cs = Theme.of(context).colorScheme;
    final TextEditingController resController = TextEditingController(text: c['resolution']);
    String selectedStatus = c['statusComplaint'] ?? 'Open';

@@ -222,16 +241,16 @@ class ComplaintListPage extends StatelessWidget {
      StatefulBuilder(
        builder: (context, setModalState) => Container(
          padding: const EdgeInsets.all(24),
-          decoration: const BoxDecoration(
-            color: AppColor.surfaceElevated,
-            borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
+          decoration: BoxDecoration(
+            color: cs.surfaceContainerHighest,
+            borderRadius: const BorderRadius.vertical(top: Radius.circular(24)),
          ),
          child: Column(
            mainAxisSize: MainAxisSize.min,
            children: [
-              Text('تحديث حالة الشكوى', style: AppStyle.headTitle),
+              Text('تحديث حالة الشكوى', style: GoogleFonts.cairo(fontWeight: FontWeight.bold, color: cs.onSurface, fontSize: 18)),
              const SizedBox(height: 20),
-              _buildStatusDropdown(selectedStatus, (val) {
+              _buildStatusDropdown(selectedStatus, cs, (val) {
                setModalState(() => selectedStatus = val!);
              }),
              const SizedBox(height: 20),
@@ -263,21 +282,21 @@ class ComplaintListPage extends StatelessWidget {
    );
  }

-  Widget _buildStatusDropdown(String current, Function(String?) onChanged) {
+  Widget _buildStatusDropdown(String current, ColorScheme cs, Function(String?) onChanged) {
    return Container(
      padding: const EdgeInsets.symmetric(horizontal: 16),
      decoration: BoxDecoration(
-        color: AppColor.surface,
+        color: cs.surfaceContainerHighest,
        borderRadius: BorderRadius.circular(12),
-        border: Border.all(color: AppColor.divider),
+        border: Border.all(color: cs.outline),
      ),
      child: DropdownButtonHideUnderline(
        child: DropdownButton<String>(
          value: current,
          isExpanded: true,
-          dropdownColor: AppColor.surfaceElevated,
+          dropdownColor: cs.surfaceContainerHighest,
          items: ['Open', 'In Progress', 'Resolved']
-              .map((s) => DropdownMenuItem(value: s, child: Text(s.tr, style: AppStyle.body)))
+              .map((s) => DropdownMenuItem(value: s, child: Text(s.tr, style: GoogleFonts.inter(color: cs.onSurface, fontSize: 14))))
              .toList(),
          onChanged: onChanged,
        ),