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

---
 .../compile-file-map.properties                    |   6 +
 .../merged.dir/values/values.xml                   | 123 +++++++++++++++++++++
 .../debug/packageDebugResources/merger.xml         |  53 +++++++++
 3 files changed, 182 insertions(+)
 create mode 100644 android-app/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
 create mode 100644 android-app/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
 create mode 100644 android-app/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml

(limited to 'android-app/app/build/intermediates/incremental/debug/packageDebugResources')

diff --git a/android-app/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/android-app/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
new file mode 100644
index 0000000..0eba3a1
--- /dev/null
+++ b/android-app/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -0,0 +1,6 @@
+#Fri Mar 13 23:38:58 UTC 2026
+org.terst.nav.app-main-6\:/drawable/ic_anchor.xml=/workspace/nav/android-app/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/ic_anchor.xml
+org.terst.nav.app-main-6\:/layout/activity_main.xml=/workspace/nav/android-app/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_main.xml
+org.terst.nav.app-main-6\:/mipmap-anydpi-v26/ic_launcher_round.xml=/workspace/nav/android-app/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-anydpi-v26/ic_launcher_round.xml
+org.terst.nav.app-main-6\:/mipmap-anydpi-v26/ic_launcher.xml=/workspace/nav/android-app/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-anydpi-v26/ic_launcher.xml
+org.terst.nav.app-main-6\:/raw/mob_alarm.mp3=/workspace/nav/android-app/app/build/intermediates/packaged_res/debug/packageDebugResources/raw/mob_alarm.mp3
diff --git a/android-app/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/android-app/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
new file mode 100644
index 0000000..31750e7
--- /dev/null
+++ b/android-app/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="http://schemas.android.com/tools">
+    <color name="anchor_button_background">#3F51B5</color>
+    <color name="black">#FF000000</color>
+    <color name="instrument_background">#E61E1E1E</color>
+    <color name="instrument_text_alarm">#FFFF0000</color>
+    <color name="instrument_text_normal">#FFFFFFFF</color>
+    <color name="instrument_text_stale">#FFFFFF00</color>
+    <color name="mob_button_background">#FFD70000</color>
+    <color name="night_background">#FF000000</color>
+    <color name="night_on_background">#FFFF0000</color>
+    <color name="night_on_red">#FF000000</color>
+    <color name="night_on_surface">#FFFF0000</color>
+    <color name="night_red_primary">#FFFF0000</color>
+    <color name="night_red_variant">#FFBB0000</color>
+    <color name="night_surface">#FF110000</color>
+    <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>
+    <color name="white">#FFFFFFFF</color>
+    <dimen name="instrument_margin">8dp</dimen>
+    <dimen name="instrument_padding">4dp</dimen>
+    <dimen name="text_size_instrument_label">14sp</dimen>
+    <dimen name="text_size_instrument_primary">24sp</dimen>
+    <dimen name="text_size_instrument_secondary">18sp</dimen>
+    <string name="anchor_active_dragging_format">!!! ANCHOR DRAG !!!\nAnchor Set at %1$.4f, %2$.4f\nRadius: %3$.1fm\nDistance: %4$.1fm (%5$.1fm OVER limit)</string>
+    <string name="anchor_active_format">Anchor Set at %1$.4f, %2$.4f\nRadius: %3$.1fm\nDistance: %4$.1fm (%5$.1fm from limit)</string>
+    <string name="anchor_config_title">Anchor Watch</string>
+    <string name="anchor_inactive">Anchor Watch Inactive</string>
+    <string name="app_name">AndroidApp</string>
+    <string name="button_set_anchor">SET ANCHOR</string>
+    <string name="button_stop_anchor">STOP WATCH</string>
+    <string name="fab_anchor_content_description">Toggle Anchor Watch Configuration</string>
+    <string name="fab_mob_content_description">Activate Man Overboard (MOB) alarm</string>
+    <string name="gcm_defaultSenderId" translatable="false">47890525607</string>
+    <string name="google_api_key" translatable="false">AIzaSyBSVnBEvHJ7Cv5x2CiJn2YO8XXUOAJ88wQ</string>
+    <string name="google_app_id" translatable="false">1:47890525607:android:1662a67776b9aefc9fda82</string>
+    <string name="google_crash_reporting_api_key" translatable="false">AIzaSyBSVnBEvHJ7Cv5x2CiJn2YO8XXUOAJ88wQ</string>
+    <string name="google_storage_bucket" translatable="false">nav-test-c2872.firebasestorage.app</string>
+    <string name="instrument_label_aws">AWS</string>
+    <string name="instrument_label_boatspeed">BOAT SPEED</string>
+    <string name="instrument_label_bsp">BSP</string>
+    <string name="instrument_label_cog">COG</string>
+    <string name="instrument_label_compass">COMPASS</string>
+    <string name="instrument_label_depth">DEPTH</string>
+    <string name="instrument_label_hdg">HDG</string>
+    <string name="instrument_label_polar_pct">POLAR %</string>
+    <string name="instrument_label_sog">SOG</string>
+    <string name="instrument_label_tws">TWS</string>
+    <string name="instrument_label_vmg">VMG</string>
+    <string name="instrument_label_wind">WIND</string>
+    <string name="mob_button_recovered">RECOVERED</string>
+    <string name="mob_label_distance">DISTANCE TO MOB</string>
+    <string name="mob_label_elapsed_time">ELAPSED TIME</string>
+    <string name="placeholder_aws_value">--.-</string>
+    <string name="placeholder_bsp_value">--.-</string>
+    <string name="placeholder_cog_value">---</string>
+    <string name="placeholder_depth_value">--.-</string>
+    <string name="placeholder_hdg_value">---</string>
+    <string name="placeholder_polar_value">---</string>
+    <string name="placeholder_sog_value">--.-</string>
+    <string name="placeholder_tws_value">--.-</string>
+    <string name="placeholder_vmg_value">--.-</string>
+    <string name="project_id" translatable="false">nav-test-c2872</string>
+    <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>
+        <item name="android:textSize">@dimen/text_size_instrument_label</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>
+        <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>
+    </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>
+        <item name="android:textSize">@dimen/text_size_instrument_secondary</item>
+    </style>
+    <style name="Theme.AndroidApp" 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" ns1:targetApi="l">?attr/colorPrimaryVariant</item>
+        
+    </style>
+    <style name="Theme.AndroidApp.NightVision" parent="Theme.MaterialComponents.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" ns1:targetApi="l">@color/night_background</item>
+        
+    </style>
+</resources>
\ No newline at end of file
diff --git a/android-app/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/android-app/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
new file mode 100644
index 0000000..2bc6dd9
--- /dev/null
+++ b/android-app/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3" xmlns:ns1="http://schemas.android.com/tools"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/workspace/nav/android-app/app/src/main/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/workspace/nav/android-app/app/src/main/res"><file name="ic_anchor" path="/workspace/nav/android-app/app/src/main/res/drawable/ic_anchor.xml" qualifiers="" type="drawable"/><file path="/workspace/nav/android-app/app/src/main/res/values/colors.xml" qualifiers=""><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><color name="black">#FF000000</color><color name="white">#FFFFFFFF</color><color name="instrument_text_normal">#FFFFFFFF</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><color name="night_surface">#FF110000</color><color name="night_on_surface">#FFFF0000</color><color name="night_red_variant">#FFBB0000</color><color name="night_on_background">#FFFF0000</color><color name="night_red_primary">#FFFF0000</color><color name="night_on_red">#FF000000</color><color name="night_background">#FF000000</color></file><file path="/workspace/nav/android-app/app/src/main/res/values/strings.xml" qualifiers=""><string name="app_name">AndroidApp</string><string name="instrument_label_wind">WIND</string><string name="instrument_label_aws">AWS</string><string name="instrument_label_tws">TWS</string><string name="instrument_label_compass">COMPASS</string><string name="instrument_label_hdg">HDG</string><string name="instrument_label_cog">COG</string><string name="instrument_label_boatspeed">BOAT SPEED</string><string name="instrument_label_bsp">BSP</string><string name="instrument_label_sog">SOG</string><string name="instrument_label_vmg">VMG</string><string name="instrument_label_depth">DEPTH</string><string name="instrument_label_polar_pct">POLAR %</string><string name="placeholder_aws_value">--.-</string><string name="placeholder_tws_value">--.-</string><string name="placeholder_hdg_value">---</string><string name="placeholder_cog_value">---</string><string name="placeholder_bsp_value">--.-</string><string name="placeholder_sog_value">--.-</string><string name="placeholder_vmg_value">--.-</string><string name="placeholder_depth_value">--.-</string><string name="placeholder_polar_value">---</string><string name="fab_mob_content_description">Activate Man Overboard (MOB) alarm</string><string name="fab_anchor_content_description">Toggle Anchor Watch Configuration</string><string name="mob_label_distance">DISTANCE TO MOB</string><string name="mob_label_elapsed_time">ELAPSED TIME</string><string name="mob_button_recovered">RECOVERED</string><string name="anchor_config_title">Anchor Watch</string><string name="button_set_anchor">SET ANCHOR</string><string name="button_stop_anchor">STOP WATCH</string><string name="anchor_inactive">Anchor Watch Inactive</string><string name="anchor_active_format">Anchor Set at %1$.4f, %2$.4f\nRadius: %3$.1fm\nDistance: %4$.1fm (%5$.1fm from limit)</string><string name="anchor_active_dragging_format">!!! ANCHOR DRAG !!!\nAnchor Set at %1$.4f, %2$.4f\nRadius: %3$.1fm\nDistance: %4$.1fm (%5$.1fm OVER limit)</string></file><file path="/workspace/nav/android-app/app/src/main/res/values/themes.xml" qualifiers=""><style name="Theme.AndroidApp" 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" ns1:targetApi="l">?attr/colorPrimaryVariant</item>
+        
+    </style><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>
+        <item name="android:textSize">@dimen/text_size_instrument_label</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>
+        <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>
+    </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>
+        <item name="android:textSize">@dimen/text_size_instrument_secondary</item>
+    </style><style name="Theme.AndroidApp.NightVision" parent="Theme.MaterialComponents.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" ns1:targetApi="l">@color/night_background</item>
+        
+    </style></file><file path="/workspace/nav/android-app/app/src/main/res/values/dimens.xml" qualifiers=""><dimen name="text_size_instrument_primary">24sp</dimen><dimen name="text_size_instrument_secondary">18sp</dimen><dimen name="text_size_instrument_label">14sp</dimen><dimen name="instrument_margin">8dp</dimen><dimen name="instrument_padding">4dp</dimen></file><file name="ic_launcher" path="/workspace/nav/android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" qualifiers="anydpi-v26" type="mipmap"/><file name="ic_launcher_round" path="/workspace/nav/android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" qualifiers="anydpi-v26" type="mipmap"/><file name="activity_main" path="/workspace/nav/android-app/app/src/main/res/layout/activity_main.xml" qualifiers="" type="layout"/><file name="mob_alarm" path="/workspace/nav/android-app/app/src/main/res/raw/mob_alarm.mp3" qualifiers="" type="raw"/></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/workspace/nav/android-app/app/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/workspace/nav/android-app/app/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/workspace/nav/android-app/app/build/generated/res/resValues/debug"/><source path="/workspace/nav/android-app/app/build/generated/res/processDebugGoogleServices"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/workspace/nav/android-app/app/build/generated/res/resValues/debug"/><source path="/workspace/nav/android-app/app/build/generated/res/processDebugGoogleServices"><file path="/workspace/nav/android-app/app/build/generated/res/processDebugGoogleServices/values/values.xml" qualifiers=""><string name="gcm_defaultSenderId" translatable="false">47890525607</string><string name="google_api_key" translatable="false">AIzaSyBSVnBEvHJ7Cv5x2CiJn2YO8XXUOAJ88wQ</string><string name="google_app_id" translatable="false">1:47890525607:android:1662a67776b9aefc9fda82</string><string name="google_crash_reporting_api_key" translatable="false">AIzaSyBSVnBEvHJ7Cv5x2CiJn2YO8XXUOAJ88wQ</string><string name="google_storage_bucket" translatable="false">nav-test-c2872.firebasestorage.app</string><string name="project_id" translatable="false">nav-test-c2872</string></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="res-processDebugGoogleServices$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="res-processDebugGoogleServices" generated-set="res-processDebugGoogleServices$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
\ No newline at end of file
-- 
cgit v1.2.3