From 77892d354eda07d98e2dfa5d00fca1ed1f808d8b Mon Sep 17 00:00:00 2001
From: Peter Stone <thepeterstone@gmail.com>
Date: Mon, 23 Mar 2026 04:16:32 +0000
Subject: feat: refactor UI to BottomNavigationView with Safety and Doc
 fragments

Replace FAB-based navigation with a 4-tab BottomNavigationView (Map,
Instruments, Log, Safety). Instruments use a collapsible bottom sheet;
Log and Safety display as full-screen overlay fragments.

- Add SafetyFragment with MOB and Anchor Watch controls
- Add DocFragment for in-app markdown help (Markwon: core, tables, images)
- Add layout_instruments_sheet with 3x3 instrument grid and PolarDiagramView
- Add fragment_safety and fragment_doc layouts
- Add vector drawables: ic_map, ic_instruments, ic_log, ic_safety, ic_close
- Update activity_main.xml to CoordinatorLayout with bottom sheet + overlay
- Fix: set isHideable=true before STATE_HIDDEN to avoid silent no-op from
  behavior_hideable=false default; restore false on Map/Instruments tabs

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 android-app/app/src/main/res/drawable/ic_close.xml |  10 +
 .../app/src/main/res/drawable/ic_instruments.xml   |   9 +
 android-app/app/src/main/res/drawable/ic_log.xml   |   9 +
 android-app/app/src/main/res/drawable/ic_map.xml   |   9 +
 .../app/src/main/res/drawable/ic_safety.xml        |   9 +
 .../app/src/main/res/layout/activity_main.xml      | 550 ++-------------------
 .../app/src/main/res/layout/fragment_doc.xml       |  36 ++
 .../app/src/main/res/layout/fragment_safety.xml    | 107 ++++
 .../main/res/layout/layout_instruments_sheet.xml   | 166 +++++++
 .../app/src/main/res/menu/bottom_nav_menu.xml      |  18 +-
 android-app/app/src/main/res/values/colors.xml     |  57 ++-
 android-app/app/src/main/res/values/themes.xml     |  81 +--
 12 files changed, 485 insertions(+), 576 deletions(-)
 create mode 100644 android-app/app/src/main/res/drawable/ic_close.xml
 create mode 100644 android-app/app/src/main/res/drawable/ic_instruments.xml
 create mode 100644 android-app/app/src/main/res/drawable/ic_log.xml
 create mode 100644 android-app/app/src/main/res/drawable/ic_map.xml
 create mode 100644 android-app/app/src/main/res/drawable/ic_safety.xml
 create mode 100644 android-app/app/src/main/res/layout/fragment_doc.xml
 create mode 100644 android-app/app/src/main/res/layout/fragment_safety.xml
 create mode 100644 android-app/app/src/main/res/layout/layout_instruments_sheet.xml

(limited to 'android-app/app/src/main/res')

diff --git a/android-app/app/src/main/res/drawable/ic_close.xml b/android-app/app/src/main/res/drawable/ic_close.xml
new file mode 100644
index 0000000..16d6d37
--- /dev/null
+++ b/android-app/app/src/main/res/drawable/ic_close.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/android-app/app/src/main/res/drawable/ic_instruments.xml b/android-app/app/src/main/res/drawable/ic_instruments.xml
new file mode 100644
index 0000000..9ba6fad
--- /dev/null
+++ b/android-app/app/src/main/res/drawable/ic_instruments.xml
@@ -0,0 +1,9 @@
+<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="@android:color/white"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12.5,7h-1v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
+</vector>
diff --git a/android-app/app/src/main/res/drawable/ic_log.xml b/android-app/app/src/main/res/drawable/ic_log.xml
new file mode 100644
index 0000000..cd3a27c
--- /dev/null
+++ b/android-app/app/src/main/res/drawable/ic_log.xml
@@ -0,0 +1,9 @@
+<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="@android:color/white"
+      android:pathData="M14,2H6C4.9,2 4.01,2.9 4.01,4L4,20c0,1.1 0.89,2 1.99,2H18c1.1,0 2,-0.9 2,-2V8l-6,-6zM18,20H6V4h7v5h5v11z"/>
+</vector>
diff --git a/android-app/app/src/main/res/drawable/ic_map.xml b/android-app/app/src/main/res/drawable/ic_map.xml
new file mode 100644
index 0000000..d17e9cd
--- /dev/null
+++ b/android-app/app/src/main/res/drawable/ic_map.xml
@@ -0,0 +1,9 @@
+<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="@android:color/white"
+      android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
+</vector>
diff --git a/android-app/app/src/main/res/drawable/ic_safety.xml b/android-app/app/src/main/res/drawable/ic_safety.xml
new file mode 100644
index 0000000..8d4477d
--- /dev/null
+++ b/android-app/app/src/main/res/drawable/ic_safety.xml
@@ -0,0 +1,9 @@
+<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="@android:color/white"
+      android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12V5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94V12H5V6.3l7,-3.11v8.8z"/>
+</vector>
diff --git a/android-app/app/src/main/res/layout/activity_main.xml b/android-app/app/src/main/res/layout/activity_main.xml
index 54ad0cd..c841fc3 100644
--- a/android-app/app/src/main/res/layout/activity_main.xml
+++ b/android-app/app/src/main/res/layout/activity_main.xml
@@ -1,330 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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=".MainActivity">
 
-    <org.maplibre.android.maps.MapView
-        android:id="@+id/mapView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <!-- Instrument Display Container -->
+    <!-- Main Content Area -->
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/instrument_display_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/instrument_background"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <!-- Guidelines for a 3x2 grid-like layout (6 sections) -->
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline_vertical_33"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_percent="0.33" />
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline_vertical_66"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_percent="0.66" />
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline_horizontal_50"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.5" />
-
-        <!-- Wind Instrument -->
-        <TextView
-            android:id="@+id/label_wind"
-            style="@style/InstrumentLabel"
-            android:text="@string/instrument_label_wind"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/value_aws"
-            style="@style/InstrumentPrimaryValue"
-            tools:text="--.-"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/label_wind"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/label_aws"
-            style="@style/InstrumentSecondaryLabel"
-            android:text="@string/instrument_label_aws"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/value_aws"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/value_tws"
-            style="@style/InstrumentPrimaryValue"
-            tools:text="--.-"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/label_aws"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/label_tws"
-            style="@style/InstrumentSecondaryLabel"
-            android:text="@string/instrument_label_tws"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/value_tws"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintHorizontal_bias="0.5" />
-
-        <!-- Compass Instrument -->
-        <TextView
-            android:id="@+id/label_compass"
-            style="@style/InstrumentLabel"
-            android:text="@string/instrument_label_compass"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_66"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/value_hdg"
-            style="@style/InstrumentPrimaryValue"
-            tools:text="---"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintTop_toBottomOf="@+id/label_compass"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_66"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/label_hdg"
-            style="@style/InstrumentSecondaryLabel"
-            android:text="@string/instrument_label_hdg"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintTop_toBottomOf="@+id/value_hdg"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_66"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/value_cog"
-            style="@style/InstrumentPrimaryValue"
-            tools:text="---"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintTop_toBottomOf="@+id/label_hdg"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_66"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/label_cog"
-            style="@style/InstrumentSecondaryLabel"
-            android:text="@string/instrument_label_cog"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintTop_toBottomOf="@+id/value_cog"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_66"
-            app:layout_constraintHorizontal_bias="0.5" />
-
-        <!-- Boat Speed Instrument -->
-        <TextView
-            android:id="@+id/label_boatspeed"
-            style="@style/InstrumentLabel"
-            android:text="@string/instrument_label_boatspeed"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_66"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/value_bsp"
-            style="@style/InstrumentPrimaryValue"
-            tools:text="--.-"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_66"
-            app:layout_constraintTop_toBottomOf="@+id/label_boatspeed"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/label_bsp"
-            style="@style/InstrumentSecondaryLabel"
-            android:text="@string/instrument_label_bsp"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_66"
-            app:layout_constraintTop_toBottomOf="@+id/value_bsp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/value_sog"
-            style="@style/InstrumentPrimaryValue"
-            tools:text="--.-"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_66"
-            app:layout_constraintTop_toBottomOf="@+id/label_bsp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/label_sog"
-            style="@style/InstrumentSecondaryLabel"
-            android:text="@string/instrument_label_sog"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_66"
-            app:layout_constraintTop_toBottomOf="@+id/value_sog"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5" />
-
-        <!-- VMG Instrument -->
-        <TextView
-            android:id="@+id/label_vmg"
-            style="@style/InstrumentLabel"
-            android:text="@string/instrument_label_vmg"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/guideline_horizontal_50"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/value_vmg"
-            style="@style/InstrumentPrimaryValue"
-            tools:text="--.-"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/label_vmg"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintHorizontal_bias="0.5" />
-
-        <!-- Depth Instrument -->
-        <TextView
-            android:id="@+id/label_depth"
-            style="@style/InstrumentLabel"
-            android:text="@string/instrument_label_depth"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintTop_toTopOf="@+id/guideline_horizontal_50"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_66"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/value_depth"
-            style="@style/InstrumentPrimaryValue"
-            tools:text="--.-"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintTop_toBottomOf="@+id/label_depth"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_66"
-            app:layout_constraintHorizontal_bias="0.5" />
+        android:layout_marginBottom="56dp"> <!-- Space for BottomNav -->
 
-        <!-- Polar % Instrument -->
-        <TextView
-            android:id="@+id/label_polar_pct"
-            style="@style/InstrumentLabel"
-            android:text="@string/instrument_label_polar_pct"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_66"
-            app:layout_constraintTop_toTopOf="@+id/guideline_horizontal_50"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/value_polar_pct"
-            style="@style/InstrumentPrimaryValue"
-            android:text="@string/placeholder_polar_value"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_66"
-            app:layout_constraintTop_toBottomOf="@+id/label_polar_pct"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5" />
+        <org.maplibre.android.maps.MapView
+            android:id="@+id/mapView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
-        <!-- Barometer Instrument -->
-        <TextView
-            android:id="@+id/label_barometer"
-            style="@style/InstrumentLabel"
-            android:text="@string/instrument_label_barometer"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/value_vmg"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/value_baro"
-            style="@style/InstrumentPrimaryValue"
-            tools:text="1013.2"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/label_barometer"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintHorizontal_bias="0.5" />
-        <TextView
-            android:id="@+id/label_baro_unit"
-            style="@style/InstrumentSecondaryLabel"
-            android:text="hPa"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/value_baro"
-            app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintHorizontal_bias="0.5" />
-
-        <!-- Barometer Trend -->
-        <TextView
-            android:id="@+id/label_trend"
-            style="@style/InstrumentLabel"
-            android:text="@string/instrument_label_trend"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintTop_toBottomOf="@+id/value_depth"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5" />
-        
-        <org.terst.nav.BarometerTrendView
-            android:id="@+id/barometer_trend_view"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintStart_toStartOf="@+id/guideline_vertical_33"
-            app:layout_constraintTop_toBottomOf="@+id/label_trend"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="@+id/label_baro_unit" />
-
-        <!-- Polar Diagram View -->
-        <org.terst.nav.PolarDiagramView
-            android:id="@+id/polar_diagram_view"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="16dp"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/label_baro_unit"
-            app:layout_constraintBottom_toBottomOf="parent"
-             />
+        <!-- Overlay Fragment Container (for Log, Safety, Help) -->
+        <FrameLayout
+            android:id="@+id/fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone"
+            android:background="?attr/colorSurface" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab_tidal"
-        android:layout_width="wrap_content"
+    <!-- Collapsible Instrument Bottom Sheet -->
+    <androidx.cardview.widget.CardView
+        android:id="@+id/instrument_bottom_sheet"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:contentDescription="Toggle Tidal Current Overlay"
-        app:srcCompat="@android:drawable/ic_menu_directions"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/fab_toggle_instruments" />
+        app:behavior_hideable="false"
+        app:behavior_peekHeight="120dp"
+        app:cardElevation="16dp"
+        app:cardCornerRadius="24dp"
+        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab_toggle_instruments"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:contentDescription="Toggle Instrument Display"
-        app:srcCompat="@android:drawable/ic_menu_rotate"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        <include layout="@layout/layout_instruments_sheet" />
 
-    <!-- Anchor FAB -->
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab_anchor"
-        android:layout_width="wrap_content"
+    </androidx.cardview.widget.CardView>
+
+    <!-- Bottom Navigation -->
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/bottom_navigation"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:contentDescription="@string/fab_anchor_content_description"
-        app:srcCompat="@android:drawable/ic_menu_myplaces"
-        app:backgroundTint="@color/anchor_button_background"
-        app:layout_constraintBottom_toTopOf="@+id/fab_mob"
-        app:layout_constraintStart_toStartOf="parent" />
+        android:layout_gravity="bottom"
+        android:background="?attr/colorSurface"
+        app:menu="@menu/bottom_nav_menu" />
 
+    <!-- Persistent MOB Button (Crucial for safety, always on top) -->
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab_mob"
         android:layout_width="wrap_content"
@@ -332,211 +59,10 @@
         android:layout_margin="16dp"
         android:clickable="true"
         android:focusable="true"
-        android:contentDescription="@string/fab_mob_content_description"
+        android:contentDescription="Man Overboard"
         app:srcCompat="@android:drawable/ic_dialog_alert"
         app:backgroundTint="@color/mob_button_background"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
-    <!-- Anchor Configuration Container -->
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/anchor_config_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#DD212121"
-        android:padding="16dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
-
-        <TextView
-            android:id="@+id/anchor_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/anchor_config_title"
-            android:textColor="@android:color/white"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/anchor_status_text"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:textColor="@android:color/white"
-            android:textSize="16sp"
-            tools:text="Anchor Inactive"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/anchor_title" />
-
-        <LinearLayout
-            android:id="@+id/radius_control_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginTop="16dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/anchor_status_text">
-
-            <Button
-                android:id="@+id/button_decrease_radius"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="-"
-                android:textSize="20sp"
-                android:minWidth="48dp"
-                android:layout_marginEnd="8dp" />
-
-            <TextView
-                android:id="@+id/anchor_radius_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@android:color/white"
-                android:textSize="18sp"
-                android:textStyle="bold"
-                tools:text="Radius: 50.0m"
-                android:gravity="center_vertical" />
-
-            <Button
-                android:id="@+id/button_increase_radius"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="+"
-                android:textSize="20sp"
-                android:minWidth="48dp"
-                android:layout_marginStart="8dp" />
-
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/button_set_anchor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/button_set_anchor"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/radius_control_layout" />
-
-        <Button
-            android:id="@+id/button_stop_anchor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/button_stop_anchor"
-            android:backgroundTint="@android:color/holo_red_dark"
-            app:layout_constraintStart_toEndOf="@+id/button_set_anchor"
-            app:layout_constraintTop_toBottomOf="@+id/radius_control_layout"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <!-- MOB Navigation Display Container -->
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/mob_navigation_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/instrument_background"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/mob_label_distance"
-            style="@style/InstrumentLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/mob_label_distance"
-            app:layout_constraintBottom_toTopOf="@+id/mob_value_distance"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintVertical_chainStyle="packed"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/mob_value_distance"
-            style="@style/InstrumentPrimaryValue"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="125 m"
-            android:textSize="80sp"
-            app:layout_constraintBottom_toTopOf="@+id/mob_label_elapsed_time"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/mob_label_distance" />
-
-        <TextView
-            android:id="@+id/mob_label_elapsed_time"
-            style="@style/InstrumentLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:text="@string/mob_label_elapsed_time"
-            app:layout_constraintBottom_toTopOf="@+id/mob_value_elapsed_time"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/mob_value_distance" />
-
-        <TextView
-            android:id="@+id/mob_value_elapsed_time"
-            style="@style/InstrumentPrimaryValue"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="00:01:23"
-            android:textSize="60sp"
-            app:layout_constraintBottom_toTopOf="@+id/mob_recovered_button"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/mob_label_elapsed_time" />
-
-        <Button
-            android:id="@+id/mob_recovered_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="64dp"
-            android:text="@string/mob_button_recovered"
-            android:paddingStart="32dp"
-            android:paddingEnd="32dp"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
-            android:textSize="24sp"
-            android:backgroundTint="@color/mob_button_background"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/mob_value_elapsed_time" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <!-- Voice Log FAB -->
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab_voice_log"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:contentDescription="Open Voice Log"
-        android:src="@android:drawable/ic_btn_speak_now"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/fab_tidal" />
-
-    <!-- Voice Log Fragment Container -->
-    <FrameLayout
-        android:id="@+id/voice_log_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/white"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_anchor="@id/bottom_navigation"
+        app:layout_anchorGravity="top|start" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/android-app/app/src/main/res/layout/fragment_doc.xml b/android-app/app/src/main/res/layout/fragment_doc.xml
new file mode 100644
index 0000000..c5ecb4f
--- /dev/null
+++ b/android-app/app/src/main/res/layout/fragment_doc.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:title="Help" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <TextView
+            android:id="@+id/doc_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="24dp"
+            android:textColor="?attr/colorOnSurface"
+            android:textSize="16sp"
+            android:lineSpacingExtra="4dp" />
+
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/android-app/app/src/main/res/layout/fragment_safety.xml b/android-app/app/src/main/res/layout/fragment_safety.xml
new file mode 100644
index 0000000..5b2397e
--- /dev/null
+++ b/android-app/app/src/main/res/layout/fragment_safety.xml
@@ -0,0 +1,107 @@
+<?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"
+    android:padding="24dp"
+    android:background="?attr/colorSurface">
+
+    <TextView
+        android:id="@+id/safety_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Safety Dashboard"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        android:textColor="?attr/colorOnSurface"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/button_help_safety"
+        style="@style/Widget.Material3.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="HELP"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <!-- MOB Section -->
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/card_mob"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        app:cardCornerRadius="16dp"
+        app:layout_constraintTop_toBottomOf="@id/safety_title">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp"
+            android:gravity="center">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="MAN OVERBOARD"
+                android:textColor="@color/md_theme_error"
+                android:textStyle="bold" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/button_mob_activate"
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:layout_marginTop="16dp"
+                android:text="ACTIVATE MOB"
+                android:textSize="20sp"
+                app:backgroundTint="@color/md_theme_error" />
+
+        </LinearLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+    <!-- Anchor Section -->
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/card_anchor"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        app:cardCornerRadius="16dp"
+        app:layout_constraintTop_toBottomOf="@id/card_mob">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="ANCHOR WATCH"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/anchor_status_summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="Status: Inactive"
+                android:textColor="?attr/colorOnSurfaceVariant" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/button_anchor_config"
+                style="@style/Widget.Material3.Button.TonalButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="CONFIGURE ANCHOR WATCH" />
+
+        </LinearLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android-app/app/src/main/res/layout/layout_instruments_sheet.xml b/android-app/app/src/main/res/layout/layout_instruments_sheet.xml
new file mode 100644
index 0000000..0a84418
--- /dev/null
+++ b/android-app/app/src/main/res/layout/layout_instruments_sheet.xml
@@ -0,0 +1,166 @@
+<?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="wrap_content"
+    android:padding="16dp"
+    android:background="?attr/colorSurface">
+
+    <View
+        android:id="@+id/drag_handle"
+        android:layout_width="40dp"
+        android:layout_height="4dp"
+        android:background="@color/md_theme_outline"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <!-- Grid of Instruments -->
+    <androidx.gridlayout.widget.GridLayout
+        android:id="@+id/instrument_grid"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        app:columnCount="3"
+        app:rowCount="3"
+        app:layout_constraintTop_toBottomOf="@id/drag_handle">
+
+        <!-- Wind: AWS -->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_columnWeight="1"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:padding="8dp">
+            <TextView style="@style/InstrumentLabel" android:text="AWS" />
+            <TextView android:id="@+id/value_aws" style="@style/InstrumentPrimaryValue" tools:text="12.5" />
+        </LinearLayout>
+
+        <!-- Compass: HDG -->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_columnWeight="1"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:padding="8dp">
+            <TextView style="@style/InstrumentLabel" android:text="HDG" />
+            <TextView android:id="@+id/value_hdg" style="@style/InstrumentPrimaryValue" tools:text="225" />
+        </LinearLayout>
+
+        <!-- Performance: BSP -->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_columnWeight="1"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:padding="8dp">
+            <TextView style="@style/InstrumentLabel" android:text="BSP" />
+            <TextView android:id="@+id/value_bsp" style="@style/InstrumentPrimaryValue" tools:text="6.2" />
+        </LinearLayout>
+
+        <!-- Wind: TWS -->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_columnWeight="1"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:padding="8dp">
+            <TextView style="@style/InstrumentLabel" android:text="TWS" />
+            <TextView android:id="@+id/value_tws" style="@style/InstrumentPrimaryValue" tools:text="15.0" />
+        </LinearLayout>
+
+        <!-- Compass: COG -->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_columnWeight="1"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:padding="8dp">
+            <TextView style="@style/InstrumentLabel" android:text="COG" />
+            <TextView android:id="@+id/value_cog" style="@style/InstrumentPrimaryValue" tools:text="230" />
+        </LinearLayout>
+
+        <!-- Performance: SOG -->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_columnWeight="1"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:padding="8dp">
+            <TextView style="@style/InstrumentLabel" android:text="SOG" />
+            <TextView android:id="@+id/value_sog" style="@style/InstrumentPrimaryValue" tools:text="6.5" />
+        </LinearLayout>
+
+        <!-- VMG -->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_columnWeight="1"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:padding="8dp">
+            <TextView style="@style/InstrumentLabel" android:text="VMG" />
+            <TextView android:id="@+id/value_vmg" style="@style/InstrumentPrimaryValue" tools:text="4.2" />
+        </LinearLayout>
+
+        <!-- Depth -->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_columnWeight="1"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:padding="8dp">
+            <TextView style="@style/InstrumentLabel" android:text="Depth" />
+            <TextView android:id="@+id/value_depth" style="@style/InstrumentPrimaryValue" tools:text="12.0" />
+        </LinearLayout>
+
+        <!-- Polar % -->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_columnWeight="1"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:padding="8dp">
+            <TextView style="@style/InstrumentLabel" android:text="Polar %" />
+            <TextView android:id="@+id/value_polar_pct" style="@style/InstrumentPrimaryValue" tools:text="95%" />
+        </LinearLayout>
+
+    </androidx.gridlayout.widget.GridLayout>
+
+    <!-- Additional Detail (Visible when expanded) -->
+    <TextView
+        android:id="@+id/label_baro"
+        style="@style/InstrumentLabel"
+        android:text="Barometer"
+        android:layout_marginTop="24dp"
+        app:layout_constraintTop_toBottomOf="@id/instrument_grid"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/value_baro"
+        style="@style/InstrumentPrimaryValue"
+        tools:text="1013.2 hPa"
+        app:layout_constraintTop_toBottomOf="@id/label_baro"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <org.terst.nav.PolarDiagramView
+        android:id="@+id/polar_diagram_view"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="24dp"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/value_baro"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android-app/app/src/main/res/menu/bottom_nav_menu.xml b/android-app/app/src/main/res/menu/bottom_nav_menu.xml
index 6922dee..b29fb08 100644
--- a/android-app/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/android-app/app/src/main/res/menu/bottom_nav_menu.xml
@@ -2,10 +2,18 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/nav_map"
-        android:icon="@android:drawable/ic_dialog_map"
-        android:title="@string/nav_map" />
+        android:icon="@drawable/ic_map"
+        android:title="Map" />
     <item
-        android:id="@+id/nav_forecast"
-        android:icon="@android:drawable/ic_dialog_info"
-        android:title="@string/nav_forecast" />
+        android:id="@+id/nav_instruments"
+        android:icon="@drawable/ic_instruments"
+        android:title="Instruments" />
+    <item
+        android:id="@+id/nav_log"
+        android:icon="@drawable/ic_log"
+        android:title="Log" />
+    <item
+        android:id="@+id/nav_safety"
+        android:icon="@drawable/ic_safety"
+        android:title="Safety" />
 </menu>
diff --git a/android-app/app/src/main/res/values/colors.xml b/android-app/app/src/main/res/values/colors.xml
index 43e0076..b380d2d 100755
--- a/android-app/app/src/main/res/values/colors.xml
+++ b/android-app/app/src/main/res/values/colors.xml
@@ -1,28 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
+    <!-- M3 Color Palette -->
+    <color name="md_theme_primary">#005FB0</color>
+    <color name="md_theme_onPrimary">#FFFFFF</color>
+    <color name="md_theme_primaryContainer">#D6E3FF</color>
+    <color name="md_theme_onPrimaryContainer">#001B3E</color>
+    
+    <color name="md_theme_secondary">#565F71</color>
+    <color name="md_theme_onSecondary">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer">#DAE2F9</color>
+    <color name="md_theme_onSecondaryContainer">#131C2C</color>
+    
+    <color name="md_theme_error">#BA1A1A</color>
+    <color name="md_theme_onError">#FFFFFF</color>
+    <color name="md_theme_errorContainer">#FFDAD6</color>
+    <color name="md_theme_onErrorContainer">#410002</color>
+    
+    <color name="md_theme_background">#FDFBFF</color>
+    <color name="md_theme_onBackground">#1A1C1E</color>
+    <color name="md_theme_surface">#FDFBFF</color>
+    <color name="md_theme_onSurface">#1A1C1E</color>
+    <color name="md_theme_surfaceVariant">#E0E2EC</color>
+    <color name="md_theme_onSurfaceVariant">#44474E</color>
+    <color name="md_theme_outline">#74777F</color>
+
+    <!-- Legacy / Functional Colors -->
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-
-    <!-- Maritime theme colors -->
-    <color name="primary">#0D47A1</color>
+    <color name="primary">#005FB0</color>
     <color name="primary_dark">#002171</color>
     <color name="accent">#FF6D00</color>
-    <color name="surface">#FFFFFF</color>
-    <color name="on_primary">#FFFFFF</color>
 
-    <!-- Colors for instrument display -->
-    <color name="instrument_text_normal">#FFFFFFFF</color>
-    <color name="instrument_text_secondary">#B3FFFFFF</color>
-    <color name="instrument_text_alarm">#FFFF0000</color>
-    <color name="instrument_text_stale">#FFFFFF00</color>
-    <color name="instrument_background">#E61E1E1E</color>
-    <color name="mob_button_background">#FFD70000</color>
-    <color name="anchor_button_background">#3F51B5</color>
+    <!-- Instrument Specific -->
+    <color name="instrument_text_normal">#1A1C1E</color>
+    <color name="instrument_text_secondary">#44474E</color>
+    <color name="instrument_text_alarm">#BA1A1A</color>
+    <color name="instrument_text_stale">#74777F</color>
+    <color name="instrument_background">#FDFBFF</color>
+    <color name="instrument_card_background">#F1F4F9</color>
+    
+    <color name="mob_button_background">#BA1A1A</color>
+    <color name="anchor_button_background">#005FB0</color>
 
     <!-- Wind overlay colors -->
     <color name="wind_arrow">#FFFFFFFF</color>
@@ -30,12 +48,11 @@
     <color name="wind_medium">#FF9800</color>
     <color name="wind_strong">#F44336</color>
 
-    <!-- Night Vision Mode Colors -->
+    <!-- Night Vision Mode (Stays Red) -->
     <color name="night_red_primary">#FFFF0000</color>
     <color name="night_red_variant">#FFBB0000</color>
     <color name="night_on_red">#FF000000</color>
     <color name="night_background">#FF000000</color>
-    <color name="night_on_background">#FFFF0000</color>
     <color name="night_surface">#FF110000</color>
     <color name="night_on_surface">#FFFF0000</color>
 </resources>
diff --git a/android-app/app/src/main/res/values/themes.xml b/android-app/app/src/main/res/values/themes.xml
index abef4b9..2281d96 100755
--- a/android-app/app/src/main/res/values/themes.xml
+++ b/android-app/app/src/main/res/values/themes.xml
@@ -1,64 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Nav" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+    <!-- Base application theme (Material 3) -->
+    <style name="Theme.Nav" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
+        
+        <item name="colorSecondary">@color/md_theme_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
+        
+        <item name="android:colorBackground">@color/md_theme_background</item>
+        <item name="colorSurface">@color/md_theme_surface</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
+        
+        <item name="colorError">@color/md_theme_error</item>
+        <item name="colorOnError">@color/md_theme_onError</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
+        
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorSurface</item>
+        <item name="android:windowLightStatusBar">true</item>
     </style>
 
-    <!-- Maritime theme (weather/forecast features) -->
-    <style name="Theme.NavApp" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="colorAccent">@color/accent</item>
-        <item name="android:statusBarColor">@color/primary_dark</item>
-    </style>
-
-    <!-- Night Vision Theme -->
-    <style name="Theme.Nav.NightVision" parent="Theme.MaterialComponents.NoActionBar">
+    <!-- Night Vision Theme (Stays Dark and Red) -->
+    <style name="Theme.Nav.NightVision" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/night_red_primary</item>
-        <item name="colorPrimaryVariant">@color/night_red_variant</item>
         <item name="colorOnPrimary">@color/night_on_red</item>
-        <item name="colorSecondary">@color/night_red_primary</item>
-        <item name="colorSecondaryVariant">@color/night_red_variant</item>
-        <item name="colorOnSecondary">@color/night_on_red</item>
         <item name="android:colorBackground">@color/night_background</item>
         <item name="colorSurface">@color/night_surface</item>
         <item name="colorOnSurface">@color/night_on_surface</item>
         <item name="android:statusBarColor" tools:targetApi="l">@color/night_background</item>
+        <item name="android:windowLightStatusBar">false</item>
     </style>
 
     <!-- Instrument Display Styles -->
-    <style name="InstrumentLabel" parent="Widget.AppCompat.TextView">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:gravity">center</item>
-        <item name="android:textColor">@color/instrument_text_normal</item>
+    <style name="InstrumentLabel" parent="android:Widget.TextView">
+        <item name="android:textColor">@color/instrument_text_secondary</item>
         <item name="android:textSize">@dimen/text_size_instrument_label</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:letterSpacing">0.1</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:paddingTop">@dimen/instrument_padding</item>
-        <item name="android:paddingBottom">@dimen/instrument_padding</item>
     </style>
 
-    <style name="InstrumentPrimaryValue" parent="Widget.AppCompat.TextView">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:gravity">center</item>
+    <style name="InstrumentPrimaryValue" parent="android:Widget.TextView">
         <item name="android:textColor">@color/instrument_text_normal</item>
         <item name="android:textSize">@dimen/text_size_instrument_primary</item>
         <item name="android:textStyle">bold</item>
+        <item name="android:includeFontPadding">false</item>
     </style>
 
-    <style name="InstrumentSecondaryLabel" parent="Widget.AppCompat.TextView">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:gravity">center</item>
-        <item name="android:textColor">@color/instrument_text_normal</item>
+    <style name="InstrumentSecondaryLabel" parent="android:Widget.TextView">
+        <item name="android:textColor">@color/instrument_text_secondary</item>
         <item name="android:textSize">@dimen/text_size_instrument_secondary</item>
     </style>
+    
+    <style name="InstrumentCard" parent="Widget.Material3.CardView.Elevated">
+        <item name="cardBackgroundColor">@color/instrument_card_background</item>
+        <item name="cardCornerRadius">12dp</item>
+        <item name="cardElevation">2dp</item>
+    </style>
 </resources>
-- 
cgit v1.2.3