bump: kotlin gradle plugin

.env

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

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -1,5 +1,5 @@
 name: 🐞 Bug report
-description: Create a new bug report.
+description: Report a very clearly broken issue.
 title: 'bug: <title>'
 labels: [bug]
 body:
@@ -8,20 +8,53 @@ body:
       value: |
         # ReVanced Manager bug report
 
-        Please check for existing issues [here](https://github.com/revanced/revanced-manager/labels/bug) before creating a new one.
-  - type: textarea
+        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: Bug description
-      description: |
-        - Describe your bug in detail
-        - Add steps to reproduce the bug if possible (Step 1. Download some files. Step 2. ...)
-        - Add images and videos if possible
-        - List selected patches if applicable
+      label: Type
+      options:
+        - Error while running the manager
+        - Error at runtime
+        - Cosmetic
+        - Other
     validations:
       required: true
   - type: textarea
     attributes:
-      label: Version of ReVanced Manager and version & name of application you tried to patch
+      label: Bug description
+      description: How did you find the bug? Any additional details that might help?
+    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.
     validations:
       required: true
   - type: dropdown
@@ -31,31 +64,57 @@ body:
         - Non-root
         - Root
     validations:
-      required: false
+      required: true
   - type: textarea
     attributes:
-      label: Device logs
-      description: Export logs in ReVanced Manager settings.
+      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.
       render: shell
     validations:
       required: true
   - type: textarea
     attributes:
-      label: Patcher logs
-      description: Export logs in "Patcher" screen.
+      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.
       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 don't follow the checklist below!
+      description: Your issue will be closed if you haven't done these steps.
       options:
-        - label: This request is not a duplicate of an existing issue.
+        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
           required: true
-        - label: I have chosen an appropriate title.
+        - label: I have written a short but informative title.
           required: true
-        - label: All requested information has been provided properly.
+        - label: I filled out all of the requested information in this issue properly.
           required: true
-        - label: The issue is solely related to the ReVanced Manager
+        - label: The issue is related solely to the ReVanced Manager
           required: true

.github/ISSUE_TEMPLATE/feature-issue.yml

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

.github/config.yaml

@@ -1,2 +0,0 @@
-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/debug-build.yml

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

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

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

README.md

@@ -3,33 +3,28 @@
 The official ReVanced Manager based on Flutter.
 
 ## 🔽 Download
-
-You can obtain ReVanced Manager by downloading it from either [revanced.app/download](https://revanced.app/download) or [GitHub Releases](https://github.com/ReVanced/revanced-manager/releases)
+To download the Alpha version of Manager, go [here](https://github.com/revanced/revanced-manager/releases/latest) and install the provided APK file.
 
 ## 📝 Prerequisites
-
 1. Android 8 or higher
-2. Incompatible with certain ARMv7 devices
+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)
 
-## 📃 Documentation
-The documentation can be found [here](https://github.com/revanced/revanced-manager/tree/main/docs).
+## ⚠️ 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.*
 
 ## 🔴 Issues
-
 For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose).
 
-## 🌐 Translation
+## 💭 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.
 
-[![Crowdin](https://badges.crowdin.net/revanced/localized.svg)](https://crowdin.com/project/revanced)
-
-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](/docs/4_building.md)
+3. Add your github token in gradle.properties like [this](https://github.com/revanced/revanced-documentation/wiki/Building-from-source)
 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,153 +11,23 @@ include: package:flutter_lints/flutter.yaml
 
 analyzer:
   exclude:
-    - lib/app/app.locator.dart
-    - lib/app/app.router.dart
-    - lib/models/patch.g.dart
-    - lib/models/patched_application.g.dart
+    - lib/utils/env_class.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:
-    - 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
+    # 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

android/Gemfile

@@ -1,3 +0,0 @@
-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 flutter.compileSdkVersion
+    compileSdkVersion 33
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -54,21 +54,7 @@ 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'
-            }
         }
     }
 
@@ -85,9 +71,14 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // ReVanced
-    implementation "app.revanced:revanced-patcher:17.0.0"
+    implementation "app.revanced:revanced-patcher:6.0.0"
 
     // 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,29 +2,21 @@
     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.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
-    
+    <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.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="@string/app_name"
+        android:label="ReVanced Manager"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:largeHeap="true"
-        android:requestLegacyExternalStorage="true"
         android:extractNativeLibs="true">
         <activity
             android:name=".MainActivity"
@@ -36,16 +28,13 @@
             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"/>
             </intent-filter>
         </activity>
-       <activity
-           android:name=".ExportSettingsActivity"
-           android:exported="true">
-       </activity>
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />

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

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

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

@@ -1,161 +1,77 @@
 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.PatchSet
 import app.revanced.patcher.Patcher
 import app.revanced.patcher.PatcherOptions
-import app.revanced.patcher.patch.PatchResult
+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 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 org.json.JSONArray
-import org.json.JSONObject
 import java.io.File
-import java.io.PrintWriter
-import java.io.StringWriter
-import java.util.logging.LogRecord
-import java.util.logging.Logger
+
+private const val PATCHER_CHANNEL = "app.revanced.manager.flutter/patcher"
+private const val INSTALLER_CHANNEL = "app.revanced.manager.flutter/installer"
 
 class MainActivity : FlutterActivity() {
     private val handler = Handler(Looper.getMainLooper())
     private lateinit var installerChannel: MethodChannel
-    private var cancel: Boolean = false
-    private var stopResult: MethodChannel.Result? = null
 
-    private lateinit var patches: PatchSet
-
-    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
-
-        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)
-
+        val mainChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, PATCHER_CHANNEL)
+        installerChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, INSTALLER_CHANNEL)
         mainChannel.setMethodCallHandler { call, result ->
             when (call.method) {
                 "runPatcher" -> {
+                    val patchBundleFilePath = call.argument<String>("patchBundleFilePath")
                     val originalFilePath = call.argument<String>("originalFilePath")
                     val inputFilePath = call.argument<String>("inputFilePath")
                     val patchedFilePath = call.argument<String>("patchedFilePath")
                     val outFilePath = call.argument<String>("outFilePath")
                     val integrationsPath = call.argument<String>("integrationsPath")
                     val selectedPatches = call.argument<List<String>>("selectedPatches")
-                    val options = call.argument<Map<String, Map<String, Any>>>("options")
                     val cacheDirPath = call.argument<String>("cacheDirPath")
+                    val mergeIntegrations = call.argument<Boolean>("mergeIntegrations")
                     val keyStoreFilePath = call.argument<String>("keyStoreFilePath")
-                    val keystorePassword = call.argument<String>("keystorePassword")
-
-                    if (
+                    if (patchBundleFilePath != null &&
                         originalFilePath != null &&
                         inputFilePath != null &&
                         patchedFilePath != null &&
                         outFilePath != null &&
                         integrationsPath != null &&
                         selectedPatches != null &&
-                        options != null &&
                         cacheDirPath != null &&
-                        keyStoreFilePath != null &&
-                        keystorePassword != null
+                        mergeIntegrations != null &&
+                        keyStoreFilePath != null
                     ) {
-                        cancel = false
                         runPatcher(
                             result,
+                            patchBundleFilePath,
                             originalFilePath,
                             inputFilePath,
                             patchedFilePath,
                             outFilePath,
                             integrationsPath,
                             selectedPatches,
-                            options,
                             cacheDirPath,
-                            keyStoreFilePath,
-                            keystorePassword
+                            mergeIntegrations,
+                            keyStoreFilePath
                         )
-                    } else result.notImplemented()
-                }
-
-                "stopPatcher" -> {
-                    cancel = true
-                    stopResult = result
-                }
-
-                "getPatches" -> {
-                    val patchBundleFilePath = call.argument<String>("patchBundleFilePath")!!
-                    val cacheDirPath = call.argument<String>("cacheDirPath")!!
-
-                    try {
-                        patches = PatchBundleLoader.Dex(
-                            File(patchBundleFilePath),
-                            optimizedDexDirectory = File(cacheDirPath)
-                        )
-                    } catch (ex: Exception) {
-                        return@setMethodCallHandler result.notImplemented()
-                    } catch (err: Error) {
-                        return@setMethodCallHandler result.notImplemented()
+                    } else {
+                        result.notImplemented()
                     }
-
-                    JSONArray().apply {
-                        patches.forEach {
-                            JSONObject().apply {
-                                put("name", it.name)
-                                put("description", it.description)
-                                put("excluded", !it.use)
-                                put("compatiblePackages", JSONArray().apply {
-                                    it.compatiblePackages?.forEach { compatiblePackage ->
-                                        val compatiblePackageJson = JSONObject().apply {
-                                            put("name", compatiblePackage.name)
-                                            put(
-                                                "versions",
-                                                JSONArray().apply {
-                                                    compatiblePackage.versions?.forEach { version ->
-                                                        put(version)
-                                                    }
-                                                })
-                                        }
-                                        put(compatiblePackageJson)
-                                    }
-                                })
-                                put("options", JSONArray().apply {
-                                    it.options.values.forEach { option ->
-                                        val optionJson = JSONObject().apply option@{
-                                            put("key", option.key)
-                                            put("title", option.title)
-                                            put("description", option.description)
-                                            put("required", option.required)
-
-                                            when (val value = option.value) {
-                                                null -> put("value", null)
-                                                is Array<*> -> put("value", JSONArray().apply {
-
-                                                    value.forEach { put(it) }
-                                                })
-                                                else -> put("value", option.value)
-                                            }
-
-                                            put("optionClassType", option::class.simpleName)
-                                        }
-                                        put(optionJson)
-                                    }
-                                })
-                            }.let(::put)
-                        }
-                    }.toString().let(result::success)
                 }
-
                 else -> result.notImplemented()
             }
         }
@@ -163,16 +79,16 @@ class MainActivity : FlutterActivity() {
 
     private fun runPatcher(
         result: MethodChannel.Result,
+        patchBundleFilePath: String,
         originalFilePath: String,
         inputFilePath: String,
         patchedFilePath: String,
         outFilePath: String,
         integrationsPath: String,
         selectedPatches: List<String>,
-        options: Map<String, Map<String, Any>>,
         cacheDirPath: String,
-        keyStoreFilePath: String,
-        keystorePassword: String
+        mergeIntegrations: Boolean,
+        keyStoreFilePath: String
     ) {
         val originalFile = File(originalFilePath)
         val inputFile = File(inputFilePath)
@@ -180,148 +96,125 @@ class MainActivity : FlutterActivity() {
         val outFile = File(outFilePath)
         val integrations = File(integrationsPath)
         val keyStoreFile = File(keyStoreFilePath)
-        val cacheDir = File(cacheDirPath)
 
         Thread {
-            fun updateProgress(progress: Double, header: String, log: String) {
+            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")
+                }
+
                 handler.post {
                     installerChannel.invokeMethod(
                         "update",
                         mapOf(
-                            "progress" to progress,
-                            "header" to header,
-                            "log" to log
+                            "progress" to 0.1,
+                            "header" to "",
+                            "log" to "Copying original apk"
                         )
                     )
                 }
-            }
-
-            fun postStop() = handler.post { stopResult!!.success(null) }
-
-            // Setup logger
-            Logger.getLogger("").apply {
-                handlers.forEach {
-                    it.close()
-                    removeHandler(it)
-                }
-
-                object : java.util.logging.Handler() {
-                    override fun publish(record: LogRecord) {
-                        if (record.loggerName?.startsWith("app.revanced") != true || cancel) return
-
-                        updateProgress(-1.0, "", record.message)
-                    }
-
-                    override fun flush() = Unit
-                    override fun close() = flush()
-                }.let(::addHandler)
-            }
-
-            try {
-                updateProgress(0.0, "", "Copying APK")
-
-                if (cancel) {
-                    postStop()
-                    return@Thread
-                }
-
                 originalFile.copyTo(inputFile, true)
 
-                if (cancel) {
-                    postStop()
-                    return@Thread
-                }
-
-                updateProgress(0.05, "Reading APK...", "Reading APK")
-
-                val patcher = Patcher(
-                    PatcherOptions(
-                        inputFile,
-                        cacheDir,
-                        Aapt.binary(applicationContext).absolutePath,
-                        cacheDir.path,
-                        true // TODO: Add option to disable this
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf(
+                            "progress" to 0.2,
+                            "header" to "Unpacking apk...",
+                            "log" to "Unpacking input apk"
+                        )
                     )
-                )
-
-                if (cancel) {
-                    postStop()
-                    return@Thread
                 }
+                val patcher =
+                    Patcher(
+                        PatcherOptions(
+                            inputFile,
+                            cacheDirPath,
+                            Aapt.binary(applicationContext).absolutePath,
+                            cacheDirPath,
+                            logger = ManagerLogger()
+                        )
+                    )
 
-                updateProgress(0.1, "Loading patches...", "Loading patches")
-
-                val patches = patches.filter { patch ->
-                    val isCompatible = patch.compatiblePackages?.any {
-                        it.name == patcher.context.packageMetadata.packageName
-                    } ?: false
-
-                    val compatibleOrUniversal =
-                        isCompatible || patch.compatiblePackages.isNullOrEmpty()
-
-                    compatibleOrUniversal && selectedPatches.any { it == patch.name }
-                }.onEach { patch ->
-                    options[patch.name]?.forEach { (key, value) ->
-                        patch.options[key] = value
+                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.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.patch.name} failed: $writer"
-                            } ?: run {
-                                "${patchResult.patch.name} succeeded"
-                            }
-
-                            updateProgress(progress, "", msg)
-                            progress += progressStep
+                patcher.addPatches(patches)
+                patcher.executePatches().forEach { (patch, res) ->
+                    if (res.isSuccess) {
+                        val msg = "[success] $patch"
+                        handler.post {
+                            installerChannel.invokeMethod(
+                                "update",
+                                mapOf(
+                                    "progress" to 0.5,
+                                    "header" to "",
+                                    "log" to msg
+                                )
+                            )
                         }
+                        return@forEach
+                    }
+                    val msg = "[error] $patch:" + res.exceptionOrNull()!!.printStackTrace()
+                    handler.post {
+                        installerChannel.invokeMethod(
+                            "update",
+                            mapOf("progress" to 0.5, "header" to "", "log" to msg)
+                        )
                     }
                 }
 
-                if (cancel) {
-                    postStop()
-                    patcher.close()
-                    return@Thread
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf(
+                            "progress" to 0.7,
+                            "header" to "Repacking apk...",
+                            "log" to "Repacking patched apk"
+                        )
+                    )
                 }
-
-                updateProgress(0.8, "Building...", "")
-
-                val res = patcher.get()
-                patcher.close()
-
+                val res = patcher.save()
                 ZipFile(patchedFile).use { file ->
                     res.dexFiles.forEach {
-                        if (cancel) {
-                            postStop()
-                            return@Thread
-                        }
                         file.addEntryCompressData(
                             ZipEntry.createWithName(it.name),
                             it.stream.readBytes()
@@ -338,35 +231,90 @@ class MainActivity : FlutterActivity() {
                         ZipAligner::getEntryAlignment
                     )
                 }
-
-                if (cancel) {
-                    postStop()
-                    return@Thread
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf(
+                            "progress" to 0.9,
+                            "header" to "Signing apk...",
+                            "log" to ""
+                        )
+                    )
                 }
 
-                updateProgress(0.9, "Signing...", "Signing APK")
+                // Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
 
                 try {
-                    Signer("ReVanced", keystorePassword)
-                        .signApk(patchedFile, outFile, keyStoreFile)
+                    Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
                 } catch (e: Exception) {
-                    print("Error signing APK: ${e.message}")
+                    //log to console
+                    print("Error signing apk: ${e.message}")
                     e.printStackTrace()
                 }
 
-                updateProgress(1.0, "Patched", "Patched")
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf(
+                            "progress" to 1.0,
+                            "header" to "Finished!",
+                            "log" to "Finished!"
+                        )
+                    )
+                }
             } catch (ex: Throwable) {
-                if (!cancel) {
-                    val stack = ex.stackTraceToString()
-                    updateProgress(
-                        -100.0,
-                        "Failed",
-                        "An error occurred:\n$stack"
+                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"
+                        )
                     )
                 }
             }
-
             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) {
+            handler.post {
+                installerChannel.invokeMethod(
+                    "update",
+                    mapOf("progress" to -1.0, "header" to "", "log" to msg)
+                )
+            }
+        }
+    }
 }

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

@@ -1,30 +0,0 @@
-<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,6 +1,5 @@
 <?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"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/values/colors.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,5 +1,6 @@
 buildscript {
-    ext.kotlin_version = '1.9.0'
+    ext.cronetVersion = '102.5005.125'
+    ext.kotlin_version = '1.7.20'
     repositories {
         google()
         mavenCentral()
@@ -16,9 +17,12 @@ allprojects {
         google()
         mavenCentral()
         maven {
-            url 'https://jitpack.io'
+            url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
+            credentials {
+                username = (project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")) as String
+                password = (project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")) as String
+            }
         }
-        mavenLocal()
     }
 }
 
@@ -28,6 +32,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-tasks.register("clean", Delete) {
+task clean(type: Delete) {
     delete rootProject.buildDir
 }

android/gradle.properties

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

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#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
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+zipStoreBase=GRADLE_USER_HOME

assets/i18n/en_US.json

@@ -1,65 +1,39 @@
 {
     "okButton": "OK",
     "cancelButton": "Cancel",
-    "dismissButton": "Dismiss",
-    "quitButton": "Quit",
-    "updateButton": "Update",
     "enabledLabel": "Enabled",
     "disabledLabel": "Disabled",
-    "installed":"Installed: {version}",
-    "suggested":"Suggested: {version}",
     "yesButton": "Yes",
     "noButton": "No",
-    "warning": "Warning",
-    "options": "Options",
-    "notice": "Notice",
-    "noShowAgain": "Don't show this again",
-    "add": "Add",
-    "remove": "Remove",
     "navigationView": {
         "dashboardTab": "Dashboard",
         "patcherTab": "Patcher",
         "settingsTab": "Settings"
     },
     "homeView": {
-        "refreshSuccess": "Refreshed successfully",
         "widgetTitle": "Dashboard",
-
         "updatesSubtitle": "Updates",
-        "patchedSubtitle": "Patched apps",
-
+        "patchedSubtitle": "Patched Applications",
+        "updatesAvailable": "Updates available",
         "noUpdates": "No updates available",
-
-        "WIP": "Work in progress...",
-
-        "noInstallations": "No patched apps installed",
-        "installUpdate": "Continue to install the update?",
-
+        "WIP": "Work In Progress",
+        "noInstallations": "No patched applications installed",
+        "installed": "Installed",
         "updateDialogTitle": "Update 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",
-
+        "updateDialogText": "Are you sure you want to download and update ReVanced Manager?",
+        "notificationTitle": "ReVanced Manager was updated",
+        "notificationText": "Tap to open the app",
         "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."
     },
     "applicationItem": {
-        "infoButton": "Info"
+        "patchButton": "Patch",
+        "infoButton": "Info",
+        "changelogLabel": "Changelog"
     },
     "latestCommitCard": {
         "loadingLabel": "Loading...",
@@ -71,28 +45,21 @@
     "patcherView": {
         "widgetTitle": "Patcher",
         "patchButton": "Patch",
-
-        "armv7WarningDialogText": "Patching on ARMv7 devices 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?",
-        "requiredOptionDialogText" : "Some patch options have to be set."
+        "patchDialogTitle": "Warning",
+        "patchDialogText": "You have selected a resource patch and a split APK installation was detected so patching errors may occur.\nAre you sure you want to proceed with patching a split base APK?"
     },
     "appSelectorCard": {
-        "widgetTitle": "Select an application",
+        "widgetTitle": "Select application",
         "widgetTitleSelected": "Selected application",
         "widgetSubtitle": "No application selected",
-
-        "noAppsLabel": "No applications found",
-        "notInstalled":"App not installed",
-
+        "noAppsLabel": "No applications found.",
         "currentVersion": "Current",
-        "suggestedVersion": "Suggested",
-        "allVersions": "All versions"
+        "recommendedVersion": "Recommended",
+        "anyVersion": "any"
     },
     "patchSelectorCard": {
         "widgetTitle": "Select patches",
         "widgetTitleSelected": "Selected patches",
-
         "widgetSubtitle": "Select an application first",
         "widgetEmptySubtitle": "No patches selected"
     },
@@ -101,224 +68,111 @@
         "widgetSubtitle": "We are online!"
     },
     "appSelectorView": {
-        "viewTitle": "Select an application",
+        "viewTitle": "Select application",
         "searchBarHint": "Search applications",
-
         "storageButton": "Storage",
-        "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"
+        "errorMessage": "Unable to use selected application."
     },
     "patchesSelectorView": {
         "viewTitle": "Select patches",
         "searchBarHint": "Search patches",
-        "universalPatches": "Universal patches",
-        "newPatches": "New patches",
-        "patches": "Patches",
-
         "doneButton": "Done",
-
-        "default": "Default",
-        "defaultTooltip": "Select all default patches",
-
-        "none": "None",
-        "noneTooltip": "Deselect all patches",
-
-        "loadPatchesSelection": "Load patch selection",
-        "noSavedPatches": "No saved patch selection for the selected app.\nPress Done to save the current selection.",
         "noPatchesFound": "No patches found for the selected app",
-        "setRequiredOption": "Some patches require options to be set:\n\n{patches}\n\nPlease set them before continuing."
-    },
-    "patchOptionsView": {
-        "resetOptionsTooltip": "Reset patch options",
-        "viewTitle": "Patch options",
-        "saveOptions": "Save",
-
-        "addOptions": "Add options",
-        "deselectPatch": "Deselect patch",
-        "tooltip": "More input options",
-        "selectFilePath": "Select file path",
-        "selectFolder": "Select folder",
-        "selectOption": "Select option",
-
-        "requiredOption": "This option is required",
-        "unsupportedOption": "This option is not supported",
-        "requiredOptionNull": "The following options have to be set:\n\n{options}"
+        "selectAllPatchesWarningTitle": "Warning",
+        "selectAllPatchesWarningContent": "You are about to select all patches, that includes unrecommended 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.",
-        "unsupportedRequiredOption": "This patch contains a required option that is not supported by this app",
-
-        "patchesChangeWarningDialogText": "It is recommended to use the default patch selection and options. Changing them may result in unexpected issues.\n\nYou'll need to turn on \"Allow changing patch selection\" in settings before changing any patch selection.",
-        "patchesChangeWarningDialogButton": "Use default selection"
+        "unsupportedWarningButton": "Warning",
+        "unsupportedDialogTitle": "Warning",
+        "unsupportedDialogText": "Selecting this patch may result in patching errors.\n\nApp version: {packageVersion}\nCurrent supported versions:\n{supportedVersions}"
     },
     "installerView": {
         "widgetTitle": "Installer",
-        "installType": "Select install type",
-        "installTypeDescription": "Select the installation type to proceed with.",
-
         "installButton": "Install",
-        "installRootType": "Mount",
-        "installNonRootType": "Normal",
-
-        "pressBackAgain": "Press back again to cancel",
+        "installRootButton": "Install as Root",
         "openButton": "Open",
         "shareButton": "Share file",
-        
         "notificationTitle": "ReVanced Manager is patching",
         "notificationText": "Tap to return to the installer",
-
-        "exportApkButtonTooltip": "Export patched APK",
-        "exportLogButtonTooltip": "Export log",
-
-        "screenshotDetected": "A screenshot has been detected. If you are trying to share the log, please share a text copy instead.\n\nCopy log to clipboard?",
-        "copiedToClipboard": "Copied log to clipboard",
-
-        "noExit": "Installer is still running, cannot exit..."
+        "shareApkMenuOption": "Share APK",
+        "shareLogMenuOption": "Share log",
+        "installErrorDialogTitle": "Error",
+        "installErrorDialogText1": "Root install is not possible with the current patches selection.\nRepatch your app or choose non-root install.",
+        "installErrorDialogText2": "Non-root install is not possible with the current patches selection.\nRepatch your app or choose root install if you have your device rooted.",
+        "installErrorDialogText3": "Root install is not possible as the original APK was selected from storage.\nSelect an installed app or choose non-root install.",
+        "noExit": "Installer is still running..."
     },
     "settingsView": {
         "widgetTitle": "Settings",
-
         "appearanceSectionTitle": "Appearance",
         "teamSectionTitle": "Team",
-        "debugSectionTitle": "Debugging",
+        "infoSectionTitle": "Info",
         "advancedSectionTitle": "Advanced",
-        "exportSectionTitle": "Import & export",
-
-        "themeModeLabel": "App theme",
-        "systemThemeLabel": "System",
-        "lightThemeLabel": "Light",
-        "darkThemeLabel": "Dark",
-
+        "logsSectionTitle": "Logs",
+        "darkThemeLabel": "Dark Mode",
+        "darkThemeHint": "Welcome to the Dark Side",
         "dynamicThemeLabel": "Material You",
         "dynamicThemeHint": "Enjoy an experience closer to your device",
-
         "languageLabel": "Language",
         "englishOption": "English",
-
+        "frenchOption": "French",
         "sourcesLabel": "Sources",
-        "sourcesLabelHint": "Configure your sources",
-        "sourcesIntegrationsLabel": "Integrations source",
+        "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 your sources to their default values?",
-        "apiURLResetDialogText": "Are you sure you want to reset your API URL to its default value?",
-        "sourcesUpdateNote": "Note: Patches will be updated to the latest version automatically.\n\nThis will reveal your IP address to the server.",
-
-        "apiURLLabel": "API URL",
-        "apiURLHint": "Configure your API URL",
-        "selectApiURL": "API URL",
-        "hostRepositoryLabel": "Repository API",
-        "orgPatchesLabel": "Patches organization",
-        "sourcesPatchesLabel": "Patches source",
-        "orgIntegrationsLabel": "Integrations organization",
-        
+        "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": "Share logs",
-        "logsHint": "Share ReVanced Manager logs",
-
-        "enablePatchesSelectionLabel": "Allow changing patch selection",
-        "enablePatchesSelectionHint": "Allow changing the selection of patches",
-        "enablePatchesSelectionWarningText": "Changing the selection of patches may cause unexpected issues.\n\nEnable anyways?",
-        "disablePatchesSelectionWarningText": "You are about to disable changing the selection of patches.\nThe default selection of patches will be restored.\n\nDisable anyways?",
-
-        "autoUpdatePatchesLabel": "Auto update patches",
-        "autoUpdatePatchesHint": "Automatically update patches to the latest version",
-        "universalPatchesLabel": "Show universal patches",
-        "universalPatchesHint": "Display all apps and universal patches (may slow down the app list)",
-        "versionCompatibilityCheckLabel": "Version compatibility check",
-        "versionCompatibilityCheckHint": "Restricts patches to supported app versions",
-
+        "logsLabel": "Logs",
+        "logsHint": "Share device debug logs",
+        "apiURLLabel": "API URL",
+        "apiURLHint": "Configure your custom API URL",
+        "selectApiURL": "Select URL",
         "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",
-
-        "deleteTempDirLabel": "Delete temporary files",
-        "deleteTempDirHint": "Delete unused temporary files",
-        "deletedTempDir": "Temporary files deleted",
-
-        "exportPatchesLabel": "Export patch selection",
-        "exportPatchesHint": "Export patch selection to a JSON file",
-        "exportedPatches": "Patch selection exported",
-        "noExportFileFound": "No patch selection to export",
-
-        "importPatchesLabel": "Import patch selection",
-        "importPatchesHint": "Import patch selection from a JSON file",
-        "importedPatches": "Patch selection imported",
-
-        "resetStoredPatchesLabel": "Reset patch selection",
-        "resetStoredPatchesHint": "Reset the stored patch selection",
-        "resetStoredPatchesDialogTitle": "Reset patch selection?",
-        "resetStoredPatchesDialogText": "The default selection of patches will be restored.",
-        "resetStoredPatches": "Patch selection has been reset",
-
-        "resetStoredOptionsLabel": "Reset patch options",
-        "resetStoredOptionsHint": "Reset all patch options",
-        "resetStoredOptionsDialogTitle": "Reset patch options?",
-        "resetStoredOptionsDialogText": "Resetting patch options will remove all saved options.",
-        "resetStoredOptions": "Options have been reset",
-
-        "deleteLogsLabel": "Clear logs",
-        "deleteLogsHint": "Delete collected ReVanced Manager logs",
-        "deletedLogs": "Logs deleted",
-
-        "regenerateKeystoreLabel": "Regenerate keystore",
-        "regenerateKeystoreHint": "Regenerate the keystore used to sign apps",
-
-        "regenerateKeystoreDialogTitle": "Regenerate keystore?",
-        "regenerateKeystoreDialogText": "Patched apps signed with the old keystore will no longer be able to be updated.",
-        "regeneratedKeystore": "Keystore regenerated",
-
-        "exportKeystoreLabel": "Export keystore",
-        "exportKeystoreHint": "Export the keystore used to sign apps",
-        "exportedKeystore": "Keystore exported",
-        "noKeystoreExportFileFound": "No keystore to export",
-
-        "importKeystoreLabel": "Import keystore",
-        "importKeystoreHint": "Import a keystore used to sign apps",
-        "importedKeystore": "Keystore imported",
-
-        "selectKeystorePassword": "Keystore password",
-        "selectKeystorePasswordHint": "Select keystore password used to sign apps",
-
-        "jsonSelectorErrorMessage": "Unable to use selected JSON file",
-        "keystoreSelectorErrorMessage": "Unable to use selected keystore file"
+        "deleteKeystoreLabel": "Delete keystore",
+        "deleteKeystoreHint": "Delete the keystore used to sign the app",
+        "deletedKeystore": "Keystore deleted",
+        "deleteTempDirLabel": "Delete temp directory",
+        "deleteTempDirHint": "Delete the temporary directory used to store temporary files",
+        "deletedTempDir": "Temp directory deleted",
+        "deleteLogsLabel": "Delete logs",
+        "deleteLogsHint": "Delete collected manager logs",
+        "deletedLogs": "Logs deleted"
     },
     "appInfoView": {
-        "widgetTitle": "App info",
+        "widgetTitle": "App Info",
         "openButton": "Open",
         "uninstallButton": "Uninstall",
+        "patchButton": "Patch",
         "unpatchButton": "Unpatch",
-        "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",
-        "installTypeLabel": "Installation type",
+        "rootDialogTitle": "Error",
+        "rootDialogText": "App was installed with root mode enabled but currently root mode is disabled.\nPlease enable root mode first.",
+        "packageNameLabel": "Package Name",
+        "originalPackageNameLabel": "Original Package Name",
+        "installTypeLabel": "Installation Type",
         "rootTypeLabel": "Root",
         "nonRootTypeLabel": "Non-root",
-        "patchedDateLabel": "Patched date",
-        "appliedPatchesLabel": "Applied patches",
-
+        "patchedDateLabel": "Patched Date",
         "patchedDateHint": "{date} at {time}",
+        "appliedPatchesLabel": "Applied Patches",
         "appliedPatchesHint": "{quantity} applied patches",
-        
-        "updateNotImplemented": "This feature has not been implemented yet"
+        "updateNotImplemented": "Update functionality not implemented yet"
     },
     "contributorsView": {
         "widgetTitle": "Contributors",
-        "patcherContributors": "Patcher contributors",
-        "patchesContributors": "Patches contributors",
-        "integrationsContributors": "Integrations contributors",
-        "cliContributors": "CLI contributors",
-        "managerContributors": "Manager contributors"
+        "patcherContributors": "Patcher Contributors",
+        "patchesContributors": "Patches Contributors",
+        "integrationsContributors": "Integrations Contributors",
+        "cliContributors": "CLI Contributors",
+        "managerContributors": "Manager Contributors"
     }
 }

crowdin.yml

@@ -1,4 +1,3 @@
-preserve_hierarchy: 1
 files:
-  - source: /assets/i18n/en_US.json
+  - source: /assets/i18n/en.json
     translation: /assets/i18n/%locale_with_underscore%.json

docs/0_prerequisites.md

@@ -1,16 +0,0 @@
-# 💼 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

@@ -1,14 +0,0 @@
-# ⬇️ 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

@@ -1,38 +0,0 @@
-# 🧩 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].
-
-   > [!NOTE]  
-   > Some patches have options that can or must be configured by tapping on ⚙️ icon next to the patch name.
-
-   >[!WARNING]  
-   > If you see a warning you can click on it for more information.
-5. Tap on the **Done** then **Patch** button
-
-   > [!WARNING]  
-   > The patching process may take ~5 minutes. Exiting the app may cancel patching or increase the time it takes to patch.
-6. Tap on the **Install** button
-
-   > [!NOTE]  
-   > If you are rooted, you can mount the patched app on top of the original app.[^3]
-   > Optionally, you may export the patched app to storage using the option in the bottom left corner.
-
-[^1]: Non-root users may be prompted to select an APK from storage, in which case you must source the APK file yourself. ReVanced does not provide any APK files.
-[^2]: It is suggested to use the default set of patches by tapping on the **Default** button above the list of patches.
-[^3]: Mounting the patched app on top of the original app will only work if the installed app version matches the version of the app selected in step 3. above.
-
-## ⏭️ What's next
-
-The next page will bring you back to the usage page.
-
-Continue: [🛠️ Usage](2_usage.md)

docs/2_2_managing.md

@@ -1,15 +0,0 @@
-# 🧰 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

@@ -1,14 +0,0 @@
-# 🔄 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

@@ -1,52 +0,0 @@
-# ⚙️ Configuring ReVanced Manager
-
-ReVanced Manager has settings that can be configured to your liking.
-
-## 🎛️ Essential settings
-
-- ### 🪛 Allow changing patch selection
-
-  Allows the user to change the patch selection from the default selection.
-
-- ### 🔍 Version compatibility check
-
-  Constrains patches to supported app versions. Disable this to patch any version of an app.
-
-  > [!WARNING]
-  > Disabling this may cause issues if the patches are not compatible with the app version.  
-
-- ### 🧑‍🔬 Show universal patches
-
-  Reveals patches which can be applied to any app.
-
-  > [!WARNING]  
-  > These patches may not work on all apps.
-
-- ### 🧬 Sources
-
-  Override the API and download patches from a different source.
-
-- ### 🔗 API URL
-
-  API to use to fetch updates and patches from.  
-
-- ### 💾 Imports & Exports
-
-  You can import, export or reset the following settings:
-
-  - 🔑 Keystore
-  - 📄 Patch selection
-  - ⚙️ Patch options
-
-  > [!NOTE]  
-  > This is particularly useful if you want to backup or reset your settings.
-
-- ### ❓ 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

@@ -1,16 +0,0 @@
-# 🛠️ 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

@@ -1,27 +0,0 @@
-# ❔ 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.
-
-- 🚨 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

@@ -1,41 +0,0 @@
-# 🛠️ 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 `~/android/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

@@ -1,21 +0,0 @@
-# 💊 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

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

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

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

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

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

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

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

gradlew

@@ -1,240 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,91 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

lib/app/app.dart

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

lib/main.dart

@@ -1,33 +1,52 @@
-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/download_manager.dart';
 import 'package:revanced_manager/services/github_api.dart';
 import 'package:revanced_manager/services/manager_api.dart';
+import 'package:revanced_manager/services/patcher_api.dart';
 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: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;
 Future main() async {
   await ThemeManager.initialise();
   await setupLocator();
   WidgetsFlutterBinding.ensureInitialized();
   await locator<ManagerAPI>().initialize();
-  await locator<DownloadManager>().initialize();
-  final String apiUrl = locator<ManagerAPI>().getApiUrl();
+  String apiUrl = locator<ManagerAPI>().getApiUrl();
   await locator<RevancedAPI>().initialize(apiUrl);
-  final String repoUrl = locator<ManagerAPI>().getRepoUrl();
-  locator<GithubAPI>().initialize(repoUrl);
+  // bool isSentryEnabled = locator<ManagerAPI>().isSentryEnabled();
+  locator<GithubAPI>().initialize();
+  await locator<PatcherAPI>().initialize();
   tz.initializeTimeZones();
-  prefs = await SharedPreferences.getInstance();
 
+  // Remove this section if you are building from source and don't have sentry configured
+  // await SentryFlutter.init(
+  //   (options) {
+  //     options
+  //       ..dsn = isSentryEnabled ? '' : ''
+  //       ..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());
 }
 
@@ -36,12 +55,6 @@ 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]);
-    const Locale locale = Locale('en', 'US');
-
     return DynamicThemeBuilder(
       title: 'ReVanced Manager',
       home: const NavigationView(),
@@ -49,18 +62,11 @@ class MyApp extends StatelessWidget {
         FlutterI18nDelegate(
           translationLoader: FileTranslationLoader(
             fallbackFile: 'en_US',
-            forcedLocale: locale,
             basePath: 'assets/i18n',
-            useCountryCode: true,
           ),
-          missingTranslationHandler: (key, locale) {
-            log(
-              '--> Missing translation: key: $key, languageCode: ${locale?.languageCode}',
-            );
-          },
         ),
         GlobalMaterialLocalizations.delegate,
-        GlobalWidgetsLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate
       ],
     );
   }

lib/models/patch.dart

@@ -1,41 +1,45 @@
 import 'package:json_annotation/json_annotation.dart';
+import 'package:revanced_manager/utils/string.dart';
 
 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,
-    required this.options,
   });
 
-  factory Patch.fromJson(Map<String, dynamic> json) {
-    // See: https://github.com/ReVanced/revanced-manager/issues/1364#issuecomment-1760414618
-    if (json['options'] == null) {
-      json['options'] = [];
-    }
-
-    return _$PatchFromJson(json);
-  }
-
-  final String name;
-  final String? description;
-  final bool excluded;
-  final List<Package> compatiblePackages;
-  final List<Option> options;
+  factory Patch.fromJson(Map<String, dynamic> json) => _$PatchFromJson(json);
 
   Map<String, dynamic> toJson() => _$PatchToJson(this);
 
   String getSimpleName() {
-    return name;
+    return name
+        .replaceAll('-', ' ')
+        .split('-')
+        .join(' ')
+        .toTitleCase()
+        .replaceFirst('Microg', 'MicroG');
   }
 }
 
 @JsonSerializable()
 class Package {
+  final String name;
+  final List<String> versions;
+
   Package({
     required this.name,
     required this.versions,
@@ -44,31 +48,5 @@ class Package {
   factory Package.fromJson(Map<String, dynamic> json) =>
       _$PackageFromJson(json);
 
-  final String name;
-  final List<String> versions;
-
   Map toJson() => _$PackageToJson(this);
 }
-
-@JsonSerializable()
-class Option {
-  Option({
-    required this.key,
-    required this.title,
-    required this.description,
-    required this.value,
-    required this.required,
-    required this.optionClassType,
-  });
-
-  factory Option.fromJson(Map<String, dynamic> json) => _$OptionFromJson(json);
-
-  final String key;
-  final String title;
-  final String description;
-  dynamic value;
-  final bool required;
-  final String optionClassType;
-
-  Map toJson() => _$OptionToJson(this);
-}

lib/models/patched_application.dart

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

lib/services/download_manager.dart

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

lib/services/github_api.dart

@@ -1,171 +1,145 @@
+import 'dart:convert';
 import 'dart:io';
 import 'package:collection/collection.dart';
 import 'package:dio/dio.dart';
-import 'package:flutter/foundation.dart';
+import 'package:dio_http_cache_lts/dio_http_cache_lts.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:injectable/injectable.dart';
-import 'package:revanced_manager/app/app.locator.dart';
-import 'package:revanced_manager/services/download_manager.dart';
-import 'package:revanced_manager/services/manager_api.dart';
+import 'package:native_dio_client/native_dio_client.dart';
+import 'package:revanced_manager/models/patch.dart';
+import 'package:revanced_manager/utils/check_for_gms.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
+import 'package:sentry_dio/sentry_dio.dart';
 
 @lazySingleton
 class GithubAPI {
-  late final Dio _dio;
-  late final ManagerAPI _managerAPI = locator<ManagerAPI>();
-  late final DownloadManager _downloadManager = locator<DownloadManager>();
+  late Dio _dio = Dio();
+  final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
+  final Options _cacheOptions = buildCacheOptions(
+    const Duration(hours: 6),
+    maxStale: const Duration(days: 1),
+  );
+  final Map<String, String> repoAppPath = {
+    'com.google.android.youtube': 'youtube',
+    'com.google.android.apps.youtube.music': 'music',
+    'com.twitter.android': 'twitter',
+    'com.reddit.frontpage': 'reddit',
+    'com.zhiliaoapp.musically': 'tiktok',
+    'de.dwd.warnapp': 'warnwetter',
+    'com.garzotto.pflotsh.ecmwf_a': 'ecmwf',
+    'com.spotify.music': 'spotify',
+  };
 
-  Future<void> initialize(String repoUrl) async {
-    _dio = _downloadManager.initDio(repoUrl);
+  void initialize() async {
+    try {
+      bool isGMSInstalled = await checkForGMS();
+
+      if (!isGMSInstalled) {
+        _dio = Dio(BaseOptions(
+          baseUrl: 'https://api.github.com',
+        ));
+        print('GitHub API: Using default engine + $isGMSInstalled');
+      } else {
+        _dio = Dio(BaseOptions(
+          baseUrl: 'https://api.github.com',
+        ))
+          ..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);
+    }
   }
 
   Future<void> clearAllCache() async {
-    await _downloadManager.clearAllCache();
-  }
-
-  Future<Map<String, dynamic>?> getLatestRelease(
-    String repoName,
-  ) async {
     try {
-      final response = await _dio.get(
-        '/repos/$repoName/releases',
-      );
-      return response.data[0];
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-      return null;
+      await _dioCacheManager.clearAll();
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
     }
   }
 
-  Future<Map<String, dynamic>?> getPatchesRelease(
-    String repoName,
-    String version,
-  ) async {
+  Future<Map<String, dynamic>?> _getLatestRelease(String repoName) async {
     try {
-      final response = await _dio.get(
-        '/repos/$repoName/releases/tags/$version',
-      );
-      return response.data;
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-      return null;
-    }
-  }
-
-  Future<Map<String, dynamic>?> getLatestPatchesRelease(
-    String repoName,
-  ) async {
-    try {
-      final response = await _dio.get(
+      var response = await _dio.get(
         '/repos/$repoName/releases/latest',
+        options: _cacheOptions,
       );
       return response.data;
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
       return null;
     }
   }
 
-  Future<Map<String, dynamic>?> getLatestManagerRelease(
+  Future<List<String>> getCommits(
+    String packageName,
     String repoName,
+    DateTime since,
   ) async {
+    String path =
+        'src/main/kotlin/app/revanced/patches/${repoAppPath[packageName]}';
     try {
-      final response = await _dio.get(
-        '/repos/$repoName/releases',
+      var response = await _dio.get(
+        '/repos/$repoName/commits',
+        queryParameters: {
+          'path': path,
+          'since': since.toIso8601String(),
+        },
+        options: _cacheOptions,
       );
-      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;
+      List<dynamic> commits = response.data;
+      return commits
+          .map(
+            (commit) => (commit['commit']['message']).split('\n')[0] +
+                ' - ' +
+                commit['commit']['author']['name'] +
+                '\n' as String,
+          )
+          .toList();
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
+      return List.empty();
     }
   }
 
-  Future<File?> getLatestReleaseFile(
-    String extension,
-    String repoName,
-  ) async {
+  Future<File?> getLatestReleaseFile(String extension, String repoName) async {
     try {
-      final Map<String, dynamic>? release = await getLatestRelease(repoName);
+      Map<String, dynamic>? release = await _getLatestRelease(repoName);
       if (release != null) {
-        final Map<String, dynamic>? asset =
+        Map<String, dynamic>? asset =
             (release['assets'] as List<dynamic>).firstWhereOrNull(
           (asset) => (asset['name'] as String).endsWith(extension),
         );
         if (asset != null) {
-          return await _downloadManager.getSingleFile(
+          return await DefaultCacheManager().getSingleFile(
             asset['browser_download_url'],
           );
         }
       }
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
+      return null;
     }
     return null;
   }
 
-  Future<File?> getPatchesReleaseFile(
-    String extension,
-    String repoName,
-    String version,
-    String url,
-  ) async {
+  Future<List<Patch>> getPatches(String repoName) async {
+    List<Patch> patches = [];
     try {
-      if (url.isNotEmpty) {
-        return await _downloadManager.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 _downloadManager.getSingleFile(
-            downloadUrl,
-          );
-        }
-      }
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
+      File? f = await getLatestReleaseFile('.json', repoName);
+      if (f != null) {
+        List<dynamic> list = jsonDecode(f.readAsStringSync());
+        patches = list.map((patch) => Patch.fromJson(patch)).toList();
       }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
+      return List.empty();
     }
-    return null;
+    return patches;
   }
 }

lib/services/manager_api.dart

@@ -1,24 +1,16 @@
 import 'dart:convert';
 import 'dart:io';
 import 'package:device_apps/device_apps.dart';
-import 'package:device_info_plus/device_info_plus.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:injectable/injectable.dart';
 import 'package:package_info_plus/package_info_plus.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/github_api.dart';
-import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/revanced_api.dart';
 import 'package:revanced_manager/services/root_api.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
-import 'package:revanced_manager/utils/check_for_supported_patch.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:timeago/timeago.dart';
 
 @lazySingleton
 class ManagerAPI {
@@ -28,47 +20,15 @@ class ManagerAPI {
   final String patcherRepo = 'revanced-patcher';
   final String cliRepo = 'revanced-cli';
   late SharedPreferences _prefs;
-  List<Patch> patches = [];
-  List<Option> modifiedOptions = [];
-  List<Option> options = [];
-  Patch? selectedPatch;
-  BuildContext? ctx;
-  bool isRooted = false;
-  bool isDynamicThemeAvailable = 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 defaultApiUrl = 'https://releases.revanced.app/';
   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();
-    isDynamicThemeAvailable = (await getSdkVersion()) >= 31; // ANDROID_12_SDK_VERSION = 31
-    storedPatchesFile =
-        (await getApplicationDocumentsDirectory()).path + storedPatchesFile;
-  }
-
-  Future<int> getSdkVersion() async {
-    final AndroidDeviceInfo info = await DeviceInfoPlugin().androidInfo;
-    return info.version.sdkInt;
   }
 
   String getApiUrl() {
@@ -79,29 +39,11 @@ class ManagerAPI {
     if (url.isEmpty || url == ' ') {
       url = defaultApiUrl;
     }
+    await _revancedAPI.initialize(url);
     await _revancedAPI.clearAllCache();
     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;
   }
@@ -113,109 +55,6 @@ 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);
-  }
-
-  Option? getPatchOption(String packageName, String patchName, String key) {
-    final String? optionJson =
-        _prefs.getString('patchOption-$packageName-$patchName-$key');
-    if (optionJson != null) {
-      final Option option = Option.fromJson(jsonDecode(optionJson));
-      return option;
-    } else {
-      return null;
-    }
-  }
-
-  void setPatchOption(Option option, String patchName, String packageName) {
-    final String optionJson = jsonEncode(option.toJson());
-    _prefs.setString(
-      'patchOption-$packageName-$patchName-${option.key}',
-      optionJson,
-    );
-  }
-
-  void clearPatchOption(String packageName, String patchName, String key) {
-    _prefs.remove('patchOption-$packageName-$patchName-$key');
-  }
-
   String getIntegrationsRepo() {
     return _prefs.getString('integrationsRepo') ?? defaultIntegrationsRepo;
   }
@@ -235,37 +74,21 @@ class ManagerAPI {
     await _prefs.setBool('useDynamicTheme', value);
   }
 
-  int getThemeMode() {
-    return _prefs.getInt('themeMode') ?? 2;
+  bool getUseDarkTheme() {
+    return _prefs.getBool('useDarkTheme') ?? false;
   }
 
-  Future<void> setThemeMode(int value) async {
-    await _prefs.setInt('themeMode', value);
+  Future<void> setUseDarkTheme(bool value) async {
+    await _prefs.setBool('useDarkTheme', value);
   }
 
-  bool areUniversalPatchesEnabled() {
-    return _prefs.getBool('universalPatchesEnabled') ?? false;
-  }
+  // bool isSentryEnabled() {
+  //   return _prefs.getBool('sentryEnabled') ?? true;
+  // }
 
-  Future<void> enableUniversalPatchesStatus(bool value) async {
-    await _prefs.setBool('universalPatchesEnabled', value);
-  }
-
-  bool isVersionCompatibilityCheckEnabled() {
-    return _prefs.getBool('versionCompatibilityCheckEnabled') ?? true;
-  }
-
-  Future<void> enableVersionCompatibilityCheckStatus(bool value) async {
-    await _prefs.setBool('versionCompatibilityCheckEnabled', value);
-  }
-
-  Future<void> setKeystorePassword(String password) async {
-    await _prefs.setString('keystorePassword', password);
-  }
-
-  String getKeystorePassword() {
-    return _prefs.getString('keystorePassword') ?? defaultKeystorePassword;
-  }
+  // Future<void> setSentryStatus(bool value) async {
+  //   await _prefs.setBool('sentryEnabled', value);
+  // }
 
   Future<void> deleteTempFolder() async {
     final Directory dir = Directory('/data/local/tmp/revanced-manager');
@@ -276,34 +99,29 @@ class ManagerAPI {
 
   Future<void> deleteKeystore() async {
     final File keystore = File(
-      keystoreFile,
-    );
+        '/sdcard/Android/data/app.revanced.manager.flutter/files/revanced-manager.keystore');
     if (await keystore.exists()) {
       await keystore.delete();
     }
   }
 
   List<PatchedApplication> getPatchedApps() {
-    final List<String> apps = _prefs.getStringList('patchedApps') ?? [];
+    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 {
-    final List<PatchedApplication> patchedApps = getPatchedApps();
+    List<PatchedApplication> patchedApps = getPatchedApps();
     patchedApps.removeWhere((a) => a.packageName == app.packageName);
-    final ApplicationWithIcon? installed = await DeviceApps.getApp(
+    ApplicationWithIcon? installed = await DeviceApps.getApp(
       app.packageName,
       true,
     ) as ApplicationWithIcon?;
@@ -317,19 +135,17 @@ class ManagerAPI {
   }
 
   Future<void> deletePatchedApp(PatchedApplication app) async {
-    final List<PatchedApplication> patchedApps = getPatchedApps();
+    List<PatchedApplication> patchedApps = getPatchedApps();
     patchedApps.removeWhere((a) => a.packageName == app.packageName);
     await setPatchedApps(patchedApps);
   }
 
-  Future<void> clearAllData() async {
+  void clearAllData() async {
     try {
       _revancedAPI.clearAllCache();
       _githubAPI.clearAllCache();
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
     }
   }
 
@@ -338,109 +154,63 @@ class ManagerAPI {
   }
 
   Future<List<Patch>> getPatches() async {
-    if (patches.isNotEmpty) {
-      return patches;
-    }
-    final File? patchBundleFile = await downloadPatches();
-    final Directory appCache = await getTemporaryDirectory();
-    Directory('${appCache.path}/cache').createSync();
-    final Directory workDir =
-        Directory('${appCache.path}/cache').createTempSync('tmp-');
-    final Directory cacheDir = Directory('${workDir.path}/cache');
-    cacheDir.createSync();
-    if (patchBundleFile != null) {
-      try {
-        final String patchesJson = await PatcherAPI.patcherChannel.invokeMethod(
-          'getPatches',
-          {
-            'patchBundleFilePath': patchBundleFile.path,
-            'cacheDirPath': cacheDir.path,
-          },
-        );
-        final List<dynamic> patchesJsonList = jsonDecode(patchesJson);
-        patches = patchesJsonList
-            .map((patchJson) => Patch.fromJson(patchJson))
-            .toList();
-        return patches;
-      } on Exception catch (e) {
-        if (kDebugMode) {
-          print(e);
-        }
+    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 [];
     }
-
-    return List.empty();
   }
 
   Future<File?> downloadPatches() async {
     try {
-      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);
+      String repoName = getPatchesRepo();
+      if (repoName == defaultPatchesRepo) {
+        return await _revancedAPI.getLatestReleaseFile(
+          '.jar',
+          defaultPatchesRepo,
+        );
+      } else {
+        return await _githubAPI.getLatestReleaseFile('.jar', repoName);
       }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
       return null;
     }
   }
 
   Future<File?> downloadIntegrations() async {
     try {
-      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);
+      String repoName = getIntegrationsRepo();
+      if (repoName == defaultIntegrationsRepo) {
+        return await _revancedAPI.getLatestReleaseFile(
+          '.apk',
+          defaultIntegrationsRepo,
+        );
+      } else {
+        return await _githubAPI.getLatestReleaseFile('.apk', repoName);
       }
+    } 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?> 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?> getLatestPatcherReleaseTime() async {
+    return await _revancedAPI.getLatestReleaseTime('.gz', defaultPatcherRepo);
   }
 
   Future<String?> getLatestManagerReleaseTime() async {
-    return await _revancedAPI.getLatestReleaseTime(
-      '.apk',
-      defaultManagerRepo,
-    );
+    return await _revancedAPI.getLatestReleaseTime('.apk', defaultManagerRepo);
   }
 
   Future<String?> getLatestManagerVersion() async {
@@ -450,87 +220,24 @@ 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 {
-    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;
-      }
-    }
+    return await _revancedAPI.getLatestReleaseVersion(
+      '.json',
+      defaultPatchesRepo,
+    );
   }
 
   Future<String> getCurrentManagerVersion() async {
-    final PackageInfo packageInfo = await PackageInfo.fromPlatform();
+    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 {
-    final List<PatchedApplication> toRemove = [];
-    for (final PatchedApplication app in patchedApps) {
-      final bool isRemove = await isAppUninstalled(app);
+    List<PatchedApplication> toRemove = [];
+    for (PatchedApplication app in patchedApps) {
+      bool isRemove = await isAppUninstalled(app);
       if (isRemove) {
         toRemove.add(app);
       }
@@ -538,116 +245,101 @@ class ManagerAPI {
     return toRemove;
   }
 
-  Future<List<PatchedApplication>> getMountedApps() async {
-    final List<PatchedApplication> mountedApps = [];
-    final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+  Future<List<PatchedApplication>> getUnsavedApps(
+    List<PatchedApplication> patchedApps,
+  ) async {
+    List<PatchedApplication> unsavedApps = [];
+    bool hasRootPermissions = await _rootAPI.hasRootPermissions();
     if (hasRootPermissions) {
-      final List<String> installedApps = await _rootAPI.getInstalledApps();
-      for (final String packageName in installedApps) {
-        final ApplicationWithIcon? application = await DeviceApps.getApp(
-          packageName,
+      List<String> installedApps = await _rootAPI.getInstalledApps();
+      for (String packageName in installedApps) {
+        if (!patchedApps.any((app) => app.packageName == packageName)) {
+          ApplicationWithIcon? application = await DeviceApps.getApp(
+            packageName,
+            true,
+          ) as ApplicationWithIcon?;
+          if (application != null) {
+            unsavedApps.add(
+              PatchedApplication(
+                name: application.appName,
+                packageName: application.packageName,
+                originalPackageName: application.packageName,
+                version: application.versionName!,
+                apkFilePath: application.apkFilePath,
+                icon: application.icon,
+                patchDate: DateTime.now(),
+                isRooted: true,
+              ),
+            );
+          }
+        }
+      }
+    }
+    List<Application> userApps = await DeviceApps.getInstalledApplications(
+      includeSystemApps: false,
+      includeAppIcons: false,
+    );
+    for (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(
+          app.packageName,
           true,
         ) as ApplicationWithIcon?;
         if (application != null) {
-          mountedApps.add(
+          unsavedApps.add(
             PatchedApplication(
               name: application.appName,
               packageName: application.packageName,
+              originalPackageName: application.packageName,
               version: application.versionName!,
               apkFilePath: application.apkFilePath,
               icon: application.icon,
               patchDate: DateTime.now(),
-              isRooted: true,
+              isRooted: false,
             ),
           );
         }
       }
     }
-
-    return mountedApps;
-  }
-
-  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();
-              },
-            ),
-          ],
-        ),
-      ),
-    );
+    return unsavedApps;
   }
 
   Future<void> reAssessSavedApps() async {
-    final List<PatchedApplication> patchedApps = getPatchedApps();
-
-    // Remove apps that are not installed anymore.
-    final List<PatchedApplication> toRemove =
-        await getAppsToRemove(patchedApps);
+    List<PatchedApplication> patchedApps = getPatchedApps();
+    List<PatchedApplication> unsavedApps = await getUnsavedApps(patchedApps);
+    patchedApps.addAll(unsavedApps);
+    List<PatchedApplication> toRemove = await getAppsToRemove(patchedApps);
     patchedApps.removeWhere((a) => toRemove.contains(a));
-
-    // Determine all apps that are installed by mounting.
-    final List<PatchedApplication> mountedApps = await getMountedApps();
-    mountedApps.removeWhere(
-      (app) => patchedApps
-          .any((patchedApp) => patchedApp.packageName == app.packageName),
-    );
-    patchedApps.addAll(mountedApps);
-
+    for (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 =
+            (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]'), ''));
+          if (currentInstalledVersionInt > currentSavedVersionInt) {
+            app.hasUpdates = true;
+          }
+        }
+      }
+    }
     await setPatchedApps(patchedApps);
   }
 
   Future<bool> isAppUninstalled(PatchedApplication app) async {
     bool existsRoot = false;
-    final bool existsNonRoot = await DeviceApps.isAppInstalled(app.packageName);
+    bool existsNonRoot = await DeviceApps.isAppInstalled(app.packageName);
     if (app.isRooted) {
-      final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+      bool hasRootPermissions = await _rootAPI.hasRootPermissions();
       if (hasRootPermissions) {
         existsRoot = await _rootAPI.isAppInstalled(app.packageName);
       }
@@ -656,6 +348,32 @@ class ManagerAPI {
     return !existsNonRoot;
   }
 
+  Future<bool> hasAppUpdates(String packageName, DateTime patchDate) async {
+    List<String> commits = await _githubAPI.getCommits(
+      packageName,
+      getPatchesRepo(),
+      patchDate,
+    );
+    return commits.isNotEmpty;
+  }
+
+  Future<List<String>> getAppChangelog(
+      String packageName, DateTime patchDate) async {
+    List<String> newCommits = await _githubAPI.getCommits(
+      packageName,
+      getPatchesRepo(),
+      patchDate,
+    );
+    if (newCommits.isEmpty) {
+      newCommits = await _githubAPI.getCommits(
+        packageName,
+        getPatchesRepo(),
+        patchDate,
+      );
+    }
+    return newCommits;
+  }
+
   Future<bool> isSplitApk(PatchedApplication patchedApp) async {
     Application? app;
     if (patchedApp.isFromStorage) {
@@ -665,74 +383,4 @@ class ManagerAPI {
     }
     return app != null && app.isSplit;
   }
-
-  Future<void> setSelectedPatches(
-    String app,
-    List<String> patches,
-  ) async {
-    final File selectedPatchesFile = File(storedPatchesFile);
-    final Map<String, dynamic> patchesMap = await readSelectedPatchesFile();
-    if (patches.isEmpty) {
-      patchesMap.remove(app);
-    } else {
-      patchesMap[app] = patches;
-    }
-    selectedPatchesFile.writeAsString(jsonEncode(patchesMap));
-  }
-
-  // get default patches for app
-  Future<List<String>> getDefaultPatches() async {
-    final List<Patch> patches = await getPatches();
-    final List<String> defaultPatches = [];
-    if (isVersionCompatibilityCheckEnabled() == true) {
-      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 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()) {
-      return {};
-    }
-    final String string = selectedPatchesFile.readAsStringSync();
-    if (string.trim().isEmpty) {
-      return {};
-    }
-    return jsonDecode(string);
-  }
-
-  void resetAllOptions() {
-    _prefs.getKeys().where((key) => key.startsWith('patchOption-')).forEach(
-      (key) {
-        _prefs.remove(key);
-      },
-    );
-  }
-
-  Future<void> resetLastSelectedPatches() async {
-    final File selectedPatchesFile = File(storedPatchesFile);
-    if (selectedPatchesFile.existsSync()) {
-      selectedPatchesFile.deleteSync();
-    }
-  }
 }

lib/services/patcher_api.dart

@@ -1,39 +1,33 @@
 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';
 
 @lazySingleton
 class PatcherAPI {
   static const patcherChannel =
-  MethodChannel('app.revanced.manager.flutter/patcher');
+      MethodChannel('app.revanced.manager.flutter/patcher');
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final RootAPI _rootAPI = RootAPI();
   late Directory _dataDir;
   late Directory _tmpDir;
   late File _keyStoreFile;
   List<Patch> _patches = [];
-  List<Patch> _universalPatches = [];
-  List<String> _compatiblePackages = [];
-  Map filteredPatches = <String, List<Patch>>{};
-  File? outFile;
+  File? _outFile;
 
   Future<void> initialize() async {
-    await loadPatches();
-    await _managerAPI.downloadIntegrations();
-    final Directory appCache = await getTemporaryDirectory();
+    await _loadPatches();
+    Directory appCache = await getTemporaryDirectory();
     _dataDir = await getExternalStorageDirectory() ?? appCache;
     _tmpDir = Directory('${appCache.path}/patcher');
     _keyStoreFile = File('${_dataDir.path}/revanced-manager.keystore');
@@ -46,279 +40,250 @@ 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 {
+  Future<void> _loadPatches() async {
     try {
       if (_patches.isEmpty) {
         _patches = await _managerAPI.getPatches();
       }
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
       _patches = List.empty();
     }
-
-    _compatiblePackages = getCompatiblePackages();
-    _universalPatches = getUniversalPatches();
   }
 
-  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);
+  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);
+            }
           }
-        }
-      } on Exception catch (e) {
-        if (kDebugMode) {
-          print(e);
+        } on Exception catch (e, s) {
+          await Sentry.captureException(e, stackTrace: s);
+          continue;
         }
       }
     }
     return filteredApps;
   }
 
-  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),
-    )
+  Future<List<Patch>> getFilteredPatches(String packageName) async {
+    return _patches
+        .where((patch) =>
+            !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();
   }
 
-  Future<void> runPatcher(String packageName,
-      String apkFilePath,
-      List<Patch> selectedPatches,) async {
-    final File? integrationsFile = await _managerAPI.downloadIntegrations();
-    final Map<String, Map<String, dynamic>> options = {};
-    for (final patch in selectedPatches) {
-      if (patch.options.isNotEmpty) {
-        final Map<String, dynamic> patchOptions = {};
-        for (final option in patch.options) {
-          final patchOption = _managerAPI.getPatchOption(packageName, patch.name, option.key);
-          if (patchOption != null) {
-            patchOptions[patchOption.key] = patchOption.value;
-          }
+  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 {
+    return selectedPatches.any(
+      (patch) => patch.dependencies.any(
+        (dep) => dep.contains('resource-'),
+      ),
+    );
+  }
+
+  Future<bool> needsSettingsPatch(List<Patch> selectedPatches) async {
+    return selectedPatches.any(
+      (patch) => patch.dependencies.any(
+        (dep) => dep.contains('settings'),
+      ),
+    );
+  }
+
+  Future<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,
+    List<Patch> selectedPatches,
+  ) async {
+    bool mergeIntegrations = await needsIntegrations(selectedPatches);
+    bool includeSettings = await needsSettingsPatch(selectedPatches);
+    if (includeSettings) {
+      try {
+        Patch? settingsPatch = _patches.firstWhereOrNull(
+          (patch) =>
+              patch.name.contains('settings') &&
+              patch.compatiblePackages.any((pack) => pack.name == packageName),
+        );
+        if (settingsPatch != null) {
+          selectedPatches.add(settingsPatch);
         }
-        options[patch.name] = patchOptions;
+      } on Exception catch (e, s) {
+        await Sentry.captureException(e, stackTrace: s);
+        // ignore
       }
     }
-
-    if (integrationsFile != null) {
+    File? patchBundleFile = await _managerAPI.downloadPatches();
+    File? integrationsFile;
+    if (mergeIntegrations) {
+      integrationsFile = await _managerAPI.downloadIntegrations();
+    }
+    if (patchBundleFile != null) {
       _dataDir.createSync();
       _tmpDir.createSync();
-      final Directory workDir = _tmpDir.createTempSync('tmp-');
-      final File inputFile = File('${workDir.path}/base.apk');
-      final File patchedFile = File('${workDir.path}/patched.apk');
-      outFile = File('${workDir.path}/out.apk');
-      final Directory cacheDir = Directory('${workDir.path}/cache');
+      Directory workDir = _tmpDir.createTempSync('tmp-');
+      File inputFile = File('${workDir.path}/base.apk');
+      File patchedFile = File('${workDir.path}/patched.apk');
+      _outFile = File('${workDir.path}/out.apk');
+      Directory cacheDir = Directory('${workDir.path}/cache');
       cacheDir.createSync();
-      final String originalFilePath = apkFilePath;
-
       try {
         await patcherChannel.invokeMethod(
           'runPatcher',
           {
-            'originalFilePath': originalFilePath,
+            'patchBundleFilePath': patchBundleFile.path,
+            'originalFilePath': await getOriginalFilePath(
+              packageName,
+              originalFilePath,
+            ),
             'inputFilePath': inputFile.path,
             'patchedFilePath': patchedFile.path,
-            'outFilePath': outFile!.path,
-            'integrationsPath': integrationsFile.path,
+            'outFilePath': _outFile!.path,
+            'integrationsPath': mergeIntegrations ? integrationsFile!.path : '',
             'selectedPatches': selectedPatches.map((p) => p.name).toList(),
-            'options': options,
             'cacheDirPath': cacheDir.path,
+            'mergeIntegrations': mergeIntegrations,
             'keyStoreFilePath': _keyStoreFile.path,
-            'keystorePassword': _managerAPI.getKeystorePassword(),
           },
         );
-      } on Exception catch (e) {
-        if (kDebugMode) {
-          print(e);
-        }
+      } on Exception catch (e, s) {
+        print(e);
+        throw await Sentry.captureException(e, stackTrace: s);
       }
     }
-}
+  }
 
-Future<void> stopPatcher() async {
-  try {
-    await patcherChannel.invokeMethod('stopPatcher');
-  } on Exception catch (e) {
-    if (kDebugMode) {
-      print(e);
+  Future<bool> installPatchedFile(PatchedApplication patchedApp) async {
+    if (_outFile != null) {
+      try {
+        if (patchedApp.isRooted) {
+          bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+          if (hasRootPermissions) {
+            return _rootAPI.installApp(
+              patchedApp.packageName,
+              patchedApp.apkFilePath,
+              _outFile!.path,
+            );
+          }
+        } else {
+          await AppInstaller.installApk(_outFile!.path);
+          return await DeviceApps.isAppInstalled(patchedApp.packageName);
+        }
+      } on Exception catch (e, s) {
+        await Sentry.captureException(e, stackTrace: s);
+        return false;
+      }
+    }
+    return false;
+  }
+
+  void sharePatchedFile(String appName, String version) {
+    try {
+      if (_outFile != null) {
+        String prefix = appName.toLowerCase().replaceAll(' ', '-');
+        String newName = '$prefix-revanced_v$version.apk';
+        int lastSeparator = _outFile!.path.lastIndexOf('/');
+        String newPath =
+            _outFile!.path.substring(0, lastSeparator + 1) + newName;
+        File shareFile = _outFile!.copySync(newPath);
+        ShareExtend.share(shareFile.path, 'file');
+      }
+    } on Exception catch (e, s) {
+      Sentry.captureException(e, stackTrace: s);
     }
   }
-}
 
-Future<bool> installPatchedFile(PatchedApplication patchedApp) async {
-  if (outFile != null) {
-    try {
-      if (patchedApp.isRooted) {
-        final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
-        if (hasRootPermissions) {
-          return _rootAPI.installApp(
-            patchedApp.packageName,
-            patchedApp.apkFilePath,
-            outFile!.path,
+  Future<void> sharePatcherLog(String logs) async {
+    Directory appCache = await getTemporaryDirectory();
+    Directory logDir = Directory('${appCache.path}/logs');
+    logDir.createSync();
+    String dateTime = DateTime.now()
+        .toIso8601String()
+        .replaceAll('-', '')
+        .replaceAll(':', '')
+        .replaceAll('T', '')
+        .replaceAll('.', '');
+    File log = File('${logDir.path}/revanced-manager_patcher_$dateTime.log');
+    log.writeAsStringSync(logs);
+    ShareExtend.share(log.path, 'file');
+  }
+
+  String getRecommendedVersion(String packageName) {
+    Map<String, int> versions = {};
+    for (Patch patch in _patches) {
+      Package? package = patch.compatiblePackages.firstWhereOrNull(
+        (pack) => pack.name == packageName,
+      );
+      if (package != null) {
+        for (String version in package.versions) {
+          versions.update(
+            version,
+            (value) => versions[version]! + 1,
+            ifAbsent: () => 1,
           );
         }
-      } else {
-        final install = await InstallPlugin.installApk(outFile!.path);
-        return install['isSuccess'];
-      }
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-      return false;
-    }
-  }
-  return false;
-}
-
-void exportPatchedFile(String appName, String version) {
-  try {
-    if (outFile != null) {
-      final String newName = _getFileName(appName, version);
-      CRFileSaver.saveFileWithDialog(
-        SaveFileDialogParams(
-          sourceFilePath: outFile!.path,
-          destinationFileName: newName,
-        ),
-      );
-    }
-  } on Exception catch (e) {
-    if (kDebugMode) {
-      print(e);
-    }
-  }
-}
-
-void sharePatchedFile(String appName, String version) {
-  try {
-    if (outFile != null) {
-      final String newName = _getFileName(appName, version);
-      final int lastSeparator = outFile!.path.lastIndexOf('/');
-      final String newPath =
-          outFile!.path.substring(0, lastSeparator + 1) + newName;
-      final File shareFile = outFile!.copySync(newPath);
-      ShareExtend.share(shareFile.path, 'file');
-    }
-  } on Exception catch (e) {
-    if (kDebugMode) {
-      print(e);
-    }
-  }
-}
-
-String _getFileName(String appName, String version) {
-  final String prefix = appName.toLowerCase().replaceAll(' ', '-');
-  final String newName = '$prefix-revanced_v$version.apk';
-  return newName;
-}
-
-Future<void> exportPatcherLog(String logs) async {
-  final Directory appCache = await getTemporaryDirectory();
-  final Directory logDir = Directory('${appCache.path}/logs');
-  logDir.createSync();
-  final String dateTime = DateTime.now()
-      .toIso8601String()
-      .replaceAll('-', '')
-      .replaceAll(':', '')
-      .replaceAll('T', '')
-      .replaceAll('.', '');
-  final String fileName = 'revanced-manager_patcher_$dateTime.txt';
-  final File log = File('${logDir.path}/$fileName');
-  log.writeAsStringSync(logs);
-  CRFileSaver.saveFileWithDialog(
-    SaveFileDialogParams(
-      sourceFilePath: log.path,
-      destinationFileName: fileName,
-    ),
-  );
-}
-
-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 (final String version in package.versions) {
-        versions.update(
-          version,
-              (value) => versions[version]! + 1,
-          ifAbsent: () => 1,
-        );
       }
     }
+    if (versions.isNotEmpty) {
+      var entries = versions.entries.toList()
+        ..sort((a, b) => a.value.compareTo(b.value));
+      versions
+        ..clear()
+        ..addEntries(entries);
+      versions.removeWhere((key, value) => value != versions.values.last);
+      return (versions.keys.toList()..sort()).last;
+    }
+    return '';
   }
-  if (versions.isNotEmpty) {
-    final entries = versions.entries.toList()
-      ..sort((a, b) => a.value.compareTo(b.value));
-    versions
-      ..clear()
-      ..addEntries(entries);
-    versions.removeWhere((key, value) => value != versions.values.last);
-    return (versions.keys.toList()
-      ..sort()).last;
-  }
-  return '';
-}}
+}

lib/services/revanced_api.dart

@@ -1,69 +1,101 @@
-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:flutter/foundation.dart';
+import 'package:dio_http_cache_lts/dio_http_cache_lts.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:injectable/injectable.dart';
-import 'package:revanced_manager/app/app.locator.dart';
-import 'package:revanced_manager/services/download_manager.dart';
-import 'package:synchronized/synchronized.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 final Dio _dio;
-  late final DownloadManager _downloadManager = locator<DownloadManager>();
+  late Dio _dio = Dio();
+  final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
+  final Options _cacheOptions = buildCacheOptions(
+    const Duration(hours: 6),
+    maxStale: const Duration(days: 1),
+  );
 
-  final Lock getToolsLock = Lock();
+  Future<void> initialize(String apiUrl) async {
+    try {
+      bool isGMSInstalled = await checkForGMS();
 
-  Future<void> initialize(String repoUrl) async {
-    _dio = _downloadManager.initDio(repoUrl);
+      if (!isGMSInstalled) {
+        _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);
+    }
   }
 
   Future<void> clearAllCache() async {
-    await _downloadManager.clearAllCache();
+    try {
+      await _dioCacheManager.clearAll();
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
+    }
   }
 
   Future<Map<String, List<dynamic>>> getContributors() async {
-    final Map<String, List<dynamic>> contributors = {};
+    Map<String, List<dynamic>> contributors = {};
     try {
-      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'];
+      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'];
         contributors[name] = repo['contributors'];
       }
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
       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,
-  ) {
-    return getToolsLock.synchronized(() async {
-      try {
-        final response = await _dio.get('/tools');
-        final List<dynamic> tools = response.data['tools'];
-        return tools.firstWhereOrNull(
-          (t) =>
-              t['repository'] == repoName &&
-              (t['name'] as String).endsWith(extension),
-        );
-      } on Exception catch (e) {
-        if (kDebugMode) {
-          print(e);
-        }
-        return null;
-      }
-    });
+  ) async {
+    try {
+      var response = await _dio.get('/tools', options: _cacheOptions);
+      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);
+      return null;
+    }
   }
 
   Future<String?> getLatestReleaseVersion(
@@ -71,100 +103,52 @@ class RevancedAPI {
     String repoName,
   ) async {
     try {
-      final Map<String, dynamic>? release = await _getLatestRelease(
+      Map<String, dynamic>? release = await _getLatestRelease(
         extension,
         repoName,
       );
       if (release != null) {
         return release['version'];
       }
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
       return null;
     }
     return null;
   }
 
-  Future<File?> getLatestReleaseFile(
-    String extension,
-    String repoName,
-  ) async {
+  Future<File?> getLatestReleaseFile(String extension, String repoName) async {
     try {
-      final Map<String, dynamic>? release = await _getLatestRelease(
+      Map<String, dynamic>? release = await _getLatestRelease(
         extension,
         repoName,
       );
       if (release != null) {
-        final String url = release['browser_download_url'];
-        return await _downloadManager.getSingleFile(url);
-      }
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
+        String url = release['browser_download_url'];
+        return await DefaultCacheManager().getSingleFile(url);
       }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
       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 _downloadManager.getFileStream(
-      release!['browser_download_url'] as String,
-    )) {
-      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 {
-      final Map<String, dynamic>? release = await _getLatestRelease(
+      Map<String, dynamic>? release = await _getLatestRelease(
         extension,
         repoName,
       );
       if (release != null) {
-        final DateTime timestamp =
-            DateTime.parse(release['timestamp'] as String);
+        DateTime timestamp = DateTime.parse(release['timestamp'] as String);
         return format(timestamp, locale: 'en_short');
       }
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
       return null;
     }
     return null;

lib/services/root_api.dart

@@ -1,21 +1,17 @@
-import 'package:flutter/foundation.dart';
 import 'package:root/root.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
 
 class RootAPI {
-  // TODO(ponces): remove in the future, keep it for now during migration.
-  final String _revancedOldDirPath = '/data/local/tmp/revanced-manager';
-  final String _revancedDirPath = '/data/adb/revanced';
+  final String _managerDirPath = '/data/local/tmp/revanced-manager';
   final String _postFsDataDirPath = '/data/adb/post-fs-data.d';
   final String _serviceDDirPath = '/data/adb/service.d';
 
   Future<bool> isRooted() async {
     try {
-      final bool? isRooted = await Root.isRootAvailable();
+      bool? isRooted = await Root.isRootAvailable();
       return isRooted != null && isRooted;
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
       return false;
     }
   }
@@ -28,10 +24,8 @@ class RootAPI {
         return isRooted != null && isRooted;
       }
       return false;
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
       return false;
     }
   }
@@ -42,62 +36,53 @@ class RootAPI {
     seLinux,
     String filePath,
   ) async {
-    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);
-      }
+    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"',
+      );
     }
   }
 
   Future<bool> isAppInstalled(String packageName) async {
     if (packageName.isNotEmpty) {
-      return fileExists('$_serviceDDirPath/$packageName.sh');
+      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 false;
   }
 
   Future<List<String>> getInstalledApps() async {
-    final List<String> apps = List.empty(growable: true);
     try {
       String? res = await Root.exec(
-        cmd: 'ls "$_revancedDirPath"',
+        cmd: 'ls "$_managerDirPath"',
       );
       if (res != null) {
-        final List<String> list = res.split('\n');
-        list.removeWhere((pack) => pack.isEmpty);
-        apps.addAll(list.map((pack) => pack.trim()).toList());
-      }
-      // TODO(ponces): remove in the future, keep it for now during migration.
-      res = await Root.exec(
-        cmd: 'ls "$_revancedOldDirPath"',
-      );
-      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);
+        List<String> apps = res.split('\n');
+        apps.removeWhere((pack) => pack.isEmpty);
+        return apps.map((pack) => pack.trim()).toList();
       }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
+      return List.empty();
     }
-    return apps;
+    return List.empty();
   }
 
   Future<void> deleteApp(String packageName, String originalFilePath) async {
@@ -107,12 +92,8 @@ 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 "$_revancedOldDirPath/$packageName"',
-    );
-    await Root.exec(
-      cmd: 'rm -rf "$_revancedDirPath/$packageName"',
+      cmd: 'rm -rf "$_managerDirPath/$packageName"',
     );
     await Root.exec(
       cmd: 'rm -rf "$_serviceDDirPath/$packageName.sh"',
@@ -130,13 +111,13 @@ class RootAPI {
     try {
       await deleteApp(packageName, originalFilePath);
       await Root.exec(
-        cmd: 'mkdir -p "$_revancedDirPath/$packageName"',
+        cmd: 'mkdir -p "$_managerDirPath/$packageName"',
       );
       await setPermissions(
         '0755',
         'shell:shell',
         '',
-        '$_revancedDirPath/$packageName',
+        '$_managerDirPath/$packageName',
       );
       await saveOriginalFilePath(packageName, originalFilePath);
       await installServiceDScript(packageName);
@@ -144,24 +125,19 @@ class RootAPI {
       await installApk(packageName, patchedFilePath);
       await mountApk(packageName, originalFilePath);
       return true;
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
       return false;
     }
   }
 
   Future<void> installServiceDScript(String packageName) async {
-    await Root.exec(
-      cmd: 'mkdir -p "$_serviceDDirPath"',
-    );
-    final String content = '#!/system/bin/sh\n'
+    String content = '#!/system/bin/sh\n'
         'while [ "\$(getprop sys.boot_completed | tr -d \'"\'"\'\\\\r\'"\'"\')" != "1" ]; do sleep 3; done\n'
-        'base_path=$_revancedDirPath/$packageName/base.apk\n'
+        'base_path=$_managerDirPath/$packageName/base.apk\n'
         'stock_path=\$(pm path $packageName | grep base | sed \'"\'"\'s/package://g\'"\'"\')\n'
-        r'[ ! -z $stock_path ] && mount -o bind $base_path $stock_path';
-    final String scriptFilePath = '$_serviceDDirPath/$packageName.sh';
+        '[ ! -z \$stock_path ] && mount -o bind \$base_path \$stock_path';
+    String scriptFilePath = '$_serviceDDirPath/$packageName.sh';
     await Root.exec(
       cmd: 'echo \'$content\' > "$scriptFilePath"',
     );
@@ -169,13 +145,10 @@ class RootAPI {
   }
 
   Future<void> installPostFsDataScript(String packageName) async {
-    await Root.exec(
-      cmd: 'mkdir -p "$_postFsDataDirPath"',
-    );
-    final String content = '#!/system/bin/sh\n'
+    String content = '#!/system/bin/sh\n'
         'stock_path=\$(pm path $packageName | grep base | sed \'"\'"\'s/package://g\'"\'"\')\n'
-        r'[ ! -z $stock_path ] && umount -l $stock_path';
-    final String scriptFilePath = '$_postFsDataDirPath/$packageName.sh';
+        '[ ! -z \$stock_path ] && umount -l \$stock_path';
+    String scriptFilePath = '$_postFsDataDirPath/$packageName.sh';
     await Root.exec(
       cmd: 'echo \'$content\' > "$scriptFilePath"',
     );
@@ -183,7 +156,7 @@ class RootAPI {
   }
 
   Future<void> installApk(String packageName, String patchedFilePath) async {
-    final String newPatchedFilePath = '$_revancedDirPath/$packageName/base.apk';
+    String newPatchedFilePath = '$_managerDirPath/$packageName/base.apk';
     await Root.exec(
       cmd: 'cp "$patchedFilePath" "$newPatchedFilePath"',
     );
@@ -196,7 +169,7 @@ class RootAPI {
   }
 
   Future<void> mountApk(String packageName, String originalFilePath) async {
-    final String newPatchedFilePath = '$_revancedDirPath/$packageName/base.apk';
+    String newPatchedFilePath = '$_managerDirPath/$packageName/base.apk';
     await Root.exec(
       cmd: 'am force-stop "$packageName"',
     );
@@ -209,26 +182,42 @@ class RootAPI {
   }
 
   Future<bool> isMounted(String packageName) async {
-    final String? res = await Root.exec(
+    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 {
-    final String originalRootPath =
-        '$_revancedDirPath/$packageName/original.apk';
+    String originalRootPath = '$_managerDirPath/$packageName/original.apk';
     await Root.exec(
-      cmd: 'mkdir -p "$_revancedDirPath/$packageName"',
+      cmd: 'mkdir -p "$_managerDirPath/$packageName"',
     );
     await setPermissions(
       '0755',
       'shell:shell',
       '',
-      '$_revancedDirPath/$packageName',
+      '$_managerDirPath/$packageName',
     );
     await Root.exec(
       cmd: 'cp "$originalFilePath" "$originalRootPath"',
@@ -240,18 +229,4 @@ 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,6 +3,7 @@ import 'package:google_fonts/google_fonts.dart';
 
 var lightCustomColorScheme = ColorScheme.fromSeed(
   seedColor: Colors.blue,
+  brightness: Brightness.light,
   primary: const Color(0xff1B73E8),
 );
 
@@ -12,7 +13,7 @@ var lightCustomTheme = ThemeData(
   navigationBarTheme: NavigationBarThemeData(
     labelTextStyle: MaterialStateProperty.all(
       TextStyle(
-        color: lightCustomColorScheme.onSurface,
+        color: lightCustomColorScheme.secondary,
         fontWeight: FontWeight.w500,
       ),
     ),
@@ -33,12 +34,13 @@ var darkCustomTheme = ThemeData(
   navigationBarTheme: NavigationBarThemeData(
     labelTextStyle: MaterialStateProperty.all(
       TextStyle(
-        color: darkCustomColorScheme.onSurface,
+        color: darkCustomColorScheme.secondary,
         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,114 +1,94 @@
-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 StatefulWidget {
+class DynamicThemeBuilder extends StatelessWidget {
+  final String title;
+  final Widget home;
+  final Iterable<LocalizationsDelegate> localizationsDelegates;
+
   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) {
-        final ThemeData lightDynamicTheme = ThemeData(
+        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?.onSurface,
+                color: lightColorScheme?.secondary,
                 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),
         );
-        final ThemeData darkDynamicTheme = ThemeData(
+        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?.onSurface,
+                color: darkColorScheme?.secondary,
                 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: brightness == Brightness.light ? lightCustomTheme : darkCustomTheme,
-              1: brightness == Brightness.light ? lightDynamicTheme : darkDynamicTheme,
-              2: lightCustomTheme,
-              3: lightDynamicTheme,
-              4: darkCustomTheme,
-              5: darkDynamicTheme,
+              0: lightCustomTheme,
+              1: darkCustomTheme,
+              2: lightDynamicTheme,
+              3: darkDynamicTheme,
             },
-            fallbackTheme: PlatformDispatcher.instance.platformBrightness == Brightness.light ? lightCustomTheme : darkCustomTheme,
+            fallbackTheme: lightCustomTheme,
           ),
           builder: (context, theme) => MaterialApp(
-                debugShowCheckedModeBanner: false,
-                title: widget.title,
-                navigatorKey: StackedService.navigatorKey,
-                onGenerateRoute: StackedRouter().onGenerateRoute,
-                theme: theme,
-                home: widget.home,
-                localizationsDelegates: widget.localizationsDelegates,
-              ),
+            debugShowCheckedModeBanner: false,
+            title: title,
+            navigatorKey: StackedService.navigatorKey,
+            onGenerateRoute: StackedRouter().onGenerateRoute,
+            theme: theme,
+            home: home,
+            localizationsDelegates: localizationsDelegates,
+          ),
         );
       },
     );
   }
-
-  @override
-  void dispose() {
-    WidgetsBinding.instance.removeObserver(this);
-    super.dispose();
-  }
 }

lib/ui/views/app_selector/app_selector_view.dart

@@ -1,11 +1,10 @@
-import 'package:flutter/material.dart' hide SearchBar;
+import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
-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: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';
 
 class AppSelectorView extends StatefulWidget {
   const AppSelectorView({Key? key}) : super(key: key);
@@ -20,9 +19,10 @@ class _AppSelectorViewState extends State<AppSelectorView> {
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<AppSelectorViewModel>.reactive(
-      onViewModelReady: (model) => model.initialize(),
+      onModelReady: (model) => model.initialize(),
       viewModelBuilder: () => AppSelectorViewModel(),
       builder: (context, model, child) => Scaffold(
+        resizeToAvoidBottomInset: false,
         floatingActionButton: FloatingActionButton.extended(
           label: I18nText('appSelectorView.storageButton'),
           icon: const Icon(Icons.sd_storage),
@@ -36,28 +36,32 @@ class _AppSelectorViewState extends State<AppSelectorView> {
             SliverAppBar(
               pinned: true,
               floating: true,
+              snap: false,
               title: I18nText(
                 'appSelectorView.viewTitle',
-              ),
-              titleTextStyle: TextStyle(
-                fontSize: 22.0,
-                    color: Theme.of(context).textTheme.titleLarge!.color,
+                child: Text(
+                  '',
+                  style: TextStyle(
+                    color: Theme.of(context).textTheme.headline6!.color,
                   ),
+                ),
+              ),
               leading: IconButton(
                 icon: Icon(
                   Icons.arrow_back,
-                  color: Theme.of(context).textTheme.titleLarge!.color,
+                  color: Theme.of(context).textTheme.headline6!.color,
                 ),
                 onPressed: () => Navigator.of(context).pop(),
               ),
               bottom: PreferredSize(
-                preferredSize: const Size.fromHeight(66.0),
+                preferredSize: const Size.fromHeight(64.0),
                 child: Padding(
                   padding: const EdgeInsets.symmetric(
                     vertical: 8.0,
                     horizontal: 12.0,
                   ),
                   child: SearchBar(
+                    showSelectIcon: false,
                     hintText: FlutterI18n.translate(
                       context,
                       'appSelectorView.searchBarHint',
@@ -74,64 +78,26 @@ class _AppSelectorViewState extends State<AppSelectorView> {
             SliverToBoxAdapter(
               child: model.noApps
                   ? Center(
-                      child: I18nText(
-                        'appSelectorCard.noAppsLabel',
-                        child: Text(
-                          '',
-                          style: TextStyle(
-                            color:
-                                Theme.of(context).textTheme.titleLarge!.color,
-                          ),
-                        ),
-                      ),
+                      child: I18nText('appSelectorCard.noAppsLabel'),
                     )
-                  : model.allApps.isEmpty
+                  : model.apps.isEmpty
                       ? const AppSkeletonLoader()
                       : Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 12.0)
-                              .copyWith(
-                            bottom:
-                                MediaQuery.viewPaddingOf(context).bottom + 8.0,
-                          ),
+                              .copyWith(bottom: 80),
                           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.showDownloadToast();
+                                        model.selectApp(app);
+                                        Navigator.of(context).pop();
                                       },
-                                    ),
-                                  )
-                                  .toList(),
-                              const SizedBox(height: 70.0),
-                            ],
+                                    ))
+                                .toList(),
                           ),
                         ),
             ),

lib/ui/views/app_selector/app_selector_viewmodel.dart

@@ -1,204 +1,51 @@
 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_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:revanced_manager/ui/widgets/shared/custom_material_button.dart';
-import 'package:revanced_manager/utils/check_for_supported_patch.dart';
+import 'package:sentry_flutter/sentry_flutter.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 {
-    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();
+    apps.addAll(await _patcherAPI.getFilteredInstalledApps());
+    apps.sort((a, b) => a.appName.compareTo(b.appName));
+    noApps = apps.isEmpty;
     notifyListeners();
   }
 
-  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 {
+  void selectApp(ApplicationWithIcon application) async {
     locator<PatcherViewModel>().selectedApp = PatchedApplication(
       name: application.appName,
       packageName: application.packageName,
+      originalPackageName: application.packageName,
       version: application.versionName!,
       apkFilePath: application.apkFilePath,
       icon: application.icon,
       patchDate: DateTime.now(),
     );
-    await locator<PatcherViewModel>().loadLastSelectedPatches();
-  }
-
-  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) {
-        await selectApp(app);
-        if (context.mounted) {
-          Navigator.pop(context);
-        }
-        final List<Option> requiredNullOptions = getNullRequiredOptions(locator<PatcherViewModel>().selectedPatches, packageName);
-        if(requiredNullOptions.isNotEmpty){
-          locator<PatcherViewModel>().showRequiredOptionDialog();
-        }
-      }
-    }
-  }
-
-  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'),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
+    locator<PatcherViewModel>().selectedPatches.clear();
+    locator<PatcherViewModel>().notifyListeners();
   }
 
   Future<void> selectAppFromStorage(BuildContext context) async {
     try {
-      final FilePickerResult? result = await FilePicker.platform.pickFiles(
+      FilePickerResult? result = await FilePicker.platform.pickFiles(
         type: FileType.custom,
         allowedExtensions: ['apk'],
       );
       if (result != null && result.files.single.path != null) {
-        final File apkFile = File(result.files.single.path!);
-        final List<String> pathSplit = result.files.single.path!.split('/');
-        pathSplit.removeLast();
-        final Directory filePickerCacheDir = Directory(pathSplit.join('/'));
-        final Iterable<File> deletableFiles =
-            (await filePickerCacheDir.list().toList()).whereType<File>();
-        for (final file in deletableFiles) {
-          if (file.path != apkFile.path && file.path.endsWith('.apk')) {
-            file.delete();
-          }
-        }
-        final ApplicationWithIcon? application =
-            await DeviceApps.getAppFromStorage(
+        File apkFile = File(result.files.single.path!);
+        ApplicationWithIcon? application = await DeviceApps.getAppFromStorage(
           apkFile.path,
           true,
         ) as ApplicationWithIcon?;
@@ -206,46 +53,29 @@ class AppSelectorViewModel extends BaseViewModel {
           locator<PatcherViewModel>().selectedApp = PatchedApplication(
             name: application.appName,
             packageName: application.packageName,
+            originalPackageName: application.packageName,
             version: application.versionName!,
             apkFilePath: result.files.single.path!,
             icon: application.icon,
             patchDate: DateTime.now(),
             isFromStorage: true,
           );
-          locator<PatcherViewModel>().loadLastSelectedPatches();
+          locator<PatcherViewModel>().selectedPatches.clear();
+          locator<PatcherViewModel>().notifyListeners();
         }
       }
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-      _toast.showBottom('appSelectorView.errorMessage');
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
+      _toast.show('appSelectorView.errorMessage');
     }
   }
 
   List<ApplicationWithIcon> getFilteredApps(String query) {
     return apps
-        .where(
-          (app) =>
-              query.isEmpty ||
-              query.length < 2 ||
-              app.appName.toLowerCase().contains(query.toLowerCase()) ||
-              app.packageName.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(),
-      onViewModelReady: (model) => model.getContributors(),
+      onModelReady: (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.titleLarge!.color,
+                    color: Theme.of(context).textTheme.headline6!.color,
                   ),
                 ),
               ),
@@ -57,7 +57,6 @@ 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 {
-    final Map<String, List<dynamic>> contributors =
+    Map<String, List<dynamic>> contributors =
         await _managerAPI.getContributors();
     patcherContributors = contributors[_managerAPI.defaultPatcherRepo] ?? [];
     patchesContributors = contributors[_managerAPI.getPatchesRepo()] ?? [];

lib/ui/views/home/home_view.dart

@@ -1,10 +1,13 @@
 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';
 
@@ -15,11 +18,12 @@ class HomeView extends StatelessWidget {
   Widget build(BuildContext context) {
     return ViewModelBuilder<HomeViewModel>.reactive(
       disposeViewModel: false,
-      fireOnViewModelReadyOnce: true,
-      onViewModelReady: (model) => model.initialize(context),
+      onModelReady: (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>[
@@ -30,7 +34,7 @@ class HomeView extends StatelessWidget {
                   child: Text(
                     '',
                     style: GoogleFonts.inter(
-                      color: Theme.of(context).textTheme.titleLarge!.color,
+                      color: Theme.of(context).textTheme.headline6!.color,
                     ),
                   ),
                 ),
@@ -44,21 +48,63 @@ class HomeView extends StatelessWidget {
                         'homeView.updatesSubtitle',
                         child: Text(
                           '',
-                          style: Theme.of(context).textTheme.titleLarge,
+                          style: Theme.of(context).textTheme.headline6!,
                         ),
                       ),
                       const SizedBox(height: 10),
-                      LatestCommitCard(model: model, parentContext: context),
+                      LatestCommitCard(
+                        onPressed: () =>
+                            model.showUpdateConfirmationDialog(context),
+                      ),
                       const SizedBox(height: 23),
                       I18nText(
                         'homeView.patchedSubtitle',
                         child: Text(
                           '',
-                          style: Theme.of(context).textTheme.titleLarge,
+                          style: Theme.of(context).textTheme.headline6!,
                         ),
                       ),
-                      const SizedBox(height: 10),
-                      InstalledAppsCard(),
+                      const SizedBox(height: 8),
+                      Row(
+                        children: <Widget>[
+                          DashboardChip(
+                            label: I18nText('homeView.installed'),
+                            isSelected: !model.showUpdatableApps,
+                            onSelected: (value) {
+                              model.toggleUpdatableApps(false);
+                            },
+                          ),
+                          const SizedBox(width: 10),
+                          DashboardChip(
+                            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(),
+                      ),
                     ],
                   ),
                 ),

lib/ui/views/home/home_viewmodel.dart

@@ -1,86 +1,55 @@
 // 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:flutter/foundation.dart';
+import 'package:device_apps/device_apps.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 = [];
-  String? _latestManagerVersion = '';
-  File? downloadedApk;
+  List<PatchedApplication> patchedUpdatableApps = [];
 
   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'),
       ),
-      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');
-          }
-        }
-      },
+      onSelectNotification: (p) =>
+          DeviceApps.openApp('app.revanced.manager.flutter'),
     );
     flutterLocalNotificationsPlugin
         .resolvePlatformSpecificImplementation<
             AndroidFlutterLocalNotificationsPlugin>()
         ?.requestPermission();
-    final bool isConnected = await Connectivity().checkConnection();
+    bool isConnected = await Connectivity().checkConnection();
     if (!isConnected) {
-      _toast.showBottom('homeView.noConnection');
+      _toast.show('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());
   }
 
@@ -96,7 +65,7 @@ class HomeViewModel extends BaseViewModel {
     notifyListeners();
   }
 
-  Future<void> navigateToPatcher(PatchedApplication app) async {
+  void navigateToPatcher(PatchedApplication app) async {
     locator<PatcherViewModel>().selectedApp = app;
     locator<PatcherViewModel>().selectedPatches =
         await _patcherAPI.getAppliedPatches(app.appliedPatches);
@@ -105,366 +74,118 @@ class HomeViewModel extends BaseViewModel {
   }
 
   void _getPatchedApps() {
-    patchedInstalledApps = _managerAPI.getPatchedApps().toList();
+    patchedInstalledApps = _managerAPI
+        .getPatchedApps()
+        .where((app) => app.hasUpdates == false)
+        .toList();
+    patchedUpdatableApps = _managerAPI
+        .getPatchedApps()
+        .where((app) => app.hasUpdates == true)
+        .toList();
     notifyListeners();
   }
 
   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 {
-        final int latestVersionInt =
+        int latestVersionInt =
             int.parse(latestVersion.replaceAll(RegExp('[^0-9]'), ''));
-        final int currentVersionInt =
+        int currentVersionInt =
             int.parse(currentVersion.replaceAll(RegExp('[^0-9]'), ''));
         return latestVersionInt > currentVersionInt;
-      } on Exception catch (e) {
-        if (kDebugMode) {
-          print(e);
-        }
+      } on Exception catch (e, s) {
+        await Sentry.captureException(e, stackTrace: s);
         return false;
       }
     }
     return false;
   }
 
-  Future<File?> downloadManager() async {
+  Future<void> updateManager(BuildContext context) 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);
+      _toast.show('homeView.downloadingMessage');
+      File? managerApk = await _managerAPI.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,
+        );
+        _toast.show('homeView.installingMessage');
+        await AppInstaller.installApk(managerApk.path);
+      } else {
+        _toast.show('homeView.errorDownloadMessage');
       }
-      return null;
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
+      _toast.show('homeView.errorInstallMessage');
     }
   }
 
-  Future<void> showPatchesConsent(BuildContext context) async {
-    final ValueNotifier<bool> autoUpdate = ValueNotifier(true);
-    await showDialog(
-      context: context,
-      barrierDismissible: false,
+  void updatesAreDisabled() {
+    _toast.show('homeView.updatesDisabled');
+  }
+
+  Future<void> showUpdateConfirmationDialog(BuildContext parentContext) async {
+    return showDialog(
+      context: parentContext,
       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: [
+        title: I18nText('homeView.updateDialogTitle'),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: I18nText('homeView.updateDialogText'),
+        actions: <Widget>[
           CustomMaterialButton(
             isFilled: false,
-            onPressed: () async {
-              await _managerAPI.setPatchesConsent(false);
-              SystemNavigator.pop();
-            },
-            label: I18nText('quitButton'),
+            label: I18nText('noButton'),
+            onPressed: () => Navigator.of(context).pop(),
           ),
           CustomMaterialButton(
-            onPressed: () async {
-              await _managerAPI.setPatchesConsent(true);
-              await _managerAPI.setPatchesAutoUpdate(autoUpdate.value);
+            label: I18nText('yesButton'),
+            onPressed: () {
               Navigator.of(context).pop();
+              updateManager(parentContext);
             },
-            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<String?> getLatestPatcherReleaseTime() async {
+    return _managerAPI.getLatestPatcherReleaseTime();
   }
 
-  Future<void> updateManager(BuildContext context) async {
-    final ValueNotifier<bool> downloaded = ValueNotifier(false);
-    try {
-      _toast.showBottom('homeView.downloadingMessage');
-      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) {
-        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 InstallPlugin.installApk(managerApk.path);
-      } else {
-        _toast.showBottom('homeView.errorDownloadMessage');
-      }
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-      _toast.showBottom('homeView.errorInstallMessage');
-    }
-  }
-
-  void updatesAreDisabled() {
-    _toast.showBottom('homeView.updatesDisabled');
-  }
-
-  Future<void> showUpdateConfirmationDialog(
-    BuildContext parentContext,
-    bool isPatches,
-  ) {
-    return showModalBottomSheet(
-      context: parentContext,
-      isScrollControlled: true,
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.vertical(top: Radius.circular(24.0)),
-      ),
-      builder: (context) => UpdateConfirmationDialog(
-        isPatches: isPatches,
-      ),
-    );
-  }
-
-  Future<Map<String, dynamic>?> getLatestManagerRelease() {
-    return _githubAPI.getLatestManagerRelease(_managerAPI.defaultManagerRepo);
-  }
-
-  Future<Map<String, dynamic>?> getLatestPatchesRelease() {
-    return _githubAPI.getLatestPatchesRelease(_managerAPI.defaultPatchesRepo);
-  }
-
-  Future<String?> getLatestPatchesReleaseTime() {
-    return _managerAPI.getLatestPatchesReleaseTime();
-  }
-
-  Future<String?> getLatestManagerReleaseTime() {
+  Future<String?> getLatestManagerReleaseTime() async {
     return _managerAPI.getLatestManagerReleaseTime();
   }
 
   Future<void> forceRefresh(BuildContext context) async {
-    _managerAPI.clearAllData();
-    _toast.showBottom('homeView.refreshSuccess');
+    await Future.delayed(const Duration(seconds: 1));
+    if (_lastUpdate == null ||
+        _lastUpdate!.difference(DateTime.now()).inSeconds > 2) {
+      _managerAPI.clearAllData();
+    }
     initialize(context);
   }
 }

lib/ui/views/installer/installer_view.dart

@@ -2,8 +2,10 @@ 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';
 
@@ -13,64 +15,12 @@ class InstallerView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<InstallerViewModel>.reactive(
-      onViewModelReady: (model) => model.initialize(context),
+      onModelReady: (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>[
@@ -78,16 +28,43 @@ class InstallerView extends StatelessWidget {
                   title: Text(
                     model.headerLogs,
                     style: GoogleFonts.inter(
-                      color: Theme.of(context).textTheme.titleLarge!.color,
+                      color: Theme.of(context).textTheme.headline6!.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.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),
@@ -107,6 +84,66 @@ 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,6 +1,5 @@
 // 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';
@@ -15,8 +14,7 @@ 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:revanced_manager/utils/about_info.dart';
-import 'package:screenshot_callback/screenshot_callback.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:stacked/stacked.dart';
 import 'package:wakelock/wakelock.dart';
 
@@ -31,7 +29,6 @@ class InstallerViewModel extends BaseViewModel {
     'app.revanced.manager.flutter/installer',
   );
   final ScrollController scrollController = ScrollController();
-  final ScreenshotCallback screenshotCallback = ScreenshotCallback();
   double? progress = 0.0;
   String logs = '';
   String headerLogs = '';
@@ -39,9 +36,6 @@ class InstallerViewModel extends BaseViewModel {
   bool isPatching = true;
   bool isInstalled = false;
   bool hasErrors = false;
-  bool isCanceled = false;
-  bool cancel = false;
-  bool showPopupScreenshotWarning = true;
 
   Future<void> initialize(BuildContext context) async {
     isRooted = await _rootAPI.isRooted();
@@ -57,23 +51,18 @@ 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) {
-        if (kDebugMode) {
-          print(e);
-        } // ignore
+      } on Exception catch (e, s) {
+        await Sentry.captureException(e, stackTrace: s);
+        // ignore
       }
     }
-    screenshotCallback.addListener(() {
-      if (showPopupScreenshotWarning) {
-        showPopupScreenshotWarning = false;
-        screenshotDetected(context);
-      }
-    });
     await Wakelock.enable();
     await handlePlatformChannelMethods();
     await runPatcher();
@@ -84,10 +73,10 @@ class InstallerViewModel extends BaseViewModel {
       switch (call.method) {
         case 'update':
           if (call.arguments != null) {
-            final Map<dynamic, dynamic> arguments = call.arguments;
-            final double progress = arguments['progress'];
-            final String header = arguments['header'];
-            final String log = arguments['log'];
+            Map<dynamic, dynamic> arguments = call.arguments;
+            double progress = arguments['progress'];
+            String header = arguments['header'];
+            String log = arguments['log'];
             update(progress, header, log);
           }
           break;
@@ -95,7 +84,7 @@ class InstallerViewModel extends BaseViewModel {
     });
   }
 
-  Future<void> update(double value, String header, String log) async {
+  void update(double value, String header, String log) {
     if (value >= 0.0) {
       progress = value;
     }
@@ -107,11 +96,6 @@ 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;
@@ -140,267 +124,119 @@ class InstallerViewModel extends BaseViewModel {
 
   Future<void> runPatcher() async {
     try {
-      await _patcherAPI.runPatcher(
-        _app.packageName,
-        _app.apkFilePath,
-        _patches,
-      );
-    } on Exception catch (e) {
-      update(
-        -100.0,
-        'Failed...',
-        'Something went wrong:\n$e',
-      );
-      if (kDebugMode) {
-        print(e);
+      update(0.0, 'Initializing...', 'Initializing installer');
+      if (_patches.isNotEmpty) {
+        try {
+          update(0.1, '', 'Creating working directory');
+          await _patcherAPI.runPatcher(
+            _app.packageName,
+            _app.apkFilePath,
+            _patches,
+          );
+        } on Exception catch (e, s) {
+          update(
+            -100.0,
+            'Aborting...',
+            'An error occurred! Aborting\nError:\n$e',
+          );
+          await Sentry.captureException(e, stackTrace: s);
+          throw await Sentry.captureException(e, stackTrace: s);
+        }
+      } else {
+        update(-100.0, 'Aborting...', 'No app or patches selected! Aborting');
       }
-    }
-
-    // Necessary to reset the state of patches so that they
-    // can be reloaded again.
-    _managerAPI.patches.clear();
-    await _patcherAPI.loadPatches();
-
-    try {
       if (FlutterBackground.isBackgroundExecutionEnabled) {
         try {
           FlutterBackground.disableBackgroundExecution();
-        } on Exception catch (e) {
-          if (kDebugMode) {
-            print(e);
-          } // ignore
+        } on Exception catch (e, s) {
+          await Sentry.captureException(e, stackTrace: s);
+          // ignore
         }
       }
       await Wakelock.disable();
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
     }
   }
 
-  Future<void> copyLogs() async {
-    final info = await AboutInfo.getInfo();
-
-    final formattedLogs = [
-      '- Device Info',
-      'ReVanced Manager: ${info['version']}',
-      'Build: ${info['flavor']}',
-      'Model: ${info['model']}',
-      'Android version: ${info['androidVersion']}',
-      'Supported architectures: ${info['supportedArch'].join(", ")}',
-      'Root permissions: ${isRooted ? 'Yes' : 'No'}',
-      
-      '\n- Patch Info',
-      'App: ${_app.packageName} v${_app.version}',
-      'Patches version: ${_managerAPI.patchesVersion}',
-      'Patches: ${_patches.map((p) => p.name + (p.options.isEmpty ? '' : ' [${p.options.map((o) => '${o.title}: ${o.value}').join(", ")}]')).toList().join(", ")}',
-      
-      '\n- Settings',
-      'Allow changing patch selection: ${_managerAPI.isPatchesChangeEnabled()}',
-      'Version compatibility check: ${_managerAPI.isVersionCompatibilityCheckEnabled()}',
-      'Show universal patches: ${_managerAPI.areUniversalPatchesEnabled()}',
-      'Patches source: ${_managerAPI.getPatchesRepo()}',
-      'Integration source: ${_managerAPI.getIntegrationsRepo()}',
-      
-      '\n- Logs',
-      logs,
-    ];
-
-    Clipboard.setData(ClipboardData(text: formattedLogs.join('\n')));
-    _toast.showBottom('installerView.copiedToClipboard');
-  }
-
-  Future<void> screenshotDetected(BuildContext context) async {
-    await showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: I18nText(
-          'warning',
-        ),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        icon: const Icon(Icons.warning),
-        content: SingleChildScrollView(
-          child: I18nText('installerView.screenshotDetected'),
-        ),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
-            onPressed: () {
-              Navigator.of(context).pop();
-            },
-          ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
-            onPressed: () {
-              copyLogs();
-              showPopupScreenshotWarning = true;
-              Navigator.of(context).pop();
-            },
-          ),
-        ],
-      ),
-    );
-  }
-
-  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'),
-                      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, 'Canceling...', 'Canceling patching process');
-      await _patcherAPI.stopPatcher();
-      update(-100.0, 'Canceled...', 'Press back to exit');
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-    }
-  }
-
-  Future<void> installResult(BuildContext context, bool installAsRoot) async {
+  void installResult(BuildContext context, bool installAsRoot) async {
     try {
       _app.isRooted = installAsRoot;
-      update(
-        1.0,
-        'Installing...',
-        _app.isRooted
-            ? 'Installing patched file using root method'
-            : 'Installing patched file using nonroot method',
-      );
-      isInstalled = await _patcherAPI.installPatchedFile(_app);
-      if (isInstalled) {
-        _app.isFromStorage = false;
-        _app.patchDate = DateTime.now();
-        _app.appliedPatches = _patches.map((p) => p.name).toList();
-
-        // In case a patch changed the app name or package name,
-        // update the app info.
-        final app =
-            await DeviceApps.getAppFromStorage(_patcherAPI.outFile!.path);
-        if (app != null) {
-          _app.name = app.appName;
-          _app.packageName = app.packageName;
-        }
-
-        await _managerAPI.savePatchedApp(_app);
-
-        update(1.0, 'Installed!', 'Installed!');
+      bool hasMicroG = _patches.any((p) => p.name.endsWith('microg-support'));
+      bool rootMicroG = installAsRoot && hasMicroG;
+      bool rootFromStorage = installAsRoot && _app.isFromStorage;
+      bool ytWithoutRootMicroG =
+          !installAsRoot && !hasMicroG && _app.packageName.contains('youtube');
+      if (rootMicroG || rootFromStorage || ytWithoutRootMicroG) {
+        return showDialog(
+          context: context,
+          builder: (context) => AlertDialog(
+            title: I18nText('installerView.installErrorDialogTitle'),
+            backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+            content: I18nText(
+              rootMicroG
+                  ? 'installerView.installErrorDialogText1'
+                  : rootFromStorage
+                      ? 'installerView.installErrorDialogText3'
+                      : 'installerView.installErrorDialogText2',
+            ),
+            actions: <Widget>[
+              CustomMaterialButton(
+                label: I18nText('okButton'),
+                onPressed: () => Navigator.of(context).pop(),
+              )
+            ],
+          ),
+        );
       } else {
-        // TODO(aabed): Show error message.
-      }
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
+        update(
+          1.0,
+          'Installing...',
+          _app.isRooted
+              ? 'Installing patched file using root method'
+              : 'Installing patched file using nonroot method',
+        );
+        isInstalled = await _patcherAPI.installPatchedFile(_app);
+        if (isInstalled) {
+          update(1.0, 'Installed!', 'Installed!');
+          _app.isFromStorage = false;
+          _app.patchDate = DateTime.now();
+          _app.appliedPatches = _patches.map((p) => p.name).toList();
+          if (hasMicroG) {
+            _app.name += ' ReVanced';
+            _app.packageName = _app.packageName.replaceFirst(
+              'com.google.',
+              'app.revanced.',
+            );
+          }
+          await _managerAPI.savePatchedApp(_app);
+        }
       }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
     }
   }
 
-  void exportResult() {
+  void shareResult() {
     try {
-      _patcherAPI.exportPatchedFile(_app.name, _app.version);
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
+      _patcherAPI.sharePatchedFile(_app.name, _app.version);
+    } on Exception catch (e, s) {
+      Sentry.captureException(e, stackTrace: s);
     }
   }
 
+  void shareLog() {
+    _patcherAPI.sharePatcherLog(logs);
+  }
+
   Future<void> cleanPatcher() async {
     try {
       _patcherAPI.cleanPatcher();
       locator<PatcherViewModel>().selectedApp = null;
       locator<PatcherViewModel>().selectedPatches.clear();
       locator<PatcherViewModel>().notifyListeners();
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
     }
   }
 
@@ -408,35 +244,23 @@ class InstallerViewModel extends BaseViewModel {
     DeviceApps.openApp(_app.packageName);
   }
 
-  void onButtonPressed(int value) {
+  void onMenuSelection(int value) {
     switch (value) {
       case 0:
-        exportResult();
+        shareResult();
         break;
       case 1:
-        copyLogs();
+        shareLog();
         break;
     }
   }
 
   Future<bool> onWillPop(BuildContext context) async {
     if (isPatching) {
-      if (!cancel) {
-        cancel = true;
-        _toast.showBottom('installerView.pressBackAgain');
-      } else if (!isCanceled) {
-        await stopPatcher();
-      } else {
-        _toast.showBottom('installerView.noExit');
-      }
+      _toast.show('installerView.noExit');
       return false;
     }
-    if (!cancel) {
-      cleanPatcher();
-    } else {
-      _patcherAPI.cleanPatcher();
-    }
-    screenshotCallback.dispose();
+    cleanPatcher();
     Navigator.of(context).pop();
     return true;
   }

lib/ui/views/navigation/navigation_view.dart

@@ -11,70 +11,60 @@ class NavigationView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<NavigationViewModel>.reactive(
-      onViewModelReady: (model) => model.initialize(context),
+      onModelReady: (model) => model.initialize(context),
       viewModelBuilder: () => locator<NavigationViewModel>(),
-      builder: (context, model, child) => WillPopScope(
-        onWillPop: () async {
-          if (model.currentIndex == 0) {
-            return true;
-          } else {
-            model.setIndex(0);
-            return false;
-          }
-        },
-        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: '',
+      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',
               ),
-              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(1)
+                  ? const Icon(Icons.build)
+                  : const Icon(Icons.build_outlined),
+              label: FlutterI18n.translate(
+                context,
+                'navigationView.patcherTab',
               ),
-              NavigationDestination(
-                icon: model.isIndexSelected(2)
-                    ? const Icon(Icons.settings)
-                    : const Icon(Icons.settings_outlined),
-                label: FlutterI18n.translate(
-                  context,
-                  'navigationView.settingsTab',
-                ),
-                tooltip: '',
+              tooltip: '',
+            ),
+            NavigationDestination(
+              icon: model.isIndexSelected(2)
+                  ? const Icon(Icons.settings)
+                  : const Icon(Icons.settings_outlined),
+              label: FlutterI18n.translate(
+                context,
+                'navigationView.settingsTab',
               ),
-            ],
-          ),
+              tooltip: '',
+            ),
+          ],
         ),
       ),
     );

lib/ui/views/navigation/navigation_viewmodel.dart

@@ -1,5 +1,4 @@
 // ignore_for_file: use_build_context_synchronously
-import 'package:device_info_plus/device_info_plus.dart';
 import 'package:dynamic_themes/dynamic_themes.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -16,37 +15,23 @@ import 'package:stacked/stacked.dart';
 
 @lazySingleton
 class NavigationViewModel extends IndexTrackingViewModel {
-  Future<void> initialize(BuildContext context) async {
+  void initialize(BuildContext context) async {
     locator<Toast>().initialize(context);
-    final SharedPreferences prefs = await SharedPreferences.getInstance();
-
+    SharedPreferences prefs = await SharedPreferences.getInstance();
     if (prefs.getBool('permissionsRequested') == null) {
-      await Permission.storage.request();
       await prefs.setBool('permissionsRequested', true);
-      await RootAPI().hasRootPermissions().then(
+      RootAPI().hasRootPermissions().then(
             (value) => Permission.requestInstallPackages.request().then(
                   (value) => Permission.ignoreBatteryOptimizations.request(),
                 ),
           );
     }
-
-    final dynamicTheme = DynamicTheme.of(context)!;
-    if (prefs.getInt('themeMode') == null) {
-      await prefs.setInt('themeMode', 0);
-      await dynamicTheme.setTheme(0);
+    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);
     }
-
-    // Force disable Material You on Android 11 and below
-    if (dynamicTheme.themeId.isOdd) {
-      const int android12SdkVersion = 31;
-      final AndroidDeviceInfo info = await DeviceInfoPlugin().androidInfo;
-      if (info.version.sdkInt < android12SdkVersion) {
-        await prefs.setInt('themeMode', 0);
-        await prefs.setBool('useDynamicTheme', false);
-        await dynamicTheme.setTheme(0);
-      }
-    }
-
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
     SystemChrome.setSystemUIOverlayStyle(
       SystemUiOverlayStyle(

lib/ui/views/patch_options/patch_options_view.dart

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

lib/ui/views/patch_options/patch_options_viewmodel.dart

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

lib/ui/views/patcher/patcher_view.dart

@@ -22,14 +22,7 @@ class PatcherView extends StatelessWidget {
           child: FloatingActionButton.extended(
             label: I18nText('patcherView.patchButton'),
             icon: const Icon(Icons.build),
-            onPressed: () async{
-              if (model.checkRequiredPatchOption(context)) {
-                final bool proceed = model.showRemovedPatchesDialog(context);
-                if (proceed && context.mounted) {
-                  model.showArmv7WarningDialog(context);
-                }
-              }
-            },
+            onPressed: () => model.showPatchConfirmationDialog(context),
           ),
         ),
         body: CustomScrollView(
@@ -41,7 +34,7 @@ class PatcherView extends StatelessWidget {
                 child: Text(
                   '',
                   style: GoogleFonts.inter(
-                    color: Theme.of(context).textTheme.titleLarge!.color,
+                    color: Theme.of(context).textTheme.headline6!.color,
                   ),
                 ),
               ),
@@ -52,10 +45,7 @@ class PatcherView extends StatelessWidget {
                 delegate: SliverChildListDelegate.fixed(
                   <Widget>[
                     AppSelectorCard(
-                      onPressed: () => {
-                        model.navigateToAppSelector(),
-                        model.ctx = context,
-                      },
+                      onPressed: () => model.navigateToAppSelector(),
                     ),
                     const SizedBox(height: 16),
                     Opacity(

lib/ui/views/patcher/patcher_viewmodel.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: use_build_context_synchronously
-
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:injectable/injectable.dart';
@@ -10,8 +8,6 @@ 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';
 
@@ -21,9 +17,7 @@ class PatcherViewModel extends BaseViewModel {
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
   PatchedApplication? selectedApp;
-  BuildContext? ctx;
   List<Patch> selectedPatches = [];
-  List<String> removedPatches = [];
 
   void navigateToAppSelector() {
     _navigationService.navigateTo(Routes.appSelectorView);
@@ -45,107 +39,44 @@ class PatcherViewModel extends BaseViewModel {
     return selectedApp == null;
   }
 
-  bool showRemovedPatchesDialog(BuildContext context) {
-    if (removedPatches.isNotEmpty) {
-      showDialog(
-        context: context,
-        builder: (context) => AlertDialog(
-          title: I18nText('notice'),
-          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-          content: I18nText(
-            'patcherView.removedPatchesWarningDialogText',
-            translationParams: {'patches': removedPatches.join('\n')},
-          ),
-          actions: <Widget>[
-            CustomMaterialButton(
-              isFilled: false,
-              label: I18nText('noButton'),
-              onPressed: () {
-                Navigator.of(context).pop();
-              },
-            ),
-            CustomMaterialButton(
-              label: I18nText('yesButton'),
-              onPressed: () {
-                Navigator.of(context).pop();
-                showArmv7WarningDialog(context);
-              },
-            ),
-          ],
-        ),
-      );
-      return false;
-    }
-    return true;
-  }
-
-  bool checkRequiredPatchOption(BuildContext context) {
-    if (getNullRequiredOptions(selectedPatches, selectedApp!.packageName)
-        .isNotEmpty) {
-      showRequiredOptionDialog(context);
-      return false;
-    }
-    return true;
-  }
-
-  void showRequiredOptionDialog([context]) {
-    showDialog(
-      context: context ?? ctx,
-      builder: (context) => AlertDialog(
-        title: I18nText('notice'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: I18nText('patcherView.requiredOptionDialogText'),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('cancelButton'),
-            onPressed: () => {
-              Navigator.of(context).pop(),
-            },
-          ),
-          CustomMaterialButton(
-            label: I18nText('okButton'),
-            onPressed: () => {
-              Navigator.pop(context),
-              navigateToPatchesSelector(),
-            },
-          ),
-        ],
-      ),
+  Future<bool> isValidPatchConfig() async {
+    bool needsResourcePatching = await _patcherAPI.needsResourcePatching(
+      selectedPatches,
     );
+    if (needsResourcePatching && selectedApp != null) {
+      bool isSplit = await _managerAPI.isSplitApk(selectedApp!);
+      return !isSplit;
+    }
+    return true;
   }
 
-  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) {
+  Future<void> showPatchConfirmationDialog(BuildContext context) async {
+    bool isValid = await isValidPatchConfig();
+    if (isValid) {
+      navigateToInstaller();
+    } else {
       return showDialog(
         context: context,
         builder: (context) => AlertDialog(
-          title: I18nText('warning'),
+          title: I18nText('patcherView.patchDialogTitle'),
           backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-          content: I18nText('patcherView.armv7WarningDialogText'),
+          content: I18nText('patcherView.patchDialogText'),
           actions: <Widget>[
             CustomMaterialButton(
+              isFilled: false,
               label: I18nText('noButton'),
               onPressed: () => Navigator.of(context).pop(),
             ),
             CustomMaterialButton(
               label: I18nText('yesButton'),
-              isFilled: false,
               onPressed: () {
                 Navigator.of(context).pop();
                 navigateToInstaller();
               },
-            ),
+            )
           ],
         ),
       );
-    } else {
-      navigateToInstaller();
     }
   }
 
@@ -157,58 +88,23 @@ class PatcherViewModel extends BaseViewModel {
     return text;
   }
 
-  String getSuggestedVersionString(BuildContext context) {
-    String suggestedVersion =
-        _patcherAPI.getSuggestedVersion(selectedApp!.packageName);
-    if (suggestedVersion.isEmpty) {
-      suggestedVersion = FlutterI18n.translate(
+  String getRecommendedVersionString(BuildContext context) {
+    String recommendedVersion =
+        _patcherAPI.getRecommendedVersion(selectedApp!.packageName);
+    if (recommendedVersion.isEmpty) {
+      recommendedVersion = FlutterI18n.translate(
         context,
-        'appSelectorCard.allVersions',
+        'appSelectorCard.anyVersion',
       );
     } else {
-      suggestedVersion = 'v$suggestedVersion';
+      recommendedVersion = 'v$recommendedVersion';
     }
     return '${FlutterI18n.translate(
       context,
       'appSelectorCard.currentVersion',
     )}: v${selectedApp!.version}\n${FlutterI18n.translate(
       context,
-      'appSelectorCard.suggestedVersion',
-    )}: $suggestedVersion';
-  }
-
-  Future<void> loadLastSelectedPatches() async {
-    this.selectedPatches.clear();
-    removedPatches.clear();
-    final List<String> selectedPatches =
-        await _managerAPI.getSelectedPatches(selectedApp!.packageName);
-    final List<Patch> patches =
-        _patcherAPI.getFilteredPatches(selectedApp!.packageName);
-    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.isVersionCompatibilityCheckEnabled()) {
-      this.selectedPatches.removeWhere((patch) => !isPatchSupported(patch));
-    }
-    if (!_managerAPI.areUniversalPatchesEnabled()) {
-      this
-          .selectedPatches
-          .removeWhere((patch) => patch.compatiblePackages.isEmpty);
-    }
-    final usedPatches = _managerAPI.getUsedPatches(selectedApp!.packageName);
-    for (final patch in usedPatches) {
-      if (!patches.any((p) => p.name == patch.name)) {
-        removedPatches.add('• ${patch.name}');
-        for (final option in patch.options) {
-          _managerAPI.clearPatchOption(
-              selectedApp!.packageName, patch.name, option.key);
-        }
-      }
-    }
-    notifyListeners();
+      'appSelectorCard.recommendedVersion',
+    )}: $recommendedVersion';
   }
 }

lib/ui/views/patches_selector/patches_selector_view.dart

@@ -1,11 +1,8 @@
-import 'package:flutter/material.dart' hide SearchBar;
+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/views/patches_selector/patches_selector_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/patchesSelectorView/patch_item.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 {
@@ -17,40 +14,22 @@ 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(
-      onViewModelReady: (model) => model.initialize(),
+      onModelReady: (model) => model.initialize(),
       viewModelBuilder: () => PatchesSelectorViewModel(),
       builder: (context, model, child) => Scaffold(
+        resizeToAvoidBottomInset: false,
         floatingActionButton: Visibility(
           visible: model.patches.isNotEmpty,
           child: FloatingActionButton.extended(
-            label: Row(
-              children: <Widget>[
-                I18nText('patchesSelectorView.doneButton'),
-                Text(' (${model.selectedPatches.length})'),
-              ],
-            ),
+            label: I18nText('patchesSelectorView.doneButton'),
             icon: const Icon(Icons.check),
             onPressed: () {
-              if (!model.areRequiredOptionsNull(context)) {
-                model.selectPatches();
-                Navigator.of(context).pop();
-              }
+              model.selectPatches();
+              Navigator.of(context).pop();
             },
           ),
         ),
@@ -59,62 +38,51 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
             SliverAppBar(
               pinned: true,
               floating: true,
+              snap: false,
               title: I18nText(
                 'patchesSelectorView.viewTitle',
-              ),
-              titleTextStyle: TextStyle(
-                fontSize: 22.0,
-                color: Theme.of(context).textTheme.titleLarge!.color,
+                child: Text(
+                  '',
+                  style: TextStyle(
+                    color: Theme.of(context).textTheme.headline6!.color,
+                  ),
+                ),
               ),
               leading: IconButton(
                 icon: Icon(
                   Icons.arrow_back,
-                  color: Theme.of(context).textTheme.titleLarge!.color,
+                  color: Theme.of(context).textTheme.headline6!.color,
                 ),
-                onPressed: () {
-                  model.resetSelection();
-                  Navigator.of(context).pop();
-                },
+                onPressed: () => Navigator.of(context).pop(),
               ),
               actions: [
                 Container(
-                  margin: const EdgeInsets.symmetric(vertical: 12),
-                  padding: const EdgeInsets.symmetric(horizontal: 6),
+                  height: 2,
+                  margin: const EdgeInsets.only(right: 16, 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),
                   ),
-                  alignment: Alignment.center,
                   child: Text(
                     model.patchesVersion!,
                     style: TextStyle(
-                      color: Theme.of(context).textTheme.titleLarge!.color,
+                      color: Theme.of(context).textTheme.headline6!.color,
                     ),
                   ),
                 ),
-                PopupMenuButton(
-                  onSelected: (value) {
-                    model.onMenuSelection(value, context);
-                  },
-                  itemBuilder: (BuildContext context) => <PopupMenuEntry>[
-                    PopupMenuItem(
-                      value: 0,
-                      child: I18nText(
-                        'patchesSelectorView.loadPatchesSelection',
-                      ),
-                    ),
-                  ],
-                ),
               ],
               bottom: PreferredSize(
-                preferredSize: const Size.fromHeight(66.0),
+                preferredSize: const Size.fromHeight(64.0),
                 child: Padding(
                   padding: const EdgeInsets.symmetric(
                     vertical: 8.0,
                     horizontal: 12.0,
                   ),
                   child: SearchBar(
+                    showSelectIcon: true,
                     hintText: FlutterI18n.translate(
                       context,
                       'patchesSelectorView.searchBarHint',
@@ -124,6 +92,12 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                         _query = searchQuery;
                       });
                     },
+                    onSelectAll: (value) {
+                      if (value) {
+                        model.selectAllPatcherWarning(context);
+                      }
+                      model.selectAllPatches(value);
+                    },
                   ),
                 ),
               ),
@@ -143,234 +117,106 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                       ),
                     )
                   : Padding(
-                      padding:
-                          const EdgeInsets.symmetric(horizontal: 12.0).copyWith(
-                        bottom: MediaQuery.viewPaddingOf(context).bottom + 8.0,
-                      ),
+                      padding: const EdgeInsets.symmetric(horizontal: 12.0)
+                          .copyWith(bottom: 80),
                       child: Column(
-                        children: [
-                          Row(
-                            children: [
-                              ActionChip(
-                                label: I18nText('patchesSelectorView.default'),
-                                tooltip: FlutterI18n.translate(
-                                  context,
-                                  'patchesSelectorView.defaultTooltip',
-                                ),
-                                onPressed: () {
-                                  if (_managerAPI.isPatchesChangeEnabled()) {
-                                    model.selectDefaultPatches();
-                                  } else {
-                                    model.showPatchesChangeDialog(context);
-                                  }
-                                },
+                        children: model
+                            .getQueriedPatches(_query)
+                            .map(
+                              (patch) => PatchItem(
+                                name: patch.name,
+                                simpleName: patch.getSimpleName(),
+                                version: patch.version,
+                                description: patch.description,
+                                packageVersion: model.getAppVersion(),
+                                supportedPackageVersions:
+                                    model.getSupportedVersions(patch),
+                                isUnsupported: !model.isPatchSupported(patch),
+                                isSelected: model.isSelected(patch),
+                                onChanged: (value) =>
+                                    model.selectPatch(patch, value),
                               ),
-                              const SizedBox(width: 8),
-                              ActionChip(
-                                label: I18nText('patchesSelectorView.none'),
-                                tooltip: FlutterI18n.translate(
-                                  context,
-                                  'patchesSelectorView.noneTooltip',
-                                ),
-                                onPressed: () {
-                                  if (_managerAPI.isPatchesChangeEnabled()) {
-                                    model.clearPatches();
-                                  } else {
-                                    model.showPatchesChangeDialog(context);
-                                  }
-                                },
-                              ),
-                            ],
-                          ),
-                          if (model.newPatchExists())
-                            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,
+                              /* TODO: Enable this and make use of new Patch Options implementation
+                                   patch.hasOptions ? ExpandablePanel(
+                                    controller: expController,
+                                    theme: const ExpandableThemeData(
+                                      hasIcon: false,
+                                      tapBodyToExpand: true,
+                                      tapBodyToCollapse: true,
+                                      tapHeaderToExpand: true,
                                     ),
-                                    child: I18nText(
-                                      'patchesSelectorView.newPatches',
-                                      child: Text(
-                                        '',
-                                        style: TextStyle(
+                                    header: Column(
+                                      children: <Widget>[
+                                        GestureDetector(
+                                          onLongPress: () =>
+                                              expController.toggle(),
+                                          child: PatchItem(
+                                            name: patch.name,
+                                            simpleName: patch.getSimpleName(),
+                                            description: patch.description,
+                                            version: patch.version,
+                                            packageVersion:
+                                                model.getAppVersion(),
+                                            supportedPackageVersions: model
+                                                .getSupportedVersions(patch),
+                                            isUnsupported: !model
+                                                .isPatchSupported(patch),
+                                            isSelected:
+                                                model.isSelected(patch),
+                                            onChanged: (value) => model
+                                                .selectPatch(patch, value),
+                                            child: const Padding(
+                                              padding: EdgeInsets.symmetric(
+                                                vertical: 8.0,
+                                              ),
+                                              child: Text(
+                                                  'Long press for additional options.',
+                                              ),
+                                            ),
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                    expanded: Padding(
+                                      padding: const EdgeInsets.symmetric(
+                                        vertical: 10.0,
+                                        horizontal: 10,
+                                      ),
+                                      child: Container(
+                                        padding: const EdgeInsets.symmetric(
+                                          vertical: 8,
+                                          horizontal: 8,
+                                        ),
+                                        decoration: BoxDecoration(
                                           color: Theme.of(context)
                                               .colorScheme
-                                              .primary,
+                                              .tertiary
+                                              .withOpacity(0.1),
+                                          borderRadius:
+                                              BorderRadius.circular(12),
+                                        ),
+                                        child: Column(
+                                          children: <Widget>[
+                                            Text(
+                                              'Patch options',
+                                              style: GoogleFonts.inter(
+                                                fontSize: 18,
+                                                fontWeight: FontWeight.w600,
+                                              ),
+                                            ),
+                                            const OptionsTextField(
+                                                hint: 'App name'),
+                                            const OptionsFilePicker(
+                                              optionName: 'Choose a logo',
+                                            ),
+                                          ],
                                         ),
                                       ),
                                     ),
-                                  ),
-                                ),
-                                ...model.getQueriedPatches(_query).map((patch) {
-                                  if (model.isPatchNew(patch)) {
-                                    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(),
-                                      hasUnsupportedPatchOption:
-                                          hasUnsupportedRequiredOption(
-                                        patch.options,
-                                        patch,
-                                      ),
-                                      options: patch.options,
-                                      isSelected: model.isSelected(patch),
-                                      navigateToOptions: (options) =>
-                                          model.navigateToPatchOptions(
-                                        options,
-                                        patch,
-                                      ),
-                                      onChanged: (value) => model.selectPatch(
-                                        patch,
-                                        value,
-                                        context,
-                                      ),
-                                    );
-                                  } else {
-                                    return Container();
-                                  }
-                                }),
-                                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.patches',
-                                      child: Text(
-                                        '',
-                                        style: TextStyle(
-                                          color: Theme.of(context)
-                                              .colorScheme
-                                              .primary,
-                                        ),
-                                      ),
-                                    ),
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ...model.getQueriedPatches(_query).map(
-                            (patch) {
-                              if (patch.compatiblePackages.isNotEmpty) {
-                                return PatchItem(
-                                  name: patch.name,
-                                  simpleName: patch.getSimpleName(),
-                                  description: patch.description ?? '',
-                                  packageVersion: model.getAppInfo().version,
-                                  supportedPackageVersions:
-                                      model.getSupportedVersions(patch),
-                                  isUnsupported: !isPatchSupported(patch),
-                                  isChangeEnabled:
-                                      _managerAPI.isPatchesChangeEnabled(),
-                                  hasUnsupportedPatchOption:
-                                      hasUnsupportedRequiredOption(
-                                    patch.options,
-                                    patch,
-                                  ),
-                                  options: patch.options,
-                                  isSelected: model.isSelected(patch),
-                                  navigateToOptions: (options) =>
-                                      model.navigateToPatchOptions(
-                                    options,
-                                    patch,
-                                  ),
-                                  onChanged: (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,
-                                        ),
-                                      ),
-                                    ),
-                                  ),
-                                ),
-                                ...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(),
-                                      hasUnsupportedPatchOption:
-                                          hasUnsupportedRequiredOption(
-                                        patch.options,
-                                        patch,
-                                      ),
-                                      options: patch.options,
-                                      isSelected: model.isSelected(patch),
-                                      navigateToOptions: (options) =>
-                                          model.navigateToPatchOptions(
-                                        options,
-                                        patch,
-                                      ),
-                                      onChanged: (value) => model.selectPatch(
-                                        patch,
-                                        value,
-                                        context,
-                                      ),
-                                    );
-                                  } else {
-                                    return Container();
-                                  }
-                                }),
-                              ],
-                            ),
-                          const SizedBox(height: 70.0),
-                        ],
+                                    collapsed: Container(),
+                                  ) */
+                            )
+                            .toList(),
                       ),
                     ),
             ),

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -1,52 +1,29 @@
 import 'package:collection/collection.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/app/app.locator.dart';
-import 'package:revanced_manager/app/app.router.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
-import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
-import 'package:revanced_manager/utils/check_for_supported_patch.dart';
 import 'package:stacked/stacked.dart';
-import 'package:stacked_services/stacked_services.dart';
+import 'package:flutter/material.dart';
 
 class PatchesSelectorViewModel extends BaseViewModel {
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
-  final NavigationService _navigationService = locator<NavigationService>();
   final List<Patch> patches = [];
-  final List<Patch> currentSelection = [];
   final List<Patch> selectedPatches =
       locator<PatcherViewModel>().selectedPatches;
-  PatchedApplication? selectedApp = locator<PatcherViewModel>().selectedApp;
   String? patchesVersion = '';
-  bool isDefaultPatchesRepo() {
-    return _managerAPI.getPatchesRepo() == 'revanced/revanced-patches';
-  }
 
   Future<void> initialize() async {
-    getPatchesVersion().whenComplete(() => notifyListeners());
-    patches.addAll(
-      _patcherAPI.getFilteredPatches(
-        selectedApp!.packageName,
-      ),
-    );
-    final List<Option> requiredNullOptions =
-        getNullRequiredOptions(patches, selectedApp!.packageName);
-    patches.sort((a, b) {
-      if (b.options.any((option) => requiredNullOptions.contains(option)) &&
-          a.options.isEmpty) {
-        return 1;
-      } else {
-        return a.name.compareTo(b.name);
-      }
-    });
-    currentSelection.clear();
-    currentSelection.addAll(selectedPatches);
+    getPatchesVersion();
+    patches.addAll(await _patcherAPI.getFilteredPatches(
+      locator<PatcherViewModel>().selectedApp!.originalPackageName,
+    ));
+    patches.sort((a, b) => a.name.compareTo(b.name));
     notifyListeners();
   }
 
@@ -56,198 +33,68 @@ class PatchesSelectorViewModel extends BaseViewModel {
     );
   }
 
-  void navigateToPatchOptions(List<Option> setOptions, Patch patch) {
-    _managerAPI.options = setOptions;
-    _managerAPI.selectedPatch = patch;
-    _managerAPI.modifiedOptions.clear();
-    _navigationService.navigateToPatchOptionsView();
-  }
-
-  bool areRequiredOptionsNull(BuildContext context) {
-    final List<String> patchesWithNullRequiredOptions = [];
-    final List<Option> requiredNullOptions =
-        getNullRequiredOptions(selectedPatches, selectedApp!.packageName);
-    if (requiredNullOptions.isNotEmpty) {
-      for (final patch in selectedPatches) {
-        for (final patchOption in patch.options) {
-          if (requiredNullOptions.contains(patchOption)) {
-            patchesWithNullRequiredOptions.add(patch.name);
-            break;
-          }
-        }
-      }
-      showSetRequiredOption(context, patchesWithNullRequiredOptions);
-      return true;
-    }
-    return false;
-  }
-
-  Future<void> showSetRequiredOption(
-    BuildContext context,
-    List<String> patches,
-  ) async {
-    return showDialog(
-      barrierDismissible: false,
-      context: context,
-      builder: (context) => AlertDialog(
-        title: I18nText('notice'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: I18nText(
-          'patchesSelectorView.setRequiredOption',
-          translationParams: {
-            'patches': patches.map((patch) => '• $patch').join('\n'),
-          },
-        ),
-        actions: <Widget>[
-          CustomMaterialButton(
-            label: I18nText('okButton'),
-            onPressed: () => {
-              Navigator.of(context).pop(),
-            },
-          ),
-        ],
-      ),
-    );
-  }
-
-  void selectPatch(Patch patch, bool isSelected, BuildContext context) {
-    if (_managerAPI.isPatchesChangeEnabled()) {
-      if (isSelected && !selectedPatches.contains(patch)) {
-        selectedPatches.add(patch);
-      } else {
-        selectedPatches.remove(patch);
-      }
-      notifyListeners();
+  void selectPatch(Patch patch, bool isSelected) {
+    if (isSelected && !selectedPatches.contains(patch)) {
+      selectedPatches.add(patch);
     } else {
-      showPatchesChangeDialog(context);
-    }
-  }
-
-  Future<void> showPatchesChangeDialog(BuildContext context) async {
-    return showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        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 selectDefaultPatches() {
-    selectedPatches.clear();
-    if (locator<PatcherViewModel>().selectedApp?.packageName != null) {
-      selectedPatches.addAll(
-        _patcherAPI
-            .getFilteredPatches(
-              locator<PatcherViewModel>().selectedApp!.packageName,
-            )
-            .where(
-              (element) =>
-                  !element.excluded &&
-                  (!_managerAPI.isVersionCompatibilityCheckEnabled() ||
-                      isPatchSupported(element)),
-            ),
-      );
+      selectedPatches.remove(patch);
     }
     notifyListeners();
   }
 
-  void clearPatches() {
+  Future<void> selectAllPatcherWarning(BuildContext context) {
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: I18nText('patchesSelectorView.selectAllPatchesWarningTitle'),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: I18nText('patchesSelectorView.selectAllPatchesWarningContent'),
+        actions: <Widget>[
+          CustomMaterialButton(
+            label: I18nText('okButton'),
+            onPressed: () => Navigator.of(context).pop(),
+          )
+        ],
+      ),
+    );
+  }
+
+  void selectAllPatches(bool isSelected) {
     selectedPatches.clear();
+    if (isSelected) {
+      selectedPatches.addAll(patches);
+    }
     notifyListeners();
   }
 
   void selectPatches() {
     locator<PatcherViewModel>().selectedPatches = selectedPatches;
-    saveSelectedPatches();
-    if (_managerAPI.ctx != null) {
-      Navigator.pop(_managerAPI.ctx!);
-      _managerAPI.ctx = null;
-    }
     locator<PatcherViewModel>().notifyListeners();
   }
 
-  void resetSelection() {
-    selectedPatches.clear();
-    selectedPatches.addAll(currentSelection);
-    notifyListeners();
-  }
-
-  Future<void> getPatchesVersion() async {
-    patchesVersion = await _managerAPI.getCurrentPatchesVersion();
+  Future<String?> getPatchesVersion() async {
+    patchesVersion = await _managerAPI.getLatestPatchesVersion();
+    // print('Patches version: $patchesVersion');
+    return patchesVersion ?? '0.0.0';
   }
 
   List<Patch> getQueriedPatches(String query) {
-    final List<Patch> patch = patches
-        .where(
-          (patch) =>
-              query.isEmpty ||
-              query.length < 2 ||
-              patch.name.toLowerCase().contains(query.toLowerCase()) ||
-              patch.name
-                  .replaceAll(RegExp(r'[^\w\s]+'), '')
-                  .toLowerCase()
-                  .contains(query.toLowerCase()),
-        )
+    return 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();
-    }
   }
 
-  PatchedApplication getAppInfo() {
-    return locator<PatcherViewModel>().selectedApp!;
-  }
-
-  bool isPatchNew(Patch patch) {
-    final List<Patch> savedPatches =
-        _managerAPI.getSavedPatches(selectedApp!.packageName);
-    if (savedPatches.isEmpty) {
-      return false;
-    } else {
-      return !savedPatches
-          .any((p) => p.getSimpleName() == patch.getSimpleName());
-    }
-  }
-
-  bool newPatchExists() {
-    return patches.any(
-      (patch) => isPatchNew(patch),
-    );
+  String getAppVersion() {
+    return locator<PatcherViewModel>().selectedApp!.version;
   }
 
   List<String> getSupportedVersions(Patch patch) {
-    final PatchedApplication app = locator<PatcherViewModel>().selectedApp!;
-    final Package? package = patch.compatiblePackages.firstWhereOrNull(
+    PatchedApplication app = locator<PatcherViewModel>().selectedApp!;
+    Package? package = patch.compatiblePackages.firstWhereOrNull(
       (pack) => pack.name == app.packageName,
     );
     if (package != null) {
@@ -257,42 +104,10 @@ class PatchesSelectorViewModel extends BaseViewModel {
     }
   }
 
-  void onMenuSelection(value, BuildContext context) {
-    switch (value) {
-      case 0:
-        loadSelectedPatches(context);
-        break;
-    }
-  }
-
-  Future<void> saveSelectedPatches() async {
-    final List<String> selectedPatches =
-        this.selectedPatches.map((patch) => patch.name).toList();
-    await _managerAPI.setSelectedPatches(
-      locator<PatcherViewModel>().selectedApp!.packageName,
-      selectedPatches,
-    );
-  }
-
-  Future<void> loadSelectedPatches(BuildContext context) async {
-    if (_managerAPI.isPatchesChangeEnabled()) {
-      final List<String> selectedPatches = await _managerAPI.getSelectedPatches(
-        locator<PatcherViewModel>().selectedApp!.packageName,
-      );
-      if (selectedPatches.isNotEmpty) {
-        this.selectedPatches.clear();
-        this.selectedPatches.addAll(
-              patches.where((patch) => selectedPatches.contains(patch.name)),
-            );
-        if (_managerAPI.isVersionCompatibilityCheckEnabled()) {
-          this.selectedPatches.removeWhere((patch) => !isPatchSupported(patch));
-        }
-      } else {
-        locator<Toast>().showBottom('patchesSelectorView.noSavedPatches');
-      }
-      notifyListeners();
-    } else {
-      showPatchesChangeDialog(context);
-    }
+  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)));
   }
 }

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

@@ -1,122 +0,0 @@
-// 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/services/toast.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
-import 'package:stacked/stacked.dart';
-
-class SManageApiUrl extends BaseViewModel {
-  final ManagerAPI _managerAPI = locator<ManagerAPI>();
-  final Toast _toast = locator<Toast>();
-
-  final TextEditingController _apiUrlController = TextEditingController();
-
-  Future<void> showApiUrlDialog(BuildContext context) async {
-    final String apiUrl = _managerAPI.getApiUrl();
-    _apiUrlController.text = apiUrl.replaceAll('https://', '');
-    return showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: Row(
-          children: <Widget>[
-            I18nText('settingsView.apiURLLabel'),
-            const Spacer(),
-            IconButton(
-              icon: const Icon(Icons.manage_history_outlined),
-              onPressed: () => showApiUrlResetDialog(context),
-              color: Theme.of(context).colorScheme.secondary,
-            ),
-          ],
-        ),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: SingleChildScrollView(
-          child: Column(
-            children: <Widget>[
-              CustomTextField(
-                leadingIcon: Icon(
-                  Icons.api_outlined,
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-                inputController: _apiUrlController,
-                label: I18nText('settingsView.selectApiURL'),
-                hint: apiUrl,
-                onChanged: (value) => notifyListeners(),
-              ),
-            ],
-          ),
-        ),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('cancelButton'),
-            onPressed: () {
-              _apiUrlController.clear();
-              Navigator.of(context).pop();
-            },
-          ),
-          CustomMaterialButton(
-            label: I18nText('okButton'),
-            onPressed: () {
-              String apiUrl = _apiUrlController.text;
-              if (!apiUrl.startsWith('https')) {
-                apiUrl = 'https://$apiUrl';
-              }
-              _managerAPI.setApiUrl(apiUrl);
-              _toast.showBottom('settingsView.restartAppForChanges');
-              Navigator.of(context).pop();
-            },
-          ),
-        ],
-      ),
-    );
-  }
-
-  Future<void> showApiUrlResetDialog(BuildContext context) async {
-    return showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: I18nText('settingsView.sourcesResetDialogTitle'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: I18nText('settingsView.apiURLResetDialogText'),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
-            onPressed: () => Navigator.of(context).pop(),
-          ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
-            onPressed: () {
-              _managerAPI.setApiUrl('');
-              _toast.showBottom('settingsView.restartAppForChanges');
-              Navigator.of(context)
-                ..pop()
-                ..pop();
-            },
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-final sManageApiUrl = SManageApiUrl();
-
-class SManageApiUrlUI extends StatelessWidget {
-  const SManageApiUrlUI({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return SettingsTileDialog(
-      padding: const EdgeInsets.symmetric(horizontal: 20.0),
-      title: 'settingsView.apiURLLabel',
-      subtitle: 'settingsView.apiURLHint',
-      onTap: () => sManageApiUrl.showApiUrlDialog(context),
-    );
-  }
-}

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

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

@@ -1,189 +0,0 @@
-// 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/services/toast.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
-import 'package:stacked/stacked.dart';
-
-class SManageSources extends BaseViewModel {
-  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 {
-    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];
-    _intSourceController.text = integrationsRepo.split('/')[1];
-    return showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: Row(
-          children: <Widget>[
-            I18nText('settingsView.sourcesLabel'),
-            const Spacer(),
-            IconButton(
-              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,
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-                inputController: _orgPatSourceController,
-                label: I18nText('settingsView.orgPatchesLabel'),
-                hint: patchesRepo.split('/')[0],
-                onChanged: (value) => notifyListeners(),
-              ),
-              const SizedBox(height: 8),
-              CustomTextField(
-                leadingIcon: const Icon(
-                  Icons.extension_outlined,
-                  color: Colors.transparent,
-                ),
-                inputController: _patSourceController,
-                label: I18nText('settingsView.sourcesPatchesLabel'),
-                hint: patchesRepo.split('/')[1],
-                onChanged: (value) => notifyListeners(),
-              ),
-              const SizedBox(height: 20),
-              CustomTextField(
-                leadingIcon: Icon(
-                  Icons.merge_outlined,
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-                inputController: _orgIntSourceController,
-                label: I18nText('settingsView.orgIntegrationsLabel'),
-                hint: integrationsRepo.split('/')[0],
-                onChanged: (value) => notifyListeners(),
-              ),
-              const SizedBox(height: 8),
-              CustomTextField(
-                leadingIcon: const Icon(
-                  Icons.merge_outlined,
-                  color: Colors.transparent,
-                ),
-                inputController: _intSourceController,
-                label: I18nText('settingsView.sourcesIntegrationsLabel'),
-                hint: integrationsRepo.split('/')[1],
-                onChanged: (value) => notifyListeners(),
-              ),
-              const SizedBox(height: 20),
-              I18nText('settingsView.sourcesUpdateNote'),
-            ],
-          ),
-        ),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('cancelButton'),
-            onPressed: () {
-              _orgPatSourceController.clear();
-              _patSourceController.clear();
-              _orgIntSourceController.clear();
-              _intSourceController.clear();
-              Navigator.of(context).pop();
-            },
-          ),
-          CustomMaterialButton(
-            label: I18nText('okButton'),
-            onPressed: () {
-              _managerAPI.setRepoUrl(_hostSourceController.text.trim());
-              _managerAPI.setPatchesRepo(
-                '${_orgPatSourceController.text.trim()}/${_patSourceController.text.trim()}',
-              );
-              _managerAPI.setIntegrationsRepo(
-                '${_orgIntSourceController.text.trim()}/${_intSourceController.text.trim()}',
-              );
-              _managerAPI.setCurrentPatchesVersion('0.0.0');
-              _managerAPI.setCurrentIntegrationsVersion('0.0.0');
-              _toast.showBottom('settingsView.restartAppForChanges');
-              Navigator.of(context).pop();
-            },
-          ),
-        ],
-      ),
-    );
-  }
-
-  Future<void> showResetConfirmationDialog(BuildContext context) async {
-    return showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: I18nText('settingsView.sourcesResetDialogTitle'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: I18nText('settingsView.sourcesResetDialogText'),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
-            onPressed: () => Navigator.of(context).pop(),
-          ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
-            onPressed: () {
-              _managerAPI.setRepoUrl('');
-              _managerAPI.setPatchesRepo('');
-              _managerAPI.setIntegrationsRepo('');
-              _managerAPI.setCurrentPatchesVersion('0.0.0');
-              _managerAPI.setCurrentIntegrationsVersion('0.0.0');
-              _toast.showBottom('settingsView.restartAppForChanges');
-              Navigator.of(context)
-                ..pop()
-                ..pop();
-            },
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-final sManageSources = SManageSources();
-
-class SManageSourcesUI extends StatelessWidget {
-  const SManageSourcesUI({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return SettingsTileDialog(
-      padding: const EdgeInsets.symmetric(horizontal: 20.0),
-      title: 'settingsView.sourcesLabel',
-      subtitle: 'settingsView.sourcesLabelHint',
-      onTap: () => sManageSources.showSourcesDialog(context),
-    );
-  }
-}

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

@@ -1,95 +0,0 @@
-// 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/main.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';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:stacked/stacked.dart';
-import 'package:timeago/timeago.dart' as timeago;
-
-final _settingViewModel = SettingsViewModel();
-
-class SUpdateLanguage extends BaseViewModel {
-  final Toast _toast = locator<Toast>();
-  late SharedPreferences _prefs;
-  String selectedLanguage = 'English';
-  String selectedLanguageLocale = prefs.getString('language') ?? 'en_US';
-  List languages = [];
-
-  Future<void> initialize() async {
-    _prefs = await SharedPreferences.getInstance();
-    selectedLanguageLocale =
-        _prefs.getString('language') ?? selectedLanguageLocale;
-    notifyListeners();
-  }
-
-  Future<void> updateLanguage(BuildContext context, String? value) async {
-    if (value != null) {
-      selectedLanguageLocale = value;
-      _prefs = await SharedPreferences.getInstance();
-      await _prefs.setString('language', value);
-      await FlutterI18n.refresh(context, Locale(value));
-      timeago.setLocaleMessages(value, timeago.EnMessages());
-      locator<NavigationViewModel>().notifyListeners();
-      notifyListeners();
-    }
-  }
-
-  Future<void> initLang() async {
-    languages.sort((a, b) => a['name'].compareTo(b['name']));
-    notifyListeners();
-  }
-
-  Future<void> showLanguagesDialog(BuildContext parentContext) {
-    initLang();
-    return showDialog(
-      context: parentContext,
-      builder: (context) => SimpleDialog(
-        title: I18nText('settingsView.languageLabel'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        children: [
-          SizedBox(
-            height: 500,
-            child: ListView.builder(
-              itemCount: languages.length,
-              itemBuilder: (context, index) {
-                return RadioListTile<String>(
-                  title: Text(languages[index]['name']),
-                  subtitle: Text(languages[index]['locale']),
-                  value: languages[index]['locale'],
-                  groupValue: selectedLanguageLocale,
-                  onChanged: (value) {
-                    selectedLanguage = languages[index]['name'];
-                    _toast.showBottom('settingsView.restartAppForChanges');
-                    updateLanguage(context, value);
-                    Navigator.pop(context);
-                  },
-                );
-              },
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class SUpdateLanguageUI extends StatelessWidget {
-  const SUpdateLanguageUI({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return SettingsTileDialog(
-      padding: const EdgeInsets.symmetric(horizontal: 20.0),
-      title: 'settingsView.languageLabel',
-      subtitle: _settingViewModel.sUpdateLanguage.selectedLanguage,
-      onTap: () =>
-          _settingViewModel.sUpdateLanguage.showLanguagesDialog(context),
-    );
-  }
-}

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

@@ -1,185 +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/widgets/settingsView/settings_section.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
-
-class SUpdateThemeUI extends StatefulWidget {
-  const SUpdateThemeUI({super.key});
-
-  @override
-  State<SUpdateThemeUI> createState() => _SUpdateThemeUIState();
-}
-
-class _SUpdateThemeUIState extends State<SUpdateThemeUI> {
-  final ManagerAPI managerAPI = locator<ManagerAPI>();
-
-  @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: getThemeModeName(),
-            onPressed: () => {showThemeDialog(context)},
-          ),
-          onTap: () => {showThemeDialog(context)},
-        ),
-        if (managerAPI.isDynamicThemeAvailable)
-          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: getDynamicThemeStatus(),
-            onChanged: (value) => {
-              setUseDynamicTheme(
-                context,
-                value,
-              ),
-            },
-          ),
-      ],
-    );
-  }
-
-  bool getDynamicThemeStatus() {
-    return managerAPI.getUseDynamicTheme();
-  }
-
-  Future<void> setUseDynamicTheme(BuildContext context, bool value) async {
-    await managerAPI.setUseDynamicTheme(value);
-    final int currentTheme = (DynamicTheme.of(context)!.themeId ~/ 2) * 2;
-    await DynamicTheme.of(context)!.setTheme(currentTheme + (value ? 1 : 0));
-    setState(() {});
-  }
-
-  int getThemeMode() {
-    return managerAPI.getThemeMode();
-  }
-
-  Future<void> setThemeMode(BuildContext context, int value) async {
-    await managerAPI.setThemeMode(value);
-    final bool isDynamicTheme = DynamicTheme.of(context)!.themeId.isEven;
-    await DynamicTheme.of(context)!
-        .setTheme(value * 2 + (isDynamicTheme ? 0 : 1));
-    final bool isLight = value != 2 &&
-        (value == 1 ||
-            DynamicTheme.of(context)!.theme.brightness == Brightness.light);
-    SystemChrome.setSystemUIOverlayStyle(
-      SystemUiOverlayStyle(
-        systemNavigationBarIconBrightness:
-            isLight ? Brightness.dark : Brightness.light,
-      ),
-    );
-    setState(() {});
-  }
-
-  I18nText getThemeModeName() {
-    switch (getThemeMode()) {
-      case 0:
-        return I18nText('settingsView.systemThemeLabel');
-      case 1:
-        return I18nText('settingsView.lightThemeLabel');
-      case 2:
-        return I18nText('settingsView.darkThemeLabel');
-      default:
-        return I18nText('settingsView.systemThemeLabel');
-    }
-  }
-
-  Future<void> showThemeDialog(BuildContext context) async {
-    final ValueNotifier<int> newTheme = ValueNotifier(getThemeMode());
-
-    return showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: I18nText('settingsView.themeModeLabel'),
-        icon: const Icon(Icons.palette),
-        contentPadding: const EdgeInsets.symmetric(vertical: 16),
-        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();
-            },
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/ui/views/settings/settings_view.dart

@@ -1,14 +1,12 @@
-// ignore_for_file: prefer_const_constructors
-
 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/settingsFragment/settings_update_theme.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_advanced_section.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_debug_section.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_export_section.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_team_section.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/about_widget.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/custom_switch_tile.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/social_media_widget.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
@@ -32,7 +30,7 @@ class SettingsView extends StatelessWidget {
                 child: Text(
                   '',
                   style: GoogleFonts.inter(
-                    color: Theme.of(context).textTheme.titleLarge!.color,
+                    color: Theme.of(context).textTheme.headline6!.color,
                   ),
                 ),
               ),
@@ -40,22 +38,199 @@ class SettingsView extends StatelessWidget {
             SliverList(
               delegate: SliverChildListDelegate.fixed(
                 <Widget>[
-                  ListView(
-                    padding: EdgeInsets.zero,
-                    shrinkWrap: true,
-                    physics: NeverScrollableScrollPhysics(),
-                    children: const [
-                      SUpdateThemeUI(),
-                      // _settingsDivider,
-                      // SUpdateLanguageUI(),
-                      _settingsDivider,
-                      SAdvancedSection(),
-                      _settingsDivider,
-                      SExportSection(),
-                      _settingsDivider,
-                      STeamSection(),
-                      _settingsDivider,
-                      SDebugSection(),
+                  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: model.getDarkThemeStatus(),
+                        onTap: (value) => model.setUseDarkTheme(
+                          context,
+                          value,
+                        ),
+                      ),
+                      FutureBuilder<int>(
+                        future: model.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: model.getDynamicThemeStatus(),
+                            onTap: (value) => model.setUseDynamicTheme(
+                              context,
+                              value,
+                            ),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                  SettingsTileDialog(
+                    padding: const EdgeInsets.symmetric(horizontal: 20.0),
+                    title: 'settingsView.languageLabel',
+                    subtitle: 'English',
+                    onTap: () => model.showLanguagesDialog(context),
+                  ),
+                  _settingsDivider,
+                  SettingsSection(
+                    title: 'settingsView.teamSectionTitle',
+                    children: <Widget>[
+                      ListTile(
+                        contentPadding:
+                            const EdgeInsets.symmetric(horizontal: 20.0),
+                        title: I18nText(
+                          'settingsView.contributorsLabel',
+                          child: const Text(
+                            '',
+                            style: TextStyle(
+                              fontSize: 20,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                        ),
+                        subtitle: I18nText('settingsView.contributorsHint'),
+                        onTap: () => model.navigateToContributors(),
+                      ),
+                      const SocialMediaWidget(
+                        padding: EdgeInsets.symmetric(horizontal: 20.0),
+                      ),
+                    ],
+                  ),
+                  _settingsDivider,
+                  SettingsSection(
+                    title: 'settingsView.advancedSectionTitle',
+                    children: <Widget>[
+                      SettingsTileDialog(
+                        padding: const EdgeInsets.symmetric(horizontal: 20.0),
+                        title: 'settingsView.apiURLLabel',
+                        subtitle: 'settingsView.apiURLHint',
+                        onTap: () => model.showApiUrlDialog(context),
+                      ),
+                      SettingsTileDialog(
+                        padding: const EdgeInsets.symmetric(horizontal: 20.0),
+                        title: 'settingsView.sourcesLabel',
+                        subtitle: 'settingsView.sourcesLabelHint',
+                        onTap: () => model.showSourcesDialog(context),
+                      ),
+                      ListTile(
+                        contentPadding:
+                            const EdgeInsets.symmetric(horizontal: 20.0),
+                        title: I18nText(
+                          'settingsView.deleteKeystoreLabel',
+                          child: const Text(
+                            '',
+                            style: TextStyle(
+                              fontSize: 20,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                        ),
+                        subtitle: I18nText('settingsView.deleteKeystoreHint'),
+                        onTap: () => model.deleteKeystore,
+                      ),
+                      ListTile(
+                        contentPadding:
+                            const EdgeInsets.symmetric(horizontal: 20.0),
+                        title: I18nText(
+                          'settingsView.deleteTempDirLabel',
+                          child: const Text(
+                            '',
+                            style: TextStyle(
+                              fontSize: 20,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                        ),
+                        subtitle: I18nText('settingsView.deleteTempDirHint'),
+                        onTap: () => model.deleteTempDir(),
+                      ),
+                      ListTile(
+                        contentPadding:
+                            const EdgeInsets.symmetric(horizontal: 20.0),
+                        title: I18nText(
+                          'settingsView.deleteLogsLabel',
+                          child: const Text(
+                            '',
+                            style: TextStyle(
+                              fontSize: 20,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                        ),
+                        subtitle: I18nText('settingsView.deleteLogsHint'),
+                        onTap: () => model.deleteLogs(),
+                      ),
+                    ],
+                  ),
+                  _settingsDivider,
+                  // SettingsSection(
+                  //   title: 'settingsView.logsSectionTitle',
+                  //   children: <Widget>[
+                  //     CustomSwitchTile(
+                  //       padding: const EdgeInsets.symmetric(horizontal: 20.0),
+                  //       title: I18nText(
+                  //         'settingsView.sentryLabel',
+                  //         child: const Text(
+                  //           '',
+                  //           style: TextStyle(
+                  //             fontSize: 20,
+                  //             fontWeight: FontWeight.w500,
+                  //           ),
+                  //         ),
+                  //       ),
+                  //       subtitle: I18nText('settingsView.sentryHint'),
+                  //       value: model.isSentryEnabled(),
+                  //       onTap: (value) => model.useSentry(value),
+                  //     ),
+                  //   ],
+                  // ),
+                  // _settingsDivider,
+                  SettingsSection(
+                    title: 'settingsView.infoSectionTitle',
+                    children: <Widget>[
+                      ListTile(
+                        contentPadding:
+                            const EdgeInsets.symmetric(horizontal: 20.0),
+                        title: I18nText(
+                          'settingsView.logsLabel',
+                          child: const Text(
+                            '',
+                            style: TextStyle(
+                              fontSize: 20,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                        ),
+                        subtitle: I18nText('settingsView.logsHint'),
+                        onTap: () => model.exportLogcatLogs(),
+                      ),
+                      const AboutWidget(
+                        padding: EdgeInsets.symmetric(horizontal: 20.0),
+                      ),
                     ],
                   ),
                 ],

lib/ui/views/settings/settings_viewmodel.dart

@@ -1,8 +1,9 @@
+// ignore_for_file: use_build_context_synchronously
 import 'dart:io';
-import 'package:cr_file_saver/file_saver.dart';
-import 'package:file_picker/file_picker.dart';
-import 'package:flutter/foundation.dart';
+import 'package:device_info_plus/device_info_plus.dart';
+import 'package:dynamic_themes/dynamic_themes.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:logcat/logcat.dart';
 import 'package:path_provider/path_provider.dart';
@@ -10,140 +11,323 @@ 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/services/toast.dart';
-import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
-import 'package:revanced_manager/ui/views/patches_selector/patches_selector_viewmodel.dart';
-import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_update_language.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
 import 'package:share_extend/share_extend.dart';
 import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
+import 'package:timeago/timeago.dart';
+
+// ignore: constant_identifier_names
+const int ANDROID_12_SDK_VERSION = 31;
 
 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 TextEditingController _orgPatSourceController = TextEditingController();
+  final TextEditingController _patSourceController = TextEditingController();
+  final TextEditingController _orgIntSourceController = TextEditingController();
+  final TextEditingController _intSourceController = TextEditingController();
+  final TextEditingController _apiUrlController = TextEditingController();
 
-  final SUpdateLanguage sUpdateLanguage = SUpdateLanguage();
+  void setLanguage(String language) {
+    notifyListeners();
+  }
 
   void navigateToContributors() {
     _navigationService.navigateTo(Routes.contributorsView);
   }
 
-  bool isPatchesAutoUpdate() {
-    return _managerAPI.isPatchesAutoUpdate();
-  }
-
-  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('yesButton'),
-              onPressed: () {
-                _managerAPI.setChangingToggleModified(true);
-                _managerAPI.setPatchesChangeEnabled(true);
-                Navigator.of(context).pop();
-              },
-            ),
-            CustomMaterialButton(
-              label: I18nText('noButton'),
-              onPressed: () {
-                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();
-              },
-            ),
-          ],
-        ),
-      );
+  Future<void> updateLanguage(BuildContext context, String? value) async {
+    if (value != null) {
+      await FlutterI18n.refresh(context, Locale(value));
+      setLocaleMessages(value, EnMessages());
     }
   }
 
-  bool areUniversalPatchesEnabled() {
-    return _managerAPI.areUniversalPatchesEnabled();
+  bool getDynamicThemeStatus() {
+    return _managerAPI.getUseDynamicTheme();
   }
 
-  void showUniversalPatches(bool value) {
-    _managerAPI.enableUniversalPatchesStatus(value);
+  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 isVersionCompatibilityCheckEnabled() {
-    return _managerAPI.isVersionCompatibilityCheckEnabled();
+  bool getDarkThemeStatus() {
+    return _managerAPI.getUseDarkTheme();
   }
 
-  void useVersionCompatibilityCheck(bool value) {
-    _managerAPI.enableVersionCompatibilityCheckStatus(value);
+  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();
   }
 
+  Future<void> showLanguagesDialog(BuildContext context) {
+    return showDialog(
+      context: context,
+      builder: (context) => SimpleDialog(
+        title: I18nText('settingsView.languageLabel'),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        children: <Widget>[
+          RadioListTile<String>(
+            title: I18nText('settingsView.englishOption'),
+            value: 'en',
+            groupValue: 'en',
+            onChanged: (value) {
+              updateLanguage(context, value);
+              Navigator.of(context).pop();
+            },
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> showSourcesDialog(BuildContext context) async {
+    String patchesRepo = _managerAPI.getPatchesRepo();
+    String integrationsRepo = _managerAPI.getIntegrationsRepo();
+    _orgPatSourceController.text = patchesRepo.split('/')[0];
+    _patSourceController.text = patchesRepo.split('/')[1];
+    _orgIntSourceController.text = integrationsRepo.split('/')[0];
+    _intSourceController.text = integrationsRepo.split('/')[1];
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Row(
+          children: <Widget>[
+            I18nText('settingsView.sourcesLabel'),
+            const Spacer(),
+            IconButton(
+              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: Icon(
+                  Icons.extension_outlined,
+                  color: Theme.of(context).colorScheme.secondary,
+                ),
+                inputController: _orgPatSourceController,
+                label: I18nText('settingsView.orgPatchesLabel'),
+                hint: patchesRepo.split('/')[0],
+                onChanged: (value) => notifyListeners(),
+              ),
+              const SizedBox(height: 8),
+              CustomTextField(
+                leadingIcon: const Icon(
+                  Icons.extension_outlined,
+                  color: Colors.transparent,
+                ),
+                inputController: _patSourceController,
+                label: I18nText('settingsView.sourcesPatchesLabel'),
+                hint: patchesRepo.split('/')[1],
+                onChanged: (value) => notifyListeners(),
+              ),
+              const SizedBox(height: 20),
+              CustomTextField(
+                leadingIcon: Icon(
+                  Icons.merge_outlined,
+                  color: Theme.of(context).colorScheme.secondary,
+                ),
+                inputController: _orgIntSourceController,
+                label: I18nText('settingsView.orgIntegrationsLabel'),
+                hint: integrationsRepo.split('/')[0],
+                onChanged: (value) => notifyListeners(),
+              ),
+              const SizedBox(height: 8),
+              CustomTextField(
+                leadingIcon: const Icon(
+                  Icons.merge_outlined,
+                  color: Colors.transparent,
+                ),
+                inputController: _intSourceController,
+                label: I18nText('settingsView.sourcesIntegrationsLabel'),
+                hint: integrationsRepo.split('/')[1],
+                onChanged: (value) => notifyListeners(),
+              ),
+            ],
+          ),
+        ),
+        actions: <Widget>[
+          CustomMaterialButton(
+            isFilled: false,
+            label: I18nText('cancelButton'),
+            onPressed: () {
+              _orgPatSourceController.clear();
+              _patSourceController.clear();
+              _orgIntSourceController.clear();
+              _intSourceController.clear();
+              Navigator.of(context).pop();
+            },
+          ),
+          CustomMaterialButton(
+            label: I18nText('okButton'),
+            onPressed: () {
+              _managerAPI.setPatchesRepo(
+                '${_orgPatSourceController.text}/${_patSourceController.text}',
+              );
+              _managerAPI.setIntegrationsRepo(
+                '${_orgIntSourceController.text}/${_intSourceController.text}',
+              );
+              Navigator.of(context).pop();
+            },
+          )
+        ],
+      ),
+    );
+  }
+
+  Future<void> showApiUrlDialog(BuildContext context) async {
+    String apiUrl = _managerAPI.getApiUrl();
+    _apiUrlController.text = apiUrl.replaceAll('https://', '');
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Row(
+          children: <Widget>[
+            I18nText('settingsView.apiURLLabel'),
+            const Spacer(),
+            IconButton(
+              icon: const Icon(Icons.manage_history_outlined),
+              onPressed: () => showApiUrlResetDialog(context),
+              color: Theme.of(context).colorScheme.secondary,
+            )
+          ],
+        ),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: SingleChildScrollView(
+          child: Column(
+            children: <Widget>[
+              CustomTextField(
+                leadingIcon: Icon(
+                  Icons.api_outlined,
+                  color: Theme.of(context).colorScheme.secondary,
+                ),
+                inputController: _apiUrlController,
+                label: I18nText('settingsView.selectApiURL'),
+                hint: apiUrl.split('/')[0],
+                onChanged: (value) => notifyListeners(),
+              ),
+            ],
+          ),
+        ),
+        actions: <Widget>[
+          CustomMaterialButton(
+            isFilled: false,
+            label: I18nText('cancelButton'),
+            onPressed: () {
+              _apiUrlController.clear();
+              Navigator.of(context).pop();
+            },
+          ),
+          CustomMaterialButton(
+            label: I18nText('okButton'),
+            onPressed: () {
+              String apiUrl = _apiUrlController.text;
+              if (!apiUrl.startsWith('https')) {
+                apiUrl = 'https://$apiUrl';
+              }
+              _managerAPI.setApiUrl(apiUrl);
+              Navigator.of(context).pop();
+            },
+          )
+        ],
+      ),
+    );
+  }
+
+  Future<void> showResetConfirmationDialog(BuildContext context) async {
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: I18nText('settingsView.sourcesResetDialogTitle'),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: I18nText('settingsView.sourcesResetDialogText'),
+        actions: <Widget>[
+          CustomMaterialButton(
+            isFilled: false,
+            label: I18nText('noButton'),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+          CustomMaterialButton(
+            label: I18nText('yesButton'),
+            onPressed: () {
+              _managerAPI.setPatchesRepo('');
+              _managerAPI.setIntegrationsRepo('');
+              Navigator.of(context).pop();
+              Navigator.of(context).pop();
+            },
+          )
+        ],
+      ),
+    );
+  }
+
+  Future<void> showApiUrlResetDialog(BuildContext context) async {
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: I18nText('settingsView.sourcesResetDialogTitle'),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: I18nText('settingsView.apiURLResetDialogText'),
+        actions: <Widget>[
+          CustomMaterialButton(
+            isFilled: false,
+            label: I18nText('noButton'),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+          CustomMaterialButton(
+            label: I18nText('yesButton'),
+            onPressed: () {
+              _managerAPI.setApiUrl('');
+              Navigator.of(context).pop();
+              Navigator.of(context).pop();
+            },
+          )
+        ],
+      ),
+    );
+  }
+
+  // bool isSentryEnabled() {
+  //   return _managerAPI.isSentryEnabled();
+  // }
+
+  // void useSentry(bool value) {
+  //   _managerAPI.setSentryStatus(value);
+  //   _toast.showBottom('settingsView.restartAppForChanges');
+  //   notifyListeners();
+  // }
+
   void deleteKeystore() {
     _managerAPI.deleteKeystore();
-    _toast.showBottom('settingsView.regeneratedKeystore');
+    _toast.showBottom('settingsView.deletedKeystore');
     notifyListeners();
   }
 
@@ -153,109 +337,14 @@ class SettingsViewModel extends BaseViewModel {
     notifyListeners();
   }
 
-  Future<void> exportPatches() async {
-    try {
-      final File outFile = File(_managerAPI.storedPatchesFile);
-      if (outFile.existsSync()) {
-        final String dateTime =
-            DateTime.now().toString().replaceAll(' ', '_').split('.').first;
-        await CRFileSaver.saveFileWithDialog(
-          SaveFileDialogParams(
-            sourceFilePath: outFile.path,
-            destinationFileName: 'selected_patches_$dateTime.json',
-          ),
-        );
-        _toast.showBottom('settingsView.exportedPatches');
-      } else {
-        _toast.showBottom('settingsView.noExportFileFound');
-      }
-    } on Exception catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-    }
-  }
-
-  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');
-        }
-      } on Exception catch (e) {
-        if (kDebugMode) {
-          print(e);
-        }
-        _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');
-    }
-  }
-
-  void resetAllOptions() {
-    _managerAPI.resetAllOptions();
-    _toast.showBottom('settingsView.resetStoredOptions');
-  }
-
-  void resetSelectedPatches() {
-    _managerAPI.resetLastSelectedPatches();
-    _toast.showBottom('settingsView.resetStoredPatches');
+  Future<int> getSdkVersion() async {
+    AndroidDeviceInfo info = await DeviceInfoPlugin().androidInfo;
+    return info.version.sdkInt ?? -1;
   }
 
   Future<void> deleteLogs() async {
-    final Directory appCacheDir = await getTemporaryDirectory();
-    final Directory logsDir = Directory('${appCacheDir.path}/logs');
+    Directory appCacheDir = await getTemporaryDirectory();
+    Directory logsDir = Directory('${appCacheDir.path}/logs');
     if (logsDir.existsSync()) {
       logsDir.deleteSync(recursive: true);
     }
@@ -263,18 +352,17 @@ class SettingsViewModel extends BaseViewModel {
   }
 
   Future<void> exportLogcatLogs() async {
-    final Directory appCache = await getTemporaryDirectory();
-    final Directory logDir = Directory('${appCache.path}/logs');
+    Directory appCache = await getTemporaryDirectory();
+    Directory logDir = Directory('${appCache.path}/logs');
     logDir.createSync();
-    final String dateTime = DateTime.now()
+    String dateTime = DateTime.now()
         .toIso8601String()
         .replaceAll('-', '')
         .replaceAll(':', '')
         .replaceAll('T', '')
         .replaceAll('.', '');
-    final File logcat =
-        File('${logDir.path}/revanced-manager_logcat_$dateTime.log');
-    final String logs = await Logcat.execute();
+    File logcat = File('${logDir.path}/revanced-manager_logcat_$dateTime.log');
+    String logs = await Logcat.execute();
     logcat.writeAsStringSync(logs);
     ShareExtend.share(logcat.path, 'file');
   }

lib/ui/widgets/appInfoView/app_info_view.dart

@@ -8,11 +8,12 @@ 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) {
@@ -27,7 +28,7 @@ class AppInfoView extends StatelessWidget {
                 child: Text(
                   '',
                   style: GoogleFonts.inter(
-                    color: Theme.of(context).textTheme.titleLarge!.color,
+                    color: Theme.of(context).textTheme.headline6!.color,
                   ),
                 ),
               ),
@@ -51,13 +52,13 @@ class AppInfoView extends StatelessWidget {
                     Text(
                       app.name,
                       textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.titleLarge,
+                      style: Theme.of(context).textTheme.headline6,
                     ),
                     const SizedBox(height: 4),
                     Text(
                       app.version,
                       textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.titleLarge,
+                      style: Theme.of(context).textTheme.subtitle1,
                     ),
                     const SizedBox(height: 20),
                     Padding(
@@ -153,6 +154,44 @@ 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,
@@ -222,6 +261,22 @@ class AppInfoView extends StatelessWidget {
                       subtitle: Text(app.packageName),
                     ),
                     const SizedBox(height: 4),
+                    ListTile(
+                      contentPadding:
+                          const EdgeInsets.symmetric(horizontal: 20.0),
+                      title: I18nText(
+                        'appInfoView.originalPackageNameLabel',
+                        child: const Text(
+                          '',
+                          style: TextStyle(
+                            fontSize: 20,
+                            fontWeight: FontWeight.w500,
+                          ),
+                        ),
+                      ),
+                      subtitle: Text(app.originalPackageName),
+                    ),
+                    const SizedBox(height: 4),
                     ListTile(
                       contentPadding:
                           const EdgeInsets.symmetric(horizontal: 20.0),

lib/ui/widgets/appInfoView/app_info_viewmodel.dart

@@ -13,6 +13,7 @@ import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:revanced_manager/utils/string.dart';
 import 'package:stacked/stacked.dart';
 
 class AppInfoViewModel extends BaseViewModel {
@@ -28,7 +29,7 @@ class AppInfoViewModel extends BaseViewModel {
   ) async {
     bool isUninstalled = true;
     if (app.isRooted) {
-      final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+      bool hasRootPermissions = await _rootAPI.hasRootPermissions();
       if (hasRootPermissions) {
         await _rootAPI.deleteApp(app.packageName, app.apkFilePath);
         if (!onlyUnpatch) {
@@ -44,7 +45,7 @@ class AppInfoViewModel extends BaseViewModel {
     }
   }
 
-  Future<void> navigateToPatcher(PatchedApplication app) async {
+  void navigateToPatcher(PatchedApplication app) async {
     locator<PatcherViewModel>().selectedApp = app;
     locator<PatcherViewModel>().selectedPatches =
         await _patcherAPI.getAppliedPatches(app.appliedPatches);
@@ -53,7 +54,7 @@ class AppInfoViewModel extends BaseViewModel {
   }
 
   void updateNotImplemented(BuildContext context) {
-    _toast.showBottom('appInfoView.updateNotImplemented');
+    _toast.show('appInfoView.updateNotImplemented');
   }
 
   Future<void> showUninstallDialog(
@@ -61,7 +62,7 @@ class AppInfoViewModel extends BaseViewModel {
     PatchedApplication app,
     bool onlyUnpatch,
   ) async {
-    final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+    bool hasRootPermissions = await _rootAPI.hasRootPermissions();
     if (app.isRooted && !hasRootPermissions) {
       return showDialog(
         context: context,
@@ -73,7 +74,7 @@ class AppInfoViewModel extends BaseViewModel {
             CustomMaterialButton(
               label: I18nText('okButton'),
               onPressed: () => Navigator.of(context).pop(),
-            ),
+            )
           ],
         ),
       );
@@ -102,7 +103,7 @@ class AppInfoViewModel extends BaseViewModel {
                   Navigator.of(context).pop();
                   Navigator.of(context).pop();
                 },
-              ),
+              )
             ],
           ),
         );
@@ -133,20 +134,27 @@ 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) {
-    return '• ${appliedPatches.join('\n• ')}';
+    List<String> names = appliedPatches
+        .map((p) => p
+            .replaceAll('-', ' ')
+            .split('-')
+            .join(' ')
+            .toTitleCase()
+            .replaceFirst('Microg', 'MicroG'))
+        .toList();
+    return '\u2022 ${names.join('\n\u2022 ')}';
   }
 
   void openApp(PatchedApplication app) {

lib/ui/widgets/appSelectorView/app_skeleton_loader.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 import 'package:skeletons/skeletons.dart';
 
 class AppSkeletonLoader extends StatelessWidget {
@@ -7,68 +6,61 @@ class AppSkeletonLoader extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    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)),
+    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)),
+                  ),
                 ),
-              ),
-              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'),
+      ),
     );
   }
 }