From e6d015be65eb527edcbf6619dd5c4673c329a5ea Mon Sep 17 00:00:00 2001
From: 230410 <230410@epvc.pt>
Date: Wed, 18 Mar 2026 10:40:21 +0000
Subject: [PATCH] Atualizado

---
 .idea/deploymentTargetSelector.xml            |    4 +-
 app/src/main/AndroidManifest.xml              |    7 +
 .../java/com/example/bem/AlarmReceiver.java   |    7 +-
 .../com/example/bem/AlarmRingingActivity.java |   45 +
 .../com/example/bem/InviteCodeActivity.java   |   10 +-
 .../java/com/example/bem/MainActivity.java    | 1382 +++++++++++------
 app/src/main/res/layout/dialog_profile.xml    |   27 +-
 app/src/main/res/layout/item_alarm_card.xml   |   24 +-
 app/src/main/res/layout/item_calendar_day.xml |    6 +-
 .../main/res/layout/item_saved_account.xml    |   26 +-
 app/src/main/res/layout/layout_tab_alarms.xml |    3 +
 .../main/res/layout/layout_tab_calendar.xml   |  119 +-
 .../main/res/layout/layout_tab_guardians.xml  |   12 +-
 13 files changed, 1049 insertions(+), 623 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 48d8506..85de9e0 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-03-10T15:47:42.816610Z">
+        <DropdownSelection timestamp="2026-03-18T10:38:49.186279Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/230410/.android/avd/Pixel_9_Pro.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/230410/.android/avd/Medium_Phone.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cf2f002..7b4088e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -65,6 +66,12 @@
             android:enabled="true"
             android:exported="false"
             android:foregroundServiceType="mediaPlayback" />
+
+        <service
+            android:name=".GuardianNotificationService"
+            android:enabled="true"
+            android:exported="false"
+            android:foregroundServiceType="dataSync" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/bem/AlarmReceiver.java b/app/src/main/java/com/example/bem/AlarmReceiver.java
index 26fdf3b..9f1a4ff 100644
--- a/app/src/main/java/com/example/bem/AlarmReceiver.java
+++ b/app/src/main/java/com/example/bem/AlarmReceiver.java
@@ -23,6 +23,7 @@ public class AlarmReceiver extends BroadcastReceiver {
         String message = intent.getStringExtra("alarm_message");
         String ringtoneUriString = intent.getStringExtra("ringtone_uri");
         int alarmId = intent.getIntExtra("alarm_id", -1);
+        String docId = intent.getStringExtra("alarm_doc_id");
         
         if (title == null) {
             title = "Alarme de Medicamento";
@@ -39,6 +40,7 @@ public class AlarmReceiver extends BroadcastReceiver {
         activityIntent.putExtra("alarm_time", new java.text.SimpleDateFormat("HH:mm", java.util.Locale.getDefault()).format(new java.util.Date()));
         activityIntent.putExtra("ringtone_uri", ringtoneUriString);
         activityIntent.putExtra("alarm_id", alarmId);
+        activityIntent.putExtra("alarm_doc_id", docId);
         context.startActivity(activityIntent);
         
         Intent serviceIntent = new Intent(context, AlarmSoundService.class);
@@ -52,7 +54,7 @@ public class AlarmReceiver extends BroadcastReceiver {
         }
         
         createNotificationChannel(context);
-        showNotification(context, title, message, ringtoneUriString, alarmId);
+        showNotification(context, title, message, ringtoneUriString, alarmId, docId);
     }
     
     private void createNotificationChannel(Context context) {
@@ -72,13 +74,14 @@ public class AlarmReceiver extends BroadcastReceiver {
         }
     }
     
-    private void showNotification(Context context, String title, String message, String ringtoneUriString, int alarmId) {
+    private void showNotification(Context context, String title, String message, String ringtoneUriString, int alarmId, String docId) {
         Intent activityIntent = new Intent(context, AlarmRingingActivity.class);
         activityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
         activityIntent.putExtra("alarm_title", title);
         activityIntent.putExtra("alarm_time", new java.text.SimpleDateFormat("HH:mm", java.util.Locale.getDefault()).format(new java.util.Date()));
         activityIntent.putExtra("ringtone_uri", ringtoneUriString);
         activityIntent.putExtra("alarm_id", alarmId);
+        activityIntent.putExtra("alarm_doc_id", docId);
         
         PendingIntent pendingIntent = PendingIntent.getActivity(
                 context, 
diff --git a/app/src/main/java/com/example/bem/AlarmRingingActivity.java b/app/src/main/java/com/example/bem/AlarmRingingActivity.java
index cce553e..d04e55b 100644
--- a/app/src/main/java/com/example/bem/AlarmRingingActivity.java
+++ b/app/src/main/java/com/example/bem/AlarmRingingActivity.java
@@ -38,6 +38,7 @@ public class AlarmRingingActivity extends AppCompatActivity {
         String time = getIntent().getStringExtra("alarm_time");
         String ringtoneUri = getIntent().getStringExtra("ringtone_uri");
         int alarmId = getIntent().getIntExtra("alarm_id", -1);
+        String docId = getIntent().getStringExtra("alarm_doc_id");
         
         TextView textTitle = findViewById(R.id.textAlarmTitle);
         TextView textTime = findViewById(R.id.textAlarmTime);
@@ -59,9 +60,53 @@ public class AlarmRingingActivity extends AppCompatActivity {
         
         btnStop.setOnClickListener(v -> {
             stopAlarmService();
+            confirmInFirestore(title, docId);
             finish();
         });
     }
+
+    private void confirmInFirestore(String title, String docId) {
+        com.google.firebase.auth.FirebaseUser user = com.google.firebase.auth.FirebaseAuth.getInstance().getCurrentUser();
+        if (user == null) return;
+        
+        String uid = user.getUid();
+        com.google.firebase.firestore.FirebaseFirestore db = com.google.firebase.firestore.FirebaseFirestore.getInstance();
+        
+        if (docId != null) {
+            updateAlarmDocument(db, uid, docId, title);
+        } else {
+            // Fallback to title search if docId is missing
+            db.collection("users").document(uid).collection("alarms")
+                    .whereEqualTo("title", title)
+                    .get()
+                    .addOnSuccessListener(snapshots -> {
+                        for (com.google.firebase.firestore.DocumentSnapshot doc : snapshots) {
+                            updateAlarmDocument(db, uid, doc.getId(), title);
+                        }
+                    });
+        }
+    }
+
+    private void updateAlarmDocument(com.google.firebase.firestore.FirebaseFirestore db, String uid, String documentId, String title) {
+        java.util.Map<String, Object> update = new java.util.HashMap<>();
+        long now = System.currentTimeMillis();
+        update.put("lastTakenTimestamp", now);
+        update.put("takenToday", true);
+        
+        db.collection("users").document(uid).collection("alarms").document(documentId).update(update);
+        
+        // Also add to history
+        String dateKey = new java.text.SimpleDateFormat("yyyyMMdd", java.util.Locale.getDefault()).format(new java.util.Date());
+        java.util.Map<String, Object> hist = new java.util.HashMap<>();
+        hist.put("date", dateKey);
+        hist.put("alarmId", documentId);
+        hist.put("title", title);
+        hist.put("takenAt", now);
+        
+        db.collection("users").document(uid).collection("history")
+                .document(dateKey + "_" + documentId)
+                .set(hist);
+    }
     
     private void snoozeAlarm(String title, String ringtoneUri, int alarmId) {
         AlarmManager alarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
diff --git a/app/src/main/java/com/example/bem/InviteCodeActivity.java b/app/src/main/java/com/example/bem/InviteCodeActivity.java
index 37b51cd..77f0396 100644
--- a/app/src/main/java/com/example/bem/InviteCodeActivity.java
+++ b/app/src/main/java/com/example/bem/InviteCodeActivity.java
@@ -105,13 +105,13 @@ public class InviteCodeActivity extends AppCompatActivity {
 
             String guardianId = currentUser.getUid();
 
-            // 1. Atualizar o perfil do responsável PRIMEIRO (ele tem permissão para o seu
-            // próprio perfil)
+            // 1. Atualizar o perfil do responsável PRIMEIRO (ele tem permissão para o seu próprio perfil)
             db.collection("users").document(guardianId)
                     .update("managedUsers", FieldValue.arrayUnion(patientId), "type", "guardian")
                     .addOnSuccessListener(aVoid -> {
 
-                        // 2. Tentar atualizar o perfil do paciente (pode falhar por permissões)
+                        // 2. Tentar atualizar o perfil do paciente (pode falhar por permissões se as regras não deixarem,
+                        // mas vamos tentar)
                         Map<String, Object> patientUpdate = new HashMap<>();
                         patientUpdate.put("guardianId", guardianId);
                         patientUpdate.put("guardians", FieldValue.arrayUnion(guardianId));
@@ -123,8 +123,8 @@ public class InviteCodeActivity extends AppCompatActivity {
                                 })
                                 .addOnFailureListener(e -> {
                                     // Se falhar o paciente mas o responsável deu certo, avisamos mas prosseguimos
-                                    Log.e("InviteCode", "Falha ao atualizar paciente (provavelmente permissões): "
-                                            + e.getMessage());
+                                    Log.e("InviteCode", "Falha ao atualizar paciente (provavelmente permissões): " + e.getMessage());
+                                    // Even though permissions might fail from the client side, we complete association
                                     completeAssociation(code);
                                 });
 
diff --git a/app/src/main/java/com/example/bem/MainActivity.java b/app/src/main/java/com/example/bem/MainActivity.java
index 3ac40f8..50568c6 100644
--- a/app/src/main/java/com/example/bem/MainActivity.java
+++ b/app/src/main/java/com/example/bem/MainActivity.java
@@ -8,6 +8,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.graphics.drawable.GradientDrawable;
+import android.location.Address;
+import android.location.Geocoder;
+import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -35,6 +39,7 @@ import androidx.core.content.ContextCompat;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.firestore.FirebaseFirestore;
+import com.google.firebase.firestore.ListenerRegistration;
 import com.google.firebase.firestore.QueryDocumentSnapshot;
 
 import java.util.ArrayList;
@@ -44,6 +49,14 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import com.google.android.gms.location.FusedLocationProviderClient;
+import com.google.android.gms.location.LocationServices;
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
 public class MainActivity extends AppCompatActivity {
 
     private enum Tab {
@@ -54,26 +67,15 @@ public class MainActivity extends AppCompatActivity {
     }
 
     private FrameLayout tabContainer;
-    private LinearLayout tabAlarms;
-    private LinearLayout tabReminders;
-    private LinearLayout tabGuardians;
-    private LinearLayout tabCalendar;
-    private ImageView iconAlarms;
-    private ImageView iconReminders;
-    private ImageView iconGuardians;
-    private ImageView iconCalendar;
-    private TextView textAlarms;
-    private TextView textReminders;
-    private TextView textGuardians;
-    private TextView textCalendar;
+    private LinearLayout tabAlarms, tabReminders, tabGuardians, tabCalendar;
+    private ImageView iconAlarms, iconReminders, iconGuardians, iconCalendar;
+    private TextView textAlarms, textReminders, textGuardians, textCalendar;
 
     private LayoutInflater inflater;
-    private View alarmsView;
-    private View remindersView;
-    private View guardiansView;
-    private View calendarView;
+    private View alarmsView, remindersView, guardiansView, calendarView;
     private LinearLayout alarmListContainer;
     private final List<AlarmItem> alarms = new ArrayList<>();
+    private final List<AlarmItem> patientAlarms = new ArrayList<>();
     private Tab currentTab = null;
     private FirebaseAuth mAuth;
     private FirebaseFirestore db;
@@ -82,22 +84,53 @@ public class MainActivity extends AppCompatActivity {
     private int editingAlarmIndex = -1;
     private String currentUserId = null;
     private boolean isGuardian = false;
+    private String linkedPatientId = null;
+    
+    private ListenerRegistration guardianAlarmsListener;
+    private ListenerRegistration patientCalendarListener;
+    private ListenerRegistration historyListener;
+    private ListenerRegistration userDocListener;
+    
+    private FusedLocationProviderClient fusedLocationClient;
+    private TextView textLocation, textTemperature, textCondition, textTipDesc1;
+    
+    private final Map<String, List<String>> confirmationHistory = new HashMap<>(); // key: YYYYMMDD, value: list of alarm titles
 
     private final ActivityResultLauncher<String> notificationPermissionLauncher = registerForActivityResult(
             new ActivityResultContracts.RequestPermission(), isGranted -> {
-                if (isGranted) {
-                    Toast.makeText(this, "Permissão de notificações concedida!", Toast.LENGTH_SHORT).show();
-                } else {
+                if (!isGranted) {
                     Toast.makeText(this, "Permissão negada. Alarmes podem não tocar.", Toast.LENGTH_LONG).show();
                 }
             });
 
+    private final ActivityResultLauncher<String> locationPermissionLauncher = registerForActivityResult(
+            new ActivityResultContracts.RequestPermission(), isGranted -> {
+                if (isGranted) {
+                    fetchLocationAndWeather();
+                }
+            });
+
+    private AlarmItem editingAlarmForSound;
+    private final ActivityResultLauncher<Intent> ringtonePickerLauncher = registerForActivityResult(
+            new ActivityResultContracts.StartActivityForResult(), result -> {
+                if (result.getResultCode() == RESULT_OK && result.getData() != null && editingAlarmForSound != null) {
+                    Uri uri = result.getData().getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
+                    if (uri != null) {
+                        editingAlarmForSound.ringtoneUri = uri.toString();
+                        updateAlarmInFirestore(editingAlarmForSound);
+                        android.widget.Toast.makeText(this, "Som alterado!", android.widget.Toast.LENGTH_SHORT).show();
+                    }
+                    editingAlarmForSound = null;
+                }
+            });
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         mAuth = FirebaseAuth.getInstance();
         db = FirebaseFirestore.getInstance();
+        fusedLocationClient = LocationServices.getFusedLocationProviderClient(this);
 
         FirebaseUser currentUser = mAuth.getCurrentUser();
         if (currentUser == null) {
@@ -115,7 +148,40 @@ public class MainActivity extends AppCompatActivity {
 
         String userType = prefs.getString("user_type", "user");
         isGuardian = "guardian".equals(userType);
+        linkedPatientId = prefs.getString("linked_patient_id", null);
 
+        initViews();
+        setupListeners();
+        observeUserDocument();
+
+        requestNotificationPermissions();
+        
+        // Fix: Auto-load the initial tab immediately to avoid white screen
+        Tab initialTab = isGuardian ? Tab.GUARDIANS : Tab.ALARMS;
+        currentTab = initialTab;
+        
+        applyUserModeLayout();
+        tabContainer.post(() -> loadAndShowTab(currentTab));
+        
+        loadAlarmsFromFirestore();
+        showIntroDialogIfNeeded();
+        updateLastActive();
+        if (isGuardian) startGuardianServiceIfLinked();
+    }
+
+    @Override
+    protected void onRestart() {
+        super.onRestart();
+        updateLastActive();
+    }
+
+    private void updateLastActive() {
+        if (currentUserId != null) {
+            db.collection("users").document(currentUserId).update("lastActive", System.currentTimeMillis());
+        }
+    }
+
+    private void initViews() {
         tabContainer = findViewById(R.id.tabContainer);
         tabAlarms = findViewById(R.id.tabAlarms);
         tabReminders = findViewById(R.id.tabReminders);
@@ -132,18 +198,47 @@ public class MainActivity extends AppCompatActivity {
         textGuardians = findViewById(R.id.textGuardians);
         textCalendar = findViewById(R.id.textCalendar);
 
-        ImageView profileButton = findViewById(R.id.profileButton);
+        findViewById(R.id.profileButton).setOnClickListener(v -> showProfileMenu());
+    }
 
+    private void setupListeners() {
         tabAlarms.setOnClickListener(v -> switchTab(Tab.ALARMS));
         tabReminders.setOnClickListener(v -> switchTab(Tab.REMINDERS));
         tabGuardians.setOnClickListener(v -> handleGuardianTabClick());
         tabCalendar.setOnClickListener(v -> switchTab(Tab.CALENDAR));
-        profileButton.setOnClickListener(v -> showProfileMenu());
+    }
 
-        requestNotificationPermissions();
-        applyUserModeLayout();
-        loadAlarmsFromFirestore();
-        showIntroDialogIfNeeded();
+    private void observeUserDocument() {
+        if (currentUserId == null) return;
+        userDocListener = db.collection("users").document(currentUserId).addSnapshotListener((snapshot, e) -> {
+            if (e != null || snapshot == null || !snapshot.exists()) return;
+            
+            String type = snapshot.getString("type");
+            boolean newIsGuardian = "guardian".equals(type);
+            
+            // Handle patient linkage
+            List<String> managed = new ArrayList<>();
+            Object val = snapshot.get("managedUsers");
+            if (val instanceof List) {
+                for (Object item : (List<?>) val) if (item instanceof String) managed.add((String) item);
+            }
+            String newPatientId = managed.isEmpty() ? null : managed.get(0);
+            
+            boolean linkageChanged = (newPatientId == null && linkedPatientId != null) || 
+                                     (newPatientId != null && !newPatientId.equals(linkedPatientId));
+            
+            if (newIsGuardian != isGuardian || linkageChanged) {
+                isGuardian = newIsGuardian;
+                linkedPatientId = newPatientId;
+                prefs.edit().putString("user_type", type).apply();
+                applyUserModeLayout();
+                
+                // If the user is currently on a tab that depends on patient data, refresh it
+                if (isGuardian && (currentTab == Tab.GUARDIANS || currentTab == Tab.CALENDAR)) {
+                    loadAndShowTab(currentTab);
+                }
+            }
+        });
     }
 
     private void applyUserModeLayout() {
@@ -151,12 +246,16 @@ public class MainActivity extends AppCompatActivity {
             tabAlarms.setVisibility(View.GONE);
             tabReminders.setVisibility(View.GONE);
             tabCalendar.setVisibility(View.VISIBLE);
-            switchTab(Tab.GUARDIANS);
+            if (currentTab == Tab.ALARMS || currentTab == Tab.REMINDERS) {
+                switchTab(Tab.GUARDIANS);
+            }
         } else {
             tabAlarms.setVisibility(View.VISIBLE);
             tabReminders.setVisibility(View.VISIBLE);
             tabCalendar.setVisibility(View.GONE);
-            switchTab(Tab.ALARMS);
+            if (currentTab == Tab.GUARDIANS || currentTab == Tab.CALENDAR) {
+                switchTab(Tab.ALARMS);
+            }
         }
     }
 
@@ -179,17 +278,15 @@ public class MainActivity extends AppCompatActivity {
         if (isGuardian) {
             switchTab(Tab.GUARDIANS);
         } else {
-             db.collection("users").document(currentUserId).get().addOnSuccessListener(documentSnapshot -> {
-                if (documentSnapshot.exists() && documentSnapshot.contains("guardianId")) {
-                    Toast.makeText(this, "Já tem um responsável associado.", Toast.LENGTH_SHORT).show();
+             db.collection("users").document(currentUserId).get().addOnSuccessListener(doc -> {
+                if (doc.exists() && (doc.contains("guardianId") || doc.contains("guardians"))) {
                      switchTab(Tab.GUARDIANS);
                 } else {
                     new AlertDialog.Builder(this)
-                        .setTitle("Controle Parental")
-                        .setMessage("Ainda não tem um responsável associado. Deseja gerar um código de convite para adicionar um?")
+                        .setTitle("Responsável")
+                        .setMessage("Ainda não tem um responsável associado. Deseja gerar um código de convite?")
                         .setPositiveButton("Gerar Código", (dialog, which) -> {
-                            Intent intent = new Intent(MainActivity.this, GenerateCodeActivity.class);
-                            startActivity(intent);
+                            startActivity(new Intent(this, GenerateCodeActivity.class));
                         })
                         .setNegativeButton("Agora Não", null)
                         .show();
@@ -200,63 +297,44 @@ public class MainActivity extends AppCompatActivity {
 
     private void showProfileMenu() {
         View dialogView = inflater.inflate(R.layout.dialog_profile, null);
-        AlertDialog dialog = new AlertDialog.Builder(this)
-                .setView(dialogView)
-                .create();
+        AlertDialog dialog = new AlertDialog.Builder(this).setView(dialogView).create();
+        if (dialog.getWindow() != null) dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
 
-        if (dialog.getWindow() != null) {
-            dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
-        }
-
-        TextView textName = dialogView.findViewById(R.id.textProfileName);
-        TextView textEmail = dialogView.findViewById(R.id.textProfileEmail);
-        LinearLayout btnTheme = dialogView.findViewById(R.id.btnProfileTheme);
-        LinearLayout btnSupport = dialogView.findViewById(R.id.btnProfileSupport);
-        LinearLayout btnExitGuardian = dialogView.findViewById(R.id.btnProfileExitGuardian);
-        LinearLayout btnLogout = dialogView.findViewById(R.id.btnProfileLogout);
-        Button btnClose = dialogView.findViewById(R.id.btnProfileClose);
-
-        String name = prefs.getString("user_name", "Utilizador");
-        FirebaseUser user = mAuth.getCurrentUser();
-        String email = user != null ? user.getEmail() : "Não disponível";
-
-        textName.setText(name);
-        textEmail.setText(email);
-
-        btnTheme.setOnClickListener(v -> {
-            dialog.dismiss();
-            toggleDarkMode();
-        });
-
-        btnSupport.setOnClickListener(v -> {
-            dialog.dismiss();
-            openSupportEmail();
-        });
-
-        if (isGuardian) {
-            btnExitGuardian.setVisibility(View.VISIBLE);
-            btnExitGuardian.setOnClickListener(v -> {
-                dialog.dismiss();
-                exitGuardianMode();
+        TextView nameTxt = dialogView.findViewById(R.id.textProfileName);
+        TextView emailTxt = dialogView.findViewById(R.id.textProfileEmail);
+        
+        nameTxt.setText(prefs.getString("user_name", "Utilizador"));
+        FirebaseUser currentUser = mAuth.getCurrentUser();
+        emailTxt.setText(currentUser != null ? currentUser.getEmail() : "Não disponível");
+        
+        // Fetch fresh data from Firestore to ensure it's correct
+        if (currentUserId != null) {
+            db.collection("users").document(currentUserId).get().addOnSuccessListener(doc -> {
+                if (doc.exists()) {
+                    String name = doc.getString("name");
+                    String email = doc.getString("email");
+                    if (name != null) nameTxt.setText(name);
+                    if (email != null) emailTxt.setText(email);
+                }
             });
-        } else {
-            btnExitGuardian.setVisibility(View.GONE);
         }
+        
+        // Profile buttons
+        dialogView.findViewById(R.id.btnProfileSupport).setOnClickListener(v -> { dialog.dismiss(); openSupportEmail(); });
+        
+        View btnExitGuardian = dialogView.findViewById(R.id.btnProfileExitGuardian);
+        btnExitGuardian.setVisibility(isGuardian ? View.VISIBLE : View.GONE);
+        btnExitGuardian.setOnClickListener(v -> { dialog.dismiss(); exitGuardianMode(); });
 
-        btnLogout.setOnClickListener(v -> {
-            dialog.dismiss();
-            logout();
-        });
-
-        btnClose.setOnClickListener(v -> dialog.dismiss());
-
+        dialogView.findViewById(R.id.btnProfileLogout).setOnClickListener(v -> { dialog.dismiss(); logout(); });
+        dialogView.findViewById(R.id.btnProfileClose).setOnClickListener(v -> dialog.dismiss());
         dialog.show();
     }
 
     private void exitGuardianMode() {
         prefs.edit().putString("user_type", "user").apply();
         Intent intent = new Intent(this, InviteCodeActivity.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        stopService(new Intent(this, GuardianNotificationService.class));
         startActivity(intent);
         finish();
     }
@@ -268,171 +346,313 @@ public class MainActivity extends AppCompatActivity {
     }
 
     private void openSupportEmail() {
-        Intent intent = new Intent(Intent.ACTION_SENDTO);
-        intent.setData(Uri.parse("mailto:support@bempap.com"));
+        Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:support@bempap.com"));
         intent.putExtra(Intent.EXTRA_SUBJECT, "Suporte App Bem+");
-        try {
-            startActivity(intent);
-        } catch (Exception e) {
-            Toast.makeText(this, "Nenhuma app de email encontrada.", Toast.LENGTH_SHORT).show();
-        }
+        try { startActivity(intent); } catch (Exception e) { Toast.makeText(this, "Erro ao abrir email.", Toast.LENGTH_SHORT).show(); }
     }
 
     private void logout() {
         mAuth.signOut();
+        stopService(new Intent(this, GuardianNotificationService.class));
         redirectToLogin();
     }
 
     private void applyThemeFromPrefs() {
-        if (prefs.getBoolean(PREF_DARK_MODE, false)) {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-        } else {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-        }
+        AppCompatDelegate.setDefaultNightMode(prefs.getBoolean(PREF_DARK_MODE, false) ? 
+                AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
     }
 
     private void switchTab(Tab tab) {
-        if (tab == currentTab) return;
+        if (tab == currentTab && tabContainer.getChildCount() > 0) return;
         currentTab = tab;
-
-        View oldContent = tabContainer.getChildCount() > 0 ? tabContainer.getChildAt(0) : null;
-        if (oldContent != null) {
-            oldContent.animate().alpha(0f).setDuration(150).withEndAction(() -> {
-                tabContainer.removeAllViews();
-                loadAndShowTab(tab);
-            }).start();
-        } else {
-            loadAndShowTab(tab);
-        }
+        loadAndShowTab(tab);
     }
 
     private void loadAndShowTab(Tab tab) {
-        View content;
+        if (guardianAlarmsListener != null) { guardianAlarmsListener.remove(); guardianAlarmsListener = null; }
+        if (patientCalendarListener != null) { patientCalendarListener.remove(); patientCalendarListener = null; }
+        if (historyListener != null) { historyListener.remove(); historyListener = null; }
+
+        View content = null;
         switch (tab) {
-            case REMINDERS:
-                if (remindersView == null) remindersView = inflater.inflate(R.layout.layout_tab_reminders, tabContainer, false);
-                content = remindersView;
-                break;
-            case GUARDIANS:
-                if (guardiansView == null) guardiansView = inflater.inflate(R.layout.layout_tab_guardians, tabContainer, false);
-                loadGuardianData(guardiansView);
-                content = guardiansView;
-                break;
-            case CALENDAR:
-                if (calendarView == null) calendarView = inflater.inflate(R.layout.layout_tab_calendar, tabContainer, false);
-                setupCalendar(calendarView);
-                content = calendarView;
-                break;
             case ALARMS:
-            default:
                 if (alarmsView == null) alarmsView = inflater.inflate(R.layout.layout_tab_alarms, tabContainer, false);
+                content = alarmsView;
                 Button addAlarm = alarmsView.findViewById(R.id.btnAddAlarm);
                 alarmListContainer = alarmsView.findViewById(R.id.alarmListContainer);
                 if (addAlarm != null) addAlarm.setOnClickListener(v -> showAddAlarmDialog());
                 renderAlarms();
-                content = alarmsView;
+                break;
+            case REMINDERS:
+                if (remindersView == null) remindersView = inflater.inflate(R.layout.layout_tab_reminders, tabContainer, false);
+                content = remindersView;
+                textLocation = remindersView.findViewById(R.id.textLocation);
+                textTemperature = remindersView.findViewById(R.id.textTemperature);
+                textCondition = remindersView.findViewById(R.id.textCondition);
+                textTipDesc1 = remindersView.findViewById(R.id.textTipDesc1);
+                TextView textGreeting = remindersView.findViewById(R.id.textGreeting);
+                if (textGreeting != null) {
+                    int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
+                    if (hour < 12) textGreeting.setText("Bom dia");
+                    else if (hour < 18) textGreeting.setText("Boa tarde");
+                    else textGreeting.setText("Boa noite");
+                }
+                if (!isGuardian) {
+                    fetchLocationAndWeather();
+                }
+                break;
+            case GUARDIANS:
+                if (guardiansView == null) guardiansView = inflater.inflate(R.layout.layout_tab_guardians, tabContainer, false);
+                content = guardiansView;
+                loadGuardianData(guardiansView);
+                break;
+            case CALENDAR:
+                calendarView = inflater.inflate(R.layout.layout_tab_calendar, tabContainer, false);
+                content = calendarView;
+                // Render the calendar grid immediately with days visible
+                setupCalendar(calendarView, isGuardian ? patientAlarms : alarms);
+                // Then start async listeners to update with real data
+                if (isGuardian) loadPatientDataForCalendar(calendarView);
+                else setupHistoryListener(currentUserId, calendarView, alarms);
                 break;
         }
-
-        content.setAlpha(0f);
-        tabContainer.addView(content);
-        content.animate().alpha(1f).setDuration(120).start();
+        
+        tabContainer.removeAllViews();
+        if (content != null) {
+            if (content.getParent() != null) {
+                ((android.view.ViewGroup) content.getParent()).removeView(content);
+            }
+            tabContainer.addView(content);
+        }
         updateTabHighlight(tab);
     }
 
-    private void setupCalendar(View view) {
+    private void loadPatientDataForCalendar(View view) {
+        if (view == null) return;
+        if (linkedPatientId != null) {
+            setupPatientCalendarListener(view, linkedPatientId);
+            setupHistoryListener(linkedPatientId, view, patientAlarms);
+        } else {
+            db.collection("users").document(currentUserId).get().addOnSuccessListener(doc -> {
+                List<String> managed = new ArrayList<>();
+                Object val = doc.get("managedUsers");
+                if (val instanceof List) {
+                    for (Object item : (List<?>) val) if (item instanceof String) managed.add((String) item);
+                }
+                if (!managed.isEmpty()) {
+                    linkedPatientId = managed.get(0);
+                    setupPatientCalendarListener(view, linkedPatientId);
+                    setupHistoryListener(linkedPatientId, view, patientAlarms);
+                } else {
+                    setupCalendar(view, new ArrayList<>());
+                }
+            });
+        }
+    }
+
+    private void setupPatientCalendarListener(View view, String pId) {
+        if (patientCalendarListener != null) patientCalendarListener.remove();
+        patientCalendarListener = db.collection("users").document(pId).collection("alarms")
+                .addSnapshotListener((snapshots, e) -> {
+                    if (e != null || snapshots == null) return;
+                    patientAlarms.clear();
+                    for (QueryDocumentSnapshot d : snapshots) {
+                        AlarmItem item = d.toObject(AlarmItem.class);
+                        item.documentId = d.getId();
+                        patientAlarms.add(item);
+                    }
+                    setupCalendar(view, patientAlarms);
+                });
+    }
+
+    private void setupHistoryListener(String userId, View view, List<AlarmItem> listToDisplay) {
+        if (historyListener != null) historyListener.remove();
+        if (userId == null) return;
+        
+        historyListener = db.collection("users").document(userId).collection("history")
+                .addSnapshotListener((snapshots, e) -> {
+                    if (e != null || snapshots == null) return;
+                    confirmationHistory.clear();
+                    for (QueryDocumentSnapshot d : snapshots) {
+                        String date = d.getString("date"); // YYYYMMDD
+                        String title = d.getString("title");
+                        if (date != null && title != null) {
+                            if (!confirmationHistory.containsKey(date)) {
+                                confirmationHistory.put(date, new ArrayList<>());
+                            }
+                            confirmationHistory.get(date).add(title);
+                        }
+                    }
+                    setupCalendar(view, listToDisplay);
+                });
+    }
+
+    private void setupCalendar(View view, List<AlarmItem> listToDisplay) {
         if (view == null) return;
         LinearLayout calendarGrid = view.findViewById(R.id.calendarGrid);
         TextView monthTitle = view.findViewById(R.id.textMonthTitle);
         LinearLayout legendContainer = view.findViewById(R.id.legendContainer);
-
+        LinearLayout weekdayHeaders = view.findViewById(R.id.weekdayHeaders);
         if (calendarGrid == null || monthTitle == null || legendContainer == null) return;
 
         calendarGrid.removeAllViews();
         legendContainer.removeAllViews();
 
+        // Setup month title
         Calendar calendar = Calendar.getInstance();
         int currentDay = calendar.get(Calendar.DAY_OF_MONTH);
         int currentMonth = calendar.get(Calendar.MONTH);
-
         String[] months = { "Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro" };
         monthTitle.setText(String.format(Locale.getDefault(), "%s %d", months[currentMonth], calendar.get(Calendar.YEAR)));
 
+        // Setup weekday headers programmatically
+        if (weekdayHeaders != null) {
+            weekdayHeaders.removeAllViews();
+            String[] dayNames = {"DOM", "SEG", "TER", "QUA", "QUI", "SEX", "SÁB"};
+            for (int i = 0; i < 7; i++) {
+                TextView hdr = new TextView(this);
+                hdr.setLayoutParams(new LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1.0f));
+                hdr.setText(dayNames[i]);
+                hdr.setGravity(android.view.Gravity.CENTER);
+                hdr.setTextSize(11);
+                hdr.setTypeface(null, android.graphics.Typeface.BOLD);
+                hdr.setTextColor(i == 0 ? ContextCompat.getColor(this, R.color.delete) : ContextCompat.getColor(this, R.color.neutral_medium));
+                hdr.setPadding(0, 8, 0, 8);
+                weekdayHeaders.addView(hdr);
+            }
+        }
+
+        // Map medication colors
         int[] dotColors = { ContextCompat.getColor(this, R.color.primary), ContextCompat.getColor(this, R.color.guardian_purple_end), ContextCompat.getColor(this, R.color.delete), 0xFFFFA500, 0xFF00C853 };
         Map<String, Integer> medColors = new HashMap<>();
         int colorIndex = 0;
-        for (AlarmItem alarm : alarms) {
+        for (AlarmItem alarm : listToDisplay) {
             if (!medColors.containsKey(alarm.title)) {
-                int color = dotColors[colorIndex % dotColors.length];
-                medColors.put(alarm.title, color);
+                int col = dotColors[colorIndex % dotColors.length];
+                medColors.put(alarm.title, col);
                 colorIndex++;
-                TextView legendItem = new TextView(this);
-                legendItem.setText(String.format(Locale.getDefault(), "• %s", alarm.title));
-                legendItem.setTextColor(color);
-                legendItem.setTextSize(14);
-                legendItem.setPadding(0, 0, 0, 8);
-                legendContainer.addView(legendItem);
+                TextView legend = new TextView(this);
+                legend.setText(String.format(Locale.getDefault(), "● %s", alarm.title));
+                legend.setTextColor(col);
+                legend.setTextSize(14);
+                legend.setPadding(0, 4, 0, 4);
+                legendContainer.addView(legend);
             }
         }
 
+        // Calendar math
         calendar.set(Calendar.DAY_OF_MONTH, 1);
-        int firstDayOfWeek = calendar.get(Calendar.DAY_OF_WEEK) - 1;
+        int firstDayOfWeek = calendar.get(Calendar.DAY_OF_WEEK) - 1; // 0=Sunday
         int daysInMonth = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
 
-        SharedPreferences logPrefs = getSharedPreferences("medication_log", MODE_PRIVATE);
-        java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyyMMdd", Locale.getDefault());
-        LinearLayout currentWeekRow = new LinearLayout(this);
-        currentWeekRow.setOrientation(LinearLayout.HORIZONTAL);
-        calendarGrid.addView(currentWeekRow);
+        float density = getResources().getDisplayMetrics().density;
+        int cellHeight = (int)(44 * density); // 44dp per cell
 
-        for (int i = 0; i < firstDayOfWeek; i++) {
-            View empty = new View(this);
-            empty.setLayoutParams(new LinearLayout.LayoutParams(0, 50, 1.0f));
-            currentWeekRow.addView(empty);
-        }
+        // Build grid row by row
+        int dayNum = 1;
+        int totalCells = firstDayOfWeek + daysInMonth;
+        int totalRows = (int)Math.ceil(totalCells / 7.0);
 
-        int dayOfWeekCounter = firstDayOfWeek;
-        for (int day = 1; day <= daysInMonth; day++) {
-            if (dayOfWeekCounter == 0) {
-                currentWeekRow = new LinearLayout(this);
-                currentWeekRow.setOrientation(LinearLayout.HORIZONTAL);
-                calendarGrid.addView(currentWeekRow);
-            }
-            View dayCell = inflater.inflate(R.layout.item_calendar_day, currentWeekRow, false);
-            TextView numText = dayCell.findViewById(R.id.textDayNumber);
-            LinearLayout dots = dayCell.findViewById(R.id.dotsContainer);
-            numText.setText(String.valueOf(day));
+        for (int row = 0; row < totalRows; row++) {
+            LinearLayout weekRow = new LinearLayout(this);
+            weekRow.setOrientation(LinearLayout.HORIZONTAL);
+            weekRow.setLayoutParams(new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+            weekRow.setWeightSum(7.0f);
 
-            if (day == currentDay) {
-                numText.setBackground(ContextCompat.getDrawable(this, R.drawable.bg_calendar_day_selected));
-                numText.setTextColor(ContextCompat.getColor(this, R.color.primary));
-            }
+            for (int col = 0; col < 7; col++) {
+                int cellIndex = row * 7 + col;
 
-            calendar.set(Calendar.DAY_OF_MONTH, day);
-            String dateKey = sdf.format(calendar.getTime());
-            for (AlarmItem alarm : alarms) {
-                String key = "med_" + alarm.title.replaceAll("\\s+", "_") + "_" + dateKey;
-                if (logPrefs.getBoolean(key + "_taken", false)) {
-                    View dot = new View(this);
-                    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(12, 12);
-                    params.setMargins(2, 0, 2, 0);
-                    dot.setLayoutParams(params);
-                    dot.setBackground(ContextCompat.getDrawable(this, R.drawable.bg_dot));
-                    Integer color = medColors.get(alarm.title);
-                    if (color != null && dot.getBackground() != null) {
-                        dot.getBackground().setTint(color);
+                if (cellIndex < firstDayOfWeek || dayNum > daysInMonth) {
+                    // Empty cell
+                    View empty = new View(this);
+                    empty.setLayoutParams(new LinearLayout.LayoutParams(0, cellHeight, 1.0f));
+                    weekRow.addView(empty);
+                } else {
+                    // Day cell - built entirely in code
+                    LinearLayout dayCell = new LinearLayout(this);
+                    dayCell.setOrientation(LinearLayout.VERTICAL);
+                    dayCell.setLayoutParams(new LinearLayout.LayoutParams(0, cellHeight, 1.0f));
+                    dayCell.setGravity(android.view.Gravity.CENTER_HORIZONTAL);
+                    dayCell.setPadding((int)(2*density), (int)(2*density), (int)(2*density), (int)(2*density));
+
+                    // Day number
+                    TextView numText = new TextView(this);
+                    int numSize = (int)(26 * density);
+                    LinearLayout.LayoutParams numParams = new LinearLayout.LayoutParams(numSize, numSize);
+                    numParams.gravity = android.view.Gravity.CENTER_HORIZONTAL;
+                    numText.setLayoutParams(numParams);
+                    numText.setText(String.valueOf(dayNum));
+                    numText.setGravity(android.view.Gravity.CENTER);
+                    numText.setTextSize(13);
+
+                    if (dayNum == currentDay) {
+                        GradientDrawable circle = new GradientDrawable();
+                        circle.setShape(GradientDrawable.OVAL);
+                        circle.setColor(ContextCompat.getColor(this, R.color.primary));
+                        numText.setBackground(circle);
+                        numText.setTextColor(0xFFFFFFFF);
+                        numText.setTypeface(null, android.graphics.Typeface.BOLD);
+                    } else {
+                        numText.setTextColor(ContextCompat.getColor(this, R.color.neutral_dark));
                     }
-                    dots.addView(dot);
+                    dayCell.addView(numText);
+
+                    // Dots container
+                    LinearLayout dotsRow = new LinearLayout(this);
+                    dotsRow.setOrientation(LinearLayout.HORIZONTAL);
+                    dotsRow.setGravity(android.view.Gravity.CENTER);
+                    LinearLayout.LayoutParams dotsParams = new LinearLayout.LayoutParams(
+                            LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+                    dotsParams.topMargin = (int)(2 * density);
+                    dotsRow.setLayoutParams(dotsParams);
+
+                    Calendar dayCal = (Calendar) calendar.clone();
+                    dayCal.set(Calendar.DAY_OF_MONTH, dayNum);
+                    String dayShort = getShortDayName(dayCal.get(Calendar.DAY_OF_WEEK));
+
+                    for (AlarmItem alarm : listToDisplay) {
+                        if (alarm.days != null && alarm.days.contains(dayShort)) {
+                            View dot = new View(this);
+                            int dotSize = (int)(6 * density);
+                            LinearLayout.LayoutParams dp = new LinearLayout.LayoutParams(dotSize, dotSize);
+                            dp.setMargins((int)(1*density), 0, (int)(1*density), 0);
+                            dot.setLayoutParams(dp);
+
+                            String dayKey = String.format(Locale.getDefault(), "%04d%02d%02d", dayCal.get(Calendar.YEAR), dayCal.get(Calendar.MONTH) + 1, dayNum);
+                            List<String> confirmedToday = confirmationHistory.get(dayKey);
+                            boolean taken = confirmedToday != null && confirmedToday.contains(alarm.title);
+
+                            GradientDrawable shape = new GradientDrawable();
+                            shape.setShape(GradientDrawable.OVAL);
+                            Integer color = medColors.get(alarm.title);
+                            if (color != null) shape.setColor(color);
+                            if (!taken) shape.setAlpha(60);
+
+                            dot.setBackground(shape);
+                            dotsRow.addView(dot);
+                        }
+                    }
+                    dayCell.addView(dotsRow);
+
+                    weekRow.addView(dayCell);
+                    dayNum++;
                 }
             }
-            currentWeekRow.addView(dayCell);
-            dayOfWeekCounter = (dayOfWeekCounter + 1) % 7;
+            calendarGrid.addView(weekRow);
         }
-        while (dayOfWeekCounter != 0 && dayOfWeekCounter < 7) {
-            View empty = new View(this);
-            empty.setLayoutParams(new LinearLayout.LayoutParams(0, 50, 1.0f));
-            currentWeekRow.addView(empty);
-            dayOfWeekCounter++;
+    }
+
+    private String getShortDayName(int dayOfWeek) {
+        switch (dayOfWeek) {
+            case Calendar.MONDAY: return "Seg";
+            case Calendar.TUESDAY: return "Ter";
+            case Calendar.WEDNESDAY: return "Qua";
+            case Calendar.THURSDAY: return "Qui";
+            case Calendar.FRIDAY: return "Sex";
+            case Calendar.SATURDAY: return "Sáb";
+            case Calendar.SUNDAY: return "Dom";
+            default: return "";
         }
     }
 
@@ -449,17 +669,17 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
-    private void highlightTab(LinearLayout layout, ImageView icon, TextView text) {
-        layout.setBackground(ContextCompat.getDrawable(this, R.drawable.bg_tab_active));
-        icon.setColorFilter(ContextCompat.getColor(this, R.color.primary));
-        text.setTextColor(ContextCompat.getColor(this, R.color.primary));
+    private void highlightTab(LinearLayout l, ImageView i, TextView t) {
+        l.setBackground(ContextCompat.getDrawable(this, R.drawable.bg_tab_active));
+        i.setColorFilter(ContextCompat.getColor(this, R.color.primary));
+        t.setTextColor(ContextCompat.getColor(this, R.color.primary));
     }
 
-    private void resetTab(LinearLayout layout, ImageView icon, TextView text) {
-        layout.setBackground(null);
+    private void resetTab(LinearLayout l, ImageView i, TextView t) {
+        l.setBackground(null);
         int neutral = ContextCompat.getColor(this, R.color.neutral_medium);
-        icon.setColorFilter(neutral);
-        text.setTextColor(neutral);
+        i.setColorFilter(neutral);
+        t.setTextColor(neutral);
     }
 
     private void renderAlarms() {
@@ -474,26 +694,20 @@ public class MainActivity extends AppCompatActivity {
             return;
         }
         for (int i = 0; i < alarms.size(); i++) {
-            final int index = i;
+            final int idx = i;
             AlarmItem item = alarms.get(i);
             View card = inflater.inflate(R.layout.item_alarm_card, alarmListContainer, false);
-            TextView title = card.findViewById(R.id.textAlarmTitle);
-            TextView time = card.findViewById(R.id.textAlarmTime);
-            TextView days = card.findViewById(R.id.textAlarmDays);
             SwitchCompat toggle = card.findViewById(R.id.switchAlarm);
-            ImageButton edit = card.findViewById(R.id.buttonEditAlarm);
-            ImageButton delete = card.findViewById(R.id.buttonDeleteAlarm);
             Button confirmBtn = card.findViewById(R.id.btnConfirmMedication);
 
-            title.setText(item.title);
-            time.setText(item.time);
-            days.setText(item.days);
+            ((TextView)card.findViewById(R.id.textAlarmTitle)).setText(item.title);
+            ((TextView)card.findViewById(R.id.textAlarmTime)).setText(item.time);
+            ((TextView)card.findViewById(R.id.textAlarmDays)).setText(item.days);
             toggle.setChecked(item.enabled);
-
-            if (item.takenToday) {
+            if (isTakenToday(item)) {
                 confirmBtn.setText(R.string.taken_confirmed);
                 confirmBtn.setBackgroundColor(ContextCompat.getColor(this, R.color.neutral_medium));
-                confirmBtn.setEnabled(false);
+                confirmBtn.setEnabled(true); // Keep enabled for revert
             } else {
                 confirmBtn.setText(R.string.confirm_medication);
                 confirmBtn.setBackground(ContextCompat.getDrawable(this, R.drawable.bg_new_button));
@@ -501,159 +715,356 @@ public class MainActivity extends AppCompatActivity {
             }
 
             confirmBtn.setOnClickListener(v -> {
-                item.takenToday = true;
-                item.lastTakenTimestamp = System.currentTimeMillis();
-                saveMedicationConfirmation(item);
-                renderAlarms();
-                showConfirmationDialog(item);
+                if (isTakenToday(item)) {
+                    showRevertDialog(item);
+                } else {
+                    item.lastTakenTimestamp = System.currentTimeMillis();
+                    item.takenToday = true;
+                    updateAlarmInFirestore(item);
+                    saveMedicationConfirmationToFirestore(item);
+                    saveMedicationConfirmationLocally(item);
+                    renderAlarms();
+                    Toast.makeText(this, "Medicação confirmada!", Toast.LENGTH_SHORT).show();
+                }
             });
 
-            toggle.setOnCheckedChangeListener((buttonView, isChecked) -> {
-                item.enabled = isChecked;
-                updateAlarmInFirestore(item);
-            });
-
-            edit.setOnClickListener(v -> showEditAlarmDialog(item, index));
-
-            delete.setOnClickListener(v -> new AlertDialog.Builder(this)
-                    .setTitle("Remover Alarme")
-                    .setMessage("Tem certeza que deseja remover \"" + item.title + "\"?")
-                    .setPositiveButton("Remover", (dialog, which) -> deleteAlarmFromFirestore(item, index))
-                    .setNegativeButton("Cancelar", null).show());
-
+            toggle.setOnCheckedChangeListener((b, checked) -> { item.enabled = checked; updateAlarmInFirestore(item); });
+            card.findViewById(R.id.buttonEditAlarm).setOnClickListener(v -> showEditAlarmDialog(item, idx));
+            card.findViewById(R.id.buttonDeleteAlarm).setOnClickListener(v -> deleteAlarmFromFirestore(item, idx));
             alarmListContainer.addView(card);
         }
     }
-
-    private void showConfirmationDialog(AlarmItem item) {
-        java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("HH:mm", Locale.getDefault());
-        String timeStr = sdf.format(new java.util.Date(item.lastTakenTimestamp));
+    private void showRevertDialog(AlarmItem item) {
         new AlertDialog.Builder(this)
-                .setTitle("✓ Medicamento Confirmado")
-                .setMessage("Confirmou que tomou:\n\n" + "💊 " + item.title + "\n" + "🕐 Às " + timeStr + "\n\n" + "O responsável será notificado automaticamente.")
-                .setPositiveButton("OK", null)
+                .setTitle("Anular Toma")
+                .setMessage("Deseja anular a confirmação de hoje para " + item.title + "?")
+                .setPositiveButton("Sim, Anular", (d, w) -> revertMedicationConfirmation(item))
+                .setNegativeButton("Não", null)
                 .show();
-        Toast.makeText(this, "Responsável notificado!", Toast.LENGTH_LONG).show();
     }
 
-    private void saveMedicationConfirmation(AlarmItem item) {
+    private void revertMedicationConfirmation(AlarmItem item) {
+        item.lastTakenTimestamp = 0;
+        item.takenToday = false;
+        updateAlarmInFirestore(item);
+        
+        String dateKey = new java.text.SimpleDateFormat("yyyyMMdd", Locale.getDefault()).format(new java.util.Date());
+        db.collection("users").document(currentUserId).collection("history")
+                .document(dateKey + "_" + item.documentId).delete()
+                .addOnSuccessListener(aVoid -> {
+                    renderAlarms();
+                    Toast.makeText(this, "Toma anulada.", Toast.LENGTH_SHORT).show();
+                });
+        
+        // Also remove from local prefs if applicable
+        prefs.edit().remove("taken_" + dateKey + "_" + item.documentId).apply();
+    }
+
+    private boolean isTakenToday(AlarmItem item) {
+        if (item.lastTakenTimestamp == 0) return false;
+        Calendar last = Calendar.getInstance(); last.setTimeInMillis(item.lastTakenTimestamp);
+        Calendar now = Calendar.getInstance();
+        return last.get(Calendar.YEAR) == now.get(Calendar.YEAR) && last.get(Calendar.DAY_OF_YEAR) == now.get(Calendar.DAY_OF_YEAR);
+    }
+
+    private void saveMedicationConfirmationLocally(AlarmItem item) {
         SharedPreferences confirmPrefs = getSharedPreferences("medication_log", MODE_PRIVATE);
         String key = "med_" + item.title.replaceAll("\\s+", "_") + "_" + new java.text.SimpleDateFormat("yyyyMMdd", Locale.getDefault()).format(new java.util.Date());
         confirmPrefs.edit().putLong(key, item.lastTakenTimestamp).putBoolean(key + "_taken", true).putString(key + "_title", item.title).apply();
     }
 
-    private void loadGuardianData(View guardiansView) {
-        SharedPreferences confirmPrefs = getSharedPreferences("medication_log", MODE_PRIVATE);
-        java.text.SimpleDateFormat dateFormat = new java.text.SimpleDateFormat("yyyyMMdd", Locale.getDefault());
-        String today = dateFormat.format(new java.util.Date());
+    private void saveMedicationConfirmationToFirestore(AlarmItem item) {
+        if (currentUserId == null) return;
+        String dateKey = new java.text.SimpleDateFormat("yyyyMMdd", Locale.getDefault()).format(new java.util.Date());
+        Map<String, Object> data = new HashMap<>();
+        data.put("date", dateKey);
+        data.put("alarmId", item.documentId);
+        data.put("title", item.title);
+        data.put("takenAt", System.currentTimeMillis());
         
-        // Match IDs with layout_tab_guardians.xml
-        TextView patientName = guardiansView.findViewById(R.id.textPatientName);
-        TextView patientStatus = guardiansView.findViewById(R.id.textPatientStatus);
-        LinearLayout medicationStatusList = guardiansView.findViewById(R.id.medicationStatusList);
+        db.collection("users").document(currentUserId).collection("history")
+                .document(dateKey + "_" + item.documentId)
+                .set(data);
+    }
+
+    private void loadGuardianData(View view) {
+        TextView patientName = view.findViewById(R.id.textPatientName);
+        TextView patientStatus = view.findViewById(R.id.textPatientStatus);
+        LinearLayout list = view.findViewById(R.id.medicationStatusList);
+        LinearLayout guardianListContainer = view.findViewById(R.id.guardianListContainer);
+        View btnRefresh = view.findViewById(R.id.btnRefreshGuardian);
+        if (patientName == null || list == null) return;
         
-        if (patientName != null) {
-            String name = prefs.getString("user_name", "Utilizador");
-            patientName.setText(name);
+        if (btnRefresh != null) {
+            btnRefresh.setOnClickListener(v -> {
+                linkedPatientId = null; // Force re-fetch of patient ID
+                loadGuardianData(view);
+                Toast.makeText(this, "A atualizar dados do utilizador...", Toast.LENGTH_SHORT).show();
+            });
         }
-        if (patientStatus != null) patientStatus.setText(R.string.online_updated_now);
 
-        if (medicationStatusList != null) {
-            medicationStatusList.removeAllViews();
-            for (AlarmItem alarm : alarms) {
-                String key = "med_" + alarm.title.replaceAll("\\s+", "_") + "_" + today;
-                boolean taken = confirmPrefs.getBoolean(key + "_taken", false);
-                long timestamp = confirmPrefs.getLong(key, 0);
-
-                View statusCard = inflater.inflate(R.layout.item_alarm_card, medicationStatusList, false);
-                TextView titleView = statusCard.findViewById(R.id.textAlarmTitle);
-                TextView timeView = statusCard.findViewById(R.id.textAlarmTime);
-                TextView daysView = statusCard.findViewById(R.id.textAlarmDays);
-                statusCard.findViewById(R.id.btnConfirmMedication).setVisibility(View.GONE);
-                statusCard.findViewById(R.id.switchAlarm).setVisibility(View.GONE);
-                statusCard.findViewById(R.id.buttonDeleteAlarm).setVisibility(View.GONE);
-                statusCard.findViewById(R.id.buttonEditAlarm).setVisibility(View.GONE);
-
-                titleView.setText(alarm.title);
-                timeView.setText(alarm.time);
-
-                if (taken) {
-                    String takenTime = new java.text.SimpleDateFormat("HH:mm", Locale.getDefault()).format(new java.util.Date(timestamp));
-                    daysView.setText(String.format(Locale.getDefault(), "✓ Tomado às %s", takenTime));
-                    daysView.setTextColor(ContextCompat.getColor(this, R.color.primary));
-                } else {
-                    daysView.setText(R.string.pending_status);
-                    daysView.setTextColor(ContextCompat.getColor(this, R.color.delete));
-                }
-                medicationStatusList.addView(statusCard);
+        if (isGuardian) {
+            if (linkedPatientId != null) {
+                setupGuardianAlarmsListener(view, linkedPatientId, patientName, patientStatus, list);
+            } else {
+                db.collection("users").document(currentUserId).get().addOnSuccessListener(doc -> {
+                    List<String> managed = new ArrayList<>();
+                    Object val = doc.get("managedUsers");
+                    if (val instanceof List) {
+                        for (Object item : (List<?>) val) if (item instanceof String) managed.add((String) item);
+                    }
+                    android.util.Log.d("GuardianTab", "Managed users found: " + managed.size());
+                    if (!managed.isEmpty()) {
+                        linkedPatientId = managed.get(0);
+                        prefs.edit().putString("linked_patient_id", linkedPatientId).apply();
+                        db.collection("users").document(linkedPatientId).get().addOnSuccessListener(pDoc -> {
+                            String pName = pDoc.getString("name");
+                            if (pName != null) prefs.edit().putString("linked_patient_name", pName).apply();
+                            setupGuardianAlarmsListener(view, linkedPatientId, patientName, patientStatus, list);
+                        });
+                    } else { 
+                        // FALLBACK: Search for patients that have this user as guardian
+                        db.collection("users").whereArrayContains("guardians", currentUserId).get().addOnSuccessListener(q -> {
+                            if (!q.isEmpty()) {
+                                com.google.firebase.firestore.DocumentSnapshot d = q.getDocuments().get(0);
+                                String fId = d.getId();
+                                linkedPatientId = fId;
+                                prefs.edit().putString("linked_patient_id", linkedPatientId).apply();
+                                String pName = d.getString("name");
+                                if (pName != null) prefs.edit().putString("linked_patient_name", pName).apply();
+                                setupGuardianAlarmsListener(view, linkedPatientId, patientName, patientStatus, list);
+                            } else {
+                                patientName.setText("Nenhum utilizador associado");
+                                patientStatus.setText("Certifique-se que o utilizador gerou o código.");
+                            }
+                        });
+                    }
+                });
+            }
+        } else {
+            patientName.setText(prefs.getString("user_name", "Utilizador"));
+            patientStatus.setText(R.string.online_updated_now);
+            list.removeAllViews();
+            for (AlarmItem a : alarms) renderPatientAlarmStatus(list, a);
+            
+            if (guardianListContainer != null) {
+                db.collection("users").document(currentUserId).get().addOnSuccessListener(doc -> {
+                    guardianListContainer.removeAllViews();
+                    List<String> guardians = new ArrayList<>();
+                    if (doc.contains("guardians")) {
+                        Object val = doc.get("guardians");
+                        if (val instanceof List) {
+                            for (Object item : (List<?>) val) if (item instanceof String) guardians.add((String) item);
+                        }
+                    } else if (doc.contains("guardianId")) {
+                        String gid = doc.getString("guardianId");
+                        if (gid != null && !gid.isEmpty()) guardians.add(gid);
+                    }
+                    
+                    if (guardians.isEmpty()) {
+                        TextView empty = new TextView(this);
+                        empty.setText("Nenhum responsável associado.");
+                        empty.setTextColor(ContextCompat.getColor(this, R.color.neutral_medium));
+                        empty.setPadding(0, 16, 0, 16);
+                        guardianListContainer.addView(empty);
+                    } else {
+                        for (String gid : guardians) {
+                            db.collection("users").document(gid).get().addOnSuccessListener(gDoc -> {
+                                View gCard = inflater.inflate(R.layout.item_saved_account, guardianListContainer, false);
+                                TextView nameTxt = gCard.findViewById(R.id.textSavedName);
+                                TextView emailTxt = gCard.findViewById(R.id.textSavedEmail);
+                                ImageView closeBtn = gCard.findViewById(R.id.btnRemoveAccount);
+                                View statusDot = gCard.findViewById(R.id.viewOnlineStatus); // I'll add this to layout
+                                
+                                nameTxt.setText(gDoc.getString("name"));
+                                String email = gDoc.getString("email");
+                                Long lastActive = gDoc.getLong("lastActive");
+                                boolean isOnline = lastActive != null && (System.currentTimeMillis() - lastActive < 300000); // 5 mins
+                                
+                                emailTxt.setText(isOnline ? "Online" : (email != null ? email : ""));
+                                emailTxt.setTextColor(ContextCompat.getColor(this, isOnline ? R.color.primary : R.color.neutral_medium));
+                                
+                                closeBtn.setVisibility(View.GONE);
+                                if (statusDot != null) {
+                                    statusDot.setVisibility(View.VISIBLE);
+                                    GradientDrawable bg = (GradientDrawable) statusDot.getBackground().mutate();
+                                    bg.setColor(ContextCompat.getColor(this, isOnline ? R.color.primary : R.color.neutral_medium));
+                                }
+                                
+                                guardianListContainer.addView(gCard);
+                            });
+                        }
+                    }
+                });
             }
         }
         
-        // Add "Add Guardian" logic if needed
-        View btnAddGuardian = guardiansView.findViewById(R.id.btnAddGuardian);
-        if (btnAddGuardian != null) {
-            btnAddGuardian.setOnClickListener(v -> {
-                Intent intent = new Intent(this, GenerateCodeActivity.class);
-                startActivity(intent);
+        View btnAdd = view.findViewById(R.id.btnAddGuardian);
+        if (btnAdd != null) btnAdd.setOnClickListener(v -> startActivity(new Intent(this, GenerateCodeActivity.class)));
+    }
+
+    private void setupGuardianAlarmsListener(View view, String pId, TextView nameView, TextView statusView, LinearLayout list) {
+        db.collection("users").document(pId).get().addOnSuccessListener(pDoc -> {
+            nameView.setText(pDoc.getString("name"));
+            statusView.setText("Conectado ao Utilizador");
+            
+            if (guardianAlarmsListener != null) guardianAlarmsListener.remove();
+            guardianAlarmsListener = db.collection("users").document(pId).collection("alarms")
+                .addSnapshotListener((snaps, e) -> {
+                if (e != null) {
+                    android.util.Log.e("GuardianTab", "Error fetching alarms for " + pId + ": " + e.getMessage());
+                    // Don't show toast on background errors unless it's critical
+                    return;
+                }
+                if (snaps == null || view == null) return;
+                
+                android.util.Log.d("GuardianTab", "Received " + snaps.size() + " alarms for " + pId);
+                patientAlarms.clear();
+                for (QueryDocumentSnapshot d : snaps) {
+                    AlarmItem alarm = d.toObject(AlarmItem.class);
+                    alarm.documentId = d.getId();
+                    patientAlarms.add(alarm);
+                }
+                
+                // Sort by time
+                java.util.Collections.sort(patientAlarms, (a1, a2) -> {
+                    int c = Integer.compare(a1.hour, a2.hour);
+                    return c != 0 ? c : Integer.compare(a1.minute, a2.minute);
+                });
+
+                list.removeAllViews();
+                int takenCount = 0;
+                AlarmItem nextMed = null;
+                Calendar now = Calendar.getInstance();
+                int nowH = now.get(Calendar.HOUR_OF_DAY);
+                int nowM = now.get(Calendar.MINUTE);
+
+                for (AlarmItem alarm : patientAlarms) {
+                    renderPatientAlarmStatus(list, alarm);
+                    if (isTakenToday(alarm)) takenCount++;
+                    else if (nextMed == null && (alarm.hour > nowH || (alarm.hour == nowH && alarm.minute > nowM))) {
+                        nextMed = alarm;
+                    }
+                }
+                
+                // Refresh calendar with updated patient alarms
+                setupCalendar(calendarView, patientAlarms);
+
+                // Update Dashboard
+                TextView statusTitle = view.findViewById(R.id.textStatusTitle);
+                TextView statusDesc = view.findViewById(R.id.textStatusDesc);
+                ImageView statusIcon = view.findViewById(R.id.iconStatus);
+                if (statusTitle != null) {
+                    if (takenCount == patientAlarms.size() && !patientAlarms.isEmpty()) {
+                        statusTitle.setText("Tudo em ordem");
+                        statusDesc.setText("Todas as medicações de hoje foram tomadas.");
+                        if (statusIcon != null) statusIcon.setImageResource(android.R.drawable.checkbox_on_background);
+                    } else {
+                        statusTitle.setText("Acompanhamento ativo");
+                        statusDesc.setText(String.format(Locale.getDefault(), "O utilizador tomou %d de %d medicações hoje.", takenCount, patientAlarms.size()));
+                        if (statusIcon != null) statusIcon.setImageResource(android.R.drawable.ic_menu_recent_history);
+                    }
+                }
+
+                // Update Next Medication Card
+                View nextCard = view.findViewById(R.id.cardNextMedication);
+                if (nextCard != null) {
+                    if (nextMed != null) {
+                        nextCard.setVisibility(View.VISIBLE);
+                        ((TextView)view.findViewById(R.id.textNextTime)).setText(String.format(Locale.getDefault(), "%02d:%02d", nextMed.hour, nextMed.minute));
+                        ((TextView)view.findViewById(R.id.textNextTitle)).setText(nextMed.title);
+                        String detail = nextMed.time.contains("•") ? nextMed.time.split("•")[1].trim() : "";
+                        ((TextView)view.findViewById(R.id.textNextDetail)).setText(detail);
+                    } else {
+                        nextCard.setVisibility(View.GONE);
+                    }
+                }
             });
+            
+            // Start Notification Service
+            if (pId != null) {
+                String pName = pDoc.getString("name");
+                Intent serviceIntent = new Intent(this, GuardianNotificationService.class);
+                serviceIntent.putExtra("patientId", pId);
+                serviceIntent.putExtra("patientName", pName);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) startForegroundService(serviceIntent);
+                else startService(serviceIntent);
+            }
+            
+            setupHistoryListener(pId, calendarView, patientAlarms);
+        });
+    }
+
+    private void startGuardianServiceIfLinked() {
+        String pId = prefs.getString("linked_patient_id", null);
+        String pName = prefs.getString("linked_patient_name", "Utilizador");
+        if (pId != null) {
+            Intent serviceIntent = new Intent(this, GuardianNotificationService.class);
+            serviceIntent.putExtra("patientId", pId);
+            serviceIntent.putExtra("patientName", pName);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) startForegroundService(serviceIntent);
+            else startService(serviceIntent);
         }
     }
 
+    private void renderPatientAlarmStatus(LinearLayout container, AlarmItem alarm) {
+        View card = inflater.inflate(R.layout.item_alarm_card, container, false);
+        card.findViewById(R.id.btnConfirmMedication).setVisibility(View.GONE);
+        card.findViewById(R.id.switchAlarm).setVisibility(View.GONE);
+        card.findViewById(R.id.buttonDeleteAlarm).setVisibility(View.GONE);
+        card.findViewById(R.id.buttonEditAlarm).setVisibility(View.GONE);
+
+        ((TextView)card.findViewById(R.id.textAlarmTitle)).setText(alarm.title);
+        ((TextView)card.findViewById(R.id.textAlarmTime)).setText(alarm.time);
+
+        TextView statusText = card.findViewById(R.id.textAlarmDays);
+        if (isTakenToday(alarm)) {
+            String timeStr = new java.text.SimpleDateFormat("HH:mm", Locale.getDefault()).format(new java.util.Date(alarm.lastTakenTimestamp));
+            statusText.setText(String.format(Locale.getDefault(), "✓ Tomado às %s", timeStr));
+            statusText.setTextColor(ContextCompat.getColor(this, R.color.primary));
+            statusText.setBackgroundResource(R.drawable.bg_day_chip); // Reusing chip background
+            if (statusText.getBackground() != null) statusText.getBackground().setTint(ContextCompat.getColor(this, R.color.primary_light_bg));
+        } else {
+            statusText.setText("Aguardando confirmação");
+            statusText.setTextColor(ContextCompat.getColor(this, R.color.neutral_medium));
+            statusText.setBackgroundResource(R.drawable.bg_day_chip);
+            if (statusText.getBackground() != null) statusText.getBackground().setTint(0x1A000000); // Light gray
+        }
+        container.addView(card);
+    }
+
     private void showAddAlarmDialog() {
         View dialogView = inflater.inflate(R.layout.dialog_add_alarm, null, false);
         EditText titleInput = dialogView.findViewById(R.id.inputAlarmTitle);
         TextView timeDisplay = dialogView.findViewById(R.id.textSelectedTime);
-        EditText detailsInput = dialogView.findViewById(R.id.inputAlarmDetails);
-
-        final int[] selectedHour = { 8 };
-        final int[] selectedMinute = { 0 };
-
-        timeDisplay.setText(String.format(Locale.getDefault(), "%02d:%02d", selectedHour[0], selectedMinute[0]));
-        timeDisplay.setTextColor(ContextCompat.getColor(this, R.color.neutral_dark));
+        final int[] selTime = { 8, 0 };
+        timeDisplay.setText(String.format(Locale.getDefault(), "%02d:%02d", selTime[0], selTime[1]));
 
         ((View) timeDisplay.getParent()).setOnClickListener(v -> {
-            android.app.TimePickerDialog picker = new android.app.TimePickerDialog(this,
-                    (view, hourOfDay, minute) -> {
-                        selectedHour[0] = hourOfDay;
-                        selectedMinute[0] = minute;
-                        timeDisplay.setText(String.format(Locale.getDefault(), "%02d:%02d", hourOfDay, minute));
-                    }, selectedHour[0], selectedMinute[0], true);
-            picker.setTitle("Escolha o horário");
-            picker.show();
+            new android.app.TimePickerDialog(this, (view, h, m) -> {
+                selTime[0] = h; selTime[1] = m;
+                timeDisplay.setText(String.format(Locale.getDefault(), "%02d:%02d", h, m));
+            }, selTime[0], selTime[1], true).show();
         });
 
-        AlertDialog dialog = new AlertDialog.Builder(this).setView(dialogView).setPositiveButton("Guardar", null).setNegativeButton("Cancelar", null).create();
-        dialog.setOnShowListener(dialogInterface -> {
-            Button positiveButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
-            positiveButton.setOnClickListener(v -> {
-                String title = titleInput.getText().toString().trim();
-                if (TextUtils.isEmpty(title)) {
-                    titleInput.setError("Insira o nome do medicamento");
-                    return;
-                }
-                String details = detailsInput.getText().toString().trim();
-                String timeFormatted = String.format(Locale.getDefault(), "%02d:%02d", selectedHour[0], selectedMinute[0]);
-
-                AlarmItem newAlarm = new AlarmItem(title, timeFormatted + " • " + details, "Seg • Ter • Qua • Qui • Sex", true);
-                newAlarm.hour = selectedHour[0];
-                newAlarm.minute = selectedMinute[0];
-
-                saveAlarmInFirestore(newAlarm);
-                dialog.dismiss();
-            });
-        });
-        dialog.show();
+        new AlertDialog.Builder(this).setView(dialogView).setPositiveButton("Guardar", (d, w) -> {
+            String title = titleInput.getText().toString().trim();
+            if (TextUtils.isEmpty(title)) return;
+            String time = String.format(Locale.getDefault(), "%02d:%02d", selTime[0], selTime[1]);
+            AlarmItem newItem = new AlarmItem(title, time + " • " + ((EditText)dialogView.findViewById(R.id.inputAlarmDetails)).getText().toString().trim(), "Seg • Ter • Qua • Qui • Sex", true);
+            newItem.hour = selTime[0]; newItem.minute = selTime[1];
+            saveAlarmInFirestore(newItem);
+        }).setNegativeButton("Cancelar", null).show();
     }
 
     private void showEditAlarmDialog(AlarmItem item, int index) {
         editingAlarmIndex = index;
-        String[] options = { "⏰ Alterar horário", "📝 Editar título", "📅 Alterar dias" };
-        new AlertDialog.Builder(this).setTitle("Editar: " + item.title).setItems(options, (dialog, which) -> {
-            switch (which) {
-                case 0: showChangeTimeDialog(item); break;
-                case 1: showEditTitleDialog(item); break;
-                case 2: showEditDaysDialog(item); break;
-            }
+        String[] opts = { "⏰ Alterar horário", "📝 Editar título", "📅 Alterar dias", "🔊 Alterar som" };
+        new AlertDialog.Builder(this).setTitle("Editar: " + item.title).setItems(opts, (dialog, which) -> {
+            if (which == 0) showChangeTimeDialog(item);
+            else if (which == 1) showEditTitleDialog(item);
+            else if (which == 2) showEditDaysDialog(item);
+            else if (which == 3) showRingtonePicker(item);
         }).setNegativeButton("Fechar", null).show();
     }
 
@@ -661,189 +1072,228 @@ public class MainActivity extends AppCompatActivity {
         String[] days = {"Segunda", "Terça", "Quarta", "Quinta", "Sexta", "Sábado", "Domingo"};
         boolean[] checked = new boolean[7];
         if (item.days != null) {
-            if (item.days.contains("Seg")) checked[0] = true;
-            if (item.days.contains("Ter")) checked[1] = true;
-            if (item.days.contains("Qua")) checked[2] = true;
-            if (item.days.contains("Qui")) checked[3] = true;
-            if (item.days.contains("Sex")) checked[4] = true;
-            if (item.days.contains("Sáb")) checked[5] = true;
-            if (item.days.contains("Dom")) checked[6] = true;
+            String[] shorts = {"Seg", "Ter", "Qua", "Qui", "Sex", "Sáb", "Dom"};
+            for (int i=0; i<7; i++) if (item.days.contains(shorts[i])) checked[i] = true;
         }
-
-        new AlertDialog.Builder(this)
-                .setTitle("Escolher dias")
-                .setMultiChoiceItems(days, checked, (dialog, which, isChecked) -> checked[which] = isChecked)
-                .setPositiveButton("OK", (dialog, which) -> {
+        new AlertDialog.Builder(this).setTitle("Escolher dias").setMultiChoiceItems(days, checked, (d, w, isC) -> checked[w] = isC)
+                .setPositiveButton("OK", (d, w) -> {
                     StringBuilder sb = new StringBuilder();
                     String[] shorts = {"Seg", "Ter", "Qua", "Qui", "Sex", "Sáb", "Dom"};
-                    for (int i = 0; i < 7; i++) {
-                        if (checked[i]) {
-                            if (sb.length() > 0) sb.append(" • ");
-                            sb.append(shorts[i]);
-                        }
-                    }
-                    if (sb.length() == 0) sb.append("Nenhum dia");
-                    item.days = sb.toString();
+                    for (int i=0; i<7; i++) if (checked[i]) { if (sb.length() > 0) sb.append(" • "); sb.append(shorts[i]); }
+                    item.days = sb.length() == 0 ? "Nenhum dia" : sb.toString();
                     updateAlarmInFirestore(item);
-                })
-                .setNegativeButton("Cancelar", null)
-                .show();
+                }).show();
     }
 
     private void showChangeTimeDialog(AlarmItem item) {
-        new android.app.TimePickerDialog(this, (view, hourOfDay, minute) -> {
-            item.hour = hourOfDay;
-            item.minute = minute;
-            String details = item.time.contains("•") ? item.time.split("•")[1].trim() : "";
-            item.time = String.format(Locale.getDefault(), "%02d:%02d • %s", hourOfDay, minute, details);
+        new android.app.TimePickerDialog(this, (v, h, m) -> {
+            item.hour = h; item.minute = m;
+            String det = item.time.contains("•") ? item.time.split("•")[1].trim() : "";
+            item.time = String.format(Locale.getDefault(), "%02d:%02d • %s", h, m, det);
             updateAlarmInFirestore(item);
-            scheduleAlarm(item, alarms.indexOf(item));
         }, item.hour, item.minute, true).show();
     }
 
     private void showEditTitleDialog(AlarmItem item) {
-        EditText input = new EditText(this);
-        input.setText(item.title);
-        input.setPadding(50, 40, 50, 40);
-        new AlertDialog.Builder(this).setTitle("Editar nome").setView(input).setPositiveButton("Guardar", (dialog, which) -> {
-            String newTitle = input.getText().toString().trim();
-            if (!TextUtils.isEmpty(newTitle)) {
-                item.title = newTitle;
-                updateAlarmInFirestore(item);
-            }
-        }).setNegativeButton("Cancelar", null).show();
+        EditText input = new EditText(this); input.setText(item.title);
+        new AlertDialog.Builder(this).setTitle("Editar nome").setView(input).setPositiveButton("Guardar", (d, w) -> {
+            if (!TextUtils.isEmpty(input.getText())) { item.title = input.getText().toString().trim(); updateAlarmInFirestore(item); }
+        }).show();
     }
 
-    private void scheduleAlarm(AlarmItem item, int alarmId) {
-        AlarmManager alarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
-        Intent intent = new Intent(this, AlarmReceiver.class);
-        intent.putExtra("alarm_title", item.title);
-        intent.putExtra("alarm_id", alarmId);
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(this, alarmId, intent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
-
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, item.hour);
-        calendar.set(Calendar.MINUTE, item.minute);
-        calendar.set(Calendar.SECOND, 0);
-        if (calendar.getTimeInMillis() < System.currentTimeMillis()) {
-            calendar.add(Calendar.DAY_OF_MONTH, 1);
-        }
-
-        try {
-            alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), pendingIntent);
-        } catch (SecurityException e) {
-            Toast.makeText(this, "Erro: Permissão de alarme necessária", Toast.LENGTH_SHORT).show();
-        }
+    private void showRingtonePicker(AlarmItem item) {
+        editingAlarmForSound = item;
+        Intent intent = new Intent(RingtoneManager.ACTION_RINGTONE_PICKER);
+        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TITLE, "Selecionar som do alarme");
+        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, false);
+        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true);
+        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_ALARM);
+        if (item.ringtoneUri != null) intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, Uri.parse(item.ringtoneUri));
+        ringtonePickerLauncher.launch(intent);
     }
 
     private void loadAlarmsFromFirestore() {
         if (currentUserId == null) return;
-        db.collection("users").document(currentUserId).collection("alarms")
-                .get()
-                .addOnCompleteListener(task -> {
-                    if (task.isSuccessful()) {
-                        alarms.clear();
-                        for (QueryDocumentSnapshot document : task.getResult()) {
-                            AlarmItem item = document.toObject(AlarmItem.class);
-                            item.documentId = document.getId();
-                            alarms.add(item);
-                        }
-                        renderAlarms();
-                        if (calendarView != null) {
-                            setupCalendar(calendarView);
-                        }
-                    } else {
-                        Log.e("Firestore", "Error loading alarms: ", task.getException());
-                    }
-                });
+        db.collection("users").document(currentUserId).collection("alarms").get().addOnCompleteListener(task -> {
+            if (task.isSuccessful()) {
+                alarms.clear();
+                for (QueryDocumentSnapshot d : task.getResult()) {
+                    AlarmItem item = d.toObject(AlarmItem.class);
+                    item.documentId = d.getId();
+                    alarms.add(item);
+                    if (item.enabled) scheduleAlarm(item);
+                }
+                if (currentTab == Tab.ALARMS) renderAlarms();
+            }
+        });
     }
 
     private void saveAlarmInFirestore(AlarmItem item) {
-        if (currentUserId == null) return;
-        db.collection("users").document(currentUserId).collection("alarms")
-                .add(item)
-                .addOnSuccessListener(documentReference -> {
-                    item.documentId = documentReference.getId();
-                    if (!alarms.contains(item)) {
-                        alarms.add(item);
-                    }
-                    int alarmId = alarms.indexOf(item);
-                    scheduleAlarm(item, alarmId);
-                    renderAlarms();
-                    Toast.makeText(this, "Alarme criado e agendado!", Toast.LENGTH_SHORT).show();
-                })
-                .addOnFailureListener(e -> Toast.makeText(this, "Erro ao guardar alarme", Toast.LENGTH_SHORT).show());
+        db.collection("users").document(currentUserId).collection("alarms").add(item).addOnSuccessListener(ref -> {
+            item.documentId = ref.getId(); alarms.add(item); renderAlarms(); scheduleAlarm(item);
+        });
     }
 
     private void updateAlarmInFirestore(AlarmItem item) {
-        if (currentUserId == null || item.documentId == null) return;
-        db.collection("users").document(currentUserId).collection("alarms").document(item.documentId)
-                .set(item)
-                .addOnSuccessListener(aVoid -> {
-                    renderAlarms();
-                    Toast.makeText(this, "Alarme atualizado!", Toast.LENGTH_SHORT).show();
-                })
-                .addOnFailureListener(e -> Toast.makeText(this, "Erro ao atualizar alarme", Toast.LENGTH_SHORT).show());
+        if (currentUserId != null && item.documentId != null)
+            db.collection("users").document(currentUserId).collection("alarms").document(item.documentId).set(item).addOnSuccessListener(a -> {
+                renderAlarms(); scheduleAlarm(item);
+            });
+    }
+
+    private void scheduleAlarm(AlarmItem item) {
+        AlarmManager am = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
+        if (am == null) return;
+
+        if (!item.enabled) {
+            cancelAlarm(item);
+            return;
+        }
+
+        Intent intent = new Intent(this, AlarmReceiver.class);
+        intent.putExtra("alarm_title", item.title);
+        intent.putExtra("alarm_message", "Hora de tomar: " + item.title);
+        intent.putExtra("ringtone_uri", item.ringtoneUri);
+        intent.putExtra("alarm_doc_id", item.documentId);
+        
+        int reqCode = item.documentId != null ? item.documentId.hashCode() : (int) System.currentTimeMillis();
+        PendingIntent pi = PendingIntent.getBroadcast(this, reqCode, intent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
+
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.HOUR_OF_DAY, item.hour);
+        cal.set(Calendar.MINUTE, item.minute);
+        cal.set(Calendar.SECOND, 0);
+
+        if (cal.getTimeInMillis() <= System.currentTimeMillis()) cal.add(Calendar.DAY_OF_YEAR, 1);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            am.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, cal.getTimeInMillis(), pi);
+        } else {
+            am.setExact(AlarmManager.RTC_WAKEUP, cal.getTimeInMillis(), pi);
+        }
+    }
+
+    private void cancelAlarm(AlarmItem item) {
+        AlarmManager am = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
+        if (am == null || item.documentId == null) return;
+        Intent intent = new Intent(this, AlarmReceiver.class);
+        int reqCode = item.documentId.hashCode();
+        PendingIntent pi = PendingIntent.getBroadcast(this, reqCode, intent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_NO_CREATE);
+        if (pi != null) { am.cancel(pi); pi.cancel(); }
     }
 
     private void deleteAlarmFromFirestore(AlarmItem item, int index) {
-        if (currentUserId == null || item.documentId == null) return;
-        db.collection("users").document(currentUserId).collection("alarms").document(item.documentId)
-                .delete()
-                .addOnSuccessListener(aVoid -> {
-                    alarms.remove(index);
-                    renderAlarms();
-                    Toast.makeText(this, "Alarme removido", Toast.LENGTH_SHORT).show();
-                })
-                .addOnFailureListener(e -> Toast.makeText(this, "Erro ao remover alarme", Toast.LENGTH_SHORT).show());
+        new AlertDialog.Builder(this).setTitle("Remover").setMessage("Remover " + item.title + "?")
+                .setPositiveButton("Sim", (d, w) -> {
+                    db.collection("users").document(currentUserId).collection("alarms").document(item.documentId).delete().addOnSuccessListener(a -> {
+                        cancelAlarm(item); alarms.remove(index); renderAlarms();
+                    });
+                }).show();
     }
 
-     private void showIntroDialogIfNeeded() {
-        boolean hasSeenIntro = prefs.getBoolean("has_seen_intro", false);
-        if (!hasSeenIntro) {
-            View dialogView = inflater.inflate(R.layout.dialog_intro, null);
-            AlertDialog dialog = new AlertDialog.Builder(this)
-                    .setView(dialogView)
-                    .setCancelable(false)
-                    .create();
-
-            Button skipButton = dialogView.findViewById(R.id.btnSkipIntro);
-            skipButton.setOnClickListener(v -> {
-                prefs.edit().putBoolean("has_seen_intro", true).apply();
-                dialog.dismiss();
-            });
-
-            dialog.show();
+    private void showIntroDialogIfNeeded() {
+        if (!prefs.getBoolean("has_seen_intro", false)) {
+            View v = inflater.inflate(R.layout.dialog_intro, null);
+            AlertDialog d = new AlertDialog.Builder(this).setView(v).setCancelable(false).create();
+            v.findViewById(R.id.btnSkipIntro).setOnClickListener(view -> { prefs.edit().putBoolean("has_seen_intro", true).apply(); d.dismiss(); });
+            d.show();
         }
     }
 
+    private void fetchLocationAndWeather() {
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+            locationPermissionLauncher.launch(Manifest.permission.ACCESS_FINE_LOCATION);
+            return;
+        }
+
+        fusedLocationClient.getLastLocation().addOnSuccessListener(this, location -> {
+            if (location != null) {
+                // Reverse geocode to get city name
+                try {
+                    Geocoder geocoder = new Geocoder(this, Locale.getDefault());
+                    List<Address> addresses = geocoder.getFromLocation(location.getLatitude(), location.getLongitude(), 1);
+                    if (addresses != null && !addresses.isEmpty()) {
+                        String city = addresses.get(0).getLocality();
+                        if (city == null) city = addresses.get(0).getSubAdminArea();
+                        if (city == null) city = addresses.get(0).getAdminArea();
+                        if (textLocation != null && city != null) {
+                            textLocation.setText(city);
+                        }
+                    }
+                } catch (Exception e) {
+                    Log.e("Geocoder", "Failed to get city name", e);
+                    if (textLocation != null) textLocation.setText("Localização");
+                }
+
+                // Fetch weather data
+                Retrofit retrofit = new Retrofit.Builder()
+                        .baseUrl("https://api.open-meteo.com/")
+                        .addConverterFactory(GsonConverterFactory.create())
+                        .build();
+
+                WeatherService service = retrofit.create(WeatherService.class);
+                service.getCurrentWeather(location.getLatitude(), location.getLongitude()).enqueue(new Callback<WeatherResponse>() {
+                    @Override
+                    public void onResponse(Call<WeatherResponse> call, Response<WeatherResponse> response) {
+                        if (response.isSuccessful() && response.body() != null) {
+                            double temp = response.body().currentWeather.temperature;
+                            int code = response.body().currentWeather.weatherCode;
+                            if (textTemperature != null) {
+                                textTemperature.setText(String.format(Locale.getDefault(), "%.1f°C", temp));
+                            }
+                            if (textCondition != null) {
+                                textCondition.setText(getWeatherCondition(code));
+                            }
+                            if (textTipDesc1 != null) {
+                                textTipDesc1.setText(String.format(Locale.getDefault(), "%s, %.1f°C", getWeatherCondition(code), temp));
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(Call<WeatherResponse> call, Throwable t) {
+                        if (textCondition != null) textCondition.setText("Clima indisponível");
+                    }
+                });
+            } else {
+                Log.e("Location", "Last location is null");
+                if (textLocation != null) textLocation.setText("GPS indisponível");
+            }
+        }).addOnFailureListener(e -> {
+            Log.e("Location", "Failed to get location", e);
+            if (textLocation != null) textLocation.setText("Erro GPS");
+        });
+    }
+
+    private String getWeatherCondition(int code) {
+        if (code == 0) return "Céu limpo";
+        if (code <= 3) return "Parcialmente nublado";
+        if (code <= 48) return "Nevoeiro";
+        if (code <= 57) return "Chuviscos";
+        if (code <= 67) return "Chuva";
+        if (code <= 77) return "Neve";
+        if (code <= 82) return "Aguaceiros";
+        if (code <= 86) return "Neve forte";
+        if (code <= 99) return "Trovoada";
+        return "Sem dados";
+    }
+
+    @Override protected void onDestroy() { 
+        super.onDestroy(); 
+        if (guardianAlarmsListener != null) guardianAlarmsListener.remove(); 
+        if (patientCalendarListener != null) patientCalendarListener.remove(); 
+        if (historyListener != null) historyListener.remove();
+        if (userDocListener != null) userDocListener.remove();
+    }
 
     public static class AlarmItem {
-        public String documentId;
-        public String title;
-        public String time;
-        public String days;
-        public boolean enabled;
-        public int hour;
-        public int minute;
-        public boolean takenToday;
+        public String documentId, title, time, days, ringtoneUri;
+        public boolean enabled, takenToday;
+        public int hour, minute;
         public long lastTakenTimestamp;
-        public String ringtoneUri;
-        public String ringtoneName;
-
         public AlarmItem() { }
-
         public AlarmItem(String title, String time, String days, boolean enabled) {
-            this.title = title;
-            this.time = time;
-            this.days = days;
-            this.enabled = enabled;
-            this.hour = 8;
-            this.minute = 0;
-            this.takenToday = false;
-            this.lastTakenTimestamp = 0;
-            this.ringtoneUri = null;
-            this.ringtoneName = "Toque padrão";
+            this.title = title; this.time = time; this.days = days; this.enabled = enabled;
         }
     }
 }
diff --git a/app/src/main/res/layout/dialog_profile.xml b/app/src/main/res/layout/dialog_profile.xml
index 4deeb26..880954b 100644
--- a/app/src/main/res/layout/dialog_profile.xml
+++ b/app/src/main/res/layout/dialog_profile.xml
@@ -51,33 +51,8 @@
         android:background="@color/divider"
         android:layout_marginBottom="24dp" />
 
-    <!-- Action Buttons -->
-    <LinearLayout
-        android:id="@+id/btnProfileTheme"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingVertical="12dp">
+    <!-- No theme button here as per user request -->
 
-        <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:src="@android:drawable/ic_menu_compass"
-            app:tint="@color/theme_blue_primary" />
-
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_weight="1"
-            android:text="Mudar Tema"
-            android:textColor="@color/theme_black_primary"
-            android:textSize="16sp" />
-    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/btnProfileSupport"
diff --git a/app/src/main/res/layout/item_alarm_card.xml b/app/src/main/res/layout/item_alarm_card.xml
index 71bd8a0..34f779f 100644
--- a/app/src/main/res/layout/item_alarm_card.xml
+++ b/app/src/main/res/layout/item_alarm_card.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="12dp"
@@ -17,19 +18,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-
-            <View
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:background="@drawable/bg_service_icon" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:orientation="vertical">
+            android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/textAlarmTitle"
@@ -48,7 +37,6 @@
                     android:text="09:00 • 100mg"
                     android:textColor="@color/neutral_medium"
                     android:textSize="14sp" />
-            </LinearLayout>
         </LinearLayout>
 
         <ImageButton
@@ -59,9 +47,9 @@
             android:background="@android:color/transparent"
             android:contentDescription="Editar alarme"
             android:src="@android:drawable/ic_menu_edit"
-            android:tint="@color/primary" />
+            app:tint="@color/primary" />
 
-        <Switch
+        <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/switchAlarm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -74,7 +62,7 @@
             android:background="@android:color/transparent"
             android:contentDescription="Remover alarme"
             android:src="@android:drawable/ic_menu_delete"
-            android:tint="@color/delete" />
+            app:tint="@color/delete" />
     </LinearLayout>
 
     <LinearLayout
@@ -112,5 +100,3 @@
             android:textStyle="bold" />
     </LinearLayout>
 </LinearLayout>
-
-
diff --git a/app/src/main/res/layout/item_calendar_day.xml b/app/src/main/res/layout/item_calendar_day.xml
index 20dc82b..ca1131e 100644
--- a/app/src/main/res/layout/item_calendar_day.xml
+++ b/app/src/main/res/layout/item_calendar_day.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_weight="1"
     android:orientation="vertical"
-    android:padding="4dp"
-    android:minHeight="60dp"
+    android:padding="2dp"
+    android:minHeight="50dp"
     android:gravity="center_horizontal">
 
     <TextView
diff --git a/app/src/main/res/layout/item_saved_account.xml b/app/src/main/res/layout/item_saved_account.xml
index c1f425a..ee7628a 100644
--- a/app/src/main/res/layout/item_saved_account.xml
+++ b/app/src/main/res/layout/item_saved_account.xml
@@ -8,13 +8,27 @@
     android:orientation="horizontal"
     android:padding="12dp">
 
-    <ImageView
-        android:id="@+id/imageViewAvatar"
+    <FrameLayout
         android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:background="@drawable/bg_avatar"
-        android:padding="8dp"
-        android:src="@drawable/logo_bem" />
+        android:layout_height="40dp">
+
+        <ImageView
+            android:id="@+id/imageViewAvatar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_avatar"
+            android:padding="8dp"
+            android:src="@drawable/logo_bem" />
+
+        <View
+            android:id="@+id/viewOnlineStatus"
+            android:layout_width="12dp"
+            android:layout_height="12dp"
+            android:layout_gravity="bottom|end"
+            android:background="@drawable/bg_circle_avatar"
+            android:backgroundTint="@color/neutral_medium"
+            android:visibility="gone" />
+    </FrameLayout>
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/layout_tab_alarms.xml b/app/src/main/res/layout/layout_tab_alarms.xml
index 5a1854c..0eb4605 100644
--- a/app/src/main/res/layout/layout_tab_alarms.xml
+++ b/app/src/main/res/layout/layout_tab_alarms.xml
@@ -57,6 +57,9 @@
                     android:alpha="0.7"
                     android:textSize="14sp" />
 
+                <!-- Weather removed from here and moved to Reminders tab -->
+
+
             </LinearLayout>
         </FrameLayout>
 
diff --git a/app/src/main/res/layout/layout_tab_calendar.xml b/app/src/main/res/layout/layout_tab_calendar.xml
index c9ed07d..1bed7bf 100644
--- a/app/src/main/res/layout/layout_tab_calendar.xml
+++ b/app/src/main/res/layout/layout_tab_calendar.xml
@@ -1,57 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/background_surface"
-    android:overScrollMode="never"
-    android:paddingBottom="32dp">
+    android:fillViewport="true">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingStart="24dp"
-        android:paddingTop="32dp"
-        android:paddingEnd="24dp">
+        android:padding="20dp"
+        android:paddingBottom="120dp">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Histórico"
             android:textColor="@color/neutral_dark"
-            android:textSize="26sp"
+            android:textSize="24sp"
             android:textStyle="bold" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="20dp"
             android:text="Registo de medicação tomada"
             android:textColor="@color/neutral_medium"
             android:textSize="14sp" />
 
-        <!-- Calendar Container -->
+        <!-- Calendar Card -->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
             android:background="@drawable/bg_guardian_card"
             android:orientation="vertical"
-            android:padding="16dp">
+            android:padding="12dp">
 
+            <!-- Month Title -->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingBottom="16dp">
+                android:paddingBottom="12dp">
 
                 <TextView
                     android:id="@+id/textMonthTitle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="Dezembro 2024"
+                    android:text="Março 2026"
                     android:textColor="@color/neutral_dark"
                     android:textSize="18sp"
                     android:textStyle="bold" />
@@ -63,102 +62,40 @@
                     android:tint="@color/primary" />
             </LinearLayout>
 
-            <!-- Weekday Headers -->
+            <!-- Weekday Headers - 7 equal TextViews in a TableRow-like layout -->
             <LinearLayout
+                android:id="@+id/weekdayHeaders"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:weightSum="7">
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:padding="4dp"
-                    android:text="D"
-                    android:textColor="@color/delete"
-                    android:textStyle="bold" />
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:padding="4dp"
-                    android:text="S"
-                    android:textColor="@color/neutral_medium"
-                    android:textStyle="bold" />
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:padding="4dp"
-                    android:text="T"
-                    android:textColor="@color/neutral_medium"
-                    android:textStyle="bold" />
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:padding="4dp"
-                    android:text="Q"
-                    android:textColor="@color/neutral_medium"
-                    android:textStyle="bold" />
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:padding="4dp"
-                    android:text="Q"
-                    android:textColor="@color/neutral_medium"
-                    android:textStyle="bold" />
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:padding="4dp"
-                    android:text="S"
-                    android:textColor="@color/neutral_medium"
-                    android:textStyle="bold" />
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:padding="4dp"
-                    android:text="S"
-                    android:textColor="@color/neutral_medium"
-                    android:textStyle="bold" />
+                android:baselineAligned="false">
+                <!-- 7 headers added programmatically to guarantee equal width -->
             </LinearLayout>
-            
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginVertical="8dp"
-                android:background="@color/divider"/>
+                android:layout_marginTop="6dp"
+                android:layout_marginBottom="6dp"
+                android:background="@color/divider" />
 
-            <!-- Month Grid -->
+            <!-- Calendar Grid - rows added programmatically -->
             <LinearLayout
                 android:id="@+id/calendarGrid"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
-                <!-- Rows will be added here -->
-            </LinearLayout>
+                android:orientation="vertical" />
 
         </LinearLayout>
-        
+
         <!-- Legend -->
         <LinearLayout
             android:id="@+id/legendContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="16dp"
             android:orientation="vertical">
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -166,10 +103,8 @@
                 android:textSize="16sp"
                 android:textStyle="bold"
                 android:textColor="@color/neutral_dark"
-                android:layout_marginBottom="8dp"/>
-                
-             <!-- Legend items added programmatically -->
+                android:layout_marginBottom="8dp" />
         </LinearLayout>
 
     </LinearLayout>
-</androidx.core.widget.NestedScrollView>
+</ScrollView>
diff --git a/app/src/main/res/layout/layout_tab_guardians.xml b/app/src/main/res/layout/layout_tab_guardians.xml
index a0a3ca8..7375d79 100644
--- a/app/src/main/res/layout/layout_tab_guardians.xml
+++ b/app/src/main/res/layout/layout_tab_guardians.xml
@@ -21,10 +21,19 @@
             android:orientation="horizontal"
             android:layout_marginBottom="32dp">
 
+            <ImageButton
+                android:id="@+id/btnRefreshGuardian"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:src="@android:drawable/stat_notify_sync"
+                android:layout_marginEnd="12dp"
+                app:tint="@color/theme_blue_primary" />
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:orientation="vertical">
 
                 <TextView
@@ -44,7 +53,6 @@
                     android:textColor="@color/neutral_medium"
                     android:textSize="14sp" />
             </LinearLayout>
-
         </LinearLayout>
 
         <!-- Summary Status Section -->