chore(release): 1.19.0-dev.6 [skip ci]

## Bug Fixes
* **PopScope:** User able to exit patch screen when the installer is still running (#1663) ([Benjamin](eb6d3cd64e))
## Code Refactoring
* Disable update for dev build (#1662) ([Benjamin](c900d09cf8))
## Continuous Integration
* Add scope to changelog (#1672) ([Benjamin](8cda2c164d))

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -1,5 +1,5 @@
 name: 🐞 Bug report
-description: Report a very clearly broken issue.
+description: Create a new bug report.
 title: 'bug: <title>'
 labels: [bug]
 body:
@@ -8,53 +8,20 @@ body:
       value: |
         # ReVanced Manager bug report
 
-        Important to note that your issue may have already been reported before. Please check for existing issues [here](https://github.com/revanced/revanced-manager/labels/bug).
-
-  - type: dropdown
-    attributes:
-      label: Type
-      options:
-        - Error while running the manager
-        - Error at runtime
-        - Cosmetic
-        - Other
-    validations:
-      required: true
+        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: How did you find the bug? Any additional details that might help?
+      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: Steps to reproduce
-      description: Add the steps to reproduce this bug, including your environment.
-      placeholder: Step 1. Download some files. Step 2. ...
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Android version
-      description: Android version used.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Manager version
-      description: Manager version used.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Target package name
-      description: App you tried to patch.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Target package version.
-      description: Version of the app you tried to patch.
+      label: Version of ReVanced Manager and version & name of application you tried to patch
     validations:
       required: true
   - type: dropdown
@@ -64,57 +31,31 @@ body:
         - Non-root
         - Root
     validations:
-      required: true
+      required: false
   - type: textarea
     attributes:
-      label: Patches selected.
-      description: Patches you selected for the app.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Device logs (exported using Manager settings).
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so there is no need for backticks.
+      label: Device logs
+      description: Export logs in ReVanced Manager settings.
       render: shell
     validations:
       required: true
   - type: textarea
     attributes:
-      label: Installer logs (exported using Installer menu option) [unneeded if the issue is not during patching].
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so there is no need for backticks.
+      label: Patcher logs
+      description: Export logs in "Patcher" screen.
       render: shell
     validations:
       required: false
-  - type: textarea
-    attributes:
-      label: Screenshots or video
-      description: Add screenshots or videos that show the bug here.
-      placeholder: Drag and drop the screenshots/videos into this box.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Solution
-      description: If applicable, add a possible solution.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add additional context here.
-    validations:
-      required: false
   - type: checkboxes
-    id: acknowledgments
     attributes:
-      label: Acknowledgments
-      description: Your issue will be closed if you haven't done these steps.
+      label: Acknowledgements
+      description: Your issue will be closed if you don't follow the checklist below!
       options:
-        - label: I have searched the existing issues; this is new and no duplicate or related to another open issue.
+        - label: This request is not a duplicate of an existing issue.
           required: true
-        - label: I have written a short but informative title.
+        - label: I have chosen an appropriate title.
           required: true
-        - label: I properly filled out all of the requested information in this issue.
+        - label: All requested information has been provided properly.
           required: true
-        - label: The issue is solely related to ReVanced Manager and not caused by patches.
+        - label: The issue is solely related to the ReVanced Manager
           required: true

.github/ISSUE_TEMPLATE/feature-issue.yml

@@ -1,52 +1,42 @@
 name: ⭐ Feature request
-description: Create a detailed feature request.
+description: Create a new feature request.
 title: 'feat: <title>'
-labels: [feature-request]
+labels: 'feature request'
 body:
-  - type: dropdown
+  - type: markdown
     attributes:
-      label: Type
-      options:
-        - Functionality
-        - Cosmetic
-        - Other
-    validations:
-      required: true
+      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: Issue
-      description: What is the current problem. Why does it require a feature request?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Feature
-      description: Describe your feature in detail. How does it solve the issue?
+      label: Feature description
+      description: Describe your feature in detail.
     validations:
       required: true
   - type: textarea
     attributes:
       label: Motivation
-      description: Why should your feature should be considered?
+      description: Explain why the lack of it is a problem.
     validations:
       required: true
   - type: textarea
     attributes:
       label: Additional context
-      description: Add additional context here.
+      description: In case there is something else you want to add.
     validations:
       required: false
   - type: checkboxes
-    id: acknowledgements
     attributes:
       label: Acknowledgements
-      description: Your issue will be closed if you haven't done these steps.
+      description: Your issue will be closed if you don't follow the checklist below!
       options:
-        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
+        - label: This request is not a duplicate of an existing issue.
           required: true
-        - label: I have written a short but informative title.
+        - label: I have chosen an appropriate title.
           required: true
-        - label: I filled out all of the requested information in this issue properly.
+        - label: All requested information has been provided properly.
           required: true
-        - label: The issue is related solely to the ReVanced Manager 
+        - label: The issue is solely related to the ReVanced Manager
           required: true

.github/workflows/analyze.yml

@@ -1,38 +0,0 @@
-name: Analyze Code
-
-on:
-  push:
-    branches: [ "dev" ]
-    paths: 
-      - "**.dart"
-      - ".github/workflows/analyze.yml"
-  pull_request:
-    branches: [ "main", "dev" ]
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
-    paths: 
-      - "**.dart"
-      - ".github/workflows/analyze.yml"
-
-jobs:
-  build:
-    name: "Static analysis & format check"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-          cache: true
-      - name: Install Flutter dependencies
-        run: flutter pub get
-      - name: Generate files with Builder
-        run: flutter packages pub run build_runner build --delete-conflicting-outputs
-      - name: Analyze code
-        uses: ValentinVignal/action-dart-analyze@v0.15
-        with:
-          fail-on: warning

.github/workflows/pr-build.yml

@@ -1,45 +1,121 @@
 name: PR Build
 
 on:
-  pull_request:
-    paths: 
-      - ".github/workflows/pr-build.yml"
-      - "android/**"
-      - "assets/**"
-      - "lib/**"
-      
+  workflow_dispatch:
+    inputs:
+      # Flutter
+      flutter-branch:
+        description: Flutter branch
+        type: choice
+        default: 'stable'
+        options: 
+          - stable
+          - beta
+          - dev
+          - master
+      flutter-cache:
+        description: Cache
+        type: boolean
+        default: true
+      # Application configuration
+      app-flavour:
+        description: App flavour
+        default: 'release'
+        type: choice
+        options: 
+          - release
+          - debug
+          - profile
+      # Pull Request
+      pr-number:
+        description: PR number (No hashtag)
+        required: true
+
+run-name: "Build PR ${{ inputs.pr-number }}"
+        
 jobs:
   build:
-    name: Build
+    name: Build the application
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
     steps:
+      - name: Setup
+        env: 
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh repo clone "${{ github.repository }}"
+          cd revanced-manager
+          gh repo set-default "${{ github.repository }}"
+          gh pr checkout "${{ inputs.pr-number }}"
+          
+          echo "DATETIME=$( TZ='UTC+0' date --rfc-email )" >> $GITHUB_ENV
+          echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+          
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
-          # Make sure the release step uses its own credentials:
-          # https://github.com/cycjimmy/semantic-release-action#private-packages
           persist-credentials: false
-          fetch-depth: 0
+          
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'zulu'
+          cache: gradle
+          
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
-          cache: true
+          channel: ${{ inputs.flutter-branch }}
+          cache: ${{ inputs.flutter-cache }}
+          
       - name: Install Flutter dependencies
         run: flutter pub get
+        
       - name: Generate files with Builder
-        run: flutter packages pub run build_runner build --delete-conflicting-outputs
+        run: dart run build_runner build --delete-conflicting-outputs 
+        
       - name: Build with Flutter
-        env:
+        continue-on-error: true
+        id: flutter-build
+        env: 
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: flutter build apk --debug
+        run: |
+          flutter build apk --"${{ inputs.app-flavour }}";
+          
+      - name: Prepare to comment
+        run: |
+          if [[ "${{ steps.flutter-build.outcome }}" == "success" ]]; then
+            echo "MESSAGE=✅ ReVanced Manager ${{ env.COMMIT_HASH }} build succeeded." >> $GITHUB_ENV
+          else
+            echo "MESSAGE=🚫 ReVanced Manager ${{ env.COMMIT_HASH }} build failed." >> $GITHUB_ENV
+          fi
+          
+      - name: "Comment to Pull Request #${{ inputs.pr-number }}"
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          GITHUB_TOKEN: ${{ github.token }}
+          pr_number: ${{ inputs.pr-number }}
+          mode: recreate
+          message: |
+            ## ⚒️ ReVanced PR Build workflow
+            
+            ${{ env.MESSAGE }}
+            
+            You can see more details in run [${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})!
+
+            ### ⚙️ Overview
+            - App flavor: ${{ inputs.app-flavour }}
+            - Branch: ${{ inputs.flutter-branch }}
+            - Start time: ${{ env.DATETIME }}
+
       - name: Upload build
         uses: actions/upload-artifact@v3
         with:
-          name: revanced-manager
-          path: build/app/outputs/flutter-apk/app-debug.apk
+          if-no-files-found: error
+          name: revanced-manager-(${{ env.COMMIT_HASH }}-${{ inputs.pr-number }}-${{ inputs.app-flavour }})-${{ inputs.flutter-branch }}
+          path: | 
+            build/app/outputs/flutter-apk/app-${{ inputs.app-flavour }}.apk
+            build/app/outputs/flutter-apk/app-${{ inputs.app-flavour }}.apk.sha1

.github/workflows/release-build.yml

@@ -1,50 +1,58 @@
 name: "Release Build"
 
 on:
+  workflow_dispatch:
   push:
-    tags:
-      - "v*"
+    branches:
+      - main
+      - dev
+    paths:
+      - ".github/workflows/release-build.yml"
+      - "android/**"
+      - "assets/**"
+      - "lib/**"
+      - ".releaserc.js"
+      - "pubspec.yaml"
 
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set env
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
-          java-version: "11"
+          java-version: "17"
           distribution: "zulu"
+
       - uses: subosito/flutter-action@v2
         with:
           channel: "stable"
+
+      - name: Cache Node modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            node_modules
+          key: npm-${{ hashFiles('package-lock.json') }}
+
+      - name: Setup semantic-release
+        run: npm install
+
       - name: Set up Flutter
         run: flutter pub get
+
       - name: Generate files with Builder
-        run: flutter packages pub run build_runner build --delete-conflicting-outputs
+        run: dart run build_runner build --delete-conflicting-outputs
+
       - name: Build with Flutter
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-          SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-          SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
-        run: flutter build apk
-      - name: Sign APK
-        id: sign_apk
-        uses: ilharp/sign-android-release@v1
-        with:
-          releaseDir: build/app/outputs/apk/release
-          signingKey: ${{ secrets.SIGNING_KEYSTORE }}
+          signingKey: "keystore.jks"
           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: Publish release APK
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          prerelease: false
-          files: revanced-manager-${{ env.RELEASE_VERSION }}.apk
+        run: |
+          echo "${{ secrets.SIGNING_KEYSTORE }}" | base64 --decode > android/app/keystore.jks
+          npx semantic-release

.gitignore

@@ -9,6 +9,7 @@
 .buildlog/
 .history
 .svn/
+local.properties
 
 # IntelliJ related
 *.iml
@@ -58,6 +59,7 @@ unlinked.ds
 unlinked_spec.ds
 
 # Android related
+.gradle/
 **/android/**/gradle-wrapper.jar
 **/android/.gradle
 **/android/captures/

.releaserc

@@ -1,75 +0,0 @@
-{
-  "branches": [
-    "main",
-    {
-      "name": "dev",
-      "prerelease": true
-    }
-  ],
-  "plugins": [
-    "semantic-release-export-data",
-    "@semantic-release/commit-analyzer",
-    [
-      "@semantic-release/release-notes-generator",
-      {
-        "presetConfig": {
-          "types": [
-            {
-              "type": "build",
-              "section": "Dependency Updates"
-            },
-            {
-              "type": "chore",
-              "section": "Other Changes",
-              "hidden": false
-            },
-            {
-              "type": "perf",
-              "section": "Performance Improvements",
-              "hidden": false
-            },
-            {
-              "type": "refactor",
-              "section": "Code Improvements",
-              "hidden": false
-            }
-          ]
-        }
-      }
-    ],
-    "@semantic-release/changelog",
-    "semantic-release-flutter-plugin",
-    [
-      "@semantic-release/git",
-      {
-        "assets": [
-          "CHANGELOG.md",
-          "pubspec.yaml"
-        ]
-      }
-    ],
-    [
-      "@semantic-release/github",
-      {
-        "assets": [
-          {
-            "path": "build/app/outputs/apk/release/revanced-manager-*.apk"
-          }
-        ],
-        "successComment": false
-      }
-    ],
-    [
-      "@saithodev/semantic-release-backmerge",
-      {
-        "backmergeBranches": [
-          {
-            "from": "main",
-            "to": "dev"
-          }
-        ],
-        "clearWorkspace": true
-      }
-    ]
-  ]
-}

.releaserc.js

@@ -0,0 +1,117 @@
+module.exports = {
+  "branches": [
+    "main",
+    {
+      "name": "dev",
+      "prerelease": true
+    }
+  ],
+  "plugins": [
+    [
+      "@semantic-release/commit-analyzer", {
+        "releaseRules": [
+          { "type": "build", "scope": "Needs bump", "release": "patch" }
+        ]
+      }
+    ],
+    "@semantic-release/changelog",
+    [
+      "@semantic-release/release-notes-generator",
+      {
+        preset: "conventionalcommits",
+        presetConfig: {
+          types: [
+            { type: "feat", section: "Features" },
+            { type: "fix", section: "Bug Fixes" },
+            { type: "docs", section: "Documentation" },
+            { type: "style", section: "Styles" },
+            { type: "refactor", section: "Code Refactoring" },
+            { type: "perf", section: "Performance Improvements" },
+            { type: "test", section: "Tests" },
+            { type: "build", section: "Build System" },
+            { type: "ci", section: "Continuous Integration" },
+            { type: "chore", section: "Chores" },
+            { type: "revert", section: "Reverts" },
+          ]
+        },
+        writerOpts: {
+          transform: (commit, context) => {
+            if (commit.author.name === "semantic-release-bot") return;
+            const types = {
+              feat: "Features",
+              fix: "Bug Fixes",
+              docs: "Documentation",
+              style: "Styles",
+              refactor: "Code Refactoring",
+              perf: "Performance Improvements",
+              test: "Tests",
+              build: "Build System",
+              ci: "Continuous Integration",
+              chore: "Chores",
+              revert: "Reverts",
+            }
+            commit.type = types[commit.type];
+            return commit;
+          },
+          commitPartial: "* {{#if scope}}**{{scope}}:** {{/if}}{{subject}} ([{{author.name}}]({{~@root.host}}/{{~@root.owner}}/{{~@root.repository}}/commit/{{hash}}))\n",
+          mainTemplate: `
+{{#each commitGroups}}
+{{#if title}}
+## {{title}}
+{{/if}}
+{{#each commits}}
+{{> commit root=@root}}
+{{/each}}
+{{/each}}
+          `
+        }
+      }
+    ],
+    [
+      "@droidsolutions-oss/semantic-release-update-file",
+      {
+        "files": [
+          {
+            "path": ["pubspec.yaml"],
+            "type": "flutter",
+            "branches": ["main", "dev"]
+          }
+        ]
+      }
+    ],
+    [
+      "@semantic-release/exec",
+      {
+        "prepareCmd": "flutter build apk"
+      }
+    ],
+    [
+      "@semantic-release/git",
+      {
+        "assets": [
+          "pubspec.yaml"
+        ]
+      }
+    ],
+    [
+      "@semantic-release/github",
+      {
+        "assets": [
+          {
+            "path": "build/app/outputs/apk/release/revanced-manager*.apk"
+          }
+        ],
+        "successComment": false
+      }
+    ],
+    [
+      "@saithodev/semantic-release-backmerge",
+      {
+        "backmergeBranches": [{"from": "main", "to": "dev"}],
+        "clearWorkspace": true
+      }
+    ]
+  ],
+
+
+};

.run/main.dart.run.xml

@@ -1,6 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="main.dart" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />
-    <method v="2" />
-  </configuration>
-</component>

CHANGELOG.md

@@ -1 +0,0 @@
-

CONTRIBUTING.md

@@ -0,0 +1,103 @@
+<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-round.svg" />
+           <img height="24px" src="assets/revanced-logo/revanced-logo-round.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>
+
+# 👋 Contribution guidelines
+
+This document describes how to contribute to ReVanced Manager.
+
+## 📖 Resources to help you get started
+
+* 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
+
+## 🙏 Submitting a feature request
+
+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-issue.yml&title=feat%3A+%3Ctitle%3E).
+
+> [!NOTE]
+> We may reject your request at the discretion of ReVanced Manager's maintainers,
+> please provide good motivation for a request to be accepted.
+
+## 🐞 Submitting a bug report
+
+If you encounter a bug while using the ReVanced Manager app, open an issue using the
+[bug report issue template](https://github.com/ReVanced/revanced-manager/issues/new?assignees=&labels=bug&projects=&template=bug-issue.yml&title=bug%3A+%3Ctitle%3E).
+
+## 📝 How to contribute
+
+> [!TIP]
+> We recommend that you discuss your changes with 
+> the maintainers of ReVanced Manager before contributing. 
+> This will help you determine whether your change is acceptable.
+
+1. Fork the repository and create a new branch based off the `dev` branch
+2. Commit your changes
+3. Open a pull request to the `dev` branch and reference issues that your pull request closes
+4. The maintainers of ReVanced Manager will review and provide suggestions. 
+   Once your pull request is approved and merged, it 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.

README.md

@@ -1,31 +1,97 @@
+<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-round.svg" />
+           <img height="24px" src="assets/revanced-logo/revanced-logo-round.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
 
-The official ReVanced Manager based on Flutter.
+[![GitHub last commit](https://img.shields.io/github/last-commit/ReVanced/revanced-manager)](https://github.com/ReVanced/revanced-manager/commits "")
+[![GitHub commit activity](https://img.shields.io/github/commit-activity/w/ReVanced/revanced-manager)](https://github.com/ReVanced/revanced-manager/commits "")
+
+ReVanced Manager is an Android application that uses ReVanced Patcher to add, remove, and modify existing functionalities in Android applications.
+
+## 💪 Features
+
+Some of the features we provide are:
+
+* 📱 **Portable**: ReVanced Patcher that fit in your pocket;
+* 🤗 **Intuitive UI**: Help you manage your patched applications with easy-to-use interface;
+* 🛠️ **Customization**: Patch with third-party sources;
+* ✨ And a **lot more!**
 
 ## 🔽 Download
-To download latest Manager, go [here](https://github.com/revanced/revanced-manager/releases/latest) and install the provided APK file.
 
-## 📝 Prerequisites
-1. Android 8 or higher
-2. Does not work on some armv7 devices
+You can get ReVanced Manager by downloading from [ReVanced site](https://revanced.app/download) or [GitHub releases](https://github.com/ReVanced/revanced-manager/releases).
 
-## 🔴 Issues
-For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose).
+## 📚 Everything else
 
-## 💭 Discussion
-If you wish to discuss the Manager, a thread has been made under the [#development](https://discord.com/channels/952946952348270622/1002922226443632761) channel in the Discord server, please note that this thread may be temporary and may be removed in the future.
+### 📄 Documentation
 
+Documentation on how to use the application is available [here](/docs/README.md).
 
-## 🌐 Translation
-[![Crowdin](https://badges.crowdin.net/revanced/localized.svg)](https://crowdin.com/project/revanced)
+### 👋 Contributing
 
-If you wish to translate ReVanced Manager, we're accepting translations on [Crowdin](https://translate.revanced.app)
+Thank you for considering contributing to ReVanced Manager, you can find the contribution guidelines [here](/CONTRIBUTING.md).
 
-## 🛠️ Building Manager from source
-1. Setup flutter environment for your [platform](https://docs.flutter.dev/get-started/install)
-2. Clone the repository locally
-3. Add your github token in gradle.properties like [this](/docs/4_building.md)
-4. Open the project in terminal
-5. Run `flutter pub get` in terminal
-6. Then `flutter packages pub run build_runner build --delete-conflicting-outputs` (Must be done on each git pull)
-7. To build release apk run `flutter build apk`
+### 🔴 Issues
+
+For suggestions and bug reports, open an issue [here](https://github.com/ReVanced/revanced-manager/issues/choose).
+
+## ⚖️ License
+
+ReVanced Manager adopts the [GNU General Public License 3.0](/LICENSE), [tl;dr](https://www.tldrlegal.com/license/gnu-general-public-license-v3-gpl-3): You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build & install instructions.

SECURITY.md

@@ -0,0 +1,77 @@
+<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-round.svg" />
+           <img height="24px" src="assets/revanced-logo/revanced-logo-round.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>
+
+# 🔒 Security Policy
+
+This document describes how to report security vulnerabilities for ReVanced Manager.
+
+## 🚨 Reporting a Vulnerability
+
+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).
+
+If a vulnerability is confirmed and accepted, you can join our [Discord](https://discord.gg/revanced) server to receive a special contributor role.
+
+### ⏳ Supported Versions
+
+| Version | Branch      | Supported          |
+| ------- | ------------|------------------- |
+| ![GitHub Release](https://img.shields.io/github/v/release/ReVanced/revanced-manager?style=for-the-badge) | main        | :white_check_mark: |
+| ![Static Badge](https://img.shields.io/badge/version-latest-brightgreen?style=for-the-badge) | dev         | :white_check_mark: |
+| ![Static Badge](https://img.shields.io/badge/version-latest-brightgreen?style=for-the-badge) | compose-dev | :white_check_mark: |

analysis_options.yaml

@@ -21,7 +21,6 @@ linter:
     - always_declare_return_types
     - require_trailing_commas
     - always_put_control_body_on_new_line
-    - always_require_non_null_named_parameters
     - always_use_package_imports # we do this commonly
     - annotate_overrides
     - avoid_bool_literals_in_conditional_expressions
@@ -40,8 +39,6 @@ linter:
     - avoid_relative_lib_imports
     - avoid_renaming_method_parameters
     - avoid_return_types_on_setters
-    - avoid_returning_null
-    - avoid_returning_null_for_future
     - avoid_returning_null_for_void
     - avoid_setters_without_getters
     - avoid_shadowing_type_parameters
@@ -126,6 +123,7 @@ linter:
     - slash_for_doc_comments
     - sort_child_properties_last
     - sort_constructors_first
+    - sort_pub_dependencies
     - sort_unnamed_constructors_first
     - test_types_in_equals
     - throw_in_finally

android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,44 +22,55 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    compileSdk 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
-
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
-
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
-
     defaultConfig {
         applicationId "app.revanced.manager.flutter"
-        minSdkVersion 26
-        targetSdkVersion 33
+        minSdk 26
+        targetSdk 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
-
     buildTypes {
         release {
             shrinkResources false
             minifyEnabled false
-            resValue "string", "app_name", "ReVanced Manager"
-            signingConfig signingConfigs.debug
             ndk {
                 abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
             }
+            if (System.getenv("signingKey") != null) {
+                signingConfigs {
+                    create("release") {
+                        storeFile = file(System.getenv("signingKey"))
+                        storePassword = System.getenv("keyStorePassword")
+                        keyAlias = System.getenv("keyAlias")
+                        keyPassword = System.getenv("keyPassword")
+                    }
+                }
+                signingConfig = signingConfigs.release
+                resValue "string", "app_name", "ReVanced Manager"
+                applicationVariants.all { variant ->
+                    variant.outputs.all {
+                        outputFileName = "revanced-manager-v${flutterVersionName}.apk"
+                    }
+                }
+            } else {
+                signingConfig = signingConfigs.debug
+                resValue "string", "app_name", "ReVanced Manager Debug"
+                applicationIdSuffix ".debug"
+            }
         }
         debug {
             shrinkResources false
@@ -70,11 +82,32 @@ android {
                 abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
             }
         }
+        profile {
+            shrinkResources false
+            minifyEnabled false
+            resValue "string", "app_name", "ReVanced Manager Profile"
+            applicationIdSuffix ".profile"
+            signingConfig signingConfigs.debug
+            ndk {
+                abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
+            }
+        }
+    }
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging true
+            excludes += ['/prebuilt/**']
+        }
+        resources {
+            excludes += ['/prebuilt/**']
+        }
     }
 
-    packagingOptions {
-        exclude '/prebuilt/**'
-    }
+    namespace 'app.revanced.manager.flutter'
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 flutter {
@@ -85,7 +118,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // ReVanced
-    implementation "app.revanced:revanced-patcher:14.1.0"
+    implementation "app.revanced:revanced-patcher:19.1.0"
 
     // Signing & aligning
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")

android/app/src/debug/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="app.revanced.manager.flutter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -1,8 +1,7 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="app.revanced.manager.flutter">
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
-
+    <uses-permission android:name="android.permission.VIBRATE" />
+    
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
@@ -24,9 +23,7 @@
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:largeHeap="true"
-        android:requestLegacyExternalStorage="true"
-        android:extractNativeLibs="true"
-        android:enableOnBackInvokedCallback="true">
+        android:requestLegacyExternalStorage="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -36,13 +33,17 @@
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"/>
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ExportSettingsActivity"
+            android:exported="true">
+        </activity>
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
@@ -55,5 +56,22 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
         </provider>
+
+        <receiver
+            android:name=".utils.packageInstaller.InstallerReceiver"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="APP_INSTALL_ACTION" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name=".utils.packageInstaller.UninstallerReceiver"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="APP_UNINSTALL_ACTION" />
+            </intent-filter>
+        </receiver>
     </application>
 </manifest>

android/app/src/main/kotlin/app/revanced/manager/flutter/ExportSettingsActivity.kt

@@ -0,0 +1,83 @@
+package app.revanced.manager.flutter
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.util.Base64
+import org.json.JSONObject
+import java.io.ByteArrayInputStream
+import java.io.File
+import java.security.cert.CertificateFactory
+import java.security.cert.X509Certificate
+import java.security.MessageDigest
+
+class ExportSettingsActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val callingPackageName = getCallingPackage()!!
+
+        if (getFingerprint(callingPackageName) == getFingerprint(getPackageName())) {
+            // Create JSON Object
+            val json = JSONObject()
+
+            // Default Data
+            json.put("keystorePassword", "s3cur3p@ssw0rd")
+
+            // Load Shared Preferences
+            val sharedPreferences = getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE)
+            val allEntries: Map<String, *> = sharedPreferences.getAll()
+            for ((key, value) in allEntries.entries) {
+                json.put(key.replace("flutter.", ""), value)
+            }
+
+            // Load keystore
+            val keystoreFile = File(getExternalFilesDir(null), "/revanced-manager.keystore")
+            if (keystoreFile.exists()) {
+                val keystoreBytes = keystoreFile.readBytes()
+                val keystoreBase64 = Base64.encodeToString(keystoreBytes, Base64.DEFAULT)
+                json.put("keystore", keystoreBase64)
+            }
+
+            // Load saved patches
+            val storedPatchesFile = File(filesDir.parentFile.absolutePath, "/app_flutter/selected-patches.json")
+            if (storedPatchesFile.exists()) {
+                val patchesBytes = storedPatchesFile.readBytes()
+                val patches = String(patchesBytes, Charsets.UTF_8)
+                json.put("patches", JSONObject(patches))
+            }
+
+            // Send data back
+            val resultIntent = Intent()
+            resultIntent.putExtra("data", json.toString())
+            setResult(Activity.RESULT_OK, resultIntent)
+            finish()
+        } else {
+            val resultIntent = Intent()
+            setResult(Activity.RESULT_CANCELED)
+            finish()
+        }
+    }
+
+    fun getFingerprint(packageName: String): String {
+        // Get the signature of the app that matches the package name
+        val packageInfo = packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES)
+        val signature = packageInfo.signatures[0]
+
+        // Get the raw certificate data
+        val rawCert = signature.toByteArray()
+
+        // Generate an X509Certificate from the data
+        val certFactory = CertificateFactory.getInstance("X509")
+        val x509Cert = certFactory.generateCertificate(ByteArrayInputStream(rawCert)) as X509Certificate
+
+        // Get the SHA256 fingerprint
+        val fingerprint = MessageDigest.getInstance("SHA256").digest(x509Cert.encoded).joinToString("") {
+            "%02x".format(it)
+        }
+
+        return fingerprint
+    }
+}

android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt

@@ -1,33 +1,39 @@
 package app.revanced.manager.flutter
 
+import android.app.PendingIntent
+import android.app.SearchManager
+import android.content.Intent
+import android.content.pm.PackageInstaller
+import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import app.revanced.manager.flutter.utils.Aapt
 import app.revanced.manager.flutter.utils.aligning.ZipAligner
+import app.revanced.manager.flutter.utils.packageInstaller.InstallerReceiver
+import app.revanced.manager.flutter.utils.packageInstaller.UninstallerReceiver
 import app.revanced.manager.flutter.utils.signing.Signer
 import app.revanced.manager.flutter.utils.zip.ZipFile
 import app.revanced.manager.flutter.utils.zip.structures.ZipEntry
 import app.revanced.patcher.PatchBundleLoader
+import app.revanced.patcher.PatchSet
 import app.revanced.patcher.Patcher
 import app.revanced.patcher.PatcherOptions
-import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
-import app.revanced.patcher.extensions.PatchExtensions.patchName
 import app.revanced.patcher.patch.PatchResult
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
+import kotlinx.coroutines.InternalCoroutinesApi
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.runBlocking
+import org.json.JSONArray
+import org.json.JSONObject
 import java.io.File
 import java.io.PrintWriter
 import java.io.StringWriter
-import java.util.logging.Level
 import java.util.logging.LogRecord
 import java.util.logging.Logger
-import java.util.logging.SimpleFormatter
 
-private const val PATCHER_CHANNEL = "app.revanced.manager.flutter/patcher"
-private const val INSTALLER_CHANNEL = "app.revanced.manager.flutter/installer"
 
 class MainActivity : FlutterActivity() {
     private val handler = Handler(Looper.getMainLooper())
@@ -35,32 +41,53 @@ class MainActivity : FlutterActivity() {
     private var cancel: Boolean = false
     private var stopResult: MethodChannel.Result? = null
 
+    private lateinit var patches: PatchSet
+
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
-        val mainChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, PATCHER_CHANNEL)
-        installerChannel =
-            MethodChannel(flutterEngine.dartExecutor.binaryMessenger, INSTALLER_CHANNEL)
+
+        val patcherChannel = "app.revanced.manager.flutter/patcher"
+        val installerChannel = "app.revanced.manager.flutter/installer"
+        val openBrowserChannel = "app.revanced.manager.flutter/browser"
+
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, openBrowserChannel).setMethodCallHandler { call, result ->
+            if (call.method == "openBrowser") {
+                val searchQuery = call.argument<String>("query")
+                openBrowser(searchQuery)
+                result.success(null)
+            } else {
+                result.notImplemented()
+            }
+        }
+
+        val mainChannel =
+            MethodChannel(flutterEngine.dartExecutor.binaryMessenger, patcherChannel)
+
+        this.installerChannel =
+            MethodChannel(flutterEngine.dartExecutor.binaryMessenger, installerChannel)
+
         mainChannel.setMethodCallHandler { call, result ->
             when (call.method) {
                 "runPatcher" -> {
-                    val patchBundleFilePath = call.argument<String>("patchBundleFilePath")
                     val originalFilePath = call.argument<String>("originalFilePath")
                     val inputFilePath = call.argument<String>("inputFilePath")
                     val patchedFilePath = call.argument<String>("patchedFilePath")
                     val outFilePath = call.argument<String>("outFilePath")
                     val integrationsPath = call.argument<String>("integrationsPath")
                     val selectedPatches = call.argument<List<String>>("selectedPatches")
+                    val options = call.argument<Map<String, Map<String, Any>>>("options")
                     val cacheDirPath = call.argument<String>("cacheDirPath")
                     val keyStoreFilePath = call.argument<String>("keyStoreFilePath")
                     val keystorePassword = call.argument<String>("keystorePassword")
 
-                    if (patchBundleFilePath != null &&
+                    if (
                         originalFilePath != null &&
                         inputFilePath != null &&
                         patchedFilePath != null &&
                         outFilePath != null &&
                         integrationsPath != null &&
                         selectedPatches != null &&
+                        options != null &&
                         cacheDirPath != null &&
                         keyStoreFilePath != null &&
                         keystorePassword != null
@@ -68,20 +95,18 @@ class MainActivity : FlutterActivity() {
                         cancel = false
                         runPatcher(
                             result,
-                            patchBundleFilePath,
                             originalFilePath,
                             inputFilePath,
                             patchedFilePath,
                             outFilePath,
                             integrationsPath,
                             selectedPatches,
+                            options,
                             cacheDirPath,
                             keyStoreFilePath,
                             keystorePassword
                         )
-                    } else {
-                        result.notImplemented()
-                    }
+                    } else result.notImplemented()
                 }
 
                 "stopPatcher" -> {
@@ -89,20 +114,117 @@ class MainActivity : FlutterActivity() {
                     stopResult = result
                 }
 
+                "getPatches" -> {
+                    val patchBundleFilePath = call.argument<String>("patchBundleFilePath")!!
+                    val cacheDirPath = call.argument<String>("cacheDirPath")!!
+
+                    try {
+                        val patchBundleFile = File(patchBundleFilePath)
+                        patchBundleFile.setWritable(false)
+                        patches = PatchBundleLoader.Dex(
+                            patchBundleFile,
+                            optimizedDexDirectory = File(cacheDirPath)
+                        )
+                    } catch (ex: Exception) {
+                        return@setMethodCallHandler result.notImplemented()
+                    } catch (err: Error) {
+                        return@setMethodCallHandler result.notImplemented()
+                    }
+
+                    JSONArray().apply {
+                        patches.forEach {
+                            JSONObject().apply {
+                                put("name", it.name)
+                                put("description", it.description)
+                                put("excluded", !it.use)
+                                put("compatiblePackages", JSONArray().apply {
+                                    it.compatiblePackages?.forEach { compatiblePackage ->
+                                        val compatiblePackageJson = JSONObject().apply {
+                                            put("name", compatiblePackage.name)
+                                            put(
+                                                "versions",
+                                                JSONArray().apply {
+                                                    compatiblePackage.versions?.forEach { version ->
+                                                        put(version)
+                                                    }
+                                                })
+                                        }
+                                        put(compatiblePackageJson)
+                                    }
+                                })
+                                put("options", JSONArray().apply {
+                                    it.options.values.forEach { option ->
+                                        JSONObject().apply {
+                                            put("key", option.key)
+                                            put("title", option.title)
+                                            put("description", option.description)
+                                            put("required", option.required)
+
+                                            fun JSONObject.putValue(
+                                                value: Any?,
+                                                key: String = "value"
+                                            ) = if (value is Array<*>) put(
+                                                key,
+                                                JSONArray().apply {
+                                                    value.forEach { put(it) }
+                                                })
+                                            else put(key, value)
+
+                                            putValue(option.default)
+
+                                            option.values?.let { values ->
+                                                put("values",
+                                                    JSONObject().apply {
+                                                        values.forEach { (key, value) ->
+                                                            putValue(value, key)
+                                                        }
+                                                    })
+                                            } ?: put("values", null)
+                                            put("valueType", option.valueType)
+                                        }.let(::put)
+                                    }
+                                })
+                            }.let(::put)
+                        }
+                    }.toString().let(result::success)
+                }
+
+                "installApk" -> {
+                    val apkPath = call.argument<String>("apkPath")!!
+                    PackageInstallerManager.result = result
+                    installApk(apkPath)
+                }
+
+                "uninstallApp" -> {
+                    val packageName = call.argument<String>("packageName")!!
+                    uninstallApp(packageName)
+                    PackageInstallerManager.result = result
+                }
+
                 else -> result.notImplemented()
             }
         }
     }
 
+    private fun openBrowser(query: String?) {
+        val intent = Intent(Intent.ACTION_WEB_SEARCH).apply {
+            putExtra(SearchManager.QUERY, query)
+        }
+        if (intent.resolveActivity(packageManager) != null) {
+            startActivity(intent)
+        }
+    }
+    
+    @OptIn(InternalCoroutinesApi::class)
     private fun runPatcher(
         result: MethodChannel.Result,
-        patchBundleFilePath: String,
         originalFilePath: String,
         inputFilePath: String,
         patchedFilePath: String,
         outFilePath: String,
         integrationsPath: String,
         selectedPatches: List<String>,
+        options: Map<String, Map<String, Any>>,
         cacheDirPath: String,
         keyStoreFilePath: String,
         keystorePassword: String
@@ -116,175 +238,143 @@ class MainActivity : FlutterActivity() {
         val cacheDir = File(cacheDirPath)
 
         Thread {
-            try {
-                Logger.getLogger("").apply {
-                    handlers.forEach {
-                        it.close()
-                        removeHandler(it)
-                    }
-                    object : java.util.logging.Handler() {
-                        override fun publish(record: LogRecord) = formatter.format(record).toByteArray().let {
-                            if (record.level.intValue() > Level.INFO.intValue())
-                                System.err.write(it)
-                            else
-                                System.out.write(it)
-                        }
-
-                        override fun flush() {
-                            System.out.flush()
-                            System.err.flush()
-                        }
-
-                        override fun close() = flush()
-                    }.also {
-                        it.level = Level.ALL
-                        it.formatter = SimpleFormatter()
-                    }.let(::addHandler)
-                }
+            fun updateProgress(progress: Double, header: String, log: String) {
                 handler.post {
                     installerChannel.invokeMethod(
                         "update",
                         mapOf(
-                            "progress" to 0.1,
-                            "header" to "",
-                            "log" to "Copying original APK"
+                            "progress" to progress,
+                            "header" to header,
+                            "log" to log
                         )
                     )
                 }
+            }
+
+            fun postStop() = handler.post { stopResult!!.success(null) }
+
+            // Setup logger
+            Logger.getLogger("").apply {
+                handlers.forEach {
+                    it.close()
+                    removeHandler(it)
+                }
+
+                object : java.util.logging.Handler() {
+                    override fun publish(record: LogRecord) {
+                        if (record.loggerName?.startsWith("app.revanced") != true || cancel) return
+
+                        updateProgress(-1.0, "", record.message)
+                    }
+
+                    override fun flush() = Unit
+                    override fun close() = flush()
+                }.let(::addHandler)
+            }
+
+            try {
+                updateProgress(0.0, "", "Copying APK")
 
                 if (cancel) {
-                    handler.post { stopResult!!.success(null) }
+                    postStop()
                     return@Thread
                 }
 
                 originalFile.copyTo(inputFile, true)
 
                 if (cancel) {
-                    handler.post { stopResult!!.success(null) }
+                    postStop()
                     return@Thread
                 }
 
-                handler.post {
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf(
-                            "progress" to 0.2,
-                            "header" to "Reading APK...",
-                            "log" to "Reading input APK"
-                        )
-                    )
-                }
+                updateProgress(0.05, "Reading APK...", "Reading APK")
 
-                val patcher =
-                    Patcher(
-                        PatcherOptions(
-                            inputFile,
-                            cacheDir,
-                            Aapt.binary(applicationContext).absolutePath,
-                            cacheDir.path,
-                        )
+                val patcher = Patcher(
+                    PatcherOptions(
+                        inputFile,
+                        cacheDir,
+                        Aapt.binary(applicationContext).absolutePath,
+                        cacheDir.path,
+                        true // TODO: Add option to disable this
                     )
+                )
 
                 if (cancel) {
-                    handler.post { stopResult!!.success(null) }
+                    postStop()
                     return@Thread
                 }
 
-                handler.post {
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf("progress" to 0.3, "header" to "Loading patches...", "log" to "Loading patches")
-                    )
-                }
+                updateProgress(0.1, "Loading patches...", "Loading patches")
 
-                val patches =
-                    PatchBundleLoader.Dex(
-                        File(patchBundleFilePath)
-                    ).filter { patch ->
-                        (patch.compatiblePackages?.any { it.name == patcher.context.packageMetadata.packageName } == true || patch.compatiblePackages.isNullOrEmpty()) &&
-                                selectedPatches.any { it == patch.patchName }
+                val patches = patches.filter { patch ->
+                    val isCompatible = patch.compatiblePackages?.any {
+                        it.name == patcher.context.packageMetadata.packageName
+                    } ?: false
+
+                    val compatibleOrUniversal =
+                        isCompatible || patch.compatiblePackages.isNullOrEmpty()
+
+                    compatibleOrUniversal && selectedPatches.any { it == patch.name }
+                }.onEach { patch ->
+                    options[patch.name]?.forEach { (key, value) ->
+                        patch.options[key] = value
                     }
+                }
 
                 if (cancel) {
-                    handler.post { stopResult!!.success(null) }
+                    postStop()
                     return@Thread
                 }
 
-                handler.post {
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf(
-                            "progress" to 0.5,
-                            "header" to "Executing patches...",
-                            "log" to ""
-                        )
-                    )
-                }
+                updateProgress(0.15, "Executing...", "")
+
+                // Update the progress bar every time a patch is executed from 0.15 to 0.7
+                val totalPatchesCount = patches.size
+                val progressStep = 0.55 / totalPatchesCount
+                var progress = 0.15
 
                 patcher.apply {
                     acceptIntegrations(listOf(integrations))
                     acceptPatches(patches)
 
                     runBlocking {
-                        apply(false).collect { patchResult: PatchResult ->
-                            patchResult.exception?.let {
-                                if (cancel) {
-                                    handler.post { stopResult!!.success(null) }
-                                    this.cancel()
-                                    return@collect
-                                }
-                                StringWriter().use { writer ->
-                                    it.printStackTrace(PrintWriter(writer))
-                                    handler.post {
-                                        installerChannel.invokeMethod(
-                                            "update",
-                                            mapOf("progress" to 0.5, "header" to "", "log" to "${patchResult.patchName} failed: $writer")
-                                        )
-                                    }
-                                }
-                            } ?: run {
-                                if (cancel) {
-                                    handler.post { stopResult!!.success(null) }
-                                    this.cancel()
-                                    return@collect
-                                }
-                                val msg = "${patchResult.patchName} succeeded"
-                                handler.post {
-                                    installerChannel.invokeMethod(
-                                        "update",
-                                        mapOf(
-                                            "progress" to 0.5,
-                                            "header" to "",
-                                            "log" to msg
-                                        )
-                                    )
-                                }
+                        apply(false).collect(FlowCollector { patchResult: PatchResult ->
+                            if (cancel) {
+                                handler.post { stopResult!!.success(null) }
+                                this.cancel()
+                                this@apply.close()
+                                return@FlowCollector
                             }
-                        }
+
+                            val msg = patchResult.exception?.let {
+                                val writer = StringWriter()
+                                it.printStackTrace(PrintWriter(writer))
+                                "${patchResult.patch.name} failed: $writer"
+                            } ?: run {
+                                "${patchResult.patch.name} succeeded"
+                            }
+
+                            updateProgress(progress, "", msg)
+                            progress += progressStep
+                        })
                     }
                 }
 
                 if (cancel) {
-                    handler.post { stopResult!!.success(null) }
+                    postStop()
+                    patcher.close()
                     return@Thread
                 }
 
-                handler.post {
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf(
-                            "progress" to 0.7,
-                            "header" to "Repacking APK...",
-                            "log" to ""
-                        )
-                    )
-                }
+                updateProgress(0.75, "Building...", "")
+
                 val res = patcher.get()
                 patcher.close()
+
                 ZipFile(patchedFile).use { file ->
                     res.dexFiles.forEach {
                         if (cancel) {
-                            handler.post { stopResult!!.success(null) }
+                            postStop()
                             return@Thread
                         }
                         file.addEntryCompressData(
@@ -303,92 +393,69 @@ class MainActivity : FlutterActivity() {
                         ZipAligner::getEntryAlignment
                     )
                 }
+
                 if (cancel) {
-                    handler.post { stopResult!!.success(null) }
+                    postStop()
                     return@Thread
                 }
-                handler.post {
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf(
-                            "progress" to 0.9,
-                            "header" to "Signing APK...",
-                            "log" to ""
-                        )
-                    )
-                }
 
-                try {
-                    Signer("ReVanced", keystorePassword).signApk(
-                        patchedFile,
-                        outFile,
-                        keyStoreFile
-                    )
-                } catch (e: Exception) {
-                    //log to console
-                    print("Error signing APK: ${e.message}")
-                    e.printStackTrace()
-                }
+                updateProgress(0.8, "Signing...", "Signing APK")
 
-                handler.post {
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf(
-                            "progress" to 1.0,
-                            "header" to "Finished!",
-                            "log" to "Finished!"
-                        )
-                    )
-                }
+                Signer("ReVanced", keystorePassword).signApk(patchedFile, outFile, keyStoreFile)
+
+                updateProgress(.85, "Patched", "Patched APK")
             } catch (ex: Throwable) {
                 if (!cancel) {
                     val stack = ex.stackTraceToString()
-                    handler.post {
-                        installerChannel.invokeMethod(
-                            "update",
-                            mapOf(
-                                "progress" to -100.0,
-                                "header" to "Aborted...",
-                                "log" to "An error occurred! Aborted\nError:\n$stack"
-                            )
-                        )
-                    }
+                    updateProgress(
+                        -100.0,
+                        "Failed",
+                        "An error occurred:\n$stack"
+                    )
                 }
             }
+
             handler.post { result.success(null) }
         }.start()
     }
 
-//    inner class ManagerLogger : Logger {
-//        override fun error(msg: String) {
-//            handler.post {
-//                installerChannel
-//                    .invokeMethod(
-//                        "update",
-//                        mapOf("progress" to -1.0, "header" to "", "log" to msg)
-//                    )
-//            }
-//        }
-//
-//        override fun warn(msg: String) {
-//            handler.post {
-//                installerChannel.invokeMethod(
-//                    "update",
-//                    mapOf("progress" to -1.0, "header" to "", "log" to msg)
-//                )
-//            }
-//        }
-//
-//        override fun info(msg: String) {
-//            handler.post {
-//                installerChannel.invokeMethod(
-//                    "update",
-//                    mapOf("progress" to -1.0, "header" to "", "log" to msg)
-//                )
-//            }
-//        }
-//
-//        override fun trace(_msg: String) { /* unused */
-//        }
-//    }
+    private fun installApk(apkPath: String) {
+        val packageInstaller: PackageInstaller = applicationContext.packageManager.packageInstaller
+        val sessionParams = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL)
+        val sessionId: Int = packageInstaller.createSession(sessionParams)
+        val session: PackageInstaller.Session = packageInstaller.openSession(sessionId)
+        session.use { activeSession ->
+            val sessionOutputStream = activeSession.openWrite(applicationContext.packageName, 0, -1)
+            sessionOutputStream.use { outputStream ->
+                val apkFile = File(apkPath)
+                apkFile.inputStream().use { inputStream ->
+                    inputStream.copyTo(outputStream)
+                }
+            }
+        }
+        val receiverIntent = Intent(applicationContext, InstallerReceiver::class.java).apply {
+            action = "APP_INSTALL_ACTION"
+        }
+        val receiverPendingIntent = PendingIntent.getBroadcast(context, sessionId, receiverIntent, PackageInstallerManager.flags)
+        session.commit(receiverPendingIntent.intentSender)
+        session.close()
+    }
+
+    private fun uninstallApp(packageName: String) {
+        val packageInstaller: PackageInstaller = applicationContext.packageManager.packageInstaller
+        val receiverIntent = Intent(applicationContext, UninstallerReceiver::class.java).apply {
+            action = "APP_UNINSTALL_ACTION"
+        }
+        val receiverPendingIntent = PendingIntent.getBroadcast(context, 0, receiverIntent, PackageInstallerManager.flags)
+        packageInstaller.uninstall(packageName, receiverPendingIntent.intentSender)
+    }
+
+    object PackageInstallerManager {
+        var result: MethodChannel.Result? = null
+        val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        } else {
+            PendingIntent.FLAG_UPDATE_CURRENT
+        }
+    }
 }

android/app/src/main/kotlin/app/revanced/manager/flutter/utils/packageInstaller/InstallerReceiver.kt

@@ -0,0 +1,32 @@
+package app.revanced.manager.flutter.utils.packageInstaller
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageInstaller
+import app.revanced.manager.flutter.MainActivity
+
+class InstallerReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        when (val status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS, -1)) {
+            PackageInstaller.STATUS_PENDING_USER_ACTION -> {
+                val confirmationIntent = intent.getParcelableExtra<Intent>(Intent.EXTRA_INTENT)
+                if (confirmationIntent != null) {
+                    context.startActivity(confirmationIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+                }
+            }
+
+            else -> {
+                val packageName = intent.getStringExtra(PackageInstaller.EXTRA_PACKAGE_NAME)
+                val message = intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE)
+                val otherPackageName = intent.getStringExtra(PackageInstaller.EXTRA_OTHER_PACKAGE_NAME)
+                MainActivity.PackageInstallerManager.result!!.success(mapOf(
+                    "status" to status,
+                    "packageName" to packageName,
+                    "message" to message,
+                    "otherPackageName" to otherPackageName
+                ))
+            }
+        }
+    }
+}

android/app/src/main/kotlin/app/revanced/manager/flutter/utils/packageInstaller/UninstallerReceiver.kt

@@ -0,0 +1,24 @@
+package app.revanced.manager.flutter.utils.packageInstaller
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageInstaller
+import app.revanced.manager.flutter.MainActivity
+
+class UninstallerReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        when (val status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS, -1)) {
+            PackageInstaller.STATUS_PENDING_USER_ACTION -> {
+                val confirmationIntent = intent.getParcelableExtra<Intent>(Intent.EXTRA_INTENT)
+                if (confirmationIntent != null) {
+                    context.startActivity(confirmationIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+                }
+            }
+
+            else -> {
+                MainActivity.PackageInstallerManager.result!!.success(status)
+            }
+        }
+    }
+}

android/app/src/profile/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="app.revanced.manager.flutter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.9.0'
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -16,11 +16,7 @@ allprojects {
         google()
         mavenCentral()
         maven {
-            url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
-            credentials {
-                username = (project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")) as String
-                password = (project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")) as String
-            }
+            url 'https://jitpack.io'
         }
         mavenLocal()
     }
@@ -29,6 +25,8 @@ allprojects {
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
     project.evaluationDependsOn(':app')
 }
 

android/gradle.properties

@@ -4,3 +4,6 @@ org.gradle.daemon=true
 org.gradle.caching=true
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a01b6587e15fe7ed120a0ee299c25982a1eee045abd6a9dd5e216b2f628ef9ac
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/settings.gradle

@@ -1,11 +1,20 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    plugins {
+        id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+include ":app"
+
+apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"

assets/i18n/en_US.json

@@ -1,6 +1,7 @@
 {
     "okButton": "OK",
     "cancelButton": "Cancel",
+    "dismissButton": "Dismiss",
     "quitButton": "Quit",
     "updateButton": "Update",
     "enabledLabel": "Enabled",
@@ -10,9 +11,13 @@
     "yesButton": "Yes",
     "noButton": "No",
     "warning": "Warning",
+    "options": "Options",
     "notice": "Notice",
     "noShowAgain": "Don't show this again",
-    "new": "New",
+    "add": "Add",
+    "remove": "Remove",
+    "showChangelogButton": "Show changelog",
+    "showUpdateButton": "Show update",
     "navigationView": {
         "dashboardTab": "Dashboard",
         "patcherTab": "Patcher",
@@ -23,29 +28,35 @@
         "widgetTitle": "Dashboard",
 
         "updatesSubtitle": "Updates",
-        "patchedSubtitle": "Patched applications",
+        "patchedSubtitle": "Patched apps",
+        "changeLaterSubtitle": "You can change this in the settings at a later time.",
 
         "noUpdates": "No updates available",
 
         "WIP": "Work in progress...",
 
-        "noInstallations": "No patched applications installed",
+        "noInstallations": "No patched apps installed",
         "installUpdate": "Continue to install the update?",
 
-        "updateDialogTitle": "Update Manager",
-        "updatePatchesDialogTitle": "Update ReVanced Patches",
+        "updateSheetTitle": "Update ReVanced Manager",
+        "updateDialogTitle": "New update available",
+        "updatePatchesSheetTitle": "Update ReVanced Patches",
         "updateChangelogTitle": "Changelog",
 
-        "patchesConsentDialogText": "ReVanced Patches needs to be downloaded.",
-        "patchesConsentDialogText2": "This will connect you to {url}.",
-        "patchesConsentDialogText3": "Auto update?",
-        "patchesConsentDialogText3Sub": "You can change this in settings at a later time.",
+        "updateDialogText": "A new update is available for {file}.\n\nThe currently installed version is {version}.",
+
+        "downloadConsentDialogTitle": "Download necessary files?",
+        "downloadConsentDialogText": "ReVanced Manager needs to download necessary files to work properly.",
+        "downloadConsentDialogText2": "This will connect you to {url}.",
+
+        "checkUpdateDialogTitle": "Check for updates?",
+        "checkUpdateDialogText": "Do you want ReVanced Manager to check for updates automatically?",
 
         "notificationTitle": "Update downloaded",
         "notificationText": "Tap to install the update",
 
         "downloadingMessage": "Downloading update...",
-        "downloadedMessage": "Update downloaded!",
+        "downloadedMessage": "Update downloaded",
 
         "installingMessage": "Installing update...",
 
@@ -56,9 +67,7 @@
         "updatesDisabled": "Updating a patched app is currently disabled. Repatch the app again."
     },
     "applicationItem": {
-        "patchButton": "Patch",
-        "infoButton": "Info",
-        "changelogLabel": "Changelog"
+        "infoButton": "Info"
     },
     "latestCommitCard": {
         "loadingLabel": "Loading...",
@@ -71,22 +80,21 @@
         "widgetTitle": "Patcher",
         "patchButton": "Patch",
 
-        "patchDialogText": "You have selected a resource patch and a split APK installation has been detected, so patching errors may occur.\nAre you sure you want to proceed?",
-        "armv7WarningDialogText": "Patching on ARMv7 devices is not yet supported and might fail. Proceed anyways?",
-        "splitApkWarningDialogText": "Patching a split APK is not yet supported and might fail. Proceed anyways?",
-        "removedPatchesWarningDialogText": "The following patches have been removed since the last time you used them.\n\n{patches}\n\nProceed anyways?"
+        "armv7WarningDialogText": "Patching on ARMv7 devices is not yet supported and might fail. Continue anyways?",
+
+        "removedPatchesWarningDialogText": "The following patches have been removed since the last time you used them.\n\n{patches}\n\nContinue anyways?",
+        "requiredOptionDialogText" : "Some patch options have to be set."
     },
     "appSelectorCard": {
-        "widgetTitle": "Select an application",
-        "widgetTitleSelected": "Selected application",
-        "widgetSubtitle": "No application selected",
+        "widgetTitle": "Select an app",
+        "widgetTitleSelected": "Selected app",
+        "widgetSubtitle": "No app selected",
 
         "noAppsLabel": "No applications found",
-        "notInstalled":"App not installed",
 
         "currentVersion": "Current",
         "suggestedVersion": "Suggested",
-        "allVersions": "All versions"
+        "anyVersion": "Any version"
     },
     "patchSelectorCard": {
         "widgetTitle": "Select patches",
@@ -100,23 +108,27 @@
         "widgetSubtitle": "We are online!"
     },
     "appSelectorView": {
-        "viewTitle": "Select an application",
-        "searchBarHint": "Search applications",
+        "viewTitle": "Select an app",
+        "searchBarHint": "Search app",
 
         "storageButton": "Storage",
         "selectFromStorageButton": "Select from storage",
-        
+
         "errorMessage": "Unable to use selected application",
 
         "downloadToast": "Download function is not available yet",
 
+        "requireSuggestedAppVersionDialogText": "The version of the app you have selected does not match the suggested version which can lead to unexpected issues. Please use the suggested version.\n\nSelected version: {selected}\nSuggested version: {suggested}\n\nTo continue anyway, disable \"Require suggested app version\" in the settings.",
+
         "featureNotAvailable": "Feature not implemented",
-        "featureNotAvailableText": "This application is a split APK and cannot be selected. Unfortunately, this feature is only available for rooted users at the moment. However, you can still install the application by selecting its APK files from your device's storage instead"
+        "featureNotAvailableText": "This app is a split APK and can only be patched and installed reliably by mounting with root permissions. However, you can patch and install a full APK by selecting it from storage."
     },
     "patchesSelectorView": {
         "viewTitle": "Select patches",
         "searchBarHint": "Search patches",
         "universalPatches": "Universal patches",
+        "newPatches": "New patches",
+        "patches": "Patches",
 
         "doneButton": "Done",
 
@@ -126,46 +138,60 @@
         "none": "None",
         "noneTooltip": "Deselect all patches",
 
-        "loadPatchesSelection": "Load patches selection",
-        "noSavedPatches": "No saved patches for the selected app.\nPress Done to save current selection.",
+        "loadPatchesSelection": "Load patch selection",
+        "noSavedPatches": "No saved patch selection for the selected app.\nPress Done to save the current selection.",
         "noPatchesFound": "No patches found for the selected app",
+        "setRequiredOption": "Some patches require options to be set:\n\n{patches}\n\nPlease set them before continuing."
+    },
+    "patchOptionsView": {
+        "customValue": "Custom value",
+        "resetOptionsTooltip": "Reset patch options",
+        "viewTitle": "Patch options",
+        "saveOptions": "Save",
 
-        "selectAllPatchesWarningContent": "You are about to select all patches, that includes non-suggested patches and can cause unwanted behavior."
+        "addOptions": "Add options",
+        "deselectPatch": "Deselect patch",
+        "tooltip": "More input options",
+        "selectFilePath": "Select file path",
+        "selectFolder": "Select folder",
+        "selectOption": "Select option",
+
+        "requiredOption": "This option is required",
+        "unsupportedOption": "This option is not supported",
+        "requiredOptionNull": "The following options have to be set:\n\n{options}"
     },
     "patchItem": {
         "unsupportedDialogText": "Selecting this patch may result in patching errors.\n\nApp version: {packageVersion}\nSupported versions:\n{supportedVersions}",
-        "unsupportedPatchVersion": "Patch is not supported for this app version. Enable the experimental toggle in settings to proceed.",
+        "unsupportedPatchVersion": "Patch is not supported for this app version.",
+        "unsupportedRequiredOption": "This patch contains a required option that is not supported by this app",
 
-        "newPatchDialogText": "This is a new patch that has been added since the last time you have patched this app.",
-        "newPatch": "New patch",
-
-        "patchesChangeWarningDialogText": "It is recommended to use the default selection of patches because changing it may cause unexpected issues.\n\nIf you know what you are doing, you can enable \"Enable changing selection\" in the settings.",
+        "patchesChangeWarningDialogText": "It is recommended to use the default patch selection and options. Changing them may result in unexpected issues.\n\nYou'll need to turn on \"Allow changing patch selection\" in the settings before changing any patch selection.",
         "patchesChangeWarningDialogButton": "Use default selection"
     },
     "installerView": {
         "widgetTitle": "Installer",
         "installType": "Select install type",
-        "installTypeDescription": "Select the installation type to proceed with.",
+        "installTypeDescription": "Select the installation type to continue with.",
 
         "installButton": "Install",
-        "installRootType": "Root",
-        "installNonRootType": "Non-root",
-        "installRecommendedType": "Recommended",
+        "installRootType": "Mount",
+        "installNonRootType": "Regular",
+
+        "warning": "Disable auto updates for the patched app to avoid unexpected issues.",
 
         "pressBackAgain": "Press back again to cancel",
         "openButton": "Open",
         "shareButton": "Share file",
-        
+
         "notificationTitle": "ReVanced Manager is patching",
         "notificationText": "Tap to return to the installer",
 
         "exportApkButtonTooltip": "Export patched APK",
         "exportLogButtonTooltip": "Export log",
 
-        "installErrorDialogTitle": "Error",
-        "installErrorDialogText1": "Root install is not possible with the current patches selection.\nRepatch your app or choose non-root install.",
-        "installErrorDialogText2": "Non-root install is not possible with the current patches selection.\nRepatch your app or choose root install if you have your device rooted.",
-        "installErrorDialogText3": "Root install is not possible as the original APK was selected from storage.\nSelect an installed app or choose non-root install.",
+        "screenshotDetected": "A screenshot has been detected. If you are trying to share the log, please share a text copy instead.\n\nCopy log to clipboard?",
+        "copiedToClipboard": "Copied log to clipboard",
+
         "noExit": "Installer is still running, cannot exit..."
     },
     "settingsView": {
@@ -173,13 +199,14 @@
 
         "appearanceSectionTitle": "Appearance",
         "teamSectionTitle": "Team",
-        "infoSectionTitle": "Info",
+        "debugSectionTitle": "Debugging",
         "advancedSectionTitle": "Advanced",
         "exportSectionTitle": "Import & export",
-        "logsSectionTitle": "Logs",
 
-        "darkThemeLabel": "Dark mode",
-        "darkThemeHint": "Welcome to the dark side",
+        "themeModeLabel": "App theme",
+        "systemThemeLabel": "System",
+        "lightThemeLabel": "Light",
+        "darkThemeLabel": "Dark",
 
         "dynamicThemeLabel": "Material You",
         "dynamicThemeHint": "Enjoy an experience closer to your device",
@@ -188,39 +215,45 @@
         "englishOption": "English",
 
         "sourcesLabel": "Sources",
-        "sourcesLabelHint": "Configure your custom sources",
+        "sourcesLabelHint": "Configure the source of patches and integrations",
         "sourcesIntegrationsLabel": "Integrations source",
         "sourcesResetDialogTitle": "Reset",
-        "sourcesResetDialogText": "Are you sure you want to reset custom sources to their default values?",
-        "apiURLResetDialogText": "Are you sure you want to reset API URL to its default value?",
-        "sourcesUpdateNote": "Note: ReVanced Patches will be updated to the latest version automatically.\n\nThis will reveal your IP address to the server.",
+        "sourcesResetDialogText": "Are you sure you want to reset your sources to their default values?",
+        "apiURLResetDialogText": "Are you sure you want to reset your API URL to its default value?",
+        "sourcesUpdateNote": "Note: Patches will be updated to the latest version automatically.\n\nThis will reveal your IP address to the server.",
 
         "apiURLLabel": "API URL",
-        "apiURLHint": "Configure your custom API URL",
+        "apiURLHint": "Configure the URL of the API to use",
         "selectApiURL": "API URL",
         "hostRepositoryLabel": "Repository API",
         "orgPatchesLabel": "Patches organization",
         "sourcesPatchesLabel": "Patches source",
         "orgIntegrationsLabel": "Integrations organization",
-        
+
         "contributorsLabel": "Contributors",
         "contributorsHint": "A list of contributors of ReVanced",
 
-        "logsLabel": "Logs",
-        "logsHint": "Share Manager's logs",
+        "logsLabel": "Share logs",
+        "logsHint": "Share ReVanced Manager logs",
 
-        "enablePatchesSelectionLabel": "Enable changing selection",
-        "enablePatchesSelectionHint": "Enable changing the selection of patches.",
-        "enablePatchesSelectionWarningText": "Changing the default selection of patches may cause unexpected issues.\n\nEnable anyways?",
+        "enablePatchesSelectionLabel": "Allow changing patch selection",
+        "enablePatchesSelectionHint": "Do not prevent selecting or deselecting patches",
+        "enablePatchesSelectionWarningText": "Changing the selection of patches may cause unexpected issues.\n\nEnable anyways?",
         "disablePatchesSelectionWarningText": "You are about to disable changing the selection of patches.\nThe default selection of patches will be restored.\n\nDisable anyways?",
 
         "autoUpdatePatchesLabel": "Auto update patches",
-        "autoUpdatePatchesHint": "Automatically update ReVanced Patches to the latest version",
-        "experimentalUniversalPatchesLabel": "Experimental universal patches support",
-        "experimentalUniversalPatchesHint": "Display all applications to use with universal patches, loading list of apps may be slower",
-        "experimentalPatchesLabel": "Experimental patches support",
-        "experimentalPatchesHint": "Enable usage of unsupported patches in any app version",
-        "enabledExperimentalPatches": "Experimental patches support enabled",
+        "autoUpdatePatchesHint": "Automatically update patches to the latest version",
+        "showUpdateDialogLabel": "Show update dialog",
+        "showUpdateDialogHint": "Show a dialog when a new update is available",
+        "universalPatchesLabel": "Show universal patches",
+        "universalPatchesHint": "Display all apps and universal patches (may slow down the app list)",
+
+        "versionCompatibilityCheckLabel": "Version compatibility check",
+        "versionCompatibilityCheckHint": "Prevent selecting patches that are not compatible with the selected app version",
+
+        "requireSuggestedAppVersionLabel": "Require suggested app version",
+        "requireSuggestedAppVersionHint": "Prevent selecting an app with a version that is not the suggested",
+        "requireSuggestedAppVersionDialogText": "Selecting an app that is not the suggested version may cause unexpected issues.\n\nDo you want to proceed anyways?",
 
         "aboutLabel": "About",
         "snackbarMessage": "Copied to clipboard",
@@ -230,69 +263,74 @@
         "deleteTempDirHint": "Delete unused temporary files",
         "deletedTempDir": "Temporary files deleted",
 
-        "exportPatchesLabel": "Export patches selection",
-        "exportPatchesHint": "Export patches selection to a JSON file",
-        "exportedPatches": "Patches selection exported",
-        "noExportFileFound": "No patches selection to export",
+        "exportPatchesLabel": "Export patch selection",
+        "exportPatchesHint": "Export patch selection to a JSON file",
+        "exportedPatches": "Patch selection exported",
+        "noExportFileFound": "No patch selection to export",
 
-        "importPatchesLabel": "Import patches selection",
-        "importPatchesHint": "Import patches selection from a JSON file",
-        "importedPatches": "Patches selection imported",
+        "importPatchesLabel": "Import patch selection",
+        "importPatchesHint": "Import patch selection from a JSON file",
+        "importedPatches": "Patch selection imported",
 
-        "resetStoredPatchesLabel": "Reset patches",
-        "resetStoredPatchesHint": "Reset the stored patches selection",
+        "resetStoredPatchesLabel": "Reset patch selection",
+        "resetStoredPatchesHint": "Reset the stored patch selection",
+        "resetStoredPatchesDialogTitle": "Reset patch selection?",
+        "resetStoredPatchesDialogText": "The default selection of patches will be restored.",
+        "resetStoredPatches": "Patch selection has been reset",
 
-        "resetStoredPatchesDialogTitle": "Reset patches selection?",
-        "resetStoredPatchesDialogText": "Resetting patches selection will remove all selected patches.",
-        "resetStoredPatches": "Patches selection has been reset",
+        "resetStoredOptionsLabel": "Reset patch options",
+        "resetStoredOptionsHint": "Reset all patch options",
+        "resetStoredOptionsDialogTitle": "Reset patch options?",
+        "resetStoredOptionsDialogText": "Resetting patch options will remove all saved options.",
+        "resetStoredOptions": "Options have been reset",
 
-        "deleteLogsLabel": "Delete logs",
-        "deleteLogsHint": "Delete collected manager logs",
+        "deleteLogsLabel": "Clear logs",
+        "deleteLogsHint": "Delete collected ReVanced Manager logs",
         "deletedLogs": "Logs deleted",
 
         "regenerateKeystoreLabel": "Regenerate keystore",
-        "regenerateKeystoreHint": "Regenerate the keystore used to sign the app",
+        "regenerateKeystoreHint": "Regenerate the keystore used to sign apps",
 
         "regenerateKeystoreDialogTitle": "Regenerate keystore?",
-        "regenerateKeystoreDialogText": "Patched apps signed with the old keystore will no longer be able to update.",
+        "regenerateKeystoreDialogText": "Patched apps signed with the old keystore will no longer be able to be updated.",
         "regeneratedKeystore": "Keystore regenerated",
 
         "exportKeystoreLabel": "Export keystore",
-        "exportKeystoreHint": "Export keystore used to sign apps",
+        "exportKeystoreHint": "Export the keystore used to sign apps",
         "exportedKeystore": "Keystore exported",
         "noKeystoreExportFileFound": "No keystore to export",
 
         "importKeystoreLabel": "Import keystore",
-        "importKeystoreHint": "Import keystore used to sign apps",
+        "importKeystoreHint": "Import a keystore used to sign apps",
         "importedKeystore": "Keystore imported",
 
-        "selectKeystorePassword": "Keystore Password",
-        "selectKeystorePasswordHint": "Select keystore password used to sign the apk",
+        "selectKeystorePassword": "Keystore password",
+        "selectKeystorePasswordHint": "Select keystore password used to sign apps",
 
         "jsonSelectorErrorMessage": "Unable to use selected JSON file",
-        "keystoreSelectorErrorMessage": "Unable to use selected KEYSTORE file"
+        "keystoreSelectorErrorMessage": "Unable to use selected keystore file"
     },
     "appInfoView": {
         "widgetTitle": "App info",
         "openButton": "Open",
         "uninstallButton": "Uninstall",
-        "unpatchButton": "Unpatch",
+        "unmountButton": "Unmount",
         "rootDialogTitle": "Error",
 
-        "unpatchDialogText": "Are you sure you want to unpatch this app?",
+        "unmountDialogText": "Are you sure you want to unmount this app?",
+        "uninstallDialogText": "Are you sure you want to uninstall this app?",
         "rootDialogText": "App was installed with superuser permissions, but currently ReVanced Manager has no permissions.\nPlease grant superuser permissions first.",
 
         "packageNameLabel": "Package name",
-        "originalPackageNameLabel": "Original package name",
         "installTypeLabel": "Installation type",
-        "rootTypeLabel": "Root",
-        "nonRootTypeLabel": "Non-root",
+        "mountTypeLabel": "Mount",
+        "regularTypeLabel": "Regular",
         "patchedDateLabel": "Patched date",
         "appliedPatchesLabel": "Applied patches",
 
         "patchedDateHint": "{date} at {time}",
         "appliedPatchesHint": "{quantity} applied patches",
-        
+
         "updateNotImplemented": "This feature has not been implemented yet"
     },
     "contributorsView": {
@@ -302,5 +340,34 @@
         "integrationsContributors": "Integrations contributors",
         "cliContributors": "CLI contributors",
         "managerContributors": "Manager contributors"
+    },
+    "installErrorDialog": {
+        "mount_version_mismatch": "Version mismatch",
+        "mount_no_root": "No root access",
+        "mount_missing_installation": "Installation not found",
+
+        "status_failure_blocked": "Installation blocked",
+        "install_failed_verification_failure": "Verification failed",
+        "status_failure_invalid": "Installation invalid",
+        "install_failed_version_downgrade": "Can't downgrade",
+        "status_failure_conflict": "Installation conflict",
+        "status_failure_storage": "Installation storage issue",
+        "status_failure_incompatible": "Installation incompatible",
+        "status_failure_timeout": "Installation timeout",
+        "status_unknown": "Installation failed",
+
+        "mount_version_mismatch_description": "The installation failed due to the installed app being a different version than the patched app.\n\nInstall the version of the app you are mounting and try again.",
+        "mount_no_root_description": "The installation failed due to root access not being granted.\n\nGrant root access to ReVanced Manager and try again.",
+        "mount_missing_installation_description": "The installation failed due to the unpatched app not being installed on this device in order to mount over it.\n\nInstall the unpatched app before mounting and try again.",
+
+        "status_failure_timeout_description": "The installation took too long to finish.\n\nWould you like to try again?",
+        "status_failure_storage_description": "The installation failed due to insufficient storage.\n\nFree up some space and try again.",
+        "status_failure_invalid_description": "The installation failed due to the patched app being invalid.\n\nUninstall the app and try again?",
+        "status_failure_incompatible_description": "The app is incompatible with this device.\n\nContact the developer of the app and ask for support.",
+        "status_failure_conflict_description": "The installation was prevented by an existing installation of the app.\n\nUninstall the installed app and try again?",
+        "status_failure_blocked_description": "The installation was blocked by {packageName}.\n\nAdjust your security settings and try again.",
+        "install_failed_verification_failure_description": "The installation failed due to a verification issue.\n\nAdjust your security settings and try again.",
+        "install_failed_version_downgrade_description": "The installation failed due to the patched app being a lower version than the installed app.\n\nUninstall the app and try again?",
+        "status_unknown_description": "The installation failed due to an unknown reason. Please try again."
     }
 }

assets/revanced-logo/revanced-logo-round.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 800 800" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g id="Logo"><g id="Ring"><circle id="Ring-Background" serif:id="Ring Background" cx="400" cy="400" r="400" style="fill:#1b1b1b;"/><path id="Ring1" serif:id="Ring" d="M400,0c220.766,0 400,179.234 400,400c-0,220.766 -179.234,400 -400,400c-220.766,-0 -400,-179.234 -400,-400c0,-220.766 179.234,-400 400,-400Zm-0,36c200.897,-0 364,163.103 364,364c0,200.897 -163.103,364 -364,364c-200.897,0 -364,-163.103 -364,-364c-0,-200.897 163.103,-364 364,-364Z" style="fill:url(#_Linear1);"/></g><g id="Shape"><path id="V-Shape" serif:id="V Shape" d="M538.74,269.872c1.481,-3.382 1.157,-7.283 -0.863,-10.373c-2.021,-3.091 -5.464,-4.954 -9.156,-4.954c-5.148,0 -10.435,0 -14.165,0c-3.1,0 -5.907,1.834 -7.153,4.672c-12.468,28.396 -78.273,178.273 -100.25,228.328c-1.246,2.838 -4.053,4.671 -7.154,4.671c-3.1,0 -5.907,-1.833 -7.153,-4.671c-21.977,-50.055 -87.782,-199.932 -100.25,-228.328c-1.246,-2.838 -4.053,-4.672 -7.153,-4.672c-3.73,0 -9.017,0 -14.164,0c-3.693,0 -7.135,1.863 -9.156,4.954c-2.02,3.09 -2.344,6.991 -0.863,10.373c23.557,53.766 101.872,232.519 117.871,269.034c1.743,3.979 5.674,6.549 10.018,6.549c6.293,-0 15.408,-0 21.701,-0c4.344,-0 8.275,-2.57 10.018,-6.549c15.999,-36.515 94.315,-215.268 117.872,-269.034Z" style="fill:#fff;"/><path id="Diamond" d="M408.119,395.312c-1.675,2.901 -4.77,4.688 -8.119,4.688c-3.349,-0 -6.444,-1.787 -8.119,-4.688c-16.997,-29.44 -56.156,-97.264 -73.153,-126.704c-1.675,-2.901 -1.675,-6.474 0,-9.375c1.675,-2.901 4.77,-4.688 8.119,-4.688c33.995,0 112.311,0 146.306,0c3.349,0 6.444,1.787 8.119,4.688c1.675,2.901 1.675,6.474 -0,9.375c-16.997,29.44 -56.156,97.264 -73.153,126.704Z" style="fill:url(#_Linear2);"/></g></g><defs><linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.89859e-14,800,-800,4.89859e-14,400.001,3.31681e-10)"><stop offset="0" style="stop-color:#f04e98;stop-opacity:1"/><stop offset="0.5" style="stop-color:#5f65d4;stop-opacity:1"/><stop offset="1" style="stop-color:#4e98f0;stop-opacity:1"/></linearGradient><linearGradient id="_Linear2" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.77155e-14,289.317,-282.535,1.73003e-14,400,254.545)"><stop offset="0" style="stop-color:#f04e98;stop-opacity:1"/><stop offset="0.5" style="stop-color:#5f65d4;stop-opacity:1"/><stop offset="1" style="stop-color:#4e98f0;stop-opacity:1"/></linearGradient></defs></svg>

crowdin.yml

@@ -1,9 +1,4 @@
-project_id_env: CROWDIN_PROJECT_ID
-api_token_env: CROWDIN_PERSONAL_TOKEN
-
-commit_message: 'chore(i18n): sync translations'
-
-preserve_hierarchy: true
+preserve_hierarchy: 1
 files:
-  - source: assets/i18n/en_US.json
-    translation: assets/i18n/%locale_with_underscore%.json
+  - source: /assets/i18n/en_US.json
+    translation: /assets/i18n/%locale_with_underscore%.json

docs/2_1_patching.md

@@ -7,16 +7,27 @@ The following pages will guide you through using ReVanced Manager to patch apps.
 1. Navigate to the **Patcher** tab from the bottom navigation bar
 2. Tap on the **Select an app** card
 3. Choose an app to patch[^1]
-   > **Note**: The suggested version is visible in each app's card.
-4. Tap on the **Select patches** card and select the patches you want to apply[^2]
-   > **Warning**: If you see a warning you can click on it for more information.
-5. Tap on the **Done** then **Patch** button
-   > **Warning**: The patching process may take ~5 minutes. Exiting the app may increase the time it takes to patch.
-6. 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]: 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.
+   > [!NOTE]  
+   > The suggested version is visible in each app's card.
+4. Tap on the **Select patches** card and select the patches you want to apply[^2].
+
+   > [!NOTE]  
+   > Some patches have options that can or must be configured by tapping on ⚙️ icon next to the patch name.
+
+   >[!WARNING]  
+   > If you see a warning you can click on it for more information.
+5. Tap on the **Done** then **Patch** button
+
+   > [!WARNING]  
+   > The patching process may take ~5 minutes. Exiting the app may cancel patching or increase the time it takes to patch.
+6. 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 option in the bottom left corner.
+
+[^1]: Non-root users may be prompted to select an APK from storage, in which case you must source the APK file yourself. ReVanced does not provide any APK files.
 [^2]: It is suggested to use the default set of patches by tapping on the **Default** button above the list of patches.
 [^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 3. above.
 

docs/2_4_settings.md

@@ -2,33 +2,46 @@
 
 ReVanced Manager has settings that can be configured to your liking.
 
-## ⭐ Essential settings
+## 🎛️ Essential settings
 
-- ### 🔗 API URL
+- ### 🪛 Allow changing patch selection
 
-  Specify the URL of the API to use. This is used to fetch ReVanced Patches and update ReVanced Manager.
+  Allows the user to change the patch selection from the default selection.
+
+- ### 🔍 Version compatibility check
+
+  Constrains patches to supported app versions. Disable this to patch any version of an app.
+
+  > [!WARNING]
+  > Disabling this may cause issues if the patches are not compatible with the app version.  
+
+- ### 🧑‍🔬 Show universal patches
+
+  Reveals patches which can be applied to any app.
+
+  > [!WARNING]  
+  > These patches may not work on all apps.
 
 - ### 🧬 Sources
 
-  Override the API and change the source of ReVanced Patches.
+  Override the API and download patches from a different source.
 
-- ### 🧪 Experimental ReVanced Patches support
+- ### 🔗 API URL
 
-  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.
+  API to use to fetch updates and patches from.  
 
-- ### 🧑‍🔬 Experimental universal support
+- ### 💾 Imports & Exports
 
-  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.
+  You can import, export or reset the following settings:
 
-- ### 🔑 Export, import or delete keystore
+  - 🔑 Keystore
+  - 📄 Patch selection
+  - ⚙️ Patch options
 
-  Manage the keystore used to sign patched apps.
+  > [!NOTE]  
+  > This is particularly useful if you want to backup or reset your settings.
 
-- ### 📄 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
+- ### ❓ About
 
   View information about your device and ReVanced Manager. This includes the version of ReVanced Manager and supported architectures of your device.
 
@@ -36,4 +49,4 @@ ReVanced Manager has settings that can be configured to your liking.
 
 The next page will bring you back to the usage page.
 
-Continue: [🛠️ Usage](2_usage.md)
+Continue: [🛠️ Usage](2_usage.md)

docs/3_troubleshooting.md

@@ -5,21 +5,19 @@ In case you encounter any issues while using ReVanced Manager, please refer to t
 - 💉 Patching fails with an error
 
   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.
+- 🚫 App not installed as package conflicts with an existing package
+
+  An existing installation of the app you're trying to patch conflicts with the patched app (i.e., signature mismatch or downgrade). 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.
+  You may be trying to patch a split APK[^1]. This may not work under certain circumstances. In such a case, patch a full APK.
+
+  Your device may otherwise be unsupported. Please look at 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.
@@ -29,3 +27,5 @@ In case you encounter any issues while using ReVanced Manager, please refer to t
 The next page will teach you how to build ReVanced Manager from source.
 
 Continue: [🔨 Building from source](4_building.md)
+
+[^1]: https://developer.android.com/guide/app-bundle/app-bundle-format

docs/4_building.md

@@ -2,38 +2,31 @@
 
 This page will guide you through building ReVanced Manager from source.
 
-1. Setup the Flutter environment for your [platform](https://docs.flutter.dev/get-started/install)
+1\. Setup the Flutter environment for your [platform](https://docs.flutter.dev/get-started/install)
 
-2. Clone the repository
+2\. Clone the repository
 
    ```sh
    git clone https://github.com/revanced/revanced-manager.git && cd revanced-manager
    ```
-
-3. Create a GitHub personal access token with the `read:packages` scope [here](https://github.com/settings/tokens/new?scopes=read:packages&description=ReVanced)
-
-4. Add your GitHub username and the token to `~/.gradle/gradle.properties`
-
-   ```properties
-   gpr.user = YourUsername
-   gpr.key = ghp_longrandomkey
-   ```
-
-5. Get dependencies
+3\. Get dependencies
 
    ```sh
    flutter pub get
    ```
 
-6. Delete conflicting outputs
+4\. Delete conflicting outputs
+
+> [!TIP]
+> Must be run every time you sync your local repository with the remote repository.
 
    ```sh
-   flutter packages pub run build_runner build --delete-conflicting-outputs
+   dart run build_runner build --delete-conflicting-outputs
    ```
 
-   > **Note**: Must be run every time you sync your local repository with the remote repository.
 
-7. Build the APK
+
+5\. Build the APK
 
    ```sh
    flutter build apk

lib/app/app.dart

@@ -1,3 +1,4 @@
+import 'package:revanced_manager/services/download_manager.dart';
 import 'package:revanced_manager/services/github_api.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
@@ -9,6 +10,8 @@ import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
 import 'package:revanced_manager/ui/views/installer/installer_view.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_view.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart';
+import 'package:revanced_manager/ui/views/patch_options/patch_options_view.dart';
+import 'package:revanced_manager/ui/views/patch_options/patch_options_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_view.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patches_selector/patches_selector_view.dart';
@@ -23,6 +26,7 @@ import 'package:stacked_services/stacked_services.dart';
     MaterialRoute(page: PatcherView),
     MaterialRoute(page: AppSelectorView),
     MaterialRoute(page: PatchesSelectorView),
+    MaterialRoute(page: PatchOptionsView),
     MaterialRoute(page: InstallerView),
     MaterialRoute(page: SettingsView),
     MaterialRoute(page: ContributorsView),
@@ -32,11 +36,13 @@ import 'package:stacked_services/stacked_services.dart';
     LazySingleton(classType: NavigationViewModel),
     LazySingleton(classType: HomeViewModel),
     LazySingleton(classType: PatcherViewModel),
+    LazySingleton(classType: PatchOptionsViewModel),
     LazySingleton(classType: NavigationService),
     LazySingleton(classType: ManagerAPI),
     LazySingleton(classType: PatcherAPI),
     LazySingleton(classType: RevancedAPI),
     LazySingleton(classType: GithubAPI),
+    LazySingleton(classType: DownloadManager),
     LazySingleton(classType: Toast),
   ],
 )

lib/main.dart

@@ -4,33 +4,41 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:revanced_manager/app/app.locator.dart';
+import 'package:revanced_manager/services/download_manager.dart';
 import 'package:revanced_manager/services/github_api.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/revanced_api.dart';
+import 'package:revanced_manager/services/root_api.dart';
 import 'package:revanced_manager/ui/theme/dynamic_theme_builder.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_view.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:stacked_themes/stacked_themes.dart';
 import 'package:timezone/data/latest.dart' as tz;
 
 late SharedPreferences prefs;
 Future main() async {
-  await ThemeManager.initialise();
   await setupLocator();
   WidgetsFlutterBinding.ensureInitialized();
   await locator<ManagerAPI>().initialize();
+  await locator<DownloadManager>().initialize();
   final String apiUrl = locator<ManagerAPI>().getApiUrl();
   await locator<RevancedAPI>().initialize(apiUrl);
   final String repoUrl = locator<ManagerAPI>().getRepoUrl();
   locator<GithubAPI>().initialize(repoUrl);
   tz.initializeTimeZones();
+
+  // TODO(aAbed): remove in the future, keep it for now during migration.
+  final rootAPI = RootAPI();
+  if (await rootAPI.hasRootPermissions()) {
+    await rootAPI.removeOrphanedFiles();
+  }
+
   prefs = await SharedPreferences.getInstance();
 
   runApp(const MyApp());
 }
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {

lib/models/patch.dart

@@ -1,5 +1,4 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:revanced_manager/utils/string.dart';
 
 part 'patch.g.dart';
 
@@ -9,26 +8,32 @@ class Patch {
     required this.name,
     required this.description,
     required this.excluded,
-    required this.dependencies,
     required this.compatiblePackages,
+    required this.options,
   });
 
-  factory Patch.fromJson(Map<String, dynamic> json) => _$PatchFromJson(json);
+  factory Patch.fromJson(Map<String, dynamic> json) {
+    _migrateV16ToV17(json);
+
+    return _$PatchFromJson(json);
+  }
+
+  static void _migrateV16ToV17(Map<String, dynamic> json) {
+    if (json['options'] == null) {
+      json['options'] = [];
+    }
+  }
+
   final String name;
-  final String description;
+  final String? description;
   final bool excluded;
-  final List<String> dependencies;
   final List<Package> compatiblePackages;
+  final List<Option> options;
 
   Map<String, dynamic> toJson() => _$PatchToJson(this);
 
   String getSimpleName() {
-    return name
-        .replaceAll('-', ' ')
-        .split('-')
-        .join(' ')
-        .toTitleCase()
-        .replaceFirst('Microg', 'MicroG');
+    return name;
   }
 }
 
@@ -41,8 +46,50 @@ class Package {
 
   factory Package.fromJson(Map<String, dynamic> json) =>
       _$PackageFromJson(json);
+
   final String name;
   final List<String> versions;
 
   Map toJson() => _$PackageToJson(this);
 }
+
+@JsonSerializable()
+class Option {
+  Option({
+    required this.key,
+    required this.title,
+    required this.description,
+    required this.value,
+    required this.values,
+    required this.required,
+    required this.valueType,
+  });
+
+  factory Option.fromJson(Map<String, dynamic> json) {
+    _migrateV17ToV19(json);
+
+    return _$OptionFromJson(json);
+  }
+
+  static void _migrateV17ToV19(Map<String, dynamic> json) {
+    if (json['valueType'] == null) {
+      final type = json['optionClassType'];
+      if (type is String) {
+        json['valueType'] =
+            type.replaceAll('PatchOption', '').replaceAll('List', 'Array');
+
+        json['optionClassType'] = null;
+      }
+    }
+  }
+
+  final String key;
+  final String title;
+  final String description;
+  final dynamic value;
+  final Map<String, dynamic>? values;
+  final bool required;
+  final String valueType;
+
+  Map toJson() => _$OptionToJson(this);
+}

lib/models/patched_application.dart

@@ -9,23 +9,19 @@ class PatchedApplication {
   PatchedApplication({
     required this.name,
     required this.packageName,
-    required this.originalPackageName,
     required this.version,
     required this.apkFilePath,
     required this.icon,
     required this.patchDate,
     this.isRooted = false,
     this.isFromStorage = false,
-    this.hasUpdates = false,
     this.appliedPatches = const [],
-    this.changelog = const [],
   });
 
   factory PatchedApplication.fromJson(Map<String, dynamic> json) =>
       _$PatchedApplicationFromJson(json);
   String name;
   String packageName;
-  String originalPackageName;
   String version;
   final String apkFilePath;
   @JsonKey(
@@ -36,9 +32,7 @@ class PatchedApplication {
   DateTime patchDate;
   bool isRooted;
   bool isFromStorage;
-  bool hasUpdates;
   List<String> appliedPatches;
-  List<String> changelog;
 
   Map<String, dynamic> toJson() => _$PatchedApplicationToJson(this);
 

lib/services/download_manager.dart

@@ -0,0 +1,75 @@
+import 'package:dio/dio.dart';
+import 'package:dio_cache_interceptor/dio_cache_interceptor.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_cache_manager/file.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:injectable/injectable.dart';
+import 'package:revanced_manager/app/app.locator.dart';
+import 'package:revanced_manager/services/manager_api.dart';
+
+@lazySingleton
+class DownloadManager {
+  final ManagerAPI _managerAPI = locator<ManagerAPI>();
+  late final String _userAgent;
+
+  final _cacheOptions = CacheOptions(
+    store: MemCacheStore(),
+    maxStale: const Duration(days: 1),
+    priority: CachePriority.high,
+  );
+
+  Future<void> initialize() async {
+    _userAgent =
+        'ReVanced-Manager/${await _managerAPI.getCurrentManagerVersion()}';
+  }
+
+  Dio initDio(String url) {
+    var dio = Dio();
+    try {
+      dio = Dio(
+        BaseOptions(
+          baseUrl: url,
+          headers: {
+            'User-Agent': _userAgent,
+          },
+        ),
+      );
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+    }
+
+    dio.interceptors.add(DioCacheInterceptor(options: _cacheOptions));
+    return dio;
+  }
+
+  Future<void> clearAllCache() async {
+    try {
+      await _cacheOptions.store!.clean();
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+    }
+  }
+
+  Future<File> getSingleFile(String url) async {
+    return DefaultCacheManager().getSingleFile(
+      url,
+      headers: {
+        'User-Agent': _userAgent,
+      },
+    );
+  }
+
+  Stream<FileResponse> getFileStream(String url) {
+    return DefaultCacheManager().getFileStream(
+      url,
+      withProgress: true,
+      headers: {
+        'User-Agent': _userAgent,
+      },
+    );
+  }
+}

lib/services/github_api.dart

@@ -1,61 +1,24 @@
-import 'dart:convert';
 import 'dart:io';
 import 'package:collection/collection.dart';
 import 'package:dio/dio.dart';
-import 'package:dio_cache_interceptor/dio_cache_interceptor.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:injectable/injectable.dart';
 import 'package:revanced_manager/app/app.locator.dart';
-import 'package:revanced_manager/models/patch.dart';
+import 'package:revanced_manager/services/download_manager.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 
 @lazySingleton
 class GithubAPI {
-  late Dio _dio = Dio();
+  late final Dio _dio;
   late final ManagerAPI _managerAPI = locator<ManagerAPI>();
-
-  final _cacheOptions = CacheOptions(
-    store: MemCacheStore(),
-    maxStale: const Duration(days: 1),
-    priority: CachePriority.high,
-  );
-
-  final Map<String, String> repoAppPath = {
-    'com.google.android.youtube': 'youtube',
-    'com.google.android.apps.youtube.music': 'music',
-    'com.twitter.android': 'twitter',
-    'com.reddit.frontpage': 'reddit',
-    'com.zhiliaoapp.musically': 'tiktok',
-    'de.dwd.warnapp': 'warnwetter',
-    'com.garzotto.pflotsh.ecmwf_a': 'ecmwf',
-    'com.spotify.music': 'spotify',
-  };
+  late final DownloadManager _downloadManager = locator<DownloadManager>();
 
   Future<void> initialize(String repoUrl) async {
-    try {
-      _dio = Dio(
-        BaseOptions(
-          baseUrl: repoUrl,
-        ),
-      );
-
-      _dio.interceptors.add(DioCacheInterceptor(options: _cacheOptions));
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-    }
+    _dio = _downloadManager.initDio(repoUrl);
   }
 
   Future<void> clearAllCache() async {
-    try {
-      await _cacheOptions.store!.clean();
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-    }
+    await _downloadManager.clearAllCache();
   }
 
   Future<Map<String, dynamic>?> getLatestRelease(
@@ -117,8 +80,8 @@ class GithubAPI {
       final Map<String, dynamic> releases = response.data[0];
       int updates = 0;
       final String currentVersion =
-          await ManagerAPI().getCurrentManagerVersion();
-      while (response.data[updates]['tag_name'] != 'v$currentVersion') {
+          await _managerAPI.getCurrentManagerVersion();
+      while (response.data[updates]['tag_name'] != currentVersion) {
         updates++;
       }
       for (int i = 1; i < updates; i++) {
@@ -142,38 +105,6 @@ class GithubAPI {
     }
   }
 
-  Future<List<String>> getCommits(
-    String packageName,
-    String repoName,
-    DateTime since,
-  ) async {
-    final String path =
-        'src/main/kotlin/app/revanced/patches/${repoAppPath[packageName]}';
-    try {
-      final response = await _dio.get(
-        '/repos/$repoName/commits',
-        queryParameters: {
-          'path': path,
-          'since': since.toIso8601String(),
-        },
-      );
-      final List<dynamic> commits = response.data;
-      return commits
-          .map(
-            (commit) => commit['commit']['message'].split('\n')[0] +
-                ' - ' +
-                commit['commit']['author']['name'] +
-                '\n' as String,
-          )
-          .toList();
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-    }
-    return [];
-  }
-
   Future<File?> getLatestReleaseFile(
     String extension,
     String repoName,
@@ -186,7 +117,7 @@ class GithubAPI {
           (asset) => (asset['name'] as String).endsWith(extension),
         );
         if (asset != null) {
-          return await DefaultCacheManager().getSingleFile(
+          return await _downloadManager.getSingleFile(
             asset['browser_download_url'],
           );
         }
@@ -207,7 +138,7 @@ class GithubAPI {
   ) async {
     try {
       if (url.isNotEmpty) {
-        return await DefaultCacheManager().getSingleFile(
+        return await _downloadManager.getSingleFile(
           url,
         );
       }
@@ -222,12 +153,10 @@ class GithubAPI {
           final String downloadUrl = asset['browser_download_url'];
           if (extension == '.apk') {
             _managerAPI.setIntegrationsDownloadURL(downloadUrl);
-          } else if (extension == '.json') {
-            _managerAPI.setPatchesDownloadURL(downloadUrl, false);
           } else {
-            _managerAPI.setPatchesDownloadURL(downloadUrl, true);
+            _managerAPI.setPatchesDownloadURL(downloadUrl);
           }
-          return await DefaultCacheManager().getSingleFile(
+          return await _downloadManager.getSingleFile(
             downloadUrl,
           );
         }
@@ -239,30 +168,4 @@ class GithubAPI {
     }
     return null;
   }
-
-  Future<List<Patch>> getPatches(
-    String repoName,
-    String version,
-    String url,
-  ) async {
-    List<Patch> patches = [];
-    try {
-      final File? f = await getPatchesReleaseFile(
-        '.json',
-        repoName,
-        version,
-        url,
-      );
-      if (f != null) {
-        final List<dynamic> list = jsonDecode(f.readAsStringSync());
-        patches = list.map((patch) => Patch.fromJson(patch)).toList();
-      }
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-    }
-
-    return patches;
-  }
 }

lib/services/manager_api.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 import 'package:device_apps/device_apps.dart';
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/widgets/I18nText.dart';
@@ -11,9 +12,11 @@ import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/github_api.dart';
+import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/revanced_api.dart';
 import 'package:revanced_manager/services/root_api.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:revanced_manager/services/toast.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_checkbox_list_tile.dart';
 import 'package:revanced_manager/utils/check_for_supported_patch.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:timeago/timeago.dart';
@@ -22,11 +25,20 @@ import 'package:timeago/timeago.dart';
 class ManagerAPI {
   final RevancedAPI _revancedAPI = locator<RevancedAPI>();
   final GithubAPI _githubAPI = locator<GithubAPI>();
+  final Toast _toast = locator<Toast>();
   final RootAPI _rootAPI = RootAPI();
   final String patcherRepo = 'revanced-patcher';
   final String cliRepo = 'revanced-cli';
   late SharedPreferences _prefs;
+  List<Patch> patches = [];
+  List<Option> modifiedOptions = [];
+  List<Option> options = [];
+  Patch? selectedPatch;
+  BuildContext? ctx;
   bool isRooted = false;
+  bool releaseBuild = false;
+  bool suggestedAppVersionSelected = true;
+  bool isDynamicThemeAvailable = false;
   String storedPatchesFile = '/selected-patches.json';
   String keystoreFile =
       '/sdcard/Android/data/app.revanced.manager.flutter/files/revanced-manager.keystore';
@@ -40,19 +52,41 @@ class ManagerAPI {
   String defaultManagerRepo = 'revanced/revanced-manager';
   String? patchesVersion = '';
   String? integrationsVersion = '';
+
   bool isDefaultPatchesRepo() {
-    return getPatchesRepo() == 'revanced/revanced-patches';
+    return getPatchesRepo().toLowerCase() == defaultPatchesRepo;
   }
 
   bool isDefaultIntegrationsRepo() {
-    return getIntegrationsRepo() == 'revanced/revanced-integrations';
+    return getIntegrationsRepo().toLowerCase() ==
+        defaultIntegrationsRepo;
   }
 
   Future<void> initialize() async {
     _prefs = await SharedPreferences.getInstance();
     isRooted = await _rootAPI.isRooted();
+    isDynamicThemeAvailable =
+        (await getSdkVersion()) >= 31; // ANDROID_12_SDK_VERSION = 31
     storedPatchesFile =
         (await getApplicationDocumentsDirectory()).path + storedPatchesFile;
+    if (kReleaseMode) {
+      releaseBuild = !(await getCurrentManagerVersion()).contains('-dev');
+    }
+
+    // Migrate to new API URL if not done yet as the old one is sunset.
+    final bool hasMigrated = _prefs.getBool('migratedToNewApiUrl') ?? false;
+    if (!hasMigrated) {
+      final String apiUrl = getApiUrl().toLowerCase();
+      if (apiUrl.contains('releases.revanced.app')) {
+        await setApiUrl(''); // Reset to default.
+        _prefs.setBool('migratedToNewApiUrl', true);
+      }
+    }
+  }
+
+  Future<int> getSdkVersion() async {
+    final AndroidDeviceInfo info = await DeviceInfoPlugin().androidInfo;
+    return info.version.sdkInt;
   }
 
   String getApiUrl() {
@@ -63,9 +97,9 @@ class ManagerAPI {
     if (url.isEmpty || url == ' ') {
       url = defaultApiUrl;
     }
-    await _revancedAPI.initialize(url);
     await _revancedAPI.clearAllCache();
     await _prefs.setString('apiUrl', url);
+    _toast.showBottom('settingsView.restartAppForChanges');
   }
 
   String getRepoUrl() {
@@ -79,12 +113,12 @@ class ManagerAPI {
     await _prefs.setString('repoUrl', url);
   }
 
-  String getPatchesDownloadURL(bool bundle) {
-    return _prefs.getString('patchesDownloadURL-$bundle') ?? '';
+  String getPatchesDownloadURL() {
+    return _prefs.getString('patchesDownloadURL') ?? '';
   }
 
-  Future<void> setPatchesDownloadURL(String value, bool bundle) async {
-    await _prefs.setString('patchesDownloadURL-$bundle', value);
+  Future<void> setPatchesDownloadURL(String value) async {
+    await _prefs.setString('patchesDownloadURL', value);
   }
 
   String getPatchesRepo() {
@@ -98,12 +132,12 @@ class ManagerAPI {
     await _prefs.setString('patchesRepo', value);
   }
 
-  bool getPatchesConsent() {
-    return _prefs.getBool('patchesConsent') ?? false;
+  bool getDownloadConsent() {
+    return _prefs.getBool('downloadConsent') ?? false;
   }
 
-  Future<void> setPatchesConsent(bool consent) async {
-    await _prefs.setBool('patchesConsent', consent);
+  void setDownloadConsent(bool consent) {
+    _prefs.setBool('downloadConsent', consent);
   }
 
   bool isPatchesAutoUpdate() {
@@ -111,17 +145,6 @@ class ManagerAPI {
   }
 
   bool isPatchesChangeEnabled() {
-    if (getPatchedApps().isNotEmpty && !isChangingToggleModified()) {
-      for (final apps in getPatchedApps()) {
-        if (getSavedPatches(apps.originalPackageName)
-                .indexWhere((patch) => patch.excluded) !=
-            -1) {
-          setPatchesChangeWarning(false);
-          setPatchesChangeEnabled(true);
-          break;
-        }
-      }
-    }
     return _prefs.getBool('patchesChangeEnabled') ?? false;
   }
 
@@ -137,6 +160,14 @@ class ManagerAPI {
     _prefs.setBool('showPatchesChangeWarning', !value);
   }
 
+  bool showUpdateDialog() {
+    return _prefs.getBool('showUpdateDialog') ?? true;
+  }
+
+  void setShowUpdateDialog(bool value) {
+    _prefs.setBool('showUpdateDialog', value);
+  }
+
   bool isChangingToggleModified() {
     return _prefs.getBool('isChangingToggleModified') ?? false;
   }
@@ -145,8 +176,8 @@ class ManagerAPI {
     _prefs.setBool('isChangingToggleModified', value);
   }
 
-  Future<void> setPatchesAutoUpdate(bool value) async {
-    await _prefs.setBool('patchesAutoUpdate', value);
+  void setPatchesAutoUpdate(bool value) {
+    _prefs.setBool('patchesAutoUpdate', value);
   }
 
   List<Patch> getSavedPatches(String packageName) {
@@ -189,6 +220,29 @@ class ManagerAPI {
     await _prefs.setStringList('usedPatches-$packageName', patchesJson);
   }
 
+  Option? getPatchOption(String packageName, String patchName, String key) {
+    final String? optionJson =
+        _prefs.getString('patchOption-$packageName-$patchName-$key');
+    if (optionJson != null) {
+      final Option option = Option.fromJson(jsonDecode(optionJson));
+      return option;
+    } else {
+      return null;
+    }
+  }
+
+  void setPatchOption(Option option, String patchName, String packageName) {
+    final String optionJson = jsonEncode(option.toJson());
+    _prefs.setString(
+      'patchOption-$packageName-$patchName-${option.key}',
+      optionJson,
+    );
+  }
+
+  void clearPatchOption(String packageName, String patchName, String key) {
+    _prefs.remove('patchOption-$packageName-$patchName-$key');
+  }
+
   String getIntegrationsRepo() {
     return _prefs.getString('integrationsRepo') ?? defaultIntegrationsRepo;
   }
@@ -208,12 +262,12 @@ class ManagerAPI {
     await _prefs.setBool('useDynamicTheme', value);
   }
 
-  bool getUseDarkTheme() {
-    return _prefs.getBool('useDarkTheme') ?? false;
+  int getThemeMode() {
+    return _prefs.getInt('themeMode') ?? 2;
   }
 
-  Future<void> setUseDarkTheme(bool value) async {
-    await _prefs.setBool('useDarkTheme', value);
+  Future<void> setThemeMode(int value) async {
+    await _prefs.setInt('themeMode', value);
   }
 
   bool areUniversalPatchesEnabled() {
@@ -224,12 +278,20 @@ class ManagerAPI {
     await _prefs.setBool('universalPatchesEnabled', value);
   }
 
-  bool areExperimentalPatchesEnabled() {
-    return _prefs.getBool('experimentalPatchesEnabled') ?? false;
+  bool isVersionCompatibilityCheckEnabled() {
+    return _prefs.getBool('versionCompatibilityCheckEnabled') ?? true;
   }
 
-  Future<void> enableExperimentalPatchesStatus(bool value) async {
-    await _prefs.setBool('experimentalPatchesEnabled', value);
+  Future<void> enableVersionCompatibilityCheckStatus(bool value) async {
+    await _prefs.setBool('versionCompatibilityCheckEnabled', value);
+  }
+
+  bool isRequireSuggestedAppVersionEnabled() {
+    return _prefs.getBool('requireSuggestedAppVersionEnabled') ?? true;
+  }
+
+  Future<void> enableRequireSuggestedAppVersionStatus(bool value) async {
+    await _prefs.setBool('requireSuggestedAppVersionEnabled', value);
   }
 
   Future<void> setKeystorePassword(String password) async {
@@ -311,28 +373,45 @@ class ManagerAPI {
   }
 
   Future<List<Patch>> getPatches() async {
-    try {
-      final String repoName = getPatchesRepo();
-      final String currentVersion = await getCurrentPatchesVersion();
-      final String url = getPatchesDownloadURL(false);
-      return await _githubAPI.getPatches(
-        repoName,
-        currentVersion,
-        url,
-      );
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-      return [];
+    if (patches.isNotEmpty) {
+      return patches;
     }
+    final File? patchBundleFile = await downloadPatches();
+    final Directory appCache = await getTemporaryDirectory();
+    Directory('${appCache.path}/cache').createSync();
+    final Directory workDir =
+        Directory('${appCache.path}/cache').createTempSync('tmp-');
+    final Directory cacheDir = Directory('${workDir.path}/cache');
+    cacheDir.createSync();
+    if (patchBundleFile != null) {
+      try {
+        final String patchesJson = await PatcherAPI.patcherChannel.invokeMethod(
+          'getPatches',
+          {
+            'patchBundleFilePath': patchBundleFile.path,
+            'cacheDirPath': cacheDir.path,
+          },
+        );
+        final List<dynamic> patchesJsonList = jsonDecode(patchesJson);
+        patches = patchesJsonList
+            .map((patchJson) => Patch.fromJson(patchJson))
+            .toList();
+        return patches;
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
+        }
+      }
+    }
+
+    return List.empty();
   }
 
   Future<File?> downloadPatches() async {
     try {
       final String repoName = getPatchesRepo();
       final String currentVersion = await getCurrentPatchesVersion();
-      final String url = getPatchesDownloadURL(true);
+      final String url = getPatchesDownloadURL();
       return await _githubAPI.getPatchesReleaseFile(
         '.jar',
         repoName,
@@ -441,7 +520,11 @@ class ManagerAPI {
 
   Future<String> getCurrentManagerVersion() async {
     final PackageInfo packageInfo = await PackageInfo.fromPlatform();
-    return packageInfo.version;
+    String version = packageInfo.version;
+    if (!version.startsWith('v')) {
+      version = 'v$version';
+    }
+    return version;
   }
 
   Future<String> getCurrentPatchesVersion() async {
@@ -458,8 +541,7 @@ class ManagerAPI {
 
   Future<void> setCurrentPatchesVersion(String version) async {
     await _prefs.setString('patchesVersion', version);
-    await setPatchesDownloadURL('', false);
-    await setPatchesDownloadURL('', true);
+    await setPatchesDownloadURL('');
     await downloadPatches();
   }
 
@@ -495,62 +577,33 @@ class ManagerAPI {
     return toRemove;
   }
 
-  Future<List<PatchedApplication>> getUnsavedApps(
-    List<PatchedApplication> patchedApps,
-  ) async {
-    final List<PatchedApplication> unsavedApps = [];
+  Future<List<PatchedApplication>> getMountedApps() async {
+    final List<PatchedApplication> mountedApps = [];
     final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
     if (hasRootPermissions) {
       final List<String> installedApps = await _rootAPI.getInstalledApps();
       for (final String packageName in installedApps) {
-        if (!patchedApps.any((app) => app.packageName == packageName)) {
-          final ApplicationWithIcon? application = await DeviceApps.getApp(
-            packageName,
-            true,
-          ) as ApplicationWithIcon?;
-          if (application != null) {
-            unsavedApps.add(
-              PatchedApplication(
-                name: application.appName,
-                packageName: application.packageName,
-                originalPackageName: application.packageName,
-                version: application.versionName!,
-                apkFilePath: application.apkFilePath,
-                icon: application.icon,
-                patchDate: DateTime.now(),
-                isRooted: true,
-              ),
-            );
-          }
-        }
-      }
-    }
-    final List<Application> userApps =
-        await DeviceApps.getInstalledApplications();
-    for (final Application app in userApps) {
-      if (app.packageName.startsWith('app.revanced') &&
-          !app.packageName.startsWith('app.revanced.manager.') &&
-          !patchedApps.any((uapp) => uapp.packageName == app.packageName)) {
         final ApplicationWithIcon? application = await DeviceApps.getApp(
-          app.packageName,
+          packageName,
           true,
         ) as ApplicationWithIcon?;
         if (application != null) {
-          unsavedApps.add(
+          mountedApps.add(
             PatchedApplication(
               name: application.appName,
               packageName: application.packageName,
-              originalPackageName: application.packageName,
               version: application.versionName!,
               apkFilePath: application.apkFilePath,
               icon: application.icon,
               patchDate: DateTime.now(),
+              isRooted: true,
             ),
           );
         }
       }
     }
-    return unsavedApps;
+
+    return mountedApps;
   }
 
   Future<void> showPatchesChangeWarningDialog(BuildContext context) {
@@ -559,10 +612,9 @@ class ManagerAPI {
     return showDialog(
       barrierDismissible: false,
       context: context,
-      builder: (context) => WillPopScope(
-        onWillPop: () async => false,
+      builder: (context) => PopScope(
+        canPop: false,
         child: AlertDialog(
-          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
           title: I18nText('warning'),
           content: ValueListenableBuilder(
             valueListenable: noShow,
@@ -582,7 +634,7 @@ class ManagerAPI {
                     ),
                   ),
                   const SizedBox(height: 8),
-                  CheckboxListTile(
+                  HapticCheckboxListTile(
                     value: value,
                     contentPadding: EdgeInsets.zero,
                     title: I18nText(
@@ -597,12 +649,12 @@ class ManagerAPI {
             },
           ),
           actions: [
-            CustomMaterialButton(
-              label: I18nText('okButton'),
+            FilledButton(
               onPressed: () {
                 setPatchesChangeWarning(noShow.value);
                 Navigator.of(context).pop();
               },
+              child: I18nText('okButton'),
             ),
           ],
         ),
@@ -610,36 +662,22 @@ class ManagerAPI {
     );
   }
 
-  Future<void> reAssessSavedApps() async {
+  Future<void> rePatchedSavedApps() async {
     final List<PatchedApplication> patchedApps = getPatchedApps();
-    final List<PatchedApplication> unsavedApps =
-        await getUnsavedApps(patchedApps);
-    patchedApps.addAll(unsavedApps);
+
+    // Remove apps that are not installed anymore.
     final List<PatchedApplication> toRemove =
         await getAppsToRemove(patchedApps);
     patchedApps.removeWhere((a) => toRemove.contains(a));
-    for (final PatchedApplication app in patchedApps) {
-      app.hasUpdates =
-          await hasAppUpdates(app.originalPackageName, app.patchDate);
-      app.changelog =
-          await getAppChangelog(app.originalPackageName, app.patchDate);
-      if (!app.hasUpdates) {
-        final String? currentInstalledVersion =
-            (await DeviceApps.getApp(app.packageName))?.versionName;
-        if (currentInstalledVersion != null) {
-          final String currentSavedVersion = app.version;
-          final int currentInstalledVersionInt = int.parse(
-            currentInstalledVersion.replaceAll(RegExp('[^0-9]'), ''),
-          );
-          final int currentSavedVersionInt = int.parse(
-            currentSavedVersion.replaceAll(RegExp('[^0-9]'), ''),
-          );
-          if (currentInstalledVersionInt > currentSavedVersionInt) {
-            app.hasUpdates = true;
-          }
-        }
-      }
-    }
+
+    // Determine all apps that are installed by mounting.
+    final List<PatchedApplication> mountedApps = await getMountedApps();
+    mountedApps.removeWhere(
+      (app) => patchedApps
+          .any((patchedApp) => patchedApp.packageName == app.packageName),
+    );
+    patchedApps.addAll(mountedApps);
+
     await setPatchedApps(patchedApps);
   }
 
@@ -656,37 +694,6 @@ class ManagerAPI {
     return !existsNonRoot;
   }
 
-  Future<bool> hasAppUpdates(
-    String packageName,
-    DateTime patchDate,
-  ) async {
-    final List<String> commits = await _githubAPI.getCommits(
-      packageName,
-      getPatchesRepo(),
-      patchDate,
-    );
-    return commits.isNotEmpty;
-  }
-
-  Future<List<String>> getAppChangelog(
-    String packageName,
-    DateTime patchDate,
-  ) async {
-    List<String> newCommits = await _githubAPI.getCommits(
-      packageName,
-      getPatchesRepo(),
-      patchDate,
-    );
-    if (newCommits.isEmpty) {
-      newCommits = await _githubAPI.getCommits(
-        packageName,
-        getPatchesRepo(),
-        patchDate,
-      );
-    }
-    return newCommits;
-  }
-
   Future<bool> isSplitApk(PatchedApplication patchedApp) async {
     Application? app;
     if (patchedApp.isFromStorage) {
@@ -715,7 +722,7 @@ class ManagerAPI {
   Future<List<String>> getDefaultPatches() async {
     final List<Patch> patches = await getPatches();
     final List<String> defaultPatches = [];
-    if (areExperimentalPatchesEnabled() == false) {
+    if (isVersionCompatibilityCheckEnabled() == true) {
       defaultPatches.addAll(
         patches
             .where(
@@ -752,8 +759,18 @@ class ManagerAPI {
     return jsonDecode(string);
   }
 
+  void resetAllOptions() {
+    _prefs.getKeys().where((key) => key.startsWith('patchOption-')).forEach(
+      (key) {
+        _prefs.remove(key);
+      },
+    );
+  }
+
   Future<void> resetLastSelectedPatches() async {
     final File selectedPatchesFile = File(storedPatchesFile);
-    selectedPatchesFile.deleteSync();
+    if (selectedPatchesFile.existsSync()) {
+      selectedPatchesFile.deleteSync();
+    }
   }
 }

lib/services/patcher_api.dart

@@ -1,19 +1,20 @@
 import 'dart:io';
 
 import 'package:collection/collection.dart';
-import 'package:cr_file_saver/file_saver.dart';
 import 'package:device_apps/device_apps.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_file_dialog/flutter_file_dialog.dart';
+import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:injectable/injectable.dart';
-import 'package:install_plugin/install_plugin.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/root_api.dart';
-import 'package:share_extend/share_extend.dart';
+import 'package:share_plus/share_plus.dart';
 
 @lazySingleton
 class PatcherAPI {
@@ -25,12 +26,13 @@ class PatcherAPI {
   late Directory _tmpDir;
   late File _keyStoreFile;
   List<Patch> _patches = [];
+  List<Patch> _universalPatches = [];
+  List<String> _compatiblePackages = [];
   Map filteredPatches = <String, List<Patch>>{};
-  File? _outFile;
+  File? outFile;
 
   Future<void> initialize() async {
-    await _loadPatches();
-    await _managerAPI.downloadPatches();
+    await loadPatches();
     await _managerAPI.downloadIntegrations();
     final Directory appCache = await getTemporaryDirectory();
     _dataDir = await getExternalStorageDirectory() ?? appCache;
@@ -45,7 +47,23 @@ class PatcherAPI {
     }
   }
 
-  Future<void> _loadPatches() async {
+  List<String> getCompatiblePackages() {
+    final List<String> compatiblePackages = [];
+    for (final Patch patch in _patches) {
+      for (final Package package in patch.compatiblePackages) {
+        if (!compatiblePackages.contains(package.name)) {
+          compatiblePackages.add(package.name);
+        }
+      }
+    }
+    return compatiblePackages;
+  }
+
+  List<Patch> getUniversalPatches() {
+    return _patches.where((patch) => patch.compatiblePackages.isEmpty).toList();
+  }
+
+  Future<void> loadPatches() async {
     try {
       if (_patches.isEmpty) {
         _patches = await _managerAPI.getPatches();
@@ -56,6 +74,9 @@ class PatcherAPI {
       }
       _patches = List.empty();
     }
+
+    _compatiblePackages = getCompatiblePackages();
+    _universalPatches = getUniversalPatches();
   }
 
   Future<List<ApplicationWithIcon>> getFilteredInstalledApps(
@@ -63,48 +84,42 @@ class PatcherAPI {
   ) async {
     final List<ApplicationWithIcon> filteredApps = [];
     final bool allAppsIncluded =
-        _patches.any((patch) => patch.compatiblePackages.isEmpty) &&
-            showUniversalPatches;
+        _universalPatches.isNotEmpty && showUniversalPatches;
     if (allAppsIncluded) {
-      final allPackages = await DeviceApps.getInstalledApplications(
+      final appList = await DeviceApps.getInstalledApplications(
         includeAppIcons: true,
         onlyAppsWithLaunchIntent: true,
       );
-      for (final pkg in allPackages) {
-        if (!filteredApps.any((app) => app.packageName == pkg.packageName)) {
-          final appInfo = await DeviceApps.getApp(
-            pkg.packageName,
-            true,
-          ) as ApplicationWithIcon?;
-          if (appInfo != null) {
-            filteredApps.add(appInfo);
-          }
-        }
+
+      for (final app in appList) {
+        filteredApps.add(app as ApplicationWithIcon);
       }
     }
-    for (final Patch patch in _patches) {
-      for (final Package package in patch.compatiblePackages) {
-        try {
-          if (!filteredApps.any((app) => app.packageName == package.name)) {
-            final ApplicationWithIcon? app = await DeviceApps.getApp(
-              package.name,
-              true,
-            ) as ApplicationWithIcon?;
-            if (app != null) {
-              filteredApps.add(app);
-            }
-          }
-        } on Exception catch (e) {
-          if (kDebugMode) {
-            print(e);
+    for (final packageName in _compatiblePackages) {
+      try {
+        if (!filteredApps.any((app) => app.packageName == packageName)) {
+          final ApplicationWithIcon? app = await DeviceApps.getApp(
+            packageName,
+            true,
+          ) as ApplicationWithIcon?;
+          if (app != null) {
+            filteredApps.add(app);
           }
         }
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
+        }
       }
     }
     return filteredApps;
   }
 
   List<Patch> getFilteredPatches(String packageName) {
+    if (!_compatiblePackages.contains(packageName)) {
+      return _universalPatches;
+    }
+
     final List<Patch> patches = _patches
         .where(
           (patch) =>
@@ -132,69 +147,49 @@ class PatcherAPI {
         .toList();
   }
 
-  Future<bool> needsResourcePatching(
-    List<Patch> selectedPatches,
-  ) async {
-    return selectedPatches.any(
-      (patch) => patch.dependencies.any(
-        (dep) => dep.contains('resource-'),
-      ),
-    );
-  }
-
-  Future<bool> needsSettingsPatch(List<Patch> selectedPatches) async {
-    return selectedPatches.any(
-      (patch) => patch.dependencies.any(
-        (dep) => dep.contains('settings'),
-      ),
-    );
-  }
-
   Future<void> runPatcher(
     String packageName,
     String apkFilePath,
     List<Patch> selectedPatches,
   ) async {
-    final bool includeSettings = await needsSettingsPatch(selectedPatches);
-    if (includeSettings) {
-      try {
-        final Patch? settingsPatch = _patches.firstWhereOrNull(
-          (patch) =>
-              patch.name.contains('settings') &&
-              patch.compatiblePackages.any((pack) => pack.name == packageName),
-        );
-        if (settingsPatch != null) {
-          selectedPatches.add(settingsPatch);
-        }
-      } on Exception catch (e) {
-        if (kDebugMode) {
-          print(e);
+    final File? integrationsFile = await _managerAPI.downloadIntegrations();
+    final Map<String, Map<String, dynamic>> options = {};
+    for (final patch in selectedPatches) {
+      if (patch.options.isNotEmpty) {
+        final Map<String, dynamic> patchOptions = {};
+        for (final option in patch.options) {
+          final patchOption =
+              _managerAPI.getPatchOption(packageName, patch.name, option.key);
+          if (patchOption != null) {
+            patchOptions[patchOption.key] = patchOption.value;
+          }
         }
+        options[patch.name] = patchOptions;
       }
     }
-    final File? patchBundleFile = await _managerAPI.downloadPatches();
-    final File? integrationsFile = await _managerAPI.downloadIntegrations();
-    if (patchBundleFile != null) {
+
+    if (integrationsFile != null) {
       _dataDir.createSync();
       _tmpDir.createSync();
       final Directory workDir = _tmpDir.createTempSync('tmp-');
       final File inputFile = File('${workDir.path}/base.apk');
       final File patchedFile = File('${workDir.path}/patched.apk');
-      _outFile = File('${workDir.path}/out.apk');
+      outFile = File('${workDir.path}/out.apk');
       final Directory cacheDir = Directory('${workDir.path}/cache');
       cacheDir.createSync();
       final String originalFilePath = apkFilePath;
+
       try {
         await patcherChannel.invokeMethod(
           'runPatcher',
           {
-            'patchBundleFilePath': patchBundleFile.path,
             'originalFilePath': originalFilePath,
             'inputFilePath': inputFile.path,
             'patchedFilePath': patchedFile.path,
-            'outFilePath': _outFile!.path,
-            'integrationsPath': integrationsFile!.path,
+            'outFilePath': outFile!.path,
+            'integrationsPath': integrationsFile.path,
             'selectedPatches': selectedPatches.map((p) => p.name).toList(),
+            'options': options,
             'cacheDirPath': cacheDir.path,
             'keyStoreFilePath': _keyStoreFile.path,
             'keystorePassword': _managerAPI.getKeystorePassword(),
@@ -218,40 +213,165 @@ class PatcherAPI {
     }
   }
 
-  Future<bool> installPatchedFile(PatchedApplication patchedApp) async {
-    if (_outFile != null) {
+  Future<int> installPatchedFile(
+    BuildContext context,
+    PatchedApplication patchedApp,
+  ) async {
+    if (outFile != null) {
+      _managerAPI.ctx = context;
       try {
         if (patchedApp.isRooted) {
           final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
-          if (hasRootPermissions) {
-            return _rootAPI.installApp(
+          final packageVersion = await DeviceApps.getApp(patchedApp.packageName)
+              .then((app) => app?.versionName);
+          if (!hasRootPermissions) {
+            installErrorDialog(1);
+          } else if (packageVersion == null) {
+            installErrorDialog(1.2);
+          } else if (packageVersion == patchedApp.version) {
+            return await _rootAPI.install(
               patchedApp.packageName,
               patchedApp.apkFilePath,
-              _outFile!.path,
-            );
+              outFile!.path,
+            )
+                ? 0
+                : 1;
+          } else {
+            installErrorDialog(1.1);
           }
         } else {
-          final install = await InstallPlugin.installApk(_outFile!.path);
-          return install['isSuccess'];
+          if (await _rootAPI.hasRootPermissions()) {
+            await _rootAPI.uninstall(patchedApp.packageName);
+          }
+          if (context.mounted) {
+            return await installApk(
+              context,
+              outFile!.path,
+            );
+          }
         }
       } on Exception catch (e) {
         if (kDebugMode) {
           print(e);
         }
-        return false;
       }
     }
-    return false;
+    return 1;
+  }
+
+  Future<int> installApk(
+    BuildContext context,
+    String apkPath,
+  ) async {
+    try {
+      final status = await patcherChannel.invokeMethod('installApk', {
+        'apkPath': apkPath,
+      });
+      final int statusCode = status['status'];
+      final String message = status['message'];
+      final bool hasExtra =
+          message.contains('INSTALL_FAILED_VERIFICATION_FAILURE') ||
+              message.contains('INSTALL_FAILED_VERSION_DOWNGRADE');
+      if (statusCode == 0 || (statusCode == 3 && !hasExtra)) {
+        return statusCode;
+      } else {
+        _managerAPI.ctx = context;
+        return await installErrorDialog(
+          statusCode,
+          status,
+          hasExtra,
+        );
+      }
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+      return 3;
+    }
+  }
+
+  Future<int> installErrorDialog(
+    num statusCode, [
+    status,
+    bool hasExtra = false,
+  ]) async {
+    final String statusValue = InstallStatus.byCode(
+      hasExtra ? double.parse('$statusCode.1') : statusCode,
+    );
+    bool cleanInstall = false;
+    final bool isFixable = statusCode == 4 || statusCode == 5;
+    await showDialog(
+      context: _managerAPI.ctx!,
+      builder: (context) => AlertDialog(
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        title: I18nText('installErrorDialog.$statusValue'),
+        content: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            I18nText(
+              'installErrorDialog.${statusValue}_description',
+              translationParams: statusCode == 2
+                  ? {
+                      'packageName': status['otherPackageName'],
+                    }
+                  : null,
+            ),
+          ],
+        ),
+        actions: (status == null)
+            ? <Widget>[
+                FilledButton(
+                  onPressed: () async {
+                    Navigator.pop(context);
+                  },
+                  child: I18nText('okButton'),
+                ),
+              ]
+            : <Widget>[
+                if (!isFixable)
+                  FilledButton(
+                    onPressed: () {
+                      Navigator.pop(context);
+                    },
+                    child: I18nText('cancelButton'),
+                  )
+                else
+                  TextButton(
+                    onPressed: () {
+                      Navigator.pop(context);
+                    },
+                    child: I18nText('cancelButton'),
+                  ),
+                if (isFixable)
+                  FilledButton(
+                    onPressed: () async {
+                      final int response = await patcherChannel.invokeMethod(
+                        'uninstallApp',
+                        {'packageName': status['packageName']},
+                      );
+                      if (response == 0 && context.mounted) {
+                        cleanInstall = true;
+                        Navigator.pop(context);
+                      }
+                    },
+                    child: I18nText('okButton'),
+                  ),
+              ],
+      ),
+    );
+    return cleanInstall ? 10 : 1;
   }
 
   void exportPatchedFile(String appName, String version) {
     try {
-      if (_outFile != null) {
+      if (outFile != null) {
         final String newName = _getFileName(appName, version);
-        CRFileSaver.saveFileWithDialog(
-          SaveFileDialogParams(
-            sourceFilePath: _outFile!.path,
-            destinationFileName: newName,
+        FlutterFileDialog.saveFile(
+          params: SaveFileDialogParams(
+            sourceFilePath: outFile!.path,
+            fileName: newName,
+            mimeTypesFilter: ['application/vnd.android.package-archive'],
           ),
         );
       }
@@ -264,13 +384,13 @@ class PatcherAPI {
 
   void sharePatchedFile(String appName, String version) {
     try {
-      if (_outFile != null) {
+      if (outFile != null) {
         final String newName = _getFileName(appName, version);
-        final int lastSeparator = _outFile!.path.lastIndexOf('/');
+        final int lastSeparator = outFile!.path.lastIndexOf('/');
         final String newPath =
-            _outFile!.path.substring(0, lastSeparator + 1) + newName;
-        final File shareFile = _outFile!.copySync(newPath);
-        ShareExtend.share(shareFile.path, 'file');
+            outFile!.path.substring(0, lastSeparator + 1) + newName;
+        final File shareFile = outFile!.copySync(newPath);
+        Share.shareXFiles([XFile(shareFile.path)]);
       }
     } on Exception catch (e) {
       if (kDebugMode) {
@@ -280,8 +400,10 @@ class PatcherAPI {
   }
 
   String _getFileName(String appName, String version) {
+    final String patchVersion = _managerAPI.patchesVersion!;
     final String prefix = appName.toLowerCase().replaceAll(' ', '-');
-    final String newName = '$prefix-revanced_v$version.apk';
+    final String newName =
+        '$prefix-revanced_v$version-patches_$patchVersion.apk';
     return newName;
   }
 
@@ -295,13 +417,13 @@ class PatcherAPI {
         .replaceAll(':', '')
         .replaceAll('T', '')
         .replaceAll('.', '');
-    final String fileName = 'revanced-manager_patcher_$dateTime.log';
+    final String fileName = 'revanced-manager_patcher_$dateTime.txt';
     final File log = File('${logDir.path}/$fileName');
     log.writeAsStringSync(logs);
-    CRFileSaver.saveFileWithDialog(
-      SaveFileDialogParams(
+    FlutterFileDialog.saveFile(
+      params: SaveFileDialogParams(
         sourceFilePath: log.path,
-        destinationFileName: fileName,
+        fileName: fileName,
       ),
     );
   }
@@ -334,3 +456,60 @@ class PatcherAPI {
     return '';
   }
 }
+
+enum InstallStatus {
+  mountNoRoot(1),
+  mountVersionMismatch(1.1),
+  mountMissingInstallation(1.2),
+
+  statusFailureBlocked(2),
+  installFailedVerificationFailure(3.1),
+  statusFailureInvalid(4),
+  installFailedVersionDowngrade(4.1),
+  statusFailureConflict(5),
+  statusFailureStorage(6),
+  statusFailureIncompatible(7),
+  statusFailureTimeout(8);
+
+  const InstallStatus(this.statusCode);
+  final double statusCode;
+
+  static String byCode(num code) {
+    try {
+      return InstallStatus.values
+          .firstWhere((flag) => flag.statusCode == code)
+          .status;
+    } catch (e) {
+      return 'status_unknown';
+    }
+  }
+}
+
+extension InstallStatusExtension on InstallStatus {
+  String get status {
+    switch (this) {
+      case InstallStatus.mountNoRoot:
+        return 'mount_no_root';
+      case InstallStatus.mountVersionMismatch:
+        return 'mount_version_mismatch';
+      case InstallStatus.mountMissingInstallation:
+        return 'mount_missing_installation';
+      case InstallStatus.statusFailureBlocked:
+        return 'status_failure_blocked';
+      case InstallStatus.installFailedVerificationFailure:
+        return 'install_failed_verification_failure';
+      case InstallStatus.statusFailureInvalid:
+        return 'status_failure_invalid';
+      case InstallStatus.installFailedVersionDowngrade:
+        return 'install_failed_version_downgrade';
+      case InstallStatus.statusFailureConflict:
+        return 'status_failure_conflict';
+      case InstallStatus.statusFailureStorage:
+        return 'status_failure_storage';
+      case InstallStatus.statusFailureIncompatible:
+        return 'status_failure_incompatible';
+      case InstallStatus.statusFailureTimeout:
+        return 'status_failure_timeout';
+    }
+  }
+}

lib/services/revanced_api.dart

@@ -3,46 +3,28 @@ import 'dart:io';
 
 import 'package:collection/collection.dart';
 import 'package:dio/dio.dart';
-import 'package:dio_cache_interceptor/dio_cache_interceptor.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:injectable/injectable.dart';
+import 'package:revanced_manager/app/app.locator.dart';
+import 'package:revanced_manager/services/download_manager.dart';
+import 'package:revanced_manager/services/manager_api.dart';
+import 'package:synchronized/synchronized.dart';
 import 'package:timeago/timeago.dart';
 
 @lazySingleton
 class RevancedAPI {
-  late Dio _dio = Dio();
+  late final Dio _dio;
+  late final DownloadManager _downloadManager = locator<DownloadManager>();
 
-  final _cacheOptions = CacheOptions(
-    store: MemCacheStore(),
-    maxStale: const Duration(days: 1),
-    priority: CachePriority.high,
-  );
+  final Lock getToolsLock = Lock();
 
-  Future<void> initialize(String apiUrl) async {
-    try {
-      _dio = Dio(
-        BaseOptions(
-          baseUrl: apiUrl,
-        ),
-      );
-
-      _dio.interceptors.add(DioCacheInterceptor(options: _cacheOptions));
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-    }
+  Future<void> initialize(String repoUrl) async {
+    _dio = _downloadManager.initDio(repoUrl);
   }
 
   Future<void> clearAllCache() async {
-    try {
-      await _cacheOptions.store!.clean();
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-    }
+    await _downloadManager.clearAllCache();
   }
 
   Future<Map<String, List<dynamic>>> getContributors() async {
@@ -51,7 +33,7 @@ class RevancedAPI {
       final response = await _dio.get('/contributors');
       final List<dynamic> repositories = response.data['repositories'];
       for (final Map<String, dynamic> repo in repositories) {
-        final String name = repo['name'];
+        final String name = repo['name'].toLowerCase();
         contributors[name] = repo['contributors'];
       }
     } on Exception catch (e) {
@@ -66,21 +48,26 @@ class RevancedAPI {
   Future<Map<String, dynamic>?> _getLatestRelease(
     String extension,
     String repoName,
-  ) async {
-    try {
-      final response = await _dio.get('/tools');
-      final List<dynamic> tools = response.data['tools'];
-      return tools.firstWhereOrNull(
-        (t) =>
-            t['repository'] == repoName &&
-            (t['name'] as String).endsWith(extension),
-      );
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-      return null;
+  ) {
+    if (!locator<ManagerAPI>().getDownloadConsent()) {
+      return Future(() => null);
     }
+    return getToolsLock.synchronized(() async {
+      try {
+        final response = await _dio.get('/tools');
+        final List<dynamic> tools = response.data['tools'];
+        return tools.firstWhereOrNull(
+          (t) =>
+              (t['repository'] as String).toLowerCase() == repoName.toLowerCase() &&
+              (t['name'] as String).endsWith(extension),
+        );
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
+        }
+        return null;
+      }
+    });
   }
 
   Future<String?> getLatestReleaseVersion(
@@ -115,7 +102,7 @@ class RevancedAPI {
       );
       if (release != null) {
         final String url = release['browser_download_url'];
-        return await DefaultCacheManager().getSingleFile(url);
+        return await _downloadManager.getSingleFile(url);
       }
     } on Exception catch (e) {
       if (kDebugMode) {
@@ -147,9 +134,8 @@ class RevancedAPI {
       'revanced/revanced-manager',
     );
     File? outputFile;
-    await for (final result in DefaultCacheManager().getFileStream(
+    await for (final result in _downloadManager.getFileStream(
       release!['browser_download_url'] as String,
-      withProgress: true,
     )) {
       if (result is DownloadProgress) {
         final totalSize = result.totalSize ?? 10000000;

lib/services/root_api.dart

@@ -2,10 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:root/root.dart';
 
 class RootAPI {
-  // TODO(ponces): remove in the future, keep it for now during migration.
-  final String _revancedOldDirPath = '/data/local/tmp/revanced-manager';
   final String _revancedDirPath = '/data/adb/revanced';
-  final String _postFsDataDirPath = '/data/adb/post-fs-data.d';
   final String _serviceDDirPath = '/data/adb/service.d';
 
   Future<bool> isRooted() async {
@@ -43,21 +40,22 @@ class RootAPI {
     String filePath,
   ) async {
     try {
+      final StringBuffer commands = StringBuffer();
       if (permissions.isNotEmpty) {
-        await Root.exec(
-          cmd: 'chmod $permissions "$filePath"',
-        );
+        commands.writeln('chmod $permissions $filePath');
       }
+
       if (ownerGroup.isNotEmpty) {
-        await Root.exec(
-          cmd: 'chown $ownerGroup "$filePath"',
-        );
+        commands.writeln('chown $ownerGroup $filePath');
       }
+
       if (seLinux.isNotEmpty) {
-        await Root.exec(
-          cmd: 'chcon $seLinux "$filePath"',
-        );
+        commands.writeln('chcon $seLinux $filePath');
       }
+
+      await Root.exec(
+        cmd: commands.toString(),
+      );
     } on Exception catch (e) {
       if (kDebugMode) {
         print(e);
@@ -75,18 +73,7 @@ class RootAPI {
   Future<List<String>> getInstalledApps() async {
     final List<String> apps = List.empty(growable: true);
     try {
-      String? res = await Root.exec(
-        cmd: 'ls "$_revancedDirPath"',
-      );
-      if (res != null) {
-        final List<String> list = res.split('\n');
-        list.removeWhere((pack) => pack.isEmpty);
-        apps.addAll(list.map((pack) => pack.trim()).toList());
-      }
-      // TODO(ponces): remove in the future, keep it for now during migration.
-      res = await Root.exec(
-        cmd: 'ls "$_revancedOldDirPath"',
-      );
+      final String? res = await Root.exec(cmd: 'ls $_revancedDirPath');
       if (res != null) {
         final List<String> list = res.split('\n');
         list.removeWhere((pack) => pack.isEmpty);
@@ -100,49 +87,36 @@ class RootAPI {
     return apps;
   }
 
-  Future<void> deleteApp(String packageName, String originalFilePath) async {
+  Future<void> uninstall(String packageName) async {
     await Root.exec(
-      cmd: 'am force-stop "$packageName"',
-    );
-    await Root.exec(
-      cmd: 'su -mm -c "umount -l $originalFilePath"',
-    );
-    // TODO(ponces): remove in the future, keep it for now during migration.
-    await Root.exec(
-      cmd: 'rm -rf "$_revancedOldDirPath/$packageName"',
-    );
-    await Root.exec(
-      cmd: 'rm -rf "$_revancedDirPath/$packageName"',
-    );
-    await Root.exec(
-      cmd: 'rm -rf "$_serviceDDirPath/$packageName.sh"',
-    );
-    await Root.exec(
-      cmd: 'rm -rf "$_postFsDataDirPath/$packageName.sh"',
+      cmd: '''
+          grep $packageName /proc/mounts | while read -r line; do echo \$line | cut -d " " -f 2 | sed "s/apk.*/apk/" | xargs -r umount -l; done
+          rm -rf $_revancedDirPath/$packageName $_serviceDDirPath/$packageName.sh
+          ''',
     );
   }
 
-  Future<bool> installApp(
+  Future<void> removeOrphanedFiles() async {
+    await Root.exec(
+      cmd: 'find $_revancedDirPath -type f -name original.apk -delete',
+    );
+  }
+
+  Future<bool> install(
     String packageName,
     String originalFilePath,
     String patchedFilePath,
   ) async {
     try {
-      await deleteApp(packageName, originalFilePath);
-      await Root.exec(
-        cmd: 'mkdir -p "$_revancedDirPath/$packageName"',
-      );
       await setPermissions(
         '0755',
         'shell:shell',
         '',
         '$_revancedDirPath/$packageName',
       );
-      await saveOriginalFilePath(packageName, originalFilePath);
+      await installPatchedApk(packageName, patchedFilePath);
       await installServiceDScript(packageName);
-      await installPostFsDataScript(packageName);
-      await installApk(packageName, patchedFilePath);
-      await mountApk(packageName, originalFilePath);
+      await runMountScript(packageName);
       return true;
     } on Exception catch (e) {
       if (kDebugMode) {
@@ -154,38 +128,48 @@ class RootAPI {
 
   Future<void> installServiceDScript(String packageName) async {
     await Root.exec(
-      cmd: 'mkdir -p "$_serviceDDirPath"',
+      cmd: 'mkdir -p $_serviceDDirPath',
     );
-    final String content = '#!/system/bin/sh\n'
-        'while [ "\$(getprop sys.boot_completed | tr -d \'"\'"\'\\\\r\'"\'"\')" != "1" ]; do sleep 3; done\n'
-        'base_path=$_revancedDirPath/$packageName/base.apk\n'
-        'stock_path=\$(pm path $packageName | grep base | sed \'"\'"\'s/package://g\'"\'"\')\n'
-        r'[ ! -z $stock_path ] && mount -o bind $base_path $stock_path';
+    final String mountScript = '''
+    #!/system/bin/sh
+    # Mount using Magisk mirror, if available.
+    MAGISKTMP="\$( magisk --path )" || MAGISKTMP=/sbin
+    MIRROR="\$MAGISKTMP/.magisk/mirror"
+    if [ ! -f \$MIRROR ]; then
+        MIRROR=""
+    fi
+
+    until [ "\$(getprop sys.boot_completed)" = 1 ]; do sleep 3; done
+    until [ -d "/sdcard/Android" ]; do sleep 1; done
+    
+    # Unmount any existing installation to prevent multiple unnecessary mounts.
+    grep $packageName /proc/mounts | while read -r line; do echo \$line | cut -d " " -f 2 | sed "s/apk.*/apk/" | xargs -r umount -l; done
+
+    base_path=$_revancedDirPath/$packageName/base.apk
+    stock_path=\$(pm path $packageName | grep base | sed "s/package://g" )
+
+    chcon u:object_r:apk_data_file:s0  \$base_path
+    mount -o bind \$MIRROR\$base_path \$stock_path
+
+    # Kill the app to force it to restart the mounted APK in case it is already running
+    am force-stop $packageName
+    '''
+        .trimMultilineString();
     final String scriptFilePath = '$_serviceDDirPath/$packageName.sh';
     await Root.exec(
-      cmd: 'echo \'$content\' > "$scriptFilePath"',
+      cmd: 'echo \'$mountScript\' > "$scriptFilePath"',
     );
     await setPermissions('0744', '', '', scriptFilePath);
   }
 
-  Future<void> installPostFsDataScript(String packageName) async {
-    await Root.exec(
-      cmd: 'mkdir -p "$_postFsDataDirPath"',
-    );
-    final String content = '#!/system/bin/sh\n'
-        'stock_path=\$(pm path $packageName | grep base | sed \'"\'"\'s/package://g\'"\'"\')\n'
-        r'[ ! -z $stock_path ] && umount -l $stock_path';
-    final String scriptFilePath = '$_postFsDataDirPath/$packageName.sh';
-    await Root.exec(
-      cmd: 'echo \'$content\' > "$scriptFilePath"',
-    );
-    await setPermissions('0744', '', '', scriptFilePath);
-  }
-
-  Future<void> installApk(String packageName, String patchedFilePath) async {
+  Future<void> installPatchedApk(
+      String packageName, String patchedFilePath,) async {
     final String newPatchedFilePath = '$_revancedDirPath/$packageName/base.apk';
     await Root.exec(
-      cmd: 'cp "$patchedFilePath" "$newPatchedFilePath"',
+      cmd: '''
+      mkdir -p $_revancedDirPath/$packageName
+      cp "$patchedFilePath" $newPatchedFilePath
+      ''',
     );
     await setPermissions(
       '0644',
@@ -195,50 +179,10 @@ class RootAPI {
     );
   }
 
-  Future<void> mountApk(String packageName, String originalFilePath) async {
-    final String newPatchedFilePath = '$_revancedDirPath/$packageName/base.apk';
-    await Root.exec(
-      cmd: 'am force-stop "$packageName"',
-    );
-    await Root.exec(
-      cmd: 'su -mm -c "umount -l $originalFilePath"',
-    );
-    await Root.exec(
-      cmd: 'su -mm -c "mount -o bind $newPatchedFilePath $originalFilePath"',
-    );
-  }
-
-  Future<bool> isMounted(String packageName) async {
-    final String? res = await Root.exec(
-      cmd: 'cat /proc/mounts | grep $packageName',
-    );
-    return res != null && res.isNotEmpty;
-  }
-
-  Future<void> saveOriginalFilePath(
+  Future<void> runMountScript(
     String packageName,
-    String originalFilePath,
   ) async {
-    final String originalRootPath =
-        '$_revancedDirPath/$packageName/original.apk';
-    await Root.exec(
-      cmd: 'mkdir -p "$_revancedDirPath/$packageName"',
-    );
-    await setPermissions(
-      '0755',
-      'shell:shell',
-      '',
-      '$_revancedDirPath/$packageName',
-    );
-    await Root.exec(
-      cmd: 'cp "$originalFilePath" "$originalRootPath"',
-    );
-    await setPermissions(
-      '0644',
-      'shell:shell',
-      'u:object_r:apk_data_file:s0',
-      originalFilePath,
-    );
+    await Root.exec(cmd: '.$_serviceDDirPath/$packageName.sh');
   }
 
   Future<bool> fileExists(String path) async {
@@ -255,3 +199,10 @@ class RootAPI {
     }
   }
 }
+
+// Remove leading spaces manually until
+// https://github.com/dart-lang/language/issues/559 is closed
+extension StringExtension on String {
+  String trimMultilineString() =>
+      split('\n').map((line) => line.trim()).join('\n').trim();
+}

lib/theme.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 var lightCustomColorScheme = ColorScheme.fromSeed(
-  seedColor: Colors.blue,
-  primary: const Color(0xff1B73E8),
+  seedColor: Colors.purple,
+  primary: const Color(0xFF4C51C0),
 );
 
 var lightCustomTheme = ThemeData(
@@ -21,10 +21,10 @@ var lightCustomTheme = ThemeData(
 );
 
 var darkCustomColorScheme = ColorScheme.fromSeed(
-  seedColor: Colors.blue,
+  seedColor: Colors.purple,
   brightness: Brightness.dark,
-  primary: const Color(0xffA5CAFF),
-  surface: const Color(0xff1B1A1D),
+  primary: const Color(0xFFBFC1FF),
+  surface: const Color(0xFF131316),
 );
 
 var darkCustomTheme = ThemeData(
@@ -38,7 +38,7 @@ var darkCustomTheme = ThemeData(
       ),
     ),
   ),
-  canvasColor: const Color(0xff1B1A1D),
-  scaffoldBackgroundColor: const Color(0xff1B1A1D),
+  canvasColor: const Color(0xFF131316),
+  scaffoldBackgroundColor: const Color(0xFF131316),
   textTheme: GoogleFonts.robotoTextTheme(ThemeData.dark().textTheme),
 );

lib/ui/theme/dynamic_theme_builder.dart

@@ -1,22 +1,57 @@
+import 'dart:ui';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:dynamic_themes/dynamic_themes.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/app/app.router.dart';
+import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/theme.dart';
 import 'package:stacked_services/stacked_services.dart';
 
-class DynamicThemeBuilder extends StatelessWidget {
+class DynamicThemeBuilder extends StatefulWidget {
   const DynamicThemeBuilder({
-    Key? key,
+    super.key,
     required this.title,
     required this.home,
     required this.localizationsDelegates,
-  }) : super(key: key);
+  });
   final String title;
   final Widget home;
   final Iterable<LocalizationsDelegate> localizationsDelegates;
 
+  @override
+  State<DynamicThemeBuilder> createState() => _DynamicThemeBuilderState();
+}
+
+class _DynamicThemeBuilderState extends State<DynamicThemeBuilder>
+    with WidgetsBindingObserver {
+  Brightness brightness = PlatformDispatcher.instance.platformBrightness;
+  final ManagerAPI _managerAPI = locator<ManagerAPI>();
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addObserver(this);
+  }
+
+  @override
+  void didChangePlatformBrightness() {
+    setState(() {
+      brightness = PlatformDispatcher.instance.platformBrightness;
+    });
+    if (_managerAPI.getThemeMode() < 2) {
+      SystemChrome.setSystemUIOverlayStyle(
+        SystemUiOverlayStyle(
+          systemNavigationBarIconBrightness: brightness == Brightness.light
+              ? Brightness.dark
+              : Brightness.light,
+        ),
+      );
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return DynamicColorBuilder(
@@ -50,24 +85,39 @@ class DynamicThemeBuilder extends StatelessWidget {
         return DynamicTheme(
           themeCollection: ThemeCollection(
             themes: {
-              0: lightCustomTheme,
-              1: darkCustomTheme,
-              2: lightDynamicTheme,
-              3: darkDynamicTheme,
+              0: brightness == Brightness.light
+                  ? lightCustomTheme
+                  : darkCustomTheme,
+              1: brightness == Brightness.light
+                  ? lightDynamicTheme
+                  : darkDynamicTheme,
+              2: lightCustomTheme,
+              3: lightDynamicTheme,
+              4: darkCustomTheme,
+              5: darkDynamicTheme,
             },
-            fallbackTheme: lightCustomTheme,
+            fallbackTheme: PlatformDispatcher.instance.platformBrightness ==
+                    Brightness.light
+                ? lightCustomTheme
+                : darkCustomTheme,
           ),
           builder: (context, theme) => MaterialApp(
             debugShowCheckedModeBanner: false,
-            title: title,
+            title: widget.title,
             navigatorKey: StackedService.navigatorKey,
             onGenerateRoute: StackedRouter().onGenerateRoute,
             theme: theme,
-            home: home,
-            localizationsDelegates: localizationsDelegates,
+            home: widget.home,
+            localizationsDelegates: widget.localizationsDelegates,
           ),
         );
       },
     );
   }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
 }

lib/ui/views/app_selector/app_selector_view.dart

@@ -4,11 +4,12 @@ import 'package:revanced_manager/ui/views/app_selector/app_selector_viewmodel.da
 import 'package:revanced_manager/ui/widgets/appSelectorView/app_skeleton_loader.dart';
 import 'package:revanced_manager/ui/widgets/appSelectorView/installed_app_item.dart';
 import 'package:revanced_manager/ui/widgets/appSelectorView/not_installed_app_item.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_floating_action_button_extended.dart';
 import 'package:revanced_manager/ui/widgets/shared/search_bar.dart';
 import 'package:stacked/stacked.dart' hide SkeletonLoader;
 
 class AppSelectorView extends StatefulWidget {
-  const AppSelectorView({Key? key}) : super(key: key);
+  const AppSelectorView({super.key});
 
   @override
   State<AppSelectorView> createState() => _AppSelectorViewState();
@@ -23,13 +24,11 @@ class _AppSelectorViewState extends State<AppSelectorView> {
       onViewModelReady: (model) => model.initialize(),
       viewModelBuilder: () => AppSelectorViewModel(),
       builder: (context, model, child) => Scaffold(
-        resizeToAvoidBottomInset: false,
-        floatingActionButton: FloatingActionButton.extended(
+        floatingActionButton: HapticFloatingActionButtonExtended(
           label: I18nText('appSelectorView.storageButton'),
           icon: const Icon(Icons.sd_storage),
           onPressed: () {
             model.selectAppFromStorage(context);
-            Navigator.of(context).pop();
           },
         ),
         body: CustomScrollView(
@@ -39,12 +38,10 @@ class _AppSelectorViewState extends State<AppSelectorView> {
               floating: true,
               title: I18nText(
                 'appSelectorView.viewTitle',
-                child: Text(
-                  '',
-                  style: TextStyle(
-                    color: Theme.of(context).textTheme.titleLarge!.color,
-                  ),
-                ),
+              ),
+              titleTextStyle: TextStyle(
+                fontSize: 22.0,
+                color: Theme.of(context).textTheme.titleLarge!.color,
               ),
               leading: IconButton(
                 icon: Icon(
@@ -54,7 +51,7 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                 onPressed: () => Navigator.of(context).pop(),
               ),
               bottom: PreferredSize(
-                preferredSize: const Size.fromHeight(64.0),
+                preferredSize: const Size.fromHeight(66.0),
                 child: Padding(
                   padding: const EdgeInsets.symmetric(
                     vertical: 8.0,
@@ -98,9 +95,7 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                           ),
                           child: Column(
                             children: [
-                              ...model
-                                  .getFilteredApps(_query)
-                                  .map(
+                              ...model.getFilteredApps(_query).map(
                                     (app) => InstalledAppItem(
                                       name: app.appName,
                                       pkgName: app.packageName,
@@ -116,12 +111,13 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                                         context,
                                         app.packageName,
                                       ),
+                                      onLinkTap: () =>
+                                          model.searchSuggestedVersionOnWeb(
+                                        packageName: app.packageName,
+                                      ),
                                     ),
-                                  )
-                                  .toList(),
-                              ...model
-                                  .getFilteredAppsNames(_query)
-                                  .map(
+                                  ),
+                              ...model.getFilteredAppsNames(_query).map(
                                     (app) => NotInstalledAppItem(
                                       name: app,
                                       patchesCount: model.patchesCount(app),
@@ -130,9 +126,12 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                                       onTap: () {
                                         model.showDownloadToast();
                                       },
+                                      onLinkTap: () =>
+                                          model.searchSuggestedVersionOnWeb(
+                                        packageName: app,
+                                      ),
                                     ),
-                                  )
-                                  .toList(),
+                                  ),
                               const SizedBox(height: 70.0),
                             ],
                           ),

lib/ui/views/app_selector/app_selector_viewmodel.dart

@@ -1,9 +1,10 @@
 import 'dart:io';
 
 import 'package:device_apps/device_apps.dart';
-import 'package:file_picker/file_picker.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_file_dialog/flutter_file_dialog.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
@@ -12,7 +13,7 @@ import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:revanced_manager/utils/check_for_supported_patch.dart';
 import 'package:stacked/stacked.dart';
 
 class AppSelectorViewModel extends BaseViewModel {
@@ -69,17 +70,67 @@ class AppSelectorViewModel extends BaseViewModel {
     return true;
   }
 
-  Future<void> selectApp(ApplicationWithIcon application) async {
+  Future<void> searchSuggestedVersionOnWeb({
+    required String packageName,
+  }) async {
+    final String suggestedVersion = getSuggestedVersion(packageName);
+
+    if (suggestedVersion.isNotEmpty) {
+      await openDefaultBrowser('$packageName apk version $suggestedVersion');
+    } else {
+      await openDefaultBrowser('$packageName apk');
+    }
+  }
+
+  Future<void> openDefaultBrowser(String query) async {
+    if (Platform.isAndroid) {
+      try {
+        const platform = MethodChannel('app.revanced.manager.flutter/browser');
+        await platform.invokeMethod('openBrowser', {'query': query});
+      } catch (e) {
+        if (kDebugMode) {
+          print(e);
+        }
+      }
+    } else {
+      throw 'Platform not supported';
+    }
+  }
+
+  Future<void> selectApp(
+    BuildContext context,
+    ApplicationWithIcon application, [
+    bool isFromStorage = false,
+  ]) async {
+    final String suggestedVersion =
+        getSuggestedVersion(application.packageName);
+    if (application.versionName != suggestedVersion &&
+        suggestedVersion.isNotEmpty) {
+      _managerAPI.suggestedAppVersionSelected = false;
+      if (_managerAPI.isRequireSuggestedAppVersionEnabled() &&
+          context.mounted) {
+        return showRequireSuggestedAppVersionDialog(
+          context,
+          application.versionName!,
+          suggestedVersion,
+        );
+      }
+    } else {
+      _managerAPI.suggestedAppVersionSelected = true;
+    }
     locator<PatcherViewModel>().selectedApp = PatchedApplication(
       name: application.appName,
       packageName: application.packageName,
-      originalPackageName: application.packageName,
       version: application.versionName!,
       apkFilePath: application.apkFilePath,
       icon: application.icon,
       patchDate: DateTime.now(),
+      isFromStorage: isFromStorage,
     );
-    locator<PatcherViewModel>().loadLastSelectedPatches();
+    await locator<PatcherViewModel>().loadLastSelectedPatches();
+    if (context.mounted) {
+      Navigator.pop(context);
+    }
   }
 
   Future<void> canSelectInstalled(
@@ -89,19 +140,63 @@ class AppSelectorViewModel extends BaseViewModel {
     final app =
         await DeviceApps.getApp(packageName, true) as ApplicationWithIcon?;
     if (app != null) {
-      if (await checkSplitApk(packageName) && !isRooted) {
-        return showSelectFromStorageDialog(context);
-      } else if (!await checkSplitApk(packageName) || isRooted) {
-        selectApp(app);
-        Navigator.pop(context);
+      final bool isSplitApk = await checkSplitApk(packageName);
+      if (isRooted || !isSplitApk) {
+        if (context.mounted) {
+          await selectApp(context, app);
+        }
+        final List<Option> requiredNullOptions = getNullRequiredOptions(
+          locator<PatcherViewModel>().selectedPatches,
+          packageName,
+        );
+        if (requiredNullOptions.isNotEmpty) {
+          locator<PatcherViewModel>().showRequiredOptionDialog();
+        }
+      } else {
+        if (context.mounted) {
+          return showSelectFromStorageDialog(context);
+        }
       }
     }
   }
 
+  Future showRequireSuggestedAppVersionDialog(
+    BuildContext context,
+    String selectedVersion,
+    String suggestedVersion,
+  ) async {
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: I18nText('warning'),
+        content: I18nText(
+          'appSelectorView.requireSuggestedAppVersionDialogText',
+          translationParams: {
+            'suggested': suggestedVersion,
+            'selected': selectedVersion,
+          },
+          child: const Text(
+            '',
+            style: TextStyle(
+              fontSize: 16,
+              fontWeight: FontWeight.w500,
+            ),
+          ),
+        ),
+        actions: [
+          FilledButton(
+            onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('okButton'),
+          ),
+        ],
+      ),
+    );
+  }
+
   Future showSelectFromStorageDialog(BuildContext context) async {
     return showDialog(
       context: context,
-      builder: (context) => SimpleDialog(
+      builder: (innerContext) => SimpleDialog(
         alignment: Alignment.center,
         contentPadding:
             const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
@@ -110,7 +205,7 @@ class AppSelectorViewModel extends BaseViewModel {
           Icon(
             Icons.block,
             size: 28,
-            color: Theme.of(context).colorScheme.primary,
+            color: Theme.of(innerContext).colorScheme.primary,
           ),
           const SizedBox(height: 20),
           I18nText(
@@ -136,14 +231,12 @@ class AppSelectorViewModel extends BaseViewModel {
             ),
           ),
           const SizedBox(height: 30),
-          CustomMaterialButton(
-            onPressed: () => selectAppFromStorage(context).then(
-              (_) {
-                Navigator.pop(context);
-                Navigator.pop(context);
-              },
-            ),
-            label: Row(
+          FilledButton(
+            onPressed: () async {
+              Navigator.pop(innerContext);
+              await selectAppFromStorage(context);
+            },
+            child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
                 const Icon(Icons.sd_card),
@@ -153,12 +246,11 @@ class AppSelectorViewModel extends BaseViewModel {
             ),
           ),
           const SizedBox(height: 10),
-          CustomMaterialButton(
-            isFilled: false,
+          TextButton(
             onPressed: () {
-              Navigator.pop(context);
+              Navigator.pop(innerContext);
             },
-            label: Row(
+            child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
                 const SizedBox(width: 10),
@@ -173,13 +265,14 @@ class AppSelectorViewModel extends BaseViewModel {
 
   Future<void> selectAppFromStorage(BuildContext context) async {
     try {
-      final FilePickerResult? result = await FilePicker.platform.pickFiles(
-        type: FileType.custom,
-        allowedExtensions: ['apk'],
+      final String? result = await FlutterFileDialog.pickFile(
+        params: const OpenFileDialogParams(
+          fileExtensionsFilter: ['apk'],
+        ),
       );
-      if (result != null && result.files.single.path != null) {
-        final File apkFile = File(result.files.single.path!);
-        final List<String> pathSplit = result.files.single.path!.split('/');
+      if (result != null) {
+        final File apkFile = File(result);
+        final List<String> pathSplit = result.split('/');
         pathSplit.removeLast();
         final Directory filePickerCacheDir = Directory(pathSplit.join('/'));
         final Iterable<File> deletableFiles =
@@ -194,18 +287,8 @@ class AppSelectorViewModel extends BaseViewModel {
           apkFile.path,
           true,
         ) as ApplicationWithIcon?;
-        if (application != null) {
-          locator<PatcherViewModel>().selectedApp = PatchedApplication(
-            name: application.appName,
-            packageName: application.packageName,
-            originalPackageName: application.packageName,
-            version: application.versionName!,
-            apkFilePath: result.files.single.path!,
-            icon: application.icon,
-            patchDate: DateTime.now(),
-            isFromStorage: true,
-          );
-          locator<PatcherViewModel>().loadLastSelectedPatches();
+        if (application != null && context.mounted) {
+          await selectApp(context, application, true);
         }
       }
     } on Exception catch (e) {
@@ -222,7 +305,8 @@ class AppSelectorViewModel extends BaseViewModel {
           (app) =>
               query.isEmpty ||
               query.length < 2 ||
-              app.appName.toLowerCase().contains(query.toLowerCase()),
+              app.appName.toLowerCase().contains(query.toLowerCase()) ||
+              app.packageName.toLowerCase().contains(query.toLowerCase()),
         )
         .toList();
   }

lib/ui/views/contributors/contributors_view.dart

@@ -7,7 +7,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
 class ContributorsView extends StatelessWidget {
-  const ContributorsView({Key? key}) : super(key: key);
+  const ContributorsView({super.key});
 
   @override
   Widget build(BuildContext context) {

lib/ui/views/contributors/contributors_viewmodel.dart

@@ -14,9 +14,9 @@ class ContributorsViewModel extends BaseViewModel {
     final Map<String, List<dynamic>> contributors =
         await _managerAPI.getContributors();
     patcherContributors = contributors[_managerAPI.defaultPatcherRepo] ?? [];
-    patchesContributors = contributors[_managerAPI.getPatchesRepo()] ?? [];
+    patchesContributors = contributors[_managerAPI.getPatchesRepo().toLowerCase()] ?? [];
     integrationsContributors =
-        contributors[_managerAPI.getIntegrationsRepo()] ?? [];
+        contributors[_managerAPI.getIntegrationsRepo().toLowerCase()] ?? [];
     cliContributors = contributors[_managerAPI.defaultCliRepo] ?? [];
     managerContributors = contributors[_managerAPI.defaultManagerRepo] ?? [];
     notifyListeners();

lib/ui/views/home/home_view.dart

@@ -9,7 +9,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
 class HomeView extends StatelessWidget {
-  const HomeView({Key? key}) : super(key: key);
+  const HomeView({super.key});
 
   @override
   Widget build(BuildContext context) {

lib/ui/views/home/home_viewmodel.dart

@@ -1,14 +1,13 @@
 // ignore_for_file: use_build_context_synchronously
 import 'dart:async';
 import 'dart:io';
-import 'package:cross_connectivity/cross_connectivity.dart';
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:injectable/injectable.dart';
-import 'package:install_plugin/install_plugin.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/app/app.router.dart';
@@ -20,8 +19,8 @@ import 'package:revanced_manager/services/revanced_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/homeView/update_confirmation_dialog.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/homeView/update_confirmation_sheet.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_checkbox_list_tile.dart';
 import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
 
@@ -34,19 +33,35 @@ class HomeViewModel extends BaseViewModel {
   final RevancedAPI _revancedAPI = locator<RevancedAPI>();
   final Toast _toast = locator<Toast>();
   final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
-  DateTime? _lastUpdate;
   bool showUpdatableApps = false;
+  bool releaseBuild = false;
   List<PatchedApplication> patchedInstalledApps = [];
-  List<PatchedApplication> patchedUpdatableApps = [];
+  String _currentManagerVersion = '';
+  String _currentPatchesVersion = '';
   String? _latestManagerVersion = '';
   File? downloadedApk;
 
   Future<void> initialize(BuildContext context) async {
-    _latestManagerVersion = await _managerAPI.getLatestManagerVersion();
-    if (!_managerAPI.getPatchesConsent()) {
-      await showPatchesConsent(context);
+    _managerAPI.rePatchedSavedApps().then((_) => _getPatchedApps());
+    _currentManagerVersion = await _managerAPI.getCurrentManagerVersion();
+    if (!_managerAPI.getDownloadConsent()) {
+      await showDownloadConsent(context);
+      await forceRefresh(context);
+      return;
     }
+    _latestManagerVersion = await _managerAPI.getLatestManagerVersion();
+    _currentPatchesVersion = await _managerAPI.getCurrentPatchesVersion();
+    if (_managerAPI.showUpdateDialog() && await hasManagerUpdates()) {
+      showUpdateDialog(context, false);
+    }
+    if (!_managerAPI.isPatchesAutoUpdate() &&
+        _managerAPI.showUpdateDialog() &&
+        await hasPatchesUpdates()) {
+      showUpdateDialog(context, true);
+    }
+
     await _patcherAPI.initialize();
+
     await flutterLocalNotificationsPlugin.initialize(
       const InitializationSettings(
         android: AndroidInitializationSettings('ic_notification'),
@@ -56,7 +71,7 @@ class HomeViewModel extends BaseViewModel {
           _toast.showBottom('homeView.installingMessage');
           final File? managerApk = await _managerAPI.downloadManager();
           if (managerApk != null) {
-            await InstallPlugin.installApk(managerApk.path);
+            await _patcherAPI.installApk(context, managerApk.path);
           } else {
             _toast.showBottom('homeView.errorDownloadMessage');
           }
@@ -66,24 +81,25 @@ class HomeViewModel extends BaseViewModel {
     flutterLocalNotificationsPlugin
         .resolvePlatformSpecificImplementation<
             AndroidFlutterLocalNotificationsPlugin>()
-        ?.requestPermission();
-    final bool isConnected = await Connectivity().checkConnection();
+        ?.requestNotificationsPermission();
+
+    final bool isConnected =
+        await Connectivity().checkConnectivity() != ConnectivityResult.none;
     if (!isConnected) {
       _toast.showBottom('homeView.noConnection');
     }
+
     final NotificationAppLaunchDetails? notificationAppLaunchDetails =
         await flutterLocalNotificationsPlugin.getNotificationAppLaunchDetails();
     if (notificationAppLaunchDetails?.didNotificationLaunchApp ?? false) {
       _toast.showBottom('homeView.installingMessage');
       final File? managerApk = await _managerAPI.downloadManager();
       if (managerApk != null) {
-        await InstallPlugin.installApk(managerApk.path);
+        await _patcherAPI.installApk(context, managerApk.path);
       } else {
         _toast.showBottom('homeView.errorDownloadMessage');
       }
     }
-    _getPatchedApps();
-    _managerAPI.reAssessSavedApps().then((_) => _getPatchedApps());
   }
 
   void navigateToAppInfo(PatchedApplication app) {
@@ -108,25 +124,17 @@ class HomeViewModel extends BaseViewModel {
 
   void _getPatchedApps() {
     patchedInstalledApps = _managerAPI.getPatchedApps().toList();
-    patchedUpdatableApps = _managerAPI
-        .getPatchedApps()
-        .where((app) => app.hasUpdates == true)
-        .toList();
     notifyListeners();
   }
 
   Future<bool> hasManagerUpdates() async {
-    String currentVersion = await _managerAPI.getCurrentManagerVersion();
-
-    // add v to current version
-    if (!currentVersion.startsWith('v')) {
-      currentVersion = 'v$currentVersion';
+    if (!_managerAPI.releaseBuild) {
+      return false;
     }
-
     _latestManagerVersion =
-        await _managerAPI.getLatestManagerVersion() ?? currentVersion;
+        await _managerAPI.getLatestManagerVersion() ?? _currentManagerVersion;
 
-    if (_latestManagerVersion != currentVersion) {
+    if (_latestManagerVersion != _currentManagerVersion) {
       return true;
     }
     return false;
@@ -134,13 +142,12 @@ class HomeViewModel extends BaseViewModel {
 
   Future<bool> hasPatchesUpdates() async {
     final String? latestVersion = await _managerAPI.getLatestPatchesVersion();
-    final String currentVersion = await _managerAPI.getCurrentPatchesVersion();
     if (latestVersion != null) {
       try {
         final int latestVersionInt =
             int.parse(latestVersion.replaceAll(RegExp('[^0-9]'), ''));
         final int currentVersionInt =
-            int.parse(currentVersion.replaceAll(RegExp('[^0-9]'), ''));
+            int.parse(_currentPatchesVersion.replaceAll(RegExp('[^0-9]'), ''));
         return latestVersionInt > currentVersionInt;
       } on Exception catch (e) {
         if (kDebugMode) {
@@ -168,22 +175,98 @@ class HomeViewModel extends BaseViewModel {
     }
   }
 
-  Future<void> showPatchesConsent(BuildContext context) async {
+  Future<void> showDownloadConsent(BuildContext context) async {
     final ValueNotifier<bool> autoUpdate = ValueNotifier(true);
     await showDialog(
       context: context,
       barrierDismissible: false,
-      builder: (context) => AlertDialog(
-        title: const Text('Download ReVanced Patches?'),
+      builder: (context) => PopScope(
+        canPop: false,
+        child: AlertDialog(
+          title: I18nText('homeView.downloadConsentDialogTitle'),
+          content: ValueListenableBuilder(
+            valueListenable: autoUpdate,
+            builder: (context, value, child) {
+              return Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  I18nText(
+                    'homeView.downloadConsentDialogText',
+                    child: Text(
+                      '',
+                      style: TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context).colorScheme.secondary,
+                      ),
+                    ),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(vertical: 10),
+                    child: I18nText(
+                      'homeView.downloadConsentDialogText2',
+                      translationParams: {
+                        'url': _managerAPI.defaultApiUrl.split('/')[2],
+                      },
+                      child: Text(
+                        '',
+                        style: TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.w500,
+                          color: Theme.of(context).colorScheme.error,
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              );
+            },
+          ),
+          actions: [
+            TextButton(
+              onPressed: () async {
+                _managerAPI.setDownloadConsent(false);
+                SystemNavigator.pop();
+              },
+              child: I18nText('quitButton'),
+            ),
+            FilledButton(
+              onPressed: () async {
+                _managerAPI.setDownloadConsent(true);
+                _managerAPI.setPatchesAutoUpdate(autoUpdate.value);
+                Navigator.of(context).pop();
+              },
+              child: I18nText('okButton'),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void showUpdateDialog(BuildContext context, bool isPatches) {
+    final ValueNotifier<bool> noShow =
+        ValueNotifier(!_managerAPI.showUpdateDialog());
+    showDialog(
+      context: context,
+      builder: (innerContext) => AlertDialog(
+        title: I18nText('homeView.updateDialogTitle'),
         content: ValueListenableBuilder(
-          valueListenable: autoUpdate,
+          valueListenable: noShow,
           builder: (context, value, child) {
             return Column(
               mainAxisSize: MainAxisSize.min,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 I18nText(
-                  'homeView.patchesConsentDialogText',
+                  'homeView.updateDialogText',
+                  translationParams: {
+                    'file': isPatches ? 'ReVanced Patches' : 'ReVanced Manager',
+                    'version': isPatches
+                        ? _currentPatchesVersion
+                        : _currentManagerVersion,
+                  },
                   child: Text(
                     '',
                     style: TextStyle(
@@ -193,34 +276,18 @@ class HomeViewModel extends BaseViewModel {
                     ),
                   ),
                 ),
-                Padding(
-                  padding: const EdgeInsets.symmetric(vertical: 10),
-                  child: I18nText(
-                    'homeView.patchesConsentDialogText2',
-                    translationParams: {
-                      'url': _managerAPI.defaultApiUrl.split('/')[2],
-                    },
-                    child: Text(
-                      '',
-                      style: TextStyle(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w500,
-                        color: Theme.of(context).colorScheme.error,
-                      ),
-                    ),
-                  ),
-                ),
-                CheckboxListTile(
+                const SizedBox(height: 10),
+                HapticCheckboxListTile(
                   value: value,
                   contentPadding: EdgeInsets.zero,
                   title: I18nText(
-                    'homeView.patchesConsentDialogText3',
+                    'noShowAgain',
                   ),
                   subtitle: I18nText(
-                    'homeView.patchesConsentDialogText3Sub',
+                    'homeView.changeLaterSubtitle',
                   ),
                   onChanged: (selected) {
-                    autoUpdate.value = selected!;
+                    noShow.value = selected!;
                   },
                 ),
               ],
@@ -228,21 +295,20 @@ class HomeViewModel extends BaseViewModel {
           },
         ),
         actions: [
-          CustomMaterialButton(
-            isFilled: false,
+          TextButton(
             onPressed: () async {
-              await _managerAPI.setPatchesConsent(false);
-              SystemNavigator.pop();
+              _managerAPI.setShowUpdateDialog(!noShow.value);
+              Navigator.pop(innerContext);
             },
-            label: I18nText('quitButton'),
+            child: I18nText('dismissButton'), // Decide later
           ),
-          CustomMaterialButton(
+          FilledButton(
             onPressed: () async {
-              await _managerAPI.setPatchesConsent(true);
-              await _managerAPI.setPatchesAutoUpdate(autoUpdate.value);
-              Navigator.of(context).pop();
+              _managerAPI.setShowUpdateDialog(!noShow.value);
+              Navigator.pop(innerContext);
+              await showUpdateConfirmationDialog(context, isPatches);
             },
-            label: I18nText('okButton'),
+            child: I18nText('showUpdateButton'),
           ),
         ],
       ),
@@ -274,119 +340,91 @@ class HomeViewModel extends BaseViewModel {
         builder: (context) => ValueListenableBuilder(
           valueListenable: downloaded,
           builder: (context, value, child) {
-            return SimpleDialog(
-              contentPadding: const EdgeInsets.all(16.0),
+            return AlertDialog(
               title: I18nText(
                 !value
                     ? 'homeView.downloadingMessage'
                     : 'homeView.downloadedMessage',
-                child: Text(
-                  '',
-                  style: TextStyle(
-                    fontSize: 20,
-                    fontWeight: FontWeight.w500,
-                    color: Theme.of(context).colorScheme.secondary,
-                  ),
-                ),
               ),
-              children: [
-                Column(
-                  children: [
-                    Row(
+              content: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  if (!value)
+                    Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-                        Icon(
-                          Icons.new_releases_outlined,
-                          color: Theme.of(context).colorScheme.secondary,
+                        StreamBuilder<double>(
+                          initialData: 0.0,
+                          stream: _revancedAPI.managerUpdateProgress.stream,
+                          builder: (context, snapshot) {
+                            return LinearProgressIndicator(
+                              value: snapshot.data! * 0.01,
+                              valueColor: AlwaysStoppedAnimation<Color>(
+                                Theme.of(context).colorScheme.secondary,
+                              ),
+                            );
+                          },
                         ),
-                        const SizedBox(width: 8.0),
-                        Text(
-                          '$_latestManagerVersion',
-                          style: TextStyle(
-                            fontSize: 18,
-                            fontWeight: FontWeight.w500,
-                            color: Theme.of(context).colorScheme.secondary,
+                        const SizedBox(height: 16.0),
+                        Align(
+                          alignment: Alignment.centerRight,
+                          child: FilledButton(
+                            onPressed: () {
+                              _revancedAPI.disposeManagerUpdateProgress();
+                              Navigator.of(context).pop();
+                            },
+                            child: I18nText('cancelButton'),
                           ),
                         ),
                       ],
                     ),
-                    const SizedBox(height: 16.0),
-                    if (!value)
-                      Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          StreamBuilder<double>(
-                            initialData: 0.0,
-                            stream: _revancedAPI.managerUpdateProgress.stream,
-                            builder: (context, snapshot) {
-                              return LinearProgressIndicator(
-                                value: snapshot.data! * 0.01,
-                                valueColor: AlwaysStoppedAnimation<Color>(
-                                  Theme.of(context).colorScheme.secondary,
-                                ),
-                              );
-                            },
-                          ),
-                          const SizedBox(height: 16.0),
-                          Align(
-                            alignment: Alignment.centerRight,
-                            child: CustomMaterialButton(
-                              label: I18nText('cancelButton'),
-                              onPressed: () {
-                                _revancedAPI.disposeManagerUpdateProgress();
-                                Navigator.of(context).pop();
-                              },
+                  if (value)
+                    Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        I18nText(
+                          'homeView.installUpdate',
+                          child: Text(
+                            '',
+                            style: TextStyle(
+                              fontSize: 16,
+                              fontWeight: FontWeight.w500,
+                              color: Theme.of(context).colorScheme.secondary,
                             ),
                           ),
-                        ],
-                      ),
-                    if (value)
-                      Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          I18nText(
-                            'homeView.installUpdate',
-                            child: Text(
-                              '',
-                              style: TextStyle(
-                                fontSize: 20,
-                                fontWeight: FontWeight.w500,
-                                color: Theme.of(context).colorScheme.secondary,
+                        ),
+                        const SizedBox(height: 16.0),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.end,
+                          children: [
+                            Align(
+                              alignment: Alignment.centerRight,
+                              child: TextButton(
+                                onPressed: () {
+                                  Navigator.of(context).pop();
+                                },
+                                child: I18nText('cancelButton'),
                               ),
                             ),
-                          ),
-                          const SizedBox(height: 16.0),
-                          Row(
-                            mainAxisAlignment: MainAxisAlignment.end,
-                            children: [
-                              Align(
-                                alignment: Alignment.centerRight,
-                                child: CustomMaterialButton(
-                                  isFilled: false,
-                                  label: I18nText('cancelButton'),
-                                  onPressed: () {
-                                    Navigator.of(context).pop();
-                                  },
-                                ),
+                            const SizedBox(width: 8.0),
+                            Align(
+                              alignment: Alignment.centerRight,
+                              child: FilledButton(
+                                onPressed: () async {
+                                  await _patcherAPI.installApk(
+                                    context,
+                                    downloadedApk!.path,
+                                  );
+                                },
+                                child: I18nText('updateButton'),
                               ),
-                              const SizedBox(width: 8.0),
-                              Align(
-                                alignment: Alignment.centerRight,
-                                child: CustomMaterialButton(
-                                  label: I18nText('updateButton'),
-                                  onPressed: () async {
-                                    await InstallPlugin.installApk(
-                                      downloadedApk!.path,
-                                    );
-                                  },
-                                ),
-                              ),
-                            ],
-                          ),
-                        ],
-                      ),
-                  ],
-                ),
-              ],
+                            ),
+                          ],
+                        ),
+                      ],
+                    ),
+                ],
+              ),
             );
           },
         ),
@@ -420,7 +458,7 @@ class HomeViewModel extends BaseViewModel {
         //       UILocalNotificationDateInterpretation.absoluteTime,
         // );
         _toast.showBottom('homeView.installingMessage');
-        await InstallPlugin.installApk(managerApk.path);
+        await _patcherAPI.installApk(context, managerApk.path);
       } else {
         _toast.showBottom('homeView.errorDownloadMessage');
       }
@@ -438,16 +476,18 @@ class HomeViewModel extends BaseViewModel {
 
   Future<void> showUpdateConfirmationDialog(
     BuildContext parentContext,
-    bool isPatches,
-  ) {
+    bool isPatches, [
+    bool changelog = false,
+  ]) {
     return showModalBottomSheet(
       context: parentContext,
       isScrollControlled: true,
       shape: const RoundedRectangleBorder(
         borderRadius: BorderRadius.vertical(top: Radius.circular(24.0)),
       ),
-      builder: (context) => UpdateConfirmationDialog(
+      builder: (context) => UpdateConfirmationSheet(
         isPatches: isPatches,
+        changelog: changelog,
       ),
     );
   }
@@ -469,11 +509,7 @@ class HomeViewModel extends BaseViewModel {
   }
 
   Future<void> forceRefresh(BuildContext context) async {
-    await Future.delayed(const Duration(seconds: 1));
-    if (_lastUpdate == null ||
-        _lastUpdate!.difference(DateTime.now()).inSeconds > 2) {
-      _managerAPI.clearAllData();
-    }
+    _managerAPI.clearAllData();
     _toast.showBottom('homeView.refreshSuccess');
     initialize(context);
   }

lib/ui/views/installer/installer_view.dart

@@ -5,27 +5,42 @@ import 'package:revanced_manager/ui/views/installer/installer_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/installerView/gradient_progress_indicator.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_floating_action_button_extended.dart';
 import 'package:stacked/stacked.dart';
 
 class InstallerView extends StatelessWidget {
-  const InstallerView({Key? key}) : super(key: key);
+  const InstallerView({super.key});
 
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<InstallerViewModel>.reactive(
       onViewModelReady: (model) => model.initialize(context),
       viewModelBuilder: () => InstallerViewModel(),
-      builder: (context, model, child) => WillPopScope(
+      builder: (context, model, child) => PopScope(
+        onPopInvoked: (bool didPop) => model.onWillPop(context),
+        canPop: false,
         child: SafeArea(
           top: false,
-          bottom: false,
+          bottom: model.isPatching,
           child: Scaffold(
             floatingActionButton: Visibility(
-              visible: !model.isPatching,
-              child: FloatingActionButton.extended(
-                label: I18nText('installerView.installButton'),
-                icon: const Icon(Icons.file_download_outlined),
-                onPressed: () => model.installTypeDialog(context),
+              visible: !model.isPatching && !model.hasErrors,
+              child: HapticFloatingActionButtonExtended(
+                label: I18nText(
+                  model.isInstalled
+                      ? 'installerView.openButton'
+                      : 'installerView.installButton',
+                ),
+                icon: model.isInstalled
+                    ? const Icon(Icons.open_in_new)
+                    : const Icon(Icons.file_download_outlined),
+                onPressed: model.isInstalled
+                    ? () => {
+                          model.openApp(),
+                          model.cleanPatcher(),
+                          Navigator.of(context).pop(),
+                        }
+                    : () => model.installTypeDialog(context),
                 elevation: 0,
               ),
             ),
@@ -99,7 +114,6 @@ class InstallerView extends StatelessWidget {
             ),
           ),
         ),
-        onWillPop: () => model.onWillPop(context),
       ),
     );
   }

lib/ui/views/installer/installer_viewmodel.dart

@@ -13,10 +13,12 @@ import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/root_api.dart';
 import 'package:revanced_manager/services/toast.dart';
+import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:revanced_manager/utils/about_info.dart';
+import 'package:screenshot_callback/screenshot_callback.dart';
 import 'package:stacked/stacked.dart';
-import 'package:wakelock/wakelock.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
 
 class InstallerViewModel extends BaseViewModel {
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
@@ -29,6 +31,7 @@ class InstallerViewModel extends BaseViewModel {
     'app.revanced.manager.flutter/installer',
   );
   final ScrollController scrollController = ScrollController();
+  final ScreenshotCallback screenshotCallback = ScreenshotCallback();
   double? progress = 0.0;
   String logs = '';
   String headerLogs = '';
@@ -38,6 +41,7 @@ class InstallerViewModel extends BaseViewModel {
   bool hasErrors = false;
   bool isCanceled = false;
   bool cancel = false;
+  bool showPopupScreenshotWarning = true;
 
   Future<void> initialize(BuildContext context) async {
     isRooted = await _rootAPI.isRooted();
@@ -64,7 +68,13 @@ class InstallerViewModel extends BaseViewModel {
         } // ignore
       }
     }
-    await Wakelock.enable();
+    screenshotCallback.addListener(() {
+      if (showPopupScreenshotWarning) {
+        showPopupScreenshotWarning = false;
+        screenshotDetected(context);
+      }
+    });
+    await WakelockPlus.enable();
     await handlePlatformChannelMethods();
     await runPatcher();
   }
@@ -94,7 +104,7 @@ class InstallerViewModel extends BaseViewModel {
       isPatching = true;
       isInstalled = false;
       hasErrors = false;
-    } else if (value == 1.0) {
+    } else if (value == .85) {
       isPatching = false;
       hasErrors = false;
       await _managerAPI.savePatches(
@@ -105,6 +115,7 @@ class InstallerViewModel extends BaseViewModel {
     } else if (value == -100.0) {
       isPatching = false;
       hasErrors = true;
+      progress = 0.0;
     }
     if (header.isNotEmpty) {
       headerLogs = header;
@@ -117,10 +128,10 @@ class InstallerViewModel extends BaseViewModel {
       if (logs[logs.length - 1] == '\n') {
         logs = logs.substring(0, logs.length - 1);
       }
-      Future.delayed(const Duration(milliseconds: 500)).then((value) {
+      Future.delayed(const Duration(milliseconds: 100)).then((value) {
         scrollController.animateTo(
           scrollController.position.maxScrollExtent,
-          duration: const Duration(milliseconds: 200),
+          duration: const Duration(milliseconds: 100),
           curve: Curves.fastOutSlowIn,
         );
       });
@@ -130,28 +141,28 @@ class InstallerViewModel extends BaseViewModel {
 
   Future<void> runPatcher() async {
     try {
-      update(0.0, 'Initializing...', 'Initializing installer');
-      if (_patches.isNotEmpty) {
-        try {
-          update(0.1, '', 'Creating working directory');
-          await _patcherAPI.runPatcher(
-            _app.packageName,
-            _app.apkFilePath,
-            _patches,
-          );
-        } on Exception catch (e) {
-          update(
-            -100.0,
-            'Aborted...',
-            'An error occurred! Aborted\nError:\n$e',
-          );
-          if (kDebugMode) {
-            print(e);
-          }
-        }
-      } else {
-        update(-100.0, 'Aborted...', 'No app or patches selected! Aborted');
+      await _patcherAPI.runPatcher(
+        _app.packageName,
+        _app.apkFilePath,
+        _patches,
+      );
+    } on Exception catch (e) {
+      update(
+        -100.0,
+        'Failed...',
+        'Something went wrong:\n$e',
+      );
+      if (kDebugMode) {
+        print(e);
       }
+    }
+
+    // Necessary to reset the state of patches so that they
+    // can be reloaded again.
+    _managerAPI.patches.clear();
+    await _patcherAPI.loadPatches();
+
+    try {
       if (FlutterBackground.isBackgroundExecutionEnabled) {
         try {
           FlutterBackground.disableBackgroundExecution();
@@ -161,7 +172,7 @@ class InstallerViewModel extends BaseViewModel {
           } // ignore
         }
       }
-      await Wakelock.disable();
+      await WakelockPlus.disable();
     } on Exception catch (e) {
       if (kDebugMode) {
         print(e);
@@ -169,95 +180,269 @@ class InstallerViewModel extends BaseViewModel {
     }
   }
 
+  void _trimLogs(List<String> logLines, String keyword, String? newString) {
+    final lineCount = logLines.where((line) => line.endsWith(keyword)).length;
+    final index = logLines.indexWhere((line) => line.endsWith(keyword));
+    if (newString != null && lineCount > 0) {
+      logLines.insert(
+        index,
+        newString.replaceAll('{lineCount}', lineCount.toString()),
+      );
+    }
+    logLines.removeWhere((lines) => lines.endsWith(keyword));
+  }
+
+  dynamic _getPatchOptionValue(String patchName, Option option) {
+    final Option? savedOption =
+        _managerAPI.getPatchOption(_app.packageName, patchName, option.key);
+    if (savedOption != null) {
+      return savedOption.value;
+    } else {
+      return option.value;
+    }
+  }
+
+  String _formatPatches(List<Patch> patches, String noneString) {
+    return patches.isEmpty
+        ? noneString
+        : patches.map((p) {
+            final optionsChanged = p.options
+                .where((o) => _getPatchOptionValue(p.name, o) != o.value)
+                .toList();
+            return p.name +
+                (optionsChanged.isEmpty
+                    ? ''
+                    : ' [${optionsChanged.map((o) => '${o.title}: ${_getPatchOptionValue(p.name, o)}').join(", ")}]');
+          }).join(', ');
+  }
+
+  String _getSuggestedVersion(String packageName) {
+    String suggestedVersion = _patcherAPI.getSuggestedVersion(_app.packageName);
+    if (suggestedVersion.isEmpty) {
+      suggestedVersion = 'Any';
+    }
+    return suggestedVersion;
+  }
+
+  Future<void> copyLogs() async {
+    final info = await AboutInfo.getInfo();
+
+    // Trim out extra lines
+    final logsTrimmed = logs.split('\n');
+    _trimLogs(logsTrimmed, 'succeeded', 'Applied {lineCount} patches');
+    _trimLogs(logsTrimmed, '.dex', 'Compiled {lineCount} dex files');
+
+    // Get patches added / removed
+    final defaultPatches = _patcherAPI
+        .getFilteredPatches(_app.packageName)
+        .where((p) => !p.excluded)
+        .toList();
+    final appliedPatchesNames = _patches.map((p) => p.name).toList();
+
+    final patchesAdded = _patches.where((p) => p.excluded).toList();
+    final patchesRemoved = defaultPatches
+        .where((p) => !appliedPatchesNames.contains(p.name))
+        .map((p) => p.name)
+        .toList();
+    final patchesOptionsChanged = defaultPatches
+        .where(
+          (p) =>
+              appliedPatchesNames.contains(p.name) &&
+              p.options.any((o) => _getPatchOptionValue(p.name, o) != o.value),
+        )
+        .toList();
+
+    // Add Info
+    final formattedLogs = [
+      '- Device Info',
+      'ReVanced Manager: ${info['version']}',
+      'Model: ${info['model']}',
+      'Android version: ${info['androidVersion']}',
+      'Supported architectures: ${info['supportedArch'].join(", ")}',
+      'Root permissions: ${isRooted ? 'Yes' : 'No'}', //
+
+      '\n- Patch Info',
+      'App: ${_app.packageName} v${_app.version} (Suggested: ${_getSuggestedVersion(_app.packageName)})',
+      'Patches version: ${_managerAPI.patchesVersion}',
+      'Patches added: ${_formatPatches(patchesAdded, 'Default')}',
+      'Patches removed: ${patchesRemoved.isEmpty ? 'None' : patchesRemoved.join(', ')}',
+      'Default patch options changed: ${_formatPatches(patchesOptionsChanged, 'None')}', //
+
+      '\n- Settings',
+      'Allow changing patch selection: ${_managerAPI.isPatchesChangeEnabled()}',
+      'Version compatibility check: ${_managerAPI.isVersionCompatibilityCheckEnabled()}',
+      'Show universal patches: ${_managerAPI.areUniversalPatchesEnabled()}',
+      'Patches source: ${_managerAPI.getPatchesRepo()}',
+      'Integration source: ${_managerAPI.getIntegrationsRepo()}', //
+
+      '\n- Logs',
+      logsTrimmed.join('\n'),
+    ];
+
+    Clipboard.setData(ClipboardData(text: formattedLogs.join('\n')));
+    _toast.showBottom('installerView.copiedToClipboard');
+  }
+
+  Future<void> screenshotDetected(BuildContext context) async {
+    await showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: I18nText(
+          'warning',
+        ),
+        icon: const Icon(Icons.warning),
+        content: SingleChildScrollView(
+          child: I18nText('installerView.screenshotDetected'),
+        ),
+        actions: <Widget>[
+          TextButton(
+            onPressed: () {
+              Navigator.of(context).pop();
+            },
+            child: I18nText('noButton'),
+          ),
+          FilledButton(
+            onPressed: () {
+              copyLogs();
+              showPopupScreenshotWarning = true;
+              Navigator.of(context).pop();
+            },
+            child: I18nText('yesButton'),
+          ),
+        ],
+      ),
+    );
+  }
+
   Future<void> installTypeDialog(BuildContext context) async {
     final ValueNotifier<int> installType = ValueNotifier(0);
     if (isRooted) {
       await showDialog(
         context: context,
         barrierDismissible: false,
-        builder: (context) => AlertDialog(
+        builder: (innerContext) => AlertDialog(
           title: I18nText(
             'installerView.installType',
           ),
-          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
           icon: const Icon(Icons.file_download_outlined),
           contentPadding: const EdgeInsets.symmetric(vertical: 16),
-          content: ValueListenableBuilder(
-            valueListenable: installType,
-            builder: (context, value, child) {
-              return Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Padding(
-                    padding: const EdgeInsets.symmetric(
-                      horizontal: 20,
-                      vertical: 10,
-                    ),
-                    child: I18nText(
-                      'installerView.installTypeDescription',
-                      child: Text(
-                        '',
-                        style: TextStyle(
-                          fontSize: 16,
-                          fontWeight: FontWeight.w500,
-                          color: Theme.of(context).colorScheme.secondary,
+          content: SingleChildScrollView(
+            child: ValueListenableBuilder(
+              valueListenable: installType,
+              builder: (context, value, child) {
+                return Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Padding(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 20,
+                        vertical: 10,
+                      ),
+                      child: I18nText(
+                        'installerView.installTypeDescription',
+                        child: Text(
+                          '',
+                          style: TextStyle(
+                            fontSize: 16,
+                            fontWeight: FontWeight.w500,
+                            color: Theme.of(context).colorScheme.secondary,
+                          ),
                         ),
                       ),
                     ),
-                  ),
-                  RadioListTile(
-                    title: I18nText('installerView.installNonRootType'),
-                    subtitle: I18nText('installerView.installRecommendedType'),
-                    contentPadding: const EdgeInsets.symmetric(horizontal: 10),
-                    value: 0,
-                    groupValue: value,
-                    onChanged: (selected) {
-                      installType.value = selected!;
-                    },
-                  ),
-                  RadioListTile(
-                    title: I18nText('installerView.installRootType'),
-                    contentPadding: const EdgeInsets.symmetric(horizontal: 10),
-                    value: 1,
-                    groupValue: value,
-                    onChanged: (selected) {
-                      installType.value = selected!;
-                    },
-                  ),
-                ],
-              );
-            },
-          ),
-          actions: [
-            CustomMaterialButton(
-              label: I18nText('cancelButton'),
-              isFilled: false,
-              onPressed: () {
-                Navigator.of(context).pop();
+                    RadioListTile(
+                      title: I18nText('installerView.installNonRootType'),
+                      contentPadding:
+                          const EdgeInsets.symmetric(horizontal: 16),
+                      value: 0,
+                      groupValue: value,
+                      onChanged: (selected) {
+                        installType.value = selected!;
+                      },
+                    ),
+                    RadioListTile(
+                      title: I18nText('installerView.installRootType'),
+                      contentPadding:
+                          const EdgeInsets.symmetric(horizontal: 16),
+                      value: 1,
+                      groupValue: value,
+                      onChanged: (selected) {
+                        installType.value = selected!;
+                      },
+                    ),
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 16),
+                      child: I18nText(
+                        'installerView.warning',
+                        child: Text(
+                          '',
+                          style: TextStyle(
+                            fontWeight: FontWeight.w500,
+                            color: Theme.of(context).colorScheme.error,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+                );
               },
             ),
-            CustomMaterialButton(
-              label: I18nText('installerView.installButton'),
+          ),
+          actions: [
+            TextButton(
               onPressed: () {
-                Navigator.of(context).pop();
+                Navigator.of(innerContext).pop();
+              },
+              child: I18nText('cancelButton'),
+            ),
+            FilledButton(
+              onPressed: () {
+                Navigator.of(innerContext).pop();
                 installResult(context, installType.value == 1);
               },
+              child: I18nText('installerView.installButton'),
             ),
           ],
         ),
       );
     } else {
-      installResult(context, false);
+      await showDialog(
+        context: context,
+        barrierDismissible: false,
+        builder: (innerContext) => AlertDialog(
+          title: I18nText(
+            'warning',
+          ),
+          contentPadding: const EdgeInsets.all(16),
+          content: I18nText('installerView.warning'),
+          actions: [
+            TextButton(
+              onPressed: () {
+                Navigator.of(innerContext).pop();
+              },
+              child: I18nText('cancelButton'),
+            ),
+            FilledButton(
+              onPressed: () {
+                Navigator.of(innerContext).pop();
+                installResult(context, false);
+              },
+              child: I18nText('installerView.installButton'),
+            ),
+          ],
+        ),
+      );
     }
   }
 
   Future<void> stopPatcher() async {
     try {
       isCanceled = true;
-      update(0.5, 'Aborting...', 'Canceling patching process');
+      update(0.5, 'Canceling...', 'Canceling patching process');
       await _patcherAPI.stopPatcher();
-      update(-100.0, 'Aborted...', 'Press back to exit');
+      await WakelockPlus.disable();
+      update(-100.0, 'Canceled...', 'Press back to exit');
     } on Exception catch (e) {
       if (kDebugMode) {
         print(e);
@@ -268,56 +453,47 @@ class InstallerViewModel extends BaseViewModel {
   Future<void> installResult(BuildContext context, bool installAsRoot) async {
     try {
       _app.isRooted = installAsRoot;
-      final bool hasMicroG =
-          _patches.any((p) => p.name.endsWith('MicroG support'));
-      final bool rootMicroG = installAsRoot && hasMicroG;
-      final bool rootFromStorage = installAsRoot && _app.isFromStorage;
-      final bool ytWithoutRootMicroG =
-          !installAsRoot && !hasMicroG && _app.packageName.contains('youtube');
-      if (rootMicroG || rootFromStorage || ytWithoutRootMicroG) {
-        return showDialog(
-          context: context,
-          builder: (context) => AlertDialog(
-            title: I18nText('installerView.installErrorDialogTitle'),
-            backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-            content: I18nText(
-              rootMicroG
-                  ? 'installerView.installErrorDialogText1'
-                  : rootFromStorage
-                      ? 'installerView.installErrorDialogText3'
-                      : 'installerView.installErrorDialogText2',
-            ),
-            actions: <Widget>[
-              CustomMaterialButton(
-                label: I18nText('okButton'),
-                onPressed: () => Navigator.of(context).pop(),
-              ),
-            ],
-          ),
+      if (headerLogs != 'Installing...') {
+        update(
+          .85,
+          'Installing...',
+          _app.isRooted ? 'Mounting patched app' : 'Installing patched app',
         );
+      }
+      final int response = await _patcherAPI.installPatchedFile(context, _app);
+      if (response == 0) {
+        isInstalled = true;
+        _app.isFromStorage = false;
+        _app.patchDate = DateTime.now();
+        _app.appliedPatches = _patches.map((p) => p.name).toList();
+
+        // In case a patch changed the app name or package name,
+        // update the app info.
+        final app =
+            await DeviceApps.getAppFromStorage(_patcherAPI.outFile!.path);
+        if (app != null) {
+          _app.name = app.appName;
+          _app.packageName = app.packageName;
+        }
+
+        await _managerAPI.savePatchedApp(_app);
+        await locator<HomeViewModel>().initialize(context);
+
+        update(1.0, 'Installed', 'Installed');
+      } else if (response == 3) {
+        update(
+          .85,
+          'Installation canceled',
+          'Installation canceled',
+        );
+      } else if (response == 10) {
+        installResult(context, installAsRoot);
       } else {
         update(
-          1.0,
-          'Installing...',
-          _app.isRooted
-              ? 'Installing patched file using root method'
-              : 'Installing patched file using nonroot method',
+          .85,
+          'Installation failed',
+          'Installation failed',
         );
-        isInstalled = await _patcherAPI.installPatchedFile(_app);
-        if (isInstalled) {
-          update(1.0, 'Installed!', 'Installed!');
-          _app.isFromStorage = false;
-          _app.patchDate = DateTime.now();
-          _app.appliedPatches = _patches.map((p) => p.name).toList();
-          if (hasMicroG) {
-            _app.name += ' ReVanced';
-            _app.packageName = _app.packageName.replaceFirst(
-              'com.google.',
-              'app.revanced.',
-            );
-          }
-          await _managerAPI.savePatchedApp(_app);
-        }
       }
     } on Exception catch (e) {
       if (kDebugMode) {
@@ -336,10 +512,6 @@ class InstallerViewModel extends BaseViewModel {
     }
   }
 
-  void exportLog() {
-    _patcherAPI.exportPatcherLog(logs);
-  }
-
   Future<void> cleanPatcher() async {
     try {
       _patcherAPI.cleanPatcher();
@@ -363,7 +535,7 @@ class InstallerViewModel extends BaseViewModel {
         exportResult();
         break;
       case 1:
-        exportLog();
+        copyLogs();
         break;
     }
   }
@@ -385,6 +557,7 @@ class InstallerViewModel extends BaseViewModel {
     } else {
       _patcherAPI.cleanPatcher();
     }
+    screenshotCallback.dispose();
     Navigator.of(context).pop();
     return true;
   }

lib/ui/views/navigation/navigation_view.dart

@@ -6,21 +6,17 @@ import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart';
 import 'package:stacked/stacked.dart';
 
 class NavigationView extends StatelessWidget {
-  const NavigationView({Key? key}) : super(key: key);
+  const NavigationView({super.key});
 
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<NavigationViewModel>.reactive(
       onViewModelReady: (model) => model.initialize(context),
       viewModelBuilder: () => locator<NavigationViewModel>(),
-      builder: (context, model, child) => WillPopScope(
-        onWillPop: () async {
-          if (model.currentIndex == 0) {
-            return true;
-          } else {
-            model.setIndex(0);
-            return false;
-          }
+      builder: (context, model, child) => PopScope(
+        canPop: model.currentIndex == 0,
+        onPopInvoked: (bool didPop) => {
+          if (!didPop) model.setIndex(0),
         },
         child: Scaffold(
           body: PageTransitionSwitcher(

lib/ui/views/navigation/navigation_viewmodel.dart

@@ -1,4 +1,5 @@
 // ignore_for_file: use_build_context_synchronously
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:dynamic_themes/dynamic_themes.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -18,25 +19,34 @@ class NavigationViewModel extends IndexTrackingViewModel {
   Future<void> initialize(BuildContext context) async {
     locator<Toast>().initialize(context);
     final SharedPreferences prefs = await SharedPreferences.getInstance();
-    requestManageExternalStorage();
 
     if (prefs.getBool('permissionsRequested') == null) {
       await Permission.storage.request();
-      await Permission.manageExternalStorage.request();
       await prefs.setBool('permissionsRequested', true);
-      RootAPI().hasRootPermissions().then(
+      await RootAPI().hasRootPermissions().then(
             (value) => Permission.requestInstallPackages.request().then(
                   (value) => Permission.ignoreBatteryOptimizations.request(),
                 ),
           );
     }
 
-    if (prefs.getBool('useDarkTheme') == null) {
-      final bool isDark =
-          MediaQuery.platformBrightnessOf(context) != Brightness.light;
-      await prefs.setBool('useDarkTheme', isDark);
-      await DynamicTheme.of(context)!.setTheme(isDark ? 1 : 0);
+    final dynamicTheme = DynamicTheme.of(context)!;
+    if (prefs.getInt('themeMode') == null) {
+      await prefs.setInt('themeMode', 0);
+      await dynamicTheme.setTheme(0);
     }
+
+    // Force disable Material You on Android 11 and below
+    if (dynamicTheme.themeId.isOdd) {
+      const int android12SdkVersion = 31;
+      final AndroidDeviceInfo info = await DeviceInfoPlugin().androidInfo;
+      if (info.version.sdkInt < android12SdkVersion) {
+        await prefs.setInt('themeMode', 0);
+        await prefs.setBool('useDynamicTheme', false);
+        await dynamicTheme.setTheme(0);
+      }
+    }
+
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
     SystemChrome.setSystemUIOverlayStyle(
       SystemUiOverlayStyle(
@@ -49,17 +59,6 @@ class NavigationViewModel extends IndexTrackingViewModel {
     );
   }
 
-  Future<void> requestManageExternalStorage() async {
-    final manageExternalStorageStatus =
-        await Permission.manageExternalStorage.status;
-    if (manageExternalStorageStatus.isDenied) {
-      await Permission.manageExternalStorage.request();
-    }
-    if (manageExternalStorageStatus.isPermanentlyDenied) {
-      await openAppSettings();
-    }
-  }
-
   Widget getViewForIndex(int index) {
     switch (index) {
       case 0:

lib/ui/views/patch_options/patch_options_view.dart

@@ -0,0 +1,132 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/flutter_i18n.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:revanced_manager/models/patch.dart';
+import 'package:revanced_manager/ui/views/patch_options/patch_options_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/patchesSelectorView/patch_options_fields.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_floating_action_button_extended.dart';
+import 'package:stacked/stacked.dart';
+
+class PatchOptionsView extends StatelessWidget {
+  const PatchOptionsView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ViewModelBuilder<PatchOptionsViewModel>.reactive(
+      onViewModelReady: (model) => model.initialize(),
+      viewModelBuilder: () => PatchOptionsViewModel(),
+      builder: (context, model, child) => GestureDetector(
+        onTap: () => FocusScope.of(context).unfocus(),
+        child: Scaffold(
+          floatingActionButton: HapticFloatingActionButtonExtended(
+            onPressed: () async {
+              final bool saved = model.saveOptions(context);
+              if (saved && context.mounted) {
+                Navigator.pop(context);
+              }
+            },
+            label: I18nText('patchOptionsView.saveOptions'),
+            icon: const Icon(Icons.save),
+          ),
+          body: CustomScrollView(
+            slivers: <Widget>[
+              SliverAppBar(
+                title: I18nText(
+                  'patchOptionsView.viewTitle',
+                  child: Text(
+                    '',
+                    style: GoogleFonts.inter(
+                      color: Theme.of(context).textTheme.titleLarge!.color,
+                    ),
+                  ),
+                ),
+                actions: [
+                  IconButton(
+                    onPressed: () {
+                      model.resetOptions();
+                    },
+                    icon: const Icon(
+                      Icons.history,
+                    ),
+                    tooltip: FlutterI18n.translate(
+                      context,
+                      'patchOptionsView.resetOptionsTooltip',
+                    ),
+                  ),
+                ],
+              ),
+              SliverToBoxAdapter(
+                child: Padding(
+                  padding: const EdgeInsets.all(8.0),
+                  child: Column(
+                    children: [
+                      for (final Option option in model.visibleOptions)
+                        if (option.valueType == 'String' ||
+                            option.valueType == 'Int')
+                          IntAndStringPatchOption(
+                            patchOption: option,
+                            removeOption: (option) {
+                              model.removeOption(option);
+                            },
+                            onChanged: (value, option) {
+                              model.modifyOptions(value, option);
+                            },
+                          )
+                        else if (option.valueType == 'Boolean')
+                          BooleanPatchOption(
+                            patchOption: option,
+                            removeOption: (option) {
+                              model.removeOption(option);
+                            },
+                            onChanged: (value, option) {
+                              model.modifyOptions(value, option);
+                            },
+                          )
+                        else if (option.valueType == 'StringArray' ||
+                            option.valueType == 'IntArray' ||
+                            option.valueType == 'LongArray')
+                          IntStringLongListPatchOption(
+                            patchOption: option,
+                            removeOption: (option) {
+                              model.removeOption(option);
+                            },
+                            onChanged: (value, option) {
+                              model.modifyOptions(value, option);
+                            },
+                          )
+                        else
+                          UnsupportedPatchOption(
+                            patchOption: option,
+                          ),
+                      if (model.visibleOptions.length !=
+                          model.options.length) ...[
+                        const SizedBox(
+                          height: 8,
+                        ),
+                        FilledButton(
+                          onPressed: () {
+                            model.showAddOptionDialog(context);
+                          },
+                          child: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              const Icon(Icons.add),
+                              I18nText('patchOptionsView.addOptions'),
+                            ],
+                          ),
+                        ),
+                      ],
+                      const SizedBox(
+                        height: 80,
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/ui/views/patch_options/patch_options_viewmodel.dart

@@ -0,0 +1,268 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/widgets/I18nText.dart';
+import 'package:revanced_manager/app/app.locator.dart';
+import 'package:revanced_manager/models/patch.dart';
+import 'package:revanced_manager/services/manager_api.dart';
+import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
+import 'package:revanced_manager/ui/views/patches_selector/patches_selector_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
+import 'package:stacked/stacked.dart';
+
+class PatchOptionsViewModel extends BaseViewModel {
+  final ManagerAPI _managerAPI = locator<ManagerAPI>();
+  final String selectedApp =
+      locator<PatcherViewModel>().selectedApp!.packageName;
+  List<Option> options = [];
+  List<Option> savedOptions = [];
+  List<Option> visibleOptions = [];
+
+  Future<void> initialize() async {
+    options = getDefaultOptions();
+    for (final Option option in options) {
+      final Option? savedOption = _managerAPI.getPatchOption(
+        selectedApp,
+        _managerAPI.selectedPatch!.name,
+        option.key,
+      );
+      if (savedOption != null) {
+        savedOptions.add(savedOption);
+      }
+    }
+    if (savedOptions.isNotEmpty) {
+      visibleOptions = [
+        ...savedOptions,
+        ...options.where(
+          (option) =>
+              option.required &&
+              !savedOptions.any((sOption) => sOption.key == option.key),
+        ),
+      ];
+    } else {
+      visibleOptions = [
+        ...options.where((option) => option.required),
+      ];
+    }
+  }
+
+  void addOption(Option option) {
+    visibleOptions.add(option);
+    notifyListeners();
+  }
+
+  void removeOption(Option option) {
+    visibleOptions.removeWhere((vOption) => vOption.key == option.key);
+    notifyListeners();
+  }
+
+  bool saveOptions(BuildContext context) {
+    final List<Option> requiredNullOptions = [];
+    for (final Option option in options) {
+      if (!visibleOptions.any((vOption) => vOption.key == option.key)) {
+        _managerAPI.clearPatchOption(
+          selectedApp,
+          _managerAPI.selectedPatch!.name,
+          option.key,
+        );
+      }
+    }
+    for (final Option option in visibleOptions) {
+      if (option.required && option.value == null) {
+        requiredNullOptions.add(option);
+      } else {
+        _managerAPI.setPatchOption(
+          option,
+          _managerAPI.selectedPatch!.name,
+          selectedApp,
+        );
+      }
+    }
+    if (requiredNullOptions.isNotEmpty) {
+      showRequiredOptionNullDialog(
+        context,
+        requiredNullOptions,
+        _managerAPI,
+        selectedApp,
+      );
+      return false;
+    }
+    return true;
+  }
+
+  void modifyOptions(dynamic value, Option option) {
+    final Option modifiedOption = Option(
+      title: option.title,
+      description: option.description,
+      values: option.values,
+      valueType: option.valueType,
+      value: value,
+      required: option.required,
+      key: option.key,
+    );
+    visibleOptions[visibleOptions
+        .indexWhere((vOption) => vOption.key == option.key)] = modifiedOption;
+    _managerAPI.modifiedOptions
+        .removeWhere((mOption) => mOption.key == option.key);
+    _managerAPI.modifiedOptions.add(modifiedOption);
+  }
+
+  List<Option> getDefaultOptions() {
+    final List<Option> defaultOptions = [];
+    for (final option in _managerAPI.options) {
+      final Option defaultOption = Option(
+        title: option.title,
+        description: option.description,
+        values: option.values,
+        valueType: option.valueType,
+        value: option.value is List ? option.value.toList() : option.value,
+        required: option.required,
+        key: option.key,
+      );
+      defaultOptions.add(defaultOption);
+    }
+    return defaultOptions;
+  }
+
+  void resetOptions() {
+    _managerAPI.modifiedOptions.clear();
+    visibleOptions =
+        getDefaultOptions().where((option) => option.required).toList();
+    notifyListeners();
+  }
+
+  Future<void> showAddOptionDialog(BuildContext context) async {
+    await showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            I18nText(
+              'patchOptionsView.addOptions',
+            ),
+            Text(
+              '',
+              style: TextStyle(
+                fontSize: 16,
+                color: Theme.of(context).colorScheme.onSecondaryContainer,
+              ),
+            ),
+          ],
+        ),
+        actions: [
+          FilledButton(
+            onPressed: () {
+              Navigator.of(context).pop();
+            },
+            child: I18nText('cancelButton'),
+          ),
+        ],
+        contentPadding: const EdgeInsets.all(8),
+        content: Wrap(
+          spacing: 14,
+          runSpacing: 14,
+          children: options
+              .where(
+            (option) =>
+                !visibleOptions.any((vOption) => vOption.key == option.key),
+          )
+              .map((e) {
+            return CustomCard(
+              padding: const EdgeInsets.all(4),
+              backgroundColor: Theme.of(context).colorScheme.surface,
+              onTap: () {
+                addOption(e);
+                Navigator.pop(context);
+              },
+              child: Padding(
+                padding: const EdgeInsets.all(8.0),
+                child: Row(
+                  children: [
+                    Expanded(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            e.title,
+                            style: TextStyle(
+                              fontSize: 16,
+                              color: Theme.of(context).colorScheme.onSurface,
+                            ),
+                          ),
+                          const SizedBox(height: 4),
+                          Text(
+                            e.description,
+                            style: TextStyle(
+                              fontSize: 14,
+                              color: Theme.of(context).colorScheme.onSurface,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            );
+          }).toList(),
+        ),
+      ),
+    );
+  }
+}
+
+Future<void> showRequiredOptionNullDialog(
+  BuildContext context,
+  List<Option> options,
+  ManagerAPI managerAPI,
+  String selectedApp,
+) async {
+  final List<String> optionsTitles = [];
+  for (final option in options) {
+    optionsTitles.add('• ${option.title}');
+  }
+  await showDialog(
+    context: context,
+    builder: (context) => AlertDialog(
+      title: I18nText('notice'),
+      actions: [
+        TextButton(
+          onPressed: () async {
+            if (managerAPI.isPatchesChangeEnabled()) {
+              locator<PatcherViewModel>()
+                  .selectedPatches
+                  .remove(managerAPI.selectedPatch);
+              locator<PatcherViewModel>().notifyListeners();
+              for (final option in options) {
+                managerAPI.clearPatchOption(
+                  selectedApp,
+                  managerAPI.selectedPatch!.name,
+                  option.key,
+                );
+              }
+              Navigator.of(context)
+                ..pop()
+                ..pop()
+                ..pop();
+            } else {
+              PatchesSelectorViewModel().showPatchesChangeDialog(context);
+            }
+          },
+          child: I18nText('patchOptionsView.deselectPatch'),
+        ),
+        FilledButton(
+          onPressed: () {
+            Navigator.of(context).pop();
+          },
+          child: I18nText('okButton'),
+        ),
+      ],
+      content: I18nText(
+        'patchOptionsView.requiredOptionNull',
+        translationParams: {
+          'options': optionsTitles.join('\n'),
+        },
+      ),
+    ),
+  );
+}

lib/ui/views/patcher/patcher_view.dart

@@ -6,10 +6,11 @@ import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/patcherView/app_selector_card.dart';
 import 'package:revanced_manager/ui/widgets/patcherView/patch_selector_card.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_floating_action_button_extended.dart';
 import 'package:stacked/stacked.dart';
 
 class PatcherView extends StatelessWidget {
-  const PatcherView({Key? key}) : super(key: key);
+  const PatcherView({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -19,10 +20,17 @@ class PatcherView extends StatelessWidget {
       builder: (context, model, child) => Scaffold(
         floatingActionButton: Visibility(
           visible: model.showPatchButton(),
-          child: FloatingActionButton.extended(
+          child: HapticFloatingActionButtonExtended(
             label: I18nText('patcherView.patchButton'),
             icon: const Icon(Icons.build),
-            onPressed: () => model.showRemovedPatchesDialog(context),
+            onPressed: () async {
+              if (model.checkRequiredPatchOption(context)) {
+                final bool proceed = model.showRemovedPatchesDialog(context);
+                if (proceed && context.mounted) {
+                  model.showArmv7WarningDialog(context);
+                }
+              }
+            },
           ),
         ),
         body: CustomScrollView(
@@ -45,7 +53,10 @@ class PatcherView extends StatelessWidget {
                 delegate: SliverChildListDelegate.fixed(
                   <Widget>[
                     AppSelectorCard(
-                      onPressed: () => model.navigateToAppSelector(),
+                      onPressed: () => {
+                        model.navigateToAppSelector(),
+                        model.ctx = context,
+                      },
                     ),
                     const SizedBox(height: 16),
                     Opacity(

lib/ui/views/patcher/patcher_viewmodel.dart

@@ -1,6 +1,10 @@
 // ignore_for_file: use_build_context_synchronously
 
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:injectable/injectable.dart';
 import 'package:revanced_manager/app/app.locator.dart';
@@ -9,7 +13,6 @@ import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/utils/about_info.dart';
 import 'package:revanced_manager/utils/check_for_supported_patch.dart';
 import 'package:stacked/stacked.dart';
@@ -20,7 +23,9 @@ class PatcherViewModel extends BaseViewModel {
   final NavigationService _navigationService = locator<NavigationService>();
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
+  Set<String> savedPatchNames = {};
   PatchedApplication? selectedApp;
+  BuildContext? ctx;
   List<Patch> selectedPatches = [];
   List<String> removedPatches = [];
 
@@ -44,79 +49,70 @@ class PatcherViewModel extends BaseViewModel {
     return selectedApp == null;
   }
 
-  Future<bool> isValidPatchConfig() async {
-    final bool needsResourcePatching = await _patcherAPI.needsResourcePatching(
-      selectedPatches,
-    );
-    if (needsResourcePatching && selectedApp != null) {
-      final bool isSplit = await _managerAPI.isSplitApk(selectedApp!);
-      return !isSplit;
-    }
-    return true;
-  }
-
-  Future<void> showPatchConfirmationDialog(BuildContext context) async {
-    final bool isValid = await isValidPatchConfig();
-    if (context.mounted) {
-      if (isValid) {
-        showArmv7WarningDialog(context);
-      } else {
-        return showDialog(
-          context: context,
-          builder: (context) => AlertDialog(
-            title: I18nText('warning'),
-            backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-            content: I18nText('patcherView.splitApkWarningDialogText'),
-            actions: <Widget>[
-              CustomMaterialButton(
-                label: I18nText('noButton'),
-                onPressed: () => Navigator.of(context).pop(),
-              ),
-              CustomMaterialButton(
-                label: I18nText('yesButton'),
-                isFilled: false,
-                onPressed: () {
-                  Navigator.of(context).pop();
-                  showArmv7WarningDialog(context);
-                },
-              ),
-            ],
-          ),
-        );
-      }
-    }
-  }
-
-  Future<void> showRemovedPatchesDialog(BuildContext context) async {
+  bool showRemovedPatchesDialog(BuildContext context) {
     if (removedPatches.isNotEmpty) {
-      return showDialog(
+      showDialog(
         context: context,
         builder: (context) => AlertDialog(
           title: I18nText('notice'),
-          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
           content: I18nText(
             'patcherView.removedPatchesWarningDialogText',
             translationParams: {'patches': removedPatches.join('\n')},
           ),
           actions: <Widget>[
-            CustomMaterialButton(
-              isFilled: false,
-              label: I18nText('noButton'),
-              onPressed: () => Navigator.of(context).pop(),
-            ),
-            CustomMaterialButton(
-              label: I18nText('yesButton'),
+            TextButton(
               onPressed: () {
                 Navigator.of(context).pop();
-                navigateToInstaller();
               },
+              child: I18nText('noButton'),
+            ),
+            FilledButton(
+              onPressed: () {
+                Navigator.of(context).pop();
+                showArmv7WarningDialog(context);
+              },
+              child: I18nText('yesButton'),
             ),
           ],
         ),
       );
-    } else {
-      showArmv7WarningDialog(context);
+      return false;
     }
+    return true;
+  }
+
+  bool checkRequiredPatchOption(BuildContext context) {
+    if (getNullRequiredOptions(selectedPatches, selectedApp!.packageName)
+        .isNotEmpty) {
+      showRequiredOptionDialog(context);
+      return false;
+    }
+    return true;
+  }
+
+  void showRequiredOptionDialog([context]) {
+    showDialog(
+      context: context ?? ctx,
+      builder: (context) => AlertDialog(
+        title: I18nText('notice'),
+        content: I18nText('patcherView.requiredOptionDialogText'),
+        actions: <Widget>[
+          TextButton(
+            onPressed: () => {
+              Navigator.of(context).pop(),
+            },
+            child: I18nText('cancelButton'),
+          ),
+          FilledButton(
+            onPressed: () => {
+              Navigator.pop(context),
+              navigateToPatchesSelector(),
+            },
+            child: I18nText('okButton'),
+          ),
+        ],
+      ),
+    );
   }
 
   Future<void> showArmv7WarningDialog(BuildContext context) async {
@@ -130,20 +126,18 @@ class PatcherViewModel extends BaseViewModel {
         context: context,
         builder: (context) => AlertDialog(
           title: I18nText('warning'),
-          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
           content: I18nText('patcherView.armv7WarningDialogText'),
           actions: <Widget>[
-            CustomMaterialButton(
-              label: I18nText('noButton'),
+            FilledButton(
               onPressed: () => Navigator.of(context).pop(),
+              child: I18nText('noButton'),
             ),
-            CustomMaterialButton(
-              label: I18nText('yesButton'),
-              isFilled: false,
+            TextButton(
               onPressed: () {
                 Navigator.of(context).pop();
                 navigateToInstaller();
               },
+              child: I18nText('yesButton'),
             ),
           ],
         ),
@@ -154,40 +148,55 @@ class PatcherViewModel extends BaseViewModel {
   }
 
   String getAppSelectionString() {
-    String text = '${selectedApp!.name} (${selectedApp!.packageName})';
-    if (text.length > 32) {
-      text = '${text.substring(0, 32)}...)';
-    }
-    return text;
+    return '${selectedApp!.name} ${selectedApp!.version}';
+  }
+
+  Future<void> queryVersion(String suggestedVersion) async {
+    await openDefaultBrowser(
+      '${selectedApp!.packageName} apk version $suggestedVersion',
+    );
   }
 
   String getSuggestedVersionString(BuildContext context) {
-    String suggestedVersion =
-        _patcherAPI.getSuggestedVersion(selectedApp!.packageName);
-    if (suggestedVersion.isEmpty) {
-      suggestedVersion = FlutterI18n.translate(
-        context,
-        'appSelectorCard.allVersions',
-      );
+    return _patcherAPI.getSuggestedVersion(selectedApp!.packageName);
+  }
+
+  Future<void> openDefaultBrowser(String query) async {
+    if (Platform.isAndroid) {
+      try {
+        const platform = MethodChannel('app.revanced.manager.flutter/browser');
+        await platform.invokeMethod('openBrowser', {'query': query});
+      } catch (e) {
+        if (kDebugMode) {
+          print(e);
+        }
+      }
     } else {
-      suggestedVersion = 'v$suggestedVersion';
+      throw 'Platform not supported';
+    }
+  }
+
+  bool isPatchNew(Patch patch) {
+    if (savedPatchNames.isEmpty) {
+      savedPatchNames = _managerAPI
+          .getSavedPatches(selectedApp!.packageName)
+          .map((p) => p.name)
+          .toSet();
+    }
+    if (savedPatchNames.isEmpty) {
+      return false;
+    } else {
+      return !savedPatchNames.contains(patch.name);
     }
-    return '${FlutterI18n.translate(
-      context,
-      'appSelectorCard.currentVersion',
-    )}: v${selectedApp!.version}\n${FlutterI18n.translate(
-      context,
-      'appSelectorCard.suggestedVersion',
-    )}: $suggestedVersion';
   }
 
   Future<void> loadLastSelectedPatches() async {
     this.selectedPatches.clear();
     removedPatches.clear();
     final List<String> selectedPatches =
-        await _managerAPI.getSelectedPatches(selectedApp!.originalPackageName);
+        await _managerAPI.getSelectedPatches(selectedApp!.packageName);
     final List<Patch> patches =
-        _patcherAPI.getFilteredPatches(selectedApp!.originalPackageName);
+        _patcherAPI.getFilteredPatches(selectedApp!.packageName);
     this
         .selectedPatches
         .addAll(patches.where((patch) => selectedPatches.contains(patch.name)));
@@ -195,7 +204,7 @@ class PatcherViewModel extends BaseViewModel {
       this.selectedPatches.clear();
       this.selectedPatches.addAll(patches.where((patch) => !patch.excluded));
     }
-    if (!_managerAPI.areExperimentalPatchesEnabled()) {
+    if (_managerAPI.isVersionCompatibilityCheckEnabled()) {
       this.selectedPatches.removeWhere((patch) => !isPatchSupported(patch));
     }
     if (!_managerAPI.areUniversalPatchesEnabled()) {
@@ -203,10 +212,25 @@ class PatcherViewModel extends BaseViewModel {
           .selectedPatches
           .removeWhere((patch) => patch.compatiblePackages.isEmpty);
     }
-    final usedPatches = _managerAPI.getUsedPatches(selectedApp!.originalPackageName);
-    for (final patch in usedPatches){
-      if (!patches.any((p) => p.name == patch.name)){
-        removedPatches.add('\u2022 ${patch.name}');
+    this.selectedPatches.addAll(
+          patches.where(
+            (patch) =>
+                isPatchNew(patch) &&
+                !patch.excluded &&
+                !this.selectedPatches.contains(patch),
+          ),
+        );
+    final usedPatches = _managerAPI.getUsedPatches(selectedApp!.packageName);
+    for (final patch in usedPatches) {
+      if (!patches.any((p) => p.name == patch.name)) {
+        removedPatches.add('• ${patch.name}');
+        for (final option in patch.options) {
+          _managerAPI.clearPatchOption(
+            selectedApp!.packageName,
+            patch.name,
+            option.key,
+          );
+        }
       }
     }
     notifyListeners();

lib/ui/views/patches_selector/patches_selector_view.dart

@@ -3,14 +3,12 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/ui/views/patches_selector/patches_selector_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/patchesSelectorView/patch_item.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_popup_menu.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_floating_action_button_extended.dart';
 import 'package:revanced_manager/ui/widgets/shared/search_bar.dart';
-import 'package:revanced_manager/utils/check_for_supported_patch.dart';
 import 'package:stacked/stacked.dart';
 
 class PatchesSelectorView extends StatefulWidget {
-  const PatchesSelectorView({Key? key}) : super(key: key);
+  const PatchesSelectorView({super.key});
 
   @override
   State<PatchesSelectorView> createState() => _PatchesSelectorViewState();
@@ -37,10 +35,9 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
       onViewModelReady: (model) => model.initialize(),
       viewModelBuilder: () => PatchesSelectorViewModel(),
       builder: (context, model, child) => Scaffold(
-        resizeToAvoidBottomInset: false,
         floatingActionButton: Visibility(
           visible: model.patches.isNotEmpty,
-          child: FloatingActionButton.extended(
+          child: HapticFloatingActionButtonExtended(
             label: Row(
               children: <Widget>[
                 I18nText('patchesSelectorView.doneButton'),
@@ -49,8 +46,10 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
             ),
             icon: const Icon(Icons.check),
             onPressed: () {
-              model.selectPatches();
-              Navigator.of(context).pop();
+              if (!model.areRequiredOptionsNull(context)) {
+                model.selectPatches();
+                Navigator.of(context).pop();
+              }
             },
           ),
         ),
@@ -61,60 +60,54 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
               floating: true,
               title: I18nText(
                 'patchesSelectorView.viewTitle',
-                child: Text(
-                  '',
-                  style: TextStyle(
-                    color: Theme.of(context).textTheme.titleLarge!.color,
-                  ),
-                ),
+              ),
+              titleTextStyle: TextStyle(
+                fontSize: 22.0,
+                color: Theme.of(context).textTheme.titleLarge!.color,
               ),
               leading: IconButton(
                 icon: Icon(
                   Icons.arrow_back,
                   color: Theme.of(context).textTheme.titleLarge!.color,
                 ),
-                onPressed: () => Navigator.of(context).pop(),
+                onPressed: () {
+                  model.resetSelection();
+                  Navigator.of(context).pop();
+                },
               ),
               actions: [
-                FittedBox(
-                  fit: BoxFit.scaleDown,
-                  child: Container(
-                    margin: const EdgeInsets.only(top: 12, bottom: 12),
-                    padding:
-                        const EdgeInsets.symmetric(horizontal: 6, vertical: 6),
-                    decoration: BoxDecoration(
-                      color: Theme.of(context)
-                          .colorScheme
-                          .tertiary
-                          .withOpacity(0.5),
-                      borderRadius: BorderRadius.circular(6),
-                    ),
-                    child: Text(
-                      model.patchesVersion!,
-                      style: TextStyle(
-                        color: Theme.of(context).textTheme.titleLarge!.color,
-                      ),
+                Container(
+                  margin: const EdgeInsets.symmetric(vertical: 12),
+                  padding: const EdgeInsets.symmetric(horizontal: 6),
+                  decoration: BoxDecoration(
+                    color:
+                        Theme.of(context).colorScheme.tertiary.withOpacity(0.5),
+                    borderRadius: BorderRadius.circular(6),
+                  ),
+                  alignment: Alignment.center,
+                  child: Text(
+                    model.patchesVersion!,
+                    style: TextStyle(
+                      color: Theme.of(context).textTheme.titleLarge!.color,
                     ),
                   ),
                 ),
-                CustomPopupMenu(
-                  onSelected: (value) =>
-                      {model.onMenuSelection(value, context)},
-                  children: {
-                    0: I18nText(
-                      'patchesSelectorView.loadPatchesSelection',
-                      child: const Text(
-                        '',
-                        style: TextStyle(
-                          fontWeight: FontWeight.bold,
-                        ),
+                PopupMenuButton(
+                  onSelected: (value) {
+                    model.onMenuSelection(value, context);
+                  },
+                  itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+                    PopupMenuItem(
+                      value: 0,
+                      child: I18nText(
+                        'patchesSelectorView.loadPatchesSelection',
                       ),
                     ),
-                  },
+                  ],
                 ),
               ],
               bottom: PreferredSize(
-                preferredSize: const Size.fromHeight(64.0),
+                preferredSize: const Size.fromHeight(66.0),
                 child: Padding(
                   padding: const EdgeInsets.symmetric(
                     vertical: 8.0,
@@ -188,63 +181,58 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                               ),
                             ],
                           ),
+                          if (model
+                              .getQueriedPatches(_query)
+                              .any((patch) => model.isPatchNew(patch)))
+                            Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                model.getPatchCategory(
+                                  context,
+                                  'patchesSelectorView.newPatches',
+                                ),
+                                ...model.getQueriedPatches(_query).map((patch) {
+                                  if (model.isPatchNew(patch)) {
+                                    return model.getPatchItem(context, patch);
+                                  } else {
+                                    return Container();
+                                  }
+                                }),
+                                if (model.getQueriedPatches(_query).any(
+                                      (patch) =>
+                                          !model.isPatchNew(patch) &&
+                                          patch.compatiblePackages.isNotEmpty,
+                                    ))
+                                  model.getPatchCategory(
+                                    context,
+                                    'patchesSelectorView.patches',
+                                  ),
+                              ],
+                            ),
                           ...model.getQueriedPatches(_query).map(
                             (patch) {
-                              if (patch.compatiblePackages.isNotEmpty) {
-                                return PatchItem(
-                                  name: patch.name,
-                                  simpleName: patch.getSimpleName(),
-                                  description: patch.description,
-                                  packageVersion: model.getAppInfo().version,
-                                  supportedPackageVersions:
-                                      model.getSupportedVersions(patch),
-                                  isUnsupported: !isPatchSupported(patch),
-                                  isChangeEnabled: _managerAPI.isPatchesChangeEnabled(),
-                                  isNew: model.isPatchNew(
-                                    patch,
-                                    model.getAppInfo().packageName,
-                                  ),
-                                  isSelected: model.isSelected(patch),
-                                  onChanged: (value) =>
-                                      model.selectPatch(patch, value, context),
-                                );
+                              if (patch.compatiblePackages.isNotEmpty &&
+                                  !model.isPatchNew(patch)) {
+                                return model.getPatchItem(context, patch);
                               } else {
                                 return Container();
                               }
                             },
                           ),
-                          if (_managerAPI.areUniversalPatchesEnabled())
+                          if (model
+                              .getQueriedPatches(_query)
+                              .any((patch) => patch.compatiblePackages.isEmpty))
                             Column(
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
-                                Padding(
-                                  padding: const EdgeInsets.symmetric(
-                                    vertical: 10.0,
-                                  ),
-                                  child: I18nText(
-                                    'patchesSelectorView.universalPatches',
-                                  ),
+                                model.getPatchCategory(
+                                  context,
+                                  'patchesSelectorView.universalPatches',
                                 ),
                                 ...model.getQueriedPatches(_query).map((patch) {
-                                  if (patch.compatiblePackages.isEmpty) {
-                                    return PatchItem(
-                                      name: patch.name,
-                                      simpleName: patch.getSimpleName(),
-                                      description: patch.description,
-                                      packageVersion:
-                                          model.getAppInfo().version,
-                                      supportedPackageVersions:
-                                          model.getSupportedVersions(patch),
-                                      isUnsupported: !isPatchSupported(patch),
-                                      isChangeEnabled: _managerAPI.isPatchesChangeEnabled(),
-                                      isNew: false,
-                                      isSelected: model.isSelected(patch),
-                                      onChanged: (value) => model.selectPatch(
-                                        patch,
-                                        value,
-                                        context,
-                                      ),
-                                    );
+                                  if (patch.compatiblePackages.isEmpty &&
+                                      !model.isPatchNew(patch)) {
+                                    return model.getPatchItem(context, patch);
                                   } else {
                                     return Container();
                                   }

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -2,24 +2,29 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/app/app.locator.dart';
+import 'package:revanced_manager/app/app.router.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/patchesSelectorView/patch_item.dart';
 import 'package:revanced_manager/utils/check_for_supported_patch.dart';
 import 'package:stacked/stacked.dart';
+import 'package:stacked_services/stacked_services.dart';
 
 class PatchesSelectorViewModel extends BaseViewModel {
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
+  final NavigationService _navigationService = locator<NavigationService>();
   final List<Patch> patches = [];
+  final List<Patch> currentSelection = [];
   final List<Patch> selectedPatches =
       locator<PatcherViewModel>().selectedPatches;
   PatchedApplication? selectedApp = locator<PatcherViewModel>().selectedApp;
   String? patchesVersion = '';
+
   bool isDefaultPatchesRepo() {
     return _managerAPI.getPatchesRepo() == 'revanced/revanced-patches';
   }
@@ -28,17 +33,22 @@ class PatchesSelectorViewModel extends BaseViewModel {
     getPatchesVersion().whenComplete(() => notifyListeners());
     patches.addAll(
       _patcherAPI.getFilteredPatches(
-        selectedApp!.originalPackageName,
+        selectedApp!.packageName,
       ),
     );
+    final List<Option> requiredNullOptions =
+        getNullRequiredOptions(patches, selectedApp!.packageName);
     patches.sort((a, b) {
-      if (isPatchNew(a, selectedApp!.packageName) ==
-          isPatchNew(b, selectedApp!.packageName)) {
-        return a.name.compareTo(b.name);
+      if (b.options.any((option) => requiredNullOptions.contains(option)) &&
+          a.options.isEmpty) {
+        return 1;
       } else {
-        return isPatchNew(b, selectedApp!.packageName) ? 1 : -1;
+        return a.name.compareTo(b.name);
       }
     });
+    currentSelection.clear();
+    currentSelection.addAll(selectedPatches);
+
     notifyListeners();
   }
 
@@ -48,6 +58,59 @@ class PatchesSelectorViewModel extends BaseViewModel {
     );
   }
 
+  void navigateToPatchOptions(List<Option> setOptions, Patch patch) {
+    _managerAPI.options = setOptions;
+    _managerAPI.selectedPatch = patch;
+    _managerAPI.modifiedOptions.clear();
+    _navigationService.navigateToPatchOptionsView();
+  }
+
+  bool areRequiredOptionsNull(BuildContext context) {
+    final List<String> patchesWithNullRequiredOptions = [];
+    final List<Option> requiredNullOptions =
+        getNullRequiredOptions(selectedPatches, selectedApp!.packageName);
+    if (requiredNullOptions.isNotEmpty) {
+      for (final patch in selectedPatches) {
+        for (final patchOption in patch.options) {
+          if (requiredNullOptions.contains(patchOption)) {
+            patchesWithNullRequiredOptions.add(patch.name);
+            break;
+          }
+        }
+      }
+      showSetRequiredOption(context, patchesWithNullRequiredOptions);
+      return true;
+    }
+    return false;
+  }
+
+  Future<void> showSetRequiredOption(
+    BuildContext context,
+    List<String> patches,
+  ) async {
+    return showDialog(
+      barrierDismissible: false,
+      context: context,
+      builder: (context) => AlertDialog(
+        title: I18nText('notice'),
+        content: I18nText(
+          'patchesSelectorView.setRequiredOption',
+          translationParams: {
+            'patches': patches.map((patch) => '• $patch').join('\n'),
+          },
+        ),
+        actions: <Widget>[
+          FilledButton(
+            onPressed: () => {
+              Navigator.of(context).pop(),
+            },
+            child: I18nText('okButton'),
+          ),
+        ],
+      ),
+    );
+  }
+
   void selectPatch(Patch patch, bool isSelected, BuildContext context) {
     if (_managerAPI.isPatchesChangeEnabled()) {
       if (isSelected && !selectedPatches.contains(patch)) {
@@ -65,7 +128,6 @@ class PatchesSelectorViewModel extends BaseViewModel {
     return showDialog(
       context: context,
       builder: (context) => AlertDialog(
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         title: I18nText('warning'),
         content: I18nText(
           'patchItem.patchesChangeWarningDialogText',
@@ -78,18 +140,17 @@ class PatchesSelectorViewModel extends BaseViewModel {
           ),
         ),
         actions: [
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('okButton'),
+          TextButton(
             onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('okButton'),
           ),
-          CustomMaterialButton(
-            label: I18nText('patchItem.patchesChangeWarningDialogButton'),
+          FilledButton(
             onPressed: () {
               Navigator.of(context)
                 ..pop()
                 ..pop();
             },
+            child: I18nText('patchItem.patchesChangeWarningDialogButton'),
           ),
         ],
       ),
@@ -98,16 +159,16 @@ class PatchesSelectorViewModel extends BaseViewModel {
 
   void selectDefaultPatches() {
     selectedPatches.clear();
-    if (locator<PatcherViewModel>().selectedApp?.originalPackageName != null) {
+    if (locator<PatcherViewModel>().selectedApp?.packageName != null) {
       selectedPatches.addAll(
         _patcherAPI
             .getFilteredPatches(
-              locator<PatcherViewModel>().selectedApp!.originalPackageName,
+              locator<PatcherViewModel>().selectedApp!.packageName,
             )
             .where(
               (element) =>
                   !element.excluded &&
-                  (_managerAPI.areExperimentalPatchesEnabled() ||
+                  (!_managerAPI.isVersionCompatibilityCheckEnabled() ||
                       isPatchSupported(element)),
             ),
       );
@@ -126,6 +187,12 @@ class PatchesSelectorViewModel extends BaseViewModel {
     locator<PatcherViewModel>().notifyListeners();
   }
 
+  void resetSelection() {
+    selectedPatches.clear();
+    selectedPatches.addAll(currentSelection);
+    notifyListeners();
+  }
+
   Future<void> getPatchesVersion() async {
     patchesVersion = await _managerAPI.getCurrentPatchesVersion();
   }
@@ -137,7 +204,10 @@ class PatchesSelectorViewModel extends BaseViewModel {
               query.isEmpty ||
               query.length < 2 ||
               patch.name.toLowerCase().contains(query.toLowerCase()) ||
-              patch.getSimpleName().toLowerCase().contains(query.toLowerCase()),
+              patch.name
+                  .replaceAll(RegExp(r'[^\w\s]+'), '')
+                  .toLowerCase()
+                  .contains(query.toLowerCase()),
         )
         .toList();
     if (_managerAPI.areUniversalPatchesEnabled()) {
@@ -149,18 +219,63 @@ class PatchesSelectorViewModel extends BaseViewModel {
     }
   }
 
+  Widget getPatchItem(BuildContext context, Patch patch) {
+    return PatchItem(
+      name: patch.name,
+      simpleName: patch.getSimpleName(),
+      description: patch.description ?? '',
+      packageVersion: getAppInfo().version,
+      supportedPackageVersions: getSupportedVersions(patch),
+      isUnsupported: !isPatchSupported(patch),
+      isChangeEnabled: _managerAPI.isPatchesChangeEnabled(),
+      hasUnsupportedPatchOption: hasUnsupportedRequiredOption(
+        patch.options,
+        patch,
+      ),
+      options: patch.options,
+      isSelected: isSelected(patch),
+      navigateToOptions: (options) => navigateToPatchOptions(
+        options,
+        patch,
+      ),
+      onChanged: (value) => selectPatch(
+        patch,
+        value,
+        context,
+      ),
+    );
+  }
+
+  Widget getPatchCategory(BuildContext context, String category) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(
+        vertical: 10.0,
+      ),
+      child: Container(
+        padding: const EdgeInsets.only(
+          top: 10.0,
+          bottom: 10.0,
+          left: 5.0,
+        ),
+        child: I18nText(
+          category,
+          child: Text(
+            '',
+            style: TextStyle(
+              color: Theme.of(context).colorScheme.primary,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
   PatchedApplication getAppInfo() {
     return locator<PatcherViewModel>().selectedApp!;
   }
 
-  bool isPatchNew(Patch patch, String packageName) {
-    final List<Patch> savedPatches = _managerAPI.getSavedPatches(packageName);
-    if (savedPatches.isEmpty) {
-      return false;
-    } else {
-      return !savedPatches
-          .any((p) => p.getSimpleName() == patch.getSimpleName());
-    }
+  bool isPatchNew(Patch patch) {
+    return locator<PatcherViewModel>().isPatchNew(patch);
   }
 
   List<String> getSupportedVersions(Patch patch) {
@@ -187,7 +302,7 @@ class PatchesSelectorViewModel extends BaseViewModel {
     final List<String> selectedPatches =
         this.selectedPatches.map((patch) => patch.name).toList();
     await _managerAPI.setSelectedPatches(
-      locator<PatcherViewModel>().selectedApp!.originalPackageName,
+      locator<PatcherViewModel>().selectedApp!.packageName,
       selectedPatches,
     );
   }
@@ -195,14 +310,14 @@ class PatchesSelectorViewModel extends BaseViewModel {
   Future<void> loadSelectedPatches(BuildContext context) async {
     if (_managerAPI.isPatchesChangeEnabled()) {
       final List<String> selectedPatches = await _managerAPI.getSelectedPatches(
-        locator<PatcherViewModel>().selectedApp!.originalPackageName,
+        locator<PatcherViewModel>().selectedApp!.packageName,
       );
       if (selectedPatches.isNotEmpty) {
         this.selectedPatches.clear();
         this.selectedPatches.addAll(
               patches.where((patch) => selectedPatches.contains(patch.name)),
             );
-        if (!_managerAPI.areExperimentalPatchesEnabled()) {
+        if (_managerAPI.isVersionCompatibilityCheckEnabled()) {
           this.selectedPatches.removeWhere((patch) => !isPatchSupported(patch));
         }
       } else {

lib/ui/views/settings/settingsFragment/settings_manage_api_url.dart

@@ -4,15 +4,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/services/manager_api.dart';
-import 'package:revanced_manager/services/toast.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
 
 class SManageApiUrl extends BaseViewModel {
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
-  final Toast _toast = locator<Toast>();
 
   final TextEditingController _apiUrlController = TextEditingController();
 
@@ -33,34 +29,38 @@ class SManageApiUrl extends BaseViewModel {
             ),
           ],
         ),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         content: SingleChildScrollView(
           child: Column(
             children: <Widget>[
-              CustomTextField(
-                leadingIcon: Icon(
-                  Icons.api_outlined,
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-                inputController: _apiUrlController,
-                label: I18nText('settingsView.selectApiURL'),
-                hint: apiUrl,
+              TextField(
+                controller: _apiUrlController,
+                autocorrect: false,
                 onChanged: (value) => notifyListeners(),
+                decoration: InputDecoration(
+                  icon: Icon(
+                    Icons.api_outlined,
+                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                  ),
+                  border: const OutlineInputBorder(),
+                  labelText: FlutterI18n.translate(
+                    context,
+                    'settingsView.selectApiURL',
+                  ),
+                  hintText: apiUrl,
+                ),
               ),
             ],
           ),
         ),
         actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('cancelButton'),
+          TextButton(
             onPressed: () {
               _apiUrlController.clear();
               Navigator.of(context).pop();
             },
+            child: I18nText('cancelButton'),
           ),
-          CustomMaterialButton(
-            label: I18nText('okButton'),
+          FilledButton(
             onPressed: () {
               String apiUrl = _apiUrlController.text;
               if (!apiUrl.startsWith('https')) {
@@ -69,6 +69,7 @@ class SManageApiUrl extends BaseViewModel {
               _managerAPI.setApiUrl(apiUrl);
               Navigator.of(context).pop();
             },
+            child: I18nText('okButton'),
           ),
         ],
       ),
@@ -80,23 +81,20 @@ class SManageApiUrl extends BaseViewModel {
       context: context,
       builder: (context) => AlertDialog(
         title: I18nText('settingsView.sourcesResetDialogTitle'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         content: I18nText('settingsView.apiURLResetDialogText'),
         actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
+          TextButton(
             onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('noButton'),
           ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
+          FilledButton(
             onPressed: () {
               _managerAPI.setApiUrl('');
-              _toast.showBottom('settingsView.restartAppForChanges');
               Navigator.of(context)
                 ..pop()
                 ..pop();
             },
+            child: I18nText('yesButton'),
           ),
         ],
       ),

lib/ui/views/settings/settingsFragment/settings_manage_keystore_password.dart

@@ -4,9 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/services/manager_api.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
 
 class SManageKeystorePassword extends BaseViewModel {
@@ -33,35 +31,40 @@ class SManageKeystorePassword extends BaseViewModel {
             ),
           ],
         ),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         content: SingleChildScrollView(
           child: Column(
             children: <Widget>[
-              CustomTextField(
-                inputController: _keystorePasswordController,
-                label: I18nText('settingsView.selectKeystorePassword'),
-                hint: '',
+              TextField(
+                controller: _keystorePasswordController,
+                autocorrect: false,
+                obscureText: true,
                 onChanged: (value) => notifyListeners(),
+                decoration: InputDecoration(
+                  border: const OutlineInputBorder(),
+                  labelText: FlutterI18n.translate(
+                    context,
+                    'settingsView.selectKeystorePassword',
+                  ),
+                ),
               ),
             ],
           ),
         ),
         actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('cancelButton'),
+          TextButton(
             onPressed: () {
               _keystorePasswordController.clear();
               Navigator.of(context).pop();
             },
+            child: I18nText('cancelButton'),
           ),
-          CustomMaterialButton(
-            label: I18nText('okButton'),
+          FilledButton(
             onPressed: () {
               final String passwd = _keystorePasswordController.text;
               _managerAPI.setKeystorePassword(passwd);
               Navigator.of(context).pop();
             },
+            child: I18nText('okButton'),
           ),
         ],
       ),

lib/ui/views/settings/settingsFragment/settings_manage_sources.dart

@@ -5,9 +5,7 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/toast.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
 
 class SManageSources extends BaseViewModel {
@@ -43,63 +41,105 @@ class SManageSources extends BaseViewModel {
             ),
           ],
         ),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         content: SingleChildScrollView(
           child: Column(
             children: <Widget>[
-              CustomTextField(
-                leadingIcon: const Icon(
-                  Icons.extension_outlined,
-                  color: Colors.transparent,
-                ),
-                inputController: _hostSourceController,
-                label: I18nText('settingsView.hostRepositoryLabel'),
-                hint: hostRepository,
+              /*
+              API for accessing the specified repositories
+              If default is used, will use the ReVanced API
+              */
+              TextField(
+                controller: _hostSourceController,
+                autocorrect: false,
                 onChanged: (value) => notifyListeners(),
-              ),
-              const SizedBox(height: 20),
-              CustomTextField(
-                leadingIcon: Icon(
-                  Icons.extension_outlined,
-                  color: Theme.of(context).colorScheme.secondary,
+                decoration: InputDecoration(
+                  icon: Icon(
+                    Icons.rocket_launch_outlined,
+                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                  ),
+                  border: const OutlineInputBorder(),
+                  labelText: FlutterI18n.translate(
+                    context,
+                    'settingsView.hostRepositoryLabel',
+                  ),
+                  hintText: hostRepository,
                 ),
-                inputController: _orgPatSourceController,
-                label: I18nText('settingsView.orgPatchesLabel'),
-                hint: patchesRepo.split('/')[0],
-                onChanged: (value) => notifyListeners(),
               ),
               const SizedBox(height: 8),
-              CustomTextField(
-                leadingIcon: const Icon(
-                  Icons.extension_outlined,
-                  color: Colors.transparent,
-                ),
-                inputController: _patSourceController,
-                label: I18nText('settingsView.sourcesPatchesLabel'),
-                hint: patchesRepo.split('/')[1],
+              // Patches owner's name
+              TextField(
+                controller: _orgPatSourceController,
+                autocorrect: false,
                 onChanged: (value) => notifyListeners(),
-              ),
-              const SizedBox(height: 20),
-              CustomTextField(
-                leadingIcon: Icon(
-                  Icons.merge_outlined,
-                  color: Theme.of(context).colorScheme.secondary,
+                decoration: InputDecoration(
+                  icon: Icon(
+                    Icons.extension_outlined,
+                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                  ),
+                  border: const OutlineInputBorder(),
+                  labelText: FlutterI18n.translate(
+                    context,
+                    'settingsView.orgPatchesLabel',
+                  ),
+                  hintText: patchesRepo.split('/')[0],
                 ),
-                inputController: _orgIntSourceController,
-                label: I18nText('settingsView.orgIntegrationsLabel'),
-                hint: integrationsRepo.split('/')[0],
-                onChanged: (value) => notifyListeners(),
               ),
               const SizedBox(height: 8),
-              CustomTextField(
-                leadingIcon: const Icon(
-                  Icons.merge_outlined,
-                  color: Colors.transparent,
-                ),
-                inputController: _intSourceController,
-                label: I18nText('settingsView.sourcesIntegrationsLabel'),
-                hint: integrationsRepo.split('/')[1],
+              // Patches repository's name
+              TextField(
+                controller: _patSourceController,
+                autocorrect: false,
                 onChanged: (value) => notifyListeners(),
+                decoration: InputDecoration(
+                  icon: const Icon(
+                    Icons.extension_outlined,
+                    color: Colors.transparent,
+                  ),
+                  border: const OutlineInputBorder(),
+                  labelText: FlutterI18n.translate(
+                    context,
+                    'settingsView.sourcesPatchesLabel',
+                  ),
+                  hintText: patchesRepo.split('/')[1],
+                ),
+              ),
+              const SizedBox(height: 8),
+              // Integrations owner's name
+              TextField(
+                controller: _orgIntSourceController,
+                autocorrect: false,
+                onChanged: (value) => notifyListeners(),
+                decoration: InputDecoration(
+                  icon: Icon(
+                    Icons.merge_outlined,
+                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                  ),
+                  border: const OutlineInputBorder(),
+                  labelText: FlutterI18n.translate(
+                    context,
+                    'settingsView.orgIntegrationsLabel',
+                  ),
+                  hintText: integrationsRepo.split('/')[0],
+                ),
+              ),
+              const SizedBox(height: 8),
+              // Integrations repository's name
+              TextField(
+                controller: _intSourceController,
+                autocorrect: false,
+                onChanged: (value) => notifyListeners(),
+                decoration: InputDecoration(
+                  icon: const Icon(
+                    Icons.merge_outlined,
+                    color: Colors.transparent,
+                  ),
+                  border: const OutlineInputBorder(),
+                  labelText: FlutterI18n.translate(
+                    context,
+                    'settingsView.sourcesIntegrationsLabel',
+                  ),
+                  hintText: integrationsRepo.split('/')[1],
+                ),
               ),
               const SizedBox(height: 20),
               I18nText('settingsView.sourcesUpdateNote'),
@@ -107,9 +147,7 @@ class SManageSources extends BaseViewModel {
           ),
         ),
         actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('cancelButton'),
+          TextButton(
             onPressed: () {
               _orgPatSourceController.clear();
               _patSourceController.clear();
@@ -117,9 +155,9 @@ class SManageSources extends BaseViewModel {
               _intSourceController.clear();
               Navigator.of(context).pop();
             },
+            child: I18nText('cancelButton'),
           ),
-          CustomMaterialButton(
-            label: I18nText('okButton'),
+          FilledButton(
             onPressed: () {
               _managerAPI.setRepoUrl(_hostSourceController.text.trim());
               _managerAPI.setPatchesRepo(
@@ -133,6 +171,7 @@ class SManageSources extends BaseViewModel {
               _toast.showBottom('settingsView.restartAppForChanges');
               Navigator.of(context).pop();
             },
+            child: I18nText('okButton'),
           ),
         ],
       ),
@@ -144,16 +183,13 @@ class SManageSources extends BaseViewModel {
       context: context,
       builder: (context) => AlertDialog(
         title: I18nText('settingsView.sourcesResetDialogTitle'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         content: I18nText('settingsView.sourcesResetDialogText'),
         actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
+          TextButton(
             onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('noButton'),
           ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
+          FilledButton(
             onPressed: () {
               _managerAPI.setRepoUrl('');
               _managerAPI.setPatchesRepo('');
@@ -165,6 +201,7 @@ class SManageSources extends BaseViewModel {
                 ..pop()
                 ..pop();
             },
+            child: I18nText('yesButton'),
           ),
         ],
       ),

lib/ui/views/settings/settingsFragment/settings_update_language.dart

@@ -51,7 +51,6 @@ class SUpdateLanguage extends BaseViewModel {
       context: parentContext,
       builder: (context) => SimpleDialog(
         title: I18nText('settingsView.languageLabel'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         children: [
           SizedBox(
             height: 500,

lib/ui/views/settings/settingsFragment/settings_update_theme.dart

@@ -6,67 +6,29 @@ import 'package:flutter/services.dart';
 import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/services/manager_api.dart';
-import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
-import 'package:stacked/stacked.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_radio_list_tile.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_switch_list_tile.dart';
 
-final _settingViewModel = SettingsViewModel();
+class SUpdateThemeUI extends StatefulWidget {
+  const SUpdateThemeUI({super.key});
 
-// ignore: constant_identifier_names
-const int ANDROID_12_SDK_VERSION = 31;
-
-class SUpdateTheme extends BaseViewModel {
-  final ManagerAPI _managerAPI = locator<ManagerAPI>();
-
-  bool getDynamicThemeStatus() {
-    return _managerAPI.getUseDynamicTheme();
-  }
-
-  Future<void> setUseDynamicTheme(BuildContext context, bool value) async {
-    await _managerAPI.setUseDynamicTheme(value);
-    final int currentTheme = DynamicTheme.of(context)!.themeId;
-    if (currentTheme.isEven) {
-      await DynamicTheme.of(context)!.setTheme(value ? 2 : 0);
-    } else {
-      await DynamicTheme.of(context)!.setTheme(value ? 3 : 1);
-    }
-    notifyListeners();
-  }
-
-  bool getDarkThemeStatus() {
-    return _managerAPI.getUseDarkTheme();
-  }
-
-  Future<void> setUseDarkTheme(BuildContext context, bool value) async {
-    await _managerAPI.setUseDarkTheme(value);
-    final int currentTheme = DynamicTheme.of(context)!.themeId;
-    if (currentTheme < 2) {
-      await DynamicTheme.of(context)!.setTheme(value ? 1 : 0);
-    } else {
-      await DynamicTheme.of(context)!.setTheme(value ? 3 : 2);
-    }
-    SystemChrome.setSystemUIOverlayStyle(
-      SystemUiOverlayStyle(
-        systemNavigationBarIconBrightness:
-            value ? Brightness.light : Brightness.dark,
-      ),
-    );
-    notifyListeners();
-  }
+  @override
+  State<SUpdateThemeUI> createState() => _SUpdateThemeUIState();
 }
 
-class SUpdateThemeUI extends StatelessWidget {
-  const SUpdateThemeUI({super.key});
+class _SUpdateThemeUIState extends State<SUpdateThemeUI> {
+  final ManagerAPI managerAPI = locator<ManagerAPI>();
 
   @override
   Widget build(BuildContext context) {
     return SettingsSection(
       title: 'settingsView.appearanceSectionTitle',
       children: <Widget>[
-        SwitchListTile(
+        ListTile(
           contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
           title: I18nText(
-            'settingsView.darkThemeLabel',
+            'settingsView.themeModeLabel',
             child: const Text(
               '',
               style: TextStyle(
@@ -75,42 +37,148 @@ class SUpdateThemeUI extends StatelessWidget {
               ),
             ),
           ),
-          subtitle: I18nText('settingsView.darkThemeHint'),
-          value: SUpdateTheme().getDarkThemeStatus(),
-          onChanged: (value) => SUpdateTheme().setUseDarkTheme(
-            context,
-            value,
+          trailing: FilledButton(
+            onPressed: () => {showThemeDialog(context)},
+            child: getThemeModeName(),
           ),
+          onTap: () => {showThemeDialog(context)},
         ),
-        FutureBuilder<int>(
-          future: _settingViewModel.getSdkVersion(),
-          builder: (context, snapshot) => Visibility(
-            visible:
-                snapshot.hasData && snapshot.data! >= ANDROID_12_SDK_VERSION,
-            child: SwitchListTile(
-              contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
-              title: I18nText(
-                'settingsView.dynamicThemeLabel',
-                child: const Text(
-                  '',
-                  style: TextStyle(
-                    fontSize: 20,
-                    fontWeight: FontWeight.w500,
-                  ),
+        if (managerAPI.isDynamicThemeAvailable)
+          HapticSwitchListTile(
+            contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+            title: I18nText(
+              'settingsView.dynamicThemeLabel',
+              child: const Text(
+                '',
+                style: TextStyle(
+                  fontSize: 20,
+                  fontWeight: FontWeight.w500,
                 ),
               ),
-              subtitle: I18nText('settingsView.dynamicThemeHint'),
-              value: _settingViewModel.sUpdateTheme.getDynamicThemeStatus(),
-              onChanged: (value) => {
-                _settingViewModel.sUpdateTheme.setUseDynamicTheme(
-                  context,
-                  value,
-                ),
-              },
             ),
+            subtitle: I18nText('settingsView.dynamicThemeHint'),
+            value: getDynamicThemeStatus(),
+            onChanged: (value) => {
+              setUseDynamicTheme(
+                context,
+                value,
+              ),
+            },
           ),
-        ),
       ],
     );
   }
+
+  bool getDynamicThemeStatus() {
+    return managerAPI.getUseDynamicTheme();
+  }
+
+  Future<void> setUseDynamicTheme(BuildContext context, bool value) async {
+    await managerAPI.setUseDynamicTheme(value);
+    final int currentTheme = (DynamicTheme.of(context)!.themeId ~/ 2) * 2;
+    await DynamicTheme.of(context)!.setTheme(currentTheme + (value ? 1 : 0));
+    setState(() {});
+  }
+
+  int getThemeMode() {
+    return managerAPI.getThemeMode();
+  }
+
+  Future<void> setThemeMode(BuildContext context, int value) async {
+    await managerAPI.setThemeMode(value);
+    final bool isDynamicTheme = DynamicTheme.of(context)!.themeId.isEven;
+    await DynamicTheme.of(context)!
+        .setTheme(value * 2 + (isDynamicTheme ? 0 : 1));
+    final bool isLight = value != 2 &&
+        (value == 1 ||
+            DynamicTheme.of(context)!.theme.brightness == Brightness.light);
+    SystemChrome.setSystemUIOverlayStyle(
+      SystemUiOverlayStyle(
+        systemNavigationBarIconBrightness:
+            isLight ? Brightness.dark : Brightness.light,
+      ),
+    );
+    setState(() {});
+  }
+
+  I18nText getThemeModeName() {
+    switch (getThemeMode()) {
+      case 0:
+        return I18nText('settingsView.systemThemeLabel');
+      case 1:
+        return I18nText('settingsView.lightThemeLabel');
+      case 2:
+        return I18nText('settingsView.darkThemeLabel');
+      default:
+        return I18nText('settingsView.systemThemeLabel');
+    }
+  }
+
+  Future<void> showThemeDialog(BuildContext context) async {
+    final ValueNotifier<int> newTheme = ValueNotifier(getThemeMode());
+
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: I18nText('settingsView.themeModeLabel'),
+        icon: const Icon(Icons.palette),
+        contentPadding: const EdgeInsets.symmetric(vertical: 16),
+        content: SingleChildScrollView(
+          child: ValueListenableBuilder(
+            valueListenable: newTheme,
+            builder: (context, value, child) {
+              return Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  HapticRadioListTile(
+                    title: I18nText('settingsView.systemThemeLabel'),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                    value: 0,
+                    groupValue: value,
+                    onChanged: (value) {
+                      newTheme.value = value!;
+                    },
+                  ),
+                  HapticRadioListTile(
+                    title: I18nText('settingsView.lightThemeLabel'),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                    value: 1,
+                    groupValue: value,
+                    onChanged: (value) {
+                      newTheme.value = value!;
+                    },
+                  ),
+                  HapticRadioListTile(
+                    title: I18nText('settingsView.darkThemeLabel'),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                    value: 2,
+                    groupValue: value,
+                    onChanged: (value) {
+                      newTheme.value = value!;
+                    },
+                  ),
+                ],
+              );
+            },
+          ),
+        ),
+        actions: <Widget>[
+          TextButton(
+            onPressed: () {
+              Navigator.of(context).pop();
+            },
+            child: I18nText('cancelButton'),
+          ),
+          FilledButton(
+            onPressed: () {
+              setThemeMode(context, newTheme.value);
+              Navigator.of(context).pop();
+            },
+            child: I18nText('okButton'),
+          ),
+        ],
+      ),
+    );
+  }
 }

lib/ui/views/settings/settings_view.dart

@@ -6,14 +6,14 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_update_theme.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_advanced_section.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_debug_section.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_export_section.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_info_section.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_team_section.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
 class SettingsView extends StatelessWidget {
-  const SettingsView({Key? key}) : super(key: key);
+  const SettingsView({super.key});
 
   static const _settingsDivider =
       Divider(thickness: 1.0, indent: 20.0, endIndent: 20.0);
@@ -40,16 +40,24 @@ class SettingsView extends StatelessWidget {
             SliverList(
               delegate: SliverChildListDelegate.fixed(
                 <Widget>[
-                  SUpdateThemeUI(),
-                  // SUpdateLanguageUI(),
-                  // _settingsDivider,
-                  STeamSection(),
-                  _settingsDivider,
-                  SAdvancedSection(),
-                  _settingsDivider,
-                  SExportSection(),
-                  _settingsDivider,
-                  SInfoSection(),
+                  ListView(
+                    padding: EdgeInsets.zero,
+                    shrinkWrap: true,
+                    physics: NeverScrollableScrollPhysics(),
+                    children: const [
+                      SUpdateThemeUI(),
+                      // _settingsDivider,
+                      // SUpdateLanguageUI(),
+                      _settingsDivider,
+                      SAdvancedSection(),
+                      _settingsDivider,
+                      SExportSection(),
+                      _settingsDivider,
+                      STeamSection(),
+                      _settingsDivider,
+                      SDebugSection(),
+                    ],
+                  ),
                 ],
               ),
             ),

lib/ui/views/settings/settings_viewmodel.dart

@@ -1,9 +1,7 @@
 import 'dart:io';
-import 'package:cr_file_saver/file_saver.dart';
-import 'package:device_info_plus/device_info_plus.dart';
-import 'package:file_picker/file_picker.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_file_dialog/flutter_file_dialog.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:logcat/logcat.dart';
 import 'package:path_provider/path_provider.dart';
@@ -14,9 +12,7 @@ import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patches_selector/patches_selector_viewmodel.dart';
 import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_update_language.dart';
-import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_update_theme.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
-import 'package:share_extend/share_extend.dart';
+import 'package:share_plus/share_plus.dart';
 import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
 
@@ -29,7 +25,6 @@ class SettingsViewModel extends BaseViewModel {
   final Toast _toast = locator<Toast>();
 
   final SUpdateLanguage sUpdateLanguage = SUpdateLanguage();
-  final SUpdateTheme sUpdateTheme = SUpdateTheme();
 
   void navigateToContributors() {
     _navigationService.navigateTo(Routes.contributorsView);
@@ -44,6 +39,15 @@ class SettingsViewModel extends BaseViewModel {
     notifyListeners();
   }
 
+  bool showUpdateDialog() {
+    return _managerAPI.showUpdateDialog();
+  }
+
+  void setShowUpdateDialog(bool value) {
+    _managerAPI.setShowUpdateDialog(value);
+    notifyListeners();
+  }
+
   bool isPatchesChangeEnabled() {
     return _managerAPI.isPatchesChangeEnabled();
   }
@@ -56,7 +60,6 @@ class SettingsViewModel extends BaseViewModel {
       return showDialog(
         context: context,
         builder: (context) => AlertDialog(
-          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
           title: I18nText('warning'),
           content: I18nText(
             'settingsView.enablePatchesSelectionWarningText',
@@ -69,20 +72,19 @@ class SettingsViewModel extends BaseViewModel {
             ),
           ),
           actions: [
-            CustomMaterialButton(
-              isFilled: false,
-              label: I18nText('noButton'),
-              onPressed: () {
-                Navigator.of(context).pop();
-              },
-            ),
-            CustomMaterialButton(
-              label: I18nText('yesButton'),
+            TextButton(
               onPressed: () {
                 _managerAPI.setChangingToggleModified(true);
                 _managerAPI.setPatchesChangeEnabled(true);
                 Navigator.of(context).pop();
               },
+              child: I18nText('yesButton'),
+            ),
+            FilledButton(
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+              child: I18nText('noButton'),
             ),
           ],
         ),
@@ -91,7 +93,6 @@ class SettingsViewModel extends BaseViewModel {
       return showDialog(
         context: context,
         builder: (context) => AlertDialog(
-          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
           title: I18nText('warning'),
           content: I18nText(
             'settingsView.disablePatchesSelectionWarningText',
@@ -104,21 +105,20 @@ class SettingsViewModel extends BaseViewModel {
             ),
           ),
           actions: [
-            CustomMaterialButton(
-              isFilled: false,
-              label: I18nText('noButton'),
+            TextButton(
               onPressed: () {
                 Navigator.of(context).pop();
               },
+              child: I18nText('noButton'),
             ),
-            CustomMaterialButton(
-              label: I18nText('yesButton'),
+            FilledButton(
               onPressed: () {
                 _managerAPI.setChangingToggleModified(true);
                 _patchesSelectorViewModel.selectDefaultPatches();
                 _managerAPI.setPatchesChangeEnabled(false);
                 Navigator.of(context).pop();
               },
+              child: I18nText('yesButton'),
             ),
           ],
         ),
@@ -135,15 +135,66 @@ class SettingsViewModel extends BaseViewModel {
     notifyListeners();
   }
 
-  bool areExperimentalPatchesEnabled() {
-    return _managerAPI.areExperimentalPatchesEnabled();
+  bool isVersionCompatibilityCheckEnabled() {
+    return _managerAPI.isVersionCompatibilityCheckEnabled();
   }
 
-  void useExperimentalPatches(bool value) {
-    _managerAPI.enableExperimentalPatchesStatus(value);
+  void useVersionCompatibilityCheck(bool value) {
+    _managerAPI.enableVersionCompatibilityCheckStatus(value);
     notifyListeners();
   }
 
+  bool isRequireSuggestedAppVersionEnabled() {
+    return _managerAPI.isRequireSuggestedAppVersionEnabled();
+  }
+
+  Future<void>? showRequireSuggestedAppVersionDialog(
+    BuildContext context,
+    bool value,
+  ) {
+    if (!value) {
+      return showDialog(
+        context: context,
+        builder: (context) => AlertDialog(
+          title: I18nText('warning'),
+          content: I18nText(
+            'settingsView.requireSuggestedAppVersionDialogText',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          actions: [
+            TextButton(
+              onPressed: () {
+                _managerAPI.enableRequireSuggestedAppVersionStatus(false);
+                Navigator.of(context).pop();
+              },
+              child: I18nText('yesButton'),
+            ),
+            FilledButton(
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+              child: I18nText('noButton'),
+            ),
+          ],
+        ),
+      );
+    } else {
+      _managerAPI.enableRequireSuggestedAppVersionStatus(true);
+
+      if (!_managerAPI.suggestedAppVersionSelected) {
+        _patcherViewModel.selectedApp = null;
+      }
+
+      return null;
+    }
+  }
+
   void deleteKeystore() {
     _managerAPI.deleteKeystore();
     _toast.showBottom('settingsView.regeneratedKeystore');
@@ -162,10 +213,10 @@ class SettingsViewModel extends BaseViewModel {
       if (outFile.existsSync()) {
         final String dateTime =
             DateTime.now().toString().replaceAll(' ', '_').split('.').first;
-        await CRFileSaver.saveFileWithDialog(
-          SaveFileDialogParams(
+        await FlutterFileDialog.saveFile(
+          params: SaveFileDialogParams(
             sourceFilePath: outFile.path,
-            destinationFileName: 'selected_patches_$dateTime.json',
+            fileName: 'selected_patches_$dateTime.json',
           ),
         );
         _toast.showBottom('settingsView.exportedPatches');
@@ -182,12 +233,13 @@ class SettingsViewModel extends BaseViewModel {
   Future<void> importPatches(BuildContext context) async {
     if (isPatchesChangeEnabled()) {
       try {
-        final FilePickerResult? result = await FilePicker.platform.pickFiles(
-          type: FileType.custom,
-          allowedExtensions: ['json'],
+        final String? result = await FlutterFileDialog.pickFile(
+          params: const OpenFileDialogParams(
+            fileExtensionsFilter: ['json'],
+          ),
         );
-        if (result != null && result.files.single.path != null) {
-          final File inFile = File(result.files.single.path!);
+        if (result != null) {
+          final File inFile = File(result);
           inFile.copySync(_managerAPI.storedPatchesFile);
           inFile.delete();
           if (_patcherViewModel.selectedApp != null) {
@@ -212,10 +264,10 @@ class SettingsViewModel extends BaseViewModel {
       if (outFile.existsSync()) {
         final String dateTime =
             DateTime.now().toString().replaceAll(' ', '_').split('.').first;
-        await CRFileSaver.saveFileWithDialog(
-          SaveFileDialogParams(
+        await FlutterFileDialog.saveFile(
+          params: SaveFileDialogParams(
             sourceFilePath: outFile.path,
-            destinationFileName: 'keystore_$dateTime.keystore',
+            fileName: 'keystore_$dateTime.keystore',
           ),
         );
         _toast.showBottom('settingsView.exportedKeystore');
@@ -231,9 +283,9 @@ class SettingsViewModel extends BaseViewModel {
 
   Future<void> importKeystore() async {
     try {
-      final FilePickerResult? result = await FilePicker.platform.pickFiles();
-      if (result != null && result.files.single.path != null) {
-        final File inFile = File(result.files.single.path!);
+      final String? result = await FlutterFileDialog.pickFile();
+      if (result != null) {
+        final File inFile = File(result);
         inFile.copySync(_managerAPI.keystoreFile);
 
         _toast.showBottom('settingsView.importedKeystore');
@@ -246,16 +298,16 @@ class SettingsViewModel extends BaseViewModel {
     }
   }
 
+  void resetAllOptions() {
+    _managerAPI.resetAllOptions();
+    _toast.showBottom('settingsView.resetStoredOptions');
+  }
+
   void resetSelectedPatches() {
     _managerAPI.resetLastSelectedPatches();
     _toast.showBottom('settingsView.resetStoredPatches');
   }
 
-  Future<int> getSdkVersion() async {
-    final AndroidDeviceInfo info = await DeviceInfoPlugin().androidInfo;
-    return info.version.sdkInt;
-  }
-
   Future<void> deleteLogs() async {
     final Directory appCacheDir = await getTemporaryDirectory();
     final Directory logsDir = Directory('${appCacheDir.path}/logs');
@@ -279,6 +331,6 @@ class SettingsViewModel extends BaseViewModel {
         File('${logDir.path}/revanced-manager_logcat_$dateTime.log');
     final String logs = await Logcat.execute();
     logcat.writeAsStringSync(logs);
-    ShareExtend.share(logcat.path, 'file');
+    await Share.shareXFiles([XFile(logcat.path)]);
   }
 }

lib/ui/widgets/appInfoView/app_info_view.dart

@@ -9,9 +9,9 @@ import 'package:stacked/stacked.dart';
 
 class AppInfoView extends StatelessWidget {
   const AppInfoView({
-    Key? key,
+    super.key,
     required this.app,
-  }) : super(key: key);
+  });
   final PatchedApplication app;
 
   @override
@@ -184,7 +184,7 @@ class AppInfoView extends StatelessWidget {
                                           ),
                                           const SizedBox(height: 10),
                                           I18nText(
-                                            'appInfoView.unpatchButton',
+                                            'appInfoView.unmountButton',
                                             child: Text(
                                               '',
                                               style: TextStyle(
@@ -222,22 +222,6 @@ class AppInfoView extends StatelessWidget {
                       subtitle: Text(app.packageName),
                     ),
                     const SizedBox(height: 4),
-                    ListTile(
-                      contentPadding:
-                          const EdgeInsets.symmetric(horizontal: 20.0),
-                      title: I18nText(
-                        'appInfoView.originalPackageNameLabel',
-                        child: const Text(
-                          '',
-                          style: TextStyle(
-                            fontSize: 20,
-                            fontWeight: FontWeight.w500,
-                          ),
-                        ),
-                      ),
-                      subtitle: Text(app.originalPackageName),
-                    ),
-                    const SizedBox(height: 4),
                     ListTile(
                       contentPadding:
                           const EdgeInsets.symmetric(horizontal: 20.0),
@@ -252,8 +236,8 @@ class AppInfoView extends StatelessWidget {
                         ),
                       ),
                       subtitle: app.isRooted
-                          ? I18nText('appInfoView.rootTypeLabel')
-                          : I18nText('appInfoView.nonRootTypeLabel'),
+                          ? I18nText('appInfoView.mountTypeLabel')
+                          : I18nText('appInfoView.regularTypeLabel'),
                     ),
                     const SizedBox(height: 4),
                     ListTile(

lib/ui/widgets/appInfoView/app_info_viewmodel.dart

@@ -12,8 +12,6 @@ import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
-import 'package:revanced_manager/utils/string.dart';
 import 'package:stacked/stacked.dart';
 
 class AppInfoViewModel extends BaseViewModel {
@@ -27,18 +25,17 @@ class AppInfoViewModel extends BaseViewModel {
     PatchedApplication app,
     bool onlyUnpatch,
   ) async {
-    bool isUninstalled = true;
-    if (app.isRooted) {
-      final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
-      if (hasRootPermissions) {
-        await _rootAPI.deleteApp(app.packageName, app.apkFilePath);
-        if (!onlyUnpatch) {
-          await DeviceApps.uninstallApp(app.packageName);
-        }
-      }
-    } else {
+    var isUninstalled = onlyUnpatch;
+
+    if (!onlyUnpatch) {
+      // TODO(Someone): Wait for the app to uninstall successfully.
       isUninstalled = await DeviceApps.uninstallApp(app.packageName);
     }
+
+    if (isUninstalled && app.isRooted &&  await _rootAPI.hasRootPermissions()) {
+      await _rootAPI.uninstall(app.packageName);
+    }
+
     if (isUninstalled) {
       await _managerAPI.deletePatchedApp(app);
       locator<HomeViewModel>().initialize(context);
@@ -68,12 +65,11 @@ class AppInfoViewModel extends BaseViewModel {
         context: context,
         builder: (context) => AlertDialog(
           title: I18nText('appInfoView.rootDialogTitle'),
-          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
           content: I18nText('appInfoView.rootDialogText'),
           actions: <Widget>[
-            CustomMaterialButton(
-              label: I18nText('okButton'),
+            FilledButton(
               onPressed: () => Navigator.of(context).pop(),
+              child: I18nText('okButton'),
             ),
           ],
         ),
@@ -84,32 +80,53 @@ class AppInfoViewModel extends BaseViewModel {
           context: context,
           builder: (context) => AlertDialog(
             title: I18nText(
-              'appInfoView.unpatchButton',
+              'appInfoView.unmountButton',
             ),
-            backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
             content: I18nText(
-              'appInfoView.unpatchDialogText',
+              'appInfoView.unmountDialogText',
             ),
             actions: <Widget>[
-              CustomMaterialButton(
-                isFilled: false,
-                label: I18nText('noButton'),
+              TextButton(
                 onPressed: () => Navigator.of(context).pop(),
+                child: I18nText('noButton'),
               ),
-              CustomMaterialButton(
-                label: I18nText('yesButton'),
+              FilledButton(
                 onPressed: () {
-                  uninstallApp(context, app, onlyUnpatch);
+                  uninstallApp(context, app, true);
                   Navigator.of(context).pop();
                   Navigator.of(context).pop();
                 },
+                child: I18nText('yesButton'),
               ),
             ],
           ),
         );
       } else {
-        uninstallApp(context, app, onlyUnpatch);
-        Navigator.of(context).pop();
+        return showDialog(
+          context: context,
+          builder: (context) => AlertDialog(
+            title: I18nText(
+              'appInfoView.uninstallButton',
+            ),
+            content: I18nText(
+              'appInfoView.uninstallDialogText',
+            ),
+            actions: <Widget>[
+              TextButton(
+                onPressed: () => Navigator.of(context).pop(),
+                child: I18nText('noButton'),
+              ),
+              FilledButton(
+                onPressed: () {
+                  uninstallApp(context, app, false);
+                  Navigator.of(context).pop();
+                  Navigator.of(context).pop();
+                },
+                child: I18nText('yesButton'),
+              ),
+            ],
+          ),
+        );
       }
     }
   }
@@ -132,14 +149,13 @@ class AppInfoViewModel extends BaseViewModel {
       context: context,
       builder: (context) => AlertDialog(
         title: I18nText('appInfoView.appliedPatchesLabel'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         content: SingleChildScrollView(
           child: Text(getAppliedPatchesString(app.appliedPatches)),
         ),
         actions: <Widget>[
-          CustomMaterialButton(
-            label: I18nText('okButton'),
+          FilledButton(
             onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('okButton'),
           ),
         ],
       ),
@@ -147,17 +163,7 @@ class AppInfoViewModel extends BaseViewModel {
   }
 
   String getAppliedPatchesString(List<String> appliedPatches) {
-    final List<String> names = appliedPatches
-        .map(
-          (p) => p
-              .replaceAll('-', ' ')
-              .split('-')
-              .join(' ')
-              .toTitleCase()
-              .replaceFirst('Microg', 'MicroG'),
-        )
-        .toList();
-    return '\u2022 ${names.join('\n\u2022 ')}';
+    return '• ${appliedPatches.join('\n• ')}';
   }
 
   void openApp(PatchedApplication app) {

lib/ui/widgets/appSelectorView/app_skeleton_loader.dart

@@ -3,7 +3,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 import 'package:skeletons/skeletons.dart';
 
 class AppSkeletonLoader extends StatelessWidget {
-  const AppSkeletonLoader({Key? key}) : super(key: key);
+  const AppSkeletonLoader({super.key});
 
   @override
   Widget build(BuildContext context) {

lib/ui/widgets/appSelectorView/installed_app_item.dart

@@ -5,7 +5,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class InstalledAppItem extends StatefulWidget {
   const InstalledAppItem({
-    Key? key,
+    super.key,
     required this.name,
     required this.pkgName,
     required this.icon,
@@ -13,7 +13,9 @@ class InstalledAppItem extends StatefulWidget {
     required this.suggestedVersion,
     required this.installedVersion,
     this.onTap,
-  }) : super(key: key);
+    this.onLinkTap,
+  });
+
   final String name;
   final String pkgName;
   final Uint8List icon;
@@ -21,6 +23,7 @@ class InstalledAppItem extends StatefulWidget {
   final String suggestedVersion;
   final String installedVersion;
   final Function()? onTap;
+  final Function()? onLinkTap;
 
   @override
   State<InstalledAppItem> createState() => _InstalledAppItemState();
@@ -51,39 +54,26 @@ class _InstalledAppItemState extends State<InstalledAppItem> {
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: <Widget>[
-                  Text(
-                    widget.name,
-                    maxLines: 2,
-                    overflow: TextOverflow.visible,
-                    style: const TextStyle(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w500,
-                    ),
-                  ),
-                  Text(widget.pkgName),
-                  I18nText(
-                    FlutterI18n.translate(
-                      context,
-                      'installed',
-                      translationParams: {
-                        'version': 'v${widget.installedVersion}',
-                      },
-                    ),
-                  ),
                   Wrap(
+                    crossAxisAlignment: WrapCrossAlignment.center,
+                    spacing: 4,
                     children: [
-                      I18nText(
-                        'suggested',
-                        translationParams: {
-                          'version': widget.suggestedVersion.isEmpty
-                              ? FlutterI18n.translate(
-                                  context,
-                                  'appSelectorCard.allVersions',
-                                )
-                              : 'v${widget.suggestedVersion}',
-                        },
+                      Text(
+                        widget.name,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: const TextStyle(
+                          fontSize: 16,
+                        ),
+                      ),
+                      Text(
+                        widget.installedVersion,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: const TextStyle(
+                          fontSize: 16,
+                        ),
                       ),
-                      const SizedBox(width: 4),
                       Text(
                         widget.patchesCount == 1
                             ? '• ${widget.patchesCount} patch'
@@ -91,11 +81,58 @@ class _InstalledAppItemState extends State<InstalledAppItem> {
                         maxLines: 1,
                         overflow: TextOverflow.ellipsis,
                         style: TextStyle(
+                          fontSize: 16,
                           color: Theme.of(context).colorScheme.secondary,
                         ),
                       ),
                     ],
                   ),
+                  Text(
+                    widget.pkgName,
+                  ),
+                  const SizedBox(height: 4),
+                  Wrap(
+                    crossAxisAlignment: WrapCrossAlignment.center,
+                    children: [
+                      Material(
+                        color: Theme.of(context).colorScheme.secondaryContainer,
+                        borderRadius:
+                            const BorderRadius.all(Radius.circular(8)),
+                        child: InkWell(
+                          onTap: widget.onLinkTap,
+                          borderRadius:
+                              const BorderRadius.all(Radius.circular(8)),
+                          child: Container(
+                            padding: const EdgeInsets.fromLTRB(8, 4, 8, 4),
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                I18nText(
+                                  'suggested',
+                                  translationParams: {
+                                    'version': widget.suggestedVersion.isEmpty
+                                        ? FlutterI18n.translate(
+                                            context,
+                                            'appSelectorCard.anyVersion',
+                                          )
+                                        : widget.suggestedVersion,
+                                  },
+                                ),
+                                const SizedBox(width: 4),
+                                Icon(
+                                  Icons.search,
+                                  size: 16,
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .onSecondaryContainer,
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
                 ],
               ),
             ),

lib/ui/widgets/appSelectorView/not_installed_app_item.dart

@@ -4,16 +4,19 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class NotInstalledAppItem extends StatefulWidget {
   const NotInstalledAppItem({
-    Key? key,
+    super.key,
     required this.name,
     required this.patchesCount,
     required this.suggestedVersion,
     this.onTap,
-  }) : super(key: key);
+    this.onLinkTap,
+  });
+
   final String name;
   final int patchesCount;
   final String suggestedVersion;
   final Function()? onTap;
+  final Function()? onLinkTap;
 
   @override
   State<NotInstalledAppItem> createState() => _NotInstalledAppItem();
@@ -30,68 +33,91 @@ class _NotInstalledAppItem extends State<NotInstalledAppItem> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: <Widget>[
             Container(
+              width: 48,
               height: 48,
-              padding: const EdgeInsets.symmetric(vertical: 4.0),
               alignment: Alignment.center,
               child: const CircleAvatar(
                 backgroundColor: Colors.transparent,
                 child: Icon(
                   Icons.square_rounded,
                   color: Colors.grey,
-                  size: 44,
+                  size: 48,
                 ),
               ),
             ),
             const SizedBox(width: 12),
             Expanded(
               child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: <Widget>[
-                  Text(
-                    widget.name,
-                    style: const TextStyle(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w500,
-                    ),
-                  ),
-                  const SizedBox(height: 4),
-                  I18nText(
-                    'appSelectorCard.notInstalled',
-                    child: Text(
-                      '',
-                      style: TextStyle(
-                        color: Theme.of(context).textTheme.titleLarge!.color,
-                      ),
-                    ),
-                  ),
-                  Wrap(
-                    children: [
-                      I18nText(
-                        'suggested',
-                        translationParams: {
-                          'version': widget.suggestedVersion.isEmpty
-                              ? FlutterI18n.translate(
-                                  context,
-                                  'appSelectorCard.allVersions',
-                                )
-                              : 'v${widget.suggestedVersion}',
-                        },
-                      ),
-                      const SizedBox(width: 4),
-                      Text(
-                        widget.patchesCount == 1
-                            ? '• ${widget.patchesCount} patch'
-                            : '• ${widget.patchesCount} patches',
-                        maxLines: 1,
-                        overflow: TextOverflow.ellipsis,
-                        style: TextStyle(
-                          color: Theme.of(context).colorScheme.secondary,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: <Widget>[
+                    Wrap(
+                      crossAxisAlignment: WrapCrossAlignment.center,
+                      spacing: 4,
+                      children: [
+                        Text(
+                          widget.name,
+                          style: const TextStyle(
+                            fontSize: 16,
+                          ),
                         ),
-                      ),
-                    ],
-                  ),
-                ],
-              ),
+                        Text(
+                          widget.patchesCount == 1
+                              ? '• ${widget.patchesCount} patch'
+                              : '• ${widget.patchesCount} patches',
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                          style: TextStyle(
+                            fontSize: 16,
+                            color: Theme.of(context).colorScheme.secondary,
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 4),
+                    Wrap(
+                      crossAxisAlignment: WrapCrossAlignment.center,
+                      children: [
+                        Material(
+                          color:
+                              Theme.of(context).colorScheme.secondaryContainer,
+                          borderRadius:
+                              const BorderRadius.all(Radius.circular(8)),
+                          child: InkWell(
+                            onTap: widget.onLinkTap,
+                            borderRadius:
+                                const BorderRadius.all(Radius.circular(8)),
+                            child: Container(
+                              padding: const EdgeInsets.fromLTRB(8, 4, 8, 4),
+                              child: Row(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  I18nText(
+                                    'suggested',
+                                    translationParams: {
+                                      'version': widget.suggestedVersion.isEmpty
+                                          ? FlutterI18n.translate(
+                                              context,
+                                              'appSelectorCard.anyVersion',
+                                            )
+                                          : widget.suggestedVersion,
+                                    },
+                                  ),
+                                  const SizedBox(width: 4),
+                                  Icon(
+                                    Icons.search,
+                                    size: 16,
+                                    color: Theme.of(context)
+                                        .colorScheme
+                                        .onSecondaryContainer,
+                                  ),
+                                ],
+                              ),
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ]),
             ),
           ],
         ),

lib/ui/widgets/contributorsView/contributors_card.dart

@@ -1,16 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_cache_manager/file.dart';
-import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
+import 'package:revanced_manager/services/download_manager.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class ContributorsCard extends StatefulWidget {
   const ContributorsCard({
-    Key? key,
+    super.key,
     required this.title,
     required this.contributors,
-  }) : super(key: key);
+  });
   final String title;
   final List<dynamic> contributors;
 
@@ -58,7 +58,7 @@ class _ContributorsCardState extends State<ContributorsCard> {
                   mode: LaunchMode.externalApplication,
                 ),
                 child: FutureBuilder<File?>(
-                  future: DefaultCacheManager().getSingleFile(
+                  future: DownloadManager().getSingleFile(
                     widget.contributors[index]['avatar_url'],
                   ),
                   builder: (context, snapshot) => snapshot.hasData

lib/ui/widgets/homeView/installed_apps_card.dart

@@ -10,7 +10,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 //ignore: must_be_immutable
 class InstalledAppsCard extends StatelessWidget {
-  InstalledAppsCard({Key? key}) : super(key: key);
+  InstalledAppsCard({super.key});
 
   List<PatchedApplication> apps = locator<HomeViewModel>().patchedInstalledApps;
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
@@ -79,8 +79,6 @@ class InstalledAppsCard extends StatelessWidget {
                           icon: app.icon,
                           name: app.name,
                           patchDate: app.patchDate,
-                          changelog: app.changelog,
-                          isUpdatableApp: false,
                           onPressed: () =>
                               locator<HomeViewModel>().navigateToAppInfo(app),
                         ),

lib/ui/widgets/homeView/latest_commit_card.dart

@@ -3,14 +3,13 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 
 class LatestCommitCard extends StatefulWidget {
   const LatestCommitCard({
-    Key? key,
+    super.key,
     required this.model,
     required this.parentContext,
-  }) : super(key: key);
+  });
   final HomeViewModel model;
   final BuildContext parentContext;
 
@@ -56,17 +55,15 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
               FutureBuilder<bool>(
                 future: model.hasManagerUpdates(),
                 initialData: false,
-                builder: (context, snapshot) => Opacity(
-                  opacity: snapshot.hasData && snapshot.data! ? 1.0 : 0.25,
-                  child: CustomMaterialButton(
-                    label: I18nText('updateButton'),
-                    onPressed: snapshot.hasData && snapshot.data!
-                        ? () => widget.model.showUpdateConfirmationDialog(
-                              widget.parentContext,
-                              false,
-                            )
-                        : () => {},
+                builder: (context, snapshot) => FilledButton(
+                  onPressed: () => widget.model.showUpdateConfirmationDialog(
+                    widget.parentContext,
+                    false,
+                    !snapshot.data!,
                   ),
+                  child: (snapshot.hasData && !snapshot.data!)
+                      ? I18nText('showChangelogButton')
+                      : I18nText('showUpdateButton'),
                 ),
               ),
             ],
@@ -75,7 +72,7 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
 
         const SizedBox(height: 16),
 
-        // ReVanced Patches
+        // Patches
         CustomCard(
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -109,19 +106,17 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
                 ),
               ),
               FutureBuilder<bool>(
-                future: locator<HomeViewModel>().hasPatchesUpdates(),
+                future: model.hasPatchesUpdates(),
                 initialData: false,
-                builder: (context, snapshot) => Opacity(
-                  opacity: snapshot.hasData && snapshot.data! ? 1.0 : 0.25,
-                  child: CustomMaterialButton(
-                    label: I18nText('updateButton'),
-                    onPressed: snapshot.hasData && snapshot.data!
-                        ? () => widget.model.showUpdateConfirmationDialog(
-                              widget.parentContext,
-                              true,
-                            )
-                        : () => {},
+                builder: (context, snapshot) => FilledButton(
+                  onPressed: () => widget.model.showUpdateConfirmationDialog(
+                    widget.parentContext,
+                    true,
+                    !snapshot.data!,
                   ),
+                  child: (snapshot.hasData && !snapshot.data!)
+                      ? I18nText('showChangelogButton')
+                      : I18nText('showUpdateButton'),
                 ),
               ),
             ],

lib/ui/widgets/homeView/update_confirmation_sheet.dart

@@ -3,12 +3,12 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 
-class UpdateConfirmationDialog extends StatelessWidget {
-  const UpdateConfirmationDialog({super.key, required this.isPatches});
+class UpdateConfirmationSheet extends StatelessWidget {
+  const UpdateConfirmationSheet({super.key, required this.isPatches,  this.changelog = false});
 
   final bool isPatches;
+  final bool changelog;
   @override
   Widget build(BuildContext context) {
     final HomeViewModel model = locator<HomeViewModel>();
@@ -37,6 +37,7 @@ class UpdateConfirmationDialog extends StatelessWidget {
               return Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
+                  if (!changelog)
                   Padding(
                     padding: const EdgeInsets.only(
                       top: 40.0,
@@ -52,8 +53,8 @@ class UpdateConfirmationDialog extends StatelessWidget {
                             children: [
                               I18nText(
                                 isPatches
-                                    ? 'homeView.updatePatchesDialogTitle'
-                                    : 'homeView.updateDialogTitle',
+                                    ? 'homeView.updatePatchesSheetTitle'
+                                    : 'homeView.updateSheetTitle',
                                 child: const Text(
                                   '',
                                   style: TextStyle(
@@ -86,21 +87,20 @@ class UpdateConfirmationDialog extends StatelessWidget {
                             ],
                           ),
                         ),
-                        CustomMaterialButton(
-                          isExpanded: true,
-                          label: I18nText('updateButton'),
+                        FilledButton(
                           onPressed: () {
                             Navigator.of(context).pop();
                             isPatches
                                 ? model.updatePatches(context)
                                 : model.updateManager(context);
                           },
+                          child: I18nText('updateButton'),
                         ),
                       ],
                     ),
                   ),
                   Padding(
-                    padding: const EdgeInsets.only(left: 24.0, bottom: 12.0),
+                    padding: const EdgeInsets.only(top: 12.0, left: 24.0, bottom: 12.0),
                     child: I18nText(
                       'homeView.updateChangelogTitle',
                       child: Text(

lib/ui/widgets/patcherView/app_selector_card.dart

@@ -7,20 +7,29 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class AppSelectorCard extends StatelessWidget {
   const AppSelectorCard({
-    Key? key,
+    super.key,
     required this.onPressed,
-  }) : super(key: key);
+  });
+
   final Function() onPressed;
 
   @override
   Widget build(BuildContext context) {
+    final vm = locator<PatcherViewModel>();
+
+
+    String? suggestedVersion;
+    if (vm.selectedApp != null) {
+      suggestedVersion = vm.getSuggestedVersionString(context);
+    }
+
     return CustomCard(
       onTap: onPressed,
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
           I18nText(
-            locator<PatcherViewModel>().selectedApp == null
+            vm.selectedApp == null
                 ? 'appSelectorCard.widgetTitle'
                 : 'appSelectorCard.widgetTitleSelected',
             child: const Text(
@@ -32,7 +41,7 @@ class AppSelectorCard extends StatelessWidget {
             ),
           ),
           const SizedBox(height: 8),
-          if (locator<PatcherViewModel>().selectedApp == null)
+          if (vm.selectedApp == null)
             I18nText('appSelectorCard.widgetSubtitle')
           else
             Row(
@@ -41,9 +50,9 @@ class AppSelectorCard extends StatelessWidget {
                   height: 18.0,
                   child: ClipOval(
                     child: Image.memory(
-                      locator<PatcherViewModel>().selectedApp == null
+                      vm.selectedApp == null
                           ? Uint8List(0)
-                          : locator<PatcherViewModel>().selectedApp!.icon,
+                          : vm.selectedApp!.icon,
                       fit: BoxFit.cover,
                     ),
                   ),
@@ -51,22 +60,64 @@ class AppSelectorCard extends StatelessWidget {
                 const SizedBox(width: 6),
                 Flexible(
                   child: Text(
-                    locator<PatcherViewModel>().getAppSelectionString(),
+                    vm.getAppSelectionString(),
                     style: const TextStyle(fontWeight: FontWeight.w600),
                   ),
                 ),
               ],
             ),
-          if (locator<PatcherViewModel>().selectedApp == null)
+          if (vm.selectedApp == null)
             Container()
           else
             Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
               children: [
                 const SizedBox(height: 4),
                 Text(
-                  locator<PatcherViewModel>()
-                      .getSuggestedVersionString(context),
+                  vm.selectedApp!.packageName,
                 ),
+                if (suggestedVersion!.isNotEmpty &&
+                    suggestedVersion != vm.selectedApp!.version) ...[
+                  const SizedBox(height: 4),
+                  Row(
+                    children: [
+                      Material(
+                        color: Theme.of(context).colorScheme.secondaryContainer,
+                        borderRadius:
+                            const BorderRadius.all(Radius.circular(8)),
+                        child: InkWell(
+                          onTap: () {
+                            vm.queryVersion(suggestedVersion!);
+                          },
+                          borderRadius:
+                              const BorderRadius.all(Radius.circular(8)),
+                          child: Container(
+                            padding: const EdgeInsets.fromLTRB(8, 4, 8, 4),
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                I18nText(
+                                  'suggested',
+                                  translationParams: {
+                                    'version': suggestedVersion,
+                                  },
+                                ),
+                                const SizedBox(width: 4),
+                                Icon(
+                                  Icons.search,
+                                  size: 16,
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .onSecondaryContainer,
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ]
               ],
             ),
         ],

lib/ui/widgets/patcherView/patch_selector_card.dart

@@ -7,9 +7,9 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class PatchSelectorCard extends StatelessWidget {
   const PatchSelectorCard({
-    Key? key,
+    super.key,
     required this.onPressed,
-  }) : super(key: key);
+  });
   final Function() onPressed;
 
   @override
@@ -58,8 +58,11 @@ class PatchSelectorCard extends StatelessWidget {
 
   String _getPatchesSelection() {
     String text = '';
-    for (final Patch p in locator<PatcherViewModel>().selectedPatches) {
-      text += '\u2022  ${p.getSimpleName()}\n';
+    final List<Patch> selectedPatches =
+        locator<PatcherViewModel>().selectedPatches;
+    selectedPatches.sort((a, b) => a.name.compareTo(b.name));
+    for (final Patch p in selectedPatches) {
+      text += '•  ${p.getSimpleName()}\n';
     }
     return text.substring(0, text.length - 1);
   }

lib/ui/widgets/patchesSelectorView/patch_item.dart

@@ -1,38 +1,41 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
+import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/toast.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_checkbox.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_custom_card.dart';
 
 // ignore: must_be_immutable
 class PatchItem extends StatefulWidget {
   PatchItem({
-    Key? key,
+    super.key,
     required this.name,
     required this.simpleName,
     required this.description,
     required this.packageVersion,
     required this.supportedPackageVersions,
     required this.isUnsupported,
-    required this.isNew,
+    required this.hasUnsupportedPatchOption,
+    required this.options,
     required this.isSelected,
     required this.onChanged,
+    required this.navigateToOptions,
     required this.isChangeEnabled,
-    this.child,
-  }) : super(key: key);
+  });
   final String name;
   final String simpleName;
   final String description;
   final String packageVersion;
   final List<String> supportedPackageVersions;
   final bool isUnsupported;
-  final bool isNew;
+  final bool hasUnsupportedPatchOption;
+  final List<Option> options;
   bool isSelected;
   final Function(bool) onChanged;
+  final void Function(List<Option>) navigateToOptions;
   final bool isChangeEnabled;
-  final Widget? child;
   final toast = locator<Toast>();
   final _managerAPI = locator<ManagerAPI>();
 
@@ -45,157 +48,162 @@ class _PatchItemState extends State<PatchItem> {
   Widget build(BuildContext context) {
     widget.isSelected = widget.isSelected &&
         (!widget.isUnsupported ||
-            widget._managerAPI.areExperimentalPatchesEnabled());
+            !widget._managerAPI.isVersionCompatibilityCheckEnabled()) &&
+        !widget.hasUnsupportedPatchOption;
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 4.0),
       child: Opacity(
         opacity: widget.isUnsupported &&
-                widget._managerAPI.areExperimentalPatchesEnabled() == false
+                widget._managerAPI.isVersionCompatibilityCheckEnabled() == true
             ? 0.5
             : 1,
-        child: CustomCard(
+        child: HapticCustomCard(
+          padding: EdgeInsets.only(
+            top: 12,
+            bottom: 16,
+            left: 8.0,
+            right: widget.options.isNotEmpty ? 4.0 : 8.0,
+          ),
           onTap: () {
-            setState(() {
-              if (widget.isUnsupported &&
-                  !widget._managerAPI.areExperimentalPatchesEnabled()) {
-                widget.isSelected = false;
-                widget.toast.showBottom('patchItem.unsupportedPatchVersion');
-              } else if (widget.isChangeEnabled) {
-                widget.isSelected = !widget.isSelected;
+            if (widget.isUnsupported &&
+                widget._managerAPI.isVersionCompatibilityCheckEnabled()) {
+              widget.isSelected = false;
+              widget.toast.showBottom('patchItem.unsupportedPatchVersion');
+            } else if (widget.isChangeEnabled) {
+              if (!widget.isSelected) {
+                if (widget.hasUnsupportedPatchOption) {
+                  _showUnsupportedRequiredOptionDialog();
+                  return;
+                }
               }
-            });
-            if (!widget.isUnsupported || widget._managerAPI.areExperimentalPatchesEnabled()) {
+              widget.isSelected = !widget.isSelected;
+              setState(() {});
+            }
+            if (!widget.isUnsupported ||
+                !widget._managerAPI.isVersionCompatibilityCheckEnabled()) {
               widget.onChanged(widget.isSelected);
             }
           },
-          child: Column(
-            children: <Widget>[
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: <Widget>[
-                  Flexible(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: <Widget>[
-                        Row(
-                          crossAxisAlignment: CrossAxisAlignment.end,
-                          children: <Widget>[
-                            Expanded(
-                              child: Text(
-                                widget.simpleName,
-                                maxLines: 2,
-                                overflow: TextOverflow.visible,
-                                style: const TextStyle(
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.w600,
-                                ),
-                              ),
-                            ),
-                          ],
-                        ),
-                        const SizedBox(height: 4),
-                        Text(
-                          widget.description,
-                          softWrap: true,
-                          overflow: TextOverflow.visible,
-                          style: TextStyle(
-                            fontSize: 14,
-                            color: Theme.of(context)
-                                .colorScheme
-                                .onSecondaryContainer,
-                          ),
-                        ),
-                      ],
-                    ),
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Transform.scale(
+                scale: 1.2,
+                child: HapticCheckbox(
+                  value: widget.isSelected,
+                  activeColor: Theme.of(context).colorScheme.primary,
+                  checkColor: Theme.of(context).colorScheme.secondaryContainer,
+                  side: BorderSide(
+                    width: 2.0,
+                    color: Theme.of(context).colorScheme.primary,
                   ),
-                  Transform.scale(
-                    scale: 1.2,
-                    child: Checkbox(
-                      value: widget.isSelected,
-                      activeColor: Theme.of(context).colorScheme.primary,
-                      checkColor:
-                          Theme.of(context).colorScheme.secondaryContainer,
-                      side: BorderSide(
-                        width: 2.0,
-                        color: Theme.of(context).colorScheme.primary,
-                      ),
-                      onChanged: (newValue) {
-                        setState(() {
-                          if (widget.isUnsupported &&
-                              !widget._managerAPI
-                                  .areExperimentalPatchesEnabled()) {
-                            widget.isSelected = false;
-                            widget.toast.showBottom(
-                              'patchItem.unsupportedPatchVersion',
-                            );
-                          } else if (widget.isChangeEnabled) {
-                            widget.isSelected = newValue!;
-                          }
-                        });
-                        if (!widget.isUnsupported || widget._managerAPI.areExperimentalPatchesEnabled()) {
-                          widget.onChanged(widget.isSelected);
+                  onChanged: (newValue) {
+                    if (widget.isUnsupported &&
+                        widget._managerAPI
+                            .isVersionCompatibilityCheckEnabled()) {
+                      widget.isSelected = false;
+                      widget.toast.showBottom(
+                        'patchItem.unsupportedPatchVersion',
+                      );
+                    } else if (widget.isChangeEnabled) {
+                      if (!widget.isSelected) {
+                        if (widget.hasUnsupportedPatchOption) {
+                          _showUnsupportedRequiredOptionDialog();
+                          return;
                         }
-                      },
-                    ),
+                      }
+                      widget.isSelected = newValue!;
+                      setState(() {});
+                    }
+                    if (!widget.isUnsupported ||
+                        !widget._managerAPI
+                            .isVersionCompatibilityCheckEnabled()) {
+                      widget.onChanged(widget.isSelected);
+                    }
+                  },
+                ),
+              ),
+              Expanded(
+                child: Padding(
+                  padding: const EdgeInsets.only(top: 10),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        widget.simpleName,
+                        maxLines: 2,
+                        overflow: TextOverflow.visible,
+                        style: const TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.w600,
+                        ),
+                      ),
+                      Text(
+                        widget.description,
+                        softWrap: true,
+                        overflow: TextOverflow.visible,
+                        style: TextStyle(
+                          fontSize: 14,
+                          color: Theme.of(context)
+                              .colorScheme
+                              .onSecondaryContainer,
+                        ),
+                      ),
+                      if (widget.description.isNotEmpty)
+                        Align(
+                          alignment: Alignment.topLeft,
+                          child: Wrap(
+                            spacing: 8,
+                            runSpacing: 4,
+                            children: [
+                              if (widget.isUnsupported &&
+                                  !widget._managerAPI
+                                      .isVersionCompatibilityCheckEnabled())
+                                Padding(
+                                  padding: const EdgeInsets.only(top: 8),
+                                  child: TextButton.icon(
+                                    label: I18nText('warning'),
+                                    icon: const Icon(
+                                      Icons.warning_amber_outlined,
+                                      size: 20.0,
+                                    ),
+                                    onPressed: () =>
+                                        _showUnsupportedWarningDialog(),
+                                    style: ButtonStyle(
+                                      shape: MaterialStateProperty.all(
+                                        RoundedRectangleBorder(
+                                          borderRadius:
+                                              BorderRadius.circular(8),
+                                          side: BorderSide(
+                                            color: Theme.of(context)
+                                                .colorScheme
+                                                .secondary,
+                                          ),
+                                        ),
+                                      ),
+                                      backgroundColor:
+                                          MaterialStateProperty.all(
+                                        Colors.transparent,
+                                      ),
+                                      foregroundColor:
+                                          MaterialStateProperty.all(
+                                        Theme.of(context).colorScheme.secondary,
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                            ],
+                          ),
+                        ),
+                    ],
                   ),
-                ],
+                ),
               ),
-              Row(
-                children: [
-                  if (widget.isUnsupported &&
-                      widget._managerAPI.areExperimentalPatchesEnabled())
-                    Padding(
-                      padding: const EdgeInsets.only(top: 8, right: 8),
-                      child: TextButton.icon(
-                        label: I18nText('warning'),
-                        icon: const Icon(Icons.warning, size: 20.0),
-                        onPressed: () => _showUnsupportedWarningDialog(),
-                        style: ButtonStyle(
-                          shape: MaterialStateProperty.all(
-                            RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(8),
-                              side: BorderSide(
-                                color: Theme.of(context).colorScheme.secondary,
-                              ),
-                            ),
-                          ),
-                          backgroundColor: MaterialStateProperty.all(
-                            Colors.transparent,
-                          ),
-                          foregroundColor: MaterialStateProperty.all(
-                            Theme.of(context).colorScheme.secondary,
-                          ),
-                        ),
-                      ),
-                    ),
-                  if (widget.isNew)
-                    Padding(
-                      padding: const EdgeInsets.only(top: 8),
-                      child: TextButton.icon(
-                        label: I18nText('new'),
-                        icon: const Icon(Icons.star, size: 20.0),
-                        onPressed: () => _showNewPatchDialog(),
-                        style: ButtonStyle(
-                          shape: MaterialStateProperty.all(
-                            RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(8),
-                              side: BorderSide(
-                                color: Theme.of(context).colorScheme.secondary,
-                              ),
-                            ),
-                          ),
-                          backgroundColor: MaterialStateProperty.all(
-                            Colors.transparent,
-                          ),
-                          foregroundColor: MaterialStateProperty.all(
-                            Theme.of(context).colorScheme.secondary,
-                          ),
-                        ),
-                      ),
-                    ),
-                ],
-              ),
-              widget.child ?? const SizedBox(),
+              if (widget.options.isNotEmpty)
+                IconButton(
+                  icon: const Icon(Icons.settings_outlined),
+                  onPressed: () => widget.navigateToOptions(widget.options),
+                ),
             ],
           ),
         ),
@@ -208,38 +216,36 @@ class _PatchItemState extends State<PatchItem> {
       context: context,
       builder: (context) => AlertDialog(
         title: I18nText('warning'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         content: I18nText(
           'patchItem.unsupportedDialogText',
           translationParams: {
             'packageVersion': widget.packageVersion,
             'supportedVersions':
-                '\u2022 ${widget.supportedPackageVersions.reversed.join('\n\u2022 ')}',
+                '• ${widget.supportedPackageVersions.reversed.join('\n• ')}',
           },
         ),
         actions: <Widget>[
-          CustomMaterialButton(
-            label: I18nText('okButton'),
+          FilledButton(
             onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('okButton'),
           ),
         ],
       ),
     );
   }
 
-  Future<void> _showNewPatchDialog() {
+  Future<void> _showUnsupportedRequiredOptionDialog() {
     return showDialog(
       context: context,
       builder: (context) => AlertDialog(
-        title: I18nText('patchItem.newPatch'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        title: I18nText('notice'),
         content: I18nText(
-          'patchItem.newPatchDialogText',
+          'patchItem.unsupportedRequiredOption',
         ),
         actions: <Widget>[
-          CustomMaterialButton(
-            label: I18nText('okButton'),
+          FilledButton(
             onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('okButton'),
           ),
         ],
       ),

lib/ui/widgets/patchesSelectorView/patch_options_fields.dart

@@ -1,73 +1,552 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_file_dialog/flutter_file_dialog.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
-import 'package:google_fonts/google_fonts.dart';
+import 'package:revanced_manager/models/patch.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
-class OptionsTextField extends StatelessWidget {
-  const OptionsTextField({Key? key, required this.hint}) : super(key: key);
-  final String hint;
+class BooleanPatchOption extends StatelessWidget {
+  const BooleanPatchOption({
+    super.key,
+    required this.patchOption,
+    required this.removeOption,
+    required this.onChanged,
+  });
+
+  final Option patchOption;
+  final void Function(Option option) removeOption;
+  final void Function(dynamic value, Option option) onChanged;
 
   @override
   Widget build(BuildContext context) {
-    final size = MediaQuery.sizeOf(context);
-    final sHeight = size.height;
-    final sWidth = size.width;
-    return Container(
-      margin: const EdgeInsets.only(top: 12, bottom: 6),
-      padding: EdgeInsets.zero,
-      child: TextField(
-        decoration: InputDecoration(
-          constraints: BoxConstraints(
-            maxHeight: sHeight * 0.05,
-            maxWidth: sWidth * 1,
+    final ValueNotifier patchOptionValue = ValueNotifier(patchOption.value);
+    return PatchOption(
+      widget: Align(
+        alignment: Alignment.bottomLeft,
+        child: ValueListenableBuilder(
+          valueListenable: patchOptionValue,
+          builder: (context, value, child) {
+            return Switch(
+              value: value ?? false,
+              onChanged: (bool value) {
+                patchOptionValue.value = value;
+                onChanged(value, patchOption);
+              },
+            );
+          },
+        ),
+      ),
+      patchOption: patchOption,
+      removeOption: (Option option) {
+        removeOption(option);
+      },
+    );
+  }
+}
+
+class IntAndStringPatchOption extends StatelessWidget {
+  const IntAndStringPatchOption({
+    super.key,
+    required this.patchOption,
+    required this.removeOption,
+    required this.onChanged,
+  });
+
+  final Option patchOption;
+  final void Function(Option option) removeOption;
+  final void Function(dynamic value, Option option) onChanged;
+
+  @override
+  Widget build(BuildContext context) {
+    final ValueNotifier patchOptionValue = ValueNotifier(patchOption.value);
+    String getKey() {
+      if (patchOption.value != null && patchOption.values != null) {
+        final List values = patchOption.values!.entries
+            .where((e) => e.value == patchOption.value)
+            .toList();
+        if (values.isNotEmpty) {
+          return values.first.key;
+        }
+      }
+      return '';
+    }
+
+    return PatchOption(
+      widget: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          TextFieldForPatchOption(
+            value: patchOption.value,
+            values: patchOption.values,
+            optionType: patchOption.valueType,
+            selectedKey: getKey(),
+            onChanged: (value) {
+              patchOptionValue.value = value;
+              onChanged(value, patchOption);
+            },
           ),
-          border: const OutlineInputBorder(),
-          labelText: hint,
+          ValueListenableBuilder(
+            valueListenable: patchOptionValue,
+            builder: (context, value, child) {
+              if (patchOption.required && value == null) {
+                return Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    const SizedBox(height: 8),
+                    I18nText(
+                      'patchOptionsView.requiredOption',
+                      child: Text(
+                        '',
+                        style: TextStyle(
+                          color: Theme.of(context).colorScheme.error,
+                        ),
+                      ),
+                    ),
+                  ],
+                );
+              } else {
+                return const SizedBox();
+              }
+            },
+          ),
+        ],
+      ),
+      patchOption: patchOption,
+      removeOption: (Option option) {
+        removeOption(option);
+      },
+    );
+  }
+}
+
+class IntStringLongListPatchOption extends StatelessWidget {
+  const IntStringLongListPatchOption({
+    super.key,
+    required this.patchOption,
+    required this.removeOption,
+    required this.onChanged,
+  });
+
+  final Option patchOption;
+  final void Function(Option option) removeOption;
+  final void Function(dynamic value, Option option) onChanged;
+
+  @override
+  Widget build(BuildContext context) {
+    final List<dynamic> values = List.from(patchOption.value ?? []);
+    final ValueNotifier patchOptionValue = ValueNotifier(values);
+    final String type = patchOption.valueType;
+
+    String getKey(dynamic value) {
+      if (value != null && patchOption.values != null) {
+        final List values = patchOption.values!.entries
+            .where((e) => e.value.toString() == value)
+            .toList();
+        if (values.isNotEmpty) {
+          return values.first.key;
+        }
+      }
+      return '';
+    }
+
+    bool isCustomValue() {
+      if (values.length == 1 && patchOption.values != null) {
+        if (getKey(values[0]) != '') {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    bool isTextFieldVisible = isCustomValue();
+
+    return PatchOption(
+      widget: ValueListenableBuilder(
+        valueListenable: patchOptionValue,
+        builder: (context, value, child) {
+          return Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              ListView.builder(
+                shrinkWrap: true,
+                itemCount: value.length,
+                physics: const NeverScrollableScrollPhysics(),
+                itemBuilder: (BuildContext context, int index) {
+                  final e = values[index];
+                  return TextFieldForPatchOption(
+                    value: e.toString(),
+                    values: patchOption.values,
+                    optionType: type,
+                    selectedKey: value.length > 1 ? '' : getKey(e),
+                    showDropdown: index == 0,
+                    onChanged: (newValue) {
+                      if (newValue is List) {
+                        values.clear();
+                        isTextFieldVisible = false;
+                        values.add(newValue.toString());
+                      } else {
+                        isTextFieldVisible = true;
+                        if (values.length == 1 &&
+                            values[0].toString().startsWith('[') &&
+                            type.contains('Array')) {
+                          values.clear();
+                          values.addAll(patchOption.value);
+                        } else {
+                          values[index] = type == 'StringArray'
+                              ? newValue
+                              : type == 'IntArray'
+                                  ? int.parse(
+                                      newValue.toString().isEmpty
+                                          ? '0'
+                                          : newValue.toString(),
+                                    )
+                                  : num.parse(
+                                      newValue.toString().isEmpty
+                                          ? '0'
+                                          : newValue.toString(),
+                                    );
+                        }
+                      }
+                      patchOptionValue.value = List.from(values);
+                      onChanged(values, patchOption);
+                    },
+                    removeValue: () {
+                      patchOptionValue.value = List.from(patchOptionValue.value)
+                        ..removeAt(index);
+                      values.removeAt(index);
+                      onChanged(values, patchOption);
+                    },
+                  );
+                },
+              ),
+              if (isTextFieldVisible) ...[
+                const SizedBox(height: 4),
+                Align(
+                  alignment: Alignment.centerLeft,
+                  child: TextButton(
+                    onPressed: () {
+                      if (type == 'StringArray') {
+                        patchOptionValue.value =
+                            List.from(patchOptionValue.value)..add('');
+                        values.add('');
+                      } else {
+                        patchOptionValue.value =
+                            List.from(patchOptionValue.value)..add(0);
+                        values.add(0);
+                      }
+                      onChanged(values, patchOption);
+                    },
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        const Icon(Icons.add, size: 20),
+                        I18nText(
+                          'add',
+                          child: const Text(
+                            '',
+                            style: TextStyle(
+                              fontSize: 14,
+                              fontWeight: FontWeight.w600,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ],
+            ],
+          );
+        },
+      ),
+      patchOption: patchOption,
+      removeOption: (Option option) {
+        removeOption(option);
+      },
+    );
+  }
+}
+
+class UnsupportedPatchOption extends StatelessWidget {
+  const UnsupportedPatchOption({super.key, required this.patchOption});
+
+  final Option patchOption;
+
+  @override
+  Widget build(BuildContext context) {
+    return PatchOption(
+      widget: Align(
+        alignment: Alignment.centerLeft,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(vertical: 8.0),
+          child: I18nText(
+            'patchOptionsView.unsupportedOption',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 16,
+              ),
+            ),
+          ),
+        ),
+      ),
+      patchOption: patchOption,
+      removeOption: (_) {},
+    );
+  }
+}
+
+class PatchOption extends StatelessWidget {
+  const PatchOption({
+    super.key,
+    required this.widget,
+    required this.patchOption,
+    required this.removeOption,
+  });
+
+  final Widget widget;
+  final Option patchOption;
+  final void Function(Option option) removeOption;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: CustomCard(
+        child: Row(
+          children: [
+            Expanded(
+              child: Column(
+                children: [
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Expanded(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text(
+                              patchOption.title,
+                              style: const TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.w600,
+                              ),
+                            ),
+                            const SizedBox(height: 4),
+                            Text(
+                              patchOption.description,
+                              style: TextStyle(
+                                fontSize: 14,
+                                color: Theme.of(context)
+                                    .colorScheme
+                                    .onSecondaryContainer,
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                      if (!patchOption.required)
+                        IconButton(
+                          onPressed: () => removeOption(patchOption),
+                          icon: const Icon(Icons.delete),
+                        ),
+                    ],
+                  ),
+                  const SizedBox(height: 4),
+                  widget,
+                ],
+              ),
+            ),
+          ],
         ),
       ),
     );
   }
 }
 
-class OptionsFilePicker extends StatelessWidget {
-  const OptionsFilePicker({Key? key, required this.optionName})
-      : super(key: key);
-  final String optionName;
+class TextFieldForPatchOption extends StatefulWidget {
+  const TextFieldForPatchOption({
+    super.key,
+    required this.value,
+    required this.values,
+    this.removeValue,
+    required this.onChanged,
+    required this.optionType,
+    required this.selectedKey,
+    this.showDropdown = true,
+  });
+
+  final String? value;
+  final Map<String, dynamic>? values;
+  final String optionType;
+  final String selectedKey;
+  final bool showDropdown;
+  final void Function()? removeValue;
+  final void Function(dynamic value) onChanged;
+
+  @override
+  State<TextFieldForPatchOption> createState() =>
+      _TextFieldForPatchOptionState();
+}
+
+class _TextFieldForPatchOptionState extends State<TextFieldForPatchOption> {
+  final TextEditingController controller = TextEditingController();
+  String? selectedKey;
+  String? defaultValue;
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 4.0),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: <Widget>[
-          I18nText(
-            optionName,
-            child: Text(
-              '',
-              style: GoogleFonts.inter(
-                fontSize: 16,
-                fontWeight: FontWeight.w500,
-              ),
+    final bool isStringOption = widget.optionType.contains('String');
+    final bool isArrayOption = widget.optionType.contains('Array');
+    selectedKey ??= widget.selectedKey;
+    controller.text = !isStringOption &&
+            isArrayOption &&
+            selectedKey == '' &&
+            (widget.value != null && widget.value.toString().startsWith('['))
+        ? ''
+        : widget.value ?? '';
+    defaultValue ??= controller.text;
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        if (widget.showDropdown && (widget.values?.isNotEmpty ?? false))
+          DropdownButton<String>(
+            style: const TextStyle(
+              fontSize: 16,
             ),
-          ),
-          ElevatedButton(
-            style: ButtonStyle(
-              backgroundColor: MaterialStateProperty.all(
-                Theme.of(context).colorScheme.primary,
+            borderRadius: BorderRadius.circular(4),
+            dropdownColor: Theme.of(context).colorScheme.secondaryContainer,
+            isExpanded: true,
+            value: selectedKey,
+            items: widget.values!.entries
+                .map(
+                  (e) => DropdownMenuItem(
+                    value: e.key,
+                    child: RichText(
+                      text: TextSpan(
+                        text: e.key,
+                        style: TextStyle(
+                          fontSize: 16,
+                          color: Theme.of(context)
+                              .colorScheme
+                              .onSecondaryContainer,
+                        ),
+                        children: [
+                          TextSpan(
+                            text: ' ${e.value}',
+                            style: TextStyle(
+                              fontSize: 14,
+                              color: Theme.of(context)
+                                  .colorScheme
+                                  .onSecondaryContainer
+                                  .withOpacity(0.6),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                )
+                .toList()
+              ..add(
+                DropdownMenuItem(
+                  value: '',
+                  child: I18nText(
+                    'patchOptionsView.customValue',
+                    child: const Text(
+                      '',
+                      style: TextStyle(
+                        fontSize: 16,
+                      ),
+                    ),
+                  ),
+                ),
               ),
-            ),
-            onPressed: () {
-              // pick files
+            onChanged: (value) {
+              if (value == '') {
+                controller.text = defaultValue!;
+                widget.onChanged(controller.text);
+              } else {
+                controller.text = widget.values![value].toString();
+                widget.onChanged(
+                  isArrayOption ? widget.values![value] : controller.text,
+                );
+              }
+              setState(() {
+                selectedKey = value;
+              });
             },
-            child: Text(
-              'Select File',
-              style: TextStyle(
-                color: Theme.of(context).textTheme.bodyLarge?.color,
+          ),
+        if (selectedKey == '')
+          TextFormField(
+            inputFormatters: [
+              if (widget.optionType.contains('Int'))
+                FilteringTextInputFormatter.allow(RegExp(r'[0-9]')),
+              if (widget.optionType.contains('Long'))
+                FilteringTextInputFormatter.allow(RegExp(r'^[0-9]*\.?[0-9]*')),
+            ],
+            controller: controller,
+            keyboardType:
+                isStringOption ? TextInputType.text : TextInputType.number,
+            decoration: InputDecoration(
+              suffixIcon: PopupMenuButton(
+                tooltip: FlutterI18n.translate(
+                  context,
+                  'patchOptionsView.tooltip',
+                ),
+                itemBuilder: (BuildContext context) {
+                  return [
+                    if (isArrayOption)
+                      PopupMenuItem(
+                        value: 'remove',
+                        child: I18nText('remove'),
+                      ),
+                    if (isStringOption) ...[
+                      PopupMenuItem(
+                        value: 'patchOptionsView.selectFilePath',
+                        child: I18nText('patchOptionsView.selectFilePath'),
+                      ),
+                      PopupMenuItem(
+                        value: 'patchOptionsView.selectFolder',
+                        child: I18nText('patchOptionsView.selectFolder'),
+                      ),
+                    ],
+                  ];
+                },
+                onSelected: (String selection) async {
+                  switch (selection) {
+                    case 'patchOptionsView.selectFilePath':
+                      final String? result = await FlutterFileDialog.pickFile();
+                      if (result != null) {
+                        controller.text = result;
+                        widget.onChanged(controller.text);
+                      }
+                      break;
+                    case 'patchOptionsView.selectFolder':
+                      final DirectoryLocation? result =
+                          await FlutterFileDialog.pickDirectory();
+                      if (result != null) {
+                        controller.text = result.toString();
+                        widget.onChanged(controller.text);
+                      }
+                      break;
+                    case 'remove':
+                      widget.removeValue!();
+                      break;
+                  }
+                },
+              ),
+              hintStyle: TextStyle(
+                fontSize: 14,
+                color: Theme.of(context).colorScheme.onSecondaryContainer,
               ),
             ),
+            onChanged: (String value) {
+              widget.onChanged(value);
+            },
           ),
-        ],
-      ),
+      ],
     );
   }
 }

lib/ui/widgets/settingsView/about_widget.dart

@@ -4,7 +4,7 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/utils/about_info.dart';
 
 class AboutWidget extends StatefulWidget {
-  const AboutWidget({Key? key, this.padding}) : super(key: key);
+  const AboutWidget({super.key, this.padding});
 
   final EdgeInsetsGeometry? padding;
 

lib/ui/widgets/settingsView/custom_switch.dart

@@ -1,63 +0,0 @@
-import 'package:flutter/material.dart';
-
-class CustomSwitch extends StatelessWidget {
-  const CustomSwitch({
-    Key? key,
-    required this.onChanged,
-    required this.value,
-  }) : super(key: key);
-  final ValueChanged<bool> onChanged;
-  final bool value;
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: () => onChanged(!value),
-      child: SizedBox(
-        height: 25,
-        width: 50,
-        child: Stack(
-          children: <Widget>[
-            AnimatedContainer(
-              height: 25,
-              width: 50,
-              curve: Curves.ease,
-              duration: const Duration(milliseconds: 400),
-              decoration: BoxDecoration(
-                borderRadius: const BorderRadius.all(
-                  Radius.circular(25.0),
-                ),
-                color: value
-                    ? Theme.of(context).colorScheme.primary
-                    : Theme.of(context).colorScheme.secondary,
-              ),
-            ),
-            AnimatedAlign(
-              curve: Curves.ease,
-              duration: const Duration(milliseconds: 400),
-              alignment: !value ? Alignment.centerLeft : Alignment.centerRight,
-              child: Container(
-                height: 20,
-                width: 20,
-                margin: const EdgeInsets.symmetric(horizontal: 3),
-                decoration: BoxDecoration(
-                  shape: BoxShape.circle,
-                  color: value
-                      ? Theme.of(context).colorScheme.primaryContainer
-                      : Theme.of(context).colorScheme.surface,
-                  boxShadow: [
-                    BoxShadow(
-                      color: Colors.black12.withOpacity(0.1),
-                      spreadRadius: 0.5,
-                      blurRadius: 1,
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/ui/widgets/settingsView/custom_switch_tile.dart

@@ -1,32 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/custom_switch.dart';
-
-class CustomSwitchTile extends StatelessWidget {
-  const CustomSwitchTile({
-    Key? key,
-    required this.title,
-    required this.subtitle,
-    required this.value,
-    required this.onTap,
-    this.padding,
-  }) : super(key: key);
-  final Widget title;
-  final Widget subtitle;
-  final bool value;
-  final Function(bool) onTap;
-  final EdgeInsetsGeometry? padding;
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      contentPadding: padding ?? EdgeInsets.zero,
-      title: title,
-      subtitle: subtitle,
-      onTap: () => onTap(!value),
-      trailing: CustomSwitch(
-        value: value,
-        onChanged: onTap,
-      ),
-    );
-  }
-}

lib/ui/widgets/settingsView/custom_text_field.dart

@@ -1,73 +0,0 @@
-import 'package:flutter/material.dart';
-
-class CustomTextField extends StatelessWidget {
-  const CustomTextField({
-    Key? key,
-    required this.inputController,
-    required this.label,
-    required this.hint,
-    this.leadingIcon,
-    required this.onChanged,
-  }) : super(key: key);
-  final TextEditingController inputController;
-  final Widget label;
-  final String hint;
-  final Widget? leadingIcon;
-  final Function(String)? onChanged;
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(top: 4.0),
-      child: TextField(
-        controller: inputController,
-        onChanged: onChanged,
-        keyboardType: TextInputType.text,
-        decoration: InputDecoration(
-          icon: leadingIcon,
-          label: label,
-          filled: true,
-          fillColor: Theme.of(context).colorScheme.secondaryContainer,
-          hintText: hint,
-          hintStyle: TextStyle(
-            color: Theme.of(context).colorScheme.secondary,
-          ),
-          floatingLabelStyle: MaterialStateTextStyle.resolveWith(
-            (states) => states.contains(MaterialState.focused)
-                ? TextStyle(color: Theme.of(context).colorScheme.primary)
-                : TextStyle(color: Theme.of(context).colorScheme.secondary),
-          ),
-          contentPadding: const EdgeInsets.symmetric(
-            vertical: 8.0,
-            horizontal: 16.0,
-          ),
-          border: OutlineInputBorder(
-            borderSide: BorderSide(
-              color: Theme.of(context).colorScheme.primary,
-            ),
-            borderRadius: BorderRadius.circular(10),
-          ),
-          focusedBorder: OutlineInputBorder(
-            borderSide: BorderSide(
-              color: Theme.of(context).colorScheme.primary,
-              width: 2.0,
-            ),
-            borderRadius: BorderRadius.circular(10),
-          ),
-          errorBorder: OutlineInputBorder(
-            borderSide: BorderSide(
-              color: Theme.of(context).colorScheme.error,
-            ),
-            borderRadius: BorderRadius.circular(10),
-          ),
-          enabledBorder: OutlineInputBorder(
-            borderSide: BorderSide(
-              color: Theme.of(context).colorScheme.primary,
-            ),
-            borderRadius: BorderRadius.circular(10),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/ui/widgets/settingsView/settings_advanced_section.dart

@@ -1,18 +1,15 @@
 // ignore_for_file: prefer_const_constructors
 
 import 'package:flutter/material.dart';
-import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_manage_api_url.dart';
 import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_manage_sources.dart';
-import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_enable_patches_selection.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_auto_update_patches.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_experimental_patches.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_experimental_universal_patches.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_enable_patches_selection.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_require_suggested_app_version.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
-
-final _settingsViewModel = SettingsViewModel();
+import 'package:revanced_manager/ui/widgets/settingsView/settings_show_update_dialog.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_universal_patches.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_version_compatibility_check.dart';
 
 class SAdvancedSection extends StatelessWidget {
   const SAdvancedSection({super.key});
@@ -21,85 +18,16 @@ class SAdvancedSection extends StatelessWidget {
   Widget build(BuildContext context) {
     return SettingsSection(
       title: 'settingsView.advancedSectionTitle',
-      children: <Widget>[
-        SManageApiUrlUI(),
-        SManageSourcesUI(),
-        // SManageKeystorePasswordUI(),
+      children: const <Widget>[
         SAutoUpdatePatches(),
+        SShowUpdateDialog(),
         SEnablePatchesSelection(),
-        SExperimentalUniversalPatches(),
-        SExperimentalPatches(),
-        ListTile(
-          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
-          title: I18nText(
-            'settingsView.regenerateKeystoreLabel',
-            child: const Text(
-              '',
-              style: TextStyle(
-                fontSize: 20,
-                fontWeight: FontWeight.w500,
-              ),
-            ),
-          ),
-          subtitle: I18nText('settingsView.regenerateKeystoreHint'),
-          onTap: () => _showDeleteKeystoreDialog(context),
-        ),
-        ListTile(
-          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
-          title: I18nText(
-            'settingsView.deleteTempDirLabel',
-            child: const Text(
-              '',
-              style: TextStyle(
-                fontSize: 20,
-                fontWeight: FontWeight.w500,
-              ),
-            ),
-          ),
-          subtitle: I18nText('settingsView.deleteTempDirHint'),
-          onTap: () => _settingsViewModel.deleteTempDir(),
-        ),
-        ListTile(
-          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
-          title: I18nText(
-            'settingsView.deleteLogsLabel',
-            child: const Text(
-              '',
-              style: TextStyle(
-                fontSize: 20,
-                fontWeight: FontWeight.w500,
-              ),
-            ),
-          ),
-          subtitle: I18nText('settingsView.deleteLogsHint'),
-          onTap: () => _settingsViewModel.deleteLogs(),
-        ),
+        SRequireSuggestedAppVersion(),
+        SVersionCompatibilityCheck(),
+        SUniversalPatches(),
+        SManageSourcesUI(),
+        SManageApiUrlUI(),
       ],
     );
   }
-
-  Future<void> _showDeleteKeystoreDialog(context) {
-    return showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: I18nText('settingsView.regenerateKeystoreDialogTitle'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: I18nText('settingsView.regenerateKeystoreDialogText'),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
-            onPressed: () => Navigator.of(context).pop(),
-          ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
-            onPressed: () => {
-              Navigator.of(context).pop(),
-              _settingsViewModel.deleteKeystore(),
-            },
-          ),
-        ],
-      ),
-    );
-  }
 }

lib/ui/widgets/settingsView/settings_auto_update_patches.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_switch_list_tile.dart';
 
 class SAutoUpdatePatches extends StatefulWidget {
   const SAutoUpdatePatches({super.key});
@@ -14,7 +15,7 @@ final _settingsViewModel = SettingsViewModel();
 class _SAutoUpdatePatchesState extends State<SAutoUpdatePatches> {
   @override
   Widget build(BuildContext context) {
-    return SwitchListTile(
+    return HapticSwitchListTile(
       contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
       title: I18nText(
         'settingsView.autoUpdatePatchesLabel',

lib/ui/widgets/settingsView/settings_debug_section.dart

@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/widgets/I18nText.dart';
+import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/about_widget.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
+
+final _settingsViewModel = SettingsViewModel();
+
+class SDebugSection extends StatelessWidget {
+  const SDebugSection({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SettingsSection(
+      title: 'settingsView.debugSectionTitle',
+      children: <Widget>[
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.logsLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.logsHint'),
+          onTap: () => _settingsViewModel.exportLogcatLogs(),
+        ),
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.deleteLogsLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.deleteLogsHint'),
+          onTap: () => _settingsViewModel.deleteLogs(),
+        ),
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.deleteTempDirLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.deleteTempDirHint'),
+          onTap: () => _settingsViewModel.deleteTempDir(),
+        ),
+        const AboutWidget(
+          padding: EdgeInsets.symmetric(horizontal: 20.0),
+        ),
+      ],
+    );
+  }
+}

lib/ui/widgets/settingsView/settings_enable_patches_selection.dart

@@ -1,12 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_switch_list_tile.dart';
 
 class SEnablePatchesSelection extends StatefulWidget {
   const SEnablePatchesSelection({super.key});
 
   @override
-  State<SEnablePatchesSelection> createState() => _SEnablePatchesSelectionState();
+  State<SEnablePatchesSelection> createState() =>
+      _SEnablePatchesSelectionState();
 }
 
 final _settingsViewModel = SettingsViewModel();
@@ -14,7 +16,7 @@ final _settingsViewModel = SettingsViewModel();
 class _SEnablePatchesSelectionState extends State<SEnablePatchesSelection> {
   @override
   Widget build(BuildContext context) {
-    return SwitchListTile(
+    return HapticSwitchListTile(
       contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
       title: I18nText(
         'settingsView.enablePatchesSelectionLabel',

lib/ui/widgets/settingsView/settings_export_section.dart

@@ -3,7 +3,6 @@ import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_manage_keystore_password.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 
 final _settingsViewModel = SettingsViewModel();
 
@@ -45,6 +44,46 @@ class SExportSection extends StatelessWidget {
           subtitle: I18nText('settingsView.importPatchesHint'),
           onTap: () => _settingsViewModel.importPatches(context),
         ),
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.resetStoredPatchesLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.resetStoredPatchesHint'),
+          onTap: () => _showResetDialog(
+            context,
+            'settingsView.resetStoredPatchesDialogTitle',
+            'settingsView.resetStoredPatchesDialogText',
+            _settingsViewModel.resetSelectedPatches,
+          ),
+        ),
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.resetStoredOptionsLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.resetStoredOptionsHint'),
+          onTap: () => _showResetDialog(
+            context,
+            'settingsView.resetStoredOptionsDialogTitle',
+            'settingsView.resetStoredOptionsDialogText',
+            _settingsViewModel.resetAllOptions,
+          ),
+        ),
         ListTile(
           contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
           title: I18nText(
@@ -84,7 +123,7 @@ class SExportSection extends StatelessWidget {
         ListTile(
           contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
           title: I18nText(
-            'settingsView.resetStoredPatchesLabel',
+            'settingsView.regenerateKeystoreLabel',
             child: const Text(
               '',
               style: TextStyle(
@@ -93,34 +132,59 @@ class SExportSection extends StatelessWidget {
               ),
             ),
           ),
-          subtitle: I18nText('settingsView.resetStoredPatchesHint'),
-          onTap: () => _showResetStoredPatchesDialog(context),
+          subtitle: I18nText('settingsView.regenerateKeystoreHint'),
+          onTap: () => _showDeleteKeystoreDialog(context),
         ),
+        // SManageKeystorePasswordUI(),
       ],
     );
   }
 
-  Future<void> _showResetStoredPatchesDialog(context) {
+  Future<void> _showResetDialog(
+    context,
+    dialogTitle,
+    dialogText,
+    dialogAction,
+  ) {
     return showDialog(
       context: context,
       builder: (context) => AlertDialog(
-        title: I18nText('settingsView.resetStoredPatchesDialogTitle'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: I18nText(
-          'settingsView.resetStoredPatchesDialogText',
-        ),
+        title: I18nText(dialogTitle),
+        content: I18nText(dialogText),
         actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
+          TextButton(
             onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('noButton'),
           ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
+          FilledButton(
             onPressed: () => {
               Navigator.of(context).pop(),
-              _settingsViewModel.resetSelectedPatches(),
+              dialogAction(),
             },
+            child: I18nText('yesButton'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _showDeleteKeystoreDialog(context) {
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: I18nText('settingsView.regenerateKeystoreDialogTitle'),
+        content: I18nText('settingsView.regenerateKeystoreDialogText'),
+        actions: <Widget>[
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('noButton'),
+          ),
+          FilledButton(
+            onPressed: () => {
+              Navigator.of(context).pop(),
+              _settingsViewModel.deleteKeystore(),
+            },
+            child: I18nText('yesButton'),
           ),
         ],
       ),

lib/ui/widgets/settingsView/settings_info_section.dart

@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_i18n/widgets/I18nText.dart';
-import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/about_widget.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
-
-final _settingsViewModel = SettingsViewModel();
-
-class SInfoSection extends StatelessWidget {
-  const SInfoSection({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return SettingsSection(
-      title: 'settingsView.infoSectionTitle',
-      children: <Widget>[
-        ListTile(
-          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
-          title: I18nText(
-            'settingsView.logsLabel',
-            child: const Text(
-              '',
-              style: TextStyle(
-                fontSize: 20,
-                fontWeight: FontWeight.w500,
-              ),
-            ),
-          ),
-          subtitle: I18nText('settingsView.logsHint'),
-          onTap: () => _settingsViewModel.exportLogcatLogs(),
-        ),
-        const AboutWidget(
-          padding: EdgeInsets.symmetric(horizontal: 20.0),
-        ),
-      ],
-    );
-  }
-}

lib/ui/widgets/settingsView/settings_require_suggested_app_version.dart

@@ -0,0 +1,43 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/widgets/I18nText.dart';
+import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_switch_list_tile.dart';
+
+class SRequireSuggestedAppVersion extends StatefulWidget {
+  const SRequireSuggestedAppVersion({super.key});
+
+  @override
+  State<SRequireSuggestedAppVersion> createState() =>
+      _SRequireSuggestedAppVersionState();
+}
+
+final _settingsViewModel = SettingsViewModel();
+
+class _SRequireSuggestedAppVersionState
+    extends State<SRequireSuggestedAppVersion> {
+  @override
+  Widget build(BuildContext context) {
+    return HapticSwitchListTile(
+      contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+      title: I18nText(
+        'settingsView.requireSuggestedAppVersionLabel',
+        child: const Text(
+          '',
+          style: TextStyle(
+            fontSize: 20,
+            fontWeight: FontWeight.w500,
+          ),
+        ),
+      ),
+      subtitle: I18nText('settingsView.requireSuggestedAppVersionHint'),
+      value: _settingsViewModel.isRequireSuggestedAppVersionEnabled(),
+      onChanged: (value) async {
+        await _settingsViewModel.showRequireSuggestedAppVersionDialog(
+          context,
+          value,
+        );
+        setState(() {});
+      },
+    );
+  }
+}

lib/ui/widgets/settingsView/settings_section.dart

@@ -3,10 +3,10 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 
 class SettingsSection extends StatelessWidget {
   const SettingsSection({
-    Key? key,
+    super.key,
     required this.title,
     required this.children,
-  }) : super(key: key);
+  });
   final String title;
   final List<Widget> children;
 

lib/ui/widgets/settingsView/settings_show_update_dialog.dart

@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/widgets/I18nText.dart';
+import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_switch_list_tile.dart';
+
+class SShowUpdateDialog extends StatefulWidget {
+  const SShowUpdateDialog({super.key});
+
+  @override
+  State<SShowUpdateDialog> createState() => _SShowUpdateDialogState();
+}
+
+final _settingsViewModel = SettingsViewModel();
+
+class _SShowUpdateDialogState extends State<SShowUpdateDialog> {
+  @override
+  Widget build(BuildContext context) {
+    return HapticSwitchListTile(
+      contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+      title: I18nText(
+        'settingsView.showUpdateDialogLabel',
+        child: const Text(
+          '',
+          style: TextStyle(
+            fontSize: 20,
+            fontWeight: FontWeight.w500,
+          ),
+        ),
+      ),
+      subtitle: I18nText('settingsView.showUpdateDialogHint'),
+      value: _settingsViewModel.showUpdateDialog(),
+      onChanged: (value) {
+        setState(() {
+          _settingsViewModel.setShowUpdateDialog(value);
+        });
+      },
+    );
+  }
+}

lib/ui/widgets/settingsView/settings_tile_dialog.dart

@@ -3,12 +3,12 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 
 class SettingsTileDialog extends StatelessWidget {
   const SettingsTileDialog({
-    Key? key,
+    super.key,
     required this.title,
     required this.subtitle,
     required this.onTap,
     this.padding,
-  }) : super(key: key);
+  });
   final String title;
   final String subtitle;
   final Function()? onTap;

lib/ui/widgets/settingsView/settings_universal_patches.dart

@@ -3,27 +3,26 @@ import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patches_selector/patches_selector_viewmodel.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_switch_list_tile.dart';
 
-class SExperimentalUniversalPatches extends StatefulWidget {
-  const SExperimentalUniversalPatches({super.key});
+class SUniversalPatches extends StatefulWidget {
+  const SUniversalPatches({super.key});
 
   @override
-  State<SExperimentalUniversalPatches> createState() =>
-      _SExperimentalUniversalPatchesState();
+  State<SUniversalPatches> createState() => _SUniversalPatchesState();
 }
 
 final _settingsViewModel = SettingsViewModel();
 final _patchesSelectorViewModel = PatchesSelectorViewModel();
 final _patcherViewModel = PatcherViewModel();
 
-class _SExperimentalUniversalPatchesState
-    extends State<SExperimentalUniversalPatches> {
+class _SUniversalPatchesState extends State<SUniversalPatches> {
   @override
   Widget build(BuildContext context) {
-    return SwitchListTile(
+    return HapticSwitchListTile(
       contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
       title: I18nText(
-        'settingsView.experimentalUniversalPatchesLabel',
+        'settingsView.universalPatchesLabel',
         child: const Text(
           '',
           style: TextStyle(
@@ -32,7 +31,7 @@ class _SExperimentalUniversalPatchesState
           ),
         ),
       ),
-      subtitle: I18nText('settingsView.experimentalUniversalPatchesHint'),
+      subtitle: I18nText('settingsView.universalPatchesHint'),
       value: _settingsViewModel.areUniversalPatchesEnabled(),
       onChanged: (value) {
         setState(() {

lib/ui/widgets/settingsView/settings_version_compatibility_check.dart

@@ -3,26 +3,29 @@ import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patches_selector/patches_selector_viewmodel.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_switch_list_tile.dart';
 import 'package:revanced_manager/utils/check_for_supported_patch.dart';
 
-class SExperimentalPatches extends StatefulWidget {
-  const SExperimentalPatches({super.key});
+class SVersionCompatibilityCheck extends StatefulWidget {
+  const SVersionCompatibilityCheck({super.key});
 
   @override
-  State<SExperimentalPatches> createState() => _SExperimentalPatchesState();
+  State<SVersionCompatibilityCheck> createState() =>
+      _SVersionCompatibilityCheckState();
 }
 
 final _settingsViewModel = SettingsViewModel();
 final _patchesSelectorViewModel = PatchesSelectorViewModel();
 final _patcherViewModel = PatcherViewModel();
 
-class _SExperimentalPatchesState extends State<SExperimentalPatches> {
+class _SVersionCompatibilityCheckState
+    extends State<SVersionCompatibilityCheck> {
   @override
   Widget build(BuildContext context) {
-    return SwitchListTile(
+    return HapticSwitchListTile(
       contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
       title: I18nText(
-        'settingsView.experimentalPatchesLabel',
+        'settingsView.versionCompatibilityCheckLabel',
         child: const Text(
           '',
           style: TextStyle(
@@ -31,11 +34,11 @@ class _SExperimentalPatchesState extends State<SExperimentalPatches> {
           ),
         ),
       ),
-      subtitle: I18nText('settingsView.experimentalPatchesHint'),
-      value: _settingsViewModel.areExperimentalPatchesEnabled(),
+      subtitle: I18nText('settingsView.versionCompatibilityCheckHint'),
+      value: _settingsViewModel.isVersionCompatibilityCheckEnabled(),
       onChanged: (value) {
         setState(() {
-          _settingsViewModel.useExperimentalPatches(value);
+          _settingsViewModel.useVersionCompatibilityCheck(value);
         });
         if (!value) {
           _patcherViewModel.selectedPatches