build: bump version to 1.3.0 (#892)

skip-checks: true

.env

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

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -116,5 +116,5 @@ body:
           required: true
         - label: I filled out all of the requested information in this issue properly.
           required: true
-        - label: The issue is related solely to the ReVanced Manager
+        - label: The issue is related solely to the ReVanced Manager and not related to patching errors or patches
           required: true

.github/config.yaml

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

.github/workflows/analyze.yml

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

.github/workflows/commit-build.yml

@@ -1,55 +0,0 @@
-name: "Android CI Actions"
-
-on:
-  push:
-    branches:
-      - "**"
-    tags-ignore:
-      - "v*" # Ignore tags that start with "v" (e.g. v1.0.0) because they are handled by release-build.yml
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set env
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-      - name: Set up JDK 12
-        uses: actions/setup-java@v3
-        with:
-          java-version: '12'
-          distribution: 'zulu'
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-      - name: Set environment variables
-        run: echo $SECRETS | base64 -d > lib/utils/environment.dart
-        env:
-          SECRETS: ${{ secrets.SECRETS }}
-      - 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 }}
-          SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-          SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-          SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
-        run: flutter build apk
-      - name: Sign APK
-        id: sign_apk
-        uses: ilharp/sign-android-release@v1
-        with:
-          releaseDir: build/app/outputs/apk/release
-          signingKey: ${{ secrets.SIGNING_KEYSTORE }}
-          keyStorePassword: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
-          keyAlias: ${{ secrets.SIGNING_KEY_ALIAS }}
-          keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
-      - name: Add version to APK
-        run: mv ${{ steps.sign_apk.outputs.signedFile }} revanced-manager-${{ env.RELEASE_VERSION }}.apk
-      - name: Upload APK
-        uses: actions/upload-artifact@v2
-        with:
-          name: revanced-manager-${{ env.RELEASE_VERSION }}
-          path: revanced-manager-${{ env.RELEASE_VERSION }}.apk

.github/workflows/crowdin.yml

@@ -3,7 +3,7 @@ name: Sync Crowdin translations
 on:
   push:
     branches:
-      - "flutter"
+      - "dev"
     paths:
       - "assets/i18n/en_US.json"
       - ".github/workflows/crowdin.yml"
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Crowdin
-        uses: crowdin/github-action@1.5.0
+        uses: crowdin/github-action@v1
         with:
           config: crowdin.yml
           upload_sources: true

.github/workflows/pull-request-build.yml

@@ -1,41 +1,41 @@
-name: "Android CI PR Build"
-
-on:
-  pull_request:
-    branches:
-      - "**"
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set env
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-      - name: Set up JDK 12
-        uses: actions/setup-java@v3
-        with:
-          java-version: '12'
-          distribution: 'zulu'
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-      - name: Set environment variables
-        run: echo $SECRETS | base64 -d > lib/utils/environment.dart
-        env:
-          SECRETS: ${{ secrets.SECRETS }}
-      - 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
-      - name: Add version to APK
-        run: mv build/app/outputs/flutter-apk/app-release.apk revanced-manager-${{ env.RELEASE_VERSION }}.apk
-      - name: Upload APK
-        uses: actions/upload-artifact@v2
-        with:
-          name: revanced-manager-${{ env.RELEASE_VERSION }}
-          path: revanced-manager-${{ env.RELEASE_VERSION }}.apk
+name: PR Build
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        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: '17'
+          distribution: 'zulu'
+          cache: 'gradle'
+      - 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
+      - name: Upload build
+        uses: actions/upload-artifact@v3
+        with:
+          name: revanced-manager
+          path: build/app/outputs/flutter-apk/app-release.apk

.github/workflows/release-build.yml

@@ -15,15 +15,11 @@ jobs:
       - name: Set up JDK 12
         uses: actions/setup-java@v3
         with:
-          java-version: '12'
-          distribution: 'zulu'
+          java-version: "12"
+          distribution: "zulu"
       - uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
-      - name: Set environment variables
-        run: echo $SECRETS | base64 -d > lib/utils/environment.dart
-        env:
-          SECRETS: ${{ secrets.SECRETS }}
+          channel: "stable"
       - name: Set up Flutter
         run: flutter pub get
       - name: Generate files with Builder
@@ -51,4 +47,4 @@ jobs:
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: false
-          files: revanced-manager-${{ env.RELEASE_VERSION }}.apk
+          files: revanced-manager-${{ env.RELEASE_VERSION }}.apk

.github/workflows/release.yml

@@ -0,0 +1,68 @@
+name: Release
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - dev
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        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: '17'
+          distribution: 'zulu'
+          cache: 'gradle'
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+          cache: 'npm'
+      - 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
+      - name: Sign APK
+        id: sign_apk
+        uses: ilharp/sign-android-release@v1
+        with:
+          releaseDir: build/app/outputs/apk/release
+          signingKey: ${{ secrets.SIGNING_KEYSTORE }}
+          keyStorePassword: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
+          keyAlias: ${{ secrets.SIGNING_KEY_ALIAS }}
+          keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
+      - name: Setup semantic-release
+        run: npm ci
+      - name: Get release version
+        run: npm exec -- semantic-release --dry-run
+        id: get-next-version
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Add version to APK
+        run: mv $SIGNED_FILE_PATH $(dirname $SIGNED_FILE_PATH)/revanced-manager-${{ steps.get-next-version.outputs.new-release-version }}.apk
+        env:
+          SIGNED_FILE_PATH: ${{steps.sign_apk.outputs.signedFile}}
+      - name: Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
+        run: npm exec semantic-release

.gitignore

@@ -134,5 +134,11 @@ app.*.map.json
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 !/dev/ci/**/Gemfile.lock
 
-Firebase related
-.firebase
+# Firebase related
+.firebase
+
+# Dependency directories
+node_modules/
+
+# FVM
+.fvm

.releaserc

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

CHANGELOG.md

@@ -0,0 +1 @@
+

README.md

@@ -3,15 +3,11 @@
 The official ReVanced Manager based on Flutter.
 
 ## 🔽 Download
-To download the Alpha version of Manager, go [here](https://github.com/revanced/revanced-manager/releases/latest) and install the provided APK file.
+To download latest Manager, go [here](https://github.com/revanced/revanced-manager/releases/latest) and install the provided APK file.
 
 ## 📝 Prerequisites
 1. Android 8 or higher
 2. Does not work on some armv7 devices
-3. [Vanced MicroG](https://github.com/TeamVanced/VancedMicroG/releases) required for YouTube and YouTube Music (Only for non-root)
-
-## ⚠️ Disclaimer
-*Please note that even though we're releasing the Manager, it is an ALPHA version. There's a big chance that the Manager might not work at all for you.*
 
 ## 🔴 Issues
 For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose).
@@ -28,7 +24,7 @@ If you wish to translate ReVanced Manager, we're accepting translations on [Crow
 ## 🛠️ Building Manager from source
 1. Setup flutter environment for your [platform](https://docs.flutter.dev/get-started/install)
 2. Clone the repository locally
-3. Add your github token in gradle.properties like [this](https://github.com/revanced/revanced-documentation/blob/main/docs/revanced-development/2_building_from_source.md)
+3. Add your github token in gradle.properties like [this](https://github.com/revanced/revanced-manager/blob/docs/docs/5_building-from-source.md)
 4. Open the project in terminal
 5. Run `flutter pub get` in terminal
 6. Then `flutter packages pub run build_runner build --delete-conflicting-outputs` (Must be done on each git pull)

analysis_options.yaml

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

android/app/build.gradle

@@ -71,14 +71,10 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // ReVanced
-    implementation "app.revanced:revanced-patcher:6.3.2"
+    implementation "app.revanced:revanced-patcher:9.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

@@ -17,7 +17,8 @@
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:largeHeap="true"
-        android:extractNativeLibs="true">
+        android:extractNativeLibs="true"
+        android:enableOnBackInvokedCallback="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -28,8 +29,7 @@
             android:windowSoftInputMode="adjustResize">
             <meta-data
               android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+              android:resource="@style/NormalTheme"/>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

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

@@ -43,8 +43,9 @@ class MainActivity : FlutterActivity() {
                     val integrationsPath = call.argument<String>("integrationsPath")
                     val selectedPatches = call.argument<List<String>>("selectedPatches")
                     val cacheDirPath = call.argument<String>("cacheDirPath")
-                    val mergeIntegrations = call.argument<Boolean>("mergeIntegrations")
                     val keyStoreFilePath = call.argument<String>("keyStoreFilePath")
+                    val keystorePassword = call.argument<String>("keystorePassword")
+
                     if (patchBundleFilePath != null &&
                         originalFilePath != null &&
                         inputFilePath != null &&
@@ -53,8 +54,8 @@ class MainActivity : FlutterActivity() {
                         integrationsPath != null &&
                         selectedPatches != null &&
                         cacheDirPath != null &&
-                        mergeIntegrations != null &&
-                        keyStoreFilePath != null
+                        keyStoreFilePath != null &&
+                        keystorePassword != null
                     ) {
                         runPatcher(
                             result,
@@ -66,8 +67,8 @@ class MainActivity : FlutterActivity() {
                             integrationsPath,
                             selectedPatches,
                             cacheDirPath,
-                            mergeIntegrations,
-                            keyStoreFilePath
+                            keyStoreFilePath,
+                            keystorePassword
                         )
                     } else {
                         result.notImplemented()
@@ -88,8 +89,8 @@ class MainActivity : FlutterActivity() {
         integrationsPath: String,
         selectedPatches: List<String>,
         cacheDirPath: String,
-        mergeIntegrations: Boolean,
-        keyStoreFilePath: String
+        keyStoreFilePath: String,
+        keystorePassword: String
     ) {
         val originalFile = File(originalFilePath)
         val inputFile = File(inputFilePath)
@@ -139,19 +140,17 @@ class MainActivity : FlutterActivity() {
                         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"
-                            )
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf(
+                            "progress" to 0.4,
+                            "header" to "Merging integrations...",
+                            "log" to "Merging integrations"
                         )
-                    }
-                    patcher.addFiles(listOf(integrations)) {}
+                    )
                 }
+                patcher.addIntegrations(listOf(integrations)) {}
 
                 handler.post {
                     installerChannel.invokeMethod(
@@ -248,7 +247,7 @@ class MainActivity : FlutterActivity() {
                 // Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
 
                 try {
-                    Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
+                    Signer("ReVanced", keystorePassword).signApk(patchedFile, outFile, keyStoreFile)
                 } catch (e: Exception) {
                     //log to console
                     print("Error signing apk: ${e.message}")

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

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

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

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

android/build.gradle

@@ -1,6 +1,5 @@
 buildscript {
-    ext.cronetVersion = '102.5005.125'
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
@@ -32,6 +31,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle/wrapper/gradle-wrapper.properties

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

assets/i18n/en_US.json

@@ -13,6 +13,7 @@
         "settingsTab": "Settings"
     },
     "homeView": {
+        "refreshSuccess": "Refreshed successfully",
         "widgetTitle": "Dashboard",
         "updatesSubtitle": "Updates",
         "patchedSubtitle": "Patched applications",
@@ -47,7 +48,8 @@
     "patcherView": {
         "widgetTitle": "Patcher",
         "patchButton": "Patch",
-        "patchDialogText": "You have selected a resource patch and a split APK installation has been detected, so patching errors may occur.\nAre you sure you want to proceed?"
+        "patchDialogText": "You have selected a resource patch and a split APK installation has been detected, so patching errors may occur.\nAre you sure you want to proceed?",
+        "armv7WarningDialogText": "Patching on ARMv7 devices is not yet supported and might fail. Proceed anyways?"
     },
     "appSelectorCard": {
         "widgetTitle": "Select an application",
@@ -55,7 +57,7 @@
         "widgetSubtitle": "No application selected",
         "noAppsLabel": "No applications found",
         "currentVersion": "Current",
-        "recommendedVersion": "Recommended",
+        "suggestedVersion": "Suggested",
         "anyVersion": "any"
     },
     "patchSelectorCard": {
@@ -71,20 +73,25 @@
     "appSelectorView": {
         "viewTitle": "Select an application",
         "searchBarHint": "Search applications",
+        "selectFromStorageButton": "Select from storage",
         "storageButton": "Storage",
-        "errorMessage": "Unable to use selected application"
+        "errorMessage": "Unable to use selected application",
+        "downloadToast": "Download function is not available yet",
+        "featureNotAvailable": "Feature not implemented",
+        "featureNotAvailableText": "This application is a split APK and cannot be selected. Unfortunately, this feature is only available for rooted users at the moment. However, you can still install the application by selecting its APK files from your device's storage instead"
     },
     "patchesSelectorView": {
         "viewTitle": "Select patches",
         "searchBarHint": "Search patches",
         "doneButton": "Done",
-        "recommended": "Recommended",
-        "all": "All",
+        "default": "Default",
+        "defaultTooltip": "Select all default patches",
         "none": "None",
+        "noneTooltip": "Deselect all patches",
         "loadPatchesSelection": "Load patches selection",
         "noSavedPatches": "No saved patches for the selected app.\nPress Done to save current selection.",
         "noPatchesFound": "No patches found for the selected app",
-        "selectAllPatchesWarningContent": "You are about to select all patches, that includes unrecommended patches and can cause unwanted behavior."
+        "selectAllPatchesWarningContent": "You are about to select all patches, that includes non-suggested patches and can cause unwanted behavior."
     },
     "patchItem": {
         "unsupportedDialogText": "Selecting this patch may result in patching errors.\n\nApp version: {packageVersion}\nSupported versions:\n{supportedVersions}",
@@ -145,11 +152,10 @@
         "exportSectionTitle": "Import & export",
         "aboutLabel": "About",
         "snackbarMessage": "Copied to clipboard",
-        "sentryLabel": "Sentry logging",
-        "sentryHint": "Send anonymous logs to help us improve ReVanced Manager",
         "restartAppForChanges": "Restart the app to apply changes",
         "deleteKeystoreLabel": "Delete keystore",
         "deleteKeystoreHint": "Delete the keystore used to sign the app",
+        "deleteKeystoreDialogText": "Are you sure you want to delete the keystore used to sign patched applications?",
         "deletedKeystore": "Keystore deleted",
         "deleteTempDirLabel": "Delete temporary files",
         "deleteTempDirHint": "Delete unused temporary files",
@@ -167,7 +173,17 @@
         "jsonSelectorErrorMessage": "Unable to use selected JSON file",
         "deleteLogsLabel": "Delete logs",
         "deleteLogsHint": "Delete collected manager logs",
-        "deletedLogs": "Logs deleted"
+        "deletedLogs": "Logs deleted",
+        "exportKeystoreLabel": "Export keystore",
+        "exportKeystoreHint": "Export keystore used to sign apps",
+        "exportedKeystore": "Keystore exported",
+        "noKeystoreExportFileFound": "No keystore to export",
+        "importKeystoreLabel": "Import keystore",
+        "importKeystoreHint": "Import keystore used to sign apps",
+        "importedKeystore": "Keystore imported",
+        "keystoreSelectorErrorMessage": "Unable to use selected KEYSTORE file",
+        "selectKeystorePassword": "Keystore Password",
+        "selectKeystorePasswordHint": "Select keystore password used to sign the apk"
     },
     "appInfoView": {
         "widgetTitle": "App info",

lib/app/app.dart

@@ -1,4 +1,3 @@
-import 'package:revanced_manager/services/crowdin_api.dart';
 import 'package:revanced_manager/services/github_api.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
@@ -38,7 +37,6 @@ import 'package:stacked_services/stacked_services.dart';
     LazySingleton(classType: PatcherAPI),
     LazySingleton(classType: RevancedAPI),
     LazySingleton(classType: GithubAPI),
-    LazySingleton(classType: CrowdinAPI),
     LazySingleton(classType: Toast),
   ],
 )

lib/main.dart

@@ -1,18 +1,17 @@
+import 'dart:developer';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:revanced_manager/app/app.locator.dart';
-import 'package:revanced_manager/services/crowdin_api.dart';
 import 'package:revanced_manager/services/github_api.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/revanced_api.dart';
 import 'package:revanced_manager/ui/theme/dynamic_theme_builder.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_view.dart';
-import 'package:revanced_manager/utils/environment.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:stacked_themes/stacked_themes.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:timezone/data/latest.dart' as tz;
 
 late SharedPreferences prefs;
@@ -21,38 +20,14 @@ Future main() async {
   await setupLocator();
   WidgetsFlutterBinding.ensureInitialized();
   await locator<ManagerAPI>().initialize();
-  String apiUrl = locator<ManagerAPI>().getApiUrl();
+  final String apiUrl = locator<ManagerAPI>().getApiUrl();
   await locator<RevancedAPI>().initialize(apiUrl);
-  await locator<CrowdinAPI>().initialize();
-  bool isSentryEnabled = locator<ManagerAPI>().isSentryEnabled();
-  String repoUrl = locator<ManagerAPI>().getRepoUrl();
+  final String repoUrl = locator<ManagerAPI>().getRepoUrl();
   locator<GithubAPI>().initialize(repoUrl);
   await locator<PatcherAPI>().initialize();
   tz.initializeTimeZones();
   prefs = await SharedPreferences.getInstance();
 
-  await SentryFlutter.init(
-    (options) {
-      options
-        ..dsn = isSentryEnabled ? Environment.sentryDSN : ''
-        ..environment = 'alpha'
-        ..release = '0.1'
-        ..tracesSampleRate = 1.0
-        ..anrEnabled = true
-        ..enableOutOfMemoryTracking = true
-        ..sampleRate = isSentryEnabled ? 1.0 : 0.0
-        ..beforeSend = (event, hint) {
-          if (isSentryEnabled) {
-            return event;
-          } else {
-            return null;
-          }
-        } as BeforeSendCallback?;
-    },
-    appRunner: () {
-      runApp(const MyApp());
-    },
-  );
   runApp(const MyApp());
 }
 
@@ -65,7 +40,7 @@ class MyApp extends StatelessWidget {
     // String replaceLocale = rawLocale.replaceAll('_', '-');
     // List<String> localeList = replaceLocale.split('-');
     // Locale locale = Locale(localeList[0], localeList[1]);
-    Locale locale = const Locale('en', 'US');
+    const Locale locale = Locale('en', 'US');
 
     return DynamicThemeBuilder(
       title: 'ReVanced Manager',
@@ -79,8 +54,9 @@ class MyApp extends StatelessWidget {
             useCountryCode: true,
           ),
           missingTranslationHandler: (key, locale) {
-            print(
-                '--> Missing translation: key: $key, languageCode: ${locale?.languageCode}');
+            log(
+              '--> Missing translation: key: $key, languageCode: ${locale?.languageCode}',
+            );
           },
         ),
         GlobalMaterialLocalizations.delegate,

lib/models/patch.dart

@@ -5,13 +5,6 @@ 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,
@@ -22,6 +15,12 @@ class Patch {
   });
 
   factory Patch.fromJson(Map<String, dynamic> json) => _$PatchFromJson(json);
+  final String name;
+  final String description;
+  final String version;
+  final bool excluded;
+  final List<String> dependencies;
+  final List<Package> compatiblePackages;
 
   Map<String, dynamic> toJson() => _$PatchToJson(this);
 
@@ -37,9 +36,6 @@ class Patch {
 
 @JsonSerializable()
 class Package {
-  final String name;
-  final List<String> versions;
-
   Package({
     required this.name,
     required this.versions,
@@ -47,6 +43,8 @@ class Package {
 
   factory Package.fromJson(Map<String, dynamic> json) =>
       _$PackageFromJson(json);
+  final String name;
+  final List<String> versions;
 
   Map toJson() => _$PackageToJson(this);
 }

lib/models/patched_application.dart

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

lib/services/crowdin_api.dart

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

lib/services/github_api.dart

@@ -1,22 +1,24 @@
 import 'dart:convert';
 import 'dart:io';
+
 import 'package:collection/collection.dart';
 import 'package:dio/dio.dart';
-import 'package:dio_http_cache_lts/dio_http_cache_lts.dart';
+import 'package:dio_cache_interceptor/dio_cache_interceptor.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:injectable/injectable.dart';
 import 'package:revanced_manager/models/patch.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
-import 'package:sentry_dio/sentry_dio.dart';
 
 @lazySingleton
 class GithubAPI {
   late Dio _dio = Dio();
-  final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
-  final Options _cacheOptions = buildCacheOptions(
-    const Duration(hours: 6),
+
+  final _cacheOptions = CacheOptions(
+    store: MemCacheStore(),
     maxStale: const Duration(days: 1),
+    priority: CachePriority.high,
   );
+
   final Map<String, String> repoAppPath = {
     'com.google.android.youtube': 'youtube',
     'com.google.android.apps.youtube.music': 'music',
@@ -28,38 +30,44 @@ class GithubAPI {
     'com.spotify.music': 'spotify',
   };
 
-  void initialize(String repoUrl) async {
+  Future<void> initialize(String repoUrl) async {
     try {
-      _dio = Dio(BaseOptions(
-        baseUrl: repoUrl,
-      ));
-
-      _dio.interceptors.add(_dioCacheManager.interceptor);
-      _dio.addSentry(
-        captureFailedRequests: true,
+      _dio = Dio(
+        BaseOptions(
+          baseUrl: repoUrl,
+        ),
       );
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+
+      _dio.interceptors.add(DioCacheInterceptor(options: _cacheOptions));
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
   Future<void> clearAllCache() async {
     try {
-      await _dioCacheManager.clearAll();
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+      await _cacheOptions.store!.clean();
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
-  Future<Map<String, dynamic>?> getLatestRelease(String repoName) async {
+  Future<Map<String, dynamic>?> getLatestRelease(
+    String repoName,
+  ) async {
     try {
-      var response = await _dio.get(
+      final response = await _dio.get(
         '/repos/$repoName/releases',
-        options: _cacheOptions,
       );
       return response.data[0];
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return null;
     }
   }
@@ -69,37 +77,41 @@ class GithubAPI {
     String repoName,
     DateTime since,
   ) async {
-    String path =
+    final String path =
         'src/main/kotlin/app/revanced/patches/${repoAppPath[packageName]}';
     try {
-      var response = await _dio.get(
+      final response = await _dio.get(
         '/repos/$repoName/commits',
         queryParameters: {
           'path': path,
           'since': since.toIso8601String(),
         },
-        options: _cacheOptions,
       );
-      List<dynamic> commits = response.data;
+      final List<dynamic> commits = response.data;
       return commits
           .map(
-            (commit) => (commit['commit']['message']).split('\n')[0] +
+            (commit) => commit['commit']['message'].split('\n')[0] +
                 ' - ' +
                 commit['commit']['author']['name'] +
                 '\n' as String,
           )
           .toList();
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-      return List.empty();
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
+    return [];
   }
 
-  Future<File?> getLatestReleaseFile(String extension, String repoName) async {
+  Future<File?> getLatestReleaseFile(
+    String extension,
+    String repoName,
+  ) async {
     try {
-      Map<String, dynamic>? release = await getLatestRelease(repoName);
+      final Map<String, dynamic>? release = await getLatestRelease(repoName);
       if (release != null) {
-        Map<String, dynamic>? asset =
+        final Map<String, dynamic>? asset =
             (release['assets'] as List<dynamic>).firstWhereOrNull(
           (asset) => (asset['name'] as String).endsWith(extension),
         );
@@ -109,9 +121,10 @@ class GithubAPI {
           );
         }
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-      return null;
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
     return null;
   }
@@ -119,29 +132,34 @@ class GithubAPI {
   Future<List<Patch>> getPatches(String repoName) async {
     List<Patch> patches = [];
     try {
-      File? f = await getLatestReleaseFile('.json', repoName);
+      final File? f = await getLatestReleaseFile('.json', repoName);
       if (f != null) {
-        List<dynamic> list = jsonDecode(f.readAsStringSync());
+        final 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();
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
+
     return patches;
   }
 
   Future<String> getLastestReleaseVersion(String repoName) async {
     try {
-      Map<String, dynamic>? release = await getLatestRelease(repoName);
+      final Map<String, dynamic>? release = await getLatestRelease(repoName);
       if (release != null) {
         return release['tag_name'];
       } else {
         return 'Unknown';
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-      return '';
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+
+      return 'Unknown';
     }
   }
 }

lib/services/manager_api.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 import 'package:device_apps/device_apps.dart';
+import 'package:flutter/foundation.dart';
 import 'package:injectable/injectable.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:path_provider/path_provider.dart';
@@ -10,7 +11,7 @@ import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/github_api.dart';
 import 'package:revanced_manager/services/revanced_api.dart';
 import 'package:revanced_manager/services/root_api.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
+import 'package:revanced_manager/utils/check_for_supported_patch.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 @lazySingleton
@@ -20,8 +21,12 @@ class ManagerAPI {
   final RootAPI _rootAPI = RootAPI();
   final String patcherRepo = 'revanced-patcher';
   final String cliRepo = 'revanced-cli';
-  late String storedPatchesFile = '/selected-patches.json';
   late SharedPreferences _prefs;
+  bool isRooted = false;
+  String storedPatchesFile = '/selected-patches.json';
+  String keystoreFile =
+      '/sdcard/Android/data/app.revanced.manager.flutter/files/revanced-manager.keystore';
+  String defaultKeystorePassword = 's3cur3p@ssw0rd';
   String defaultApiUrl = 'https://releases.revanced.app/';
   String defaultRepoUrl = 'https://api.github.com';
   String defaultPatcherRepo = 'revanced/revanced-patcher';
@@ -29,9 +34,14 @@ class ManagerAPI {
   String defaultIntegrationsRepo = 'revanced/revanced-integrations';
   String defaultCliRepo = 'revanced/revanced-cli';
   String defaultManagerRepo = 'revanced/revanced-manager';
+  String? patchesVersion = '';
+  bool isDefaultPatchesRepo() {
+    return getPatchesRepo() == 'revanced/revanced-patches';
+  }
 
   Future<void> initialize() async {
     _prefs = await SharedPreferences.getInstance();
+    isRooted = await _rootAPI.isRooted();
     storedPatchesFile =
         (await getApplicationDocumentsDirectory()).path + storedPatchesFile;
   }
@@ -98,14 +108,6 @@ class ManagerAPI {
     await _prefs.setBool('useDarkTheme', value);
   }
 
-  bool isSentryEnabled() {
-    return _prefs.getBool('sentryEnabled') ?? true;
-  }
-
-  Future<void> setSentryStatus(bool value) async {
-    await _prefs.setBool('sentryEnabled', value);
-  }
-
   bool areUniversalPatchesEnabled() {
     return _prefs.getBool('universalPatchesEnabled') ?? false;
   }
@@ -122,6 +124,14 @@ class ManagerAPI {
     await _prefs.setBool('experimentalPatchesEnabled', value);
   }
 
+  Future<void> setKeystorePassword(String password) async {
+    await _prefs.setString('keystorePassword', password);
+  }
+
+  String getKeystorePassword() {
+    return _prefs.getString('keystorePassword') ?? defaultKeystorePassword;
+  }
+
   Future<void> deleteTempFolder() async {
     final Directory dir = Directory('/data/local/tmp/revanced-manager');
     if (await dir.exists()) {
@@ -131,29 +141,34 @@ class ManagerAPI {
 
   Future<void> deleteKeystore() async {
     final File keystore = File(
-        '/sdcard/Android/data/app.revanced.manager.flutter/files/revanced-manager.keystore');
+      keystoreFile,
+    );
     if (await keystore.exists()) {
       await keystore.delete();
     }
   }
 
   List<PatchedApplication> getPatchedApps() {
-    List<String> apps = _prefs.getStringList('patchedApps') ?? [];
+    final List<String> apps = _prefs.getStringList('patchedApps') ?? [];
     return apps.map((a) => PatchedApplication.fromJson(jsonDecode(a))).toList();
   }
 
-  Future<void> setPatchedApps(List<PatchedApplication> patchedApps) async {
+  Future<void> setPatchedApps(
+    List<PatchedApplication> patchedApps,
+  ) async {
     if (patchedApps.length > 1) {
       patchedApps.sort((a, b) => a.name.compareTo(b.name));
     }
-    await _prefs.setStringList('patchedApps',
-        patchedApps.map((a) => json.encode(a.toJson())).toList());
+    await _prefs.setStringList(
+      'patchedApps',
+      patchedApps.map((a) => json.encode(a.toJson())).toList(),
+    );
   }
 
   Future<void> savePatchedApp(PatchedApplication app) async {
-    List<PatchedApplication> patchedApps = getPatchedApps();
+    final List<PatchedApplication> patchedApps = getPatchedApps();
     patchedApps.removeWhere((a) => a.packageName == app.packageName);
-    ApplicationWithIcon? installed = await DeviceApps.getApp(
+    final ApplicationWithIcon? installed = await DeviceApps.getApp(
       app.packageName,
       true,
     ) as ApplicationWithIcon?;
@@ -167,17 +182,19 @@ class ManagerAPI {
   }
 
   Future<void> deletePatchedApp(PatchedApplication app) async {
-    List<PatchedApplication> patchedApps = getPatchedApps();
+    final List<PatchedApplication> patchedApps = getPatchedApps();
     patchedApps.removeWhere((a) => a.packageName == app.packageName);
     await setPatchedApps(patchedApps);
   }
 
-  void clearAllData() async {
+  Future<void> clearAllData() async {
     try {
       _revancedAPI.clearAllCache();
       _githubAPI.clearAllCache();
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
@@ -187,21 +204,23 @@ class ManagerAPI {
 
   Future<List<Patch>> getPatches() async {
     try {
-      String repoName = getPatchesRepo();
+      final 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);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return [];
     }
   }
 
   Future<File?> downloadPatches() async {
     try {
-      String repoName = getPatchesRepo();
+      final String repoName = getPatchesRepo();
       if (repoName == defaultPatchesRepo) {
         return await _revancedAPI.getLatestReleaseFile(
           '.jar',
@@ -210,15 +229,17 @@ class ManagerAPI {
       } else {
         return await _githubAPI.getLatestReleaseFile('.jar', repoName);
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return null;
     }
   }
 
   Future<File?> downloadIntegrations() async {
     try {
-      String repoName = getIntegrationsRepo();
+      final String repoName = getIntegrationsRepo();
       if (repoName == defaultIntegrationsRepo) {
         return await _revancedAPI.getLatestReleaseFile(
           '.apk',
@@ -227,22 +248,33 @@ class ManagerAPI {
       } else {
         return await _githubAPI.getLatestReleaseFile('.apk', repoName);
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return null;
     }
   }
 
   Future<File?> downloadManager() async {
-    return await _revancedAPI.getLatestReleaseFile('.apk', defaultManagerRepo);
+    return await _revancedAPI.getLatestReleaseFile(
+      '.apk',
+      defaultManagerRepo,
+    );
   }
 
   Future<String?> getLatestPatcherReleaseTime() async {
-    return await _revancedAPI.getLatestReleaseTime('.gz', defaultPatcherRepo);
+    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 {
@@ -260,16 +292,29 @@ class ManagerAPI {
   }
 
   Future<String> getCurrentManagerVersion() async {
-    PackageInfo packageInfo = await PackageInfo.fromPlatform();
+    final PackageInfo packageInfo = await PackageInfo.fromPlatform();
     return packageInfo.version;
   }
 
+  Future<String?> getCurrentPatchesVersion() async {
+    if (isDefaultPatchesRepo()) {
+      patchesVersion = await getLatestPatchesVersion();
+      // print('Patches version: $patchesVersion');
+      return patchesVersion ?? '0.0.0';
+    } else {
+      // fetch from github
+      patchesVersion =
+          await _githubAPI.getLastestReleaseVersion(getPatchesRepo());
+    }
+    return null;
+  }
+
   Future<List<PatchedApplication>> getAppsToRemove(
     List<PatchedApplication> patchedApps,
   ) async {
-    List<PatchedApplication> toRemove = [];
-    for (PatchedApplication app in patchedApps) {
-      bool isRemove = await isAppUninstalled(app);
+    final List<PatchedApplication> toRemove = [];
+    for (final PatchedApplication app in patchedApps) {
+      final bool isRemove = await isAppUninstalled(app);
       if (isRemove) {
         toRemove.add(app);
       }
@@ -280,13 +325,13 @@ class ManagerAPI {
   Future<List<PatchedApplication>> getUnsavedApps(
     List<PatchedApplication> patchedApps,
   ) async {
-    List<PatchedApplication> unsavedApps = [];
-    bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+    final List<PatchedApplication> unsavedApps = [];
+    final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
     if (hasRootPermissions) {
-      List<String> installedApps = await _rootAPI.getInstalledApps();
-      for (String packageName in installedApps) {
+      final List<String> installedApps = await _rootAPI.getInstalledApps();
+      for (final String packageName in installedApps) {
         if (!patchedApps.any((app) => app.packageName == packageName)) {
-          ApplicationWithIcon? application = await DeviceApps.getApp(
+          final ApplicationWithIcon? application = await DeviceApps.getApp(
             packageName,
             true,
           ) as ApplicationWithIcon?;
@@ -307,15 +352,13 @@ class ManagerAPI {
         }
       }
     }
-    List<Application> userApps = await DeviceApps.getInstalledApplications(
-      includeSystemApps: false,
-      includeAppIcons: false,
-    );
-    for (Application app in userApps) {
+    final List<Application> userApps =
+        await DeviceApps.getInstalledApplications();
+    for (final Application app in userApps) {
       if (app.packageName.startsWith('app.revanced') &&
           !app.packageName.startsWith('app.revanced.manager.') &&
           !patchedApps.any((uapp) => uapp.packageName == app.packageName)) {
-        ApplicationWithIcon? application = await DeviceApps.getApp(
+        final ApplicationWithIcon? application = await DeviceApps.getApp(
           app.packageName,
           true,
         ) as ApplicationWithIcon?;
@@ -329,7 +372,6 @@ class ManagerAPI {
               apkFilePath: application.apkFilePath,
               icon: application.icon,
               patchDate: DateTime.now(),
-              isRooted: false,
             ),
           );
         }
@@ -339,25 +381,29 @@ class ManagerAPI {
   }
 
   Future<void> reAssessSavedApps() async {
-    List<PatchedApplication> patchedApps = getPatchedApps();
-    List<PatchedApplication> unsavedApps = await getUnsavedApps(patchedApps);
+    final List<PatchedApplication> patchedApps = getPatchedApps();
+    final List<PatchedApplication> unsavedApps =
+        await getUnsavedApps(patchedApps);
     patchedApps.addAll(unsavedApps);
-    List<PatchedApplication> toRemove = await getAppsToRemove(patchedApps);
+    final List<PatchedApplication> toRemove =
+        await getAppsToRemove(patchedApps);
     patchedApps.removeWhere((a) => toRemove.contains(a));
-    for (PatchedApplication app in patchedApps) {
+    for (final PatchedApplication app in patchedApps) {
       app.hasUpdates =
           await hasAppUpdates(app.originalPackageName, app.patchDate);
       app.changelog =
           await getAppChangelog(app.originalPackageName, app.patchDate);
       if (!app.hasUpdates) {
-        String? currentInstalledVersion =
+        final String? currentInstalledVersion =
             (await DeviceApps.getApp(app.packageName))?.versionName;
         if (currentInstalledVersion != null) {
-          String currentSavedVersion = app.version;
-          int currentInstalledVersionInt = int.parse(
-              currentInstalledVersion.replaceAll(RegExp('[^0-9]'), ''));
-          int currentSavedVersionInt =
-              int.parse(currentSavedVersion.replaceAll(RegExp('[^0-9]'), ''));
+          final String currentSavedVersion = app.version;
+          final int currentInstalledVersionInt = int.parse(
+            currentInstalledVersion.replaceAll(RegExp('[^0-9]'), ''),
+          );
+          final int currentSavedVersionInt = int.parse(
+            currentSavedVersion.replaceAll(RegExp('[^0-9]'), ''),
+          );
           if (currentInstalledVersionInt > currentSavedVersionInt) {
             app.hasUpdates = true;
           }
@@ -369,9 +415,9 @@ class ManagerAPI {
 
   Future<bool> isAppUninstalled(PatchedApplication app) async {
     bool existsRoot = false;
-    bool existsNonRoot = await DeviceApps.isAppInstalled(app.packageName);
+    final bool existsNonRoot = await DeviceApps.isAppInstalled(app.packageName);
     if (app.isRooted) {
-      bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+      final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
       if (hasRootPermissions) {
         existsRoot = await _rootAPI.isAppInstalled(app.packageName);
       }
@@ -380,8 +426,11 @@ class ManagerAPI {
     return !existsNonRoot;
   }
 
-  Future<bool> hasAppUpdates(String packageName, DateTime patchDate) async {
-    List<String> commits = await _githubAPI.getCommits(
+  Future<bool> hasAppUpdates(
+    String packageName,
+    DateTime patchDate,
+  ) async {
+    final List<String> commits = await _githubAPI.getCommits(
       packageName,
       getPatchesRepo(),
       patchDate,
@@ -390,7 +439,9 @@ class ManagerAPI {
   }
 
   Future<List<String>> getAppChangelog(
-      String packageName, DateTime patchDate) async {
+    String packageName,
+    DateTime patchDate,
+  ) async {
     List<String> newCommits = await _githubAPI.getCommits(
       packageName,
       getPatchesRepo(),
@@ -416,38 +467,59 @@ class ManagerAPI {
     return app != null && app.isSplit;
   }
 
-  Future<void> setSelectedPatches(String app, List<String> patches) async {
+  Future<void> setSelectedPatches(
+    String app,
+    List<String> patches,
+  ) async {
     final File selectedPatchesFile = File(storedPatchesFile);
-    Map<String, dynamic> patchesMap = await readSelectedPatchesFile();
+    final Map<String, dynamic> patchesMap = await readSelectedPatchesFile();
     if (patches.isEmpty) {
       patchesMap.remove(app);
     } else {
       patchesMap[app] = patches;
     }
-    if (selectedPatchesFile.existsSync()) {
-      selectedPatchesFile.createSync(recursive: true);
-    }
     selectedPatchesFile.writeAsString(jsonEncode(patchesMap));
   }
 
-  Future<List<String>> getSelectedPatches(String app) async {
-    Map<String, dynamic> patchesMap = await readSelectedPatchesFile();
-    if (patchesMap.isNotEmpty) {
-      final List<String> patches =
-          List.from(patchesMap.putIfAbsent(app, () => List.empty()));
-      return patches;
+  // get default patches for app
+  Future<List<String>> getDefaultPatches() async {
+    final List<Patch> patches = await getPatches();
+    final List<String> defaultPatches = [];
+    if (areExperimentalPatchesEnabled() == false) {
+      defaultPatches.addAll(
+        patches
+            .where(
+              (element) =>
+                  element.excluded == false && isPatchSupported(element),
+            )
+            .map((p) => p.name),
+      );
+    } else {
+      defaultPatches.addAll(
+        patches
+            .where((element) => isPatchSupported(element))
+            .map((p) => p.name),
+      );
     }
-    return List.empty();
+    return defaultPatches;
+  }
+
+  Future<List<String>> getSelectedPatches(String app) async {
+    final Map<String, dynamic> patchesMap = await readSelectedPatchesFile();
+    final List<String> defaultPatches = await getDefaultPatches();
+    return List.from(patchesMap.putIfAbsent(app, () => defaultPatches));
   }
 
   Future<Map<String, dynamic>> readSelectedPatchesFile() async {
     final File selectedPatchesFile = File(storedPatchesFile);
-    if (selectedPatchesFile.existsSync()) {
-      String string = selectedPatchesFile.readAsStringSync();
-      if (string.trim().isEmpty) return {};
-      return json.decode(string);
+    if (!selectedPatchesFile.existsSync()) {
+      return {};
     }
-    return {};
+    final String string = selectedPatchesFile.readAsStringSync();
+    if (string.trim().isEmpty) {
+      return {};
+    }
+    return jsonDecode(string);
   }
 
   Future<void> resetLastSelectedPatches() async {

lib/services/patcher_api.dart

@@ -1,7 +1,10 @@
 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:path_provider/path_provider.dart';
@@ -10,9 +13,7 @@ import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/root_api.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:share_extend/share_extend.dart';
-import 'package:cr_file_saver/file_saver.dart';
 
 @lazySingleton
 class PatcherAPI {
@@ -29,7 +30,7 @@ class PatcherAPI {
 
   Future<void> initialize() async {
     await _loadPatches();
-    Directory appCache = await getTemporaryDirectory();
+    final Directory appCache = await getTemporaryDirectory();
     _dataDir = await getExternalStorageDirectory() ?? appCache;
     _tmpDir = Directory('${appCache.path}/patcher');
     _keyStoreFile = File('${_dataDir.path}/revanced-manager.keystore');
@@ -47,24 +48,29 @@ class PatcherAPI {
       if (_patches.isEmpty) {
         _patches = await _managerAPI.getPatches();
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       _patches = List.empty();
     }
   }
 
-  Future<List<ApplicationWithIcon>> getFilteredInstalledApps(bool showUniversalPatches) async {
-    List<ApplicationWithIcon> filteredApps = [];
-    bool? allAppsIncluded =
-        _patches.any((patch) => patch.compatiblePackages.isEmpty) && showUniversalPatches;
+  Future<List<ApplicationWithIcon>> getFilteredInstalledApps(
+    bool showUniversalPatches,
+  ) async {
+    final List<ApplicationWithIcon> filteredApps = [];
+    final bool allAppsIncluded =
+        _patches.any((patch) => patch.compatiblePackages.isEmpty) &&
+            showUniversalPatches;
     if (allAppsIncluded) {
-      var allPackages = await DeviceApps.getInstalledApplications(
+      final allPackages = await DeviceApps.getInstalledApplications(
         includeAppIcons: true,
         onlyAppsWithLaunchIntent: true,
       );
-      allPackages.forEach((pkg) async {
+      for (final pkg in allPackages) {
         if (!filteredApps.any((app) => app.packageName == pkg.packageName)) {
-          var appInfo = await DeviceApps.getApp(
+          final appInfo = await DeviceApps.getApp(
             pkg.packageName,
             true,
           ) as ApplicationWithIcon?;
@@ -72,13 +78,13 @@ class PatcherAPI {
             filteredApps.add(appInfo);
           }
         }
-      });
+      }
     }
-    for (Patch patch in _patches) {
-      for (Package package in patch.compatiblePackages) {
+    for (final Patch patch in _patches) {
+      for (final Package package in patch.compatiblePackages) {
         try {
           if (!filteredApps.any((app) => app.packageName == package.name)) {
-            ApplicationWithIcon? app = await DeviceApps.getApp(
+            final ApplicationWithIcon? app = await DeviceApps.getApp(
               package.name,
               true,
             ) as ApplicationWithIcon?;
@@ -86,9 +92,10 @@ class PatcherAPI {
               filteredApps.add(app);
             }
           }
-        } on Exception catch (e, s) {
-          await Sentry.captureException(e, stackTrace: s);
-          continue;
+        } on Exception catch (e) {
+          if (kDebugMode) {
+            print(e);
+          }
         }
       }
     }
@@ -97,44 +104,31 @@ class PatcherAPI {
 
   List<Patch> getFilteredPatches(String packageName) {
     if (!filteredPatches.keys.contains(packageName)) {
-      List<Patch> patches = _patches
-          .where((patch) =>
-              patch.compatiblePackages.isEmpty ||
-              !patch.name.contains('settings') &&
-                  patch.compatiblePackages
-                      .any((pack) => pack.name == packageName))
+      final List<Patch> patches = _patches
+          .where(
+            (patch) =>
+                patch.compatiblePackages.isEmpty ||
+                !patch.name.contains('settings') &&
+                    patch.compatiblePackages
+                        .any((pack) => pack.name == packageName),
+          )
           .toList();
       filteredPatches[packageName] = patches;
     }
     return filteredPatches[packageName];
   }
 
-  Future<List<Patch>> getAppliedPatches(List<String> appliedPatches) async {
+  Future<List<Patch>> getAppliedPatches(
+    List<String> appliedPatches,
+  ) async {
     return _patches
         .where((patch) => appliedPatches.contains(patch.name))
         .toList();
   }
 
-  bool dependencyNeedsIntegrations(String name) {
-    return name.contains('integrations') ||
-        _patches.any(
-          (patch) =>
-              patch.name == name &&
-              (patch.dependencies.any(
-                (dep) => dependencyNeedsIntegrations(dep),
-              )),
-        );
-  }
-
-  Future<bool> needsIntegrations(List<Patch> selectedPatches) async {
-    return selectedPatches.any(
-      (patch) => patch.dependencies.any(
-        (dep) => dependencyNeedsIntegrations(dep),
-      ),
-    );
-  }
-
-  Future<bool> needsResourcePatching(List<Patch> selectedPatches) async {
+  Future<bool> needsResourcePatching(
+    List<Patch> selectedPatches,
+  ) async {
     return selectedPatches.any(
       (patch) => patch.dependencies.any(
         (dep) => dep.contains('resource-'),
@@ -155,7 +149,7 @@ class PatcherAPI {
     String originalFilePath,
   ) async {
     try {
-      bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+      final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
       if (hasRootPermissions) {
         originalFilePath = await _rootAPI.getOriginalFilePath(
           packageName,
@@ -163,8 +157,10 @@ class PatcherAPI {
         );
       }
       return originalFilePath;
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return originalFilePath;
     }
   }
@@ -174,11 +170,10 @@ class PatcherAPI {
     String originalFilePath,
     List<Patch> selectedPatches,
   ) async {
-    bool mergeIntegrations = await needsIntegrations(selectedPatches);
-    bool includeSettings = await needsSettingsPatch(selectedPatches);
+    final bool includeSettings = await needsSettingsPatch(selectedPatches);
     if (includeSettings) {
       try {
-        Patch? settingsPatch = _patches.firstWhereOrNull(
+        final Patch? settingsPatch = _patches.firstWhereOrNull(
           (patch) =>
               patch.name.contains('settings') &&
               patch.compatiblePackages.any((pack) => pack.name == packageName),
@@ -186,24 +181,22 @@ class PatcherAPI {
         if (settingsPatch != null) {
           selectedPatches.add(settingsPatch);
         }
-      } on Exception catch (e, s) {
-        await Sentry.captureException(e, stackTrace: s);
-        // ignore
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
+        }
       }
     }
-    File? patchBundleFile = await _managerAPI.downloadPatches();
-    File? integrationsFile;
-    if (mergeIntegrations) {
-      integrationsFile = await _managerAPI.downloadIntegrations();
-    }
+    final File? patchBundleFile = await _managerAPI.downloadPatches();
+    final File? integrationsFile = await _managerAPI.downloadIntegrations();
     if (patchBundleFile != null) {
       _dataDir.createSync();
       _tmpDir.createSync();
-      Directory workDir = _tmpDir.createTempSync('tmp-');
-      File inputFile = File('${workDir.path}/base.apk');
-      File patchedFile = File('${workDir.path}/patched.apk');
+      final Directory workDir = _tmpDir.createTempSync('tmp-');
+      final File inputFile = File('${workDir.path}/base.apk');
+      final File patchedFile = File('${workDir.path}/patched.apk');
       _outFile = File('${workDir.path}/out.apk');
-      Directory cacheDir = Directory('${workDir.path}/cache');
+      final Directory cacheDir = Directory('${workDir.path}/cache');
       cacheDir.createSync();
       try {
         await patcherChannel.invokeMethod(
@@ -217,16 +210,17 @@ class PatcherAPI {
             'inputFilePath': inputFile.path,
             'patchedFilePath': patchedFile.path,
             'outFilePath': _outFile!.path,
-            'integrationsPath': mergeIntegrations ? integrationsFile!.path : '',
+            'integrationsPath': integrationsFile!.path,
             'selectedPatches': selectedPatches.map((p) => p.name).toList(),
             'cacheDirPath': cacheDir.path,
-            'mergeIntegrations': mergeIntegrations,
             'keyStoreFilePath': _keyStoreFile.path,
+            'keystorePassword': _managerAPI.getKeystorePassword(),
           },
         );
-      } on Exception catch (e, s) {
-        print(e);
-        throw await Sentry.captureException(e, stackTrace: s);
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
+        }
       }
     }
   }
@@ -235,7 +229,7 @@ class PatcherAPI {
     if (_outFile != null) {
       try {
         if (patchedApp.isRooted) {
-          bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+          final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
           if (hasRootPermissions) {
             return _rootAPI.installApp(
               patchedApp.packageName,
@@ -245,10 +239,14 @@ class PatcherAPI {
           }
         } else {
           await AppInstaller.installApk(_outFile!.path);
-          return await DeviceApps.isAppInstalled(patchedApp.packageName);
+          return await DeviceApps.isAppInstalled(
+            patchedApp.packageName,
+          );
+        }
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
         }
-      } on Exception catch (e, s) {
-        await Sentry.captureException(e, stackTrace: s);
         return false;
       }
     }
@@ -258,67 +256,68 @@ class PatcherAPI {
   void exportPatchedFile(String appName, String version) {
     try {
       if (_outFile != null) {
-        String newName = _getFileName(appName, version);
-
-        // This is temporary workaround to populate initial file name
-        // ref: https://github.com/Cleveroad/cr_file_saver/issues/7
-        int lastSeparator = _outFile!.path.lastIndexOf('/');
-        String newSourcePath =
-            _outFile!.path.substring(0, lastSeparator + 1) + newName;
-        _outFile!.copySync(newSourcePath);
-
-        CRFileSaver.saveFileWithDialog(SaveFileDialogParams(
-            sourceFilePath: newSourcePath, destinationFileName: newName));
+        final String newName = _getFileName(appName, version);
+        CRFileSaver.saveFileWithDialog(
+          SaveFileDialogParams(
+            sourceFilePath: _outFile!.path,
+            destinationFileName: newName,
+          ),
+        );
+      }
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
       }
-    } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s);
     }
   }
 
   void sharePatchedFile(String appName, String version) {
     try {
       if (_outFile != null) {
-        String newName = _getFileName(appName, version);
-        int lastSeparator = _outFile!.path.lastIndexOf('/');
-        String newPath =
+        final String newName = _getFileName(appName, version);
+        final int lastSeparator = _outFile!.path.lastIndexOf('/');
+        final String newPath =
             _outFile!.path.substring(0, lastSeparator + 1) + newName;
-        File shareFile = _outFile!.copySync(newPath);
+        final File shareFile = _outFile!.copySync(newPath);
         ShareExtend.share(shareFile.path, 'file');
       }
-    } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
   String _getFileName(String appName, String version) {
-    String prefix = appName.toLowerCase().replaceAll(' ', '-');
-    String newName = '$prefix-revanced_v$version.apk';
+    final String prefix = appName.toLowerCase().replaceAll(' ', '-');
+    final String newName = '$prefix-revanced_v$version.apk';
     return newName;
   }
 
   Future<void> sharePatcherLog(String logs) async {
-    Directory appCache = await getTemporaryDirectory();
-    Directory logDir = Directory('${appCache.path}/logs');
+    final Directory appCache = await getTemporaryDirectory();
+    final Directory logDir = Directory('${appCache.path}/logs');
     logDir.createSync();
-    String dateTime = DateTime.now()
+    final String dateTime = DateTime.now()
         .toIso8601String()
         .replaceAll('-', '')
         .replaceAll(':', '')
         .replaceAll('T', '')
         .replaceAll('.', '');
-    File log = File('${logDir.path}/revanced-manager_patcher_$dateTime.log');
+    final 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(
+  String getSuggestedVersion(String packageName) {
+    final Map<String, int> versions = {};
+    for (final Patch patch in _patches) {
+      final Package? package = patch.compatiblePackages.firstWhereOrNull(
         (pack) => pack.name == packageName,
       );
       if (package != null) {
-        for (String version in package.versions) {
+        for (final String version in package.versions) {
           versions.update(
             version,
             (value) => versions[version]! + 1,
@@ -328,7 +327,7 @@ class PatcherAPI {
       }
     }
     if (versions.isNotEmpty) {
-      var entries = versions.entries.toList()
+      final entries = versions.entries.toList()
         ..sort((a, b) => a.value.compareTo(b.value));
       versions
         ..clear()

lib/services/revanced_api.dart

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

lib/services/root_api.dart

@@ -1,5 +1,5 @@
+import 'package:flutter/foundation.dart';
 import 'package:root/root.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
 
 class RootAPI {
   final String _managerDirPath = '/data/local/tmp/revanced-manager';
@@ -8,10 +8,12 @@ class RootAPI {
 
   Future<bool> isRooted() async {
     try {
-      bool? isRooted = await Root.isRootAvailable();
+      final bool? isRooted = await Root.isRootAvailable();
       return isRooted != null && isRooted;
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return false;
     }
   }
@@ -24,8 +26,10 @@ class RootAPI {
         return isRooted != null && isRooted;
       }
       return false;
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return false;
     }
   }
@@ -70,16 +74,18 @@ class RootAPI {
 
   Future<List<String>> getInstalledApps() async {
     try {
-      String? res = await Root.exec(
+      final String? res = await Root.exec(
         cmd: 'ls "$_managerDirPath"',
       );
       if (res != null) {
-        List<String> apps = res.split('\n');
+        final 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);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return List.empty();
     }
     return List.empty();
@@ -125,19 +131,21 @@ class RootAPI {
       await installApk(packageName, patchedFilePath);
       await mountApk(packageName, originalFilePath);
       return true;
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       return false;
     }
   }
 
   Future<void> installServiceDScript(String packageName) async {
-    String content = '#!/system/bin/sh\n'
+    final String content = '#!/system/bin/sh\n'
         'while [ "\$(getprop sys.boot_completed | tr -d \'"\'"\'\\\\r\'"\'"\')" != "1" ]; do sleep 3; done\n'
         'base_path=$_managerDirPath/$packageName/base.apk\n'
         'stock_path=\$(pm path $packageName | grep base | sed \'"\'"\'s/package://g\'"\'"\')\n'
-        '[ ! -z \$stock_path ] && mount -o bind \$base_path \$stock_path';
-    String scriptFilePath = '$_serviceDDirPath/$packageName.sh';
+        r'[ ! -z $stock_path ] && mount -o bind $base_path $stock_path';
+    final String scriptFilePath = '$_serviceDDirPath/$packageName.sh';
     await Root.exec(
       cmd: 'echo \'$content\' > "$scriptFilePath"',
     );
@@ -145,10 +153,10 @@ class RootAPI {
   }
 
   Future<void> installPostFsDataScript(String packageName) async {
-    String content = '#!/system/bin/sh\n'
+    final String content = '#!/system/bin/sh\n'
         'stock_path=\$(pm path $packageName | grep base | sed \'"\'"\'s/package://g\'"\'"\')\n'
-        '[ ! -z \$stock_path ] && umount -l \$stock_path';
-    String scriptFilePath = '$_postFsDataDirPath/$packageName.sh';
+        r'[ ! -z $stock_path ] && umount -l $stock_path';
+    final String scriptFilePath = '$_postFsDataDirPath/$packageName.sh';
     await Root.exec(
       cmd: 'echo \'$content\' > "$scriptFilePath"',
     );
@@ -156,7 +164,7 @@ class RootAPI {
   }
 
   Future<void> installApk(String packageName, String patchedFilePath) async {
-    String newPatchedFilePath = '$_managerDirPath/$packageName/base.apk';
+    final String newPatchedFilePath = '$_managerDirPath/$packageName/base.apk';
     await Root.exec(
       cmd: 'cp "$patchedFilePath" "$newPatchedFilePath"',
     );
@@ -169,7 +177,7 @@ class RootAPI {
   }
 
   Future<void> mountApk(String packageName, String originalFilePath) async {
-    String newPatchedFilePath = '$_managerDirPath/$packageName/base.apk';
+    final String newPatchedFilePath = '$_managerDirPath/$packageName/base.apk';
     await Root.exec(
       cmd: 'am force-stop "$packageName"',
     );
@@ -182,7 +190,7 @@ class RootAPI {
   }
 
   Future<bool> isMounted(String packageName) async {
-    String? res = await Root.exec(
+    final String? res = await Root.exec(
       cmd: 'cat /proc/mounts | grep $packageName',
     );
     return res != null && res.isNotEmpty;
@@ -192,7 +200,7 @@ class RootAPI {
     String packageName,
     String originalFilePath,
   ) async {
-    bool isInstalled = await isAppInstalled(packageName);
+    final bool isInstalled = await isAppInstalled(packageName);
     if (isInstalled && await isMounted(packageName)) {
       originalFilePath = '$_managerDirPath/$packageName/original.apk';
       await setPermissions(
@@ -209,7 +217,8 @@ class RootAPI {
     String packageName,
     String originalFilePath,
   ) async {
-    String originalRootPath = '$_managerDirPath/$packageName/original.apk';
+    final String originalRootPath =
+        '$_managerDirPath/$packageName/original.apk';
     await Root.exec(
       cmd: 'mkdir -p "$_managerDirPath/$packageName"',
     );

lib/theme.dart

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

lib/ui/theme/dynamic_theme_builder.dart

@@ -7,65 +7,44 @@ import 'package:revanced_manager/theme.dart';
 import 'package:stacked_services/stacked_services.dart';
 
 class DynamicThemeBuilder extends StatelessWidget {
-  final String title;
-  final Widget home;
-  final Iterable<LocalizationsDelegate> localizationsDelegates;
-
   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
   Widget build(BuildContext context) {
     return DynamicColorBuilder(
       builder: (lightColorScheme, darkColorScheme) {
-        ThemeData lightDynamicTheme = ThemeData(
+        final ThemeData lightDynamicTheme = ThemeData(
           useMaterial3: true,
-          canvasColor: lightColorScheme?.background,
           navigationBarTheme: NavigationBarThemeData(
-            backgroundColor: lightColorScheme?.background,
-            indicatorColor: lightColorScheme?.primary.withAlpha(150),
             labelTextStyle: MaterialStateProperty.all(
               GoogleFonts.roboto(
-                color: lightColorScheme?.secondary,
+                color: lightColorScheme?.onSurface,
                 fontWeight: FontWeight.w500,
               ),
             ),
-            iconTheme: MaterialStateProperty.all(
-              IconThemeData(
-                color: lightColorScheme?.secondary,
-              ),
-            ),
           ),
-          scaffoldBackgroundColor: lightColorScheme?.background,
           colorScheme: lightColorScheme?.harmonized(),
-          toggleableActiveColor: lightColorScheme?.primary,
           textTheme: GoogleFonts.robotoTextTheme(ThemeData.light().textTheme),
         );
-        ThemeData darkDynamicTheme = ThemeData(
+        final ThemeData darkDynamicTheme = ThemeData(
           useMaterial3: true,
-          canvasColor: darkColorScheme?.background,
           navigationBarTheme: NavigationBarThemeData(
-            backgroundColor: darkColorScheme?.background,
-            indicatorColor: darkColorScheme?.primary.withOpacity(0.4),
             labelTextStyle: MaterialStateProperty.all(
               GoogleFonts.roboto(
-                color: darkColorScheme?.secondary,
+                color: darkColorScheme?.onSurface,
                 fontWeight: FontWeight.w500,
               ),
             ),
-            iconTheme: MaterialStateProperty.all(
-              IconThemeData(
-                color: darkColorScheme?.secondary,
-              ),
-            ),
           ),
-          scaffoldBackgroundColor: darkColorScheme?.background,
           colorScheme: darkColorScheme?.harmonized(),
-          toggleableActiveColor: darkColorScheme?.primary,
           textTheme: GoogleFonts.robotoTextTheme(ThemeData.dark().textTheme),
         );
         return DynamicTheme(

lib/ui/views/app_selector/app_selector_view.dart

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

lib/ui/views/app_selector/app_selector_viewmodel.dart

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

lib/ui/views/contributors/contributors_view.dart

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

lib/ui/views/contributors/contributors_viewmodel.dart

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

lib/ui/views/home/home_view.dart

@@ -1,13 +1,12 @@
+import 'package:animations/animations.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:animations/animations.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/homeView/available_updates_card.dart';
 import 'package:revanced_manager/ui/widgets/homeView/installed_apps_card.dart';
 import 'package:revanced_manager/ui/widgets/homeView/latest_commit_card.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_chip.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
@@ -18,12 +17,11 @@ class HomeView extends StatelessWidget {
   Widget build(BuildContext context) {
     return ViewModelBuilder<HomeViewModel>.reactive(
       disposeViewModel: false,
-      onModelReady: (model) => model.initialize(context),
+      fireOnViewModelReadyOnce: true,
+      onViewModelReady: (model) => model.initialize(context),
       viewModelBuilder: () => locator<HomeViewModel>(),
       builder: (context, model, child) => Scaffold(
         body: RefreshIndicator(
-          color: Theme.of(context).colorScheme.secondary,
-          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
           onRefresh: () => model.forceRefresh(context),
           child: CustomScrollView(
             slivers: <Widget>[
@@ -34,7 +32,7 @@ class HomeView extends StatelessWidget {
                   child: Text(
                     '',
                     style: GoogleFonts.inter(
-                      color: Theme.of(context).textTheme.headline6!.color,
+                      color: Theme.of(context).textTheme.titleLarge!.color,
                     ),
                   ),
                 ),
@@ -48,40 +46,67 @@ class HomeView extends StatelessWidget {
                         'homeView.updatesSubtitle',
                         child: Text(
                           '',
-                          style: Theme.of(context).textTheme.headline6!,
+                          style: Theme.of(context).textTheme.titleLarge,
                         ),
                       ),
                       const SizedBox(height: 10),
                       LatestCommitCard(
-                        onPressed: () =>
+                        onPressedManager: () =>
                             model.showUpdateConfirmationDialog(context),
+                        onPressedPatches: () => model.forceRefresh(context),
                       ),
                       const SizedBox(height: 23),
                       I18nText(
                         'homeView.patchedSubtitle',
                         child: Text(
                           '',
-                          style: Theme.of(context).textTheme.headline6!,
+                          style: Theme.of(context).textTheme.titleLarge,
                         ),
                       ),
                       const SizedBox(height: 8),
                       Row(
                         children: <Widget>[
-                          CustomChip(
+                          ActionChip(
+                            avatar: const Icon(Icons.grid_view),
                             label: I18nText('homeView.installed'),
-                            isSelected: !model.showUpdatableApps,
-                            onSelected: (value) {
+                            side: BorderSide(
+                              color: model.showUpdatableApps
+                                  ? Theme.of(context).colorScheme.outline
+                                  : Theme.of(context)
+                                      .colorScheme
+                                      .secondaryContainer,
+                              width: model.showUpdatableApps ? 1 : 1,
+                            ),
+                            backgroundColor: model.showUpdatableApps
+                                ? Theme.of(context).colorScheme.background
+                                : Theme.of(context)
+                                    .colorScheme
+                                    .secondaryContainer,
+                            onPressed: () {
                               model.toggleUpdatableApps(false);
                             },
                           ),
                           const SizedBox(width: 10),
-                          CustomChip(
+                          ActionChip(
+                            avatar: const Icon(Icons.update),
                             label: I18nText('homeView.updatesAvailable'),
-                            isSelected: model.showUpdatableApps,
-                            onSelected: (value) {
+                            side: BorderSide(
+                              color: !model.showUpdatableApps
+                                  ? Theme.of(context).colorScheme.outline
+                                  : Theme.of(context)
+                                      .colorScheme
+                                      .secondaryContainer,
+                              width: !model.showUpdatableApps ? 1 : 1,
+                            ),
+                            backgroundColor: !model.showUpdatableApps
+                                ? Theme.of(context).colorScheme.background
+                                : Theme.of(context)
+                                    .colorScheme
+                                    .secondaryContainer,
+                            onPressed: () {
                               model.toggleUpdatableApps(true);
                             },
-                          )
+                          ),
                         ],
                       ),
                       const SizedBox(height: 14),

lib/ui/views/home/home_viewmodel.dart

@@ -1,26 +1,30 @@
 // ignore_for_file: use_build_context_synchronously
+import 'dart:async';
 import 'dart:io';
+
 import 'package:app_installer/app_installer.dart';
 import 'package:cross_connectivity/cross_connectivity.dart';
-import 'package:device_apps/device_apps.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:injectable/injectable.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/github_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:sentry_flutter/sentry_flutter.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:revanced_manager/utils/about_info.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 {
@@ -28,29 +32,52 @@ class HomeViewModel extends BaseViewModel {
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
   final GithubAPI _githubAPI = locator<GithubAPI>();
+  final RevancedAPI _revancedAPI = locator<RevancedAPI>();
   final Toast _toast = locator<Toast>();
   final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
   DateTime? _lastUpdate;
   bool showUpdatableApps = false;
   List<PatchedApplication> patchedInstalledApps = [];
   List<PatchedApplication> patchedUpdatableApps = [];
+  String? _latestManagerVersion = '';
 
   Future<void> initialize(BuildContext context) async {
+    _latestManagerVersion = await _managerAPI.getLatestManagerVersion();
     await flutterLocalNotificationsPlugin.initialize(
       const InitializationSettings(
         android: AndroidInitializationSettings('ic_notification'),
       ),
-      onSelectNotification: (p) =>
-          DeviceApps.openApp('app.revanced.manager.flutter'),
+      onDidReceiveNotificationResponse: (response) async {
+        if (response.id == 0) {
+          _toast.showBottom('homeView.installingMessage');
+          final File? managerApk = await _managerAPI.downloadManager();
+          if (managerApk != null) {
+            await AppInstaller.installApk(managerApk.path);
+          } else {
+            _toast.showBottom('homeView.errorDownloadMessage');
+          }
+        }
+      },
     );
     flutterLocalNotificationsPlugin
         .resolvePlatformSpecificImplementation<
             AndroidFlutterLocalNotificationsPlugin>()
         ?.requestPermission();
-    bool isConnected = await Connectivity().checkConnection();
+    final bool isConnected = await Connectivity().checkConnection();
     if (!isConnected) {
       _toast.showBottom('homeView.noConnection');
     }
+    final NotificationAppLaunchDetails? notificationAppLaunchDetails =
+        await flutterLocalNotificationsPlugin.getNotificationAppLaunchDetails();
+    if (notificationAppLaunchDetails?.didNotificationLaunchApp ?? false) {
+      _toast.showBottom('homeView.installingMessage');
+      final File? managerApk = await _managerAPI.downloadManager();
+      if (managerApk != null) {
+        await AppInstaller.installApk(managerApk.path);
+      } else {
+        _toast.showBottom('homeView.errorDownloadMessage');
+      }
+    }
     _getPatchedApps();
     _managerAPI.reAssessSavedApps().then((_) => _getPatchedApps());
   }
@@ -67,7 +94,7 @@ class HomeViewModel extends BaseViewModel {
     notifyListeners();
   }
 
-  void navigateToPatcher(PatchedApplication app) async {
+  Future<void> navigateToPatcher(PatchedApplication app) async {
     locator<PatcherViewModel>().selectedApp = app;
     locator<PatcherViewModel>().selectedPatches =
         await _patcherAPI.getAppliedPatches(app.appliedPatches);
@@ -76,10 +103,7 @@ class HomeViewModel extends BaseViewModel {
   }
 
   void _getPatchedApps() {
-    patchedInstalledApps = _managerAPI
-        .getPatchedApps()
-        .where((app) => app.hasUpdates == false)
-        .toList();
+    patchedInstalledApps = _managerAPI.getPatchedApps().toList();
     patchedUpdatableApps = _managerAPI
         .getPatchedApps()
         .where((app) => app.hasUpdates == true)
@@ -88,59 +112,157 @@ class HomeViewModel extends BaseViewModel {
   }
 
   Future<bool> hasManagerUpdates() async {
-    String? latestVersion = await _managerAPI.getLatestManagerVersion();
     String currentVersion = await _managerAPI.getCurrentManagerVersion();
+
+    // add v to current version
+    if (!currentVersion.startsWith('v')) {
+      currentVersion = 'v$currentVersion';
+    }
+
+    if (_latestManagerVersion != currentVersion) {
+      return true;
+    }
+    return false;
+  }
+
+  Future<bool> hasPatchesUpdates() async {
+    final String? latestVersion = await _managerAPI.getLatestPatchesVersion();
+    final String? currentVersion = await _managerAPI.getCurrentPatchesVersion();
     if (latestVersion != null) {
       try {
-        int latestVersionInt =
+        final int latestVersionInt =
             int.parse(latestVersion.replaceAll(RegExp('[^0-9]'), ''));
-        int currentVersionInt =
-            int.parse(currentVersion.replaceAll(RegExp('[^0-9]'), ''));
+        final int currentVersionInt =
+            int.parse(currentVersion!.replaceAll(RegExp('[^0-9]'), ''));
         return latestVersionInt > currentVersionInt;
-      } on Exception catch (e, s) {
-        await Sentry.captureException(e, stackTrace: s);
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
+        }
         return false;
       }
     }
     return false;
   }
 
+  Future<File?> downloadManager() async {
+    try {
+      final response = await _revancedAPI.downloadManager();
+      final bytes = await response!.readAsBytes();
+      final tempDir = await getTemporaryDirectory();
+      final tempFile = File('${tempDir.path}/revanced-manager.apk');
+      await tempFile.writeAsBytes(bytes);
+      return tempFile;
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+      return null;
+    }
+  }
+
   Future<void> updateManager(BuildContext context) async {
     try {
       _toast.showBottom('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',
+      showDialog(
+        context: context,
+        builder: (context) => SimpleDialog(
+          contentPadding: const EdgeInsets.all(16.0),
+          title: I18nText(
+            'homeView.downloadingMessage',
+            child: Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+                color: Theme.of(context).colorScheme.secondary,
+              ),
             ),
           ),
-          androidAllowWhileIdle: true,
-          uiLocalNotificationDateInterpretation:
-              UILocalNotificationDateInterpretation.absoluteTime,
-        );
+          children: [
+            Column(
+              children: [
+                Row(
+                  children: [
+                    Icon(
+                      Icons.new_releases_outlined,
+                      color: Theme.of(context).colorScheme.secondary,
+                    ),
+                    const SizedBox(width: 8.0),
+                    Text(
+                      'v$_latestManagerVersion',
+                      style: TextStyle(
+                        fontSize: 18,
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context).colorScheme.secondary,
+                      ),
+                    ),
+                  ],
+                ),
+                const SizedBox(height: 16.0),
+                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();
+                    },
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ),
+      );
+      final File? managerApk = await downloadManager();
+      if (managerApk != null) {
+        // await flutterLocalNotificationsPlugin.zonedSchedule(
+        //   0,
+        //   FlutterI18n.translate(
+        //     context,
+        //     'homeView.notificationTitle',
+        //   ),
+        //   FlutterI18n.translate(
+        //     context,
+        //     'homeView.notificationText',
+        //   ),
+        //   tz.TZDateTime.now(tz.local).add(const Duration(seconds: 5)),
+        //   const NotificationDetails(
+        //     android: AndroidNotificationDetails(
+        //       'revanced_manager_channel',
+        //       'ReVanced Manager Channel',
+        //       importance: Importance.max,
+        //       priority: Priority.high,
+        //       ticker: 'ticker',
+        //     ),
+        //   ),
+        //   androidAllowWhileIdle: true,
+        //   uiLocalNotificationDateInterpretation:
+        //       UILocalNotificationDateInterpretation.absoluteTime,
+        // );
         _toast.showBottom('homeView.installingMessage');
         await AppInstaller.installApk(managerApk.path);
       } else {
         _toast.showBottom('homeView.errorDownloadMessage');
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
       _toast.showBottom('homeView.errorInstallMessage');
     }
   }
@@ -149,7 +271,9 @@ class HomeViewModel extends BaseViewModel {
     _toast.showBottom('homeView.updatesDisabled');
   }
 
-  Future<void> showUpdateConfirmationDialog(BuildContext parentContext) {
+  Future<void> showUpdateConfirmationDialog(
+    BuildContext parentContext,
+  ) {
     return showModalBottomSheet(
       context: parentContext,
       isScrollControlled: true,
@@ -178,6 +302,7 @@ class HomeViewModel extends BaseViewModel {
         _lastUpdate!.difference(DateTime.now()).inSeconds > 2) {
       _managerAPI.clearAllData();
     }
+    _toast.showBottom('homeView.refreshSuccess');
     initialize(context);
   }
 }

lib/ui/views/installer/installer_view.dart

@@ -2,9 +2,9 @@ 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_material_button.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_popup_menu.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
@@ -15,11 +15,12 @@ class InstallerView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<InstallerViewModel>.reactive(
-      onModelReady: (model) => model.initialize(context),
+      onViewModelReady: (model) => model.initialize(context),
       viewModelBuilder: () => InstallerViewModel(),
       builder: (context, model, child) => WillPopScope(
         child: SafeArea(
           top: false,
+          bottom: false,
           child: Scaffold(
             body: CustomScrollView(
               controller: model.scrollController,
@@ -28,7 +29,7 @@ class InstallerView extends StatelessWidget {
                   title: Text(
                     model.headerLogs,
                     style: GoogleFonts.inter(
-                      color: Theme.of(context).textTheme.headline6!.color,
+                      color: Theme.of(context).textTheme.titleLarge!.color,
                     ),
                   ),
                   onBackButtonPressed: () => model.onWillPop(context),
@@ -48,15 +49,15 @@ class InstallerView extends StatelessWidget {
                                 ),
                               ),
                             ),
-                            1: I18nText(
-                              'installerView.exportApkMenuOption',
-                              child: const Text(
-                                '',
-                                style: TextStyle(
-                                  fontWeight: FontWeight.bold,
-                                ),
+                          1: I18nText(
+                            'installerView.exportApkMenuOption',
+                            child: const Text(
+                              '',
+                              style: TextStyle(
+                                fontWeight: FontWeight.bold,
                               ),
                             ),
+                          ),
                           2: I18nText(
                             'installerView.shareLogMenuOption',
                             child: const Text(
@@ -71,9 +72,9 @@ class InstallerView extends StatelessWidget {
                     ),
                   ],
                   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),
@@ -153,6 +154,11 @@ class InstallerView extends StatelessWidget {
                     ),
                   ),
                 ),
+                SliverFillRemaining(
+                  hasScrollBody: false,
+                  child: SizedBox(
+                      height: MediaQuery.of(context).viewPadding.bottom),
+                ),
               ],
             ),
           ),

lib/ui/views/installer/installer_viewmodel.dart

@@ -1,5 +1,6 @@
 // ignore_for_file: use_build_context_synchronously
 import 'package:device_apps/device_apps.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_background/flutter_background.dart';
@@ -14,7 +15,6 @@ import 'package:revanced_manager/services/root_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:stacked/stacked.dart';
 import 'package:wakelock/wakelock.dart';
 
@@ -51,16 +51,15 @@ class InstallerViewModel extends BaseViewModel {
               context,
               'installerView.notificationText',
             ),
-            notificationImportance: AndroidNotificationImportance.Default,
             notificationIcon: const AndroidResource(
               name: 'ic_notification',
-              defType: 'drawable',
             ),
           ),
         ).then((value) => FlutterBackground.enableBackgroundExecution());
-      } on Exception catch (e, s) {
-        await Sentry.captureException(e, stackTrace: s);
-        // ignore
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
+        } // ignore
       }
     }
     await Wakelock.enable();
@@ -73,10 +72,10 @@ class InstallerViewModel extends BaseViewModel {
       switch (call.method) {
         case 'update':
           if (call.arguments != null) {
-            Map<dynamic, dynamic> arguments = call.arguments;
-            double progress = arguments['progress'];
-            String header = arguments['header'];
-            String log = arguments['log'];
+            final Map<dynamic, dynamic> arguments = call.arguments;
+            final double progress = arguments['progress'];
+            final String header = arguments['header'];
+            final String log = arguments['log'];
             update(progress, header, log);
           }
           break;
@@ -133,14 +132,15 @@ class InstallerViewModel extends BaseViewModel {
             _app.apkFilePath,
             _patches,
           );
-        } on Exception catch (e, s) {
+        } on Exception catch (e) {
           update(
             -100.0,
             'Aborting...',
             'An error occurred! Aborting\nError:\n$e',
           );
-          await Sentry.captureException(e, stackTrace: s);
-          throw await Sentry.captureException(e, stackTrace: s);
+          if (kDebugMode) {
+            print(e);
+          }
         }
       } else {
         update(-100.0, 'Aborting...', 'No app or patches selected! Aborting');
@@ -148,24 +148,28 @@ class InstallerViewModel extends BaseViewModel {
       if (FlutterBackground.isBackgroundExecutionEnabled) {
         try {
           FlutterBackground.disableBackgroundExecution();
-        } on Exception catch (e, s) {
-          await Sentry.captureException(e, stackTrace: s);
-          // ignore
+        } on Exception catch (e) {
+          if (kDebugMode) {
+            print(e);
+          } // ignore
         }
       }
       await Wakelock.disable();
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
-  void installResult(BuildContext context, bool installAsRoot) async {
+  Future<void> installResult(BuildContext context, bool installAsRoot) async {
     try {
       _app.isRooted = installAsRoot;
-      bool hasMicroG = _patches.any((p) => p.name.endsWith('microg-support'));
-      bool rootMicroG = installAsRoot && hasMicroG;
-      bool rootFromStorage = installAsRoot && _app.isFromStorage;
-      bool ytWithoutRootMicroG =
+      final bool hasMicroG =
+          _patches.any((p) => p.name.endsWith('microg-support'));
+      final bool rootMicroG = installAsRoot && hasMicroG;
+      final bool rootFromStorage = installAsRoot && _app.isFromStorage;
+      final bool ytWithoutRootMicroG =
           !installAsRoot && !hasMicroG && _app.packageName.contains('youtube');
       if (rootMicroG || rootFromStorage || ytWithoutRootMicroG) {
         return showDialog(
@@ -212,24 +216,30 @@ class InstallerViewModel extends BaseViewModel {
           await _managerAPI.savePatchedApp(_app);
         }
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
   void exportResult() {
     try {
       _patcherAPI.exportPatchedFile(_app.name, _app.version);
-    } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
   void shareResult() {
     try {
       _patcherAPI.sharePatchedFile(_app.name, _app.version);
-    } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 
@@ -243,8 +253,10 @@ class InstallerViewModel extends BaseViewModel {
       locator<PatcherViewModel>().selectedApp = null;
       locator<PatcherViewModel>().selectedPatches.clear();
       locator<PatcherViewModel>().notifyListeners();
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
 

lib/ui/views/navigation/navigation_view.dart

@@ -11,7 +11,7 @@ class NavigationView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<NavigationViewModel>.reactive(
-      onModelReady: (model) => model.initialize(context),
+      onViewModelReady: (model) => model.initialize(context),
       viewModelBuilder: () => locator<NavigationViewModel>(),
       builder: (context, model, child) => Scaffold(
         body: PageTransitionSwitcher(
@@ -42,7 +42,6 @@ class NavigationView extends StatelessWidget {
                 context,
                 'navigationView.dashboardTab',
               ),
-              tooltip: '',
             ),
             NavigationDestination(
               icon: model.isIndexSelected(1)
@@ -52,7 +51,6 @@ class NavigationView extends StatelessWidget {
                 context,
                 'navigationView.patcherTab',
               ),
-              tooltip: '',
             ),
             NavigationDestination(
               icon: model.isIndexSelected(2)
@@ -62,7 +60,6 @@ class NavigationView extends StatelessWidget {
                 context,
                 'navigationView.settingsTab',
               ),
-              tooltip: '',
             ),
           ],
         ),

lib/ui/views/navigation/navigation_viewmodel.dart

@@ -15,19 +15,21 @@ import 'package:stacked/stacked.dart';
 
 @lazySingleton
 class NavigationViewModel extends IndexTrackingViewModel {
-  void initialize(BuildContext context) async {
+  Future<void> initialize(BuildContext context) async {
     locator<Toast>().initialize(context);
-    SharedPreferences prefs = await SharedPreferences.getInstance();
+    final SharedPreferences prefs =
+        await SharedPreferences.getInstance();
     if (prefs.getBool('permissionsRequested') == null) {
       await prefs.setBool('permissionsRequested', true);
       RootAPI().hasRootPermissions().then(
             (value) => Permission.requestInstallPackages.request().then(
-                  (value) => Permission.ignoreBatteryOptimizations.request(),
+                  (value) =>
+                      Permission.ignoreBatteryOptimizations.request(),
                 ),
           );
     }
     if (prefs.getBool('useDarkTheme') == null) {
-      bool isDark =
+      final bool isDark =
           MediaQuery.of(context).platformBrightness != Brightness.light;
       await prefs.setBool('useDarkTheme', isDark);
       await DynamicTheme.of(context)!.setTheme(isDark ? 1 : 0);
@@ -37,7 +39,8 @@ class NavigationViewModel extends IndexTrackingViewModel {
       SystemUiOverlayStyle(
         systemNavigationBarColor: Colors.transparent,
         systemNavigationBarIconBrightness:
-            DynamicTheme.of(context)!.theme.brightness == Brightness.light
+            DynamicTheme.of(context)!.theme.brightness ==
+                    Brightness.light
                 ? Brightness.dark
                 : Brightness.light,
       ),

lib/ui/views/patcher/patcher_view.dart

@@ -34,7 +34,7 @@ class PatcherView extends StatelessWidget {
                 child: Text(
                   '',
                   style: GoogleFonts.inter(
-                    color: Theme.of(context).textTheme.headline6!.color,
+                    color: Theme.of(context).textTheme.titleLarge!.color,
                   ),
                 ),
               ),

lib/ui/views/patcher/patcher_viewmodel.dart

@@ -1,3 +1,5 @@
+// ignore_for_file: use_build_context_synchronously
+
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:injectable/injectable.dart';
@@ -8,6 +10,7 @@ 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:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
 
@@ -40,35 +43,69 @@ class PatcherViewModel extends BaseViewModel {
   }
 
   Future<bool> isValidPatchConfig() async {
-    bool needsResourcePatching = await _patcherAPI.needsResourcePatching(
+    final bool needsResourcePatching = await _patcherAPI.needsResourcePatching(
       selectedPatches,
     );
     if (needsResourcePatching && selectedApp != null) {
-      bool isSplit = await _managerAPI.isSplitApk(selectedApp!);
+      final bool isSplit = await _managerAPI.isSplitApk(selectedApp!);
       return !isSplit;
     }
     return true;
   }
 
   Future<void> showPatchConfirmationDialog(BuildContext context) async {
-    bool isValid = await isValidPatchConfig();
-    if (isValid) {
-      navigateToInstaller();
-    } else {
+    final bool isValid = await isValidPatchConfig();
+    if (context.mounted) {
+      if (isValid) {
+        showArmv7WarningDialog(context);
+      } else {
+        return showDialog(
+          context: context,
+          builder: (context) => AlertDialog(
+            title: I18nText('warning'),
+            backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+            content: I18nText('patcherView.armv7WarningDialogText'),
+            actions: <Widget>[
+              CustomMaterialButton(
+                label: I18nText('noButton'),
+                onPressed: () => Navigator.of(context).pop(),
+              ),
+              CustomMaterialButton(
+                label: I18nText('yesButton'),
+                isFilled: false,
+                onPressed: () {
+                  Navigator.of(context).pop();
+                  showArmv7WarningDialog(context);
+                },
+              )
+            ],
+          ),
+        );
+      }
+    }
+  }
+
+  Future<void> showArmv7WarningDialog(BuildContext context) async {
+    final bool armv7 = await AboutInfo.getInfo().then((info) {
+      final List<String> archs = info['arch'];
+      final supportedAbis = ['arm64-v8a', 'x86', 'x86_64'];
+      return !archs.any((arch) => supportedAbis.contains(arch));
+    });
+    if (context.mounted && armv7) {
       return showDialog(
         context: context,
         builder: (context) => AlertDialog(
           title: I18nText('warning'),
           backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-          content: I18nText('patcherView.patchDialogText'),
+          content: I18nText('patcherView.armv7WarningDialogText'),
           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();
@@ -77,6 +114,8 @@ class PatcherViewModel extends BaseViewModel {
           ],
         ),
       );
+    } else {
+      navigateToInstaller();
     }
   }
 
@@ -88,31 +127,31 @@ class PatcherViewModel extends BaseViewModel {
     return text;
   }
 
-  String getRecommendedVersionString(BuildContext context) {
-    String recommendedVersion =
-        _patcherAPI.getRecommendedVersion(selectedApp!.packageName);
-    if (recommendedVersion.isEmpty) {
-      recommendedVersion = FlutterI18n.translate(
+  String getSuggestedVersionString(BuildContext context) {
+    String suggestedVersion =
+        _patcherAPI.getSuggestedVersion(selectedApp!.packageName);
+    if (suggestedVersion.isEmpty) {
+      suggestedVersion = FlutterI18n.translate(
         context,
         'appSelectorCard.anyVersion',
       );
     } else {
-      recommendedVersion = 'v$recommendedVersion';
+      suggestedVersion = 'v$suggestedVersion';
     }
     return '${FlutterI18n.translate(
       context,
       'appSelectorCard.currentVersion',
     )}: v${selectedApp!.version}\n${FlutterI18n.translate(
       context,
-      'appSelectorCard.recommendedVersion',
-    )}: $recommendedVersion';
+      'appSelectorCard.suggestedVersion',
+    )}: $suggestedVersion';
   }
 
   Future<void> loadLastSelectedPatches() async {
     this.selectedPatches.clear();
-    List<String> selectedPatches =
+    final List<String> selectedPatches =
         await _managerAPI.getSelectedPatches(selectedApp!.originalPackageName);
-    List<Patch> patches =
+    final List<Patch> patches =
         _patcherAPI.getFilteredPatches(selectedApp!.originalPackageName);
     this
         .selectedPatches

lib/ui/views/patches_selector/patches_selector_view.dart

@@ -1,10 +1,10 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide SearchBar;
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/ui/views/patches_selector/patches_selector_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/patchesSelectorView/patch_item.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_chip.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_popup_menu.dart';
 import 'package:revanced_manager/ui/widgets/shared/search_bar.dart';
+import 'package:revanced_manager/utils/check_for_supported_patch.dart';
 import 'package:stacked/stacked.dart';
 
 class PatchesSelectorView extends StatefulWidget {
@@ -20,7 +20,7 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<PatchesSelectorViewModel>.reactive(
-      onModelReady: (model) => model.initialize(),
+      onViewModelReady: (model) => model.initialize(),
       viewModelBuilder: () => PatchesSelectorViewModel(),
       builder: (context, model, child) => Scaffold(
         resizeToAvoidBottomInset: false,
@@ -45,26 +45,24 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
             SliverAppBar(
               pinned: true,
               floating: true,
-              snap: false,
               title: I18nText(
                 'patchesSelectorView.viewTitle',
                 child: Text(
                   '',
                   style: TextStyle(
-                    color: Theme.of(context).textTheme.headline6!.color,
+                    color: Theme.of(context).textTheme.titleLarge!.color,
                   ),
                 ),
               ),
               leading: IconButton(
                 icon: Icon(
                   Icons.arrow_back,
-                  color: Theme.of(context).textTheme.headline6!.color,
+                  color: Theme.of(context).textTheme.titleLarge!.color,
                 ),
                 onPressed: () => Navigator.of(context).pop(),
               ),
               actions: [
                 Container(
-                  height: 2,
                   margin: const EdgeInsets.only(top: 12, bottom: 12),
                   padding:
                       const EdgeInsets.symmetric(horizontal: 6, vertical: 6),
@@ -76,7 +74,7 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                   child: Text(
                     model.patchesVersion!,
                     style: TextStyle(
-                      color: Theme.of(context).textTheme.headline6!.color,
+                      color: Theme.of(context).textTheme.titleLarge!.color,
                     ),
                   ),
                 ),
@@ -103,7 +101,6 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                     horizontal: 12.0,
                   ),
                   child: SearchBar(
-                    showSelectIcon: true,
                     hintText: FlutterI18n.translate(
                       context,
                       'patchesSelectorView.searchBarHint',
@@ -113,12 +110,6 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                         _query = searchQuery;
                       });
                     },
-                    onSelectAll: (value) {
-                      if (value) {
-                        model.selectAllPatcherWarning(context);
-                      }
-                      model.selectAllPatches(value);
-                    },
                   ),
                 ),
               ),
@@ -138,30 +129,32 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                       ),
                     )
                   : Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 12.0)
-                          .copyWith(bottom: 80),
+                      padding:
+                          const EdgeInsets.symmetric(horizontal: 12.0).copyWith(
+                        bottom: MediaQuery.of(context).viewPadding.bottom + 8.0,
+                      ),
                       child: Column(
                         children: [
                           Row(
                             children: [
-                              CustomChip(
-                                label:
-                                    I18nText('patchesSelectorView.recommended'),
-                                onSelected: (value) {
-                                  model.selectRecommendedPatches();
+                              ActionChip(
+                                label: I18nText('patchesSelectorView.default'),
+                                tooltip: FlutterI18n.translate(
+                                  context,
+                                  'patchesSelectorView.defaultTooltip',
+                                ),
+                                onPressed: () {
+                                  model.selectDefaultPatches();
                                 },
                               ),
                               const SizedBox(width: 8),
-                              CustomChip(
-                                label: I18nText('patchesSelectorView.all'),
-                                onSelected: (value) {
-                                  model.selectAllPatches(true);
-                                },
-                              ),
-                              const SizedBox(width: 8),
-                              CustomChip(
+                              ActionChip(
                                 label: I18nText('patchesSelectorView.none'),
-                                onSelected: (value) {
+                                tooltip: FlutterI18n.translate(
+                                  context,
+                                  'patchesSelectorView.noneTooltip',
+                                ),
+                                onPressed: () {
                                   model.clearPatches();
                                 },
                               ),
@@ -178,7 +171,7 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                                   packageVersion: model.getAppVersion(),
                                   supportedPackageVersions:
                                       model.getSupportedVersions(patch),
-                                  isUnsupported: !model.isPatchSupported(patch),
+                                  isUnsupported: !isPatchSupported(patch),
                                   isSelected: model.isSelected(patch),
                                   onChanged: (value) =>
                                       model.selectPatch(patch, value),

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -1,5 +1,4 @@
 import 'package:collection/collection.dart';
-import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
@@ -8,9 +7,8 @@ import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:revanced_manager/utils/check_for_supported_patch.dart';
 import 'package:stacked/stacked.dart';
-import 'package:flutter/material.dart';
 
 class PatchesSelectorViewModel extends BaseViewModel {
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
@@ -25,10 +23,12 @@ class PatchesSelectorViewModel extends BaseViewModel {
   }
 
   Future<void> initialize() async {
-    getPatchesVersion();
-    patches.addAll(_patcherAPI.getFilteredPatches(
-      locator<PatcherViewModel>().selectedApp!.originalPackageName,
-    ));
+    getPatchesVersion().whenComplete(() => notifyListeners());
+    patches.addAll(
+      _patcherAPI.getFilteredPatches(
+        locator<PatcherViewModel>().selectedApp!.originalPackageName,
+      ),
+    );
     patches.sort((a, b) => a.name.compareTo(b.name));
     notifyListeners();
   }
@@ -48,44 +48,15 @@ class PatchesSelectorViewModel extends BaseViewModel {
     notifyListeners();
   }
 
-  Future<void> selectAllPatcherWarning(BuildContext context) {
-    return showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: I18nText('warning'),
-        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 && _managerAPI.areExperimentalPatchesEnabled() == false) {
-      selectedPatches
-          .addAll(patches.where((element) => isPatchSupported(element)));
-    }
-
-    if (isSelected && _managerAPI.areExperimentalPatchesEnabled()) {
-      selectedPatches.addAll(patches);
-    }
-
-    notifyListeners();
-  }
-
-  void selectRecommendedPatches() {
+  void selectDefaultPatches() {
     selectedPatches.clear();
 
     if (_managerAPI.areExperimentalPatchesEnabled() == false) {
-      selectedPatches.addAll(patches.where(
-          (element) => element.excluded == false && isPatchSupported(element)));
+      selectedPatches.addAll(
+        patches.where(
+          (element) => element.excluded == false && isPatchSupported(element),
+        ),
+      );
     }
 
     if (_managerAPI.areExperimentalPatchesEnabled()) {
@@ -117,15 +88,18 @@ class PatchesSelectorViewModel extends BaseViewModel {
       patchesVersion = await _githubAPI
           .getLastestReleaseVersion(_managerAPI.getPatchesRepo());
     }
+    return null;
   }
 
   List<Patch> getQueriedPatches(String query) {
     return patches
-        .where((patch) =>
-            query.isEmpty ||
-            query.length < 2 ||
-            patch.name.toLowerCase().contains(query.toLowerCase()) ||
-            patch.getSimpleName().toLowerCase().contains(query.toLowerCase()))
+        .where(
+          (patch) =>
+              query.isEmpty ||
+              query.length < 2 ||
+              patch.name.toLowerCase().contains(query.toLowerCase()) ||
+              patch.getSimpleName().toLowerCase().contains(query.toLowerCase()),
+        )
         .toList();
   }
 
@@ -134,8 +108,8 @@ class PatchesSelectorViewModel extends BaseViewModel {
   }
 
   List<String> getSupportedVersions(Patch patch) {
-    PatchedApplication app = locator<PatcherViewModel>().selectedApp!;
-    Package? package = patch.compatiblePackages.firstWhereOrNull(
+    final PatchedApplication app = locator<PatcherViewModel>().selectedApp!;
+    final Package? package = patch.compatiblePackages.firstWhereOrNull(
       (pack) => pack.name == app.packageName,
     );
     if (package != null) {
@@ -145,13 +119,6 @@ class PatchesSelectorViewModel extends BaseViewModel {
     }
   }
 
-  bool isPatchSupported(Patch patch) {
-    PatchedApplication app = locator<PatcherViewModel>().selectedApp!;
-    return patch.compatiblePackages.isEmpty || patch.compatiblePackages.any((pack) =>
-        pack.name == app.packageName &&
-        (pack.versions.isEmpty || pack.versions.contains(app.version)));
-  }
-
   void onMenuSelection(value) {
     switch (value) {
       case 0:
@@ -161,20 +128,23 @@ class PatchesSelectorViewModel extends BaseViewModel {
   }
 
   Future<void> saveSelectedPatches() async {
-    List<String> selectedPatches =
+    final List<String> selectedPatches =
         this.selectedPatches.map((patch) => patch.name).toList();
     await _managerAPI.setSelectedPatches(
-        locator<PatcherViewModel>().selectedApp!.originalPackageName,
-        selectedPatches);
+      locator<PatcherViewModel>().selectedApp!.originalPackageName,
+      selectedPatches,
+    );
   }
 
   Future<void> loadSelectedPatches() async {
-    List<String> selectedPatches = await _managerAPI.getSelectedPatches(
-        locator<PatcherViewModel>().selectedApp!.originalPackageName);
+    final List<String> selectedPatches = await _managerAPI.getSelectedPatches(
+      locator<PatcherViewModel>().selectedApp!.originalPackageName,
+    );
     if (selectedPatches.isNotEmpty) {
       this.selectedPatches.clear();
       this.selectedPatches.addAll(
-          patches.where((patch) => selectedPatches.contains(patch.name)));
+            patches.where((patch) => selectedPatches.contains(patch.name)),
+          );
     } else {
       locator<Toast>().showBottom('patchesSelectorView.noSavedPatches');
     }

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

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/services/manager_api.dart';
+import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
@@ -11,11 +12,12 @@ import 'package:stacked/stacked.dart';
 
 class SManageApiUrl extends BaseViewModel {
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
+  final Toast _toast = locator<Toast>();
 
   final TextEditingController _apiUrlController = TextEditingController();
 
   Future<void> showApiUrlDialog(BuildContext context) async {
-    String apiUrl = _managerAPI.getApiUrl();
+    final String apiUrl = _managerAPI.getApiUrl();
     _apiUrlController.text = apiUrl.replaceAll('https://', '');
     return showDialog(
       context: context,
@@ -90,7 +92,7 @@ class SManageApiUrl extends BaseViewModel {
             label: I18nText('yesButton'),
             onPressed: () {
               _managerAPI.setApiUrl('');
-              Navigator.of(context).pop();
+              _toast.showBottom('settingsView.restartAppForChanges');
               Navigator.of(context).pop();
             },
           )

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

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

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

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/services/manager_api.dart';
+import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
@@ -11,6 +12,7 @@ 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();
@@ -19,9 +21,9 @@ class SManageSources extends BaseViewModel {
   final TextEditingController _intSourceController = TextEditingController();
 
   Future<void> showSourcesDialog(BuildContext context) async {
-    String hostRepository = _managerAPI.getRepoUrl();
-    String patchesRepo = _managerAPI.getPatchesRepo();
-    String integrationsRepo = _managerAPI.getIntegrationsRepo();
+    final String hostRepository = _managerAPI.getRepoUrl();
+    final String patchesRepo = _managerAPI.getPatchesRepo();
+    final String integrationsRepo = _managerAPI.getIntegrationsRepo();
     _hostSourceController.text = hostRepository;
     _orgPatSourceController.text = patchesRepo.split('/')[0];
     _patSourceController.text = patchesRepo.split('/')[1];
@@ -117,13 +119,14 @@ class SManageSources extends BaseViewModel {
           CustomMaterialButton(
             label: I18nText('okButton'),
             onPressed: () {
-              _managerAPI.setRepoUrl(_hostSourceController.text);
+              _managerAPI.setRepoUrl(_hostSourceController.text.trim());
               _managerAPI.setPatchesRepo(
-                '${_orgPatSourceController.text}/${_patSourceController.text}',
+                '${_orgPatSourceController.text.trim()}/${_patSourceController.text.trim()}',
               );
               _managerAPI.setIntegrationsRepo(
-                '${_orgIntSourceController.text}/${_intSourceController.text}',
+                '${_orgIntSourceController.text.trim()}/${_intSourceController.text.trim()}',
               );
+              _toast.showBottom('settingsView.restartAppForChanges');
               Navigator.of(context).pop();
             },
           )
@@ -151,9 +154,10 @@ class SManageSources extends BaseViewModel {
               _managerAPI.setRepoUrl('');
               _managerAPI.setPatchesRepo('');
               _managerAPI.setIntegrationsRepo('');
-              Navigator.of(context).pop();
-              Navigator.of(context).pop();
-              Navigator.of(context).pop();
+              _toast.showBottom('settingsView.restartAppForChanges');
+              Navigator.of(context)
+                ..pop()
+                ..pop();
             },
           )
         ],

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

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

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

@@ -7,7 +7,6 @@ import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/custom_switch_tile.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
 import 'package:stacked/stacked.dart';
 
@@ -23,9 +22,9 @@ class SUpdateTheme extends BaseViewModel {
     return _managerAPI.getUseDynamicTheme();
   }
 
-  void setUseDynamicTheme(BuildContext context, bool value) async {
+  Future<void> setUseDynamicTheme(BuildContext context, bool value) async {
     await _managerAPI.setUseDynamicTheme(value);
-    int currentTheme = DynamicTheme.of(context)!.themeId;
+    final int currentTheme = DynamicTheme.of(context)!.themeId;
     if (currentTheme.isEven) {
       await DynamicTheme.of(context)!.setTheme(value ? 2 : 0);
     } else {
@@ -38,9 +37,9 @@ class SUpdateTheme extends BaseViewModel {
     return _managerAPI.getUseDarkTheme();
   }
 
-  void setUseDarkTheme(BuildContext context, bool value) async {
+  Future<void> setUseDarkTheme(BuildContext context, bool value) async {
     await _managerAPI.setUseDarkTheme(value);
-    int currentTheme = DynamicTheme.of(context)!.themeId;
+    final int currentTheme = DynamicTheme.of(context)!.themeId;
     if (currentTheme < 2) {
       await DynamicTheme.of(context)!.setTheme(value ? 1 : 0);
     } else {
@@ -64,8 +63,8 @@ class SUpdateThemeUI extends StatelessWidget {
     return SettingsSection(
       title: 'settingsView.appearanceSectionTitle',
       children: <Widget>[
-        CustomSwitchTile(
-          padding: const EdgeInsets.symmetric(horizontal: 20.0),
+        SwitchListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
           title: I18nText(
             'settingsView.darkThemeLabel',
             child: const Text(
@@ -78,7 +77,7 @@ class SUpdateThemeUI extends StatelessWidget {
           ),
           subtitle: I18nText('settingsView.darkThemeHint'),
           value: SUpdateTheme().getDarkThemeStatus(),
-          onTap: (value) => SUpdateTheme().setUseDarkTheme(
+          onChanged: (value) => SUpdateTheme().setUseDarkTheme(
             context,
             value,
           ),
@@ -88,8 +87,8 @@ class SUpdateThemeUI extends StatelessWidget {
           builder: (context, snapshot) => Visibility(
             visible:
                 snapshot.hasData && snapshot.data! >= ANDROID_12_SDK_VERSION,
-            child: CustomSwitchTile(
-              padding: const EdgeInsets.symmetric(horizontal: 20.0),
+            child: SwitchListTile(
+              contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
               title: I18nText(
                 'settingsView.dynamicThemeLabel',
                 child: const Text(
@@ -102,11 +101,12 @@ class SUpdateThemeUI extends StatelessWidget {
               ),
               subtitle: I18nText('settingsView.dynamicThemeHint'),
               value: _settingViewModel.sUpdateTheme.getDynamicThemeStatus(),
-              onTap: (value) =>
-                  _settingViewModel.sUpdateTheme.setUseDynamicTheme(
-                context,
-                value,
-              ),
+              onChanged: (value) => {
+                _settingViewModel.sUpdateTheme.setUseDynamicTheme(
+                  context,
+                  value,
+                ),
+              },
             ),
           ),
         ),

lib/ui/views/settings/settings_view.dart

@@ -3,8 +3,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_update_language.dart';
-import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_update_theme.dart';
+import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_update_theme.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_advanced_section.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_export_section.dart';
@@ -33,7 +32,7 @@ class SettingsView extends StatelessWidget {
                 child: Text(
                   '',
                   style: GoogleFonts.inter(
-                    color: Theme.of(context).textTheme.headline6!.color,
+                    color: Theme.of(context).textTheme.titleLarge!.color,
                   ),
                 ),
               ),
@@ -50,8 +49,6 @@ class SettingsView extends StatelessWidget {
                   _settingsDivider,
                   SExportSection(),
                   _settingsDivider,
-                  // SLoggingSection(),
-                  // _settingsDivider,
                   SInfoSection(),
                 ],
               ),

lib/ui/views/settings/settings_viewmodel.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 import 'package:cr_file_saver/file_saver.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:file_picker/file_picker.dart';
+import 'package:flutter/foundation.dart';
 import 'package:logcat/logcat.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:revanced_manager/app/app.locator.dart';
@@ -9,15 +10,15 @@ import 'package:revanced_manager/app/app.router.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
-import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_update_language.dart';
-import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_update_theme.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
+import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_update_language.dart';
+import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_update_theme.dart';
 import 'package:share_extend/share_extend.dart';
 import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
 
 class SettingsViewModel extends BaseViewModel {
-  final NavigationService _navigationService = locator<NavigationService>();
+  final NavigationService _navigationService =
+      locator<NavigationService>();
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final Toast _toast = locator<Toast>();
 
@@ -28,16 +29,6 @@ class SettingsViewModel extends BaseViewModel {
     _navigationService.navigateTo(Routes.contributorsView);
   }
 
-  bool isSentryEnabled() {
-    return _managerAPI.isSentryEnabled();
-  }
-
-  void useSentry(bool value) {
-    _managerAPI.setSentryStatus(value);
-    _toast.showBottom('settingsView.restartAppForChanges');
-    notifyListeners();
-  }
-
   bool areUniversalPatchesEnabled() {
     return _managerAPI.areUniversalPatchesEnabled();
   }
@@ -70,47 +61,91 @@ class SettingsViewModel extends BaseViewModel {
 
   Future<void> exportPatches() async {
     try {
-      File outFile = File(_managerAPI.storedPatchesFile);
+      final File outFile = File(_managerAPI.storedPatchesFile);
       if (outFile.existsSync()) {
-        String dateTime =
-            DateTime.now().toString().replaceAll(' ', '_').split('.').first;
-        String tempFilePath =
-            '${outFile.path.substring(0, outFile.path.lastIndexOf('/') + 1)}selected_patches_$dateTime.json';
-        outFile.copySync(tempFilePath);
-        await CRFileSaver.saveFileWithDialog(SaveFileDialogParams(
-            sourceFilePath: tempFilePath, destinationFileName: ''));
-        File(tempFilePath).delete();
-        locator<Toast>().showBottom('settingsView.exportedPatches');
+        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 {
-        locator<Toast>().showBottom('settingsView.noExportFileFound');
+        _toast.showBottom('settingsView.noExportFileFound');
+      }
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
       }
-    } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s);
     }
   }
 
   Future<void> importPatches() async {
     try {
-      FilePickerResult? result = await FilePicker.platform.pickFiles(
+      final FilePickerResult? result =
+          await FilePicker.platform.pickFiles(
         type: FileType.custom,
         allowedExtensions: ['json'],
       );
       if (result != null && result.files.single.path != null) {
-        File inFile = File(result.files.single.path!);
-        final File storedPatchesFile = File(_managerAPI.storedPatchesFile);
-        if (!storedPatchesFile.existsSync()) {
-          storedPatchesFile.createSync(recursive: true);
-        }
-        inFile.copySync(storedPatchesFile.path);
+        final File inFile = File(result.files.single.path!);
+        inFile.copySync(_managerAPI.storedPatchesFile);
         inFile.delete();
         if (locator<PatcherViewModel>().selectedApp != null) {
           locator<PatcherViewModel>().loadLastSelectedPatches();
         }
-        locator<Toast>().showBottom('settingsView.importedPatches');
+        _toast.showBottom('settingsView.importedPatches');
       }
-    } on Exception catch (e, s) {
-      await Sentry.captureException(e, stackTrace: s);
-      locator<Toast>().showBottom('settingsView.jsonSelectorErrorMessage');
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+      _toast.showBottom('settingsView.jsonSelectorErrorMessage');
+    }
+  }
+
+    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');
     }
   }
 
@@ -120,13 +155,13 @@ class SettingsViewModel extends BaseViewModel {
   }
 
   Future<int> getSdkVersion() async {
-    AndroidDeviceInfo info = await DeviceInfoPlugin().androidInfo;
-    return info.version.sdkInt ?? -1;
+    final AndroidDeviceInfo info = await DeviceInfoPlugin().androidInfo;
+    return info.version.sdkInt;
   }
 
   Future<void> deleteLogs() async {
-    Directory appCacheDir = await getTemporaryDirectory();
-    Directory logsDir = Directory('${appCacheDir.path}/logs');
+    final Directory appCacheDir = await getTemporaryDirectory();
+    final Directory logsDir = Directory('${appCacheDir.path}/logs');
     if (logsDir.existsSync()) {
       logsDir.deleteSync(recursive: true);
     }
@@ -134,17 +169,18 @@ class SettingsViewModel extends BaseViewModel {
   }
 
   Future<void> exportLogcatLogs() async {
-    Directory appCache = await getTemporaryDirectory();
-    Directory logDir = Directory('${appCache.path}/logs');
+    final Directory appCache = await getTemporaryDirectory();
+    final Directory logDir = Directory('${appCache.path}/logs');
     logDir.createSync();
-    String dateTime = DateTime.now()
+    final String dateTime = DateTime.now()
         .toIso8601String()
         .replaceAll('-', '')
         .replaceAll(':', '')
         .replaceAll('T', '')
         .replaceAll('.', '');
-    File logcat = File('${logDir.path}/revanced-manager_logcat_$dateTime.log');
-    String logs = await Logcat.execute();
+    final File logcat =
+        File('${logDir.path}/revanced-manager_logcat_$dateTime.log');
+    final String logs = await Logcat.execute();
     logcat.writeAsStringSync(logs);
     ShareExtend.share(logcat.path, 'file');
   }

lib/ui/widgets/appInfoView/app_info_view.dart

@@ -8,12 +8,11 @@ import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
 class AppInfoView extends StatelessWidget {
-  final PatchedApplication app;
-
   const AppInfoView({
     Key? key,
     required this.app,
   }) : super(key: key);
+  final PatchedApplication app;
 
   @override
   Widget build(BuildContext context) {
@@ -28,7 +27,7 @@ class AppInfoView extends StatelessWidget {
                 child: Text(
                   '',
                   style: GoogleFonts.inter(
-                    color: Theme.of(context).textTheme.headline6!.color,
+                    color: Theme.of(context).textTheme.titleLarge!.color,
                   ),
                 ),
               ),
@@ -52,13 +51,13 @@ class AppInfoView extends StatelessWidget {
                     Text(
                       app.name,
                       textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.headline6,
+                      style: Theme.of(context).textTheme.titleLarge,
                     ),
                     const SizedBox(height: 4),
                     Text(
                       app.version,
                       textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.subtitle1,
+                      style: Theme.of(context).textTheme.titleLarge,
                     ),
                     const SizedBox(height: 20),
                     Padding(

lib/ui/widgets/appInfoView/app_info_viewmodel.dart

@@ -29,7 +29,7 @@ class AppInfoViewModel extends BaseViewModel {
   ) async {
     bool isUninstalled = true;
     if (app.isRooted) {
-      bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+      final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
       if (hasRootPermissions) {
         await _rootAPI.deleteApp(app.packageName, app.apkFilePath);
         if (!onlyUnpatch) {
@@ -45,7 +45,7 @@ class AppInfoViewModel extends BaseViewModel {
     }
   }
 
-  void navigateToPatcher(PatchedApplication app) async {
+  Future<void> navigateToPatcher(PatchedApplication app) async {
     locator<PatcherViewModel>().selectedApp = app;
     locator<PatcherViewModel>().selectedPatches =
         await _patcherAPI.getAppliedPatches(app.appliedPatches);
@@ -62,7 +62,7 @@ class AppInfoViewModel extends BaseViewModel {
     PatchedApplication app,
     bool onlyUnpatch,
   ) async {
-    bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+    final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
     if (app.isRooted && !hasRootPermissions) {
       return showDialog(
         context: context,
@@ -134,7 +134,8 @@ 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'),
@@ -146,13 +147,15 @@ class AppInfoViewModel extends BaseViewModel {
   }
 
   String getAppliedPatchesString(List<String> appliedPatches) {
-    List<String> names = appliedPatches
-        .map((p) => p
-            .replaceAll('-', ' ')
-            .split('-')
-            .join(' ')
-            .toTitleCase()
-            .replaceFirst('Microg', 'MicroG'))
+    final List<String> names = appliedPatches
+        .map(
+          (p) => p
+              .replaceAll('-', ' ')
+              .split('-')
+              .join(' ')
+              .toTitleCase()
+              .replaceFirst('Microg', 'MicroG'),
+        )
         .toList();
     return '\u2022 ${names.join('\n\u2022 ')}';
   }

lib/ui/widgets/appSelectorView/app_skeleton_loader.dart

@@ -21,7 +21,6 @@ class AppSkeletonLoader extends StatelessWidget {
                   style: SkeletonAvatarStyle(
                     width: screenWidth * 0.15,
                     height: screenWidth * 0.15,
-                    shape: BoxShape.rectangle,
                     borderRadius: const BorderRadius.all(Radius.circular(12)),
                   ),
                 ),

lib/ui/widgets/appSelectorView/installed_app_item.dart

@@ -3,20 +3,21 @@ import 'package:flutter/material.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class InstalledAppItem extends StatefulWidget {
-  final String name;
-  final String pkgName;
-  final Uint8List icon;
-  final int patchesCount;
-  final Function()? onTap;
-
   const InstalledAppItem({
     Key? key,
     required this.name,
     required this.pkgName,
     required this.icon,
     required this.patchesCount,
+    required this.suggestedVersion,
     this.onTap,
   }) : super(key: key);
+  final String name;
+  final String pkgName;
+  final Uint8List icon;
+  final int patchesCount;
+  final String suggestedVersion;
+  final Function()? onTap;
 
   @override
   State<InstalledAppItem> createState() => _InstalledAppItemState();
@@ -47,32 +48,35 @@ class _InstalledAppItemState extends State<InstalledAppItem> {
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: <Widget>[
+                  Text(
+                    widget.name,
+                    maxLines: 2,
+                    overflow: TextOverflow.visible,
+                    style: const TextStyle(
+                      fontSize: 16,
+                      fontWeight: FontWeight.w500,
+                    ),
+                  ),
+                  const SizedBox(height: 4),
+                  Text(widget.pkgName),
                   Row(
-                    crossAxisAlignment: CrossAxisAlignment.center,
-                    children: <Widget>[
+                    children: [
                       Text(
-                        widget.name,
-                        maxLines: 2,
-                        overflow: TextOverflow.visible,
-                        style: const TextStyle(
-                          fontSize: 16,
-                          fontWeight: FontWeight.w500,
-                        ),
+                        widget.suggestedVersion.isEmpty
+                            ? 'All versions'
+                            : widget.suggestedVersion,
                       ),
-                      const SizedBox(width: 6),
+                      const SizedBox(width: 4),
                       Text(
                         widget.patchesCount == 1
-                            ? "${widget.patchesCount} patch"
-                            : "${widget.patchesCount} patches",
+                            ? '• ${widget.patchesCount} patch'
+                            : '• ${widget.patchesCount} patches',
                         style: TextStyle(
-                          fontSize: 8,
                           color: Theme.of(context).colorScheme.secondary,
                         ),
                       ),
                     ],
                   ),
-                  const SizedBox(height: 4),
-                  Text(widget.pkgName),
                 ],
               ),
             ),

lib/ui/widgets/appSelectorView/not_installed_app_item.dart

@@ -0,0 +1,85 @@
+import 'package:flutter/material.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
+
+class NotInstalledAppItem extends StatefulWidget {
+  const NotInstalledAppItem({
+    Key? key,
+    required this.name,
+    required this.patchesCount,
+    required this.suggestedVersion,
+    this.onTap,
+  }) : super(key: key);
+  final String name;
+  final int patchesCount;
+  final String suggestedVersion;
+  final Function()? onTap;
+
+  @override
+  State<NotInstalledAppItem> createState() => _NotInstalledAppItem();
+}
+
+class _NotInstalledAppItem extends State<NotInstalledAppItem> {
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 4.0),
+      child: CustomCard(
+        onTap: widget.onTap,
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: <Widget>[
+            Container(
+              height: 48,
+              padding: const EdgeInsets.symmetric(vertical: 4.0),
+              alignment: Alignment.center,
+              child: const CircleAvatar(
+                backgroundColor: Colors.transparent,
+                child: Icon(
+                  Icons.square_rounded,
+                  color: Colors.grey,
+                  size: 44,
+                ),
+              ),
+            ),
+            const SizedBox(width: 12),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  Text(
+                    widget.name,
+                    style: const TextStyle(
+                      fontSize: 16,
+                      fontWeight: FontWeight.w500,
+                    ),
+                  ),
+                  const SizedBox(height: 4),
+                  const Text('App not installed.'),
+                  const SizedBox(height: 4),
+                  Row(
+                    children: [
+                      Text(
+                        widget.suggestedVersion.isEmpty
+                            ? 'All versions'
+                            : widget.suggestedVersion,
+                      ),
+                      const SizedBox(width: 4),
+                      Text(
+                        widget.patchesCount == 1
+                            ? '• ${widget.patchesCount} patch'
+                            : '• ${widget.patchesCount} patches',
+                        style: TextStyle(
+                          color: Theme.of(context).colorScheme.secondary,
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/ui/widgets/contributorsView/contributors_card.dart

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

lib/ui/widgets/homeView/available_updates_card.dart

@@ -3,7 +3,6 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/shared/application_item.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class AvailableUpdatesCard extends StatelessWidget {
@@ -29,7 +28,7 @@ class AvailableUpdatesCard extends StatelessWidget {
               child: Text(
                 '',
                 textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.subtitle1!.copyWith(
+                style: Theme.of(context).textTheme.titleMedium!.copyWith(
                       color: Theme.of(context).colorScheme.secondary,
                     ),
               ),
@@ -54,7 +53,7 @@ class AvailableUpdatesCard extends StatelessWidget {
     //                 child: Text(
     //                   '',
     //                   textAlign: TextAlign.center,
-    //                   style: Theme.of(context).textTheme.subtitle1!.copyWith(
+    //                   style: Theme.of(context).textTheme.titleMedium!.copyWith(
     //                         color: Theme.of(context).colorScheme.secondary,
     //                       ),
     //                 ),

lib/ui/widgets/homeView/installed_apps_card.dart

@@ -30,7 +30,7 @@ class InstalledAppsCard extends StatelessWidget {
                     child: Text(
                       '',
                       textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.subtitle1!.copyWith(
+                      style: Theme.of(context).textTheme.titleMedium!.copyWith(
                             color: Theme.of(context).colorScheme.secondary,
                           ),
                     ),

lib/ui/widgets/homeView/latest_commit_card.dart

@@ -2,16 +2,17 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 
 class LatestCommitCard extends StatefulWidget {
-  final Function() onPressed;
-
   const LatestCommitCard({
     Key? key,
-    required this.onPressed,
+    required this.onPressedManager,
+    required this.onPressedPatches,
   }) : super(key: key);
+  final Function() onPressedManager;
+  final Function() onPressedPatches;
 
   @override
   State<LatestCommitCard> createState() => _LatestCommitCardState();
@@ -22,67 +23,109 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
 
   @override
   Widget build(BuildContext context) {
-    return CustomCard(
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: <Widget>[
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
+    return Column(
+      children: [
+        // ReVanced Manager
+        CustomCard(
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: <Widget>[
-              Row(
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
                 children: <Widget>[
-                  I18nText('latestCommitCard.patcherLabel'),
-                  FutureBuilder<String?>(
-                    future: model.getLatestPatcherReleaseTime(),
-                    builder: (context, snapshot) => Text(
-                      snapshot.hasData && snapshot.data!.isNotEmpty
-                          ? FlutterI18n.translate(
-                              context,
-                              'latestCommitCard.timeagoLabel',
-                              translationParams: {'time': snapshot.data!},
-                            )
-                          : FlutterI18n.translate(
-                              context,
-                              'latestCommitCard.loadingLabel',
-                            ),
-                    ),
+                  const Row(
+                    children: <Widget>[
+                      Text('ReVanced Manager'),
+                    ],
+                  ),
+                  const SizedBox(height: 4),
+                  Row(
+                    children: <Widget>[
+                      FutureBuilder<String?>(
+                        future: model.getLatestManagerReleaseTime(),
+                        builder: (context, snapshot) =>
+                            snapshot.hasData && snapshot.data!.isNotEmpty
+                                ? I18nText(
+                                    'latestCommitCard.timeagoLabel',
+                                    translationParams: {'time': snapshot.data!},
+                                  )
+                                : I18nText('latestCommitCard.loadingLabel'),
+                      ),
+                    ],
                   ),
                 ],
               ),
-              const SizedBox(height: 4),
-              Row(
-                children: <Widget>[
-                  I18nText('latestCommitCard.managerLabel'),
-                  FutureBuilder<String?>(
-                    future: model.getLatestManagerReleaseTime(),
-                    builder: (context, snapshot) =>
-                        snapshot.hasData && snapshot.data!.isNotEmpty
-                            ? I18nText(
-                                'latestCommitCard.timeagoLabel',
-                                translationParams: {'time': snapshot.data!},
-                              )
-                            : I18nText('latestCommitCard.loadingLabel'),
+              FutureBuilder<bool>(
+                future: model.hasManagerUpdates(),
+                initialData: false,
+                builder: (context, snapshot) => Opacity(
+                  opacity: snapshot.hasData && snapshot.data! ? 1.0 : 0.25,
+                  child: CustomMaterialButton(
+                    label: I18nText('updateButton'),
+                    onPressed: snapshot.hasData && snapshot.data!
+                        ? widget.onPressedManager
+                        : () => {},
                   ),
-                ],
+                ),
               ),
             ],
           ),
-          FutureBuilder<bool>(
-            future: locator<HomeViewModel>().hasManagerUpdates(),
-            initialData: false,
-            builder: (context, snapshot) => Opacity(
-              opacity: snapshot.hasData && snapshot.data! ? 1.0 : 0.25,
-              child: CustomMaterialButton(
-                isExpanded: false,
-                label: I18nText('latestCommitCard.updateButton'),
-                onPressed: snapshot.hasData && snapshot.data!
-                    ? widget.onPressed
-                    : () => {},
+        ),
+
+        const SizedBox(height: 16),
+
+        // ReVanced Patches
+        CustomCard(
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: <Widget>[
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  const Row(
+                    children: <Widget>[
+                      Text('ReVanced Patches'),
+                    ],
+                  ),
+                  const SizedBox(height: 4),
+                  Row(
+                    children: <Widget>[
+                      FutureBuilder<String?>(
+                        future: model.getLatestPatcherReleaseTime(),
+                        builder: (context, snapshot) => Text(
+                          snapshot.hasData && snapshot.data!.isNotEmpty
+                              ? FlutterI18n.translate(
+                                  context,
+                                  'latestCommitCard.timeagoLabel',
+                                  translationParams: {'time': snapshot.data!},
+                                )
+                              : FlutterI18n.translate(
+                                  context,
+                                  'latestCommitCard.loadingLabel',
+                                ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
               ),
-            ),
+              FutureBuilder<bool>(
+                future: locator<HomeViewModel>().hasPatchesUpdates(),
+                initialData: false,
+                builder: (context, snapshot) => Opacity(
+                  opacity: snapshot.hasData && snapshot.data! ? 1.0 : 0.25,
+                  child: CustomMaterialButton(
+                    label: I18nText('updateButton'),
+                    onPressed: snapshot.hasData && snapshot.data!
+                        ? widget.onPressedPatches
+                        : () => {},
+                  ),
+                ),
+              ),
+            ],
           ),
-        ],
-      ),
+        ),
+      ],
     );
   }
 }

lib/ui/widgets/homeView/update_confirmation_dialog.dart

@@ -14,15 +14,14 @@ class UpdateConfirmationDialog extends StatelessWidget {
 
     return DraggableScrollableSheet(
       expand: false,
-      initialChildSize: 0.5,
       snap: true,
       snapSizes: const [0.5],
-      builder: (context, scrollController) => SingleChildScrollView(
+      builder: (_, scrollController) => SingleChildScrollView(
         controller: scrollController,
         child: SafeArea(
           child: FutureBuilder<Map<String, dynamic>?>(
             future: model.getLatestManagerRelease(),
-            builder: (context, snapshot) {
+            builder: (_, snapshot) {
               if (!snapshot.hasData) {
                 return const SizedBox(
                   height: 300,
@@ -37,20 +36,26 @@ class UpdateConfirmationDialog extends StatelessWidget {
                 children: [
                   Padding(
                     padding: const EdgeInsets.only(
-                        top: 40.0, left: 24.0, right: 24.0, bottom: 32.0),
+                      top: 40.0,
+                      left: 24.0,
+                      right: 24.0,
+                      bottom: 32.0,
+                    ),
                     child: Row(
                       children: [
                         Expanded(
                           child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
+                            crossAxisAlignment:
+                                CrossAxisAlignment.start,
                             children: [
                               I18nText(
                                 'homeView.updateDialogTitle',
                                 child: const Text(
-                                  "",
+                                  '',
                                   style: TextStyle(
-                                      fontSize: 24,
-                                      fontWeight: FontWeight.bold),
+                                    fontSize: 24,
+                                    fontWeight: FontWeight.bold,
+                                  ),
                                 ),
                               ),
                               const SizedBox(height: 4.0),
@@ -58,12 +63,14 @@ class UpdateConfirmationDialog extends StatelessWidget {
                                 children: [
                                   Icon(
                                     Icons.new_releases_outlined,
-                                    color:
-                                        Theme.of(context).colorScheme.secondary,
+                                    color: Theme.of(context)
+                                        .colorScheme
+                                        .secondary,
                                   ),
                                   const SizedBox(width: 8.0),
                                   Text(
-                                    snapshot.data!["tag_name"] ?? "Unknown",
+                                    snapshot.data!['tag_name'] ??
+                                        'Unknown',
                                     style: TextStyle(
                                       fontSize: 20,
                                       fontWeight: FontWeight.w500,
@@ -89,31 +96,36 @@ class UpdateConfirmationDialog extends StatelessWidget {
                     ),
                   ),
                   Padding(
-                    padding: const EdgeInsets.only(left: 24.0, bottom: 12.0),
+                    padding:
+                        const EdgeInsets.only(left: 24.0, bottom: 12.0),
                     child: I18nText(
                       'homeView.updateChangelogTitle',
                       child: Text(
-                        "",
+                        '',
                         style: TextStyle(
-                            fontSize: 20,
-                            fontWeight: FontWeight.w500,
-                            color: Theme.of(context)
-                                .colorScheme
-                                .onSecondaryContainer),
+                          fontSize: 20,
+                          fontWeight: FontWeight.w500,
+                          color: Theme.of(context)
+                              .colorScheme
+                              .onSecondaryContainer,
+                        ),
                       ),
                     ),
                   ),
                   Container(
-                    margin: const EdgeInsets.symmetric(horizontal: 24.0),
+                    margin:
+                        const EdgeInsets.symmetric(horizontal: 24.0),
                     decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.secondaryContainer,
+                      color: Theme.of(context)
+                          .colorScheme
+                          .secondaryContainer,
                       borderRadius: BorderRadius.circular(12.0),
                     ),
                     child: Markdown(
                       shrinkWrap: true,
                       physics: const NeverScrollableScrollPhysics(),
                       padding: const EdgeInsets.all(20.0),
-                      data: snapshot.data!["body"] ?? "",
+                      data: snapshot.data!['body'] ?? '',
                     ),
                   ),
                 ],

lib/ui/widgets/installerView/gradient_progress_indicator.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
 class GradientProgressIndicator extends StatefulWidget {
-  final double? progress;
   const GradientProgressIndicator({required this.progress, super.key});
+  final double? progress;
 
   @override
   State<GradientProgressIndicator> createState() =>

lib/ui/widgets/patcherView/app_selector_card.dart

@@ -6,12 +6,11 @@ import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class AppSelectorCard extends StatelessWidget {
-  final Function() onPressed;
-
   const AppSelectorCard({
     Key? key,
     required this.onPressed,
   }) : super(key: key);
+  final Function() onPressed;
 
   @override
   Widget build(BuildContext context) {
@@ -33,40 +32,41 @@ class AppSelectorCard extends StatelessWidget {
             ),
           ),
           const SizedBox(height: 8),
-          locator<PatcherViewModel>().selectedApp == null
-              ? I18nText('appSelectorCard.widgetSubtitle')
-              : Row(
-                  children: <Widget>[
-                    SizedBox(
-                      height: 18.0,
-                      child: ClipOval(
-                        child: Image.memory(
-                          locator<PatcherViewModel>().selectedApp == null
-                              ? Uint8List(0)
-                              : locator<PatcherViewModel>().selectedApp!.icon,
-                          fit: BoxFit.cover,
-                        ),
-                      ),
+          if (locator<PatcherViewModel>().selectedApp == null)
+            I18nText('appSelectorCard.widgetSubtitle')
+          else
+            Row(
+              children: <Widget>[
+                SizedBox(
+                  height: 18.0,
+                  child: ClipOval(
+                    child: Image.memory(
+                      locator<PatcherViewModel>().selectedApp == null
+                          ? Uint8List(0)
+                          : locator<PatcherViewModel>().selectedApp!.icon,
+                      fit: BoxFit.cover,
                     ),
-                    const SizedBox(width: 6),
-                    Text(
-                        locator<PatcherViewModel>()
-                        .getAppSelectionString(),
-                        style: const TextStyle(fontWeight: FontWeight.w600),
-                      ),
-                  ],
+                  ),
                 ),
-          locator<PatcherViewModel>().selectedApp == null
-              ? Container()
-              : Column(
-                  children: [
-                    const SizedBox(height: 4),
-                    Text(
-                      locator<PatcherViewModel>()
-                          .getRecommendedVersionString(context),
-                    ),
-                  ],
+                const SizedBox(width: 6),
+                Text(
+                  locator<PatcherViewModel>().getAppSelectionString(),
+                  style: const TextStyle(fontWeight: FontWeight.w600),
                 ),
+              ],
+            ),
+          if (locator<PatcherViewModel>().selectedApp == null)
+            Container()
+          else
+            Column(
+              children: [
+                const SizedBox(height: 4),
+                Text(
+                  locator<PatcherViewModel>()
+                      .getSuggestedVersionString(context),
+                ),
+              ],
+            ),
         ],
       ),
     );

lib/ui/widgets/patcherView/patch_selector_card.dart

@@ -6,12 +6,11 @@ import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class PatchSelectorCard extends StatelessWidget {
-  final Function() onPressed;
-
   const PatchSelectorCard({
     Key? key,
     required this.onPressed,
   }) : super(key: key);
+  final Function() onPressed;
 
   @override
   Widget build(BuildContext context) {
@@ -46,11 +45,12 @@ class PatchSelectorCard extends StatelessWidget {
             ],
           ),
           const SizedBox(height: 4),
-          locator<PatcherViewModel>().selectedApp == null
-              ? I18nText('patchSelectorCard.widgetSubtitle')
-              : locator<PatcherViewModel>().selectedPatches.isEmpty
-                  ? I18nText('patchSelectorCard.widgetEmptySubtitle')
-                  : Text(_getPatchesSelection()),
+          if (locator<PatcherViewModel>().selectedApp == null)
+            I18nText('patchSelectorCard.widgetSubtitle')
+          else
+            locator<PatcherViewModel>().selectedPatches.isEmpty
+                ? I18nText('patchSelectorCard.widgetEmptySubtitle')
+                : Text(_getPatchesSelection()),
         ],
       ),
     );
@@ -58,7 +58,7 @@ class PatchSelectorCard extends StatelessWidget {
 
   String _getPatchesSelection() {
     String text = '';
-    for (Patch p in locator<PatcherViewModel>().selectedPatches) {
+    for (final Patch p in locator<PatcherViewModel>().selectedPatches) {
       text += '\u2022  ${p.getSimpleName()} (v${p.version})\n';
     }
     return text.substring(0, text.length - 1);

lib/ui/widgets/patchesSelectorView/patch_item.dart

@@ -3,11 +3,24 @@ 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/shared/custom_material_button.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 
 // ignore: must_be_immutable
 class PatchItem extends StatefulWidget {
+  PatchItem({
+    Key? key,
+    required this.name,
+    required this.simpleName,
+    required this.description,
+    required this.version,
+    required this.packageVersion,
+    required this.supportedPackageVersions,
+    required this.isUnsupported,
+    required this.isSelected,
+    required this.onChanged,
+    this.child,
+  }) : super(key: key);
   final String name;
   final String simpleName;
   final String description;
@@ -21,20 +34,6 @@ class PatchItem extends StatefulWidget {
   final toast = locator<Toast>();
   final _managerAPI = locator<ManagerAPI>();
 
-  PatchItem(
-      {Key? key,
-      required this.name,
-      required this.simpleName,
-      required this.description,
-      required this.version,
-      required this.packageVersion,
-      required this.supportedPackageVersions,
-      required this.isUnsupported,
-      required this.isSelected,
-      required this.onChanged,
-      this.child})
-      : super(key: key);
-
   @override
   State<PatchItem> createState() => _PatchItemState();
 }
@@ -75,30 +74,31 @@ class _PatchItemState extends State<PatchItem> {
                       Row(
                         crossAxisAlignment: CrossAxisAlignment.end,
                         children: <Widget>[
-                          Text(
-                            widget.simpleName,
-                            maxLines: 2,
-                            overflow: TextOverflow.visible,
-                            style: const TextStyle(
-                              fontSize: 16,
-                              fontWeight: FontWeight.w600,
-                            ),
-                          ),
-                          const SizedBox(width: 6),
-                          Text(
-                            widget.version,
-                            style: TextStyle(
-                              fontSize: 16,
-                              color: Theme.of(context).colorScheme.secondary,
+                          Expanded(
+                            child: Text(
+                              widget.simpleName,
+                              maxLines: 2,
+                              overflow: TextOverflow.visible,
+                              style: const TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.w600,
+                              ),
                             ),
                           ),
                         ],
                       ),
+                      const SizedBox(height: 1),
+                      Text(
+                        widget.version,
+                        style: TextStyle(
+                          fontSize: 14,
+                          color: Theme.of(context).colorScheme.secondary,
+                        ),
+                      ),
                       const SizedBox(height: 4),
                       Text(
                         widget.description,
                         softWrap: true,
-                        maxLines: 3,
                         overflow: TextOverflow.visible,
                         style: TextStyle(
                           fontSize: 14,
@@ -139,38 +139,37 @@ class _PatchItemState extends State<PatchItem> {
                 )
               ],
             ),
-            widget.isUnsupported
-                ? Row(
-                    children: <Widget>[
-                      Padding(
-                        padding: const EdgeInsets.only(top: 8),
-                        child: TextButton.icon(
-                          label: I18nText('warning'),
-                          icon: const Icon(Icons.warning, size: 20.0),
-                          onPressed: () => _showUnsupportedWarningDialog(),
-                          style: ButtonStyle(
-                            shape: MaterialStateProperty.all(
-                              RoundedRectangleBorder(
-                                borderRadius: BorderRadius.circular(8),
-                                side: BorderSide(
-                                  width: 1,
-                                  color:
-                                      Theme.of(context).colorScheme.secondary,
-                                ),
-                              ),
-                            ),
-                            backgroundColor: MaterialStateProperty.all(
-                              Colors.transparent,
-                            ),
-                            foregroundColor: MaterialStateProperty.all(
-                              Theme.of(context).colorScheme.secondary,
+            if (widget.isUnsupported)
+              Row(
+                children: <Widget>[
+                  Padding(
+                    padding: const EdgeInsets.only(top: 8),
+                    child: TextButton.icon(
+                      label: I18nText('warning'),
+                      icon: const Icon(Icons.warning, size: 20.0),
+                      onPressed: () => _showUnsupportedWarningDialog(),
+                      style: ButtonStyle(
+                        shape: MaterialStateProperty.all(
+                          RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(8),
+                            side: BorderSide(
+                              color: Theme.of(context).colorScheme.secondary,
                             ),
                           ),
                         ),
+                        backgroundColor: MaterialStateProperty.all(
+                          Colors.transparent,
+                        ),
+                        foregroundColor: MaterialStateProperty.all(
+                          Theme.of(context).colorScheme.secondary,
+                        ),
                       ),
-                    ],
-                  )
-                : Container(),
+                    ),
+                  ),
+                ],
+              )
+            else
+              Container(),
             widget.child ?? const SizedBox(),
           ],
         ),

lib/ui/widgets/patchesSelectorView/patch_options_fields.dart

@@ -3,8 +3,8 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 class OptionsTextField extends StatelessWidget {
-  final String hint;
   const OptionsTextField({Key? key, required this.hint}) : super(key: key);
+  final String hint;
 
   @override
   Widget build(BuildContext context) {
@@ -12,7 +12,7 @@ class OptionsTextField extends StatelessWidget {
     final sWidth = MediaQuery.of(context).size.width;
     return Container(
       margin: const EdgeInsets.only(top: 12, bottom: 6),
-      padding: const EdgeInsets.all(0),
+      padding: EdgeInsets.zero,
       child: TextField(
         decoration: InputDecoration(
           constraints: BoxConstraints(
@@ -28,9 +28,9 @@ class OptionsTextField extends StatelessWidget {
 }
 
 class OptionsFilePicker extends StatelessWidget {
-  final String optionName;
   const OptionsFilePicker({Key? key, required this.optionName})
       : super(key: key);
+  final String optionName;
 
   @override
   Widget build(BuildContext context) {
@@ -61,7 +61,7 @@ class OptionsFilePicker extends StatelessWidget {
             child: Text(
               'Select File',
               style: TextStyle(
-                color: Theme.of(context).textTheme.bodyText1?.color,
+                color: Theme.of(context).textTheme.bodyLarge?.color,
               ),
             ),
           ),

lib/ui/widgets/settingsView/about_widget.dart

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

lib/ui/widgets/settingsView/custom_switch.dart

@@ -1,14 +1,13 @@
 import 'package:flutter/material.dart';
 
 class CustomSwitch extends StatelessWidget {
-  final ValueChanged<bool> onChanged;
-  final bool value;
-
   const CustomSwitch({
     Key? key,
     required this.onChanged,
     required this.value,
   }) : super(key: key);
+  final ValueChanged<bool> onChanged;
+  final bool value;
 
   @override
   Widget build(BuildContext context) {
@@ -45,7 +44,7 @@ class CustomSwitch extends StatelessWidget {
                   shape: BoxShape.circle,
                   color: value
                       ? Theme.of(context).colorScheme.primaryContainer
-                      : Colors.white,
+                      : Theme.of(context).colorScheme.surface,
                   boxShadow: [
                     BoxShadow(
                       color: Colors.black12.withOpacity(0.1),

lib/ui/widgets/settingsView/custom_switch_tile.dart

@@ -2,12 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/custom_switch.dart';
 
 class CustomSwitchTile extends StatelessWidget {
-  final Widget title;
-  final Widget subtitle;
-  final bool value;
-  final Function(bool) onTap;
-  final EdgeInsetsGeometry? padding;
-
   const CustomSwitchTile({
     Key? key,
     required this.title,
@@ -16,6 +10,11 @@ class CustomSwitchTile extends StatelessWidget {
     required this.onTap,
     this.padding,
   }) : super(key: key);
+  final Widget title;
+  final Widget subtitle;
+  final bool value;
+  final Function(bool) onTap;
+  final EdgeInsetsGeometry? padding;
 
   @override
   Widget build(BuildContext context) {

lib/ui/widgets/settingsView/custom_text_field.dart

@@ -1,12 +1,6 @@
 import 'package:flutter/material.dart';
 
 class CustomTextField extends StatelessWidget {
-  final TextEditingController inputController;
-  final Widget label;
-  final String hint;
-  final Widget? leadingIcon;
-  final Function(String)? onChanged;
-
   const CustomTextField({
     Key? key,
     required this.inputController,
@@ -15,6 +9,11 @@ class CustomTextField extends StatelessWidget {
     this.leadingIcon,
     required this.onChanged,
   }) : super(key: key);
+  final TextEditingController inputController;
+  final Widget label;
+  final String hint;
+  final Widget? leadingIcon;
+  final Function(String)? onChanged;
 
   @override
   Widget build(BuildContext context) {
@@ -45,10 +44,8 @@ class CustomTextField extends StatelessWidget {
           border: OutlineInputBorder(
             borderSide: BorderSide(
               color: Theme.of(context).colorScheme.primary,
-              width: 1.0,
             ),
             borderRadius: BorderRadius.circular(10),
-            gapPadding: 4.0,
           ),
           focusedBorder: OutlineInputBorder(
             borderSide: BorderSide(
@@ -60,14 +57,12 @@ class CustomTextField extends StatelessWidget {
           errorBorder: OutlineInputBorder(
             borderSide: BorderSide(
               color: Theme.of(context).colorScheme.error,
-              width: 1.0,
             ),
             borderRadius: BorderRadius.circular(10),
           ),
           enabledBorder: OutlineInputBorder(
             borderSide: BorderSide(
               color: Theme.of(context).colorScheme.primary,
-              width: 1.0,
             ),
             borderRadius: BorderRadius.circular(10),
           ),

lib/ui/widgets/settingsView/settings_advanced_section.dart

@@ -2,12 +2,13 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/widgets/I18nText.dart';
-import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_manage_api_url.dart';
-import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_manage_sources.dart';
+import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_manage_api_url.dart';
+import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_manage_sources.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_experimental_patches.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_experimental_universal_patches.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 
 final _settingsViewModel = SettingsViewModel();
 
@@ -21,6 +22,7 @@ class SAdvancedSection extends StatelessWidget {
       children: <Widget>[
         SManageApiUrlUI(),
         SManageSourcesUI(),
+        // SManageKeystorePasswordUI(),
         SExperimentalUniversalPatches(),
         SExperimentalPatches(),
         ListTile(
@@ -36,7 +38,7 @@ class SAdvancedSection extends StatelessWidget {
             ),
           ),
           subtitle: I18nText('settingsView.deleteKeystoreHint'),
-          onTap: () => _settingsViewModel.deleteKeystore,
+          onTap: () => _showDeleteKeystoreDialog(context),
         ),
         ListTile(
           contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
@@ -71,4 +73,31 @@ class SAdvancedSection extends StatelessWidget {
       ],
     );
   }
+
+  Future<void> _showDeleteKeystoreDialog(context) {
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: I18nText('warning'),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: I18nText(
+          'settingsView.deleteKeystoreDialogText',
+        ),
+        actions: <Widget>[
+          CustomMaterialButton(
+            isFilled: false,
+            label: I18nText('noButton'),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+          CustomMaterialButton(
+            label: I18nText('yesButton'),
+            onPressed: () => {
+              Navigator.of(context).pop(),
+              _settingsViewModel.deleteKeystore()
+            },
+          )
+        ],
+      ),
+    );
+  }
 }

lib/ui/widgets/settingsView/settings_experimental_patches.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/custom_switch_tile.dart';
 
 class SExperimentalPatches extends StatefulWidget {
   const SExperimentalPatches({super.key});
@@ -15,8 +14,8 @@ final _settingsViewModel = SettingsViewModel();
 class _SExperimentalPatchesState extends State<SExperimentalPatches> {
   @override
   Widget build(BuildContext context) {
-    return CustomSwitchTile(
-      padding: const EdgeInsets.symmetric(horizontal: 20.0),
+    return SwitchListTile(
+      contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
       title: I18nText(
         'settingsView.experimentalPatchesLabel',
         child: const Text(
@@ -29,7 +28,7 @@ class _SExperimentalPatchesState extends State<SExperimentalPatches> {
       ),
       subtitle: I18nText('settingsView.experimentalPatchesHint'),
       value: _settingsViewModel.areExperimentalPatchesEnabled(),
-      onTap: (value) {
+      onChanged: (value) {
         setState(() {
           _settingsViewModel.useExperimentalPatches(value);
         });

lib/ui/widgets/settingsView/settings_experimental_universal_patches.dart

@@ -1,22 +1,23 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/custom_switch_tile.dart';
 
 class SExperimentalUniversalPatches extends StatefulWidget {
   const SExperimentalUniversalPatches({super.key});
 
   @override
-  State<SExperimentalUniversalPatches> createState() => _SExperimentalUniversalPatchesState();
+  State<SExperimentalUniversalPatches> createState() =>
+      _SExperimentalUniversalPatchesState();
 }
 
 final _settingsViewModel = SettingsViewModel();
 
-class _SExperimentalUniversalPatchesState extends State<SExperimentalUniversalPatches> {
+class _SExperimentalUniversalPatchesState
+    extends State<SExperimentalUniversalPatches> {
   @override
   Widget build(BuildContext context) {
-    return CustomSwitchTile(
-      padding: const EdgeInsets.symmetric(horizontal: 20.0),
+    return SwitchListTile(
+      contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
       title: I18nText(
         'settingsView.experimentalUniversalPatchesLabel',
         child: const Text(
@@ -29,7 +30,7 @@ class _SExperimentalUniversalPatchesState extends State<SExperimentalUniversalPa
       ),
       subtitle: I18nText('settingsView.experimentalUniversalPatchesHint'),
       value: _settingsViewModel.areUniversalPatchesEnabled(),
-      onTap: (value) {
+      onChanged: (value) {
         setState(() {
           _settingsViewModel.showUniversalPatches(value);
         });

lib/ui/widgets/settingsView/settings_export_section.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/widgets/I18nText.dart';
+import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_manage_keystore_password.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
 
@@ -43,6 +44,40 @@ class SExportSection extends StatelessWidget {
           subtitle: I18nText('settingsView.importPatchesHint'),
           onTap: () => _settingsViewModel.importPatches(),
         ),
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.exportKeystoreLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.exportKeystoreHint'),
+          onTap: () => _settingsViewModel.exportKeystore(),
+        ),
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.importKeystoreLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.importKeystoreHint'),
+          onTap: () {
+            _settingsViewModel.importKeystore();
+            final sManageKeystorePassword = SManageKeystorePassword();
+            sManageKeystorePassword.showKeystoreDialog(context);
+          },
+        ),
         ListTile(
           contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
           title: I18nText(

lib/ui/widgets/settingsView/settings_logging_section.dart

@@ -1,36 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_i18n/widgets/I18nText.dart';
-import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/custom_switch_tile.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
-
-final _settingsViewModel = SettingsViewModel();
-
-class SLoggingSection extends StatelessWidget {
-  const SLoggingSection({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return 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: _settingsViewModel.isSentryEnabled(),
-          onTap: (value) => _settingsViewModel.useSentry(value),
-        ),
-      ],
-    );
-  }
-}

lib/ui/widgets/settingsView/settings_section.dart

@@ -2,14 +2,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 
 class SettingsSection extends StatelessWidget {
-  final String title;
-  final List<Widget> children;
-
   const SettingsSection({
     Key? key,
     required this.title,
     required this.children,
   }) : super(key: key);
+  final String title;
+  final List<Widget> children;
 
   @override
   Widget build(BuildContext context) {

lib/ui/widgets/settingsView/settings_tile_dialog.dart

@@ -2,11 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 
 class SettingsTileDialog extends StatelessWidget {
-  final String title;
-  final String subtitle;
-  final Function()? onTap;
-  final EdgeInsetsGeometry? padding;
-
   const SettingsTileDialog({
     Key? key,
     required this.title,
@@ -14,6 +9,10 @@ class SettingsTileDialog extends StatelessWidget {
     required this.onTap,
     this.padding,
   }) : super(key: key);
+  final String title;
+  final String subtitle;
+  final Function()? onTap;
+  final EdgeInsetsGeometry? padding;
 
   @override
   Widget build(BuildContext context) {

lib/ui/widgets/settingsView/social_media_item.dart

@@ -1,13 +1,7 @@
-
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class SocialMediaItem extends StatelessWidget {
-  final Widget? icon;
-  final Widget title;
-  final Widget? subtitle;
-  final String? url;
-
   const SocialMediaItem({
     Key? key,
     this.icon,
@@ -15,6 +9,10 @@ class SocialMediaItem extends StatelessWidget {
     this.subtitle,
     this.url,
   }) : super(key: key);
+  final Widget? icon;
+  final Widget title;
+  final Widget? subtitle;
+  final String? url;
 
   @override
   Widget build(BuildContext context) {

lib/ui/widgets/settingsView/social_media_widget.dart

@@ -6,12 +6,11 @@ import 'package:revanced_manager/ui/widgets/settingsView/social_media_item.dart'
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class SocialMediaWidget extends StatelessWidget {
-  final EdgeInsetsGeometry? padding;
-
   const SocialMediaWidget({
     Key? key,
     this.padding,
   }) : super(key: key);
+  final EdgeInsetsGeometry? padding;
 
   @override
   Widget build(BuildContext context) {
@@ -40,9 +39,9 @@ class SocialMediaWidget extends StatelessWidget {
       ),
       expanded: Padding(
         padding: padding ?? EdgeInsets.zero,
-        child: CustomCard(
+        child: const CustomCard(
           child: Column(
-            children: const <Widget>[
+            children: <Widget>[
               SocialMediaItem(
                 icon: FaIcon(FontAwesomeIcons.github),
                 title: Text('GitHub'),

lib/ui/widgets/shared/application_item.dart

@@ -1,19 +1,13 @@
 import 'dart:typed_data';
+
+import 'package:expandable/expandable.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
-import 'package:expandable/expandable.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:timeago/timeago.dart';
 
 class ApplicationItem extends StatefulWidget {
-  final Uint8List icon;
-  final String name;
-  final DateTime patchDate;
-  final List<String> changelog;
-  final bool isUpdatableApp;
-  final Function() onPressed;
-
   const ApplicationItem({
     Key? key,
     required this.icon,
@@ -23,6 +17,12 @@ class ApplicationItem extends StatefulWidget {
     required this.isUpdatableApp,
     required this.onPressed,
   }) : super(key: key);
+  final Uint8List icon;
+  final String name;
+  final DateTime patchDate;
+  final List<String> changelog;
+  final bool isUpdatableApp;
+  final Function() onPressed;
 
   @override
   State<ApplicationItem> createState() => _ApplicationItemState();
@@ -33,7 +33,7 @@ class _ApplicationItemState extends State<ApplicationItem>
   late AnimationController _animationController;
 
   @override
-  initState() {
+  void initState() {
     super.initState();
     _animationController = AnimationController(
       vsync: this,
@@ -49,95 +49,100 @@ class _ApplicationItemState extends State<ApplicationItem>
 
   @override
   Widget build(BuildContext context) {
-    ExpandableController expController = ExpandableController();
+    final ExpandableController expController = ExpandableController();
     return Container(
-        margin: const EdgeInsets.only(bottom: 16.0),
-        child: CustomCard(
-          onTap: () {
-            expController.toggle();
-            _animationController.isCompleted
-                ? _animationController.reverse()
-                : _animationController.forward();
-          },
-          child: ExpandablePanel(
-            controller: expController,
-            theme: const ExpandableThemeData(
-              inkWellBorderRadius: BorderRadius.all(Radius.circular(16)),
-              tapBodyToCollapse: false,
-              tapBodyToExpand: false,
-              tapHeaderToExpand: false,
-              hasIcon: false,
-              animationDuration: Duration(milliseconds: 450),
-            ),
-            header: Row(
-              children: <Widget>[
-                SizedBox(
-                  width: 40,
-                  child: Image.memory(widget.icon, height: 40, width: 40),
-                ),
-                const SizedBox(width: 4),
-                Padding(
-                  padding: const EdgeInsets.only(left: 15.0),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: <Widget>[
-                      Text(
-                        widget.name.length > 12
-                            ? '${widget.name.substring(0, 12)}...'
-                            : widget.name,
-                        style: const TextStyle(
-                          fontSize: 16,
-                          fontWeight: FontWeight.w500,
-                        ),
-                      ),
-                      Text(format(widget.patchDate)),
-                    ],
-                  ),
-                ),
-                const Spacer(),
-                RotationTransition(
-                  turns: Tween(begin: 0.0, end: 0.50)
-                      .animate(_animationController),
-                  child: const Padding(
-                    padding: EdgeInsets.all(8.0),
-                    child: Icon(Icons.arrow_drop_down),
-                  ),
-                ),
-                const SizedBox(width: 8),
-                Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  crossAxisAlignment: CrossAxisAlignment.end,
+      margin: const EdgeInsets.only(bottom: 16.0),
+      child: CustomCard(
+        onTap: () {
+          expController.toggle();
+          _animationController.isCompleted
+              ? _animationController.reverse()
+              : _animationController.forward();
+        },
+        child: ExpandablePanel(
+          controller: expController,
+          theme: const ExpandableThemeData(
+            inkWellBorderRadius: BorderRadius.all(Radius.circular(16)),
+            tapBodyToCollapse: false,
+            tapBodyToExpand: false,
+            tapHeaderToExpand: false,
+            hasIcon: false,
+            animationDuration: Duration(milliseconds: 450),
+          ),
+          header: Row(
+            children: <Widget>[
+              SizedBox(
+                width: 40,
+                child: Image.memory(widget.icon, height: 40, width: 40),
+              ),
+              const SizedBox(width: 4),
+              Padding(
+                padding: const EdgeInsets.only(left: 15.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
                   children: <Widget>[
-                    CustomMaterialButton(
-                      label: widget.isUpdatableApp
-                          ? I18nText('applicationItem.patchButton')
-                          : I18nText('applicationItem.infoButton'),
-                      onPressed: widget.onPressed,
+                    Text(
+                      widget.name.length > 12
+                          ? '${widget.name.substring(0, 12)}...'
+                          : widget.name,
+                      style: const TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500,
+                      ),
                     ),
+                    Text(format(widget.patchDate)),
                   ],
                 ),
-              ],
-            ),
-            collapsed: const SizedBox(),
-            expanded: Padding(
-              padding: const EdgeInsets.only(
-                  top: 16.0, left: 4.0, right: 4.0, bottom: 4.0),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
+              ),
+              const Spacer(),
+              RotationTransition(
+                turns:
+                    Tween(begin: 0.0, end: 0.50).animate(_animationController),
+                child: const Padding(
+                  padding: EdgeInsets.all(8.0),
+                  child: Icon(Icons.arrow_drop_down),
+                ),
+              ),
+              const SizedBox(width: 8),
+              Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.end,
                 children: <Widget>[
-                  I18nText(
-                    'applicationItem.changelogLabel',
-                    child: const Text(
-                      '',
-                      style: TextStyle(fontWeight: FontWeight.w700),
-                    ),
+                  CustomMaterialButton(
+                    label: widget.isUpdatableApp
+                        ? I18nText('applicationItem.patchButton')
+                        : I18nText('applicationItem.infoButton'),
+                    onPressed: widget.onPressed,
                   ),
-                  const SizedBox(height: 4),
-                  Text('\u2022 ${widget.changelog.join('\n\u2022 ')}'),
                 ],
               ),
+            ],
+          ),
+          collapsed: const SizedBox(),
+          expanded: Padding(
+            padding: const EdgeInsets.only(
+              top: 16.0,
+              left: 4.0,
+              right: 4.0,
+              bottom: 4.0,
+            ),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                I18nText(
+                  'applicationItem.changelogLabel',
+                  child: const Text(
+                    '',
+                    style: TextStyle(fontWeight: FontWeight.w700),
+                  ),
+                ),
+                const SizedBox(height: 4),
+                Text('\u2022 ${widget.changelog.join('\n\u2022 ')}'),
+              ],
             ),
           ),
-        ));
+        ),
+      ),
+    );
   }
 }

lib/ui/widgets/shared/custom_card.dart

@@ -1,21 +1,20 @@
 import 'package:flutter/material.dart';
 
 class CustomCard extends StatelessWidget {
+  const CustomCard({
+    Key? key,
+    this.isFilled = true,
+    required this.child,
+    this.onTap,
+    this.padding,
+    this.backgroundColor,
+  }) : super(key: key);
   final bool isFilled;
   final Widget child;
   final Function()? onTap;
   final EdgeInsetsGeometry? padding;
   final Color? backgroundColor;
 
-  const CustomCard(
-      {Key? key,
-      this.isFilled = true,
-      required this.child,
-      this.onTap,
-      this.padding,
-      this.backgroundColor})
-      : super(key: key);
-
   @override
   Widget build(BuildContext context) {
     return Material(

lib/ui/widgets/shared/custom_chip.dart

@@ -1,16 +1,15 @@
 import 'package:flutter/material.dart';
 
 class CustomChip extends StatelessWidget {
-  final Widget label;
-  final bool isSelected;
-  final Function(bool)? onSelected;
-
   const CustomChip({
     Key? key,
     required this.label,
     this.isSelected = false,
     this.onSelected,
   }) : super(key: key);
+  final Widget label;
+  final bool isSelected;
+  final Function(bool)? onSelected;
 
   @override
   Widget build(BuildContext context) {
@@ -18,7 +17,7 @@ class CustomChip extends StatelessWidget {
       showCheckmark: false,
       label: label,
       selected: isSelected,
-      labelStyle: Theme.of(context).textTheme.subtitle2!.copyWith(
+      labelStyle: Theme.of(context).textTheme.titleSmall!.copyWith(
             color: isSelected
                 ? Theme.of(context).colorScheme.primary
                 : Theme.of(context).colorScheme.secondary,

lib/ui/widgets/shared/custom_material_button.dart

@@ -1,11 +1,6 @@
 import 'package:flutter/material.dart';
 
 class CustomMaterialButton extends StatelessWidget {
-  final Widget label;
-  final bool isFilled;
-  final bool isExpanded;
-  final Function()? onPressed;
-
   const CustomMaterialButton({
     Key? key,
     required this.label,
@@ -13,6 +8,10 @@ class CustomMaterialButton extends StatelessWidget {
     this.isExpanded = false,
     required this.onPressed,
   }) : super(key: key);
+  final Widget label;
+  final bool isFilled;
+  final bool isExpanded;
+  final Function()? onPressed;
 
   @override
   Widget build(BuildContext context) {
@@ -28,7 +27,6 @@ class CustomMaterialButton extends StatelessWidget {
             side: isFilled
                 ? BorderSide.none
                 : BorderSide(
-                    width: 1,
                     color: Theme.of(context).colorScheme.primary,
                   ),
           ),
@@ -50,12 +48,6 @@ class CustomMaterialButton extends StatelessWidget {
 
 // ignore: must_be_immutable
 class TimerButton extends StatefulWidget {
-  Widget label;
-  bool isFilled;
-  int seconds;
-  final bool isRunning;
-  final Function()? onTimerEnd;
-
   TimerButton({
     Key? key,
     required this.seconds,
@@ -64,6 +56,11 @@ class TimerButton extends StatefulWidget {
     this.label = const Text(''),
     this.isFilled = true,
   }) : super(key: key);
+  Widget label;
+  bool isFilled;
+  int seconds;
+  final bool isRunning;
+  final Function()? onTimerEnd;
 
   @override
   State<TimerButton> createState() => _TimerButtonState();
@@ -101,7 +98,6 @@ class _TimerButtonState extends State<TimerButton> {
             side: widget.isFilled
                 ? BorderSide.none
                 : BorderSide(
-                    width: 1,
                     color: Theme.of(context).colorScheme.primary,
                   ),
           ),

lib/ui/widgets/shared/custom_popup_menu.dart

@@ -1,14 +1,13 @@
 import 'package:flutter/material.dart';
 
 class CustomPopupMenu extends StatelessWidget {
-  final Function(dynamic) onSelected;
-  final Map<int, Widget> children;
-
   const CustomPopupMenu({
     Key? key,
     required this.onSelected,
     required this.children,
   }) : super(key: key);
+  final Function(dynamic) onSelected;
+  final Map<int, Widget> children;
 
   @override
   Widget build(BuildContext context) {

lib/ui/widgets/shared/custom_sliver_app_bar.dart

@@ -1,12 +1,6 @@
 import 'package:flutter/material.dart';
 
 class CustomSliverAppBar extends StatelessWidget {
-  final Widget title;
-  final List<Widget>? actions;
-  final PreferredSizeWidget? bottom;
-  final bool isMainView;
-  final Function()? onBackButtonPressed;
-
   const CustomSliverAppBar({
     Key? key,
     required this.title,
@@ -15,13 +9,16 @@ class CustomSliverAppBar extends StatelessWidget {
     this.isMainView = false,
     this.onBackButtonPressed,
   }) : super(key: key);
+  final Widget title;
+  final List<Widget>? actions;
+  final PreferredSizeWidget? bottom;
+  final bool isMainView;
+  final Function()? onBackButtonPressed;
 
   @override
   Widget build(BuildContext context) {
     return SliverAppBar(
       pinned: true,
-      snap: false,
-      floating: false,
       expandedHeight: 100.0,
       automaticallyImplyLeading: !isMainView,
       flexibleSpace: FlexibleSpaceBar(
@@ -36,7 +33,7 @@ class CustomSliverAppBar extends StatelessWidget {
           : IconButton(
               icon: Icon(
                 Icons.arrow_back,
-                color: Theme.of(context).textTheme.headline6!.color,
+                color: Theme.of(context).textTheme.titleLarge!.color,
               ),
               onPressed:
                   onBackButtonPressed ?? () => Navigator.of(context).pop(),