From cd4ff307b7d03eb79faa1a3f9f646b0c28240a5b Mon Sep 17 00:00:00 2001
From: 230408 <230408@epvc.pt>
Date: Tue, 25 Nov 2025 17:07:52 +0000
Subject: [PATCH] cursor fez maior parte dos designs

---
 .idea/gradle.xml                              |   1 +
 .../com/example/pap_findu/MainActivity.java   |   7 +-
 .../pap_findu/ui/alerts/AlertsFragment.java   |  29 ++
 .../ui/dashboard/DashboardFragment.java       |  37 --
 .../ui/dashboard/DashboardViewModel.java      |  19 -
 .../pap_findu/ui/home/HomeFragment.java       |  37 --
 .../pap_findu/ui/home/HomeViewModel.java      |  19 -
 .../example/pap_findu/ui/map/MapFragment.java |  29 ++
 .../notifications/NotificationsFragment.java  |  37 --
 .../notifications/NotificationsViewModel.java |  19 -
 .../pap_findu/ui/zones/ZonesFragment.java     |  29 ++
 .../main/res/color/bottom_nav_selector.xml    |   5 +
 app/src/main/res/drawable-anydpi/zonas.xml    |  11 +
 app/src/main/res/drawable-hdpi/zonas.png      | Bin 0 -> 614 bytes
 app/src/main/res/drawable-mdpi/zonas.png      | Bin 0 -> 397 bytes
 app/src/main/res/drawable-xhdpi/zonas.png     | Bin 0 -> 761 bytes
 app/src/main/res/drawable-xxhdpi/zonas.png    | Bin 0 -> 1141 bytes
 .../main/res/drawable/bg_alert_icon_info.xml  |   6 +
 .../res/drawable/bg_alert_icon_warning.xml    |   6 +
 .../res/drawable/bg_avatar_placeholder.xml    |   5 +
 app/src/main/res/drawable/bg_badge.xml        |   5 +
 app/src/main/res/drawable/bg_bottom_nav.xml   |  16 +
 app/src/main/res/drawable/bg_chip_muted.xml   |  11 +
 app/src/main/res/drawable/bg_chip_success.xml |  11 +
 app/src/main/res/drawable/bg_chip_warning.xml |  11 +
 .../res/drawable/bg_filter_chip_active.xml    |  11 +
 .../res/drawable/bg_filter_chip_neutral.xml   |  14 +
 app/src/main/res/drawable/bg_header_top.xml   |  11 +
 app/src/main/res/drawable/bg_map_card.xml     |  18 +
 app/src/main/res/drawable/bg_map_surface.xml  |   6 +
 .../main/res/drawable/bg_marker_avatar.xml    |  10 +
 app/src/main/res/drawable/bg_marker_label.xml |  14 +
 app/src/main/res/drawable/bg_marker_user.xml  |   9 +
 app/src/main/res/drawable/bg_safe_banner.xml  |  14 +
 .../main/res/drawable/bg_safe_banner_icon.xml |   6 +
 .../main/res/drawable/bg_safe_zone_circle.xml |   8 +
 .../main/res/drawable/bg_status_online.xml    |   6 +
 .../res/drawable/bg_zone_icon_primary.xml     |   6 +
 .../res/drawable/bg_zone_icon_secondary.xml   |   6 +
 app/src/main/res/drawable/bg_zoom_button.xml  |  18 +
 .../main/res/drawable/ic_alert_warning.xml    |  10 +
 app/src/main/res/drawable/ic_battery.xml      |  13 +
 app/src/main/res/drawable/ic_chat_bubble.xml  |  10 +
 app/src/main/res/drawable/ic_history.xml      |  11 +
 app/src/main/res/drawable/ic_location_pin.xml |  11 +
 app/src/main/res/drawable/ic_nav_alerts.xml   |  10 +
 app/src/main/res/drawable/ic_nav_home.xml     |  11 +
 app/src/main/res/drawable/ic_nav_zones.xml    |  11 +
 .../main/res/drawable/ic_navigation_plane.xml |  10 +
 app/src/main/res/drawable/ic_profile.xml      |  11 +
 app/src/main/res/drawable/ic_signal_gps.xml   |  13 +
 app/src/main/res/drawable/ic_zoom_minus.xml   |  10 +
 app/src/main/res/drawable/ic_zoom_plus.xml    |  10 +
 app/src/main/res/layout/activity_main.xml     |  48 +-
 app/src/main/res/layout/fragment_alerts.xml   | 322 +++++++++++++
 .../main/res/layout/fragment_dashboard.xml    |  22 -
 app/src/main/res/layout/fragment_home.xml     |  22 -
 app/src/main/res/layout/fragment_map.xml      | 449 ++++++++++++++++++
 .../res/layout/fragment_notifications.xml     |  22 -
 app/src/main/res/layout/fragment_zones.xml    | 283 +++++++++++
 app/src/main/res/menu/bottom_nav_menu.xml     |  19 -
 app/src/main/res/menu/bottom_tabs.xml         |  17 +
 .../main/res/navigation/mobile_navigation.xml |  29 +-
 app/src/main/res/values/strings.xml           |  50 ++
 ...4-53890ca6-7f8b-4d60-9982-58871ec14e0f.png |   0
 65 files changed, 1639 insertions(+), 292 deletions(-)
 create mode 100644 app/src/main/java/com/example/pap_findu/ui/alerts/AlertsFragment.java
 delete mode 100644 app/src/main/java/com/example/pap_findu/ui/dashboard/DashboardFragment.java
 delete mode 100644 app/src/main/java/com/example/pap_findu/ui/dashboard/DashboardViewModel.java
 delete mode 100644 app/src/main/java/com/example/pap_findu/ui/home/HomeFragment.java
 delete mode 100644 app/src/main/java/com/example/pap_findu/ui/home/HomeViewModel.java
 create mode 100644 app/src/main/java/com/example/pap_findu/ui/map/MapFragment.java
 delete mode 100644 app/src/main/java/com/example/pap_findu/ui/notifications/NotificationsFragment.java
 delete mode 100644 app/src/main/java/com/example/pap_findu/ui/notifications/NotificationsViewModel.java
 create mode 100644 app/src/main/java/com/example/pap_findu/ui/zones/ZonesFragment.java
 create mode 100644 app/src/main/res/color/bottom_nav_selector.xml
 create mode 100644 app/src/main/res/drawable-anydpi/zonas.xml
 create mode 100644 app/src/main/res/drawable-hdpi/zonas.png
 create mode 100644 app/src/main/res/drawable-mdpi/zonas.png
 create mode 100644 app/src/main/res/drawable-xhdpi/zonas.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/zonas.png
 create mode 100644 app/src/main/res/drawable/bg_alert_icon_info.xml
 create mode 100644 app/src/main/res/drawable/bg_alert_icon_warning.xml
 create mode 100644 app/src/main/res/drawable/bg_avatar_placeholder.xml
 create mode 100644 app/src/main/res/drawable/bg_badge.xml
 create mode 100644 app/src/main/res/drawable/bg_bottom_nav.xml
 create mode 100644 app/src/main/res/drawable/bg_chip_muted.xml
 create mode 100644 app/src/main/res/drawable/bg_chip_success.xml
 create mode 100644 app/src/main/res/drawable/bg_chip_warning.xml
 create mode 100644 app/src/main/res/drawable/bg_filter_chip_active.xml
 create mode 100644 app/src/main/res/drawable/bg_filter_chip_neutral.xml
 create mode 100644 app/src/main/res/drawable/bg_header_top.xml
 create mode 100644 app/src/main/res/drawable/bg_map_card.xml
 create mode 100644 app/src/main/res/drawable/bg_map_surface.xml
 create mode 100644 app/src/main/res/drawable/bg_marker_avatar.xml
 create mode 100644 app/src/main/res/drawable/bg_marker_label.xml
 create mode 100644 app/src/main/res/drawable/bg_marker_user.xml
 create mode 100644 app/src/main/res/drawable/bg_safe_banner.xml
 create mode 100644 app/src/main/res/drawable/bg_safe_banner_icon.xml
 create mode 100644 app/src/main/res/drawable/bg_safe_zone_circle.xml
 create mode 100644 app/src/main/res/drawable/bg_status_online.xml
 create mode 100644 app/src/main/res/drawable/bg_zone_icon_primary.xml
 create mode 100644 app/src/main/res/drawable/bg_zone_icon_secondary.xml
 create mode 100644 app/src/main/res/drawable/bg_zoom_button.xml
 create mode 100644 app/src/main/res/drawable/ic_alert_warning.xml
 create mode 100644 app/src/main/res/drawable/ic_battery.xml
 create mode 100644 app/src/main/res/drawable/ic_chat_bubble.xml
 create mode 100644 app/src/main/res/drawable/ic_history.xml
 create mode 100644 app/src/main/res/drawable/ic_location_pin.xml
 create mode 100644 app/src/main/res/drawable/ic_nav_alerts.xml
 create mode 100644 app/src/main/res/drawable/ic_nav_home.xml
 create mode 100644 app/src/main/res/drawable/ic_nav_zones.xml
 create mode 100644 app/src/main/res/drawable/ic_navigation_plane.xml
 create mode 100644 app/src/main/res/drawable/ic_profile.xml
 create mode 100644 app/src/main/res/drawable/ic_signal_gps.xml
 create mode 100644 app/src/main/res/drawable/ic_zoom_minus.xml
 create mode 100644 app/src/main/res/drawable/ic_zoom_plus.xml
 create mode 100644 app/src/main/res/layout/fragment_alerts.xml
 delete mode 100644 app/src/main/res/layout/fragment_dashboard.xml
 delete mode 100644 app/src/main/res/layout/fragment_home.xml
 create mode 100644 app/src/main/res/layout/fragment_map.xml
 delete mode 100644 app/src/main/res/layout/fragment_notifications.xml
 create mode 100644 app/src/main/res/layout/fragment_zones.xml
 delete mode 100644 app/src/main/res/menu/bottom_nav_menu.xml
 create mode 100644 app/src/main/res/menu/bottom_tabs.xml
 create mode 100644 assets/Captura_de_ecra__2025-11-25__a_s_14.16.14-53890ca6-7f8b-4d60-9982-58871ec14e0f.png

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 97f0a8e..639c779 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/app/src/main/java/com/example/pap_findu/MainActivity.java b/app/src/main/java/com/example/pap_findu/MainActivity.java
index 8b3637a..ff2719f 100644
--- a/app/src/main/java/com/example/pap_findu/MainActivity.java
+++ b/app/src/main/java/com/example/pap_findu/MainActivity.java
@@ -23,14 +23,11 @@ public class MainActivity extends AppCompatActivity {
         binding = ActivityMainBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
-        BottomNavigationView navView = findViewById(R.id.nav_view);
-        // Passing each menu ID as a set of Ids because each
-        // menu should be considered as top level destinations.
+        BottomNavigationView navView = binding.navView;
         AppBarConfiguration appBarConfiguration = new AppBarConfiguration.Builder(
-                R.id.navigation_home, R.id.navigation_dashboard, R.id.navigation_notifications)
+                R.id.navigation_map, R.id.navigation_zones, R.id.navigation_alerts)
                 .build();
         NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_activity_main);
-        NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);
         NavigationUI.setupWithNavController(binding.navView, navController);
     }
 
diff --git a/app/src/main/java/com/example/pap_findu/ui/alerts/AlertsFragment.java b/app/src/main/java/com/example/pap_findu/ui/alerts/AlertsFragment.java
new file mode 100644
index 0000000..82faa81
--- /dev/null
+++ b/app/src/main/java/com/example/pap_findu/ui/alerts/AlertsFragment.java
@@ -0,0 +1,29 @@
+package com.example.pap_findu.ui.alerts;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import com.example.pap_findu.databinding.FragmentAlertsBinding;
+
+public class AlertsFragment extends Fragment {
+
+    private FragmentAlertsBinding binding;
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        binding = FragmentAlertsBinding.inflate(inflater, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+}
diff --git a/app/src/main/java/com/example/pap_findu/ui/dashboard/DashboardFragment.java b/app/src/main/java/com/example/pap_findu/ui/dashboard/DashboardFragment.java
deleted file mode 100644
index 41001a1..0000000
--- a/app/src/main/java/com/example/pap_findu/ui/dashboard/DashboardFragment.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.example.pap_findu.ui.dashboard;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProvider;
-
-import com.example.pap_findu.databinding.FragmentDashboardBinding;
-
-public class DashboardFragment extends Fragment {
-
-    private FragmentDashboardBinding binding;
-
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             ViewGroup container, Bundle savedInstanceState) {
-        DashboardViewModel dashboardViewModel =
-                new ViewModelProvider(this).get(DashboardViewModel.class);
-
-        binding = FragmentDashboardBinding.inflate(inflater, container, false);
-        View root = binding.getRoot();
-
-        final TextView textView = binding.textDashboard;
-        dashboardViewModel.getText().observe(getViewLifecycleOwner(), textView::setText);
-        return root;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        binding = null;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/pap_findu/ui/dashboard/DashboardViewModel.java b/app/src/main/java/com/example/pap_findu/ui/dashboard/DashboardViewModel.java
deleted file mode 100644
index 98dc7b8..0000000
--- a/app/src/main/java/com/example/pap_findu/ui/dashboard/DashboardViewModel.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.example.pap_findu.ui.dashboard;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-public class DashboardViewModel extends ViewModel {
-
-    private final MutableLiveData<String> mText;
-
-    public DashboardViewModel() {
-        mText = new MutableLiveData<>();
-        mText.setValue("This is dashboard fragment");
-    }
-
-    public LiveData<String> getText() {
-        return mText;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/pap_findu/ui/home/HomeFragment.java b/app/src/main/java/com/example/pap_findu/ui/home/HomeFragment.java
deleted file mode 100644
index 8ae89bc..0000000
--- a/app/src/main/java/com/example/pap_findu/ui/home/HomeFragment.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.example.pap_findu.ui.home;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProvider;
-
-import com.example.pap_findu.databinding.FragmentHomeBinding;
-
-public class HomeFragment extends Fragment {
-
-    private FragmentHomeBinding binding;
-
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             ViewGroup container, Bundle savedInstanceState) {
-        HomeViewModel homeViewModel =
-                new ViewModelProvider(this).get(HomeViewModel.class);
-
-        binding = FragmentHomeBinding.inflate(inflater, container, false);
-        View root = binding.getRoot();
-
-        final TextView textView = binding.textHome;
-        homeViewModel.getText().observe(getViewLifecycleOwner(), textView::setText);
-        return root;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        binding = null;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/pap_findu/ui/home/HomeViewModel.java b/app/src/main/java/com/example/pap_findu/ui/home/HomeViewModel.java
deleted file mode 100644
index 2688076..0000000
--- a/app/src/main/java/com/example/pap_findu/ui/home/HomeViewModel.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.example.pap_findu.ui.home;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-public class HomeViewModel extends ViewModel {
-
-    private final MutableLiveData<String> mText;
-
-    public HomeViewModel() {
-        mText = new MutableLiveData<>();
-        mText.setValue("This is home fragment");
-    }
-
-    public LiveData<String> getText() {
-        return mText;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/pap_findu/ui/map/MapFragment.java b/app/src/main/java/com/example/pap_findu/ui/map/MapFragment.java
new file mode 100644
index 0000000..df91fba
--- /dev/null
+++ b/app/src/main/java/com/example/pap_findu/ui/map/MapFragment.java
@@ -0,0 +1,29 @@
+package com.example.pap_findu.ui.map;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import com.example.pap_findu.databinding.FragmentMapBinding;
+
+public class MapFragment extends Fragment {
+
+    private FragmentMapBinding binding;
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        binding = FragmentMapBinding.inflate(inflater, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+}
diff --git a/app/src/main/java/com/example/pap_findu/ui/notifications/NotificationsFragment.java b/app/src/main/java/com/example/pap_findu/ui/notifications/NotificationsFragment.java
deleted file mode 100644
index 12800fd..0000000
--- a/app/src/main/java/com/example/pap_findu/ui/notifications/NotificationsFragment.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.example.pap_findu.ui.notifications;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProvider;
-
-import com.example.pap_findu.databinding.FragmentNotificationsBinding;
-
-public class NotificationsFragment extends Fragment {
-
-    private FragmentNotificationsBinding binding;
-
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             ViewGroup container, Bundle savedInstanceState) {
-        NotificationsViewModel notificationsViewModel =
-                new ViewModelProvider(this).get(NotificationsViewModel.class);
-
-        binding = FragmentNotificationsBinding.inflate(inflater, container, false);
-        View root = binding.getRoot();
-
-        final TextView textView = binding.textNotifications;
-        notificationsViewModel.getText().observe(getViewLifecycleOwner(), textView::setText);
-        return root;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        binding = null;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/pap_findu/ui/notifications/NotificationsViewModel.java b/app/src/main/java/com/example/pap_findu/ui/notifications/NotificationsViewModel.java
deleted file mode 100644
index 124383e..0000000
--- a/app/src/main/java/com/example/pap_findu/ui/notifications/NotificationsViewModel.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.example.pap_findu.ui.notifications;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-public class NotificationsViewModel extends ViewModel {
-
-    private final MutableLiveData<String> mText;
-
-    public NotificationsViewModel() {
-        mText = new MutableLiveData<>();
-        mText.setValue("This is notifications fragment");
-    }
-
-    public LiveData<String> getText() {
-        return mText;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/pap_findu/ui/zones/ZonesFragment.java b/app/src/main/java/com/example/pap_findu/ui/zones/ZonesFragment.java
new file mode 100644
index 0000000..419e1cc
--- /dev/null
+++ b/app/src/main/java/com/example/pap_findu/ui/zones/ZonesFragment.java
@@ -0,0 +1,29 @@
+package com.example.pap_findu.ui.zones;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import com.example.pap_findu.databinding.FragmentZonesBinding;
+
+public class ZonesFragment extends Fragment {
+
+    private FragmentZonesBinding binding;
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        binding = FragmentZonesBinding.inflate(inflater, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+}
diff --git a/app/src/main/res/color/bottom_nav_selector.xml b/app/src/main/res/color/bottom_nav_selector.xml
new file mode 100644
index 0000000..8d923e5
--- /dev/null
+++ b/app/src/main/res/color/bottom_nav_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#1C6CFF" android:state_checked="true" />
+    <item android:color="#B0B7C3" />
+</selector>
diff --git a/app/src/main/res/drawable-anydpi/zonas.xml b/app/src/main/res/drawable-anydpi/zonas.xml
new file mode 100644
index 0000000..4295200
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/zonas.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7D9CA8"
+    android:alpha="0.8">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/zonas.png b/app/src/main/res/drawable-hdpi/zonas.png
new file mode 100644
index 0000000000000000000000000000000000000000..11d8db6cd4e9e4d9aacaffd45726057719d4d9fa
GIT binary patch
literal 614
zcmV-s0-61ZP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0006lNkl<ZcwX(6
z&ubGw6vrddibyX#c@xBg;z?+GC|>lYg5aTe_u#Dup-5$C*QMgYOAql-vNMxF+w7Yx
zjh-rkg%(@dV*Q`=*>n=~O|qTcY;tKo@Fg($zVDk&c7Bvfms}J)O*6hW6<?Wc*1?&!
zg`&uh%q;pxMxf{!H~#ISK$|C6Unu;Ge8;Bei*_)l5d79()2E?>G=0Imq2Q<d(9<NN
zglxRW++4h_R3<Pyj{;>*Fgq7QnXed*;+3_}pFeRN#aRaPGZBW#B!+^TSR*7g`}kVY
z=2xlo=L*(16ISB8J)s>Ppx?rckNfyf6{_S8`khJJbG&F{9{m<CqIvYU>va4O{mulM
zUSME5ST%2<-xAi6o9J)XNqUKXXFOG(!$7N0Z_S|J;zwKe(Qg&##v}AQ6IScDG0=)v
z%r5#ZzN9_$x9g<2hkj=k%jIhr*d<A8Si|F=dwl;XOp-~g$po*M9~g=fnqr}1;{E6Z
zzw7exeuep&5fMGd;JgyD{uJ|bfx&r&xw+xxzk=bJCFvvP=4P?{E&b(o&_a@2#oVFb
z<?3M*cQuwUZ)jQvEgkkYOBWxuNB^!cm{$m*nmopa=gC{E&tXoX2pMl;(?Js2RI$Er
z-hR?k*m#iMtgc?i`jL=!cv>whdVqB!h4+;WoJ2=dL;qMfyGwUXhQ|ip0!9vBN2hT@
zOY7@5&^K1z)jId?v|Hp@;dkbhr_2J5UveS%3-oOi!O+1)IRF3v07*qoM6N<$f^+LI
A82|tP

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/zonas.png b/app/src/main/res/drawable-mdpi/zonas.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b30781e6e7833e9f1ce54761a4390f35d0e7378
GIT binary patch
literal 397
zcmV;80doF{P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00040Nkl<ZcwXI<
z%}T>S6op&Cl?&bZ0D=qMxX{;eBNmr}(r7b-*%xson9PKTNM_QF8xaH-f|35{L-j_e
zm~)*bt*-jPfzo@<ne?{PMq}X#f?!E1+mhOT{*+MWpqQb5CW6Rr3T^vX{(T6|M0mS_
zxmw7??qQ)zLDJj7d?iAg4=i#jwj<0>#aH$WOX$F%uhX_96|ZqFqwENKoKPT#@;>*N
z0eIff;{?M}XKnO|*j$u7W`G_iYz4}6m`7P3KEV(@P9$FuhMVQ5|56SfH)Ou%1tu3N
zJ1M?sTF*P1$MzC?oV3DlnH5xsVomIs3f<CYEOE;`V!jeTHoLsYp(x$Pd@bn7URW8|
z1LkVug}v2Z3QIce-mPG6CPZXBES-pcO^4{83%Y2pSWfGELf_mRUnOgJz@JxxoZsAU
rP0BkeUB~&qKz|t?-PnD6f3X<@Hvrk5{_du_00000NkvXXu0mjfQ)IQT

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/zonas.png b/app/src/main/res/drawable-xhdpi/zonas.png
new file mode 100644
index 0000000000000000000000000000000000000000..c00026fe269df08ba38497f3cb25bb57926c6ef0
GIT binary patch
literal 761
zcmV<V0tWqwP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008ONkl<ZcwX(8
zTWb?R7>45slzIeFL{L-&Q4o45df`711TO?{tfDu1Ar{*-J7KRqLZLR>nYA=_cP2|O
zte~i11yib4|5N>@7%A^g>?SjtMA!!&DD8anexbW_NU2m%P~eQpbaK?=(JjX1CnnS{
z@T14o&57Xk5v=PwOvqtsaM{pwJD1ta!a1C$=lD~}ZfgF$p~0-aeegWlh4c0VuNIv)
zG}M)2!Q3&NKUZ8ful0od*|T@U58{J55Sy?zRIC2v{9ep+PF2WeD%_P^eZV}Y&@y;6
z73$csXk5fxXHdWr2D;Yc@jJ|Q!swIw5Qepr-jSw1JG<ZazieNZer6r)6EuD&=3C>1
z>M;hHtn$WntZl(WV+6;Wl_OYdO*$kky(9BjhtRkMtV>BN64qIh3NbkTGCGNMNI8hl
zV4X><vjziDy*FTuiEBx+Ez3TFb=F`2S`{kO2hixTSdU_jH5g#h<H-rEL%cwp!a9>!
zXAK4z4b>dhA+*9osXCAzu^(7xO+~0G1{vk?4Xka!Ua8xu@djx#dx*8x&<b+^gZ|+Z
zn~DEkSSEOUo^EM@VVu$Xc^v9|-``42tYVmJ|2#fhFy9HZdekt`wX_*dVy-jvDuaQp
zrN`|s<~oIi@;ipQ(&O?o<~gSl#FsGGopKoSa)E+Y(&3hJ`4w|=!}X<JI~FASFeg{&
zzp#i+bgztX{@kgE=y<x3?i{Vxhj9L$Kx_6>Y^DqE;k-RV-*;IDcU^-^rM0zucHOL$
zYspzdW0`yuF7Cnk`U2zX1va;t6|Tl{p1!eu&@(jIUb%vE^qo$Q+kN{=eKYh$1e-<a
z(Yb<k0|mVgZ?NeNKEv??$DJV9VLGu^MWd<T6&yd1=yT1+uTJQg{0+wpJk<2%)(7yX
r>xb~~{{@~<cUhQRz~2`X6u9FzI_WE$aP7zE00000NkvXXu0mjfsGM`t

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/zonas.png b/app/src/main/res/drawable-xxhdpi/zonas.png
new file mode 100644
index 0000000000000000000000000000000000000000..925998e378227547523fd21a34b5e55724e8b1ac
GIT binary patch
literal 1141
zcmV-*1d98KP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000C$Nkl<ZcwX(B
z&5ImG7{+&!m>7@<Vmzo2zYYrK<_CBXkz8`nfU*Y#!GkDB_OL1&XRBsu5D^jfuqIi%
zt9lZX*?w!<AcztLktAx?nD{@%w*pJZQ?pEM_e^#7PXFLx4&C+CQ#IW+Rn^mTb1f|`
zEiElAJLGeH@tK|;E=iSrFLidUr_F!&D5a}X(|MT=KaKhuPht68Nwj|95pMLV(;2=>
z=$r0Z|1kPCp2gMtU{BGHPJ@f<Qk3WWv7RQ<kx8~NqJa|;-<ls`g^eLPckccbZEj(s
zCao1s|3*>6uBK=(I3%_C2OBdj$&{|Y&tC}Us3l@Oe~bs>sb4vcQggH0&+9#aFRZN{
zutA;hp`_?0W~vh%sm$+A=-{GXFjy^+Ns0N*#6_QBzDkMK=?OPvwOZ8qLzuHNq@o`%
zVC7O2W6nyja}Xz7O*D7=b_eqYM`%hhSP}88nE3MpE1o78JYGnt`3my}C5oawJRsh1
zf_aNJMLK*NeYfD_@7i<Ra(?2D{tG>W5~;!C7|K_?47p}I7(J2sJl|WUlcG3#7(Ihg
zW+7@<_~^GC3u}WzSl(C5i8+pb!Qgwm(8N%x3s0igIE2n$LLVOqMeFDl3=HEXMOV?s
zmqOzmFMZG_7)}^3(YNU1i`{~C{l*J@f`LIibrOAi;m-YHgx^@9PcSfumr`0rA76Me
zEF3=%p-(U{h>xT;-=U8$e2XRM=Ogq91_tpHZK97ag$8L|Wd{{}QXx)n96_&fbmQz<
z^zjj2u?D?@Arg8I1Nkb7uIxj<?XZt{u)ME$#y*dJ!B{G>)Zp9YC-mD6KKEC*yq}g*
zdKCSF!E32~W%i&~Qo7!Y>1FiYLMnQ#%+nEh=aJC(_1;vmR{{nrBB6}p&yzASyuPE0
zc)XB!jKsXb5juOr304ycJ$x1ORssgAi!f(paF{a~t_J!Vb5;f~0iGKXuu=)V^SRbk
z!GP6@ZeYI35h=ak2CYW&ym=b))q#%PB*(D9mC_#=tTqUhz2gK9EZH9(!(6qZr;5+4
z%c}CnJU;LO_7w~sO!43-=BXtd_HQTrw58}z%u!pq{r+L60aMoE>Z<p1wpw7fR<RLN
zlcF!N{@Qcr?|9gdDQSK_-;4D(0-4a8*qDhcF)w1hje>vne{&i&IbFi~8b@>{e_%wz
zCL+6|iS;!Skz^lZ<H|~?jT2Z;qrnE25&uG7LI1{M-`yy)!GBk@Y5!D({<{LH%v)}Q
zcc?gT#&V)4e0!XA8ttppe1d+vjt}Gbz9P@q8?jQK6bqLxAK1|wK~?@stSUs`e{;=l
z=VJMpfCp`joq^&j?G%=qB|1E4yRU?Ab&jH+vB1o+nCAyajYqcQ@Z6bYS)1pvgHFZy
zgLvLdBUSeLR_ECFUh#O#oSj5w-Q~2xR|i^JT3T9Kb`}2vm@w61QnPti00000NkvXX
Hu0mjf7bPXw

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/bg_alert_icon_info.xml b/app/src/main/res/drawable/bg_alert_icon_info.xml
new file mode 100644
index 0000000..e340c6a
--- /dev/null
+++ b/app/src/main/res/drawable/bg_alert_icon_info.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="56dp" android:height="56dp" />
+    <solid android:color="#E0F2FF" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_alert_icon_warning.xml b/app/src/main/res/drawable/bg_alert_icon_warning.xml
new file mode 100644
index 0000000..392160f
--- /dev/null
+++ b/app/src/main/res/drawable/bg_alert_icon_warning.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="56dp" android:height="56dp" />
+    <solid android:color="#FFE8E8" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_avatar_placeholder.xml b/app/src/main/res/drawable/bg_avatar_placeholder.xml
new file mode 100644
index 0000000..a33940b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_avatar_placeholder.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#E8EEFF" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_badge.xml b/app/src/main/res/drawable/bg_badge.xml
new file mode 100644
index 0000000..630a443
--- /dev/null
+++ b/app/src/main/res/drawable/bg_badge.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#FF2F46" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_bottom_nav.xml b/app/src/main/res/drawable/bg_bottom_nav.xml
new file mode 100644
index 0000000..3972b26
--- /dev/null
+++ b/app/src/main/res/drawable/bg_bottom_nav.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFFFF" />
+    <corners
+        android:topLeftRadius="28dp"
+        android:topRightRadius="28dp" />
+    <padding
+        android:left="8dp"
+        android:top="4dp"
+        android:right="8dp"
+        android:bottom="8dp" />
+    <stroke
+        android:width="1dp"
+        android:color="#E6EAF2" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_chip_muted.xml b/app/src/main/res/drawable/bg_chip_muted.xml
new file mode 100644
index 0000000..4733344
--- /dev/null
+++ b/app/src/main/res/drawable/bg_chip_muted.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#EEF2F7" />
+    <corners android:radius="14dp" />
+    <padding
+        android:left="10dp"
+        android:top="5dp"
+        android:right="10dp"
+        android:bottom="5dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_chip_success.xml b/app/src/main/res/drawable/bg_chip_success.xml
new file mode 100644
index 0000000..c5f2a6f
--- /dev/null
+++ b/app/src/main/res/drawable/bg_chip_success.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#E5F7ED" />
+    <corners android:radius="16dp" />
+    <padding
+        android:left="12dp"
+        android:top="6dp"
+        android:right="12dp"
+        android:bottom="6dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_chip_warning.xml b/app/src/main/res/drawable/bg_chip_warning.xml
new file mode 100644
index 0000000..9a62f69
--- /dev/null
+++ b/app/src/main/res/drawable/bg_chip_warning.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFF4E5" />
+    <corners android:radius="16dp" />
+    <padding
+        android:left="12dp"
+        android:top="6dp"
+        android:right="12dp"
+        android:bottom="6dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_filter_chip_active.xml b/app/src/main/res/drawable/bg_filter_chip_active.xml
new file mode 100644
index 0000000..3bd2bd4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_filter_chip_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#E7EEFF" />
+    <corners android:radius="18dp" />
+    <padding
+        android:left="18dp"
+        android:top="8dp"
+        android:right="18dp"
+        android:bottom="8dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_filter_chip_neutral.xml b/app/src/main/res/drawable/bg_filter_chip_neutral.xml
new file mode 100644
index 0000000..af180ad
--- /dev/null
+++ b/app/src/main/res/drawable/bg_filter_chip_neutral.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFFFF" />
+    <corners android:radius="18dp" />
+    <stroke
+        android:width="1dp"
+        android:color="#E3E6EF" />
+    <padding
+        android:left="18dp"
+        android:top="8dp"
+        android:right="18dp"
+        android:bottom="8dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_header_top.xml b/app/src/main/res/drawable/bg_header_top.xml
new file mode 100644
index 0000000..2860c73
--- /dev/null
+++ b/app/src/main/res/drawable/bg_header_top.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:startColor="#1B6DE8"
+        android:endColor="#2C85FF"
+        android:angle="90" />
+    <corners
+        android:bottomLeftRadius="32dp"
+        android:bottomRightRadius="32dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_map_card.xml b/app/src/main/res/drawable/bg_map_card.xml
new file mode 100644
index 0000000..bce4017
--- /dev/null
+++ b/app/src/main/res/drawable/bg_map_card.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#FFFFFFFF" />
+            <corners android:radius="36dp" />
+            <stroke
+                android:width="1dp"
+                android:color="#E1E8F4" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#F5FAFF" />
+            <corners android:radius="36dp" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/bg_map_surface.xml b/app/src/main/res/drawable/bg_map_surface.xml
new file mode 100644
index 0000000..09eba8d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_map_surface.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#F9FBFE" />
+    <corners android:radius="32dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_marker_avatar.xml b/app/src/main/res/drawable/bg_marker_avatar.xml
new file mode 100644
index 0000000..0a4ebfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_marker_avatar.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="48dp" android:height="48dp" />
+    <solid android:color="#FFFFFFFF" />
+    <stroke
+        android:width="1dp"
+        android:color="#E0E7F1" />
+    <padding android:all="8dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_marker_label.xml b/app/src/main/res/drawable/bg_marker_label.xml
new file mode 100644
index 0000000..177bad0
--- /dev/null
+++ b/app/src/main/res/drawable/bg_marker_label.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFFFF" />
+    <corners android:radius="24dp" />
+    <stroke
+        android:width="1dp"
+        android:color="#DDE6EE" />
+    <padding
+        android:left="16dp"
+        android:top="6dp"
+        android:right="16dp"
+        android:bottom="6dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_marker_user.xml b/app/src/main/res/drawable/bg_marker_user.xml
new file mode 100644
index 0000000..ad26c5b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_marker_user.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="24dp" android:height="24dp" />
+    <solid android:color="#1C68FF" />
+    <stroke
+        android:width="2dp"
+        android:color="#FFFFFFFF" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_safe_banner.xml b/app/src/main/res/drawable/bg_safe_banner.xml
new file mode 100644
index 0000000..c4c37ac
--- /dev/null
+++ b/app/src/main/res/drawable/bg_safe_banner.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#E8F8ED" />
+    <corners android:radius="18dp" />
+    <stroke
+        android:width="1dp"
+        android:color="#B8E2C8" />
+    <padding
+        android:left="16dp"
+        android:top="16dp"
+        android:right="16dp"
+        android:bottom="16dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_safe_banner_icon.xml b/app/src/main/res/drawable/bg_safe_banner_icon.xml
new file mode 100644
index 0000000..e422379
--- /dev/null
+++ b/app/src/main/res/drawable/bg_safe_banner_icon.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="36dp" android:height="36dp" />
+    <solid android:color="#E5F7ED" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_safe_zone_circle.xml b/app/src/main/res/drawable/bg_safe_zone_circle.xml
new file mode 100644
index 0000000..84381e4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_safe_zone_circle.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#5533CE7A" />
+    <stroke
+        android:width="2dp"
+        android:color="#AA6FDB92" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_status_online.xml b/app/src/main/res/drawable/bg_status_online.xml
new file mode 100644
index 0000000..82a0ee0
--- /dev/null
+++ b/app/src/main/res/drawable/bg_status_online.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="10dp" android:height="10dp" />
+    <solid android:color="#1AD873" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_zone_icon_primary.xml b/app/src/main/res/drawable/bg_zone_icon_primary.xml
new file mode 100644
index 0000000..9f28157
--- /dev/null
+++ b/app/src/main/res/drawable/bg_zone_icon_primary.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="56dp" android:height="56dp" />
+    <solid android:color="#E4ECFF" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_zone_icon_secondary.xml b/app/src/main/res/drawable/bg_zone_icon_secondary.xml
new file mode 100644
index 0000000..732f0fc
--- /dev/null
+++ b/app/src/main/res/drawable/bg_zone_icon_secondary.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="56dp" android:height="56dp" />
+    <solid android:color="#FFEFE3" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_zoom_button.xml b/app/src/main/res/drawable/bg_zoom_button.xml
new file mode 100644
index 0000000..290c213
--- /dev/null
+++ b/app/src/main/res/drawable/bg_zoom_button.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#E5EAF2" />
+            <corners android:radius="16dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#FFFFFFFF" />
+            <corners android:radius="16dp" />
+            <stroke
+                android:width="1dp"
+                android:color="#E0E7F1" />
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/ic_alert_warning.xml b/app/src/main/res/drawable/ic_alert_warning.xml
new file mode 100644
index 0000000..dbc4aae
--- /dev/null
+++ b/app/src/main/res/drawable/ic_alert_warning.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#F97316"
+        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zm0,-4h-2v-4h2v4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_battery.xml b/app/src/main/res/drawable/ic_battery.xml
new file mode 100644
index 0000000..dd592d3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_battery.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#1FB66F"
+        android:pathData="M16,4h-1V2H9v2H8a2,2 0 0,0 -2,2v12a2,2 0 0,0 2,2h8a2,2 0 0,0 2,-2V6a2,2 0 0,0 -2,-2Zm0,14H8V6h8Z" />
+    <path
+        android:fillColor="#1FB66F"
+        android:pathData="M10,11h4v4h-4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_chat_bubble.xml b/app/src/main/res/drawable/ic_chat_bubble.xml
new file mode 100644
index 0000000..abba07c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chat_bubble.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M20,2H4C2.9,2 2,2.9 2,4v18l4,-4h14c1.1,0 2,-0.9 2,-2V4C22,2.9 21.1,2 20,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
new file mode 100644
index 0000000..0f3fdb2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,4a8,8 0 1,1 -8,8H2a10,10 0 1,0 3,-7.32V4H3v5h5V7H5.26A8,8 0 0,1 12,4Zm-1,3v6h5v-2h-3V7h-2Z"
+        android:fillType="evenOdd" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_location_pin.xml b/app/src/main/res/drawable/ic_location_pin.xml
new file mode 100644
index 0000000..53ad6e9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_location_pin.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#1FB66F"
+        android:pathData="M12,2a7,7 0 0,1 7,7c0,5 -7,13 -7,13S5,14 5,9a7,7 0 0,1 7,-7Zm0,9.5a2.5,2.5 0 1,0 0,-5 2.5,2.5 0 0,0 0,5Z"
+        android:fillType="evenOdd" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_nav_alerts.xml b/app/src/main/res/drawable/ic_nav_alerts.xml
new file mode 100644
index 0000000..72f7358
--- /dev/null
+++ b/app/src/main/res/drawable/ic_nav_alerts.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,22a2,2 0 0,0 2,-2h-4a2,2 0 0,0 2,2zm6,-6v-5a6,6 0 0,0 -5,-5.91V4a1,1 0 1,0 -2,0v1.09A6,6 0 0,0 6,11v5l-2,2v1h16v-1z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_nav_home.xml b/app/src/main/res/drawable/ic_nav_home.xml
new file mode 100644
index 0000000..5655526
--- /dev/null
+++ b/app/src/main/res/drawable/ic_nav_home.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M3,10.25L12,3l9,7.25V20a1,1 0 0,1 -1,1h-5v-5h-6v5H4a1,1 0 0,1 -1,-1z"
+        android:fillType="evenOdd" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_nav_zones.xml b/app/src/main/res/drawable/ic_nav_zones.xml
new file mode 100644
index 0000000..8719a87
--- /dev/null
+++ b/app/src/main/res/drawable/ic_nav_zones.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,2a7,7 0 0,1 7,7c0,5 -7,13 -7,13S5,14 5,9a7,7 0 0,1 7,-7zm0,9.5a2.5,2.5 0 1,0 0,-5 2.5,2.5 0 0,0 0,5z"
+        android:fillType="evenOdd" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_navigation_plane.xml b/app/src/main/res/drawable/ic_navigation_plane.xml
new file mode 100644
index 0000000..d37908e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_navigation_plane.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_profile.xml b/app/src/main/res/drawable/ic_profile.xml
new file mode 100644
index 0000000..0c3737b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_profile.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,12a4,4 0 1,0 0,-8 4,4 0 0,0 0,8Zm0,2c-3.33,0 -8,1.67 -8,5v2h16v-2c0,-3.33 -4.67,-5 -8,-5Z"
+        android:fillType="evenOdd" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_signal_gps.xml b/app/src/main/res/drawable/ic_signal_gps.xml
new file mode 100644
index 0000000..79da48d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_signal_gps.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#2F6BFF"
+        android:pathData="M12,8a4,4 0 1,0 0,8 4,4 0 0,0 0,-8Zm0,6a2,2 0 1,1 0,-4 2,2 0 0,1 0,4Z" />
+    <path
+        android:fillColor="#2F6BFF"
+        android:pathData="M12,4a8,8 0 0,0 -7.75,6H2v4h2.25A8,8 0 1,0 12,4Zm0,14a6,6 0 0,1 -5.65,-4h11.3A6,6 0 0,1 12,18Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_zoom_minus.xml b/app/src/main/res/drawable/ic_zoom_minus.xml
new file mode 100644
index 0000000..f69cdb7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zoom_minus.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#1F2A37"
+        android:pathData="M5,11h14v2H5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_zoom_plus.xml b/app/src/main/res/drawable/ic_zoom_plus.xml
new file mode 100644
index 0000000..36c999e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zoom_plus.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#1F2A37"
+        android:pathData="M11,5h2v6h6v2h-6v6h-2v-6H5v-2h6Z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 06ea6ca..582ce2d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,33 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/container"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="?attr/actionBarSize">
+    android:background="#F3F6FB"
+    tools:context=".MainActivity">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/nav_host_fragment_activity_main"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:defaultNavHost="true"
+        app:layout_constraintBottom_toTopOf="@+id/nav_view"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navGraph="@navigation/mobile_navigation" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/nav_view"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
-        android:background="?android:attr/windowBackground"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:background="@drawable/bg_bottom_nav"
+        android:paddingTop="6dp"
+        android:paddingBottom="10dp"
+        app:itemIconSize="24dp"
+        app:itemIconTint="@color/bottom_nav_selector"
+        app:itemTextColor="@color/bottom_nav_selector"
+        app:labelVisibilityMode="labeled"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:menu="@menu/bottom_nav_menu" />
-
-    <fragment
-        android:id="@+id/nav_host_fragment_activity_main"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:defaultNavHost="true"
-        app:layout_constraintBottom_toTopOf="@id/nav_view"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navGraph="@navigation/mobile_navigation" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:menu="@menu/bottom_tabs" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_alerts.xml b/app/src/main/res/layout/fragment_alerts.xml
new file mode 100644
index 0000000..1c8f5e8
--- /dev/null
+++ b/app/src/main/res/layout/fragment_alerts.xml
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#F6F7FB"
+    android:paddingBottom="96dp"
+    tools:context=".ui.alerts.AlertsFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="24dp">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="190dp">
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="190dp"
+                android:background="@drawable/bg_header_top" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/alerts_header_title"
+                    android:textColor="#FFFFFF"
+                    android:textSize="26sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="@string/alerts_header_subtitle"
+                    android:textColor="#E1EAFF"
+                    android:textSize="14sp" />
+            </LinearLayout>
+        </FrameLayout>
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="-50dp"
+            android:layout_marginEnd="20dp"
+            app:cardCornerRadius="20dp"
+            app:cardElevation="4dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="18dp">
+
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:src="@drawable/ic_alert_warning" />
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="14dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/alerts_summary_title"
+                        android:textColor="#111827"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:text="@string/alerts_summary_desc"
+                        android:textColor="#6B7280" />
+                </LinearLayout>
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <LinearLayout
+            android:id="@+id/filterRow"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center_horizontal"
+            android:orientation="horizontal"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_filter_chip_active"
+                android:text="@string/alerts_filter_all"
+                android:textColor="#1C6CFF"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:background="@drawable/bg_filter_chip_neutral"
+                android:text="@string/alerts_filter_pending"
+                android:textColor="#64748B"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:background="@drawable/bg_filter_chip_neutral"
+                android:text="@string/alerts_filter_resolved"
+                android:textColor="#64748B"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/alertsList"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:orientation="vertical"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp">
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                app:cardBackgroundColor="#FFFFFF"
+                app:cardCornerRadius="22dp"
+                app:strokeColor="#E1E5EF"
+                app:strokeWidth="1dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="20dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <FrameLayout
+                            android:layout_width="56dp"
+                            android:layout_height="56dp"
+                            android:background="@drawable/bg_alert_icon_warning">
+
+                            <ImageView
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:padding="14dp"
+                                android:src="@drawable/ic_alert_warning" />
+                        </FrameLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="16dp"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/alerts_school_title"
+                                android:textColor="#111827"
+                                android:textSize="17sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:text="@string/alerts_school_desc"
+                                android:textColor="#6B7280" />
+                        </LinearLayout>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/bg_chip_warning"
+                            android:text="@string/alerts_status_attention"
+                            android:textColor="#B45309"
+                            android:textStyle="bold" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="14dp"
+                        android:gravity="space_between"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/alerts_school_time"
+                            android:textColor="#0F172A"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/alerts_school_action"
+                            android:textColor="#1C6CFF"
+                            android:textStyle="bold" />
+                    </LinearLayout>
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                app:cardBackgroundColor="#FFFFFF"
+                app:cardCornerRadius="22dp"
+                app:strokeColor="#E1E5EF"
+                app:strokeWidth="1dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="20dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <FrameLayout
+                            android:layout_width="56dp"
+                            android:layout_height="56dp"
+                            android:background="@drawable/bg_alert_icon_info">
+
+                            <ImageView
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:padding="14dp"
+                                android:src="@android:drawable/ic_dialog_info"
+                                android:tint="#1F6AEF" />
+                        </FrameLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="16dp"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/alerts_geofence_title"
+                                android:textColor="#111827"
+                                android:textSize="17sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:text="@string/alerts_geofence_desc"
+                                android:textColor="#6B7280" />
+                        </LinearLayout>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/bg_chip_success"
+                            android:text="@string/alerts_status_resolved"
+                            android:textColor="#0F7A45"
+                            android:textStyle="bold" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="14dp"
+                        android:gravity="space_between"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/alerts_geofence_time"
+                            android:textColor="#0F172A"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/alerts_geofence_action"
+                            android:textColor="#9CA3AF" />
+                    </LinearLayout>
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
+        </LinearLayout>
+    </LinearLayout>
+
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
deleted file mode 100644
index 166ab0e..0000000
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.dashboard.DashboardFragment">
-
-    <TextView
-        android:id="@+id/text_dashboard"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:textAlignment="center"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
deleted file mode 100644
index f3d9b08..0000000
--- a/app/src/main/res/layout/fragment_home.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.home.HomeFragment">
-
-    <TextView
-        android:id="@+id/text_home"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:textAlignment="center"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
new file mode 100644
index 0000000..ed97c29
--- /dev/null
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -0,0 +1,449 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#F3F6FB"
+    android:paddingBottom="90dp"
+    tools:context=".ui.map.MapFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="24dp">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="210dp">
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="210dp"
+                android:background="@drawable/bg_header_top" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/headerTitle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/header_title"
+                    android:textColor="#FFFFFF"
+                    android:textSize="28sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/headerSubtitle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="@string/header_subtitle"
+                    android:textColor="#E1EAFF"
+                    android:textSize="14sp" />
+            </LinearLayout>
+        </FrameLayout>
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/userStatusCard"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginTop="-60dp"
+            android:elevation="6dp"
+            android:translationZ="6dp"
+            app:cardCornerRadius="22dp"
+            app:cardUseCompatPadding="false">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="20dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <FrameLayout
+                        android:layout_width="60dp"
+                        android:layout_height="60dp"
+                        android:background="@drawable/bg_avatar_placeholder"
+                        android:padding="6dp">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:text="@string/status_avatar_emoji"
+                            android:textSize="26sp" />
+                    </FrameLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/status_name"
+                            android:textColor="#111827"
+                            android:textSize="18sp"
+                            android:textStyle="bold" />
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+                            <View
+                                android:layout_width="10dp"
+                                android:layout_height="10dp"
+                                android:background="@drawable/bg_status_online" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="6dp"
+                                android:text="@string/status_online"
+                                android:textColor="#1FB66F"
+                                android:textSize="14sp"
+                                android:textStyle="bold" />
+                        </LinearLayout>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="end"
+                        android:orientation="vertical">
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+                            <ImageView
+                                android:layout_width="20dp"
+                                android:layout_height="20dp"
+                                android:src="@drawable/ic_battery" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="4dp"
+                                android:text="@string/battery_percent"
+                                android:textColor="#111827"
+                                android:textStyle="bold" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="6dp"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+                            <ImageView
+                                android:layout_width="20dp"
+                                android:layout_height="20dp"
+                                android:src="@drawable/ic_signal_gps" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="4dp"
+                                android:text="@string/gps_label"
+                                android:textColor="#111827"
+                                android:textStyle="bold" />
+                        </LinearLayout>
+                    </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:background="@drawable/bg_safe_banner"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="16dp">
+
+                    <FrameLayout
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:background="@drawable/bg_safe_banner_icon">
+
+                        <ImageView
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            android:layout_gravity="center"
+                            android:src="@drawable/ic_location_pin" />
+                    </FrameLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="12dp"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/status_safe_zone_line1"
+                            android:textColor="#0B6635"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:text="@string/status_safe_zone_line2"
+                            android:textColor="#0B6635" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/mapContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="20dp"
+            app:cardCornerRadius="36dp"
+            app:cardElevation="4dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="380dp"
+                android:background="@drawable/bg_map_card"
+                android:clipToPadding="false"
+                android:padding="24dp">
+
+                <ImageView
+                    android:id="@+id/mapTexture"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:alpha="0.35"
+                    android:contentDescription="@string/header_title"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/zonas"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <View
+                    android:id="@+id/safeZone"
+                    android:layout_width="280dp"
+                    android:layout_height="280dp"
+                    android:background="@drawable/bg_safe_zone_circle"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <LinearLayout
+                    android:id="@+id/userMarker"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <View
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:background="@drawable/bg_marker_user" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:text="@string/map_marker_miguel"
+                        android:textColor="#111827"
+                        android:textStyle="bold" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/homeMarker"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginBottom="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent">
+
+                    <FrameLayout
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:background="@drawable/bg_marker_avatar">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:text="🏠"
+                            android:textSize="18sp" />
+                    </FrameLayout>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:background="@drawable/bg_marker_label"
+                        android:text="@string/map_marker_home"
+                        android:textColor="#111827"
+                        android:textStyle="bold" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/schoolMarker"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginTop="24dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    app:layout_constraintEnd_toEndOf="@+id/safeZone"
+                    app:layout_constraintTop_toTopOf="@+id/safeZone">
+
+                    <FrameLayout
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:background="@drawable/bg_marker_avatar">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:text="🏫"
+                            android:textSize="18sp" />
+                    </FrameLayout>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:background="@drawable/bg_marker_label"
+                        android:text="@string/map_marker_school"
+                        android:textColor="#111827"
+                        android:textStyle="bold" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/zoomControls"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <ImageButton
+                        android:id="@+id/zoomInButton"
+                        android:layout_width="52dp"
+                        android:layout_height="52dp"
+                        android:background="@drawable/bg_zoom_button"
+                        android:contentDescription="@string/zoom_in"
+                        android:src="@drawable/ic_zoom_plus" />
+
+                    <ImageButton
+                        android:id="@+id/zoomOutButton"
+                        android:layout_width="52dp"
+                        android:layout_height="52dp"
+                        android:layout_marginTop="10dp"
+                        android:background="@drawable/bg_zoom_button"
+                        android:contentDescription="@string/zoom_out"
+                        android:src="@drawable/ic_zoom_minus" />
+                </LinearLayout>
+
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
+                    android:id="@+id/navigationFab"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginBottom="12dp"
+                    android:contentDescription="@string/navigate"
+                    app:backgroundTint="#1F6AEF"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:srcCompat="@drawable/ic_navigation_plane" />
+
+                <FrameLayout
+                    android:id="@+id/messagesFabContainer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="12dp"
+                    android:layout_marginBottom="12dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent">
+
+                    <com.google.android.material.floatingactionbutton.FloatingActionButton
+                        android:id="@+id/messagesFab"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@string/messages"
+                        app:backgroundTint="#1DB45A"
+                        app:srcCompat="@drawable/ic_chat_bubble" />
+
+                    <TextView
+                        android:id="@+id/messagesBadge"
+                        android:layout_width="22dp"
+                        android:layout_height="22dp"
+                        android:layout_gravity="top|end"
+                        android:background="@drawable/bg_badge"
+                        android:gravity="center"
+                        android:text="@string/messages_badge"
+                        android:textColor="#FFFFFF"
+                        android:textSize="12sp"
+                        android:textStyle="bold" />
+                </FrameLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.cardview.widget.CardView>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/sosButton"
+            style="@style/Widget.MaterialComponents.Button"
+            android:layout_width="match_parent"
+            android:layout_height="64dp"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
+            android:backgroundTint="#E53935"
+            android:cornerRadius="18dp"
+            android:drawablePadding="12dp"
+            android:drawableEnd="@android:drawable/ic_menu_call"
+            android:icon="@android:drawable/ic_dialog_alert"
+            android:iconPadding="12dp"
+            android:iconTint="#FFFFFF"
+            android:text="@string/sos_button_text"
+            android:textAllCaps="true"
+            android:textColor="#FFFFFF"
+            android:textStyle="bold"
+            app:iconGravity="textStart" />
+    </LinearLayout>
+
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml
deleted file mode 100644
index d417935..0000000
--- a/app/src/main/res/layout/fragment_notifications.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.notifications.NotificationsFragment">
-
-    <TextView
-        android:id="@+id/text_notifications"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:textAlignment="center"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_zones.xml b/app/src/main/res/layout/fragment_zones.xml
new file mode 100644
index 0000000..8216d1f
--- /dev/null
+++ b/app/src/main/res/layout/fragment_zones.xml
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#F5F7FB"
+    android:paddingBottom="96dp"
+    tools:context=".ui.zones.ZonesFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="24dp">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="190dp">
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="190dp"
+                android:background="@drawable/bg_header_top" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/zones_header_title"
+                    android:textColor="#FFFFFF"
+                    android:textSize="26sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="@string/zones_header_subtitle"
+                    android:textColor="#E1EAFF"
+                    android:textSize="14sp" />
+            </LinearLayout>
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="-40dp"
+            android:layout_marginEnd="24dp"
+            android:background="@drawable/bg_safe_banner"
+            android:orientation="vertical"
+            android:padding="18dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/zones_summary_title"
+                android:textColor="#0B6635"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:text="@string/zones_summary_desc"
+                android:textColor="#0B6635" />
+        </LinearLayout>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/addZoneButton"
+            style="@style/Widget.MaterialComponents.Button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
+            android:backgroundTint="#1F6AEF"
+            android:cornerRadius="16dp"
+            android:icon="@android:drawable/ic_input_add"
+            android:iconTint="#FFFFFF"
+            android:text="@string/zones_add_button"
+            android:textAllCaps="false"
+            android:textColor="#FFFFFF"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:id="@+id/zoneList"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:orientation="vertical"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp">
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                app:cardBackgroundColor="#FFFFFF"
+                app:cardCornerRadius="24dp"
+                app:strokeColor="#E1E5EF"
+                app:strokeWidth="1dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="20dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <FrameLayout
+                            android:layout_width="56dp"
+                            android:layout_height="56dp"
+                            android:background="@drawable/bg_zone_icon_primary">
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:gravity="center"
+                                android:text="🏫"
+                                android:textSize="24sp" />
+                        </FrameLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="16dp"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/zones_school_name"
+                                android:textColor="#0F172A"
+                                android:textSize="18sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:text="@string/zones_school_desc"
+                                android:textColor="#6B7280" />
+                        </LinearLayout>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/bg_chip_success"
+                            android:text="@string/zones_status_safe"
+                            android:textColor="#0F7A45"
+                            android:textStyle="bold" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="14dp"
+                        android:gravity="space_between"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/bg_chip_muted"
+                            android:text="@string/zones_chip_entry"
+                            android:textColor="#4B5563" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/zones_last_update"
+                            android:textColor="#9CA3AF" />
+                    </LinearLayout>
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                app:cardBackgroundColor="#FFFFFF"
+                app:cardCornerRadius="24dp"
+                app:strokeColor="#E1E5EF"
+                app:strokeWidth="1dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="20dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <FrameLayout
+                            android:layout_width="56dp"
+                            android:layout_height="56dp"
+                            android:background="@drawable/bg_zone_icon_secondary">
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:gravity="center"
+                                android:text="🏠"
+                                android:textSize="24sp" />
+                        </FrameLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="16dp"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/zones_home_name"
+                                android:textColor="#0F172A"
+                                android:textSize="18sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:text="@string/zones_home_desc"
+                                android:textColor="#6B7280" />
+                        </LinearLayout>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/bg_chip_warning"
+                            android:text="@string/zones_status_attention"
+                            android:textColor="#B45309"
+                            android:textStyle="bold" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="14dp"
+                        android:gravity="space_between"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/bg_chip_muted"
+                            android:text="@string/zones_chip_exit"
+                            android:textColor="#4B5563" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/zones_home_update"
+                            android:textColor="#F97316"
+                            android:textStyle="bold" />
+                    </LinearLayout>
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
+
+        </LinearLayout>
+    </LinearLayout>
+
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
deleted file mode 100644
index fb6d040..0000000
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/navigation_home"
-        android:icon="@drawable/ic_home_black_24dp"
-        android:title="@string/title_home" />
-
-    <item
-        android:id="@+id/navigation_dashboard"
-        android:icon="@drawable/ic_dashboard_black_24dp"
-        android:title="@string/title_dashboard" />
-
-    <item
-        android:id="@+id/navigation_notifications"
-        android:icon="@drawable/ic_notifications_black_24dp"
-        android:title="@string/title_notifications" />
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/bottom_tabs.xml b/app/src/main/res/menu/bottom_tabs.xml
new file mode 100644
index 0000000..2487193
--- /dev/null
+++ b/app/src/main/res/menu/bottom_tabs.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/navigation_map"
+        android:icon="@drawable/ic_nav_home"
+        android:title="Mapa" />
+
+    <item
+        android:id="@+id/navigation_zones"
+        android:icon="@drawable/ic_nav_zones"
+        android:title="Zonas" />
+
+    <item
+        android:id="@+id/navigation_alerts"
+        android:icon="@drawable/ic_nav_alerts"
+        android:title="Alertas" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 7476ddd..5be105c 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -3,23 +3,24 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mobile_navigation"
-    app:startDestination="@+id/navigation_home">
+    app:startDestination="@id/navigation_map">
 
     <fragment
-        android:id="@+id/navigation_home"
-        android:name="com.example.pap_findu.ui.home.HomeFragment"
-        android:label="@string/title_home"
-        tools:layout="@layout/fragment_home" />
+        android:id="@+id/navigation_map"
+        android:name="com.example.pap_findu.ui.map.MapFragment"
+        android:label="Mapa"
+        tools:layout="@layout/fragment_map" />
 
     <fragment
-        android:id="@+id/navigation_dashboard"
-        android:name="com.example.pap_findu.ui.dashboard.DashboardFragment"
-        android:label="@string/title_dashboard"
-        tools:layout="@layout/fragment_dashboard" />
+        android:id="@+id/navigation_zones"
+        android:name="com.example.pap_findu.ui.zones.ZonesFragment"
+        android:label="Zonas"
+        tools:layout="@layout/fragment_zones" />
 
     <fragment
-        android:id="@+id/navigation_notifications"
-        android:name="com.example.pap_findu.ui.notifications.NotificationsFragment"
-        android:label="@string/title_notifications"
-        tools:layout="@layout/fragment_notifications" />
-</navigation>
\ No newline at end of file
+        android:id="@+id/navigation_alerts"
+        android:name="com.example.pap_findu.ui.alerts.AlertsFragment"
+        android:label="Alertas"
+        tools:layout="@layout/fragment_alerts" />
+
+</navigation>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 282a616..af94a76 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,4 +3,54 @@
     <string name="title_home">Home</string>
     <string name="title_dashboard">Dashboard</string>
     <string name="title_notifications">Notifications</string>
+    <string name="header_title">FindU</string>
+    <string name="header_subtitle">Segurança em Tempo Real</string>
+    <string name="status_name">Miguel Santos</string>
+    <string name="status_online">Online</string>
+    <string name="status_avatar_emoji">🧒</string>
+    <string name="battery_percent">85%</string>
+    <string name="gps_label">GPS</string>
+    <string name="status_safe_zone_line1">Dentro de Zona Segura</string>
+    <string name="status_safe_zone_line2">Escola Secundária - Chegada às 08:45</string>
+    <string name="map_marker_miguel">Miguel</string>
+    <string name="map_marker_home">Casa</string>
+    <string name="map_marker_school">Escola</string>
+    <string name="zoom_in">Aproximar</string>
+    <string name="zoom_out">Afastar</string>
+    <string name="navigate">Navegar</string>
+    <string name="messages">Mensagens</string>
+    <string name="messages_badge">3</string>
+    <string name="sos_button_text">BOTÃO SOS DE EMERGÊNCIA</string>
+    <string name="zones_header_title">Zonas Seguras</string>
+    <string name="zones_header_subtitle">Gerencie os locais protegidos do Miguel</string>
+    <string name="zones_summary_title">2 zonas monitorizadas</string>
+    <string name="zones_summary_desc">Todas as entradas e saídas são notificadas em tempo real.</string>
+    <string name="zones_add_button">Adicionar nova zona</string>
+    <string name="zones_school_name">Escola Secundária</string>
+    <string name="zones_school_desc">Chegada prevista 08:45</string>
+    <string name="zones_status_safe">Ativa</string>
+    <string name="zones_chip_entry">Entrada confirmada</string>
+    <string name="zones_last_update">Atualizado há 2 min</string>
+    <string name="zones_home_name">Casa</string>
+    <string name="zones_home_desc">Saída habitual 13:30</string>
+    <string name="zones_status_attention">Atenção</string>
+    <string name="zones_chip_exit">Saída inesperada</string>
+    <string name="zones_home_update">Há 5 min</string>
+    <string name="alerts_header_title">Alertas em Tempo Real</string>
+    <string name="alerts_header_subtitle">Veja rapidamente eventos críticos e resolvidos</string>
+    <string name="alerts_summary_title">2 alertas aguardando revisão</string>
+    <string name="alerts_summary_desc">Último evento há 5 minutos</string>
+    <string name="alerts_filter_all">Todos</string>
+    <string name="alerts_filter_pending">Pendentes</string>
+    <string name="alerts_filter_resolved">Resolvidos</string>
+    <string name="alerts_school_title">Saída antecipada da Escola</string>
+    <string name="alerts_school_desc">Miguel saiu da zona antes do previsto.</string>
+    <string name="alerts_status_attention">Urgente</string>
+    <string name="alerts_school_time">12:35</string>
+    <string name="alerts_school_action">Contactar</string>
+    <string name="alerts_geofence_title">Entrada confirmada na Casa</string>
+    <string name="alerts_geofence_desc">Miguel chegou dentro do horário configurado.</string>
+    <string name="alerts_status_resolved">Resolvido</string>
+    <string name="alerts_geofence_time">13:32</string>
+    <string name="alerts_geofence_action">Registado automaticamente</string>
 </resources>
\ No newline at end of file
diff --git a/assets/Captura_de_ecra__2025-11-25__a_s_14.16.14-53890ca6-7f8b-4d60-9982-58871ec14e0f.png b/assets/Captura_de_ecra__2025-11-25__a_s_14.16.14-53890ca6-7f8b-4d60-9982-58871ec14e0f.png
new file mode 100644
index 0000000..e69de29