Merge pull request #3105 from hussainmohd-a/dev-v055y

v057

Author: hussainmohd-a

app/build.gradle

@@ -421,6 +421,31 @@ android {
     }
     lint {
         abortOnError true
+        // Lint analyzes main, androidTest and unitTest sources of the variant by
+        // default; the unitTest analysis (lintAnalyze<Variant>UnitTest) take more time
+        // to complete. Restrict lint to the variant's main sources.
+        ignoreTestSources true
+    }
+
+    testOptions {
+        unitTests {
+            // Plain JVM unit tests load the stubbed android.jar, whose methods
+            // throw "not mocked" by default.
+            returnDefaultValues = true
+            // NOTE: includeAndroidResources is intentionally left disabled.
+            // Enabling it makes Robolectric inflate the real manifest, which
+            // instantiates the app Application (initializes the gojni native
+            // backend, unavailable on the JVM) and breaks Material-themed
+            // activity tests.
+        }
+    }
+
+    // Test-task tuning is done lazily on the task container (configureEach)
+    // instead of unitTests.all {} to avoid eager configuration.
+    tasks.withType(Test).configureEach {
+        // Robolectric sandboxes across ~1200 tests exceed the 512m
+        // default, causing spurious OOMs in classes that run late.
+        maxHeapSize = "2g"
     }
 
     // ------------------------------------------------------------------
@@ -584,7 +609,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
     androidTestImplementation 'androidx.test.espresso:espresso-accessibility:3.7.0'
     androidTestImplementation 'androidx.test:rules:1.7.0'
-    testImplementation 'org.robolectric:robolectric:4.16.1'
+    testImplementation 'org.robolectric:robolectric:4.17'
     testImplementation 'androidx.test:core:1.7.0'
     testImplementation 'androidx.test.ext:junit:1.3.0'
     testImplementation 'org.mockito:mockito-core:5.23.0'

app/src/full/res/color/chip_toggle_text.xml

@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Toggle-chip text (Allowed/Blocked on the home logs card): selection is
-     conveyed by full-contrast text on the selected chip and a dimmed label
-     on the unselected one; no green/red tinting. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true" android:color="?attr/primaryTextColor" />
     <item android:color="?attr/primaryLightColorText" />

app/src/full/res/color/conn_tracker_segment_stroke.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/colorPrimary" />
+    <item android:color="?attr/border" />
+</selector>

app/src/full/res/color/conn_tracker_segment_text.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/colorPrimary" />
+    <item android:color="?attr/primaryLightColorText" />
+</selector>

app/src/full/res/layout-w600dp/fragment_home_screen.xml

@@ -28,7 +28,6 @@
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardElevation="4dp"
             android:layout_margin="4dp"
             app:cardCornerRadius="8dp">
 
@@ -368,7 +367,6 @@
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardElevation="4dp"
             android:layout_margin="4dp"
             app:cardCornerRadius="8dp">
 
@@ -714,7 +712,6 @@
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardElevation="4dp"
             android:layout_margin="4dp"
             app:cardCornerRadius="8dp">
 
@@ -927,7 +924,6 @@
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardElevation="4dp"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
             android:layout_marginTop="4dp"

app/src/full/res/layout/activity_misc_settings.xml

@@ -62,7 +62,6 @@
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardElevation="4dp"
             android:layout_margin="4dp"
             app:cardCornerRadius="8dp">
 
@@ -602,7 +601,6 @@
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardElevation="4dp"
             android:layout_margin="4dp"
             app:cardCornerRadius="8dp">
 
@@ -1011,7 +1009,6 @@
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardElevation="4dp"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
             android:layout_marginTop="4dp"