fix(Compose): Adjusted universal patches safeguard and warnings (#2550 )

feat(Compose): hide developer settings (#2551 )
fix: handle edge-to-edge properly in fullscreen dialogs
2025-05-18 15:06:45 +08:00 · 2025-05-17 21:33:02 +02:00 · 2025-05-15 20:56:25 +02:00 · 2025-05-14 20:23:23 +02:00 · 2025-05-14 19:55:09 +02:00 · 2025-05-14 19:34:05 +02:00
60 changed files with 1185 additions and 804 deletions
--- a/.github/ISSUE_TEMPLATE/bug-issue.yml
+++ b/.github/ISSUE_TEMPLATE/bug-issue.yml
@ -1,61 +0,0 @@
-name: 🐞 Bug report
-description: Create a new bug report.
-title: 'bug: <title>'
-labels: [bug]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # ReVanced Manager bug report
-
-        Please check for existing issues [here](https://github.com/revanced/revanced-manager/labels/bug) before creating a new one.
-  - type: textarea
-    attributes:
-      label: Bug description
-      description: |
-        - Describe your bug in detail
-        - Add steps to reproduce the bug if possible (Step 1. Download some files. Step 2. ...)
-        - Add images and videos if possible
-        - List selected patches if applicable
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Version of ReVanced Manager and version & name of application you tried to patch
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: Installation type
-      options:
-        - Non-root
-        - Root
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Device logs
-      description: Export logs in ReVanced Manager settings.
-      render: shell
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Patcher logs
-      description: Export logs in "Patcher" screen.
-      render: shell
-    validations:
-      required: false
-  - type: checkboxes
-    attributes:
-      label: Acknowledgements
-      description: Your issue will be closed if you don't follow the checklist below!
-      options:
-        - label: This request is not a duplicate of an existing issue.
-          required: true
-        - label: I have chosen an appropriate title.
-          required: true
-        - label: All requested information has been provided properly.
-          required: true
-        - label: The issue is solely related to the ReVanced Manager
-          required: true
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -0,0 +1,109 @@
+name: 🐞 Bug report
+description: Report a bug or an issue.
+title: 'bug: '
+labels: ['Bug report']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        <p align="center">
+          <picture>
+            <source
+              width="256px"
+              media="(prefers-color-scheme: dark)"
+              srcset="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-headline/revanced-headline-vertical-dark.svg"
+            >
+            <img 
+              width="256px"
+              src="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-headline/revanced-headline-vertical-light.svg"
+            >
+          </picture>
+          <br>
+          <a href="https://revanced.app/">
+             <picture>
+                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-logo/revanced-logo.svg" />
+                 <img height="24px" src="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-logo/revanced-logo.svg" />
+             </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://github.com/ReVanced">
+               <picture>
+                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+                   <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+               </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="http://revanced.app/discord">
+               <picture>
+                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+               </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://reddit.com/r/revancedapp">
+               <picture>
+                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+               </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://t.me/app_revanced">
+              <picture>
+                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+              </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://x.com/revancedapp">
+              <picture>
+                 <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+                 <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+              </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://www.youtube.com/@ReVanced">
+              <picture>
+                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+             </picture>
+           </a>
+           <br>
+           <br>
+           Continuing the legacy of Vanced
+        </p>
+
+        # ReVanced Manager bug report
+
+        Before creating a new bug report, please keep the following in mind:
+
+        - **Do not submit a duplicate bug report**: Search for existing bug reports [here](https://github.com/ReVanced/revanced-manager/issues?q=label%3A%22Bug+report%22).
+        - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-manager/blob/main/CONTRIBUTING.md).
+        - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
+  - type: textarea
+    attributes:
+      label: Bug description
+      description: |
+        - Describe your bug in detail
+        - Add steps to reproduce the bug if possible (Step 1. ... Step 2. ...)
+        - Add images and videos if possible
+        - List used patches, downloader and settings if applicable
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Patch logs
+      description: Patch logs can be exported by clicking on the "Logs" button in the "Patcher" screen, when patching finishes.
+      render: shell
+  - type: textarea
+    attributes:
+      label: Debug logs
+      description: Debug logs can be exported by clicking on  "Export debug logs" in "Settings" > "Advanced".
+    validations:
+      required: true
+  - type: checkboxes
+    attributes:
+      label: Acknowledgements
+      description: Your bug report will be closed if you don't follow the checklist below.
+      options:
+        - label: I have checked all open and closed bug reports and this is not a duplicate.
+          required: true
+        - label: I have chosen an appropriate title.
+          required: true
+        - label: All requested information has been provided properly.
+          required: true
+        - label: The bug is only related to ReVanced Manager.
+          required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1 +1,5 @@
-blank_issues_enabled: false
+blank_issues_enabled: false
+contact_links:
+  - name: 🗨 Discussions
+    url: https://github.com/revanced/revanced-suggestions/discussions
+    about: Have something unspecific to ReVanced Manager in mind? Search for or start a new discussion!
--- a/.github/ISSUE_TEMPLATE/feature-issue.yml
+++ b/.github/ISSUE_TEMPLATE/feature-issue.yml
@ -1,42 +0,0 @@
-name: ⭐ Feature request
-description: Create a new feature request.
-title: 'feat: <title>'
-labels: [feature request]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # ReVanced Manager feature request
-
-        Please check for existing feature requests [here](https://github.com/revanced/revanced-manager/labels/bug) before creating a new one.
-  - type: textarea
-    attributes:
-      label: Feature description
-      description: Describe your feature in detail.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Motivation
-      description: Explain why the lack of it is a problem.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: In case there is something else you want to add.
-    validations:
-      required: false
-  - type: checkboxes
-    attributes:
-      label: Acknowledgements
-      description: Your issue will be closed if you don't follow the checklist below!
-      options:
-        - label: This request is not a duplicate of an existing issue.
-          required: true
-        - label: I have chosen an appropriate title.
-          required: true
-        - label: All requested information has been provided properly.
-          required: true
-        - label: The issue is solely related to the ReVanced Manager
-          required: true
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@ -0,0 +1,103 @@
+body:
+  - type: markdown
+    attributes:
+      value: |
+        <p align="center">
+          <picture>
+            <source
+              width="256px"
+              media="(prefers-color-scheme: dark)"
+              srcset="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-headline/revanced-headline-vertical-dark.svg"
+            >
+            <img 
+              width="256px"
+              src="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-headline/revanced-headline-vertical-light.svg"
+            >
+          </picture>
+          <br>
+          <a href="https://revanced.app/">
+             <picture>
+                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-logo/revanced-logo.svg" />
+                 <img height="24px" src="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-logo/revanced-logo.svg" />
+             </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://github.com/ReVanced">
+               <picture>
+                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+                   <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+               </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="http://revanced.app/discord">
+               <picture>
+                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+               </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://reddit.com/r/revancedapp">
+               <picture>
+                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+               </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://t.me/app_revanced">
+              <picture>
+                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+              </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://x.com/revancedapp">
+              <picture>
+                 <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+                 <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+              </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://www.youtube.com/@ReVanced">
+              <picture>
+                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+             </picture>
+           </a>
+           <br>
+           <br>
+           Continuing the legacy of Vanced
+        </p>
+
+        # ReVanced Manager feature request
+
+        Before creating a new feature request, please keep the following in mind:
+
+        - **Do not submit a duplicate feature request**: Search for existing feature requests [here](https://github.com/ReVanced/revanced-manager/issues?q=label%3A%22Feature+request%22).
+        - **Review the contribution guidelines**: Make sure your feature request adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-manager/blob/main/CONTRIBUTING.md).
+        - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
+  - type: textarea
+    attributes:
+      label: Feature description
+      description: |
+        - Describe your feature in detail
+        - Add images, videos, links, examples, references, etc. if possible
+  - type: textarea
+    attributes:
+      label: Motivation
+      description: |
+        A strong motivation is necessary for a feature request to be considered.
+        
+        - Why should this feature be implemented? 
+        - What is the explicit use case?
+        - What are the benefits?
+        - What makes this feature important?
+    validations:
+      required: true
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Your feature request will be closed if you don't follow the checklist below.
+      options:
+        - label: I have checked all open and closed feature requests and this is not a duplicate
+          required: true
+        - label: I have chosen an appropriate title.
+          required: true
+        - label: All requested information has been provided properly.
+          required: true
+        - label: The feature request is only related to ReVanced Manager.
+          required: true
--- a/.github/config.yaml
+++ b/.github/config.yaml
@ -1,2 +1,2 @@
 firstPRMergeComment: >
-  ❤️ Thank you for contributing to ReVanced Manager. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.
+  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) to receive a role for your contribution.
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@ -0,0 +1,25 @@
+name: Build pull request
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - dev
+
+jobs:
+  release:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Cache Gradle
+        uses: burrunan/gradle-cache-action@v1
+
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew build --no-daemon
--- a/.github/workflows/open_pull_request.yml
+++ b/.github/workflows/open_pull_request.yml
@ -0,0 +1,26 @@
+name: Open a PR to main
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+env:
+  MESSAGE: Merge branch `${{ github.head_ref || github.ref_name }}` to `main`
+
+jobs:
+  pull-request:
+    name: Open pull request
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Open pull request
+        uses: repo-sync/pull-request@v2
+        with:
+          destination_branch: 'main'
+          pr_title: 'chore: ${{ env.MESSAGE }}'
+          pr_body: 'This pull request will ${{ env.MESSAGE }}.'
+          pr_draft: true
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@ -1,44 +0,0 @@
-name: Build pull request
-
-on:
-  pull_request:
-    paths:
-      - ".github/workflows/pr-build.yml"
-      - "app/**"
-      - "gradle/**"
-      - "*.properties"
-      - ".kts"
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v4
-
-      - name: Build with Gradle
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew assembleRelease --no-daemon -PnoProguard -PsignAsDebug
-
-      - name: Set env
-        run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-
-      - name: Add hash to APK
-        run: mv app/build/outputs/apk/release/app-release.apk revanced-manager-${{ env.COMMIT_HASH }}.apk
-
-      - name: Upload build
-        uses: actions/upload-artifact@v4
-        with:
-          name: revanced-manager
-          path: revanced-manager-${{ env.COMMIT_HASH }}.apk
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@ -1,57 +0,0 @@
-name: Release Build
-
-on:
-  push:
-    tags:
-      - "v*"
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      attestations: write
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set env
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v4
-
-      - name: Build with Gradle
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew assembleRelease --no-daemon
-
-      - name: Sign APK
-        id: sign_apk
-        uses: ilharp/sign-android-release@v1
-        with:
-          releaseDir: ./app/build/outputs/apk/release/
-          signingKey: ${{ secrets.SIGNING_KEYSTORE }}
-          keyStorePassword: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
-          keyAlias: ${{ secrets.SIGNING_KEY_ALIAS }}
-          keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
-
-      - name: Add version to APK
-        run: mv ${{ steps.sign_apk.outputs.signedFile }} revanced-manager-${{ env.RELEASE_VERSION }}.apk
-
-      - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@v1
-        with:
-          subject-path: revanced-manager-${{ env.RELEASE_VERSION }}.apk
-
-      - name: Publish release APK
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          prerelease: false
-          files: revanced-manager-${{ env.RELEASE_VERSION }}.apk
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -0,0 +1,64 @@
+name: Release
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - dev
+
+jobs:
+  release:
+    name: Release
+    permissions:
+      contents: write
+      id-token: write
+      attestations: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Cache Gradle
+        uses: burrunan/gradle-cache-action@v1
+
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew assembleRelease
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Setup keystore
+        run: |
+          echo "${{ secrets.KEYSTORE }}" | base64 --decode > "app/keystore.jks"
+
+      - name: Semantic Release
+        uses: cycjimmy/semantic-release-action@v4
+        id: semantic
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEYSTORE_ENTRY_ALIAS: ${{ secrets.KEYSTORE_ENTRY_ALIAS }}
+          KEYSTORE_ENTRY_PASSWORD: ${{ secrets.KEYSTORE_ENTRY_PASSWORD }}
+
+      - name: Attest
+        if: steps.semantic.outputs.new_release_published == 'true'
+        uses: actions/attest-build-provenance@v2
+        with:
+          subject-path: build/app/outputs/apk/release/revanced-manager-*.apk
--- a/.github/workflows/update_documentation.yml
+++ b/.github/workflows/update_documentation.yml
@ -16,4 +16,4 @@ jobs:
          token: ${{ secrets.DOCUMENTATION_REPO_ACCESS_TOKEN  }}
          repository: revanced/revanced-documentation
          event-type: update-documentation
-          client-payload: '{"repo": "${{ github.event.repository.name }}", "ref": "${{ github.ref }}"}'
+          client-payload: '{"repo": "${{ github.event.repository.name }}", "ref": "${{ github.ref }}"}'
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -58,20 +58,46 @@
   Continuing the legacy of Vanced
 </p>

-# 🔒 Security Policy
+# 👋 Contribution guidelines

-This document describes how to report security vulnerabilities for ReVanced Manager.
+This document describes how to contribute to ReVanced Manager.

-## 🚨 Reporting a Vulnerability
+## 📖 Resources to help you get started

-Please open an issue in our [advisory tracker](https://github.com/ReVanced/revanced-manager/security/advisories/new) or reach out privately to us on [Discord](https://discord.gg/revanced).
+* The [documentation](/docs/README.md) provides steps to build ReVanced Manager from source
+* Our [backlog](https://github.com/orgs/ReVanced/projects/12) is where we keep track of what we're working on
+* [Issues](https://github.com/ReVanced/revanced-manager/issues) are where we keep track of bugs and feature requests

-If a vulnerability is confirmed and accepted, you can join our [Discord](https://discord.gg/revanced) server to receive a special contributor role.
+## 🙏 Submitting a feature request

-### ⏳ Supported Versions
+Features can be requested by opening an issue using the
+[Feature request issue template](https://github.com/ReVanced/revanced-manager/issues/new?assignees=&labels=Feature+request&projects=&template=feature_request.yml&title=feat%3A+).

-| Version                                                                                                                                 | Branch      | Supported          |
-| --------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------------------ |
-| ![Latest stable release](https://img.shields.io/github/v/release/ReVanced/revanced-manager?style=for-the-badge "Latest stable release") | main        | :white_check_mark: |
-| ![Latest version](https://img.shields.io/badge/version-latest-brightgreen?style=for-the-badge "Latest version")                         | dev         | :white_check_mark: |
-| ![Latest version](https://img.shields.io/badge/version-latest-brightgreen?style=for-the-badge "Latest version")                         | compose-dev | :white_check_mark: |
+> **Note**
+> Requests can be accepted or rejected at the discretion of maintainers of ReVanced Manager.
+> Good motivation has to be provided for a request to be accepted.
+
+## 🐞 Submitting a bug report
+
+If you encounter a bug while using ReVanced Manager, open an issue using the
+[Bug report issue template](https://github.com/ReVanced/revanced-manager/issues/new?assignees=&labels=Bug+report&projects=&template=bug_report.yml&title=bug%3A+).
+
+## 📝 How to contribute
+
+1. Before contributing, it is recommended to open an issue to discuss your change
+   with the maintainers of ReVanced Manager. This will help you determine whether your change is acceptable
+   and whether it is worth your time to implement it
+2. Development happens on the `dev` branch. Fork the repository and create your branch from `dev`
+3. Commit your changes
+4. Submit a pull request to the `dev` branch of the repository and reference issues
+   that your pull request closes in the description of your pull request
+5. Our team will review your pull request and provide feedback. Once your pull request is approved,
+   it will be merged into the `dev` branch and will be included in the next release of ReVanced Manager
+
+## 🤚 I want to contribute but don't know how to code
+
+Even if you don't know how to code, you can still contribute by
+translating ReVanced Manager on [Crowdin](https://translate.revanced.app/).
+
+❤️ Thank you for considering contributing to ReVanced Manager,  
+ReVanced
--- a/README.md
+++ b/README.md
@ -1,55 +1,104 @@
-# ReVanced Manager (Compose Rewrite)
+<p align="center">
+  <picture>
+    <source
+      width="256px"
+      media="(prefers-color-scheme: dark)"
+      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
+    >
+    <img 
+      width="256px"
+      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
+    >
+  </picture>
+  <br>
+  <a href="https://revanced.app/">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
+           <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://github.com/ReVanced">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="http://revanced.app/discord">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://reddit.com/r/revancedapp">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://t.me/app_revanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://x.com/revancedapp">
+      <picture>
+         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://www.youtube.com/@ReVanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+     </picture>
+   </a>
+   <br>
+   <br>
+   Continuing the legacy of Vanced
+</p>

-[![GitHub license](https://img.shields.io/github/license/revanced/revanced-manager)](../../blob/main/LICENSE)
-[![GitHub last commit](https://img.shields.io/github/last-commit/revanced/revanced-manager/compose-dev)](https://github.com/ReVanced/revanced-manager/commits/compose-dev)
-[![GitHub commit activity](https://img.shields.io/github/commit-activity/w/revanced/revanced-manager/compose-dev)](https://github.com/ReVanced/revanced-manager/commits/compose-dev)
+# 💊 ReVanced Manager

-_(Yet another)_ rewrite of the ReVanced Manager using Kotlin and Jetpack Compose.
+![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/ReVanced/revanced-manager/release.yml)
+![GPLv3 License](https://img.shields.io/badge/License-GPL%20v3-yellow.svg)

-## Design system
+Application to use ReVanced on Android

-In this rewrite, we are adopting the latest Material Design principles and guidelines by using Material 3 and Material You.
+## ❓ About

-Material Design is a design system developed by Google that provides a unified visual language for building beautiful and consistent user interfaces across all platforms and devices. Material You is an extension of Material Design that provides even more customization options for users, making it possible for them to personalize their device and create a unique look and feel.
+ReVanced Manager is an application that uses [ReVanced Patcher](https://github.com/revanced/revanced-patcher) to patch Android apps.

-### Why Material 3?
+## 💪 Features

-* **Consistent design language**
-* **Improved accessibility**
-* **Better user experience**
+Some of the features ReVanced Manager provides are:

-By using Material 3 and Material You, we are ensuring that the app's user interface is consistent, customizable, accessible, and engaging for our users. This will help to improve the overall user experience and increase user satisfaction with the the manager.
-
-## Technology stack
-
-* Kotlin: Kotlin is a modern and concise programming language that is fully interoperable with Java and provides improved safety, readability, and maintainability compared to Java.
-* Jetpack Compose: Jetpack Compose is a modern UI toolkit for Android development that allows developers to build beautiful and performant user interfaces using declarative programming. It provides a unified and efficient way of building UI that is well-integrated with the Android framework.
-
-## Why Kotlin and Compose?
-
-* **Improved safety:** Kotlin provides improved safety compared to Java, which reduces the likelihood of common programming mistakes that can cause security vulnerabilities or crashes.
-* **Concise and readable code:** Kotlin's concise syntax and expressive type system make the code more readable, which makes it easier for developers to understand and maintain the codebase.
-* **Better performance:** Jetpack Compose uses the power of the Android framework to provide smooth and fast performance, which enhances the user experience.
-* **Modern and efficient UI development:** Jetpack Compose provides a modern and efficient way of building UI, which makes it easier for developers to create beautiful and performant user interfaces.
+- ⬇️ **Download**: Automatically download apps using the ReVanced Manager downloader plugin system
+- 💉 **Patch**: Select and apply patches to any Android app
+- 🛠️ **Customize**: Manage patches, apps, signing, themes, updates, and many more settings

 ## 🔽 Download

-You can obtain ReVanced Manager by downloading it from either [revanced.app/download](https://revanced.app/download) or [GitHub Releases](https://github.com/ReVanced/revanced-manager/releases)
+You can download the most recent version of ReVanced Manager at [revanced.app/download](https://revanced.app/download) or from [GitHub releases](https://github.com/ReVanced/revanced-manager/releases/latest).  
+Learn how to use ReVanced Manager by following the [documentation](/docs).

-## 📝 Prerequisites
+## 📚 Everything else

-For a list of prerequisites, refer to [docs/0_prerequisites.md](docs/0_prerequisites.md)
+### 📙 Contributing

-## 🔴 Issues
+Thank you for considering contributing to ReVanced Manager.
+You can find the contribution guidelines [here](CONTRIBUTING.md).

-For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose).
+### 🛠️ Building

-## 🌐 Translation
+To build a ReVanced Manager, you can follow the [documentation](/docs).

-[![Crowdin](https://badges.crowdin.net/revanced/localized.svg)](https://crowdin.com/project/revanced)
+### 📄 Documentation

-We're accepting translations on [Crowdin](https://translate.revanced.app)
+You can find the documentation for ReVanced Manager [here](/docs).

-## 🛠️ Building Manager from source
+## ⚖️ License

-For instructions on how to build ReVanced Manager from source, refer to [docs/4_building.md](docs/4_building.md)
+ReVanced Manager is licensed under the GPLv3 license. Please see the [license file](LICENSE) for more information.
+[tl;dr](https://www.tldrlegal.com/license/gnu-general-public-license-v3-gpl-3) you may copy, distribute and modify ReVanced Manager as long as you track changes/dates in source files.
+Any modifications to ReVanced Manager must also be made available under the GPL, along with build & install instructions.
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -59,164 +59,164 @@ android {

            buildConfigField("long", "BUILD_ID", "0L")
        }
+    }

-        compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_17
-            targetCompatibility = JavaVersion.VERSION_17
-        }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }

-        dependenciesInfo {
-            includeInApk = false
-            includeInBundle = false
-        }
+    dependenciesInfo {
+        includeInApk = false
+        includeInBundle = false
+    }

-        packaging {
-            resources.excludes.addAll(
-                listOf(
-                    "/prebuilt/**",
-                    "META-INF/DEPENDENCIES",
-                    "META-INF/**.version",
-                    "DebugProbesKt.bin",
-                    "kotlin-tooling-metadata.json",
-                    "org/bouncycastle/pqc/**.properties",
-                    "org/bouncycastle/x509/**.properties",
-                )
+    packaging {
+        resources.excludes.addAll(
+            listOf(
+                "/prebuilt/**",
+                "META-INF/DEPENDENCIES",
+                "META-INF/**.version",
+                "DebugProbesKt.bin",
+                "kotlin-tooling-metadata.json",
+                "org/bouncycastle/pqc/**.properties",
+                "org/bouncycastle/x509/**.properties",
            )
-            jniLibs {
-                useLegacyPackaging = true
-            }
-        }
-
-        ksp {
-            arg("room.schemaLocation", "$projectDir/schemas")
-        }
-
-        kotlinOptions {
-            jvmTarget = "17"
-        }
-
-        buildFeatures {
-            compose = true
-            aidl = true
-            buildConfig = true
-        }
-
-        android {
-            androidResources {
-                generateLocaleConfig = true
-            }
-        }
-
-        externalNativeBuild {
-            cmake {
-                path = file("src/main/cpp/CMakeLists.txt")
-                version = "3.22.1"
-            }
+        )
+        jniLibs {
+            useLegacyPackaging = true
        }
    }

-    kotlin {
-        jvmToolchain(17)
+    ksp {
+        arg("room.schemaLocation", "$projectDir/schemas")
    }

-    dependencies {
+    kotlinOptions {
+        jvmTarget = "17"
+    }

-        // AndroidX Core
-        implementation(libs.androidx.ktx)
-        implementation(libs.runtime.ktx)
-        implementation(libs.runtime.compose)
-        implementation(libs.splash.screen)
-        implementation(libs.activity.compose)
-        implementation(libs.work.runtime.ktx)
-        implementation(libs.preferences.datastore)
-        implementation(libs.appcompat)
+    buildFeatures {
+        compose = true
+        aidl = true
+        buildConfig = true
+    }

-        // Compose
-        implementation(platform(libs.compose.bom))
-        implementation(libs.compose.ui)
-        implementation(libs.compose.ui.preview)
-        implementation(libs.compose.ui.tooling)
-        implementation(libs.compose.livedata)
-        implementation(libs.compose.material.icons.extended)
-        implementation(libs.compose.material3)
-        implementation(libs.navigation.compose)
+    android {
+        androidResources {
+            generateLocaleConfig = true
+        }
+    }

-        // Accompanist
-        implementation(libs.accompanist.drawablepainter)
-
-        // Placeholder
-        implementation(libs.placeholder.material3)
-
-        // HTML Scraper
-        implementation(libs.skrapeit.dsl)
-        implementation(libs.skrapeit.parser)
-
-        // Coil (async image loading, network image)
-        implementation(libs.coil.compose)
-        implementation(libs.coil.appiconloader)
-
-        // KotlinX
-        implementation(libs.kotlinx.serialization.json)
-        implementation(libs.kotlinx.collection.immutable)
-        implementation(libs.kotlinx.datetime)
-
-        // Room
-        implementation(libs.room.runtime)
-        implementation(libs.room.ktx)
-        annotationProcessor(libs.room.compiler)
-        ksp(libs.room.compiler)
-
-        // ReVanced
-        implementation(libs.revanced.patcher)
-        implementation(libs.revanced.library)
-
-        // Downloader plugins
-        implementation(libs.plugin.api)
-
-        // Native processes
-        implementation(libs.kotlin.process)
-
-        // HiddenAPI
-        compileOnly(libs.hidden.api.stub)
-
-        // LibSU
-        implementation(libs.libsu.core)
-        implementation(libs.libsu.service)
-        implementation(libs.libsu.nio)
-
-        // Koin
-        implementation(libs.koin.android)
-        implementation(libs.koin.compose)
-        implementation(libs.koin.compose.navigation)
-        implementation(libs.koin.workmanager)
-
-        // Licenses
-        implementation(libs.about.libraries)
-
-        // Ktor
-        implementation(libs.ktor.core)
-        implementation(libs.ktor.logging)
-        implementation(libs.ktor.okhttp)
-        implementation(libs.ktor.content.negotiation)
-        implementation(libs.ktor.serialization)
-
-        // Markdown
-        implementation(libs.markdown.renderer)
-
-        // Fading Edges
-        implementation(libs.fading.edges)
-
-        // Scrollbars
-        implementation(libs.scrollbars)
-
-        // EnumUtil
-        implementation(libs.enumutil)
-        ksp(libs.enumutil.ksp)
-
-        // Reorderable lists
-        implementation(libs.reorderable)
-
-        // Compose Icons
-        implementation(libs.compose.icons.fontawesome)
+    externalNativeBuild {
+        cmake {
+            path = file("src/main/cpp/CMakeLists.txt")
+            version = "3.22.1"
+        }
    }
 }
+
+kotlin {
+    jvmToolchain(17)
+}
+
+dependencies {
+
+    // AndroidX Core
+    implementation(libs.androidx.ktx)
+    implementation(libs.runtime.ktx)
+    implementation(libs.runtime.compose)
+    implementation(libs.splash.screen)
+    implementation(libs.activity.compose)
+    implementation(libs.work.runtime.ktx)
+    implementation(libs.preferences.datastore)
+    implementation(libs.appcompat)
+
+    // Compose
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.ui)
+    implementation(libs.compose.ui.preview)
+    implementation(libs.compose.ui.tooling)
+    implementation(libs.compose.livedata)
+    implementation(libs.compose.material.icons.extended)
+    implementation(libs.compose.material3)
+    implementation(libs.navigation.compose)
+
+    // Accompanist
+    implementation(libs.accompanist.drawablepainter)
+
+    // Placeholder
+    implementation(libs.placeholder.material3)
+
+    // HTML Scraper
+    implementation(libs.skrapeit.dsl)
+    implementation(libs.skrapeit.parser)
+
+    // Coil (async image loading, network image)
+    implementation(libs.coil.compose)
+    implementation(libs.coil.appiconloader)
+
+    // KotlinX
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.kotlinx.collection.immutable)
+    implementation(libs.kotlinx.datetime)
+
+    // Room
+    implementation(libs.room.runtime)
+    implementation(libs.room.ktx)
+    annotationProcessor(libs.room.compiler)
+    ksp(libs.room.compiler)
+
+    // ReVanced
+    implementation(libs.revanced.patcher)
+    implementation(libs.revanced.library)
+
+    // Downloader plugins
+    implementation(libs.plugin.api)
+
+    // Native processes
+    implementation(libs.kotlin.process)
+
+    // HiddenAPI
+    compileOnly(libs.hidden.api.stub)
+
+    // LibSU
+    implementation(libs.libsu.core)
+    implementation(libs.libsu.service)
+    implementation(libs.libsu.nio)
+
+    // Koin
+    implementation(libs.koin.android)
+    implementation(libs.koin.compose)
+    implementation(libs.koin.compose.navigation)
+    implementation(libs.koin.workmanager)
+
+    // Licenses
+    implementation(libs.about.libraries)
+
+    // Ktor
+    implementation(libs.ktor.core)
+    implementation(libs.ktor.logging)
+    implementation(libs.ktor.okhttp)
+    implementation(libs.ktor.content.negotiation)
+    implementation(libs.ktor.serialization)
+
+    // Markdown
+    implementation(libs.markdown.renderer)
+
+    // Fading Edges
+    implementation(libs.fading.edges)
+
+    // Scrollbars
+    implementation(libs.scrollbars)
+
+    // EnumUtil
+    implementation(libs.enumutil)
+    ksp(libs.enumutil.ksp)
+
+    // Reorderable lists
+    implementation(libs.reorderable)
+
+    // Compose Icons
+    implementation(libs.compose.icons.fontawesome)
+}
--- a/app/src/main/java/app/revanced/manager/MainActivity.kt
+++ b/app/src/main/java/app/revanced/manager/MainActivity.kt
@ -44,13 +44,13 @@ import app.revanced.manager.ui.screen.SettingsScreen
 import app.revanced.manager.ui.screen.UpdateScreen
 import app.revanced.manager.ui.screen.settings.AboutSettingsScreen
 import app.revanced.manager.ui.screen.settings.AdvancedSettingsScreen
-import app.revanced.manager.ui.screen.settings.ContributorScreen
-import app.revanced.manager.ui.screen.settings.DeveloperOptionsScreen
+import app.revanced.manager.ui.screen.settings.ContributorSettingsScreen
+import app.revanced.manager.ui.screen.settings.DeveloperSettingsScreen
 import app.revanced.manager.ui.screen.settings.DownloadsSettingsScreen
 import app.revanced.manager.ui.screen.settings.GeneralSettingsScreen
 import app.revanced.manager.ui.screen.settings.ImportExportSettingsScreen
-import app.revanced.manager.ui.screen.settings.LicensesScreen
-import app.revanced.manager.ui.screen.settings.update.ChangelogsScreen
+import app.revanced.manager.ui.screen.settings.LicensesSettingsScreen
+import app.revanced.manager.ui.screen.settings.update.ChangelogsSettingsScreen
 import app.revanced.manager.ui.screen.settings.update.UpdatesSettingsScreen
 import app.revanced.manager.ui.theme.ReVancedManagerTheme
 import app.revanced.manager.ui.theme.Theme
@ -164,7 +164,7 @@ private fun ReVancedManager(vm: MainViewModel) {
                        }
                    }
                },
-                vm = koinViewModel { parametersOf(it.getComplexArg<Patcher.ViewModelParams>()) }
+                viewModel = koinViewModel { parametersOf(it.getComplexArg<Patcher.ViewModelParams>()) }
            )
        }

@ -234,7 +234,7 @@ private fun ReVancedManager(vm: MainViewModel) {
                        selectedAppInfoVm.updateConfiguration(patches, options)
                        navController.popBackStack()
                    },
-                    vm = koinViewModel { parametersOf(data) }
+                    viewModel = koinViewModel { parametersOf(data) }
                )
            }

@ -277,8 +277,8 @@ private fun ReVancedManager(vm: MainViewModel) {
                AdvancedSettingsScreen(onBackClick = navController::popBackStack)
            }

-            composable<Settings.DeveloperOptions> {
-                DeveloperOptionsScreen(onBackClick = navController::popBackStack)
+            composable<Settings.Developer> {
+                DeveloperSettingsScreen(onBackClick = navController::popBackStack)
            }

            composable<Settings.Updates> {
@ -305,15 +305,15 @@ private fun ReVancedManager(vm: MainViewModel) {
            }

            composable<Settings.Changelogs> {
-                ChangelogsScreen(onBackClick = navController::popBackStack)
+                ChangelogsSettingsScreen(onBackClick = navController::popBackStack)
            }

            composable<Settings.Contributors> {
-                ContributorScreen(onBackClick = navController::popBackStack)
+                ContributorSettingsScreen(onBackClick = navController::popBackStack)
            }

            composable<Settings.Licenses> {
-                LicensesScreen(onBackClick = navController::popBackStack)
+                LicensesSettingsScreen(onBackClick = navController::popBackStack)
            }

        }
--- a/app/src/main/java/app/revanced/manager/domain/bundles/PatchBundleSource.kt
+++ b/app/src/main/java/app/revanced/manager/domain/bundles/PatchBundleSource.kt
@ -34,7 +34,7 @@ sealed class PatchBundleSource(initialName: String, val uid: Int, directory: Fil

    private val _nameFlow = MutableStateFlow(initialName)
    val nameFlow =
-        _nameFlow.map { it.ifEmpty { app.getString(if (isDefault) R.string.patches_name_default else R.string.patches_name_fallback) } }
+        _nameFlow.map { it.ifEmpty { app.getString(if (isDefault) R.string.bundle_name_default else R.string.bundle_name_fallback) } }

    suspend fun getName() = nameFlow.first()

--- a/app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt
+++ b/app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt
@ -3,6 +3,7 @@ package app.revanced.manager.domain.manager
 import android.content.Context
 import app.revanced.manager.domain.manager.base.BasePreferencesManager
 import app.revanced.manager.ui.theme.Theme
+import app.revanced.manager.util.isDebuggable

 class PreferencesManager(
    context: Context
@ -24,8 +25,10 @@ class PreferencesManager(

    val disablePatchVersionCompatCheck = booleanPreference("disable_patch_version_compatibility_check", false)
    val disableSelectionWarning = booleanPreference("disable_selection_warning", false)
-    val disableUniversalPatchWarning = booleanPreference("disable_universal_patch_warning", false)
+    val disableUniversalPatchCheck = booleanPreference("disable_patch_universal_check", false)
    val suggestedVersionSafeguard = booleanPreference("suggested_version_safeguard", true)

    val acknowledgedDownloaderPlugins = stringSetPreference("acknowledged_downloader_plugins", emptySet())
+
+    val showDeveloperSettings = booleanPreference("show_developer_settings", context.isDebuggable)
 }
--- a/app/src/main/java/app/revanced/manager/domain/repository/PatchBundleRepository.kt
+++ b/app/src/main/java/app/revanced/manager/domain/repository/PatchBundleRepository.kt
@ -165,7 +165,7 @@ class PatchBundleRepository(
        getBundlesByType<RemotePatchBundle>().forEach { it.downloadLatest() }

    suspend fun updateCheck() =
-        uiSafe(app, R.string.patches_download_fail, "Failed to update bundles") {
+        uiSafe(app, R.string.source_download_fail, "Failed to update bundles") {
            coroutineScope {
                if (!networkInfo.isSafe()) {
                    Log.d(tag, "Skipping update check because the network is down or metered.")
--- a/app/src/main/java/app/revanced/manager/patcher/runtime/ProcessRuntime.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/runtime/ProcessRuntime.kt
@ -111,6 +111,7 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
        }

        val patching = CompletableDeferred<Unit>()
+        val scope = this

        launch(Dispatchers.IO) {
            val binder = awaitBinderConnection()
@ -124,7 +125,7 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
                override fun log(level: String, msg: String) = logger.log(enumValueOf(level), msg)

                override fun patchSucceeded() {
-                    launch { onPatchCompleted() }
+                    scope.launch { onPatchCompleted() }
                }

                override fun progress(name: String?, state: String?, msg: String?) =
@ -179,7 +180,7 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
    }

    /**
-     * An [Exception] occured in the remote process while patching.
+     * An [Exception] occurred in the remote process while patching.
     *
     * @param originalStackTrace The stack trace of the original [Exception].
     */
--- a/app/src/main/java/app/revanced/manager/patcher/runtime/process/PatcherProcess.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/runtime/process/PatcherProcess.kt
@ -1,8 +1,10 @@
 package app.revanced.manager.patcher.runtime.process

+import android.annotation.SuppressLint
 import android.app.ActivityThread
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.os.Looper
 import app.revanced.manager.BuildConfig
@ -95,6 +97,10 @@ class PatcherProcess(private val context: Context) : IPatcherProcess.Stub() {
    }

    companion object {
+        private val longArrayClass = LongArray::class.java
+        private val emptyLongArray = LongArray(0)
+
+        @SuppressLint("PrivateApi")
        @JvmStatic
        fun main(args: Array<String>) {
            Looper.prepare()
@ -105,6 +111,15 @@ class PatcherProcess(private val context: Context) : IPatcherProcess.Stub() {
            val systemContext = ActivityThread.systemMain().systemContext as Context
            val appContext = systemContext.createPackageContext(managerPackageName, 0)

+            // Avoid annoying logs. See https://github.com/robolectric/robolectric/blob/ad0484c6b32c7d11176c711abeb3cb4a900f9258/robolectric/src/main/java/org/robolectric/android/internal/AndroidTestEnvironment.java#L376-L388
+            Class.forName("android.app.AppCompatCallbacks").apply {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                    getDeclaredMethod("install", longArrayClass, longArrayClass).also { it.isAccessible = true }(null, emptyLongArray, emptyLongArray)
+                } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    getDeclaredMethod("install", longArrayClass).also { it.isAccessible = true }(null, emptyLongArray)
+                }
+            }
+
            val ipcInterface = PatcherProcess(appContext)

            appContext.sendBroadcast(Intent().apply {
--- a/app/src/main/java/app/revanced/manager/ui/component/ConfirmDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/ConfirmDialog.kt
@ -0,0 +1,41 @@
+package app.revanced.manager.ui.component
+
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import app.revanced.manager.R
+
+@Composable
+fun ConfirmDialog(
+    onDismiss: () -> Unit,
+    onConfirm: () -> Unit,
+    title: String,
+    description: String,
+    icon: ImageVector
+) {
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        dismissButton = {
+            TextButton(onDismiss) {
+                Text(stringResource(R.string.cancel))
+            }
+        },
+        confirmButton = {
+            TextButton(
+                onClick = {
+                    onConfirm()
+                    onDismiss()
+                }
+            ) {
+                Text(stringResource(R.string.confirm))
+            }
+        },
+        title = { Text(title) },
+        icon = { Icon(icon, null) },
+        text = { Text(description) }
+    )
+}
--- a/app/src/main/java/app/revanced/manager/ui/component/ExceptionViewerDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/ExceptionViewerDialog.kt
@ -16,8 +16,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.bundle.BundleTopBar

@ -26,17 +24,13 @@ import app.revanced.manager.ui.component.bundle.BundleTopBar
 fun ExceptionViewerDialog(text: String, onDismiss: () -> Unit) {
    val context = LocalContext.current

-    Dialog(
+    FullscreenDialog(
        onDismissRequest = onDismiss,
-        properties = DialogProperties(
-            usePlatformDefaultWidth = false,
-            dismissOnBackPress = true
-        )
    ) {
        Scaffold(
            topBar = {
                BundleTopBar(
-                    title = stringResource(R.string.patches_error),
+                    title = stringResource(R.string.bundle_error),
                    onBackClick = onDismiss,
                    backIcon = {
                        Icon(
--- a/app/src/main/java/app/revanced/manager/ui/component/FullscreenDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/FullscreenDialog.kt
@ -0,0 +1,34 @@
+package app.revanced.manager.ui.component
+
+import android.view.WindowManager
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.DialogWindowProvider
+
+private val properties = DialogProperties(
+    usePlatformDefaultWidth = false,
+    dismissOnBackPress = true,
+    decorFitsSystemWindows = false,
+)
+
+@Composable
+fun FullscreenDialog(onDismissRequest: () -> Unit, content: @Composable () -> Unit) {
+    Dialog(
+        onDismissRequest = onDismissRequest,
+        properties = properties
+    ) {
+        val window = (LocalView.current.parent as DialogWindowProvider).window
+        LaunchedEffect(Unit) {
+            window.statusBarColor = Color.Transparent.toArgb()
+            window.navigationBarColor = Color.Transparent.toArgb()
+            window.addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS)
+        }
+
+        content()
+    }
+}
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BaseBundleDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BaseBundleDialog.kt
@ -87,8 +87,8 @@ fun BaseBundleDialog(

        if (remoteUrl != null) {
            BundleListItem(
-                headlineText = stringResource(R.string.auto_update),
-                supportingText = stringResource(R.string.auto_update_description),
+                headlineText = stringResource(R.string.bundle_auto_update),
+                supportingText = stringResource(R.string.bundle_auto_update_description),
                trailingContent = {
                    HapticSwitch(
                        checked = autoUpdate,
@ -108,7 +108,7 @@ fun BaseBundleDialog(
            if (showUrlInputDialog) {
                TextInputDialog(
                    initial = url,
-                    title = stringResource(R.string.patches_url),
+                    title = stringResource(R.string.bundle_input_source_url),
                    onDismissRequest = { showUrlInputDialog = false },
                    onConfirm = {
                        showUrlInputDialog = false
@ -129,7 +129,7 @@ fun BaseBundleDialog(
                        showUrlInputDialog = true
                    }
                ),
-                headlineText = stringResource(R.string.patches_url),
+                headlineText = stringResource(R.string.bundle_input_source_url),
                supportingText = url.ifEmpty {
                    stringResource(R.string.field_not_set)
                }
@ -139,7 +139,7 @@ fun BaseBundleDialog(
        val patchesClickable = patchCount > 0
        BundleListItem(
            headlineText = stringResource(R.string.patches),
-            supportingText = stringResource(R.string.patches_view),
+            supportingText = stringResource(R.string.bundle_view_patches),
            modifier = Modifier.clickable(
                enabled = patchesClickable,
                onClick = onPatchesClick
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleInformationDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleInformationDialog.kt
@ -12,8 +12,6 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
 import app.revanced.manager.data.platform.NetworkInfo
@ -23,6 +21,7 @@ import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.asRemote
 import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.isDefault
 import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState
 import app.revanced.manager.ui.component.ExceptionViewerDialog
+import app.revanced.manager.ui.component.FullscreenDialog
 import kotlinx.coroutines.launch
 import org.koin.compose.koinInject

@ -56,19 +55,15 @@ fun BundleInformationDialog(
        )
    }

-    Dialog(
+    FullscreenDialog(
        onDismissRequest = onDismissRequest,
-        properties = DialogProperties(
-            usePlatformDefaultWidth = false,
-            dismissOnBackPress = true
-        )
    ) {
        val bundleName by bundle.nameState

        Scaffold(
            topBar = {
                BundleTopBar(
-                    title = stringResource(R.string.patches),
+                    title = stringResource(R.string.patch_bundle_field),
                    onBackClick = onDismissRequest,
                    backIcon = {
                        Icon(
@ -124,8 +119,8 @@ fun BundleInformationDialog(
                        )

                        BundleListItem(
-                            headlineText = stringResource(R.string.patches_error),
-                            supportingText = stringResource(R.string.patches_error_description),
+                            headlineText = stringResource(R.string.bundle_error),
+                            supportingText = stringResource(R.string.bundle_error_description),
                            trailingContent = {
                                Icon(
                                    Icons.AutoMirrored.Outlined.ArrowRight,
@ -138,8 +133,8 @@ fun BundleInformationDialog(

                    if (state is PatchBundleSource.State.Missing && !isLocal) {
                        BundleListItem(
-                            headlineText = stringResource(R.string.patches_error),
-                            supportingText = stringResource(R.string.patches_not_downloaded),
+                            headlineText = stringResource(R.string.bundle_error),
+                            supportingText = stringResource(R.string.bundle_not_downloaded),
                            modifier = Modifier.clickable(onClick = onUpdate)
                        )
                    }
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleItem.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleItem.kt
@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material.icons.outlined.ErrorOutline
 import androidx.compose.material.icons.outlined.Warning
 import androidx.compose.material3.Icon
@ -26,8 +27,9 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
 import app.revanced.manager.domain.bundles.PatchBundleSource
-import app.revanced.manager.ui.component.haptics.HapticCheckbox
 import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState
+import app.revanced.manager.ui.component.ConfirmDialog
+import app.revanced.manager.ui.component.haptics.HapticCheckbox
 import kotlinx.coroutines.flow.map

@OptIn(ExperimentalFoundationApi::class)
@ -42,6 +44,7 @@ fun BundleItem(
    toggleSelection: (Boolean) -> Unit,
 ) {
    var viewBundleDialogPage by rememberSaveable { mutableStateOf(false) }
+    var showDeleteConfirmationDialog by rememberSaveable { mutableStateOf(false) }
    val state by bundle.state.collectAsStateWithLifecycle()

    val version by remember(bundle) {
@ -52,15 +55,25 @@ fun BundleItem(
    if (viewBundleDialogPage) {
        BundleInformationDialog(
            onDismissRequest = { viewBundleDialogPage = false },
-            onDeleteRequest = {
-                viewBundleDialogPage = false
-                onDelete()
-            },
+            onDeleteRequest = { showDeleteConfirmationDialog = true },
            bundle = bundle,
            onUpdate = onUpdate,
        )
    }

+    if (showDeleteConfirmationDialog) {
+        ConfirmDialog(
+            onDismiss = { showDeleteConfirmationDialog = false },
+            onConfirm = {
+                onDelete()
+                viewBundleDialogPage = false
+            },
+            title = stringResource(R.string.bundle_delete_single_dialog_title),
+            description = stringResource(R.string.bundle_delete_single_dialog_description, name),
+            icon = Icons.Outlined.Delete
+        )
+    }
+
    ListItem(
        modifier = Modifier
            .height(64.dp)
@ -88,8 +101,8 @@ fun BundleItem(
            Row {
                val icon = remember(state) {
                    when (state) {
-                        is PatchBundleSource.State.Failed -> Icons.Outlined.ErrorOutline to R.string.patches_error
-                        is PatchBundleSource.State.Missing -> Icons.Outlined.Warning to R.string.patches_missing
+                        is PatchBundleSource.State.Failed -> Icons.Outlined.ErrorOutline to R.string.bundle_error
+                        is PatchBundleSource.State.Missing -> Icons.Outlined.Warning to R.string.bundle_missing
                        is PatchBundleSource.State.Loaded -> null
                    }
                }
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BundlePatchesDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BundlePatchesDialog.kt
@ -22,13 +22,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
 import app.revanced.manager.domain.bundles.PatchBundleSource
 import app.revanced.manager.patcher.patch.PatchInfo
 import app.revanced.manager.ui.component.ArrowButton
+import app.revanced.manager.ui.component.FullscreenDialog
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar

@OptIn(ExperimentalMaterial3Api::class)
@ -41,17 +40,13 @@ fun BundlePatchesDialog(
    var showOptions by rememberSaveable { mutableStateOf(false) }
    val state by bundle.state.collectAsStateWithLifecycle()

-    Dialog(
+    FullscreenDialog(
        onDismissRequest = onDismissRequest,
-        properties = DialogProperties(
-            usePlatformDefaultWidth = false,
-            dismissOnBackPress = true
-        )
    ) {
        Scaffold(
            topBar = {
                BundleTopBar(
-                    title = stringResource(R.string.patches),
+                    title = stringResource(R.string.bundle_patches),
                    onBackClick = onDismissRequest,
                    backIcon = {
                        Icon(
@ -138,10 +133,10 @@ fun PatchItem(
                        verticalAlignment = Alignment.CenterVertically
                    ) {
                        PatchInfoChip(
-                            text = "$PACKAGE_ICON ${stringResource(R.string.patches_view_any_package)}"
+                            text = "$PACKAGE_ICON ${stringResource(R.string.bundle_view_patches_any_package)}"
                        )
                        PatchInfoChip(
-                            text = "$VERSION_ICON ${stringResource(R.string.patches_view_any_version)}"
+                            text = "$VERSION_ICON ${stringResource(R.string.bundle_view_patches_any_version)}"
                        )
                    }
                } else {
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleSelector.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleSelector.kt
@ -15,9 +15,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import app.revanced.manager.R
 import app.revanced.manager.domain.bundles.PatchBundleSource
 import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState

@ -49,7 +47,7 @@ fun BundleSelector(bundles: List<PatchBundleSource>, onFinish: (PatchBundleSourc
                    .fillMaxWidth()
            ) {
                Text(
-                    text = stringResource(R.string.select),
+                    text = "Select bundle",
                    style = MaterialTheme.typography.titleLarge,
                    color = MaterialTheme.colorScheme.onSurface
                )
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/ImportBundleDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/ImportBundleDialog.kt
@ -77,7 +77,7 @@ fun ImportPatchBundleDialog(
    AlertDialogExtended(
        onDismissRequest = onDismiss,
        title = {
-            Text(stringResource(if (currentStep == 0) R.string.select else R.string.add_patches))
+            Text(stringResource(if (currentStep == 0) R.string.select else R.string.add_patch_bundle))
        },
        text = {
            steps[currentStep]()
@ -126,7 +126,7 @@ fun SelectBundleTypeStep(
    ) {
        Text(
            modifier = Modifier.padding(horizontal = 24.dp),
-            text = stringResource(R.string.select_patches_type_dialog_description)
+            text = stringResource(R.string.select_bundle_type_dialog_description)
        )
        Column {
            ListItem(
@ -136,7 +136,7 @@ fun SelectBundleTypeStep(
                ),
                headlineContent = { Text(stringResource(R.string.enter_url)) },
                overlineContent = { Text(stringResource(R.string.recommended)) },
-                supportingContent = { Text(stringResource(R.string.remote_patches_description)) },
+                supportingContent = { Text(stringResource(R.string.remote_bundle_description)) },
                leadingContent = {
                    HapticRadioButton(
                        selected = bundleType == BundleType.Remote,
@ -152,7 +152,7 @@ fun SelectBundleTypeStep(
                    onClick = { onBundleTypeSelected(BundleType.Local) }
                ),
                headlineContent = { Text(stringResource(R.string.select_from_storage)) },
-                supportingContent = { Text(stringResource(R.string.local_patches_description)) },
+                supportingContent = { Text(stringResource(R.string.local_bundle_description)) },
                overlineContent = { },
                leadingContent = {
                    HapticRadioButton(
@ -185,7 +185,7 @@ fun ImportBundleStep(
                ) {
                    ListItem(
                        headlineContent = {
-                            Text(stringResource(R.string.patches))
+                            Text(stringResource(R.string.patch_bundle_field))
                        },
                        supportingContent = { Text(stringResource(if (patchBundle != null) R.string.file_field_set else R.string.file_field_not_set)) },
                        trailingContent = {
@ -206,7 +206,7 @@ fun ImportBundleStep(
                    OutlinedTextField(
                        value = remoteUrl,
                        onValueChange = onRemoteUrlChange,
-                        label = { Text(stringResource(R.string.patches_url)) }
+                        label = { Text(stringResource(R.string.bundle_url)) }
                    )
                }
                Column(
--- a/app/src/main/java/app/revanced/manager/ui/component/patches/OptionFields.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/patches/OptionFields.kt
@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListItemInfo
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
@ -55,13 +56,13 @@ import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.DialogProperties
 import app.revanced.manager.R
 import app.revanced.manager.data.platform.Filesystem
 import app.revanced.manager.patcher.patch.Option
 import app.revanced.manager.ui.component.AlertDialogExtended
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.FloatInputDialog
+import app.revanced.manager.ui.component.FullscreenDialog
 import app.revanced.manager.ui.component.IntInputDialog
 import app.revanced.manager.ui.component.LongInputDialog
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
@ -73,16 +74,17 @@ import app.revanced.manager.util.saver.snapshotStateListSaver
 import app.revanced.manager.util.saver.snapshotStateSetSaver
 import app.revanced.manager.util.toast
 import app.revanced.manager.util.transparentListItemColors
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.parcelize.Parcelize
 import org.koin.compose.koinInject
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 import sh.calvin.reorderable.ReorderableItem
 import sh.calvin.reorderable.rememberReorderableLazyColumnState
+import sh.calvin.reorderable.rememberReorderableLazyListState
 import java.io.Serializable
 import kotlin.random.Random
 import kotlin.reflect.typeOf
-import androidx.compose.ui.window.Dialog as ComposeDialog

 private class OptionEditorScope<T : Any>(
    private val editor: OptionEditor<T>,
@ -497,7 +499,8 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti

        val lazyListState = rememberLazyListState()
        val reorderableLazyColumnState =
-            rememberReorderableLazyColumnState(lazyListState) { from, to ->
+            // Update the list
+            rememberReorderableLazyListState(lazyListState) { from, to ->
                // Update the list
                items.add(to.index, items.removeAt(from.index))
            }
@ -524,12 +527,8 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
            scope.submitDialog(items.mapNotNull { it.value })
        }

-        ComposeDialog(
+        FullscreenDialog(
            onDismissRequest = back,
-            properties = DialogProperties(
-                usePlatformDefaultWidth = false,
-                dismissOnBackPress = true
-            ),
        ) {
            Scaffold(
                topBar = {
--- a/app/src/main/java/app/revanced/manager/ui/component/patches/PathSelectorDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/patches/PathSelectorDialog.kt
@ -23,10 +23,9 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AppTopBar
+import app.revanced.manager.ui.component.FullscreenDialog
 import app.revanced.manager.ui.component.GroupHeader
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.util.saver.PathSaver
@ -48,12 +47,8 @@ fun PathSelectorDialog(root: Path, onSelect: (Path?) -> Unit) {
        currentDirectory.listDirectoryEntries().filter(Path::isReadable).partition(Path::isDirectory)
    }

-    Dialog(
+    FullscreenDialog(
        onDismissRequest = { onSelect(null) },
-        properties = DialogProperties(
-            usePlatformDefaultWidth = false,
-            dismissOnBackPress = true
-        )
    ) {
        Scaffold(
            topBar = {
--- a/app/src/main/java/app/revanced/manager/ui/component/settings/SafeguardBooleanItem.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/settings/SafeguardBooleanItem.kt
@ -1,6 +1,8 @@
 package app.revanced.manager.ui.component.settings

 import androidx.annotation.StringRes
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.WarningAmber
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@ -9,7 +11,9 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import app.revanced.manager.R
 import app.revanced.manager.domain.manager.base.Preference
+import app.revanced.manager.ui.component.ConfirmDialog
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch

@ -28,13 +32,15 @@ fun SafeguardBooleanItem(
    }

    if (showSafeguardWarning) {
-        SafeguardConfirmationDialog(
+        ConfirmDialog(
            onDismiss = { showSafeguardWarning = false },
            onConfirm = {
                coroutineScope.launch { preference.update(!value) }
                showSafeguardWarning = false
            },
-            body = stringResource(confirmationText)
+            title = stringResource(id = R.string.warning),
+            description = stringResource(confirmationText),
+            icon = Icons.Outlined.WarningAmber
        )
    }

--- a/app/src/main/java/app/revanced/manager/ui/component/settings/SafeguardConfirmationDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/settings/SafeguardConfirmationDialog.kt
@ -1,46 +0,0 @@
-package app.revanced.manager.ui.component.settings
-
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.WarningAmber
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import app.revanced.manager.R
-
-@Composable
-fun SafeguardConfirmationDialog(
-    onDismiss: () -> Unit,
-    onConfirm: () -> Unit,
-    body: String,
-) {
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        confirmButton = {
-            TextButton(onClick = onConfirm) {
-                Text(stringResource(R.string.yes))
-            }
-        },
-        dismissButton = {
-            TextButton(onClick = onDismiss) {
-                Text(stringResource(R.string.no))
-            }
-        },
-        icon = {
-            Icon(Icons.Outlined.WarningAmber, null)
-        },
-        title = {
-            Text(
-                text = stringResource(id = R.string.warning),
-                style = MaterialTheme.typography.headlineSmall.copy(textAlign = TextAlign.Center)
-            )
-        },
-        text = {
-            Text(body)
-        }
-    )
-}
--- a/app/src/main/java/app/revanced/manager/ui/model/BundleInfo.kt
+++ b/app/src/main/java/app/revanced/manager/ui/model/BundleInfo.kt
@ -11,6 +11,7 @@ import kotlinx.coroutines.flow.map
 */
 data class BundleInfo(
    val name: String,
+    val version: String?,
    val uid: Int,
    val compatible: List<PatchInfo>,
    val incompatible: List<PatchInfo>,
@ -78,7 +79,7 @@ data class BundleInfo(
                        targetList.add(it)
                    }

-                    BundleInfo(source.getName(), source.uid, compatible, incompatible, universal)
+                    BundleInfo(source.getName(), source.currentVersion(), source.uid, compatible, incompatible, universal)
                }
            }

--- a/app/src/main/java/app/revanced/manager/ui/model/navigation/Nav.kt
+++ b/app/src/main/java/app/revanced/manager/ui/model/navigation/Nav.kt
@ -92,5 +92,5 @@ object Settings {
    data object Licenses : Destination

    @Serializable
-    data object DeveloperOptions : Destination
+    data object Developer : Destination
 }
--- a/app/src/main/java/app/revanced/manager/ui/screen/BundleListScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/BundleListScreen.kt
@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@ -19,13 +20,19 @@ fun BundleListScreen(
    selectedSources: SnapshotStateList<PatchBundleSource>,
    bundlesSelectable: Boolean,
 ) {
+    val sortedSources = remember(sources) {
+        sources.sortedByDescending { source ->
+            source.state.value.patchBundleOrNull()?.patches?.size ?: 0
+        }
+    }
+
    LazyColumnWithScrollbar(
        modifier = Modifier.fillMaxSize(),
        horizontalAlignment = Alignment.CenterHorizontally,
        verticalArrangement = Arrangement.Top,
    ) {
        items(
-            sources,
+            sortedSources,
            key = { it.uid }
        ) { source ->
            BundleItem(
--- a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
@ -21,6 +21,7 @@ import androidx.compose.material.icons.filled.BatteryAlert
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.outlined.Apps
 import androidx.compose.material.icons.outlined.BugReport
+import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material.icons.outlined.DeleteOutline
 import androidx.compose.material.icons.outlined.Download
 import androidx.compose.material.icons.outlined.Refresh
@ -62,6 +63,7 @@ import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.AutoUpdatesDialog
 import app.revanced.manager.ui.component.AvailableUpdateDialog
 import app.revanced.manager.ui.component.NotificationCard
+import app.revanced.manager.ui.component.ConfirmDialog
 import app.revanced.manager.ui.component.bundle.BundleTopBar
 import app.revanced.manager.ui.component.bundle.ImportPatchBundleDialog
 import app.revanced.manager.ui.component.haptics.HapticFloatingActionButton
@ -77,7 +79,7 @@ enum class DashboardPage(
    val icon: ImageVector
 ) {
    DASHBOARD(R.string.tab_apps, Icons.Outlined.Apps),
-    BUNDLES(R.string.tab_patches, Icons.Outlined.Source),
+    BUNDLES(R.string.tab_bundles, Icons.Outlined.Source),
 }

@SuppressLint("BatteryLife")
@ -91,7 +93,7 @@ fun DashboardScreen(
    onDownloaderPluginClick: () -> Unit,
    onAppClick: (String) -> Unit
 ) {
-    val bundlesSelectable by remember { derivedStateOf { vm.selectedSources.isNotEmpty() } }
+    val bundlesSelectable by remember { derivedStateOf { vm.selectedSources.size > 0 } }
    val availablePatches by vm.availablePatches.collectAsStateWithLifecycle(0)
    val showNewDownloaderPluginsNotification by vm.newDownloaderPluginsAvailable.collectAsStateWithLifecycle(
        false
@ -154,11 +156,25 @@ fun DashboardScreen(
        }
    )

+    var showDeleteConfirmationDialog by rememberSaveable { mutableStateOf(false) }
+    if (showDeleteConfirmationDialog) {
+        ConfirmDialog(
+            onDismiss = { showDeleteConfirmationDialog = false },
+            onConfirm = {
+                vm.selectedSources.forEach { if (!it.isDefault) vm.delete(it) }
+                vm.cancelSourceSelection()
+            },
+            title = stringResource(R.string.bundle_delete_multiple_dialog_title),
+            description = stringResource(R.string.bundle_delete_multiple_dialog_description),
+            icon = Icons.Outlined.Delete
+        )
+    }
+
    Scaffold(
        topBar = {
            if (bundlesSelectable) {
                BundleTopBar(
-                    title = stringResource(R.string.patches_selected, vm.selectedSources.size),
+                    title = stringResource(R.string.bundles_selected, vm.selectedSources.size),
                    onBackClick = vm::cancelSourceSelection,
                    backIcon = {
                        Icon(
@ -169,8 +185,7 @@ fun DashboardScreen(
                    actions = {
                        IconButton(
                            onClick = {
-                                vm.selectedSources.forEach { if (!it.isDefault) vm.delete(it) }
-                                vm.cancelSourceSelection()
+                                showDeleteConfirmationDialog = true
                            }
                        ) {
                            Icon(
@ -224,7 +239,7 @@ fun DashboardScreen(
                    when (pagerState.currentPage) {
                        DashboardPage.DASHBOARD.ordinal -> {
                            if (availablePatches < 1) {
-                                androidContext.toast(androidContext.getString(R.string.no_patch_found))
+                                androidContext.toast(androidContext.getString(R.string.patches_unavailable))
                                composableScope.launch {
                                    pagerState.animateScrollToPage(
                                        DashboardPage.BUNDLES.ordinal
--- a/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
@ -17,6 +17,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.OpenInNew
+import androidx.compose.material.icons.outlined.Cancel
 import androidx.compose.material.icons.outlined.FileDownload
 import androidx.compose.material.icons.outlined.PostAdd
 import androidx.compose.material.icons.outlined.Save
@ -45,6 +46,7 @@ import app.revanced.manager.R
 import app.revanced.manager.data.room.apps.installed.InstallType
 import app.revanced.manager.ui.component.AppScaffold
 import app.revanced.manager.ui.component.AppTopBar
+import app.revanced.manager.ui.component.ConfirmDialog
 import app.revanced.manager.ui.component.InstallerStatusDialog
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
 import app.revanced.manager.ui.component.patcher.InstallPickerDialog
@ -58,25 +60,23 @@ import app.revanced.manager.util.EventEffect
@Composable
 fun PatcherScreen(
    onBackClick: () -> Unit,
-    vm: PatcherViewModel
+    viewModel: PatcherViewModel
 ) {
-    fun leaveScreen() {
-        vm.onBack()
-        onBackClick()
-    }
-    BackHandler(onBack = ::leaveScreen)

    val context = LocalContext.current
    val exportApkLauncher =
-        rememberLauncherForActivityResult(CreateDocument(APK_MIMETYPE), vm::export)
+        rememberLauncherForActivityResult(CreateDocument(APK_MIMETYPE), viewModel::export)

-    val patcherSucceeded by vm.patcherSucceeded.observeAsState(null)
-    val canInstall by remember { derivedStateOf { patcherSucceeded == true && (vm.installedPackageName != null || !vm.isInstalling) } }
+    val patcherSucceeded by viewModel.patcherSucceeded.observeAsState(null)
+    val canInstall by remember { derivedStateOf { patcherSucceeded == true && (viewModel.installedPackageName != null || !viewModel.isInstalling) } }
    var showInstallPicker by rememberSaveable { mutableStateOf(false) }
+    var showDismissConfirmationDialog by rememberSaveable { mutableStateOf(false) }
+
+    BackHandler(onBack = { showDismissConfirmationDialog = true })

    val steps by remember {
        derivedStateOf {
-            vm.steps.groupBy { it.category }
+            viewModel.steps.groupBy { it.category }
        }
    }

@ -93,34 +93,47 @@ fun PatcherScreen(
    if (showInstallPicker)
        InstallPickerDialog(
            onDismiss = { showInstallPicker = false },
-            onConfirm = vm::install
+            onConfirm = viewModel::install
        )

-    vm.packageInstallerStatus?.let {
-        InstallerStatusDialog(it, vm, vm::dismissPackageInstallerDialog)
+    if (showDismissConfirmationDialog) {
+        ConfirmDialog(
+            onDismiss = { showDismissConfirmationDialog = false },
+            onConfirm = {
+                viewModel.onBack()
+                onBackClick()
+            },
+            title = stringResource(R.string.patcher_stop_confirm_title),
+            description = stringResource(R.string.patcher_stop_confirm_description),
+            icon = Icons.Outlined.Cancel
+        )
+    }
+
+    viewModel.packageInstallerStatus?.let {
+        InstallerStatusDialog(it, viewModel, viewModel::dismissPackageInstallerDialog)
    }

    val activityLauncher = rememberLauncherForActivityResult(
        contract = ActivityResultContracts.StartActivityForResult(),
-        onResult = vm::handleActivityResult
+        onResult = viewModel::handleActivityResult
    )
-    EventEffect(flow = vm.launchActivityFlow) { intent ->
+    EventEffect(flow = viewModel.launchActivityFlow) { intent ->
        activityLauncher.launch(intent)
    }

-    vm.activityPromptDialog?.let { title ->
+    viewModel.activityPromptDialog?.let { title ->
        AlertDialog(
-            onDismissRequest = vm::rejectInteraction,
+            onDismissRequest = viewModel::rejectInteraction,
            confirmButton = {
                TextButton(
-                    onClick = vm::allowInteraction
+                    onClick = viewModel::allowInteraction
                ) {
                    Text(stringResource(R.string.continue_))
                }
            },
            dismissButton = {
                TextButton(
-                    onClick = vm::rejectInteraction
+                    onClick = viewModel::rejectInteraction
                ) {
                    Text(stringResource(R.string.cancel))
                }
@ -137,20 +150,20 @@ fun PatcherScreen(
            AppTopBar(
                title = stringResource(R.string.patcher),
                scrollBehavior = scrollBehavior,
-                onBackClick = ::leaveScreen
+                onBackClick = { showDismissConfirmationDialog = true }
            )
        },
        bottomBar = {
            BottomAppBar(
                actions = {
                    IconButton(
-                        onClick = { exportApkLauncher.launch("${vm.packageName}_${vm.version}_revanced_patched.apk") },
+                        onClick = { exportApkLauncher.launch("${viewModel.packageName}_${viewModel.version}_revanced_patched.apk") },
                        enabled = patcherSucceeded == true
                    ) {
                        Icon(Icons.Outlined.Save, stringResource(id = R.string.save_apk))
                    }
                    IconButton(
-                        onClick = { vm.exportLogs(context) },
+                        onClick = { viewModel.exportLogs(context) },
                        enabled = patcherSucceeded != null
                    ) {
                        Icon(Icons.Outlined.PostAdd, stringResource(id = R.string.save_logs))
@ -161,11 +174,11 @@ fun PatcherScreen(
                        HapticExtendedFloatingActionButton(
                            text = {
                                Text(
-                                    stringResource(if (vm.installedPackageName == null) R.string.install_app else R.string.open_app)
+                                    stringResource(if (viewModel.installedPackageName == null) R.string.install_app else R.string.open_app)
                                )
                            },
                            icon = {
-                                vm.installedPackageName?.let {
+                                viewModel.installedPackageName?.let {
                                    Icon(
                                        Icons.AutoMirrored.Outlined.OpenInNew,
                                        stringResource(R.string.open_app)
@ -176,10 +189,10 @@ fun PatcherScreen(
                                )
                            },
                            onClick = {
-                                if (vm.installedPackageName == null)
-                                    if (vm.isDeviceRooted()) showInstallPicker = true
-                                    else vm.install(InstallType.DEFAULT)
-                                else vm.open()
+                                if (viewModel.installedPackageName == null)
+                                    if (viewModel.isDeviceRooted()) showInstallPicker = true
+                                    else viewModel.install(InstallType.DEFAULT)
+                                else viewModel.open()
                            }
                        )
                    }
@ -193,7 +206,7 @@ fun PatcherScreen(
                .fillMaxSize()
        ) {
            LinearProgressIndicator(
-                progress = { vm.progress },
+                progress = { viewModel.progress },
                modifier = Modifier.fillMaxWidth()
            )

@ -209,8 +222,8 @@ fun PatcherScreen(
                    Steps(
                        category = category,
                        steps = steps,
-                        stepCount = if (category == StepCategory.PATCHING) vm.patchesProgress else null,
-                        stepProgressProvider = vm
+                        stepCount = if (category == StepCategory.PATCHING) viewModel.patchesProgress else null,
+                        stepProgressProvider = viewModel
                    )
                }
            }
--- a/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
@ -58,16 +58,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
 import app.revanced.manager.patcher.patch.Option
 import app.revanced.manager.patcher.patch.PatchInfo
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.CheckedFilterChip
+import app.revanced.manager.ui.component.FullscreenDialog
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.ui.component.SafeguardDialog
 import app.revanced.manager.ui.component.SearchBar
@ -89,9 +87,9 @@ import kotlinx.coroutines.launch
 fun PatchesSelectorScreen(
    onSave: (PatchSelection?, Options) -> Unit,
    onBackClick: () -> Unit,
-    vm: PatchesSelectorViewModel
+    viewModel: PatchesSelectorViewModel
 ) {
-    val bundles by vm.bundlesFlow.collectAsStateWithLifecycle(initialValue = emptyList())
+    val bundles by viewModel.bundlesFlow.collectAsStateWithLifecycle(initialValue = emptyList())
    val pagerState = rememberPagerState(
        initialPage = 0,
        initialPageOffsetFraction = 0f
@ -107,15 +105,15 @@ fun PatchesSelectorScreen(
    }
    var showBottomSheet by rememberSaveable { mutableStateOf(false) }
    val showSaveButton by remember {
-        derivedStateOf { vm.selectionIsValid(bundles) }
+        derivedStateOf { viewModel.selectionIsValid(bundles) }
    }

-    val defaultPatchSelectionCount by vm.defaultSelectionCount
+    val defaultPatchSelectionCount by viewModel.defaultSelectionCount
        .collectAsStateWithLifecycle(initialValue = 0)

    val selectedPatchCount by remember {
        derivedStateOf {
-            vm.customPatchSelection?.values?.sumOf { it.size } ?: defaultPatchSelectionCount
+            viewModel.customPatchSelection?.values?.sumOf { it.size } ?: defaultPatchSelectionCount
        }
    }

@ -147,14 +145,14 @@ fun PatchesSelectorScreen(
                    verticalArrangement = Arrangement.spacedBy(12.dp)
                ) {
                    CheckedFilterChip(
-                        selected = vm.filter and SHOW_INCOMPATIBLE == 0,
-                        onClick = { vm.toggleFlag(SHOW_INCOMPATIBLE) },
+                        selected = viewModel.filter and SHOW_INCOMPATIBLE == 0,
+                        onClick = { viewModel.toggleFlag(SHOW_INCOMPATIBLE) },
                        label = { Text(stringResource(R.string.this_version)) }
                    )

                    CheckedFilterChip(
-                        selected = vm.filter and SHOW_UNIVERSAL != 0,
-                        onClick = { vm.toggleFlag(SHOW_UNIVERSAL) },
+                        selected = viewModel.filter and SHOW_UNIVERSAL != 0,
+                        onClick = { viewModel.toggleFlag(SHOW_UNIVERSAL) },
                        label = { Text(stringResource(R.string.universal)) },
                    )
                }
@ -162,43 +160,39 @@ fun PatchesSelectorScreen(
        }
    }

-    if (vm.compatibleVersions.isNotEmpty())
+    if (viewModel.compatibleVersions.isNotEmpty())
        IncompatiblePatchDialog(
-            appVersion = vm.appVersion ?: stringResource(R.string.any_version),
-            compatibleVersions = vm.compatibleVersions,
-            onDismissRequest = vm::dismissDialogs
+            appVersion = viewModel.appVersion ?: stringResource(R.string.any_version),
+            compatibleVersions = viewModel.compatibleVersions,
+            onDismissRequest = viewModel::dismissDialogs
        )
    var showIncompatiblePatchesDialog by rememberSaveable {
        mutableStateOf(false)
    }
    if (showIncompatiblePatchesDialog)
        IncompatiblePatchesDialog(
-            appVersion = vm.appVersion ?: stringResource(R.string.any_version),
+            appVersion = viewModel.appVersion ?: stringResource(R.string.any_version),
            onDismissRequest = { showIncompatiblePatchesDialog = false }
        )

-    vm.optionsDialog?.let { (bundle, patch) ->
+    viewModel.optionsDialog?.let { (bundle, patch) ->
        OptionsDialog(
-            onDismissRequest = vm::dismissDialogs,
+            onDismissRequest = viewModel::dismissDialogs,
            patch = patch,
-            values = vm.getOptions(bundle, patch),
-            reset = { vm.resetOptions(bundle, patch) },
-            set = { key, value -> vm.setOption(bundle, patch, key, value) }
+            values = viewModel.getOptions(bundle, patch),
+            reset = { viewModel.resetOptions(bundle, patch) },
+            set = { key, value -> viewModel.setOption(bundle, patch, key, value) }
        )
    }

-    var showSelectionWarning by rememberSaveable {
-        mutableStateOf(false)
-    }
-    if (showSelectionWarning) {
+    var showSelectionWarning by rememberSaveable { mutableStateOf(false) }
+    var showUniversalWarning by rememberSaveable { mutableStateOf(false) }
+
+    if (showSelectionWarning)
        SelectionWarningDialog(onDismiss = { showSelectionWarning = false })
-    }
-    vm.pendingUniversalPatchAction?.let {
-        UniversalPatchWarningDialog(
-            onCancel = vm::dismissUniversalPatchWarning,
-            onConfirm = vm::confirmUniversalPatchWarning
-        )
-    }
+
+    if (showUniversalWarning)
+        UniversalPatchWarningDialog(onDismiss = { showUniversalWarning = false })

    fun LazyListScope.patchList(
        uid: Int,
@ -222,27 +216,25 @@ fun PatchesSelectorScreen(
                PatchItem(
                    patch = patch,
                    onOptionsDialog = {
-                        vm.optionsDialog = uid to patch
+                        viewModel.optionsDialog = uid to patch
                    },
-                    selected = compatible && vm.isSelected(
+                    selected = compatible && viewModel.isSelected(
                        uid,
                        patch
                    ),
                    onToggle = {
                        when {
                            // Open incompatible dialog if the patch is not supported
-                            !compatible -> vm.openIncompatibleDialog(patch)
+                            !compatible -> viewModel.openIncompatibleDialog(patch)

                            // Show selection warning if enabled
-                            vm.selectionWarningEnabled -> showSelectionWarning = true
+                            viewModel.selectionWarningEnabled -> showSelectionWarning = true

-                            // Set pending universal patch action if the universal patch warning is enabled and there are no compatible packages
-                            vm.universalPatchWarningEnabled && patch.compatiblePackages == null -> {
-                                vm.pendingUniversalPatchAction = { vm.togglePatch(uid, patch) }
-                            }
+                            // Show universal warning if enabled
+                            viewModel.universalPatchWarningEnabled -> showUniversalWarning = true

                            // Toggle the patch otherwise
-                            else -> vm.togglePatch(uid, patch)
+                            else -> viewModel.togglePatch(uid, patch)
                        }
                    },
                    compatible = compatible
@ -328,7 +320,7 @@ fun PatchesSelectorScreen(
                    patchList(
                        uid = bundle.uid,
                        patches = bundle.universal.searched(),
-                        visible = vm.filter and SHOW_UNIVERSAL != 0,
+                        visible = viewModel.filter and SHOW_UNIVERSAL != 0,
                        compatible = true
                    ) {
                        ListHeader(
@ -339,8 +331,8 @@ fun PatchesSelectorScreen(
                    patchList(
                        uid = bundle.uid,
                        patches = bundle.incompatible.searched(),
-                        visible = vm.filter and SHOW_INCOMPATIBLE != 0,
-                        compatible = vm.allowIncompatiblePatches
+                        visible = viewModel.filter and SHOW_INCOMPATIBLE != 0,
+                        compatible = viewModel.allowIncompatiblePatches
                    ) {
                        ListHeader(
                            title = stringResource(R.string.incompatible_patches),
@ -363,22 +355,30 @@ fun PatchesSelectorScreen(
                    verticalArrangement = Arrangement.spacedBy(4.dp)
                ) {
                    SmallFloatingActionButton(
-                        onClick = vm::reset,
+                        onClick = viewModel::reset,
                        containerColor = MaterialTheme.colorScheme.tertiaryContainer
                    ) {
                        Icon(Icons.Outlined.Restore, stringResource(R.string.reset))
                    }
                    HapticExtendedFloatingActionButton(
-                        text = { Text(stringResource(R.string.save_with_count, selectedPatchCount)) },
+                        text = {
+                            Text(
+                                stringResource(
+                                    R.string.save_with_count,
+                                    selectedPatchCount
+                                )
+                            )
+                        },
                        icon = {
                            Icon(
                                imageVector = Icons.Outlined.Save,
                                contentDescription = stringResource(R.string.save)
                            )
                        },
-                        expanded = patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp ?: true,
+                        expanded = patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp
+                            ?: true,
                        onClick = {
-                            onSave(vm.getCustomSelection(), vm.getOptions())
+                            onSave(viewModel.getCustomSelection(), viewModel.getOptions())
                        }
                    )
                }
@ -405,7 +405,19 @@ fun PatchesSelectorScreen(
                                    )
                                }
                            },
-                            text = { Text(bundle.name) },
+                            text = {
+                                Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                                    Text(
+                                        text = bundle.name,
+                                        style = MaterialTheme.typography.bodyMedium
+                                    )
+                                    Text(
+                                        text = bundle.version!!,
+                                        style = MaterialTheme.typography.bodySmall,
+                                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                                    )
+                                }
+                            },
                            selectedContentColor = MaterialTheme.colorScheme.primary,
                            unselectedContentColor = MaterialTheme.colorScheme.onSurfaceVariant
                        )
@ -434,7 +446,7 @@ fun PatchesSelectorScreen(
                        patchList(
                            uid = bundle.uid,
                            patches = bundle.universal,
-                            visible = vm.filter and SHOW_UNIVERSAL != 0,
+                            visible = viewModel.filter and SHOW_UNIVERSAL != 0,
                            compatible = true
                        ) {
                            ListHeader(
@ -444,8 +456,8 @@ fun PatchesSelectorScreen(
                        patchList(
                            uid = bundle.uid,
                            patches = bundle.incompatible,
-                            visible = vm.filter and SHOW_INCOMPATIBLE != 0,
-                            compatible = vm.allowIncompatiblePatches
+                            visible = viewModel.filter and SHOW_INCOMPATIBLE != 0,
+                            compatible = viewModel.allowIncompatiblePatches
                        ) {
                            ListHeader(
                                title = stringResource(R.string.incompatible_patches),
@ -460,7 +472,9 @@ fun PatchesSelectorScreen(
 }

@Composable
-private fun SelectionWarningDialog(onDismiss: () -> Unit) {
+private fun SelectionWarningDialog(
+    onDismiss: () -> Unit
+) {
    SafeguardDialog(
        onDismiss = onDismiss,
        title = R.string.warning,
@ -470,33 +484,12 @@ private fun SelectionWarningDialog(onDismiss: () -> Unit) {

@Composable
 private fun UniversalPatchWarningDialog(
-    onCancel: () -> Unit,
-    onConfirm: () -> Unit
+    onDismiss: () -> Unit
 ) {
-    AlertDialog(
-        onDismissRequest = onCancel,
-        confirmButton = {
-            TextButton(onClick = onConfirm) {
-                Text(stringResource(R.string.continue_))
-            }
-        },
-        dismissButton = {
-            TextButton(onClick = onCancel) {
-                Text(stringResource(R.string.cancel))
-            }
-        },
-        icon = {
-            Icon(Icons.Outlined.WarningAmber, null)
-        },
-        title = {
-            Text(
-                text = stringResource(R.string.warning),
-                style = MaterialTheme.typography.headlineSmall.copy(textAlign = TextAlign.Center)
-            )
-        },
-        text = {
-            Text(stringResource(R.string.universal_patch_warning_description))
-        }
+    SafeguardDialog(
+        onDismiss = onDismiss,
+        title = R.string.warning,
+        body = stringResource(R.string.universal_patch_warning_description),
    )
 }

@ -618,13 +611,7 @@ private fun OptionsDialog(
    reset: () -> Unit,
    set: (String, Any?) -> Unit,
    onDismissRequest: () -> Unit,
-) = Dialog(
-    onDismissRequest = onDismissRequest,
-    properties = DialogProperties(
-        usePlatformDefaultWidth = false,
-        dismissOnBackPress = true
-    )
-) {
+) = FullscreenDialog(onDismissRequest = onDismissRequest) {
    Scaffold(
        topBar = {
            AppTopBar(
--- a/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
@ -1,5 +1,6 @@
 package app.revanced.manager.ui.screen

+import androidx.annotation.StringRes
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@ -7,55 +8,79 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
+import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ColumnWithScrollbar
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.model.navigation.Settings
+import org.koin.compose.koinInject

-private val settingsSections = listOf(
-    Triple(
-        R.string.general,
-        R.string.general_description,
-        Icons.Outlined.Settings
-    ) to Settings.General,
-    Triple(
-        R.string.updates,
-        R.string.updates_description,
-        Icons.Outlined.Update
-    ) to Settings.Updates,
-    Triple(
-        R.string.downloads,
-        R.string.downloads_description,
-        Icons.Outlined.Download
-    ) to Settings.Downloads,
-    Triple(
-        R.string.import_export,
-        R.string.import_export_description,
-        Icons.Outlined.SwapVert
-    ) to Settings.ImportExport,
-    Triple(
-        R.string.advanced,
-        R.string.advanced_description,
-        Icons.Outlined.Tune
-    ) to Settings.Advanced,
-    Triple(
-        R.string.developer_options,
-        R.string.developer_options_description,
-        Icons.Outlined.Code
-    ) to Settings.DeveloperOptions,
-    Triple(
-        R.string.about,
-        R.string.app_name,
-        Icons.Outlined.Info
-    ) to Settings.About,
+private data class Section(
+    @StringRes val name: Int,
+    @StringRes val description: Int,
+    val image: ImageVector,
+    val destination: Settings.Destination,
 )

@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun SettingsScreen(onBackClick: () -> Unit, navigate: (Settings.Destination) -> Unit) {
+    val prefs: PreferencesManager = koinInject()
+    val showDeveloperSettings by prefs.showDeveloperSettings.getAsState()
+
+    val settingsSections = remember(showDeveloperSettings) {
+        listOfNotNull(
+            Section(
+                R.string.general,
+                R.string.general_description,
+                Icons.Outlined.Settings,
+                Settings.General
+            ),
+            Section(
+                R.string.updates,
+                R.string.updates_description,
+                Icons.Outlined.Update,
+                Settings.Updates
+            ),
+            Section(
+                R.string.downloads,
+                R.string.downloads_description,
+                Icons.Outlined.Download,
+                Settings.Downloads
+            ),
+            Section(
+                R.string.import_export,
+                R.string.import_export_description,
+                Icons.Outlined.SwapVert,
+                Settings.ImportExport
+            ),
+            Section(
+                R.string.advanced,
+                R.string.advanced_description,
+                Icons.Outlined.Tune,
+                Settings.Advanced
+            ),
+            Section(
+                R.string.about,
+                R.string.app_name,
+                Icons.Outlined.Info,
+                Settings.About
+            ),
+            Section(
+                R.string.developer_options,
+                R.string.developer_options_description,
+                Icons.Outlined.Code,
+                Settings.Developer
+            ).takeIf { showDeveloperSettings }
+        )
+    }
+
    Scaffold(
        topBar = {
            AppTopBar(
@ -69,12 +94,12 @@ fun SettingsScreen(onBackClick: () -> Unit, navigate: (Settings.Destination) ->
                .padding(paddingValues)
                .fillMaxSize()
        ) {
-            settingsSections.forEach { (titleDescIcon, destination) ->
+            settingsSections.forEach { (name, description, icon, destination) ->
                SettingsListItem(
                    modifier = Modifier.clickable { navigate(destination) },
-                    headlineContent = stringResource(titleDescIcon.first),
-                    supportingContent = stringResource(titleDescIcon.second),
-                    leadingContent = { Icon(titleDescIcon.third, null) }
+                    headlineContent = stringResource(name),
+                    supportingContent = stringResource(description),
+                    leadingContent = { Icon(icon, null) }
                )
            }
        }
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt
@ -23,16 +23,26 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedCard
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarDuration
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import app.revanced.manager.BuildConfig
 import app.revanced.manager.R
@ -42,6 +52,7 @@ import app.revanced.manager.ui.component.ColumnWithScrollbar
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.model.navigation.Settings
 import app.revanced.manager.ui.viewmodel.AboutViewModel
+import app.revanced.manager.ui.viewmodel.AboutViewModel.Companion.DEVELOPER_OPTIONS_TAPS
 import app.revanced.manager.ui.viewmodel.AboutViewModel.Companion.getSocialIcon
 import app.revanced.manager.util.openUrl
 import app.revanced.manager.util.toast
@ -109,7 +120,8 @@ fun AboutSettingsScreen(
    }

    val listItems = listOfNotNull(
-        Triple(stringResource(R.string.submit_feedback),
+        Triple(
+            stringResource(R.string.submit_feedback),
            stringResource(R.string.submit_feedback_description),
            third = {
                context.openUrl("https://github.com/ReVanced/revanced-manager/issues/new/choose")
@ -134,6 +146,35 @@ fun AboutSettingsScreen(
    )

    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
+    val snackbarHostState = remember { SnackbarHostState() }
+
+    val showDeveloperSettings by viewModel.showDeveloperSettings.getAsState()
+    var developerTaps by rememberSaveable { mutableIntStateOf(0) }
+    LaunchedEffect(developerTaps) {
+        if (developerTaps == 0) return@LaunchedEffect
+        if (showDeveloperSettings) {
+            snackbarHostState.showSnackbar(context.getString(R.string.developer_options_already_enabled))
+            developerTaps = 0
+            return@LaunchedEffect
+        }
+
+        val remaining = DEVELOPER_OPTIONS_TAPS - developerTaps
+        if (remaining > 0) {
+            snackbarHostState.showSnackbar(
+                context.getString(
+                    R.string.developer_options_taps,
+                    remaining
+                ),
+                duration = SnackbarDuration.Long
+            )
+        } else if (remaining == 0) {
+            viewModel.showDeveloperSettings.update(true)
+            snackbarHostState.showSnackbar(context.getString(R.string.developer_options_enabled))
+        }
+
+        // Reset the counter
+        developerTaps = 0
+    }

    Scaffold(
        topBar = {
@ -143,6 +184,9 @@ fun AboutSettingsScreen(
                onBackClick = onBackClick
            )
        },
+        snackbarHost = {
+            SnackbarHost(hostState = snackbarHostState)
+        },
        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
    ) { paddingValues ->
        ColumnWithScrollbar(
@ -153,9 +197,11 @@ fun AboutSettingsScreen(
            verticalArrangement = Arrangement.spacedBy(16.dp)
        ) {
            Image(
-                modifier = Modifier.padding(top = 16.dp),
+                modifier = Modifier
+                    .padding(top = 16.dp)
+                    .clickable { developerTaps += 1 },
                painter = icon,
-                contentDescription = null
+                contentDescription = stringResource(R.string.app_name)
            )
            Column(
                horizontalAlignment = Alignment.CenterHorizontally,
@ -163,7 +209,11 @@ fun AboutSettingsScreen(
            ) {
                Text(
                    stringResource(R.string.app_name),
-                    style = MaterialTheme.typography.headlineSmall
+                    style = MaterialTheme.typography.headlineSmall,
+                    modifier = Modifier.semantics {
+                        // Icon already has this information for the purpose of being clickable.
+                        hideFromAccessibility()
+                    }
                )
                Text(
                    text = stringResource(R.string.version) + " " + BuildConfig.VERSION_NAME + " (" + BuildConfig.VERSION_CODE + ")",
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt
@ -61,7 +61,7 @@ import org.koin.androidx.compose.koinViewModel
@Composable
 fun AdvancedSettingsScreen(
    onBackClick: () -> Unit,
-    vm: AdvancedSettingsViewModel = koinViewModel()
+    viewModel: AdvancedSettingsViewModel = koinViewModel()
 ) {
    val context = LocalContext.current
    val memoryLimit = remember {
@ -91,16 +91,16 @@ fun AdvancedSettingsScreen(
        ) {
            GroupHeader(stringResource(R.string.manager))

-            val apiUrl by vm.prefs.api.getAsState()
+            val apiUrl by viewModel.prefs.api.getAsState()
            var showApiUrlDialog by rememberSaveable { mutableStateOf(false) }

            if (showApiUrlDialog) {
                APIUrlDialog(
                    currentUrl = apiUrl,
-                    defaultUrl = vm.prefs.api.default,
+                    defaultUrl = viewModel.prefs.api.default,
                    onSubmit = {
                        showApiUrlDialog = false
-                        it?.let(vm::setApiUrl)
+                        it?.let(viewModel::setApiUrl)
                    }
                )
            }
@ -114,44 +114,44 @@ fun AdvancedSettingsScreen(

            GroupHeader(stringResource(R.string.safeguards))
            SafeguardBooleanItem(
-                preference = vm.prefs.disablePatchVersionCompatCheck,
-                coroutineScope = vm.viewModelScope,
+                preference = viewModel.prefs.disablePatchVersionCompatCheck,
+                coroutineScope = viewModel.viewModelScope,
                headline = R.string.patch_compat_check,
                description = R.string.patch_compat_check_description,
                confirmationText = R.string.patch_compat_check_confirmation
            )
            SafeguardBooleanItem(
-                preference = vm.prefs.disableUniversalPatchWarning,
-                coroutineScope = vm.viewModelScope,
-                headline = R.string.universal_patches_safeguard,
-                description = R.string.universal_patches_safeguard_description,
-                confirmationText = R.string.universal_patches_safeguard_confirmation
-            )
-            SafeguardBooleanItem(
-                preference = vm.prefs.suggestedVersionSafeguard,
-                coroutineScope = vm.viewModelScope,
+                preference = viewModel.prefs.suggestedVersionSafeguard,
+                coroutineScope = viewModel.viewModelScope,
                headline = R.string.suggested_version_safeguard,
                description = R.string.suggested_version_safeguard_description,
                confirmationText = R.string.suggested_version_safeguard_confirmation
            )
            SafeguardBooleanItem(
-                preference = vm.prefs.disableSelectionWarning,
-                coroutineScope = vm.viewModelScope,
+                preference = viewModel.prefs.disableSelectionWarning,
+                coroutineScope = viewModel.viewModelScope,
                headline = R.string.patch_selection_safeguard,
                description = R.string.patch_selection_safeguard_description,
                confirmationText = R.string.patch_selection_safeguard_confirmation
            )
+            SafeguardBooleanItem(
+                preference = viewModel.prefs.disableUniversalPatchCheck,
+                coroutineScope = viewModel.viewModelScope,
+                headline = R.string.universal_patches_safeguard,
+                description = R.string.universal_patches_safeguard_description,
+                confirmationText = R.string.universal_patches_safeguard_confirmation
+            )

            GroupHeader(stringResource(R.string.patcher))
            BooleanItem(
-                preference = vm.prefs.useProcessRuntime,
-                coroutineScope = vm.viewModelScope,
+                preference = viewModel.prefs.useProcessRuntime,
+                coroutineScope = viewModel.viewModelScope,
                headline = R.string.process_runtime,
                description = R.string.process_runtime_description,
            )
            IntegerItem(
-                preference = vm.prefs.patcherProcessMemoryLimit,
-                coroutineScope = vm.viewModelScope,
+                preference = viewModel.prefs.patcherProcessMemoryLimit,
+                coroutineScope = viewModel.viewModelScope,
                headline = R.string.process_runtime_memory_limit,
                description = R.string.process_runtime_memory_limit_description,
            )
@ -159,11 +159,11 @@ fun AdvancedSettingsScreen(
            GroupHeader(stringResource(R.string.debugging))
            val exportDebugLogsLauncher =
                rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("text/plain")) {
-                    it?.let(vm::exportDebugLogs)
+                    it?.let(viewModel::exportDebugLogs)
                }
            SettingsListItem(
                headlineContent = stringResource(R.string.debug_logs_export),
-                modifier = Modifier.clickable { exportDebugLogsLauncher.launch(vm.debugLogFileName) }
+                modifier = Modifier.clickable { exportDebugLogsLauncher.launch(viewModel.debugLogFileName) }
            )
            val clipboard = remember { context.getSystemService<ClipboardManager>()!! }
            val deviceContent = """
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/ContributorSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/ContributorSettingsScreen.kt
@ -51,7 +51,7 @@ import org.koin.androidx.compose.koinViewModel

@OptIn(ExperimentalMaterial3Api::class)
@Composable
-fun ContributorScreen(
+fun ContributorSettingsScreen(
    onBackClick: () -> Unit,
    viewModel: ContributorViewModel = koinViewModel()
 ) {
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/DeveloperSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/DeveloperSettingsScreen.kt
@ -12,19 +12,23 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
+import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.GroupHeader
+import app.revanced.manager.ui.component.settings.BooleanItem
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.DeveloperOptionsViewModel
 import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.koinInject

@OptIn(ExperimentalMaterial3Api::class)
@Composable
-fun DeveloperOptionsScreen(
+fun DeveloperSettingsScreen(
    onBackClick: () -> Unit,
    vm: DeveloperOptionsViewModel = koinViewModel()
 ) {
    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
+    val prefs: PreferencesManager = koinInject()

    Scaffold(
        topBar = {
@ -37,13 +41,20 @@ fun DeveloperOptionsScreen(
        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
    ) { paddingValues ->
        Column(modifier = Modifier.padding(paddingValues)) {
-            GroupHeader(stringResource(R.string.patches))
+            GroupHeader(stringResource(R.string.manager))
+            BooleanItem(
+                preference = prefs.showDeveloperSettings,
+                headline = R.string.developer_options,
+                description = R.string.developer_options_description,
+            )
+
+            GroupHeader(stringResource(R.string.patch_bundles_section))
            SettingsListItem(
-                headlineContent = stringResource(R.string.patches_force_download),
+                headlineContent = stringResource(R.string.patch_bundles_force_download),
                modifier = Modifier.clickable(onClick = vm::redownloadBundles)
            )
            SettingsListItem(
-                headlineContent = stringResource(R.string.patches_reset),
+                headlineContent = stringResource(R.string.patch_bundles_reset),
                modifier = Modifier.clickable(onClick = vm::redownloadBundles)
            )
        }
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt
@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@ -43,6 +44,7 @@ import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ExceptionViewerDialog
 import app.revanced.manager.ui.component.GroupHeader
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar
+import app.revanced.manager.ui.component.ConfirmDialog
 import app.revanced.manager.ui.component.haptics.HapticCheckbox
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.DownloadsViewModel
@ -59,6 +61,17 @@ fun DownloadsSettingsScreen(
    val downloadedApps by viewModel.downloadedApps.collectAsStateWithLifecycle(emptyList())
    val pluginStates by viewModel.downloaderPluginStates.collectAsStateWithLifecycle()
    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
+    var showDeleteConfirmationDialog by rememberSaveable { mutableStateOf(false) }
+
+    if (showDeleteConfirmationDialog) {
+        ConfirmDialog(
+            onDismiss = { showDeleteConfirmationDialog = false },
+            onConfirm = { viewModel.deleteApps() },
+            title = stringResource(R.string.downloader_plugin_delete_apps_title),
+            description = stringResource(R.string.downloader_plugin_delete_apps_description),
+            icon = Icons.Outlined.Delete
+        )
+    }

    Scaffold(
        topBar = {
@ -68,7 +81,7 @@ fun DownloadsSettingsScreen(
                onBackClick = onBackClick,
                actions = {
                    if (viewModel.appSelection.isNotEmpty()) {
-                        IconButton(onClick = { viewModel.deleteApps() }) {
+                        IconButton(onClick = { showDeleteConfirmationDialog = true }) {
                            Icon(Icons.Default.Delete, stringResource(R.string.delete))
                        }
                    }
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/ImportExportSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/ImportExportSettingsScreen.kt
@ -203,8 +203,8 @@ fun ImportExportSettingsScreen(
            if (patchBundles.size > 1) {
                GroupItem(
                    onClick = { showBundleSelector = true },
-                    headline = R.string.patch_options_reset_patches,
-                    description = R.string.patch_options_reset_patches_description,
+                    headline = R.string.patch_options_reset_bundle,
+                    description = R.string.patch_options_reset_bundle_description,
                )
            }
        }
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesSettingsScreen.kt
@ -18,7 +18,7 @@ import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults

@OptIn(ExperimentalMaterial3Api::class)
@Composable
-fun LicensesScreen(
+fun LicensesSettingsScreen(
    onBackClick: () -> Unit,
 ) {
    AppScaffold(
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsSettingsScreen.kt
@ -27,7 +27,7 @@ import org.koin.androidx.compose.koinViewModel

@OptIn(ExperimentalMaterial3Api::class)
@Composable
-fun ChangelogsScreen(
+fun ChangelogsSettingsScreen(
    onBackClick: () -> Unit,
    vm: ChangelogsViewModel = koinViewModel()
 ) {
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/AboutViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/AboutViewModel.kt
@ -8,6 +8,7 @@ import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.revanced.manager.data.platform.NetworkInfo
+import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.network.api.ReVancedAPI
 import app.revanced.manager.network.dto.ReVancedDonationLink
 import app.revanced.manager.network.dto.ReVancedSocial
@ -27,6 +28,7 @@ import kotlinx.coroutines.withContext
 class AboutViewModel(
    private val reVancedAPI: ReVancedAPI,
    private val network: NetworkInfo,
+    prefs: PreferencesManager,
 ) : ViewModel() {
    var socials by mutableStateOf(emptyList<ReVancedSocial>())
        private set
@ -37,6 +39,8 @@ class AboutViewModel(
    val isConnected: Boolean
        get() = network.isConnected()

+    val showDeveloperSettings = prefs.showDeveloperSettings
+
    init {
        viewModelScope.launch {
            if (!isConnected) {
@ -53,6 +57,8 @@ class AboutViewModel(
    }

    companion object {
+        const val DEVELOPER_OPTIONS_TAPS = 5
+
        private val socialIcons = mapOf(
            "Discord" to FontAwesomeIcons.Brands.Discord,
            "GitHub" to FontAwesomeIcons.Brands.Github,
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/DashboardViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/DashboardViewModel.kt
@ -135,13 +135,13 @@ class DashboardViewModel(

        uiSafe(
            app,
-            R.string.patches_download_fail,
+            R.string.source_download_fail,
            RemotePatchBundle.updateFailMsg
        ) {
            if (bundle.update())
-                app.toast(app.getString(R.string.patches_update_success, bundle.getName()))
+                app.toast(app.getString(R.string.bundle_update_success, bundle.getName()))
            else
-                app.toast(app.getString(R.string.patches_update_unavailable, bundle.getName()))
+                app.toast(app.getString(R.string.bundle_update_unavailable, bundle.getName()))
        }
    }
 }
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/DeveloperOptionsViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/DeveloperOptionsViewModel.kt
@ -16,7 +16,7 @@ class DeveloperOptionsViewModel(
    private val patchBundleRepository: PatchBundleRepository
 ) : ViewModel() {
    fun redownloadBundles() = viewModelScope.launch {
-        uiSafe(app, R.string.patches_download_fail, RemotePatchBundle.updateFailMsg) {
+        uiSafe(app, R.string.source_download_fail, RemotePatchBundle.updateFailMsg) {
            patchBundleRepository.redownloadRemoteBundles()
        }
    }
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt
@ -55,8 +55,6 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
    private val packageName = input.app.packageName
    val appVersion = input.app.version

-    var pendingUniversalPatchAction by mutableStateOf<(() -> Unit)?>(null)
-
    var selectionWarningEnabled by mutableStateOf(true)
        private set
    var universalPatchWarningEnabled by mutableStateOf(true)
@ -69,7 +67,9 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi

    init {
        viewModelScope.launch {
-            universalPatchWarningEnabled = !prefs.disableUniversalPatchWarning.get()
+            if (prefs.disableUniversalPatchCheck.get()) {
+                universalPatchWarningEnabled = false
+            }

            if (prefs.disableSelectionWarning.get()) {
                selectionWarningEnabled = false
@ -160,17 +160,6 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
        customPatchSelection = selection.put(bundle, newPatches)
    }

-    fun confirmUniversalPatchWarning() {
-        universalPatchWarningEnabled = false
-
-        pendingUniversalPatchAction?.invoke()
-        pendingUniversalPatchAction = null
-    }
-
-    fun dismissUniversalPatchWarning() {
-        pendingUniversalPatchAction = null
-    }
-
    fun reset() {
        patchOptions.clear()
        customPatchSelection = null
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -14,24 +14,26 @@
    <string name="dashboard">Dashboard</string>
    <string name="settings">Settings</string>
    <string name="select_app">Select an app</string>
-    <string name="patches_count_selected">%1$d/%2$d selected</string>
+    <string name="patches_selected">%1$d/%2$d selected</string>

    <string name="new_downloader_plugins_notification">New downloader plugins available. Click here to configure them.</string>
    <string name="unsupported_architecture_warning">Patching on this device architecture is unsupported and will most likely fail.</string>

    <string name="import_">Import</string>
-    <string name="import_patches">Import patches</string>
+    <string name="import_bundle">Import patch bundle</string>
+    <string name="bundle_patches">Bundle patches</string>
+    <string name="patch_bundle_field">Patch bundle</string>
    <string name="file_field_set">Selected</string>
    <string name="file_field_not_set">Not selected</string>

    <string name="field_not_set">Not set</string>

-    <string name="patches_missing">Missing</string>
-    <string name="patches_error">Error</string>
-    <string name="patches_error_description">Patches could not be loaded. Click to view the error</string>
-    <string name="patches_not_downloaded">Patches has not been downloaded. Click here to download it</string>
-    <string name="patches_name_default">Patches</string>
-    <string name="patches_name_fallback">Unnamed</string>
+    <string name="bundle_missing">Missing</string>
+    <string name="bundle_error">Error</string>
+    <string name="bundle_error_description">Bundle could not be loaded. Click to view the error</string>
+    <string name="bundle_not_downloaded">Bundle has not been downloaded. Click here to download it</string>
+    <string name="bundle_name_default">Default</string>
+    <string name="bundle_name_fallback">Unnamed</string>

    <string name="android_11_bug_dialog_title">Android 11 bug</string>
    <string name="android_11_bug_dialog_description">The app installation permission must be granted ahead of time to avoid a bug in the Android 11 system that will negatively affect the user experience.</string>
@ -98,8 +100,8 @@
    <string name="patch_selection_safeguard">Allow changing patch selection</string>
    <string name="patch_selection_safeguard_description">Do not prevent selecting or deselecting patches</string>
    <string name="patch_selection_safeguard_confirmation">Changing the selection of patches may cause unexpected issues.\n\nEnable anyways?</string>
-    <string name="universal_patches_safeguard">Disable universal patch warning</string>
-    <string name="universal_patches_safeguard_description">Disables the warning that appears when you try to select universal patches</string>
+    <string name="universal_patches_safeguard">Allow using universal patches</string>
+    <string name="universal_patches_safeguard_description">Do not prevent using universal patches</string>
    <string name="universal_patches_safeguard_confirmation">Universal patches are not as well tested as those that target specific apps.\n\nEnable anyways?</string>
    <string name="import_keystore">Import keystore</string>
    <string name="import_keystore_description">Import a custom keystore</string>
@ -130,8 +132,8 @@
    <string name="reset_patch_selection_success">Patch selection has been reset</string>
    <string name="patch_options_reset_package">Reset patch options for app</string>
    <string name="patch_options_reset_package_description">Resets patch options for a single app</string>
-    <string name="patch_options_reset_patches">Resets patch options for this patches</string>
-    <string name="patch_options_reset_patches_description">Resets patch options for all patches</string>
+    <string name="patch_options_reset_bundle">Resets patch options for bundle</string>
+    <string name="patch_options_reset_bundle_description">Resets patch options for all patches in a bundle</string>
    <string name="patch_options_reset_all">Reset patch options</string>
    <string name="patch_options_reset_all_description">Resets all patch options</string>
    <string name="downloader_plugins">Plugins</string>
@ -141,11 +143,13 @@
    <string name="downloader_plugin_trust_dialog_title">Trust plugin?</string>
    <string name="downloader_plugin_revoke_trust_dialog_title">Revoke trust?</string>
    <string name="downloader_plugin_trust_dialog_body">Package name: %1$s\nSignature (SHA-256): %2$s</string>
+    <string name="downloader_plugin_delete_apps_title">Delete selected apps</string>
+    <string name="downloader_plugin_delete_apps_description">Are you sure you want to delete the selected apps?</string>
    <string name="downloader_settings_no_apps">No downloaded apps found</string>

    <string name="search_apps">Search apps…</string>
    <string name="loading_body">Loading…</string>
-    <string name="downloading_patches">Downloading patches…</string>
+    <string name="downloading_patches">Downloading patch bundle…</string>

    <string name="options">Options</string>
    <string name="ok">OK</string>
@ -183,8 +187,8 @@
    <string name="debug_logs_export_success">Exported logs</string>
    <string name="api_url">API URL</string>
    <string name="api_url_description">The API used to download necessary files.</string>
-    <string name="api_url_dialog_title">Change API URL</string>
-    <string name="api_url_dialog_description">Change the API URL of ReVanced Manager. ReVanced Manager uses the API to download patches and updates.</string>
+    <string name="api_url_dialog_title">Set custom API URL</string>
+    <string name="api_url_dialog_description">Set the API URL of ReVanced Manager. ReVanced Manager uses the API to download patches and updates.</string>
    <string name="api_url_dialog_warning">ReVanced Manager connects to the API to download patches and updates. Make sure that you trust it.</string>
    <string name="api_url_dialog_save">Set</string>
    <string name="api_url_dialog_reset">Reset API URL</string>
@ -194,25 +198,26 @@
    <string name="device_architectures">CPU Architectures</string>
    <string name="device_memory_limit">Memory limits</string>
    <string name="device_memory_limit_format">%1$dMB (Normal) - %2$dMB (Large)</string>
-    <string name="patches_force_download">Force download all patches</string>
-    <string name="patches_reset">Reset patches</string>
+    <string name="patch_bundles_section">Patch bundles</string>
+    <string name="patch_bundles_force_download">Force download all patch bundles</string>
+    <string name="patch_bundles_reset">Reset patch bundles</string>
    <string name="patching">Patching</string>
    <string name="signing">Signing</string>
    <string name="storage">Storage</string>
-    <string name="no_patch_found">No patch can be found. Check your patches</string>
+    <string name="patches_unavailable">No patches are available. Check your bundles</string>
    <string name="tab_apps">Apps</string>
-    <string name="tab_patches">Patches</string>
+    <string name="tab_bundles">Patch bundles</string>
    <string name="delete">Delete</string>
    <string name="refresh">Refresh</string>
    <string name="continue_anyways">Continue anyways</string>
    <string name="download_another_version">Download another version</string>
    <string name="download_app">Download app</string>
    <string name="download_apk">Download APK file</string>
-    <string name="patches_download_fail">Failed to download patches: %s</string>
-    <string name="patches_replace_fail">Failed to load updated patches: %s</string>
+    <string name="source_download_fail">Failed to download patch bundle: %s</string>
+    <string name="source_replace_fail">Failed to load updated patch bundle: %s</string>
    <string name="no_patched_apps_found">No patched apps found</string>
    <string name="tap_on_patches">Tap on the patches to get more information about them</string>
-    <string name="patches_selected">%s selected</string>
+    <string name="bundles_selected">%s selected</string>
    <string name="incompatible_patches">Incompatible patches</string>
    <string name="universal_patches">Universal patches</string>
    <string name="patch_selection_reset_toast">Patch selection and options has been reset to recommended defaults</string>
@ -221,7 +226,7 @@
    <string name="non_suggested_version_warning_description">The version of the app you have selected does not match the suggested version.\nPlease use the suggested version: %s\n\nTo continue anyway, disable \"Require suggested app version\" in the advanced settings.</string>
    <string name="selection_warning_title">Stop using defaults?</string>
    <string name="selection_warning_description">It is recommended to use the default patch selection and options. Changing them may result in unexpected issues.\n\nYou need to turn on \"Allow changing patch selection\" in the advanced settings before toggling patches.</string>
-    <string name="universal_patch_warning_description">Universal patches have a more generalized use and do not work as reliably as patches that target specific apps. You may encounter issues while using them.\n\nThis warning can be disabled in the advanced settings.</string>
+    <string name="universal_patch_warning_description">Universal patches have a more generalized use and do not work as reliably as patches that target specific apps. You may encounter issues while using them.\n\nYou need to turn on \"Allow using universal patches\" in the advanced settings before using universal patches.</string>
    <string name="this_version">This version</string>
    <string name="universal">Any app</string>
    <string name="search_patches">Search patches</string>
@ -298,6 +303,8 @@
    <string name="patcher_step_write_patched">Write patched APK file</string>
    <string name="patcher_step_sign_apk">Sign patched APK file</string>
    <string name="patcher_notification_message">Patching in progress…</string>
+    <string name="patcher_stop_confirm_title">Stop patcher</string>
+    <string name="patcher_stop_confirm_description">Are you sure you want to stop the patching process?</string>
    <string name="execute_patches">Execute patches</string>
    <string name="executing_patch">Execute %s</string>
    <string name="failed_to_execute_patch">Failed to execute %s</string>
@ -325,14 +332,25 @@
    <string name="submit_feedback_description">Help us improve this application</string>
    <string name="developer_options">Developer options</string>
    <string name="developer_options_description">Options for debugging issues</string>
-    <string name="patches_update_success">Successfully updated %s</string>
-    <string name="patches_update_unavailable">No update available for %s</string>
-    <string name="patches_view">View patches</string>
-    <string name="patches_view_any_version">Any version</string>
-    <string name="patches_view_any_package">Any package</string>
+    <string name="bundle_input_source_url">Source URL</string>
+    <string name="bundle_update_success">Successfully updated %s</string>
+    <string name="bundle_update_unavailable">No update available for %s</string>
+    <string name="bundle_auto_update">Auto update</string>
+    <string name="bundle_auto_update_description">Automatically update this bundle when ReVanced starts</string>
+    <string name="bundle_view_patches">View patches</string>
+    <string name="bundle_view_patches_any_version">Any version</string>
+    <string name="bundle_view_patches_any_package">Any package</string>
+    <string name="bundle_delete_single_dialog_title">Delete bundle</string>
+    <string name="bundle_delete_multiple_dialog_title">Delete bundles</string>
+    <string name="bundle_delete_single_dialog_description">Are you sure you want to delete the bundle \"%s\"?</string>
+    <string name="bundle_delete_multiple_dialog_description">Are you sure you want to delete the selected bundles?</string>
+

    <string name="about_revanced_manager">About ReVanced Manager</string>
    <string name="revanced_manager_description">ReVanced Manager is an application designed to work with ReVanced Patcher, which allows for long-lasting patches to be created for Android apps. The patching system is designed to automatically work with new versions of apps with minimal maintenance.</string>
+    <string name="developer_options_taps">%d taps remaining</string>
+    <string name="developer_options_enabled">Developer options enabled</string>
+    <string name="developer_options_already_enabled">Developer options are already enabled</string>
    <string name="update_available">An update is available</string>
    <string name="current_version">Current version: %s</string>
    <string name="new_version">New version: %s</string>
@ -356,7 +374,7 @@
    <string name="save_with_count">Save (%1$s)</string>
    <string name="update">Update</string>
    <string name="empty">Empty</string>
-    <string name="installing_message">Tap on <b>Update</b> when prompted.\nReVanced Manager will close when updating.</string>
+    <string name="installing_message">Tap on <b>Update</b> when prompted. \n ReVanced Manager will close when updating.</string>
    <string name="no_changelogs_found">No changelogs found</string>
    <string name="just_now">Just now</string>
    <string name="minutes_ago">%sm ago</string>
@ -380,9 +398,10 @@
    <string name="no_contributors_found">No contributors found</string>
    <string name="select">Select</string>
    <string name="select_deselect_all">Select or deselect all</string>
-    <string name="select_patches_type_dialog_description">Add new patches from URL or local files</string>
-    <string name="local_patches_description">Add patches from local storage.</string>
-    <string name="remote_patches_description">Add patches from URL. Patches can automatically update.</string>
+    <string name="select_bundle_type_dialog_title">Add new bundle</string>
+    <string name="select_bundle_type_dialog_description">Add a new bundle from a URL or storage</string>
+    <string name="local_bundle_description">Import local files from your storage, does not automatically update</string>
+    <string name="remote_bundle_description">Import remote files from a URL, can automatically update</string>
    <string name="recommended">Recommended</string>

    <string name="installation_failed_dialog_title">Installation failed</string>
@ -407,10 +426,9 @@
    <string name="about_device">About device</string>
    <string name="enter_url">Enter URL</string>
    <string name="next">Next</string>
+    <string name="add_patch_bundle">Add patch bundle</string>
+    <string name="bundle_url">Bundle URL</string>
    <string name="auto_update">Auto update</string>
-    <string name="add_patches">Add patches</string>
-    <string name="auto_update_description">Automatically update when a new version is available</string>
-    <string name="patches_url">Patches URL</string>
    <string name="incompatible_patches_dialog">These patches are not compatible with the selected app version (%1$s).\n\nClick on the patches to see more details.</string>
    <string name="incompatible_patch">Incompatible patch</string>
    <string name="any_version">Any</string>
@ -419,4 +437,5 @@
    <string name="show_manager_update_dialog_on_launch_description">Shows a popup notification whenever there is a new update available on launch.</string>
    <string name="failed_to_import_keystore">Failed to import keystore</string>
    <string name="export">Export</string>
+    <string name="confirm">Confirm</string>
 </resources>
--- a/assets/revanced-logo/revanced-logo-round.svg
+++ b/assets/revanced-logo/revanced-logo-round.svg
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@ -1,22 +1,22 @@
 [versions]
-ktx = "1.15.0"
-material3 = "1.3.1"
-ui-tooling = "1.7.7"
-viewmodel-lifecycle = "2.8.7"
+ktx = "1.16.0"
+material3 = "1.3.2"
+ui-tooling = "1.8.1"
+viewmodel-lifecycle = "2.9.0"
 splash-screen = "1.0.1"
-activity = "1.10.0"
+activity = "1.10.1"
 appcompat = "1.7.0"
 preferences-datastore = "1.1.2"
-work-runtime = "2.10.0"
-compose-bom = "2025.01.01"
-navigation = "2.8.6"
+work-runtime = "2.10.1"
+compose-bom = "2025.05.00"
+navigation = "2.9.0"
 accompanist = "0.37.0"
 placeholder = "1.1.2"
 reorderable = "2.4.3"
 serialization = "1.8.0"
 collection = "0.3.8"
 datetime = "0.6.1"
-room-version = "2.6.1"
+room-version = "2.7.1"
 revanced-patcher = "21.0.0"
 revanced-library = "3.0.2"
 plugin-api = "1.0.0"
@ -25,7 +25,7 @@ ktor = "2.3.9"
 markdown-renderer = "0.30.0"
 fading-edges = "1.0.4"
 kotlin = "2.1.10"
-android-gradle-plugin = "8.8.0"
+android-gradle-plugin = "8.9.1"
 dev-tools-gradle-plugin = "2.1.10-1.0.29"
 about-libraries-gradle-plugin = "11.5.0"
 coil = "2.7.0"
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/6
+++ b/6
@ -114,7 +114,7 @@ case "$( uname )" in                #(
  NONSTOP* )        nonstop=true ;;
 esac

-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""


 # Determine the Java command to use to start the JVM.
@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
        "$@"

 # Stop when "xargs" is not available.
--- a/gradlew.bat
+++ b/gradlew.bat
@ -70,11 +70,11 @@ goto fail
 :execute
@rem Setup the command line

-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=


@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*

 :end
@rem End local scope for the variables with windows NT shell
Author	SHA1	Message	Date
Brosssh	dd48011c28	fix(Compose): Adjusted universal patches safeguard and warnings (#2550 )	2025-05-17 21:33:02 +02:00
Ax333l	9851f73477	feat(Compose): hide developer settings (#2551 )	2025-05-15 20:56:25 +02:00
Ax333l	e71e6fb797	fix: handle edge-to-edge properly in fullscreen dialogs	2025-05-14 20:23:23 +02:00
Brosssh	111e8808a0	feat(Compose): Add confirmation dialog on multiple operations (#2529 )	2025-05-14 19:55:09 +02:00
Robert	a30ff45111	refactor: Rename settings screens for consistency (#2547 )	2025-05-14 19:34:05 +02:00
Brosssh	eb03daaebd	feat(Compose): Improve patches selector tab by adding the bundle version (#2545 )	2025-05-14 19:33:05 +02:00
oSumAtrIX	9e2a7917ba	ci: Adjust and modernize workflow files to match other repos	2025-05-12 18:32:30 +02:00
oSumAtrIX	88fc639751	docs: Adjust issue templates to match other repos	2025-05-12 18:32:30 +02:00
oSumAtrIX	2fc099568e	docs: Add contribution guidelines and adjust README	2025-05-12 18:32:29 +02:00
oSumAtrIX	e641b91e57	build: Update Gradle Wrapper	2025-05-12 18:32:29 +02:00
Ax333l	d09e9b79cb	fix: patch count remaining at zero when using process runtime (#2542 )	2025-05-11 19:30:12 +02:00
Robert	3f5d04a513	feat: Order bundles by number of patches	2025-05-11 13:10:11 +02:00
oSumAtrIX	3ad027007f	style: Apply formatting	2025-05-10 23:07:46 +02:00