diff --git a/.gradle/9.2.1/executionHistory/executionHistory.bin b/.gradle/9.2.1/executionHistory/executionHistory.bin index 9eb856c..9723783 100644 Binary files a/.gradle/9.2.1/executionHistory/executionHistory.bin and b/.gradle/9.2.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/9.2.1/executionHistory/executionHistory.lock b/.gradle/9.2.1/executionHistory/executionHistory.lock index 9659f93..fa1627c 100644 Binary files a/.gradle/9.2.1/executionHistory/executionHistory.lock and b/.gradle/9.2.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/9.2.1/fileHashes/fileHashes.bin b/.gradle/9.2.1/fileHashes/fileHashes.bin index 034c6c3..78216fd 100644 Binary files a/.gradle/9.2.1/fileHashes/fileHashes.bin and b/.gradle/9.2.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/9.2.1/fileHashes/fileHashes.lock b/.gradle/9.2.1/fileHashes/fileHashes.lock index d511728..b22956c 100644 Binary files a/.gradle/9.2.1/fileHashes/fileHashes.lock and b/.gradle/9.2.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/9.2.1/fileHashes/resourceHashesCache.bin b/.gradle/9.2.1/fileHashes/resourceHashesCache.bin index f77c105..484d837 100644 Binary files a/.gradle/9.2.1/fileHashes/resourceHashesCache.bin and b/.gradle/9.2.1/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 5981a76..5aae698 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index f7a627f..4d19467 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/app/build/intermediates/dex/debug/mergeProjectDexDebug/1/classes.dex b/app/build/intermediates/dex/debug/mergeProjectDexDebug/1/classes.dex index c0e0d0a..c3f7f61 100644 Binary files a/app/build/intermediates/dex/debug/mergeProjectDexDebug/1/classes.dex and b/app/build/intermediates/dex/debug/mergeProjectDexDebug/1/classes.dex differ diff --git a/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex b/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex index 25c979d..548b95d 100644 Binary files a/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex and b/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex differ diff --git a/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex index 86e7fec..8f8ea99 100644 Binary files a/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex and b/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ diff --git a/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex b/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex index 2ce5d9a..985ef7f 100644 Binary files a/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex and b/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex differ diff --git a/app/build/intermediates/dex/debug/mergeProjectDexDebug/6/classes.dex b/app/build/intermediates/dex/debug/mergeProjectDexDebug/6/classes.dex index 6c245e7..f626e1e 100644 Binary files a/app/build/intermediates/dex/debug/mergeProjectDexDebug/6/classes.dex and b/app/build/intermediates/dex/debug/mergeProjectDexDebug/6/classes.dex differ diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 6110f06..d22f807 100644 --- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Tue Mar 03 16:47:40 WET 2026 +#Wed Mar 04 11:26:11 WET 2026 base.0=/Users/230405/Desktop/papcuida/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex base.1=/Users/230405/Desktop/papcuida/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex base.10=/Users/230405/Desktop/papcuida/app/build/intermediates/dex/debug/mergeExtDexDebug/classes2.dex diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/data/model/Appointment.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/data/model/Appointment.class index 09b18e8..7b0f02c 100644 Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/data/model/Appointment.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/data/model/Appointment.class differ diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/data/model/Medication.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/data/model/Medication.class index 2cc1378..c65e4c2 100644 Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/data/model/Medication.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/data/model/Medication.class differ diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/appointments/AppointmentsViewModel.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/appointments/AppointmentsViewModel.class index 9352738..af94e54 100644 Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/appointments/AppointmentsViewModel.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/appointments/AppointmentsViewModel.class differ diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/auth/RegisterActivity.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/auth/RegisterActivity.class index a77e026..04c5a8c 100644 Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/auth/RegisterActivity.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/auth/RegisterActivity.class differ diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/medication/MedicationDialog.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/medication/MedicationDialog.class index 53620f0..f2332df 100644 Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/medication/MedicationDialog.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/medication/MedicationDialog.class differ diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/medication/MedicationViewModel.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/medication/MedicationViewModel.class index 141be53..767dfb0 100644 Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/medication/MedicationViewModel.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/medication/MedicationViewModel.class differ diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/profile/ProfileFragment.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/profile/ProfileFragment.class index 28092b2..827e6bd 100644 Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/profile/ProfileFragment.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/profile/ProfileFragment.class differ diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/schedule/ScheduleViewModel.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/schedule/ScheduleViewModel.class index 2e2aa97..f47cf66 100644 Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/schedule/ScheduleViewModel.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cuida/ui/schedule/ScheduleViewModel.class differ diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/data/model/Appointment.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/data/model/Appointment.dex index fec4e45..8791232 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/data/model/Appointment.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/data/model/Appointment.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/data/model/Medication.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/data/model/Medication.dex index e9a027b..4d8710b 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/data/model/Medication.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/data/model/Medication.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/appointments/AppointmentsViewModel.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/appointments/AppointmentsViewModel.dex index d45aef9..e064202 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/appointments/AppointmentsViewModel.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/appointments/AppointmentsViewModel.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/auth/RegisterActivity.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/auth/RegisterActivity.dex index 909055b..cf8cbd3 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/auth/RegisterActivity.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/auth/RegisterActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/medication/MedicationDialog.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/medication/MedicationDialog.dex index 6c37a11..e9b752b 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/medication/MedicationDialog.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/medication/MedicationDialog.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/medication/MedicationViewModel.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/medication/MedicationViewModel.dex index e821312..31aff4d 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/medication/MedicationViewModel.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/medication/MedicationViewModel.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/profile/ProfileFragment.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/profile/ProfileFragment.dex index f42fbc9..cc54c26 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/profile/ProfileFragment.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/profile/ProfileFragment.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/schedule/ScheduleViewModel.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/schedule/ScheduleViewModel.dex index 73483ed..efc00bb 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/schedule/ScheduleViewModel.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/cuida/ui/schedule/ScheduleViewModel.dex differ diff --git a/app/build/outputs/apk/debug/app-debug.apk b/app/build/outputs/apk/debug/app-debug.apk index ff61fbc..f5d98ed 100644 Binary files a/app/build/outputs/apk/debug/app-debug.apk and b/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 65afd28..99e3295 100644 Binary files a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/app/src/main/java/com/example/cuida/data/model/Appointment.java b/app/src/main/java/com/example/cuida/data/model/Appointment.java index 6296c7b..736ea21 100644 --- a/app/src/main/java/com/example/cuida/data/model/Appointment.java +++ b/app/src/main/java/com/example/cuida/data/model/Appointment.java @@ -12,16 +12,18 @@ public class Appointment { public String time; // HH:mm public String reason; public boolean isPast; + public String userId; // Required empty constructor for Firestore deserialization public Appointment() { } - public Appointment(String type, String date, String time, String reason, boolean isPast) { + public Appointment(String type, String date, String time, String reason, boolean isPast, String userId) { this.type = type; this.date = date; this.time = time; this.reason = reason; this.isPast = isPast; + this.userId = userId; } } diff --git a/app/src/main/java/com/example/cuida/data/model/Medication.java b/app/src/main/java/com/example/cuida/data/model/Medication.java index 80ac783..e6e5626 100644 --- a/app/src/main/java/com/example/cuida/data/model/Medication.java +++ b/app/src/main/java/com/example/cuida/data/model/Medication.java @@ -12,16 +12,18 @@ public class Medication { public String dosage; // e.g. "1 compprimido" public String notes; public boolean isTaken; + public String userId; // Required empty constructor for Firestore deserialization public Medication() { } - public Medication(String name, String time, String dosage, String notes) { + public Medication(String name, String time, String dosage, String notes, String userId) { this.name = name; this.time = time; this.dosage = dosage; this.notes = notes; this.isTaken = false; + this.userId = userId; } } diff --git a/app/src/main/java/com/example/cuida/ui/appointments/AppointmentsViewModel.java b/app/src/main/java/com/example/cuida/ui/appointments/AppointmentsViewModel.java index 933d3ca..0a5d1a2 100644 --- a/app/src/main/java/com/example/cuida/ui/appointments/AppointmentsViewModel.java +++ b/app/src/main/java/com/example/cuida/ui/appointments/AppointmentsViewModel.java @@ -36,7 +36,8 @@ public class AppointmentsViewModel extends AndroidViewModel { String userId = auth.getCurrentUser().getUid(); // 1. Fetch Future Appointments - db.collection("users").document(userId).collection("appointments") + db.collection("consultas") + .whereEqualTo("userId", userId) .whereEqualTo("isPast", false) .addSnapshotListener((value, error) -> { if (error != null) { @@ -68,7 +69,8 @@ public class AppointmentsViewModel extends AndroidViewModel { }); // 2. Fetch Past Appointments - db.collection("users").document(userId).collection("appointments") + db.collection("consultas") + .whereEqualTo("userId", userId) .whereEqualTo("isPast", true) .addSnapshotListener((value, error) -> { if (error != null) { @@ -113,7 +115,9 @@ public class AppointmentsViewModel extends AndroidViewModel { return; String userId = auth.getCurrentUser().getUid(); - db.collection("users").document(userId).collection("appointments") + appointment.userId = userId; + + db.collection("consultas") .add(appointment) .addOnSuccessListener(documentReference -> Log.d("AppointmentsVM", "Appointment added")) .addOnFailureListener(e -> Log.w("AppointmentsVM", "Error adding appointment", e)); diff --git a/app/src/main/java/com/example/cuida/ui/auth/RegisterActivity.java b/app/src/main/java/com/example/cuida/ui/auth/RegisterActivity.java index d76c4e3..a0afb9e 100644 --- a/app/src/main/java/com/example/cuida/ui/auth/RegisterActivity.java +++ b/app/src/main/java/com/example/cuida/ui/auth/RegisterActivity.java @@ -61,7 +61,7 @@ public class RegisterActivity extends AppCompatActivity { userMap.put("numero_utente", utenteStr); userMap.put("profilePictureUri", ""); // Init empty - db.collection("usuarios").document(userId) + db.collection("utilizadores").document(userId) .set(userMap) .addOnSuccessListener(aVoid -> { Toast.makeText(RegisterActivity.this, "Conta criada com sucesso!", diff --git a/app/src/main/java/com/example/cuida/ui/medication/MedicationDialog.java b/app/src/main/java/com/example/cuida/ui/medication/MedicationDialog.java index 9a7a07b..23d36b1 100644 --- a/app/src/main/java/com/example/cuida/ui/medication/MedicationDialog.java +++ b/app/src/main/java/com/example/cuida/ui/medication/MedicationDialog.java @@ -104,7 +104,7 @@ public class MedicationDialog extends DialogFragment { if (listener != null) listener.onSave(medicationToEdit); } else { - Medication newMed = new Medication(name, time, dosage, notes); + Medication newMed = new Medication(name, time, dosage, notes, null); if (listener != null) listener.onSave(newMed); } diff --git a/app/src/main/java/com/example/cuida/ui/medication/MedicationViewModel.java b/app/src/main/java/com/example/cuida/ui/medication/MedicationViewModel.java index efecadb..bece2fb 100644 --- a/app/src/main/java/com/example/cuida/ui/medication/MedicationViewModel.java +++ b/app/src/main/java/com/example/cuida/ui/medication/MedicationViewModel.java @@ -35,7 +35,8 @@ public class MedicationViewModel extends AndroidViewModel { return; String userId = auth.getCurrentUser().getUid(); - db.collection("users").document(userId).collection("medications") + db.collection("medicamentos") + .whereEqualTo("userId", userId) .orderBy("time", Query.Direction.ASCENDING) .addSnapshotListener((value, error) -> { if (error != null) { @@ -73,7 +74,9 @@ public class MedicationViewModel extends AndroidViewModel { return; String userId = auth.getCurrentUser().getUid(); - db.collection("users").document(userId).collection("medications") + medication.userId = userId; + + db.collection("medicamentos") .add(medication) .addOnSuccessListener(documentReference -> Log.d("MedicationViewModel", "Medication added")) .addOnFailureListener(e -> Log.w("MedicationViewModel", "Error adding medication", e)); @@ -84,7 +87,9 @@ public class MedicationViewModel extends AndroidViewModel { return; String userId = auth.getCurrentUser().getUid(); - db.collection("users").document(userId).collection("medications") + medication.userId = userId; + + db.collection("medicamentos") .document(medication.id) .set(medication) .addOnSuccessListener(aVoid -> Log.d("MedicationViewModel", "Medication updated")) diff --git a/app/src/main/java/com/example/cuida/ui/profile/ProfileFragment.java b/app/src/main/java/com/example/cuida/ui/profile/ProfileFragment.java index e728079..fe1e759 100644 --- a/app/src/main/java/com/example/cuida/ui/profile/ProfileFragment.java +++ b/app/src/main/java/com/example/cuida/ui/profile/ProfileFragment.java @@ -55,7 +55,7 @@ public class ProfileFragment extends Fragment { return; String userId = auth.getCurrentUser().getUid(); - db.collection("users").document(userId).get() + db.collection("utilizadores").document(userId).get() .addOnSuccessListener(documentSnapshot -> { if (documentSnapshot.exists()) { currentUser = documentSnapshot.toObject(User.class); @@ -175,7 +175,7 @@ public class ProfileFragment extends Fragment { currentUser.email = newEmail; String userId = auth.getCurrentUser().getUid(); - db.collection("users").document(userId) + db.collection("utilizadores").document(userId) .set(currentUser) .addOnSuccessListener(aVoid -> { if (emailChanged) { diff --git a/app/src/main/java/com/example/cuida/ui/schedule/ScheduleViewModel.java b/app/src/main/java/com/example/cuida/ui/schedule/ScheduleViewModel.java index 9109917..5220a27 100644 --- a/app/src/main/java/com/example/cuida/ui/schedule/ScheduleViewModel.java +++ b/app/src/main/java/com/example/cuida/ui/schedule/ScheduleViewModel.java @@ -75,7 +75,8 @@ public class ScheduleViewModel extends AndroidViewModel { return; String userId = auth.getCurrentUser().getUid(); - db.collection("users").document(userId).collection("appointments") + db.collection("consultas") + .whereEqualTo("userId", userId) .whereEqualTo("date", date) .get() .addOnCompleteListener(task -> { @@ -122,9 +123,9 @@ public class ScheduleViewModel extends AndroidViewModel { String userId = auth.getCurrentUser().getUid(); if (date != null && time != null) { - Appointment appointment = new Appointment("Consulta Geral", date, time, reason, false); + Appointment appointment = new Appointment("Consulta Geral", date, time, reason, false, userId); - db.collection("users").document(userId).collection("appointments") + db.collection("consultas") .add(appointment) .addOnSuccessListener(documentReference -> { try { diff --git a/build/reports/problems/problems-report.html b/build/reports/problems/problems-report.html index b322ab5..48d55c1 100644 --- a/build/reports/problems/problems-report.html +++ b/build/reports/problems/problems-report.html @@ -646,7 +646,7 @@ code + .copy-button {