Updated Compose version, updated Github workflow

Author: Mike Lau

.github/workflows/main.yml

@@ -1,53 +1,76 @@
-name: main
-'on':
+name: Build and Upload APK
+
+on:
   push:
     tags:
-      - '*'
+      - 'v*'
+
+permissions:
+  contents: write
+
 jobs:
-  apk:
-    name: Generate APK
+  build:
+    name: Build Pokedex App
     runs-on: ubuntu-latest
+
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2.4.0
-      - name: Setup JDK
-        uses: actions/setup-java@v2.5.0
+      # Checkout the repository
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Extract versionName and versionCode from the tag
+      - name: Extract version info
+        id: extract_version
+        run: |
+          TAG_NAME=${GITHUB_REF#refs/tags/}
+          VERSION_NAME=$(echo $TAG_NAME | sed 's/^v//' | cut -d'-' -f1)
+          VERSION_CODE=$(echo $TAG_NAME | cut -d'-' -f2)
+          echo "VERSION_NAME=$VERSION_NAME" >> $GITHUB_ENV
+          echo "VERSION_CODE=$VERSION_CODE" >> $GITHUB_ENV
+
+      # Set up JDK for Android
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          distribution: temurin
           java-version: '17'
-      - name: Set execution flag for gradlew
-        run: chmod +x gradlew
+          distribution: 'temurin'
+
+      # Set up Android SDK
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
+      # Build the APK with versionName and versionCode
       - name: Build APK
-        run: bash ./gradlew assembleDebug --stacktrace
-      - name: Upload APK
-        uses: actions/upload-artifact@v1
-        with:
-          name: apk
-          path: app/build/outputs/apk/debug/app-debug.apk
-  release:
-    name: Release APK
-    needs: apk
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download APK from build
-        uses: actions/download-artifact@v1
-        with:
-          name: apk
+        run: |
+          ./gradlew assembleDebug -PversionName=$VERSION_NAME -PversionCode=$VERSION_CODE
+
+      # Find the generated APK file
+      - name: Find APK
+        id: find_apk
+        run: |
+          APK_PATH=$(find app/build/outputs/apk -name "app-*.apk" | head -n 1)
+          echo "APK_PATH=$APK_PATH" >> $GITHUB_ENV
+          echo "APK_NAME=$(basename $APK_PATH)" >> $GITHUB_ENV
+
+      # Create a GitHub Release
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
         with:
           tag_name: ${{ github.ref_name }}
-          release_name: '${{ github.event.repository.name }} v${{ github.ref_name }}'
-      - name: Upload Release APK
-        id: upload_release_asset
-        uses: actions/upload-release-asset@v1.0.1
+          release_name: Release ${{ github.ref_name }}
+          draft: false
+          prerelease: false
         env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      # Upload APK to GitHub Release
+      - name: Upload APK to Release
+        uses: actions/upload-release-asset@v1
         with:
-          upload_url: '${{ steps.create_release.outputs.upload_url }}'
-          asset_path: apk/app-debug.apk
-          asset_name: '${{ github.event.repository.name }}.apk'
-          asset_content_type: application/zip
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ${{ env.APK_PATH }}
+          asset_name: ${{ env.APK_NAME }}
+          asset_content_type: application/vnd.android.package-archive
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

app/build.gradle.kts

@@ -16,8 +16,18 @@ android {
         applicationId = "com.mikelau.pokedex"
         minSdk = 24
         targetSdk = 36
-        versionCode = 3
-        versionName = "2.1.0"
+
+        versionName = if (project.hasProperty("versionName")) {
+            project.property("versionName") as String
+        } else {
+            "2.2.0"
+        }
+
+        versionCode = if (project.hasProperty("versionCode")) {
+            (project.property("versionCode") as String).toInt()
+        } else {
+            5
+        }
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

feature/pokemon/ui/src/main/java/com/mikelau/feature/pokemon/ui/screen/PokemonViewModel.kt

@@ -54,7 +54,7 @@ class PokemonViewModel @Inject constructor(private val getPokemonListUseCase: Ge
                         })
                     } else if(_query.value.isNotBlank()) {
                         _pokemonList.value = PokemonStateHolder(data = it.data?.filter {
-                                filter -> filter.name.contains(_query.value)
+                                filter -> filter.name.contains(_query.value.lowercase())
                         })
                     } else {
                         _pokemonList.value = PokemonStateHolder(data = it.data)

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ androidx-test-ext-junit = "1.2.1"
 espresso-core = "3.6.1"
 lifecycle-runtime-ktx = "2.8.7"
 activity-compose = "1.10.1"
-compose-bom = "2025.04.00"
+compose-bom = "2025.04.01"
 appcompat = "1.7.0"
 material = "1.12.0"
 retrofit = "2.11.0"