Merge trunk into upstream

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,18 +1,17 @@
 name: Bug report
 description: Create a report to help us address issues you are facing with the app.
 title: "[BUG] "
-labels: [bug]
+labels: [ bug ]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        Thanks for taking the time to file this issue! Here are a few things to check before clicking the submit button :)
-        1. Make sure you're on the latest version of the app. The current release can be found here: https://github.com/LawnchairLauncher/lawnchair/releases.
-        2. Read the FAQ to check if it's one of the common issues you can encounter in the launcher; if it is, please don't create an issue about it. https://lawnchair.app/faq.
-        3. Search through **both** [open and closed issues](https://github.com/LawnchairLauncher/lawnchair/issues?q=is%3Aissue+sort%3Aupdated-desc+) for your bug.
-        4. ALWAYS fill this template. If you fail to do so, your issue will be immediately closed with no response. Maintaining open source projects for free is hard work, and we expect users to respect that time and effort by putting in a little bit of their own. That helps us fix these problems faster and in return you get a better app — everybody wins.
-
-        Note: If this issue is inactive for 90 days, it'll be marked as stale.
+      label: Checklist
+      description: Ensure you are using the latest build.
+      options:
+        - label: No one has submitted a similar or identical bug report before.
+          required: true
+        - label: Please check if the same issue is presented in [the upstream nightly artifact](https://github.com/LawnchairLauncher/lawnchair/releases/tag/nightly). If so, please file the issue to that repository instead.
+          required: true
 
   - type: textarea
     id: bug-description
@@ -21,54 +20,3 @@ body:
       description: A clear and concise description of what the bug is.
     validations:
       required: true
-
-  - type: textarea
-    id: steps-to-reproduce
-    attributes:
-      label: Steps to reproduce
-      description: Steps to reproduce the bug
-      value: |
-        Steps to reproduce the behavior:
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. See error
-    validations:
-      required: true
-
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: Expected behavior
-      description: A clear and concise description of what you expected to happen.
-    validations:
-      required: true
-
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots
-      description: If applicable, add screenshots to help explain your problem.
-    validations:
-      required: false
-
-  - type: textarea
-    id: device-info
-    attributes:
-      label: Device information
-      description: Provide details about your device, OS, app version, etc.
-      value: |
-        - Device: [e.g. Google Pixel 6]
-        - OS: [e.g. stock ROM Android version 12.0]
-        - App version: [e.g. 12.1.0 Alpha 4]
-    validations:
-      required: true
-
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
-      placeholder: If this is a crash report, you can paste or link the crash message in here.
-    validations:
-      required: false

.github/workflows/ci.yml

@@ -3,33 +3,32 @@ name: CI
 on:
   push:
     branches:
-      - '*-dev'
+      - trunk
     paths-ignore:
       - '.idea/**'
       - '.gitattributes'
       - '.github/**.json'
       - '.gitignore'
-      - '.gitmodules'
       - '**.md'
       - 'LICENSE'
       - 'NOTICE'
   pull_request:
+    branches:
+      - trunk
     paths-ignore:
       - '.idea/**'
       - '.gitattributes'
       - '.github/**.json'
       - '.gitignore'
-      - '.gitmodules'
       - '**.md'
       - 'LICENSE'
       - 'NOTICE'
-  workflow_dispatch:
-  workflow_call:
 
 jobs:
-  build-debug-apk:
+  build:
     runs-on: ubuntu-latest
-    continue-on-error: true
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v4
         with:
@@ -42,23 +41,14 @@ jobs:
         with:
           cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
           gradle-home-cache-cleanup: true
-      - name: Write sign info
-        if: github.repository_owner == 'LawnchairLauncher'
-        run: |
-          if [ ! -z "${{ secrets.KEYSTORE }}" ]; then
-            echo storePassword='${{ secrets.KEYSTORE_PASSWORD }}' >> keystore.properties
-            echo keyAlias='${{ secrets.KEY_ALIAS }}' >> keystore.properties
-            echo keyPassword='${{ secrets.KEY_PASSWORD }}' >> keystore.properties
-            echo storeFile='${{ github.workspace }}/key.jks' >> keystore.properties
-            echo ${{ secrets.KEYSTORE }} | base64 --decode > ${{ github.workspace }}/key.jks
-          fi
-      - name: Build debug APK
-        run: ./gradlew assembleLawnWithQuickstepGithubDebug assembleLawnWithQuickstepMarketDebug
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
+      - run: ./gradlew assembleLawnWithQuickstepRelease
+      - uses: actions/upload-artifact@v4
+        if: github.ref == 'refs/heads/trunk' && github.event_name == 'push'
         with:
-          name: Debug APK
-          path: build/outputs/apk/**/*.apk
+          name: Release APK
+          path: |
+            build/outputs/apk/lawnWithQuickstep/release/*.apk
+            build/outputs/mapping/lawnWithQuickstepRelease/mapping.txt
 
   check-style:
     runs-on: ubuntu-latest
@@ -75,67 +65,20 @@ jobs:
           gradle-home-cache-cleanup: true
       - run: ./gradlew spotlessCheck
 
-  send-notifications:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'LawnchairLauncher'
-    needs: build-debug-apk
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-          fetch-depth: 0
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-      - name: Install Python packages
-        run: |
-          python -m pip install --upgrade pip
-          pip install gitpython requests
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: Debug APK
-          path: artifacts/debug-apk
-      - name: Send notifications
-        run: python ci.py
-        env:
-          GITHUB_EVENT_BEFORE: ${{ github.event.before }}
-          TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_CI_BOT_TOKEN }}
-          TELEGRAM_CI_CHANNEL_ID: ${{ secrets.TELEGRAM_CI_CHANNEL_ID }}
-          TELEGRAM_TEAM_GROUP_ID: ${{ secrets.NOTIFY_CHANNEL_ID }}
-          ARTIFACT_DIRECTORY: artifacts/debug-apk
-          GITHUB_REF: ${{ github.ref }}
-          ACTION: internal_notifications
-
-  crowdin-auto-merge:
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.user.login == 'lawnchair-bot' && github.event.pull_request.title == 'New Crowdin translations by Github Action'
-    needs: build-debug-apk
-    steps:
-      - env:
-          GH_TOKEN: ${{ secrets.LAWNCHAIR_BOT_TOKEN }}
-          PR_URL: ${{ github.event.pull_request.html_url }}
-        run: |
-          gh pr comment $PR_URL --body "No issues found, auto-merging the Crowdin pull request."
-          gh pr merge $PR_URL --auto --squash --delete-branch
-
   nightly-release:
     runs-on: ubuntu-latest
-    if: github.repository_owner == 'LawnchairLauncher' && github.event_name == 'push' && github.ref == 'refs/heads/14-dev'
-    needs: build-debug-apk
+    if: github.repository_owner == 'Goooler' && github.ref == 'refs/heads/trunk' && github.event_name == 'push'
+    needs: build
     permissions:
       contents: write
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
-      # Note the # and () symbols are not supported in GitHub Release filenames, even manually
-      - name: Export APK_NAME for later use
-        run: echo "APK_NAME=Lawnchair.Debug.${{ github.ref_name }}.Nightly-CI_${{ github.run_number }}-$(echo ${{ github.sha }} | cut -c1-7).apk" >> $GITHUB_ENV
-      - name: Rename .apk file
-        run: mv "./Debug APK/lawnWithQuickstepGithub/debug/"*.apk "./$APK_NAME"
+      - name: Generate release name with current date
+        run: echo "RELEASE_NAME=14.0.0-$(date +'%Y%m%d')" >> $GITHUB_ENV
       - name: Delete release if exist then create release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh release view "nightly" && gh release delete "nightly" -y --cleanup-tag
-          gh release create "nightly" "./$APK_NAME" -p -t "Lawnchair Nightly" --generate-notes
+          gh release view ${{ env.RELEASE_NAME }} && gh release delete "nightly" -y --cleanup-tag
+          gh release create ${{ env.RELEASE_NAME }} "./Release APK/apk/lawnWithQuickstep/release/"*.apk "./Release APK/mapping/lawnWithQuickstepRelease/"mapping.txt -t ${{ env.RELEASE_NAME }} --generate-notes