build: bump version to v1.9.5

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -12,7 +12,7 @@ body:
   - type: textarea
     attributes:
       label: Bug description
-      description: |
+      description:
         - Describe your bug in detail
         - Add steps to reproduce the bug if possible (Step 1. Download some files. Step 2. ...)
         - Add images and videos if possible

.github/workflows/analyze.yml

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

.github/workflows/pr-build.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           # Make sure the release step uses its own credentials:
           # https://github.com/cycjimmy/semantic-release-action#private-packages

.github/workflows/release-build.yml

@@ -9,7 +9,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Set up JDK 11

README.md

@@ -3,33 +3,29 @@
 The official ReVanced Manager based on Flutter.
 
 ## 🔽 Download
-
-You can obtain ReVanced Manager by downloading it from either [revanced.app/download](https://revanced.app/download) or [GitHub Releases](https://github.com/ReVanced/revanced-manager/releases)
+To download 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. Incompatible with certain ARMv7 devices
-
-## 📃 Documentation
-The documentation can be found [here](https://github.com/revanced/revanced-manager/tree/main/docs).
+2. Does not work on some armv7 devices
 
 ## 🔴 Issues
-
 For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose).
 
-## 🌐 Translation
+## 💭 Discussion
+If you wish to discuss the Manager, a thread has been made under the [#development](https://discord.com/channels/952946952348270622/1002922226443632761) channel in the Discord server, please note that this thread may be temporary and may be removed in the future.
 
+
+## 🌐 Translation
 [![Crowdin](https://badges.crowdin.net/revanced/localized.svg)](https://crowdin.com/project/revanced)
 
-We're accepting translations on [Crowdin](https://translate.revanced.app).
+If you wish to translate ReVanced Manager, we're accepting translations on [Crowdin](https://translate.revanced.app)
 
 ## 🛠️ Building Manager from source
-
 1. Setup flutter environment for your [platform](https://docs.flutter.dev/get-started/install)
 2. Clone the repository locally
-3. Add your GitHub token in gradle.properties like [this](/docs/4_building.md)
+3. Add your github token in gradle.properties like [this](/docs/4_building.md)
 4. Open the project in terminal
 5. Run `flutter pub get` in terminal
 6. Then `flutter packages pub run build_runner build --delete-conflicting-outputs` (Must be done on each git pull)
-7. To build release APK run `flutter build apk`
+7. To build release apk run `flutter build apk`

android/app/build.gradle

@@ -85,7 +85,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // ReVanced
-    implementation "app.revanced:revanced-patcher:17.0.0"
+    implementation "app.revanced:revanced-patcher:14.2.2"
 
     // Signing & aligning
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")

android/app/src/main/AndroidManifest.xml

@@ -25,7 +25,8 @@
         android:icon="@mipmap/ic_launcher"
         android:largeHeap="true"
         android:requestLegacyExternalStorage="true"
-        android:extractNativeLibs="true">
+        android:extractNativeLibs="true"
+        android:enableOnBackInvokedCallback="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -42,10 +43,6 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-       <activity
-           android:name=".ExportSettingsActivity"
-           android:exported="true">
-       </activity>
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />

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

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

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

@@ -8,17 +8,16 @@ import app.revanced.manager.flutter.utils.signing.Signer
 import app.revanced.manager.flutter.utils.zip.ZipFile
 import app.revanced.manager.flutter.utils.zip.structures.ZipEntry
 import app.revanced.patcher.PatchBundleLoader
-import app.revanced.patcher.PatchSet
 import app.revanced.patcher.Patcher
 import app.revanced.patcher.PatcherOptions
+import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
+import app.revanced.patcher.extensions.PatchExtensions.patchName
 import app.revanced.patcher.patch.PatchResult
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.runBlocking
-import org.json.JSONArray
-import org.json.JSONObject
 import java.io.File
 import java.io.PrintWriter
 import java.io.StringWriter
@@ -31,8 +30,6 @@ class MainActivity : FlutterActivity() {
     private var cancel: Boolean = false
     private var stopResult: MethodChannel.Result? = null
 
-    private lateinit var patches: PatchSet
-
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
 
@@ -48,25 +45,24 @@ class MainActivity : FlutterActivity() {
         mainChannel.setMethodCallHandler { call, result ->
             when (call.method) {
                 "runPatcher" -> {
+                    val patchBundleFilePath = call.argument<String>("patchBundleFilePath")
                     val originalFilePath = call.argument<String>("originalFilePath")
                     val inputFilePath = call.argument<String>("inputFilePath")
                     val patchedFilePath = call.argument<String>("patchedFilePath")
                     val outFilePath = call.argument<String>("outFilePath")
                     val integrationsPath = call.argument<String>("integrationsPath")
                     val selectedPatches = call.argument<List<String>>("selectedPatches")
-                    val options = call.argument<Map<String, Map<String, Any>>>("options")
                     val cacheDirPath = call.argument<String>("cacheDirPath")
                     val keyStoreFilePath = call.argument<String>("keyStoreFilePath")
                     val keystorePassword = call.argument<String>("keystorePassword")
 
-                    if (
+                    if (patchBundleFilePath != null &&
                         originalFilePath != null &&
                         inputFilePath != null &&
                         patchedFilePath != null &&
                         outFilePath != null &&
                         integrationsPath != null &&
                         selectedPatches != null &&
-                        options != null &&
                         cacheDirPath != null &&
                         keyStoreFilePath != null &&
                         keystorePassword != null
@@ -74,13 +70,13 @@ class MainActivity : FlutterActivity() {
                         cancel = false
                         runPatcher(
                             result,
+                            patchBundleFilePath,
                             originalFilePath,
                             inputFilePath,
                             patchedFilePath,
                             outFilePath,
                             integrationsPath,
                             selectedPatches,
-                            options,
                             cacheDirPath,
                             keyStoreFilePath,
                             keystorePassword
@@ -93,69 +89,6 @@ class MainActivity : FlutterActivity() {
                     stopResult = result
                 }
 
-                "getPatches" -> {
-                    val patchBundleFilePath = call.argument<String>("patchBundleFilePath")!!
-                    val cacheDirPath = call.argument<String>("cacheDirPath")!!
-
-                    try {
-                        patches = PatchBundleLoader.Dex(
-                            File(patchBundleFilePath),
-                            optimizedDexDirectory = File(cacheDirPath)
-                        )
-                    } catch (ex: Exception) {
-                        return@setMethodCallHandler result.notImplemented()
-                    } catch (err: Error) {
-                        return@setMethodCallHandler result.notImplemented()
-                    }
-
-                    JSONArray().apply {
-                        patches.forEach {
-                            JSONObject().apply {
-                                put("name", it.name)
-                                put("description", it.description)
-                                put("excluded", !it.use)
-                                put("compatiblePackages", JSONArray().apply {
-                                    it.compatiblePackages?.forEach { compatiblePackage ->
-                                        val compatiblePackageJson = JSONObject().apply {
-                                            put("name", compatiblePackage.name)
-                                            put(
-                                                "versions",
-                                                JSONArray().apply {
-                                                    compatiblePackage.versions?.forEach { version ->
-                                                        put(version)
-                                                    }
-                                                })
-                                        }
-                                        put(compatiblePackageJson)
-                                    }
-                                })
-                                put("options", JSONArray().apply {
-                                    it.options.values.forEach { option ->
-                                        val optionJson = JSONObject().apply option@{
-                                            put("key", option.key)
-                                            put("title", option.title)
-                                            put("description", option.description)
-                                            put("required", option.required)
-
-                                            when (val value = option.value) {
-                                                null -> put("value", null)
-                                                is Array<*> -> put("value", JSONArray().apply {
-
-                                                    value.forEach { put(it) }
-                                                })
-                                                else -> put("value", option.value)
-                                            }
-
-                                            put("optionClassType", option::class.simpleName)
-                                        }
-                                        put(optionJson)
-                                    }
-                                })
-                            }.let(::put)
-                        }
-                    }.toString().let(result::success)
-                }
-
                 else -> result.notImplemented()
             }
         }
@@ -163,13 +96,13 @@ class MainActivity : FlutterActivity() {
 
     private fun runPatcher(
         result: MethodChannel.Result,
+        patchBundleFilePath: String,
         originalFilePath: String,
         inputFilePath: String,
         patchedFilePath: String,
         outFilePath: String,
         integrationsPath: String,
         selectedPatches: List<String>,
-        options: Map<String, Map<String, Any>>,
         cacheDirPath: String,
         keyStoreFilePath: String,
         keystorePassword: String
@@ -206,11 +139,8 @@ class MainActivity : FlutterActivity() {
                 }
 
                 object : java.util.logging.Handler() {
-                    override fun publish(record: LogRecord) {
-                        if (record.loggerName?.startsWith("app.revanced") != true || cancel) return
-
+                    override fun publish(record: LogRecord) =
                         updateProgress(-1.0, "", record.message)
-                    }
 
                     override fun flush() = Unit
                     override fun close() = flush()
@@ -240,7 +170,6 @@ class MainActivity : FlutterActivity() {
                         cacheDir,
                         Aapt.binary(applicationContext).absolutePath,
                         cacheDir.path,
-                        true // TODO: Add option to disable this
                     )
                 )
 
@@ -251,7 +180,10 @@ class MainActivity : FlutterActivity() {
 
                 updateProgress(0.1, "Loading patches...", "Loading patches")
 
-                val patches = patches.filter { patch ->
+                val patches = PatchBundleLoader.Dex(
+                    File(patchBundleFilePath),
+                    optimizedDexDirectory = cacheDir
+                ).filter { patch ->
                     val isCompatible = patch.compatiblePackages?.any {
                         it.name == patcher.context.packageMetadata.packageName
                     } ?: false
@@ -259,11 +191,7 @@ class MainActivity : FlutterActivity() {
                     val compatibleOrUniversal =
                         isCompatible || patch.compatiblePackages.isNullOrEmpty()
 
-                    compatibleOrUniversal && selectedPatches.any { it == patch.name }
-                }.onEach { patch ->
-                    options[patch.name]?.forEach { (key, value) ->
-                        patch.options[key] = value
-                    }
+                    compatibleOrUniversal && selectedPatches.any { it == patch.patchName }
                 }
 
                 if (cancel) {
@@ -294,9 +222,9 @@ class MainActivity : FlutterActivity() {
                             val msg = patchResult.exception?.let {
                                 val writer = StringWriter()
                                 it.printStackTrace(PrintWriter(writer))
-                                "${patchResult.patch.name} failed: $writer"
+                                "${patchResult.patchName} failed: $writer"
                             } ?: run {
-                                "${patchResult.patch.name} succeeded"
+                                "${patchResult.patchName} succeeded"
                             }
 
                             updateProgress(progress, "", msg)
@@ -360,7 +288,7 @@ class MainActivity : FlutterActivity() {
                     val stack = ex.stackTraceToString()
                     updateProgress(
                         -100.0,
-                        "Failed",
+                        "Aborted",
                         "An error occurred:\n$stack"
                     )
                 }

android/build.gradle

@@ -16,7 +16,11 @@ allprojects {
         google()
         mavenCentral()
         maven {
-            url 'https://jitpack.io'
+            url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
+            credentials {
+                username = (project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")) as String
+                password = (project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")) as String
+            }
         }
         mavenLocal()
     }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionSha256Sum=a01b6587e15fe7ed120a0ee299c25982a1eee045abd6a9dd5e216b2f628ef9ac
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

assets/i18n/en_US.json

@@ -10,11 +10,9 @@
     "yesButton": "Yes",
     "noButton": "No",
     "warning": "Warning",
-    "options": "Options",
     "notice": "Notice",
     "noShowAgain": "Don't show this again",
-    "add": "Add",
-    "remove": "Remove",
+    "new": "New",
     "navigationView": {
         "dashboardTab": "Dashboard",
         "patcherTab": "Patcher",
@@ -25,13 +23,13 @@
         "widgetTitle": "Dashboard",
 
         "updatesSubtitle": "Updates",
-        "patchedSubtitle": "Patched apps",
+        "patchedSubtitle": "Patched applications",
 
         "noUpdates": "No updates available",
 
         "WIP": "Work in progress...",
 
-        "noInstallations": "No patched apps installed",
+        "noInstallations": "No patched applications installed",
         "installUpdate": "Continue to install the update?",
 
         "updateDialogTitle": "Update Manager",
@@ -58,7 +56,9 @@
         "updatesDisabled": "Updating a patched app is currently disabled. Repatch the app again."
     },
     "applicationItem": {
-        "infoButton": "Info"
+        "patchButton": "Patch",
+        "infoButton": "Info",
+        "changelogLabel": "Changelog"
     },
     "latestCommitCard": {
         "loadingLabel": "Loading...",
@@ -71,10 +71,10 @@
         "widgetTitle": "Patcher",
         "patchButton": "Patch",
 
+        "patchDialogText": "You have selected a resource patch and a split APK installation has been detected, so patching errors may occur.\nAre you sure you want to proceed?",
         "armv7WarningDialogText": "Patching on ARMv7 devices is not yet supported and might fail. Proceed anyways?",
-
-        "removedPatchesWarningDialogText": "The following patches have been removed since the last time you used them.\n\n{patches}\n\nProceed anyways?",
-        "requiredOptionDialogText" : "Some patch options have to be set."
+        "splitApkWarningDialogText": "Patching a split APK is not yet supported and might fail. Proceed anyways?",
+        "removedPatchesWarningDialogText": "The following patches have been removed since the last time you used them.\n\n{patches}\n\nProceed anyways?"
     },
     "appSelectorCard": {
         "widgetTitle": "Select an application",
@@ -117,8 +117,6 @@
         "viewTitle": "Select patches",
         "searchBarHint": "Search patches",
         "universalPatches": "Universal patches",
-        "newPatches": "New patches",
-        "patches": "Patches",
 
         "doneButton": "Done",
 
@@ -128,32 +126,20 @@
         "none": "None",
         "noneTooltip": "Deselect all patches",
 
-        "loadPatchesSelection": "Load patch selection",
-        "noSavedPatches": "No saved patch selection for the selected app.\nPress Done to save the current selection.",
+        "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",
-        "setRequiredOption": "Some patches require options to be set:\n\n{patches}\n\nPlease set them before continuing."
-    },
-    "patchOptionsView": {
-        "viewTitle": "Patch options",
-        "saveOptions": "Save",
 
-        "addOptions": "Add options",
-        "deselectPatch": "Deselect patch",
-        "tooltip": "More input options",
-        "selectFilePath": "Select file path",
-        "selectFolder": "Select folder",
-        "selectOption": "Select option",
-
-        "requiredOption": "This option is required",
-        "unsupportedOption": "This option is not supported",
-        "requiredOptionNull": "The following options have to be set:\n\n{options}"
+        "selectAllPatchesWarningContent": "You are about to select all patches, that includes non-suggested patches and can cause unwanted behavior."
     },
     "patchItem": {
         "unsupportedDialogText": "Selecting this patch may result in patching errors.\n\nApp version: {packageVersion}\nSupported versions:\n{supportedVersions}",
-        "unsupportedPatchVersion": "Patch is not supported for this app version.",
-        "unsupportedRequiredOption": "This patch contains a required option that is not supported by this app",
+        "unsupportedPatchVersion": "Patch is not supported for this app version. Enable the experimental toggle in settings to proceed.",
 
-        "patchesChangeWarningDialogText": "It is recommended to use the default patch selection and options. Changing them may result in unexpected issues.\n\nYou'll need to turn on \"Allow changing patch selection\" in settings before changing any patch selection.",
+        "newPatchDialogText": "This is a new patch that has been added since the last time you have patched this app.",
+        "newPatch": "New patch",
+
+        "patchesChangeWarningDialogText": "It is recommended to use the default selection of patches because changing it may cause unexpected issues.\n\nIf you know what you are doing, you can enable \"Enable changing selection\" in the settings.",
         "patchesChangeWarningDialogButton": "Use default selection"
     },
     "installerView": {
@@ -162,8 +148,9 @@
         "installTypeDescription": "Select the installation type to proceed with.",
 
         "installButton": "Install",
-        "installRootType": "Mount",
-        "installNonRootType": "Normal",
+        "installRootType": "Root",
+        "installNonRootType": "Non-root",
+        "installRecommendedType": "Recommended",
 
         "pressBackAgain": "Press back again to cancel",
         "openButton": "Open",
@@ -175,9 +162,10 @@
         "exportApkButtonTooltip": "Export patched APK",
         "exportLogButtonTooltip": "Export log",
 
-        "screenshotDetected": "A screenshot has been detected. If you are trying to share the log, please share a text copy instead.\n\nCopy log to clipboard?",
-        "copiedToClipboard": "Copied log to clipboard",
-
+        "installErrorDialogTitle": "Error",
+        "installErrorDialogText1": "Root install is not possible with the current patches selection.\nRepatch your app or choose non-root install.",
+        "installErrorDialogText2": "Non-root install is not possible with the current patches selection.\nRepatch your app or choose root install if you have your device rooted.",
+        "installErrorDialogText3": "Root install is not possible as the original APK was selected from storage.\nSelect an installed app or choose non-root install.",
         "noExit": "Installer is still running, cannot exit..."
     },
     "settingsView": {
@@ -185,14 +173,13 @@
 
         "appearanceSectionTitle": "Appearance",
         "teamSectionTitle": "Team",
-        "debugSectionTitle": "Debugging",
+        "infoSectionTitle": "Info",
         "advancedSectionTitle": "Advanced",
         "exportSectionTitle": "Import & export",
+        "logsSectionTitle": "Logs",
 
-        "themeModeLabel": "App theme",
-        "systemThemeLabel": "System",
-        "lightThemeLabel": "Light",
-        "darkThemeLabel": "Dark",
+        "darkThemeLabel": "Dark mode",
+        "darkThemeHint": "Welcome to the dark side",
 
         "dynamicThemeLabel": "Material You",
         "dynamicThemeHint": "Enjoy an experience closer to your device",
@@ -201,15 +188,15 @@
         "englishOption": "English",
 
         "sourcesLabel": "Sources",
-        "sourcesLabelHint": "Configure your sources",
+        "sourcesLabelHint": "Configure your custom sources",
         "sourcesIntegrationsLabel": "Integrations source",
         "sourcesResetDialogTitle": "Reset",
-        "sourcesResetDialogText": "Are you sure you want to reset your sources to their default values?",
-        "apiURLResetDialogText": "Are you sure you want to reset your API URL to its default value?",
-        "sourcesUpdateNote": "Note: Patches will be updated to the latest version automatically.\n\nThis will reveal your IP address to the server.",
+        "sourcesResetDialogText": "Are you sure you want to reset custom sources to their default values?",
+        "apiURLResetDialogText": "Are you sure you want to reset API URL to its default value?",
+        "sourcesUpdateNote": "Note: ReVanced Patches will be updated to the latest version automatically.\n\nThis will reveal your IP address to the server.",
 
         "apiURLLabel": "API URL",
-        "apiURLHint": "Configure your API URL",
+        "apiURLHint": "Configure your custom API URL",
         "selectApiURL": "API URL",
         "hostRepositoryLabel": "Repository API",
         "orgPatchesLabel": "Patches organization",
@@ -219,20 +206,21 @@
         "contributorsLabel": "Contributors",
         "contributorsHint": "A list of contributors of ReVanced",
 
-        "logsLabel": "Share logs",
-        "logsHint": "Share ReVanced Manager logs",
+        "logsLabel": "Logs",
+        "logsHint": "Share Manager's logs",
 
-        "enablePatchesSelectionLabel": "Allow changing patch selection",
-        "enablePatchesSelectionHint": "Allow changing the selection of patches",
-        "enablePatchesSelectionWarningText": "Changing the selection of patches may cause unexpected issues.\n\nEnable anyways?",
+        "enablePatchesSelectionLabel": "Enable changing selection",
+        "enablePatchesSelectionHint": "Enable changing the selection of patches.",
+        "enablePatchesSelectionWarningText": "Changing the default selection of patches may cause unexpected issues.\n\nEnable anyways?",
         "disablePatchesSelectionWarningText": "You are about to disable changing the selection of patches.\nThe default selection of patches will be restored.\n\nDisable anyways?",
 
         "autoUpdatePatchesLabel": "Auto update patches",
-        "autoUpdatePatchesHint": "Automatically update patches to the latest version",
-        "universalPatchesLabel": "Show universal patches",
-        "universalPatchesHint": "Display all apps and universal patches (may slow down the app list)",
-        "versionCompatibilityCheckLabel": "Version compatibility check",
-        "versionCompatibilityCheckHint": "Restricts patches to supported versions",
+        "autoUpdatePatchesHint": "Automatically update ReVanced Patches to the latest version",
+        "experimentalUniversalPatchesLabel": "Experimental universal patches support",
+        "experimentalUniversalPatchesHint": "Display all applications to use with universal patches, loading list of apps may be slower",
+        "experimentalPatchesLabel": "Experimental patches support",
+        "experimentalPatchesHint": "Enable usage of unsupported patches in any app version",
+        "enabledExperimentalPatches": "Experimental patches support enabled",
 
         "aboutLabel": "About",
         "snackbarMessage": "Copied to clipboard",
@@ -242,52 +230,47 @@
         "deleteTempDirHint": "Delete unused temporary files",
         "deletedTempDir": "Temporary files deleted",
 
-        "exportPatchesLabel": "Export patch selection",
-        "exportPatchesHint": "Export patch selection to a JSON file",
-        "exportedPatches": "Patch selection exported",
-        "noExportFileFound": "No patch selection to export",
+        "exportPatchesLabel": "Export patches selection",
+        "exportPatchesHint": "Export patches selection to a JSON file",
+        "exportedPatches": "Patches selection exported",
+        "noExportFileFound": "No patches selection to export",
 
-        "importPatchesLabel": "Import patch selection",
-        "importPatchesHint": "Import patch selection from a JSON file",
-        "importedPatches": "Patch selection imported",
+        "importPatchesLabel": "Import patches selection",
+        "importPatchesHint": "Import patches selection from a JSON file",
+        "importedPatches": "Patches selection imported",
 
-        "resetStoredPatchesLabel": "Reset patch selection",
-        "resetStoredPatchesHint": "Reset the stored patch selection",
-        "resetStoredPatchesDialogTitle": "Reset patch selection?",
-        "resetStoredPatchesDialogText": "The default selection of patches will be restored..",
-        "resetStoredPatches": "Patch selection has been reset",
+        "resetStoredPatchesLabel": "Reset patches",
+        "resetStoredPatchesHint": "Reset the stored patches selection",
 
-        "resetStoredOptionsLabel": "Reset patch options",
-        "resetStoredOptionsHint": "Reset all patch options",
-        "resetStoredOptionsDialogTitle": "Reset patch options?",
-        "resetStoredOptionsDialogText": "Resetting patch options will remove all saved options.",
-        "resetStoredOptions": "Options have been reset",
+        "resetStoredPatchesDialogTitle": "Reset patches selection?",
+        "resetStoredPatchesDialogText": "Resetting patches selection will remove all selected patches.",
+        "resetStoredPatches": "Patches selection has been reset",
 
-        "deleteLogsLabel": "Clear logs",
-        "deleteLogsHint": "Delete collected ReVanced Manager logs",
+        "deleteLogsLabel": "Delete logs",
+        "deleteLogsHint": "Delete collected manager logs",
         "deletedLogs": "Logs deleted",
 
         "regenerateKeystoreLabel": "Regenerate keystore",
-        "regenerateKeystoreHint": "Regenerate the keystore used to sign apps",
+        "regenerateKeystoreHint": "Regenerate the keystore used to sign the app",
 
         "regenerateKeystoreDialogTitle": "Regenerate keystore?",
-        "regenerateKeystoreDialogText": "Patched apps signed with the old keystore will no longer be able to be updated.",
+        "regenerateKeystoreDialogText": "Patched apps signed with the old keystore will no longer be able to update.",
         "regeneratedKeystore": "Keystore regenerated",
 
         "exportKeystoreLabel": "Export keystore",
-        "exportKeystoreHint": "Export the keystore used to sign apps",
+        "exportKeystoreHint": "Export keystore used to sign apps",
         "exportedKeystore": "Keystore exported",
         "noKeystoreExportFileFound": "No keystore to export",
 
         "importKeystoreLabel": "Import keystore",
-        "importKeystoreHint": "Import a keystore used to sign apps",
+        "importKeystoreHint": "Import keystore used to sign apps",
         "importedKeystore": "Keystore imported",
 
-        "selectKeystorePassword": "Keystore password",
-        "selectKeystorePasswordHint": "Select keystore password used to sign apps",
+        "selectKeystorePassword": "Keystore Password",
+        "selectKeystorePasswordHint": "Select keystore password used to sign the apk",
 
         "jsonSelectorErrorMessage": "Unable to use selected JSON file",
-        "keystoreSelectorErrorMessage": "Unable to use selected keystore file"
+        "keystoreSelectorErrorMessage": "Unable to use selected KEYSTORE file"
     },
     "appInfoView": {
         "widgetTitle": "App info",
@@ -300,6 +283,7 @@
         "rootDialogText": "App was installed with superuser permissions, but currently ReVanced Manager has no permissions.\nPlease grant superuser permissions first.",
 
         "packageNameLabel": "Package name",
+        "originalPackageNameLabel": "Original package name",
         "installTypeLabel": "Installation type",
         "rootTypeLabel": "Root",
         "nonRootTypeLabel": "Non-root",

crowdin.yml

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

docs/2_1_patching.md

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

docs/2_4_settings.md

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

docs/3_troubleshooting.md

@@ -6,7 +6,7 @@ In case you encounter any issues while using ReVanced Manager, please refer to t
 
   Make sure ReVanced Manager is up to date by following [🔄 Updating ReVanced Manager](2_3_updating.md) and select the **Default** button when choosing patches.
   
-- 🚫 App not installed as package conflicts with an existing package
+- 💥 App not installed as package conflicts with an existing package
 
   An existing installation of the app you're trying to patch is conflicting with the patched app. Uninstall the existing app before installing the patched app.
 
@@ -16,6 +16,10 @@ In case you encounter any issues while using ReVanced Manager, please refer to t
 
   Alternatively, you can use [ReVanced CLI](https://github.com/revanced/revanced-cli) to patch the app.
 
+- 🚫 Non-root install is not possible with the current patches selection
+
+  Select the **Default** button when choosing patches.
+
 - 🚨 Patched app crashes on launch
 
   Select the **Default** button when choosing patches.

docs/4_building.md

@@ -12,7 +12,7 @@ This page will guide you through building ReVanced Manager from source.
 
 3. Create a GitHub personal access token with the `read:packages` scope [here](https://github.com/settings/tokens/new?scopes=read:packages&description=ReVanced)
 
-4. Add your GitHub username and the token to `~/android/gradle.properties`
+4. Add your GitHub username and the token to `~/.gradle/gradle.properties`
 
    ```properties
    gpr.user = YourUsername
@@ -31,8 +31,7 @@ This page will guide you through building ReVanced Manager from source.
    flutter packages pub run build_runner build --delete-conflicting-outputs
    ```
 
-   > [!Note]
-   > Must be run every time you sync your local repository with the remote repository.
+   > **Note**: Must be run every time you sync your local repository with the remote repository.
 
 7. Build the APK
 

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

gradlew.bat

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

lib/app/app.dart

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

lib/main.dart

@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:revanced_manager/app/app.locator.dart';
-import 'package:revanced_manager/services/download_manager.dart';
 import 'package:revanced_manager/services/github_api.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/revanced_api.dart';
@@ -20,7 +19,6 @@ Future main() async {
   await setupLocator();
   WidgetsFlutterBinding.ensureInitialized();
   await locator<ManagerAPI>().initialize();
-  await locator<DownloadManager>().initialize();
   final String apiUrl = locator<ManagerAPI>().getApiUrl();
   await locator<RevancedAPI>().initialize(apiUrl);
   final String repoUrl = locator<ManagerAPI>().getRepoUrl();

lib/models/patch.dart

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

lib/models/patched_application.dart

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

lib/services/download_manager.dart

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

lib/services/github_api.dart

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

lib/services/manager_api.dart

@@ -11,7 +11,6 @@ import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/github_api.dart';
-import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/revanced_api.dart';
 import 'package:revanced_manager/services/root_api.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
@@ -27,11 +26,6 @@ class ManagerAPI {
   final String patcherRepo = 'revanced-patcher';
   final String cliRepo = 'revanced-cli';
   late SharedPreferences _prefs;
-  List<Patch> patches = [];
-  List<Option> modifiedOptions = [];
-  List<Option> options = [];
-  Patch? selectedPatch;
-  BuildContext? ctx;
   bool isRooted = false;
   String storedPatchesFile = '/selected-patches.json';
   String keystoreFile =
@@ -46,14 +40,12 @@ class ManagerAPI {
   String defaultManagerRepo = 'revanced/revanced-manager';
   String? patchesVersion = '';
   String? integrationsVersion = '';
-
   bool isDefaultPatchesRepo() {
-    return getPatchesRepo().toLowerCase() == 'revanced/revanced-patches';
+    return getPatchesRepo() == 'revanced/revanced-patches';
   }
 
   bool isDefaultIntegrationsRepo() {
-    return getIntegrationsRepo().toLowerCase() ==
-        'revanced/revanced-integrations';
+    return getIntegrationsRepo() == 'revanced/revanced-integrations';
   }
 
   Future<void> initialize() async {
@@ -87,12 +79,12 @@ class ManagerAPI {
     await _prefs.setString('repoUrl', url);
   }
 
-  String getPatchesDownloadURL() {
-    return _prefs.getString('patchesDownloadURL') ?? '';
+  String getPatchesDownloadURL(bool bundle) {
+    return _prefs.getString('patchesDownloadURL-$bundle') ?? '';
   }
 
-  Future<void> setPatchesDownloadURL(String value) async {
-    await _prefs.setString('patchesDownloadURL', value);
+  Future<void> setPatchesDownloadURL(String value, bool bundle) async {
+    await _prefs.setString('patchesDownloadURL-$bundle', value);
   }
 
   String getPatchesRepo() {
@@ -186,29 +178,6 @@ class ManagerAPI {
     await _prefs.setStringList('usedPatches-$packageName', patchesJson);
   }
 
-  Option? getPatchOption(String packageName, String patchName, String key) {
-    final String? optionJson =
-        _prefs.getString('patchOption-$packageName-$patchName-$key');
-    if (optionJson != null) {
-      final Option option = Option.fromJson(jsonDecode(optionJson));
-      return option;
-    } else {
-      return null;
-    }
-  }
-
-  void setPatchOption(Option option, String patchName, String packageName) {
-    final String optionJson = jsonEncode(option.toJson());
-    _prefs.setString(
-      'patchOption-$packageName-$patchName-${option.key}',
-      optionJson,
-    );
-  }
-
-  void clearPatchOption(String packageName, String patchName, String key) {
-    _prefs.remove('patchOption-$packageName-$patchName-$key');
-  }
-
   String getIntegrationsRepo() {
     return _prefs.getString('integrationsRepo') ?? defaultIntegrationsRepo;
   }
@@ -228,12 +197,12 @@ class ManagerAPI {
     await _prefs.setBool('useDynamicTheme', value);
   }
 
-  int getThemeMode() {
-    return _prefs.getInt('themeMode') ?? 2;
+  bool getUseDarkTheme() {
+    return _prefs.getBool('useDarkTheme') ?? false;
   }
 
-  Future<void> setThemeMode(int value) async {
-    await _prefs.setInt('themeMode', value);
+  Future<void> setUseDarkTheme(bool value) async {
+    await _prefs.setBool('useDarkTheme', value);
   }
 
   bool areUniversalPatchesEnabled() {
@@ -244,12 +213,12 @@ class ManagerAPI {
     await _prefs.setBool('universalPatchesEnabled', value);
   }
 
-  bool isVersionCompatibilityCheckEnabled() {
-    return _prefs.getBool('versionCompatibilityCheckEnabled') ?? true;
+  bool areExperimentalPatchesEnabled() {
+    return _prefs.getBool('experimentalPatchesEnabled') ?? false;
   }
 
-  Future<void> enableVersionCompatibilityCheckStatus(bool value) async {
-    await _prefs.setBool('versionCompatibilityCheckEnabled', value);
+  Future<void> enableExperimentalPatchesStatus(bool value) async {
+    await _prefs.setBool('experimentalPatchesEnabled', value);
   }
 
   Future<void> setKeystorePassword(String password) async {
@@ -331,45 +300,28 @@ class ManagerAPI {
   }
 
   Future<List<Patch>> getPatches() async {
-    if (patches.isNotEmpty) {
-      return patches;
-    }
-    final File? patchBundleFile = await downloadPatches();
-    final Directory appCache = await getTemporaryDirectory();
-    Directory('${appCache.path}/cache').createSync();
-    final Directory workDir =
-        Directory('${appCache.path}/cache').createTempSync('tmp-');
-    final Directory cacheDir = Directory('${workDir.path}/cache');
-    cacheDir.createSync();
-    if (patchBundleFile != null) {
-      try {
-        final String patchesJson = await PatcherAPI.patcherChannel.invokeMethod(
-          'getPatches',
-          {
-            'patchBundleFilePath': patchBundleFile.path,
-            'cacheDirPath': cacheDir.path,
-          },
-        );
-        final List<dynamic> patchesJsonList = jsonDecode(patchesJson);
-        patches = patchesJsonList
-            .map((patchJson) => Patch.fromJson(patchJson))
-            .toList();
-        return patches;
-      } on Exception catch (e) {
-        if (kDebugMode) {
-          print(e);
-        }
+    try {
+      final String repoName = getPatchesRepo();
+      final String currentVersion = await getCurrentPatchesVersion();
+      final String url = getPatchesDownloadURL(false);
+      return await _githubAPI.getPatches(
+        repoName,
+        currentVersion,
+        url,
+      );
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
       }
+      return [];
     }
-
-    return List.empty();
   }
 
   Future<File?> downloadPatches() async {
     try {
       final String repoName = getPatchesRepo();
       final String currentVersion = await getCurrentPatchesVersion();
-      final String url = getPatchesDownloadURL();
+      final String url = getPatchesDownloadURL(true);
       return await _githubAPI.getPatchesReleaseFile(
         '.jar',
         repoName,
@@ -495,7 +447,8 @@ class ManagerAPI {
 
   Future<void> setCurrentPatchesVersion(String version) async {
     await _prefs.setString('patchesVersion', version);
-    await setPatchesDownloadURL('');
+    await setPatchesDownloadURL('', false);
+    await setPatchesDownloadURL('', true);
     await downloadPatches();
   }
 
@@ -531,33 +484,62 @@ class ManagerAPI {
     return toRemove;
   }
 
-  Future<List<PatchedApplication>> getMountedApps() async {
-    final List<PatchedApplication> mountedApps = [];
+  Future<List<PatchedApplication>> getUnsavedApps(
+    List<PatchedApplication> patchedApps,
+  ) async {
+    final List<PatchedApplication> unsavedApps = [];
     final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
     if (hasRootPermissions) {
       final List<String> installedApps = await _rootAPI.getInstalledApps();
       for (final String packageName in installedApps) {
+        if (!patchedApps.any((app) => app.packageName == packageName)) {
+          final ApplicationWithIcon? application = await DeviceApps.getApp(
+            packageName,
+            true,
+          ) as ApplicationWithIcon?;
+          if (application != null) {
+            unsavedApps.add(
+              PatchedApplication(
+                name: application.appName,
+                packageName: application.packageName,
+                originalPackageName: application.packageName,
+                version: application.versionName!,
+                apkFilePath: application.apkFilePath,
+                icon: application.icon,
+                patchDate: DateTime.now(),
+                isRooted: true,
+              ),
+            );
+          }
+        }
+      }
+    }
+    final List<Application> userApps =
+        await DeviceApps.getInstalledApplications();
+    for (final Application app in userApps) {
+      if (app.packageName.startsWith('app.revanced') &&
+          !app.packageName.startsWith('app.revanced.manager.') &&
+          !patchedApps.any((uapp) => uapp.packageName == app.packageName)) {
         final ApplicationWithIcon? application = await DeviceApps.getApp(
-          packageName,
+          app.packageName,
           true,
         ) as ApplicationWithIcon?;
         if (application != null) {
-          mountedApps.add(
+          unsavedApps.add(
             PatchedApplication(
               name: application.appName,
               packageName: application.packageName,
+              originalPackageName: application.packageName,
               version: application.versionName!,
               apkFilePath: application.apkFilePath,
               icon: application.icon,
               patchDate: DateTime.now(),
-              isRooted: true,
             ),
           );
         }
       }
     }
-
-    return mountedApps;
+    return unsavedApps;
   }
 
   Future<void> showPatchesChangeWarningDialog(BuildContext context) {
@@ -619,20 +601,34 @@ class ManagerAPI {
 
   Future<void> reAssessSavedApps() async {
     final List<PatchedApplication> patchedApps = getPatchedApps();
-
-    // Remove apps that are not installed anymore.
+    final List<PatchedApplication> unsavedApps =
+        await getUnsavedApps(patchedApps);
+    patchedApps.addAll(unsavedApps);
     final List<PatchedApplication> toRemove =
         await getAppsToRemove(patchedApps);
     patchedApps.removeWhere((a) => toRemove.contains(a));
-
-    // Determine all apps that are installed by mounting.
-    final List<PatchedApplication> mountedApps = await getMountedApps();
-    mountedApps.removeWhere(
-      (app) => patchedApps
-          .any((patchedApp) => patchedApp.packageName == app.packageName),
-    );
-    patchedApps.addAll(mountedApps);
-
+    for (final PatchedApplication app in patchedApps) {
+      app.hasUpdates =
+          await hasAppUpdates(app.originalPackageName, app.patchDate);
+      app.changelog =
+          await getAppChangelog(app.originalPackageName, app.patchDate);
+      if (!app.hasUpdates) {
+        final String? currentInstalledVersion =
+            (await DeviceApps.getApp(app.packageName))?.versionName;
+        if (currentInstalledVersion != null) {
+          final String currentSavedVersion = app.version;
+          final int currentInstalledVersionInt = int.parse(
+            currentInstalledVersion.replaceAll(RegExp('[^0-9]'), ''),
+          );
+          final int currentSavedVersionInt = int.parse(
+            currentSavedVersion.replaceAll(RegExp('[^0-9]'), ''),
+          );
+          if (currentInstalledVersionInt > currentSavedVersionInt) {
+            app.hasUpdates = true;
+          }
+        }
+      }
+    }
     await setPatchedApps(patchedApps);
   }
 
@@ -649,6 +645,37 @@ class ManagerAPI {
     return !existsNonRoot;
   }
 
+  Future<bool> hasAppUpdates(
+    String packageName,
+    DateTime patchDate,
+  ) async {
+    final List<String> commits = await _githubAPI.getCommits(
+      packageName,
+      getPatchesRepo(),
+      patchDate,
+    );
+    return commits.isNotEmpty;
+  }
+
+  Future<List<String>> getAppChangelog(
+    String packageName,
+    DateTime patchDate,
+  ) async {
+    List<String> newCommits = await _githubAPI.getCommits(
+      packageName,
+      getPatchesRepo(),
+      patchDate,
+    );
+    if (newCommits.isEmpty) {
+      newCommits = await _githubAPI.getCommits(
+        packageName,
+        getPatchesRepo(),
+        patchDate,
+      );
+    }
+    return newCommits;
+  }
+
   Future<bool> isSplitApk(PatchedApplication patchedApp) async {
     Application? app;
     if (patchedApp.isFromStorage) {
@@ -677,7 +704,7 @@ class ManagerAPI {
   Future<List<String>> getDefaultPatches() async {
     final List<Patch> patches = await getPatches();
     final List<String> defaultPatches = [];
-    if (isVersionCompatibilityCheckEnabled() == false) {
+    if (areExperimentalPatchesEnabled() == false) {
       defaultPatches.addAll(
         patches
             .where(
@@ -714,18 +741,8 @@ class ManagerAPI {
     return jsonDecode(string);
   }
 
-  void resetAllOptions() {
-    _prefs.getKeys().where((key) => key.startsWith('patchOption-')).forEach(
-      (key) {
-        _prefs.remove(key);
-      },
-    );
-  }
-
   Future<void> resetLastSelectedPatches() async {
     final File selectedPatchesFile = File(storedPatchesFile);
-    if (selectedPatchesFile.existsSync()) {
-      selectedPatchesFile.deleteSync();
-    }
+    selectedPatchesFile.deleteSync();
   }
 }

lib/services/patcher_api.dart

@@ -18,20 +18,19 @@ import 'package:share_extend/share_extend.dart';
 @lazySingleton
 class PatcherAPI {
   static const patcherChannel =
-  MethodChannel('app.revanced.manager.flutter/patcher');
+      MethodChannel('app.revanced.manager.flutter/patcher');
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final RootAPI _rootAPI = RootAPI();
   late Directory _dataDir;
   late Directory _tmpDir;
   late File _keyStoreFile;
   List<Patch> _patches = [];
-  List<Patch> _universalPatches = [];
-  List<String> _compatiblePackages = [];
   Map filteredPatches = <String, List<Patch>>{};
-  File? outFile;
+  File? _outFile;
 
   Future<void> initialize() async {
-    await loadPatches();
+    await _loadPatches();
+    await _managerAPI.downloadPatches();
     await _managerAPI.downloadIntegrations();
     final Directory appCache = await getTemporaryDirectory();
     _dataDir = await getExternalStorageDirectory() ?? appCache;
@@ -46,23 +45,7 @@ class PatcherAPI {
     }
   }
 
-  List<String> getCompatiblePackages() {
-    final List<String> compatiblePackages = [];
-    for (final Patch patch in _patches) {
-      for (final Package package in patch.compatiblePackages) {
-        if (!compatiblePackages.contains(package.name)) {
-          compatiblePackages.add(package.name);
-        }
-      }
-    }
-    return compatiblePackages;
-  }
-
-  List<Patch> getUniversalPatches() {
-    return _patches.where((patch) => patch.compatiblePackages.isEmpty).toList();
-  }
-
-  Future<void> loadPatches() async {
+  Future<void> _loadPatches() async {
     try {
       if (_patches.isEmpty) {
         _patches = await _managerAPI.getPatches();
@@ -73,40 +56,48 @@ class PatcherAPI {
       }
       _patches = List.empty();
     }
-
-    _compatiblePackages = getCompatiblePackages();
-    _universalPatches = getUniversalPatches();
   }
 
   Future<List<ApplicationWithIcon>> getFilteredInstalledApps(
-      bool showUniversalPatches,) async {
+    bool showUniversalPatches,
+  ) async {
     final List<ApplicationWithIcon> filteredApps = [];
     final bool allAppsIncluded =
-        _universalPatches.isNotEmpty && showUniversalPatches;
+        _patches.any((patch) => patch.compatiblePackages.isEmpty) &&
+            showUniversalPatches;
     if (allAppsIncluded) {
-      final appList = await DeviceApps.getInstalledApplications(
+      final allPackages = await DeviceApps.getInstalledApplications(
         includeAppIcons: true,
         onlyAppsWithLaunchIntent: true,
       );
-
-      for (final app in appList) {
-        filteredApps.add(app as ApplicationWithIcon);
-      }
-    }
-    for (final packageName in _compatiblePackages) {
-      try {
-        if (!filteredApps.any((app) => app.packageName == packageName)) {
-          final ApplicationWithIcon? app = await DeviceApps.getApp(
-            packageName,
+      for (final pkg in allPackages) {
+        if (!filteredApps.any((app) => app.packageName == pkg.packageName)) {
+          final appInfo = await DeviceApps.getApp(
+            pkg.packageName,
             true,
           ) as ApplicationWithIcon?;
-          if (app != null) {
-            filteredApps.add(app);
+          if (appInfo != null) {
+            filteredApps.add(appInfo);
           }
         }
-      } on Exception catch (e) {
-        if (kDebugMode) {
-          print(e);
+      }
+    }
+    for (final Patch patch in _patches) {
+      for (final Package package in patch.compatiblePackages) {
+        try {
+          if (!filteredApps.any((app) => app.packageName == package.name)) {
+            final ApplicationWithIcon? app = await DeviceApps.getApp(
+              package.name,
+              true,
+            ) as ApplicationWithIcon?;
+            if (app != null) {
+              filteredApps.add(app);
+            }
+          }
+        } on Exception catch (e) {
+          if (kDebugMode) {
+            print(e);
+          }
         }
       }
     }
@@ -114,18 +105,14 @@ class PatcherAPI {
   }
 
   List<Patch> getFilteredPatches(String packageName) {
-    if (!_compatiblePackages.contains(packageName)) {
-      return _universalPatches;
-    }
-
     final List<Patch> patches = _patches
         .where(
           (patch) =>
-      patch.compatiblePackages.isEmpty ||
-          !patch.name.contains('settings') &&
-              patch.compatiblePackages
-                  .any((pack) => pack.name == packageName),
-    )
+              patch.compatiblePackages.isEmpty ||
+              !patch.name.contains('settings') &&
+                  patch.compatiblePackages
+                      .any((pack) => pack.name == packageName),
+        )
         .toList();
     if (!_managerAPI.areUniversalPatchesEnabled()) {
       filteredPatches[packageName] = patches
@@ -137,52 +124,77 @@ class PatcherAPI {
     return filteredPatches[packageName];
   }
 
-  Future<List<Patch>> getAppliedPatches(List<String> appliedPatches,) async {
+  Future<List<Patch>> getAppliedPatches(
+    List<String> appliedPatches,
+  ) async {
     return _patches
         .where((patch) => appliedPatches.contains(patch.name))
         .toList();
   }
 
-  Future<void> runPatcher(String packageName,
-      String apkFilePath,
-      List<Patch> selectedPatches,) async {
-    final File? integrationsFile = await _managerAPI.downloadIntegrations();
-    final Map<String, Map<String, dynamic>> options = {};
-    for (final patch in selectedPatches) {
-      if (patch.options.isNotEmpty) {
-        final Map<String, dynamic> patchOptions = {};
-        for (final option in patch.options) {
-          final patchOption = _managerAPI.getPatchOption(packageName, patch.name, option.key);
-          if (patchOption != null) {
-            patchOptions[patchOption.key] = patchOption.value;
-          }
+  Future<bool> needsResourcePatching(
+    List<Patch> selectedPatches,
+  ) async {
+    return selectedPatches.any(
+      (patch) => patch.dependencies.any(
+        (dep) => dep.contains('resource-'),
+      ),
+    );
+  }
+
+  Future<bool> needsSettingsPatch(List<Patch> selectedPatches) async {
+    return selectedPatches.any(
+      (patch) => patch.dependencies.any(
+        (dep) => dep.contains('settings'),
+      ),
+    );
+  }
+
+  Future<void> runPatcher(
+    String packageName,
+    String apkFilePath,
+    List<Patch> selectedPatches,
+  ) async {
+    final bool includeSettings = await needsSettingsPatch(selectedPatches);
+    if (includeSettings) {
+      try {
+        final Patch? settingsPatch = _patches.firstWhereOrNull(
+          (patch) =>
+              patch.name.contains('settings') &&
+              patch.compatiblePackages.any((pack) => pack.name == packageName),
+        );
+        if (settingsPatch != null) {
+          selectedPatches.add(settingsPatch);
+        }
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
         }
-        options[patch.name] = patchOptions;
       }
     }
-
-    if (integrationsFile != null) {
+    final File? patchBundleFile = await _managerAPI.downloadPatches();
+    final File? integrationsFile = await _managerAPI.downloadIntegrations();
+    if (patchBundleFile != null) {
       _dataDir.createSync();
       _tmpDir.createSync();
       final Directory workDir = _tmpDir.createTempSync('tmp-');
       final File inputFile = File('${workDir.path}/base.apk');
       final File patchedFile = File('${workDir.path}/patched.apk');
-      outFile = File('${workDir.path}/out.apk');
+      _outFile = File('${workDir.path}/out.apk');
       final Directory cacheDir = Directory('${workDir.path}/cache');
       cacheDir.createSync();
       final String originalFilePath = apkFilePath;
-
       try {
         await patcherChannel.invokeMethod(
           'runPatcher',
           {
+            'patchBundleFilePath': patchBundleFile.path,
             'originalFilePath': originalFilePath,
             'inputFilePath': inputFile.path,
             'patchedFilePath': patchedFile.path,
-            'outFilePath': outFile!.path,
-            'integrationsPath': integrationsFile.path,
+            'outFilePath': _outFile!.path,
+            'integrationsPath': integrationsFile!.path,
             'selectedPatches': selectedPatches.map((p) => p.name).toList(),
-            'options': options,
             'cacheDirPath': cacheDir.path,
             'keyStoreFilePath': _keyStoreFile.path,
             'keystorePassword': _managerAPI.getKeystorePassword(),
@@ -194,131 +206,131 @@ class PatcherAPI {
         }
       }
     }
-}
+  }
 
-Future<void> stopPatcher() async {
-  try {
-    await patcherChannel.invokeMethod('stopPatcher');
-  } on Exception catch (e) {
-    if (kDebugMode) {
-      print(e);
+  Future<void> stopPatcher() async {
+    try {
+      await patcherChannel.invokeMethod('stopPatcher');
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
     }
   }
-}
 
-Future<bool> installPatchedFile(PatchedApplication patchedApp) async {
-  if (outFile != null) {
-    try {
-      if (patchedApp.isRooted) {
-        final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
-        if (hasRootPermissions) {
-          return _rootAPI.installApp(
-            patchedApp.packageName,
-            patchedApp.apkFilePath,
-            outFile!.path,
-          );
+  Future<bool> installPatchedFile(PatchedApplication patchedApp) async {
+    if (_outFile != null) {
+      try {
+        if (patchedApp.isRooted) {
+          final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+          if (hasRootPermissions) {
+            return _rootAPI.installApp(
+              patchedApp.packageName,
+              patchedApp.apkFilePath,
+              _outFile!.path,
+            );
+          }
+        } else {
+          final install = await InstallPlugin.installApk(_outFile!.path);
+          return install['isSuccess'];
         }
-      } else {
-        final install = await InstallPlugin.installApk(outFile!.path);
-        return install['isSuccess'];
+      } on Exception catch (e) {
+        if (kDebugMode) {
+          print(e);
+        }
+        return false;
+      }
+    }
+    return false;
+  }
+
+  void exportPatchedFile(String appName, String version) {
+    try {
+      if (_outFile != null) {
+        final String newName = _getFileName(appName, version);
+        CRFileSaver.saveFileWithDialog(
+          SaveFileDialogParams(
+            sourceFilePath: _outFile!.path,
+            destinationFileName: newName,
+          ),
+        );
       }
     } on Exception catch (e) {
       if (kDebugMode) {
         print(e);
       }
-      return false;
     }
   }
-  return false;
-}
 
-void exportPatchedFile(String appName, String version) {
-  try {
-    if (outFile != null) {
-      final String newName = _getFileName(appName, version);
-      CRFileSaver.saveFileWithDialog(
-        SaveFileDialogParams(
-          sourceFilePath: outFile!.path,
-          destinationFileName: newName,
-        ),
-      );
-    }
-  } on Exception catch (e) {
-    if (kDebugMode) {
-      print(e);
-    }
-  }
-}
-
-void sharePatchedFile(String appName, String version) {
-  try {
-    if (outFile != null) {
-      final String newName = _getFileName(appName, version);
-      final int lastSeparator = outFile!.path.lastIndexOf('/');
-      final String newPath =
-          outFile!.path.substring(0, lastSeparator + 1) + newName;
-      final File shareFile = outFile!.copySync(newPath);
-      ShareExtend.share(shareFile.path, 'file');
-    }
-  } on Exception catch (e) {
-    if (kDebugMode) {
-      print(e);
-    }
-  }
-}
-
-String _getFileName(String appName, String version) {
-  final String prefix = appName.toLowerCase().replaceAll(' ', '-');
-  final String newName = '$prefix-revanced_v$version.apk';
-  return newName;
-}
-
-Future<void> exportPatcherLog(String logs) async {
-  final Directory appCache = await getTemporaryDirectory();
-  final Directory logDir = Directory('${appCache.path}/logs');
-  logDir.createSync();
-  final String dateTime = DateTime.now()
-      .toIso8601String()
-      .replaceAll('-', '')
-      .replaceAll(':', '')
-      .replaceAll('T', '')
-      .replaceAll('.', '');
-  final String fileName = 'revanced-manager_patcher_$dateTime.txt';
-  final File log = File('${logDir.path}/$fileName');
-  log.writeAsStringSync(logs);
-  CRFileSaver.saveFileWithDialog(
-    SaveFileDialogParams(
-      sourceFilePath: log.path,
-      destinationFileName: fileName,
-    ),
-  );
-}
-
-String getSuggestedVersion(String packageName) {
-  final Map<String, int> versions = {};
-  for (final Patch patch in _patches) {
-    final Package? package = patch.compatiblePackages.firstWhereOrNull(
-          (pack) => pack.name == packageName,
-    );
-    if (package != null) {
-      for (final String version in package.versions) {
-        versions.update(
-          version,
-              (value) => versions[version]! + 1,
-          ifAbsent: () => 1,
-        );
+  void sharePatchedFile(String appName, String version) {
+    try {
+      if (_outFile != null) {
+        final String newName = _getFileName(appName, version);
+        final int lastSeparator = _outFile!.path.lastIndexOf('/');
+        final String newPath =
+            _outFile!.path.substring(0, lastSeparator + 1) + newName;
+        final File shareFile = _outFile!.copySync(newPath);
+        ShareExtend.share(shareFile.path, 'file');
+      }
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
       }
     }
   }
-  if (versions.isNotEmpty) {
-    final entries = versions.entries.toList()
-      ..sort((a, b) => a.value.compareTo(b.value));
-    versions
-      ..clear()
-      ..addEntries(entries);
-    versions.removeWhere((key, value) => value != versions.values.last);
-    return (versions.keys.toList()
-      ..sort()).last;
+
+  String _getFileName(String appName, String version) {
+    final String prefix = appName.toLowerCase().replaceAll(' ', '-');
+    final String newName = '$prefix-revanced_v$version.apk';
+    return newName;
   }
-  return '';
-}}
+
+  Future<void> exportPatcherLog(String logs) async {
+    final Directory appCache = await getTemporaryDirectory();
+    final Directory logDir = Directory('${appCache.path}/logs');
+    logDir.createSync();
+    final String dateTime = DateTime.now()
+        .toIso8601String()
+        .replaceAll('-', '')
+        .replaceAll(':', '')
+        .replaceAll('T', '')
+        .replaceAll('.', '');
+    final String fileName = 'revanced-manager_patcher_$dateTime.log';
+    final File log = File('${logDir.path}/$fileName');
+    log.writeAsStringSync(logs);
+    CRFileSaver.saveFileWithDialog(
+      SaveFileDialogParams(
+        sourceFilePath: log.path,
+        destinationFileName: fileName,
+      ),
+    );
+  }
+
+  String getSuggestedVersion(String packageName) {
+    final Map<String, int> versions = {};
+    for (final Patch patch in _patches) {
+      final Package? package = patch.compatiblePackages.firstWhereOrNull(
+        (pack) => pack.name == packageName,
+      );
+      if (package != null) {
+        for (final String version in package.versions) {
+          versions.update(
+            version,
+            (value) => versions[version]! + 1,
+            ifAbsent: () => 1,
+          );
+        }
+      }
+    }
+    if (versions.isNotEmpty) {
+      final entries = versions.entries.toList()
+        ..sort((a, b) => a.value.compareTo(b.value));
+      versions
+        ..clear()
+        ..addEntries(entries);
+      versions.removeWhere((key, value) => value != versions.values.last);
+      return (versions.keys.toList()..sort()).last;
+    }
+    return '';
+  }
+}

lib/services/revanced_api.dart

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

lib/ui/theme/dynamic_theme_builder.dart

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

lib/ui/views/app_selector/app_selector_view.dart

@@ -23,6 +23,7 @@ class _AppSelectorViewState extends State<AppSelectorView> {
       onViewModelReady: (model) => model.initialize(),
       viewModelBuilder: () => AppSelectorViewModel(),
       builder: (context, model, child) => Scaffold(
+        resizeToAvoidBottomInset: false,
         floatingActionButton: FloatingActionButton.extended(
           label: I18nText('appSelectorView.storageButton'),
           icon: const Icon(Icons.sd_storage),
@@ -38,11 +39,13 @@ class _AppSelectorViewState extends State<AppSelectorView> {
               floating: true,
               title: I18nText(
                 'appSelectorView.viewTitle',
-              ),
-              titleTextStyle: TextStyle(
-                fontSize: 22.0,
+                child: Text(
+                  '',
+                  style: TextStyle(
                     color: Theme.of(context).textTheme.titleLarge!.color,
                   ),
+                ),
+              ),
               leading: IconButton(
                 icon: Icon(
                   Icons.arrow_back,
@@ -51,7 +54,7 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                 onPressed: () => Navigator.of(context).pop(),
               ),
               bottom: PreferredSize(
-                preferredSize: const Size.fromHeight(66.0),
+                preferredSize: const Size.fromHeight(64.0),
                 child: Padding(
                   padding: const EdgeInsets.symmetric(
                     vertical: 8.0,

lib/ui/views/app_selector/app_selector_viewmodel.dart

@@ -13,7 +13,6 @@ import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
-import 'package:revanced_manager/utils/check_for_supported_patch.dart';
 import 'package:stacked/stacked.dart';
 
 class AppSelectorViewModel extends BaseViewModel {
@@ -74,12 +73,13 @@ class AppSelectorViewModel extends BaseViewModel {
     locator<PatcherViewModel>().selectedApp = PatchedApplication(
       name: application.appName,
       packageName: application.packageName,
+      originalPackageName: application.packageName,
       version: application.versionName!,
       apkFilePath: application.apkFilePath,
       icon: application.icon,
       patchDate: DateTime.now(),
     );
-    await locator<PatcherViewModel>().loadLastSelectedPatches();
+    locator<PatcherViewModel>().loadLastSelectedPatches();
   }
 
   Future<void> canSelectInstalled(
@@ -94,14 +94,10 @@ class AppSelectorViewModel extends BaseViewModel {
           return showSelectFromStorageDialog(context);
         }
       } else if (!await checkSplitApk(packageName) || isRooted) {
-        await selectApp(app);
+        selectApp(app);
         if (context.mounted) {
           Navigator.pop(context);
         }
-        final List<Option> requiredNullOptions = getNullRequiredOptions(locator<PatcherViewModel>().selectedPatches, packageName);
-        if(requiredNullOptions.isNotEmpty){
-          locator<PatcherViewModel>().showRequiredOptionDialog();
-        }
       }
     }
   }
@@ -206,6 +202,7 @@ class AppSelectorViewModel extends BaseViewModel {
           locator<PatcherViewModel>().selectedApp = PatchedApplication(
             name: application.appName,
             packageName: application.packageName,
+            originalPackageName: application.packageName,
             version: application.versionName!,
             apkFilePath: result.files.single.path!,
             icon: application.icon,
@@ -229,8 +226,7 @@ class AppSelectorViewModel extends BaseViewModel {
           (app) =>
               query.isEmpty ||
               query.length < 2 ||
-              app.appName.toLowerCase().contains(query.toLowerCase()) ||
-              app.packageName.toLowerCase().contains(query.toLowerCase()),
+              app.appName.toLowerCase().contains(query.toLowerCase()),
         )
         .toList();
   }

lib/ui/views/home/home_viewmodel.dart

@@ -34,8 +34,10 @@ class HomeViewModel extends BaseViewModel {
   final RevancedAPI _revancedAPI = locator<RevancedAPI>();
   final Toast _toast = locator<Toast>();
   final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
+  DateTime? _lastUpdate;
   bool showUpdatableApps = false;
   List<PatchedApplication> patchedInstalledApps = [];
+  List<PatchedApplication> patchedUpdatableApps = [];
   String? _latestManagerVersion = '';
   File? downloadedApk;
 
@@ -80,7 +82,7 @@ class HomeViewModel extends BaseViewModel {
         _toast.showBottom('homeView.errorDownloadMessage');
       }
     }
-
+    _getPatchedApps();
     _managerAPI.reAssessSavedApps().then((_) => _getPatchedApps());
   }
 
@@ -106,6 +108,10 @@ class HomeViewModel extends BaseViewModel {
 
   void _getPatchedApps() {
     patchedInstalledApps = _managerAPI.getPatchedApps().toList();
+    patchedUpdatableApps = _managerAPI
+        .getPatchedApps()
+        .where((app) => app.hasUpdates == true)
+        .toList();
     notifyListeners();
   }
 
@@ -463,7 +469,11 @@ class HomeViewModel extends BaseViewModel {
   }
 
   Future<void> forceRefresh(BuildContext context) async {
-    _managerAPI.clearAllData();
+    await Future.delayed(const Duration(seconds: 1));
+    if (_lastUpdate == null ||
+        _lastUpdate!.difference(DateTime.now()).inSeconds > 2) {
+      _managerAPI.clearAllData();
+    }
     _toast.showBottom('homeView.refreshSuccess');
     initialize(context);
   }

lib/ui/views/installer/installer_viewmodel.dart

@@ -15,8 +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:revanced_manager/utils/about_info.dart';
-import 'package:screenshot_callback/screenshot_callback.dart';
 import 'package:stacked/stacked.dart';
 import 'package:wakelock/wakelock.dart';
 
@@ -31,7 +29,6 @@ class InstallerViewModel extends BaseViewModel {
     'app.revanced.manager.flutter/installer',
   );
   final ScrollController scrollController = ScrollController();
-  final ScreenshotCallback screenshotCallback = ScreenshotCallback();
   double? progress = 0.0;
   String logs = '';
   String headerLogs = '';
@@ -41,7 +38,6 @@ class InstallerViewModel extends BaseViewModel {
   bool hasErrors = false;
   bool isCanceled = false;
   bool cancel = false;
-  bool showPopupScreenshotWarning = true;
 
   Future<void> initialize(BuildContext context) async {
     isRooted = await _rootAPI.isRooted();
@@ -68,12 +64,6 @@ class InstallerViewModel extends BaseViewModel {
         } // ignore
       }
     }
-    screenshotCallback.addListener(() {
-      if (showPopupScreenshotWarning) {
-        showPopupScreenshotWarning = false;
-        screenshotDetected(context);
-      }
-    });
     await Wakelock.enable();
     await handlePlatformChannelMethods();
     await runPatcher();
@@ -139,30 +129,29 @@ class InstallerViewModel extends BaseViewModel {
   }
 
   Future<void> runPatcher() async {
-
     try {
-      await _patcherAPI.runPatcher(
-        _app.packageName,
-        _app.apkFilePath,
-        _patches,
-      );
-    } on Exception catch (e) {
-      update(
-        -100.0,
-        'Failed...',
-        'Something went wrong:\n$e',
-      );
-      if (kDebugMode) {
-        print(e);
+      update(0.0, 'Initializing...', 'Initializing installer');
+      if (_patches.isNotEmpty) {
+        try {
+          update(0.1, '', 'Creating working directory');
+          await _patcherAPI.runPatcher(
+            _app.packageName,
+            _app.apkFilePath,
+            _patches,
+          );
+        } on Exception catch (e) {
+          update(
+            -100.0,
+            'Aborted...',
+            'An error occurred! Aborted\nError:\n$e',
+          );
+          if (kDebugMode) {
+            print(e);
+          }
+        }
+      } else {
+        update(-100.0, 'Aborted...', 'No app or patches selected! Aborted');
       }
-    }
-
-    // Necessary to reset the state of patches so that they
-    // can be reloaded again.
-   _managerAPI.patches.clear();
-    await _patcherAPI.loadPatches();
-
-    try {
       if (FlutterBackground.isBackgroundExecutionEnabled) {
         try {
           FlutterBackground.disableBackgroundExecution();
@@ -180,72 +169,6 @@ class InstallerViewModel extends BaseViewModel {
     }
   }
 
-  Future<void> copyLogs() async {
-    final info = await AboutInfo.getInfo();
-
-    final formattedLogs = [
-      '```',
-      '~ Device Info',
-      'ReVanced Manager: ${info['version']}',
-      'Build: ${info['flavor']}',
-      'Model: ${info['model']}',
-      'Android version: ${info['androidVersion']}',
-      'Supported architectures: ${info['supportedArch'].join(", ")}',
-
-      '\n~ Patch Info',
-      'App: ${_app.packageName} v${_app.version}',
-      'Patches version: ${_managerAPI.patchesVersion}',
-      'Patches: ${_patches.map((p) => p.name).toList().join(", ")}',
-
-      '\n~ Settings',
-      'Allow changing patch selection: ${_managerAPI.isPatchesChangeEnabled()}',
-      'Show universal patches: ${_managerAPI.areUniversalPatchesEnabled()}',
-      'Version compatibility check: ${_managerAPI.isVersionCompatibilityCheckEnabled()}',
-      'Patches source: ${_managerAPI.getPatchesRepo()}',
-      'Integration source: ${_managerAPI.getIntegrationsRepo()}',
-
-      '\n~ Logs',
-      logs,
-      '```',
-    ];
-
-    Clipboard.setData(ClipboardData(text: formattedLogs.join('\n')));
-    _toast.showBottom('installerView.copiedToClipboard');
-  }
-
-  Future<void> screenshotDetected(BuildContext context) async {
-    await showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: I18nText(
-          'warning',
-        ),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        icon: const Icon(Icons.warning),
-        content: SingleChildScrollView(
-          child: I18nText('installerView.screenshotDetected'),
-        ),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
-            onPressed: () {
-              Navigator.of(context).pop();
-            },
-          ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
-            onPressed: () {
-              copyLogs();
-              showPopupScreenshotWarning = true;
-              Navigator.of(context).pop();
-            },
-          ),
-        ],
-      ),
-    );
-  }
-
   Future<void> installTypeDialog(BuildContext context) async {
     final ValueNotifier<int> installType = ValueNotifier(0);
     if (isRooted) {
@@ -259,55 +182,52 @@ class InstallerViewModel extends BaseViewModel {
           backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
           icon: const Icon(Icons.file_download_outlined),
           contentPadding: const EdgeInsets.symmetric(vertical: 16),
-          content: SingleChildScrollView(
-            child: ValueListenableBuilder(
-              valueListenable: installType,
-              builder: (context, value, child) {
-                return Column(
-                  mainAxisSize: MainAxisSize.min,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Padding(
-                      padding: const EdgeInsets.symmetric(
-                        horizontal: 20,
-                        vertical: 10,
-                      ),
-                      child: I18nText(
-                        'installerView.installTypeDescription',
-                        child: Text(
-                          '',
-                          style: TextStyle(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w500,
-                            color: Theme.of(context).colorScheme.secondary,
-                          ),
+          content: ValueListenableBuilder(
+            valueListenable: installType,
+            builder: (context, value, child) {
+              return Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 20,
+                      vertical: 10,
+                    ),
+                    child: I18nText(
+                      'installerView.installTypeDescription',
+                      child: Text(
+                        '',
+                        style: TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.w500,
+                          color: Theme.of(context).colorScheme.secondary,
                         ),
                       ),
                     ),
-                    RadioListTile(
-                      title: I18nText('installerView.installNonRootType'),
-                      contentPadding:
-                          const EdgeInsets.symmetric(horizontal: 16),
-                      value: 0,
-                      groupValue: value,
-                      onChanged: (selected) {
-                        installType.value = selected!;
-                      },
-                    ),
-                    RadioListTile(
-                      title: I18nText('installerView.installRootType'),
-                      contentPadding:
-                          const EdgeInsets.symmetric(horizontal: 16),
-                      value: 1,
-                      groupValue: value,
-                      onChanged: (selected) {
-                        installType.value = selected!;
-                      },
-                    ),
-                  ],
-                );
-              },
-            ),
+                  ),
+                  RadioListTile(
+                    title: I18nText('installerView.installNonRootType'),
+                    subtitle: I18nText('installerView.installRecommendedType'),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 10),
+                    value: 0,
+                    groupValue: value,
+                    onChanged: (selected) {
+                      installType.value = selected!;
+                    },
+                  ),
+                  RadioListTile(
+                    title: I18nText('installerView.installRootType'),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 10),
+                    value: 1,
+                    groupValue: value,
+                    onChanged: (selected) {
+                      installType.value = selected!;
+                    },
+                  ),
+                ],
+              );
+            },
           ),
           actions: [
             CustomMaterialButton(
@@ -335,9 +255,9 @@ class InstallerViewModel extends BaseViewModel {
   Future<void> stopPatcher() async {
     try {
       isCanceled = true;
-      update(0.5, 'Canceling...', 'Canceling patching process');
+      update(0.5, 'Aborting...', 'Canceling patching process');
       await _patcherAPI.stopPatcher();
-      update(-100.0, 'Canceled...', 'Press back to exit');
+      update(-100.0, 'Aborted...', 'Press back to exit');
     } on Exception catch (e) {
       if (kDebugMode) {
         print(e);
@@ -348,33 +268,56 @@ class InstallerViewModel extends BaseViewModel {
   Future<void> installResult(BuildContext context, bool installAsRoot) async {
     try {
       _app.isRooted = installAsRoot;
-      update(
-        1.0,
-        'Installing...',
-        _app.isRooted
-            ? 'Installing patched file using root method'
-            : 'Installing patched file using nonroot method',
-      );
-      isInstalled = await _patcherAPI.installPatchedFile(_app);
-      if (isInstalled) {
-        _app.isFromStorage = false;
-        _app.patchDate = DateTime.now();
-        _app.appliedPatches = _patches.map((p) => p.name).toList();
-
-        // In case a patch changed the app name or package name,
-        // update the app info.
-        final app =
-            await DeviceApps.getAppFromStorage(_patcherAPI.outFile!.path);
-        if (app != null) {
-          _app.name = app.appName;
-          _app.packageName = app.packageName;
-        }
-
-        await _managerAPI.savePatchedApp(_app);
-
-        update(1.0, 'Installed!', 'Installed!');
+      final bool hasMicroG =
+          _patches.any((p) => p.name.endsWith('MicroG support'));
+      final bool rootMicroG = installAsRoot && hasMicroG;
+      final bool rootFromStorage = installAsRoot && _app.isFromStorage;
+      final bool ytWithoutRootMicroG =
+          !installAsRoot && !hasMicroG && _app.packageName.contains('youtube');
+      if (rootMicroG || rootFromStorage || ytWithoutRootMicroG) {
+        return showDialog(
+          context: context,
+          builder: (context) => AlertDialog(
+            title: I18nText('installerView.installErrorDialogTitle'),
+            backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+            content: I18nText(
+              rootMicroG
+                  ? 'installerView.installErrorDialogText1'
+                  : rootFromStorage
+                      ? 'installerView.installErrorDialogText3'
+                      : 'installerView.installErrorDialogText2',
+            ),
+            actions: <Widget>[
+              CustomMaterialButton(
+                label: I18nText('okButton'),
+                onPressed: () => Navigator.of(context).pop(),
+              ),
+            ],
+          ),
+        );
       } else {
-        // TODO(aabed): Show error message.
+        update(
+          1.0,
+          'Installing...',
+          _app.isRooted
+              ? 'Installing patched file using root method'
+              : 'Installing patched file using nonroot method',
+        );
+        isInstalled = await _patcherAPI.installPatchedFile(_app);
+        if (isInstalled) {
+          update(1.0, 'Installed!', 'Installed!');
+          _app.isFromStorage = false;
+          _app.patchDate = DateTime.now();
+          _app.appliedPatches = _patches.map((p) => p.name).toList();
+          if (hasMicroG) {
+            _app.name += ' ReVanced';
+            _app.packageName = _app.packageName.replaceFirst(
+              'com.google.',
+              'app.revanced.',
+            );
+          }
+          await _managerAPI.savePatchedApp(_app);
+        }
       }
     } on Exception catch (e) {
       if (kDebugMode) {
@@ -393,6 +336,10 @@ class InstallerViewModel extends BaseViewModel {
     }
   }
 
+  void exportLog() {
+    _patcherAPI.exportPatcherLog(logs);
+  }
+
   Future<void> cleanPatcher() async {
     try {
       _patcherAPI.cleanPatcher();
@@ -416,7 +363,7 @@ class InstallerViewModel extends BaseViewModel {
         exportResult();
         break;
       case 1:
-        copyLogs();
+        exportLog();
         break;
     }
   }
@@ -438,7 +385,6 @@ class InstallerViewModel extends BaseViewModel {
     } else {
       _patcherAPI.cleanPatcher();
     }
-    screenshotCallback.dispose();
     Navigator.of(context).pop();
     return true;
   }

lib/ui/views/navigation/navigation_viewmodel.dart

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

lib/ui/views/patch_options/patch_options_view.dart

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

lib/ui/views/patch_options/patch_options_viewmodel.dart

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

lib/ui/views/patcher/patcher_view.dart

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

lib/ui/views/patcher/patcher_viewmodel.dart

@@ -21,7 +21,6 @@ class PatcherViewModel extends BaseViewModel {
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
   PatchedApplication? selectedApp;
-  BuildContext? ctx;
   List<Patch> selectedPatches = [];
   List<String> removedPatches = [];
 
@@ -45,9 +44,52 @@ class PatcherViewModel extends BaseViewModel {
     return selectedApp == null;
   }
 
-  bool showRemovedPatchesDialog(BuildContext context) {
+  Future<bool> isValidPatchConfig() async {
+    final bool needsResourcePatching = await _patcherAPI.needsResourcePatching(
+      selectedPatches,
+    );
+    if (needsResourcePatching && selectedApp != null) {
+      final bool isSplit = await _managerAPI.isSplitApk(selectedApp!);
+      return !isSplit;
+    }
+    return true;
+  }
+
+  Future<void> showPatchConfirmationDialog(BuildContext context) async {
+    final bool isValid = await isValidPatchConfig();
+    if (context.mounted) {
+      if (isValid) {
+        showArmv7WarningDialog(context);
+      } else {
+        return showDialog(
+          context: context,
+          builder: (context) => AlertDialog(
+            title: I18nText('warning'),
+            backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+            content: I18nText('patcherView.splitApkWarningDialogText'),
+            actions: <Widget>[
+              CustomMaterialButton(
+                label: I18nText('noButton'),
+                onPressed: () => Navigator.of(context).pop(),
+              ),
+              CustomMaterialButton(
+                label: I18nText('yesButton'),
+                isFilled: false,
+                onPressed: () {
+                  Navigator.of(context).pop();
+                  showArmv7WarningDialog(context);
+                },
+              ),
+            ],
+          ),
+        );
+      }
+    }
+  }
+
+  Future<void> showRemovedPatchesDialog(BuildContext context) async {
     if (removedPatches.isNotEmpty) {
-      showDialog(
+      return showDialog(
         context: context,
         builder: (context) => AlertDialog(
           title: I18nText('notice'),
@@ -60,58 +102,21 @@ class PatcherViewModel extends BaseViewModel {
             CustomMaterialButton(
               isFilled: false,
               label: I18nText('noButton'),
-              onPressed: () {
-                Navigator.of(context).pop();
-              },
+              onPressed: () => Navigator.of(context).pop(),
             ),
             CustomMaterialButton(
               label: I18nText('yesButton'),
               onPressed: () {
                 Navigator.of(context).pop();
-                showArmv7WarningDialog(context);
+                navigateToInstaller();
               },
             ),
           ],
         ),
       );
-      return false;
+    } else {
+      showArmv7WarningDialog(context);
     }
-    return true;
-  }
-
-  bool checkRequiredPatchOption(BuildContext context) {
-    if (getNullRequiredOptions(selectedPatches, selectedApp!.packageName).isNotEmpty) {
-      showRequiredOptionDialog(context);
-      return false;
-    }
-    return true;
-  }
-
-  void showRequiredOptionDialog([context]) {
-    showDialog(
-      context: context ?? ctx,
-      builder: (context) => AlertDialog(
-        title: I18nText('notice'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: I18nText('patcherView.requiredOptionDialogText'),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('cancelButton'),
-            onPressed: () => {
-              Navigator.of(context).pop(),
-            },
-          ),
-          CustomMaterialButton(
-            label: I18nText('okButton'),
-            onPressed: () => {
-              Navigator.pop(context),
-              navigateToPatchesSelector(),
-            },
-          ),
-        ],
-      ),
-    );
   }
 
   Future<void> showArmv7WarningDialog(BuildContext context) async {
@@ -180,9 +185,9 @@ class PatcherViewModel extends BaseViewModel {
     this.selectedPatches.clear();
     removedPatches.clear();
     final List<String> selectedPatches =
-        await _managerAPI.getSelectedPatches(selectedApp!.packageName);
+        await _managerAPI.getSelectedPatches(selectedApp!.originalPackageName);
     final List<Patch> patches =
-        _patcherAPI.getFilteredPatches(selectedApp!.packageName);
+        _patcherAPI.getFilteredPatches(selectedApp!.originalPackageName);
     this
         .selectedPatches
         .addAll(patches.where((patch) => selectedPatches.contains(patch.name)));
@@ -190,7 +195,7 @@ class PatcherViewModel extends BaseViewModel {
       this.selectedPatches.clear();
       this.selectedPatches.addAll(patches.where((patch) => !patch.excluded));
     }
-    if (!_managerAPI.isVersionCompatibilityCheckEnabled()) {
+    if (!_managerAPI.areExperimentalPatchesEnabled()) {
       this.selectedPatches.removeWhere((patch) => !isPatchSupported(patch));
     }
     if (!_managerAPI.areUniversalPatchesEnabled()) {
@@ -198,13 +203,10 @@ class PatcherViewModel extends BaseViewModel {
           .selectedPatches
           .removeWhere((patch) => patch.compatiblePackages.isEmpty);
     }
-    final usedPatches = _managerAPI.getUsedPatches(selectedApp!.packageName);
+    final usedPatches = _managerAPI.getUsedPatches(selectedApp!.originalPackageName);
     for (final patch in usedPatches){
       if (!patches.any((p) => p.name == patch.name)){
-        removedPatches.add('• ${patch.name}');
-        for (final option in patch.options) {
-          _managerAPI.clearPatchOption(selectedApp!.packageName, patch.name, option.key);
-        }
+        removedPatches.add('\u2022 ${patch.name}');
       }
     }
     notifyListeners();

lib/ui/views/patches_selector/patches_selector_view.dart

@@ -4,6 +4,7 @@ import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/ui/views/patches_selector/patches_selector_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/patchesSelectorView/patch_item.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_popup_menu.dart';
 import 'package:revanced_manager/ui/widgets/shared/search_bar.dart';
 import 'package:revanced_manager/utils/check_for_supported_patch.dart';
 import 'package:stacked/stacked.dart';
@@ -36,6 +37,7 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
       onViewModelReady: (model) => model.initialize(),
       viewModelBuilder: () => PatchesSelectorViewModel(),
       builder: (context, model, child) => Scaffold(
+        resizeToAvoidBottomInset: false,
         floatingActionButton: Visibility(
           visible: model.patches.isNotEmpty,
           child: FloatingActionButton.extended(
@@ -47,10 +49,8 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
             ),
             icon: const Icon(Icons.check),
             onPressed: () {
-              if (!model.areRequiredOptionsNull(context)) {
-                model.selectPatches();
-                Navigator.of(context).pop();
-              }
+              model.selectPatches();
+              Navigator.of(context).pop();
             },
           ),
         ),
@@ -61,54 +61,60 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
               floating: true,
               title: I18nText(
                 'patchesSelectorView.viewTitle',
-              ),
-              titleTextStyle: TextStyle(
-                fontSize: 22.0,
-                color: Theme.of(context).textTheme.titleLarge!.color,
+                child: Text(
+                  '',
+                  style: TextStyle(
+                    color: Theme.of(context).textTheme.titleLarge!.color,
+                  ),
+                ),
               ),
               leading: IconButton(
                 icon: Icon(
                   Icons.arrow_back,
                   color: Theme.of(context).textTheme.titleLarge!.color,
                 ),
-                onPressed: () {
-                  model.resetSelection();
-                  Navigator.of(context).pop();
-                },
+                onPressed: () => Navigator.of(context).pop(),
               ),
               actions: [
-                Container(
-                  margin: const EdgeInsets.symmetric(vertical: 12),
-                  padding: const EdgeInsets.symmetric(horizontal: 6),
-                  decoration: BoxDecoration(
-                    color:
-                        Theme.of(context).colorScheme.tertiary.withOpacity(0.5),
-                    borderRadius: BorderRadius.circular(6),
-                  ),
-                  alignment: Alignment.center,
-                  child: Text(
-                    model.patchesVersion!,
-                    style: TextStyle(
-                      color: Theme.of(context).textTheme.titleLarge!.color,
+                FittedBox(
+                  fit: BoxFit.scaleDown,
+                  child: Container(
+                    margin: const EdgeInsets.only(top: 12, bottom: 12),
+                    padding:
+                        const EdgeInsets.symmetric(horizontal: 6, vertical: 6),
+                    decoration: BoxDecoration(
+                      color: Theme.of(context)
+                          .colorScheme
+                          .tertiary
+                          .withOpacity(0.5),
+                      borderRadius: BorderRadius.circular(6),
+                    ),
+                    child: Text(
+                      model.patchesVersion!,
+                      style: TextStyle(
+                        color: Theme.of(context).textTheme.titleLarge!.color,
+                      ),
                     ),
                   ),
                 ),
-                PopupMenuButton(
-                  onSelected: (value) {
-                    model.onMenuSelection(value, context);
-                  },
-                  itemBuilder: (BuildContext context) => <PopupMenuEntry>[
-                    PopupMenuItem(
-                      value: 0,
-                      child: I18nText(
-                        'patchesSelectorView.loadPatchesSelection',
+                CustomPopupMenu(
+                  onSelected: (value) =>
+                      {model.onMenuSelection(value, context)},
+                  children: {
+                    0: I18nText(
+                      'patchesSelectorView.loadPatchesSelection',
+                      child: const Text(
+                        '',
+                        style: TextStyle(
+                          fontWeight: FontWeight.bold,
+                        ),
                       ),
                     ),
-                  ],
+                  },
                 ),
               ],
               bottom: PreferredSize(
-                preferredSize: const Size.fromHeight(66.0),
+                preferredSize: const Size.fromHeight(64.0),
                 child: Padding(
                   padding: const EdgeInsets.symmetric(
                     vertical: 8.0,
@@ -182,123 +188,26 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                               ),
                             ],
                           ),
-                          if (model.newPatchExists())
-                            Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Padding(
-                                  padding: const EdgeInsets.symmetric(
-                                    vertical: 10.0,
-                                  ),
-                                  child: Container(
-                                    padding: const EdgeInsets.only(
-                                      top: 10.0,
-                                      bottom: 10.0,
-                                      left: 5.0,
-                                    ),
-                                    child: I18nText(
-                                      'patchesSelectorView.newPatches',
-                                      child: Text(
-                                        '',
-                                        style: TextStyle(
-                                          color: Theme.of(context)
-                                              .colorScheme
-                                              .primary,
-                                        ),
-                                      ),
-                                    ),
-                                  ),
-                                ),
-                                ...model.getQueriedPatches(_query).map((patch) {
-                                  if (model.isPatchNew(patch)) {
-                                    return PatchItem(
-                                      name: patch.name,
-                                      simpleName: patch.getSimpleName(),
-                                      description: patch.description ?? '',
-                                      packageVersion:
-                                          model.getAppInfo().version,
-                                      supportedPackageVersions:
-                                          model.getSupportedVersions(patch),
-                                      isUnsupported: !isPatchSupported(patch),
-                                      isChangeEnabled:
-                                          _managerAPI.isPatchesChangeEnabled(),
-                                      hasUnsupportedPatchOption:
-                                          hasUnsupportedRequiredOption(
-                                        patch.options,
-                                        patch,
-                                      ),
-                                      options: patch.options,
-                                      isSelected: model.isSelected(patch),
-                                      navigateToOptions: (options) =>
-                                          model.navigateToPatchOptions(
-                                        options,
-                                        patch,
-                                      ),
-                                      onChanged: (value) => model.selectPatch(
-                                        patch,
-                                        value,
-                                        context,
-                                      ),
-                                    );
-                                  } else {
-                                    return Container();
-                                  }
-                                }),
-                                Padding(
-                                  padding: const EdgeInsets.symmetric(
-                                    vertical: 10.0,
-                                  ),
-                                  child: Container(
-                                    padding: const EdgeInsets.only(
-                                      top: 10.0,
-                                      bottom: 10.0,
-                                      left: 5.0,
-                                    ),
-                                    child: I18nText(
-                                      'patchesSelectorView.patches',
-                                      child: Text(
-                                        '',
-                                        style: TextStyle(
-                                          color: Theme.of(context)
-                                              .colorScheme
-                                              .primary,
-                                        ),
-                                      ),
-                                    ),
-                                  ),
-                                ),
-                              ],
-                            ),
                           ...model.getQueriedPatches(_query).map(
                             (patch) {
                               if (patch.compatiblePackages.isNotEmpty) {
                                 return PatchItem(
                                   name: patch.name,
                                   simpleName: patch.getSimpleName(),
-                                  description: patch.description ?? '',
+                                  description: patch.description,
                                   packageVersion: model.getAppInfo().version,
                                   supportedPackageVersions:
                                       model.getSupportedVersions(patch),
                                   isUnsupported: !isPatchSupported(patch),
                                   isChangeEnabled:
                                       _managerAPI.isPatchesChangeEnabled(),
-                                  hasUnsupportedPatchOption:
-                                      hasUnsupportedRequiredOption(
-                                    patch.options,
+                                  isNew: model.isPatchNew(
                                     patch,
+                                    model.getAppInfo().packageName,
                                   ),
-                                  options: patch.options,
                                   isSelected: model.isSelected(patch),
-                                  navigateToOptions: (options) =>
-                                      model.navigateToPatchOptions(
-                                    options,
-                                    patch,
-                                  ),
-                                  onChanged: (value) => model.selectPatch(
-                                    patch,
-                                    value,
-                                    context,
-                                  ),
+                                  onChanged: (value) =>
+                                      model.selectPatch(patch, value, context),
                                 );
                               } else {
                                 return Container();
@@ -337,7 +246,7 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                                     return PatchItem(
                                       name: patch.name,
                                       simpleName: patch.getSimpleName(),
-                                      description: patch.description ?? '',
+                                      description: patch.description,
                                       packageVersion:
                                           model.getAppInfo().version,
                                       supportedPackageVersions:
@@ -345,18 +254,8 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                                       isUnsupported: !isPatchSupported(patch),
                                       isChangeEnabled:
                                           _managerAPI.isPatchesChangeEnabled(),
-                                      hasUnsupportedPatchOption:
-                                          hasUnsupportedRequiredOption(
-                                        patch.options,
-                                        patch,
-                                      ),
-                                      options: patch.options,
+                                      isNew: false,
                                       isSelected: model.isSelected(patch),
-                                      navigateToOptions: (options) =>
-                                          model.navigateToPatchOptions(
-                                        options,
-                                        patch,
-                                      ),
                                       onChanged: (value) => model.selectPatch(
                                         patch,
                                         value,

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -2,7 +2,6 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/app/app.locator.dart';
-import 'package:revanced_manager/app/app.router.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/manager_api.dart';
@@ -12,14 +11,11 @@ import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/utils/check_for_supported_patch.dart';
 import 'package:stacked/stacked.dart';
-import 'package:stacked_services/stacked_services.dart';
 
 class PatchesSelectorViewModel extends BaseViewModel {
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
-  final NavigationService _navigationService = locator<NavigationService>();
   final List<Patch> patches = [];
-  final List<Patch> currentSelection = [];
   final List<Patch> selectedPatches =
       locator<PatcherViewModel>().selectedPatches;
   PatchedApplication? selectedApp = locator<PatcherViewModel>().selectedApp;
@@ -32,21 +28,17 @@ class PatchesSelectorViewModel extends BaseViewModel {
     getPatchesVersion().whenComplete(() => notifyListeners());
     patches.addAll(
       _patcherAPI.getFilteredPatches(
-        selectedApp!.packageName,
+        selectedApp!.originalPackageName,
       ),
     );
-    final List<Option> requiredNullOptions =
-        getNullRequiredOptions(patches, selectedApp!.packageName);
     patches.sort((a, b) {
-      if (b.options.any((option) => requiredNullOptions.contains(option)) &&
-          a.options.isEmpty) {
-        return 1;
-      } else {
+      if (isPatchNew(a, selectedApp!.packageName) ==
+          isPatchNew(b, selectedApp!.packageName)) {
         return a.name.compareTo(b.name);
+      } else {
+        return isPatchNew(b, selectedApp!.packageName) ? 1 : -1;
       }
     });
-    currentSelection.clear();
-    currentSelection.addAll(selectedPatches);
     notifyListeners();
   }
 
@@ -56,60 +48,6 @@ class PatchesSelectorViewModel extends BaseViewModel {
     );
   }
 
-  void navigateToPatchOptions(List<Option> setOptions, Patch patch) {
-    _managerAPI.options = setOptions;
-    _managerAPI.selectedPatch = patch;
-    _managerAPI.modifiedOptions.clear();
-    _navigationService.navigateToPatchOptionsView();
-  }
-
-  bool areRequiredOptionsNull(BuildContext context) {
-    final List<String> patchesWithNullRequiredOptions = [];
-    final List<Option> requiredNullOptions =
-        getNullRequiredOptions(selectedPatches, selectedApp!.packageName);
-    if (requiredNullOptions.isNotEmpty) {
-      for (final patch in selectedPatches) {
-        for (final patchOption in patch.options) {
-          if (requiredNullOptions.contains(patchOption)) {
-            patchesWithNullRequiredOptions.add(patch.name);
-            break;
-          }
-        }
-      }
-      showSetRequiredOption(context, patchesWithNullRequiredOptions);
-      return true;
-    }
-    return false;
-  }
-
-  Future<void> showSetRequiredOption(
-    BuildContext context,
-    List<String> patches,
-  ) async {
-    return showDialog(
-      barrierDismissible: false,
-      context: context,
-      builder: (context) => AlertDialog(
-        title: I18nText('notice'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: I18nText(
-          'patchesSelectorView.setRequiredOption',
-          translationParams: {
-            'patches': patches.map((patch) => '• $patch').join('\n'),
-          },
-        ),
-        actions: <Widget>[
-          CustomMaterialButton(
-            label: I18nText('okButton'),
-            onPressed: () => {
-              Navigator.of(context).pop(),
-            },
-          ),
-        ],
-      ),
-    );
-  }
-
   void selectPatch(Patch patch, bool isSelected, BuildContext context) {
     if (_managerAPI.isPatchesChangeEnabled()) {
       if (isSelected && !selectedPatches.contains(patch)) {
@@ -160,16 +98,16 @@ class PatchesSelectorViewModel extends BaseViewModel {
 
   void selectDefaultPatches() {
     selectedPatches.clear();
-    if (locator<PatcherViewModel>().selectedApp?.packageName != null) {
+    if (locator<PatcherViewModel>().selectedApp?.originalPackageName != null) {
       selectedPatches.addAll(
         _patcherAPI
             .getFilteredPatches(
-              locator<PatcherViewModel>().selectedApp!.packageName,
+              locator<PatcherViewModel>().selectedApp!.originalPackageName,
             )
             .where(
               (element) =>
                   !element.excluded &&
-                  (_managerAPI.isVersionCompatibilityCheckEnabled() ||
+                  (_managerAPI.areExperimentalPatchesEnabled() ||
                       isPatchSupported(element)),
             ),
       );
@@ -185,19 +123,9 @@ class PatchesSelectorViewModel extends BaseViewModel {
   void selectPatches() {
     locator<PatcherViewModel>().selectedPatches = selectedPatches;
     saveSelectedPatches();
-    if (_managerAPI.ctx != null) {
-      Navigator.pop(_managerAPI.ctx!);
-      _managerAPI.ctx = null;
-    }
     locator<PatcherViewModel>().notifyListeners();
   }
 
-  void resetSelection() {
-    selectedPatches.clear();
-    selectedPatches.addAll(currentSelection);
-    notifyListeners();
-  }
-
   Future<void> getPatchesVersion() async {
     patchesVersion = await _managerAPI.getCurrentPatchesVersion();
   }
@@ -209,7 +137,7 @@ class PatchesSelectorViewModel extends BaseViewModel {
               query.isEmpty ||
               query.length < 2 ||
               patch.name.toLowerCase().contains(query.toLowerCase()) ||
-              patch.name.replaceAll(RegExp(r'[^\w\s]+'), '').toLowerCase().contains(query.toLowerCase()),
+              patch.getSimpleName().toLowerCase().contains(query.toLowerCase()),
         )
         .toList();
     if (_managerAPI.areUniversalPatchesEnabled()) {
@@ -225,9 +153,8 @@ class PatchesSelectorViewModel extends BaseViewModel {
     return locator<PatcherViewModel>().selectedApp!;
   }
 
-  bool isPatchNew(Patch patch) {
-    final List<Patch> savedPatches =
-        _managerAPI.getSavedPatches(selectedApp!.packageName);
+  bool isPatchNew(Patch patch, String packageName) {
+    final List<Patch> savedPatches = _managerAPI.getSavedPatches(packageName);
     if (savedPatches.isEmpty) {
       return false;
     } else {
@@ -236,12 +163,6 @@ class PatchesSelectorViewModel extends BaseViewModel {
     }
   }
 
-  bool newPatchExists() {
-    return patches.any(
-      (patch) => isPatchNew(patch),
-    );
-  }
-
   List<String> getSupportedVersions(Patch patch) {
     final PatchedApplication app = locator<PatcherViewModel>().selectedApp!;
     final Package? package = patch.compatiblePackages.firstWhereOrNull(
@@ -266,7 +187,7 @@ class PatchesSelectorViewModel extends BaseViewModel {
     final List<String> selectedPatches =
         this.selectedPatches.map((patch) => patch.name).toList();
     await _managerAPI.setSelectedPatches(
-      locator<PatcherViewModel>().selectedApp!.packageName,
+      locator<PatcherViewModel>().selectedApp!.originalPackageName,
       selectedPatches,
     );
   }
@@ -274,14 +195,14 @@ class PatchesSelectorViewModel extends BaseViewModel {
   Future<void> loadSelectedPatches(BuildContext context) async {
     if (_managerAPI.isPatchesChangeEnabled()) {
       final List<String> selectedPatches = await _managerAPI.getSelectedPatches(
-        locator<PatcherViewModel>().selectedApp!.packageName,
+        locator<PatcherViewModel>().selectedApp!.originalPackageName,
       );
       if (selectedPatches.isNotEmpty) {
         this.selectedPatches.clear();
         this.selectedPatches.addAll(
               patches.where((patch) => selectedPatches.contains(patch.name)),
             );
-        if (!_managerAPI.isVersionCompatibilityCheckEnabled()) {
+        if (!_managerAPI.areExperimentalPatchesEnabled()) {
           this.selectedPatches.removeWhere((patch) => !isPatchSupported(patch));
         }
       } else {

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

@@ -8,7 +8,6 @@ import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
 
 final _settingViewModel = SettingsViewModel();
@@ -25,114 +24,37 @@ class SUpdateTheme extends BaseViewModel {
 
   Future<void> setUseDynamicTheme(BuildContext context, bool value) async {
     await _managerAPI.setUseDynamicTheme(value);
-    final int currentTheme = (DynamicTheme.of(context)!.themeId ~/ 2) * 2;
-    await DynamicTheme.of(context)!.setTheme(currentTheme + (value ? 1 : 0));
+    final int currentTheme = DynamicTheme.of(context)!.themeId;
+    if (currentTheme.isEven) {
+      await DynamicTheme.of(context)!.setTheme(value ? 2 : 0);
+    } else {
+      await DynamicTheme.of(context)!.setTheme(value ? 3 : 1);
+    }
     notifyListeners();
   }
 
-  int getThemeMode() {
-    return _managerAPI.getThemeMode();
+  bool getDarkThemeStatus() {
+    return _managerAPI.getUseDarkTheme();
   }
 
-  Future<void> setThemeMode(BuildContext context, int value) async {
-    await _managerAPI.setThemeMode(value);
-    final bool isDynamicTheme = DynamicTheme.of(context)!.themeId.isEven;
-    await DynamicTheme.of(context)!.setTheme(value * 2 + (isDynamicTheme ? 0 : 1));
-    final bool isLight = value != 2 && (value == 1 || DynamicTheme.of(context)!.theme.brightness == Brightness.light);
+  Future<void> setUseDarkTheme(BuildContext context, bool value) async {
+    await _managerAPI.setUseDarkTheme(value);
+    final int currentTheme = DynamicTheme.of(context)!.themeId;
+    if (currentTheme < 2) {
+      await DynamicTheme.of(context)!.setTheme(value ? 1 : 0);
+    } else {
+      await DynamicTheme.of(context)!.setTheme(value ? 3 : 2);
+    }
     SystemChrome.setSystemUIOverlayStyle(
       SystemUiOverlayStyle(
         systemNavigationBarIconBrightness:
-        isLight ? Brightness.dark : Brightness.light,
+            value ? Brightness.light : Brightness.dark,
       ),
     );
     notifyListeners();
   }
-
-  I18nText getThemeModeName() {
-    switch (getThemeMode()) {
-      case 0:
-        return I18nText('settingsView.systemThemeLabel');
-      case 1:
-        return I18nText('settingsView.lightThemeLabel');
-      case 2:
-        return I18nText('settingsView.darkThemeLabel');
-      default:
-        return I18nText('settingsView.systemThemeLabel');
-    }
-  }
-
-  Future<void> showThemeDialog(BuildContext context) async {
-    final ValueNotifier<int> newTheme = ValueNotifier(getThemeMode());
-
-    return showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: I18nText('settingsView.themeModeLabel'),
-        icon: const Icon(Icons.palette),
-        contentPadding: const EdgeInsets.symmetric(vertical: 16),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: SingleChildScrollView(
-          child: ValueListenableBuilder(
-            valueListenable: newTheme,
-            builder: (context, value, child) {
-              return Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: <Widget>[
-                  RadioListTile(
-                    title: I18nText('settingsView.systemThemeLabel'),
-                    contentPadding: const EdgeInsets.symmetric(horizontal: 16),
-                    value: 0,
-                    groupValue: value,
-                    onChanged: (value) {
-                      newTheme.value = value!;
-                    },
-                  ),
-                  RadioListTile(
-                    title: I18nText('settingsView.lightThemeLabel'),
-                    contentPadding: const EdgeInsets.symmetric(horizontal: 16),
-                    value: 1,
-                    groupValue: value,
-                    onChanged: (value) {
-                      newTheme.value = value!;
-                    },
-                  ),
-                  RadioListTile(
-                    title: I18nText('settingsView.darkThemeLabel'),
-                    contentPadding: const EdgeInsets.symmetric(horizontal: 16),
-                    value: 2,
-                    groupValue: value,
-                    onChanged: (value) {
-                      newTheme.value = value!;
-                    },
-                  ),
-                ],
-              );
-            },
-          ),
-        ),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('cancelButton'),
-            onPressed: () {
-              Navigator.of(context).pop();
-            },
-          ),
-          CustomMaterialButton(
-            label: I18nText('okButton'),
-            onPressed: () {
-              setThemeMode(context, newTheme.value);
-              Navigator.of(context).pop();
-            },
-          ),
-        ],
-      ),
-    );
-  }
 }
 
-final sUpdateTheme = SUpdateTheme();
 class SUpdateThemeUI extends StatelessWidget {
   const SUpdateThemeUI({super.key});
 
@@ -141,10 +63,10 @@ class SUpdateThemeUI extends StatelessWidget {
     return SettingsSection(
       title: 'settingsView.appearanceSectionTitle',
       children: <Widget>[
-        ListTile(
+        SwitchListTile(
           contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
           title: I18nText(
-            'settingsView.themeModeLabel',
+            'settingsView.darkThemeLabel',
             child: const Text(
               '',
               style: TextStyle(
@@ -153,11 +75,12 @@ class SUpdateThemeUI extends StatelessWidget {
               ),
             ),
           ),
-          trailing: CustomMaterialButton(
-            label: sUpdateTheme.getThemeModeName(),
-            onPressed: () => { sUpdateTheme.showThemeDialog(context) },
+          subtitle: I18nText('settingsView.darkThemeHint'),
+          value: SUpdateTheme().getDarkThemeStatus(),
+          onChanged: (value) => SUpdateTheme().setUseDarkTheme(
+            context,
+            value,
           ),
-          onTap: () => { sUpdateTheme.showThemeDialog(context) },
         ),
         FutureBuilder<int>(
           future: _settingViewModel.getSdkVersion(),

lib/ui/views/settings/settings_view.dart

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

lib/ui/views/settings/settings_viewmodel.dart

@@ -71,16 +71,16 @@ class SettingsViewModel extends BaseViewModel {
           actions: [
             CustomMaterialButton(
               isFilled: false,
-              label: I18nText('yesButton'),
+              label: I18nText('noButton'),
               onPressed: () {
-                _managerAPI.setChangingToggleModified(true);
-                _managerAPI.setPatchesChangeEnabled(true);
                 Navigator.of(context).pop();
               },
             ),
             CustomMaterialButton(
-              label: I18nText('noButton'),
+              label: I18nText('yesButton'),
               onPressed: () {
+                _managerAPI.setChangingToggleModified(true);
+                _managerAPI.setPatchesChangeEnabled(true);
                 Navigator.of(context).pop();
               },
             ),
@@ -135,12 +135,12 @@ class SettingsViewModel extends BaseViewModel {
     notifyListeners();
   }
 
-  bool isVersionCompatibilityCheckEnabled() {
-    return _managerAPI.isVersionCompatibilityCheckEnabled();
+  bool areExperimentalPatchesEnabled() {
+    return _managerAPI.areExperimentalPatchesEnabled();
   }
 
-  void useVersionCompatibilityCheck(bool value) {
-    _managerAPI.enableVersionCompatibilityCheckStatus(value);
+  void useExperimentalPatches(bool value) {
+    _managerAPI.enableExperimentalPatchesStatus(value);
     notifyListeners();
   }
 
@@ -246,11 +246,6 @@ class SettingsViewModel extends BaseViewModel {
     }
   }
 
-  void resetAllOptions() {
-    _managerAPI.resetAllOptions();
-    _toast.showBottom('settingsView.resetStoredOptions');
-  }
-
   void resetSelectedPatches() {
     _managerAPI.resetLastSelectedPatches();
     _toast.showBottom('settingsView.resetStoredPatches');

lib/ui/widgets/appInfoView/app_info_view.dart

@@ -222,6 +222,22 @@ class AppInfoView extends StatelessWidget {
                       subtitle: Text(app.packageName),
                     ),
                     const SizedBox(height: 4),
+                    ListTile(
+                      contentPadding:
+                          const EdgeInsets.symmetric(horizontal: 20.0),
+                      title: I18nText(
+                        'appInfoView.originalPackageNameLabel',
+                        child: const Text(
+                          '',
+                          style: TextStyle(
+                            fontSize: 20,
+                            fontWeight: FontWeight.w500,
+                          ),
+                        ),
+                      ),
+                      subtitle: Text(app.originalPackageName),
+                    ),
+                    const SizedBox(height: 4),
                     ListTile(
                       contentPadding:
                           const EdgeInsets.symmetric(horizontal: 20.0),

lib/ui/widgets/appInfoView/app_info_viewmodel.dart

@@ -13,6 +13,7 @@ import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:revanced_manager/utils/string.dart';
 import 'package:stacked/stacked.dart';
 
 class AppInfoViewModel extends BaseViewModel {
@@ -146,7 +147,17 @@ class AppInfoViewModel extends BaseViewModel {
   }
 
   String getAppliedPatchesString(List<String> appliedPatches) {
-    return '• ${appliedPatches.join('\n• ')}';
+    final List<String> names = appliedPatches
+        .map(
+          (p) => p
+              .replaceAll('-', ' ')
+              .split('-')
+              .join(' ')
+              .toTitleCase()
+              .replaceFirst('Microg', 'MicroG'),
+        )
+        .toList();
+    return '\u2022 ${names.join('\n\u2022 ')}';
   }
 
   void openApp(PatchedApplication app) {

lib/ui/widgets/contributorsView/contributors_card.dart

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

lib/ui/widgets/homeView/installed_apps_card.dart

@@ -79,6 +79,8 @@ class InstalledAppsCard extends StatelessWidget {
                           icon: app.icon,
                           name: app.name,
                           patchDate: app.patchDate,
+                          changelog: app.changelog,
+                          isUpdatableApp: false,
                           onPressed: () =>
                               locator<HomeViewModel>().navigateToAppInfo(app),
                         ),

lib/ui/widgets/homeView/latest_commit_card.dart

@@ -75,7 +75,7 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
 
         const SizedBox(height: 16),
 
-        // Patches
+        // ReVanced Patches
         CustomCard(
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -84,7 +84,7 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: <Widget>[
-                    const Text('Patches'),
+                    const Text('ReVanced Patches'),
                     const SizedBox(height: 4),
                     Row(
                       children: <Widget>[

lib/ui/widgets/patcherView/patch_selector_card.dart

@@ -58,10 +58,8 @@ class PatchSelectorCard extends StatelessWidget {
 
   String _getPatchesSelection() {
     String text = '';
-    final List<Patch> selectedPatches = locator<PatcherViewModel>().selectedPatches;
-    selectedPatches.sort((a, b) => a.name.compareTo(b.name));
-    for (final Patch p in selectedPatches) {
-      text += '•  ${p.getSimpleName()}\n';
+    for (final Patch p in locator<PatcherViewModel>().selectedPatches) {
+      text += '\u2022  ${p.getSimpleName()}\n';
     }
     return text.substring(0, text.length - 1);
   }

lib/ui/widgets/patchesSelectorView/patch_item.dart

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

lib/ui/widgets/patchesSelectorView/patch_options_fields.dart

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

lib/ui/widgets/settingsView/settings_advanced_section.dart

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

lib/ui/widgets/settingsView/settings_debug_section.dart

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

lib/ui/widgets/settingsView/settings_experimental_patches.dart

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

lib/ui/widgets/settingsView/settings_experimental_universal_patches.dart

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

lib/ui/widgets/settingsView/settings_export_section.dart

@@ -45,46 +45,6 @@ class SExportSection extends StatelessWidget {
           subtitle: I18nText('settingsView.importPatchesHint'),
           onTap: () => _settingsViewModel.importPatches(context),
         ),
-        ListTile(
-          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
-          title: I18nText(
-            'settingsView.resetStoredPatchesLabel',
-            child: const Text(
-              '',
-              style: TextStyle(
-                fontSize: 20,
-                fontWeight: FontWeight.w500,
-              ),
-            ),
-          ),
-          subtitle: I18nText('settingsView.resetStoredPatchesHint'),
-          onTap: () => _showResetDialog(
-            context,
-            'settingsView.resetStoredPatchesDialogTitle',
-            'settingsView.resetStoredPatchesDialogText',
-            _settingsViewModel.resetSelectedPatches,
-          ),
-        ),
-        ListTile(
-          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
-          title: I18nText(
-            'settingsView.resetStoredOptionsLabel',
-            child: const Text(
-              '',
-              style: TextStyle(
-                fontSize: 20,
-                fontWeight: FontWeight.w500,
-              ),
-            ),
-          ),
-          subtitle: I18nText('settingsView.resetStoredOptionsHint'),
-          onTap: () => _showResetDialog(
-            context,
-            'settingsView.resetStoredOptionsDialogTitle',
-            'settingsView.resetStoredOptionsDialogText',
-            _settingsViewModel.resetAllOptions,
-          ),
-        ),
         ListTile(
           contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
           title: I18nText(
@@ -124,7 +84,7 @@ class SExportSection extends StatelessWidget {
         ListTile(
           contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
           title: I18nText(
-            'settingsView.regenerateKeystoreLabel',
+            'settingsView.resetStoredPatchesLabel',
             child: const Text(
               '',
               style: TextStyle(
@@ -133,26 +93,22 @@ class SExportSection extends StatelessWidget {
               ),
             ),
           ),
-          subtitle: I18nText('settingsView.regenerateKeystoreHint'),
-          onTap: () => _showDeleteKeystoreDialog(context),
+          subtitle: I18nText('settingsView.resetStoredPatchesHint'),
+          onTap: () => _showResetStoredPatchesDialog(context),
         ),
-        // SManageKeystorePasswordUI(),
       ],
     );
   }
 
-  Future<void> _showResetDialog(
-    context,
-    dialogTitle,
-    dialogText,
-    dialogAction,
-  ) {
+  Future<void> _showResetStoredPatchesDialog(context) {
     return showDialog(
       context: context,
       builder: (context) => AlertDialog(
-        title: I18nText(dialogTitle),
+        title: I18nText('settingsView.resetStoredPatchesDialogTitle'),
         backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: I18nText(dialogText),
+        content: I18nText(
+          'settingsView.resetStoredPatchesDialogText',
+        ),
         actions: <Widget>[
           CustomMaterialButton(
             isFilled: false,
@@ -163,32 +119,7 @@ class SExportSection extends StatelessWidget {
             label: I18nText('yesButton'),
             onPressed: () => {
               Navigator.of(context).pop(),
-              dialogAction(),
-            },
-          ),
-        ],
-      ),
-    );
-  }
-
-  Future<void> _showDeleteKeystoreDialog(context) {
-    return showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: I18nText('settingsView.regenerateKeystoreDialogTitle'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: I18nText('settingsView.regenerateKeystoreDialogText'),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
-            onPressed: () => Navigator.of(context).pop(),
-          ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
-            onPressed: () => {
-              Navigator.of(context).pop(),
-              _settingsViewModel.deleteKeystore(),
+              _settingsViewModel.resetSelectedPatches(),
             },
           ),
         ],

lib/ui/widgets/settingsView/settings_info_section.dart

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

lib/ui/widgets/settingsView/social_media_widget.dart

@@ -4,7 +4,6 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/social_media_item.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_icon.dart';
 
 class SocialMediaWidget extends StatelessWidget {
   const SocialMediaWidget({
@@ -43,12 +42,6 @@ class SocialMediaWidget extends StatelessWidget {
         child: const CustomCard(
           child: Column(
             children: <Widget>[
-              SocialMediaItem(
-                icon: Icon(CustomIcon.revancedIcon),
-                title: Text('Website'),
-                subtitle: Text('revanced.app'),
-                url: 'https://revanced.app',
-              ),
               SocialMediaItem(
                 icon: FaIcon(FontAwesomeIcons.github),
                 title: Text('GitHub'),
@@ -82,8 +75,8 @@ class SocialMediaWidget extends StatelessWidget {
               SocialMediaItem(
                 icon: FaIcon(FontAwesomeIcons.youtube),
                 title: Text('YouTube'),
-                subtitle: Text('youtube.com/@revanced'),
-                url: 'https://youtube.com/@revanced',
+                subtitle: Text('youtube.com/revanced'),
+                url: 'https://youtube.com/revanced',
               ),
             ],
           ),

lib/ui/widgets/shared/application_item.dart

@@ -1,5 +1,6 @@
 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_card.dart';
@@ -12,84 +13,151 @@ class ApplicationItem extends StatefulWidget {
     required this.icon,
     required this.name,
     required this.patchDate,
+    required this.changelog,
+    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();
 }
 
-class _ApplicationItemState extends State<ApplicationItem> {
+class _ApplicationItemState extends State<ApplicationItem>
+    with TickerProviderStateMixin {
+  late AnimationController _animationController;
 
   @override
   void initState() {
     super.initState();
+    _animationController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 300),
+    );
+  }
+
+  @override
+  void dispose() {
+    _animationController.dispose();
+    super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
+    final ExpandableController expController = ExpandableController();
     return Container(
       margin: const EdgeInsets.only(bottom: 16.0),
       child: CustomCard(
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Flexible(
-              child: Row(
-                children: [
-                  SizedBox(
-                    width: 40,
-                    child: Image.memory(widget.icon, height: 40, width: 40),
-                  ),
-                  const SizedBox(width: 19),
-                  Expanded(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: <Widget>[
-                        Text(
-                          widget.name,
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                          style: const TextStyle(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w500,
-                          ),
-                        ),
-                        Text(
-                          format(widget.patchDate),
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                          style: const TextStyle(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w500,
-                          ),
-                        ),
-                      ],
+        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(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Flexible(
+                child: Row(
+                  children: [
+                    SizedBox(
+                      width: 40,
+                      child: Image.memory(widget.icon, height: 40, width: 40),
                     ),
-                  ),
-                ],
-              ),
-            ),
-            Row(
-              children: [
-                const SizedBox(width: 8),
-                Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  crossAxisAlignment: CrossAxisAlignment.end,
-                  children: <Widget>[
-                    CustomMaterialButton(
-                      label: I18nText('applicationItem.infoButton'),
-                      onPressed: widget.onPressed,
+                    const SizedBox(width: 19),
+                    Expanded(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: <Widget>[
+                          Text(
+                            widget.name,
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: const TextStyle(
+                              fontSize: 16,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                          Text(
+                            format(widget.patchDate),
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: const TextStyle(
+                              fontSize: 16,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                        ],
+                      ),
                     ),
                   ],
                 ),
+              ),
+              Row(
+                children: [
+                  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>[
+                      CustomMaterialButton(
+                        label: widget.isUpdatableApp
+                            ? I18nText('applicationItem.patchButton')
+                            : I18nText('applicationItem.infoButton'),
+                        onPressed: widget.onPressed,
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ],
+          ),
+          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_icon.dart

@@ -1,9 +0,0 @@
-import 'package:flutter/widgets.dart';
-
-class CustomIcon {
-  CustomIcon._();
-
-  static const _kFontFam = 'CustomIcon';
-
-  static const IconData revancedIcon = IconData(0xe800, fontFamily: _kFontFam);
-}

lib/utils/check_for_supported_patch.dart

@@ -1,7 +1,6 @@
 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/ui/views/patcher/patcher_viewmodel.dart';
 
 bool isPatchSupported(Patch patch) {
@@ -13,49 +12,3 @@ bool isPatchSupported(Patch patch) {
             (pack.versions.isEmpty || pack.versions.contains(app.version)),
       );
 }
-
-bool hasUnsupportedRequiredOption(List<Option> options, Patch patch) {
-  final List<String> requiredOptionsType = [];
-  final List<String> supportedOptionsType = [
-    'StringPatchOption',
-    'BooleanPatchOption',
-    'IntPatchOption',
-    'StringListPatchOption',
-    'IntListPatchOption',
-    'LongListPatchOption',
-  ];
-  for (final Option option in options) {
-    if (option.required &&
-        option.value == null &&
-        locator<ManagerAPI>()
-                .getPatchOption(
-                  locator<PatcherViewModel>().selectedApp!.packageName,
-                  patch.name,
-                  option.key,
-                ) == null) {
-      requiredOptionsType.add(option.optionClassType);
-    }
-  }
-  for (final String optionType in requiredOptionsType) {
-    if (!supportedOptionsType.contains(optionType)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-List<Option> getNullRequiredOptions(List<Patch> patches, String packageName) {
-  final List<Option> requiredNullOptions = [];
-  for (final patch in patches) {
-    for (final patchOption in patch.options) {
-      if (!patch.excluded &&
-          patchOption.required &&
-          patchOption.value == null &&
-          locator<ManagerAPI>()
-                  .getPatchOption(packageName, patch.name, patchOption.key) == null) {
-        requiredNullOptions.add(patchOption);
-      }
-    }
-  }
-  return requiredNullOptions;
-}

pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 1.13.0+101300000
+version: 1.9.5+100900500
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
@@ -75,8 +75,6 @@ dependencies:
   flutter_markdown: ^0.6.14
   dio_cache_interceptor: ^3.4.0
   install_plugin: ^2.1.0
-  screenshot_callback: ^3.0.1
-  synchronized: ^3.1.0
 
 dev_dependencies:
   json_serializable: ^6.6.1
@@ -91,9 +89,5 @@ dev_dependencies:
 
 flutter:
   uses-material-design: true
-  fonts:
-    - family: CustomIcon
-      fonts:
-        - asset: fonts/custom-icons.ttf
   assets:
     - assets/i18n/

settings.gradle

@@ -1,2 +0,0 @@
-include ':build.gradle'
-project(':build.gradle').projectDir = new File(rootDir, 'android/build.gradle')