diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8389deb..2d42e85 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -45,29 +45,43 @@ android {
         applicationId = "com.Intaleq.intaleq"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
-        minSdk = 23
+        minSdkVersion = 24
         targetSdk = 36
-        versionCode = 58
-        versionName = '1.1.58'
+        versionCode = 59
+        versionName = '1.1.59'
         multiDexEnabled = true
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a"
         }
+        // استدعاء المفتاح من ملف key.properties
+        manifestPlaceholders += [mapsApiKey: keystoreProperties['mapsApiKey'] ?: ""]
+    
     }
 
-    signingConfigs {
+     signingConfigs {
         release {
-            // Check if properties are defined before using them
-            storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-            storePassword = keystoreProperties['storePassword']
-            keyAlias = keystoreProperties['keyAlias']
-            keyPassword = keystoreProperties['keyPassword']
+            // Defensively check if properties exist to avoid NullPointerException in BundleTool
+            if (keystoreProperties.isEmpty()) {
+                println "BUILD_LOG: ERROR - No properties found in key.properties. Release build will fail."
+            } else {
+                storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+                storePassword = keystoreProperties['storePassword']
+                keyAlias = keystoreProperties['keyAlias']
+                keyPassword = keystoreProperties['keyPassword']
+                
+                // Final check to ensure no crucial signing variable is null
+                if (!storeFile || !storePassword || !keyAlias || !keyPassword) {
+                    println "BUILD_LOG: ERROR - One or more signing properties are NULL. Check key.properties."
+                }
+            }
         }
     }
 
     buildTypes {
         release {
+            // Only assign signingConfig if the release config is valid
             signingConfig signingConfigs.release
+            
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -86,4 +100,4 @@ dependencies {
     implementation 'com.stripe:paymentsheet:21.4.2'
     implementation 'com.scottyab:rootbeer-lib:0.1.0'
     implementation 'com.google.android.gms:play-services-safetynet:18.1.0'
-}
\ No newline at end of file
+}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index e7b1cbd..282b6c6 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,7 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.your.package.name">
+
+    <!-- Permissions -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -9,24 +12,21 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.QUICKBOOT_POWERON" />
-    <uses-permission android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
 
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
 
     <application
-        android:label="@string/label"
         android:name="${applicationName}"
+        android:label="@string/label"
+        android:icon="@mipmap/launcher_icon"
         android:allowBackup="false"
         android:fullBackupContent="false"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:usesCleartextTraffic="false"
-        android:icon="@mipmap/launcher_icon">
+        android:networkSecurityConfig="@xml/network_security_config">
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -34,61 +34,76 @@
             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">
+
+            <!-- Flutter -->
             <meta-data
                 android:name="io.flutter.embedding.android.NormalTheme"
                 android:resource="@style/NormalTheme" />
-            <meta-data
-                android:name="com.google.firebase.messaging.default_notification_icon"
-                android:resource="@mipmap/launcher_icon" />
+
+            <!-- Launcher -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
+            <!-- ✅ App Links (Verified Domain Only) -->
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
-            <!-- ... other intent-filters ... -->
+                <data
+                    android:scheme="https"
+                    android:host="intaleqapp.com"
+                    android:pathPrefix="/" />
+
+                <data
+                    android:scheme="https"
+                    android:host="www.intaleqapp.com"
+                    android:pathPrefix="/" />
+            </intent-filter>
+
+            <!-- ✅ Custom Scheme -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <!-- 
-      هنا تضع الرابط المخصص لتطبيقك. 
-      مثال: عند الضغط على رابط `intaleq://route?lat=...` سيتم فتح التطبيق.
-    -->
-                <data android:scheme="intaleq" android:host="route" />
+
+                <data android:scheme="intaleq" />
             </intent-filter>
 
         </activity>
 
-        <!-- Existing meta-data and other activities remain unchanged -->
+        <!-- Google Maps API -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="@string/api_key" />
+            android:value="${mapsApiKey}" />
+
+        <!-- Firebase Notification Channel -->
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
             android:value="@string/default_notification_channel_id" />
-        <meta-data
-            android:name="com.android.application.versionCode"
-            android:value="1" />
-        <meta-data
-            android:name="flutterEmbedding"
-            android:value="2" />
-        <receiver android:exported="false"
-            android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
-        <receiver android:exported="false"
-            android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">
+
+        <!-- Local Notifications Receivers -->
+        <receiver
+            android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver"
+            android:exported="false" />
+
+        <receiver
+            android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
-                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
+
+        <!-- UCrop -->
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+
     </application>
 </manifest>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index b099bf5..f09a915 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/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">AIzaSyCsg7bqeKJ4r2swhxVRBINIyOy7Jmb1Ph4</string>
+    <string name="api_key">k</string>
     <!-- <string name="api_key">AIzaSyCFsWBqvkXzk1Gb-bCGxwqTwJQKIeHjH64</string> -->
     <string name="security_warning_title">Security Warning</string>
     <string name="api_key_safety">AIzaSyB04YNW3LbvmQ5lX1t2bOwEU18-KUoovzw</string>
diff --git a/android/build.gradle b/android/build.gradle
index f4c4022..b8001a4 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -17,7 +17,7 @@
 //     delete rootProject.buildDir
 // }
 buildscript {
-    ext.kotlin_version = '1.9.23'
+    ext.kotlin_version = '2.1.0'
     repositories {
         google()
         mavenCentral()