25-10-2/1

android/app/build.gradle

@@ -7,28 +7,28 @@ plugins {
     // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id "dev.flutter.flutter-gradle-plugin"
 }
+
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
 // Load keystore properties if the file exists
 if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
+
 android {
     namespace = "com.intaleq_driver"
-    compileSdk = 35
-    // ndkVersion = flutter.ndkVersion
+    compileSdk = 36
+    ndkVersion "29.0.14033849"
+
     externalNativeBuild {
         cmake {
             path "src/main/cpp/CMakeLists.txt"
-            version "3.31.5" // Match cmake_minimum_required in CMakeLists.txt
+            // Using a common, stable version. Your CMakeLists.txt requests 3.10.2, 
+            // but your old gradle file had 3.22.1 and 3.31.5. Let's use a stable one.
+            version "3.22.1" 
         }
     }
 
-    defaultConfig {
-        ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"  // Keep these!
-        }
-    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
@@ -39,16 +39,18 @@ android {
         jvmTarget = JavaVersion.VERSION_1_8
     }
 
+    // Merged the two defaultConfig sections into one. This is the correct way.
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "com.intaleq_driver"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = 29
         targetSdk = 36
-        versionCode = 14
-        versionName = '1.0.14'
-        multiDexEnabled =true
+        versionCode = 16 // I've used the higher version number from your first file
+        versionName = '1.0.16' // I've used the higher version name
+        multiDexEnabled = true
+
+        ndk {
+            abiFilters "armeabi-v7a", "arm64-v8a"  // Keep these!
+        }
     }
 
     signingConfigs {
@@ -59,13 +61,13 @@ android {
            storePassword keystoreProperties['storePassword']
        }
    }
+
    buildTypes {
        release {
            signingConfig signingConfigs.release
            minifyEnabled true
            shrinkResources true
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-   
        }
    }
 }
@@ -73,11 +75,12 @@ android {
 flutter {
     source = "../.."
 }
+
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.scottyab:rootbeer-lib:0.1.0'
     implementation 'com.stripe:paymentsheet:20.52.2'
+    implementation "androidx.concurrent:concurrent-futures:1.2.0" // Added this from your first file, it was missing
     implementation 'com.google.android.gms:play-services-safetynet:18.0.1'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
-    
-}
+}

android/app/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <!-- ===== Permissions ===== -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
@@ -42,6 +43,28 @@
         android:usesCleartextTraffic="false"
         android:theme="@style/LaunchTheme">
 
+        <!-- Flutter embedding v2 -->
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
+
+        <!-- تحديد نقطة دخول خلفية (للـ overlay / background executor) -->
+        <meta-data
+            android:name="io.flutter.embedding.android.BackgroundExecutor.DART_ENTRYPOINT"
+            android:value="overlayMain" />
+        <meta-data
+            android:name="io.flutter.embedding.android.BackgroundExecutor.DART_LIBRARY_URI"
+            android:value="main.dart" />
+
+        <!-- خرائط + إشعارات فFirebase (قناة افتراضية) -->
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="@string/api_key" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="@string/default_notification_channel_id" />
+
+        <!-- Main Activity -->
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -50,59 +73,73 @@
             android:launchMode="singleTask"
             android:theme="@style/LaunchTheme"
             android:windowSoftInputMode="adjustResize">
-            <meta-data android:name="io.flutter.embedding.android.NormalTheme"
+
+            <meta-data
+                android:name="io.flutter.embedding.android.NormalTheme"
                 android:resource="@style/NormalTheme" />
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
+            <!-- Deep Link: intaleqapp://... -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <!-- Define your custom scheme -->
                 <data android:scheme="intaleqapp" />
             </intent-filter>
-
         </activity>
 
+        <!-- أنشطة ومكوّنات إضافية -->
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
 
-        <meta-data android:name="com.google.android.geo.API_KEY" android:value="@string/api_key" />
-        <meta-data android:name="com.google.firebase.messaging.default_notification_channel_id"
-            android:value="@string/default_notification_channel_id" />
-        <meta-data android:name="flutterEmbedding" android:value="2" />
+        <!-- خدماتك الخاصة -->
+        <service
+            android:name=".MyFirebaseMessagingService"
+            android:exported="false" />
 
-        <service android:name=".MyFirebaseMessagingService" android:exported="false" />
-        <service android:name=".LocationUpdatesService" android:exported="false"
+        <service
+            android:name=".LocationUpdatesService"
+            android:exported="false"
             android:foregroundServiceType="location" />
-        <service android:name="com.google.firebase.messaging.FirebaseMessagingService"
-            android:exported="false" tools:replace="android:exported">
+
+        <!-- خدمة Firebase الرسمية لاستقبال رسائل FCM -->
+        <service
+            android:name="com.google.firebase.messaging.FirebaseMessagingService"
+            android:exported="false"
+            tools:replace="android:exported">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
-        <service android:name="com.phan_tech.flutter_overlay_apps.OverlayService"
-            android:exported="false" />
-        <service android:name="flutter.overlay.window.flutter_overlay_window.OverlayService"
-            android:foregroundServiceType="specialUse">
-            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="explanation_for_special_use" />
-        </service>
 
-        <receiver android:name="com.google.firebase.iid.FirebaseInstanceIdReceiver"
-            android:exported="true" android:permission="com.google.android.c2dm.permission.SEND">
+        <!-- خدمة overlay للمكتبة الأولى (إن كنت تستخدمها) -->
+        <service
+            android:name="com.phan_tech.flutter_overlay_apps.OverlayService"
+            android:exported="false" />
+
+        <!-- خدمة overlay الخاصة بمكتبة flutter_overlay_window -->
+
+
+        <!-- استقبال توكن/رسائل قديمة (توافقية) -->
+        <receiver
+            android:name="com.google.firebase.iid.FirebaseInstanceIdReceiver"
+            android:exported="true"
+            android:permission="com.google.android.c2dm.permission.SEND">
             <intent-filter>
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
                 <category android:name="com.intaleq_driver" />
             </intent-filter>
         </receiver>
 
-        <service android:name="com.dsaved.bubblehead.bubble.BubbleHeadService"
+        <!-- خدمة الفقاعة الخاصة بك -->
+        <service
+            android:name="com.dsaved.bubblehead.bubble.BubbleHeadService"
             android:enabled="true"
             android:exported="false">
             <intent-filter>
@@ -111,6 +148,7 @@
             </intent-filter>
         </service>
 
+        <!-- Notif schedulers -->
         <receiver
             android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver"
             android:exported="false" />
@@ -125,7 +163,10 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".YourBroadcastReceiver" android:exported="false" />
+        <!-- مستقبل برودكاست خاص بك -->
+        <receiver
+            android:name=".YourBroadcastReceiver"
+            android:exported="false" />
 
     </application>
 </manifest>

android/app/src/main/res/values/strings.xml

@@ -3,7 +3,7 @@
     <!-- <string name="default_notification_channel_id">ride_channel</string> -->
     <!-- <string name="default_notification_channel_id">default_channel</string> -->
     <string name="default_notification_channel_id">high_importance_channel</string>
-    <string name="api_key">AIzaSyCFsWBqvkXzk1Gb-bCGxwqTwJQKIeHjH64</string>
+    <string name="api_key">AIzaSyACAeqD8qnNYwHKj1qRec6F3AKzdo__CiQ</string>
     <string name="security_warning_title">Security Warning</string>
     <string name="api_key_safety">AIzaSyB04YNW3LbvmQ5lX1t2bOwEU18-KUoovzw</string>
 

android/gradle.properties

@@ -5,4 +5,5 @@ android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true
 dart.obfuscation=true
-android.enableR8.fullMode=true
+android.enableR8.fullMode=true
+org.gradle.java.home=/Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home