Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.idea/deploymentTargetSelector.xml
#	app/src/main/java/com/example/pap_findu/LocationService.java
#	app/src/main/java/com/example/pap_findu/login_activity.java
#	app/src/main/java/com/example/pap_findu/ui/map/MapFragment.java
This commit is contained in:
2026-03-13 16:58:26 +00:00
21 changed files with 1601 additions and 1012 deletions

View File

@@ -58,20 +58,28 @@ dependencies {
implementation(libs.navigation.fragment)
implementation(libs.navigation.ui)
implementation(libs.activity)
implementation(libs.firebase.database)
implementation(libs.firebase.auth)
// Firebase BOM - Import the Firebase BoM
implementation(platform("com.google.firebase:firebase-bom:32.8.0"))
// Firebase SDKs - Let BOM handle the versions
implementation("com.google.firebase:firebase-database")
implementation("com.google.firebase:firebase-auth")
implementation("com.google.firebase:firebase-firestore")
implementation("com.google.firebase:firebase-storage")
implementation(libs.credentials)
implementation(libs.credentials.play.services.auth)
implementation(libs.googleid)
// Google Play Services
implementation("com.google.android.gms:play-services-maps:18.2.0")
implementation("com.google.android.gms:play-services-location:21.0.1")
implementation(libs.firebase.firestore)
implementation("com.google.android.gms:play-services-location:21.2.0")
testImplementation(libs.junit)
androidTestImplementation(libs.ext.junit)
androidTestImplementation(libs.espresso.core)
implementation("com.github.bumptech.glide:glide:4.16.0")
annotationProcessor("com.github.bumptech.glide:compiler:4.16.0")
implementation("com.google.firebase:firebase-storage:21.0.1")
implementation("com.google.android.gms:play-services-location:21.0.1")
implementation("com.google.firebase:firebase-database-ktx:20.3.0")
}