2 files changed, 6 insertions, 15 deletions
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 bbc9853..d0b0e58 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
@@ -159,16 +159,7 @@ class MainActivity : AppCompatActivity(), SafetyFragment.SafetyListener {
             polarDiagramView = findViewById(R.id.polar_diagram_view)
         )
         
-        anchorWatchHandler = AnchorWatchHandler(
-            context = this,
-            container = findViewById(R.id.anchor_config_container) ?: FrameLayout(this), // stub for now
-            statusText = findViewById(R.id.anchor_status_text) ?: android.widget.TextView(this),
-            radiusText = findViewById(R.id.anchor_radius_text) ?: android.widget.TextView(this),
-            buttonDecrease = findViewById(R.id.button_decrease_radius) ?: android.widget.Button(this),
-            buttonIncrease = findViewById(R.id.button_increase_radius) ?: android.widget.Button(this),
-            buttonSet = findViewById(R.id.button_set_anchor) ?: android.widget.Button(this),
-            buttonStop = findViewById(R.id.button_stop_anchor) ?: android.widget.Button(this)
-        )
+        // anchorWatchHandler is initialized when the anchor config UI is available
 
         val mockPolarTable = createMockPolarTable()
         findViewById<PolarDiagramView>(R.id.polar_diagram_view).setPolarTable(mockPolarTable)
@@ -242,7 +233,7 @@ class MainActivity : AppCompatActivity(), SafetyFragment.SafetyListener {
         }
         lifecycleScope.launch {
             LocationService.anchorWatchState.collect { state ->
-                safetyFragment.updateAnchorStatus(if (state.isActive) "Active: ${state.radiusM}m" else "Inactive")
+                safetyFragment.updateAnchorStatus(if (state.isActive) "Active: ${state.watchCircleRadiusMeters}m" else "Inactive")
             }
         }
     }
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/ui/InstrumentHandler.kt b/android-app/app/src/main/kotlin/org/terst/nav/ui/InstrumentHandler.kt
index 63c6165..2f72153 100644
--- a/android-app/app/src/main/kotlin/org/terst/nav/ui/InstrumentHandler.kt
+++ b/android-app/app/src/main/kotlin/org/terst/nav/ui/InstrumentHandler.kt
@@ -21,8 +21,8 @@ class InstrumentHandler(
     private val valueDepth: TextView,
     private val valuePolarPct: TextView,
     private val valueBaro: TextView,
-    private val labelTrend: TextView,
-    private val barometerTrendView: BarometerTrendView,
+    private val labelTrend: TextView?,
+    private val barometerTrendView: BarometerTrendView?,
     private val polarDiagramView: PolarDiagramView
 ) {
     /**
@@ -51,7 +51,7 @@ class InstrumentHandler(
         depth?.let { valueDepth.text = it }
         polarPct?.let { valuePolarPct.text = it }
         baro?.let { valueBaro.text = it }
-        trend?.let { labelTrend.text = it }
+        trend?.let { labelTrend?.text = it }
     }
 
     /**
@@ -65,6 +65,6 @@ class InstrumentHandler(
      * Updates the barometer trend chart.
      */
     fun updateBarometerTrend(history: List<BarometerReading>) {
-        barometerTrendView.setHistory(history)
+        barometerTrendView?.setHistory(history)
     }
 }