4/7/1

lib/constant/api_key.dart

@@ -24,14 +24,22 @@ class AK {
   static final String visionApi = a.r(a.r(a.r(Env.visionApi, cn), cC), cs);
   static final String chatGPTkeySefer =
       a.r(a.r(a.r(Env.chatGPTkeySefer, cn), cC), cs);
-  static final String chatGPTkeySeferNew = Env.chatGPTkeySeferNew;
+  static final String chatGPTkeySeferNew =
+      a.r(a.r(a.r(Env.chatGPTkeySeferNew, cn), cC), cs);
   static final String serverPHP = Env.serverPHP;
-  static final String llamaKey = Env.llamaKey;
+  static final String llamaKey = a.r(a.r(a.r(Env.llamaKey, cn), cC), cs);
-  static final String cohere = Env.cohere;
+  static final String cohere = a.r(a.r(a.r(Env.cohere, cn), cC), cs);
-  static final String claudeAiAPI = Env.claudeAiAPI;
+  static final String claudeAiAPI = a.r(a.r(a.r(Env.claudeAiAPI, cn), cC), cs);
-  static final String payPalClientId = Env.payPalClientId;
+  static final String payPalClientId =
-  static final String payPalSecret = Env.payPalSecret;
+      a.r(a.r(a.r(Env.payPalClientId, cn), cC), cs);
-  static final String geminiApi = Env.geminiApi;
+  static final String payPalSecret =
-  static const String agoraAppId = '12994c6e707543e68d5638894d04f989';
+      a.r(a.r(a.r(Env.payPalSecret, cn), cC), cs);
-  static const String agoraAppCertificate = 'e21a388f83034a159f2783889a6d7bcf';
+  static final String geminiApi = a.r(a.r(a.r(Env.geminiApi, cn), cC), cs);
+  static final String agoraAppId = a.r(a.r(a.r(Env.agoraAppId, cn), cC), cs);
+  static final String agoraAppCertificate =
+      a.r(a.r(a.r(Env.agoraAppCertificate, cn), cC), cs);
+  static final String payPalClientIdLive =
+      a.r(a.r(a.r(Env.payPalClientIdLive, cn), cC), cs);
+  static final String payPalSecretLive =
+      a.r(a.r(a.r(Env.payPalSecretLive, cn), cC), cs);
 }

lib/constant/box_name.dart

@@ -5,6 +5,7 @@ class BoxName {
 
   static const String lang = "lang";
   static const String carType = "carType";
+  static const String carPlate = "carPlate";
   static const String statusDriverLocation = "statusDriverLocation";
   static const String password = "password";
   static const String passwordDriver = "passwordDriver";

lib/controller/local/translations.dart

@@ -484,6 +484,11 @@ class MyTranslation extends Translations {
           "Please help! Contact me as soon as possible.":
               "الرجاء المساعدة! اتصل بي في أقرب وقت ممكن.",
           'Share Trip Details': "مشاركة تفاصيل الرحلة",
+          'Car Plate is ': '‏رقم اللوحة',
+          'the 300 points equal 30 L.E for you \nSo go and gain your money':
+              'اربح 30 جنيه ! كل 300 نقطة تمنحك 30 جنيه. اذهب واستفد من نقاطك!',
+          'the 300 points equal 30 L.E':
+              'الـ 300 نقطة تساوي 30 جنيه بالنسبة لك ',
           'No ride found yet': '‏لا يوجد طلبات متوفرة حاليا',
           'Accept Order': "‏اقبل الطلب",
           'reject your order.': "رفض طلبك.",

lib/controller/profile/captain_profile_controller.dart

@@ -75,6 +75,7 @@ class CaptainProfileController extends GetxController {
       box.write(BoxName.vin, d['message']['vin']);
       box.write(BoxName.color, d['message']['color']);
       box.write(BoxName.model, d['message']['model']);
+      box.write(BoxName.carPlate, d['message']['car_plate']);
       box.write(BoxName.make, d['message']['make']);
       box.write(BoxName.year, d['message']['year']);
       box.write(BoxName.expirationDate, d['message']['expiration_date']);
@@ -87,7 +88,7 @@ class CaptainProfileController extends GetxController {
   @override
   void onInit() {
     // if (box.read(BoxName.dobDriver) == null) {
-      getProfileData();
+    getProfileData();
     // }
 
     super.onInit();

lib/views/home/Captin/home_captain/call_controller.dart

@@ -61,7 +61,7 @@ class CallController extends GetxController {
 
     //create an instance of the Agora engine
     agoraEngine = createAgoraRtcEngine();
-    await agoraEngine.initialize(const RtcEngineContext(appId: AK.agoraAppId));
+    await agoraEngine.initialize(RtcEngineContext(appId: AK.agoraAppId));
     print('eeeeeeeeeeeeeeeeeeee');
     print(agoraEngine);
     // Register the event handler

lib/views/home/Captin/home_captain/drawer_captain.dart

@@ -121,7 +121,10 @@ class DrawerCaptain extends StatelessWidget {
 
           ListTile(
             leading: const Icon(Icons.account_balance_wallet),
-            title: Text('Wallet'.tr),
+            title: Text(
+              'Wallet'.tr,
+              style: AppStyle.title,
+            ),
             onTap: () {
               // Handle wallet item tap
               Get.to(() => WaletCaptain(), transition: Transition.native);
@@ -129,7 +132,10 @@ class DrawerCaptain extends StatelessWidget {
           ),
           ListTile(
             leading: const Icon(Icons.person),
-            title: Text('Profile'.tr),
+            title: Text(
+              'Profile'.tr,
+              style: AppStyle.title,
+            ),
             onTap: () {
               // Handle profile item tap
               Get.to(() => const ProfileCaptain(),
@@ -137,8 +143,13 @@ class DrawerCaptain extends StatelessWidget {
             },
           ),
           ListTile(
-            leading: const Icon(Icons.history),
+            leading: const Icon(
-            title: Text('History of Trip'.tr),
+              Icons.history,
+            ),
+            title: Text(
+              'History of Trip'.tr,
+              style: AppStyle.title,
+            ),
             onTap: () {
               Get.to(() => const HistoryCaptain(),
                   transition: Transition.downToUp);
@@ -147,7 +158,10 @@ class DrawerCaptain extends StatelessWidget {
           ),
           ListTile(
             leading: const Icon(Icons.phonelink_ring_rounded),
-            title: Text('Available for rides'.tr),
+            title: Text(
+              'Available for rides'.tr,
+              style: AppStyle.title,
+            ),
             onTap: () {
               Get.to(() => const AvailableRidesPage(),
                   transition: Transition.rightToLeftWithFade);
@@ -156,7 +170,10 @@ class DrawerCaptain extends StatelessWidget {
           ),
           ListTile(
             leading: const Icon(Icons.notifications),
-            title: Text('Notifications'.tr),
+            title: Text(
+              'Notifications'.tr,
+              style: AppStyle.title,
+            ),
             onTap: () {
               // Handle notifications item tap
               Get.to(() => const NotificationCaptain(),
@@ -165,7 +182,10 @@ class DrawerCaptain extends StatelessWidget {
           ),
           ListTile(
             leading: const Icon(Icons.help),
-            title: Text('Helping Center'.tr),
+            title: Text(
+              'Helping Center'.tr,
+              style: AppStyle.title,
+            ),
             onTap: () {
               // Handle helping center item tap
               Get.to(() => HelpCaptain(), transition: Transition.size);
@@ -173,7 +193,10 @@ class DrawerCaptain extends StatelessWidget {
           ),
           ListTile(
             leading: const Icon(Icons.settings),
-            title: Text('Settings'.tr),
+            title: Text(
+              'Settings'.tr,
+              style: AppStyle.title,
+            ),
             onTap: () {
               // Handle settings item tap
               Get.to(() => const SettingsCaptain(),
@@ -182,7 +205,10 @@ class DrawerCaptain extends StatelessWidget {
           ),
           ListTile(
             leading: const Icon(Icons.exit_to_app),
-            title: Text('Sign Out'.tr),
+            title: Text(
+              'Sign Out'.tr,
+              style: AppStyle.title,
+            ),
             onTap: () {
               // Handle sign out item tap
               Get.to(() => const LogoutCaptain(),

lib/views/home/Captin/home_captain/driver_call_page.dart

@@ -11,7 +11,7 @@ import 'package:agora_rtc_engine/agora_rtc_engine.dart';
 import '../../../../constant/api_key.dart';
 import '../../../../controller/functions/crud.dart';
 
-const String appId = AK.agoraAppId;
+String appId = AK.agoraAppId;
 
 class DriverCallPage extends StatefulWidget {
   const DriverCallPage({super.key});
@@ -75,7 +75,7 @@ class _DriverCallPageState extends State<DriverCallPage> {
 
     //create an instance of the Agora engine
     agoraEngine = createAgoraRtcEngine();
-    await agoraEngine.initialize(const RtcEngineContext(appId: AK.agoraAppId));
+    await agoraEngine.initialize(RtcEngineContext(appId: AK.agoraAppId));
     print('eeeeeeeeeeeeeeeeeeee');
     print(agoraEngine);
     // Register the event handler

lib/views/home/map_widget.dart/call_passenger_page.dart

@@ -10,7 +10,7 @@ import 'package:agora_rtc_engine/agora_rtc_engine.dart';
 
 import '../../../../constant/api_key.dart';
 
-const String appId = AK.agoraAppId;
+String appId = AK.agoraAppId;
 
 class PassengerCallPage extends StatefulWidget {
   const PassengerCallPage({
@@ -61,7 +61,7 @@ class _PassengerCallPageState extends State<PassengerCallPage> {
 
     //create an instance of the Agora engine
     agoraEngine = createAgoraRtcEngine();
-    await agoraEngine.initialize(const RtcEngineContext(appId: AK.agoraAppId));
+    await agoraEngine.initialize(RtcEngineContext(appId: AK.agoraAppId));
     print('eeeeeeeeeeeeeeeeeeee');
     print(agoraEngine);
     // Register the event handler

lib/views/home/my_wallet/walet_captain.dart

@@ -12,6 +12,7 @@ import 'package:SEFER/main.dart';
 import 'package:SEFER/views/widgets/elevated_btn.dart';
 import 'package:SEFER/views/widgets/my_textField.dart';
 import 'package:SEFER/views/widgets/mycircular.dart';
+import 'package:path/path.dart';
 
 import '../../widgets/my_scafold.dart';
 import 'points_captain.dart';
@@ -54,8 +55,8 @@ class WaletCaptain extends StatelessWidget {
                           child: InkWell(
                             onTap: () {
                               Get.snackbar(
-                                'the 300 points equal 30 JOD'.tr,
+                                'the 300 points equal 30 L.E'.tr,
-                                'the 300 points equal 30 JOD for you \nSo go and gain your money'
+                                'the 300 points equal 30 L.E for you \nSo go and gain your money'
                                     .tr,
                                 backgroundColor: AppColor.greenColor,
                                 snackPosition: SnackPosition.BOTTOM,

lib/views/home/profile/profile_captain.dart

@@ -71,6 +71,10 @@ class ProfileCaptain extends StatelessWidget {
                       Text('${'Color is '.tr} :${box.read(BoxName.color)}',
                           style: AppStyle.title),
                       const SizedBox(height: 8.0),
+                      Text(
+                          '${'Car Plate is '.tr} :${box.read(BoxName.carPlate)}',
+                          style: AppStyle.title),
+                      const SizedBox(height: 8.0),
                       Text('${'Make is '.tr}:${box.read(BoxName.make)}',
                           style: AppStyle.title),
                       const SizedBox(height: 8.0),