Add sort by Wi-Fi Standard option to AccessPoints view

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/SortBy.kt

@@ -36,10 +36,17 @@ fun sortByChannel(): Comparator<WiFiDetail> =
 fun sortByDefault(): Comparator<WiFiDetail> =
     compareBy<WiFiDetail> { it.wiFiIdentifier.ssid }.thenBy { it.wiFiIdentifier.bssid }
 
+fun sortByStandard(): Comparator<WiFiDetail> =
+    compareByDescending<WiFiDetail> { it.wiFiSignal.extra.wiFiStandard.wiFiStandardId }
+        .thenByDescending { it.wiFiSignal.level }
+        .thenBy { it.wiFiIdentifier.ssid }
+        .thenBy { it.wiFiIdentifier.bssid }
+
 enum class SortBy(
     val sort: Comparator<WiFiDetail>,
 ) {
     STRENGTH(sortByStrength()),
     SSID(sortBySSID()),
     CHANNEL(sortByChannel()),
+    STANDARD(sortByStandard()),
 }

app/src/main/res/values/arrays.xml

@@ -35,13 +35,15 @@
     <string-array name="sort_by_index_array" translatable="false">
         <item>0</item>
         <item>1</item>
-        <item>2</item>
+	<item>2</item>
+	<item>3</item>
     </string-array>
 
     <string-array name="sort_by_array">
         <item>@string/sort_by_signal_strength</item>
         <item>@string/sort_by_ssid</item>
-        <item>@string/sort_by_channel</item>
+	<item>@string/sort_by_channel</item>
+	<item>@string/sort_by_standard</item>
     </string-array>
 
     <string-array name="connection_view_index_array" translatable="false">

app/src/main/res/values/strings.xml

@@ -171,6 +171,7 @@
     <string name="security_wps" translatable="false">"WPS"</string>
     <string name="selected_menu_key" translatable="false">"selected_menu"</string>
     <string name="sort_by_channel">"Channel"</string>
+    <string name="sort_by_standard" translatable="false">"Standard"</string>
     <string name="sort_by_default" translatable="false">"0"</string>
     <string name="sort_by_key" translatable="false">"sort_by"</string>
     <string name="sort_by_signal_strength">"Signal Strength"</string>

app/src/test/kotlin/com/vrem/wifianalyzer/wifi/model/SortByTest.kt

@@ -24,15 +24,16 @@ class SortByTest {
     @Test
     fun sortBy() {
         assertThat(SortBy.entries)
-            .hasSize(3)
-            .containsExactly(SortBy.STRENGTH, SortBy.SSID, SortBy.CHANNEL)
+            .hasSize(4)
+            .containsExactly(SortBy.STRENGTH, SortBy.SSID, SortBy.CHANNEL, SortBy.STANDARD)
     }
 
     @Test
     fun sortByOrdinal() {
         assertThat(SortBy.STRENGTH.ordinal).isEqualTo(0)
         assertThat(SortBy.SSID.ordinal).isEqualTo(1)
         assertThat(SortBy.CHANNEL.ordinal).isEqualTo(2)
+        assertThat(SortBy.STANDARD.ordinal).isEqualTo(3)
     }
 
     @Test
@@ -49,5 +50,9 @@ class SortByTest {
             SortBy.CHANNEL.sort.javaClass
                 .isInstance(sortByChannel()),
         ).isTrue
+        assertThat(
+            SortBy.STANDARD.sort.javaClass
+                .isInstance(sortByStandard()),
+        ).isTrue
     }
 }