minor cleanup

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,6 +1,6 @@
 #Build Properties
-#Mon Jul 21 18:30:25 CEST 2025
-version_build=18
+#Mon Jul 21 15:02:43 EDT 2025
+version_build=19
 version_major=3
 version_minor=2
 version_patch=1

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

@@ -39,7 +39,7 @@
     <!-- green_500 -->
     <color name="success">#4CAF50</color>
     <!-- background -->
-    <color name="background">#616161</color>
+    <color name="background">#757575</color>
     <!-- black -->
     <color name="black">#000000</color>
 </resources>

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

@@ -18,62 +18,59 @@
 
 <resources>
 
+    <!-- Dark theme -->
     <style name="ThemeDark" parent="Theme.AppCompat">
         <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
         <item name="android:actionMenuTextColor">@color/selected</item>
     </style>
-
     <style name="ThemeDarkNoActionBar" parent="ThemeDark">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
+    <!-- Light theme -->
     <style name="ThemeLight" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
         <item name="android:actionMenuTextColor">@color/selected</item>
     </style>
-
     <style name="ThemeLightNoActionBar" parent="ThemeLight">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
+    <!-- Black theme -->
     <style name="ThemeBlack" parent="Theme.AppCompat">
         <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
         <item name="android:actionMenuTextColor">@color/selected</item>
         <item name="android:windowBackground">@color/black</item>
         <item name="colorPrimary">@color/black</item>
-
     </style>
-
     <style name="ThemeBlackNoActionBar" parent="ThemeBlack">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
+    <!-- System (DayNight) theme -->
     <style name="ThemeSystem" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
         <item name="android:actionMenuTextColor">@color/selected</item>
     </style>
-
     <style name="ThemeSystemNoActionBar" parent="ThemeSystem">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="ThemeOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
-        <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
-        <item name="android:actionMenuTextColor">@color/selected</item>
-    </style>
-
+    <!-- Overlay and splash styles -->
+    <style name="ThemeOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
     <style name="ThemeSplash" parent="Theme.SplashScreen">
         <item name="windowSplashScreenBackground">@color/background</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/splash_inset</item>
         <item name="windowSplashScreenAnimationDuration">500</item>
     </style>
 
+    <!-- Window animation style -->
     <style name="WindowAnimationTransition">
         <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
         <item name="android:windowExitAnimation">@android:anim/fade_out</item>
     </style>
-</resources>
+</resources>

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

@@ -159,51 +159,18 @@ class SettingsTest {
     }
 
     @Test
-    fun themeStyleDark() {
-        // setup
-        doReturn(ThemeStyle.DARK.ordinal)
-            .whenever(repository).stringAsInteger(R.string.theme_key, ThemeStyle.DARK.ordinal)
-        // execute
-        val actual = fixture.themeStyle()
-        // validate
-        assertThat(actual).isEqualTo(ThemeStyle.DARK)
-        verify(repository).stringAsInteger(R.string.theme_key, ThemeStyle.DARK.ordinal)
-    }
-
-    @Test
-    fun themeStyleLight() {
-        // setup
-        doReturn(ThemeStyle.LIGHT.ordinal)
-            .whenever(repository).stringAsInteger(R.string.theme_key, ThemeStyle.DARK.ordinal)
-        // execute
-        val actual = fixture.themeStyle()
-        // validate
-        assertThat(actual).isEqualTo(ThemeStyle.LIGHT)
-        verify(repository).stringAsInteger(R.string.theme_key, ThemeStyle.DARK.ordinal)
-    }
-
-    @Test
-    fun themeStyleBlack() {
-        // setup
-        doReturn(ThemeStyle.BLACK.ordinal)
-            .whenever(repository).stringAsInteger(R.string.theme_key, ThemeStyle.DARK.ordinal)
-        // execute
-        val actual = fixture.themeStyle()
-        // validate
-        assertThat(actual).isEqualTo(ThemeStyle.BLACK)
-        verify(repository).stringAsInteger(R.string.theme_key, ThemeStyle.DARK.ordinal)
-    }
-
-    @Test
-    fun themeStyleSystem() {
-        // setup
-        doReturn(ThemeStyle.SYSTEM.ordinal)
-            .whenever(repository).stringAsInteger(R.string.theme_key, ThemeStyle.DARK.ordinal)
-        // execute
-        val actual = fixture.themeStyle()
-        // validate
-        assertThat(actual).isEqualTo(ThemeStyle.SYSTEM)
-        verify(repository).stringAsInteger(R.string.theme_key, ThemeStyle.DARK.ordinal)
+    fun themeStyle() {
+        ThemeStyle.entries.forEach {
+            // setup
+            doReturn(it.ordinal).whenever(repository)
+                .stringAsInteger(R.string.theme_key, ThemeStyle.DARK.ordinal)
+            // execute
+            val actual = fixture.themeStyle()
+            // validate
+            assertThat(actual).describedAs("Theme: $it").isEqualTo(it)
+        }
+        verify(repository, times(ThemeStyle.entries.size))
+            .stringAsInteger(R.string.theme_key, ThemeStyle.DARK.ordinal)
     }
 
     @Test