build: Bump version to v1.17.1

Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>
Co-authored-by: Ushie <ushiekane@gmail.com>

.github/ISSUE_TEMPLATE/feature-issue.yml

@@ -1,7 +1,7 @@
 name: ⭐ Feature request
 description: Create a new feature request.
 title: 'feat: <title>'
-labels: [feature-request]
+labels: 'feature request'
 body:
   - type: markdown
     attributes:

.github/workflows/pr-build.yml

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

.github/workflows/release-build.yml

@@ -12,10 +12,10 @@ jobs:
       - uses: actions/checkout@v4
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-      - name: Set up JDK 11
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: "11"
+          java-version: "17"
           distribution: "zulu"
       - uses: subosito/flutter-action@v2
         with:
@@ -23,7 +23,7 @@ jobs:
       - name: Set up Flutter
         run: flutter pub get
       - name: Generate files with Builder
-        run: flutter packages pub run build_runner build --delete-conflicting-outputs
+        run: dart run build_runner build --delete-conflicting-outputs
       - name: Build with Flutter
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.run/main.dart.run.xml

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

CONTRIBUTING.md

@@ -0,0 +1,88 @@
+<p align="center">
+  <picture>
+    <source
+      width="256px"
+      media="(prefers-color-scheme: dark)"
+      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
+    >
+    <img 
+      width="256px"
+      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
+    >
+  </picture>
+  <br>
+  <a href="https://revanced.app/">
+       <img height="24px" src="assets/revanced-logo/revanced-logo-round.svg" />
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://github.com/ReVanced">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="http://revanced.app/discord">
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://reddit.com/r/revancedapp">
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://t.me/app_revanced">
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://x.com/revancedapp">
+      <picture>
+         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://www.youtube.com/@ReVanced">
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+   </a>
+   <br>
+   <br>
+   Continuing the legacy of Vanced
+</p>
+
+# 👋 Contribution guidelines
+
+This document describes how to contribute to ReVanced Manager.
+
+## 📖 Resources to help you get started
+
+* The [documentation](/docs/README.md) provides steps to build ReVanced Manager from source
+* Our [backlog](https://github.com/orgs/ReVanced/projects/12) is where we keep track of what we're working on
+* [Issues](https://github.com/ReVanced/revanced-manager/issues) are where we keep track of bugs and feature requests
+
+## 🙏 Submitting a feature request
+
+Features can be requested by opening an issue using the
+[feature request issue template](https://github.com/ReVanced/revanced-manager/issues/new?assignees=&labels=feature-request&projects=&template=feature-issue.yml&title=feat%3A+%3Ctitle%3E).
+
+> [!NOTE]
+> We may reject your request at the discretion of ReVanced Manager's maintainers,
+> please provide good motivation for a request to be accepted.
+
+## 🐞 Submitting a bug report
+
+If you encounter a bug while using the ReVanced Manager app, open an issue using the
+[bug report issue template](https://github.com/ReVanced/revanced-manager/issues/new?assignees=&labels=bug&projects=&template=bug-issue.yml&title=bug%3A+%3Ctitle%3E).
+
+## 📝 How to contribute
+
+> [!NOTE]
+> We recommend that you discuss your changes with 
+> the maintainers of ReVanced Manager before contributing. 
+> This will help you determine whether your change is acceptable.
+
+1. Fork the repository and create a new branch based off the `dev` branch
+2. Commit your changes
+3. Open a pull request to the `dev` branch and reference issues that your pull request closes
+4. The maintainers of ReVanced Manager will review and provide suggestions. 
+   Once your pull request is approved and merged, it will be included in the next release of ReVanced Manager
+
+## 🤚 I want to contribute but don't know how to code
+
+Even if you don't know how to code, you can still contribute by 
+translating ReVanced Manager on [Crowdin](https://translate.revanced.app/).
+
+❤️ Thank you for considering contributing to ReVanced Manager.

README.md

@@ -1,35 +1,97 @@
+<p align="center">
+  <picture>
+    <source
+      width="256px"
+      media="(prefers-color-scheme: dark)"
+      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
+    >
+    <img 
+      width="256px"
+      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
+    >
+  </picture>
+  <br>
+  <a href="https://revanced.app/">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo-round.svg" />
+           <img height="24px" src="assets/revanced-logo/revanced-logo-round.svg" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://github.com/ReVanced">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="http://revanced.app/discord">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://reddit.com/r/revancedapp">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://t.me/app_revanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://x.com/revancedapp">
+      <picture>
+         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://www.youtube.com/@ReVanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+     </picture>
+   </a>
+   <br>
+   <br>
+   Continuing the legacy of Vanced
+</p>
+
 # 💊 ReVanced Manager
 
-The official ReVanced Manager based on Flutter.
+[![GitHub last commit](https://img.shields.io/github/last-commit/ReVanced/revanced-manager)](https://github.com/ReVanced/revanced-manager/commits "")
+[![GitHub commit activity](https://img.shields.io/github/commit-activity/w/ReVanced/revanced-manager)](https://github.com/ReVanced/revanced-manager/commits "")
+
+ReVanced Manager is an Android application that uses ReVanced Patcher to add, remove, and modify existing functionalities in Android applications.
+
+## 💪 Features
+
+We provide the some of the features are:
+
+* 📱 **Portable**: ReVanced Patcher that fit in your pocket;
+* 🤗 **Intuitive UI**: Help you manage your patched applications with easy-to-use interface;
+* 🛠️ **Customization**: Patch with third-party sources;
+* ✨ And a **lot more!**
 
 ## 🔽 Download
 
-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)
+You can get ReVanced Manager by downloading from [ReVanced site](https://revanced.app/download) or [GitHub releases](https://github.com/ReVanced/revanced-manager/releases).
 
-## 📝 Prerequisites
+## 📚 Everything else
 
-1. Android 8 or higher
+### 📄 Documentation
-2. Incompatible with certain ARMv7 devices
 
-## 📃 Documentation
+Documentation on how to use the application is available [here](/docs/README.md).
-The documentation can be found [here](https://github.com/revanced/revanced-manager/tree/main/docs).
 
-## 🔴 Issues
+### 👋 Contributing
 
-For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose).
+Thank you for considering contributing to ReVanced Manager, you can find the contribution guidelines [here](/CONTRIBUTING.md).
 
-## 🌐 Translation
+### 🔴 Issues
 
-[![Crowdin](https://badges.crowdin.net/revanced/localized.svg)](https://crowdin.com/project/revanced)
+For suggestions and bug reports, open an issue [here](https://github.com/ReVanced/revanced-manager/issues/choose).
 
-We're accepting translations on [Crowdin](https://translate.revanced.app).
+## ⚖️ License
 
-## 🛠️ Building Manager from source
+ReVanced Manager adopts the [GNU General Public License 3.0](/LICENSE), [tl;dr](https://www.tldrlegal.com/license/gnu-general-public-license-v3-gpl-3): You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build & install instructions.
-
-1. Setup flutter environment for your [platform](https://docs.flutter.dev/get-started/install)
-2. Clone the repository locally
-3. Add your GitHub token in gradle.properties like [this](/docs/4_building.md)
-4. Open the project in terminal
-5. Run `flutter pub get` in terminal
-6. Then `flutter packages pub run build_runner build --delete-conflicting-outputs` (Must be done on each git pull)
-7. To build release APK run `flutter build apk`

android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,35 +22,27 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    compileSdk 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_17
     }
-
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
-
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
-
     defaultConfig {
         applicationId "app.revanced.manager.flutter"
-        minSdkVersion 26
+        minSdk 26
-        targetSdkVersion 33
+        targetSdk 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
-
     buildTypes {
         release {
             shrinkResources false
@@ -70,11 +63,32 @@ android {
                 abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
             }
         }
+        profile {
+            shrinkResources false
+            minifyEnabled false
+            resValue "string", "app_name", "ReVanced Manager Profile"
+            applicationIdSuffix ".profile"
+            signingConfig signingConfigs.debug
+            ndk {
+                abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
+            }
+        }
+    }
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging true
+            excludes += ['/prebuilt/**']
+        }
+        resources {
+            excludes += ['/prebuilt/**']
+        }
     }
 
-    packagingOptions {
+    namespace 'app.revanced.manager.flutter'
-        exclude '/prebuilt/**'
+}
-    }
+
+kotlin {
+    jvmToolchain(17)
 }
 
 flutter {
@@ -85,7 +99,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:19.1.0"
 
     // Signing & aligning
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")

android/app/src/debug/AndroidManifest.xml

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

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="app.revanced.manager.flutter">
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.INTERNET" />
 
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
@@ -24,8 +22,7 @@
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:largeHeap="true"
-        android:requestLegacyExternalStorage="true"
+        android:requestLegacyExternalStorage="true">
-        android:extractNativeLibs="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"

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

@@ -1,5 +1,7 @@
 package app.revanced.manager.flutter
 
+import android.app.SearchManager
+import android.content.Intent
 import android.os.Handler
 import android.os.Looper
 import app.revanced.manager.flutter.utils.Aapt
@@ -15,7 +17,9 @@ import app.revanced.patcher.patch.PatchResult
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
+import kotlinx.coroutines.InternalCoroutinesApi
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.runBlocking
 import org.json.JSONArray
 import org.json.JSONObject
@@ -25,6 +29,7 @@ import java.io.StringWriter
 import java.util.logging.LogRecord
 import java.util.logging.Logger
 
+
 class MainActivity : FlutterActivity() {
     private val handler = Handler(Looper.getMainLooper())
     private lateinit var installerChannel: MethodChannel
@@ -38,6 +43,17 @@ class MainActivity : FlutterActivity() {
 
         val patcherChannel = "app.revanced.manager.flutter/patcher"
         val installerChannel = "app.revanced.manager.flutter/installer"
+        val openBrowserChannel = "app.revanced.manager.flutter/browser"
+
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, openBrowserChannel).setMethodCallHandler { call, result ->
+            if (call.method == "openBrowser") {
+                val searchQuery = call.argument<String>("query")
+                openBrowser(searchQuery)
+                result.success(null)
+            } else {
+                result.notImplemented()
+            }
+        }
 
         val mainChannel =
             MethodChannel(flutterEngine.dartExecutor.binaryMessenger, patcherChannel)
@@ -98,8 +114,10 @@ class MainActivity : FlutterActivity() {
                     val cacheDirPath = call.argument<String>("cacheDirPath")!!
 
                     try {
+                        val patchBundleFile = File(patchBundleFilePath)
+                        patchBundleFile.setWritable(false)
                         patches = PatchBundleLoader.Dex(
-                            File(patchBundleFilePath),
+                            patchBundleFile,
                             optimizedDexDirectory = File(cacheDirPath)
                         )
                     } catch (ex: Exception) {
@@ -131,24 +149,34 @@ class MainActivity : FlutterActivity() {
                                 })
                                 put("options", JSONArray().apply {
                                     it.options.values.forEach { option ->
-                                        val optionJson = JSONObject().apply option@{
+                                        JSONObject().apply {
                                             put("key", option.key)
                                             put("title", option.title)
                                             put("description", option.description)
                                             put("required", option.required)
 
-                                            when (val value = option.value) {
+                                            fun JSONObject.putValue(
-                                                null -> put("value", null)
+                                                value: Any?,
-                                                is Array<*> -> put("value", JSONArray().apply {
+                                                key: String = "value"
-
+                                            ) = if (value is Array<*>) put(
+                                                key,
+                                                JSONArray().apply {
                                                     value.forEach { put(it) }
                                                 })
-                                                else -> put("value", option.value)
+                                            else put(key, value)
-                                            }
 
-                                            put("optionClassType", option::class.simpleName)
+                                            putValue(option.default)
-                                        }
+
-                                        put(optionJson)
+                                            option.values?.let { values ->
+                                                put("values",
+                                                    JSONObject().apply {
+                                                        values.forEach { (key, value) ->
+                                                            putValue(value, key)
+                                                        }
+                                                    })
+                                            } ?: put("values", null)
+                                            put("valueType", option.valueType)
+                                        }.let(::put)
                                     }
                                 })
                             }.let(::put)
@@ -161,6 +189,16 @@ class MainActivity : FlutterActivity() {
         }
     }
 
+    fun openBrowser(query: String?) {
+        val intent = Intent(Intent.ACTION_WEB_SEARCH).apply {
+            putExtra(SearchManager.QUERY, query)
+        }
+        if (intent.resolveActivity(packageManager) != null) {
+            startActivity(intent)
+        }
+    }
+    
+    @OptIn(InternalCoroutinesApi::class)
     private fun runPatcher(
         result: MethodChannel.Result,
         originalFilePath: String,
@@ -283,12 +321,12 @@ class MainActivity : FlutterActivity() {
                     acceptPatches(patches)
 
                     runBlocking {
-                        apply(false).collect { patchResult: PatchResult ->
+                        apply(false).collect(FlowCollector { patchResult: PatchResult ->
                             if (cancel) {
                                 handler.post { stopResult!!.success(null) }
                                 this.cancel()
                                 this@apply.close()
-                                return@collect
+                                return@FlowCollector
                             }
 
                             val msg = patchResult.exception?.let {
@@ -301,7 +339,7 @@ class MainActivity : FlutterActivity() {
 
                             updateProgress(progress, "", msg)
                             progress += progressStep
-                        }
+                        })
                     }
                 }
 

android/app/src/profile/AndroidManifest.xml

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

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.9.0'
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,6 +25,8 @@ allprojects {
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
     project.evaluationDependsOn(':app')
 }
 

android/gradle.properties

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

android/gradle/wrapper/gradle-wrapper.properties

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

android/settings.gradle

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

assets/i18n/en_US.json

@@ -111,6 +111,8 @@
 
         "downloadToast": "Download function is not available yet",
 
+        "requireSuggestedAppVersionDialogText": "The version of the app you have selected does not match the suggested version. Please select the app that matches the suggested version.\n\nSelected version: v{selected}\nSuggested version: v{suggested}\n\nTo proceed anyway, disable \"Require suggested app version\" in the settings.",
+
         "featureNotAvailable": "Feature not implemented",
         "featureNotAvailableText": "This application is a split APK and cannot be selected. Unfortunately, this feature is only available for rooted users at the moment. However, you can still install the application by selecting its APK files from your device's storage instead"
     },
@@ -135,6 +137,7 @@
         "setRequiredOption": "Some patches require options to be set:\n\n{patches}\n\nPlease set them before continuing."
     },
     "patchOptionsView": {
+        "customValue": "Custom value",
         "resetOptionsTooltip": "Reset patch options",
         "viewTitle": "Patch options",
         "saveOptions": "Save",
@@ -233,8 +236,12 @@
         "autoUpdatePatchesHint": "Automatically update patches to the latest version",
         "universalPatchesLabel": "Show universal patches",
         "universalPatchesHint": "Display all apps and universal patches (may slow down the app list)",
+
         "versionCompatibilityCheckLabel": "Version compatibility check",
         "versionCompatibilityCheckHint": "Restricts patches to supported app versions",
+        "requireSuggestedAppVersionLabel": "Require suggested app version",
+        "requireSuggestedAppVersionHint": "Enforce selection of suggested app version",
+        "requireSuggestedAppVersionDialogText": "Selecting an app that is not the suggested version may cause unexpected issues.\n\nDo you want to proceed anyways?",
 
         "aboutLabel": "About",
         "snackbarMessage": "Copied to clipboard",

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

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

docs/4_building.md

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

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/main.dart

@@ -11,12 +11,10 @@ import 'package:revanced_manager/services/revanced_api.dart';
 import 'package:revanced_manager/ui/theme/dynamic_theme_builder.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_view.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:stacked_themes/stacked_themes.dart';
 import 'package:timezone/data/latest.dart' as tz;
 
 late SharedPreferences prefs;
 Future main() async {
-  await ThemeManager.initialise();
   await setupLocator();
   WidgetsFlutterBinding.ensureInitialized();
   await locator<ManagerAPI>().initialize();
@@ -32,7 +30,7 @@ Future main() async {
 }
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {

lib/models/patch.dart

@@ -13,12 +13,15 @@ class Patch {
   });
 
   factory Patch.fromJson(Map<String, dynamic> json) {
-    // See: https://github.com/ReVanced/revanced-manager/issues/1364#issuecomment-1760414618
+    _migrateV16ToV17(json);
+
+    return _$PatchFromJson(json);
+  }
+
+  static void _migrateV16ToV17(Map<String, dynamic> json) {
     if (json['options'] == null) {
       json['options'] = [];
     }
-
-    return _$PatchFromJson(json);
   }
 
   final String name;
@@ -57,18 +60,37 @@ class Option {
     required this.title,
     required this.description,
     required this.value,
+    required this.values,
     required this.required,
-    required this.optionClassType,
+    required this.valueType,
   });
 
-  factory Option.fromJson(Map<String, dynamic> json) => _$OptionFromJson(json);
+  factory Option.fromJson(Map<String, dynamic> json) {
+    _migrateV17ToV19(json);
+
+    return _$OptionFromJson(json);
+  }
+
+  static void _migrateV17ToV19(Map<String, dynamic> json) {
+    if (json['valueType'] == null) {
+      final type = json['optionClassType'];
+      if (type is String) {
+        json['valueType'] = type
+            .replaceAll('PatchOption', '')
+            .replaceAll('List', 'Array');
+
+        json['optionClassType'] = null;
+      }
+    }
+  }
 
   final String key;
   final String title;
   final String description;
-  dynamic value;
+  final dynamic value;
+  final Map<String, dynamic>? values;
   final bool required;
-  final String optionClassType;
+  final String valueType;
 
   Map toJson() => _$OptionToJson(this);
 }

lib/services/manager_api.dart

@@ -34,6 +34,7 @@ class ManagerAPI {
   Patch? selectedPatch;
   BuildContext? ctx;
   bool isRooted = false;
+  bool suggestedAppVersionSelected = true;
   bool isDynamicThemeAvailable = false;
   String storedPatchesFile = '/selected-patches.json';
   String keystoreFile =
@@ -259,6 +260,14 @@ class ManagerAPI {
     await _prefs.setBool('versionCompatibilityCheckEnabled', value);
   }
 
+  bool isRequireSuggestedAppVersionEnabled() {
+    return _prefs.getBool('requireSuggestedAppVersionEnabled') ?? true;
+  }
+
+  Future<void> enableRequireSuggestedAppVersionStatus(bool value) async {
+    await _prefs.setBool('requireSuggestedAppVersionEnabled', value);
+  }
+
   Future<void> setKeystorePassword(String password) async {
     await _prefs.setString('keystorePassword', password);
   }
@@ -573,8 +582,8 @@ class ManagerAPI {
     return showDialog(
       barrierDismissible: false,
       context: context,
-      builder: (context) => WillPopScope(
+      builder: (context) => PopScope(
-        onWillPop: () async => false,
+        canPop: false,
         child: AlertDialog(
           backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
           title: I18nText('warning'),

lib/services/patcher_api.dart

@@ -1,10 +1,10 @@
 import 'dart:io';
 
 import 'package:collection/collection.dart';
-import 'package:cr_file_saver/file_saver.dart';
 import 'package:device_apps/device_apps.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_file_dialog/flutter_file_dialog.dart';
 import 'package:injectable/injectable.dart';
 import 'package:install_plugin/install_plugin.dart';
 import 'package:path_provider/path_provider.dart';
@@ -13,7 +13,7 @@ import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/root_api.dart';
-import 'package:share_extend/share_extend.dart';
+import 'package:share_plus/share_plus.dart';
 
 @lazySingleton
 class PatcherAPI {
@@ -236,10 +236,11 @@ void exportPatchedFile(String appName, String version) {
   try {
     if (outFile != null) {
       final String newName = _getFileName(appName, version);
-      CRFileSaver.saveFileWithDialog(
+      FlutterFileDialog.saveFile(
-        SaveFileDialogParams(
+          params: SaveFileDialogParams(
           sourceFilePath: outFile!.path,
-          destinationFileName: newName,
+          fileName: newName,
+          mimeTypesFilter: ['application/vnd.android.package-archive'],
         ),
       );
     }
@@ -258,7 +259,7 @@ void sharePatchedFile(String appName, String version) {
       final String newPath =
           outFile!.path.substring(0, lastSeparator + 1) + newName;
       final File shareFile = outFile!.copySync(newPath);
-      ShareExtend.share(shareFile.path, 'file');
+      Share.shareXFiles([XFile(shareFile.path)]);
     }
   } on Exception catch (e) {
     if (kDebugMode) {
@@ -286,10 +287,10 @@ Future<void> exportPatcherLog(String logs) async {
   final String fileName = 'revanced-manager_patcher_$dateTime.txt';
   final File log = File('${logDir.path}/$fileName');
   log.writeAsStringSync(logs);
-  CRFileSaver.saveFileWithDialog(
+  FlutterFileDialog.saveFile(
-    SaveFileDialogParams(
+     params:SaveFileDialogParams(
       sourceFilePath: log.path,
-      destinationFileName: fileName,
+      fileName: fileName,
     ),
   );
 }

lib/theme.dart

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

lib/ui/theme/dynamic_theme_builder.dart

@@ -12,11 +12,11 @@ import 'package:stacked_services/stacked_services.dart';
 
 class DynamicThemeBuilder extends StatefulWidget {
   const DynamicThemeBuilder({
-    Key? key,
+    super.key,
     required this.title,
     required this.home,
     required this.localizationsDelegates,
-  }) : super(key: key);
+  });
   final String title;
   final Widget home;
   final Iterable<LocalizationsDelegate> localizationsDelegates;

lib/ui/views/app_selector/app_selector_view.dart

@@ -8,7 +8,7 @@ import 'package:revanced_manager/ui/widgets/shared/search_bar.dart';
 import 'package:stacked/stacked.dart' hide SkeletonLoader;
 
 class AppSelectorView extends StatefulWidget {
-  const AppSelectorView({Key? key}) : super(key: key);
+  const AppSelectorView({super.key});
 
   @override
   State<AppSelectorView> createState() => _AppSelectorViewState();
@@ -28,7 +28,6 @@ class _AppSelectorViewState extends State<AppSelectorView> {
           icon: const Icon(Icons.sd_storage),
           onPressed: () {
             model.selectAppFromStorage(context);
-            Navigator.of(context).pop();
           },
         ),
         body: CustomScrollView(
@@ -113,9 +112,13 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                                         context,
                                         app.packageName,
                                       ),
+                                      onLinkTap: () =>
+                                          model.searchSuggestedVersionOnWeb(
+                                        packageName: app.packageName,
+                                      ),
                                     ),
                                   )
-                                  .toList(),
+                                  ,
                               ...model
                                   .getFilteredAppsNames(_query)
                                   .map(
@@ -127,9 +130,13 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                                       onTap: () {
                                         model.showDownloadToast();
                                       },
+                                      onLinkTap: () =>
+                                          model.searchSuggestedVersionOnWeb(
+                                        packageName: app,
+                                      ),
                                     ),
                                   )
-                                  .toList(),
+                                  ,
                               const SizedBox(height: 70.0),
                             ],
                           ),

lib/ui/views/app_selector/app_selector_viewmodel.dart

@@ -1,9 +1,10 @@
 import 'dart:io';
 
 import 'package:device_apps/device_apps.dart';
-import 'package:file_picker/file_picker.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_file_dialog/flutter_file_dialog.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
@@ -70,7 +71,53 @@ class AppSelectorViewModel extends BaseViewModel {
     return true;
   }
 
-  Future<void> selectApp(ApplicationWithIcon application) async {
+  Future<void> searchSuggestedVersionOnWeb({
+    required String packageName,
+  }) async {
+    final String suggestedVersion = getSuggestedVersion(packageName);
+
+    if (suggestedVersion.isNotEmpty) {
+      await openDefaultBrowser('$packageName apk version v$suggestedVersion');
+    } else {
+      await openDefaultBrowser('$packageName apk');
+    }
+  }
+
+  Future<void> openDefaultBrowser(String query) async {
+    if (Platform.isAndroid) {
+      try {
+        const platform = MethodChannel('app.revanced.manager.flutter/browser');
+        await platform.invokeMethod('openBrowser', {'query': query});
+      } catch (e) {
+        if (kDebugMode) {
+          print(e);
+        }
+      }
+    } else {
+      throw 'Platform not supported';
+    }
+  }
+
+  Future<void> selectApp(
+    BuildContext context,
+    ApplicationWithIcon application, [
+    bool isFromStorage = false,
+  ]) async {
+    final String suggestedVersion =
+        getSuggestedVersion(application.packageName);
+    if (application.versionName != suggestedVersion && suggestedVersion.isNotEmpty) {
+      _managerAPI.suggestedAppVersionSelected = false;
+      if (_managerAPI.isRequireSuggestedAppVersionEnabled() &&
+          context.mounted) {
+        return showRequireSuggestedAppVersionDialog(
+          context,
+          application.versionName!,
+          suggestedVersion,
+        );
+      }
+    } else {
+      _managerAPI.suggestedAppVersionSelected = true;
+    }
     locator<PatcherViewModel>().selectedApp = PatchedApplication(
       name: application.appName,
       packageName: application.packageName,
@@ -78,8 +125,12 @@ class AppSelectorViewModel extends BaseViewModel {
       apkFilePath: application.apkFilePath,
       icon: application.icon,
       patchDate: DateTime.now(),
+      isFromStorage: isFromStorage,
     );
     await locator<PatcherViewModel>().loadLastSelectedPatches();
+    if (context.mounted) {
+      Navigator.pop(context);
+    }
   }
 
   Future<void> canSelectInstalled(
@@ -89,27 +140,64 @@ class AppSelectorViewModel extends BaseViewModel {
     final app =
         await DeviceApps.getApp(packageName, true) as ApplicationWithIcon?;
     if (app != null) {
-      if (await checkSplitApk(packageName) && !isRooted) {
+      final bool isSplitApk = await checkSplitApk(packageName);
+      if (isRooted || !isSplitApk) {
+        if (context.mounted) {
+          await selectApp(context, app);
+        }
+        final List<Option> requiredNullOptions = getNullRequiredOptions(
+          locator<PatcherViewModel>().selectedPatches,
+          packageName,
+        );
+        if (requiredNullOptions.isNotEmpty) {
+          locator<PatcherViewModel>().showRequiredOptionDialog();
+        }
+      } else {
         if (context.mounted) {
           return showSelectFromStorageDialog(context);
         }
-      } else if (!await checkSplitApk(packageName) || isRooted) {
-        await selectApp(app);
-        if (context.mounted) {
-          Navigator.pop(context);
-        }
-        final List<Option> requiredNullOptions = getNullRequiredOptions(locator<PatcherViewModel>().selectedPatches, packageName);
-        if(requiredNullOptions.isNotEmpty){
-          locator<PatcherViewModel>().showRequiredOptionDialog();
-        }
       }
     }
   }
 
+  Future showRequireSuggestedAppVersionDialog(
+    BuildContext context,
+    String selectedVersion,
+    String suggestedVersion,
+  ) async {
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        title: I18nText('warning'),
+        content: I18nText(
+          'appSelectorView.requireSuggestedAppVersionDialogText',
+          translationParams: {
+            'suggested': suggestedVersion,
+            'selected': selectedVersion,
+          },
+          child: const Text(
+            '',
+            style: TextStyle(
+              fontSize: 16,
+              fontWeight: FontWeight.w500,
+            ),
+          ),
+        ),
+        actions: [
+          CustomMaterialButton(
+            label: I18nText('okButton'),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+        ],
+      ),
+    );
+  }
+
   Future showSelectFromStorageDialog(BuildContext context) async {
     return showDialog(
       context: context,
-      builder: (context) => SimpleDialog(
+      builder: (innerContext) => SimpleDialog(
         alignment: Alignment.center,
         contentPadding:
             const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
@@ -118,7 +206,7 @@ class AppSelectorViewModel extends BaseViewModel {
           Icon(
             Icons.block,
             size: 28,
-            color: Theme.of(context).colorScheme.primary,
+            color: Theme.of(innerContext).colorScheme.primary,
           ),
           const SizedBox(height: 20),
           I18nText(
@@ -145,12 +233,10 @@ class AppSelectorViewModel extends BaseViewModel {
           ),
           const SizedBox(height: 30),
           CustomMaterialButton(
-            onPressed: () => selectAppFromStorage(context).then(
+            onPressed: () async {
-              (_) {
+              Navigator.pop(innerContext);
-                Navigator.pop(context);
+              await selectAppFromStorage(context);
-                Navigator.pop(context);
+            },
-              },
-            ),
             label: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
@@ -164,7 +250,7 @@ class AppSelectorViewModel extends BaseViewModel {
           CustomMaterialButton(
             isFilled: false,
             onPressed: () {
-              Navigator.pop(context);
+              Navigator.pop(innerContext);
             },
             label: Row(
               mainAxisAlignment: MainAxisAlignment.center,
@@ -181,13 +267,14 @@ class AppSelectorViewModel extends BaseViewModel {
 
   Future<void> selectAppFromStorage(BuildContext context) async {
     try {
-      final FilePickerResult? result = await FilePicker.platform.pickFiles(
+      final String? result = await FlutterFileDialog.pickFile(
-        type: FileType.custom,
+        params: const OpenFileDialogParams(
-        allowedExtensions: ['apk'],
+          fileExtensionsFilter: ['apk'],
+        ),
       );
-      if (result != null && result.files.single.path != null) {
+      if (result != null) {
-        final File apkFile = File(result.files.single.path!);
+        final File apkFile = File(result);
-        final List<String> pathSplit = result.files.single.path!.split('/');
+        final List<String> pathSplit = result.split('/');
         pathSplit.removeLast();
         final Directory filePickerCacheDir = Directory(pathSplit.join('/'));
         final Iterable<File> deletableFiles =
@@ -202,17 +289,8 @@ class AppSelectorViewModel extends BaseViewModel {
           apkFile.path,
           true,
         ) as ApplicationWithIcon?;
-        if (application != null) {
+        if (application != null && context.mounted) {
-          locator<PatcherViewModel>().selectedApp = PatchedApplication(
+          await selectApp(context, application, true);
-            name: application.appName,
-            packageName: application.packageName,
-            version: application.versionName!,
-            apkFilePath: result.files.single.path!,
-            icon: application.icon,
-            patchDate: DateTime.now(),
-            isFromStorage: true,
-          );
-          locator<PatcherViewModel>().loadLastSelectedPatches();
         }
       }
     } on Exception catch (e) {

lib/ui/views/contributors/contributors_view.dart

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

lib/ui/views/home/home_view.dart

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

lib/ui/views/home/home_viewmodel.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: use_build_context_synchronously
 import 'dart:async';
 import 'dart:io';
-import 'package:cross_connectivity/cross_connectivity.dart';
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -64,8 +64,9 @@ class HomeViewModel extends BaseViewModel {
     flutterLocalNotificationsPlugin
         .resolvePlatformSpecificImplementation<
             AndroidFlutterLocalNotificationsPlugin>()
-        ?.requestPermission();
+        ?.requestNotificationsPermission();
-    final bool isConnected = await Connectivity().checkConnection();
+    final bool isConnected = await Connectivity().checkConnectivity() !=
+        ConnectivityResult.none;
     if (!isConnected) {
       _toast.showBottom('homeView.noConnection');
     }

lib/ui/views/installer/installer_view.dart

@@ -8,17 +8,18 @@ import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
 class InstallerView extends StatelessWidget {
-  const InstallerView({Key? key}) : super(key: key);
+  const InstallerView({super.key});
 
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<InstallerViewModel>.reactive(
       onViewModelReady: (model) => model.initialize(context),
       viewModelBuilder: () => InstallerViewModel(),
-      builder: (context, model, child) => WillPopScope(
+      builder: (context, model, child) => PopScope(
+        onPopInvoked: (bool didPop) => model.onPopInvoked(context, didPop),
         child: SafeArea(
           top: false,
-          bottom: false,
+          bottom: model.isPatching,
           child: Scaffold(
             floatingActionButton: Visibility(
               visible: !model.isPatching && !model.hasErrors,
@@ -83,7 +84,7 @@ class InstallerView extends StatelessWidget {
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
                   ),
-                  onBackButtonPressed: () => model.onWillPop(context),
+                  onBackButtonPressed: () => model.onBackButtonInvoked(context),
                   bottom: PreferredSize(
                     preferredSize: const Size(double.infinity, 1.0),
                     child: GradientProgressIndicator(progress: model.progress),
@@ -111,7 +112,6 @@ class InstallerView extends StatelessWidget {
             ),
           ),
         ),
-        onWillPop: () => model.onWillPop(context),
       ),
     );
   }

lib/ui/views/installer/installer_viewmodel.dart

@@ -18,7 +18,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/utils/about_info.dart';
 import 'package:screenshot_callback/screenshot_callback.dart';
 import 'package:stacked/stacked.dart';
-import 'package:wakelock/wakelock.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
 
 class InstallerViewModel extends BaseViewModel {
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
@@ -74,7 +74,7 @@ class InstallerViewModel extends BaseViewModel {
         screenshotDetected(context);
       }
     });
-    await Wakelock.enable();
+    await WakelockPlus.enable();
     await handlePlatformChannelMethods();
     await runPatcher();
   }
@@ -171,7 +171,7 @@ class InstallerViewModel extends BaseViewModel {
           } // ignore
         }
       }
-      await Wakelock.disable();
+      await WakelockPlus.disable();
     } on Exception catch (e) {
       if (kDebugMode) {
         print(e);
@@ -179,9 +179,48 @@ class InstallerViewModel extends BaseViewModel {
     }
   }
 
+  void _trimLogs(List<String> logLines, String keyword, String? newString) {
+    final lineCount = logLines.where((line) => line.endsWith(keyword)).length;
+    final index = logLines.indexWhere((line) => line.endsWith(keyword));
+    if (newString != null && lineCount > 0) {
+      logLines.insert(index, newString.replaceAll('{lineCount}', lineCount.toString()));
+    }
+    logLines.removeWhere((lines) => lines.endsWith(keyword));
+  }
+
+  dynamic _getPatchOptionValue(String patchName, Option option) {
+    final Option? savedOption = _managerAPI.getPatchOption(_app.packageName, patchName, option.key);
+    if (savedOption != null) {
+      return savedOption.value;
+    } else {
+      return option.value;
+    }
+  }
+
+  String _formatPatches(List<Patch> patches) {
+    if (patches.isEmpty) {
+      return 'None';
+    }
+    return patches.map((p) => p.name + (p.options.isEmpty ? '' : ' [${p.options.map((o) => '${o.title}: ${_getPatchOptionValue(p.name, o)}').join(", ")}]')).toList().join(', ');
+  }
+
   Future<void> copyLogs() async {
     final info = await AboutInfo.getInfo();
 
+    // Trim out extra lines
+    final logsTrimmed = logs.split('\n');
+    _trimLogs(logsTrimmed, 'succeeded', 'Applied {lineCount} patches');
+    _trimLogs(logsTrimmed, '.dex', 'Compiled {lineCount} dex files');
+
+    // Get patches added / removed
+    final defaultPatches = _patcherAPI.getFilteredPatches(_app.packageName).where((p) => !p.excluded).toList();
+    final patchesAdded = _patches.where((p) => !defaultPatches.contains(p)).toList();
+    final patchesRemoved = defaultPatches.where((p) => !_patches.contains(p)).toList();
+
+    // Options changed
+    final patchesChanged = defaultPatches.where((p) => _patches.contains(p) && p.options.any((o) => _getPatchOptionValue(p.name, o) != o.value)).toList();
+
+    // Add Info
     final formattedLogs = [
       '- Device Info',
       'ReVanced Manager: ${info['version']}',
@@ -194,7 +233,9 @@ class InstallerViewModel extends BaseViewModel {
       '\n- Patch Info',
       'App: ${_app.packageName} v${_app.version}',
       'Patches version: ${_managerAPI.patchesVersion}',
-      'Patches: ${_patches.map((p) => p.name + (p.options.isEmpty ? '' : ' [${p.options.map((o) => '${o.title}: ${o.value}').join(", ")}]')).toList().join(", ")}',
+      'Patches added: ${_formatPatches(patchesAdded)}',
+      'Patches removed: ${_formatPatches(patchesRemoved)}',
+      'Options changed: ${_formatPatches(patchesChanged)}',
 
       '\n- Settings',
       'Allow changing patch selection: ${_managerAPI.isPatchesChangeEnabled()}',
@@ -204,7 +245,7 @@ class InstallerViewModel extends BaseViewModel {
       'Integration source: ${_managerAPI.getIntegrationsRepo()}',
       
       '\n- Logs',
-      logs,
+      logsTrimmed.join('\n'),
     ];
 
     Clipboard.setData(ClipboardData(text: formattedLogs.join('\n')));
@@ -335,6 +376,7 @@ class InstallerViewModel extends BaseViewModel {
       isCanceled = true;
       update(0.5, 'Canceling...', 'Canceling patching process');
       await _patcherAPI.stopPatcher();
+      await WakelockPlus.disable();
       update(-100.0, 'Canceled...', 'Press back to exit');
     } on Exception catch (e) {
       if (kDebugMode) {
@@ -419,25 +461,38 @@ class InstallerViewModel extends BaseViewModel {
     }
   }
 
-  Future<bool> onWillPop(BuildContext context) async {
+  bool canPop() {
-    if (isPatching) {
+    return !isPatching;
-      if (!cancel) {
+  }
-        cancel = true;
+
-        _toast.showBottom('installerView.pressBackAgain');
+  void onBackButtonInvoked(BuildContext context) {
-      } else if (!isCanceled) {
+    if (canPop()) {
-        await stopPatcher();
+      onPopInvoked(context, true);
-      } else {
-        _toast.showBottom('installerView.noExit');
-      }
-      return false;
-    }
-    if (!cancel) {
-      cleanPatcher();
     } else {
-      _patcherAPI.cleanPatcher();
+      onPopInvoked(context, false);
+    }
+  }
+
+  Future<void> onPopInvoked(BuildContext context, bool didPop) async {
+    if (didPop) {
+      if (!cancel) {
+        cleanPatcher();
+      } else {
+        _patcherAPI.cleanPatcher();
+      }
+      screenshotCallback.dispose();
+      Navigator.of(context).pop();
+    } else {
+      if (isPatching) {
+        if (!cancel) {
+          cancel = true;
+          _toast.showBottom('installerView.pressBackAgain');
+        } else if (!isCanceled) {
+          await stopPatcher();
+        } else {
+          _toast.showBottom('installerView.noExit');
+        }
+      }
     }
-    screenshotCallback.dispose();
-    Navigator.of(context).pop();
-    return true;
   }
 }

lib/ui/views/navigation/navigation_view.dart

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

lib/ui/views/patch_options/patch_options_view.dart

@@ -61,8 +61,8 @@ class PatchOptionsView extends StatelessWidget {
                   child: Column(
                     children: [
                       for (final Option option in model.visibleOptions)
-                        if (option.optionClassType == 'StringPatchOption' ||
+                        if (option.valueType == 'String' ||
-                            option.optionClassType == 'IntPatchOption')
+                            option.valueType == 'Int')
                           IntAndStringPatchOption(
                             patchOption: option,
                             removeOption: (option) {
@@ -72,7 +72,7 @@ class PatchOptionsView extends StatelessWidget {
                               model.modifyOptions(value, option);
                             },
                           )
-                        else if (option.optionClassType == 'BooleanPatchOption')
+                        else if (option.valueType == 'Boolean')
                           BooleanPatchOption(
                             patchOption: option,
                             removeOption: (option) {
@@ -82,10 +82,10 @@ class PatchOptionsView extends StatelessWidget {
                               model.modifyOptions(value, option);
                             },
                           )
-                        else if (option.optionClassType ==
+                        else if (option.valueType ==
-                                'StringListPatchOption' ||
+                                'StringArray' ||
-                            option.optionClassType == 'IntListPatchOption' ||
+                            option.valueType == 'IntArray' ||
-                            option.optionClassType == 'LongListPatchOption')
+                            option.valueType == 'LongArray')
                           IntStringLongListPatchOption(
                             patchOption: option,
                             removeOption: (option) {

lib/ui/views/patch_options/patch_options_viewmodel.dart

@@ -38,11 +38,11 @@ class PatchOptionsViewModel extends BaseViewModel {
                   option.required &&
                   !savedOptions.any((sOption) => sOption.key == option.key),
             )
-            .toList(),
+            ,
       ];
     } else {
       visibleOptions = [
-        ...options.where((option) => option.required).toList(),
+        ...options.where((option) => option.required),
       ];
     }
   }
@@ -62,7 +62,10 @@ class PatchOptionsViewModel extends BaseViewModel {
     for (final Option option in options) {
       if (!visibleOptions.any((vOption) => vOption.key == option.key)) {
         _managerAPI.clearPatchOption(
-            selectedApp, _managerAPI.selectedPatch!.name, option.key);
+          selectedApp,
+          _managerAPI.selectedPatch!.name,
+          option.key,
+        );
       }
     }
     for (final Option option in visibleOptions) {
@@ -70,7 +73,10 @@ class PatchOptionsViewModel extends BaseViewModel {
         requiredNullOptions.add(option);
       } else {
         _managerAPI.setPatchOption(
-            option, _managerAPI.selectedPatch!.name, selectedApp);
+          option,
+          _managerAPI.selectedPatch!.name,
+          selectedApp,
+        );
       }
     }
     if (requiredNullOptions.isNotEmpty) {
@@ -89,7 +95,8 @@ class PatchOptionsViewModel extends BaseViewModel {
     final Option modifiedOption = Option(
       title: option.title,
       description: option.description,
-      optionClassType: option.optionClassType,
+      values: option.values,
+      valueType: option.valueType,
       value: value,
       required: option.required,
       key: option.key,
@@ -107,7 +114,8 @@ class PatchOptionsViewModel extends BaseViewModel {
       final Option defaultOption = Option(
         title: option.title,
         description: option.description,
-        optionClassType: option.optionClassType,
+        values: option.values,
+        valueType: option.valueType,
         value: option.value is List ? option.value.toList() : option.value,
         required: option.required,
         key: option.key,
@@ -172,21 +180,27 @@ class PatchOptionsViewModel extends BaseViewModel {
               },
               child: Padding(
                 padding: const EdgeInsets.all(8.0),
-                child: Column(
+                child: Row(
-                  crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    Text(
+                    Expanded(
-                      e.title,
+                      child: Column(
-                      style: const TextStyle(
+                        crossAxisAlignment: CrossAxisAlignment.start,
-                        fontSize: 16,
+                        children: [
-                      ),
+                          Text(
-                    ),
+                            e.title,
-                    const SizedBox(height: 4),
+                            style: const TextStyle(
-                    Text(
+                              fontSize: 16,
-                      e.description,
+                            ),
-                      style: TextStyle(
+                          ),
-                        fontSize: 14,
+                          const SizedBox(height: 4),
-                        color: Theme.of(context).colorScheme.onSurface,
+                          Text(
+                            e.description,
+                            style: TextStyle(
+                              fontSize: 14,
+                              color: Theme.of(context).colorScheme.onSurface,
+                            ),
+                          ),
+                        ],
                       ),
                     ),
                   ],
@@ -229,7 +243,10 @@ Future<void> showRequiredOptionNullDialog(
               locator<PatcherViewModel>().notifyListeners();
               for (final option in options) {
                 managerAPI.clearPatchOption(
-                    selectedApp, managerAPI.selectedPatch!.name, option.key);
+                  selectedApp,
+                  managerAPI.selectedPatch!.name,
+                  option.key,
+                );
               }
               Navigator.of(context)
                 ..pop()

lib/ui/views/patcher/patcher_view.dart

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

lib/ui/views/patcher/patcher_viewmodel.dart

@@ -1,6 +1,10 @@
 // ignore_for_file: use_build_context_synchronously
 
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:injectable/injectable.dart';
 import 'package:revanced_manager/app/app.locator.dart';
@@ -157,6 +161,29 @@ class PatcherViewModel extends BaseViewModel {
     return text;
   }
 
+  String getCurrentVersionString(BuildContext context) {
+    return '${FlutterI18n.translate(
+      context,
+      'appSelectorCard.currentVersion',
+    )}: v${selectedApp!.version}';
+  }
+
+  Future<void> searchSuggestedVersionOnWeb() async {
+    final String suggestedVersion =
+        _patcherAPI.getSuggestedVersion(selectedApp!.packageName);
+
+    if (suggestedVersion.isNotEmpty) {
+      await openDefaultBrowser(
+          '${selectedApp!.packageName} apk version v$suggestedVersion');
+    } else {
+      await openDefaultBrowser('${selectedApp!.packageName} apk');
+    }
+  }
+
+  String getSuggestedVersion() {
+    return _patcherAPI.getSuggestedVersion(selectedApp!.packageName);
+  }
+
   String getSuggestedVersionString(BuildContext context) {
     String suggestedVersion =
         _patcherAPI.getSuggestedVersion(selectedApp!.packageName);
@@ -169,14 +196,26 @@ class PatcherViewModel extends BaseViewModel {
       suggestedVersion = 'v$suggestedVersion';
     }
     return '${FlutterI18n.translate(
-      context,
-      'appSelectorCard.currentVersion',
-    )}: v${selectedApp!.version}\n${FlutterI18n.translate(
       context,
       'appSelectorCard.suggestedVersion',
     )}: $suggestedVersion';
   }
 
+  Future<void> openDefaultBrowser(String query) async {
+    if (Platform.isAndroid) {
+      try {
+        const platform = MethodChannel('app.revanced.manager.flutter/browser');
+        await platform.invokeMethod('openBrowser', {'query': query});
+      } catch (e) {
+        if (kDebugMode) {
+          print(e);
+        }
+      }
+    } else {
+      throw 'Platform not supported';
+    }
+  }
+
   Future<void> loadLastSelectedPatches() async {
     this.selectedPatches.clear();
     removedPatches.clear();

lib/ui/views/patches_selector/patches_selector_view.dart

@@ -3,13 +3,11 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/ui/views/patches_selector/patches_selector_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/patchesSelectorView/patch_item.dart';
 import 'package:revanced_manager/ui/widgets/shared/search_bar.dart';
-import 'package:revanced_manager/utils/check_for_supported_patch.dart';
 import 'package:stacked/stacked.dart';
 
 class PatchesSelectorView extends StatefulWidget {
-  const PatchesSelectorView({Key? key}) : super(key: key);
+  const PatchesSelectorView({super.key});
 
   @override
   State<PatchesSelectorView> createState() => _PatchesSelectorViewState();
@@ -182,187 +180,39 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                               ),
                             ],
                           ),
-                          if (model.newPatchExists())
+                          if (model.getQueriedPatches(_query).any((patch) => model.isPatchNew(patch)))
                             Column(
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
-                                Padding(
+                                model.getPatchCategory(context, 'patchesSelectorView.newPatches'),
-                                  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(
+                                    return model.getPatchItem(context, patch);
-                                      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(
+                                if (model.getQueriedPatches(_query).any((patch) => !model.isPatchNew(patch) && patch.compatiblePackages.isNotEmpty))
-                                  padding: const EdgeInsets.symmetric(
+                                  model.getPatchCategory(context, 'patchesSelectorView.patches'),
-                                    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) {
+                              if (patch.compatiblePackages.isNotEmpty && !model.isPatchNew(patch)) {
-                                return PatchItem(
+                                return model.getPatchItem(context, patch);
-                                  name: patch.name,
-                                  simpleName: patch.getSimpleName(),
-                                  description: patch.description ?? '',
-                                  packageVersion: model.getAppInfo().version,
-                                  supportedPackageVersions:
-                                      model.getSupportedVersions(patch),
-                                  isUnsupported: !isPatchSupported(patch),
-                                  isChangeEnabled:
-                                      _managerAPI.isPatchesChangeEnabled(),
-                                  hasUnsupportedPatchOption:
-                                      hasUnsupportedRequiredOption(
-                                    patch.options,
-                                    patch,
-                                  ),
-                                  options: patch.options,
-                                  isSelected: model.isSelected(patch),
-                                  navigateToOptions: (options) =>
-                                      model.navigateToPatchOptions(
-                                    options,
-                                    patch,
-                                  ),
-                                  onChanged: (value) => model.selectPatch(
-                                    patch,
-                                    value,
-                                    context,
-                                  ),
-                                );
                               } else {
                                 return Container();
                               }
                             },
                           ),
-                          if (_managerAPI.areUniversalPatchesEnabled())
+                          if (model.getQueriedPatches(_query).any((patch) => patch.compatiblePackages.isEmpty))
                             Column(
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
-                                Padding(
+                                model.getPatchCategory(context, 'patchesSelectorView.universalPatches'),
-                                  padding: const EdgeInsets.symmetric(
-                                    vertical: 10.0,
-                                  ),
-                                  child: Container(
-                                    padding: const EdgeInsets.only(
-                                      top: 10.0,
-                                      bottom: 10.0,
-                                      left: 5.0,
-                                    ),
-                                    child: I18nText(
-                                      'patchesSelectorView.universalPatches',
-                                      child: Text(
-                                        '',
-                                        style: TextStyle(
-                                          color: Theme.of(context)
-                                              .colorScheme
-                                              .primary,
-                                        ),
-                                      ),
-                                    ),
-                                  ),
-                                ),
                                 ...model.getQueriedPatches(_query).map((patch) {
-                                  if (patch.compatiblePackages.isEmpty) {
+                                  if (patch.compatiblePackages.isEmpty && !model.isPatchNew(patch)) {
-                                    return PatchItem(
+                                    return model.getPatchItem(context, patch);
-                                      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();
                                   }

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -9,6 +9,7 @@ import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/patchesSelectorView/patch_item.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';
@@ -224,6 +225,57 @@ class PatchesSelectorViewModel extends BaseViewModel {
     }
   }
 
+  Widget getPatchItem(BuildContext context, Patch patch) {
+    return PatchItem(
+      name: patch.name,
+      simpleName: patch.getSimpleName(),
+      description: patch.description ?? '',
+      packageVersion: getAppInfo().version,
+      supportedPackageVersions: getSupportedVersions(patch),
+      isUnsupported: !isPatchSupported(patch),
+      isChangeEnabled: _managerAPI.isPatchesChangeEnabled(),
+      hasUnsupportedPatchOption: hasUnsupportedRequiredOption(
+        patch.options,
+        patch,
+      ),
+      options: patch.options,
+      isSelected: isSelected(patch),
+      navigateToOptions: (options) => navigateToPatchOptions(
+        options,
+        patch,
+      ),
+      onChanged: (value) => selectPatch(
+        patch,
+        value,
+        context,
+      ),
+    );
+  }
+
+  Widget getPatchCategory(BuildContext context, String category) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(
+        vertical: 10.0,
+      ),
+      child: Container(
+        padding: const EdgeInsets.only(
+          top: 10.0,
+          bottom: 10.0,
+          left: 5.0,
+        ),
+        child: I18nText(
+          category,
+          child: Text(
+            '',
+            style: TextStyle(
+              color: Theme.of(context).colorScheme.primary,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
   PatchedApplication getAppInfo() {
     return locator<PatcherViewModel>().selectedApp!;
   }
@@ -239,12 +291,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(

lib/ui/views/settings/settings_view.dart

@@ -13,7 +13,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
 class SettingsView extends StatelessWidget {
-  const SettingsView({Key? key}) : super(key: key);
+  const SettingsView({super.key});
 
   static const _settingsDivider =
       Divider(thickness: 1.0, indent: 20.0, endIndent: 20.0);

lib/ui/views/settings/settings_viewmodel.dart

@@ -1,8 +1,7 @@
 import 'dart:io';
-import 'package:cr_file_saver/file_saver.dart';
-import 'package:file_picker/file_picker.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_file_dialog/flutter_file_dialog.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:logcat/logcat.dart';
 import 'package:path_provider/path_provider.dart';
@@ -14,7 +13,7 @@ import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patches_selector/patches_selector_viewmodel.dart';
 import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_update_language.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
-import 'package:share_extend/share_extend.dart';
+import 'package:share_plus/share_plus.dart';
 import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
 
@@ -141,6 +140,57 @@ class SettingsViewModel extends BaseViewModel {
     notifyListeners();
   }
 
+  bool isRequireSuggestedAppVersionEnabled() {
+    return _managerAPI.isRequireSuggestedAppVersionEnabled();
+  }
+
+  Future<void>? showRequireSuggestedAppVersionDialog(
+      BuildContext context, bool value,) {
+    if (!value) {
+      return showDialog(
+        context: context,
+        builder: (context) => AlertDialog(
+          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+          title: I18nText('warning'),
+          content: I18nText(
+            'settingsView.requireSuggestedAppVersionDialogText',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          actions: [
+            CustomMaterialButton(
+              isFilled: false,
+              label: I18nText('yesButton'),
+              onPressed: () {
+                _managerAPI.enableRequireSuggestedAppVersionStatus(false);
+                Navigator.of(context).pop();
+              },
+            ),
+            CustomMaterialButton(
+              label: I18nText('noButton'),
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+            ),
+          ],
+        ),
+      );
+    } else {
+      _managerAPI.enableRequireSuggestedAppVersionStatus(true);
+
+      if (!_managerAPI.suggestedAppVersionSelected) {
+        _patcherViewModel.selectedApp = null;
+      }
+
+      return null;
+    }
+  }
+
   void deleteKeystore() {
     _managerAPI.deleteKeystore();
     _toast.showBottom('settingsView.regeneratedKeystore');
@@ -159,10 +209,10 @@ class SettingsViewModel extends BaseViewModel {
       if (outFile.existsSync()) {
         final String dateTime =
             DateTime.now().toString().replaceAll(' ', '_').split('.').first;
-        await CRFileSaver.saveFileWithDialog(
+        await FlutterFileDialog.saveFile(
-          SaveFileDialogParams(
+            params: SaveFileDialogParams(
             sourceFilePath: outFile.path,
-            destinationFileName: 'selected_patches_$dateTime.json',
+            fileName: 'selected_patches_$dateTime.json',
           ),
         );
         _toast.showBottom('settingsView.exportedPatches');
@@ -179,12 +229,13 @@ class SettingsViewModel extends BaseViewModel {
   Future<void> importPatches(BuildContext context) async {
     if (isPatchesChangeEnabled()) {
       try {
-        final FilePickerResult? result = await FilePicker.platform.pickFiles(
+        final String? result = await FlutterFileDialog.pickFile(
-          type: FileType.custom,
+          params: const OpenFileDialogParams(
-          allowedExtensions: ['json'],
+            fileExtensionsFilter: ['json'],
+          ),
         );
-        if (result != null && result.files.single.path != null) {
+        if (result != null) {
-          final File inFile = File(result.files.single.path!);
+          final File inFile = File(result);
           inFile.copySync(_managerAPI.storedPatchesFile);
           inFile.delete();
           if (_patcherViewModel.selectedApp != null) {
@@ -209,10 +260,10 @@ class SettingsViewModel extends BaseViewModel {
       if (outFile.existsSync()) {
         final String dateTime =
             DateTime.now().toString().replaceAll(' ', '_').split('.').first;
-        await CRFileSaver.saveFileWithDialog(
+        await FlutterFileDialog.saveFile(
-          SaveFileDialogParams(
+            params: SaveFileDialogParams(
             sourceFilePath: outFile.path,
-            destinationFileName: 'keystore_$dateTime.keystore',
+            fileName: 'keystore_$dateTime.keystore',
           ),
         );
         _toast.showBottom('settingsView.exportedKeystore');
@@ -228,9 +279,9 @@ class SettingsViewModel extends BaseViewModel {
 
   Future<void> importKeystore() async {
     try {
-      final FilePickerResult? result = await FilePicker.platform.pickFiles();
+      final String? result = await FlutterFileDialog.pickFile();
-      if (result != null && result.files.single.path != null) {
+      if (result != null) {
-        final File inFile = File(result.files.single.path!);
+        final File inFile = File(result);
         inFile.copySync(_managerAPI.keystoreFile);
 
         _toast.showBottom('settingsView.importedKeystore');
@@ -276,6 +327,6 @@ class SettingsViewModel extends BaseViewModel {
         File('${logDir.path}/revanced-manager_logcat_$dateTime.log');
     final String logs = await Logcat.execute();
     logcat.writeAsStringSync(logs);
-    ShareExtend.share(logcat.path, 'file');
+    await Share.shareXFiles([XFile(logcat.path)]);
   }
 }

lib/ui/widgets/appInfoView/app_info_view.dart

@@ -9,9 +9,9 @@ import 'package:stacked/stacked.dart';
 
 class AppInfoView extends StatelessWidget {
   const AppInfoView({
-    Key? key,
+    super.key,
     required this.app,
-  }) : super(key: key);
+  });
   final PatchedApplication app;
 
   @override

lib/ui/widgets/appSelectorView/app_skeleton_loader.dart

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

lib/ui/widgets/appSelectorView/installed_app_item.dart

@@ -5,7 +5,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class InstalledAppItem extends StatefulWidget {
   const InstalledAppItem({
-    Key? key,
+    super.key,
     required this.name,
     required this.pkgName,
     required this.icon,
@@ -13,7 +13,9 @@ class InstalledAppItem extends StatefulWidget {
     required this.suggestedVersion,
     required this.installedVersion,
     this.onTap,
-  }) : super(key: key);
+    this.onLinkTap,
+  });
+
   final String name;
   final String pkgName;
   final Uint8List icon;
@@ -21,6 +23,7 @@ class InstalledAppItem extends StatefulWidget {
   final String suggestedVersion;
   final String installedVersion;
   final Function()? onTap;
+  final Function()? onLinkTap;
 
   @override
   State<InstalledAppItem> createState() => _InstalledAppItemState();
@@ -71,17 +74,52 @@ class _InstalledAppItemState extends State<InstalledAppItem> {
                     ),
                   ),
                   Wrap(
+                    crossAxisAlignment: WrapCrossAlignment.center,
                     children: [
-                      I18nText(
+                      Material(
-                        'suggested',
+                        color: Theme.of(context).colorScheme.secondaryContainer,
-                        translationParams: {
+                        borderRadius:
-                          'version': widget.suggestedVersion.isEmpty
+                            const BorderRadius.all(Radius.circular(8)),
-                              ? FlutterI18n.translate(
+                        child: InkWell(
-                                  context,
+                          onTap: widget.onLinkTap,
-                                  'appSelectorCard.allVersions',
+                          borderRadius:
-                                )
+                              const BorderRadius.all(Radius.circular(8)),
-                              : 'v${widget.suggestedVersion}',
+                          child: Container(
-                        },
+                            padding: const EdgeInsets.all(4),
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                I18nText(
+                                  'suggested',
+                                  translationParams: {
+                                    'version': widget.suggestedVersion.isEmpty
+                                        ? FlutterI18n.translate(
+                                            context,
+                                            'appSelectorCard.allVersions',
+                                          )
+                                        : 'v${widget.suggestedVersion}',
+                                  },
+                                  child: Text(
+                                    '',
+                                    style: TextStyle(
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSecondaryContainer,
+                                    ),
+                                  ),
+                                ),
+                                const SizedBox(width: 4),
+                                Icon(
+                                  Icons.search,
+                                  size: 16,
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .onSecondaryContainer,
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
                       ),
                       const SizedBox(width: 4),
                       Text(

lib/ui/widgets/appSelectorView/not_installed_app_item.dart

@@ -4,16 +4,19 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class NotInstalledAppItem extends StatefulWidget {
   const NotInstalledAppItem({
-    Key? key,
+    super.key,
     required this.name,
     required this.patchesCount,
     required this.suggestedVersion,
     this.onTap,
-  }) : super(key: key);
+    this.onLinkTap,
+  });
+
   final String name;
   final int patchesCount;
   final String suggestedVersion;
   final Function()? onTap;
+  final Function()? onLinkTap;
 
   @override
   State<NotInstalledAppItem> createState() => _NotInstalledAppItem();
@@ -65,17 +68,52 @@ class _NotInstalledAppItem extends State<NotInstalledAppItem> {
                     ),
                   ),
                   Wrap(
+                    crossAxisAlignment: WrapCrossAlignment.center,
                     children: [
-                      I18nText(
+                      Material(
-                        'suggested',
+                        color: Theme.of(context).colorScheme.secondaryContainer,
-                        translationParams: {
+                        borderRadius:
-                          'version': widget.suggestedVersion.isEmpty
+                            const BorderRadius.all(Radius.circular(8)),
-                              ? FlutterI18n.translate(
+                        child: InkWell(
-                                  context,
+                          onTap: widget.onLinkTap,
-                                  'appSelectorCard.allVersions',
+                          borderRadius:
-                                )
+                              const BorderRadius.all(Radius.circular(8)),
-                              : 'v${widget.suggestedVersion}',
+                          child: Container(
-                        },
+                            padding: const EdgeInsets.all(4),
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                I18nText(
+                                  'suggested',
+                                  translationParams: {
+                                    'version': widget.suggestedVersion.isEmpty
+                                        ? FlutterI18n.translate(
+                                            context,
+                                            'appSelectorCard.allVersions',
+                                          )
+                                        : 'v${widget.suggestedVersion}',
+                                  },
+                                  child: Text(
+                                    '',
+                                    style: TextStyle(
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSecondaryContainer,
+                                    ),
+                                  ),
+                                ),
+                                const SizedBox(width: 4),
+                                Icon(
+                                  Icons.search,
+                                  size: 16,
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .onSecondaryContainer,
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
                       ),
                       const SizedBox(width: 4),
                       Text(

lib/ui/widgets/contributorsView/contributors_card.dart

@@ -7,10 +7,10 @@ import 'package:url_launcher/url_launcher.dart';
 
 class ContributorsCard extends StatefulWidget {
   const ContributorsCard({
-    Key? key,
+    super.key,
     required this.title,
     required this.contributors,
-  }) : super(key: key);
+  });
   final String title;
   final List<dynamic> contributors;
 

lib/ui/widgets/homeView/installed_apps_card.dart

@@ -10,7 +10,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 //ignore: must_be_immutable
 class InstalledAppsCard extends StatelessWidget {
-  InstalledAppsCard({Key? key}) : super(key: key);
+  InstalledAppsCard({super.key});
 
   List<PatchedApplication> apps = locator<HomeViewModel>().patchedInstalledApps;
   final ManagerAPI _managerAPI = locator<ManagerAPI>();

lib/ui/widgets/homeView/latest_commit_card.dart

@@ -7,10 +7,10 @@ import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 
 class LatestCommitCard extends StatefulWidget {
   const LatestCommitCard({
-    Key? key,
+    super.key,
     required this.model,
     required this.parentContext,
-  }) : super(key: key);
+  });
   final HomeViewModel model;
   final BuildContext parentContext;
 

lib/ui/widgets/patcherView/app_selector_card.dart

@@ -7,9 +7,10 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class AppSelectorCard extends StatelessWidget {
   const AppSelectorCard({
-    Key? key,
+    super.key,
     required this.onPressed,
-  }) : super(key: key);
+  });
+
   final Function() onPressed;
 
   @override
@@ -61,11 +62,52 @@ class AppSelectorCard extends StatelessWidget {
             Container()
           else
             Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
               children: [
                 const SizedBox(height: 4),
                 Text(
-                  locator<PatcherViewModel>()
+                  locator<PatcherViewModel>().getCurrentVersionString(context),
-                      .getSuggestedVersionString(context),
+                ),
+                Row(
+                  children: [
+                    Material(
+                      color: Theme.of(context).colorScheme.secondaryContainer,
+                      borderRadius: const BorderRadius.all(Radius.circular(8)),
+                      child: InkWell(
+                        onTap: () {
+                          locator<PatcherViewModel>()
+                              .searchSuggestedVersionOnWeb();
+                        },
+                        borderRadius:
+                            const BorderRadius.all(Radius.circular(8)),
+                        child: Container(
+                          padding: const EdgeInsets.all(4),
+                          child: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              Text(
+                                locator<PatcherViewModel>()
+                                    .getSuggestedVersionString(context),
+                                style: TextStyle(
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .onSecondaryContainer,
+                                ),
+                              ),
+                              const SizedBox(width: 4),
+                              Icon(
+                                Icons.search,
+                                size: 16,
+                                color: Theme.of(context)
+                                    .colorScheme
+                                    .onSecondaryContainer,
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
                 ),
               ],
             ),

lib/ui/widgets/patcherView/patch_selector_card.dart

@@ -7,9 +7,9 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class PatchSelectorCard extends StatelessWidget {
   const PatchSelectorCard({
-    Key? key,
+    super.key,
     required this.onPressed,
-  }) : super(key: key);
+  });
   final Function() onPressed;
 
   @override

lib/ui/widgets/patchesSelectorView/patch_item.dart

@@ -10,7 +10,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 // ignore: must_be_immutable
 class PatchItem extends StatefulWidget {
   PatchItem({
-    Key? key,
+    super.key,
     required this.name,
     required this.simpleName,
     required this.description,
@@ -23,7 +23,7 @@ class PatchItem extends StatefulWidget {
     required this.onChanged,
     required this.navigateToOptions,
     required this.isChangeEnabled,
-  }) : super(key: key);
+  });
   final String name;
   final String simpleName;
   final String description;

lib/ui/widgets/patchesSelectorView/patch_options_fields.dart

@@ -1,6 +1,6 @@
-import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_file_dialog/flutter_file_dialog.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
@@ -59,13 +59,27 @@ class IntAndStringPatchOption extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final ValueNotifier patchOptionValue = ValueNotifier(patchOption.value);
+    String getKey() {
+      if (patchOption.value != null && patchOption.values != null) {
+        final List values = patchOption.values!.entries
+            .where((e) => e.value == patchOption.value)
+            .toList();
+        if (values.isNotEmpty) {
+          return values.first.key;
+        }
+      }
+      return '';
+    }
+
     return PatchOption(
       widget: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           TextFieldForPatchOption(
             value: patchOption.value,
-            optionType: patchOption.optionClassType,
+            values: patchOption.values,
+            optionType: patchOption.valueType,
+            selectedKey: getKey(),
             onChanged: (value) {
               patchOptionValue.value = value;
               onChanged(value, patchOption);
@@ -119,17 +133,41 @@ class IntStringLongListPatchOption extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final String type = patchOption.optionClassType;
+    final List<dynamic> values = List.from(patchOption.value ?? []);
-    final List<dynamic> values = patchOption.value ?? [];
     final ValueNotifier patchOptionValue = ValueNotifier(values);
+    final String type = patchOption.valueType;
+
+    String getKey(dynamic value) {
+      if (value != null && patchOption.values != null) {
+        final List values = patchOption.values!.entries
+            .where((e) => e.value.toString() == value)
+            .toList();
+        if (values.isNotEmpty) {
+          return values.first.key;
+        }
+      }
+      return '';
+    }
+
+    bool isCustomValue() {
+      if (values.length == 1 && patchOption.values != null) {
+        if (getKey(values[0]) != '') {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    bool isTextFieldVisible = isCustomValue();
+
     return PatchOption(
-      widget: Column(
+      widget: ValueListenableBuilder(
-        crossAxisAlignment: CrossAxisAlignment.start,
+        valueListenable: patchOptionValue,
-        children: [
+        builder: (context, value, child) {
-          ValueListenableBuilder(
+          return Column(
-            valueListenable: patchOptionValue,
+            crossAxisAlignment: CrossAxisAlignment.start,
-            builder: (context, value, child) {
+            children: [
-              return ListView.builder(
+              ListView.builder(
                 shrinkWrap: true,
                 itemCount: value.length,
                 physics: const NeverScrollableScrollPhysics(),
@@ -137,16 +175,42 @@ class IntStringLongListPatchOption extends StatelessWidget {
                   final e = values[index];
                   return TextFieldForPatchOption(
                     value: e.toString(),
+                    values: patchOption.values,
                     optionType: type,
+                    selectedKey: value.length > 1 ? '' : getKey(e),
+                    showDropdown: index == 0,
                     onChanged: (newValue) {
-                      values[index] = type == 'StringListPatchOption'
+                      if (newValue is List) {
-                          ? newValue
+                        values.clear();
-                          : type == 'IntListPatchOption'
+                        isTextFieldVisible = false;
-                              ? int.parse(newValue)
+                        values.add(newValue.toString());
-                              : num.parse(newValue);
+                      } else {
+                        isTextFieldVisible = true;
+                        if (values.length == 1 &&
+                            values[0].toString().startsWith('[') &&
+                            type.contains('Array')) {
+                          values.clear();
+                          values.addAll(patchOption.value);
+                        } else {
+                          values[index] = type == 'StringArray'
+                              ? newValue
+                              : type == 'IntArray'
+                                  ? int.parse(
+                                      newValue.toString().isEmpty
+                                          ? '0'
+                                          : newValue.toString(),
+                                    )
+                                  : num.parse(
+                                      newValue.toString().isEmpty
+                                          ? '0'
+                                          : newValue.toString(),
+                                    );
+                        }
+                      }
+                      patchOptionValue.value = List.from(values);
                       onChanged(values, patchOption);
                     },
-                    removeValue: (value) {
+                    removeValue: () {
                       patchOptionValue.value = List.from(patchOptionValue.value)
                         ..removeAt(index);
                       values.removeAt(index);
@@ -154,44 +218,46 @@ class IntStringLongListPatchOption extends StatelessWidget {
                     },
                   );
                 },
-              );
+              ),
-            },
+              if (isTextFieldVisible) ...[
-          ),
+                const SizedBox(height: 4),
-          const SizedBox(height: 4),
+                Align(
-          Align(
+                  alignment: Alignment.centerLeft,
-            alignment: Alignment.centerLeft,
+                  child: TextButton(
-            child: TextButton(
+                    onPressed: () {
-              onPressed: () {
+                      if (type == 'StringArray') {
-                if (type == 'StringListPatchOption') {
+                        patchOptionValue.value =
-                  patchOptionValue.value = List.from(patchOptionValue.value)
+                            List.from(patchOptionValue.value)..add('');
-                    ..add('');
+                        values.add('');
-                  values.add('');
+                      } else {
-                } else {
+                        patchOptionValue.value =
-                  patchOptionValue.value = List.from(patchOptionValue.value)
+                            List.from(patchOptionValue.value)..add(0);
-                    ..add(0);
+                        values.add(0);
-                  values.add(0);
+                      }
-                }
+                      onChanged(values, patchOption);
-                onChanged(values, patchOption);
+                    },
-              },
+                    child: Row(
-              child: Row(
+                      mainAxisSize: MainAxisSize.min,
-                mainAxisSize: MainAxisSize.min,
+                      children: [
-                children: [
+                        const Icon(Icons.add, size: 20),
-                  const Icon(Icons.add, size: 20),
+                        I18nText(
-                  I18nText(
+                          'add',
-                    'add',
+                          child: const Text(
-                    child: const Text(
+                            '',
-                      '',
+                            style: TextStyle(
-                      style: TextStyle(
+                              fontSize: 14,
-                        fontSize: 14,
+                              fontWeight: FontWeight.w600,
-                        fontWeight: FontWeight.w600,
+                            ),
-                      ),
+                          ),
+                        ),
+                      ],
                     ),
                   ),
-                ],
+                ),
-              ),
+              ],
-            ),
+            ],
-          ),
+          );
-        ],
+        },
       ),
       patchOption: patchOption,
       removeOption: (Option option) {
@@ -203,6 +269,7 @@ class IntStringLongListPatchOption extends StatelessWidget {
 
 class UnsupportedPatchOption extends StatelessWidget {
   const UnsupportedPatchOption({super.key, required this.patchOption});
+
   final Option patchOption;
 
   @override
@@ -302,14 +369,20 @@ class TextFieldForPatchOption extends StatefulWidget {
   const TextFieldForPatchOption({
     super.key,
     required this.value,
+    required this.values,
     this.removeValue,
     required this.onChanged,
     required this.optionType,
+    required this.selectedKey,
+    this.showDropdown = true,
   });
 
   final String? value;
+  final Map<String, dynamic>? values;
   final String optionType;
-  final void Function(dynamic value)? removeValue;
+  final String selectedKey;
+  final bool showDropdown;
+  final void Function()? removeValue;
   final void Function(dynamic value) onChanged;
 
   @override
@@ -319,75 +392,155 @@ class TextFieldForPatchOption extends StatefulWidget {
 
 class _TextFieldForPatchOptionState extends State<TextFieldForPatchOption> {
   final TextEditingController controller = TextEditingController();
+  String? selectedKey;
+  String? defaultValue;
+
   @override
   Widget build(BuildContext context) {
     final bool isStringOption = widget.optionType.contains('String');
-    final bool isListOption = widget.optionType.contains('List');
+    final bool isArrayOption = widget.optionType.contains('Array');
-    controller.text = widget.value ?? '';
+    selectedKey ??= widget.selectedKey;
-    return TextFormField(
+    controller.text = !isStringOption && isArrayOption && selectedKey == '' &&
-      inputFormatters: [
+            (widget.value != null && widget.value.toString().startsWith('['))
-        if (widget.optionType.contains('Int'))
+        ? ''
-          FilteringTextInputFormatter.allow(RegExp(r'[0-9]')),
+        : widget.value ?? '';
-        if (widget.optionType.contains('Long'))
+    defaultValue ??= controller.text;
-          FilteringTextInputFormatter.allow(RegExp(r'^[0-9]*\.?[0-9]*')),
+    return Column(
-      ],
+      crossAxisAlignment: CrossAxisAlignment.start,
-      controller: controller,
+      children: [
-      keyboardType: isStringOption ? TextInputType.text : TextInputType.number,
+        if (widget.showDropdown && (widget.values?.isNotEmpty ?? false))
-      decoration: InputDecoration(
+          DropdownButton<String>(
-        suffixIcon: PopupMenuButton(
+            style: const TextStyle(
-          tooltip: FlutterI18n.translate(
+              fontSize: 16,
-            context,
+            ),
-            'patchOptionsView.tooltip',
+            borderRadius: BorderRadius.circular(4),
+            dropdownColor: Theme.of(context).colorScheme.secondaryContainer,
+            isExpanded: true,
+            value: selectedKey,
+            items: widget.values!.entries
+                .map(
+                  (e) => DropdownMenuItem(
+                    value: e.key,
+                    child: RichText(
+                      text: TextSpan(
+                        text: e.key,
+                        style: const TextStyle(
+                          fontSize: 16,
+                        ),
+                        children: [
+                          TextSpan(
+                            text: ' ${e.value}',
+                            style: TextStyle(
+                              fontSize: 14,
+                              color: Theme.of(context)
+                                  .colorScheme
+                                  .onSecondaryContainer
+                                  .withOpacity(0.6),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                )
+                .toList()
+              ..add(
+                DropdownMenuItem(
+                  value: '',
+                  child: I18nText(
+                    'patchOptionsView.customValue',
+                    child: const Text(
+                      '',
+                      style: TextStyle(
+                        fontSize: 16,
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            onChanged: (value) {
+              if (value == '') {
+                controller.text = defaultValue!;
+                widget.onChanged(controller.text);
+              } else {
+                controller.text = widget.values![value].toString();
+                widget.onChanged(
+                  isArrayOption ? widget.values![value] : controller.text,
+                );
+              }
+              setState(() {
+                selectedKey = value;
+              });
+            },
           ),
-          itemBuilder: (BuildContext context) {
+        if (selectedKey == '')
-            return [
+          TextFormField(
-              if (isListOption)
+            inputFormatters: [
-                PopupMenuItem(
+              if (widget.optionType.contains('Int'))
-                  value: 'remove',
+                FilteringTextInputFormatter.allow(RegExp(r'[0-9]')),
-                  child: I18nText('remove'),
+              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',
                 ),
-              if (isStringOption && !isListOption) ...[
+                itemBuilder: (BuildContext context) {
-                PopupMenuItem(
+                  return [
-                  value: 'patchOptionsView.selectFilePath',
+                    if (isArrayOption)
-                  child: I18nText('patchOptionsView.selectFilePath'),
+                      PopupMenuItem(
-                ),
+                        value: 'remove',
-                PopupMenuItem(
+                        child: I18nText('remove'),
-                  value: 'patchOptionsView.selectFolder',
+                      ),
-                  child: I18nText('patchOptionsView.selectFolder'),
+                    if (isStringOption) ...[
-                ),
+                      PopupMenuItem(
-              ],
+                        value: 'patchOptionsView.selectFilePath',
-            ];
+                        child: I18nText('patchOptionsView.selectFilePath'),
-          },
+                      ),
-          onSelected: (String selection) async {
+                      PopupMenuItem(
-            switch (selection) {
+                        value: 'patchOptionsView.selectFolder',
-              case 'patchOptionsView.selectFilePath':
+                        child: I18nText('patchOptionsView.selectFolder'),
-                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);
+                },
-                }
+                onSelected: (String selection) async {
-                break;
+                  switch (selection) {
-              case 'patchOptionsView.selectFolder':
+                    case 'patchOptionsView.selectFilePath':
-                final result = await FilePicker.platform.getDirectoryPath();
+                      final String? result = await FlutterFileDialog.pickFile();
-                if (result != null) {
+                      if (result != null) {
-                  controller.text = result;
+                        controller.text = result;
-                  widget.onChanged(controller.text);
+                        widget.onChanged(controller.text);
-                }
+                      }
-                break;
+                      break;
-              case 'remove':
+                    case 'patchOptionsView.selectFolder':
-                widget.removeValue!(widget.value);
+                      final DirectoryLocation? result = await FlutterFileDialog.pickDirectory();
-                break;
+                      if (result != null) {
-            }
+                        controller.text = result.toString();
-          },
+                        widget.onChanged(controller.text);
-        ),
+                      }
-        hintStyle: TextStyle(
+                      break;
-          fontSize: 14,
+                    case 'remove':
-          color: Theme.of(context).colorScheme.onSecondaryContainer,
+                      widget.removeValue!();
-        ),
+                      break;
-      ),
+                  }
-      onChanged: (String value) {
+                },
-        widget.onChanged(value);
+              ),
-      },
+              hintStyle: TextStyle(
+                fontSize: 14,
+                color: Theme.of(context).colorScheme.onSecondaryContainer,
+              ),
+            ),
+            onChanged: (String value) {
+              widget.onChanged(value);
+            },
+          ),
+      ],
     );
   }
 }

lib/ui/widgets/settingsView/about_widget.dart

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

lib/ui/widgets/settingsView/custom_switch.dart

@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
 
 class CustomSwitch extends StatelessWidget {
   const CustomSwitch({
-    Key? key,
+    super.key,
     required this.onChanged,
     required this.value,
-  }) : super(key: key);
+  });
   final ValueChanged<bool> onChanged;
   final bool value;
 

lib/ui/widgets/settingsView/custom_switch_tile.dart

@@ -3,13 +3,13 @@ import 'package:revanced_manager/ui/widgets/settingsView/custom_switch.dart';
 
 class CustomSwitchTile extends StatelessWidget {
   const CustomSwitchTile({
-    Key? key,
+    super.key,
     required this.title,
     required this.subtitle,
     required this.value,
     required this.onTap,
     this.padding,
-  }) : super(key: key);
+  });
   final Widget title;
   final Widget subtitle;
   final bool value;

lib/ui/widgets/settingsView/custom_text_field.dart

@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
 
 class CustomTextField extends StatelessWidget {
   const CustomTextField({
-    Key? key,
+    super.key,
     required this.inputController,
     required this.label,
     required this.hint,
     this.leadingIcon,
     required this.onChanged,
-  }) : super(key: key);
+  });
   final TextEditingController inputController;
   final Widget label;
   final String hint;

lib/ui/widgets/settingsView/settings_advanced_section.dart

@@ -5,6 +5,7 @@ import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_man
 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/widgets/settingsView/settings_enable_patches_selection.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_require_suggested_app_version.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_universal_patches.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_version_compatibility_check.dart';
@@ -20,6 +21,7 @@ class SAdvancedSection extends StatelessWidget {
       children: const <Widget>[
         SAutoUpdatePatches(),
         SEnablePatchesSelection(),
+        SRequireSuggestedAppVersion(),
         SVersionCompatibilityCheck(),
         SUniversalPatches(),
         SManageSourcesUI(),

lib/ui/widgets/settingsView/settings_require_suggested_app_version.dart

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

lib/ui/widgets/settingsView/settings_section.dart

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

lib/ui/widgets/settingsView/settings_tile_dialog.dart

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

lib/ui/widgets/settingsView/social_media_item.dart

@@ -3,12 +3,12 @@ import 'package:url_launcher/url_launcher.dart';
 
 class SocialMediaItem extends StatelessWidget {
   const SocialMediaItem({
-    Key? key,
+    super.key,
     this.icon,
     required this.title,
     this.subtitle,
     this.url,
-  }) : super(key: key);
+  });
   final Widget? icon;
   final Widget title;
   final Widget? subtitle;

lib/ui/widgets/settingsView/social_media_widget.dart

@@ -8,9 +8,9 @@ import 'package:revanced_manager/ui/widgets/shared/custom_icon.dart';
 
 class SocialMediaWidget extends StatelessWidget {
   const SocialMediaWidget({
-    Key? key,
+    super.key,
     this.padding,
-  }) : super(key: key);
+  });
   final EdgeInsetsGeometry? padding;
 
   @override

lib/ui/widgets/shared/application_item.dart

@@ -8,12 +8,12 @@ import 'package:timeago/timeago.dart';
 
 class ApplicationItem extends StatefulWidget {
   const ApplicationItem({
-    Key? key,
+    super.key,
     required this.icon,
     required this.name,
     required this.patchDate,
     required this.onPressed,
-  }) : super(key: key);
+  });
   final Uint8List icon;
   final String name;
   final DateTime patchDate;

lib/ui/widgets/shared/custom_card.dart

@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
 
 class CustomCard extends StatelessWidget {
   const CustomCard({
-    Key? key,
+    super.key,
     this.isFilled = true,
     required this.child,
     this.onTap,
     this.padding,
     this.backgroundColor,
-  }) : super(key: key);
+  });
   final bool isFilled;
   final Widget child;
   final Function()? onTap;

lib/ui/widgets/shared/custom_chip.dart

@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
 
 class CustomChip extends StatelessWidget {
   const CustomChip({
-    Key? key,
+    super.key,
     required this.label,
     this.isSelected = false,
     this.onSelected,
-  }) : super(key: key);
+  });
   final Widget label;
   final bool isSelected;
   final Function(bool)? onSelected;

lib/ui/widgets/shared/custom_material_button.dart

@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 
 class CustomMaterialButton extends StatelessWidget {
   const CustomMaterialButton({
-    Key? key,
+    super.key,
     required this.label,
     this.isFilled = true,
     this.isExpanded = false,
     required this.onPressed,
-  }) : super(key: key);
+  });
   final Widget label;
   final bool isFilled;
   final bool isExpanded;
@@ -49,13 +49,13 @@ class CustomMaterialButton extends StatelessWidget {
 // ignore: must_be_immutable
 class TimerButton extends StatefulWidget {
   TimerButton({
-    Key? key,
+    super.key,
     required this.seconds,
     required this.isRunning,
     required this.onTimerEnd,
     this.label = const Text(''),
     this.isFilled = true,
-  }) : super(key: key);
+  });
   Widget label;
   bool isFilled;
   int seconds;

lib/ui/widgets/shared/custom_popup_menu.dart

@@ -1,39 +0,0 @@
-import 'package:flutter/material.dart';
-
-class CustomPopupMenu extends StatelessWidget {
-  const CustomPopupMenu({
-    Key? key,
-    required this.onSelected,
-    required this.children,
-  }) : super(key: key);
-  final Function(dynamic) onSelected;
-  final Map<int, Widget> children;
-
-  @override
-  Widget build(BuildContext context) {
-    return Theme(
-      data: Theme.of(context).copyWith(useMaterial3: false),
-      child: PopupMenuButton<int>(
-        icon: Icon(
-          Icons.more_vert,
-          color: Theme.of(context).colorScheme.secondary,
-        ),
-        onSelected: onSelected,
-        itemBuilder: (context) => children.entries
-            .map(
-              (entry) => PopupMenuItem<int>(
-                padding: const EdgeInsets.all(16.0).copyWith(right: 20),
-                value: entry.key,
-                child: entry.value,
-              ),
-            )
-            .toList(),
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(24),
-        ),
-        color: Theme.of(context).colorScheme.secondaryContainer,
-        position: PopupMenuPosition.under,
-      ),
-    );
-  }
-}

lib/ui/widgets/shared/custom_sliver_app_bar.dart

@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
 
 class CustomSliverAppBar extends StatelessWidget {
   const CustomSliverAppBar({
-    Key? key,
+    super.key,
     required this.title,
     this.actions,
     this.bottom,
     this.isMainView = false,
     this.onBackButtonPressed,
-  }) : super(key: key);
+  });
   final Widget title;
   final List<Widget>? actions;
   final PreferredSizeWidget? bottom;

lib/ui/widgets/shared/open_container_wrapper.dart

@@ -3,10 +3,10 @@ import 'package:flutter/material.dart';
 
 class OpenContainerWrapper extends StatelessWidget {
   const OpenContainerWrapper({
-    Key? key,
+    super.key,
     required this.openBuilder,
     required this.closedBuilder,
-  }) : super(key: key);
+  });
   final OpenContainerBuilder openBuilder;
   final CloseContainerBuilder closedBuilder;
 

lib/ui/widgets/shared/search_bar.dart

@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 
 class SearchBar extends StatefulWidget {
   const SearchBar({
-    Key? key,
+    super.key,
     required this.hintText,
     this.showSelectIcon = false,
     this.onSelectAll,
     required this.onQueryChanged,
-  }) : super(key: key);
+  });
   final String? hintText;
   final bool showSelectIcon;
   final Function(bool)? onSelectAll;

lib/utils/check_for_supported_patch.dart

@@ -17,12 +17,12 @@ bool isPatchSupported(Patch patch) {
 bool hasUnsupportedRequiredOption(List<Option> options, Patch patch) {
   final List<String> requiredOptionsType = [];
   final List<String> supportedOptionsType = [
-    'StringPatchOption',
+    'String',
-    'BooleanPatchOption',
+    'Boolean',
-    'IntPatchOption',
+    'Int',
-    'StringListPatchOption',
+    'StringArray',
-    'IntListPatchOption',
+    'IntArray',
-    'LongListPatchOption',
+    'LongArray',
   ];
   for (final Option option in options) {
     if (option.required &&
@@ -33,7 +33,7 @@ bool hasUnsupportedRequiredOption(List<Option> options, Patch patch) {
                   patch.name,
                   option.key,
                 ) == null) {
-      requiredOptionsType.add(option.optionClassType);
+      requiredOptionsType.add(option.valueType);
     }
   }
   for (final String optionType in requiredOptionsType) {

pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 1.14.2+101400200
+version: 1.17.1+101700100
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
@@ -12,77 +12,81 @@ environment:
 dependencies:
   animations: ^2.0.7
   collection: ^1.17.0
-  cross_connectivity: ^3.0.5
-  cr_file_saver:
-    git:
-      url: https://github.com/dhruvanbhalara/cr_file_saver
-      ref: "fix/incorrect_file_name"
   device_apps:
-    git:
+    git: # switch back to ponces fork once https://github.com/ponces/flutter_plugin_device_apps/pull/1 is merged
-      url: https://github.com/ponces/flutter_plugin_device_apps
+      url: https://github.com/BenjaminHalko/flutter_plugin_device_apps
       ref: revanced-manager
-  device_info_plus: ^8.1.0
+  device_info_plus: ^9.1.0
   dynamic_color: ^1.6.3
   dio: ^5.0.0
   dynamic_themes: ^1.1.0
   expandable: ^5.0.1
-  file_picker:
-    git:
-      url: https://github.com/alexmercerind/flutter_file_picker
-      ref: master
   flex_color_scheme: ^7.0.1
   flutter:
     sdk: flutter
-  flutter_background: ^1.2.0
+  flutter_background:
+    git: # remove once https://github.com/JulianAssmann/flutter_background/pull/79 is merged
+      url: https://github.com/BenjaminHalko/flutter_background
+      ref: specify-namespace
   flutter_cache_manager: ^3.3.0
-  flutter_i18n: ^0.33.0
+  flutter_i18n: ^0.34.0
-  flutter_local_notifications: ^13.0.0
+  flutter_local_notifications: ^16.1.0
   flutter_localizations:
     sdk: flutter
   flutter_svg: ^2.0.4
-  fluttertoast: ^8.2.1
+  fluttertoast:
-  font_awesome_flutter: ^10.6.0
+    git: # remove once the next fluttertoast version is release (> 8.2.2)
-  get_it: 7.2.0
+      url: https://github.com/ponnamkarthik/FlutterToast
-  google_fonts: ^4.0.3
+      ref: f4e7b4e1afc8c760eb5bac80f6a2e299906d83ca
-  http: ^0.13.5
+  font_awesome_flutter: ^10.4.0
+  get_it: ^7.6.4
+  google_fonts: ^6.1.0
+  http: ^1.1.0
   injectable: ^2.1.1
   intl: ^0.18.0
   json_annotation: ^4.8.0
   logcat:
     git:
-      url: https://github.com/SuaMusica/logcat
+      url: https://github.com/BenjaminHalko/logcat
-      ref: feature/nullSafe
+      ref: master
-  package_info_plus: ^3.0.3
+  package_info_plus: ^4.2.0
   path_provider: ^2.0.14
-  permission_handler: ^10.2.0
+  permission_handler: ^11.0.1
   pull_to_refresh: ^2.0.0
   root:
     git:
-      url: https://github.com/EvadeMaster/root
+      url: https://github.com/validcube/root
-      ref: 82803aa40f63cddff81c3e4d27ce8ce3e7c83f60
+      ref: 68e5678a535a2a3344828a14a39017fa74b9098c
-  share_extend: ^2.0.0
   shared_preferences: ^2.1.0
   skeletons: ^0.0.3
   stacked: ^3.2.0
   stacked_generator: ^1.1.0
   stacked_services: ^1.0.0
-  stacked_themes: ^0.3.10
   timeago: ^3.3.0
   timezone: ^0.9.0
   url_launcher: ^6.1.10
-  wakelock: ^0.6.2
   flutter_dotenv: ^5.0.2
   flutter_markdown: ^0.6.14
   dio_cache_interceptor: ^3.4.0
-  install_plugin: ^2.1.0
+  install_plugin:
-  screenshot_callback: ^3.0.1
+    git: # remove once https://github.com/hui-z/flutter_install_plugin/pull/67 is merged
+      url: https://github.com/BenjaminHalko/flutter_install_plugin
+      ref: master
+  screenshot_callback:
+    git: # remove once https://github.com/flutter-moum/flutter_screenshot_callback/pull/81 is merged
+      url: https://github.com/BenjaminHalko/flutter_screenshot_callback
+      ref: master
   synchronized: ^3.1.0
+  connectivity_plus: ^5.0.1
+  flutter_file_dialog: ^3.0.2
+  wakelock_plus: ^1.1.3
+  share_plus: ^7.2.1
 
 dev_dependencies:
   json_serializable: ^6.6.1
   build_runner: any
   flutter_launcher_icons: ^0.13.0
-  flutter_lints: ^2.0.1
+  flutter_lints: ^3.0.1
   flutter_test:
     sdk: flutter
   injectable_generator: ^2.1.5

settings.gradle

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