2 files changed, 111 insertions, 14 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 0824abe..a13ef7f 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
@@ -1,18 +1,24 @@
 package org.terst.nav
 
 import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 
 /**
- * Smoke test: verifies MainActivity launches without crashing.
+ * Smoke tests: verify the main UI surfaces launch and respond correctly.
+ * These run on an emulator without GPS permission, so no LocationService.
  *
- * Run on an emulator/device via:
- *   ./gradlew connectedDebugAndroidTest
- *
- * In CI, requires an emulator step before the Gradle task.
+ * Run locally:  ./gradlew connectedDebugAndroidTest
+ * In CI:        smoke-test job via android-emulator-runner
  */
 @RunWith(AndroidJUnit4::class)
 class MainActivitySmokeTest {
@@ -22,14 +28,104 @@ class MainActivitySmokeTest {
         NavApplication.isTesting = true
     }
 
+    // ── Launch ─────────────────────────────────────────────────────────────
+
     @Test
     fun mainActivity_launches_withoutCrash() {
         ActivityScenario.launch(MainActivity::class.java).use { scenario ->
-            // If we reach this line the activity started without throwing.
-            // onActivity lets us assert it is in a resumed state.
             scenario.onActivity { activity ->
                 assert(!activity.isFinishing) { "MainActivity finished immediately after launch" }
             }
         }
     }
+
+    // ── Bottom nav ─────────────────────────────────────────────────────────
+
+    @Test
+    fun bottomNav_allFourTabs_areDisplayed() {
+        ActivityScenario.launch(MainActivity::class.java).use {
+            onView(withText("Map")).check(matches(isDisplayed()))
+            onView(withText("Instruments")).check(matches(isDisplayed()))
+            onView(withText("Log")).check(matches(isDisplayed()))
+            onView(withText("Safety")).check(matches(isDisplayed()))
+        }
+    }
+
+    @Test
+    fun bottomNav_safetyTab_showsSafetyDashboard() {
+        ActivityScenario.launch(MainActivity::class.java).use {
+            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()))
+        }
+    }
+
+    @Test
+    fun bottomNav_logTab_showsVoiceLogUi() {
+        ActivityScenario.launch(MainActivity::class.java).use {
+            onView(withText("Log")).perform(click())
+            onView(withContentDescription("Start voice recognition")).check(matches(isDisplayed()))
+        }
+    }
+
+    @Test
+    fun bottomNav_instrumentsTab_isSelectable() {
+        ActivityScenario.launch(MainActivity::class.java).use {
+            onView(withText("Instruments")).perform(click())
+            onView(withId(R.id.instrument_bottom_sheet)).check(matches(isDisplayed()))
+        }
+    }
+
+    @Test
+    fun bottomNav_mapTab_returnsFromOverlay() {
+        ActivityScenario.launch(MainActivity::class.java).use {
+            onView(withText("Safety")).perform(click())
+            onView(withText("Map")).perform(click())
+            onView(withId(R.id.mapView)).check(matches(isDisplayed()))
+        }
+    }
+
+    // ── Persistent FABs ────────────────────────────────────────────────────
+
+    @Test
+    fun fabMob_isAlwaysVisible() {
+        ActivityScenario.launch(MainActivity::class.java).use {
+            onView(withContentDescription("Man Overboard")).check(matches(isDisplayed()))
+        }
+    }
+
+    @Test
+    fun fabMob_remainsVisibleOnSafetyTab() {
+        ActivityScenario.launch(MainActivity::class.java).use {
+            onView(withText("Safety")).perform(click())
+            onView(withContentDescription("Man Overboard")).check(matches(isDisplayed()))
+        }
+    }
+
+    // ── Track recording ────────────────────────────────────────────────────
+
+    @Test
+    fun fabRecordTrack_isDisplayedWithRecordDescription() {
+        ActivityScenario.launch(MainActivity::class.java).use {
+            onView(withContentDescription("Record Track")).check(matches(isDisplayed()))
+        }
+    }
+
+    @Test
+    fun fabRecordTrack_togglesToStopRecording_onFirstClick() {
+        ActivityScenario.launch(MainActivity::class.java).use {
+            onView(withContentDescription("Record Track")).perform(click())
+            onView(withContentDescription("Stop Recording")).check(matches(isDisplayed()))
+        }
+    }
+
+    @Test
+    fun fabRecordTrack_togglesBackToRecord_onSecondClick() {
+        ActivityScenario.launch(MainActivity::class.java).use {
+            onView(withContentDescription("Record Track")).perform(click())
+            onView(withContentDescription("Stop Recording")).perform(click())
+            onView(withContentDescription("Record Track")).check(matches(isDisplayed()))
+        }
+    }
 }
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt b/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt
index ecaddc0..f887a43 100644
--- a/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt
+++ b/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt
@@ -88,6 +88,14 @@ class MainActivity : AppCompatActivity(), SafetyFragment.SafetyListener {
         fabRecordTrack.setOnClickListener {
             if (viewModel.isRecording.value) viewModel.stopTrack() else viewModel.startTrack()
         }
+        // Observe immediately — pure UI state, not gated on GPS permission
+        lifecycleScope.launch {
+            viewModel.isRecording.collect { recording ->
+                val icon = if (recording) R.drawable.ic_close else R.drawable.ic_track_record
+                fabRecordTrack.setImageResource(icon)
+                fabRecordTrack.contentDescription = if (recording) "Stop Recording" else "Record Track"
+            }
+        }
     }
 
     private fun setupBottomSheet() {
@@ -262,13 +270,6 @@ class MainActivity : AppCompatActivity(), SafetyFragment.SafetyListener {
                 mapHandler?.updateTrackLayer(style, points)
             }
         }
-        lifecycleScope.launch {
-            viewModel.isRecording.collect { recording ->
-                val icon = if (recording) R.drawable.ic_close else R.drawable.ic_track_record
-                fabRecordTrack.setImageResource(icon)
-                fabRecordTrack.contentDescription = if (recording) "Stop Recording" else "Record Track"
-            }
-        }
     }
 
     private fun startInstrumentSimulation(polarTable: PolarTable) {