Merge branch 'main' into gradle

Author: VREMSoftwareDevelopment

app/build.gradle

@@ -49,18 +49,20 @@ dependencies {
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:5.21.0'
-    testImplementation 'org.mockito.kotlin:mockito-kotlin:6.2.1'
-    testImplementation 'org.robolectric:robolectric:4.16'
+    testImplementation 'org.mockito.kotlin:mockito-kotlin:6.2.2'
+    testImplementation 'org.robolectric:robolectric:4.16.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.17'
     testImplementation 'org.assertj:assertj-core:3.27.6'
+    testImplementation 'org.hamcrest:hamcrest:3.0'
     // Android Test Dependencies
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
     androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.7.0'
     androidTestImplementation 'androidx.test.ext:junit-ktx:1.3.0'
     androidTestImplementation 'androidx.test:rules:1.7.0'
     androidTestImplementation 'org.assertj:assertj-core:3.27.6'
+    androidTestImplementation 'org.hamcrest:hamcrest:3.0'
 }
 
 android {
@@ -227,3 +229,8 @@ def static writeProperties(propertiesFile, properties) {
     properties.store(writer, "Build Properties")
     writer.close()
 }
+
+configurations.all {
+    exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    exclude group: 'org.hamcrest', module: 'hamcrest-library'
+}

app/build.properties

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

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

@@ -23,7 +23,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
-import org.hamcrest.Matchers.matchesPattern
+import org.hamcrest.Matchers
 
 internal class ConnectionInstrumentedTest : Runnable {
     override fun run() {
@@ -39,7 +39,7 @@ internal class ConnectionInstrumentedTest : Runnable {
 
     private fun verifyIpAddressDisplayed() {
         val ipv4Pattern = "\\b(?:[0-9]{1,3}\\.){3}[0-9]{1,3}\\b"
-        onView(withText(matchesPattern(ipv4Pattern))).check(matches(isDisplayed()))
+        onView(withText(Matchers.matchesPattern(ipv4Pattern))).check(matches(isDisplayed()))
     }
 
     private fun verifyConnectionPopup() {

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

@@ -50,14 +50,15 @@ internal class FilterInstrumentedTest : Runnable {
         onView(allOf(withId(R.id.action_filter), isDisplayed())).perform(click())
         onView(withText("Filter")).check(matches(isDisplayed()))
         onView(withText("5 GHz")).perform(click())
-        onView(allOf(withId(android.R.id.button3), isDisplayed())).perform(click())
+        onView(allOf(withId(android.R.id.button3), isDisplayed())).perform(scrollTo(), click())
         onView(withText("Filter")).check(doesNotExist())
     }
 
     private fun verifySsidFilter() {
         onView(allOf(withId(R.id.action_filter), isDisplayed())).perform(click())
         onView(withHint("ssid SSID")).perform(typeText("test"), closeSoftKeyboard())
-        onView(allOf(withId(android.R.id.button3), isDisplayed())).perform(click())
+        pauseShort()
+        onView(allOf(withId(android.R.id.button3), isDisplayed())).perform(scrollTo(), click())
         onView(withText("Filter")).check(doesNotExist())
         onView(allOf(withId(R.id.action_filter), isDisplayed())).perform(click())
         onView(allOf(withId(android.R.id.button2), isDisplayed())).perform(scrollTo(), click())

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

@@ -20,10 +20,15 @@ package com.vrem.wifianalyzer
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withText
-import org.junit.Assert.assertEquals
+import org.assertj.core.api.Assertions.assertThat
+
+private const val SETTINGS = "Settings"
+
+private const val THEME = "Theme"
 
 internal class ThemeInstrumentedTest : Runnable {
     override fun run() {
@@ -41,17 +46,41 @@ internal class ThemeInstrumentedTest : Runnable {
         themeName: String,
         expectedNightMode: Int,
     ) {
-        selectMenuItem(R.id.nav_drawer_settings, "Settings")
-        scrollToAndVerify("Theme")
-        onView(withText("Theme")).perform(click())
+        navigateToTheme()
+        verifyThemeNotSelected(themeName)
+        selectTheme(themeName)
         pauseShort()
+        navigateToTheme()
+        verifyThemeSelected(themeName)
+        verifyNightMode(themeName, expectedNightMode)
+    }
+
+    private fun verifyThemeNotSelected(themeName: String) {
+        onView(withText(themeName)).check(doesNotExist())
+    }
+
+    private fun selectTheme(themeName: String) {
+        onView(withText(THEME)).perform(click())
         onView(withText(themeName)).check(matches(isDisplayed()))
         onView(withText(themeName)).perform(click())
-        pauseShort()
-        assertEquals(
-            "Theme $themeName should set night mode to $expectedNightMode",
-            expectedNightMode,
-            AppCompatDelegate.getDefaultNightMode(),
-        )
+    }
+
+    private fun verifyThemeSelected(themeName: String) {
+        onView(withText(themeName)).check(matches(isDisplayed()))
+    }
+
+    private fun verifyNightMode(
+        themeName: String,
+        expectedNightMode: Int,
+    ) {
+        assertThat(AppCompatDelegate.getDefaultNightMode())
+            .withFailMessage("Theme %s should set night mode to %s", themeName, expectedNightMode)
+            .isEqualTo(expectedNightMode)
+    }
+
+    private fun navigateToTheme() {
+        selectMenuItem(R.id.nav_drawer_settings, SETTINGS)
+        scrollToAndVerify(THEME)
+        onView(withText(THEME)).check(matches(isDisplayed()))
     }
 }

gradle.properties

@@ -17,31 +17,16 @@ org.gradle.warning.mode=all
 # AndroidX and Jetifier settings
 android.useAndroidX=true
 android.enableJetifier=true
-android.nonFinalResIds=true
 android.jetifier.ignorelist=bcprov-jdk15on
 
 # Kotlin code style
 kotlin.code.style=official
 
-# Remove these lines entirely (use new defaults):
-# new default is false
-android.defaults.buildfeatures.resvalues=true
-# new default is true
-android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
-# new default is true
-android.enableAppCompileTimeRClass=false
-# new default is true
-android.usesSdkInManifest.disallowed=false
-# new default is true
+# Default: true | Low Kotlin version is explicitly managed in `build.gradle`.
 android.builtInKotlin=false
-# new default is true
+# Default: true | Build scripts may need DSL syntax updates.
 android.newDsl=false
-
-# Keep these if needed for your project:
-android.uniquePackageNames=false
-android.dependency.useConstraints=true
-android.r8.strictFullModeForKeepRules=false
-android.r8.optimizedResourceShrinking=false
-
-# Add this to suppress the constraint warning:
-android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false
+# Default: false | Release build may fail if R8 rules are incomplete.
+android.r8.strictFullModeForKeepRules=true
+# Default: false | Resources may be incorrectly removed, causing runtime crashes.
+android.r8.optimizedResourceShrinking=true