Fix composeResources crash on android 7

.github/actions/submit-test/action.yml

@@ -25,6 +25,10 @@ inputs:
   google-maps-key:
     description: 'A Google Maps API key'
 
+  api-level:
+    description: 'Android API level to run the emulator with'
+    default: '30'
+
 runs:
   using: composite
   steps:
@@ -76,7 +80,7 @@ runs:
     - name: Run tests
       uses: reactivecircus/android-emulator-runner@v2
       with:
-        api-level: 30
+        api-level: ${{ inputs.api-level }}
         target: google_apis
         arch: x86_64
         emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-back none
@@ -91,7 +95,7 @@ runs:
       if: always()
       uses: actions/upload-artifact@v6
       with:
-        name: test-reports
+        name: test-reports-api${{ inputs.api-level }}
         path: '**/build/reports/androidTests'
         retention-days: 7
         if-no-files-found: warn
@@ -100,7 +104,7 @@ runs:
       if: always()
       uses: actions/upload-artifact@v6
       with:
-        name: test-screenshots
+        name: test-screenshots-api${{ inputs.api-level }}
         path: '**/build/outputs/connected_android_test_additional_output'
         retention-days: 7
         if-no-files-found: ignore
@@ -118,7 +122,7 @@ runs:
       continue-on-error: true
       uses: actions/upload-artifact@v6
       with:
-        name: firebase-emulator-log
+        name: firebase-emulator-log-api${{ inputs.api-level }}
         path: /tmp/firebase-emulator.log
         retention-days: 7
         if-no-files-found: warn
@@ -127,7 +131,7 @@ runs:
       if: always() && inputs.upload-artifacts == 'true'
       uses: actions/upload-artifact@v6
       with:
-        name: firebase-emulator-data
+        name: firebase-emulator-data-api${{ inputs.api-level }}
         path: ${{ github.workspace }}/test-android-result
         retention-days: 7
         if-no-files-found: warn

.github/workflows/test-e2e.yml

@@ -24,10 +24,26 @@ permissions:
   contents: read
 
 jobs:
-  run-instrumentation-tests:
+  request-approval:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
     environment: e2e-approval
+    steps:
+      - run: echo "Approval granted"
+
+  instrumentation-matrix:
+    name: API ${{ matrix.api-level }}
+    needs: request-approval
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - api-level: 30
+            required: true
+          - api-level: 24
+            required: false
+    continue-on-error: ${{ !matrix.required }}
     env:
       FIREBASE_CLI_EXPERIMENTS: webframeworks
 
@@ -47,3 +63,16 @@ jobs:
           android-repository: google/ground-android
           upload-artifacts: true
           google-maps-key: ${{ secrets.MAPS_API_KEY }}
+          api-level: ${{ matrix.api-level }}
+
+  run-instrumentation-tests:
+    needs: instrumentation-matrix
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check matrix results
+        run: |
+          if [ "${{ needs.instrumentation-matrix.result }}" != "success" ]; then
+            echo "Required instrumentation tests failed"
+            exit 1
+          fi

core/ui/build.gradle.kts

@@ -27,6 +27,7 @@ kotlin {
     namespace = "org.groundplatform.core.ui"
     compileSdk = libs.versions.androidCompileSdk.get().toInt()
     minSdk = libs.versions.androidMinSdk.get().toInt()
+    androidResources.enable = true
   }
 
   val xcfName = "GroundUiKit"

e2eTest/src/main/java/org/groundplatform/android/e2etest/drivers/AndroidTestDriver.kt

@@ -41,6 +41,7 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.Until
+import java.util.regex.Pattern
 import org.groundplatform.android.R
 import org.groundplatform.android.e2etest.TestConfig.DEFAULT_TIMEOUT
 import org.groundplatform.android.e2etest.TestConfig.TEST_PHOTO_FILE
@@ -180,4 +181,15 @@ class AndroidTestDriver(
       composeRule.onTarget(TestDriver.Target.Text(componentText)).assertIsNotDisplayed()
     }
   }
+
+  override fun enableLocationServices() {
+    val button =
+      device.wait(
+        Until.findObject(
+          By.text(Pattern.compile(".*${Regex.escape("ok")}.*", Pattern.CASE_INSENSITIVE))
+        ),
+        DEFAULT_TIMEOUT,
+      )
+    button?.click()
+  }
 }

e2eTest/src/main/java/org/groundplatform/android/e2etest/drivers/TestDriver.kt

@@ -38,6 +38,8 @@ interface TestDriver {
 
   fun assertVisible(componentText: String, isVisible: Boolean = false)
 
+  fun enableLocationServices()
+
   sealed class Target {
     data class TestTag(val tag: String) : Target()
 

e2eTest/src/main/java/org/groundplatform/android/e2etest/robots/HomeScreenRobot.kt

@@ -22,6 +22,10 @@ import org.groundplatform.android.ui.components.LOCATION_NOT_LOCKED_TEST_TAG
 
 @OptIn(ExperimentalTestApi::class)
 class HomeScreenRobot(override val testDriver: TestDriver) : Robot<HomeScreenRobot>() {
+  fun enableLocationServices() {
+    testDriver.enableLocationServices()
+  }
+
   fun moveMap() = testDriver.dragMapBy(500, 500)
 
   fun recenter() = testDriver.click(TestDriver.Target.TestTag(LOCATION_NOT_LOCKED_TEST_TAG))

e2eTest/src/main/java/org/groundplatform/android/e2etest/tests/CompleteAllTaskTypesTest.kt

@@ -92,6 +92,7 @@ class CompleteAllTaskTypesTest {
     with(SurveySelectorRobot(testDriver)) { selectSurvey(TestConfig.SURVEY_NAME) }
     // Add new LOI and test all task types except DRAW_AREA
     with(HomeScreenRobot(testDriver)) {
+      enableLocationServices()
       moveMap()
       recenter()
       addLoi()