Update: 2026-08-08 16:55:39

siro_driver/lib/views/home/Captin/About Us/settings_captain.dart

@@ -3,12 +3,11 @@ import 'package:get/get.dart';
 import 'package:siro_driver/constant/colors.dart';
 import 'package:siro_driver/controller/profile/setting_controller.dart';
 import 'package:siro_driver/views/lang/languages.dart';
-import 'package:siro_driver/views/widgets/my_scafold.dart';
 import 'package:siro_driver/views/widgets/mydialoug.dart';
 
 // تأكد من صحة مسارات الاستيراد هذه
 import '../../../../controller/functions/vibrate.dart'; // Controller with isVibrate
-import '../../../auth/country_widget.dart';
+import '../../../widgets/ui/siro_ui.dart';
 import 'about_us.dart';
 import 'frequantly_question.dart';
 import 'using_app_page.dart';
@@ -22,15 +21,13 @@ class SettingsCaptain extends StatelessWidget {
     final settingsController = Get.put(SettingController());
     final homeController = Get.put(HomePageController());
 
-    return MyScafolld(
+    return SiroPage(
       title: 'Settings'.tr,
-      isleading: true,
-      body: [
-        ListView(
-          padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 20.0),
+      padding: SiroUi.pageInsets,
+      body: ListView(
           children: <Widget>[
             // --- القسم الأول: عام ---
-            _buildSectionHeader('General'.tr, context),
+            SiroSectionTitle('General'.tr),
             _buildSettingsCard(
               children: [
                 _buildListTile(
@@ -53,10 +50,8 @@ class SettingsCaptain extends StatelessWidget {
                 // ),
               ],
             ),
-            const SizedBox(height: 20),
-
             // --- القسم الثاني: تفضيلات التطبيق ---
-            _buildSectionHeader('App Preferences'.tr, context),
+            SiroSectionTitle('App Preferences'.tr),
             _buildSettingsCard(
               children: [
                 _buildSwitchTile(
@@ -96,10 +91,8 @@ class SettingsCaptain extends StatelessWidget {
                 ),
               ],
             ),
-            const SizedBox(height: 20),
-
             // --- القسم الثالث: المساعدة والدعم ---
-            _buildSectionHeader('Help & Support'.tr, context),
+            SiroSectionTitle('Help & Support'.tr),
             _buildSettingsCard(
               children: [
                 _buildListTile(
@@ -119,18 +112,17 @@ class SettingsCaptain extends StatelessWidget {
                 ),
               ],
             ),
-            const SizedBox(height: 20),
-
             // --- القسم الرابع: تسجيل الخروج ---
-            _buildSectionHeader('Account'.tr, context),
+            SiroSectionTitle('Account'.tr),
             _buildSettingsCard(
               children: [
                 ListTile(
-                  leading: const Icon(Icons.logout, color: Colors.red),
+                  leading: const SiroIconBadge(Icons.logout_rounded,
+                      color: AppColor.redColor),
                   title: Text(
                     'Logout'.tr,
                     style: const TextStyle(
-                        color: Colors.red, fontWeight: FontWeight.w500),
+                        color: AppColor.redColor, fontWeight: FontWeight.w600),
                   ),
                   onTap: () {
                     MyDialog().getDialog(
@@ -145,34 +137,17 @@ class SettingsCaptain extends StatelessWidget {
                   },
                 )
               ],
-            )
+            ),
+            const SizedBox(height: 16),
           ],
         ),
-      ],
     );
   }
 
-  // ويدجت لبناء عنوان كل قسم
-  Widget _buildSectionHeader(String title, BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 8.0, bottom: 12.0),
-      child: Text(
-        title,
-        style: Theme.of(context).textTheme.titleSmall?.copyWith(
-              color: Colors.grey.shade600,
-              fontWeight: FontWeight.bold,
-            ),
-      ),
-    );
-  }
-
-  // ويدجت لبناء بطاقة الإعدادات
+  // ويدجت لبناء بطاقة الإعدادات — تجمع عناصر القسم داخل سطح واحد.
   Widget _buildSettingsCard({required List<Widget> children}) {
-    return Card(
-      elevation: 2,
-      shadowColor: Colors.black.withOpacity(0.1),
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
-      clipBehavior: Clip.antiAlias, // مهم لجعل splash effect داخل حدود البطاقة
+    return SiroCard(
+      padding: const EdgeInsets.symmetric(vertical: 4),
       child: Column(children: children),
     );
   }
@@ -184,14 +159,18 @@ class SettingsCaptain extends StatelessWidget {
     String? subtitle,
     required VoidCallback onTap,
   }) {
-    return ListTile(
-      leading: Icon(icon, color: Colors.grey.shade700),
-      title: Text(title, style: const TextStyle(fontWeight: FontWeight.w500)),
-      subtitle: subtitle != null ? Text(subtitle) : null,
-      trailing:
-          const Icon(Icons.arrow_forward_ios, size: 16, color: Colors.grey),
-      onTap: onTap,
-    );
+    return Builder(builder: (context) {
+      return ListTile(
+        leading: SiroIconBadge(icon, color: SiroUi.interactive(context)),
+        title: Text(title, style: const TextStyle(fontWeight: FontWeight.w600)),
+        subtitle: subtitle != null
+            ? Text(subtitle, style: Theme.of(context).textTheme.bodySmall)
+            : null,
+        trailing: Icon(Icons.arrow_forward_ios,
+            size: 14, color: SiroUi.subtle(context)),
+        onTap: onTap,
+      );
+    });
   }
 
   // ويدجت لبناء عنصر يحتوي على مفتاح تفعيل/إلغاء (Switch)
@@ -207,15 +186,19 @@ class SettingsCaptain extends StatelessWidget {
     return GetBuilder<T>(
       init: controller,
       builder: (ctrl) {
-        return SwitchListTile(
-          secondary: Icon(icon, color: color ?? Colors.grey.shade700),
-          title:
-              Text(title, style: const TextStyle(fontWeight: FontWeight.w500)),
-          subtitle: Text(subtitle),
-          value: valueGetter(ctrl),
-          onChanged: (value) => onChanged(ctrl),
-          activeColor: AppColor.primaryColor,
-        );
+        return Builder(builder: (context) {
+          return SwitchListTile(
+            secondary: SiroIconBadge(icon,
+                color: color ?? SiroUi.interactive(context)),
+            title:
+                Text(title, style: const TextStyle(fontWeight: FontWeight.w600)),
+            subtitle: Text(subtitle,
+                style: Theme.of(context).textTheme.bodySmall),
+            value: valueGetter(ctrl),
+            onChanged: (value) => onChanged(ctrl),
+            activeThumbColor: SiroUi.interactive(context),
+          );
+        });
       },
     );
   }