From df7ce09fdbaef94e7e049a197926a47d8aabe7a8 Mon Sep 17 00:00:00 2001 From: Matthew Bogner Date: Sun, 13 Oct 2024 06:23:55 -0500 Subject: [PATCH] feat: sort device list while keeping None (Disabled) at the top of the list (#1309) Signed-off-by: Matthew Bogner --- .../main/java/com/geeksville/mesh/ui/SettingsFragment.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt index 7b4b8184..26440994 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt @@ -360,7 +360,11 @@ class SettingsFragment : ScreenFragment("Settings"), Logging { if (devices == null) return var hasShownOurDevice = false - devices.values.forEach { device -> + devices.values + // Display the device list in alphabetical order while keeping the "None (Disabled)" + // device (fullAddress == n) at the top + .sortedBy { dle -> if (dle.fullAddress == "n") "0" else dle.name } + .forEach { device -> if (device.fullAddress == scanModel.selectedNotNull) hasShownOurDevice = true addDeviceButton(device, true)