oops

closes #2503

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -0,0 +1,61 @@
+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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,109 +0,0 @@
-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

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1 @@
-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!
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature-issue.yml

@@ -0,0 +1,42 @@
+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

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,103 +0,0 @@
-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

.github/config.yaml

@@ -1,2 +1,2 @@
 firstPRMergeComment: >
-  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) to receive a role for your contribution.
+  ❤️ Thank you for contributing to ReVanced Manager. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.

.github/workflows/build_pull_request.yml

@@ -1,33 +0,0 @@
-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 assembleRelease --no-daemon
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: revanced-manager
-          path: |
-            app/build/outputs/apk/release/revanced-manager*.apk
-            app/build/outputs/apk/release/revanced-manager*.apk.asc

.github/workflows/open_pull_request.yml

@@ -1,26 +0,0 @@
-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

.github/workflows/pr-build.yml

@@ -0,0 +1,44 @@
+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

.github/workflows/release-build.yml

@@ -0,0 +1,57 @@
+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

.github/workflows/release.yml

@@ -1,72 +0,0 @@
-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: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v6
-        with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          fingerprint: ${{ vars.GPG_FINGERPRINT }}
-
-      - 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-name: 'ReVanced Manager ${{ steps.release.outputs.new_release_git_tag }}'
-          subject-path: app/build/outputs/apk/release/revanced-manager*.apk

.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 }}"}'

.gitignore

@@ -1,132 +1,12 @@
-### Java template
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-.idea/artifacts
-.idea/compiler.xml
-.idea/jarRepositories.xml
-.idea/modules.xml
-.idea/*.iml
-.idea/modules
 *.iml
-*.ipr
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-### Gradle template
 .gradle
-**/build/
-!src/**/build/
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-
-# Cache of project
-.gradletasknamecache
-
-# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
-# gradle/wrapper/gradle-wrapper.properties
-
-# Potentially copyrighted test APK
-*.apk
-
-# Ignore vscode config
-.vscode/
-
-# Dependency directories
-node_modules/
-
-# Ignore IDEA files
-.idea/
-
-.kotlin/
-
+/local.properties
+/.idea
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
 local.properties
 
-.cxx
+.kotlin/

.releaserc

@@ -1,49 +0,0 @@
-{
-  "branches": [
-    "main",
-    {
-      "name": "dev",
-      "prerelease": true
-    }
-  ],
-  "plugins": [
-    [
-      "@semantic-release/commit-analyzer", {
-        "releaseRules": [
-          { "type": "build", "scope": "Needs bump", "release": "patch" }
-        ]
-      }
-    ],
-    "@semantic-release/release-notes-generator",
-    "@semantic-release/changelog",
-    "gradle-semantic-release-plugin",
-    [
-      "@semantic-release/git",
-      {
-        "assets": [
-          "CHANGELOG.md",
-          "gradle.properties",
-        ],
-        "message": "chore: Release v${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
-      }
-    ],
-    [
-      "@semantic-release/github",
-      {
-        "assets": [
-          {
-            "path": "app/build/outputs/apk/release/revanced-manager*.apk?(.asc)"
-          },
-        ],
-        successComment: false
-      }
-    ],
-    [
-      "@saithodev/semantic-release-backmerge",
-      {
-        backmergeBranches: [{"from": "main", "to": "dev"}],
-        clearWorkspace: true
-      }
-    ]
-  ]
-}

README.md

@@ -1,104 +1,55 @@
-<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>
+# ReVanced Manager (Compose Rewrite)
 
-# 💊 ReVanced Manager
+[![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)
 
-![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)
+_(Yet another)_ rewrite of the ReVanced Manager using Kotlin and Jetpack Compose.
 
-Application to use ReVanced on Android
+## Design system
 
-## ❓ About
+In this rewrite, we are adopting the latest Material Design principles and guidelines by using Material 3 and Material You.
 
-ReVanced Manager is an application that uses [ReVanced Patcher](https://github.com/revanced/revanced-patcher) to patch Android apps.
+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.
 
-## 💪 Features
+### Why Material 3?
 
-Some of the features ReVanced Manager provides are:
+* **Consistent design language**
+* **Improved accessibility**
+* **Better user experience**
 
-- ⬇️ **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
+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
 
-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).
+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)
 
-## 📚 Everything else
+## 📝 Prerequisites
 
-### 📙 Contributing
+For a list of prerequisites, refer to [docs/0_prerequisites.md](docs/0_prerequisites.md)
 
-Thank you for considering contributing to ReVanced Manager.
-You can find the contribution guidelines [here](CONTRIBUTING.md).
+## 🔴 Issues
 
-### 🛠️ Building
+For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose).
 
-To build a ReVanced Manager, you can follow the [documentation](/docs).
+## 🌐 Translation
 
-### 📄 Documentation
+[![Crowdin](https://badges.crowdin.net/revanced/localized.svg)](https://crowdin.com/project/revanced)
 
-You can find the documentation for ReVanced Manager [here](/docs).
+We're accepting translations on [Crowdin](https://translate.revanced.app)
 
-## ⚖️ License
+## 🛠️ Building Manager from source
 
-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.
+For instructions on how to build ReVanced Manager from source, refer to [docs/4_building.md](docs/4_building.md)

SECURITY.md

@@ -58,46 +58,20 @@
    Continuing the legacy of Vanced
 </p>
 
-# 👋 Contribution guidelines
+# 🔒 Security Policy
 
-This document describes how to contribute to ReVanced Manager.
+This document describes how to report security vulnerabilities for ReVanced Manager.
 
-## 📖 Resources to help you get started
+## 🚨 Reporting a Vulnerability
 
-* 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
+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).
 
-## 🙏 Submitting a feature request
+If a vulnerability is confirmed and accepted, you can join our [Discord](https://discord.gg/revanced) server to receive a special contributor role.
 
-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+).
+### ⏳ Supported Versions
 
-> **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
+| 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: |

api/api/api.api

@@ -1,182 +0,0 @@
-public abstract interface class app/revanced/manager/plugin/downloader/BaseDownloadScope : app/revanced/manager/plugin/downloader/Scope {
-}
-
-public final class app/revanced/manager/plugin/downloader/ConstantsKt {
-	public static final field PLUGIN_HOST_PERMISSION Ljava/lang/String;
-}
-
-public final class app/revanced/manager/plugin/downloader/DownloadUrl : android/os/Parcelable {
-	public static final field $stable I
-	public static final field CREATOR Landroid/os/Parcelable$Creator;
-	public fun <init> (Ljava/lang/String;Ljava/util/Map;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/util/Map;
-	public final fun copy (Ljava/lang/String;Ljava/util/Map;)Lapp/revanced/manager/plugin/downloader/DownloadUrl;
-	public static synthetic fun copy$default (Lapp/revanced/manager/plugin/downloader/DownloadUrl;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lapp/revanced/manager/plugin/downloader/DownloadUrl;
-	public final fun describeContents ()I
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getHeaders ()Ljava/util/Map;
-	public final fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public final fun toDownloadResult ()Lkotlin/Pair;
-	public fun toString ()Ljava/lang/String;
-	public final fun writeToParcel (Landroid/os/Parcel;I)V
-}
-
-public final class app/revanced/manager/plugin/downloader/DownloadUrl$Creator : android/os/Parcelable$Creator {
-	public fun <init> ()V
-	public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/plugin/downloader/DownloadUrl;
-	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
-	public final fun newArray (I)[Lapp/revanced/manager/plugin/downloader/DownloadUrl;
-	public synthetic fun newArray (I)[Ljava/lang/Object;
-}
-
-public final class app/revanced/manager/plugin/downloader/Downloader {
-	public static final field $stable I
-}
-
-public final class app/revanced/manager/plugin/downloader/DownloaderBuilder {
-	public static final field $stable I
-}
-
-public final class app/revanced/manager/plugin/downloader/DownloaderKt {
-	public static final fun Downloader (Lkotlin/jvm/functions/Function1;)Lapp/revanced/manager/plugin/downloader/DownloaderBuilder;
-}
-
-public final class app/revanced/manager/plugin/downloader/DownloaderScope : app/revanced/manager/plugin/downloader/Scope {
-	public static final field $stable I
-	public final fun download (Lkotlin/jvm/functions/Function3;)V
-	public final fun get (Lkotlin/jvm/functions/Function4;)V
-	public fun getHostPackageName ()Ljava/lang/String;
-	public fun getPluginPackageName ()Ljava/lang/String;
-	public final fun useService (Landroid/content/Intent;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class app/revanced/manager/plugin/downloader/ExtensionsKt {
-	public static final fun download (Lapp/revanced/manager/plugin/downloader/DownloaderScope;Lkotlin/jvm/functions/Function4;)V
-}
-
-public abstract interface class app/revanced/manager/plugin/downloader/GetScope : app/revanced/manager/plugin/downloader/Scope {
-	public abstract fun requestStartActivity (Landroid/content/Intent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract interface class app/revanced/manager/plugin/downloader/InputDownloadScope : app/revanced/manager/plugin/downloader/BaseDownloadScope {
-}
-
-public abstract interface class app/revanced/manager/plugin/downloader/OutputDownloadScope : app/revanced/manager/plugin/downloader/BaseDownloadScope {
-	public abstract fun reportSize (JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class app/revanced/manager/plugin/downloader/Package : android/os/Parcelable {
-	public static final field $stable I
-	public static final field CREATOR Landroid/os/Parcelable$Creator;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/manager/plugin/downloader/Package;
-	public static synthetic fun copy$default (Lapp/revanced/manager/plugin/downloader/Package;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lapp/revanced/manager/plugin/downloader/Package;
-	public final fun describeContents ()I
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getName ()Ljava/lang/String;
-	public final fun getVersion ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-	public final fun writeToParcel (Landroid/os/Parcel;I)V
-}
-
-public final class app/revanced/manager/plugin/downloader/Package$Creator : android/os/Parcelable$Creator {
-	public fun <init> ()V
-	public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/plugin/downloader/Package;
-	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
-	public final fun newArray (I)[Lapp/revanced/manager/plugin/downloader/Package;
-	public synthetic fun newArray (I)[Ljava/lang/Object;
-}
-
-public abstract interface annotation class app/revanced/manager/plugin/downloader/PluginHostApi : java/lang/annotation/Annotation {
-}
-
-public abstract interface class app/revanced/manager/plugin/downloader/Scope {
-	public abstract fun getHostPackageName ()Ljava/lang/String;
-	public abstract fun getPluginPackageName ()Ljava/lang/String;
-}
-
-public abstract class app/revanced/manager/plugin/downloader/UserInteractionException : java/lang/Exception {
-	public static final field $stable I
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-}
-
-public abstract class app/revanced/manager/plugin/downloader/UserInteractionException$Activity : app/revanced/manager/plugin/downloader/UserInteractionException {
-	public static final field $stable I
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-}
-
-public final class app/revanced/manager/plugin/downloader/UserInteractionException$Activity$Cancelled : app/revanced/manager/plugin/downloader/UserInteractionException$Activity {
-	public static final field $stable I
-}
-
-public final class app/revanced/manager/plugin/downloader/UserInteractionException$Activity$NotCompleted : app/revanced/manager/plugin/downloader/UserInteractionException$Activity {
-	public static final field $stable I
-	public final fun getIntent ()Landroid/content/Intent;
-	public final fun getResultCode ()I
-}
-
-public final class app/revanced/manager/plugin/downloader/UserInteractionException$RequestDenied : app/revanced/manager/plugin/downloader/UserInteractionException {
-	public static final field $stable I
-}
-
-public final class app/revanced/manager/plugin/downloader/webview/APIKt {
-	public static final fun WebViewDownloader (Lkotlin/jvm/functions/Function4;)Lapp/revanced/manager/plugin/downloader/DownloaderBuilder;
-	public static final fun runWebView (Lapp/revanced/manager/plugin/downloader/GetScope;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class app/revanced/manager/plugin/downloader/webview/IWebView$Default : app/revanced/manager/plugin/downloader/webview/IWebView {
-	public fun <init> ()V
-	public fun asBinder ()Landroid/os/IBinder;
-	public fun finish ()V
-	public fun load (Ljava/lang/String;)V
-}
-
-public abstract class app/revanced/manager/plugin/downloader/webview/IWebView$Stub : android/os/Binder, app/revanced/manager/plugin/downloader/webview/IWebView {
-	public fun <init> ()V
-	public fun asBinder ()Landroid/os/IBinder;
-	public static fun asInterface (Landroid/os/IBinder;)Lapp/revanced/manager/plugin/downloader/webview/IWebView;
-	public fun onTransact (ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-}
-
-public class app/revanced/manager/plugin/downloader/webview/IWebViewEvents$Default : app/revanced/manager/plugin/downloader/webview/IWebViewEvents {
-	public fun <init> ()V
-	public fun asBinder ()Landroid/os/IBinder;
-	public fun download (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public fun pageLoad (Ljava/lang/String;)V
-	public fun ready (Lapp/revanced/manager/plugin/downloader/webview/IWebView;)V
-}
-
-public abstract class app/revanced/manager/plugin/downloader/webview/IWebViewEvents$Stub : android/os/Binder, app/revanced/manager/plugin/downloader/webview/IWebViewEvents {
-	public fun <init> ()V
-	public fun asBinder ()Landroid/os/IBinder;
-	public static fun asInterface (Landroid/os/IBinder;)Lapp/revanced/manager/plugin/downloader/webview/IWebViewEvents;
-	public fun onTransact (ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-}
-
-public final class app/revanced/manager/plugin/downloader/webview/WebViewActivity$Parameters$Creator : android/os/Parcelable$Creator {
-	public fun <init> ()V
-	public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/plugin/downloader/webview/WebViewActivity$Parameters;
-	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
-	public final fun newArray (I)[Lapp/revanced/manager/plugin/downloader/webview/WebViewActivity$Parameters;
-	public synthetic fun newArray (I)[Ljava/lang/Object;
-}
-
-public abstract interface class app/revanced/manager/plugin/downloader/webview/WebViewCallbackScope : app/revanced/manager/plugin/downloader/Scope {
-	public abstract fun finish (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun load (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class app/revanced/manager/plugin/downloader/webview/WebViewScope : app/revanced/manager/plugin/downloader/Scope {
-	public static final field $stable I
-	public final fun download (Lkotlin/jvm/functions/Function5;)V
-	public fun getHostPackageName ()Ljava/lang/String;
-	public fun getPluginPackageName ()Ljava/lang/String;
-	public final fun pageLoad (Lkotlin/jvm/functions/Function3;)V
-}
-

api/build.gradle.kts

@@ -1,150 +0,0 @@
-import java.io.IOException
-
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.parcelize)
-    alias(libs.plugins.compose.compiler)
-    alias(libs.plugins.binary.compatibility.validator)
-    `maven-publish`
-    signing
-}
-
-group = "app.revanced"
-
-dependencies {
-    implementation(libs.androidx.ktx)
-    implementation(libs.runtime.ktx)
-    implementation(libs.activity.compose)
-    implementation(libs.appcompat)
-}
-
-fun String.runCommand(): String {
-    val process = ProcessBuilder(split("\\s".toRegex()))
-        .redirectErrorStream(true)
-        .directory(rootDir)
-        .start()
-
-    val output = StringBuilder()
-    val reader = process.inputStream.bufferedReader()
-
-    val thread = Thread {
-        reader.forEachLine {
-            output.appendLine(it)
-        }
-    }
-    thread.start()
-
-    if (!process.waitFor(10, TimeUnit.SECONDS)) {
-        process.destroy()
-        throw IOException("Command timed out: $this")
-    }
-
-    thread.join()
-    return output.toString().trim()
-}
-
-val projectPath: String = projectDir.relativeTo(rootDir).path
-val lastTag = "git describe --tags --abbrev=0".runCommand()
-val hasChangesInThisModule = "git diff --name-only $lastTag..HEAD".runCommand().lineSequence().any {
-    it.startsWith(projectPath)
-}
-
-tasks.matching { it.name.startsWith("publish") }.configureEach {
-    onlyIf {
-        hasChangesInThisModule
-    }
-}
-
-android {
-    namespace = "app.revanced.manager.plugin.downloader"
-    compileSdk = 35
-
-    defaultConfig {
-        minSdk = 26
-
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
-    buildFeatures {
-        aidl = true
-    }
-}
-
-apiValidation {
-    nonPublicMarkers += "app.revanced.manager.plugin.downloader.PluginHostApi"
-}
-
-publishing {
-    repositories {
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/revanced/revanced-manager")
-            credentials {
-                username = System.getenv("GITHUB_ACTOR") ?: extra["gpr.user"] as String?
-                password = System.getenv("GITHUB_TOKEN") ?: extra["gpr.key"] as String?
-            }
-        }
-    }
-
-    publications {
-        create<MavenPublication>("Api") {
-            afterEvaluate {
-                from(components["release"])
-            }
-
-            groupId = "app.revanced"
-            artifactId = "revanced-manager-api"
-            version = project.version.toString()
-
-            pom {
-                name = "ReVanced Manager API"
-                description = "API for ReVanced Manager."
-                url = "https://revanced.app"
-
-                licenses {
-                    license {
-                        name = "GNU General Public License v3.0"
-                        url = "https://www.gnu.org/licenses/gpl-3.0.en.html"
-                    }
-                }
-                developers {
-                    developer {
-                        id = "ReVanced"
-                        name = "ReVanced"
-                        email = "contact@revanced.app"
-                    }
-                }
-                scm {
-                    connection = "scm:git:git://github.com/revanced/revanced-manager.git"
-                    developerConnection = "scm:git:git@github.com:revanced/revanced-manager.git"
-                    url = "https://github.com/revanced/revanced-manager"
-                }
-            }
-        }
-    }
-}
-
-signing {
-    useGpgCmd()
-    sign(publishing.publications["Api"])
-}

api/src/main/AndroidManifest.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-</manifest>

api/src/main/aidl/app/revanced/manager/plugin/downloader/webview/IWebView.aidl

@@ -1,8 +0,0 @@
-// IWebView.aidl
-package app.revanced.manager.plugin.downloader.webview;
-
-@JavaPassthrough(annotation="@app.revanced.manager.plugin.downloader.PluginHostApi")
-oneway interface IWebView {
-    void load(String url);
-    void finish();
-}

api/src/main/aidl/app/revanced/manager/plugin/downloader/webview/IWebViewEvents.aidl

@@ -1,11 +0,0 @@
-// IWebViewEvents.aidl
-package app.revanced.manager.plugin.downloader.webview;
-
-import app.revanced.manager.plugin.downloader.webview.IWebView;
-
-@JavaPassthrough(annotation="@app.revanced.manager.plugin.downloader.PluginHostApi")
-oneway interface IWebViewEvents {
-    void ready(IWebView iface);
-    void pageLoad(String url);
-    void download(String url, String mimetype, String userAgent);
-}

api/src/main/kotlin/app/revanced/manager/plugin/downloader/Constants.kt

@@ -1,7 +0,0 @@
-package app.revanced.manager.plugin.downloader
-
-/**
- * The permission ID of the special plugin host permission. Only ReVanced Manager will have this permission.
- * Plugin UI activities and internal services can be protected using this permission.
- */
-const val PLUGIN_HOST_PERMISSION = "app.revanced.manager.permission.PLUGIN_HOST"

api/src/main/kotlin/app/revanced/manager/plugin/downloader/Downloader.kt

@@ -1,165 +0,0 @@
-package app.revanced.manager.plugin.downloader
-
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.ServiceConnection
-import android.os.IBinder
-import android.app.Activity
-import android.os.Parcelable
-import kotlinx.coroutines.withTimeout
-import java.io.InputStream
-import java.io.OutputStream
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-
-@RequiresOptIn(
-    level = RequiresOptIn.Level.ERROR,
-    message = "This API is only intended for plugin hosts, don't use it in a plugin.",
-)
-@Retention(AnnotationRetention.BINARY)
-annotation class PluginHostApi
-
-/**
- * The base interface for all DSL scopes.
- */
-interface Scope {
-    /**
-     * The package name of ReVanced Manager.
-     */
-    val hostPackageName: String
-
-    /**
-     * The package name of the plugin.
-     */
-    val pluginPackageName: String
-}
-
-/**
- * The scope of [DownloaderScope.get].
- */
-interface GetScope : Scope {
-    /**
-     * Ask the user to perform some required interaction in the activity specified by the provided [Intent].
-     * This function returns normally with the resulting [Intent] when the activity finishes with code [Activity.RESULT_OK].
-     *
-     * @throws UserInteractionException.RequestDenied User decided to skip this plugin.
-     * @throws UserInteractionException.Activity.Cancelled The activity was cancelled.
-     * @throws UserInteractionException.Activity.NotCompleted The activity finished with an unknown result code.
-     */
-    suspend fun requestStartActivity(intent: Intent): Intent?
-}
-
-interface BaseDownloadScope : Scope
-
-/**
- * The scope for [DownloaderScope.download].
- */
-interface InputDownloadScope : BaseDownloadScope
-
-typealias Size = Long
-typealias DownloadResult = Pair<InputStream, Size?>
-
-typealias Version = String
-typealias GetResult<T> = Pair<T, Version?>
-
-class DownloaderScope<T : Parcelable> internal constructor(
-    private val scopeImpl: Scope,
-    internal val context: Context
-) : Scope by scopeImpl {
-    // Returning an InputStream is the primary way for plugins to implement the download function, but we also want to offer an OutputStream API since using InputStream might not be convenient in all cases.
-    // It is much easier to implement the main InputStream API on top of OutputStreams compared to doing it the other way around, which is why we are using OutputStream here. This detail is not visible to plugins.
-    internal var download: (suspend OutputDownloadScope.(T, OutputStream) -> Unit)? = null
-    internal var get: (suspend GetScope.(String, String?) -> GetResult<T>?)? = null
-    private val inputDownloadScopeImpl = object : InputDownloadScope, Scope by scopeImpl {}
-
-    /**
-     * Define the download block of the plugin.
-     */
-    fun download(block: suspend InputDownloadScope.(data: T) -> DownloadResult) {
-        download = { app, outputStream ->
-            val (inputStream, size) = inputDownloadScopeImpl.block(app)
-
-            inputStream.use {
-                if (size != null) reportSize(size)
-                it.copyTo(outputStream)
-            }
-        }
-    }
-
-    /**
-     * Define the get block of the plugin.
-     * The block should return null if the app cannot be found. The version in the result must match the version argument unless it is null.
-     */
-    fun get(block: suspend GetScope.(packageName: String, version: String?) -> GetResult<T>?) {
-        get = block
-    }
-
-    /**
-     * Utilize the service specified by the provided [Intent]. The service will be unbound when the scope ends.
-     */
-    suspend fun <R : Any?> useService(intent: Intent, block: suspend (IBinder) -> R): R {
-        var onBind: ((IBinder) -> Unit)? = null
-        val serviceConn = object : ServiceConnection {
-            override fun onServiceConnected(name: ComponentName?, service: IBinder?) =
-                onBind!!(service!!)
-
-            override fun onServiceDisconnected(name: ComponentName?) {}
-        }
-
-        return try {
-            val binder = withTimeout(10000L) {
-                suspendCoroutine { continuation ->
-                    onBind = continuation::resume
-                    context.bindService(intent, serviceConn, Context.BIND_AUTO_CREATE)
-                }
-            }
-            block(binder)
-        } finally {
-            onBind = null
-            context.unbindService(serviceConn)
-        }
-    }
-}
-
-class DownloaderBuilder<T : Parcelable> internal constructor(private val block: DownloaderScope<T>.() -> Unit) {
-    @PluginHostApi
-    fun build(scopeImpl: Scope, context: Context) =
-        with(DownloaderScope<T>(scopeImpl, context)) {
-            block()
-
-            Downloader(
-                download = download!!,
-                get = get!!
-            )
-        }
-}
-
-class Downloader<T : Parcelable> internal constructor(
-    @property:PluginHostApi val get: suspend GetScope.(packageName: String, version: String?) -> GetResult<T>?,
-    @property:PluginHostApi val download: suspend OutputDownloadScope.(data: T, outputStream: OutputStream) -> Unit
-)
-
-/**
- * Define a downloader plugin.
- */
-fun <T : Parcelable> Downloader(block: DownloaderScope<T>.() -> Unit) = DownloaderBuilder(block)
-
-/**
- * @see GetScope.requestStartActivity
- */
-sealed class UserInteractionException(message: String) : Exception(message) {
-    class RequestDenied @PluginHostApi constructor() :
-        UserInteractionException("Request denied by user")
-
-    sealed class Activity(message: String) : UserInteractionException(message) {
-        class Cancelled @PluginHostApi constructor() : Activity("Interaction cancelled")
-
-        /**
-         * @param resultCode The result code of the activity.
-         * @param intent The [Intent] of the activity.
-         */
-        class NotCompleted @PluginHostApi constructor(val resultCode: Int, val intent: Intent?) :
-            Activity("Unexpected activity result code: $resultCode")
-    }
-}

api/src/main/kotlin/app/revanced/manager/plugin/downloader/Extensions.kt

@@ -1,42 +0,0 @@
-package app.revanced.manager.plugin.downloader
-
-import android.app.Activity
-import android.app.Service
-import android.content.Intent
-import android.os.IBinder
-import android.os.Parcelable
-import java.io.OutputStream
-
-/**
- * The scope of the [OutputStream] version of [DownloaderScope.download].
- */
-interface OutputDownloadScope : BaseDownloadScope {
-    suspend fun reportSize(size: Long)
-}
-
-/**
- * A replacement for [DownloaderScope.download] that uses [OutputStream].
- * The provided [OutputStream] does not need to be closed manually.
- */
-fun <T : Parcelable> DownloaderScope<T>.download(block: suspend OutputDownloadScope.(T, OutputStream) -> Unit) {
-    download = block
-}
-
-/**
- * Performs [GetScope.requestStartActivity] with an [Intent] created using the type information of [ACTIVITY].
- * @see [GetScope.requestStartActivity]
- */
-suspend inline fun <reified ACTIVITY : Activity> GetScope.requestStartActivity() =
-    requestStartActivity(
-        Intent().apply { setClassName(pluginPackageName, ACTIVITY::class.qualifiedName!!) }
-    )
-
-/**
- * Performs [DownloaderScope.useService] with an [Intent] created using the type information of [SERVICE].
- * @see [DownloaderScope.useService]
- */
-suspend inline fun <reified SERVICE : Service, R : Any?> DownloaderScope<*>.useService(
-    noinline block: suspend (IBinder) -> R
-) = useService(
-    Intent().apply { setClassName(pluginPackageName, SERVICE::class.qualifiedName!!) }, block
-)

api/src/main/kotlin/app/revanced/manager/plugin/downloader/Parcelables.kt

@@ -1,39 +0,0 @@
-package app.revanced.manager.plugin.downloader
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-import java.net.HttpURLConnection
-import java.net.URI
-
-/**
- * A simple parcelable data class for storing a package name and version.
- * This can be used as the data type for plugins that only need a name and version to implement their [DownloaderScope.download] function.
- *
- * @param name The package name.
- * @param version The version.
- */
-@Parcelize
-data class Package(val name: String, val version: String) : Parcelable
-
-/**
- * A data class for storing a download URL.
- *
- * @param url The download URL.
- * @param headers The headers to use for the request.
- */
-@Parcelize
-data class DownloadUrl(val url: String, val headers: Map<String, String> = emptyMap()) : Parcelable {
-    /**
-     * Converts this into a [DownloadResult].
-     */
-    fun toDownloadResult(): DownloadResult = with(URI.create(url).toURL().openConnection() as HttpURLConnection) {
-        useCaches = false
-        allowUserInteraction = false
-        headers.forEach(::setRequestProperty)
-
-        connectTimeout = 10_000
-        connect()
-
-        inputStream to getHeaderField("Content-Length").toLong()
-    }
-}

api/src/main/kotlin/app/revanced/manager/plugin/downloader/webview/API.kt

@@ -1,176 +0,0 @@
-package app.revanced.manager.plugin.downloader.webview
-
-import android.content.Intent
-import app.revanced.manager.plugin.downloader.DownloadUrl
-import app.revanced.manager.plugin.downloader.DownloaderScope
-import app.revanced.manager.plugin.downloader.GetScope
-import app.revanced.manager.plugin.downloader.Scope
-import app.revanced.manager.plugin.downloader.Downloader
-import app.revanced.manager.plugin.downloader.PluginHostApi
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.cancelChildren
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.supervisorScope
-import kotlinx.coroutines.withContext
-import kotlin.properties.Delegates
-
-typealias InitialUrl = String
-typealias PageLoadCallback<T> = suspend WebViewCallbackScope<T>.(url: String) -> Unit
-typealias DownloadCallback<T> = suspend WebViewCallbackScope<T>.(url: String, mimeType: String, userAgent: String) -> Unit
-
-interface WebViewCallbackScope<T> : Scope {
-    /**
-     * Finishes the activity and returns the [result].
-     */
-    suspend fun finish(result: T)
-
-    /**
-     * Tells the WebView to load the specified [url].
-     */
-    suspend fun load(url: String)
-}
-
-@OptIn(PluginHostApi::class)
-class WebViewScope<T> internal constructor(
-    coroutineScope: CoroutineScope,
-    private val scopeImpl: Scope,
-    setResult: (T) -> Unit
-) : Scope by scopeImpl {
-    private var onPageLoadCallback: PageLoadCallback<T> = {}
-    private var onDownloadCallback: DownloadCallback<T> = { _, _, _ -> }
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    private val dispatcher = Dispatchers.Default.limitedParallelism(1)
-    private lateinit var webView: IWebView
-    internal lateinit var initialUrl: String
-
-    internal val binder = object : IWebViewEvents.Stub() {
-        override fun ready(iface: IWebView?) {
-            coroutineScope.launch(dispatcher) {
-                webView = iface!!.also {
-                    it.load(initialUrl)
-                }
-            }
-        }
-
-        override fun pageLoad(url: String?) {
-            coroutineScope.launch(dispatcher) { onPageLoadCallback(callbackScope, url!!) }
-        }
-
-        override fun download(url: String?, mimetype: String?, userAgent: String?) {
-            coroutineScope.launch(dispatcher) {
-                onDownloadCallback(
-                    callbackScope,
-                    url!!,
-                    mimetype!!,
-                    userAgent!!
-                )
-            }
-        }
-    }
-
-    private val callbackScope = object : WebViewCallbackScope<T>, Scope by scopeImpl {
-        override suspend fun finish(result: T) {
-            setResult(result)
-            // Tell the WebViewActivity to finish
-            webView.let { withContext(Dispatchers.IO) { it.finish() } }
-        }
-
-        override suspend fun load(url: String) {
-            webView.let { withContext(Dispatchers.IO) { it.load(url) } }
-        }
-
-    }
-
-    /**
-     * Called when the WebView attempts to download a file to disk.
-     */
-    fun download(block: DownloadCallback<T>) {
-        onDownloadCallback = block
-    }
-
-    /**
-     * Called when the WebView finishes loading a page.
-     */
-    fun pageLoad(block: PageLoadCallback<T>) {
-        onPageLoadCallback = block
-    }
-}
-
-@JvmInline
-private value class Container<U>(val value: U)
-
-/**
- * Run a [android.webkit.WebView] Activity controlled by the provided code block.
- * The activity will keep running until it is cancelled or an event handler calls [WebViewCallbackScope.finish].
- * The [block] defines the event handlers and returns the initial URL.
- *
- * @param title The string displayed in the action bar.
- * @param block The control block.
- */
-@OptIn(PluginHostApi::class)
-suspend fun <T> GetScope.runWebView(
-    title: String,
-    block: suspend WebViewScope<T>.() -> InitialUrl
-) = supervisorScope {
-    var result by Delegates.notNull<Container<T>>()
-
-    val scope = WebViewScope<T>(this@supervisorScope, this@runWebView) { result = Container(it) }
-    scope.initialUrl = scope.block()
-
-    // Start the webview activity and wait until it finishes.
-    requestStartActivity(Intent().apply {
-        putExtra(
-            WebViewActivity.KEY,
-            WebViewActivity.Parameters(title, scope.binder)
-        )
-        setClassName(
-            hostPackageName,
-            WebViewActivity::class.qualifiedName!!
-        )
-    })
-
-    // Return the result and cancel any leftover coroutines.
-    coroutineContext.cancelChildren()
-    result.value
-}
-
-/**
- * Implement a downloader using [runWebView] and [DownloadUrl]. This function will automatically define a handler for download events unlike [runWebView].
- * Returning null inside the [block] is equivalent to returning null inside [DownloaderScope.get].
- *
- * @see runWebView
- */
-fun WebViewDownloader(block: suspend WebViewScope<DownloadUrl>.(packageName: String, version: String?) -> InitialUrl?) =
-    Downloader<DownloadUrl> {
-        val label = context.applicationInfo.loadLabel(
-            context.packageManager
-        ).toString()
-
-        get { packageName, version ->
-            class ReturnNull : Exception()
-
-            try {
-                runWebView(label) {
-                    download { url, _, userAgent ->
-                        finish(
-                            DownloadUrl(
-                                url,
-                                mapOf("User-Agent" to userAgent)
-                            )
-                        )
-                    }
-
-                    block(this@runWebView, packageName, version) ?: throw ReturnNull()
-                } to version
-            } catch (_: ReturnNull) {
-                null
-            }
-        }
-
-        download {
-            it.toDownloadResult()
-        }
-    }

api/src/main/kotlin/app/revanced/manager/plugin/downloader/webview/WebViewActivity.kt

@@ -1,161 +0,0 @@
-package app.revanced.manager.plugin.downloader.webview
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.os.IBinder
-import android.os.Parcelable
-import android.view.MenuItem
-import android.webkit.CookieManager
-import android.webkit.WebSettings
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import androidx.activity.ComponentActivity
-import androidx.activity.addCallback
-import androidx.activity.enableEdgeToEdge
-import androidx.activity.viewModels
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.lifecycle.viewModelScope
-import app.revanced.manager.plugin.downloader.PluginHostApi
-import app.revanced.manager.plugin.downloader.R
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.receiveAsFlow
-import kotlinx.coroutines.launch
-import kotlinx.parcelize.Parcelize
-
-@OptIn(PluginHostApi::class)
-@PluginHostApi
-class WebViewActivity : ComponentActivity() {
-    @SuppressLint("SetJavaScriptEnabled")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val vm by viewModels<WebViewModel>()
-        enableEdgeToEdge()
-        setContentView(R.layout.activity_webview)
-
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
-            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
-            insets
-        }
-        val webView = findViewById<WebView>(R.id.webview)
-        onBackPressedDispatcher.addCallback {
-            if (webView.canGoBack()) webView.goBack()
-            else cancelActivity()
-        }
-
-        val params = intent.getParcelableExtra<Parameters>(KEY)!!
-        actionBar?.apply {
-            title = params.title
-            setHomeAsUpIndicator(android.R.drawable.ic_menu_close_clear_cancel)
-            setDisplayHomeAsUpEnabled(true)
-        }
-
-        val events = IWebViewEvents.Stub.asInterface(params.events)!!
-        vm.setup(events)
-
-        webView.apply {
-            settings.apply {
-                cacheMode = WebSettings.LOAD_NO_CACHE
-                allowContentAccess = false
-                domStorageEnabled = true
-                javaScriptEnabled = true
-            }
-
-            webViewClient = vm.webViewClient
-            setDownloadListener { url, userAgent, _, mimetype, _ ->
-                vm.onDownload(url, mimetype, userAgent)
-            }
-        }
-
-        lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.STARTED) {
-                vm.commands.collect {
-                    when (it) {
-                        is WebViewModel.Command.Finish -> {
-                            setResult(RESULT_OK)
-                            finish()
-                        }
-
-                        is WebViewModel.Command.Load -> webView.loadUrl(it.url)
-                    }
-                }
-            }
-        }
-    }
-
-    private fun cancelActivity() {
-        setResult(RESULT_CANCELED)
-        finish()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem) = if (item.itemId == android.R.id.home) {
-        cancelActivity()
-
-        true
-    } else super.onOptionsItemSelected(item)
-
-    @Parcelize
-    internal class Parameters(
-        val title: String, val events: IBinder
-    ) : Parcelable
-
-    internal companion object {
-        const val KEY = "params"
-    }
-}
-
-@OptIn(PluginHostApi::class)
-internal class WebViewModel : ViewModel() {
-    init {
-        CookieManager.getInstance().apply {
-            removeAllCookies(null)
-            setAcceptCookie(true)
-        }
-    }
-
-    private val commandChannel = Channel<Command>()
-    val commands = commandChannel.receiveAsFlow()
-
-    private var eventBinder: IWebViewEvents? = null
-    private val ctrlBinder = object : IWebView.Stub() {
-        override fun load(url: String?) {
-            viewModelScope.launch {
-                commandChannel.send(Command.Load(url!!))
-            }
-        }
-
-        override fun finish() {
-            viewModelScope.launch {
-                commandChannel.send(Command.Finish)
-            }
-        }
-    }
-
-    val webViewClient = object : WebViewClient() {
-        override fun onPageFinished(view: WebView?, url: String?) {
-            super.onPageFinished(view, url)
-            eventBinder!!.pageLoad(url)
-        }
-    }
-
-    fun onDownload(url: String, mimeType: String, userAgent: String) {
-        eventBinder!!.download(url, mimeType, userAgent)
-    }
-
-    fun setup(binder: IWebViewEvents) {
-        if (eventBinder != null) return
-        eventBinder = binder
-        binder.ready(ctrlBinder)
-    }
-
-    sealed interface Command {
-        data class Load(val url: String) : Command
-        data object Finish : Command
-    }
-}

api/src/main/res/layout/activity_webview.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/main">
-
-    <WebView
-        android:id="@+id/webview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>

api/src/main/res/values/strings.xml

@@ -1 +0,0 @@
-<resources></resources>

api/src/main/res/values/themes.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.WebViewActivity" parent="Theme.AppCompat.DayNight">
-        <item name="android:windowActionBar">true</item>
-        <item name="android:windowNoTitle">false</item>
-    </style>
-</resources>

app/build.gradle.kts

@@ -8,109 +8,6 @@ plugins {
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.devtools)
     alias(libs.plugins.about.libraries)
-    signing
-}
-
-val outputApkFileName = "${rootProject.name}-$version.apk"
-
-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(project(":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)
 }
 
 android {
@@ -164,14 +61,6 @@ android {
         }
     }
 
-    applicationVariants.all {
-        outputs.all {
-            this as com.android.build.gradle.internal.api.ApkVariantOutputImpl
-
-            outputFileName = outputApkFileName
-        }
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
@@ -231,26 +120,103 @@ kotlin {
     jvmToolchain(17)
 }
 
-tasks {
-    // Needed by gradle-semantic-release-plugin.
-    // Tracking: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435.
-    val publish by registering {
-        group = "publishing"
-        description = "Build the release APK"
+dependencies {
 
-        dependsOn("assembleRelease")
+    // 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)
 
-        val apk = project.layout.buildDirectory.file("outputs/apk/release/${outputApkFileName}")
-        val ascFile = apk.map { it.asFile.resolveSibling("${it.asFile.name}.asc") }
+    // 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)
 
-        inputs.file(apk).withPropertyName("inputApk")
-        outputs.file(ascFile).withPropertyName("outputAsc")
+    // Accompanist
+    implementation(libs.accompanist.drawablepainter)
 
-        doLast {
-            signing {
-                useGpgCmd()
-                sign(apk.get().asFile)
-            }
-        }
-    }
+    // 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)
 }

app/src/main/AndroidManifest.xml

@@ -23,7 +23,6 @@
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.ENFORCE_UPDATE_OWNERSHIP" />
 
     <application
         android:name=".ManagerApplication"

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.ContributorSettingsScreen
-import app.revanced.manager.ui.screen.settings.DeveloperSettingsScreen
+import app.revanced.manager.ui.screen.settings.ContributorScreen
+import app.revanced.manager.ui.screen.settings.DeveloperOptionsScreen
 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.LicensesSettingsScreen
-import app.revanced.manager.ui.screen.settings.update.ChangelogsSettingsScreen
+import app.revanced.manager.ui.screen.settings.LicensesScreen
+import app.revanced.manager.ui.screen.settings.update.ChangelogsScreen
 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) {
                         }
                     }
                 },
-                viewModel = koinViewModel { parametersOf(it.getComplexArg<Patcher.ViewModelParams>()) }
+                vm = koinViewModel { parametersOf(it.getComplexArg<Patcher.ViewModelParams>()) }
             )
         }
 
@@ -234,7 +234,7 @@ private fun ReVancedManager(vm: MainViewModel) {
                         selectedAppInfoVm.updateConfiguration(patches, options)
                         navController.popBackStack()
                     },
-                    viewModel = koinViewModel { parametersOf(data) }
+                    vm = koinViewModel { parametersOf(data) }
                 )
             }
 
@@ -277,8 +277,8 @@ private fun ReVancedManager(vm: MainViewModel) {
                 AdvancedSettingsScreen(onBackClick = navController::popBackStack)
             }
 
-            composable<Settings.Developer> {
-                DeveloperSettingsScreen(onBackClick = navController::popBackStack)
+            composable<Settings.DeveloperOptions> {
+                DeveloperOptionsScreen(onBackClick = navController::popBackStack)
             }
 
             composable<Settings.Updates> {
@@ -305,15 +305,15 @@ private fun ReVancedManager(vm: MainViewModel) {
             }
 
             composable<Settings.Changelogs> {
-                ChangelogsSettingsScreen(onBackClick = navController::popBackStack)
+                ChangelogsScreen(onBackClick = navController::popBackStack)
             }
 
             composable<Settings.Contributors> {
-                ContributorSettingsScreen(onBackClick = navController::popBackStack)
+                ContributorScreen(onBackClick = navController::popBackStack)
             }
 
             composable<Settings.Licenses> {
-                LicensesSettingsScreen(onBackClick = navController::popBackStack)
+                LicensesScreen(onBackClick = navController::popBackStack)
             }
 
         }

app/src/main/java/app/revanced/manager/data/room/bundles/PatchBundleDao.kt

@@ -12,7 +12,7 @@ interface PatchBundleDao {
     fun getPropsById(uid: Int): Flow<BundleProperties?>
 
     @Query("UPDATE patch_bundles SET version = :patches WHERE uid = :uid")
-    suspend fun updateVersionHash(uid: Int, patches: String?)
+    suspend fun updateVersion(uid: Int, patches: String?)
 
     @Query("UPDATE patch_bundles SET auto_update = :value WHERE uid = :uid")
     suspend fun setAutoUpdate(uid: Int, value: Boolean)
@@ -26,7 +26,7 @@ interface PatchBundleDao {
     @Transaction
     suspend fun reset() {
         purgeCustomBundles()
-        updateVersionHash(0, null) // Reset the main source
+        updateVersion(0, null) // Reset the main source
     }
 
     @Query("DELETE FROM patch_bundles WHERE uid = :uid")

app/src/main/java/app/revanced/manager/data/room/bundles/PatchBundleEntity.kt

@@ -33,12 +33,12 @@ sealed class Source {
 data class PatchBundleEntity(
     @PrimaryKey val uid: Int,
     @ColumnInfo(name = "name") val name: String,
-    @ColumnInfo(name = "version") val versionHash: String? = null,
+    @ColumnInfo(name = "version") val version: String? = null,
     @ColumnInfo(name = "source") val source: Source,
     @ColumnInfo(name = "auto_update") val autoUpdate: Boolean
 )
 
 data class BundleProperties(
-    @ColumnInfo(name = "version") val versionHash: String? = null,
+    @ColumnInfo(name = "version") val version: String? = null,
     @ColumnInfo(name = "auto_update") val autoUpdate: Boolean
 )

app/src/main/java/app/revanced/manager/data/room/options/OptionDao.kt

@@ -27,10 +27,10 @@ abstract class OptionDao {
     abstract suspend fun createOptionGroup(group: OptionGroup)
 
     @Query("DELETE FROM option_groups WHERE patch_bundle = :uid")
-    abstract suspend fun resetOptionsForPatchBundle(uid: Int)
+    abstract suspend fun clearForPatchBundle(uid: Int)
 
     @Query("DELETE FROM option_groups WHERE package_name = :packageName")
-    abstract suspend fun resetOptionsForPackage(packageName: String)
+    abstract suspend fun clearForPackage(packageName: String)
 
     @Query("DELETE FROM option_groups")
     abstract suspend fun reset()

app/src/main/java/app/revanced/manager/data/room/selection/SelectionDao.kt

@@ -5,7 +5,6 @@ import androidx.room.Insert
 import androidx.room.MapColumn
 import androidx.room.Query
 import androidx.room.Transaction
-import kotlinx.coroutines.flow.Flow
 
 @Dao
 abstract class SelectionDao {
@@ -35,14 +34,11 @@ abstract class SelectionDao {
     @Insert
     abstract suspend fun createSelection(selection: PatchSelection)
 
-    @Query("SELECT package_name FROM patch_selections")
-    abstract fun getPackagesWithSelection(): Flow<List<String>>
-
     @Query("DELETE FROM patch_selections WHERE patch_bundle = :uid")
-    abstract suspend fun resetForPatchBundle(uid: Int)
+    abstract suspend fun clearForPatchBundle(uid: Int)
 
     @Query("DELETE FROM patch_selections WHERE package_name = :packageName")
-    abstract suspend fun resetForPackage(packageName: String)
+    abstract suspend fun clearForPackage(packageName: String)
 
     @Query("DELETE FROM patch_selections")
     abstract suspend fun reset()

app/src/main/java/app/revanced/manager/domain/bundles/LocalPatchBundle.kt

@@ -15,7 +15,7 @@ class LocalPatchBundle(name: String, id: Int, directory: File) :
         }
 
         reload()?.also {
-            saveVersionHash(it.readManifestAttribute("Version"))
+            saveVersion(it.readManifestAttribute("Version"))
         }
     }
 }

app/src/main/java/app/revanced/manager/domain/bundles/PatchBundleSource.kt

@@ -38,9 +38,6 @@ sealed class PatchBundleSource(initialName: String, val uid: Int, directory: Fil
 
     suspend fun getName() = nameFlow.first()
 
-    val versionFlow = state.map { it.patchBundleOrNull()?.readManifestAttribute("Version") }
-    val patchCountFlow = state.map { it.patchBundleOrNull()?.patches?.size ?: 0 }
-
     /**
      * Returns true if the bundle has been downloaded to local storage.
      */
@@ -87,9 +84,9 @@ sealed class PatchBundleSource(initialName: String, val uid: Int, directory: Fil
     fun propsFlow() = configRepository.getProps(uid).flowOn(Dispatchers.Default)
     suspend fun getProps() = propsFlow().first()!!
 
-    suspend fun currentVersionHash() = getProps().versionHash
-    protected suspend fun saveVersionHash(version: String?) =
-        configRepository.updateVersionHash(uid, version)
+    suspend fun currentVersion() = getProps().version
+    protected suspend fun saveVersion(version: String?) =
+        configRepository.updateVersion(uid, version)
 
     suspend fun setName(name: String) {
         configRepository.setName(uid, name)

app/src/main/java/app/revanced/manager/domain/bundles/RemotePatchBundle.kt

@@ -25,7 +25,7 @@ sealed class RemotePatchBundle(name: String, id: Int, directory: File, val endpo
             }
         }
 
-        saveVersionHash(info.version)
+        saveVersion(info.version)
         reload()
     }
 
@@ -35,7 +35,7 @@ sealed class RemotePatchBundle(name: String, id: Int, directory: File, val endpo
 
     suspend fun update(): Boolean = withContext(Dispatchers.IO) {
         val info = getLatestInfo()
-        if (hasInstalled() && info.version == currentVersionHash())
+        if (hasInstalled() && info.version == currentVersion())
             return@withContext false
 
         download(info)

app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt

@@ -3,7 +3,6 @@ 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
@@ -25,10 +24,8 @@ class PreferencesManager(
 
     val disablePatchVersionCompatCheck = booleanPreference("disable_patch_version_compatibility_check", false)
     val disableSelectionWarning = booleanPreference("disable_selection_warning", false)
-    val disableUniversalPatchCheck = booleanPreference("disable_patch_universal_check", false)
+    val disableUniversalPatchWarning = booleanPreference("disable_universal_patch_warning", false)
     val suggestedVersionSafeguard = booleanPreference("suggested_version_safeguard", true)
 
     val acknowledgedDownloaderPlugins = stringSetPreference("acknowledged_downloader_plugins", emptySet())
-
-    val showDeveloperSettings = booleanPreference("show_developer_settings", context.isDebuggable)
 }

app/src/main/java/app/revanced/manager/domain/repository/PatchBundlePersistenceRepository.kt

@@ -25,7 +25,7 @@ class PatchBundlePersistenceRepository(db: AppDatabase) {
         PatchBundleEntity(
             uid = generateUid(),
             name = name,
-            versionHash = null,
+            version = null,
             source = source,
             autoUpdate = autoUpdate
         ).also {
@@ -34,11 +34,8 @@ class PatchBundlePersistenceRepository(db: AppDatabase) {
 
     suspend fun delete(uid: Int) = dao.remove(uid)
 
-    /**
-     * Sets the version hash used for updates.
-     */
-    suspend fun updateVersionHash(uid: Int, versionHash: String?) =
-        dao.updateVersionHash(uid, versionHash)
+    suspend fun updateVersion(uid: Int, version: String?) =
+        dao.updateVersion(uid, version)
 
     suspend fun setAutoUpdate(uid: Int, value: Boolean) = dao.setAutoUpdate(uid, value)
 
@@ -50,7 +47,7 @@ class PatchBundlePersistenceRepository(db: AppDatabase) {
         val defaultSource = PatchBundleEntity(
             uid = 0,
             name = "",
-            versionHash = null,
+            version = null,
             source = Source.API,
             autoUpdate = false
         )

app/src/main/java/app/revanced/manager/domain/repository/PatchOptionsRepository.kt

@@ -76,7 +76,7 @@ class PatchOptionsRepository(db: AppDatabase) {
     fun getPackagesWithSavedOptions() =
         dao.getPackagesWithOptions().map(Iterable<String>::toSet).distinctUntilChanged()
 
-    suspend fun resetOptionsForPackage(packageName: String) = dao.resetOptionsForPackage(packageName)
-    suspend fun resetOptionsForPatchBundle(uid: Int) = dao.resetOptionsForPatchBundle(uid)
+    suspend fun clearOptionsForPackage(packageName: String) = dao.clearForPackage(packageName)
+    suspend fun clearOptionsForPatchBundle(uid: Int) = dao.clearForPatchBundle(uid)
     suspend fun reset() = dao.reset()
 }

app/src/main/java/app/revanced/manager/domain/repository/PatchSelectionRepository.kt

@@ -3,8 +3,6 @@ package app.revanced.manager.domain.repository
 import app.revanced.manager.data.room.AppDatabase
 import app.revanced.manager.data.room.AppDatabase.Companion.generateUid
 import app.revanced.manager.data.room.selection.PatchSelection
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.map
 
 class PatchSelectionRepository(db: AppDatabase) {
     private val dao = db.selectionDao()
@@ -27,15 +25,8 @@ class PatchSelectionRepository(db: AppDatabase) {
             )
         })
 
-    fun getPackagesWithSavedSelection() =
-        dao.getPackagesWithSelection().map(Iterable<String>::toSet).distinctUntilChanged()
-
-    suspend fun resetSelectionForPackage(packageName: String) {
-        dao.resetForPackage(packageName)
-    }
-
-    suspend fun resetSelectionForPatchBundle(uid: Int) {
-        dao.resetForPatchBundle(uid)
+    suspend fun clearSelection(packageName: String) {
+        dao.clearForPackage(packageName)
     }
 
     suspend fun reset() = dao.reset()
@@ -43,7 +34,7 @@ class PatchSelectionRepository(db: AppDatabase) {
     suspend fun export(bundleUid: Int): SerializedSelection = dao.exportSelection(bundleUid)
 
     suspend fun import(bundleUid: Int, selection: SerializedSelection) {
-        dao.resetForPatchBundle(bundleUid)
+        dao.clearForPatchBundle(bundleUid)
         dao.updateSelections(selection.entries.associate { (packageName, patches) ->
             getOrCreateSelection(bundleUid, packageName) to patches.toSet()
         })

app/src/main/java/app/revanced/manager/network/downloader/ParceledDownloaderData.kt

@@ -7,7 +7,7 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 /**
- * A container for [Parcelable] data returned from downloader. Instances of this class can be safely stored in a bundle without needing to set the [ClassLoader].
+ * A container for [Parcelable] data returned from downloaders. Instances of this class can be safely stored in a bundle without needing to set the [ClassLoader].
  */
 class ParceledDownloaderData private constructor(
     val pluginPackageName: String,

app/src/main/java/app/revanced/manager/ui/component/ConfirmDialog.kt

@@ -1,41 +0,0 @@
-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) }
-    )
-}

app/src/main/java/app/revanced/manager/ui/component/ExceptionViewerDialog.kt

@@ -16,6 +16,8 @@ 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
 
@@ -24,8 +26,12 @@ import app.revanced.manager.ui.component.bundle.BundleTopBar
 fun ExceptionViewerDialog(text: String, onDismiss: () -> Unit) {
     val context = LocalContext.current
 
-    FullscreenDialog(
+    Dialog(
         onDismissRequest = onDismiss,
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnBackPress = true
+        )
     ) {
         Scaffold(
             topBar = {

app/src/main/java/app/revanced/manager/ui/component/FullscreenDialog.kt

@@ -1,34 +0,0 @@
-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()
-    }
-}

app/src/main/java/app/revanced/manager/ui/component/bundle/BundleInformationDialog.kt

@@ -12,6 +12,8 @@ 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
@@ -21,7 +23,6 @@ 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
 
@@ -42,8 +43,9 @@ fun BundleInformationDialog(
     val props by remember(bundle) {
         bundle.propsFlow()
     }.collectAsStateWithLifecycle(null)
-    val patchCount by bundle.patchCountFlow.collectAsStateWithLifecycle(0)
-    val version by bundle.versionFlow.collectAsStateWithLifecycle(null)
+    val patchCount = remember(state) {
+        state.patchBundleOrNull()?.patches?.size ?: 0
+    }
 
     if (viewCurrentBundlePatches) {
         BundlePatchesDialog(
@@ -54,8 +56,12 @@ fun BundleInformationDialog(
         )
     }
 
-    FullscreenDialog(
+    Dialog(
         onDismissRequest = onDismissRequest,
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnBackPress = true
+        )
     ) {
         val bundleName by bundle.nameState
 
@@ -97,8 +103,8 @@ fun BundleInformationDialog(
                 name = bundleName,
                 remoteUrl = bundle.asRemoteOrNull?.endpoint,
                 patchCount = patchCount,
-                version = version,
-                autoUpdate = props?.autoUpdate == true,
+                version = props?.version,
+                autoUpdate = props?.autoUpdate ?: false,
                 onAutoUpdateChange = {
                     composableScope.launch {
                         bundle.asRemoteOrNull?.setAutoUpdate(it)

app/src/main/java/app/revanced/manager/ui/component/bundle/BundleItem.kt

@@ -7,7 +7,6 @@ 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
@@ -27,9 +26,8 @@ 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.domain.bundles.PatchBundleSource.Extensions.nameState
-import app.revanced.manager.ui.component.ConfirmDialog
 import app.revanced.manager.ui.component.haptics.HapticCheckbox
+import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState
 import kotlinx.coroutines.flow.map
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -44,35 +42,25 @@ 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 bundle.versionFlow.collectAsStateWithLifecycle(null)
-    val patchCount by bundle.patchCountFlow.collectAsStateWithLifecycle(0)
+    val version by remember(bundle) {
+        bundle.propsFlow().map { props -> props?.version }
+    }.collectAsStateWithLifecycle(null)
     val name by bundle.nameState
 
     if (viewBundleDialogPage) {
         BundleInformationDialog(
             onDismissRequest = { viewBundleDialogPage = false },
-            onDeleteRequest = { showDeleteConfirmationDialog = true },
+            onDeleteRequest = {
+                viewBundleDialogPage = false
+                onDelete()
+            },
             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)
@@ -92,7 +80,7 @@ fun BundleItem(
 
         headlineContent = { Text(name) },
         supportingContent = {
-            if (state is PatchBundleSource.State.Loaded) {
+            state.patchBundleOrNull()?.patches?.size?.let { patchCount ->
                 Text(pluralStringResource(R.plurals.patch_count, patchCount, patchCount))
             }
         },

app/src/main/java/app/revanced/manager/ui/component/bundle/BundlePatchesDialog.kt

@@ -22,12 +22,13 @@ 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)
@@ -40,8 +41,12 @@ fun BundlePatchesDialog(
     var showOptions by rememberSaveable { mutableStateOf(false) }
     val state by bundle.state.collectAsStateWithLifecycle()
 
-    FullscreenDialog(
+    Dialog(
         onDismissRequest = onDismissRequest,
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnBackPress = true
+        )
     ) {
         Scaffold(
             topBar = {

app/src/main/java/app/revanced/manager/ui/component/bundle/BundleSelector.kt

@@ -13,14 +13,11 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.domain.bundles.PatchBundleSource
 import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState
-import kotlinx.coroutines.flow.map
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -57,8 +54,6 @@ fun BundleSelector(bundles: List<PatchBundleSource>, onFinish: (PatchBundleSourc
             }
             bundles.forEach {
                 val name by it.nameState
-                val version by it.versionFlow.collectAsStateWithLifecycle(null)
-
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
                     horizontalArrangement = Arrangement.Center,
@@ -70,7 +65,7 @@ fun BundleSelector(bundles: List<PatchBundleSource>, onFinish: (PatchBundleSourc
                         }
                 ) {
                     Text(
-                        "$name $version",
+                        name,
                         style = MaterialTheme.typography.titleMedium,
                         color = MaterialTheme.colorScheme.onSurface
                     )

app/src/main/java/app/revanced/manager/ui/component/patches/OptionFields.kt

@@ -14,7 +14,6 @@ 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
@@ -56,13 +55,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
@@ -74,17 +73,16 @@ 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>,
@@ -499,8 +497,7 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
 
         val lazyListState = rememberLazyListState()
         val reorderableLazyColumnState =
-            // Update the list
-            rememberReorderableLazyListState(lazyListState) { from, to ->
+            rememberReorderableLazyColumnState(lazyListState) { from, to ->
                 // Update the list
                 items.add(to.index, items.removeAt(from.index))
             }
@@ -527,8 +524,12 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
             scope.submitDialog(items.mapNotNull { it.value })
         }
 
-        FullscreenDialog(
+        ComposeDialog(
             onDismissRequest = back,
+            properties = DialogProperties(
+                usePlatformDefaultWidth = false,
+                dismissOnBackPress = true
+            ),
         ) {
             Scaffold(
                 topBar = {

app/src/main/java/app/revanced/manager/ui/component/patches/PathSelectorDialog.kt

@@ -23,9 +23,10 @@ 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
@@ -47,8 +48,12 @@ fun PathSelectorDialog(root: Path, onSelect: (Path?) -> Unit) {
         currentDirectory.listDirectoryEntries().filter(Path::isReadable).partition(Path::isDirectory)
     }
 
-    FullscreenDialog(
+    Dialog(
         onDismissRequest = { onSelect(null) },
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnBackPress = true
+        )
     ) {
         Scaffold(
             topBar = {

app/src/main/java/app/revanced/manager/ui/component/settings/SafeguardBooleanItem.kt

@@ -1,8 +1,6 @@
 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
@@ -11,9 +9,7 @@ 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
 
@@ -32,15 +28,13 @@ fun SafeguardBooleanItem(
     }
 
     if (showSafeguardWarning) {
-        ConfirmDialog(
+        SafeguardConfirmationDialog(
             onDismiss = { showSafeguardWarning = false },
             onConfirm = {
                 coroutineScope.launch { preference.update(!value) }
                 showSafeguardWarning = false
             },
-            title = stringResource(id = R.string.warning),
-            description = stringResource(confirmationText),
-            icon = Icons.Outlined.WarningAmber
+            body = stringResource(confirmationText)
         )
     }
 

app/src/main/java/app/revanced/manager/ui/component/settings/SafeguardConfirmationDialog.kt

@@ -0,0 +1,46 @@
+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)
+        }
+    )
+}

app/src/main/java/app/revanced/manager/ui/component/settings/SettingsListItem.kt

@@ -1,17 +1,6 @@
 package app.revanced.manager.ui.component.settings
 
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.animateContentSize
-import androidx.compose.animation.core.FastOutSlowInEasing
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ExpandLess
-import androidx.compose.material.icons.filled.ExpandMore
-import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItemColors
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
@@ -21,10 +10,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.material3.ListItem
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 
 @Composable
 fun SettingsListItem(
@@ -82,48 +67,4 @@ fun SettingsListItem(
     colors = colors,
     tonalElevation = tonalElevation,
     shadowElevation = shadowElevation
-)
-
-@Composable
-fun ExpandableSettingListItem(
-    headlineContent: String,
-    supportingContent: String,
-    expandableContent: @Composable () -> Unit
-) {
-    var expanded by remember { mutableStateOf(false) }
-
-    Column(
-        modifier = Modifier
-            .fillMaxWidth()
-            .animateContentSize()
-    ) {
-        SettingsListItem(
-            modifier = Modifier
-                .clickable{ expanded = !expanded },
-            headlineContent = headlineContent,
-            supportingContent = supportingContent,
-            trailingContent = {
-                Icon(
-                    imageVector = if (expanded) Icons.Default.ExpandLess else Icons.Default.ExpandMore,
-                    contentDescription = null
-                )
-            }
-        )
-
-        AnimatedVisibility(visible = expanded) {
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(bottom = 12.dp, start = 16.dp, end = 16.dp)
-                    .animateContentSize(
-                        animationSpec = tween(
-                            durationMillis = 500,
-                            easing = FastOutSlowInEasing
-                        )
-                    )
-            ) {
-                expandableContent()
-            }
-        }
-    }
-}
+)

app/src/main/java/app/revanced/manager/ui/model/BundleInfo.kt

@@ -11,7 +11,6 @@ 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>,
@@ -79,7 +78,7 @@ data class BundleInfo(
                         targetList.add(it)
                     }
 
-                    BundleInfo(source.getName(), bundle.readManifestAttribute("Version"), source.uid, compatible, incompatible, universal)
+                    BundleInfo(source.getName(), source.uid, compatible, incompatible, universal)
                 }
             }
 

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 Developer : Destination
+    data object DeveloperOptions : Destination
 }

app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt

@@ -21,7 +21,6 @@ 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
@@ -63,7 +62,6 @@ 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
@@ -156,20 +154,6 @@ 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) {
@@ -185,7 +169,8 @@ fun DashboardScreen(
                     actions = {
                         IconButton(
                             onClick = {
-                                showDeleteConfirmationDialog = true
+                                vm.selectedSources.forEach { if (!it.isDefault) vm.delete(it) }
+                                vm.cancelSourceSelection()
                             }
                         ) {
                             Icon(

app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt

@@ -17,7 +17,6 @@ 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
@@ -46,7 +45,6 @@ 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
@@ -60,34 +58,25 @@ import app.revanced.manager.util.EventEffect
 @Composable
 fun PatcherScreen(
     onBackClick: () -> Unit,
-    viewModel: PatcherViewModel
+    vm: PatcherViewModel
 ) {
-    fun onLeave() {
-        viewModel.onBack()
+    fun leaveScreen() {
+        vm.onBack()
         onBackClick()
     }
+    BackHandler(onBack = ::leaveScreen)
 
     val context = LocalContext.current
     val exportApkLauncher =
-        rememberLauncherForActivityResult(CreateDocument(APK_MIMETYPE), viewModel::export)
+        rememberLauncherForActivityResult(CreateDocument(APK_MIMETYPE), vm::export)
 
-    val patcherSucceeded by viewModel.patcherSucceeded.observeAsState(null)
-    val canInstall by remember { derivedStateOf { patcherSucceeded == true && (viewModel.installedPackageName != null || !viewModel.isInstalling) } }
+    val patcherSucceeded by vm.patcherSucceeded.observeAsState(null)
+    val canInstall by remember { derivedStateOf { patcherSucceeded == true && (vm.installedPackageName != null || !vm.isInstalling) } }
     var showInstallPicker by rememberSaveable { mutableStateOf(false) }
-    var showDismissConfirmationDialog by rememberSaveable { mutableStateOf(false) }
-
-    fun onPageBack() {
-        if(patcherSucceeded == null)
-            showDismissConfirmationDialog = true
-        else
-            onLeave()
-    }
-
-    BackHandler(onBack = ::onPageBack)
 
     val steps by remember {
         derivedStateOf {
-            viewModel.steps.groupBy { it.category }
+            vm.steps.groupBy { it.category }
         }
     }
 
@@ -104,44 +93,34 @@ fun PatcherScreen(
     if (showInstallPicker)
         InstallPickerDialog(
             onDismiss = { showInstallPicker = false },
-            onConfirm = viewModel::install
+            onConfirm = vm::install
         )
 
-    if (showDismissConfirmationDialog) {
-        ConfirmDialog(
-            onDismiss = { showDismissConfirmationDialog = false },
-            onConfirm = ::onLeave,
-            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)
+    vm.packageInstallerStatus?.let {
+        InstallerStatusDialog(it, vm, vm::dismissPackageInstallerDialog)
     }
 
     val activityLauncher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.StartActivityForResult(),
-        onResult = viewModel::handleActivityResult
+        onResult = vm::handleActivityResult
     )
-    EventEffect(flow = viewModel.launchActivityFlow) { intent ->
+    EventEffect(flow = vm.launchActivityFlow) { intent ->
         activityLauncher.launch(intent)
     }
 
-    viewModel.activityPromptDialog?.let { title ->
+    vm.activityPromptDialog?.let { title ->
         AlertDialog(
-            onDismissRequest = viewModel::rejectInteraction,
+            onDismissRequest = vm::rejectInteraction,
             confirmButton = {
                 TextButton(
-                    onClick = viewModel::allowInteraction
+                    onClick = vm::allowInteraction
                 ) {
                     Text(stringResource(R.string.continue_))
                 }
             },
             dismissButton = {
                 TextButton(
-                    onClick = viewModel::rejectInteraction
+                    onClick = vm::rejectInteraction
                 ) {
                     Text(stringResource(R.string.cancel))
                 }
@@ -158,20 +137,20 @@ fun PatcherScreen(
             AppTopBar(
                 title = stringResource(R.string.patcher),
                 scrollBehavior = scrollBehavior,
-                onBackClick = ::onPageBack
+                onBackClick = ::leaveScreen
             )
         },
         bottomBar = {
             BottomAppBar(
                 actions = {
                     IconButton(
-                        onClick = { exportApkLauncher.launch("${viewModel.packageName}_${viewModel.version}_revanced_patched.apk") },
+                        onClick = { exportApkLauncher.launch("${vm.packageName}_${vm.version}_revanced_patched.apk") },
                         enabled = patcherSucceeded == true
                     ) {
                         Icon(Icons.Outlined.Save, stringResource(id = R.string.save_apk))
                     }
                     IconButton(
-                        onClick = { viewModel.exportLogs(context) },
+                        onClick = { vm.exportLogs(context) },
                         enabled = patcherSucceeded != null
                     ) {
                         Icon(Icons.Outlined.PostAdd, stringResource(id = R.string.save_logs))
@@ -182,11 +161,11 @@ fun PatcherScreen(
                         HapticExtendedFloatingActionButton(
                             text = {
                                 Text(
-                                    stringResource(if (viewModel.installedPackageName == null) R.string.install_app else R.string.open_app)
+                                    stringResource(if (vm.installedPackageName == null) R.string.install_app else R.string.open_app)
                                 )
                             },
                             icon = {
-                                viewModel.installedPackageName?.let {
+                                vm.installedPackageName?.let {
                                     Icon(
                                         Icons.AutoMirrored.Outlined.OpenInNew,
                                         stringResource(R.string.open_app)
@@ -197,10 +176,10 @@ fun PatcherScreen(
                                 )
                             },
                             onClick = {
-                                if (viewModel.installedPackageName == null)
-                                    if (viewModel.isDeviceRooted()) showInstallPicker = true
-                                    else viewModel.install(InstallType.DEFAULT)
-                                else viewModel.open()
+                                if (vm.installedPackageName == null)
+                                    if (vm.isDeviceRooted()) showInstallPicker = true
+                                    else vm.install(InstallType.DEFAULT)
+                                else vm.open()
                             }
                         )
                     }
@@ -214,7 +193,7 @@ fun PatcherScreen(
                 .fillMaxSize()
         ) {
             LinearProgressIndicator(
-                progress = { viewModel.progress },
+                progress = { vm.progress },
                 modifier = Modifier.fillMaxWidth()
             )
 
@@ -230,11 +209,11 @@ fun PatcherScreen(
                     Steps(
                         category = category,
                         steps = steps,
-                        stepCount = if (category == StepCategory.PATCHING) viewModel.patchesProgress else null,
-                        stepProgressProvider = viewModel
+                        stepCount = if (category == StepCategory.PATCHING) vm.patchesProgress else null,
+                        stepProgressProvider = vm
                     )
                 }
             }
         }
     }
-}
+}

app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt

@@ -58,14 +58,16 @@ 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
@@ -87,9 +89,9 @@ import kotlinx.coroutines.launch
 fun PatchesSelectorScreen(
     onSave: (PatchSelection?, Options) -> Unit,
     onBackClick: () -> Unit,
-    viewModel: PatchesSelectorViewModel
+    vm: PatchesSelectorViewModel
 ) {
-    val bundles by viewModel.bundlesFlow.collectAsStateWithLifecycle(initialValue = emptyList())
+    val bundles by vm.bundlesFlow.collectAsStateWithLifecycle(initialValue = emptyList())
     val pagerState = rememberPagerState(
         initialPage = 0,
         initialPageOffsetFraction = 0f
@@ -105,15 +107,15 @@ fun PatchesSelectorScreen(
     }
     var showBottomSheet by rememberSaveable { mutableStateOf(false) }
     val showSaveButton by remember {
-        derivedStateOf { viewModel.selectionIsValid(bundles) }
+        derivedStateOf { vm.selectionIsValid(bundles) }
     }
 
-    val defaultPatchSelectionCount by viewModel.defaultSelectionCount
+    val defaultPatchSelectionCount by vm.defaultSelectionCount
         .collectAsStateWithLifecycle(initialValue = 0)
 
     val selectedPatchCount by remember {
         derivedStateOf {
-            viewModel.customPatchSelection?.values?.sumOf { it.size } ?: defaultPatchSelectionCount
+            vm.customPatchSelection?.values?.sumOf { it.size } ?: defaultPatchSelectionCount
         }
     }
 
@@ -145,14 +147,14 @@ fun PatchesSelectorScreen(
                     verticalArrangement = Arrangement.spacedBy(12.dp)
                 ) {
                     CheckedFilterChip(
-                        selected = viewModel.filter and SHOW_INCOMPATIBLE == 0,
-                        onClick = { viewModel.toggleFlag(SHOW_INCOMPATIBLE) },
+                        selected = vm.filter and SHOW_INCOMPATIBLE == 0,
+                        onClick = { vm.toggleFlag(SHOW_INCOMPATIBLE) },
                         label = { Text(stringResource(R.string.this_version)) }
                     )
 
                     CheckedFilterChip(
-                        selected = viewModel.filter and SHOW_UNIVERSAL != 0,
-                        onClick = { viewModel.toggleFlag(SHOW_UNIVERSAL) },
+                        selected = vm.filter and SHOW_UNIVERSAL != 0,
+                        onClick = { vm.toggleFlag(SHOW_UNIVERSAL) },
                         label = { Text(stringResource(R.string.universal)) },
                     )
                 }
@@ -160,39 +162,43 @@ fun PatchesSelectorScreen(
         }
     }
 
-    if (viewModel.compatibleVersions.isNotEmpty())
+    if (vm.compatibleVersions.isNotEmpty())
         IncompatiblePatchDialog(
-            appVersion = viewModel.appVersion ?: stringResource(R.string.any_version),
-            compatibleVersions = viewModel.compatibleVersions,
-            onDismissRequest = viewModel::dismissDialogs
+            appVersion = vm.appVersion ?: stringResource(R.string.any_version),
+            compatibleVersions = vm.compatibleVersions,
+            onDismissRequest = vm::dismissDialogs
         )
     var showIncompatiblePatchesDialog by rememberSaveable {
         mutableStateOf(false)
     }
     if (showIncompatiblePatchesDialog)
         IncompatiblePatchesDialog(
-            appVersion = viewModel.appVersion ?: stringResource(R.string.any_version),
+            appVersion = vm.appVersion ?: stringResource(R.string.any_version),
             onDismissRequest = { showIncompatiblePatchesDialog = false }
         )
 
-    viewModel.optionsDialog?.let { (bundle, patch) ->
+    vm.optionsDialog?.let { (bundle, patch) ->
         OptionsDialog(
-            onDismissRequest = viewModel::dismissDialogs,
+            onDismissRequest = vm::dismissDialogs,
             patch = patch,
-            values = viewModel.getOptions(bundle, patch),
-            reset = { viewModel.resetOptions(bundle, patch) },
-            set = { key, value -> viewModel.setOption(bundle, patch, key, value) }
+            values = vm.getOptions(bundle, patch),
+            reset = { vm.resetOptions(bundle, patch) },
+            set = { key, value -> vm.setOption(bundle, patch, key, value) }
         )
     }
 
-    var showSelectionWarning by rememberSaveable { mutableStateOf(false) }
-    var showUniversalWarning by rememberSaveable { mutableStateOf(false) }
-
-    if (showSelectionWarning)
+    var showSelectionWarning by rememberSaveable {
+        mutableStateOf(false)
+    }
+    if (showSelectionWarning) {
         SelectionWarningDialog(onDismiss = { showSelectionWarning = false })
-
-    if (showUniversalWarning)
-        UniversalPatchWarningDialog(onDismiss = { showUniversalWarning = false })
+    }
+    vm.pendingUniversalPatchAction?.let {
+        UniversalPatchWarningDialog(
+            onCancel = vm::dismissUniversalPatchWarning,
+            onConfirm = vm::confirmUniversalPatchWarning
+        )
+    }
 
     fun LazyListScope.patchList(
         uid: Int,
@@ -216,25 +222,27 @@ fun PatchesSelectorScreen(
                 PatchItem(
                     patch = patch,
                     onOptionsDialog = {
-                        viewModel.optionsDialog = uid to patch
+                        vm.optionsDialog = uid to patch
                     },
-                    selected = compatible && viewModel.isSelected(
+                    selected = compatible && vm.isSelected(
                         uid,
                         patch
                     ),
                     onToggle = {
                         when {
                             // Open incompatible dialog if the patch is not supported
-                            !compatible -> viewModel.openIncompatibleDialog(patch)
+                            !compatible -> vm.openIncompatibleDialog(patch)
 
                             // Show selection warning if enabled
-                            viewModel.selectionWarningEnabled -> showSelectionWarning = true
+                            vm.selectionWarningEnabled -> showSelectionWarning = true
 
-                            // Show universal warning if universal patch is selected and the toggle is off
-                            patch.compatiblePackages == null && viewModel.universalPatchWarningEnabled -> showUniversalWarning = 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) }
+                            }
 
                             // Toggle the patch otherwise
-                            else -> viewModel.togglePatch(uid, patch)
+                            else -> vm.togglePatch(uid, patch)
                         }
                     },
                     compatible = compatible
@@ -320,7 +328,7 @@ fun PatchesSelectorScreen(
                     patchList(
                         uid = bundle.uid,
                         patches = bundle.universal.searched(),
-                        visible = viewModel.filter and SHOW_UNIVERSAL != 0,
+                        visible = vm.filter and SHOW_UNIVERSAL != 0,
                         compatible = true
                     ) {
                         ListHeader(
@@ -331,8 +339,8 @@ fun PatchesSelectorScreen(
                     patchList(
                         uid = bundle.uid,
                         patches = bundle.incompatible.searched(),
-                        visible = viewModel.filter and SHOW_INCOMPATIBLE != 0,
-                        compatible = viewModel.allowIncompatiblePatches
+                        visible = vm.filter and SHOW_INCOMPATIBLE != 0,
+                        compatible = vm.allowIncompatiblePatches
                     ) {
                         ListHeader(
                             title = stringResource(R.string.incompatible_patches),
@@ -355,30 +363,22 @@ fun PatchesSelectorScreen(
                     verticalArrangement = Arrangement.spacedBy(4.dp)
                 ) {
                     SmallFloatingActionButton(
-                        onClick = viewModel::reset,
+                        onClick = vm::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(viewModel.getCustomSelection(), viewModel.getOptions())
+                            onSave(vm.getCustomSelection(), vm.getOptions())
                         }
                     )
                 }
@@ -405,19 +405,7 @@ fun PatchesSelectorScreen(
                                     )
                                 }
                             },
-                            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
-                                    )
-                                }
-                            },
+                            text = { Text(bundle.name) },
                             selectedContentColor = MaterialTheme.colorScheme.primary,
                             unselectedContentColor = MaterialTheme.colorScheme.onSurfaceVariant
                         )
@@ -446,7 +434,7 @@ fun PatchesSelectorScreen(
                         patchList(
                             uid = bundle.uid,
                             patches = bundle.universal,
-                            visible = viewModel.filter and SHOW_UNIVERSAL != 0,
+                            visible = vm.filter and SHOW_UNIVERSAL != 0,
                             compatible = true
                         ) {
                             ListHeader(
@@ -456,8 +444,8 @@ fun PatchesSelectorScreen(
                         patchList(
                             uid = bundle.uid,
                             patches = bundle.incompatible,
-                            visible = viewModel.filter and SHOW_INCOMPATIBLE != 0,
-                            compatible = viewModel.allowIncompatiblePatches
+                            visible = vm.filter and SHOW_INCOMPATIBLE != 0,
+                            compatible = vm.allowIncompatiblePatches
                         ) {
                             ListHeader(
                                 title = stringResource(R.string.incompatible_patches),
@@ -472,9 +460,7 @@ fun PatchesSelectorScreen(
 }
 
 @Composable
-private fun SelectionWarningDialog(
-    onDismiss: () -> Unit
-) {
+private fun SelectionWarningDialog(onDismiss: () -> Unit) {
     SafeguardDialog(
         onDismiss = onDismiss,
         title = R.string.warning,
@@ -484,12 +470,33 @@ private fun SelectionWarningDialog(
 
 @Composable
 private fun UniversalPatchWarningDialog(
-    onDismiss: () -> Unit
+    onCancel: () -> Unit,
+    onConfirm: () -> Unit
 ) {
-    SafeguardDialog(
-        onDismiss = onDismiss,
-        title = R.string.warning,
-        body = stringResource(R.string.universal_patch_warning_description),
+    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))
+        }
     )
 }
 
@@ -611,7 +618,13 @@ private fun OptionsDialog(
     reset: () -> Unit,
     set: (String, Any?) -> Unit,
     onDismissRequest: () -> Unit,
-) = FullscreenDialog(onDismissRequest = onDismissRequest) {
+) = Dialog(
+    onDismissRequest = onDismissRequest,
+    properties = DialogProperties(
+        usePlatformDefaultWidth = false,
+        dismissOnBackPress = true
+    )
+) {
     Scaffold(
         topBar = {
             AppTopBar(

app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt

@@ -1,6 +1,5 @@
 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
@@ -8,79 +7,55 @@ 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 data class Section(
-    @StringRes val name: Int,
-    @StringRes val description: Int,
-    val image: ImageVector,
-    val destination: Settings.Destination,
+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,
 )
 
 @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(
@@ -94,12 +69,12 @@ fun SettingsScreen(onBackClick: () -> Unit, navigate: (Settings.Destination) ->
                 .padding(paddingValues)
                 .fillMaxSize()
         ) {
-            settingsSections.forEach { (name, description, icon, destination) ->
+            settingsSections.forEach { (titleDescIcon, destination) ->
                 SettingsListItem(
                     modifier = Modifier.clickable { navigate(destination) },
-                    headlineContent = stringResource(name),
-                    supportingContent = stringResource(description),
-                    leadingContent = { Icon(icon, null) }
+                    headlineContent = stringResource(titleDescIcon.first),
+                    supportingContent = stringResource(titleDescIcon.second),
+                    leadingContent = { Icon(titleDescIcon.third, null) }
                 )
             }
         }

app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt

@@ -23,26 +23,16 @@ 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
@@ -52,7 +42,6 @@ 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
@@ -120,8 +109,7 @@ 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")
@@ -146,35 +134,6 @@ 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 = {
@@ -184,9 +143,6 @@ fun AboutSettingsScreen(
                 onBackClick = onBackClick
             )
         },
-        snackbarHost = {
-            SnackbarHost(hostState = snackbarHostState)
-        },
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
         ColumnWithScrollbar(
@@ -197,11 +153,9 @@ fun AboutSettingsScreen(
             verticalArrangement = Arrangement.spacedBy(16.dp)
         ) {
             Image(
-                modifier = Modifier
-                    .padding(top = 16.dp)
-                    .clickable { developerTaps += 1 },
+                modifier = Modifier.padding(top = 16.dp),
                 painter = icon,
-                contentDescription = stringResource(R.string.app_name)
+                contentDescription = null
             )
             Column(
                 horizontalAlignment = Alignment.CenterHorizontally,
@@ -209,11 +163,7 @@ fun AboutSettingsScreen(
             ) {
                 Text(
                     stringResource(R.string.app_name),
-                    style = MaterialTheme.typography.headlineSmall,
-                    modifier = Modifier.semantics {
-                        // Icon already has this information for the purpose of being clickable.
-                        hideFromAccessibility()
-                    }
+                    style = MaterialTheme.typography.headlineSmall
                 )
                 Text(
                     text = stringResource(R.string.version) + " " + BuildConfig.VERSION_NAME + " (" + BuildConfig.VERSION_CODE + ")",

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,
-    viewModel: AdvancedSettingsViewModel = koinViewModel()
+    vm: AdvancedSettingsViewModel = koinViewModel()
 ) {
     val context = LocalContext.current
     val memoryLimit = remember {
@@ -91,16 +91,16 @@ fun AdvancedSettingsScreen(
         ) {
             GroupHeader(stringResource(R.string.manager))
 
-            val apiUrl by viewModel.prefs.api.getAsState()
+            val apiUrl by vm.prefs.api.getAsState()
             var showApiUrlDialog by rememberSaveable { mutableStateOf(false) }
 
             if (showApiUrlDialog) {
                 APIUrlDialog(
                     currentUrl = apiUrl,
-                    defaultUrl = viewModel.prefs.api.default,
+                    defaultUrl = vm.prefs.api.default,
                     onSubmit = {
                         showApiUrlDialog = false
-                        it?.let(viewModel::setApiUrl)
+                        it?.let(vm::setApiUrl)
                     }
                 )
             }
@@ -114,44 +114,44 @@ fun AdvancedSettingsScreen(
 
             GroupHeader(stringResource(R.string.safeguards))
             SafeguardBooleanItem(
-                preference = viewModel.prefs.disablePatchVersionCompatCheck,
-                coroutineScope = viewModel.viewModelScope,
+                preference = vm.prefs.disablePatchVersionCompatCheck,
+                coroutineScope = vm.viewModelScope,
                 headline = R.string.patch_compat_check,
                 description = R.string.patch_compat_check_description,
                 confirmationText = R.string.patch_compat_check_confirmation
             )
             SafeguardBooleanItem(
-                preference = viewModel.prefs.suggestedVersionSafeguard,
-                coroutineScope = viewModel.viewModelScope,
+                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,
                 headline = R.string.suggested_version_safeguard,
                 description = R.string.suggested_version_safeguard_description,
                 confirmationText = R.string.suggested_version_safeguard_confirmation
             )
             SafeguardBooleanItem(
-                preference = viewModel.prefs.disableSelectionWarning,
-                coroutineScope = viewModel.viewModelScope,
+                preference = vm.prefs.disableSelectionWarning,
+                coroutineScope = vm.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 = viewModel.prefs.useProcessRuntime,
-                coroutineScope = viewModel.viewModelScope,
+                preference = vm.prefs.useProcessRuntime,
+                coroutineScope = vm.viewModelScope,
                 headline = R.string.process_runtime,
                 description = R.string.process_runtime_description,
             )
             IntegerItem(
-                preference = viewModel.prefs.patcherProcessMemoryLimit,
-                coroutineScope = viewModel.viewModelScope,
+                preference = vm.prefs.patcherProcessMemoryLimit,
+                coroutineScope = vm.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(viewModel::exportDebugLogs)
+                    it?.let(vm::exportDebugLogs)
                 }
             SettingsListItem(
                 headlineContent = stringResource(R.string.debug_logs_export),
-                modifier = Modifier.clickable { exportDebugLogsLauncher.launch(viewModel.debugLogFileName) }
+                modifier = Modifier.clickable { exportDebugLogsLauncher.launch(vm.debugLogFileName) }
             )
             val clipboard = remember { context.getSystemService<ClipboardManager>()!! }
             val deviceContent = """

app/src/main/java/app/revanced/manager/ui/screen/settings/ContributorScreen.kt

@@ -51,7 +51,7 @@ import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun ContributorSettingsScreen(
+fun ContributorScreen(
     onBackClick: () -> Unit,
     viewModel: ContributorViewModel = koinViewModel()
 ) {

app/src/main/java/app/revanced/manager/ui/screen/settings/DeveloperOptionsScreen.kt

@@ -12,23 +12,19 @@ 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 DeveloperSettingsScreen(
+fun DeveloperOptionsScreen(
     onBackClick: () -> Unit,
     vm: DeveloperOptionsViewModel = koinViewModel()
 ) {
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-    val prefs: PreferencesManager = koinInject()
 
     Scaffold(
         topBar = {
@@ -41,13 +37,6 @@ fun DeveloperSettingsScreen(
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
         Column(modifier = Modifier.padding(paddingValues)) {
-            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.patch_bundles_force_download),

app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt

@@ -9,7 +9,6 @@ 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
@@ -44,7 +43,6 @@ 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
@@ -61,17 +59,6 @@ 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 = {
@@ -81,7 +68,7 @@ fun DownloadsSettingsScreen(
                 onBackClick = onBackClick,
                 actions = {
                     if (viewModel.appSelection.isNotEmpty()) {
-                        IconButton(onClick = { showDeleteConfirmationDialog = true }) {
+                        IconButton(onClick = { viewModel.deleteApps() }) {
                             Icon(Icons.Default.Delete, stringResource(R.string.delete))
                         }
                     }

app/src/main/java/app/revanced/manager/ui/screen/settings/ImportExportSettingsScreen.kt

@@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Key
-import androidx.compose.material.icons.outlined.WarningAmber
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -29,7 +28,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -44,14 +42,11 @@ import androidx.lifecycle.viewModelScope
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ColumnWithScrollbar
-import app.revanced.manager.ui.component.ConfirmDialog
 import app.revanced.manager.ui.component.GroupHeader
 import app.revanced.manager.ui.component.PasswordField
 import app.revanced.manager.ui.component.bundle.BundleSelector
-import app.revanced.manager.ui.component.settings.ExpandableSettingListItem
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.ImportExportViewModel
-import app.revanced.manager.ui.viewmodel.ResetDialogState
 import app.revanced.manager.util.toast
 import app.revanced.manager.util.uiSafe
 import kotlinx.coroutines.launch
@@ -64,8 +59,6 @@ fun ImportExportSettingsScreen(
     vm: ImportExportViewModel = koinViewModel()
 ) {
     val context = LocalContext.current
-    val coroutineScope = rememberCoroutineScope()
-    var selectorDialog by rememberSaveable { mutableStateOf<(@Composable () -> Unit)?>(null) }
 
     val importKeystoreLauncher =
         rememberLauncherForActivityResult(contract = ActivityResultContracts.GetContent()) {
@@ -77,7 +70,6 @@ fun ImportExportSettingsScreen(
         }
 
     val patchBundles by vm.patchBundles.collectAsStateWithLifecycle(initialValue = emptyList())
-    val packagesWithSelections by vm.packagesWithSelection.collectAsStateWithLifecycle(initialValue = emptySet())
     val packagesWithOptions by vm.packagesWithOptions.collectAsStateWithLifecycle(initialValue = emptySet())
 
     vm.selectionAction?.let { action ->
@@ -115,20 +107,6 @@ fun ImportExportSettingsScreen(
         )
     }
 
-    vm.resetDialogState?.let {
-        with(vm.resetDialogState!!) {
-            ConfirmDialog(
-                onDismiss = { vm.resetDialogState = null },
-                onConfirm = onConfirm,
-                title = stringResource(titleResId),
-                description = dialogOptionName?.let {
-                    stringResource(descriptionResId, it)
-                } ?: stringResource(descriptionResId),
-                icon = Icons.Outlined.WarningAmber
-            )
-        }
-    }
-
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
 
     Scaffold(
@@ -146,7 +124,28 @@ fun ImportExportSettingsScreen(
                 .fillMaxSize()
                 .padding(paddingValues)
         ) {
-            selectorDialog?.invoke()
+            var showPackageSelector by rememberSaveable {
+                mutableStateOf(false)
+            }
+            var showBundleSelector by rememberSaveable {
+                mutableStateOf(false)
+            }
+
+            if (showPackageSelector) {
+                PackageSelector(packages = packagesWithOptions) { selected ->
+                    selected?.let(vm::resetOptionsForPackage)
+
+                    showPackageSelector = false
+                }
+            }
+
+            if (showBundleSelector) {
+                BundleSelector(bundles = patchBundles) { bundle ->
+                    bundle?.let(vm::clearOptionsForBundle)
+
+                    showBundleSelector = false
+                }
+            }
 
             GroupHeader(stringResource(R.string.import_))
             GroupItem(
@@ -182,126 +181,32 @@ fun ImportExportSettingsScreen(
 
             GroupHeader(stringResource(R.string.reset))
             GroupItem(
-                onClick = {
-                    vm.resetDialogState = ResetDialogState.Keystore {
-                        vm.regenerateKeystore()
-                    }
-                },
+                onClick = vm::regenerateKeystore,
                 headline = R.string.regenerate_keystore,
                 description = R.string.regenerate_keystore_description
             )
-
-            ExpandableSettingListItem(
-                headlineContent = stringResource(R.string.reset_patch_selection),
-                supportingContent = stringResource(R.string.reset_patch_selection_description),
-                expandableContent = {
-                    GroupItem(
-                        onClick = {
-                            vm.resetDialogState = ResetDialogState.PatchSelectionAll {
-                                vm.resetSelection()
-                            }
-                        },
-                        headline = R.string.patch_selection_reset_all,
-                        description = R.string.patch_selection_reset_all_description
-                    )
-
-                    GroupItem(
-                        onClick = {
-                            selectorDialog = {
-                                PackageSelector(packages = packagesWithSelections) { packageName ->
-                                    packageName?.also {
-                                        vm.resetDialogState =
-                                            ResetDialogState.PatchSelectionPackage(packageName) {
-                                                vm.resetSelectionForPackage(packageName)
-                                            }
-                                    }
-                                    selectorDialog = null
-                                }
-                            }
-                        },
-                        headline = R.string.patch_selection_reset_package,
-                        description = R.string.patch_selection_reset_package_description
-                    )
-
-                    if (patchBundles.isNotEmpty()) {
-                        GroupItem(
-                            onClick = {
-                                selectorDialog = {
-                                    BundleSelector(bundles = patchBundles) { bundle ->
-                                        bundle?.also {
-                                            coroutineScope.launch {
-                                                vm.resetDialogState =
-                                                    ResetDialogState.PatchSelectionBundle(bundle.getName()) {
-                                                        vm.resetSelectionForPatchBundle(bundle)
-                                                    }
-                                            }
-                                        }
-                                        selectorDialog = null
-                                    }
-                                }
-                            },
-                            headline = R.string.patch_selection_reset_bundle,
-                            description = R.string.patch_selection_reset_bundle_description
-                        )
-                    }
-                }
+            GroupItem(
+                onClick = vm::resetSelection, // TODO: allow resetting selection for specific bundle or package name.
+                headline = R.string.reset_patch_selection,
+                description = R.string.reset_patch_selection_description
             )
-
-            ExpandableSettingListItem(
-                headlineContent = stringResource(R.string.reset_patch_options),
-                supportingContent = stringResource(R.string.reset_patch_options_description),
-                expandableContent = {
-                    GroupItem(
-                        onClick = {
-                            vm.resetDialogState = ResetDialogState.PatchOptionsAll {
-                                vm.resetOptions()
-                            }
-                        }, // TODO: patch options import/export.
-                        headline = R.string.patch_options_reset_all,
-                        description = R.string.patch_options_reset_all_description,
-                    )
-
-                    GroupItem(
-                        onClick = {
-                            selectorDialog = {
-                                PackageSelector(packages = packagesWithOptions) { packageName ->
-                                    packageName?.also {
-                                        vm.resetDialogState =
-                                            ResetDialogState.PatchOptionPackage(packageName) {
-                                                vm.resetOptionsForPackage(packageName)
-                                            }
-                                    }
-                                    selectorDialog = null
-                                }
-                            }
-                        },
-                        headline = R.string.patch_options_reset_package,
-                        description = R.string.patch_options_reset_package_description
-                    )
-
-                    if (patchBundles.isNotEmpty()) {
-                        GroupItem(
-                            onClick = {
-                                selectorDialog = {
-                                    BundleSelector(bundles = patchBundles) { bundle ->
-                                        bundle?.also {
-                                            coroutineScope.launch {
-                                                vm.resetDialogState =
-                                                    ResetDialogState.PatchOptionBundle(bundle.getName()) {
-                                                        vm.resetOptionsForBundle(bundle)
-                                                    }
-                                            }
-                                        }
-                                        selectorDialog = null
-                                    }
-                                }
-                            },
-                            headline = R.string.patch_options_reset_bundle,
-                            description = R.string.patch_options_reset_bundle_description,
-                        )
-                    }
-                }
+            GroupItem(
+                onClick = vm::resetOptions, // TODO: patch options import/export.
+                headline = R.string.patch_options_reset_all,
+                description = R.string.patch_options_reset_all_description,
             )
+            GroupItem(
+                onClick = { showPackageSelector = true },
+                headline = R.string.patch_options_reset_package,
+                description = R.string.patch_options_reset_package_description
+            )
+            if (patchBundles.size > 1) {
+                GroupItem(
+                    onClick = { showBundleSelector = true },
+                    headline = R.string.patch_options_reset_bundle,
+                    description = R.string.patch_options_reset_bundle_description,
+                )
+            }
         }
     }
 }

app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesScreen.kt

@@ -15,11 +15,10 @@ import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.Scrollbar
 import com.mikepenz.aboutlibraries.ui.compose.LibrariesContainer
 import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults
-import com.mikepenz.aboutlibraries.ui.compose.libraryColors
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun LicensesSettingsScreen(
+fun LicensesScreen(
     onBackClick: () -> Unit,
 ) {
     AppScaffold(

app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsScreen.kt

@@ -27,7 +27,7 @@ import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun ChangelogsSettingsScreen(
+fun ChangelogsScreen(
     onBackClick: () -> Unit,
     vm: ChangelogsViewModel = koinViewModel()
 ) {

app/src/main/java/app/revanced/manager/ui/screen/settings/update/UpdatesSettingsScreen.kt

@@ -87,7 +87,7 @@ fun UpdatesSettingsScreen(
             BooleanItem(
                 preference = vm.showManagerUpdateDialogOnLaunch,
                 headline = R.string.show_manager_update_dialog_on_launch,
-                description = R.string.show_manager_update_dialog_on_launch_description
+                description = R.string.update_checking_manager_description
             )
         }
     }

app/src/main/java/app/revanced/manager/ui/viewmodel/AboutViewModel.kt

@@ -8,7 +8,6 @@ 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
@@ -28,7 +27,6 @@ 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
@@ -39,8 +37,6 @@ class AboutViewModel(
     val isConnected: Boolean
         get() = network.isConnected()
 
-    val showDeveloperSettings = prefs.showDeveloperSettings
-
     init {
         viewModelScope.launch {
             if (!isConnected) {
@@ -57,8 +53,6 @@ class AboutViewModel(
     }
 
     companion object {
-        const val DEVELOPER_OPTIONS_TAPS = 5
-
         private val socialIcons = mapOf(
             "Discord" to FontAwesomeIcons.Brands.Discord,
             "GitHub" to FontAwesomeIcons.Brands.Github,

app/src/main/java/app/revanced/manager/ui/viewmodel/ImportExportViewModel.kt

@@ -4,7 +4,6 @@ import android.app.Application
 import android.net.Uri
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.annotation.StringRes
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -35,59 +34,6 @@ import java.nio.file.StandardCopyOption
 import kotlin.io.path.deleteExisting
 import kotlin.io.path.inputStream
 
-sealed class ResetDialogState(
-    @StringRes val titleResId: Int,
-    @StringRes val descriptionResId: Int,
-    val onConfirm: () -> Unit,
-    val dialogOptionName: String? = null
-) {
-    class Keystore(onConfirm: () -> Unit) : ResetDialogState(
-        titleResId = R.string.regenerate_keystore,
-        descriptionResId = R.string.regenerate_keystore_dialog_description,
-        onConfirm = onConfirm
-    )
-
-    class PatchSelectionAll(onConfirm: () -> Unit) : ResetDialogState(
-        titleResId = R.string.patch_selection_reset_all,
-        descriptionResId = R.string.patch_selection_reset_all_dialog_description,
-        onConfirm = onConfirm
-    )
-
-    class PatchSelectionPackage(dialogOptionName:String, onConfirm: () -> Unit) : ResetDialogState(
-        titleResId = R.string.patch_selection_reset_package,
-        descriptionResId = R.string.patch_selection_reset_package_dialog_description,
-        onConfirm = onConfirm,
-        dialogOptionName = dialogOptionName
-    )
-
-    class PatchSelectionBundle(dialogOptionName: String, onConfirm: () -> Unit) : ResetDialogState(
-        titleResId = R.string.patch_selection_reset_bundle,
-        descriptionResId = R.string.patch_selection_reset_bundle_dialog_description,
-        onConfirm = onConfirm,
-        dialogOptionName = dialogOptionName
-    )
-
-    class PatchOptionsAll(onConfirm: () -> Unit) : ResetDialogState(
-        titleResId = R.string.patch_options_reset_all,
-        descriptionResId = R.string.patch_options_reset_all_dialog_description,
-        onConfirm = onConfirm
-    )
-
-    class PatchOptionPackage(dialogOptionName:String, onConfirm: () -> Unit) : ResetDialogState(
-        titleResId = R.string.patch_options_reset_package,
-        descriptionResId = R.string.patch_options_reset_package_dialog_description,
-        onConfirm = onConfirm,
-        dialogOptionName = dialogOptionName
-    )
-
-    class PatchOptionBundle(dialogOptionName: String, onConfirm: () -> Unit) : ResetDialogState(
-        titleResId = R.string.patch_options_reset_bundle,
-        descriptionResId = R.string.patch_options_reset_bundle_dialog_description,
-        onConfirm = onConfirm,
-        dialogOptionName = dialogOptionName
-    )
-}
-
 @OptIn(ExperimentalSerializationApi::class)
 class ImportExportViewModel(
     private val app: Application,
@@ -105,18 +51,15 @@ class ImportExportViewModel(
     private var keystoreImportPath by mutableStateOf<Path?>(null)
     val showCredentialsDialog by derivedStateOf { keystoreImportPath != null }
 
-    var resetDialogState by mutableStateOf<ResetDialogState?>(null)
-
     val packagesWithOptions = optionsRepository.getPackagesWithSavedOptions()
-    val packagesWithSelection = selectionRepository.getPackagesWithSavedSelection()
 
     fun resetOptionsForPackage(packageName: String) = viewModelScope.launch {
-        optionsRepository.resetOptionsForPackage(packageName)
+        optionsRepository.clearOptionsForPackage(packageName)
         app.toast(app.getString(R.string.patch_options_reset_toast))
     }
 
-    fun resetOptionsForBundle(patchBundle: PatchBundleSource) = viewModelScope.launch {
-        optionsRepository.resetOptionsForPatchBundle(patchBundle.uid)
+    fun clearOptionsForBundle(patchBundle: PatchBundleSource) = viewModelScope.launch {
+        optionsRepository.clearOptionsForPatchBundle(patchBundle.uid)
         app.toast(app.getString(R.string.patch_options_reset_toast))
     }
 
@@ -192,16 +135,6 @@ class ImportExportViewModel(
         app.toast(app.getString(R.string.reset_patch_selection_success))
     }
 
-    fun resetSelectionForPackage(packageName: String) = viewModelScope.launch {
-        selectionRepository.resetSelectionForPackage(packageName)
-        app.toast(app.getString(R.string.reset_patch_selection_success))
-    }
-
-    fun resetSelectionForPatchBundle(patchBundle: PatchBundleSource) = viewModelScope.launch {
-        selectionRepository.resetSelectionForPatchBundle(patchBundle.uid)
-        app.toast(app.getString(R.string.reset_patch_selection_success))
-    }
-
     fun executeSelectionAction(target: Uri) = viewModelScope.launch {
         val source = selectedBundle!!
         val action = selectionAction!!

app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt

@@ -55,6 +55,8 @@ 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)
@@ -67,9 +69,7 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
 
     init {
         viewModelScope.launch {
-            if (prefs.disableUniversalPatchCheck.get()) {
-                universalPatchWarningEnabled = false
-            }
+            universalPatchWarningEnabled = !prefs.disableUniversalPatchWarning.get()
 
             if (prefs.disableSelectionWarning.get()) {
                 selectionWarningEnabled = false
@@ -160,6 +160,17 @@ 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

app/src/main/java/app/revanced/manager/ui/viewmodel/SelectedAppInfoViewModel.kt

@@ -131,7 +131,7 @@ class SelectedAppInfoViewModel(
         viewModelScope.launch {
             if (!persistConfiguration) return@launch // TODO: save options for patched apps.
 
-            options = withContext(Dispatchers.Default) {
+            state.value = withContext(Dispatchers.Default) {
                 val bundlePatches = bundleRepository.bundles.first()
                     .mapValues { (_, bundle) -> bundle.patches.associateBy { it.name } }
 
@@ -143,7 +143,7 @@ class SelectedAppInfoViewModel(
     }
         private set
 
-    private var selectionState: SelectionState by savedStateHandle.saveable {
+    private var selectionState by savedStateHandle.saveable {
         if (input.patches != null)
             return@saveable mutableStateOf(SelectionState.Customized(input.patches))
 
@@ -155,7 +155,7 @@ class SelectedAppInfoViewModel(
 
             val previous = selectionRepository.getSelection(packageName)
             if (previous.values.sumOf { it.size } == 0) return@launch
-            selectionState = SelectionState.Customized(previous)
+            selection.value = SelectionState.Customized(previous)
         }
 
         selection
@@ -305,7 +305,7 @@ class SelectedAppInfoViewModel(
         if (!persistConfiguration) return@launch
         viewModelScope.launch(Dispatchers.Default) {
             selection?.let { selectionRepository.updateSelection(packageName, it) }
-                ?: selectionRepository.resetSelectionForPackage(packageName)
+                ?: selectionRepository.clearSelection(packageName)
 
             optionsRepository.saveOptions(packageName, filteredOptions)
         }

app/src/main/java/app/revanced/manager/util/PM.kt

@@ -112,7 +112,7 @@ class PM(
                 app.packageManager.getPackageInfo(packageName, PackageInfoFlags.of(flags.toLong()))
             else
                 app.packageManager.getPackageInfo(packageName, flags)
-        } catch (_: NameNotFoundException) {
+        } catch (e: NameNotFoundException) {
             null
         }
 
@@ -184,8 +184,6 @@ class PM(
         get() = PackageInstaller.SessionParams(
             PackageInstaller.SessionParams.MODE_FULL_INSTALL
         ).apply {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
-                setRequestUpdateOwnership(true)
             setInstallReason(PackageManager.INSTALL_REASON_USER)
         }
 

app/src/main/res/values/strings.xml

@@ -43,24 +43,24 @@
     <string name="selected_app_meta_any_version">Any available version</string>
     <string name="app_source_dialog_title">Select source</string>
     <string name="app_source_dialog_option_auto">Auto</string>
-    <string name="app_source_dialog_option_auto_description">Use all available downloader to download the app</string>
+    <string name="app_source_dialog_option_auto_description">Use all installed downloaders to find a suitable APK file</string>
     <string name="app_source_dialog_option_auto_unavailable">No plugins available</string>
     <string name="app_source_dialog_option_installed_no_root">Mounted apps cannot be patched again without root access</string>
     <string name="app_source_dialog_option_installed_version_not_suggested">Version %s does not match the suggested version</string>
 
     <string name="patch_item_description">Start patching the application</string>
-    <string name="patch_selector_item">Select patches</string>
+    <string name="patch_selector_item">Patch selection and options</string>
     <string name="patch_selector_item_description">%d patches selected</string>
     <string name="no_patches_selected">No patches selected</string>
 
     <string name="network_unavailable_warning">Your device is not connected to the internet. Downloading will fail later.</string>
     <string name="network_metered_warning">You are currently on a metered connection. Data charges from your service provider may apply.</string>
 
-    <string name="apk_source_selector_item">Select APK source</string>
-    <string name="apk_source_auto">Using all APK downloader</string>
-    <string name="apk_source_downloader">Using %s</string>
-    <string name="apk_source_installed">Using installed APK</string>
-    <string name="apk_source_local">Using a local APK file</string>
+    <string name="apk_source_selector_item">Change source</string>
+    <string name="apk_source_auto">Current: All downloaders</string>
+    <string name="apk_source_downloader">Current: %s</string>
+    <string name="apk_source_installed">Current: Installed</string>
+    <string name="apk_source_local">Current: File</string>
 
     <string name="legacy_import_failed">Could not import legacy settings</string>
 
@@ -100,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">Allow using universal patches</string>
-    <string name="universal_patches_safeguard_description">Do not prevent using universal patches</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_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>
@@ -118,7 +118,6 @@
     <string name="export_keystore_success">Exported keystore</string>
     <string name="regenerate_keystore">Regenerate keystore</string>
     <string name="regenerate_keystore_description">Generate a new keystore</string>
-    <string name="regenerate_keystore_dialog_description">You are about to regenerate your keystore the manager will use during the patching process.\n\nYou will not be able to update the previously installed apps from this source.</string>
     <string name="regenerate_keystore_success">The keystore has been successfully replaced</string>
     <string name="import_patch_selection">Import patch selection</string>
     <string name="import_patch_selection_description">Import patch selection from a JSON file</string>
@@ -130,26 +129,12 @@
     <string name="export_patch_selection_success">Exported patch selection</string>
     <string name="reset_patch_selection">Reset patch selection</string>
     <string name="reset_patch_selection_description">Reset the stored patch selection</string>
-    <string name="reset_patch_options">Reset patch options</string>
-    <string name="reset_patch_options_description">Reset the stored patch options</string>
     <string name="reset_patch_selection_success">Patch selection has been reset</string>
-    <string name="patch_selection_reset_all">Reset all patch selection</string>
-    <string name="patch_selection_reset_all_dialog_description">You are about to reset all the patch selections. You will need to manually select each patch again.</string>
-    <string name="patch_selection_reset_all_description">Reset all the patch selections</string>
-    <string name="patch_selection_reset_package">Reset patch selection for app</string>
-    <string name="patch_selection_reset_package_dialog_description">You are about to reset the patch selection for the app \"%s\". You will have to manually select each patch again.</string>
-    <string name="patch_selection_reset_package_description">Resets patch selection for a single app</string>
-    <string name="patch_selection_reset_bundle">Resets patch selection for bundle</string>
-    <string name="patch_selection_reset_bundle_dialog_description">You are about to reset the patch selection for the bundle \"%s\". You will have to manually select each patch again.</string>
-    <string name="patch_selection_reset_bundle_description">Resets the patch selection for all patches in a bundle</string>
     <string name="patch_options_reset_package">Reset patch options for app</string>
-    <string name="patch_options_reset_package_dialog_description">You are about to reset the patch options for the app \"%s\". You will have to reapply each option again.</string>
     <string name="patch_options_reset_package_description">Resets patch options for a single app</string>
     <string name="patch_options_reset_bundle">Resets patch options for bundle</string>
-    <string name="patch_options_reset_bundle_dialog_description">You are about to reset the patch options for the bundle \"%s\". You will have to reapply each option again.</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_dialog_description">You are about to reset patch options. You will have to reapply each option again.</string>
     <string name="patch_options_reset_all_description">Resets all patch options</string>
     <string name="downloader_plugins">Plugins</string>
     <string name="downloader_plugin_state_trusted">Trusted</string>
@@ -158,8 +143,6 @@
     <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>
@@ -241,7 +224,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\nYou need to turn on \"Allow using universal patches\" in the advanced settings before using universal 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="this_version">This version</string>
     <string name="universal">Any app</string>
     <string name="search_patches">Search patches</string>
@@ -278,8 +261,8 @@
     <string name="downloader_invalid_version">Downloader did not fetch the correct version</string>
     <string name="downloader_app_not_found">Downloader did not find the app</string>
     <string name="downloader_error">Downloader error: %s</string>
-    <string name="downloader_no_plugins_installed">No downloader installed.</string>
-    <string name="downloader_no_plugins_available">There are downloader installed but none is trusted. Check your settings.</string>
+    <string name="downloader_no_plugins_installed">No plugins installed.</string>
+    <string name="downloader_no_plugins_available">No trusted plugins available for use. Check your settings.</string>
     <string name="already_patched">Already patched</string>
 
     <string name="patch_selector_sheet_filter_title">Filter</string>
@@ -318,8 +301,6 @@
     <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>
@@ -355,17 +336,9 @@
     <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 Android application that uses ReVanced Patcher to patch Android apps. It allows you to download and patch apps with custom patches, and manage the patching process.</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="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="update_available">An update is available</string>
     <string name="current_version">Current version: %s</string>
     <string name="new_version">New version: %s</string>
@@ -374,7 +347,7 @@
     <string name="install_update_manager_failed">Failed to install update</string>
     <string name="manual_update_check">Check for updates</string>
     <string name="manual_update_check_description">Manually check for updates</string>
-    <string name="update_checking_manager">Check for updates on launch</string>
+    <string name="update_checking_manager">Auto check for updates</string>
     <string name="update_checking_manager_description">Check for new versions of ReVanced Manager when the application starts</string>
     <string name="changelog">View changelogs</string>
     <string name="changelog_loading">Loading changelog</string>
@@ -452,5 +425,4 @@
     <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>

docs/1_installation.md

@@ -4,7 +4,7 @@ In order to use ReVanced on your Android device, ReVanced Manager must be instal
 
 ## ✅ Installation steps
 
-1. Download the latest version of ReVanced Manager at [revanced.app/download](https://revanced.app/download) or from [GitHub releases](https://github.com/ReVanced/revanced-manager/releases/latest)
+1. Download the latest version of ReVanced Manager from [here](https://github.com/revanced/revanced-manager/releases/latest)
 2. Install ReVanced Manager
 
 ## ⏭️ What's next

docs/2_1_patching.md

@@ -1,26 +1,25 @@
-# 💉 Patching apps
+# 🧩 Patching apps
 
-Learn how to use ReVanced Manager to patch apps.
+The following pages will guide you through using ReVanced Manager to patch apps.
 
 ## ✅ Steps to patch apps
 
-1. Navigate to the `Apps` tab at the top navigation bar
-2. Tap on the `+` button in the bottom right corner
-3. Select an app to patch.[^1]
-4. Optionally change the selection of patches[^2]
-5. Optionally select a specific downloader to download the app[^3]
-6. Tap on the `Patch` button to begin the patching process
-7. Tap on the `Install` button to install the patched app[^4]
+1. Navigate to the Apps tab from the top navigation bar
+2. Tap the + button in the bottom right corner
+3. Choose an app to patch[^1]
+4. Tap on the version of the app you want to patch[^2]
+5. Select the patches you want to apply
+6. Tap the Patch button
+7. Tap on the **Install** button
+   > **Note**: If you are rooted, you can mount the patched app on top of the original app.[^3]
+   > Optionally, you may export the patched app to storage using the options in the top right corner.
 
-[^1]: Here you can see all the apps that are supported by ReVanced.
-You can also add custom apps by tapping on the `+` button in the top right corner.
-[^2]: It is recommended to use the default set of patches by tapping on the `Reset` button in the bottom right corner.
-[^3]: By default, all available downloader will be used to download the app.
-If you want to use a specific downloader, you can change it here.
-[^4]: You can export the patched app or the patch logs in the bottom left corner.
+[^1]: Non-root users may be prompted to select an APK from storage, in which case you have to source the APK file yourself. ReVanced does not provide any APK files.
+[^2]: It is suggested to use the version with the most patches to get the most out of ReVanced.
+[^3]: Mounting the patched app on top of the original app will only work if the installed app version matches the version of the app selected in step 4. above.
 
 ## ⏭️ What's next
 
-The next page will explain how to view, open, re-patch or uninstall apps.
+The next page will bring you back to the usage page.
 
-Continue: [🧰 Managing apps](2_2_managing_apps.md)
+Continue: [🛠️ Usage](2_usage.md)

docs/2_2_managing.md

@@ -0,0 +1,15 @@
+# 🧰 Managing patched apps
+
+After patching an app, you may want to manage it. This page will guide you through managing patched apps.
+
+## ✅ Steps to manage patched apps
+
+1. Navigate to the Apps tab from the top navigation bar
+2. Select the app you want to manage
+3. 
+## ⏭️ What's next
+
+The next page will bring you back to the usage page.
+
+Continue: [🛠️ Usage](2_usage.md)
+

docs/2_2_managing_apps.md

@@ -1,15 +0,0 @@
-# 🧰 Managing apps
-
-Learn how to view, open, re-patch or uninstall apps.
-
-## ✅ Steps to manage patched apps
-
-1. Navigate to the `Apps` tab at the top navigation bar
-2. Select the app you want to view, open, re-patch or uninstall
-
-## ⏭️ What's next
-
-The next page will explain how to add new, manage existing or remove patches.
-
-Continue: [🧩 Managing patches](2_3_managing_patches.md)
-

docs/2_3_managing_patches.md

@@ -1,22 +0,0 @@
-# 🧩 Managing patches
-
-Learn how to add new, manage existing or remove patches.
-
-## ✅ Steps to manage patches
-
-1. Navigate to the `Patches` tab at the top navigation bar
-2. Tap on the `+` button in the bottom right corner
-3. Chose one of the options to add new patches[^1]:
-   - **Enter URL**: Add patches from a remote location
-   - **Select from storage**: Add patches from your local storage
-4. Select one of the patches from the list to manage or remove it
-
-[^1]: The selected file must be a JSON using the [ReVanced API](https://github.com/revanced/revanced-api) format
-(Example: `https://api.revanced.app/v4/patches`).
-
-## ⏭️ What's next
-
-The next page will explain how to update ReVanced Manager.
-
-Continue: [🔄 Updating ReVanced Manager](2_4_updating.md)
-

docs/2_3_updating.md

@@ -0,0 +1,13 @@
+# 🔄 Updating ReVanced Manager
+
+In order to keep up with the latest features and bug fixes, it is recommended to keep ReVanced Manager up to date.
+
+## ✅ Updating steps
+
+> Currently not implemented
+
+## ⏭️ What's next
+
+The next page will bring you back to the usage page.
+
+Continue: [🛠️ Usage](2_usage.md)

docs/2_4_settings.md

@@ -0,0 +1,39 @@
+# ⚙️ Configuring ReVanced Manager
+
+ReVanced Manager has settings that can be configured to your liking.
+
+## ⭐ Essential settings
+
+- ### 🔗 API URL
+
+  Specify the URL of the API to use. This is used to fetch ReVanced Patches and update ReVanced Manager.
+
+- ### 🧬 Sources
+
+  Override the API and change the source of ReVanced Patches.
+
+- ### 🧪 Experimental ReVanced Patches support
+
+  Lift app version constraints from ReVanced Patches. This allows you to patch any version of an app, even if the patch is not explicitly compatible with it.
+
+- ### 🧑‍🔬 Experimental universal support
+
+  This will show or hide ReVanced Patches, which are not meant for any app in particular but rather for all apps but may not work on all apps.
+
+- ### 🔑 Export, import or delete keystore
+
+  Manage the keystore used to sign patched apps.
+
+- ### 📄 Export, import or reset ReVanced Patches selection
+
+  Manage the ReVanced Patches selection. This is useful if you want to share your ReVanced Patches selection with others or reset it to the default selection.
+
+- ### ℹ️ About
+
+  View information about your device and ReVanced Manager. This includes the version of ReVanced Manager and supported architectures of your device.
+
+## ⏭️ What's next
+
+The next page will bring you back to the usage page.
+
+Continue: [🛠️ Usage](2_usage.md)

docs/2_4_updating.md

@@ -1,18 +0,0 @@
-# 🔄 Updating ReVanced Manager
-
-Learn how to update ReVanced Manager.
-
-## ✅ Steps to update ReVanced Manager
-
-1. Navigate to the settings by tapping on the settings icon in the top right corner
-2. Navigate to the `Updates` screen
-3. Configure the update settings accordingly[^1]
-
-[^1]: By default, ReVanced Manager will check for updates automatically on launch
-and let you when an update is available.
-
-## ⏭️ What's next
-
-The next page will explain how to configure ReVanced Manager.
-
-Continue: [⚙️ Configuring ReVanced Manager](2_5_settings.md)

docs/2_5_settings.md

@@ -1,37 +0,0 @@
-# ⚙️ Configuring ReVanced Manager
-
-Learn how to configure ReVanced Manager.
-
-## 🔧 Settings
-
-- **Import & export**: Import or export patch selections, patch options and the signing keystore
-- **Downloads**: Enable or disable ReVanced Manager downloader and manage past downloaded apps here
-- **Advanced**:
-  - **API URL**: Set the URL of the ReVanced API, ReVanced Manager will use
-  - **Disable version compatibility check**: Patching versions of apps the patches are explicitly compatible with is enforced.
-    Disabling this will allow patching versions of apps the patches are not explicitly compatible with
-    >   ⚠️ Warning  
-    >   Patches may fail patching versions they are not explicitly compatible with.
-    >   Unless you know what you are doing, it is recommended to keep this enabled.
-  - **Allow changing patch selection**: The default selection of patches is enforced.
-    Enabling this will allow you to change the patch selection
-    >   ⚠️ Warning  
-    >   Changing the selection may cause unexpected issues.
-    >   Unless you know what you are doing, it is recommended to keep this disabled.
-  - **Require suggested app version**: Specific versions of apps is enforced based on the patch selection automatically.
-    Disabling this will allow you to patch any version of apps
-    >   ⚠️ Warning  
-    >   Patches not compatible with the selected version of the app will not be used.
-    >   Unless you know what you are doing, it is recommended to keep this enabled.
-  - **Allow universal patches**: Patches that do not specify compatibility with an app explicitly are forcibly disabled.
-    Enabling this will allow selecting such patches
-    >   ⚠️ Warning  
-    >   Universal patches do not specify compatibility with an app explicitly may not work on all apps regardless.
-    >   Unless you know what you are doing, it is recommended to keep this disabled.
-- **About**: View more information and links about ReVanced and ReVanced Manager.
-
-## ⏭️ What's next
-
-The next page will explain how to troubleshoot issues with ReVanced Manager.
-
-Continue: [❓ Troubleshooting](3_troubleshooting.md)

docs/2_usage.md

@@ -1,18 +1,16 @@
 # 🛠️ Usage
 
-The following pages will guide you through using ReVanced Manager to patch and manage apps, 
-manage patches, and update or configure ReVanced Manager.
+The following pages will guide you through using ReVanced Manager to patch apps, manage patched apps, and update ReVanced Manager.
 
 ## 📖 Table of contents
 
-1. [💉 Patching apps](2_1_patching.md)
-2. [🧰 Managing apps](2_2_managing_apps.md)
-3. [🧩 Managing patches](2_3_managing_patches.md)
-4. [🔄 Updating ReVanced Manager](2_4_updating.md)
-5. [⚙️ Configuring ReVanced Manager](2_5_settings.md)
+1. [🧩 Patching apps](2_1_patching.md)
+2. [🧰 Managing patched apps](2_2_managing.md)
+3. [🔄 Updating ReVanced Manager](2_3_updating.md)
+4. [⚙️ Configuring ReVanced Manager](2_4_settings.md)
 
 ## ⏭️ What's next
 
-The next page will explain how to use ReVanced Manager to patch apps.
+The next page will guide you through troubleshooting ReVanced Manager.
 
-Continue: [💉 Patching apps](2_1_patching.md)
+Continue: [❔ Troubleshooting](3_troubleshooting.md)

docs/3_troubleshooting.md

@@ -1,20 +1,31 @@
-# ❓ Troubleshooting
+# ❔ Troubleshooting
 
-Find common issues and their solutions below.
+In case you encounter any issues while using ReVanced Manager, please refer to this page for possible solutions.
 
-## 🆘 Common issues
+- 💉 Patching fails with an error
 
-- **Patching fails with an error or patched app crashes**:
-  - Make sure ReVanced Manager is up to date by following [🔄 Updating ReVanced Manager](2_4_updating.md)  
-  - Reset the safeguard settings under `Settings` > `Advanced` to their default values
-  - If a patch has options, reset them to their default values or correctly configure them
-  - Make sure you are patching a full APK file and not an [APK bundle](https://developer.android.com/guide/app-bundle/app-bundle-format)
-- **Patches fail to load**: The selected file is not using the ReVanced API format or the remote URL is not reachable.
-- **Patching takes too long**: Make sure you are using a device with enough storage space and free memory.
-  Be patient during the patching process.
+  Make sure ReVanced Manager is up to date by following [🔄 Updating ReVanced Manager](2_3_updating.md) and select the **Default** button when choosing patches.
+  
+- 💥 App not installed as package conflicts with an existing package
+
+  An existing installation of the app you're trying to patch is conflicting with the patched app. Uninstall the existing app before installing the patched app.
+
+- ❗️ Error code `135`, `139` or `1` when patching the app
+
+  Your device is not supported. Refer to the [Prerequisites](0_prerequisites.md) page for supported devices.
+
+  Alternatively, you can use [ReVanced CLI](https://github.com/revanced/revanced-cli) to patch the app.
+
+- 🚫 Non-root install is not possible with the current patches selection
+
+  Select the **Default** button when choosing patches.
+
+- 🚨 Patched app crashes on launch
+
+  Select the **Default** button when choosing patches.
 
 ## ⏭️ What's next
 
-Learn how to build ReVanced Manager from source.
+The next page will teach you how to build ReVanced Manager from source.
 
-Continue: [🔨 Build from source](4_building.md)
+Continue: [🔨 Building from source](4_building.md)

docs/4_building.md

@@ -1,18 +1,8 @@
-# 🛠️ Build from source
+# 🛠️ Building from source
 
 This page will guide you through building ReVanced Manager from source.
 
-1. Install Java Development Kit 17 (e.g. [Temurin JDK](https://adoptium.net/temurin/releases/?os=any&arch=any&version=17))
-
-   Using [WinGet](https://learn.microsoft.com/en-us/windows/package-manager/winget):
-   ``sh
-   winget install EclipseAdoptium.Temurin.17.JDK
-   ``
-   
-   Using [SDKMAN!](https://sdkman.io/):
-   ```sh
-   sdk install java 17.0.15-tem
-   ```
+1. Download Java SDK 17 ([Azul JDK](https://www.azul.com/downloads/?version=java-17-lts&package=jdk#zulu) or [OpenJDK](https://jdk.java.net/java-se-ri/17)) and add it to path
 
 2. Clone the repository
 
@@ -20,19 +10,29 @@ This page will guide you through building ReVanced Manager from source.
    git clone https://github.com/revanced/revanced-manager.git && cd revanced-manager
    ```
 
-3. Build the APK
+3. Create a GitHub personal access token with the `read:packages` scope [here](https://github.com/settings/tokens/new?scopes=read:packages&description=ReVanced)
 
-   ```sh
-   ./gradlew assembleRelease
+4. Add your GitHub username and the token to `~/.gradle/gradle.properties`
+
+   ```properties
+   gpr.user = YourUsername
+   gpr.key = ghp_longrandomkey
    ```
 
-> [!NOTE]
-> If the build fails due to authentication, you may need to authenticate to GitHub Packages.
-> Create a personal access tokens with the scope `read:packages` [here](https://github.com/settings/tokens/new?scopes=read:packages&description=ReVanced) and add your token to ~/.gradle/gradle.properties. Create the file if it does not exist.
->
-> Example `gradle.properties` file:
->
-> ```properties
-> gpr.user = <GitHub username>
-> gpr.key = <Personal access token>
-> ```
+5. Set the `sdk.dir` property in `local.properties` to your Android SDK location
+
+   ```properties
+   sdk.dir = /path/to/android/sdk
+   ```
+
+6. Build the APK
+
+   Debug:
+   ```sh
+   ./gradlew assembleDebug
+   ```
+
+   Release:
+   ```sh
+   ./gradlew assembleRelease -Psign
+   ```

gradle.properties

@@ -22,7 +22,5 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 android.nonFinalResIds=false
-# Task :app:assembleReleaseSignApk fails if this is set to true.
-org.gradle.configuration-cache=false
+org.gradle.configuration-cache=true
 org.gradle.caching=true
-version=1.25.0-dev.1

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
-ktx = "1.16.0"
-material3 = "1.3.2"
-ui-tooling = "1.8.1"
-viewmodel-lifecycle = "2.9.0"
+ktx = "1.15.0"
+material3 = "1.3.1"
+ui-tooling = "1.7.7"
+viewmodel-lifecycle = "2.8.7"
 splash-screen = "1.0.1"
-activity = "1.10.1"
+activity = "1.10.0"
 appcompat = "1.7.0"
 preferences-datastore = "1.1.2"
-work-runtime = "2.10.1"
-compose-bom = "2025.05.00"
+work-runtime = "2.10.0"
+compose-bom = "2025.01.01"
 navigation = "2.8.6"
 accompanist = "0.37.0"
 placeholder = "1.1.2"
@@ -16,17 +16,18 @@ reorderable = "2.4.3"
 serialization = "1.8.0"
 collection = "0.3.8"
 datetime = "0.6.1"
-room-version = "2.7.1"
+room-version = "2.6.1"
 revanced-patcher = "21.0.0"
 revanced-library = "3.0.2"
+plugin-api = "1.0.0"
 koin = "3.5.3"
 ktor = "2.3.9"
 markdown-renderer = "0.30.0"
 fading-edges = "1.0.4"
 kotlin = "2.1.10"
-android-gradle-plugin = "8.9.1"
+android-gradle-plugin = "8.8.0"
 dev-tools-gradle-plugin = "2.1.10-1.0.29"
-about-libraries-gradle-plugin = "12.1.2"
+about-libraries-gradle-plugin = "11.5.0"
 coil = "2.7.0"
 app-icon-loader-coil = "1.5.0"
 skrapeit = "1.2.2"
@@ -36,7 +37,6 @@ enumutil = "1.1.1"
 compose-icons = "1.2.4"
 kotlin-process = "1.5.1"
 hidden-api-stub = "4.3.3"
-binary-compatibility-validator = "0.17.0"
 
 [libraries]
 # AndroidX Core
@@ -83,6 +83,9 @@ room-compiler = { group = "androidx.room", name = "room-compiler", version.ref =
 revanced-patcher = { group = "app.revanced", name = "revanced-patcher", version.ref = "revanced-patcher" }
 revanced-library = { group = "app.revanced", name = "revanced-library", version.ref = "revanced-library" }
 
+# Plugin API
+plugin-api = { group = "app.revanced", name = "revanced-manager-downloader-api", version.ref = "plugin-api" }
+
 # Koin
 koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
 koin-compose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koin" }
@@ -142,5 +145,4 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 devtools = { id = "com.google.devtools.ksp", version.ref = "dev-tools-gradle-plugin" }
-about-libraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "about-libraries-gradle-plugin" }
-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" }
+about-libraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "about-libraries-gradle-plugin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # 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, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_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" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%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" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

package.json

@@ -1,10 +0,0 @@
-{
-  "devDependencies": {
-    "@anolilab/multi-semantic-release": "^1.1.10",
-    "gradle-semantic-release-plugin": "^1.10.1",
-    "@saithodev/semantic-release-backmerge": "^4.0.1",
-    "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/exec": "^6.0.3",
-    "@semantic-release/git": "^10.0.1"
-  }
-}

settings.gradle.kts

@@ -22,5 +22,5 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "revanced-manager"
-include(":app", ":api")
+rootProject.name = "ReVanced Manager"
+include(":app")