diff --git a/android/.gradle/8.12/checksums/checksums.lock b/android/.gradle/8.12/checksums/checksums.lock deleted file mode 100644 index 38a36098..00000000 Binary files a/android/.gradle/8.12/checksums/checksums.lock and /dev/null differ diff --git a/android/.gradle/8.12/checksums/md5-checksums.bin b/android/.gradle/8.12/checksums/md5-checksums.bin deleted file mode 100644 index 87edac72..00000000 Binary files a/android/.gradle/8.12/checksums/md5-checksums.bin and /dev/null differ diff --git a/android/.gradle/8.12/checksums/sha1-checksums.bin b/android/.gradle/8.12/checksums/sha1-checksums.bin deleted file mode 100644 index aa1289f0..00000000 Binary files a/android/.gradle/8.12/checksums/sha1-checksums.bin and /dev/null differ diff --git a/android/.gradle/8.12/executionHistory/executionHistory.bin b/android/.gradle/8.12/executionHistory/executionHistory.bin deleted file mode 100644 index c2722df1..00000000 Binary files a/android/.gradle/8.12/executionHistory/executionHistory.bin and /dev/null differ diff --git a/android/.gradle/8.12/executionHistory/executionHistory.lock b/android/.gradle/8.12/executionHistory/executionHistory.lock deleted file mode 100644 index e5643ff8..00000000 Binary files a/android/.gradle/8.12/executionHistory/executionHistory.lock and /dev/null differ diff --git a/android/.gradle/8.12/expanded/expanded.lock b/android/.gradle/8.12/expanded/expanded.lock deleted file mode 100644 index 716cc523..00000000 Binary files a/android/.gradle/8.12/expanded/expanded.lock and /dev/null differ diff --git a/android/.gradle/8.12/fileChanges/last-build.bin b/android/.gradle/8.12/fileChanges/last-build.bin deleted file mode 100644 index f76dd238..00000000 Binary files a/android/.gradle/8.12/fileChanges/last-build.bin and /dev/null differ diff --git a/android/.gradle/8.12/fileHashes/fileHashes.bin b/android/.gradle/8.12/fileHashes/fileHashes.bin deleted file mode 100644 index 9af24af5..00000000 Binary files a/android/.gradle/8.12/fileHashes/fileHashes.bin and /dev/null differ diff --git a/android/.gradle/8.12/fileHashes/fileHashes.lock b/android/.gradle/8.12/fileHashes/fileHashes.lock deleted file mode 100644 index 6ca877ce..00000000 Binary files a/android/.gradle/8.12/fileHashes/fileHashes.lock and /dev/null differ diff --git a/android/.gradle/8.12/fileHashes/resourceHashesCache.bin b/android/.gradle/8.12/fileHashes/resourceHashesCache.bin deleted file mode 100644 index 3bdf6fe1..00000000 Binary files a/android/.gradle/8.12/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/android/.gradle/8.12/gc.properties b/android/.gradle/8.12/gc.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index fec79e6e..00000000 Binary files a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/android/.gradle/buildOutputCleanup/cache.properties b/android/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index ba5b5a72..00000000 --- a/android/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Mon Sep 01 15:57:27 AST 2025 -gradle.version=8.12 diff --git a/android/.gradle/buildOutputCleanup/outputFiles.bin b/android/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index 269312cd..00000000 Binary files a/android/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/android/.gradle/config.properties b/android/.gradle/config.properties deleted file mode 100644 index d3e37e41..00000000 --- a/android/.gradle/config.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Thu Dec 11 14:30:05 AST 2025 -java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home diff --git a/android/.gradle/file-system.probe b/android/.gradle/file-system.probe deleted file mode 100644 index 1e0186e7..00000000 Binary files a/android/.gradle/file-system.probe and /dev/null differ diff --git a/android/.gradle/noVersion/buildLogic.lock b/android/.gradle/noVersion/buildLogic.lock deleted file mode 100644 index e511f546..00000000 Binary files a/android/.gradle/noVersion/buildLogic.lock and /dev/null differ diff --git a/android/.gradle/vcs-1/gc.properties b/android/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 86f646e8..c70123d4 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -42,11 +42,6 @@ android { versionCode = flutter.versionCode versionName = flutter.versionName multiDexEnabled = true - - // Force application label to override plugin labels - manifestPlaceholders["appLabel"] = "Dr. Alhabib" - resValue("string", "app_name", "Dr. Alhabib") - resValue("string", "application_name", "Dr. Alhabib") // Filter to arm64-v8a for better native library compatibility ndk { @@ -246,102 +241,6 @@ tasks.whenTaskAdded { } } -// DISABLED: This was causing packaging conflicts -// Instead relying on manifest merger rules and resource priorities -/* -// CRITICAL: Fix CallKit plugin conflict at compile time -tasks.register("fixCallKitPluginConflict") { - doLast { - println("🔧 Fixing CallKit plugin conflicts with payment services...") - - // Fix merged manifests - val manifestFiles = listOf( - File(project.layout.buildDirectory.asFile.get(), "intermediates/merged_manifests"), - File(project.layout.buildDirectory.asFile.get(), "intermediates/packaged_manifests") - ) - - manifestFiles.forEach { manifestDir -> - if (manifestDir.exists()) { - manifestDir.walkTopDown().forEach { file -> - if (file.isFile && file.name == "AndroidManifest.xml") { - var content = file.readText() - var modified = false - - // Remove any CallKit application labels - if (content.contains("android:label=\"CallKit\"")) { - content = content.replace("android:label=\"CallKit\"", "android:label=\"@string/app_name\"") - modified = true - println(" ✓ Removed CallKit label from: ${file.path}") - } - - // Ensure tools namespace is declared if we need to use it - if (content.contains(" - if (resDir.exists()) { - resDir.walkTopDown().forEach { file -> - if (file.isFile && file.name == "strings.xml") { - var content = file.readText() - var modified = false - - // Replace any "CallKit" string resources - if (content.contains(">CallKit<")) { - content = content.replace(">CallKit<", ">Dr. Alhabib<") - modified = true - println(" ✓ Replaced CallKit string in: ${file.path}") - } - - if (modified) { - file.writeText(content) - } - } - } - } - } - - println("✅ CallKit plugin conflict fix completed!") - } -} - -// Run the fix after manifest and resource merging -tasks.whenTaskAdded { - if (name.contains("merge") && (name.contains("Manifest") || name.contains("Resources"))) { - finalizedBy("fixCallKitPluginConflict") - } -} -*/ - //tasks.whenTaskAdded { // if (name.contains("merge") && name.contains("NativeLibs")) { // doLast {