refactor theme and add more tests

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,6 +1,6 @@
 #Build Properties
-#Sat Jan 17 10:15:29 EST 2026
-version_build=1
+#Sat Jan 17 13:51:56 EST 2026
+version_build=2
 version_major=3
 version_minor=2
 version_patch=2

app/src/androidTest/kotlin/com/vrem/wifianalyzer/ThemeInstrumentedTest.kt

@@ -1,6 +1,6 @@
 /*
  * WiFiAnalyzer
- * Copyright (C) 2026 VREM Software Development <VREMSoftwareDevelopment@gmail.com>
+ * Copyright (C) 2015 - 2026 VREM Software Development <VREMSoftwareDevelopment@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

app/src/main/kotlin/com/vrem/wifianalyzer/MainActivity.kt

@@ -26,7 +26,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
@@ -62,11 +61,7 @@ class MainActivity :
 
         val settings = mainContext.settings
         settings.initializeDefaultValues()
-
-        settings.themeStyle().apply {
-            AppCompatDelegate.setDefaultNightMode(nightMode)
-            setTheme(themeNoActionBar)
-        }
+        settings.themeStyle().setTheme(this)
 
         mainReload = MainReload(settings)
 

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

@@ -20,17 +20,23 @@ package com.vrem.wifianalyzer.settings
 import android.graphics.Color
 import androidx.annotation.ColorInt
 import androidx.annotation.StyleRes
+import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import com.vrem.wifianalyzer.R
 
 enum class ThemeStyle(
-    @param:StyleRes val theme: Int,
-    @param:StyleRes val themeNoActionBar: Int,
     @param:ColorInt val colorGraphText: Int,
-    val nightMode: Int,
+    @param:StyleRes private val theme: Int,
+    private val nightMode: Int,
 ) {
-    DARK(R.style.ThemeSystem, R.style.ThemeSystemNoActionBar, Color.WHITE, AppCompatDelegate.MODE_NIGHT_YES),
-    LIGHT(R.style.ThemeSystem, R.style.ThemeSystemNoActionBar, Color.BLACK, AppCompatDelegate.MODE_NIGHT_NO),
-    SYSTEM(R.style.ThemeSystem, R.style.ThemeSystemNoActionBar, Color.GRAY, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM),
-    BLACK(R.style.ThemeBlack, R.style.ThemeBlackNoActionBar, Color.WHITE, AppCompatDelegate.MODE_NIGHT_YES),
+    DARK(Color.WHITE, R.style.ThemeSystemNoActionBar, AppCompatDelegate.MODE_NIGHT_YES),
+    LIGHT(Color.BLACK, R.style.ThemeSystemNoActionBar, AppCompatDelegate.MODE_NIGHT_NO),
+    SYSTEM(Color.GRAY, R.style.ThemeSystemNoActionBar, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM),
+    BLACK(Color.WHITE, R.style.ThemeBlackNoActionBar, AppCompatDelegate.MODE_NIGHT_YES);
+
+    fun setTheme(activity: AppCompatActivity) {
+        activity.setTheme(theme)
+        AppCompatDelegate.setDefaultNightMode(nightMode)
+    }
+
 }

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

@@ -0,0 +1,59 @@
+/*
+ * WiFiAnalyzer
+ * Copyright (C) 2015 - 2026 VREM Software Development <VREMSoftwareDevelopment@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+package com.vrem.wifianalyzer.settings
+
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
+import com.vrem.wifianalyzer.R
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import org.mockito.Mockito
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+
+@RunWith(Parameterized::class)
+class ThemeStyleParameterizedTest(
+    private val themeStyle: ThemeStyle,
+    private val expectedTheme: Int,
+    private val expectedNightMode: Int
+) {
+    companion object {
+        @JvmStatic
+        @Parameterized.Parameters(name = "{0}")
+        fun data(): Collection<Array<Any>> = listOf(
+            arrayOf(ThemeStyle.DARK, R.style.ThemeSystemNoActionBar, AppCompatDelegate.MODE_NIGHT_YES),
+            arrayOf(ThemeStyle.LIGHT, R.style.ThemeSystemNoActionBar, AppCompatDelegate.MODE_NIGHT_NO),
+            arrayOf(ThemeStyle.SYSTEM, R.style.ThemeSystemNoActionBar, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM),
+            arrayOf(ThemeStyle.BLACK, R.style.ThemeBlackNoActionBar, AppCompatDelegate.MODE_NIGHT_YES)
+        )
+    }
+
+    @Test
+    fun setThemeParameterized() {
+        // Arrange
+        val activity: AppCompatActivity = mock()
+        Mockito.mockStatic(AppCompatDelegate::class.java).use { mockedStatic ->
+            // Act
+            themeStyle.setTheme(activity)
+            // Assert
+            verify(activity).setTheme(expectedTheme)
+            mockedStatic.verify { AppCompatDelegate.setDefaultNightMode(expectedNightMode) }
+        }
+    }
+}

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

@@ -18,8 +18,6 @@
 package com.vrem.wifianalyzer.settings
 
 import android.graphics.Color
-import androidx.appcompat.app.AppCompatDelegate
-import com.vrem.wifianalyzer.R
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 
@@ -31,22 +29,6 @@ class ThemeStyleTest {
             .containsExactly(ThemeStyle.DARK, ThemeStyle.LIGHT, ThemeStyle.SYSTEM, ThemeStyle.BLACK)
     }
 
-    @Test
-    fun theme() {
-        assertThat(ThemeStyle.LIGHT.theme).isEqualTo(R.style.ThemeSystem)
-        assertThat(ThemeStyle.DARK.theme).isEqualTo(R.style.ThemeSystem)
-        assertThat(ThemeStyle.SYSTEM.theme).isEqualTo(R.style.ThemeSystem)
-        assertThat(ThemeStyle.BLACK.theme).isEqualTo(R.style.ThemeBlack)
-    }
-
-    @Test
-    fun themeNoActionBar() {
-        assertThat(ThemeStyle.DARK.themeNoActionBar).isEqualTo(R.style.ThemeSystemNoActionBar)
-        assertThat(ThemeStyle.LIGHT.themeNoActionBar).isEqualTo(R.style.ThemeSystemNoActionBar)
-        assertThat(ThemeStyle.SYSTEM.themeNoActionBar).isEqualTo(R.style.ThemeSystemNoActionBar)
-        assertThat(ThemeStyle.BLACK.themeNoActionBar).isEqualTo(R.style.ThemeBlackNoActionBar)
-    }
-
     @Test
     fun colorGraphText() {
         assertThat(ThemeStyle.DARK.colorGraphText).isEqualTo(Color.WHITE)
@@ -55,14 +37,6 @@ class ThemeStyleTest {
         assertThat(ThemeStyle.BLACK.colorGraphText).isEqualTo(Color.WHITE)
     }
 
-    @Test
-    fun nightMode() {
-        assertThat(ThemeStyle.DARK.nightMode).isEqualTo(AppCompatDelegate.MODE_NIGHT_YES)
-        assertThat(ThemeStyle.LIGHT.nightMode).isEqualTo(AppCompatDelegate.MODE_NIGHT_NO)
-        assertThat(ThemeStyle.SYSTEM.nightMode).isEqualTo(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
-        assertThat(ThemeStyle.BLACK.nightMode).isEqualTo(AppCompatDelegate.MODE_NIGHT_YES)
-    }
-
     @Test
     fun themeStyleOrdinal() {
         assertThat(ThemeStyle.DARK.ordinal).isEqualTo(0)