2026-02-19

android/app/build.gradle

@@ -42,15 +42,17 @@ android {
     // Merged the two defaultConfig sections into one. This is the correct way.
     defaultConfig {
         applicationId = "com.intaleq_driver"
-        minSdkVersion = 23
+        minSdkVersion = flutter.minSdkVersion
         targetSdk = 36
-        versionCode = 57
-        versionName = '1.1.57' // I've used the higher version name
+        versionCode = 59
+        versionName = '1.1.59' // I've used the higher version name
         multiDexEnabled = true
 
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a"  // Keep these!
         }
+        manifestPlaceholders += [mapsApiKey: keystoreProperties['mapsApiKey'] ?: ""]
+
     }
 
     signingConfigs {

android/app/src/main/AndroidManifest.xml

@@ -46,7 +46,9 @@
             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.android.geo.API_KEY"
+      android:value="${mapsApiKey}" />
     <meta-data android:name="com.google.firebase.messaging.default_notification_channel_id"
       android:value="@string/default_notification_channel_id" />
     <meta-data android:name="io.flutter.embedding.android.EnableImpeller" android:value="false" />

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

@@ -3,9 +3,9 @@
     <!-- <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">AIzaSyACAeqD8qnNYwHKj1qRec6F3AKzdo__CiQ</string>
+    <string name="api_key">e</string>
     <string name="security_warning_title">Security Warning</string>
-    <string name="api_key_safety">AIzaSyB04YNW3LbvmQ5lX1t2bOwEU18-KUoovzw</string>
+    <string name="api_key_safety">AIzaSyB04YNW3LbvmQ5lX1t2bOwEU18-</string>
     <string name="label">Intaleq Driver</string>
 
     <string name="security_warning_message">A security issue or modification has been detected on

android/build.gradle

@@ -1,24 +1,5 @@
-// allprojects {
-//     repositories {
-//         google()
-//         mavenCentral()
-//     }
-// }
-
-// rootProject.buildDir = "../build"
-// subprojects {
-//     project.buildDir = "${rootProject.buildDir}/${project.name}"
-// }
-// subprojects {
-//     project.evaluationDependsOn(":app")
-// }
-
-// tasks.register("clean", Delete) {
-//     delete rootProject.buildDir
-// }
-
 buildscript {
-    ext.kotlin_version = '1.9.23'
+    ext.kotlin_version = '2.1.0'
     repositories {
         google()
         mavenCentral()