Update WiFi signal strength handling and tests

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,6 +1,6 @@
 #Build Properties
-#Sat Oct 18 08:20:48 EDT 2025
-version_build=33
+#Sun Nov 02 08:13:02 EST 2025
+version_build=34
 version_major=3
 version_minor=2
 version_patch=1

app/jacoco.gradle

@@ -17,7 +17,7 @@
  */
 
 jacoco {
-    toolVersion = "0.8.13"
+    toolVersion = "0.8.14"
 }
 
 def executionPath = 'outputs/unit_test_code_coverage/debugUnitTest/testDebugUnitTest.exec'

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

@@ -131,7 +131,7 @@ class AccessPointDetail {
         wiFiSignal: WiFiSignal,
     ) = view.findViewById<TextView>(R.id.level)?.let {
         it.text = "${wiFiSignal.level}dBm"
-        it.setTextColor(ContextCompat.getColor(view.context, wiFiSignal.strength.colorResource))
+        it.setTextColor(ContextCompat.getColor(view.context, wiFiSignal.strengthColor))
     }
 
     private fun setLevelImage(
@@ -141,7 +141,7 @@ class AccessPointDetail {
         val strength = wiFiSignal.strength
         it.tag = strength.imageResource
         it.setImageResource(strength.imageResource)
-        it.setColorFilter(ContextCompat.getColor(view.context, strength.colorResource))
+        it.setColorFilter(ContextCompat.getColor(view.context, wiFiSignal.strengthColor))
     }
 
     private fun setViewVendorShort(

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

@@ -35,8 +35,21 @@ enum class Strength(
     fun weak(): Boolean = ZERO == this
 
     companion object {
-        fun calculate(level: Int): Strength = entries[calculateSignalLevel(level, entries.size)]
+        fun fromRssi(rssi: Int): Strength = entries[calculateSignalLevel(rssi, entries.size)]
 
         fun reverse(strength: Strength): Strength = entries[entries.size - strength.ordinal - 1]
+
+        /**
+         * RSSI thresholds are based on common Wi-Fi signal quality guidelines:
+         * - -67 dBm or higher: Excellent signal (mapped to [R.color.success])
+         * - -70 dBm to -68 dBm: Good signal (mapped to [R.color.warning])
+         * - Below -70 dBm: Weak or poor signal (mapped to [R.color.error])
+         */
+        fun colorForRssi(rssi: Int): Int =
+            when {
+                rssi >= -67 -> R.color.success
+                rssi >= -70 -> R.color.warning
+                else -> R.color.error
+            }
     }
 }

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

@@ -64,7 +64,9 @@ data class WiFiSignal(
 
     val centerWiFiChannel: WiFiChannel get() = wiFiBand.wiFiChannels.wiFiChannelByFrequency(centerFrequency)
 
-    val strength: Strength get() = Strength.calculate(level)
+    val strength: Strength get() = Strength.fromRssi(level)
+
+    val strengthColor: Int get() = Strength.colorForRssi(level)
 
     val distance: String get() =
         String.format(Locale.getDefault(), "~%.1fm", calculateDistance(primaryFrequency, level))

app/src/test/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointDetailTest.kt

@@ -22,6 +22,7 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.vrem.util.EMPTY
 import com.vrem.wifianalyzer.MainContextHelper.INSTANCE
@@ -340,6 +341,18 @@ class AccessPointDetailTest {
         validateTextViewValue(actual, expectedFastRoaming, R.id.fastRoaming)
     }
 
+    @Test
+    fun makeViewSetsCorrectLevelTextColor() {
+        // Arrange
+        val wiFiDetail = withWiFiDetail()
+        val expectedColor = ContextCompat.getColor(mainActivity, wiFiDetail.wiFiSignal.strengthColor)
+        // Act
+        val view = fixture.makeView(null, null, wiFiDetail)
+        val levelTextView = view.findViewById<TextView>(R.id.level)
+        // Assert
+        assertThat(levelTextView.currentTextColor).isEqualTo(expectedColor)
+    }
+
     private fun withWiFiDetail(
         ssid: String = "SSID",
         wiFiAdditional: WiFiAdditional = WiFiAdditional.EMPTY,

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

@@ -78,7 +78,7 @@ class StrengthTest {
     }
 
     @Test
-    fun calculate() {
+    fun fromRssi() {
         val testCases =
             listOf(
                 -89 to Strength.ZERO,
@@ -92,7 +92,7 @@ class StrengthTest {
                 0 to Strength.FOUR,
             )
         testCases.forEach { (input, expected) ->
-            assertThat(Strength.calculate(input)).isEqualTo(expected)
+            assertThat(Strength.fromRssi(input)).isEqualTo(expected)
         }
     }
 
@@ -103,4 +103,26 @@ class StrengthTest {
             assertThat(Strength.reverse(strength)).isEqualTo(expected[i])
         }
     }
+
+    @Test
+    fun colorForRssi() {
+        // rssi >= -67 (success)
+        assertThat(Strength.colorForRssi(-67)).isEqualTo(R.color.success)
+        assertThat(Strength.colorForRssi(0)).isEqualTo(R.color.success)
+        assertThat(Strength.colorForRssi(-66)).isEqualTo(R.color.success)
+        // -70 <= rssi < -67 (warning)
+        assertThat(Strength.colorForRssi(-68)).isEqualTo(R.color.warning)
+        assertThat(Strength.colorForRssi(-69)).isEqualTo(R.color.warning)
+        assertThat(Strength.colorForRssi(-70)).isEqualTo(R.color.warning)
+        // rssi < -70 (error)
+        assertThat(Strength.colorForRssi(-71)).isEqualTo(R.color.error)
+        assertThat(Strength.colorForRssi(-100)).isEqualTo(R.color.error)
+    }
+
+    @Test
+    fun fromRssiLevelBoundaries() {
+        assertThat(Strength.fromRssi(-200)).isEqualTo(Strength.ZERO)
+        assertThat(Strength.fromRssi(200)).isEqualTo(Strength.FOUR)
+    }
+
 }

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

@@ -108,6 +108,16 @@ class WiFiSignalTest {
         assertThat(fixture.strength).isEqualTo(Strength.THREE)
     }
 
+    @Test
+    fun strengthColor() {
+        // Arrange
+        val expectedColor = Strength.colorForRssi(level)
+        // Act
+        val actualColor = fixture.strengthColor
+        // Assert
+        assertThat(actualColor).isEqualTo(expectedColor)
+    }
+
     @Test
     fun distance() {
         // setup

build.gradle

@@ -20,7 +20,7 @@
 
 buildscript {
     ext {
-        kotlin_version = '2.2.20'
+        kotlin_version = '2.2.21'
     }
     repositories {
         google()
@@ -31,7 +31,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:8.13.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
-        classpath "com.github.ben-manes:gradle-versions-plugin:0.52.0"
+        classpath "com.github.ben-manes:gradle-versions-plugin:0.53.0"
     }
 }