12/22/2

lib/controller/functions/package_info.dart

@@ -1,6 +1,8 @@
 import 'dart:convert';
 import 'dart:io';
+import 'dart:ui';
 import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/colors.dart';
 import 'package:sefer_driver/constant/links.dart';
 import 'package:sefer_driver/controller/functions/crud.dart';
 import 'package:flutter/cupertino.dart';
@@ -15,7 +17,7 @@ Future<void> checkForUpdate(BuildContext context) async {
   final packageInfo = await PackageInfo.fromPlatform();
   final currentVersion = packageInfo.buildNumber;
   final version = packageInfo.version;
-  print('currentVersion is : $currentVersion');
+  // print('currentVersion is : $currentVersion');
   // Fetch the latest version from your server
   String latestVersion = await getPackageInfo();
   box.write(BoxName.packagInfo, version);
@@ -41,36 +43,118 @@ void showUpdateDialog(BuildContext context) {
   final String storeUrl = Platform.isAndroid
       ? 'https://play.google.com/store/apps/details?id=com.sefer_driver'
       : 'https://apps.apple.com/ae/app/sefer-driver/id6502189302';
-  showCupertinoDialog(
+
+  showGeneralDialog(
     context: context,
     barrierDismissible: false,
-    builder: (BuildContext context) {
-      return CupertinoAlertDialog(
-        title: Text('Update Available'.tr),
-        content: Text(
-          'A new version of the app is available. Please update to the latest version.'
-              .tr,
+    barrierColor: Colors.black.withOpacity(0.5),
+    pageBuilder: (_, __, ___) {
+      return BackdropFilter(
+        filter: ImageFilter.blur(sigmaX: 5, sigmaY: 5),
+        child: Center(
+          child: AlertDialog(
+            // Using AlertDialog for a more Material Design look
+            shape: RoundedRectangleBorder(
+                borderRadius:
+                    BorderRadius.circular(16)), // More rounded corners
+            elevation: 4, // Add a bit more elevation
+            contentPadding: EdgeInsets.zero, // Remove default content padding
+            content: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Padding(
+                  padding: const EdgeInsets.only(top: 20.0),
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    height: 72, // Slightly larger logo
+                    width: 72,
+                  ),
+                ),
+                const SizedBox(height: 16),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 24.0),
+                  child: Text(
+                    'Update Available'.tr,
+                    textAlign: TextAlign.center,
+                    style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                          // Use theme's title style
+                          fontWeight: FontWeight.bold,
+                        ),
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.all(24.0),
+                  child: Text(
+                    'A new version of the app is available. Please update to the latest version.'
+                        .tr, // More encouraging message
+                    textAlign: TextAlign.center,
+                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                          // Use theme's body style
+                          color: Colors.black87,
+                        ),
+                  ),
+                ),
+                const Divider(height: 0),
+                Row(
+                  children: [
+                    Expanded(
+                      child: TextButton(
+                        // Using TextButton for "Cancel"
+                        onPressed: () => Navigator.pop(context),
+                        style: TextButton.styleFrom(
+                          foregroundColor: Colors.grey,
+                          shape: const RoundedRectangleBorder(
+                            borderRadius: BorderRadius.only(
+                              bottomLeft: Radius.circular(16),
+                            ),
+                          ),
+                        ),
+                        child: Text('Cancel'.tr),
+                      ),
+                    ),
+                    const SizedBox(
+                      height: 48,
+                      child: VerticalDivider(width: 0), // Using VerticalDivider
+                    ),
+                    Expanded(
+                      child: ElevatedButton(
+                        // Using ElevatedButton for "Update"
+                        onPressed: () async {
+                          if (await canLaunchUrl(Uri.parse(storeUrl))) {
+                            await launchUrl(Uri.parse(storeUrl));
+                          }
+                          if (context.mounted) Navigator.pop(context);
+                        },
+                        style: ElevatedButton.styleFrom(
+                          backgroundColor: AppColor
+                              .primaryColor, // Use theme's primary color
+                          foregroundColor: Theme.of(context)
+                              .colorScheme
+                              .onPrimary, // Use theme's onPrimary color
+                          shape: const RoundedRectangleBorder(
+                            borderRadius: BorderRadius.only(
+                              bottomRight: Radius.circular(16),
+                            ),
+                          ),
+                        ),
+                        child: Text('Update'.tr),
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ),
         ),
-        actions: <Widget>[
-          CupertinoDialogAction(
-            child: Text('Update'.tr),
-            onPressed: () async {
-              if (await canLaunchUrl(Uri.parse(storeUrl))) {
-                await launchUrl(Uri.parse(storeUrl));
-              } else {
-                print('Could not launch $storeUrl');
-              }
-
-              Navigator.of(context).pop();
-            },
-          ),
-          CupertinoDialogAction(
-            child: Text('Cancel'.tr),
-            onPressed: () async {
-              Navigator.of(context).pop();
-            },
-          ),
-        ],
+      );
+    },
+    transitionBuilder: (_, animation, __, child) {
+      return ScaleTransition(
+        scale: CurvedAnimation(
+          parent: animation,
+          curve: Curves.easeOutCubic, // More natural curve
+        ),
+        child: child,
       );
     },
   );

lib/controller/local/local_controller.dart

@@ -1,94 +1,88 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-
-import '../../constant/box_name.dart';
-import '../../main.dart';
-import '../themes/themes.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/controller/themes/themes.dart';
 
 class LocaleController extends GetxController {
   Locale? language;
   String countryCode = '';
-  void restartApp() {
-    // Get.offAll(MyApp);
-    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);
     Get.changeTheme(appTheme);
     Get.updateLocale(locale);
-    restartApp();
     update();
   }
 

lib/controller/local/translations.dart

@@ -925,10 +925,50 @@ Store your money with us and receive it in your bank as a monthly salary.''':
           "You will get cost of your work for this trip":
               "ستحصل على تكلفة عملك لهذه الرحلة",
           "in your wallet": "في محفظتك",
-          "you gain": "تكسب",
+          "you gain": "تكسب", "Account": "الحساب",
+          "Wallet": "المحفظة", "Maintenance Offer": "عرض الصيانة",
+          "Enter your Question here": "أدخل سؤالك هنا",
+          "Ineligible for Offer": "غير مؤهل للحصول على العرض",
+          "You should complete 500 trips to unlock this feature.":
+              "يجب عليك إكمال 500 رحلة لتفعيل هذه الميزة.",
+          "Thank You!": "شكراً لك!",
+          "Your rating has been submitted.": "تم إرسال تقييمك.",
+          "General": "عام",
+          "Language": "اللغة",
+          "You can change the language of the app": "يمكنك تغيير لغة التطبيق",
+          "Change Country": "تغيير الدولة",
+          "Don't start trip if passenger not in your car":
+              "لا تبدأ الرحلة إذا لم يكن الراكب في سيارتك",
+          "You can change the Country to get all features":
+              "يمكنك تغيير الدولة للحصول على جميع الميزات",
+          "Slide to End Trip": "‏اسحب لإنهاء الرحلة",
+          "App Preferences": "تفضيلات التطبيق",
+          "Google Map App": "تطبيق خرائط جوجل",
+          "If you want to make Google Map App run directly when you apply order":
+              "إذا كنت تريد تشغيل تطبيق خرائط جوجل مباشرة عند تطبيق الطلب",
+          "Vibration": "الاهتزاز",
+
+          "Help & Support": "المساعدة والدعم",
+
+          "Please select a rating before submitting.":
+              "يرجى تحديد تقييم قبل الإرسال.",
+
+          "Please check back later for available rides.":
+              "يرجى التحقق مرة أخرى لاحقًا للحصول على الرحلات المتاحة.",
+          "Please enter your question": "يرجى إدخال سؤالك",
+          "Submit Question": "إرسال السؤال",
+          "Your Questions": "أسئلتك",
+          "No questions asked yet.": "لم يتم طرح أي أسئلة بعد.",
+          "Activities": "الأنشطة",
+          "History of Trip": "سجل الرحلات",
+          "Available for rides": "متاح للرحلات",
+          "Support": "الدعم",
+
+          "Helping Center": "مركز المساعدة",
+          "More": "المزيد",
           "Order Cancelled": "الطلب ملغى",
           "Order Cancelled by Passenger": "تم إلغاء الطلب من قبل الراكب",
-          "Success": "النجاح",
+          "Success": "‏تمام",
           "Feedback data saved successfully": "تم حفظ بيانات التقييم بنجاح",
           "No Promo for today .": "لا ترويج لليوم.",
           "Select your destination": "اختر وجهتك",

lib/controller/notification/notification_captain_controller.dart

@@ -1,8 +1,10 @@
 import 'dart:convert';
 
+import 'package:flutter/cupertino.dart';
 import 'package:get/get.dart';
 import 'package:sefer_driver/constant/style.dart';
 import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/mydialoug.dart';
 
 import '../../constant/box_name.dart';
 import '../../constant/links.dart';
@@ -20,16 +22,43 @@ class NotificationCaptainController extends GetxController {
         link: AppLink.getNotificationCaptain,
         payload: {'driverID': box.read(BoxName.driverID)});
     if (res == "failure") {
-      Get.defaultDialog(
-          title: 'There is no notification yet'.tr,
-          titleStyle: AppStyle.title,
-          middleText: '',
-          confirm: MyElevatedButton(
-              title: 'Back',
+      // MyDialog().getDialog('There is no notification yet'.tr, '', () {
+      //   Get.back();
+      //   Get.back();
+      // });
+      Get.dialog(
+        CupertinoAlertDialog(
+          title: Column(
+            children: [
+              const Icon(
+                CupertinoIcons.bell_slash_fill,
+                color: CupertinoColors.systemGrey,
+                size: 40,
+              ),
+              const SizedBox(height: 12),
+              Text(
+                'There is no notification yet'.tr,
+                style: const TextStyle(
+                  fontSize: 17,
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+            ],
+          ),
+          actions: [
+            CupertinoDialogAction(
               onPressed: () {
                 Get.back();
                 Get.back();
-              }));
+              },
+              child: Text('Back'.tr),
+            ),
+          ],
+        ),
+        barrierDismissible: true,
+        transitionCurve: Curves.easeOutBack,
+        transitionDuration: const Duration(milliseconds: 200),
+      );
     }
     notificationData = jsonDecode(res);
     // sql.insertData(notificationData['message'], TableName.captainNotification);

lib/controller/notification/ride_available_controller.dart

@@ -1,6 +1,8 @@
 import 'dart:convert';
 import 'dart:math';
 
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/services.dart';
 import 'package:sefer_driver/constant/box_name.dart';
 import 'package:sefer_driver/controller/functions/location_controller.dart';
 import 'package:geolocator/geolocator.dart';
@@ -79,31 +81,98 @@ class RideAvailableController extends GetxController {
   // }
 
   getRideAvailable() async {
-    isLoading = true;
-    LatLngBounds bounds = calculateBounds(
-        Get.find<LocationController>().myLocation!.latitude,
-        Get.find<LocationController>().myLocation!.longitude,
-        4000);
-    var payload = {
-      // "carType": box.read(BoxName.carTypeOfDriver).toString(),
-      'southwestLat': bounds.southwest.latitude.toString(),
-      'southwestLon': bounds.southwest.longitude.toString(),
-      'northeastLat': bounds.northeast.latitude.toString(),
-      'northeastLon': bounds.northeast.longitude.toString(),
-    };
-    Log.print('payload: ${payload}');
-    var res = await CRUD().get(link: AppLink.getRideWaiting, payload: payload);
-    Log.print('res: ${res}');
+    try {
+      isLoading = true;
+      update();
 
-    if (res != 'failure') {
-      rideAvailableMap = jsonDecode(res);
+      LatLngBounds bounds = calculateBounds(
+          Get.find<LocationController>().myLocation!.latitude,
+          Get.find<LocationController>().myLocation!.longitude,
+          4000);
+
+      var payload = {
+        'southwestLat': bounds.southwest.latitude.toString(),
+        'southwestLon': bounds.southwest.longitude.toString(),
+        'northeastLat': bounds.northeast.latitude.toString(),
+        'northeastLon': bounds.northeast.longitude.toString(),
+      };
+
+      var res =
+          await CRUD().get(link: AppLink.getRideWaiting, payload: payload);
+
+      if (res != 'failure') {
+        rideAvailableMap = jsonDecode(res);
+        isLoading = false;
+        update();
+      } else {
+        HapticFeedback.lightImpact();
+        Get.dialog(
+          CupertinoAlertDialog(
+            title: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                const Icon(
+                  CupertinoIcons.car,
+                  size: 44,
+                  color: CupertinoColors.systemGrey,
+                ),
+                const SizedBox(height: 12),
+                Text(
+                  "No Rides Available".tr,
+                  style: const TextStyle(
+                    fontSize: 17,
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+              ],
+            ),
+            content: Padding(
+              padding: const EdgeInsets.only(top: 8),
+              child: Text(
+                "Please check back later for available rides.".tr,
+                style: const TextStyle(
+                  fontSize: 13,
+                  color: CupertinoColors.systemGrey,
+                ),
+              ),
+            ),
+            actions: [
+              CupertinoDialogAction(
+                onPressed: () {
+                  Get.back();
+                  Get.back();
+                },
+                child: Text('OK'.tr),
+              ),
+            ],
+          ),
+          barrierDismissible: true,
+          transitionCurve: Curves.easeOutBack,
+          transitionDuration: const Duration(milliseconds: 200),
+        );
+      }
+    } catch (e) {
       isLoading = false;
       update();
-    } else {
-      MyDialog().getDialog("No Rides Available".tr, '', () {
-        Get.back();
-        Get.back();
-      });
+      Get.dialog(
+        CupertinoAlertDialog(
+          title: const Icon(
+            CupertinoIcons.exclamationmark_triangle_fill,
+            color: CupertinoColors.systemRed,
+            size: 44,
+          ),
+          content: Text(
+            "Error fetching rides. Please try again.".tr,
+            style: const TextStyle(fontSize: 14),
+          ),
+          actions: [
+            CupertinoDialogAction(
+              onPressed: () => Get.back(),
+              child: Text('OK'.tr),
+            ),
+          ],
+        ),
+      );
     }
   }
 

lib/controller/themes/themes.dart

@@ -1,21 +1,22 @@
 import 'package:flutter/material.dart';
 import 'package:sefer_driver/constant/style.dart';
-
 import '../../constant/colors.dart';
 
-ThemeData themeEnglish = ThemeData(
-  fontFamily: "PlayfairDisplay",
+ThemeData lightThemeEnglish = ThemeData(
+  brightness: Brightness.light,
+  fontFamily: "SFPro",
   textTheme: TextTheme(
-      displaySmall: AppStyle.title,
-      displayLarge: AppStyle.title,
-      displayMedium: AppStyle.title,
-      bodyLarge: AppStyle.title,
-      bodyMedium: AppStyle.title),
+    displaySmall: AppStyle.title,
+    displayLarge: AppStyle.headTitle,
+    displayMedium: AppStyle.headTitle2,
+    bodyLarge: AppStyle.title,
+    bodyMedium: AppStyle.subtitle,
+  ),
   primarySwatch: Colors.blue,
   dialogTheme: DialogTheme(
     backgroundColor: AppColor.secondaryColor,
     contentTextStyle: AppStyle.title,
-    titleTextStyle: AppStyle.title,
+    titleTextStyle: AppStyle.headTitle2,
   ),
   appBarTheme: AppBarTheme(
     elevation: 0,
@@ -25,35 +26,122 @@ ThemeData themeEnglish = ThemeData(
       color: AppColor.primaryColor,
     ),
     toolbarTextStyle: TextTheme(
-            titleSmall: AppStyle.subtitle,
-            headlineSmall: AppStyle.title,
-            titleLarge: AppStyle.headTitle2)
-        .bodyMedium,
+      titleSmall: AppStyle.subtitle,
+      headlineSmall: AppStyle.title,
+      titleLarge: AppStyle.headTitle2,
+    ).bodyMedium,
     titleTextStyle: TextTheme(
-            titleSmall: AppStyle.subtitle,
-            headlineSmall: AppStyle.title,
-            titleLarge: AppStyle.headTitle2)
-        .titleLarge,
+      titleSmall: AppStyle.subtitle,
+      headlineSmall: AppStyle.title,
+      titleLarge: AppStyle.headTitle2,
+    ).titleLarge,
   ),
 );
 
-ThemeData themeArabic = ThemeData(
-  fontFamily: 'mohanad',
-  textTheme: const TextTheme(
-      displayLarge: TextStyle(
-          fontWeight: FontWeight.bold,
-          fontSize: 22,
-          color: AppColor.primaryColor),
-      displayMedium: TextStyle(
-          fontWeight: FontWeight.bold,
-          fontSize: 26,
-          color: AppColor.primaryColor),
-      bodyLarge: TextStyle(
-          height: 2,
-          color: AppColor.accentColor,
-          fontWeight: FontWeight.bold,
-          fontSize: 14),
-      bodyMedium:
-          TextStyle(height: 2, color: AppColor.accentColor, fontSize: 14)),
+ThemeData darkThemeEnglish = ThemeData(
+  brightness: Brightness.dark,
+  fontFamily: "SFPro",
+  textTheme: TextTheme(
+    displaySmall: AppStyle.title,
+    displayLarge: AppStyle.headTitle,
+    displayMedium: AppStyle.headTitle2,
+    bodyLarge: AppStyle.title,
+    bodyMedium: AppStyle.subtitle,
+  ),
   primarySwatch: Colors.blue,
+  dialogTheme: DialogTheme(
+    backgroundColor: AppColor.secondaryColor,
+    contentTextStyle: AppStyle.title,
+    titleTextStyle: AppStyle.headTitle2,
+  ),
+  appBarTheme: AppBarTheme(
+    elevation: 0,
+    color: AppColor.secondaryColor,
+    centerTitle: true,
+    iconTheme: const IconThemeData(
+      color: AppColor.primaryColor,
+    ),
+    toolbarTextStyle: TextTheme(
+      titleSmall: AppStyle.subtitle,
+      headlineSmall: AppStyle.title,
+      titleLarge: AppStyle.headTitle2,
+    ).bodyMedium,
+    titleTextStyle: TextTheme(
+      titleSmall: AppStyle.subtitle,
+      headlineSmall: AppStyle.title,
+      titleLarge: AppStyle.headTitle2,
+    ).titleLarge,
+  ),
+);
+
+ThemeData lightThemeArabic = ThemeData(
+  brightness: Brightness.light,
+  fontFamily: 'SFArabic',
+  textTheme: TextTheme(
+    displaySmall: AppStyle.title,
+    displayLarge: AppStyle.headTitle,
+    displayMedium: AppStyle.headTitle2,
+    bodyLarge: AppStyle.title,
+    bodyMedium: AppStyle.subtitle,
+  ),
+  primarySwatch: Colors.blue,
+  dialogTheme: DialogTheme(
+    backgroundColor: AppColor.secondaryColor,
+    contentTextStyle: AppStyle.title,
+    titleTextStyle: AppStyle.headTitle2,
+  ),
+  appBarTheme: AppBarTheme(
+    elevation: 0,
+    color: AppColor.secondaryColor,
+    centerTitle: true,
+    iconTheme: const IconThemeData(
+      color: AppColor.primaryColor,
+    ),
+    toolbarTextStyle: TextTheme(
+      titleSmall: AppStyle.subtitle,
+      headlineSmall: AppStyle.title,
+      titleLarge: AppStyle.headTitle2,
+    ).bodyMedium,
+    titleTextStyle: TextTheme(
+      titleSmall: AppStyle.subtitle,
+      headlineSmall: AppStyle.title,
+      titleLarge: AppStyle.headTitle2,
+    ).titleLarge,
+  ),
+);
+
+ThemeData darkThemeArabic = ThemeData(
+  brightness: Brightness.dark,
+  fontFamily: 'SFArabic',
+  textTheme: TextTheme(
+    displaySmall: AppStyle.title,
+    displayLarge: AppStyle.headTitle,
+    displayMedium: AppStyle.headTitle2,
+    bodyLarge: AppStyle.title,
+    bodyMedium: AppStyle.subtitle,
+  ),
+  primarySwatch: Colors.blue,
+  dialogTheme: DialogTheme(
+    backgroundColor: AppColor.secondaryColor,
+    contentTextStyle: AppStyle.title,
+    titleTextStyle: AppStyle.headTitle2,
+  ),
+  appBarTheme: AppBarTheme(
+    elevation: 0,
+    color: AppColor.secondaryColor,
+    centerTitle: true,
+    iconTheme: const IconThemeData(
+      color: AppColor.primaryColor,
+    ),
+    toolbarTextStyle: TextTheme(
+      titleSmall: AppStyle.subtitle,
+      headlineSmall: AppStyle.title,
+      titleLarge: AppStyle.headTitle2,
+    ).bodyMedium,
+    titleTextStyle: TextTheme(
+      titleSmall: AppStyle.subtitle,
+      headlineSmall: AppStyle.title,
+      titleLarge: AppStyle.headTitle2,
+    ).titleLarge,
+  ),
 );