From dde00c0f8e4571b6253a8c65598e1de7d905e742 Mon Sep 17 00:00:00 2001
From: Peter Stone <thepeterstone@gmail.com>
Date: Fri, 13 Mar 2026 23:47:20 +0000
Subject: fix: resolve MapLibre 11.x migration issues and layout/resource
 errors

---
 .../app/src/main/res/layout/activity_main.xml        | 20 +++++++++++++++++++-
 .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml   |  5 +++++
 .../main/res/mipmap-anydpi-v26/ic_launcher_round.xml |  5 +++++
 android-app/app/src/main/res/raw/mob_alarm.mp3       |  1 +
 android-app/app/src/main/res/values/colors.xml       |  9 +++++++++
 android-app/app/src/main/res/values/themes.xml       | 20 ++++++++++++++++++++
 6 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 create mode 100644 android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
 create mode 100644 android-app/app/src/main/res/raw/mob_alarm.mp3

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

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 02a94cc..746fe32 100644
--- a/android-app/app/src/main/res/layout/activity_main.xml
+++ b/android-app/app/src/main/res/layout/activity_main.xml
@@ -209,6 +209,24 @@
             app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_66"
             app:layout_constraintHorizontal_bias="0.5" />
 
+        <!-- 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" />
+
         <!-- Polar Diagram View -->
         <org.terst.nav.PolarDiagramView
             android:id="@+id/polar_diagram_view"
@@ -388,7 +406,7 @@
             android:id="@+id/mob_value_distance"
             style="@style/InstrumentPrimaryValue"
             android:layout_width="wrap_content"
-            android://layout_height="wrap_content"
+            android:layout_height="wrap_content"
             tools:text="125 m"
             android:textSize="80sp"
             app:layout_constraintBottom_toTopOf="@+id/mob_label_elapsed_time"
diff --git a/android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..52d5417
--- /dev/null
+++ b/android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/white" />
+    <foreground android:drawable="@drawable/ic_anchor" />
+</adaptive-icon>
diff --git a/android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..52d5417
--- /dev/null
+++ b/android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/white" />
+    <foreground android:drawable="@drawable/ic_anchor" />
+</adaptive-icon>
diff --git a/android-app/app/src/main/res/raw/mob_alarm.mp3 b/android-app/app/src/main/res/raw/mob_alarm.mp3
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/android-app/app/src/main/res/raw/mob_alarm.mp3
@@ -0,0 +1 @@
+
diff --git a/android-app/app/src/main/res/values/colors.xml b/android-app/app/src/main/res/values/colors.xml
index 3dce53c..7ccb28f 100644
--- a/android-app/app/src/main/res/values/colors.xml
+++ b/android-app/app/src/main/res/values/colors.xml
@@ -14,4 +14,13 @@
     <color name="instrument_background">#E61E1E1E</color> <!-- Slightly transparent dark grey -->
     <color name="mob_button_background">#FFD70000</color> <!-- High-contrast red for MOB button -->
     <color name="anchor_button_background">#3F51B5</color>
+
+    <!-- Night Vision Mode Colors -->
+    <color name="night_red_primary">#FFFF0000</color>    <!-- Bright red for primary elements -->
+    <color name="night_red_variant">#FFBB0000</color>   <!-- Slightly darker red for variants -->
+    <color name="night_on_red">#FF000000</color>         <!-- Black text on red background -->
+    <color name="night_background">#FF000000</color>    <!-- Pure black background -->
+    <color name="night_on_background">#FFFF0000</color> <!-- Bright red text on black background -->
+    <color name="night_surface">#FF110000</color>       <!-- Very dark red surface color -->
+    <color name="night_on_surface">#FFFF0000</color>    <!-- Red text on dark red surface -->
 </resources>
\ No newline at end of file
diff --git a/android-app/app/src/main/res/values/themes.xml b/android-app/app/src/main/res/values/themes.xml
index c23c0ab..52028de 100644
--- a/android-app/app/src/main/res/values/themes.xml
+++ b/android-app/app/src/main/res/values/themes.xml
@@ -14,6 +14,26 @@
         <!-- Customize your theme here. -->
     </style>
 
+    <!-- Night Vision Theme -->
+    <style name="Theme.AndroidApp.NightVision" parent="Theme.MaterialComponents.NoActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/night_red_primary</item>
+        <item name="colorPrimaryVariant">@color/night_red_variant</item>
+        <item name="colorOnPrimary">@color/night_on_red</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/night_red_primary</item>
+        <item name="colorSecondaryVariant">@color/night_red_variant</item>
+        <item name="colorOnSecondary">@color/night_on_red</item>
+        <!-- Background color -->
+        <item name="android:colorBackground">@color/night_background</item>
+        <!-- Surface color -->
+        <item name="colorSurface">@color/night_surface</item>
+        <item name="colorOnSurface">@color/night_on_surface</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">@color/night_background</item>
+        <!-- Customize your theme here. -->
+    </style>
+
     <!-- Instrument Display Styles -->
     <style name="InstrumentLabel" parent="Widget.AppCompat.TextView">
         <item name="android:layout_width">0dp</item>
-- 
cgit v1.2.3