fix: keep radar section selection stable

Author: MichalMatu

feature/radar/src/main/java/io/blueeye/feature/radar/presentation/RadarScreen.kt

@@ -63,7 +63,7 @@ fun RadarScreen(
     val showClearDialog = remember { mutableStateOf(false) }
     val showFilterDialog = remember { mutableStateOf(false) }
     val showActiveCollectionDialog = remember { mutableStateOf(false) }
-    var selectedSectionView by rememberSaveable { mutableStateOf<RadarSectionViewType?>(null) }
+    var selectedSectionView by rememberSaveable { mutableStateOf(RadarSectionViewType.ALL) }
 
     if (showClearDialog.value) {
         AlertDialog(
@@ -235,9 +235,6 @@ fun RadarScreen(
                                         onClick = { onDeviceClick(item.fingerprint) },
                                         onWatchlistClick = { device ->
                                             viewModel.toggleWatchlist(device)
-                                            if (!device.isInWatchlist) {
-                                                selectedSectionView = RadarSectionViewType.WATCHLIST
-                                            }
                                         },
                                         onCalibrationClick = { device, label ->
                                             viewModel.updateCalibrationLabel(device, label)
@@ -450,15 +447,13 @@ private fun scannerEmptyText(scannerState: ScannerRuntimeState): String {
 }
 
 private fun resolveRadarSectionView(
-    selectedSectionView: RadarSectionViewType?,
+    selectedSectionView: RadarSectionViewType,
     options: List<RadarSectionViewOption>,
 ): RadarSectionViewType =
-    selectedSectionView?.let { requestedView ->
-        RadarSectionViewMapper.resolveSelectedView(
-            requested = requestedView,
-            options = options,
-        )
-    } ?: RadarSectionViewMapper.defaultView(options)
+    RadarSectionViewMapper.resolveSelectedView(
+        requested = selectedSectionView,
+        options = options,
+    )
 
 private object RadarSectionHeaderDefaults {
     const val STATUS_CONTAINER_ALPHA = 0.12f

feature/radar/src/main/java/io/blueeye/feature/radar/presentation/RadarSectionViewMapper.kt

@@ -35,11 +35,6 @@ object RadarSectionViewMapper {
         }
     }
 
-    fun defaultView(options: List<RadarSectionViewOption>): RadarSectionViewType =
-        DEFAULT_VIEW_PRIORITY.firstOrNull { view ->
-            options.any { option -> option.type == view && option.count > 0 }
-        } ?: RadarSectionViewType.ALL
-
     fun resolveSelectedView(
         requested: RadarSectionViewType,
         options: List<RadarSectionViewOption>,
@@ -85,13 +80,4 @@ object RadarSectionViewMapper {
             RadarSectionViewType.NEARBY,
             RadarSectionViewType.UNKNOWN_NOISE,
         )
-
-    private val DEFAULT_VIEW_PRIORITY =
-        listOf(
-            RadarSectionViewType.WATCHLIST,
-            RadarSectionViewType.SUSPICIOUS,
-            RadarSectionViewType.PUBLIC_SAFETY,
-            RadarSectionViewType.NEARBY,
-            RadarSectionViewType.UNKNOWN_NOISE,
-        )
 }

feature/radar/src/test/java/io/blueeye/feature/radar/presentation/RadarSectionViewMapperTest.kt

@@ -76,36 +76,23 @@ class RadarSectionViewMapperTest {
     }
 
     @Test
-    fun `default view opens watchlist before suspicious attention section`() {
+    fun `all view remains selected when attention sections are present`() {
         val options =
             RadarSectionViewMapper.options(
                 listOf(
-                    section(RadarUiSectionType.WATCHLIST, count = 1),
                     section(RadarUiSectionType.SUSPICIOUS, count = 2),
-                    section(RadarUiSectionType.PUBLIC_SAFETY, count = 1),
-                    section(RadarUiSectionType.UNKNOWN_NOISE, count = 8),
-                ),
-            )
-
-        assertEquals(RadarSectionViewType.WATCHLIST, RadarSectionViewMapper.defaultView(options))
-    }
-
-    @Test
-    fun `default view falls back to nearby before noise`() {
-        val options =
-            RadarSectionViewMapper.options(
-                listOf(
                     section(RadarUiSectionType.NEARBY, count = 4),
                     section(RadarUiSectionType.UNKNOWN_NOISE, count = 9),
                 ),
             )
 
-        assertEquals(RadarSectionViewType.NEARBY, RadarSectionViewMapper.defaultView(options))
-    }
+        val selected =
+            RadarSectionViewMapper.resolveSelectedView(
+                requested = RadarSectionViewType.ALL,
+                options = options,
+            )
 
-    @Test
-    fun `default view is all when options are empty`() {
-        assertEquals(RadarSectionViewType.ALL, RadarSectionViewMapper.defaultView(emptyList()))
+        assertEquals(RadarSectionViewType.ALL, selected)
     }
 
     @Test