25-5-9/1

lib/controller/local/local_controller.dart

@@ -8,149 +8,95 @@ import '../themes/themes.dart';
 class LocaleController extends GetxController {
   Locale? language;
   String countryCode = '';
-  void restartApp() {
-    runApp(MyApp());
-  }
 
-  ThemeData appTheme = themeEnglish;
+  ThemeData appTheme = lightThemeEnglish;
 
-  changeLang(String langcode) {
+  void changeLang(String langcode) {
     Locale locale;
     switch (langcode) {
       case "ar":
         locale = const Locale("ar");
-        appTheme = themeArabic;
+        appTheme = lightThemeArabic;
         box.write(BoxName.lang, 'ar');
         break;
       case "en":
         locale = const Locale("en");
-        appTheme = themeEnglish;
+        appTheme = lightThemeEnglish;
         box.write(BoxName.lang, 'en');
         break;
       case "tr":
         locale = const Locale("tr");
-        appTheme = themeEnglish;
+        appTheme = lightThemeEnglish;
         box.write(BoxName.lang, 'tr');
         break;
       case "fr":
         locale = const Locale("fr");
-        appTheme = themeEnglish;
+        appTheme = lightThemeEnglish;
         box.write(BoxName.lang, 'fr');
         break;
       case "it":
         locale = const Locale("it");
-        appTheme = themeEnglish;
+        appTheme = lightThemeEnglish;
         box.write(BoxName.lang, 'it');
         break;
       case "de":
         locale = const Locale("de");
-        appTheme = themeEnglish;
+        appTheme = lightThemeEnglish;
         box.write(BoxName.lang, 'de');
         break;
       case "el":
         locale = const Locale("el");
-        appTheme = themeEnglish;
+        appTheme = lightThemeEnglish;
         box.write(BoxName.lang, 'el');
         break;
       case "es":
         locale = const Locale("es");
-        appTheme = themeEnglish;
+        appTheme = lightThemeEnglish;
         box.write(BoxName.lang, 'es');
         break;
       case "fa":
         locale = const Locale("fa");
-        appTheme = themeEnglish;
+        appTheme = lightThemeEnglish;
         box.write(BoxName.lang, 'fa');
         break;
       case "zh":
         locale = const Locale("zh");
-        appTheme = themeEnglish;
+        appTheme = lightThemeEnglish;
         box.write(BoxName.lang, 'zh');
         break;
       case "ru":
         locale = const Locale("ru");
-        appTheme = themeEnglish;
+        appTheme = lightThemeEnglish;
         box.write(BoxName.lang, 'ru');
         break;
       case "hi":
         locale = const Locale("hi");
-        appTheme = themeEnglish;
+        appTheme = lightThemeEnglish;
         box.write(BoxName.lang, 'hi');
         break;
       default:
         locale = Locale(Get.deviceLocale!.languageCode);
         box.write(BoxName.lang, Get.deviceLocale!.languageCode);
-        appTheme = themeEnglish;
+        appTheme = lightThemeEnglish;
         break;
     }
 
     box.write(BoxName.lang, langcode);
-    // box.write(BoxName.lang, langcode);
     Get.changeTheme(appTheme);
     Get.updateLocale(locale);
-    restartApp();
     update();
   }
 
   @override
   void onInit() {
-    String storedLang = box.read(BoxName.lang) ?? "";
-    switch (storedLang) {
-      case "ar":
-        language = const Locale("ar");
-        appTheme = themeArabic;
-        break;
-      case "en":
-        language = const Locale("en");
-        appTheme = themeEnglish;
-        break;
-      case "tr":
-        language = const Locale("tr");
-        appTheme = themeEnglish;
-        break;
-      case "fr":
-        language = const Locale("fr");
-        appTheme = themeEnglish;
-        break;
-      case "it":
-        language = const Locale("it");
-        appTheme = themeEnglish;
-        break;
-      case "de":
-        language = const Locale("de");
-        appTheme = themeEnglish;
-        break;
-      case "el":
-        language = const Locale("el");
-        appTheme = themeEnglish;
-        break;
-      case "es":
-        language = const Locale("es");
-        appTheme = themeEnglish;
-        break;
-      case "fa":
-        language = const Locale("fa");
-        appTheme = themeArabic;
-        break;
-      case "zh":
-        language = const Locale("zh");
-        appTheme = themeEnglish;
-        break;
-      case "ru":
-        language = const Locale("ru");
-        appTheme = themeEnglish;
-        break;
-      case "hi":
-        language = const Locale("hi");
-        appTheme = themeEnglish;
-        break;
-      default:
-        language = Locale(Get.deviceLocale!.languageCode);
-        // language = Locale(Get.deviceLocale!.languageCode);
-        appTheme = themeEnglish;
-        break;
+    String? storedLang = box.read(BoxName.lang);
+    if (storedLang == null) {
+      // Use device language if no language is stored
+      storedLang = Get.deviceLocale!.languageCode;
+      box.write(BoxName.lang, storedLang);
     }
 
+    changeLang(storedLang);
     super.onInit();
   }
 }

lib/controller/local/translations.dart

@@ -12,8 +12,25 @@ class MyTranslation extends Translations {
           "yellow": "أصفر",
           "purple": "أرجواني",
           "orange": "برتقالي",
-          "pink": "وردي",
+          "pink": "وردي", "best driver": "أفضل سائق",
           "brown": "بني",
+          'Insert site of Owner': "أدخل موقع المالك",
+          'Insert site of Driver': "أدخل موقع السائق",
+          'Insert registration_date of Car': "أدخل تاريخ تسجيل السيارة",
+          'Insert phone of Owner': "أدخل هاتف المالك",
+          'Insert Name of Owner': "أدخل اسم المالك",
+          'Insert year of Car': "أدخل سنة السيارة",
+          'Insert registration_date of Driver': "",
+          'Insert car_type of Driver': "أدخل نوع السيارة للسائق",
+          'Insert car_model of Driver': "أدخل طراز السيارة للسائق",
+          'Insert car_number of Driver': "أدخل رقم سيارة السائق",
+          "Add Car Who Wants to Work": "أضف السيارة التي ترغب في العمل",
+          "Add Driver Who Wants to Work": "إضافة سائق يرغب في العمل",
+          "Insert Name of Driver": "أدخل اسم السائق",
+          'Insert national ID of Driver': "أدخل الرقم الوطني للسائق",
+          'Insert phone of Driver': "أدخل رقم هاتف السائق",
+          "Insert license type of Driver": "أدخل نوع رخصة السائق",
+          'Insert birth_date of Driver': "أدخل تاريخ ميلاد السائق",
           "gray": "رمادي",
           "cyan": "سماوي",
           "magenta": "بنفسجي",