9/16/2

android/app/src/main/AndroidManifest.xml

@@ -25,6 +25,7 @@
       android:theme="@style/LaunchTheme"
       android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
       android:hardwareAccelerated="true"
+      android:enableOnBackInvokedCallback="true"
       android:windowSoftInputMode="adjustResize">
       <meta-data
         android:name="io.flutter.embedding.android.NormalTheme"

ios/Runner/Info.plist

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+	<dict>
 		<key>CFBundleURLTypes</key>
 		<array>
 			<dict>
@@ -19,7 +19,7 @@
 			<string>comgooglemaps</string>
 		</array>
 		<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
+		<true />
 		<key>CFBundleDevelopmentRegion</key>
 		<string>$(DEVELOPMENT_LANGUAGE)</string>
 		<key>CFBundleDisplayName</key>
@@ -49,7 +49,7 @@
 		<key>LSApplicationCategoryType</key>
 		<string></string>
 		<key>LSRequiresIPhoneOS</key>
-	<true/>
+		<true />
 		<key>NSCameraUsageDescription</key>
 		<string>Sefer app requires access to your camera in order to scan QR codes and capture
 			images for uploading and access to connect to a call.</string>
@@ -71,7 +71,7 @@
 		<key>NSPhotoLibraryUsageDescription</key>
 		<string>Explanation of why your app needs access to the photo library.</string>
 		<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
+		<true />
 		<key>UIBackgroundModes</key>
 		<array>
 			<string>fetch</string>
@@ -96,6 +96,6 @@
 			<string>UIInterfaceOrientationLandscapeRight</string>
 		</array>
 		<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
+		<false />
-</dict>
+	</dict>
 </plist>

lib/constant/box_name.dart

@@ -25,6 +25,7 @@ class BoxName {
   static const String sosPhoneDriver = "sosPhoneDriver";
   static const String passengerID = "pasengerID";
   static const String phone = "phone";
+  static const String phoneWallet = "phoneWallet";
   static const String phoneDriver = "phoneDriver";
   static const String dobDriver = "dobDriver";
   static const String sexDriver = "sexDriver";

lib/controller/auth/login_controller.dart

@@ -246,10 +246,10 @@ class LoginController extends GetxController {
   void onInit() async {
     // permissionLocation = await Permission.locationWhenInUse.isGranted;
     await getAppTester(AppInformation.appName);
-    if (isTest == 0 && box.read(BoxName.passengerID) != null) {
+    // if (isTest == 0 && box.read(BoxName.passengerID) != null) {
-      await loginUsingCredentials(
+    //   await loginUsingCredentials(
-          box.read(BoxName.passengerID), box.read(BoxName.email));
+    //       box.read(BoxName.passengerID), box.read(BoxName.email));
-    }
+    // }
     super.onInit();
   }
 }

lib/controller/auth/register_controller.dart

@@ -232,9 +232,10 @@ class RegisterController extends GetxController {
       print('WhatsApp message sent to non-Egyptian phone number: $phoneNumber');
     }
     isLoading = false;
-    update();
+
     isSent = true;
-    remainingTime = 300; // Reset to 5 minutes
+    remainingTime = 300;
+    update(); // Reset to 5 minutes
     startTimer();
   }
 

lib/controller/firebase/firbase_messge.dart

@@ -495,34 +495,70 @@ class FirebaseMessagesController extends GetxController {
   void sendNotificationToPassengerToken(
       String title, body, token, List<String> map, String tone) async {
     try {
+      String serviceAccountKeyJson = '''{
+  "type": "service_account",
+  "project_id": "ride-b1bd8",
+  "private_key_id": "75e817c0b902db2ef35edf2c2bd159dec1f13249",
+  "private_key": "-----BEGIN PRIVATE KEY-----\\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD0zH9TQGDQHUv3\\na3/JAD1UKPwAp3wNKT0a6fxiIzjI3JxQWI30QvZCcfl6CdMhIcydX1ncSaYTcEeC\\n/AdPVCPkqyJx1YIGGg6P/mRzCWeaN8fsp6z250m5vcObDCZc3dbJEkepbep+6FPY\\n21m3KO+AHh1glgsTGZOTm5xiU8NGXpdk2QEh8wpiIIlR/HuKwVw9g8urNe3Sno+U\\nDm3z37iFqvZdmpqO8aWTJu6beb3hsREK9XK2I9JqC2JUwiGQRo3idOvPP6hkqrWx\\nKSX96vglQFYfakvJdDp2ZATOlpBYPMtS/IWhJ985u58TSS+Kl8qpnpaZBSxgJirf\\nhWzhnKLfAgMBAAECggEAJP785SePGhS7ZN6ltspm+l+hSjYFrPWFCxq+rlQ1YkHZ\\nC9l+RqKSFhOkiPmQI2s4wbXl3kFxLHHlFNoi/q2wKQBmGb8TQfnRJpjjNHGA61Ev\\n0Ue7/6qPvVb9B2MsLw/FxKiTFPuMG3bgKR9pbSFuJLYoaW7zqITOhVnYphGTqwAY\\nBVVcvISSLvELDmH9VZcv/9DVqVlqbbESHWh1Z4W6XGPoEqeDH/upNTyQQ/46Msgm\\nTGE6VqLHpWuSf6SqHp+r0Y0lI3vIPM1vz5FAJDJbOE/enHa0fSup0OHSMxl0HVMn\\nnO1yrGF3vsIPOej5HKr5d71bEIckzk73/yjNC1/mDQKBgQD7RtUvc9omsSsFMJ6e\\nBASAn6Dktx/QY/XNJjFzHQj69cywLDe5t5AL2gUi3phQ2oqB5XJdwnd5bTIEPEPZ\\nDOuOai2802p6FJk6kjmZAMVGx5JtXBH+vs6jrmQQSMiKbjwN1TT6xIWakvLOonUi\\nX6ZvjYYjU/E0YJU3jSiXWEr76wKBgQD5Zn4SouJ6BCDZMbausJVMBkk3qxsYooip\\np89WakC6e7AZinpkRcqjGGV9GOvc8crJs6fyXAA9ORepGP47Mc0ZrDssOkstznsM\\npr8R0S6MKwEZaT9ixOHdOcLZ47ps+JzA2Wr4KN2OvFHksUkB/46ATD1j9WZVgB8M\\namsYp/Y73QKBgHOo+PvsoZ9psVmkNX6abtAdqdtdB0HOoRea2uwXk0ig12TIFaZg\\nfedWpUKVnxqoXVTJHklV99RmlL0qWDiSH+LfsMnXro0e6iDxqZ1po2Se/CFmXcoa\\nXdctsFVmixhdATuExewfhTfPKABA+xWlXWC/jdy5CK+JPWXijaqMM4edAoGAE5Bj\\nsWiPpYyvWvpYX0nA3G7dzX0hqgQN/mkIjbnWDArp3IcNZNJIvBSM2Yxb7EAXbU0n\\njo6DAkp5Pa2VO+WDNlFZbvW/sf8xjeOCt44WPa6d7nVgIIpbQXRngZoopKW3/jTP\\n/FmQT8McFXmGxZ5belsAsdetSGW9icbLUerTGQ0CgYEAmf/G8Ag3XxmqTXvvHuv2\\n14OP7WnrVqkEMnydrftEwn4peXd/Lz+/GYX5Zc4ZoNgbN8IvZ5z0+OmRsallsbiW\\nBw0/tc68CjzxXOvReWxDluUopqWVGj5tlGqE5xUDku9SWJSxbkiQ3rqutzBdPXpr\\noqHwPyDrmK/Zgqn+uiIm4Ck=\\n-----END PRIVATE KEY-----\\n",
+  "client_email": "firebase-adminsdk-o2wqi@ride-b1bd8.iam.gserviceaccount.com",
+  "client_id": "111210077025005706623",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-o2wqi%40ride-b1bd8.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}
+'''; // As defined above
+
+      // Initialize AccessTokenManager
+      final accessTokenManager = AccessTokenManager(serviceAccountKeyJson);
+
+      // Obtain an OAuth 2.0 access token
+      final accessToken = await accessTokenManager.getAccessToken();
+      // Log.print('accessToken: ${accessToken}');
+
+      // Send the notification
       final response = await http.post(
-        Uri.parse('https://fcm.googleapis.com/fcm/send'),
+        Uri.parse(
+            'https://fcm.googleapis.com/v1/projects/ride-b1bd8/messages:send'),
         headers: <String, String>{
           'Content-Type': 'application/json',
-          'Authorization': 'key=${AK.serverAPI}'
+          'Authorization': 'Bearer $accessToken',
         },
         body: jsonEncode({
-          'notification': <String, dynamic>{
+          'message': {
+            'token': token,
+            'notification': {
               'title': title,
               'body': body,
-            'sound': tone
             },
-          'data': {
+            'android': {
-            'passengerList': map,
+              'notification': {
+                'sound': tone,
+              },
+            },
+            'apns': {
+              'payload': {
+                'aps': {
+                  'sound': tone,
+                },
+              },
+            },
           },
-          'priority': 'high',
-          'to': token,
         }),
       );
 
       if (response.statusCode == 200) {
-        // Notification sent successfully
+        print(
+            'Notification sent successfully. Status code: ${response.statusCode}');
+        print('Response body: ${response.body}');
       } else {
-        // Handle error response
+        print(
-        'Failed to send notification. Status code: ${response.statusCode}';
+            'Failed to send notification. Status code: ${response.statusCode}');
+        print('Response body: ${response.body}');
       }
     } catch (e) {
-      // Handle other exceptions
+      print('Error sending notification: $e');
     }
   }
 

lib/controller/home/map_passenger_controller.dart

@@ -1769,7 +1769,7 @@ class MapPassengerController extends GetxController {
             'northeastLon': bounds.northeast.longitude.toString(),
           });
           break;
-        case 'Balash':
+        case 'Awfar Car':
           res = await CRUD()
               .get(link: AppLink.getCarsLocationByPassengerBalash, payload: {
             'southwestLat': bounds.southwest.latitude.toString(),

lib/controller/local/translations.dart

@@ -7,6 +7,7 @@ class MyTranslation extends Translations {
           "Update Available": "تحديث متوفر",
           'Phone number must be exactly 11 digits long':
               "رقم الهاتف يجب أن يكون بطول 11 رقماً",
+          'Insert Wallet phone number': 'أدخل رقم هاتف المحفظة',
           "Phone number isn't an Egyptian phone number":
               "رقم الهاتف ليس رقم هاتف مصري",
           "A new version of the app is available. Please update to the latest version.":

lib/controller/payment/payment_controller.dart

@@ -31,6 +31,7 @@ class PaymentController extends GetxController {
   bool isPromoSheetDialogue = false;
   final formKey = GlobalKey<FormState>();
   final promo = TextEditingController();
+  final walletphoneController = TextEditingController();
   double totalPassenger = Get.find<MapPassengerController>().totalPassenger;
   int? selectedAmount = 0;
   List<dynamic> totalPassengerWalletDetails = [];
@@ -762,7 +763,7 @@ class PaymentController extends GetxController {
           billingData: PaymobBillingData(),
           onPayment: (PaymobResponse response) {},
         );
-
+        if (response!.success == true && response.responseCode == '200') {
           if (response!.responseCode == 'APPROVED') {
             Get.defaultDialog(
               barrierDismissible: false,
@@ -802,6 +803,7 @@ class PaymentController extends GetxController {
             );
           }
         }
+      }
     } catch (e) {
       Get.defaultDialog(
         title: 'Error'.tr,

lib/controller/payment/paymob/paymob_wallet.dart

@@ -144,7 +144,7 @@ class PaymobPaymentWallet {
   }) async {
     final Map<String, dynamic> data = {
       "source": {
-        "identifier": box.read(BoxName.phone).toString(),
+        "identifier": box.read(BoxName.phoneWallet).toString(),
         "subtype": "WALLET",
       },
       "payment_token": paymentToken,
@@ -269,7 +269,7 @@ class PaymobBillingDataWallet {
       "email": box.read(BoxName.email) ?? box.read(BoxName.emailDriver),
       "first_name": box.read(BoxName.name) ?? box.read(BoxName.nameDriver),
       "last_name": box.read(BoxName.name) ?? box.read(BoxName.nameDriver),
-      "phone_number": box.read(BoxName.phone) ?? box.read(BoxName.phoneDriver),
+      "phone_number": box.read(BoxName.phoneWallet),
       "apartment": apartment ?? "NA",
       "floor": floor ?? "NA",
       "building": building ?? "NA",

lib/main.dart

@@ -77,9 +77,9 @@ void main() async {
     userTokenExpiration: 200,
     iFrameID: 837992,
   );
+
   PaymobPaymentWallet.instance.initialize(
-    apiKey: AK
+    apiKey: AK.payMobApikey,
-        .payMobApikey, // from dashboard Select Settings -> Account Info -> API Key
     integrationID: int.parse(AK.integrationIdPayMobWallet),
     userTokenExpiration: 200,
     iFrameID: 837992,

lib/views/widgets/my_textField.dart

@@ -27,7 +27,7 @@ class MyTextForm extends StatelessWidget {
           children: [
             Text(
               label.tr,
-              style: TextStyle(
+              style: const TextStyle(
                 color: CupertinoColors.label,
                 fontSize: 16,
                 fontWeight: FontWeight.w600,