merge: reconcile master particle-wind work with origin/main redesign

Merged divergent branches (common ancestor a9d87b6). Took origin/main
as base (layer manager, recenter, quit button, GPX tracks, marine
conditions, dark theme, user position layer, active/past track layers)
and layered in particle wind simulation work:

- MapHandler: added setupWindLayer, updateWindLayer, updateWindGridLayer;
  kept their user-pos layer, follow/recenter state, active+past tracks
- WeatherRepository: kept their fetchCurrentConditions, added fetchWindGrid
- MainViewModel: kept their track/marine/summary changes, added windGrid
  StateFlow, loadWindGrid, buildGrid
- MainActivity: kept their full UI (layer picker, quit, recenter, fade
  animations), added particleWindView wiring, weatherLoaded guard,
  windArrow/windGrid observers
- activity_main.xml: took their LinearLayout redesign, added ParticleWindView
  overlay inside ConstraintLayout

https://claude.ai/code/session_01HXPjBsogsJVRwCiekDGkJX

1 files changed, 17 insertions, 1 deletions

diff --git a/android-app/app/src/androidTest/kotlin/org/terst/nav/MainActivitySmokeTest.kt b/android-app/app/src/androidTest/kotlin/org/terst/nav/MainActivitySmokeTest.kt
index fecd9cc..2d75cf4 100644
--- a/android-app/app/src/androidTest/kotlin/org/terst/nav/MainActivitySmokeTest.kt
+++ b/android-app/app/src/androidTest/kotlin/org/terst/nav/MainActivitySmokeTest.kt
@@ -24,11 +24,20 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class MainActivitySmokeTest {
 
+    companion object {
+        @org.junit.BeforeClass
+        @JvmStatic
+        fun setUpClass() {
+            NavApplication.isTesting = true
+        }
+    }
+
     @get:Rule
     val activityRule = ActivityScenarioRule(MainActivity::class.java)
 
     @Before
     fun setup() {
+        // Redundant but safe
         NavApplication.isTesting = true
     }
 
@@ -56,7 +65,7 @@ class MainActivitySmokeTest {
         onView(withText("Safety")).perform(click())
         onView(withText("Safety Dashboard")).check(matches(isDisplayed()))
         onView(withText("ACTIVATE MOB")).check(matches(isDisplayed()))
-        onView(withText("ANCHOR WATCH")).check(matches(isDisplayed()))
+        onView(withText("CONFIGURE ANCHOR WATCH")).check(matches(isDisplayed()))
     }
 
     @Test
@@ -72,6 +81,13 @@ class MainActivitySmokeTest {
     }
 
     @Test
+    fun instrumentSheet_surfacedReportButtons_areDisplayed() {
+        onView(withText("Instruments")).perform(click())
+        onView(withText("PRE-TRIP PLAN")).check(matches(isDisplayed()))
+        onView(withText("GENERATE REPORT")).check(matches(isDisplayed()))
+    }
+
+    @Test
     fun bottomNav_mapTab_returnsFromOverlay() {
         onView(withText("Safety")).perform(click())
         onView(withText("Map")).perform(click())