From fd89ff2d1d56a0f650450f7717892a9ddc3a0120 Mon Sep 17 00:00:00 2001 From: Jeel Dobariya Date: Sun, 30 Aug 2026 17:39:55 +0530 Subject: [PATCH 1/4] fix: styling error with autofill --- .../src/main/res/drawable/autofill_item_background.xml | 2 +- .../android/src/main/res/drawable/ic_arrow_back.xml | 2 +- .../android/src/main/res/drawable/ic_autofill_lock.xml | 2 +- .../android/src/main/res/layout/autofill_item.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/passcodes-autofill-service/android/src/main/res/drawable/autofill_item_background.xml b/modules/passcodes-autofill-service/android/src/main/res/drawable/autofill_item_background.xml index 403daca2..2ada0260 100644 --- a/modules/passcodes-autofill-service/android/src/main/res/drawable/autofill_item_background.xml +++ b/modules/passcodes-autofill-service/android/src/main/res/drawable/autofill_item_background.xml @@ -3,6 +3,6 @@ - + diff --git a/modules/passcodes-autofill-service/android/src/main/res/drawable/ic_arrow_back.xml b/modules/passcodes-autofill-service/android/src/main/res/drawable/ic_arrow_back.xml index 5c227c54..17217cb9 100644 --- a/modules/passcodes-autofill-service/android/src/main/res/drawable/ic_arrow_back.xml +++ b/modules/passcodes-autofill-service/android/src/main/res/drawable/ic_arrow_back.xml @@ -7,7 +7,7 @@ android:viewportHeight="24"> diff --git a/modules/passcodes-autofill-service/android/src/main/res/drawable/ic_autofill_lock.xml b/modules/passcodes-autofill-service/android/src/main/res/drawable/ic_autofill_lock.xml index 8ccb6bc9..7c9b59ee 100644 --- a/modules/passcodes-autofill-service/android/src/main/res/drawable/ic_autofill_lock.xml +++ b/modules/passcodes-autofill-service/android/src/main/res/drawable/ic_autofill_lock.xml @@ -7,7 +7,7 @@ android:viewportHeight="24"> diff --git a/modules/passcodes-autofill-service/android/src/main/res/layout/autofill_item.xml b/modules/passcodes-autofill-service/android/src/main/res/layout/autofill_item.xml index bc4fb529..141218ea 100644 --- a/modules/passcodes-autofill-service/android/src/main/res/layout/autofill_item.xml +++ b/modules/passcodes-autofill-service/android/src/main/res/layout/autofill_item.xml @@ -33,7 +33,7 @@ android:id="@+id/autofill_domain" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="?attr/colorOnPrimary" + android:textColor="@color/md_on_primary" android:textSize="16sp" android:textStyle="bold" android:maxLines="1" @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="2dp" - android:textColor="?attr/colorPrimaryContainer" + android:textColor="@color/md_primary_container" android:textSize="14sp" android:maxLines="1" android:ellipsize="end" /> From 60ee5998c0a7f6b566717a457719e8ce26896d8d Mon Sep 17 00:00:00 2001 From: Jeel Dobariya Date: Sun, 30 Aug 2026 17:47:54 +0530 Subject: [PATCH 2/4] ci: add a custom advance codeql workflow --- .github/workflows/codeql.yml | 52 ++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 00000000..bfd24eb4 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,52 @@ +name: CodeQL + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + + permissions: + security-events: write + packages: read + actions: read + contents: read + + strategy: + fail-fast: false + matrix: + include: + - language: java-kotlin + build-mode: manual + + - language: javascript-typescript + build-mode: none + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Initialize CodeQL + uses: github/codeql-action/init@v4 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + + - name: Build Android + if: matrix.language == 'java-kotlin' + working-directory: android + run: | + chmod +x gradlew + ./gradlew assembleDebug --no-daemon + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v4 + with: + category: "/language:${{ matrix.language }}" From 16cce8ef6393cb76d1e0465c5748af5c00b6a4c1 Mon Sep 17 00:00:00 2001 From: Jeel Dobariya Date: Sun, 30 Aug 2026 18:01:01 +0530 Subject: [PATCH 3/4] ci: fix the android directory not found errors --- .github/workflows/codeql.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index bfd24eb4..d9da53a0 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -31,14 +31,32 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 + # Node is required for Expo CLI / prebuild + - name: Setup Node + uses: actions/setup-node@v6 + with: + node-version: 24 + cache: npm + + # Install package.json dependencies + - name: Install dependencies + run: npm ci + + # Generate android/ from app.config.ts + config plugins + - name: Expo Prebuild + if: matrix.language == 'java-kotlin' + run: npx expo prebuild --clean --no-install + + # Initialize CodeQL BEFORE compiling Kotlin - name: Initialize CodeQL uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} build-mode: ${{ matrix.build-mode }} + # CodeQL watches this compilation - name: Build Android if: matrix.language == 'java-kotlin' working-directory: android @@ -46,6 +64,7 @@ jobs: chmod +x gradlew ./gradlew assembleDebug --no-daemon + # Analyze what CodeQL observed - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v4 with: From 669761d446cfff4b327069508449ea6a74eea75e Mon Sep 17 00:00:00 2001 From: Jeel Dobariya Date: Sun, 30 Aug 2026 18:02:59 +0530 Subject: [PATCH 4/4] ci: optimized workflow runs for native android code --- .github/workflows/codeql.yml | 80 ++++++++++++++++++++++++++---------- 1 file changed, 59 insertions(+), 21 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d9da53a0..d596183d 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -4,13 +4,18 @@ on: push: branches: - main + pull_request: branches: - main jobs: - analyze: - name: Analyze + # ============================================================ + # JavaScript / TypeScript + # ============================================================ + + analyze-javascript: + name: Analyze JavaScript / TypeScript runs-on: ubuntu-latest permissions: @@ -19,53 +24,86 @@ jobs: actions: read contents: read - strategy: - fail-fast: false - matrix: - include: - - language: java-kotlin - build-mode: manual + steps: + - name: Checkout repository + uses: actions/checkout@v5 + + - name: Initialize CodeQL + uses: github/codeql-action/init@v4 + with: + languages: javascript-typescript + build-mode: none + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v4 + with: + category: "/language:javascript-typescript" - - language: javascript-typescript - build-mode: none + # ============================================================ + # Kotlin / Android + # ============================================================ + + analyze-kotlin: + name: Analyze Kotlin / Android + runs-on: ubuntu-latest + + permissions: + security-events: write + packages: read + actions: read + contents: read steps: - name: Checkout repository uses: actions/checkout@v5 - # Node is required for Expo CLI / prebuild + - name: Check whether Kotlin-related files changed + id: changes + uses: dorny/paths-filter@v4 + with: + filters: | + kotlin: + - 'modules/**' + - 'plugins/**' + - name: Setup Node + if: steps.changes.outputs.kotlin == 'true' uses: actions/setup-node@v6 with: node-version: 24 cache: npm - # Install package.json dependencies + - name: Setup Java + if: steps.changes.outputs.kotlin == 'true' + uses: actions/setup-java@v5 + with: + distribution: temurin + java-version: "17" + - name: Install dependencies + if: steps.changes.outputs.kotlin == 'true' run: npm ci - # Generate android/ from app.config.ts + config plugins - name: Expo Prebuild - if: matrix.language == 'java-kotlin' + if: steps.changes.outputs.kotlin == 'true' run: npx expo prebuild --clean --no-install - # Initialize CodeQL BEFORE compiling Kotlin - name: Initialize CodeQL + if: steps.changes.outputs.kotlin == 'true' uses: github/codeql-action/init@v4 with: - languages: ${{ matrix.language }} - build-mode: ${{ matrix.build-mode }} + languages: java-kotlin + build-mode: manual - # CodeQL watches this compilation - name: Build Android - if: matrix.language == 'java-kotlin' + if: steps.changes.outputs.kotlin == 'true' working-directory: android run: | chmod +x gradlew ./gradlew assembleDebug --no-daemon - # Analyze what CodeQL observed - name: Perform CodeQL Analysis + if: steps.changes.outputs.kotlin == 'true' uses: github/codeql-action/analyze@v4 with: - category: "/language:${{ matrix.language }}" + category: "/language:java-kotlin"