dependencies update and code cleanup

Author: VREMSoftwareDevelopment

README.md

@@ -50,10 +50,10 @@ This is the official repository of WiFi Analyzer.
     * <img src="images/ic_lock_outline_black_18dp.png" alt="WEP/WPS" height="20">WEP/WPS
     * <img src="images/ic_lock_open_black_18dp.png" alt="Disabled" height="20">Disabled
 * Wi-Fi Standard (Requires Android OS 11+):
-    * <img src="images/ic_wifi_legacy.png" alt="802.11a/b/g" height="20">802.11a/b/g
-    * <img src="images/ic_wifi_4.png" alt="802.11n" height="20">802.11n
-    * <img src="images/ic_wifi_5.png" alt="802.11ac" height="20">802.11ac
-    * <img src="images/ic_wifi_6.png" alt="802.11ax" height="20">802.11ax
+    * 4 - 802.11n
+    * 5 - 802.11ac
+    * 6 - 802.11ax
+    * 7 - 802.11be
 
 ## How-to
 

app/build.gradle

@@ -43,11 +43,11 @@ dependencies {
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:5.11.0'
-    testImplementation 'org.mockito.kotlin:mockito-kotlin:5.2.1'
+    testImplementation 'org.mockito.kotlin:mockito-kotlin:5.3.1'
     testImplementation 'org.robolectric:robolectric:4.12.1'
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
-    testImplementation 'org.slf4j:slf4j-simple:2.0.12'
+    testImplementation 'org.slf4j:slf4j-simple:2.0.13'
     testImplementation 'org.assertj:assertj-core:3.25.3'
     // Android Test Dependencies
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

app/build.properties

@@ -1,6 +1,6 @@
 #Build Properties
-#Sun Apr 07 12:03:31 EDT 2024
-version_build=16
+#Sat Apr 13 08:45:25 EDT 2024
+version_build=17
 version_major=3
 version_minor=1
 version_patch=2

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointDetail.kt

@@ -33,8 +33,6 @@ import com.vrem.wifianalyzer.wifi.model.WiFiSignal
 
 @OpenClass
 class AccessPointDetail {
-    private val vendorShortMax = 12
-    private val vendorLongMax = 30
 
     fun makeView(
         convertView: View?,
@@ -107,9 +105,8 @@ class AccessPointDetail {
         }
 
     private fun setWiFiStandardImage(view: View, wiFiSignal: WiFiSignal) =
-        view.findViewById<ImageView>(R.id.wiFiStandardImage)?.let {
-            it.tag = wiFiSignal.extra.wiFiStandard.imageResource
-            it.setImageResource(wiFiSignal.extra.wiFiStandard.imageResource)
+        view.findViewById<TextView>(R.id.wiFiStandardValue)?.let {
+            it.text = ContextCompat.getString(view.context, wiFiSignal.extra.wiFiStandard.valueResource)
         }
 
     private fun setLevelText(view: View, wiFiSignal: WiFiSignal) =
@@ -132,7 +129,7 @@ class AccessPointDetail {
                 it.visibility = View.GONE
             } else {
                 it.visibility = View.VISIBLE
-                it.text = wiFiAdditional.vendorName.take(vendorShortMax)
+                it.text = wiFiAdditional.vendorName
             }
         }
 
@@ -152,7 +149,7 @@ class AccessPointDetail {
                 it.visibility = View.GONE
             } else {
                 it.visibility = View.VISIBLE
-                it.text = wiFiAdditional.vendorName.take(vendorLongMax)
+                it.text = wiFiAdditional.vendorName
             }
         }
 
@@ -165,7 +162,7 @@ class AccessPointDetail {
         }
 
     private fun setViewWiFiStandard(view: View, wiFiSignal: WiFiSignal) =
-        view.findViewById<TextView>(R.id.wiFiStandard)?.setText(wiFiSignal.extra.wiFiStandard.textResource)
+        view.findViewById<TextView>(R.id.wiFiStandardFull)?.setText(wiFiSignal.extra.wiFiStandard.fullResource)
 
     private fun setView80211mc(view: View, wiFiSignal: WiFiSignal) =
         view.findViewById<TextView>(R.id.flag80211mc)?.let {

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/StrengthAdapter.kt

@@ -22,7 +22,7 @@ import com.vrem.wifianalyzer.wifi.model.Strength
 
 class StrengthAdapter(selections: Set<Strength>) : EnumFilterAdapter<Strength>(selections, Strength.entries) {
     override fun color(selection: Strength): Int =
-        if (selections.contains(selection)) selection.colorResource else Strength.colorResourceDefault
+        if (selections.contains(selection)) selection.colorResource else Strength.COLOR_RESOURCE_DEFAULT
 
     override fun save(settings: Settings): Unit =
         settings.saveStrengths(selections)

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/GraphViewBuilder.kt

@@ -56,15 +56,15 @@ internal fun GridLabelRenderer.colors(themeStyle: ThemeStyle): GridLabelRenderer
 internal fun GridLabelRenderer.horizontalTitle(title: String): GridLabelRenderer {
     if (title.isNotEmpty()) {
         this.horizontalAxisTitle = title
-        this.horizontalAxisTitleTextSize = this.horizontalAxisTitleTextSize * AXIS_TEXT_SIZE_ADJUSTMENT
+        this.horizontalAxisTitleTextSize *= AXIS_TEXT_SIZE_ADJUSTMENT
     }
     return this
 }
 
 internal fun GridLabelRenderer.verticalTitle(title: String): GridLabelRenderer {
     if (title.isNotEmpty()) {
         this.verticalAxisTitle = title
-        this.verticalAxisTitleTextSize = this.verticalAxisTitleTextSize * AXIS_TEXT_SIZE_ADJUSTMENT
+        this.verticalAxisTitleTextSize *= AXIS_TEXT_SIZE_ADJUSTMENT
     }
     return this
 }
@@ -87,7 +87,7 @@ internal fun GridLabelRenderer.labels(
     this.numHorizontalLabels = numHorizontalLabels
     this.isVerticalLabelsVisible = true
     this.isHorizontalLabelsVisible = horizontalLabelsVisible
-    this.textSize = this.textSize * TEXT_SIZE_ADJUSTMENT
+    this.textSize *= TEXT_SIZE_ADJUSTMENT
     this.reloadStyles()
     return this
 }

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

@@ -33,7 +33,7 @@ enum class Strength(@DrawableRes val imageResource: Int, @ColorRes val colorReso
 
     companion object {
         @SuppressLint("NonConstantResourceId")
-        const val colorResourceDefault: Int = R.color.regular
+        const val COLOR_RESOURCE_DEFAULT: Int = R.color.regular
 
         fun calculate(level: Int): Strength {
             return entries[calculateSignalLevel(level, entries.size)]

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

@@ -27,7 +27,7 @@ data class WiFiSignalExtra(
     val fastRoaming: List<FastRoaming> = listOf()
 ) {
     fun wiFiStandardDisplay(context: Context): String =
-        context.getString(wiFiStandard.textResource)
+        context.getString(wiFiStandard.fullResource)
 
     fun fastRoamingDisplay(context: Context): String =
         fastRoaming

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

@@ -19,22 +19,21 @@ package com.vrem.wifianalyzer.wifi.model
 
 import android.net.wifi.ScanResult
 import android.os.Build
-import androidx.annotation.DrawableRes
 import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
 import com.vrem.util.buildMinVersionR
 import com.vrem.wifianalyzer.R
 
 typealias WiFiStandardId = Int
 
-enum class WiFiStandard(val wiFiStandardId: WiFiStandardId, @StringRes val textResource: Int, @DrawableRes val imageResource: Int) {
-    UNKNOWN(0, R.string.wifi_standard_unknown, R.drawable.ic_wifi_unknown),
-    LEGACY(1, R.string.wifi_standard_legacy, R.drawable.ic_wifi_legacy),
-    N(4, R.string.wifi_standard_n, R.drawable.ic_wifi_4),
-    AC(5, R.string.wifi_standard_ac, R.drawable.ic_wifi_5),
-    AX(6, R.string.wifi_standard_ax, R.drawable.ic_wifi_6),
-    AD(7, R.string.wifi_standard_ad, R.drawable.ic_wifi_unknown),
-    BE(8, R.string.wifi_standard_be, R.drawable.ic_wifi_6);
+enum class WiFiStandard(val wiFiStandardId: WiFiStandardId, @StringRes val fullResource: Int, @StringRes val valueResource: Int) {
+    UNKNOWN(0, R.string.wifi_standard_unknown, R.string.wifi_standard_unknown),
+    LEGACY(1, R.string.wifi_standard_legacy, R.string.wifi_standard_unknown),
+    N(4, R.string.wifi_standard_n, R.string.wifi_standard_value_n),
+    AC(5, R.string.wifi_standard_ac, R.string.wifi_standard_value_ac),
+    AX(6, R.string.wifi_standard_ax, R.string.wifi_standard_value_ax),
+    AD(7, R.string.wifi_standard_ad, R.string.wifi_standard_unknown),
+    BE(8, R.string.wifi_standard_be, R.string.wifi_standard_value_be);
 
     companion object {
         fun findOne(scanResult: ScanResult): WiFiStandard =

app/src/main/res/drawable/ic_brightness_low.xml

@@ -17,11 +17,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#9E9E9E"
-        android:pathData="M20,15.31L23.31,12 20,8.69V4h-4.69L12,0.69 8.69,4H4v4.69L0.69,12 4,15.31V20h4.69L12,23.31 15.31,20H20v-4.69zM12,18c-3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6 6,2.69 6,6 -2.69,6 -6,6z"/>
+        android:pathData="M20,15.31L23.31,12 20,8.69V4h-4.69L12,0.69 8.69,4H4v4.69L0.69,12 4,15.31V20h4.69L12,23.31 15.31,20H20v-4.69zM12,18c-3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6 6,2.69 6,6 -2.69,6 -6,6z" />
 </vector>