fix #512

Author: VREMSoftwareDevelopment

app/build.gradle

@@ -34,7 +34,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.annotation:annotation:1.9.1'
     implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.collection:collection-ktx:1.4.5'
+    implementation 'androidx.collection:collection-ktx:1.5.0'
     implementation 'androidx.core:core-ktx:1.15.0'
     implementation 'androidx.core:core-splashscreen:1.0.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -47,7 +47,7 @@ dependencies {
     testImplementation 'androidx.test.ext:junit:1.2.1'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:5.16.0'
+    testImplementation 'org.mockito:mockito-core:5.16.1'
     testImplementation 'org.mockito.kotlin:mockito-kotlin:5.4.0'
     testImplementation 'org.robolectric:robolectric:4.14.1'
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"

app/build.properties

@@ -1,6 +1,6 @@
 #Build Properties
-#Sat Mar 08 09:09:08 EST 2025
-version_build=5
+#Fri Mar 21 16:09:58 EDT 2025
+version_build=6
 version_major=3
 version_minor=1
 version_patch=4

app/src/main/kotlin/com/vrem/wifianalyzer/settings/ThemeStyle.kt

@@ -17,11 +17,13 @@
  */
 package com.vrem.wifianalyzer.settings
 
+import android.graphics.Color
+import androidx.annotation.ColorInt
 import androidx.annotation.StyleRes
 import com.vrem.wifianalyzer.R
 
-enum class ThemeStyle(@param:StyleRes val theme: Int, @param:StyleRes val themeNoActionBar: Int) {
-    DARK(R.style.ThemeDark, R.style.ThemeDarkNoActionBar),
-    LIGHT(R.style.ThemeLight, R.style.ThemeLightNoActionBar),
-    SYSTEM(R.style.ThemeSystem, R.style.ThemeSystemNoActionBar);
-}
+enum class ThemeStyle(@param:StyleRes val theme: Int, @param:StyleRes val themeNoActionBar: Int, @param:ColorInt val colorGraphText: Int) {
+    DARK(R.style.ThemeDark, R.style.ThemeDarkNoActionBar, Color.WHITE),
+    LIGHT(R.style.ThemeLight, R.style.ThemeLightNoActionBar, Color.BLACK),
+    SYSTEM(R.style.ThemeSystem, R.style.ThemeSystemNoActionBar, Color.GRAY);
+}

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

@@ -44,12 +44,11 @@ internal fun Viewport.initialize(maximumY: Int): Viewport {
 }
 
 internal fun GridLabelRenderer.colors(themeStyle: ThemeStyle): GridLabelRenderer {
-    val color = if (ThemeStyle.DARK == themeStyle) Color.WHITE else Color.BLACK
     this.gridColor = Color.GRAY
-    this.verticalLabelsColor = color
-    this.verticalAxisTitleColor = color
-    this.horizontalLabelsColor = color
-    this.horizontalAxisTitleColor = color
+    this.verticalLabelsColor = themeStyle.colorGraphText
+    this.verticalAxisTitleColor = themeStyle.colorGraphText
+    this.horizontalLabelsColor = themeStyle.colorGraphText
+    this.horizontalAxisTitleColor = themeStyle.colorGraphText
     return this
 }
 

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

@@ -17,7 +17,6 @@
  */
 package com.vrem.wifianalyzer.wifi.graphutils
 
-import android.graphics.Color
 import com.jjoe64.graphview.GraphView
 import com.jjoe64.graphview.LegendRenderer
 import com.jjoe64.graphview.series.BaseSeries
@@ -113,7 +112,7 @@ class GraphViewWrapper(
         legendRenderer.resetStyles()
         legendRenderer.width = 0
         legendRenderer.textSize = graphView.titleTextSize
-        legendRenderer.textColor = if (ThemeStyle.DARK == themeStyle) Color.WHITE else Color.BLACK
+        legendRenderer.textColor = themeStyle.colorGraphText
         graphLegend.display(legendRenderer)
     }
 

app/src/test/kotlin/com/vrem/wifianalyzer/settings/ThemeStyleTest.kt

@@ -17,6 +17,7 @@
  */
 package com.vrem.wifianalyzer.settings
 
+import android.graphics.Color
 import com.vrem.wifianalyzer.R
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
@@ -41,4 +42,11 @@ class ThemeStyleTest {
         assertThat(ThemeStyle.SYSTEM.themeNoActionBar).isEqualTo(R.style.ThemeSystemNoActionBar)
     }
 
+    @Test
+    fun colorGraphText() {
+        assertThat(ThemeStyle.DARK.colorGraphText).isEqualTo(Color.WHITE)
+        assertThat(ThemeStyle.LIGHT.colorGraphText).isEqualTo(Color.BLACK)
+        assertThat(ThemeStyle.SYSTEM.colorGraphText).isEqualTo(Color.GRAY)
+    }
+
 }

app/src/test/kotlin/com/vrem/wifianalyzer/wifi/graphutils/GraphViewBuilderTest.kt

@@ -173,27 +173,17 @@ class GraphViewBuilderTest {
     }
 
     @Test
-    fun gridLabelRenderColorsDarkTheme() {
-        // execute
-        gridLabelRenderer.colors(ThemeStyle.DARK)
-        // validate
-        verify(gridLabelRenderer).gridColor = Color.GRAY
-        verify(gridLabelRenderer).verticalLabelsColor = Color.WHITE
-        verify(gridLabelRenderer).verticalAxisTitleColor = Color.WHITE
-        verify(gridLabelRenderer).horizontalLabelsColor = Color.WHITE
-        verify(gridLabelRenderer).horizontalAxisTitleColor = Color.WHITE
-    }
-
-    @Test
-    fun gridLabelRenderColorsLightTheme() {
+    fun gridLabelRenderColors() {
+        // setup
+        val themeStyle = ThemeStyle.LIGHT
         // execute
-        gridLabelRenderer.colors(ThemeStyle.LIGHT)
+        gridLabelRenderer.colors(themeStyle)
         // validate
         verify(gridLabelRenderer).gridColor = Color.GRAY
-        verify(gridLabelRenderer).verticalLabelsColor = Color.BLACK
-        verify(gridLabelRenderer).verticalAxisTitleColor = Color.BLACK
-        verify(gridLabelRenderer).horizontalLabelsColor = Color.BLACK
-        verify(gridLabelRenderer).horizontalAxisTitleColor = Color.BLACK
+        verify(gridLabelRenderer).verticalLabelsColor = themeStyle.colorGraphText
+        verify(gridLabelRenderer).verticalAxisTitleColor = themeStyle.colorGraphText
+        verify(gridLabelRenderer).horizontalLabelsColor = themeStyle.colorGraphText
+        verify(gridLabelRenderer).horizontalAxisTitleColor = themeStyle.colorGraphText
     }
 
 }

build.gradle

@@ -20,7 +20,7 @@
 
 buildscript {
     ext {
-        kotlin_version = '2.1.10'
+        kotlin_version = '2.1.20'
     }
     repositories {
         google()