2 files changed, 12 insertions, 10 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 a4453be..7ce417d 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
@@ -303,14 +303,6 @@ class MainActivity : AppCompatActivity(), SafetyFragment.SafetyListener {
             }
         }
 
-        // "Saved Tracks" button in the instrument sheet
-        findViewById<View>(R.id.btn_saved_tracks).setOnClickListener {
-            showOverlay(SavedTracksFragment())
-            bottomSheetBehavior.isHideable = true
-            bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
-            // Note: do NOT set selectedItemId here — it triggers the nav listener
-            // which calls hideOverlays(), immediately undoing showOverlay().
-        }
     }
 
     /** Updates all static unit label TextViews to match current [unitPrefs]. */
@@ -435,13 +427,17 @@ class MainActivity : AppCompatActivity(), SafetyFragment.SafetyListener {
             .commit()
     }
 
+    fun showSavedTracks() {
+        showOverlay(SavedTracksFragment())
+    }
+
     internal fun hideOverlays() {
         fragmentContainer.visibility = View.GONE
         fabRecordTrack.visibility = View.VISIBLE
         fabLayers.visibility = View.VISIBLE
-        // fabRecenter visibility is managed by the isFollowing observer; just restore alpha
         fabRecenter.alpha = 1f
-        // Re-apply cached conditions in case they arrived while the overlay was covering the sheet
+        bottomSheetBehavior.isHideable = false
+        bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
         lastConditions?.let { applyConditions(it) }
     }
 
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/ui/voicelog/VoiceLogFragment.kt b/android-app/app/src/main/kotlin/org/terst/nav/ui/voicelog/VoiceLogFragment.kt
index ab30d96..105057c 100644
--- a/android-app/app/src/main/kotlin/org/terst/nav/ui/voicelog/VoiceLogFragment.kt
+++ b/android-app/app/src/main/kotlin/org/terst/nav/ui/voicelog/VoiceLogFragment.kt
@@ -23,9 +23,11 @@ import com.google.android.material.button.MaterialButton
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.textfield.TextInputEditText
 import kotlinx.coroutines.launch
+import org.terst.nav.MainActivity
 import org.terst.nav.R
 import org.terst.nav.logbook.VoiceLogState
 import org.terst.nav.logbook.VoiceLogViewModel
+import org.terst.nav.track.SavedTracksFragment
 import java.io.File
 import java.io.FileOutputStream
 import java.util.Locale
@@ -124,6 +126,10 @@ class VoiceLogFragment : Fragment() {
                 .commit()
         }
 
+        view.findViewById<MaterialButton>(R.id.btn_saved_tracks).setOnClickListener {
+            (requireActivity() as MainActivity).showSavedTracks()
+        }
+
         viewLifecycleOwner.lifecycleScope.launch {
             viewModel.state.collect { state -> renderState(state) }
         }