From 4e513d2ef9677dda7ea938fb20d2c250dba04e48 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Sat, 28 Feb 2026 03:14:02 +0000
Subject: [PATCH] fix: android build and release workflow

- Consolidate build and release jobs into a single workflow job
- Update action versions (checkout@v4, setup-java@v4)
- Fix working directory for Gradle commands (set to android/)
- Correct path to release APK (android/app/build/outputs/apk/release/app-release.apk)
- Use standard Expo prebuild command
- Add GITHUB_TOKEN for release creation and asset upload

Co-authored-by: involvex <39644169+involvex@users.noreply.github.com>
---
 .github/workflows/android.yml              | 19 +++++++++----------
 android/app/build.gradle                   |  4 ++--
 android/app/src/main/res/values/styles.xml |  2 ++
 android/gradlew                            |  0
 4 files changed, 13 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 android/gradlew

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 8a92f63..22f2e2f 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -10,33 +10,32 @@ on:
   workflow_dispatch:
 
 jobs:
-  Gradle:
+  build-and-release:
     runs-on: ubuntu-latest
     steps:
       - name: checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1
       - name: Install dependencies
         run: bun install
       - name: Running expo prebuild
-        run: bun run expo:prebuild
+        run: npx expo prebuild --platform android --no-install
       - name: setup jdk
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
       - name: Make Gradle executable
         run: chmod +x ./gradlew
+        working-directory: android
       - name: Build Release APK
         run: ./gradlew assembleRelease
-
-  Release:
-    needs: Gradle
-    runs-on: ubuntu-latest
-    steps:
+        working-directory: android
       - name: Release to GitHub
         uses: softprops/action-gh-release@v2
         if: github.ref_type == 'tag'
         with:
-          files: app/build/outputs/apk/release/app-release.apk
+          files: android/app/build/outputs/apk/release/app-release.apk
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/android/app/build.gradle b/android/app/build.gradle
index fbfa664..e500c83 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -92,8 +92,8 @@ android {
         applicationId 'com.involvex.awesomegithubapp'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 5
-        versionName "0.0.5"
+        versionCode 6
+        versionName "0.0.6"
 
         buildConfigField "String", "REACT_NATIVE_RELEASE_LEVEL", "\"${findProperty('reactNativeReleaseLevel') ?: 'stable'}\""
     }
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 131a5a4..3b76971 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -3,6 +3,8 @@
     <item name="android:enforceNavigationBarContrast" tools:targetApi="29">true</item>
     <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
     <item name="colorPrimary">@color/colorPrimary</item>
+    <item name="android:statusBarColor">@android:color/transparent</item>
+    <item name="android:navigationBarColor">@android:color/transparent</item>
   </style>
   <style name="Theme.App.SplashScreen" parent="Theme.SplashScreen">
     <item name="windowSplashScreenBackground">@color/splashscreen_background</item>
diff --git a/android/gradlew b/android/gradlew
old mode 100644
new mode 100755