build: bump version to v1.10.1

Closes #1260

.env

@@ -1,3 +0,0 @@
-sentryDSN=
-apiKey=
-appId=

.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 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 issue is not during patching].
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      label: Patcher logs
+      description: Export logs in "Patcher" screen.
       render: shell
     validations:
       required: false
-  - type: textarea
-    attributes:
-      label: Screenshots or videos
-      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: 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/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]
 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/config.yaml

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

.github/workflows/crowdin.yml

@@ -1,45 +0,0 @@
-name: Sync Crowdin translations
-
-on:
-  push:
-    branches:
-      - "flutter"
-    paths:
-      - "assets/i18n/en_US.json"
-      - ".github/workflows/crowdin.yml"
-  schedule:
-    - cron: "0 0 * * *" # daily
-  workflow_dispatch:
-
-jobs:
-  sync-crowdin:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Crowdin
-        uses: crowdin/github-action@1.0.4
-        with:
-          config: crowdin.yml
-          upload_translations: true
-          download_translations: true
-          push_translations: true
-          create_pull_request: false
-          localization_branch_name: i18n_flutter
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID  }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-
-      # commented due to Manager not being ready for the translated files to be in the main branch
-      # - name: GitHub is so dumb i just cant
-      #   run: |
-      #     sudo chmod -R ugo+rwX .
-
-      # - name: Merge
-      #   run: |
-      #     git checkout flutter
-      #     git add *
-      #     git merge i18n_flutter
-      #     git push

.github/workflows/debug-build.yml

@@ -1,43 +0,0 @@
-name: "Debug Build"
-
-on:
-  push:
-    branches:
-      - "flutter-disabled"
-    tags-ignore:
-      - "*"
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Set up JDK 12
-        uses: actions/setup-java@v1
-        with:
-          java-version: '12.x'
-      - uses: subosito/flutter-action@v1
-        with:
-          channel: 'stable'
-      - name: Set environment variables
-        run: echo $SECRETS | base64 -d > lib/utils/environment.dart
-        env:
-          SECRETS: ${{ secrets.SECRETS }}
-      - name: Set up Flutter
-        run: flutter pub get
-      - name: Generate files with Builder
-        run: flutter packages pub run build_runner build --delete-conflicting-outputs
-      - name: Build with Flutter
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: flutter build apk --debug
-      - name: Add version to APK
-        run: mv build/app/outputs/flutter-apk/app-debug.apk revanced-manager-latest.apk
-      - name: Publish debug APK
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "latest"
-          prerelease: true
-          title: "Development Build"
-          files: revanced-manager-latest.apk

.github/workflows/pr-build.yml

@@ -0,0 +1,45 @@
+name: PR Build
+
+on:
+  pull_request:
+    paths: 
+      - ".github/workflows/pr-build.yml"
+      - "android/**"
+      - "assets/**"
+      - "lib/**"
+      
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        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
+        with:
+          java-version: '11'
+          distribution: 'zulu'
+      - 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: Build with Flutter
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: flutter build apk --debug
+      - name: Upload build
+        uses: actions/upload-artifact@v3
+        with:
+          name: revanced-manager
+          path: build/app/outputs/flutter-apk/app-debug.apk

.github/workflows/release-build.yml

@@ -9,20 +9,17 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-      - name: Set up JDK 12
-        uses: actions/setup-java@v1
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          java-version: '12.x'
-      - uses: subosito/flutter-action@v1
+          java-version: "11"
+          distribution: "zulu"
+      - uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
-      - name: Set environment variables
-        run: echo $SECRETS | base64 -d > lib/utils/environment.dart
-        env:
-          SECRETS: ${{ secrets.SECRETS }}
+          channel: "stable"
       - name: Set up Flutter
         run: flutter pub get
       - name: Generate files with Builder
@@ -36,18 +33,18 @@ jobs:
         run: flutter build apk
       - name: Sign APK
         id: sign_apk
-        uses: r0adkll/sign-android-release@v1
+        uses: ilharp/sign-android-release@v1
         with:
-          releaseDirectory: build/app/outputs/apk/release
-          signingKeyBase64: ${{ secrets.SIGNING_KEYSTORE }}
+          releaseDir: build/app/outputs/apk/release
+          signingKey: ${{ secrets.SIGNING_KEYSTORE }}
           keyStorePassword: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
-          alias: ${{ secrets.SIGNING_KEY_ALIAS }}
+          keyAlias: ${{ secrets.SIGNING_KEY_ALIAS }}
           keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
       - name: Add version to APK
-        run: mv ${{steps.sign_apk.outputs.signedReleaseFile}} revanced-manager-${{ env.RELEASE_VERSION }}.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
+          files: revanced-manager-${{ env.RELEASE_VERSION }}.apk

.github/workflows/update-documentation.yml

@@ -0,0 +1,19 @@
+name: Update documentation
+
+on:
+  push:
+    paths:
+      - docs/**
+
+jobs:
+  trigger:
+    runs-on: ubuntu-latest
+    name: Dispatch event to documentation repository
+    if: github.ref == 'refs/heads/main'
+    steps:
+      - uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ secrets.DOCUMENTATION_REPO_ACCESS_TOKEN  }}
+          repository: revanced/revanced-documentation
+          event-type: update-documentation
+          client-payload: '{"repo": "${{ github.event.repository.name }}", "ref": "${{ github.ref }}"}'

.gitignore

@@ -58,6 +58,7 @@ unlinked.ds
 unlinked_spec.ds
 
 # Android related
+.gradle/
 **/android/**/gradle-wrapper.jar
 **/android/.gradle
 **/android/captures/
@@ -134,5 +135,11 @@ app.*.map.json
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 !/dev/ci/**/Gemfile.lock
 
-Firebase related
-.firebase
+# Firebase related
+.firebase
+
+# Dependency directories
+node_modules/
+
+# FVM
+.fvm

.releaserc

@@ -0,0 +1,75 @@
+{
+  "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
+      }
+    ]
+  ]
+}

CHANGELOG.md

@@ -0,0 +1 @@
+

README.md

@@ -3,33 +3,33 @@
 The official ReVanced Manager based on Flutter.
 
 ## 🔽 Download
-To download the Alpha version of Manager, go [here](https://github.com/revanced/revanced-manager/releases/latest) and install the provided APK file.
+
+You can obtain ReVanced Manager by downloading it from either [revanced.app/download](https://revanced.app/download) or [GitHub Releases](https://github.com/ReVanced/revanced-manager/releases)
 
 ## 📝 Prerequisites
-1. Android 8 or higher
-2. Does not work on some armv7 devices
-3. [Vanced MicroG](https://github.com/TeamVanced/VancedMicroG/releases) required for YouTube and YouTube Music (Only for non-root)
 
-## ⚠️ Disclaimer
-*Please note that even though we're releasing the Manager, it is an ALPHA version. There's a big chance that the Manager might not work at all for you.*
+1. Android 8 or higher
+2. Incompatible with certain ARMv7 devices
+
+## 📃 Documentation
+The documentation can be found [here](https://github.com/revanced/revanced-manager/tree/main/docs).
 
 ## 🔴 Issues
+
 For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose).
 
-## 💭 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.
-
-
 ## 🌐 Translation
+
 [![Crowdin](https://badges.crowdin.net/revanced/localized.svg)](https://crowdin.com/project/revanced)
 
-If you wish to translate ReVanced Manager, we're accepting translations on [Crowdin](https://translate.revanced.app)
+We're accepting translations on [Crowdin](https://translate.revanced.app).
 
 ## 🛠️ 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](https://github.com/revanced/revanced-documentation/wiki/Building-from-source)
+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`
+7. To build release APK run `flutter build apk`

analysis_options.yaml

@@ -11,23 +11,153 @@ include: package:flutter_lints/flutter.yaml
 
 analyzer:
   exclude:
-    - lib/utils/env_class.g.dart
+    - lib/app/app.locator.dart
+    - lib/app/app.router.dart
+    - lib/models/patch.g.dart
+    - lib/models/patched_application.g.dart
 
 linter:
-  # The lint rules applied to this project can be customized in the
-  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
-  # included above or to enable additional rules. A list of all available lints
-  # and their documentation is published at
-  # https://dart-lang.github.io/linter/lints/index.html.
-  #
-  # Instead of disabling a lint rule for the entire project in the
-  # section below, it can also be suppressed for a single line of code
-  # or a specific dart file by using the `// ignore: name_of_lint` and
-  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
-  # producing the lint.
   rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
-
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
+    - 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
+    - avoid_double_and_int_checks
+    - avoid_empty_else
+    - avoid_equals_and_hash_code_on_mutable_classes
+    - avoid_escaping_inner_quotes
+    - avoid_field_initializers_in_const_classes
+    - avoid_function_literals_in_foreach_calls
+    - avoid_implementing_value_types
+    - avoid_init_to_null
+    - avoid_js_rounded_ints
+    - avoid_null_checks_in_equality_operators
+    - avoid_print
+    - avoid_redundant_argument_values
+    - 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
+    - avoid_single_cascade_in_expression_statements
+    - avoid_type_to_string
+    - avoid_types_as_parameter_names
+    - avoid_unnecessary_containers
+    - avoid_void_async
+    - avoid_web_libraries_in_flutter # we use web libraries in web-specific code, and our tests prevent us from using them elsewhere
+    - await_only_futures
+    - camel_case_extensions
+    - camel_case_types
+    - cancel_subscriptions
+    - cast_nullable_to_non_nullable
+    - close_sinks # not reliable enough
+    - control_flow_in_finally
+    - curly_braces_in_flow_control_structures
+    - depend_on_referenced_packages
+    - deprecated_consistency
+    - directives_ordering
+    - empty_catches
+    - empty_constructor_bodies
+    - empty_statements
+    - eol_at_end_of_file
+    - exhaustive_cases
+    - file_names
+    - flutter_style_todos
+    - hash_and_equals
+    - implementation_imports
+    - collection_methods_unrelated_type
+    - leading_newlines_in_multiline_strings
+    - library_names
+    - library_prefixes
+    - library_private_types_in_public_api
+    - missing_whitespace_between_adjacent_strings
+    - no_adjacent_strings_in_list
+    - no_duplicate_case_values
+    - no_logic_in_create_state
+    - non_constant_identifier_names
+    - noop_primitive_operations
+    - null_check_on_nullable_type_parameter
+    - null_closures
+    - overridden_fields
+    - package_api_docs
+    - package_names
+    - package_prefixed_library_names
+    - prefer_adjacent_string_concatenation
+    - prefer_asserts_in_initializer_lists
+    - prefer_collection_literals
+    - prefer_conditional_assignment
+    - prefer_const_constructors
+    - prefer_const_constructors_in_immutables
+    - prefer_const_declarations
+    - prefer_const_literals_to_create_immutables
+    - prefer_contains
+    - prefer_final_fields
+    - prefer_final_in_for_each
+    - prefer_final_locals
+    - prefer_for_elements_to_map_fromIterable
+    - prefer_foreach
+    - prefer_function_declarations_over_variables
+    - prefer_generic_function_type_aliases
+    - prefer_if_elements_to_conditional_expressions
+    - prefer_if_null_operators
+    - prefer_initializing_formals
+    - prefer_inlined_adds
+    - prefer_interpolation_to_compose_strings
+    - prefer_is_empty
+    - prefer_is_not_empty
+    - prefer_is_not_operator
+    - prefer_iterable_whereType
+    - prefer_mixin # Has false positives, see https://github.com/dart-lang/linter/issues/3018
+    - prefer_null_aware_method_calls # "call()" is confusing to people new to the language since it's not documented anywhere
+    - prefer_null_aware_operators
+    - prefer_single_quotes
+    - prefer_spread_collections
+    - prefer_typing_uninitialized_variables
+    - prefer_void_to_null
+    - provide_deprecation_message
+    - recursive_getters
+    - sized_box_for_whitespace
+    - slash_for_doc_comments
+    - sort_child_properties_last
+    - sort_constructors_first
+    - sort_unnamed_constructors_first
+    - test_types_in_equals
+    - throw_in_finally
+    - tighten_type_of_initializing_formals
+    - type_init_formals
+    - unnecessary_brace_in_string_interps
+    - unnecessary_const
+    - unnecessary_getters_setters
+    - unnecessary_new
+    - unnecessary_null_aware_assignments
+    - unnecessary_null_checks
+    - unnecessary_null_in_if_null_operators
+    - unnecessary_nullable_for_final_variable_declarations
+    - unnecessary_overrides
+    - unnecessary_parenthesis
+    - unnecessary_statements
+    - unnecessary_string_escapes
+    - unnecessary_string_interpolations
+    - unnecessary_this
+    - unrelated_type_equality_checks
+    - unsafe_html
+    - use_build_context_synchronously
+    - use_full_hex_values_for_flutter_colors
+    - use_function_type_syntax_for_parameters
+    - use_if_null_to_convert_nulls_to_bools
+    - use_is_even_rather_than_modulo
+    - use_key_in_widget_constructors
+    - use_late_for_private_fields_and_variables
+    - use_named_constants
+    - use_raw_strings
+    - use_rethrow_when_possible
+    - use_setters_to_change_properties
+    - use_test_throws_matchers
+    - valid_regexps
+    - void_checks

android/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"

android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -54,7 +54,21 @@ android {
         release {
             shrinkResources false
             minifyEnabled false
+            resValue "string", "app_name", "ReVanced Manager"
             signingConfig signingConfigs.debug
+            ndk {
+                abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
+            }
+        }
+        debug {
+            shrinkResources false
+            minifyEnabled false
+            resValue "string", "app_name", "ReVanced Manager Debug"
+            applicationIdSuffix ".debug"
+            signingConfig signingConfigs.debug
+            ndk {
+                abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
+            }
         }
     }
 
@@ -71,14 +85,9 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // ReVanced
-    implementation "app.revanced:revanced-patcher:6.0.0"
+    implementation "app.revanced:revanced-patcher:14.2.2"
 
     // Signing & aligning
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
     implementation("com.android.tools.build:apksig:7.2.2")
-
-    // MicroG cronet
-    implementation("org.microg:cronet-common:$cronetVersion")
-    implementation("org.microg:cronet-native:$cronetVersion")
-
 }

android/app/src/main/AndroidManifest.xml

@@ -2,21 +2,29 @@
     package="app.revanced.manager.flutter">
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.INTERNET" />
+
     <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" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+    
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
    <application
-        android:label="ReVanced Manager"
+        android:label="@string/app_name"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:largeHeap="true"
+        android:requestLegacyExternalStorage="true"
         android:extractNativeLibs="true">
         <activity
             android:name=".MainActivity"
@@ -28,8 +36,7 @@
             android:windowSoftInputMode="adjustResize">
             <meta-data
               android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+              android:resource="@style/NormalTheme"/>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

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

@@ -1,36 +1,50 @@
 package app.revanced.manager.flutter
 
-import android.os.Build
 import android.os.Handler
 import android.os.Looper
-import androidx.annotation.NonNull
 import app.revanced.manager.flutter.utils.Aapt
 import app.revanced.manager.flutter.utils.aligning.ZipAligner
 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.Patcher
 import app.revanced.patcher.PatcherOptions
+import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
+import app.revanced.patcher.extensions.PatchExtensions.dependencies
+import app.revanced.patcher.extensions.PatchExtensions.description
+import app.revanced.patcher.extensions.PatchExtensions.include
 import app.revanced.patcher.extensions.PatchExtensions.patchName
-import app.revanced.patcher.logging.Logger
-import app.revanced.patcher.util.patch.PatchBundle
-import dalvik.system.DexClassLoader
+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.cancel
+import kotlinx.coroutines.runBlocking
 import java.io.File
-
-private const val PATCHER_CHANNEL = "app.revanced.manager.flutter/patcher"
-private const val INSTALLER_CHANNEL = "app.revanced.manager.flutter/installer"
+import java.io.PrintWriter
+import java.io.StringWriter
+import java.util.logging.LogRecord
+import java.util.logging.Logger
 
 class MainActivity : FlutterActivity() {
     private val handler = Handler(Looper.getMainLooper())
     private lateinit var installerChannel: MethodChannel
+    private var cancel: Boolean = false
+    private var stopResult: MethodChannel.Result? = null
 
-    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
+    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 mainChannel =
+            MethodChannel(flutterEngine.dartExecutor.binaryMessenger, patcherChannel)
+
+        this.installerChannel =
+            MethodChannel(flutterEngine.dartExecutor.binaryMessenger, installerChannel)
+
         mainChannel.setMethodCallHandler { call, result ->
             when (call.method) {
                 "runPatcher" -> {
@@ -42,8 +56,9 @@ class MainActivity : FlutterActivity() {
                     val integrationsPath = call.argument<String>("integrationsPath")
                     val selectedPatches = call.argument<List<String>>("selectedPatches")
                     val cacheDirPath = call.argument<String>("cacheDirPath")
-                    val mergeIntegrations = call.argument<Boolean>("mergeIntegrations")
                     val keyStoreFilePath = call.argument<String>("keyStoreFilePath")
+                    val keystorePassword = call.argument<String>("keystorePassword")
+
                     if (patchBundleFilePath != null &&
                         originalFilePath != null &&
                         inputFilePath != null &&
@@ -52,9 +67,10 @@ class MainActivity : FlutterActivity() {
                         integrationsPath != null &&
                         selectedPatches != null &&
                         cacheDirPath != null &&
-                        mergeIntegrations != null &&
-                        keyStoreFilePath != null
+                        keyStoreFilePath != null &&
+                        keystorePassword != null
                     ) {
+                        cancel = false
                         runPatcher(
                             result,
                             patchBundleFilePath,
@@ -65,13 +81,40 @@ class MainActivity : FlutterActivity() {
                             integrationsPath,
                             selectedPatches,
                             cacheDirPath,
-                            mergeIntegrations,
-                            keyStoreFilePath
+                            keyStoreFilePath,
+                            keystorePassword
                         )
-                    } else {
-                        result.notImplemented()
-                    }
+                    } else result.notImplemented()
                 }
+
+                "stopPatcher" -> {
+                    cancel = true
+                    stopResult = result
+                }
+
+                "getPatches" -> {
+                    val patchBundleFilePath = call.argument<String>("patchBundleFilePath")
+                    if (patchBundleFilePath != null) {
+                        val patches = PatchBundleLoader.Dex(
+                            File(patchBundleFilePath)
+                        ).map { patch ->
+                            val map = HashMap<String, Any>()
+                            map["\"name\""] = "\"${patch.patchName.replace("\"","\\\"")}\""
+                            map["\"description\""] = "\"${patch.description?.replace("\"","\\\"")}\""
+                            map["\"excluded\""] = !patch.include
+                            map["\"dependencies\""] = patch.dependencies?.map { "\"${it.java.patchName}\"" } ?: emptyList<Any>()
+                            map["\"compatiblePackages\""] = patch.compatiblePackages?.map {
+                                val map2 = HashMap<String, Any>()
+                                map2["\"name\""] = "\"${it.name}\""
+                                map2["\"versions\""] = it.versions.map { version -> "\"${version}\"" }
+                                map2
+                            } ?: emptyList<Any>()
+                            map
+                        }
+                        result.success(patches)
+                    } else result.notImplemented()
+                }
+
                 else -> result.notImplemented()
             }
         }
@@ -87,8 +130,8 @@ class MainActivity : FlutterActivity() {
         integrationsPath: String,
         selectedPatches: List<String>,
         cacheDirPath: String,
-        mergeIntegrations: Boolean,
-        keyStoreFilePath: String
+        keyStoreFilePath: String,
+        keystorePassword: String
     ) {
         val originalFile = File(originalFilePath)
         val inputFile = File(inputFilePath)
@@ -96,125 +139,143 @@ class MainActivity : FlutterActivity() {
         val outFile = File(outFilePath)
         val integrations = File(integrationsPath)
         val keyStoreFile = File(keyStoreFilePath)
+        val cacheDir = File(cacheDirPath)
 
         Thread {
-            try {   
-                val patches = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CUPCAKE) {
-                    PatchBundle.Dex(
-                        patchBundleFilePath,
-                        DexClassLoader(
-                            patchBundleFilePath,
-                            cacheDirPath,
-                            null,
-                            javaClass.classLoader
-                        )
-                    ).loadPatches().filter { patch -> selectedPatches.any { it == patch.patchName } }
-                } else {
-                    TODO("VERSION.SDK_INT < CUPCAKE")
-                }
-
+            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) =
+                        updateProgress(-1.0, "", record.message)
+
+                    override fun flush() = Unit
+                    override fun close() = flush()
+                }.let(::addHandler)
+            }
+
+            try {
+                updateProgress(0.0, "", "Copying APK")
+
+                if (cancel) {
+                    postStop()
+                    return@Thread
+                }
+
                 originalFile.copyTo(inputFile, true)
 
-                handler.post {
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf(
-                            "progress" to 0.2,
-                            "header" to "Unpacking apk...",
-                            "log" to "Unpacking input apk"
-                        )
-                    )
-                }
-                val patcher =
-                    Patcher(
-                        PatcherOptions(
-                            inputFile,
-                            cacheDirPath,
-                            Aapt.binary(applicationContext).absolutePath,
-                            cacheDirPath,
-                            logger = ManagerLogger()
-                        )
-                    )
-
-                handler.post {
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf("progress" to 0.3, "header" to "", "log" to "")
-                    )
-                }
-                if (mergeIntegrations) {
-                    handler.post {
-                        installerChannel.invokeMethod(
-                            "update",
-                            mapOf(
-                                "progress" to 0.4,
-                                "header" to "Merging integrations...",
-                                "log" to "Merging integrations"
-                            )
-                        )
-                    }
-                    patcher.addFiles(listOf(integrations)) {}
+                if (cancel) {
+                    postStop()
+                    return@Thread
                 }
 
-                handler.post {
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf(
-                            "progress" to 0.5,
-                            "header" to "Applying patches...",
-                            "log" to ""
-                        )
+                updateProgress(0.05, "Reading APK...", "Reading APK")
+
+                val patcher = Patcher(
+                    PatcherOptions(
+                        inputFile,
+                        cacheDir,
+                        Aapt.binary(applicationContext).absolutePath,
+                        cacheDir.path,
                     )
+                )
+
+                if (cancel) {
+                    postStop()
+                    return@Thread
                 }
 
-                patcher.addPatches(patches)
-                patcher.executePatches().forEach { (patch, res) ->
-                    if (res.isSuccess) {
-                        val msg = "Applied $patch"
-                        handler.post {
-                            installerChannel.invokeMethod(
-                                "update",
-                                mapOf(
-                                    "progress" to 0.5,
-                                    "header" to "",
-                                    "log" to msg
-                                )
-                            )
+                updateProgress(0.1, "Loading patches...", "Loading patches")
+
+                val patches = PatchBundleLoader.Dex(
+                    File(patchBundleFilePath),
+                    optimizedDexDirectory = cacheDir
+                ).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.patchName }
+                }
+
+                if (cancel) {
+                    postStop()
+                    return@Thread
+                }
+
+                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 ->
+                            if (cancel) {
+                                handler.post { stopResult!!.success(null) }
+                                this.cancel()
+                                this@apply.close()
+                                return@collect
+                            }
+
+                            val msg = patchResult.exception?.let {
+                                val writer = StringWriter()
+                                it.printStackTrace(PrintWriter(writer))
+                                "${patchResult.patchName} failed: $writer"
+                            } ?: run {
+                                "${patchResult.patchName} succeeded"
+                            }
+
+                            updateProgress(progress, "", msg)
+                            progress += progressStep
                         }
-                        return@forEach
-                    }
-                    val msg = "$patch failed.\nError:\n" + res.exceptionOrNull()!!.printStackTrace()
-                    handler.post {
-                        installerChannel.invokeMethod(
-                            "update",
-                            mapOf("progress" to 0.5, "header" to "", "log" to msg)
-                        )
                     }
                 }
 
-                handler.post {
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf(
-                            "progress" to 0.7,
-                            "header" to "Repacking apk...",
-                            "log" to "Repacking patched apk"
-                        )
-                    )
+                if (cancel) {
+                    postStop()
+                    patcher.close()
+                    return@Thread
                 }
-                val res = patcher.save()
+
+                updateProgress(0.8, "Building...", "")
+
+                val res = patcher.get()
+                patcher.close()
+
                 ZipFile(patchedFile).use { file ->
                     res.dexFiles.forEach {
+                        if (cancel) {
+                            postStop()
+                            return@Thread
+                        }
                         file.addEntryCompressData(
                             ZipEntry.createWithName(it.name),
                             it.stream.readBytes()
@@ -231,83 +292,35 @@ class MainActivity : FlutterActivity() {
                         ZipAligner::getEntryAlignment
                     )
                 }
-                handler.post {
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf(
-                            "progress" to 0.9,
-                            "header" to "Signing apk...",
-                            "log" to ""
-                        )
-                    )
+
+                if (cancel) {
+                    postStop()
+                    return@Thread
                 }
 
-                // Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
+                updateProgress(0.9, "Signing...", "Signing APK")
 
                 try {
-                    Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
+                    Signer("ReVanced", keystorePassword)
+                        .signApk(patchedFile, outFile, keyStoreFile)
                 } catch (e: Exception) {
-                    //log to console
-                    print("Error signing apk: ${e.message}")
+                    print("Error signing APK: ${e.message}")
                     e.printStackTrace()
                 }
 
-                handler.post {
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf(
-                            "progress" to 1.0,
-                            "header" to "Finished!",
-                            "log" to "Finished!"
-                        )
-                    )
-                }
+                updateProgress(1.0, "Patched", "Patched")
             } catch (ex: Throwable) {
-                val stack = ex.stackTraceToString()
-                handler.post {
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf(
-                            "progress" to -100.0,
-                            "header" to "Aborting...",
-                            "log" to "An error occurred! Aborting\nError:\n$stack"
-                        )
+                if (!cancel) {
+                    val stack = ex.stackTraceToString()
+                    updateProgress(
+                        -100.0,
+                        "Aborted",
+                        "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 */ }
-    }
 }

android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="256"
+    android:viewportHeight="256">
+  <group android:scaleX="0.23"
+      android:scaleY="0.23"
+      android:translateX="98.56"
+      android:translateY="98.56">
+    <path
+        android:pathData="M253.85,4.9C254.32,3.82 254.22,2.57 253.58,1.58C252.93,0.6 251.83,0 250.64,0C243.29,0 230.47,0 225.95,0C224.96,0 224.06,0.59 223.66,1.5C216.03,18.88 144.1,182.7 130.29,214.16C129.89,215.07 128.99,215.66 128,215.66C127.01,215.66 126.11,215.07 125.71,214.16C111.9,182.7 39.97,18.88 32.34,1.5C31.94,0.59 31.04,0 30.05,0C25.53,0 12.71,0 5.36,0C4.17,0 3.07,0.6 2.42,1.58C1.78,2.57 1.68,3.82 2.15,4.9C16.78,38.3 101.47,231.61 111.24,253.9C111.8,255.18 113.06,256 114.45,256C120.29,256 135.71,256 141.55,256C142.94,256 144.2,255.18 144.76,253.9C154.52,231.61 239.22,38.3 253.85,4.9Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M130.59,131.75C130.06,132.68 129.07,133.25 128,133.25C126.93,133.25 125.94,132.68 125.4,131.75C113.45,111.06 63.88,25.19 51.93,4.5C51.4,3.57 51.4,2.43 51.93,1.5C52.47,0.57 53.46,-0 54.53,-0L201.47,-0C202.54,-0 203.53,0.57 204.06,1.5C204.6,2.43 204.6,3.57 204.06,4.5C192.12,25.19 142.54,111.06 130.59,131.75Z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="128"
+            android:startY="-0"
+            android:endX="128"
+            android:endY="254.6"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFF04E98"/>
+          <item android:offset="0.5" android:color="#FF5F65D4"/>
+          <item android:offset="1" android:color="#FF4E98F0"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+</vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@color/ic_launcher_background"/>
-  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="ic_launcher_background">#1B1B1B</color>
-</resources>
+</resources>

android/build.gradle

@@ -1,6 +1,5 @@
 buildscript {
-    ext.cronetVersion = '102.5005.125'
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()
@@ -23,6 +22,7 @@ allprojects {
                 password = (project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")) as String
             }
         }
+        mavenLocal()
     }
 }
 
@@ -32,6 +32,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle.properties

@@ -1,3 +1,6 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx1536M -XX:+UseParallelGC
+org.gradle.parallel=true
+org.gradle.daemon=true
+org.gradle.caching=true
 android.useAndroidX=true
 android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Mon May 09 12:07:41 MSK 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-1-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionSha256Sum=a01b6587e15fe7ed120a0ee299c25982a1eee045abd6a9dd5e216b2f628ef9ac
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

assets/i18n/en_US.json

@@ -1,33 +1,57 @@
 {
     "okButton": "OK",
     "cancelButton": "Cancel",
+    "quitButton": "Quit",
+    "updateButton": "Update",
     "enabledLabel": "Enabled",
     "disabledLabel": "Disabled",
+    "installed":"Installed: {version}",
+    "suggested":"Suggested: {version}",
     "yesButton": "Yes",
     "noButton": "No",
     "warning": "Warning",
+    "notice": "Notice",
+    "noShowAgain": "Don't show this again",
+    "new": "New",
     "navigationView": {
         "dashboardTab": "Dashboard",
         "patcherTab": "Patcher",
         "settingsTab": "Settings"
     },
     "homeView": {
+        "refreshSuccess": "Refreshed successfully",
         "widgetTitle": "Dashboard",
+
         "updatesSubtitle": "Updates",
         "patchedSubtitle": "Patched applications",
-        "updatesAvailable": "Updates available",
+
         "noUpdates": "No updates available",
+
         "WIP": "Work in progress...",
+
         "noInstallations": "No patched applications installed",
-        "installed": "Installed",
+        "installUpdate": "Continue to install the update?",
+
         "updateDialogTitle": "Update Manager",
-        "updateDialogText": "Are you sure you want to download and update ReVanced Manager?",
+        "updatePatchesDialogTitle": "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.",
+
         "notificationTitle": "Update downloaded",
         "notificationText": "Tap to install the update",
+
         "downloadingMessage": "Downloading update...",
+        "downloadedMessage": "Update downloaded!",
+
         "installingMessage": "Installing update...",
+
         "errorDownloadMessage": "Unable to download update",
         "errorInstallMessage": "Unable to install update",
+
         "noConnection": "No internet connection",
         "updatesDisabled": "Updating a patched app is currently disabled. Repatch the app again."
     },
@@ -46,20 +70,28 @@
     "patcherView": {
         "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?"
+
+        "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?"
     },
     "appSelectorCard": {
         "widgetTitle": "Select an application",
         "widgetTitleSelected": "Selected application",
         "widgetSubtitle": "No application selected",
+
         "noAppsLabel": "No applications found",
+        "notInstalled":"App not installed",
+
         "currentVersion": "Current",
-        "recommendedVersion": "Recommended",
-        "anyVersion": "any"
+        "suggestedVersion": "Suggested",
+        "allVersions": "All versions"
     },
     "patchSelectorCard": {
         "widgetTitle": "Select patches",
         "widgetTitleSelected": "Selected patches",
+
         "widgetSubtitle": "Select an application first",
         "widgetEmptySubtitle": "No patches selected"
     },
@@ -70,36 +102,66 @@
     "appSelectorView": {
         "viewTitle": "Select an application",
         "searchBarHint": "Search applications",
+
         "storageButton": "Storage",
-        "errorMessage": "Unable to use selected application"
+        "selectFromStorageButton": "Select from storage",
+        
+        "errorMessage": "Unable to use selected application",
+
+        "downloadToast": "Download function is not available yet",
+
+        "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"
     },
     "patchesSelectorView": {
         "viewTitle": "Select patches",
         "searchBarHint": "Search patches",
+        "universalPatches": "Universal patches",
+
         "doneButton": "Done",
-        "recommended": "Recommended",
-        "all" : "All",
-        "none" : "None",
+
+        "default": "Default",
+        "defaultTooltip": "Select all default patches",
+
+        "none": "None",
+        "noneTooltip": "Deselect all patches",
+
         "loadPatchesSelection": "Load patches selection",
-        "noSavedPatches": "No saved patches for the selected app\nPress Done to save current selection",
+        "noSavedPatches": "No saved patches for the selected app.\nPress Done to save current selection.",
         "noPatchesFound": "No patches found for the selected app",
-        "selectAllPatchesWarningContent": "You are about to select all patches, that includes unrecommended patches and can cause unwanted behavior."
+
+        "selectAllPatchesWarningContent": "You are about to select all patches, that includes non-suggested patches and can cause unwanted behavior."
     },
     "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 experimental toggle in settings to proceed."
+        "unsupportedPatchVersion": "Patch is not supported for this app version. Enable the experimental toggle in settings to proceed.",
+
+        "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.",
+        "patchesChangeWarningDialogButton": "Use default selection"
     },
     "installerView": {
         "widgetTitle": "Installer",
+        "installType": "Select install type",
+        "installTypeDescription": "Select the installation type to proceed with.",
+
         "installButton": "Install",
-        "installRootButton": "Install as Root",
+        "installRootType": "Root",
+        "installNonRootType": "Non-root",
+        "installRecommendedType": "Recommended",
+
+        "pressBackAgain": "Press back again to cancel",
         "openButton": "Open",
         "shareButton": "Share file",
+        
         "notificationTitle": "ReVanced Manager is patching",
         "notificationText": "Tap to return to the installer",
-        "shareApkMenuOption": "Share APK",
-        "exportApkMenuOption": "Export APK",
-        "shareLogMenuOption": "Share log",
+
+        "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.",
@@ -108,81 +170,131 @@
     },
     "settingsView": {
         "widgetTitle": "Settings",
+
         "appearanceSectionTitle": "Appearance",
         "teamSectionTitle": "Team",
         "infoSectionTitle": "Info",
         "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",
+
         "languageLabel": "Language",
         "englishOption": "English",
+
         "sourcesLabel": "Sources",
         "sourcesLabelHint": "Configure your custom sources",
-        "orgPatchesLabel": "Patches organization",
-        "sourcesPatchesLabel": "Patches source",
-        "orgIntegrationsLabel": "Integrations organization",
         "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?",
-        "contributorsLabel": "Contributors",
-        "contributorsHint": "A list of contributors of ReVanced",
-        "logsLabel": "Logs",
-        "logsHint": "Share Manager's logs",
+        "sourcesUpdateNote": "Note: ReVanced 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",
         "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",
+
+        "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?",
+        "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",
-        "exportSectionTitle": "Import & export",
+
         "aboutLabel": "About",
         "snackbarMessage": "Copied to clipboard",
-        "sentryLabel": "Sentry logging",
-        "sentryHint": "Send anonymous logs to help us improve ReVanced Manager",
         "restartAppForChanges": "Restart the app to apply changes",
-        "deleteKeystoreLabel": "Delete keystore",
-        "deleteKeystoreHint": "Delete the keystore used to sign the app",
-        "deletedKeystore": "Keystore deleted",
+
         "deleteTempDirLabel": "Delete temporary files",
-        "deleteTempDirHint": "Delete the unused temporary files",
+        "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",
+
         "importPatchesLabel": "Import patches selection",
         "importPatchesHint": "Import patches selection from a JSON file",
         "importedPatches": "Patches selection imported",
+
         "resetStoredPatchesLabel": "Reset patches",
         "resetStoredPatchesHint": "Reset the stored patches selection",
+
+        "resetStoredPatchesDialogTitle": "Reset patches selection?",
+        "resetStoredPatchesDialogText": "Resetting patches selection will remove all selected patches.",
         "resetStoredPatches": "Patches selection has been reset",
-        "jsonSelectorErrorMessage": "Unable to use selected JSON file",
+
         "deleteLogsLabel": "Delete logs",
         "deleteLogsHint": "Delete collected manager logs",
-        "deletedLogs": "Logs deleted"
+        "deletedLogs": "Logs deleted",
+
+        "regenerateKeystoreLabel": "Regenerate keystore",
+        "regenerateKeystoreHint": "Regenerate the keystore used to sign the app",
+
+        "regenerateKeystoreDialogTitle": "Regenerate keystore?",
+        "regenerateKeystoreDialogText": "Patched apps signed with the old keystore will no longer be able to update.",
+        "regeneratedKeystore": "Keystore regenerated",
+
+        "exportKeystoreLabel": "Export keystore",
+        "exportKeystoreHint": "Export keystore used to sign apps",
+        "exportedKeystore": "Keystore exported",
+        "noKeystoreExportFileFound": "No keystore to export",
+
+        "importKeystoreLabel": "Import keystore",
+        "importKeystoreHint": "Import keystore used to sign apps",
+        "importedKeystore": "Keystore imported",
+
+        "selectKeystorePassword": "Keystore Password",
+        "selectKeystorePasswordHint": "Select keystore password used to sign the apk",
+
+        "jsonSelectorErrorMessage": "Unable to use selected JSON file",
+        "keystoreSelectorErrorMessage": "Unable to use selected KEYSTORE file"
     },
     "appInfoView": {
         "widgetTitle": "App info",
         "openButton": "Open",
         "uninstallButton": "Uninstall",
-        "patchButton": "Patch",
         "unpatchButton": "Unpatch",
-        "unpatchDialogText": "Are you sure you want to unpatch this app?",
         "rootDialogTitle": "Error",
+
+        "unpatchDialogText": "Are you sure you want to unpatch 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",
         "patchedDateLabel": "Patched date",
-        "patchedDateHint": "{date} at {time}",
         "appliedPatchesLabel": "Applied patches",
+
+        "patchedDateHint": "{date} at {time}",
         "appliedPatchesHint": "{quantity} applied patches",
+        
         "updateNotImplemented": "This feature has not been implemented yet"
     },
     "contributorsView": {

assets/i18n/hi_IN.json

@@ -1,197 +0,0 @@
-{
-    "okButton": "ठीक है",
-    "cancelButton": "रद्द करें",
-    "enabledLabel": "सक्रिय",
-    "disabledLabel": "निष्क्रिय",
-    "yesButton": "हाँ",
-    "noButton": "नहीं",
-    "navigationView": {
-        "dashboardTab": "नियंत्रण-पट्ट",
-        "patcherTab": "पैचर",
-        "settingsTab": "सेटिंग्स"
-    },
-    "homeView": {
-        "widgetTitle": "नियंत्रण पट्ट",
-        "updatesSubtitle": "अपडेट",
-        "patchedSubtitle": "Patched applications",
-        "updatesAvailable": "अपडेट उपलब्ध है",
-        "noUpdates": "कोई अपडेट उपलब्ध नहीं",
-        "WIP": "Work in progress...",
-        "noInstallations": "कोई पैबंद किये हुआ अनुप्रयोग नहीं है।",
-        "installed": "इंस्टॉल किया हुआ",
-        "updateDialogTitle": "अपडेट Manager",
-        "updateDialogText": "क्या आप ReVanced Manager को डाउनलोड और अपडेट करना चाहते है?",
-        "notificationTitle": "Update downloaded",
-        "notificationText": "Tap to install the update",
-        "downloadingMessage": "अपडेट डाउनलोड हो रहा है",
-        "installingMessage": "अपडेट इंस्टॉल हो रहा है",
-        "errorDownloadMessage": "अपडेट डाउनलोड करने मे असफल",
-        "errorInstallMessage": "अपडेट इंस्टॉल करने में असफल",
-        "noConnection": "कोई इंटरनेट कनेक्शन नहीं",
-        "updatesDisabled": "पैच किए गए ऐप को अपडेट करना वर्तमान में अक्षम है। ऐप को फिर से रीपैच करें।"
-    },
-    "applicationItem": {
-        "patchButton": "पैबंद",
-        "infoButton": "जानकारी",
-        "changelogLabel": "परिवर्तन पत्र"
-    },
-    "latestCommitCard": {
-        "loadingLabel": "लोड हो रहा है...",
-        "timeagoLabel": "{time} पहले",
-        "patcherLabel": "पैबंद: ",
-        "managerLabel": "Manager: ",
-        "updateButton": "Manager अपडेट करे"
-    },
-    "patcherView": {
-        "widgetTitle": "पैचर",
-        "patchButton": "पैबंद",
-        "patchDialogTitle": "चेतावनी",
-        "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?"
-    },
-    "appSelectorCard": {
-        "widgetTitle": "Select an application",
-        "widgetTitleSelected": "चुना हुआ ऐप्लकैशन",
-        "widgetSubtitle": "कोई ऐप्लकैशन चुना हुआ नहीं",
-        "noAppsLabel": "No applications found",
-        "currentVersion": "वर्तमान",
-        "recommendedVersion": "अनुशंसित",
-        "anyVersion": "कोई"
-    },
-    "patchSelectorCard": {
-        "widgetTitle": "पैच चुने",
-        "widgetTitleSelected": "चुने हुए पैच",
-        "widgetSubtitle": "पहले किसी एप्लिकेशन को चुने",
-        "widgetEmptySubtitle": "कोई पैच चुना हुआ नहीं"
-    },
-    "socialMediaCard": {
-        "widgetTitle": "सामाजिक",
-        "widgetSubtitle": "हम ऑनलाइन है"
-    },
-    "appSelectorView": {
-        "viewTitle": "Select an application",
-        "searchBarHint": "ऐप्लकैशन खोजे",
-        "storageButton": "स्टोरेज",
-        "errorMessage": "Unable to use selected application"
-    },
-    "patchesSelectorView": {
-        "viewTitle": "पैच चुने",
-        "searchBarHint": "पैच खोजे",
-        "doneButton": "पूर्ण",
-        "loadPatchesSelection": "Load patches selection",
-        "noSavedPatches": "No saved patches for the selected app\nPress Done to save current selection",
-        "noPatchesFound": "चुने हुए ऐप्लकैशन के लिए कोई पैच नहीं मिले",
-        "selectAllPatchesWarningTitle": "चेतावनी",
-        "selectAllPatchesWarningContent": "आप सभी पैच का चयन करने वाले हैं, जिसमें अनुशंसित पैच शामिल हैं और अवांछित व्यवहार का कारण बन सकते हैं।"
-    },
-    "patchItem": {
-        "unsupportedWarningButton": "चेतावनी",
-        "unsupportedDialogTitle": "चेतावनी",
-        "unsupportedDialogText": "Selecting this patch may result in patching errors.\n\nApp version: {packageVersion}\nSupported versions:\n{supportedVersions}",
-        "unsupportedPatchVersion": "इस ऐप संस्करण के लिए पैच समर्थित नहीं है। आगे बढ़ने के लिए सेटिंग में प्रयोगात्मक टॉगल सक्षम करें."
-    },
-    "installerView": {
-        "widgetTitle": "इंस्टॉल कर्ता",
-        "installButton": "इंस्टॉल करे",
-        "installRootButton": "रूट के रूप मे इंस्टॉल करे",
-        "openButton": "खोलें",
-        "shareButton": "फाइल शेयर करे",
-        "notificationTitle": "ReVanced Manager पैच कर रहा है",
-        "notificationText": "इंस्टॉल कर्ता पर जाने के लिए टैप करे",
-        "shareApkMenuOption": "APK शेयर करे",
-        "exportApkMenuOption": "निर्यात APK",
-        "shareLogMenuOption": "लॉग शेयर करें",
-        "installErrorDialogTitle": "त्रुटि",
-        "installErrorDialogText1": "वर्तमान पैच चयन के साथ रूट इंस्टॉल संभव नहीं है।\nअपने ऐप को रीपैच करें या नॉन-रूट इंस्टॉल चुनें।",
-        "installErrorDialogText2": "वर्तमान पैच चयन के साथ नॉन-रूट इंस्टॉल संभव नहीं है।\nयदि आपने अपना डिवाइस रूट किया है तो अपने ऐप को रीपैच करें या रूट इंस्टॉल चुनें।",
-        "installErrorDialogText3": "रूट इंस्टॉल संभव नहीं है क्योंकि मूल APK को स्टोरेज से चुना गया था।\nएक इंस्टॉल किया गया ऐप चुनें या नॉन-रूट इंस्टॉल चुनें।",
-        "noExit": "Installer is still running, cannot exit..."
-    },
-    "settingsView": {
-        "widgetTitle": "सेटिंग्स",
-        "appearanceSectionTitle": "स्वरूप",
-        "teamSectionTitle": "टीम",
-        "infoSectionTitle": "जानकारी",
-        "advancedSectionTitle": "एडवांसड",
-        "logsSectionTitle": "लॉग्स",
-        "darkThemeLabel": "Dark mode",
-        "darkThemeHint": "Welcome to the dark side",
-        "dynamicThemeLabel": "मेटीरियल यू",
-        "dynamicThemeHint": "अपने डिवाइस के करीब एक अनुभव का आनंद लें",
-        "languageLabel": "भाषा",
-        "englishOption": "अंग्रेज़ी",
-        "frenchOption": "फ्रेंच",
-        "sourcesLabel": "स्रोत",
-        "sourcesLabelHint": "अपने कस्टम साधन कॉन्फ़िगर करे",
-        "orgPatchesLabel": "Patches organization",
-        "sourcesPatchesLabel": "Patches source",
-        "orgIntegrationsLabel": "Integrations organization",
-        "sourcesIntegrationsLabel": "Integrations source",
-        "sourcesResetDialogTitle": "रीसेट करें",
-        "sourcesResetDialogText": "क्या आप वाकई कस्टम साधन को डिफ़ॉल्ट वैल्यू पर रीसेट करना चाहते हैं?",
-        "apiURLResetDialogText": "क्या आप वाकई कस्टम API URL को डिफ़ॉल्ट वैल्यू पर रीसेट करना चाहते हैं?",
-        "contributorsLabel": "योगदानकर्ता",
-        "contributorsHint": "ReVanced के योगदानकर्ताओ की सूची",
-        "logsLabel": "लॉग्स",
-        "logsHint": "Share Manager's logs",
-        "apiURLLabel": "API  URL",
-        "apiURLHint": "अपनी कस्टम API URL कॉन्फ़िगर करे",
-        "selectApiURL": "API URL",
-        "experimentalPatchesLabel": "Experimental patches support",
-        "experimentalPatchesHint": "Enable usage of unsupported patches in any app version",
-        "enabledExperimentalPatches": "Experimental patches support enabled",
-        "exportSectionTitle": "Import & export",
-        "aboutLabel": "विवरण",
-        "snackbarMessage": "क्लिपबोर्ड में कॉपी हो गया है",
-        "sentryLabel": "Sentry logging",
-        "sentryHint": "उन्नत प्रबंधक को बेहतर बनाने में हमारी सहायता करने के लिए अनाम लॉग भेजें",
-        "restartAppForChanges": "Restart the app to apply changes",
-        "deleteKeystoreLabel": "कीस्टोर मिटाएं",
-        "deleteKeystoreHint": "ऐप पर हस्ताक्षर करने के लिए उपयोग की जाने वाली कीस्टोर हटाएं",
-        "deletedKeystore": "कीस्टोर हटा दिया गया",
-        "deleteTempDirLabel": "Delete temporary files",
-        "deleteTempDirHint": "Delete the 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",
-        "importPatchesLabel": "Import patches selection",
-        "importPatchesHint": "Import patches selection from a JSON file",
-        "importedPatches": "Patches selection imported",
-        "resetStoredPatchesLabel": "Reset patches",
-        "resetStoredPatchesHint": "Reset the stored patches selection",
-        "resetStoredPatches": "Patches selection has been reset",
-        "jsonSelectorErrorMessage": "Unable to use selected JSON file",
-        "deleteLogsLabel": "लॉग हटाएं",
-        "deleteLogsHint": "एकत्रित प्रबंधक लॉग हटाएं",
-        "deletedLogs": "लॉग हटा दिए गए"
-    },
-    "appInfoView": {
-        "widgetTitle": "App info",
-        "openButton": "खोलें",
-        "uninstallButton": "अनइंस्टॉल करें",
-        "patchButton": "पैच",
-        "unpatchButton": "अनपैच करे",
-        "unpatchDialogText": "क्या वाकई आप इस एप को अनपैच करना चाहते हैं?",
-        "rootDialogTitle": "त्रुटि",
-        "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": "रूट",
-        "nonRootTypeLabel": "नॉन-रूट",
-        "patchedDateLabel": "Patched date",
-        "patchedDateHint": "{date} {time} पर",
-        "appliedPatchesLabel": "Applied patches",
-        "appliedPatchesHint": "{quantity} लागू किए हुआ पैच",
-        "updateNotImplemented": "This feature has not been implemented yet"
-    },
-    "contributorsView": {
-        "widgetTitle": "योगदानकर्ता",
-        "patcherContributors": "Patcher contributors",
-        "patchesContributors": "Patches contributors",
-        "integrationsContributors": "Integrations contributors",
-        "cliContributors": "CLI contributors",
-        "managerContributors": "Manager contributors"
-    }
-}

docs/0_prerequisites.md

@@ -0,0 +1,16 @@
+# 💼 Prerequisites
+
+In order to use ReVanced Manager, certain requirements must be met.
+
+## 🤝 Requirements
+
+- An Android device running Android 8 or higher
+- Any device architecture except ARMv7[^1]
+
+[^1]: This constraint only applies to patches, that require patching APK resources which is why some patches may or may not work on ARMv7 architecture. You can find out, which architectures your device supports here: [⚙️ Configuring ReVanced Manager](2_4_settings.md#%E2%84%B9%EF%B8%8F-about).
+
+## ⏭️ What's next
+
+The next page will guide you through patching an app.
+
+Continue: [⬇️ Installation](1_installation.md)

docs/1_installation.md

@@ -0,0 +1,14 @@
+# ⬇️ Installation
+
+In order to use ReVanced on your Android device, ReVanced Manager must be installed.
+
+## ✅ Installation steps
+
+1. Download the latest version of ReVanced Manager from [here](https://github.com/revanced/revanced-manager/releases/latest)
+2. Install ReVanced Manager
+
+## ⏭️ What's next
+
+The next page will guide you through using ReVanced Manager.
+
+Continue: [🛠️ Usage](2_usage.md)

docs/2_1_patching.md

@@ -0,0 +1,27 @@
+# 🧩 Patching apps
+
+The following pages will guide you through using ReVanced Manager to patch apps.
+
+## ✅ Steps 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.
+[^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.
+
+## ⏭️ What's next
+
+The next page will bring you back to the usage page.
+
+Continue: [🛠️ Usage](2_usage.md)

docs/2_2_managing.md

@@ -0,0 +1,15 @@
+# 🧰 Managing patched apps
+
+After patching an app, you may want to manage it. This page will guide you through managing patched apps.
+
+## ✅ Steps to manage patched apps
+
+1. Tap on the **Dashboard** tab in the bottom navigation bar
+2. Tap on the **Info** button for the app you want to manage
+3. Choose one of the options from the menu
+
+## ⏭️ What's next
+
+The next page will bring you back to the usage page.
+
+Continue: [🛠️ Usage](2_usage.md)

docs/2_3_updating.md

@@ -0,0 +1,14 @@
+# 🔄 Updating ReVanced Manager
+
+In order to keep up with the latest features and bug fixes, it is recommended to keep ReVanced Manager up to date.
+
+## ✅ Updating steps
+
+1. Navigate to the **Dashboard** tab from the bottom navigation bar
+2. Tap on the **Update** button in the **Updates** section
+
+## ⏭️ What's next
+
+The next page will bring you back to the usage page.
+
+Continue: [🛠️ Usage](2_usage.md)

docs/2_4_settings.md

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

docs/2_usage.md

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

docs/3_troubleshooting.md

@@ -0,0 +1,31 @@
+# ❔ Troubleshooting
+
+In case you encounter any issues while using ReVanced Manager, please refer to this page for possible solutions.
+
+- 💉 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.
+
+- ❗️ Error code `135`, `139` or `1` when patching the app
+
+  Your device is not supported. Refer to the [Prerequisites](0_prerequisites.md) page for supported devices.
+
+  Alternatively, you can use [ReVanced CLI](https://github.com/revanced/revanced-cli) to patch the app.
+
+- 🚫 Non-root install is not possible with the current patches selection
+
+  Select the **Default** button when choosing patches.
+
+- 🚨 Patched app crashes on launch
+
+  Select the **Default** button when choosing patches.
+
+## ⏭️ What's next
+
+The next page will teach you how to build ReVanced Manager from source.
+
+Continue: [🔨 Building from source](4_building.md)

docs/4_building.md

@@ -0,0 +1,40 @@
+# 🛠️ Building from source
+
+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)
+
+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
+
+   ```sh
+   flutter pub get
+   ```
+
+6. Delete conflicting outputs
+
+   ```sh
+   flutter packages pub 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
+
+   ```sh
+   flutter build apk
+   ```

docs/README.md

@@ -0,0 +1,21 @@
+# 💊 ReVanced Manager
+
+This documentation explains how to use [ReVanced Manager](https://github.com/revanced/revanced-manager).
+
+## 📖 Table of contents
+
+0. [💼 Prerequisites](0_prerequisites.md)
+1. [⬇️ Installation](1_installation.md)
+2. [🛠️ Usage](2_usage.md)
+   1. [🧩 Patching apps](2_1_patching.md)
+   2. [🧰 Managing patched apps](2_2_managing.md)
+   3. [🔄 Updating ReVanced Manager](2_3_updating.md)
+   4. [⚙️ Configuring ReVanced Manager](2_4_settings.md)
+3. [❔ Troubleshooting](3_troubleshooting.md)
+4. [🔨 Building from source](4_building.md)
+
+## ⏭️ Start here
+
+The next page will tell you about the prerequisites for using ReVanced Manager.
+
+Continue: [💼 Prerequisites](0_prerequisites.md)

fastlane/Appfile

@@ -0,0 +1,2 @@
+json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
+package_name("app.revanced.manager.flutter") # e.g. com.krausefx.app

fastlane/Fastfile

@@ -0,0 +1,38 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:android)
+
+platform :android do
+  desc "Runs all the tests"
+  lane :test do
+    gradle(task: "test")
+  end
+
+  desc "Submit a new Beta Build to Crashlytics Beta"
+  lane :beta do
+    gradle(task: "clean assembleRelease")
+    crashlytics
+  
+    # sh "your_script.sh"
+    # You can also use other beta testing services here
+  end
+
+  desc "Deploy a new version to the Google Play"
+  lane :deploy do
+    gradle(task: "clean assembleRelease")
+    upload_to_play_store
+  end
+end

fastlane/README.md

@@ -0,0 +1,48 @@
+fastlane documentation
+----
+
+# Installation
+
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```sh
+xcode-select --install
+```
+
+For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
+
+# Available Actions
+
+## Android
+
+### android test
+
+```sh
+[bundle exec] fastlane android test
+```
+
+Runs all the tests
+
+### android beta
+
+```sh
+[bundle exec] fastlane android beta
+```
+
+Submit a new Beta Build to Crashlytics Beta
+
+### android deploy
+
+```sh
+[bundle exec] fastlane android deploy
+```
+
+Deploy a new version to the Google Play
+
+----
+
+This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
+
+More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
+
+The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).

fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1 @@
+ReVanced Manager is an Android application that uses ReVanced Patcher to add, remove, and modify existing functionalities in Android applications

fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+Patch your favorite apps, right on your device.

fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+ReVanced Manager

lib/app/app.dart

@@ -1,4 +1,3 @@
-import 'package:revanced_manager/services/crowdin_api.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';
@@ -38,7 +37,6 @@ import 'package:stacked_services/stacked_services.dart';
     LazySingleton(classType: PatcherAPI),
     LazySingleton(classType: RevancedAPI),
     LazySingleton(classType: GithubAPI),
-    LazySingleton(classType: CrowdinAPI),
     LazySingleton(classType: Toast),
   ],
 )

lib/main.dart

@@ -1,18 +1,16 @@
+import 'dart:developer';
+
 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/crowdin_api.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';
 import 'package:revanced_manager/services/revanced_api.dart';
 import 'package:revanced_manager/ui/theme/dynamic_theme_builder.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_view.dart';
-import 'package:revanced_manager/utils/environment.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:stacked_themes/stacked_themes.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:timezone/data/latest.dart' as tz;
 
 late SharedPreferences prefs;
@@ -21,37 +19,13 @@ Future main() async {
   await setupLocator();
   WidgetsFlutterBinding.ensureInitialized();
   await locator<ManagerAPI>().initialize();
-  String apiUrl = locator<ManagerAPI>().getApiUrl();
+  final String apiUrl = locator<ManagerAPI>().getApiUrl();
   await locator<RevancedAPI>().initialize(apiUrl);
-  await locator<CrowdinAPI>().initialize();
-  bool isSentryEnabled = locator<ManagerAPI>().isSentryEnabled();
-  locator<GithubAPI>().initialize();
-  await locator<PatcherAPI>().initialize();
+  final String repoUrl = locator<ManagerAPI>().getRepoUrl();
+  locator<GithubAPI>().initialize(repoUrl);
   tz.initializeTimeZones();
   prefs = await SharedPreferences.getInstance();
 
-  await SentryFlutter.init(
-    (options) {
-      options
-        ..dsn = isSentryEnabled ? Environment.sentryDSN : ''
-        ..environment = 'alpha'
-        ..release = '0.1'
-        ..tracesSampleRate = 1.0
-        ..anrEnabled = true
-        ..enableOutOfMemoryTracking = true
-        ..sampleRate = isSentryEnabled ? 1.0 : 0.0
-        ..beforeSend = (event, hint) {
-          if (isSentryEnabled) {
-            return event;
-          } else {
-            return null;
-          }
-        } as BeforeSendCallback?;
-    },
-    appRunner: () {
-      runApp(const MyApp());
-    },
-  );
   runApp(const MyApp());
 }
 
@@ -60,10 +34,11 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    String rawLocale = prefs.getString('language') ?? 'en_US';
-    String replaceLocale = rawLocale.replaceAll('_', '-');
-    List<String> localeList = replaceLocale.split('-');
-    Locale locale = Locale(localeList[0], localeList[1]);
+    // String rawLocale = prefs.getString('language') ?? 'en_US';
+    // String replaceLocale = rawLocale.replaceAll('_', '-');
+    // List<String> localeList = replaceLocale.split('-');
+    // Locale locale = Locale(localeList[0], localeList[1]);
+    const Locale locale = Locale('en', 'US');
 
     return DynamicThemeBuilder(
       title: 'ReVanced Manager',
@@ -71,17 +46,19 @@ class MyApp extends StatelessWidget {
       localizationsDelegates: [
         FlutterI18nDelegate(
           translationLoader: FileTranslationLoader(
+            fallbackFile: 'en_US',
             forcedLocale: locale,
             basePath: 'assets/i18n',
             useCountryCode: true,
           ),
           missingTranslationHandler: (key, locale) {
-            print(
-                '--> Missing translation: key: $key, languageCode: ${locale?.languageCode}');
+            log(
+              '--> Missing translation: key: $key, languageCode: ${locale?.languageCode}',
+            );
           },
         ),
         GlobalMaterialLocalizations.delegate,
-        GlobalWidgetsLocalizations.delegate
+        GlobalWidgetsLocalizations.delegate,
       ],
     );
   }

lib/models/patch.dart

@@ -5,23 +5,20 @@ part 'patch.g.dart';
 
 @JsonSerializable()
 class Patch {
-  final String name;
-  final String description;
-  final String version;
-  final bool excluded;
-  final List<String> dependencies;
-  final List<Package> compatiblePackages;
-
   Patch({
     required this.name,
     required this.description,
-    required this.version,
     required this.excluded,
     required this.dependencies,
     required this.compatiblePackages,
   });
 
   factory Patch.fromJson(Map<String, dynamic> json) => _$PatchFromJson(json);
+  final String name;
+  final String description;
+  final bool excluded;
+  final List<String> dependencies;
+  final List<Package> compatiblePackages;
 
   Map<String, dynamic> toJson() => _$PatchToJson(this);
 
@@ -37,9 +34,6 @@ class Patch {
 
 @JsonSerializable()
 class Package {
-  final String name;
-  final List<String> versions;
-
   Package({
     required this.name,
     required this.versions,
@@ -47,6 +41,8 @@ class Package {
 
   factory Package.fromJson(Map<String, dynamic> json) =>
       _$PackageFromJson(json);
+  final String name;
+  final List<String> versions;
 
   Map toJson() => _$PackageToJson(this);
 }

lib/models/patched_application.dart

@@ -6,23 +6,6 @@ part 'patched_application.g.dart';
 
 @JsonSerializable()
 class PatchedApplication {
-  String name;
-  String packageName;
-  String originalPackageName;
-  String version;
-  final String apkFilePath;
-  @JsonKey(
-    fromJson: decodeBase64,
-    toJson: encodeBase64,
-  )
-  Uint8List icon;
-  DateTime patchDate;
-  bool isRooted;
-  bool isFromStorage;
-  bool hasUpdates;
-  List<String> appliedPatches;
-  List<String> changelog;
-
   PatchedApplication({
     required this.name,
     required this.packageName,
@@ -40,6 +23,22 @@ class PatchedApplication {
 
   factory PatchedApplication.fromJson(Map<String, dynamic> json) =>
       _$PatchedApplicationFromJson(json);
+  String name;
+  String packageName;
+  String originalPackageName;
+  String version;
+  final String apkFilePath;
+  @JsonKey(
+    fromJson: decodeBase64,
+    toJson: encodeBase64,
+  )
+  Uint8List icon;
+  DateTime patchDate;
+  bool isRooted;
+  bool isFromStorage;
+  bool hasUpdates;
+  List<String> appliedPatches;
+  List<String> changelog;
 
   Map<String, dynamic> toJson() => _$PatchedApplicationToJson(this);
 

lib/services/crowdin_api.dart

@@ -1,61 +0,0 @@
-import 'package:dio/dio.dart';
-import 'package:dio_http_cache_lts/dio_http_cache_lts.dart';
-import 'package:injectable/injectable.dart' hide Environment;
-import 'package:revanced_manager/utils/environment.dart';
-import 'package:sentry_dio/sentry_dio.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
-
-@lazySingleton
-class CrowdinAPI {
-  late Dio _dio = Dio();
-  final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
-  final apiKey = Environment.crowdinKEY;
-
-  Future<void> initialize() async {
-    try {
-      _dio = Dio(BaseOptions(
-        baseUrl: 'https://api.crowdin.com/api/v2',
-      ));
-
-      _dio.interceptors.add(_dioCacheManager.interceptor);
-      _dio.addSentry(
-        captureFailedRequests: true,
-      );
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-    }
-  }
-
-  Future<void> clearAllCache() async {
-    try {
-      await _dioCacheManager.clearAll();
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-    }
-  }
-
-  Future<List> getLanguages() async {
-    try {
-      var response = await _dio.get(
-        '/projects',
-        options: buildCacheOptions(
-          const Duration(hours: 6),
-          maxStale: const Duration(days: 1),
-          options: Options(
-            headers: {
-              'Authorization': 'Bearer $apiKey',
-            },
-            contentType: 'application/json',
-          ),
-        ),
-      );
-      List targetLanguages =
-          await response.data['data'][0]['data']['targetLanguages'];
-
-      return targetLanguages;
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-      return [];
-    }
-  }
-}

lib/services/github_api.dart

@@ -2,21 +2,25 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:collection/collection.dart';
 import 'package:dio/dio.dart';
-import 'package:dio_http_cache_lts/dio_http_cache_lts.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:sentry_flutter/sentry_flutter.dart';
-import 'package:sentry_dio/sentry_dio.dart';
+import 'package:revanced_manager/services/manager_api.dart';
 
 @lazySingleton
 class GithubAPI {
   late Dio _dio = Dio();
-  final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
-  final Options _cacheOptions = buildCacheOptions(
-    const Duration(hours: 6),
+  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',
@@ -28,38 +32,112 @@ class GithubAPI {
     'com.spotify.music': 'spotify',
   };
 
-  void initialize() async {
+  Future<void> initialize(String repoUrl) async {
     try {
-      _dio = Dio(BaseOptions(
-        baseUrl: 'https://api.github.com',
-      ));
-
-      _dio.interceptors.add(_dioCacheManager.interceptor);
-      _dio.addSentry(
-        captureFailedRequests: true,
+      _dio = Dio(
+        BaseOptions(
+          baseUrl: repoUrl,
+        ),
       );
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+
+      _dio.interceptors.add(DioCacheInterceptor(options: _cacheOptions));
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
   Future<void> clearAllCache() async {
     try {
-      await _dioCacheManager.clearAll();
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+      await _cacheOptions.store!.clean();
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
-  Future<Map<String, dynamic>?> _getLatestRelease(String repoName) async {
+  Future<Map<String, dynamic>?> getLatestRelease(
+    String repoName,
+  ) async {
     try {
-      var response = await _dio.get(
-        '/repos/$repoName/releases/latest',
-        options: _cacheOptions,
+      final response = await _dio.get(
+        '/repos/$repoName/releases',
+      );
+      return response.data[0];
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+      return null;
+    }
+  }
+
+  Future<Map<String, dynamic>?> getPatchesRelease(
+    String repoName,
+    String version,
+  ) async {
+    try {
+      final response = await _dio.get(
+        '/repos/$repoName/releases/tags/$version',
       );
       return response.data;
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+      return null;
+    }
+  }
+
+  Future<Map<String, dynamic>?> getLatestPatchesRelease(
+    String repoName,
+  ) async {
+    try {
+      final response = await _dio.get(
+        '/repos/$repoName/releases/latest',
+      );
+      return response.data;
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+      return null;
+    }
+  }
+
+  Future<Map<String, dynamic>?> getLatestManagerRelease(
+    String repoName,
+  ) async {
+    try {
+      final response = await _dio.get(
+        '/repos/$repoName/releases',
+      );
+      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') {
+        updates++;
+      }
+      for (int i = 1; i < updates; i++) {
+        releases.update(
+          'body',
+          (value) =>
+              value +
+              '\n' +
+              '# ' +
+              response.data[i]['tag_name'] +
+              '\n' +
+              response.data[i]['body'],
+        );
+      }
+      return releases;
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return null;
     }
   }
@@ -69,37 +147,41 @@ class GithubAPI {
     String repoName,
     DateTime since,
   ) async {
-    String path =
+    final String path =
         'src/main/kotlin/app/revanced/patches/${repoAppPath[packageName]}';
     try {
-      var response = await _dio.get(
+      final response = await _dio.get(
         '/repos/$repoName/commits',
         queryParameters: {
           'path': path,
           'since': since.toIso8601String(),
         },
-        options: _cacheOptions,
       );
-      List<dynamic> commits = response.data;
+      final List<dynamic> commits = response.data;
       return commits
           .map(
-            (commit) => (commit['commit']['message']).split('\n')[0] +
+            (commit) => commit['commit']['message'].split('\n')[0] +
                 ' - ' +
                 commit['commit']['author']['name'] +
                 '\n' as String,
           )
           .toList();
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-      return List.empty();
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
+    return [];
   }
 
-  Future<File?> getLatestReleaseFile(String extension, String repoName) async {
+  Future<File?> getLatestReleaseFile(
+    String extension,
+    String repoName,
+  ) async {
     try {
-      Map<String, dynamic>? release = await _getLatestRelease(repoName);
+      final Map<String, dynamic>? release = await getLatestRelease(repoName);
       if (release != null) {
-        Map<String, dynamic>? asset =
+        final Map<String, dynamic>? asset =
             (release['assets'] as List<dynamic>).firstWhereOrNull(
           (asset) => (asset['name'] as String).endsWith(extension),
         );
@@ -109,39 +191,76 @@ class GithubAPI {
           );
         }
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-      return null;
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
     return null;
   }
 
-  Future<List<Patch>> getPatches(String repoName) async {
-    List<Patch> patches = [];
+  Future<File?> getPatchesReleaseFile(
+    String extension,
+    String repoName,
+    String version,
+    String url,
+  ) async {
     try {
-      File? f = await getLatestReleaseFile('.json', repoName);
-      if (f != null) {
-        List<dynamic> list = jsonDecode(f.readAsStringSync());
-        patches = list.map((patch) => Patch.fromJson(patch)).toList();
+      if (url.isNotEmpty) {
+        return await DefaultCacheManager().getSingleFile(
+          url,
+        );
+      }
+      final Map<String, dynamic>? release =
+          await getPatchesRelease(repoName, version);
+      if (release != null) {
+        final Map<String, dynamic>? asset =
+            (release['assets'] as List<dynamic>).firstWhereOrNull(
+          (asset) => (asset['name'] as String).endsWith(extension),
+        );
+        if (asset != null) {
+          final String downloadUrl = asset['browser_download_url'];
+          if (extension == '.apk') {
+            _managerAPI.setIntegrationsDownloadURL(downloadUrl);
+          } else {
+            _managerAPI.setPatchesDownloadURL(downloadUrl);
+          }
+          return await DefaultCacheManager().getSingleFile(
+            downloadUrl,
+          );
+        }
+      }
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-      return List.empty();
     }
-    return patches;
+    return null;
   }
 
-  Future<String> getLastestReleaseVersion(String repoName) async {
+  Future<List<Patch>> getPatches(
+    String repoName,
+    String version,
+    String url,
+  ) async {
+    List<Patch> patches = [];
     try {
-      Map<String, dynamic>? release = await _getLatestRelease(repoName);
-      if (release != null) {
-        return release['tag_name'];
-      } else {
-        return 'Unknown';
+      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);
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-      return '';
     }
+
+    return patches;
   }
 }

lib/services/manager_api.dart

@@ -1,6 +1,9 @@
 import 'dart:convert';
 import 'dart:io';
 import 'package:device_apps/device_apps.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:injectable/injectable.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:path_provider/path_provider.dart';
@@ -8,10 +11,13 @@ 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:sentry_flutter/sentry_flutter.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:revanced_manager/utils/check_for_supported_patch.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:timeago/timeago.dart';
 
 @lazySingleton
 class ManagerAPI {
@@ -20,17 +26,33 @@ class ManagerAPI {
   final RootAPI _rootAPI = RootAPI();
   final String patcherRepo = 'revanced-patcher';
   final String cliRepo = 'revanced-cli';
-  late String storedPatchesFile = '/selected-patches.json';
   late SharedPreferences _prefs;
-  String defaultApiUrl = 'https://releases.revanced.app/';
+  List<Patch> patches = [];
+  bool isRooted = false;
+  String storedPatchesFile = '/selected-patches.json';
+  String keystoreFile =
+      '/sdcard/Android/data/app.revanced.manager.flutter/files/revanced-manager.keystore';
+  String defaultKeystorePassword = 's3cur3p@ssw0rd';
+  String defaultApiUrl = 'https://api.revanced.app/';
+  String defaultRepoUrl = 'https://api.github.com';
   String defaultPatcherRepo = 'revanced/revanced-patcher';
   String defaultPatchesRepo = 'revanced/revanced-patches';
   String defaultIntegrationsRepo = 'revanced/revanced-integrations';
   String defaultCliRepo = 'revanced/revanced-cli';
   String defaultManagerRepo = 'revanced/revanced-manager';
+  String? patchesVersion = '';
+  String? integrationsVersion = '';
+  bool isDefaultPatchesRepo() {
+    return getPatchesRepo().toLowerCase() == 'revanced/revanced-patches';
+  }
+
+  bool isDefaultIntegrationsRepo() {
+    return getIntegrationsRepo().toLowerCase() == 'revanced/revanced-integrations';
+  }
 
   Future<void> initialize() async {
     _prefs = await SharedPreferences.getInstance();
+    isRooted = await _rootAPI.isRooted();
     storedPatchesFile =
         (await getApplicationDocumentsDirectory()).path + storedPatchesFile;
   }
@@ -48,6 +70,25 @@ class ManagerAPI {
     await _prefs.setString('apiUrl', url);
   }
 
+  String getRepoUrl() {
+    return _prefs.getString('repoUrl') ?? defaultRepoUrl;
+  }
+
+  Future<void> setRepoUrl(String url) async {
+    if (url.isEmpty || url == ' ') {
+      url = defaultRepoUrl;
+    }
+    await _prefs.setString('repoUrl', url);
+  }
+
+  String getPatchesDownloadURL() {
+    return _prefs.getString('patchesDownloadURL') ?? '';
+  }
+
+  Future<void> setPatchesDownloadURL(String value) async {
+    await _prefs.setString('patchesDownloadURL', value);
+  }
+
   String getPatchesRepo() {
     return _prefs.getString('patchesRepo') ?? defaultPatchesRepo;
   }
@@ -59,6 +100,86 @@ class ManagerAPI {
     await _prefs.setString('patchesRepo', value);
   }
 
+  bool getPatchesConsent() {
+    return _prefs.getBool('patchesConsent') ?? false;
+  }
+
+  Future<void> setPatchesConsent(bool consent) async {
+    await _prefs.setBool('patchesConsent', consent);
+  }
+
+  bool isPatchesAutoUpdate() {
+    return _prefs.getBool('patchesAutoUpdate') ?? false;
+  }
+
+  bool isPatchesChangeEnabled() {
+    return _prefs.getBool('patchesChangeEnabled') ?? false;
+  }
+
+  void setPatchesChangeEnabled(bool value) {
+    _prefs.setBool('patchesChangeEnabled', value);
+  }
+
+  bool showPatchesChangeWarning() {
+    return _prefs.getBool('showPatchesChangeWarning') ?? true;
+  }
+
+  void setPatchesChangeWarning(bool value) {
+    _prefs.setBool('showPatchesChangeWarning', !value);
+  }
+
+  bool isChangingToggleModified() {
+    return _prefs.getBool('isChangingToggleModified') ?? false;
+  }
+
+  void setChangingToggleModified(bool value) {
+    _prefs.setBool('isChangingToggleModified', value);
+  }
+
+  Future<void> setPatchesAutoUpdate(bool value) async {
+    await _prefs.setBool('patchesAutoUpdate', value);
+  }
+
+  List<Patch> getSavedPatches(String packageName) {
+    final List<String> patchesJson =
+        _prefs.getStringList('savedPatches-$packageName') ?? [];
+    final List<Patch> patches = patchesJson.map((String patchJson) {
+      return Patch.fromJson(jsonDecode(patchJson));
+    }).toList();
+    return patches;
+  }
+
+  Future<void> savePatches(List<Patch> patches, String packageName) async {
+    final List<String> patchesJson = patches.map((Patch patch) {
+      return jsonEncode(patch.toJson());
+    }).toList();
+    await _prefs.setStringList('savedPatches-$packageName', patchesJson);
+  }
+
+  String getIntegrationsDownloadURL() {
+    return _prefs.getString('integrationsDownloadURL') ?? '';
+  }
+
+  Future<void> setIntegrationsDownloadURL(String value) async {
+    await _prefs.setString('integrationsDownloadURL', value);
+  }
+
+  List<Patch> getUsedPatches(String packageName) {
+    final List<String> patchesJson =
+        _prefs.getStringList('usedPatches-$packageName') ?? [];
+    final List<Patch> patches = patchesJson.map((String patchJson) {
+      return Patch.fromJson(jsonDecode(patchJson));
+    }).toList();
+    return patches;
+  }
+
+  Future<void> setUsedPatches(List<Patch> patches, String packageName) async {
+    final List<String> patchesJson = patches.map((Patch patch) {
+      return jsonEncode(patch.toJson());
+    }).toList();
+    await _prefs.setStringList('usedPatches-$packageName', patchesJson);
+  }
+
   String getIntegrationsRepo() {
     return _prefs.getString('integrationsRepo') ?? defaultIntegrationsRepo;
   }
@@ -78,20 +199,20 @@ 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 isSentryEnabled() {
-    return _prefs.getBool('sentryEnabled') ?? true;
+  bool areUniversalPatchesEnabled() {
+    return _prefs.getBool('universalPatchesEnabled') ?? false;
   }
 
-  Future<void> setSentryStatus(bool value) async {
-    await _prefs.setBool('sentryEnabled', value);
+  Future<void> enableUniversalPatchesStatus(bool value) async {
+    await _prefs.setBool('universalPatchesEnabled', value);
   }
 
   bool areExperimentalPatchesEnabled() {
@@ -102,6 +223,14 @@ class ManagerAPI {
     await _prefs.setBool('experimentalPatchesEnabled', value);
   }
 
+  Future<void> setKeystorePassword(String password) async {
+    await _prefs.setString('keystorePassword', password);
+  }
+
+  String getKeystorePassword() {
+    return _prefs.getString('keystorePassword') ?? defaultKeystorePassword;
+  }
+
   Future<void> deleteTempFolder() async {
     final Directory dir = Directory('/data/local/tmp/revanced-manager');
     if (await dir.exists()) {
@@ -111,29 +240,34 @@ class ManagerAPI {
 
   Future<void> deleteKeystore() async {
     final File keystore = File(
-        '/sdcard/Android/data/app.revanced.manager.flutter/files/revanced-manager.keystore');
+      keystoreFile,
+    );
     if (await keystore.exists()) {
       await keystore.delete();
     }
   }
 
   List<PatchedApplication> getPatchedApps() {
-    List<String> apps = _prefs.getStringList('patchedApps') ?? [];
+    final List<String> apps = _prefs.getStringList('patchedApps') ?? [];
     return apps.map((a) => PatchedApplication.fromJson(jsonDecode(a))).toList();
   }
 
-  Future<void> setPatchedApps(List<PatchedApplication> patchedApps) async {
+  Future<void> setPatchedApps(
+    List<PatchedApplication> patchedApps,
+  ) async {
     if (patchedApps.length > 1) {
       patchedApps.sort((a, b) => a.name.compareTo(b.name));
     }
-    await _prefs.setStringList('patchedApps',
-        patchedApps.map((a) => json.encode(a.toJson())).toList());
+    await _prefs.setStringList(
+      'patchedApps',
+      patchedApps.map((a) => json.encode(a.toJson())).toList(),
+    );
   }
 
   Future<void> savePatchedApp(PatchedApplication app) async {
-    List<PatchedApplication> patchedApps = getPatchedApps();
+    final List<PatchedApplication> patchedApps = getPatchedApps();
     patchedApps.removeWhere((a) => a.packageName == app.packageName);
-    ApplicationWithIcon? installed = await DeviceApps.getApp(
+    final ApplicationWithIcon? installed = await DeviceApps.getApp(
       app.packageName,
       true,
     ) as ApplicationWithIcon?;
@@ -147,17 +281,19 @@ class ManagerAPI {
   }
 
   Future<void> deletePatchedApp(PatchedApplication app) async {
-    List<PatchedApplication> patchedApps = getPatchedApps();
+    final List<PatchedApplication> patchedApps = getPatchedApps();
     patchedApps.removeWhere((a) => a.packageName == app.packageName);
     await setPatchedApps(patchedApps);
   }
 
-  void clearAllData() async {
+  Future<void> clearAllData() async {
     try {
       _revancedAPI.clearAllCache();
       _githubAPI.clearAllCache();
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
@@ -166,63 +302,102 @@ class ManagerAPI {
   }
 
   Future<List<Patch>> getPatches() async {
-    try {
-      String repoName = getPatchesRepo();
-      if (repoName == defaultPatchesRepo) {
-        return await _revancedAPI.getPatches();
-      } else {
-        return await _githubAPI.getPatches(repoName);
-      }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-      return [];
+    if (patches.isNotEmpty) {
+      return patches;
     }
+    final File? patchBundleFile = await downloadPatches();
+    if (patchBundleFile != null) {
+      try {
+        final patchesObject = await PatcherAPI.patcherChannel.invokeMethod(
+          'getPatches',
+          {
+            'patchBundleFilePath': patchBundleFile.path,
+          },
+        );
+        final List<Map<String, dynamic>> patchesMap = [];
+        patchesObject.forEach((patch) {
+          patchesMap.add(jsonDecode('$patch'));
+        });
+        patches = patchesMap.map((patch) => Patch.fromJson(patch)).toList();
+        return patches;
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
+        }
+      }
+    }
+    return List.empty();
   }
 
   Future<File?> downloadPatches() async {
     try {
-      String repoName = getPatchesRepo();
-      if (repoName == defaultPatchesRepo) {
-        return await _revancedAPI.getLatestReleaseFile(
-          '.jar',
-          defaultPatchesRepo,
-        );
-      } else {
-        return await _githubAPI.getLatestReleaseFile('.jar', repoName);
+      final String repoName = getPatchesRepo();
+      final String currentVersion = await getCurrentPatchesVersion();
+      final String url = getPatchesDownloadURL();
+      return await _githubAPI.getPatchesReleaseFile(
+        '.jar',
+        repoName,
+        currentVersion,
+        url,
+      );
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
       return null;
     }
   }
 
   Future<File?> downloadIntegrations() async {
     try {
-      String repoName = getIntegrationsRepo();
-      if (repoName == defaultIntegrationsRepo) {
-        return await _revancedAPI.getLatestReleaseFile(
-          '.apk',
-          defaultIntegrationsRepo,
-        );
-      } else {
-        return await _githubAPI.getLatestReleaseFile('.apk', repoName);
+      final String repoName = getIntegrationsRepo();
+      final String currentVersion = await getCurrentIntegrationsVersion();
+      final String url = getIntegrationsDownloadURL();
+      return await _githubAPI.getPatchesReleaseFile(
+        '.apk',
+        repoName,
+        currentVersion,
+        url,
+      );
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
       return null;
     }
   }
 
   Future<File?> downloadManager() async {
-    return await _revancedAPI.getLatestReleaseFile('.apk', defaultManagerRepo);
+    return await _revancedAPI.getLatestReleaseFile(
+      '.apk',
+      defaultManagerRepo,
+    );
   }
 
-  Future<String?> getLatestPatcherReleaseTime() async {
-    return await _revancedAPI.getLatestReleaseTime('.gz', defaultPatcherRepo);
+  Future<String?> getLatestPatchesReleaseTime() async {
+    if (isDefaultPatchesRepo()) {
+      return await _revancedAPI.getLatestReleaseTime(
+        '.json',
+        defaultPatchesRepo,
+      );
+    } else {
+      final release =
+          await _githubAPI.getLatestPatchesRelease(getPatchesRepo());
+      if (release != null) {
+        final DateTime timestamp =
+            DateTime.parse(release['created_at'] as String);
+        return format(timestamp, locale: 'en_short');
+      } else {
+        return null;
+      }
+    }
   }
 
   Future<String?> getLatestManagerReleaseTime() async {
-    return await _revancedAPI.getLatestReleaseTime('.apk', defaultManagerRepo);
+    return await _revancedAPI.getLatestReleaseTime(
+      '.apk',
+      defaultManagerRepo,
+    );
   }
 
   Future<String?> getLatestManagerVersion() async {
@@ -232,24 +407,87 @@ class ManagerAPI {
     );
   }
 
+  Future<String?> getLatestIntegrationsVersion() async {
+    if (isDefaultIntegrationsRepo()) {
+      return await _revancedAPI.getLatestReleaseVersion(
+        '.apk',
+        defaultIntegrationsRepo,
+      );
+    } else {
+      final release = await _githubAPI.getLatestRelease(getIntegrationsRepo());
+      if (release != null) {
+        return release['tag_name'];
+      } else {
+        return null;
+      }
+    }
+  }
+
   Future<String?> getLatestPatchesVersion() async {
-    return await _revancedAPI.getLatestReleaseVersion(
-      '.json',
-      defaultPatchesRepo,
-    );
+    if (isDefaultPatchesRepo()) {
+      return await _revancedAPI.getLatestReleaseVersion(
+        '.json',
+        defaultPatchesRepo,
+      );
+    } else {
+      final release =
+          await _githubAPI.getLatestPatchesRelease(getPatchesRepo());
+      if (release != null) {
+        return release['tag_name'];
+      } else {
+        return null;
+      }
+    }
   }
 
   Future<String> getCurrentManagerVersion() async {
-    PackageInfo packageInfo = await PackageInfo.fromPlatform();
+    final PackageInfo packageInfo = await PackageInfo.fromPlatform();
     return packageInfo.version;
   }
 
+  Future<String> getCurrentPatchesVersion() async {
+    patchesVersion = _prefs.getString('patchesVersion') ?? '0.0.0';
+    if (patchesVersion == '0.0.0' || isPatchesAutoUpdate()) {
+      final String newPatchesVersion =
+          await getLatestPatchesVersion() ?? '0.0.0';
+      if (patchesVersion != newPatchesVersion && newPatchesVersion != '0.0.0') {
+        await setCurrentPatchesVersion(newPatchesVersion);
+      }
+    }
+    return patchesVersion!;
+  }
+
+  Future<void> setCurrentPatchesVersion(String version) async {
+    await _prefs.setString('patchesVersion', version);
+    await setPatchesDownloadURL('');
+    await downloadPatches();
+  }
+
+  Future<String> getCurrentIntegrationsVersion() async {
+    integrationsVersion = _prefs.getString('integrationsVersion') ?? '0.0.0';
+    if (integrationsVersion == '0.0.0' || isPatchesAutoUpdate()) {
+      final String newIntegrationsVersion =
+          await getLatestIntegrationsVersion() ?? '0.0.0';
+      if (integrationsVersion != newIntegrationsVersion &&
+          newIntegrationsVersion != '0.0.0') {
+        await setCurrentIntegrationsVersion(newIntegrationsVersion);
+      }
+    }
+    return integrationsVersion!;
+  }
+
+  Future<void> setCurrentIntegrationsVersion(String version) async {
+    await _prefs.setString('integrationsVersion', version);
+    await setIntegrationsDownloadURL('');
+    await downloadIntegrations();
+  }
+
   Future<List<PatchedApplication>> getAppsToRemove(
     List<PatchedApplication> patchedApps,
   ) async {
-    List<PatchedApplication> toRemove = [];
-    for (PatchedApplication app in patchedApps) {
-      bool isRemove = await isAppUninstalled(app);
+    final List<PatchedApplication> toRemove = [];
+    for (final PatchedApplication app in patchedApps) {
+      final bool isRemove = await isAppUninstalled(app);
       if (isRemove) {
         toRemove.add(app);
       }
@@ -260,13 +498,13 @@ class ManagerAPI {
   Future<List<PatchedApplication>> getUnsavedApps(
     List<PatchedApplication> patchedApps,
   ) async {
-    List<PatchedApplication> unsavedApps = [];
-    bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+    final List<PatchedApplication> unsavedApps = [];
+    final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
     if (hasRootPermissions) {
-      List<String> installedApps = await _rootAPI.getInstalledApps();
-      for (String packageName in installedApps) {
+      final List<String> installedApps = await _rootAPI.getInstalledApps();
+      for (final String packageName in installedApps) {
         if (!patchedApps.any((app) => app.packageName == packageName)) {
-          ApplicationWithIcon? application = await DeviceApps.getApp(
+          final ApplicationWithIcon? application = await DeviceApps.getApp(
             packageName,
             true,
           ) as ApplicationWithIcon?;
@@ -287,15 +525,13 @@ class ManagerAPI {
         }
       }
     }
-    List<Application> userApps = await DeviceApps.getInstalledApplications(
-      includeSystemApps: false,
-      includeAppIcons: false,
-    );
-    for (Application app in userApps) {
+    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)) {
-        ApplicationWithIcon? application = await DeviceApps.getApp(
+        final ApplicationWithIcon? application = await DeviceApps.getApp(
           app.packageName,
           true,
         ) as ApplicationWithIcon?;
@@ -309,7 +545,6 @@ class ManagerAPI {
               apkFilePath: application.apkFilePath,
               icon: application.icon,
               patchDate: DateTime.now(),
-              isRooted: false,
             ),
           );
         }
@@ -318,26 +553,87 @@ class ManagerAPI {
     return unsavedApps;
   }
 
+  Future<void> showPatchesChangeWarningDialog(BuildContext context) {
+    final ValueNotifier<bool> noShow =
+        ValueNotifier(!showPatchesChangeWarning());
+    return showDialog(
+      barrierDismissible: false,
+      context: context,
+      builder: (context) => WillPopScope(
+        onWillPop: () async => false,
+        child: AlertDialog(
+          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+          title: I18nText('warning'),
+          content: ValueListenableBuilder(
+            valueListenable: noShow,
+            builder: (context, value, child) {
+              return Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  I18nText(
+                    'patchItem.patchesChangeWarningDialogText',
+                    child: const Text(
+                      '',
+                      style: TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500,
+                      ),
+                    ),
+                  ),
+                  const SizedBox(height: 8),
+                  CheckboxListTile(
+                    value: value,
+                    contentPadding: EdgeInsets.zero,
+                    title: I18nText(
+                      'noShowAgain',
+                    ),
+                    onChanged: (selected) {
+                      noShow.value = selected!;
+                    },
+                  ),
+                ],
+              );
+            },
+          ),
+          actions: [
+            CustomMaterialButton(
+              label: I18nText('okButton'),
+              onPressed: () {
+                setPatchesChangeWarning(noShow.value);
+                Navigator.of(context).pop();
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
   Future<void> reAssessSavedApps() async {
-    List<PatchedApplication> patchedApps = getPatchedApps();
-    List<PatchedApplication> unsavedApps = await getUnsavedApps(patchedApps);
+    final List<PatchedApplication> patchedApps = getPatchedApps();
+    final List<PatchedApplication> unsavedApps =
+        await getUnsavedApps(patchedApps);
     patchedApps.addAll(unsavedApps);
-    List<PatchedApplication> toRemove = await getAppsToRemove(patchedApps);
+    final List<PatchedApplication> toRemove =
+        await getAppsToRemove(patchedApps);
     patchedApps.removeWhere((a) => toRemove.contains(a));
-    for (PatchedApplication app in patchedApps) {
+    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) {
-        String? currentInstalledVersion =
+        final String? currentInstalledVersion =
             (await DeviceApps.getApp(app.packageName))?.versionName;
         if (currentInstalledVersion != null) {
-          String currentSavedVersion = app.version;
-          int currentInstalledVersionInt = int.parse(
-              currentInstalledVersion.replaceAll(RegExp('[^0-9]'), ''));
-          int currentSavedVersionInt =
-              int.parse(currentSavedVersion.replaceAll(RegExp('[^0-9]'), ''));
+          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;
           }
@@ -349,9 +645,9 @@ class ManagerAPI {
 
   Future<bool> isAppUninstalled(PatchedApplication app) async {
     bool existsRoot = false;
-    bool existsNonRoot = await DeviceApps.isAppInstalled(app.packageName);
+    final bool existsNonRoot = await DeviceApps.isAppInstalled(app.packageName);
     if (app.isRooted) {
-      bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+      final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
       if (hasRootPermissions) {
         existsRoot = await _rootAPI.isAppInstalled(app.packageName);
       }
@@ -360,8 +656,11 @@ class ManagerAPI {
     return !existsNonRoot;
   }
 
-  Future<bool> hasAppUpdates(String packageName, DateTime patchDate) async {
-    List<String> commits = await _githubAPI.getCommits(
+  Future<bool> hasAppUpdates(
+    String packageName,
+    DateTime patchDate,
+  ) async {
+    final List<String> commits = await _githubAPI.getCommits(
       packageName,
       getPatchesRepo(),
       patchDate,
@@ -370,7 +669,9 @@ class ManagerAPI {
   }
 
   Future<List<String>> getAppChangelog(
-      String packageName, DateTime patchDate) async {
+    String packageName,
+    DateTime patchDate,
+  ) async {
     List<String> newCommits = await _githubAPI.getCommits(
       packageName,
       getPatchesRepo(),
@@ -396,38 +697,59 @@ class ManagerAPI {
     return app != null && app.isSplit;
   }
 
-  Future<void> setSelectedPatches(String app, List<String> patches) async {
+  Future<void> setSelectedPatches(
+    String app,
+    List<String> patches,
+  ) async {
     final File selectedPatchesFile = File(storedPatchesFile);
-    Map<String, dynamic> patchesMap = await readSelectedPatchesFile();
+    final Map<String, dynamic> patchesMap = await readSelectedPatchesFile();
     if (patches.isEmpty) {
       patchesMap.remove(app);
     } else {
       patchesMap[app] = patches;
     }
-    if (selectedPatchesFile.existsSync()) {
-      selectedPatchesFile.createSync(recursive: true);
-    }
     selectedPatchesFile.writeAsString(jsonEncode(patchesMap));
   }
 
-  Future<List<String>> getSelectedPatches(String app) async {
-    Map<String, dynamic> patchesMap = await readSelectedPatchesFile();
-    if (patchesMap.isNotEmpty) {
-      final List<String> patches =
-          List.from(patchesMap.putIfAbsent(app, () => List.empty()));
-      return patches;
+  // get default patches for app
+  Future<List<String>> getDefaultPatches() async {
+    final List<Patch> patches = await getPatches();
+    final List<String> defaultPatches = [];
+    if (areExperimentalPatchesEnabled() == false) {
+      defaultPatches.addAll(
+        patches
+            .where(
+              (element) =>
+                  element.excluded == false && isPatchSupported(element),
+            )
+            .map((p) => p.name),
+      );
+    } else {
+      defaultPatches.addAll(
+        patches
+            .where((element) => isPatchSupported(element))
+            .map((p) => p.name),
+      );
     }
-    return List.empty();
+    return defaultPatches;
+  }
+
+  Future<List<String>> getSelectedPatches(String app) async {
+    final Map<String, dynamic> patchesMap = await readSelectedPatchesFile();
+    final List<String> defaultPatches = await getDefaultPatches();
+    return List.from(patchesMap.putIfAbsent(app, () => defaultPatches));
   }
 
   Future<Map<String, dynamic>> readSelectedPatchesFile() async {
     final File selectedPatchesFile = File(storedPatchesFile);
-    if (selectedPatchesFile.existsSync()) {
-      String string = selectedPatchesFile.readAsStringSync();
-      if (string.trim().isEmpty) return {};
-      return json.decode(string);
+    if (!selectedPatchesFile.existsSync()) {
+      return {};
     }
-    return {};
+    final String string = selectedPatchesFile.readAsStringSync();
+    if (string.trim().isEmpty) {
+      return {};
+    }
+    return jsonDecode(string);
   }
 
   Future<void> resetLastSelectedPatches() async {

lib/services/patcher_api.dart

@@ -1,18 +1,19 @@
 import 'dart:io';
-import 'package:app_installer/app_installer.dart';
+
 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/services.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:sentry_flutter/sentry_flutter.dart';
 import 'package:share_extend/share_extend.dart';
-import 'package:cr_file_saver/file_saver.dart';
 
 @lazySingleton
 class PatcherAPI {
@@ -24,11 +25,15 @@ class PatcherAPI {
   late Directory _tmpDir;
   late File _keyStoreFile;
   List<Patch> _patches = [];
+  List<Patch> _universalPatches = [];
+  List<String> _compatiblePackages = [];
+  Map filteredPatches = <String, List<Patch>>{};
   File? _outFile;
 
   Future<void> initialize() async {
     await _loadPatches();
-    Directory appCache = await getTemporaryDirectory();
+    await _managerAPI.downloadIntegrations();
+    final Directory appCache = await getTemporaryDirectory();
     _dataDir = await getExternalStorageDirectory() ?? appCache;
     _tmpDir = Directory('${appCache.path}/patcher');
     _keyStoreFile = File('${_dataDir.path}/revanced-manager.keystore');
@@ -41,74 +46,112 @@ class PatcherAPI {
     }
   }
 
+  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();
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       _patches = List.empty();
     }
+
+    _compatiblePackages = getCompatiblePackages();
+    _universalPatches = getUniversalPatches();
   }
 
-  Future<List<ApplicationWithIcon>> getFilteredInstalledApps() async {
-    List<ApplicationWithIcon> filteredApps = [];
-    for (Patch patch in _patches) {
-      for (Package package in patch.compatiblePackages) {
-        try {
-          if (!filteredApps.any((app) => app.packageName == package.name)) {
-            ApplicationWithIcon? app = await DeviceApps.getApp(
-              package.name,
-              true,
-            ) as ApplicationWithIcon?;
-            if (app != null) {
-              filteredApps.add(app);
-            }
+  Future<List<ApplicationWithIcon>> getFilteredInstalledApps(
+    bool showUniversalPatches,
+  ) async {
+    final List<ApplicationWithIcon> filteredApps = [];
+    final bool allAppsIncluded =
+        _universalPatches.isNotEmpty &&
+            showUniversalPatches;
+    if (allAppsIncluded) {
+      final appList = await DeviceApps.getInstalledApplications(
+        includeAppIcons: true,
+        onlyAppsWithLaunchIntent: true,
+      );
+
+      for(final app in appList) {
+        filteredApps.add(app as ApplicationWithIcon);
+      }
+    }
+    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, s) {
-          await Sentry.captureException(e, stackTrace: s);
-          continue;
+        }
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
         }
       }
     }
     return filteredApps;
   }
 
-  Future<List<Patch>> getFilteredPatches(String packageName) async {
-    return _patches
-        .where((patch) =>
-            !patch.name.contains('settings') &&
-            patch.compatiblePackages.any((pack) => pack.name == packageName))
+  List<Patch> getFilteredPatches(String packageName) {
+    if (!_compatiblePackages.contains(packageName)) {
+      return _universalPatches;
+    }
+
+    final List<Patch> patches = _patches
+        .where(
+          (patch) =>
+              patch.compatiblePackages.isEmpty ||
+              !patch.name.contains('settings') &&
+                  patch.compatiblePackages
+                      .any((pack) => pack.name == packageName),
+        )
         .toList();
+    if (!_managerAPI.areUniversalPatchesEnabled()) {
+      filteredPatches[packageName] = patches
+          .where((patch) => patch.compatiblePackages.isNotEmpty)
+          .toList();
+    } else {
+      filteredPatches[packageName] = patches;
+    }
+    return filteredPatches[packageName];
   }
 
-  Future<List<Patch>> getAppliedPatches(List<String> appliedPatches) async {
+  Future<List<Patch>> getAppliedPatches(
+    List<String> appliedPatches,
+  ) async {
     return _patches
         .where((patch) => appliedPatches.contains(patch.name))
         .toList();
   }
 
-  bool dependencyNeedsIntegrations(String name) {
-    return name.contains('integrations') ||
-        _patches.any(
-          (patch) =>
-              patch.name == name &&
-              (patch.dependencies.any(
-                (dep) => dependencyNeedsIntegrations(dep),
-              )),
-        );
-  }
-
-  Future<bool> needsIntegrations(List<Patch> selectedPatches) async {
-    return selectedPatches.any(
-      (patch) => patch.dependencies.any(
-        (dep) => dependencyNeedsIntegrations(dep),
-      ),
-    );
-  }
-
-  Future<bool> needsResourcePatching(List<Patch> selectedPatches) async {
+  Future<bool> needsResourcePatching(
+    List<Patch> selectedPatches,
+  ) async {
     return selectedPatches.any(
       (patch) => patch.dependencies.any(
         (dep) => dep.contains('resource-'),
@@ -124,35 +167,15 @@ class PatcherAPI {
     );
   }
 
-  Future<String> getOriginalFilePath(
-    String packageName,
-    String originalFilePath,
-  ) async {
-    try {
-      bool hasRootPermissions = await _rootAPI.hasRootPermissions();
-      if (hasRootPermissions) {
-        originalFilePath = await _rootAPI.getOriginalFilePath(
-          packageName,
-          originalFilePath,
-        );
-      }
-      return originalFilePath;
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-      return originalFilePath;
-    }
-  }
-
   Future<void> runPatcher(
     String packageName,
-    String originalFilePath,
+    String apkFilePath,
     List<Patch> selectedPatches,
   ) async {
-    bool mergeIntegrations = await needsIntegrations(selectedPatches);
-    bool includeSettings = await needsSettingsPatch(selectedPatches);
+    final bool includeSettings = await needsSettingsPatch(selectedPatches);
     if (includeSettings) {
       try {
-        Patch? settingsPatch = _patches.firstWhereOrNull(
+        final Patch? settingsPatch = _patches.firstWhereOrNull(
           (patch) =>
               patch.name.contains('settings') &&
               patch.compatiblePackages.any((pack) => pack.name == packageName),
@@ -160,47 +183,54 @@ class PatcherAPI {
         if (settingsPatch != null) {
           selectedPatches.add(settingsPatch);
         }
-      } on Exception catch (e, s) {
-        await Sentry.captureException(e, stackTrace: s);
-        // ignore
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
+        }
       }
     }
-    File? patchBundleFile = await _managerAPI.downloadPatches();
-    File? integrationsFile;
-    if (mergeIntegrations) {
-      integrationsFile = await _managerAPI.downloadIntegrations();
-    }
+    final File? patchBundleFile = await _managerAPI.downloadPatches();
+    final File? integrationsFile = await _managerAPI.downloadIntegrations();
     if (patchBundleFile != null) {
       _dataDir.createSync();
       _tmpDir.createSync();
-      Directory workDir = _tmpDir.createTempSync('tmp-');
-      File inputFile = File('${workDir.path}/base.apk');
-      File patchedFile = File('${workDir.path}/patched.apk');
+      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');
-      Directory cacheDir = Directory('${workDir.path}/cache');
+      final Directory cacheDir = Directory('${workDir.path}/cache');
       cacheDir.createSync();
+      final String originalFilePath = apkFilePath;
       try {
         await patcherChannel.invokeMethod(
           'runPatcher',
           {
             'patchBundleFilePath': patchBundleFile.path,
-            'originalFilePath': await getOriginalFilePath(
-              packageName,
-              originalFilePath,
-            ),
+            'originalFilePath': originalFilePath,
             'inputFilePath': inputFile.path,
             'patchedFilePath': patchedFile.path,
             'outFilePath': _outFile!.path,
-            'integrationsPath': mergeIntegrations ? integrationsFile!.path : '',
+            'integrationsPath': integrationsFile!.path,
             'selectedPatches': selectedPatches.map((p) => p.name).toList(),
             'cacheDirPath': cacheDir.path,
-            'mergeIntegrations': mergeIntegrations,
             'keyStoreFilePath': _keyStoreFile.path,
+            'keystorePassword': _managerAPI.getKeystorePassword(),
           },
         );
-      } on Exception catch (e, s) {
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
+        }
+      }
+    }
+  }
+
+  Future<void> stopPatcher() async {
+    try {
+      await patcherChannel.invokeMethod('stopPatcher');
+    } on Exception catch (e) {
+      if (kDebugMode) {
         print(e);
-        throw await Sentry.captureException(e, stackTrace: s);
       }
     }
   }
@@ -209,7 +239,7 @@ class PatcherAPI {
     if (_outFile != null) {
       try {
         if (patchedApp.isRooted) {
-          bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+          final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
           if (hasRootPermissions) {
             return _rootAPI.installApp(
               patchedApp.packageName,
@@ -218,84 +248,89 @@ class PatcherAPI {
             );
           }
         } else {
-          await AppInstaller.installApk(_outFile!.path);
-          return await DeviceApps.isAppInstalled(patchedApp.packageName);
+          final install = await InstallPlugin.installApk(_outFile!.path);
+          return install['isSuccess'];
+        }
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
         }
-      } on Exception catch (e, s) {
-        await Sentry.captureException(e, stackTrace: s);
         return false;
       }
     }
     return false;
   }
 
-
   void exportPatchedFile(String appName, String version) {
     try {
       if (_outFile != null) {
-        String newName = _getFileName(appName, version);
-
-        // This is temporary workaround to populate initial file name
-        // ref: https://github.com/Cleveroad/cr_file_saver/issues/7
-        int lastSeparator = _outFile!.path.lastIndexOf('/');
-        String newSourcePath = _outFile!.path.substring(0, lastSeparator + 1) + newName;
-        _outFile!.copySync(newSourcePath);
-
-        CRFileSaver.saveFileWithDialog(SaveFileDialogParams(
-          sourceFilePath: newSourcePath,
-          destinationFileName: newName
-        ));
+        final String newName = _getFileName(appName, version);
+        CRFileSaver.saveFileWithDialog(
+          SaveFileDialogParams(
+            sourceFilePath: _outFile!.path,
+            destinationFileName: newName,
+          ),
+        );
+      }
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
       }
-    } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s);
     }
   }
 
   void sharePatchedFile(String appName, String version) {
     try {
       if (_outFile != null) {
-        String newName = _getFileName(appName, version);
-        int lastSeparator = _outFile!.path.lastIndexOf('/');
-        String newPath =
+        final String newName = _getFileName(appName, version);
+        final int lastSeparator = _outFile!.path.lastIndexOf('/');
+        final String newPath =
             _outFile!.path.substring(0, lastSeparator + 1) + newName;
-        File shareFile = _outFile!.copySync(newPath);
+        final File shareFile = _outFile!.copySync(newPath);
         ShareExtend.share(shareFile.path, 'file');
       }
-    } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
   String _getFileName(String appName, String version) {
-      String prefix = appName.toLowerCase().replaceAll(' ', '-');
-      String newName = '$prefix-revanced_v$version.apk';
-      return newName;
-
+    final String prefix = appName.toLowerCase().replaceAll(' ', '-');
+    final String newName = '$prefix-revanced_v$version.apk';
+    return newName;
   }
 
-  Future<void> sharePatcherLog(String logs) async {
-    Directory appCache = await getTemporaryDirectory();
-    Directory logDir = Directory('${appCache.path}/logs');
+  Future<void> exportPatcherLog(String logs) async {
+    final Directory appCache = await getTemporaryDirectory();
+    final Directory logDir = Directory('${appCache.path}/logs');
     logDir.createSync();
-    String dateTime = DateTime.now()
+    final String dateTime = DateTime.now()
         .toIso8601String()
         .replaceAll('-', '')
         .replaceAll(':', '')
         .replaceAll('T', '')
         .replaceAll('.', '');
-    File log = File('${logDir.path}/revanced-manager_patcher_$dateTime.log');
+    final String fileName = 'revanced-manager_patcher_$dateTime.log';
+    final File log = File('${logDir.path}/$fileName');
     log.writeAsStringSync(logs);
-    ShareExtend.share(log.path, 'file');
+    CRFileSaver.saveFileWithDialog(
+      SaveFileDialogParams(
+        sourceFilePath: log.path,
+        destinationFileName: fileName,
+      ),
+    );
   }
 
-  String getRecommendedVersion(String packageName) {
-    Map<String, int> versions = {};
-    for (Patch patch in _patches) {
-      Package? package = patch.compatiblePackages.firstWhereOrNull(
+  String getSuggestedVersion(String packageName) {
+    final Map<String, int> versions = {};
+    for (final Patch patch in _patches) {
+      final Package? package = patch.compatiblePackages.firstWhereOrNull(
         (pack) => pack.name == packageName,
       );
       if (package != null) {
-        for (String version in package.versions) {
+        for (final String version in package.versions) {
           versions.update(
             version,
             (value) => versions[version]! + 1,
@@ -305,7 +340,7 @@ class PatcherAPI {
       }
     }
     if (versions.isNotEmpty) {
-      var entries = versions.entries.toList()
+      final entries = versions.entries.toList()
         ..sort((a, b) => a.value.compareTo(b.value));
       versions
         ..clear()

lib/services/revanced_api.dart

@@ -1,99 +1,84 @@
+import 'dart:async';
 import 'dart:io';
+
 import 'package:collection/collection.dart';
-import 'package:native_dio_client/native_dio_client.dart';
 import 'package:dio/dio.dart';
-import 'package:dio_http_cache_lts/dio_http_cache_lts.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/models/patch.dart';
-import 'package:revanced_manager/utils/check_for_gms.dart';
 import 'package:timeago/timeago.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
-import 'package:sentry_dio/sentry_dio.dart';
 
 @lazySingleton
 class RevancedAPI {
   late Dio _dio = Dio();
-  final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
-  final Options _cacheOptions = buildCacheOptions(
-    const Duration(hours: 6),
+
+  final _cacheOptions = CacheOptions(
+    store: MemCacheStore(),
     maxStale: const Duration(days: 1),
+    priority: CachePriority.high,
   );
 
   Future<void> initialize(String apiUrl) async {
     try {
-      bool isGMSInstalled = await checkForGMS();
-
-      if (!isGMSInstalled) {
-        _dio = Dio(BaseOptions(
+      _dio = Dio(
+        BaseOptions(
           baseUrl: apiUrl,
-        ));
-        print('ReVanced API: Using default engine + $isGMSInstalled');
-      } else {
-        _dio = Dio(BaseOptions(
-          baseUrl: apiUrl,
-        ))
-          ..httpClientAdapter = NativeAdapter();
-        print('ReVanced API: Using CronetEngine + $isGMSInstalled');
-      }
-      _dio.interceptors.add(_dioCacheManager.interceptor);
-      _dio.addSentry(
-        captureFailedRequests: true,
+        ),
       );
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+
+      _dio.interceptors.add(DioCacheInterceptor(options: _cacheOptions));
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
   Future<void> clearAllCache() async {
     try {
-      await _dioCacheManager.clearAll();
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+      await _cacheOptions.store!.clean();
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
   Future<Map<String, List<dynamic>>> getContributors() async {
-    Map<String, List<dynamic>> contributors = {};
+    final Map<String, List<dynamic>> contributors = {};
     try {
-      var response = await _dio.get('/contributors', options: _cacheOptions);
-      List<dynamic> repositories = response.data['repositories'];
-      for (Map<String, dynamic> repo in repositories) {
-        String name = repo['name'];
+      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'];
         contributors[name] = repo['contributors'];
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return {};
     }
     return contributors;
   }
 
-  Future<List<Patch>> getPatches() async {
-    try {
-      var response = await _dio.get('/patches', options: _cacheOptions);
-      List<dynamic> patches = response.data;
-      return patches.map((patch) => Patch.fromJson(patch)).toList();
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-      return List.empty();
-    }
-  }
-
   Future<Map<String, dynamic>?> _getLatestRelease(
     String extension,
     String repoName,
   ) async {
     try {
-      var response = await _dio.get('/tools', options: _cacheOptions);
-      List<dynamic> tools = response.data['tools'];
+      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, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return null;
     }
   }
@@ -103,52 +88,101 @@ class RevancedAPI {
     String repoName,
   ) async {
     try {
-      Map<String, dynamic>? release = await _getLatestRelease(
+      final Map<String, dynamic>? release = await _getLatestRelease(
         extension,
         repoName,
       );
       if (release != null) {
         return release['version'];
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return null;
     }
     return null;
   }
 
-  Future<File?> getLatestReleaseFile(String extension, String repoName) async {
+  Future<File?> getLatestReleaseFile(
+    String extension,
+    String repoName,
+  ) async {
     try {
-      Map<String, dynamic>? release = await _getLatestRelease(
+      final Map<String, dynamic>? release = await _getLatestRelease(
         extension,
         repoName,
       );
       if (release != null) {
-        String url = release['browser_download_url'];
+        final String url = release['browser_download_url'];
         return await DefaultCacheManager().getSingleFile(url);
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return null;
     }
     return null;
   }
 
+  StreamController<double> managerUpdateProgress =
+      StreamController<double>.broadcast();
+
+  void updateManagerDownloadProgress(int progress) {
+    managerUpdateProgress.add(progress.toDouble());
+  }
+
+  Stream<double> getManagerUpdateProgress() {
+    return managerUpdateProgress.stream;
+  }
+
+  void disposeManagerUpdateProgress() {
+    managerUpdateProgress.close();
+  }
+
+  Future<File?> downloadManager() async {
+    final Map<String, dynamic>? release = await _getLatestRelease(
+      '.apk',
+      'revanced/revanced-manager',
+    );
+    File? outputFile;
+    await for (final result in DefaultCacheManager().getFileStream(
+      release!['browser_download_url'] as String,
+      withProgress: true,
+    )) {
+      if (result is DownloadProgress) {
+        final totalSize = result.totalSize ?? 10000000;
+        final progress = (result.downloaded / totalSize * 100).round();
+
+        updateManagerDownloadProgress(progress);
+      } else if (result is FileInfo) {
+        disposeManagerUpdateProgress();
+        // The download is complete; convert the FileInfo object to a File object
+        outputFile = File(result.file.path);
+      }
+    }
+    return outputFile;
+  }
+
   Future<String?> getLatestReleaseTime(
     String extension,
     String repoName,
   ) async {
     try {
-      Map<String, dynamic>? release = await _getLatestRelease(
+      final Map<String, dynamic>? release = await _getLatestRelease(
         extension,
         repoName,
       );
       if (release != null) {
-        DateTime timestamp = DateTime.parse(release['timestamp'] as String);
+        final DateTime timestamp =
+            DateTime.parse(release['timestamp'] as String);
         return format(timestamp, locale: 'en_short');
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return null;
     }
     return null;

lib/services/root_api.dart

@@ -1,17 +1,21 @@
+import 'package:flutter/foundation.dart';
 import 'package:root/root.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
 
 class RootAPI {
-  final String _managerDirPath = '/data/local/tmp/revanced-manager';
+  // 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 {
     try {
-      bool? isRooted = await Root.isRootAvailable();
+      final bool? isRooted = await Root.isRootAvailable();
       return isRooted != null && isRooted;
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return false;
     }
   }
@@ -24,8 +28,10 @@ class RootAPI {
         return isRooted != null && isRooted;
       }
       return false;
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return false;
     }
   }
@@ -36,53 +42,62 @@ class RootAPI {
     seLinux,
     String filePath,
   ) async {
-    if (permissions.isNotEmpty) {
-      await Root.exec(
-        cmd: 'chmod $permissions "$filePath"',
-      );
-    }
-    if (ownerGroup.isNotEmpty) {
-      await Root.exec(
-        cmd: 'chown $ownerGroup "$filePath"',
-      );
-    }
-    if (seLinux.isNotEmpty) {
-      await Root.exec(
-        cmd: 'chcon $seLinux "$filePath"',
-      );
+    try {
+      if (permissions.isNotEmpty) {
+        await Root.exec(
+          cmd: 'chmod $permissions "$filePath"',
+        );
+      }
+      if (ownerGroup.isNotEmpty) {
+        await Root.exec(
+          cmd: 'chown $ownerGroup "$filePath"',
+        );
+      }
+      if (seLinux.isNotEmpty) {
+        await Root.exec(
+          cmd: 'chcon $seLinux "$filePath"',
+        );
+      }
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
   Future<bool> isAppInstalled(String packageName) async {
     if (packageName.isNotEmpty) {
-      String? res = await Root.exec(
-        cmd: 'ls "$_managerDirPath/$packageName"',
-      );
-      if (res != null && res.isNotEmpty) {
-        res = await Root.exec(
-          cmd: 'ls "$_serviceDDirPath/$packageName.sh"',
-        );
-        return res != null && res.isNotEmpty;
-      }
+      return fileExists('$_serviceDDirPath/$packageName.sh');
     }
     return false;
   }
 
   Future<List<String>> getInstalledApps() async {
+    final List<String> apps = List.empty(growable: true);
     try {
       String? res = await Root.exec(
-        cmd: 'ls "$_managerDirPath"',
+        cmd: 'ls "$_revancedDirPath"',
       );
       if (res != null) {
-        List<String> apps = res.split('\n');
-        apps.removeWhere((pack) => pack.isEmpty);
-        return apps.map((pack) => pack.trim()).toList();
+        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"',
+      );
+      if (res != null) {
+        final List<String> list = res.split('\n');
+        list.removeWhere((pack) => pack.isEmpty);
+        apps.addAll(list.map((pack) => pack.trim()).toList());
+      }
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-      return List.empty();
     }
-    return List.empty();
+    return apps;
   }
 
   Future<void> deleteApp(String packageName, String originalFilePath) async {
@@ -92,8 +107,12 @@ class RootAPI {
     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 "$_managerDirPath/$packageName"',
+      cmd: 'rm -rf "$_revancedOldDirPath/$packageName"',
+    );
+    await Root.exec(
+      cmd: 'rm -rf "$_revancedDirPath/$packageName"',
     );
     await Root.exec(
       cmd: 'rm -rf "$_serviceDDirPath/$packageName.sh"',
@@ -111,13 +130,13 @@ class RootAPI {
     try {
       await deleteApp(packageName, originalFilePath);
       await Root.exec(
-        cmd: 'mkdir -p "$_managerDirPath/$packageName"',
+        cmd: 'mkdir -p "$_revancedDirPath/$packageName"',
       );
       await setPermissions(
         '0755',
         'shell:shell',
         '',
-        '$_managerDirPath/$packageName',
+        '$_revancedDirPath/$packageName',
       );
       await saveOriginalFilePath(packageName, originalFilePath);
       await installServiceDScript(packageName);
@@ -125,19 +144,24 @@ class RootAPI {
       await installApk(packageName, patchedFilePath);
       await mountApk(packageName, originalFilePath);
       return true;
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return false;
     }
   }
 
   Future<void> installServiceDScript(String packageName) async {
-    String content = '#!/system/bin/sh\n'
+    await Root.exec(
+      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=$_managerDirPath/$packageName/base.apk\n'
+        'base_path=$_revancedDirPath/$packageName/base.apk\n'
         'stock_path=\$(pm path $packageName | grep base | sed \'"\'"\'s/package://g\'"\'"\')\n'
-        '[ ! -z \$stock_path ] && mount -o bind \$base_path \$stock_path';
-    String scriptFilePath = '$_serviceDDirPath/$packageName.sh';
+        r'[ ! -z $stock_path ] && mount -o bind $base_path $stock_path';
+    final String scriptFilePath = '$_serviceDDirPath/$packageName.sh';
     await Root.exec(
       cmd: 'echo \'$content\' > "$scriptFilePath"',
     );
@@ -145,10 +169,13 @@ class RootAPI {
   }
 
   Future<void> installPostFsDataScript(String packageName) async {
-    String content = '#!/system/bin/sh\n'
+    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'
-        '[ ! -z \$stock_path ] && umount -l \$stock_path';
-    String scriptFilePath = '$_postFsDataDirPath/$packageName.sh';
+        r'[ ! -z $stock_path ] && umount -l $stock_path';
+    final String scriptFilePath = '$_postFsDataDirPath/$packageName.sh';
     await Root.exec(
       cmd: 'echo \'$content\' > "$scriptFilePath"',
     );
@@ -156,7 +183,7 @@ class RootAPI {
   }
 
   Future<void> installApk(String packageName, String patchedFilePath) async {
-    String newPatchedFilePath = '$_managerDirPath/$packageName/base.apk';
+    final String newPatchedFilePath = '$_revancedDirPath/$packageName/base.apk';
     await Root.exec(
       cmd: 'cp "$patchedFilePath" "$newPatchedFilePath"',
     );
@@ -169,7 +196,7 @@ class RootAPI {
   }
 
   Future<void> mountApk(String packageName, String originalFilePath) async {
-    String newPatchedFilePath = '$_managerDirPath/$packageName/base.apk';
+    final String newPatchedFilePath = '$_revancedDirPath/$packageName/base.apk';
     await Root.exec(
       cmd: 'am force-stop "$packageName"',
     );
@@ -182,42 +209,26 @@ class RootAPI {
   }
 
   Future<bool> isMounted(String packageName) async {
-    String? res = await Root.exec(
+    final String? res = await Root.exec(
       cmd: 'cat /proc/mounts | grep $packageName',
     );
     return res != null && res.isNotEmpty;
   }
 
-  Future<String> getOriginalFilePath(
-    String packageName,
-    String originalFilePath,
-  ) async {
-    bool isInstalled = await isAppInstalled(packageName);
-    if (isInstalled && await isMounted(packageName)) {
-      originalFilePath = '$_managerDirPath/$packageName/original.apk';
-      await setPermissions(
-        '0644',
-        'shell:shell',
-        'u:object_r:apk_data_file:s0',
-        originalFilePath,
-      );
-    }
-    return originalFilePath;
-  }
-
   Future<void> saveOriginalFilePath(
     String packageName,
     String originalFilePath,
   ) async {
-    String originalRootPath = '$_managerDirPath/$packageName/original.apk';
+    final String originalRootPath =
+        '$_revancedDirPath/$packageName/original.apk';
     await Root.exec(
-      cmd: 'mkdir -p "$_managerDirPath/$packageName"',
+      cmd: 'mkdir -p "$_revancedDirPath/$packageName"',
     );
     await setPermissions(
       '0755',
       'shell:shell',
       '',
-      '$_managerDirPath/$packageName',
+      '$_revancedDirPath/$packageName',
     );
     await Root.exec(
       cmd: 'cp "$originalFilePath" "$originalRootPath"',
@@ -229,4 +240,18 @@ class RootAPI {
       originalFilePath,
     );
   }
+
+  Future<bool> fileExists(String path) async {
+    try {
+      final String? res = await Root.exec(
+        cmd: 'ls $path',
+      );
+      return res != null && res.isNotEmpty;
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+      return false;
+    }
+  }
 }

lib/theme.dart

@@ -3,7 +3,6 @@ import 'package:google_fonts/google_fonts.dart';
 
 var lightCustomColorScheme = ColorScheme.fromSeed(
   seedColor: Colors.blue,
-  brightness: Brightness.light,
   primary: const Color(0xff1B73E8),
 );
 
@@ -13,7 +12,7 @@ var lightCustomTheme = ThemeData(
   navigationBarTheme: NavigationBarThemeData(
     labelTextStyle: MaterialStateProperty.all(
       TextStyle(
-        color: lightCustomColorScheme.secondary,
+        color: lightCustomColorScheme.onSurface,
         fontWeight: FontWeight.w500,
       ),
     ),
@@ -34,13 +33,12 @@ var darkCustomTheme = ThemeData(
   navigationBarTheme: NavigationBarThemeData(
     labelTextStyle: MaterialStateProperty.all(
       TextStyle(
-        color: darkCustomColorScheme.secondary,
+        color: darkCustomColorScheme.onSurface,
         fontWeight: FontWeight.w500,
       ),
     ),
   ),
   canvasColor: const Color(0xff1B1A1D),
   scaffoldBackgroundColor: const Color(0xff1B1A1D),
-  toggleableActiveColor: const Color(0xffA5CAFF),
   textTheme: GoogleFonts.robotoTextTheme(ThemeData.dark().textTheme),
 );

lib/ui/theme/dynamic_theme_builder.dart

@@ -1,94 +1,114 @@
+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 {
-  final String title;
-  final Widget home;
-  final Iterable<LocalizationsDelegate> localizationsDelegates;
-
+class DynamicThemeBuilder extends StatefulWidget {
   const DynamicThemeBuilder({
     Key? 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(
       builder: (lightColorScheme, darkColorScheme) {
-        ThemeData lightDynamicTheme = ThemeData(
+        final ThemeData lightDynamicTheme = ThemeData(
           useMaterial3: true,
-          canvasColor: lightColorScheme?.background,
           navigationBarTheme: NavigationBarThemeData(
-            backgroundColor: lightColorScheme?.background,
-            indicatorColor: lightColorScheme?.primary.withAlpha(150),
             labelTextStyle: MaterialStateProperty.all(
               GoogleFonts.roboto(
-                color: lightColorScheme?.secondary,
+                color: lightColorScheme?.onSurface,
                 fontWeight: FontWeight.w500,
               ),
             ),
-            iconTheme: MaterialStateProperty.all(
-              IconThemeData(
-                color: lightColorScheme?.secondary,
-              ),
-            ),
           ),
-          scaffoldBackgroundColor: lightColorScheme?.background,
           colorScheme: lightColorScheme?.harmonized(),
-          toggleableActiveColor: lightColorScheme?.primary,
           textTheme: GoogleFonts.robotoTextTheme(ThemeData.light().textTheme),
         );
-        ThemeData darkDynamicTheme = ThemeData(
+        final ThemeData darkDynamicTheme = ThemeData(
           useMaterial3: true,
-          canvasColor: darkColorScheme?.background,
           navigationBarTheme: NavigationBarThemeData(
-            backgroundColor: darkColorScheme?.background,
-            indicatorColor: darkColorScheme?.primary.withOpacity(0.4),
             labelTextStyle: MaterialStateProperty.all(
               GoogleFonts.roboto(
-                color: darkColorScheme?.secondary,
+                color: darkColorScheme?.onSurface,
                 fontWeight: FontWeight.w500,
               ),
             ),
-            iconTheme: MaterialStateProperty.all(
-              IconThemeData(
-                color: darkColorScheme?.secondary,
-              ),
-            ),
           ),
-          scaffoldBackgroundColor: darkColorScheme?.background,
           colorScheme: darkColorScheme?.harmonized(),
-          toggleableActiveColor: darkColorScheme?.primary,
           textTheme: GoogleFonts.robotoTextTheme(ThemeData.dark().textTheme),
         );
         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,
-            navigatorKey: StackedService.navigatorKey,
-            onGenerateRoute: StackedRouter().onGenerateRoute,
-            theme: theme,
-            home: home,
-            localizationsDelegates: localizationsDelegates,
-          ),
+                debugShowCheckedModeBanner: false,
+                title: widget.title,
+                navigatorKey: StackedService.navigatorKey,
+                onGenerateRoute: StackedRouter().onGenerateRoute,
+                theme: theme,
+                home: widget.home,
+                localizationsDelegates: widget.localizationsDelegates,
+              ),
         );
       },
     );
   }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
 }

lib/ui/views/app_selector/app_selector_view.dart

@@ -1,10 +1,11 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide SearchBar;
 import 'package:flutter_i18n/flutter_i18n.dart';
-import 'package:revanced_manager/ui/widgets/appSelectorView/installed_app_item.dart';
-import 'package:revanced_manager/ui/widgets/shared/search_bar.dart';
-import 'package:revanced_manager/ui/widgets/appSelectorView/app_skeleton_loader.dart';
-import 'package:stacked/stacked.dart' hide SkeletonLoader;
 import 'package:revanced_manager/ui/views/app_selector/app_selector_viewmodel.dart';
+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/search_bar.dart';
+import 'package:stacked/stacked.dart' hide SkeletonLoader;
 
 class AppSelectorView extends StatefulWidget {
   const AppSelectorView({Key? key}) : super(key: key);
@@ -19,7 +20,7 @@ class _AppSelectorViewState extends State<AppSelectorView> {
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<AppSelectorViewModel>.reactive(
-      onModelReady: (model) => model.initialize(),
+      onViewModelReady: (model) => model.initialize(),
       viewModelBuilder: () => AppSelectorViewModel(),
       builder: (context, model, child) => Scaffold(
         resizeToAvoidBottomInset: false,
@@ -36,20 +37,19 @@ class _AppSelectorViewState extends State<AppSelectorView> {
             SliverAppBar(
               pinned: true,
               floating: true,
-              snap: false,
               title: I18nText(
                 'appSelectorView.viewTitle',
                 child: Text(
                   '',
                   style: TextStyle(
-                    color: Theme.of(context).textTheme.headline6!.color,
+                    color: Theme.of(context).textTheme.titleLarge!.color,
                   ),
                 ),
               ),
               leading: IconButton(
                 icon: Icon(
                   Icons.arrow_back,
-                  color: Theme.of(context).textTheme.headline6!.color,
+                  color: Theme.of(context).textTheme.titleLarge!.color,
                 ),
                 onPressed: () => Navigator.of(context).pop(),
               ),
@@ -61,7 +61,6 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                     horizontal: 12.0,
                   ),
                   child: SearchBar(
-                    showSelectIcon: false,
                     hintText: FlutterI18n.translate(
                       context,
                       'appSelectorView.searchBarHint',
@@ -78,26 +77,64 @@ class _AppSelectorViewState extends State<AppSelectorView> {
             SliverToBoxAdapter(
               child: model.noApps
                   ? Center(
-                      child: I18nText('appSelectorCard.noAppsLabel'),
+                      child: I18nText(
+                        'appSelectorCard.noAppsLabel',
+                        child: Text(
+                          '',
+                          style: TextStyle(
+                            color:
+                                Theme.of(context).textTheme.titleLarge!.color,
+                          ),
+                        ),
+                      ),
                     )
-                  : model.apps.isEmpty
+                  : model.allApps.isEmpty
                       ? const AppSkeletonLoader()
                       : Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 12.0)
-                              .copyWith(bottom: 80),
+                              .copyWith(
+                            bottom:
+                                MediaQuery.viewPaddingOf(context).bottom + 8.0,
+                          ),
                           child: Column(
-                            children: model
-                                .getFilteredApps(_query)
-                                .map((app) => InstalledAppItem(
+                            children: [
+                              ...model
+                                  .getFilteredApps(_query)
+                                  .map(
+                                    (app) => InstalledAppItem(
                                       name: app.appName,
                                       pkgName: app.packageName,
                                       icon: app.icon,
+                                      patchesCount:
+                                          model.patchesCount(app.packageName),
+                                      suggestedVersion:
+                                          model.getSuggestedVersion(
+                                        app.packageName,
+                                      ),
+                                      installedVersion: app.versionName!,
+                                      onTap: () => model.canSelectInstalled(
+                                        context,
+                                        app.packageName,
+                                      ),
+                                    ),
+                                  )
+                                  .toList(),
+                              ...model
+                                  .getFilteredAppsNames(_query)
+                                  .map(
+                                    (app) => NotInstalledAppItem(
+                                      name: app,
+                                      patchesCount: model.patchesCount(app),
+                                      suggestedVersion:
+                                          model.getSuggestedVersion(app),
                                       onTap: () {
-                                        model.selectApp(app);
-                                        Navigator.of(context).pop();
+                                        model.showDownloadToast();
                                       },
-                                    ))
-                                .toList(),
+                                    ),
+                                  )
+                                  .toList(),
+                              const SizedBox(height: 70.0),
+                            ],
                           ),
                         ),
             ),

lib/ui/views/app_selector/app_selector_viewmodel.dart

@@ -1,30 +1,75 @@
 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_i18n/flutter_i18n.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/patcher_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
 
 class AppSelectorViewModel extends BaseViewModel {
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
+  final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final Toast _toast = locator<Toast>();
   final List<ApplicationWithIcon> apps = [];
+  List<String> allApps = [];
   bool noApps = false;
+  bool isRooted = false;
+  int patchesCount(String packageName) {
+    return _patcherAPI.getFilteredPatches(packageName).length;
+  }
+
+  List<Patch> patches = [];
 
   Future<void> initialize() async {
-    apps.addAll(await _patcherAPI.getFilteredInstalledApps());
-    apps.sort((a, b) => a.appName.compareTo(b.appName));
-    noApps = apps.isEmpty;
+    patches = await _managerAPI.getPatches();
+    isRooted = _managerAPI.isRooted;
+
+    apps.addAll(
+      await _patcherAPI
+          .getFilteredInstalledApps(_managerAPI.areUniversalPatchesEnabled()),
+    );
+    apps.sort(
+      (a, b) => _patcherAPI
+          .getFilteredPatches(b.packageName)
+          .length
+          .compareTo(_patcherAPI.getFilteredPatches(a.packageName).length),
+    );
+    getAllApps();
     notifyListeners();
   }
 
-  void selectApp(ApplicationWithIcon application) async {
+  List<String> getAllApps() {
+    allApps = patches
+        .expand((e) => e.compatiblePackages.map((p) => p.name))
+        .toSet()
+        .where((name) => !apps.any((app) => app.packageName == name))
+        .toList();
+    noApps = allApps.isEmpty;
+    return allApps;
+  }
+
+  String getSuggestedVersion(String packageName) {
+    return _patcherAPI.getSuggestedVersion(packageName);
+  }
+
+  Future<bool> checkSplitApk(String packageName) async {
+    final app = await DeviceApps.getApp(packageName);
+    if (app != null) {
+      return app.isSplit;
+    }
+    return true;
+  }
+
+  Future<void> selectApp(ApplicationWithIcon application) async {
     locator<PatcherViewModel>().selectedApp = PatchedApplication(
       name: application.appName,
       packageName: application.packageName,
@@ -35,27 +80,121 @@ class AppSelectorViewModel extends BaseViewModel {
       patchDate: DateTime.now(),
     );
     locator<PatcherViewModel>().loadLastSelectedPatches();
-    locator<PatcherViewModel>().notifyListeners();
+  }
+
+  Future<void> canSelectInstalled(
+    BuildContext context,
+    String packageName,
+  ) async {
+    final app =
+        await DeviceApps.getApp(packageName, true) as ApplicationWithIcon?;
+    if (app != null) {
+      if (await checkSplitApk(packageName) && !isRooted) {
+        if (context.mounted) {
+          return showSelectFromStorageDialog(context);
+        }
+      } else if (!await checkSplitApk(packageName) || isRooted) {
+        selectApp(app);
+        if (context.mounted) {
+          Navigator.pop(context);
+        }
+      }
+    }
+  }
+
+  Future showSelectFromStorageDialog(BuildContext context) async {
+    return showDialog(
+      context: context,
+      builder: (context) => SimpleDialog(
+        alignment: Alignment.center,
+        contentPadding:
+            const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
+        children: [
+          const SizedBox(height: 10),
+          Icon(
+            Icons.block,
+            size: 28,
+            color: Theme.of(context).colorScheme.primary,
+          ),
+          const SizedBox(height: 20),
+          I18nText(
+            'appSelectorView.featureNotAvailable',
+            child: const Text(
+              '',
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w600,
+                wordSpacing: 1.5,
+              ),
+            ),
+          ),
+          const SizedBox(height: 20),
+          I18nText(
+            'appSelectorView.featureNotAvailableText',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 14,
+              ),
+            ),
+          ),
+          const SizedBox(height: 30),
+          CustomMaterialButton(
+            onPressed: () => selectAppFromStorage(context).then(
+              (_) {
+                Navigator.pop(context);
+                Navigator.pop(context);
+              },
+            ),
+            label: Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                const Icon(Icons.sd_card),
+                const SizedBox(width: 10),
+                I18nText('appSelectorView.selectFromStorageButton'),
+              ],
+            ),
+          ),
+          const SizedBox(height: 10),
+          CustomMaterialButton(
+            isFilled: false,
+            onPressed: () {
+              Navigator.pop(context);
+            },
+            label: Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                const SizedBox(width: 10),
+                I18nText('cancelButton'),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
   }
 
   Future<void> selectAppFromStorage(BuildContext context) async {
     try {
-      FilePickerResult? result = await FilePicker.platform.pickFiles(
+      final FilePickerResult? result = await FilePicker.platform.pickFiles(
         type: FileType.custom,
         allowedExtensions: ['apk'],
       );
       if (result != null && result.files.single.path != null) {
-        File apkFile = File(result.files.single.path!);
-        List<String> pathSplit = result.files.single.path!.split("/");
+        final File apkFile = File(result.files.single.path!);
+        final List<String> pathSplit = result.files.single.path!.split('/');
         pathSplit.removeLast();
-        Directory filePickerCacheDir = Directory(pathSplit.join("/"));
-        Iterable<File> deletableFiles =
+        final Directory filePickerCacheDir = Directory(pathSplit.join('/'));
+        final Iterable<File> deletableFiles =
             (await filePickerCacheDir.list().toList()).whereType<File>();
-        for (var file in deletableFiles) {
-          if (file.path != apkFile.path && file.path.endsWith(".apk"))
+        for (final file in deletableFiles) {
+          if (file.path != apkFile.path && file.path.endsWith('.apk')) {
             file.delete();
+          }
         }
-        ApplicationWithIcon? application = await DeviceApps.getAppFromStorage(
+        final ApplicationWithIcon? application =
+            await DeviceApps.getAppFromStorage(
           apkFile.path,
           true,
         ) as ApplicationWithIcon?;
@@ -71,21 +210,38 @@ class AppSelectorViewModel extends BaseViewModel {
             isFromStorage: true,
           );
           locator<PatcherViewModel>().loadLastSelectedPatches();
-          locator<PatcherViewModel>().notifyListeners();
         }
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       _toast.showBottom('appSelectorView.errorMessage');
     }
   }
 
   List<ApplicationWithIcon> getFilteredApps(String query) {
     return apps
-        .where((app) =>
-            query.isEmpty ||
-            query.length < 2 ||
-            app.appName.toLowerCase().contains(query.toLowerCase()))
+        .where(
+          (app) =>
+              query.isEmpty ||
+              query.length < 2 ||
+              app.appName.toLowerCase().contains(query.toLowerCase()),
+        )
         .toList();
   }
+
+  List<String> getFilteredAppsNames(String query) {
+    return allApps
+        .where(
+          (app) =>
+              query.isEmpty ||
+              query.length < 2 ||
+              app.toLowerCase().contains(query.toLowerCase()),
+        )
+        .toList();
+  }
+
+  void showDownloadToast() =>
+      _toast.showBottom('appSelectorView.downloadToast');
 }

lib/ui/views/contributors/contributors_view.dart

@@ -13,7 +13,7 @@ class ContributorsView extends StatelessWidget {
   Widget build(BuildContext context) {
     return ViewModelBuilder<ContributorsViewModel>.reactive(
       viewModelBuilder: () => ContributorsViewModel(),
-      onModelReady: (model) => model.getContributors(),
+      onViewModelReady: (model) => model.getContributors(),
       builder: (context, model, child) => Scaffold(
         body: CustomScrollView(
           slivers: <Widget>[
@@ -23,7 +23,7 @@ class ContributorsView extends StatelessWidget {
                 child: Text(
                   '',
                   style: GoogleFonts.inter(
-                    color: Theme.of(context).textTheme.headline6!.color,
+                    color: Theme.of(context).textTheme.titleLarge!.color,
                   ),
                 ),
               ),
@@ -57,6 +57,7 @@ class ContributorsView extends StatelessWidget {
                       title: 'contributorsView.managerContributors',
                       contributors: model.managerContributors,
                     ),
+                    SizedBox(height: MediaQuery.viewPaddingOf(context).bottom),
                   ],
                 ),
               ),

lib/ui/views/contributors/contributors_viewmodel.dart

@@ -11,7 +11,7 @@ class ContributorsViewModel extends BaseViewModel {
   List<dynamic> managerContributors = [];
 
   Future<void> getContributors() async {
-    Map<String, List<dynamic>> contributors =
+    final Map<String, List<dynamic>> contributors =
         await _managerAPI.getContributors();
     patcherContributors = contributors[_managerAPI.defaultPatcherRepo] ?? [];
     patchesContributors = contributors[_managerAPI.getPatchesRepo()] ?? [];

lib/ui/views/home/home_view.dart

@@ -1,13 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:animations/animations.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/homeView/available_updates_card.dart';
 import 'package:revanced_manager/ui/widgets/homeView/installed_apps_card.dart';
 import 'package:revanced_manager/ui/widgets/homeView/latest_commit_card.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_chip.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
@@ -18,12 +15,11 @@ class HomeView extends StatelessWidget {
   Widget build(BuildContext context) {
     return ViewModelBuilder<HomeViewModel>.reactive(
       disposeViewModel: false,
-      onModelReady: (model) => model.initialize(context),
+      fireOnViewModelReadyOnce: true,
+      onViewModelReady: (model) => model.initialize(context),
       viewModelBuilder: () => locator<HomeViewModel>(),
       builder: (context, model, child) => Scaffold(
         body: RefreshIndicator(
-          color: Theme.of(context).colorScheme.secondary,
-          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
           onRefresh: () => model.forceRefresh(context),
           child: CustomScrollView(
             slivers: <Widget>[
@@ -34,7 +30,7 @@ class HomeView extends StatelessWidget {
                   child: Text(
                     '',
                     style: GoogleFonts.inter(
-                      color: Theme.of(context).textTheme.headline6!.color,
+                      color: Theme.of(context).textTheme.titleLarge!.color,
                     ),
                   ),
                 ),
@@ -48,63 +44,21 @@ class HomeView extends StatelessWidget {
                         'homeView.updatesSubtitle',
                         child: Text(
                           '',
-                          style: Theme.of(context).textTheme.headline6!,
+                          style: Theme.of(context).textTheme.titleLarge,
                         ),
                       ),
                       const SizedBox(height: 10),
-                      LatestCommitCard(
-                        onPressed: () =>
-                            model.showUpdateConfirmationDialog(context),
-                      ),
+                      LatestCommitCard(model: model, parentContext: context),
                       const SizedBox(height: 23),
                       I18nText(
                         'homeView.patchedSubtitle',
                         child: Text(
                           '',
-                          style: Theme.of(context).textTheme.headline6!,
+                          style: Theme.of(context).textTheme.titleLarge,
                         ),
                       ),
-                      const SizedBox(height: 8),
-                      Row(
-                        children: <Widget>[
-                          CustomChip(
-                            label: I18nText('homeView.installed'),
-                            isSelected: !model.showUpdatableApps,
-                            onSelected: (value) {
-                              model.toggleUpdatableApps(false);
-                            },
-                          ),
-                          const SizedBox(width: 10),
-                          CustomChip(
-                            label: I18nText('homeView.updatesAvailable'),
-                            isSelected: model.showUpdatableApps,
-                            onSelected: (value) {
-                              model.toggleUpdatableApps(true);
-                            },
-                          )
-                        ],
-                      ),
-                      const SizedBox(height: 14),
-                      PageTransitionSwitcher(
-                        transitionBuilder:
-                            (child, primaryAnimation, secondaryAnimation) {
-                          return FadeThroughTransition(
-                            animation: primaryAnimation,
-                            secondaryAnimation: secondaryAnimation,
-                            fillColor: Colors.transparent,
-                            child: child,
-                          );
-                        },
-                        layoutBuilder: (entries) {
-                          return Stack(
-                            alignment: Alignment.topCenter,
-                            children: entries,
-                          );
-                        },
-                        child: model.showUpdatableApps
-                            ? AvailableUpdatesCard()
-                            : InstalledAppsCard(),
-                      ),
+                      const SizedBox(height: 10),
+                      InstalledAppsCard(),
                     ],
                   ),
                 ),

lib/ui/views/home/home_viewmodel.dart

@@ -1,54 +1,87 @@
 // ignore_for_file: use_build_context_synchronously
+import 'dart:async';
 import 'dart:io';
-import 'package:app_installer/app_installer.dart';
 import 'package:cross_connectivity/cross_connectivity.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_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';
 import 'package:revanced_manager/models/patched_application.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';
+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:sentry_flutter/sentry_flutter.dart';
 import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
-import 'package:timezone/timezone.dart' as tz;
 
 @lazySingleton
 class HomeViewModel extends BaseViewModel {
   final NavigationService _navigationService = locator<NavigationService>();
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
+  final GithubAPI _githubAPI = locator<GithubAPI>();
+  final RevancedAPI _revancedAPI = locator<RevancedAPI>();
   final Toast _toast = locator<Toast>();
   final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
   DateTime? _lastUpdate;
   bool showUpdatableApps = false;
   List<PatchedApplication> patchedInstalledApps = [];
   List<PatchedApplication> patchedUpdatableApps = [];
+  String? _latestManagerVersion = '';
+  File? downloadedApk;
 
   Future<void> initialize(BuildContext context) async {
+    _latestManagerVersion = await _managerAPI.getLatestManagerVersion();
+    if (!_managerAPI.getPatchesConsent()) {
+      await showPatchesConsent(context);
+    }
+    await _patcherAPI.initialize();
     await flutterLocalNotificationsPlugin.initialize(
       const InitializationSettings(
         android: AndroidInitializationSettings('ic_notification'),
       ),
-      onSelectNotification: (p) =>
-          DeviceApps.openApp('app.revanced.manager.flutter'),
+      onDidReceiveNotificationResponse: (response) async {
+        if (response.id == 0) {
+          _toast.showBottom('homeView.installingMessage');
+          final File? managerApk = await _managerAPI.downloadManager();
+          if (managerApk != null) {
+            await InstallPlugin.installApk(managerApk.path);
+          } else {
+            _toast.showBottom('homeView.errorDownloadMessage');
+          }
+        }
+      },
     );
     flutterLocalNotificationsPlugin
         .resolvePlatformSpecificImplementation<
             AndroidFlutterLocalNotificationsPlugin>()
         ?.requestPermission();
-    bool isConnected = await Connectivity().checkConnection();
+    final bool isConnected = await Connectivity().checkConnection();
     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);
+      } else {
+        _toast.showBottom('homeView.errorDownloadMessage');
+      }
+    }
     _getPatchedApps();
     _managerAPI.reAssessSavedApps().then((_) => _getPatchedApps());
   }
@@ -65,7 +98,7 @@ class HomeViewModel extends BaseViewModel {
     notifyListeners();
   }
 
-  void navigateToPatcher(PatchedApplication app) async {
+  Future<void> navigateToPatcher(PatchedApplication app) async {
     locator<PatcherViewModel>().selectedApp = app;
     locator<PatcherViewModel>().selectedPatches =
         await _patcherAPI.getAppliedPatches(app.appliedPatches);
@@ -74,10 +107,7 @@ class HomeViewModel extends BaseViewModel {
   }
 
   void _getPatchedApps() {
-    patchedInstalledApps = _managerAPI
-        .getPatchedApps()
-        .where((app) => app.hasUpdates == false)
-        .toList();
+    patchedInstalledApps = _managerAPI.getPatchedApps().toList();
     patchedUpdatableApps = _managerAPI
         .getPatchedApps()
         .where((app) => app.hasUpdates == true)
@@ -86,59 +116,318 @@ class HomeViewModel extends BaseViewModel {
   }
 
   Future<bool> hasManagerUpdates() async {
-    String? latestVersion = await _managerAPI.getLatestManagerVersion();
     String currentVersion = await _managerAPI.getCurrentManagerVersion();
+
+    // add v to current version
+    if (!currentVersion.startsWith('v')) {
+      currentVersion = 'v$currentVersion';
+    }
+
+    _latestManagerVersion =
+        await _managerAPI.getLatestManagerVersion() ?? currentVersion;
+
+    if (_latestManagerVersion != currentVersion) {
+      return true;
+    }
+    return false;
+  }
+
+  Future<bool> hasPatchesUpdates() async {
+    final String? latestVersion = await _managerAPI.getLatestPatchesVersion();
+    final String currentVersion = await _managerAPI.getCurrentPatchesVersion();
     if (latestVersion != null) {
       try {
-        int latestVersionInt =
+        final int latestVersionInt =
             int.parse(latestVersion.replaceAll(RegExp('[^0-9]'), ''));
-        int currentVersionInt =
+        final int currentVersionInt =
             int.parse(currentVersion.replaceAll(RegExp('[^0-9]'), ''));
         return latestVersionInt > currentVersionInt;
-      } on Exception catch (e, s) {
-        await Sentry.captureException(e, stackTrace: s);
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
+        }
         return false;
       }
     }
     return false;
   }
 
+  Future<File?> downloadManager() async {
+    try {
+      final response = await _revancedAPI.downloadManager();
+      final bytes = await response!.readAsBytes();
+      final tempDir = await getTemporaryDirectory();
+      final tempFile = File('${tempDir.path}/revanced-manager.apk');
+      await tempFile.writeAsBytes(bytes);
+      return tempFile;
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+      return null;
+    }
+  }
+
+  Future<void> showPatchesConsent(BuildContext context) async {
+    final ValueNotifier<bool> autoUpdate = ValueNotifier(true);
+    await showDialog(
+      context: context,
+      barrierDismissible: false,
+      builder: (context) => AlertDialog(
+        title: const Text('Download ReVanced Patches?'),
+        content: ValueListenableBuilder(
+          valueListenable: autoUpdate,
+          builder: (context, value, child) {
+            return Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                I18nText(
+                  'homeView.patchesConsentDialogText',
+                  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.patchesConsentDialogText2',
+                    translationParams: {
+                      'url': _managerAPI.defaultApiUrl.split('/')[2],
+                    },
+                    child: Text(
+                      '',
+                      style: TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context).colorScheme.error,
+                      ),
+                    ),
+                  ),
+                ),
+                CheckboxListTile(
+                  value: value,
+                  contentPadding: EdgeInsets.zero,
+                  title: I18nText(
+                    'homeView.patchesConsentDialogText3',
+                  ),
+                  subtitle: I18nText(
+                    'homeView.patchesConsentDialogText3Sub',
+                  ),
+                  onChanged: (selected) {
+                    autoUpdate.value = selected!;
+                  },
+                ),
+              ],
+            );
+          },
+        ),
+        actions: [
+          CustomMaterialButton(
+            isFilled: false,
+            onPressed: () async {
+              await _managerAPI.setPatchesConsent(false);
+              SystemNavigator.pop();
+            },
+            label: I18nText('quitButton'),
+          ),
+          CustomMaterialButton(
+            onPressed: () async {
+              await _managerAPI.setPatchesConsent(true);
+              await _managerAPI.setPatchesAutoUpdate(autoUpdate.value);
+              Navigator.of(context).pop();
+            },
+            label: I18nText('okButton'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> updatePatches(BuildContext context) async {
+    _toast.showBottom('homeView.downloadingMessage');
+    final String patchesVersion =
+        await _managerAPI.getLatestPatchesVersion() ?? '0.0.0';
+    final String integrationsVersion =
+        await _managerAPI.getLatestIntegrationsVersion() ?? '0.0.0';
+    if (patchesVersion != '0.0.0' && integrationsVersion != '0.0.0') {
+      await _managerAPI.setCurrentPatchesVersion(patchesVersion);
+      await _managerAPI.setCurrentIntegrationsVersion(integrationsVersion);
+      _toast.showBottom('homeView.downloadedMessage');
+      forceRefresh(context);
+    } else {
+      _toast.showBottom('homeView.errorDownloadMessage');
+    }
+  }
+
   Future<void> updateManager(BuildContext context) async {
+    final ValueNotifier<bool> downloaded = ValueNotifier(false);
     try {
       _toast.showBottom('homeView.downloadingMessage');
-      File? managerApk = await _managerAPI.downloadManager();
+      showDialog(
+        context: context,
+        builder: (context) => ValueListenableBuilder(
+          valueListenable: downloaded,
+          builder: (context, value, child) {
+            return SimpleDialog(
+              contentPadding: const EdgeInsets.all(16.0),
+              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(
+                      children: [
+                        Icon(
+                          Icons.new_releases_outlined,
+                          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),
+                    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: 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: CustomMaterialButton(
+                                  isFilled: false,
+                                  label: I18nText('cancelButton'),
+                                  onPressed: () {
+                                    Navigator.of(context).pop();
+                                  },
+                                ),
+                              ),
+                              const SizedBox(width: 8.0),
+                              Align(
+                                alignment: Alignment.centerRight,
+                                child: CustomMaterialButton(
+                                  label: I18nText('updateButton'),
+                                  onPressed: () async {
+                                    await InstallPlugin.installApk(
+                                      downloadedApk!.path,
+                                    );
+                                  },
+                                ),
+                              ),
+                            ],
+                          ),
+                        ],
+                      ),
+                  ],
+                ),
+              ],
+            );
+          },
+        ),
+      );
+      final File? managerApk = await downloadManager();
       if (managerApk != null) {
-        await flutterLocalNotificationsPlugin.zonedSchedule(
-          0,
-          FlutterI18n.translate(
-            context,
-            'homeView.notificationTitle',
-          ),
-          FlutterI18n.translate(
-            context,
-            'homeView.notificationText',
-          ),
-          tz.TZDateTime.now(tz.local).add(const Duration(seconds: 5)),
-          const NotificationDetails(
-            android: AndroidNotificationDetails(
-              'revanced_manager_channel',
-              'ReVanced Manager Channel',
-              importance: Importance.max,
-              priority: Priority.high,
-              ticker: 'ticker',
-            ),
-          ),
-          androidAllowWhileIdle: true,
-          uiLocalNotificationDateInterpretation:
-              UILocalNotificationDateInterpretation.absoluteTime,
-        );
+        downloaded.value = true;
+        downloadedApk = managerApk;
+        // await flutterLocalNotificationsPlugin.zonedSchedule(
+        //   0,
+        //   FlutterI18n.translate(
+        //     context,
+        //     'homeView.notificationTitle',
+        //   ),
+        //   FlutterI18n.translate(
+        //     context,
+        //     'homeView.notificationText',
+        //   ),
+        //   tz.TZDateTime.now(tz.local).add(const Duration(seconds: 5)),
+        //   const NotificationDetails(
+        //     android: AndroidNotificationDetails(
+        //       'revanced_manager_channel',
+        //       'ReVanced Manager Channel',
+        //       importance: Importance.max,
+        //       priority: Priority.high,
+        //       ticker: 'ticker',
+        //     ),
+        //   ),
+        //   androidAllowWhileIdle: true,
+        //   uiLocalNotificationDateInterpretation:
+        //       UILocalNotificationDateInterpretation.absoluteTime,
+        // );
         _toast.showBottom('homeView.installingMessage');
-        await AppInstaller.installApk(managerApk.path);
+        await InstallPlugin.installApk(managerApk.path);
       } else {
         _toast.showBottom('homeView.errorDownloadMessage');
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       _toast.showBottom('homeView.errorInstallMessage');
     }
   }
@@ -147,36 +436,35 @@ class HomeViewModel extends BaseViewModel {
     _toast.showBottom('homeView.updatesDisabled');
   }
 
-  Future<void> showUpdateConfirmationDialog(BuildContext parentContext) async {
-    return showDialog(
+  Future<void> showUpdateConfirmationDialog(
+    BuildContext parentContext,
+    bool isPatches,
+  ) {
+    return showModalBottomSheet(
       context: parentContext,
-      builder: (context) => AlertDialog(
-        title: I18nText('homeView.updateDialogTitle'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: I18nText('homeView.updateDialogText'),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
-            onPressed: () => Navigator.of(context).pop(),
-          ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
-            onPressed: () {
-              Navigator.of(context).pop();
-              updateManager(parentContext);
-            },
-          )
-        ],
+      isScrollControlled: true,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(top: Radius.circular(24.0)),
+      ),
+      builder: (context) => UpdateConfirmationDialog(
+        isPatches: isPatches,
       ),
     );
   }
 
-  Future<String?> getLatestPatcherReleaseTime() async {
-    return _managerAPI.getLatestPatcherReleaseTime();
+  Future<Map<String, dynamic>?> getLatestManagerRelease() {
+    return _githubAPI.getLatestManagerRelease(_managerAPI.defaultManagerRepo);
   }
 
-  Future<String?> getLatestManagerReleaseTime() async {
+  Future<Map<String, dynamic>?> getLatestPatchesRelease() {
+    return _githubAPI.getLatestPatchesRelease(_managerAPI.defaultPatchesRepo);
+  }
+
+  Future<String?> getLatestPatchesReleaseTime() {
+    return _managerAPI.getLatestPatchesReleaseTime();
+  }
+
+  Future<String?> getLatestManagerReleaseTime() {
     return _managerAPI.getLatestManagerReleaseTime();
   }
 
@@ -186,6 +474,7 @@ class HomeViewModel extends BaseViewModel {
         _lastUpdate!.difference(DateTime.now()).inSeconds > 2) {
       _managerAPI.clearAllData();
     }
+    _toast.showBottom('homeView.refreshSuccess');
     initialize(context);
   }
 }

lib/ui/views/installer/installer_view.dart

@@ -2,10 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:revanced_manager/ui/views/installer/installer_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.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_popup_menu.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
@@ -15,12 +13,64 @@ class InstallerView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<InstallerViewModel>.reactive(
-      onModelReady: (model) => model.initialize(context),
+      onViewModelReady: (model) => model.initialize(context),
       viewModelBuilder: () => InstallerViewModel(),
       builder: (context, model, child) => WillPopScope(
         child: SafeArea(
           top: false,
+          bottom: false,
           child: Scaffold(
+            floatingActionButton: Visibility(
+              visible: !model.isPatching && !model.hasErrors,
+              child: FloatingActionButton.extended(
+                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,
+              ),
+            ),
+            floatingActionButtonLocation:
+                FloatingActionButtonLocation.endContained,
+            bottomNavigationBar: Visibility(
+              visible: !model.isPatching,
+              child: BottomAppBar(
+                child: Row(
+                  children: <Widget>[
+                    Visibility(
+                      visible: !model.hasErrors,
+                      child: IconButton.filledTonal(
+                        tooltip: FlutterI18n.translate(
+                          context,
+                          'installerView.exportApkButtonTooltip',
+                        ),
+                        icon: const Icon(Icons.save),
+                        onPressed: () => model.onButtonPressed(0),
+                      ),
+                    ),
+                    IconButton.filledTonal(
+                      tooltip: FlutterI18n.translate(
+                        context,
+                        'installerView.exportLogButtonTooltip',
+                      ),
+                      icon: const Icon(Icons.post_add),
+                      onPressed: () => model.onButtonPressed(1),
+                    ),
+                  ],
+                ),
+              ),
+            ),
             body: CustomScrollView(
               controller: model.scrollController,
               slivers: <Widget>[
@@ -28,52 +78,16 @@ class InstallerView extends StatelessWidget {
                   title: Text(
                     model.headerLogs,
                     style: GoogleFonts.inter(
-                      color: Theme.of(context).textTheme.headline6!.color,
+                      color: Theme.of(context).textTheme.titleLarge!.color,
                     ),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
                   ),
                   onBackButtonPressed: () => model.onWillPop(context),
-                  actions: <Widget>[
-                    Visibility(
-                      visible: !model.isPatching,
-                      child: CustomPopupMenu(
-                        onSelected: (value) => model.onMenuSelection(value),
-                        children: {
-                          if (!model.hasErrors)
-                            0: I18nText(
-                              'installerView.shareApkMenuOption',
-                              child: const Text(
-                                '',
-                                style: TextStyle(
-                                  fontWeight: FontWeight.bold,
-                                ),
-                              ),
-                            ),
-                            1: I18nText(
-                              'installerView.exportApkMenuOption',
-                              child: const Text(
-                                '',
-                                style: TextStyle(
-                                  fontWeight: FontWeight.bold,
-                                ),
-                              ),
-                            ),
-                          2: I18nText(
-                            'installerView.shareLogMenuOption',
-                            child: const Text(
-                              '',
-                              style: TextStyle(
-                                fontWeight: FontWeight.bold,
-                              ),
-                            ),
-                          ),
-                        },
-                      ),
-                    ),
-                  ],
                   bottom: PreferredSize(
-                      preferredSize: const Size(double.infinity, 1.0),
-                      child:
-                          GradientProgressIndicator(progress: model.progress!)),
+                    preferredSize: const Size(double.infinity, 1.0),
+                    child: GradientProgressIndicator(progress: model.progress),
+                  ),
                 ),
                 SliverPadding(
                   padding: const EdgeInsets.all(20.0),
@@ -93,66 +107,6 @@ class InstallerView extends StatelessWidget {
                     ),
                   ),
                 ),
-                SliverFillRemaining(
-                  hasScrollBody: false,
-                  child: Align(
-                    alignment: Alignment.bottomCenter,
-                    child: Visibility(
-                      visible: !model.isPatching && !model.hasErrors,
-                      child: Padding(
-                        padding: const EdgeInsets.all(20.0).copyWith(top: 0.0),
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.end,
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: <Widget>[
-                            Visibility(
-                              visible: model.isInstalled,
-                              child: CustomMaterialButton(
-                                label: I18nText('installerView.openButton'),
-                                isExpanded: true,
-                                onPressed: () {
-                                  model.openApp();
-                                  model.cleanPatcher();
-                                  Navigator.of(context).pop();
-                                },
-                              ),
-                            ),
-                            Visibility(
-                              visible: !model.isInstalled && model.isRooted,
-                              child: CustomMaterialButton(
-                                isFilled: false,
-                                label:
-                                    I18nText('installerView.installRootButton'),
-                                isExpanded: true,
-                                onPressed: () => model.installResult(
-                                  context,
-                                  true,
-                                ),
-                              ),
-                            ),
-                            Visibility(
-                              visible: !model.isInstalled,
-                              child: const SizedBox(
-                                width: 16,
-                              ),
-                            ),
-                            Visibility(
-                              visible: !model.isInstalled,
-                              child: CustomMaterialButton(
-                                label: I18nText('installerView.installButton'),
-                                isExpanded: true,
-                                onPressed: () => model.installResult(
-                                  context,
-                                  false,
-                                ),
-                              ),
-                            ),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
               ],
             ),
           ),

lib/ui/views/installer/installer_viewmodel.dart

@@ -1,5 +1,6 @@
 // ignore_for_file: use_build_context_synchronously
 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_background/flutter_background.dart';
@@ -14,7 +15,6 @@ import 'package:revanced_manager/services/root_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:sentry_flutter/sentry_flutter.dart';
 import 'package:stacked/stacked.dart';
 import 'package:wakelock/wakelock.dart';
 
@@ -36,6 +36,8 @@ class InstallerViewModel extends BaseViewModel {
   bool isPatching = true;
   bool isInstalled = false;
   bool hasErrors = false;
+  bool isCanceled = false;
+  bool cancel = false;
 
   Future<void> initialize(BuildContext context) async {
     isRooted = await _rootAPI.isRooted();
@@ -51,16 +53,15 @@ class InstallerViewModel extends BaseViewModel {
               context,
               'installerView.notificationText',
             ),
-            notificationImportance: AndroidNotificationImportance.Default,
             notificationIcon: const AndroidResource(
               name: 'ic_notification',
-              defType: 'drawable',
             ),
           ),
         ).then((value) => FlutterBackground.enableBackgroundExecution());
-      } on Exception catch (e, s) {
-        await Sentry.captureException(e, stackTrace: s);
-        // ignore
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
+        } // ignore
       }
     }
     await Wakelock.enable();
@@ -73,10 +74,10 @@ class InstallerViewModel extends BaseViewModel {
       switch (call.method) {
         case 'update':
           if (call.arguments != null) {
-            Map<dynamic, dynamic> arguments = call.arguments;
-            double progress = arguments['progress'];
-            String header = arguments['header'];
-            String log = arguments['log'];
+            final Map<dynamic, dynamic> arguments = call.arguments;
+            final double progress = arguments['progress'];
+            final String header = arguments['header'];
+            final String log = arguments['log'];
             update(progress, header, log);
           }
           break;
@@ -84,7 +85,7 @@ class InstallerViewModel extends BaseViewModel {
     });
   }
 
-  void update(double value, String header, String log) {
+  Future<void> update(double value, String header, String log) async {
     if (value >= 0.0) {
       progress = value;
     }
@@ -96,6 +97,11 @@ class InstallerViewModel extends BaseViewModel {
     } else if (value == 1.0) {
       isPatching = false;
       hasErrors = false;
+      await _managerAPI.savePatches(
+        _patcherAPI.getFilteredPatches(_app.packageName),
+        _app.packageName,
+      );
+      await _managerAPI.setUsedPatches(_patches, _app.packageName);
     } else if (value == -100.0) {
       isPatching = false;
       hasErrors = true;
@@ -133,39 +139,142 @@ class InstallerViewModel extends BaseViewModel {
             _app.apkFilePath,
             _patches,
           );
-        } on Exception catch (e, s) {
+        } on Exception catch (e) {
           update(
             -100.0,
-            'Aborting...',
-            'An error occurred! Aborting\nError:\n$e',
+            'Aborted...',
+            'An error occurred! Aborted\nError:\n$e',
           );
-          await Sentry.captureException(e, stackTrace: s);
-          throw await Sentry.captureException(e, stackTrace: s);
+          if (kDebugMode) {
+            print(e);
+          }
         }
       } else {
-        update(-100.0, 'Aborting...', 'No app or patches selected! Aborting');
+        update(-100.0, 'Aborted...', 'No app or patches selected! Aborted');
       }
       if (FlutterBackground.isBackgroundExecutionEnabled) {
         try {
           FlutterBackground.disableBackgroundExecution();
-        } on Exception catch (e, s) {
-          await Sentry.captureException(e, stackTrace: s);
-          // ignore
+        } on Exception catch (e) {
+          if (kDebugMode) {
+            print(e);
+          } // ignore
         }
       }
       await Wakelock.disable();
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
-  void installResult(BuildContext context, bool installAsRoot) async {
+  Future<void> installTypeDialog(BuildContext context) async {
+    final ValueNotifier<int> installType = ValueNotifier(0);
+    if (isRooted) {
+      await showDialog(
+        context: context,
+        barrierDismissible: false,
+        builder: (context) => 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: 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: 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!;
+                      },
+                    ),
+                  ],
+                );
+              },
+            ),
+          ),
+          actions: [
+            CustomMaterialButton(
+              label: I18nText('cancelButton'),
+              isFilled: false,
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+            ),
+            CustomMaterialButton(
+              label: I18nText('installerView.installButton'),
+              onPressed: () {
+                Navigator.of(context).pop();
+                installResult(context, installType.value == 1);
+              },
+            ),
+          ],
+        ),
+      );
+    } else {
+      installResult(context, false);
+    }
+  }
+
+  Future<void> stopPatcher() async {
+    try {
+      isCanceled = true;
+      update(0.5, 'Aborting...', 'Canceling patching process');
+      await _patcherAPI.stopPatcher();
+      update(-100.0, 'Aborted...', 'Press back to exit');
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+    }
+  }
+
+  Future<void> installResult(BuildContext context, bool installAsRoot) async {
     try {
       _app.isRooted = installAsRoot;
-      bool hasMicroG = _patches.any((p) => p.name.endsWith('microg-support'));
-      bool rootMicroG = installAsRoot && hasMicroG;
-      bool rootFromStorage = installAsRoot && _app.isFromStorage;
-      bool ytWithoutRootMicroG =
+      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(
@@ -184,7 +293,7 @@ class InstallerViewModel extends BaseViewModel {
               CustomMaterialButton(
                 label: I18nText('okButton'),
                 onPressed: () => Navigator.of(context).pop(),
-              )
+              ),
             ],
           ),
         );
@@ -212,29 +321,25 @@ class InstallerViewModel extends BaseViewModel {
           await _managerAPI.savePatchedApp(_app);
         }
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
   void exportResult() {
     try {
       _patcherAPI.exportPatchedFile(_app.name, _app.version);
-    } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
-  void shareResult() {
-    try {
-      _patcherAPI.sharePatchedFile(_app.name, _app.version);
-    } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s);
-    }
-  }
-
-  void shareLog() {
-    _patcherAPI.sharePatcherLog(logs);
+  void exportLog() {
+    _patcherAPI.exportPatcherLog(logs);
   }
 
   Future<void> cleanPatcher() async {
@@ -243,8 +348,10 @@ class InstallerViewModel extends BaseViewModel {
       locator<PatcherViewModel>().selectedApp = null;
       locator<PatcherViewModel>().selectedPatches.clear();
       locator<PatcherViewModel>().notifyListeners();
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
@@ -252,26 +359,34 @@ class InstallerViewModel extends BaseViewModel {
     DeviceApps.openApp(_app.packageName);
   }
 
-  void onMenuSelection(int value) {
+  void onButtonPressed(int value) {
     switch (value) {
       case 0:
-        shareResult();
-        break;
-      case 1:
         exportResult();
         break;
-      case 2:
-        shareLog();
+      case 1:
+        exportLog();
         break;
     }
   }
 
   Future<bool> onWillPop(BuildContext context) async {
     if (isPatching) {
-      _toast.showBottom('installerView.noExit');
+      if (!cancel) {
+        cancel = true;
+        _toast.showBottom('installerView.pressBackAgain');
+      } else if (!isCanceled) {
+        await stopPatcher();
+      } else {
+        _toast.showBottom('installerView.noExit');
+      }
       return false;
     }
-    cleanPatcher();
+    if (!cancel) {
+      cleanPatcher();
+    } else {
+      _patcherAPI.cleanPatcher();
+    }
     Navigator.of(context).pop();
     return true;
   }

lib/ui/views/navigation/navigation_view.dart

@@ -11,60 +11,70 @@ class NavigationView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<NavigationViewModel>.reactive(
-      onModelReady: (model) => model.initialize(context),
+      onViewModelReady: (model) => model.initialize(context),
       viewModelBuilder: () => locator<NavigationViewModel>(),
-      builder: (context, model, child) => Scaffold(
-        body: PageTransitionSwitcher(
-          duration: const Duration(milliseconds: 400),
-          transitionBuilder: (
-            Widget child,
-            Animation<double> animation,
-            Animation<double> secondaryAnimation,
-          ) {
-            return FadeThroughTransition(
-              animation: animation,
-              secondaryAnimation: secondaryAnimation,
-              fillColor: Theme.of(context).colorScheme.surface,
-              child: child,
-            );
-          },
-          child: model.getViewForIndex(model.currentIndex),
-        ),
-        bottomNavigationBar: NavigationBar(
-          onDestinationSelected: model.setIndex,
-          selectedIndex: model.currentIndex,
-          destinations: <Widget>[
-            NavigationDestination(
-              icon: model.isIndexSelected(0)
-                  ? const Icon(Icons.dashboard)
-                  : const Icon(Icons.dashboard_outlined),
-              label: FlutterI18n.translate(
-                context,
-                'navigationView.dashboardTab',
+      builder: (context, model, child) => WillPopScope(
+        onWillPop: () async {
+          if (model.currentIndex == 0) {
+            return true;
+          } else {
+            model.setIndex(0);
+            return false;
+          }
+        },
+        child: Scaffold(
+          body: PageTransitionSwitcher(
+            duration: const Duration(milliseconds: 400),
+            transitionBuilder: (
+              Widget child,
+              Animation<double> animation,
+              Animation<double> secondaryAnimation,
+            ) {
+              return FadeThroughTransition(
+                animation: animation,
+                secondaryAnimation: secondaryAnimation,
+                fillColor: Theme.of(context).colorScheme.surface,
+                child: child,
+              );
+            },
+            child: model.getViewForIndex(model.currentIndex),
+          ),
+          bottomNavigationBar: NavigationBar(
+            onDestinationSelected: model.setIndex,
+            selectedIndex: model.currentIndex,
+            destinations: <Widget>[
+              NavigationDestination(
+                icon: model.isIndexSelected(0)
+                    ? const Icon(Icons.dashboard)
+                    : const Icon(Icons.dashboard_outlined),
+                label: FlutterI18n.translate(
+                  context,
+                  'navigationView.dashboardTab',
+                ),
+                tooltip: '',
               ),
-              tooltip: '',
-            ),
-            NavigationDestination(
-              icon: model.isIndexSelected(1)
-                  ? const Icon(Icons.build)
-                  : const Icon(Icons.build_outlined),
-              label: FlutterI18n.translate(
-                context,
-                'navigationView.patcherTab',
+              NavigationDestination(
+                icon: model.isIndexSelected(1)
+                    ? const Icon(Icons.build)
+                    : const Icon(Icons.build_outlined),
+                label: FlutterI18n.translate(
+                  context,
+                  'navigationView.patcherTab',
+                ),
+                tooltip: '',
               ),
-              tooltip: '',
-            ),
-            NavigationDestination(
-              icon: model.isIndexSelected(2)
-                  ? const Icon(Icons.settings)
-                  : const Icon(Icons.settings_outlined),
-              label: FlutterI18n.translate(
-                context,
-                'navigationView.settingsTab',
+              NavigationDestination(
+                icon: model.isIndexSelected(2)
+                    ? const Icon(Icons.settings)
+                    : const Icon(Icons.settings_outlined),
+                label: FlutterI18n.translate(
+                  context,
+                  'navigationView.settingsTab',
+                ),
+                tooltip: '',
               ),
-              tooltip: '',
-            ),
-          ],
+            ],
+          ),
         ),
       ),
     );

lib/ui/views/navigation/navigation_viewmodel.dart

@@ -15,22 +15,23 @@ import 'package:stacked/stacked.dart';
 
 @lazySingleton
 class NavigationViewModel extends IndexTrackingViewModel {
-  void initialize(BuildContext context) async {
+  Future<void> initialize(BuildContext context) async {
     locator<Toast>().initialize(context);
-    SharedPreferences prefs = await SharedPreferences.getInstance();
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
+    await requestManageExternalStorage();
+
     if (prefs.getBool('permissionsRequested') == null) {
+      await Permission.storage.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) {
-      bool isDark =
-          MediaQuery.of(context).platformBrightness != Brightness.light;
-      await prefs.setBool('useDarkTheme', isDark);
-      await DynamicTheme.of(context)!.setTheme(isDark ? 1 : 0);
+
+    if (prefs.getInt('themeMode') == null) {
+      await prefs.setInt('themeMode', 0);
     }
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
     SystemChrome.setSystemUIOverlayStyle(
@@ -44,6 +45,17 @@ 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/patcher/patcher_view.dart

@@ -22,7 +22,7 @@ class PatcherView extends StatelessWidget {
           child: FloatingActionButton.extended(
             label: I18nText('patcherView.patchButton'),
             icon: const Icon(Icons.build),
-            onPressed: () => model.showPatchConfirmationDialog(context),
+            onPressed: () => model.showRemovedPatchesDialog(context),
           ),
         ),
         body: CustomScrollView(
@@ -34,7 +34,7 @@ class PatcherView extends StatelessWidget {
                 child: Text(
                   '',
                   style: GoogleFonts.inter(
-                    color: Theme.of(context).textTheme.headline6!.color,
+                    color: Theme.of(context).textTheme.titleLarge!.color,
                   ),
                 ),
               ),

lib/ui/views/patcher/patcher_viewmodel.dart

@@ -1,3 +1,5 @@
+// ignore_for_file: use_build_context_synchronously
+
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:injectable/injectable.dart';
@@ -8,6 +10,8 @@ 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';
 import 'package:stacked_services/stacked_services.dart';
 
@@ -18,6 +22,7 @@ class PatcherViewModel extends BaseViewModel {
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
   PatchedApplication? selectedApp;
   List<Patch> selectedPatches = [];
+  List<String> removedPatches = [];
 
   void navigateToAppSelector() {
     _navigationService.navigateTo(Routes.appSelectorView);
@@ -40,27 +45,59 @@ class PatcherViewModel extends BaseViewModel {
   }
 
   Future<bool> isValidPatchConfig() async {
-    bool needsResourcePatching = await _patcherAPI.needsResourcePatching(
+    final bool needsResourcePatching = await _patcherAPI.needsResourcePatching(
       selectedPatches,
     );
     if (needsResourcePatching && selectedApp != null) {
-      bool isSplit = await _managerAPI.isSplitApk(selectedApp!);
+      final bool isSplit = await _managerAPI.isSplitApk(selectedApp!);
       return !isSplit;
     }
     return true;
   }
 
   Future<void> showPatchConfirmationDialog(BuildContext context) async {
-    bool isValid = await isValidPatchConfig();
-    if (isValid) {
-      navigateToInstaller();
-    } else {
+    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 {
+    if (removedPatches.isNotEmpty) {
       return showDialog(
         context: context,
         builder: (context) => AlertDialog(
-          title: I18nText('warning'),
+          title: I18nText('notice'),
           backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-          content: I18nText('patcherView.patchDialogText'),
+          content: I18nText(
+            'patcherView.removedPatchesWarningDialogText',
+            translationParams: {'patches': removedPatches.join('\n')},
+          ),
           actions: <Widget>[
             CustomMaterialButton(
               isFilled: false,
@@ -73,10 +110,46 @@ class PatcherViewModel extends BaseViewModel {
                 Navigator.of(context).pop();
                 navigateToInstaller();
               },
-            )
+            ),
           ],
         ),
       );
+    } else {
+      showArmv7WarningDialog(context);
+    }
+  }
+
+  Future<void> showArmv7WarningDialog(BuildContext context) async {
+    final bool armv7 = await AboutInfo.getInfo().then((info) {
+      final List<String> archs = info['supportedArch'];
+      final supportedAbis = ['arm64-v8a', 'x86', 'x86_64'];
+      return !archs.any((arch) => supportedAbis.contains(arch));
+    });
+    if (context.mounted && armv7) {
+      return showDialog(
+        context: context,
+        builder: (context) => AlertDialog(
+          title: I18nText('warning'),
+          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+          content: I18nText('patcherView.armv7WarningDialogText'),
+          actions: <Widget>[
+            CustomMaterialButton(
+              label: I18nText('noButton'),
+              onPressed: () => Navigator.of(context).pop(),
+            ),
+            CustomMaterialButton(
+              label: I18nText('yesButton'),
+              isFilled: false,
+              onPressed: () {
+                Navigator.of(context).pop();
+                navigateToInstaller();
+              },
+            ),
+          ],
+        ),
+      );
+    } else {
+      navigateToInstaller();
     }
   }
 
@@ -88,35 +161,54 @@ class PatcherViewModel extends BaseViewModel {
     return text;
   }
 
-  String getRecommendedVersionString(BuildContext context) {
-    String recommendedVersion =
-        _patcherAPI.getRecommendedVersion(selectedApp!.packageName);
-    if (recommendedVersion.isEmpty) {
-      recommendedVersion = FlutterI18n.translate(
+  String getSuggestedVersionString(BuildContext context) {
+    String suggestedVersion =
+        _patcherAPI.getSuggestedVersion(selectedApp!.packageName);
+    if (suggestedVersion.isEmpty) {
+      suggestedVersion = FlutterI18n.translate(
         context,
-        'appSelectorCard.anyVersion',
+        'appSelectorCard.allVersions',
       );
     } else {
-      recommendedVersion = 'v$recommendedVersion';
+      suggestedVersion = 'v$suggestedVersion';
     }
     return '${FlutterI18n.translate(
       context,
       'appSelectorCard.currentVersion',
     )}: v${selectedApp!.version}\n${FlutterI18n.translate(
       context,
-      'appSelectorCard.recommendedVersion',
-    )}: $recommendedVersion';
+      'appSelectorCard.suggestedVersion',
+    )}: $suggestedVersion';
   }
 
   Future<void> loadLastSelectedPatches() async {
     this.selectedPatches.clear();
-    List<String> selectedPatches =
+    removedPatches.clear();
+    final List<String> selectedPatches =
         await _managerAPI.getSelectedPatches(selectedApp!.originalPackageName);
-    List<Patch> patches =
-        await _patcherAPI.getFilteredPatches(selectedApp!.originalPackageName);
+    final List<Patch> patches =
+        _patcherAPI.getFilteredPatches(selectedApp!.originalPackageName);
     this
         .selectedPatches
         .addAll(patches.where((patch) => selectedPatches.contains(patch.name)));
+    if (!_managerAPI.isPatchesChangeEnabled()) {
+      this.selectedPatches.clear();
+      this.selectedPatches.addAll(patches.where((patch) => !patch.excluded));
+    }
+    if (!_managerAPI.areExperimentalPatchesEnabled()) {
+      this.selectedPatches.removeWhere((patch) => !isPatchSupported(patch));
+    }
+    if (!_managerAPI.areUniversalPatchesEnabled()) {
+      this
+          .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}');
+      }
+    }
     notifyListeners();
   }
 }

lib/ui/views/patches_selector/patches_selector_view.dart

@@ -1,10 +1,12 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide SearchBar;
 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_chip.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_popup_menu.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 {
@@ -16,11 +18,23 @@ class PatchesSelectorView extends StatefulWidget {
 
 class _PatchesSelectorViewState extends State<PatchesSelectorView> {
   String _query = '';
+  final _managerAPI = locator<ManagerAPI>();
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      if (!_managerAPI.isPatchesChangeEnabled() &&
+          _managerAPI.showPatchesChangeWarning()) {
+        _managerAPI.showPatchesChangeWarningDialog(context);
+      }
+    });
+  }
 
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<PatchesSelectorViewModel>.reactive(
-      onModelReady: (model) => model.initialize(),
+      onViewModelReady: (model) => model.initialize(),
       viewModelBuilder: () => PatchesSelectorViewModel(),
       builder: (context, model, child) => Scaffold(
         resizeToAvoidBottomInset: false,
@@ -30,7 +44,7 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
             label: Row(
               children: <Widget>[
                 I18nText('patchesSelectorView.doneButton'),
-                Text(' (${model.selectedPatches.length})')
+                Text(' (${model.selectedPatches.length})'),
               ],
             ),
             icon: const Icon(Icons.check),
@@ -45,43 +59,47 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
             SliverAppBar(
               pinned: true,
               floating: true,
-              snap: false,
               title: I18nText(
                 'patchesSelectorView.viewTitle',
                 child: Text(
                   '',
                   style: TextStyle(
-                    color: Theme.of(context).textTheme.headline6!.color,
+                    color: Theme.of(context).textTheme.titleLarge!.color,
                   ),
                 ),
               ),
               leading: IconButton(
                 icon: Icon(
                   Icons.arrow_back,
-                  color: Theme.of(context).textTheme.headline6!.color,
+                  color: Theme.of(context).textTheme.titleLarge!.color,
                 ),
                 onPressed: () => Navigator.of(context).pop(),
               ),
               actions: [
-                Container(
-                  height: 2,
-                  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.headline6!.color,
+                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,
+                      ),
                     ),
                   ),
                 ),
                 CustomPopupMenu(
-                  onSelected: (value) => {model.onMenuSelection(value)},
+                  onSelected: (value) =>
+                      {model.onMenuSelection(value, context)},
                   children: {
                     0: I18nText(
                       'patchesSelectorView.loadPatchesSelection',
@@ -103,7 +121,6 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                     horizontal: 12.0,
                   ),
                   child: SearchBar(
-                    showSelectIcon: true,
                     hintText: FlutterI18n.translate(
                       context,
                       'patchesSelectorView.searchBarHint',
@@ -113,12 +130,6 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                         _query = searchQuery;
                       });
                     },
-                    onSelectAll: (value) {
-                      if (value) {
-                        model.selectAllPatcherWarning(context);
-                      }
-                      model.selectAllPatches(value);
-                    },
                   ),
                 ),
               ),
@@ -138,53 +149,126 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                       ),
                     )
                   : Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 12.0)
-                          .copyWith(bottom: 80),
+                      padding:
+                          const EdgeInsets.symmetric(horizontal: 12.0).copyWith(
+                        bottom: MediaQuery.viewPaddingOf(context).bottom + 8.0,
+                      ),
                       child: Column(
                         children: [
                           Row(
                             children: [
-                              CustomChip(
-                                label:
-                                    I18nText('patchesSelectorView.recommended'),
-                                onSelected: (value) {
-                                  model.selectRecommendedPatches();
+                              ActionChip(
+                                label: I18nText('patchesSelectorView.default'),
+                                tooltip: FlutterI18n.translate(
+                                  context,
+                                  'patchesSelectorView.defaultTooltip',
+                                ),
+                                onPressed: () {
+                                  if (_managerAPI.isPatchesChangeEnabled()) {
+                                    model.selectDefaultPatches();
+                                  } else {
+                                    model.showPatchesChangeDialog(context);
+                                  }
                                 },
                               ),
                               const SizedBox(width: 8),
-                              CustomChip(
-                                label: I18nText('patchesSelectorView.all'),
-                                onSelected: (value) {
-                                  model.selectAllPatches(true);
-                                },
-                              ),
-                              const SizedBox(width: 8),
-                              CustomChip(
+                              ActionChip(
                                 label: I18nText('patchesSelectorView.none'),
-                                onSelected: (value) {
-                                  model.clearPatches();
+                                tooltip: FlutterI18n.translate(
+                                  context,
+                                  'patchesSelectorView.noneTooltip',
+                                ),
+                                onPressed: () {
+                                  if (_managerAPI.isPatchesChangeEnabled()) {
+                                    model.clearPatches();
+                                  } else {
+                                    model.showPatchesChangeDialog(context);
+                                  }
                                 },
                               ),
                             ],
                           ),
-                          ...model
-                              .getQueriedPatches(_query)
-                              .map(
-                                (patch) => PatchItem(
+                          ...model.getQueriedPatches(_query).map(
+                            (patch) {
+                              if (patch.compatiblePackages.isNotEmpty) {
+                                return PatchItem(
                                   name: patch.name,
                                   simpleName: patch.getSimpleName(),
-                                  version: patch.version,
                                   description: patch.description,
-                                  packageVersion: model.getAppVersion(),
+                                  packageVersion: model.getAppInfo().version,
                                   supportedPackageVersions:
                                       model.getSupportedVersions(patch),
-                                  isUnsupported: !model.isPatchSupported(patch),
+                                  isUnsupported: !isPatchSupported(patch),
+                                  isChangeEnabled:
+                                      _managerAPI.isPatchesChangeEnabled(),
+                                  isNew: model.isPatchNew(
+                                    patch,
+                                    model.getAppInfo().packageName,
+                                  ),
                                   isSelected: model.isSelected(patch),
                                   onChanged: (value) =>
-                                      model.selectPatch(patch, value),
+                                      model.selectPatch(patch, value, context),
+                                );
+                              } else {
+                                return Container();
+                              }
+                            },
+                          ),
+                          if (_managerAPI.areUniversalPatchesEnabled())
+                            Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                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(
+                                      'patchesSelectorView.universalPatches',
+                                      child: Text(
+                                        '',
+                                        style: TextStyle(
+                                          color: Theme.of(context)
+                                              .colorScheme
+                                              .primary,
+                                        ),
+                                      ),
+                                    ),
+                                  ),
                                 ),
-                              )
-                              .toList(),
+                                ...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,
+                                      ),
+                                    );
+                                  } else {
+                                    return Container();
+                                  }
+                                }),
+                              ],
+                            ),
+                          const SizedBox(height: 70.0),
                         ],
                       ),
                     ),

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -1,36 +1,44 @@
 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/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.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';
 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';
-import 'package:flutter/material.dart';
 
 class PatchesSelectorViewModel extends BaseViewModel {
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
-  final GithubAPI _githubAPI = locator<GithubAPI>();
   final List<Patch> patches = [];
   final List<Patch> selectedPatches =
       locator<PatcherViewModel>().selectedPatches;
+  PatchedApplication? selectedApp = locator<PatcherViewModel>().selectedApp;
   String? patchesVersion = '';
   bool isDefaultPatchesRepo() {
     return _managerAPI.getPatchesRepo() == 'revanced/revanced-patches';
   }
 
   Future<void> initialize() async {
-    getPatchesVersion();
-    patches.addAll(await _patcherAPI.getFilteredPatches(
-      locator<PatcherViewModel>().selectedApp!.originalPackageName,
-    ));
-    patches.sort((a, b) => a.name.compareTo(b.name));
-    selectRecommendedPatches();
+    getPatchesVersion().whenComplete(() => notifyListeners());
+    patches.addAll(
+      _patcherAPI.getFilteredPatches(
+        selectedApp!.originalPackageName,
+      ),
+    );
+    patches.sort((a, b) {
+      if (isPatchNew(a, selectedApp!.packageName) ==
+          isPatchNew(b, selectedApp!.packageName)) {
+        return a.name.compareTo(b.name);
+      } else {
+        return isPatchNew(b, selectedApp!.packageName) ? 1 : -1;
+      }
+    });
     notifyListeners();
   }
 
@@ -40,60 +48,70 @@ class PatchesSelectorViewModel extends BaseViewModel {
     );
   }
 
-  void selectPatch(Patch patch, bool isSelected) {
-    if (isSelected && !selectedPatches.contains(patch)) {
-      selectedPatches.add(patch);
+  void selectPatch(Patch patch, bool isSelected, BuildContext context) {
+    if (_managerAPI.isPatchesChangeEnabled()) {
+      if (isSelected && !selectedPatches.contains(patch)) {
+        selectedPatches.add(patch);
+      } else {
+        selectedPatches.remove(patch);
+      }
+      notifyListeners();
     } else {
-      selectedPatches.remove(patch);
+      showPatchesChangeDialog(context);
     }
-    notifyListeners();
   }
 
-  Future<void> selectAllPatcherWarning(BuildContext context) {
+  Future<void> showPatchesChangeDialog(BuildContext context) async {
     return showDialog(
       context: context,
       builder: (context) => AlertDialog(
-        title: I18nText('warning'),
         backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: I18nText('patchesSelectorView.selectAllPatchesWarningContent'),
-        actions: <Widget>[
+        title: I18nText('warning'),
+        content: I18nText(
+          'patchItem.patchesChangeWarningDialogText',
+          child: const Text(
+            '',
+            style: TextStyle(
+              fontSize: 16,
+              fontWeight: FontWeight.w500,
+            ),
+          ),
+        ),
+        actions: [
           CustomMaterialButton(
+            isFilled: false,
             label: I18nText('okButton'),
             onPressed: () => Navigator.of(context).pop(),
-          )
+          ),
+          CustomMaterialButton(
+            label: I18nText('patchItem.patchesChangeWarningDialogButton'),
+            onPressed: () {
+              Navigator.of(context)
+                ..pop()
+                ..pop();
+            },
+          ),
         ],
       ),
     );
   }
 
-  void selectAllPatches(bool isSelected) {
+  void selectDefaultPatches() {
     selectedPatches.clear();
-
-    if (isSelected && _managerAPI.areExperimentalPatchesEnabled() == false) {
-      selectedPatches
-          .addAll(patches.where((element) => isPatchSupported(element)));
+    if (locator<PatcherViewModel>().selectedApp?.originalPackageName != null) {
+      selectedPatches.addAll(
+        _patcherAPI
+            .getFilteredPatches(
+              locator<PatcherViewModel>().selectedApp!.originalPackageName,
+            )
+            .where(
+              (element) =>
+                  !element.excluded &&
+                  (_managerAPI.areExperimentalPatchesEnabled() ||
+                      isPatchSupported(element)),
+            ),
+      );
     }
-
-    if (isSelected && _managerAPI.areExperimentalPatchesEnabled()) {
-      selectedPatches.addAll(patches);
-    }
-
-    notifyListeners();
-  }
-
-  void selectRecommendedPatches() {
-    selectedPatches.clear();
-
-    if (_managerAPI.areExperimentalPatchesEnabled() == false) {
-      selectedPatches.addAll(patches.where(
-          (element) => element.excluded == false && isPatchSupported(element)));
-    }
-
-    if (_managerAPI.areExperimentalPatchesEnabled()) {
-      selectedPatches
-          .addAll(patches.where((element) => element.excluded == false));
-    }
-
     notifyListeners();
   }
 
@@ -108,35 +126,46 @@ class PatchesSelectorViewModel extends BaseViewModel {
     locator<PatcherViewModel>().notifyListeners();
   }
 
-  Future<String?> getPatchesVersion() async {
-    if (isDefaultPatchesRepo()) {
-      patchesVersion = await _managerAPI.getLatestPatchesVersion();
-      // print('Patches version: $patchesVersion');
-      return patchesVersion ?? '0.0.0';
-    } else {
-      // fetch from github
-      patchesVersion = await _githubAPI
-          .getLastestReleaseVersion(_managerAPI.getPatchesRepo());
-    }
+  Future<void> getPatchesVersion() async {
+    patchesVersion = await _managerAPI.getCurrentPatchesVersion();
   }
 
   List<Patch> getQueriedPatches(String query) {
-    return patches
-        .where((patch) =>
-            query.isEmpty ||
-            query.length < 2 ||
-            patch.name.toLowerCase().contains(query.toLowerCase()) ||
-            patch.getSimpleName().toLowerCase().contains(query.toLowerCase()))
+    final List<Patch> patch = patches
+        .where(
+          (patch) =>
+              query.isEmpty ||
+              query.length < 2 ||
+              patch.name.toLowerCase().contains(query.toLowerCase()) ||
+              patch.getSimpleName().toLowerCase().contains(query.toLowerCase()),
+        )
         .toList();
+    if (_managerAPI.areUniversalPatchesEnabled()) {
+      return patch;
+    } else {
+      return patch
+          .where((patch) => patch.compatiblePackages.isNotEmpty)
+          .toList();
+    }
   }
 
-  String getAppVersion() {
-    return locator<PatcherViewModel>().selectedApp!.version;
+  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());
+    }
   }
 
   List<String> getSupportedVersions(Patch patch) {
-    PatchedApplication app = locator<PatcherViewModel>().selectedApp!;
-    Package? package = patch.compatiblePackages.firstWhereOrNull(
+    final PatchedApplication app = locator<PatcherViewModel>().selectedApp!;
+    final Package? package = patch.compatiblePackages.firstWhereOrNull(
       (pack) => pack.name == app.packageName,
     );
     if (package != null) {
@@ -146,39 +175,42 @@ class PatchesSelectorViewModel extends BaseViewModel {
     }
   }
 
-  bool isPatchSupported(Patch patch) {
-    PatchedApplication app = locator<PatcherViewModel>().selectedApp!;
-    return patch.compatiblePackages.any((pack) =>
-        pack.name == app.packageName &&
-        (pack.versions.isEmpty || pack.versions.contains(app.version)));
-  }
-
-  void onMenuSelection(value) {
+  void onMenuSelection(value, BuildContext context) {
     switch (value) {
       case 0:
-        loadSelectedPatches();
+        loadSelectedPatches(context);
         break;
     }
   }
 
   Future<void> saveSelectedPatches() async {
-    List<String> selectedPatches =
+    final List<String> selectedPatches =
         this.selectedPatches.map((patch) => patch.name).toList();
     await _managerAPI.setSelectedPatches(
-        locator<PatcherViewModel>().selectedApp!.originalPackageName,
-        selectedPatches);
+      locator<PatcherViewModel>().selectedApp!.originalPackageName,
+      selectedPatches,
+    );
   }
 
-  Future<void> loadSelectedPatches() async {
-    List<String> selectedPatches = await _managerAPI.getSelectedPatches(
-        locator<PatcherViewModel>().selectedApp!.originalPackageName);
-    if (selectedPatches.isNotEmpty) {
-      this.selectedPatches.clear();
-      this.selectedPatches.addAll(
-          patches.where((patch) => selectedPatches.contains(patch.name)));
+  Future<void> loadSelectedPatches(BuildContext context) async {
+    if (_managerAPI.isPatchesChangeEnabled()) {
+      final List<String> selectedPatches = await _managerAPI.getSelectedPatches(
+        locator<PatcherViewModel>().selectedApp!.originalPackageName,
+      );
+      if (selectedPatches.isNotEmpty) {
+        this.selectedPatches.clear();
+        this.selectedPatches.addAll(
+              patches.where((patch) => selectedPatches.contains(patch.name)),
+            );
+        if (!_managerAPI.areExperimentalPatchesEnabled()) {
+          this.selectedPatches.removeWhere((patch) => !isPatchSupported(patch));
+        }
+      } else {
+        locator<Toast>().showBottom('patchesSelectorView.noSavedPatches');
+      }
+      notifyListeners();
     } else {
-      locator<Toast>().showBottom('patchesSelectorView.noSavedPatches');
+      showPatchesChangeDialog(context);
     }
-    notifyListeners();
   }
 }

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

@@ -1,116 +0,0 @@
-// ignore_for_file: use_build_context_synchronously
-
-import 'package:dynamic_themes/dynamic_themes.dart';
-import 'package:flutter/material.dart';
-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/custom_switch_tile.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
-import 'package:stacked/stacked.dart';
-
-final _settingViewModel = SettingsViewModel();
-
-// 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();
-  }
-
-  void setUseDynamicTheme(BuildContext context, bool value) async {
-    await _managerAPI.setUseDynamicTheme(value);
-    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();
-  }
-
-  void setUseDarkTheme(BuildContext context, bool value) async {
-    await _managerAPI.setUseDarkTheme(value);
-    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();
-  }
-}
-
-class SUpdateThemeUI extends StatelessWidget {
-  const SUpdateThemeUI({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return SettingsSection(
-      title: 'settingsView.appearanceSectionTitle',
-      children: <Widget>[
-        CustomSwitchTile(
-          padding: const EdgeInsets.symmetric(horizontal: 20.0),
-          title: I18nText(
-            'settingsView.darkThemeLabel',
-            child: const Text(
-              '',
-              style: TextStyle(
-                fontSize: 20,
-                fontWeight: FontWeight.w500,
-              ),
-            ),
-          ),
-          subtitle: I18nText('settingsView.darkThemeHint'),
-          value: SUpdateTheme().getDarkThemeStatus(),
-          onTap: (value) => SUpdateTheme().setUseDarkTheme(
-            context,
-            value,
-          ),
-        ),
-        FutureBuilder<int>(
-          future: _settingViewModel.getSdkVersion(),
-          builder: (context, snapshot) => Visibility(
-            visible:
-                snapshot.hasData && snapshot.data! >= ANDROID_12_SDK_VERSION,
-            child: CustomSwitchTile(
-              padding: 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(),
-              onTap: (value) =>
-                  _settingViewModel.sUpdateTheme.setUseDynamicTheme(
-                context,
-                value,
-              ),
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-}

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

@@ -4,6 +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/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';
@@ -11,11 +12,12 @@ import 'package:stacked/stacked.dart';
 
 class SManageApiUrl extends BaseViewModel {
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
+  final Toast _toast = locator<Toast>();
 
   final TextEditingController _apiUrlController = TextEditingController();
 
   Future<void> showApiUrlDialog(BuildContext context) async {
-    String apiUrl = _managerAPI.getApiUrl();
+    final String apiUrl = _managerAPI.getApiUrl();
     _apiUrlController.text = apiUrl.replaceAll('https://', '');
     return showDialog(
       context: context,
@@ -28,7 +30,7 @@ class SManageApiUrl extends BaseViewModel {
               icon: const Icon(Icons.manage_history_outlined),
               onPressed: () => showApiUrlResetDialog(context),
               color: Theme.of(context).colorScheme.secondary,
-            )
+            ),
           ],
         ),
         backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
@@ -42,7 +44,7 @@ class SManageApiUrl extends BaseViewModel {
                 ),
                 inputController: _apiUrlController,
                 label: I18nText('settingsView.selectApiURL'),
-                hint: apiUrl.split('/')[0],
+                hint: apiUrl,
                 onChanged: (value) => notifyListeners(),
               ),
             ],
@@ -67,7 +69,7 @@ class SManageApiUrl extends BaseViewModel {
               _managerAPI.setApiUrl(apiUrl);
               Navigator.of(context).pop();
             },
-          )
+          ),
         ],
       ),
     );
@@ -90,10 +92,12 @@ class SManageApiUrl extends BaseViewModel {
             label: I18nText('yesButton'),
             onPressed: () {
               _managerAPI.setApiUrl('');
-              Navigator.of(context).pop();
-              Navigator.of(context).pop();
+              _toast.showBottom('settingsView.restartAppForChanges');
+              Navigator.of(context)
+                ..pop()
+                ..pop();
             },
-          )
+          ),
         ],
       ),
     );

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

@@ -0,0 +1,86 @@
+// ignore_for_file: use_build_context_synchronously
+
+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 {
+  final ManagerAPI _managerAPI = locator<ManagerAPI>();
+
+  final TextEditingController _keystorePasswordController =
+      TextEditingController();
+
+  Future<void> showKeystoreDialog(BuildContext context) async {
+    final String keystorePasswordText = _managerAPI.getKeystorePassword();
+    _keystorePasswordController.text = keystorePasswordText;
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Row(
+          children: <Widget>[
+            I18nText('settingsView.selectKeystorePassword'),
+            const Spacer(),
+            IconButton(
+              icon: const Icon(Icons.manage_history_outlined),
+              onPressed: () => _keystorePasswordController.text =
+                  _managerAPI.defaultKeystorePassword,
+              color: Theme.of(context).colorScheme.secondary,
+            ),
+          ],
+        ),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: SingleChildScrollView(
+          child: Column(
+            children: <Widget>[
+              CustomTextField(
+                inputController: _keystorePasswordController,
+                label: I18nText('settingsView.selectKeystorePassword'),
+                hint: '',
+                onChanged: (value) => notifyListeners(),
+              ),
+            ],
+          ),
+        ),
+        actions: <Widget>[
+          CustomMaterialButton(
+            isFilled: false,
+            label: I18nText('cancelButton'),
+            onPressed: () {
+              _keystorePasswordController.clear();
+              Navigator.of(context).pop();
+            },
+          ),
+          CustomMaterialButton(
+            label: I18nText('okButton'),
+            onPressed: () {
+              final String passwd = _keystorePasswordController.text;
+              _managerAPI.setKeystorePassword(passwd);
+              Navigator.of(context).pop();
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+final sManageKeystorePassword = SManageKeystorePassword();
+
+class SManageKeystorePasswordUI extends StatelessWidget {
+  const SManageKeystorePasswordUI({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SettingsTileDialog(
+      padding: const EdgeInsets.symmetric(horizontal: 20.0),
+      title: 'settingsView.selectKeystorePassword',
+      subtitle: 'settingsView.selectKeystorePasswordHint',
+      onTap: () => sManageKeystorePassword.showKeystoreDialog(context),
+    );
+  }
+}

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

@@ -4,6 +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/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';
@@ -11,15 +12,19 @@ import 'package:stacked/stacked.dart';
 
 class SManageSources extends BaseViewModel {
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
+  final Toast _toast = locator<Toast>();
 
+  final TextEditingController _hostSourceController = TextEditingController();
   final TextEditingController _orgPatSourceController = TextEditingController();
   final TextEditingController _patSourceController = TextEditingController();
   final TextEditingController _orgIntSourceController = TextEditingController();
   final TextEditingController _intSourceController = TextEditingController();
 
   Future<void> showSourcesDialog(BuildContext context) async {
-    String patchesRepo = _managerAPI.getPatchesRepo();
-    String integrationsRepo = _managerAPI.getIntegrationsRepo();
+    final String hostRepository = _managerAPI.getRepoUrl();
+    final String patchesRepo = _managerAPI.getPatchesRepo();
+    final String integrationsRepo = _managerAPI.getIntegrationsRepo();
+    _hostSourceController.text = hostRepository;
     _orgPatSourceController.text = patchesRepo.split('/')[0];
     _patSourceController.text = patchesRepo.split('/')[1];
     _orgIntSourceController.text = integrationsRepo.split('/')[0];
@@ -35,13 +40,24 @@ class SManageSources extends BaseViewModel {
               icon: const Icon(Icons.manage_history_outlined),
               onPressed: () => showResetConfirmationDialog(context),
               color: Theme.of(context).colorScheme.secondary,
-            )
+            ),
           ],
         ),
         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,
+                onChanged: (value) => notifyListeners(),
+              ),
+              const SizedBox(height: 20),
               CustomTextField(
                 leadingIcon: Icon(
                   Icons.extension_outlined,
@@ -85,6 +101,8 @@ class SManageSources extends BaseViewModel {
                 hint: integrationsRepo.split('/')[1],
                 onChanged: (value) => notifyListeners(),
               ),
+              const SizedBox(height: 20),
+              I18nText('settingsView.sourcesUpdateNote'),
             ],
           ),
         ),
@@ -103,15 +121,19 @@ class SManageSources extends BaseViewModel {
           CustomMaterialButton(
             label: I18nText('okButton'),
             onPressed: () {
+              _managerAPI.setRepoUrl(_hostSourceController.text.trim());
               _managerAPI.setPatchesRepo(
-                '${_orgPatSourceController.text}/${_patSourceController.text}',
+                '${_orgPatSourceController.text.trim()}/${_patSourceController.text.trim()}',
               );
               _managerAPI.setIntegrationsRepo(
-                '${_orgIntSourceController.text}/${_intSourceController.text}',
+                '${_orgIntSourceController.text.trim()}/${_intSourceController.text.trim()}',
               );
+              _managerAPI.setCurrentPatchesVersion('0.0.0');
+              _managerAPI.setCurrentIntegrationsVersion('0.0.0');
+              _toast.showBottom('settingsView.restartAppForChanges');
               Navigator.of(context).pop();
             },
-          )
+          ),
         ],
       ),
     );
@@ -133,12 +155,17 @@ class SManageSources extends BaseViewModel {
           CustomMaterialButton(
             label: I18nText('yesButton'),
             onPressed: () {
+              _managerAPI.setRepoUrl('');
               _managerAPI.setPatchesRepo('');
               _managerAPI.setIntegrationsRepo('');
-              Navigator.of(context).pop();
-              Navigator.of(context).pop();
+              _managerAPI.setCurrentPatchesVersion('0.0.0');
+              _managerAPI.setCurrentIntegrationsVersion('0.0.0');
+              _toast.showBottom('settingsView.restartAppForChanges');
+              Navigator.of(context)
+                ..pop()
+                ..pop();
             },
-          )
+          ),
         ],
       ),
     );

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

@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/main.dart';
-import 'package:revanced_manager/services/crowdin_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/settings/settings_viewmodel.dart';
@@ -16,7 +15,6 @@ import 'package:timeago/timeago.dart' as timeago;
 final _settingViewModel = SettingsViewModel();
 
 class SUpdateLanguage extends BaseViewModel {
-  final CrowdinAPI _crowdinAPI = locator<CrowdinAPI>();
   final Toast _toast = locator<Toast>();
   late SharedPreferences _prefs;
   String selectedLanguage = 'English';
@@ -43,7 +41,6 @@ class SUpdateLanguage extends BaseViewModel {
   }
 
   Future<void> initLang() async {
-    languages = await _crowdinAPI.getLanguages();
     languages.sort((a, b) => a['name'].compareTo(b['name']));
     notifyListeners();
   }

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

@@ -0,0 +1,193 @@
+// ignore_for_file: use_build_context_synchronously
+
+import 'package:dynamic_themes/dynamic_themes.dart';
+import 'package:flutter/material.dart';
+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:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:stacked/stacked.dart';
+
+final _settingViewModel = SettingsViewModel();
+
+// 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 ~/ 2) * 2;
+    await DynamicTheme.of(context)!.setTheme(currentTheme + (value ? 1 : 0));
+    notifyListeners();
+  }
+
+  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,
+      ),
+    );
+    notifyListeners();
+  }
+
+  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),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: SingleChildScrollView(
+          child: ValueListenableBuilder(
+            valueListenable: newTheme,
+            builder: (context, value, child) {
+              return Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  RadioListTile(
+                    title: I18nText('settingsView.systemThemeLabel'),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                    value: 0,
+                    groupValue: value,
+                    onChanged: (value) {
+                      newTheme.value = value!;
+                    },
+                  ),
+                  RadioListTile(
+                    title: I18nText('settingsView.lightThemeLabel'),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                    value: 1,
+                    groupValue: value,
+                    onChanged: (value) {
+                      newTheme.value = value!;
+                    },
+                  ),
+                  RadioListTile(
+                    title: I18nText('settingsView.darkThemeLabel'),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                    value: 2,
+                    groupValue: value,
+                    onChanged: (value) {
+                      newTheme.value = value!;
+                    },
+                  ),
+                ],
+              );
+            },
+          ),
+        ),
+        actions: <Widget>[
+          CustomMaterialButton(
+            isFilled: false,
+            label: I18nText('cancelButton'),
+            onPressed: () {
+              Navigator.of(context).pop();
+            },
+          ),
+          CustomMaterialButton(
+            label: I18nText('okButton'),
+            onPressed: () {
+              setThemeMode(context, newTheme.value);
+              Navigator.of(context).pop();
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+final sUpdateTheme = SUpdateTheme();
+class SUpdateThemeUI extends StatelessWidget {
+  const SUpdateThemeUI({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SettingsSection(
+      title: 'settingsView.appearanceSectionTitle',
+      children: <Widget>[
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.themeModeLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          trailing: CustomMaterialButton(
+            label: sUpdateTheme.getThemeModeName(),
+            onPressed: () => { sUpdateTheme.showThemeDialog(context) },
+          ),
+          onTap: () => { sUpdateTheme.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,
+                  ),
+                ),
+              ),
+              subtitle: I18nText('settingsView.dynamicThemeHint'),
+              value: _settingViewModel.sUpdateTheme.getDynamicThemeStatus(),
+              onChanged: (value) => {
+                _settingViewModel.sUpdateTheme.setUseDynamicTheme(
+                  context,
+                  value,
+                ),
+              },
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/ui/views/settings/settings_view.dart

@@ -3,8 +3,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_update_language.dart';
-import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_update_theme.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_export_section.dart';
@@ -33,7 +32,7 @@ class SettingsView extends StatelessWidget {
                 child: Text(
                   '',
                   style: GoogleFonts.inter(
-                    color: Theme.of(context).textTheme.headline6!.color,
+                    color: Theme.of(context).textTheme.titleLarge!.color,
                   ),
                 ),
               ),
@@ -42,16 +41,14 @@ class SettingsView extends StatelessWidget {
               delegate: SliverChildListDelegate.fixed(
                 <Widget>[
                   SUpdateThemeUI(),
-                  SUpdateLanguageUI(),
-                  _settingsDivider,
+                  // SUpdateLanguageUI(),
+                  // _settingsDivider,
                   STeamSection(),
                   _settingsDivider,
                   SAdvancedSection(),
                   _settingsDivider,
                   SExportSection(),
                   _settingsDivider,
-                  // SLoggingSection(),
-                  // _settingsDivider,
                   SInfoSection(),
                 ],
               ),

lib/ui/views/settings/settings_viewmodel.dart

@@ -2,6 +2,9 @@ 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_i18n/flutter_i18n.dart';
 import 'package:logcat/logcat.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:revanced_manager/app/app.locator.dart';
@@ -9,9 +12,10 @@ import 'package:revanced_manager/app/app.router.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
-import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_update_language.dart';
-import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_update_theme.dart';
-import 'package:sentry_flutter/sentry_flutter.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:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
@@ -19,6 +23,9 @@ import 'package:stacked_services/stacked_services.dart';
 class SettingsViewModel extends BaseViewModel {
   final NavigationService _navigationService = locator<NavigationService>();
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
+  final PatchesSelectorViewModel _patchesSelectorViewModel =
+      PatchesSelectorViewModel();
+  final PatcherViewModel _patcherViewModel = locator<PatcherViewModel>();
   final Toast _toast = locator<Toast>();
 
   final SUpdateLanguage sUpdateLanguage = SUpdateLanguage();
@@ -28,13 +35,103 @@ class SettingsViewModel extends BaseViewModel {
     _navigationService.navigateTo(Routes.contributorsView);
   }
 
-  bool isSentryEnabled() {
-    return _managerAPI.isSentryEnabled();
+  bool isPatchesAutoUpdate() {
+    return _managerAPI.isPatchesAutoUpdate();
   }
 
-  void useSentry(bool value) {
-    _managerAPI.setSentryStatus(value);
-    _toast.showBottom('settingsView.restartAppForChanges');
+  void setPatchesAutoUpdate(bool value) {
+    _managerAPI.setPatchesAutoUpdate(value);
+    notifyListeners();
+  }
+
+  bool isPatchesChangeEnabled() {
+    return _managerAPI.isPatchesChangeEnabled();
+  }
+
+  Future<void> showPatchesChangeEnableDialog(
+    bool value,
+    BuildContext context,
+  ) async {
+    if (value) {
+      return showDialog(
+        context: context,
+        builder: (context) => AlertDialog(
+          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+          title: I18nText('warning'),
+          content: I18nText(
+            'settingsView.enablePatchesSelectionWarningText',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          actions: [
+            CustomMaterialButton(
+              isFilled: false,
+              label: I18nText('noButton'),
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+            ),
+            CustomMaterialButton(
+              label: I18nText('yesButton'),
+              onPressed: () {
+                _managerAPI.setChangingToggleModified(true);
+                _managerAPI.setPatchesChangeEnabled(true);
+                Navigator.of(context).pop();
+              },
+            ),
+          ],
+        ),
+      );
+    } else {
+      return showDialog(
+        context: context,
+        builder: (context) => AlertDialog(
+          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+          title: I18nText('warning'),
+          content: I18nText(
+            'settingsView.disablePatchesSelectionWarningText',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          actions: [
+            CustomMaterialButton(
+              isFilled: false,
+              label: I18nText('noButton'),
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+            ),
+            CustomMaterialButton(
+              label: I18nText('yesButton'),
+              onPressed: () {
+                _managerAPI.setChangingToggleModified(true);
+                _patchesSelectorViewModel.selectDefaultPatches();
+                _managerAPI.setPatchesChangeEnabled(false);
+                Navigator.of(context).pop();
+              },
+            ),
+          ],
+        ),
+      );
+    }
+  }
+
+  bool areUniversalPatchesEnabled() {
+    return _managerAPI.areUniversalPatchesEnabled();
+  }
+
+  void showUniversalPatches(bool value) {
+    _managerAPI.enableUniversalPatchesStatus(value);
     notifyListeners();
   }
 
@@ -49,7 +146,7 @@ class SettingsViewModel extends BaseViewModel {
 
   void deleteKeystore() {
     _managerAPI.deleteKeystore();
-    _toast.showBottom('settingsView.deletedKeystore');
+    _toast.showBottom('settingsView.regeneratedKeystore');
     notifyListeners();
   }
 
@@ -61,47 +158,91 @@ class SettingsViewModel extends BaseViewModel {
 
   Future<void> exportPatches() async {
     try {
-      File outFile = File(_managerAPI.storedPatchesFile);
+      final File outFile = File(_managerAPI.storedPatchesFile);
       if (outFile.existsSync()) {
-        String dateTime =
+        final String dateTime =
             DateTime.now().toString().replaceAll(' ', '_').split('.').first;
-        String tempFilePath =
-            '${outFile.path.substring(0, outFile.path.lastIndexOf('/') + 1)}selected_patches_$dateTime.json';
-        outFile.copySync(tempFilePath);
-        await CRFileSaver.saveFileWithDialog(SaveFileDialogParams(
-            sourceFilePath: tempFilePath, destinationFileName: ''));
-        File(tempFilePath).delete();
-        locator<Toast>().showBottom('settingsView.exportedPatches');
+        await CRFileSaver.saveFileWithDialog(
+          SaveFileDialogParams(
+            sourceFilePath: outFile.path,
+            destinationFileName: 'selected_patches_$dateTime.json',
+          ),
+        );
+        _toast.showBottom('settingsView.exportedPatches');
       } else {
-        locator<Toast>().showBottom('settingsView.noExportFileFound');
+        _toast.showBottom('settingsView.noExportFileFound');
+      }
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
       }
-    } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s);
     }
   }
 
-  Future<void> importPatches() async {
-    try {
-      FilePickerResult? result = await FilePicker.platform.pickFiles(
-        type: FileType.custom,
-        allowedExtensions: ['json'],
-      );
-      if (result != null && result.files.single.path != null) {
-        File inFile = File(result.files.single.path!);
-        final File storedPatchesFile = File(_managerAPI.storedPatchesFile);
-        if (!storedPatchesFile.existsSync()) {
-          storedPatchesFile.createSync(recursive: true);
+  Future<void> importPatches(BuildContext context) async {
+    if (isPatchesChangeEnabled()) {
+      try {
+        final FilePickerResult? result = await FilePicker.platform.pickFiles(
+          type: FileType.custom,
+          allowedExtensions: ['json'],
+        );
+        if (result != null && result.files.single.path != null) {
+          final File inFile = File(result.files.single.path!);
+          inFile.copySync(_managerAPI.storedPatchesFile);
+          inFile.delete();
+          if (_patcherViewModel.selectedApp != null) {
+            _patcherViewModel.loadLastSelectedPatches();
+          }
+          _toast.showBottom('settingsView.importedPatches');
         }
-        inFile.copySync(storedPatchesFile.path);
-        inFile.delete();
-        if (locator<PatcherViewModel>().selectedApp != null) {
-          locator<PatcherViewModel>().loadLastSelectedPatches();
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
         }
-        locator<Toast>().showBottom('settingsView.importedPatches');
+        _toast.showBottom('settingsView.jsonSelectorErrorMessage');
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-      locator<Toast>().showBottom('settingsView.jsonSelectorErrorMessage');
+    } else {
+      _managerAPI.showPatchesChangeWarningDialog(context);
+    }
+  }
+
+  Future<void> exportKeystore() async {
+    try {
+      final File outFile = File(_managerAPI.keystoreFile);
+      if (outFile.existsSync()) {
+        final String dateTime =
+            DateTime.now().toString().replaceAll(' ', '_').split('.').first;
+        await CRFileSaver.saveFileWithDialog(
+          SaveFileDialogParams(
+            sourceFilePath: outFile.path,
+            destinationFileName: 'keystore_$dateTime.keystore',
+          ),
+        );
+        _toast.showBottom('settingsView.exportedKeystore');
+      } else {
+        _toast.showBottom('settingsView.noKeystoreExportFileFound');
+      }
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+    }
+  }
+
+  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!);
+        inFile.copySync(_managerAPI.keystoreFile);
+
+        _toast.showBottom('settingsView.importedKeystore');
+      }
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+      _toast.showBottom('settingsView.keystoreSelectorErrorMessage');
     }
   }
 
@@ -111,13 +252,13 @@ class SettingsViewModel extends BaseViewModel {
   }
 
   Future<int> getSdkVersion() async {
-    AndroidDeviceInfo info = await DeviceInfoPlugin().androidInfo;
-    return info.version.sdkInt ?? -1;
+    final AndroidDeviceInfo info = await DeviceInfoPlugin().androidInfo;
+    return info.version.sdkInt;
   }
 
   Future<void> deleteLogs() async {
-    Directory appCacheDir = await getTemporaryDirectory();
-    Directory logsDir = Directory('${appCacheDir.path}/logs');
+    final Directory appCacheDir = await getTemporaryDirectory();
+    final Directory logsDir = Directory('${appCacheDir.path}/logs');
     if (logsDir.existsSync()) {
       logsDir.deleteSync(recursive: true);
     }
@@ -125,17 +266,18 @@ class SettingsViewModel extends BaseViewModel {
   }
 
   Future<void> exportLogcatLogs() async {
-    Directory appCache = await getTemporaryDirectory();
-    Directory logDir = Directory('${appCache.path}/logs');
+    final Directory appCache = await getTemporaryDirectory();
+    final Directory logDir = Directory('${appCache.path}/logs');
     logDir.createSync();
-    String dateTime = DateTime.now()
+    final String dateTime = DateTime.now()
         .toIso8601String()
         .replaceAll('-', '')
         .replaceAll(':', '')
         .replaceAll('T', '')
         .replaceAll('.', '');
-    File logcat = File('${logDir.path}/revanced-manager_logcat_$dateTime.log');
-    String logs = await Logcat.execute();
+    final File logcat =
+        File('${logDir.path}/revanced-manager_logcat_$dateTime.log');
+    final String logs = await Logcat.execute();
     logcat.writeAsStringSync(logs);
     ShareExtend.share(logcat.path, 'file');
   }

lib/ui/widgets/appInfoView/app_info_view.dart

@@ -8,12 +8,11 @@ import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
 class AppInfoView extends StatelessWidget {
-  final PatchedApplication app;
-
   const AppInfoView({
     Key? key,
     required this.app,
   }) : super(key: key);
+  final PatchedApplication app;
 
   @override
   Widget build(BuildContext context) {
@@ -28,7 +27,7 @@ class AppInfoView extends StatelessWidget {
                 child: Text(
                   '',
                   style: GoogleFonts.inter(
-                    color: Theme.of(context).textTheme.headline6!.color,
+                    color: Theme.of(context).textTheme.titleLarge!.color,
                   ),
                 ),
               ),
@@ -52,13 +51,13 @@ class AppInfoView extends StatelessWidget {
                     Text(
                       app.name,
                       textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.headline6,
+                      style: Theme.of(context).textTheme.titleLarge,
                     ),
                     const SizedBox(height: 4),
                     Text(
                       app.version,
                       textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.subtitle1,
+                      style: Theme.of(context).textTheme.titleLarge,
                     ),
                     const SizedBox(height: 20),
                     Padding(
@@ -154,44 +153,6 @@ class AppInfoView extends StatelessWidget {
                                 endIndent: 12.0,
                                 width: 1.0,
                               ),
-                              Expanded(
-                                child: Material(
-                                  type: MaterialType.transparency,
-                                  child: InkWell(
-                                    borderRadius: BorderRadius.circular(16.0),
-                                    onTap: () {
-                                      model.updateNotImplemented(context);
-                                      // model.navigateToPatcher(app);
-                                      // Navigator.of(context).pop();
-                                    },
-                                    child: Column(
-                                      mainAxisAlignment:
-                                          MainAxisAlignment.center,
-                                      children: <Widget>[
-                                        Icon(
-                                          Icons.build_outlined,
-                                          color: Theme.of(context)
-                                              .colorScheme
-                                              .primary,
-                                        ),
-                                        const SizedBox(height: 10),
-                                        I18nText(
-                                          'appInfoView.patchButton',
-                                          child: Text(
-                                            '',
-                                            style: TextStyle(
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .primary,
-                                              fontWeight: FontWeight.bold,
-                                            ),
-                                          ),
-                                        ),
-                                      ],
-                                    ),
-                                  ),
-                                ),
-                              ),
                               if (app.isRooted)
                                 VerticalDivider(
                                   color: Theme.of(context).canvasColor,

lib/ui/widgets/appInfoView/app_info_viewmodel.dart

@@ -29,7 +29,7 @@ class AppInfoViewModel extends BaseViewModel {
   ) async {
     bool isUninstalled = true;
     if (app.isRooted) {
-      bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+      final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
       if (hasRootPermissions) {
         await _rootAPI.deleteApp(app.packageName, app.apkFilePath);
         if (!onlyUnpatch) {
@@ -45,7 +45,7 @@ class AppInfoViewModel extends BaseViewModel {
     }
   }
 
-  void navigateToPatcher(PatchedApplication app) async {
+  Future<void> navigateToPatcher(PatchedApplication app) async {
     locator<PatcherViewModel>().selectedApp = app;
     locator<PatcherViewModel>().selectedPatches =
         await _patcherAPI.getAppliedPatches(app.appliedPatches);
@@ -62,7 +62,7 @@ class AppInfoViewModel extends BaseViewModel {
     PatchedApplication app,
     bool onlyUnpatch,
   ) async {
-    bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+    final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
     if (app.isRooted && !hasRootPermissions) {
       return showDialog(
         context: context,
@@ -74,7 +74,7 @@ class AppInfoViewModel extends BaseViewModel {
             CustomMaterialButton(
               label: I18nText('okButton'),
               onPressed: () => Navigator.of(context).pop(),
-            )
+            ),
           ],
         ),
       );
@@ -103,7 +103,7 @@ class AppInfoViewModel extends BaseViewModel {
                   Navigator.of(context).pop();
                   Navigator.of(context).pop();
                 },
-              )
+              ),
             ],
           ),
         );
@@ -134,25 +134,28 @@ class AppInfoViewModel extends BaseViewModel {
         title: I18nText('appInfoView.appliedPatchesLabel'),
         backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         content: SingleChildScrollView(
-            child: Text(getAppliedPatchesString(app.appliedPatches))),
+          child: Text(getAppliedPatchesString(app.appliedPatches)),
+        ),
         actions: <Widget>[
           CustomMaterialButton(
             label: I18nText('okButton'),
             onPressed: () => Navigator.of(context).pop(),
-          )
+          ),
         ],
       ),
     );
   }
 
   String getAppliedPatchesString(List<String> appliedPatches) {
-    List<String> names = appliedPatches
-        .map((p) => p
-            .replaceAll('-', ' ')
-            .split('-')
-            .join(' ')
-            .toTitleCase()
-            .replaceFirst('Microg', 'MicroG'))
+    final List<String> names = appliedPatches
+        .map(
+          (p) => p
+              .replaceAll('-', ' ')
+              .split('-')
+              .join(' ')
+              .toTitleCase()
+              .replaceFirst('Microg', 'MicroG'),
+        )
         .toList();
     return '\u2022 ${names.join('\n\u2022 ')}';
   }

lib/ui/widgets/appSelectorView/app_skeleton_loader.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 import 'package:skeletons/skeletons.dart';
 
 class AppSkeletonLoader extends StatelessWidget {
@@ -6,61 +7,68 @@ class AppSkeletonLoader extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final screenWidth = MediaQuery.of(context).size.width;
-    return Skeleton(
-      isLoading: true,
-      skeleton: ListView.builder(
-        shrinkWrap: true,
-        itemCount: 7,
-        itemBuilder: (context, index) => Padding(
-          padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 8.0),
-          child: SkeletonItem(
-            child: Row(
-              children: <Widget>[
-                SkeletonAvatar(
-                  style: SkeletonAvatarStyle(
-                    width: screenWidth * 0.15,
-                    height: screenWidth * 0.15,
-                    shape: BoxShape.rectangle,
-                    borderRadius: const BorderRadius.all(Radius.circular(12)),
+    final screenWidth = MediaQuery.sizeOf(context).width;
+    return ListView.builder(
+      shrinkWrap: true,
+      itemCount: 7,
+      padding: EdgeInsets.zero,
+      itemBuilder: (context, index) => Padding(
+        padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 12.0),
+        child: CustomCard(
+          child: Row(
+            children: [
+              SkeletonAvatar(
+                style: SkeletonAvatarStyle(
+                  width: screenWidth * 0.10,
+                  height: screenWidth * 0.10,
+                  borderRadius: const BorderRadius.all(Radius.circular(12)),
+                ),
+              ),
+              const SizedBox(width: 16),
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  SizedBox(
+                    width: screenWidth * 0.4,
+                    child: SkeletonLine(
+                      style: SkeletonLineStyle(
+                        height: 20,
+                        width: screenWidth * 0.4,
+                        borderRadius:
+                            const BorderRadius.all(Radius.circular(10)),
+                      ),
+                    ),
                   ),
-                ),
-                const SizedBox(width: 16),
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: <Widget>[
-                    Container(
-                      color: Colors.white,
-                      height: 34,
-                      width: screenWidth * 0.4,
-                      child: SkeletonParagraph(
-                        style: const SkeletonParagraphStyle(
-                          lines: 1,
-                        ),
+                  const SizedBox(height: 12),
+                  SizedBox(
+                    width: screenWidth * 0.6,
+                    child: SkeletonLine(
+                      style: SkeletonLineStyle(
+                        height: 15,
+                        width: screenWidth * 0.6,
+                        borderRadius:
+                            const BorderRadius.all(Radius.circular(10)),
                       ),
                     ),
-                    const SizedBox(height: 12),
-                    Container(
-                      margin: const EdgeInsets.only(bottom: 4),
-                      color: Colors.white,
-                      height: 34,
-                      width: screenWidth * 0.6,
-                      child: SkeletonParagraph(
-                        style: const SkeletonParagraphStyle(
-                          lines: 1,
-                        ),
+                  ),
+                  const SizedBox(height: 5),
+                  SizedBox(
+                    width: screenWidth * 0.5,
+                    child: SkeletonLine(
+                      style: SkeletonLineStyle(
+                        height: 15,
+                        width: screenWidth * 0.5,
+                        borderRadius:
+                            const BorderRadius.all(Radius.circular(10)),
                       ),
                     ),
-                  ],
-                ),
-              ],
-            ),
+                  ),
+                ],
+              ),
+            ],
           ),
         ),
       ),
-      child: const Center(
-        child: Text('Content'),
-      ),
     );
   }
 }

lib/ui/widgets/appSelectorView/installed_app_item.dart

@@ -1,20 +1,26 @@
 import 'dart:typed_data';
 import 'package:flutter/material.dart';
+import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class InstalledAppItem extends StatefulWidget {
-  final String name;
-  final String pkgName;
-  final Uint8List icon;
-  final Function()? onTap;
-
   const InstalledAppItem({
     Key? key,
     required this.name,
     required this.pkgName,
     required this.icon,
+    required this.patchesCount,
+    required this.suggestedVersion,
+    required this.installedVersion,
     this.onTap,
   }) : super(key: key);
+  final String name;
+  final String pkgName;
+  final Uint8List icon;
+  final int patchesCount;
+  final String suggestedVersion;
+  final String installedVersion;
+  final Function()? onTap;
 
   @override
   State<InstalledAppItem> createState() => _InstalledAppItemState();
@@ -54,8 +60,42 @@ class _InstalledAppItemState extends State<InstalledAppItem> {
                       fontWeight: FontWeight.w500,
                     ),
                   ),
-                  const SizedBox(height: 4),
                   Text(widget.pkgName),
+                  I18nText(
+                    FlutterI18n.translate(
+                      context,
+                      'installed',
+                      translationParams: {
+                        'version': 'v${widget.installedVersion}',
+                      },
+                    ),
+                  ),
+                  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,
+                        ),
+                      ),
+                    ],
+                  ),
                 ],
               ),
             ),

lib/ui/widgets/appSelectorView/not_installed_app_item.dart

@@ -0,0 +1,101 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/flutter_i18n.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
+
+class NotInstalledAppItem extends StatefulWidget {
+  const NotInstalledAppItem({
+    Key? key,
+    required this.name,
+    required this.patchesCount,
+    required this.suggestedVersion,
+    this.onTap,
+  }) : super(key: key);
+  final String name;
+  final int patchesCount;
+  final String suggestedVersion;
+  final Function()? onTap;
+
+  @override
+  State<NotInstalledAppItem> createState() => _NotInstalledAppItem();
+}
+
+class _NotInstalledAppItem extends State<NotInstalledAppItem> {
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 4.0),
+      child: CustomCard(
+        onTap: widget.onTap,
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: <Widget>[
+            Container(
+              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,
+                ),
+              ),
+            ),
+            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,
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/ui/widgets/contributorsView/contributors_card.dart

@@ -6,14 +6,13 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class ContributorsCard extends StatefulWidget {
-  final String title;
-  final List<dynamic> contributors;
-
   const ContributorsCard({
     Key? key,
     required this.title,
     required this.contributors,
   }) : super(key: key);
+  final String title;
+  final List<dynamic> contributors;
 
   @override
   State<ContributorsCard> createState() => _ContributorsCardState();
@@ -56,6 +55,7 @@ class _ContributorsCardState extends State<ContributorsCard> {
                   Uri.parse(
                     widget.contributors[index]['html_url'],
                   ),
+                  mode: LaunchMode.externalApplication,
                 ),
                 child: FutureBuilder<File?>(
                   future: DefaultCacheManager().getSingleFile(

lib/ui/widgets/homeView/available_updates_card.dart

@@ -1,87 +0,0 @@
-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/patched_application.dart';
-import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/shared/application_item.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
-
-class AvailableUpdatesCard extends StatelessWidget {
-  AvailableUpdatesCard({Key? key}) : super(key: key);
-
-  final List<PatchedApplication> apps =
-      locator<HomeViewModel>().patchedUpdatableApps;
-
-  @override
-  Widget build(BuildContext context) {
-    return CustomCard(
-      child: Center(
-        child: Column(
-          children: <Widget>[
-            Icon(
-              size: 40,
-              Icons.update_disabled,
-              color: Theme.of(context).colorScheme.secondary,
-            ),
-            const SizedBox(height: 16),
-            I18nText(
-              'homeView.WIP',
-              child: Text(
-                '',
-                textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.subtitle1!.copyWith(
-                      color: Theme.of(context).colorScheme.secondary,
-                    ),
-              ),
-            )
-          ],
-        ),
-      ),
-    );
-    // return apps.isEmpty
-    //     ? CustomCard(
-    //         child: Center(
-    //           child: Column(
-    //             children: <Widget>[
-    //               Icon(
-    //                 size: 40,
-    //                 Icons.update_disabled,
-    //                 color: Theme.of(context).colorScheme.secondary,
-    //               ),
-    //               const SizedBox(height: 16),
-    //               I18nText(
-    //                 'homeView.noUpdates',
-    //                 child: Text(
-    //                   '',
-    //                   textAlign: TextAlign.center,
-    //                   style: Theme.of(context).textTheme.subtitle1!.copyWith(
-    //                         color: Theme.of(context).colorScheme.secondary,
-    //                       ),
-    //                 ),
-    //               )
-    //             ],
-    //           ),
-    //         ),
-    //       )
-    //     : ListView(
-    //         shrinkWrap: true,
-    //         padding: EdgeInsets.zero,
-    //         physics: const NeverScrollableScrollPhysics(),
-    //         children: apps
-    //             .map((app) => ApplicationItem(
-    //                 icon: app.icon,
-    //                 name: app.name,
-    //                 patchDate: app.patchDate,
-    //                 changelog: app.changelog,
-    //                 isUpdatableApp: true,
-    //                 //TODO: Find a better way to do update functionality
-    //                 onPressed: () {}
-    //                 // () =>
-    //                 //     locator<HomeViewModel>().navigateToPatcher(
-    //                 //   app,
-    //                 // ),
-    //                 ))
-    //             .toList(),
-    //       );
-  }
-}