build: bump version to v1.10.1

Closes #1260

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -1,5 +1,5 @@
 name: 🐞 Bug report
-description: Report a very clearly broken issue.
+description: Create a new bug report.
 title: 'bug: <title>'
 labels: [bug]
 body:
@@ -8,53 +8,20 @@ body:
       value: |
         # ReVanced Manager bug report
 
-        Important to note that your issue may have already been reported before. Please check for existing issues [here](https://github.com/revanced/revanced-manager/labels/bug).
+        Please check for existing issues [here](https://github.com/revanced/revanced-manager/labels/bug) before creating a new one.
-
-  - type: dropdown
-    attributes:
-      label: Type
-      options:
-        - Error while running the manager
-        - Error at runtime
-        - Cosmetic
-        - Other
-    validations:
-      required: true
   - type: textarea
     attributes:
       label: Bug description
-      description: How did you find the bug? Any additional details that might help?
+      description: |
+        - Describe your bug in detail
+        - Add steps to reproduce the bug if possible (Step 1. Download some files. Step 2. ...)
+        - Add images and videos if possible
+        - List selected patches if applicable
     validations:
       required: true
   - type: textarea
     attributes:
-      label: Steps to reproduce
+      label: Version of ReVanced Manager and version & name of application you tried to patch
-      description: Add the steps to reproduce this bug, including your environment.
-      placeholder: Step 1. Download some files. Step 2. ...
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Android version
-      description: Android version used.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Manager version
-      description: Manager version used.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Target package name
-      description: App you tried to patch.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Target package version.
-      description: Version of the app you tried to patch.
     validations:
       required: true
   - type: dropdown
@@ -64,57 +31,31 @@ body:
         - Non-root
         - Root
     validations:
-      required: true
+      required: false
   - type: textarea
     attributes:
-      label: Patches selected.
+      label: Device logs
-      description: Patches you selected for the app.
+      description: Export logs in ReVanced Manager settings.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Device logs (exported using Manager settings).
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so there is no need for backticks.
       render: shell
     validations:
       required: true
   - type: textarea
     attributes:
-      label: Installer logs (exported using Installer menu option) [unneeded if the issue is not during patching].
+      label: Patcher logs
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so there is no need for backticks.
+      description: Export logs in "Patcher" screen.
       render: shell
     validations:
       required: false
-  - type: textarea
-    attributes:
-      label: Screenshots or video
-      description: Add screenshots or videos that show the bug here.
-      placeholder: Drag and drop the screenshots/videos into this box.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Solution
-      description: If applicable, add a possible solution.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add additional context here.
-    validations:
-      required: false
   - type: checkboxes
-    id: acknowledgments
     attributes:
-      label: Acknowledgments
+      label: Acknowledgements
-      description: Your issue will be closed if you haven't done these steps.
+      description: Your issue will be closed if you don't follow the checklist below!
       options:
-        - label: I have searched the existing issues; this is new and no duplicate or related to another open issue.
+        - label: This request is not a duplicate of an existing issue.
           required: true
-        - label: I have written a short but informative title.
+        - label: I have chosen an appropriate title.
           required: true
-        - label: I properly filled out all of the requested information in this issue.
+        - label: All requested information has been provided properly.
           required: true
-        - label: The issue is solely related to ReVanced Manager and not caused by patches.
+        - label: The issue is solely related to the ReVanced Manager
           required: true

.github/ISSUE_TEMPLATE/feature-issue.yml

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

.github/workflows/analyze.yml

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

.github/workflows/pr-build.yml

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

.github/workflows/release-build.yml

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

.gitignore

@@ -58,6 +58,7 @@ unlinked.ds
 unlinked_spec.ds
 
 # Android related
+.gradle/
 **/android/**/gradle-wrapper.jar
 **/android/.gradle
 **/android/captures/

README.md

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

android/app/build.gradle

@@ -52,6 +52,8 @@ android {
 
     buildTypes {
         release {
+            shrinkResources false
+            minifyEnabled false
             resValue "string", "app_name", "ReVanced Manager"
             signingConfig signingConfigs.debug
             ndk {
@@ -83,10 +85,9 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // ReVanced
-    implementation "app.revanced:revanced-patcher:11.0.4"
+    implementation "app.revanced:revanced-patcher:14.2.2"
 
     // Signing & aligning
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
     implementation("com.android.tools.build:apksig:7.2.2")
-
 }

android/app/src/main/AndroidManifest.xml

@@ -25,8 +25,7 @@
         android:icon="@mipmap/ic_launcher"
         android:largeHeap="true"
         android:requestLegacyExternalStorage="true"
-        android:extractNativeLibs="true"
+        android:extractNativeLibs="true">
-        android:enableOnBackInvokedCallback="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"

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

@@ -1,28 +1,31 @@
 package app.revanced.manager.flutter
 
-import android.os.Build
 import android.os.Handler
 import android.os.Looper
-import androidx.annotation.NonNull
 import app.revanced.manager.flutter.utils.Aapt
 import app.revanced.manager.flutter.utils.aligning.ZipAligner
 import app.revanced.manager.flutter.utils.signing.Signer
 import app.revanced.manager.flutter.utils.zip.ZipFile
 import app.revanced.manager.flutter.utils.zip.structures.ZipEntry
+import app.revanced.patcher.PatchBundleLoader
 import app.revanced.patcher.Patcher
 import app.revanced.patcher.PatcherOptions
 import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
+import app.revanced.patcher.extensions.PatchExtensions.dependencies
+import app.revanced.patcher.extensions.PatchExtensions.description
+import app.revanced.patcher.extensions.PatchExtensions.include
 import app.revanced.patcher.extensions.PatchExtensions.patchName
-import app.revanced.patcher.logging.Logger
+import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.util.patch.PatchBundle
-import dalvik.system.DexClassLoader
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.runBlocking
 import java.io.File
-
+import java.io.PrintWriter
-private const val PATCHER_CHANNEL = "app.revanced.manager.flutter/patcher"
+import java.io.StringWriter
-private const val INSTALLER_CHANNEL = "app.revanced.manager.flutter/installer"
+import java.util.logging.LogRecord
+import java.util.logging.Logger
 
 class MainActivity : FlutterActivity() {
     private val handler = Handler(Looper.getMainLooper())
@@ -30,10 +33,18 @@ class MainActivity : FlutterActivity() {
     private var cancel: Boolean = false
     private var stopResult: MethodChannel.Result? = null
 
-    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
-        val mainChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, PATCHER_CHANNEL)
+
-        installerChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, INSTALLER_CHANNEL)
+        val patcherChannel = "app.revanced.manager.flutter/patcher"
+        val installerChannel = "app.revanced.manager.flutter/installer"
+
+        val mainChannel =
+            MethodChannel(flutterEngine.dartExecutor.binaryMessenger, patcherChannel)
+
+        this.installerChannel =
+            MethodChannel(flutterEngine.dartExecutor.binaryMessenger, installerChannel)
+
         mainChannel.setMethodCallHandler { call, result ->
             when (call.method) {
                 "runPatcher" -> {
@@ -73,14 +84,37 @@ class MainActivity : FlutterActivity() {
                             keyStoreFilePath,
                             keystorePassword
                         )
-                    } else {
+                    } else result.notImplemented()
-                        result.notImplemented()
-                    }
                 }
+
                 "stopPatcher" -> {
                     cancel = true
                     stopResult = result
                 }
+
+                "getPatches" -> {
+                    val patchBundleFilePath = call.argument<String>("patchBundleFilePath")
+                    if (patchBundleFilePath != null) {
+                        val patches = PatchBundleLoader.Dex(
+                            File(patchBundleFilePath)
+                        ).map { patch ->
+                            val map = HashMap<String, Any>()
+                            map["\"name\""] = "\"${patch.patchName.replace("\"","\\\"")}\""
+                            map["\"description\""] = "\"${patch.description?.replace("\"","\\\"")}\""
+                            map["\"excluded\""] = !patch.include
+                            map["\"dependencies\""] = patch.dependencies?.map { "\"${it.java.patchName}\"" } ?: emptyList<Any>()
+                            map["\"compatiblePackages\""] = patch.compatiblePackages?.map {
+                                val map2 = HashMap<String, Any>()
+                                map2["\"name\""] = "\"${it.name}\""
+                                map2["\"versions\""] = it.versions.map { version -> "\"${version}\"" }
+                                map2
+                            } ?: emptyList<Any>()
+                            map
+                        }
+                        result.success(patches)
+                    } else result.notImplemented()
+                }
+
                 else -> result.notImplemented()
             }
         }
@@ -105,179 +139,141 @@ class MainActivity : FlutterActivity() {
         val outFile = File(outFilePath)
         val integrations = File(integrationsPath)
         val keyStoreFile = File(keyStoreFilePath)
+        val cacheDir = File(cacheDirPath)
 
         Thread {
-            try {
+            fun updateProgress(progress: Double, header: String, log: String) {
                 handler.post {
                     installerChannel.invokeMethod(
                         "update",
                         mapOf(
-                            "progress" to 0.1,
+                            "progress" to progress,
-                            "header" to "",
+                            "header" to header,
-                            "log" to "Copying original apk"
+                            "log" to log
                         )
                     )
                 }
+            }
+
+            fun postStop() = handler.post { stopResult!!.success(null) }
+
+            // Setup logger
+            Logger.getLogger("").apply {
+                handlers.forEach {
+                    it.close()
+                    removeHandler(it)
+                }
+
+                object : java.util.logging.Handler() {
+                    override fun publish(record: LogRecord) =
+                        updateProgress(-1.0, "", record.message)
+
+                    override fun flush() = Unit
+                    override fun close() = flush()
+                }.let(::addHandler)
+            }
+
+            try {
+                updateProgress(0.0, "", "Copying APK")
 
                 if (cancel) {
-                    handler.post { stopResult!!.success(null) }
+                    postStop()
                     return@Thread
                 }
 
                 originalFile.copyTo(inputFile, true)
 
-                handler.post {
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf(
-                            "progress" to 0.2,
-                            "header" to "Unpacking apk...",
-                            "log" to "Unpacking input apk"
-                        )
-                    )
-                }
-
                 if (cancel) {
-                    handler.post { stopResult!!.success(null) }
+                    postStop()
                     return@Thread
                 }
 
-                val patcher =
+                updateProgress(0.05, "Reading APK...", "Reading APK")
-                    Patcher(
+
+                val patcher = Patcher(
                     PatcherOptions(
                         inputFile,
-                            cacheDirPath,
+                        cacheDir,
                         Aapt.binary(applicationContext).absolutePath,
-                            cacheDirPath,
+                        cacheDir.path,
-                            logger = ManagerLogger()
                     )
                 )
 
                 if (cancel) {
-                    handler.post { stopResult!!.success(null) }
+                    postStop()
                     return@Thread
                 }
 
-                handler.post {
+                updateProgress(0.1, "Loading patches...", "Loading patches")
-                    installerChannel.invokeMethod(
+
-                        "update",
+                val patches = PatchBundleLoader.Dex(
-                        mapOf("progress" to 0.3, "header" to "", "log" to "")
+                    File(patchBundleFilePath),
-                    )
+                    optimizedDexDirectory = cacheDir
-                }
+                ).filter { patch ->
-                handler.post {
+                    val isCompatible = patch.compatiblePackages?.any {
-                    installerChannel.invokeMethod(
+                        it.name == patcher.context.packageMetadata.packageName
-                        "update",
+                    } ?: false
-                        mapOf(
+
-                            "progress" to 0.4,
+                    val compatibleOrUniversal =
-                            "header" to "Merging integrations...",
+                        isCompatible || patch.compatiblePackages.isNullOrEmpty()
-                            "log" to "Merging integrations"
+
-                        )
+                    compatibleOrUniversal && selectedPatches.any { it == patch.patchName }
-                    )
                 }
 
                 if (cancel) {
-                    handler.post { stopResult!!.success(null) }
+                    postStop()
                     return@Thread
                 }
 
-                patcher.addIntegrations(listOf(integrations)) {}
+                updateProgress(0.15, "Executing...", "")
 
+                // Update the progress bar every time a patch is executed from 0.15 to 0.7
+                val totalPatchesCount = patches.size
+                val progressStep = 0.55 / totalPatchesCount
+                var progress = 0.15
+
+                patcher.apply {
+                    acceptIntegrations(listOf(integrations))
+                    acceptPatches(patches)
+
+                    runBlocking {
+                        apply(false).collect { patchResult: PatchResult ->
                             if (cancel) {
                                 handler.post { stopResult!!.success(null) }
-                    return@Thread
+                                this.cancel()
+                                this@apply.close()
+                                return@collect
                             }
 
-                handler.post {
+                            val msg = patchResult.exception?.let {
-                    installerChannel.invokeMethod(
+                                val writer = StringWriter()
-                        "update",
+                                it.printStackTrace(PrintWriter(writer))
-                        mapOf(
+                                "${patchResult.patchName} failed: $writer"
-                            "progress" to 0.5,
+                            } ?: run {
-                            "header" to "Applying patches...",
+                                "${patchResult.patchName} succeeded"
-                            "log" to ""
+                            }
-                        )
+
-                    )
+                            updateProgress(progress, "", msg)
+                            progress += progressStep
+                        }
+                    }
                 }
 
                 if (cancel) {
-                    handler.post { stopResult!!.success(null) }
+                    postStop()
+                    patcher.close()
                     return@Thread
                 }
 
-                val patches = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CUPCAKE) {
+                updateProgress(0.8, "Building...", "")
-                    PatchBundle.Dex(
-                        patchBundleFilePath,
-                        DexClassLoader(
-                            patchBundleFilePath,
-                            cacheDirPath,
-                            null,
-                            javaClass.classLoader
-                        )
-                    ).loadPatches().filter { patch ->
-                        (patch.compatiblePackages?.any { it.name == patcher.context.packageMetadata.packageName } == true || patch.compatiblePackages.isNullOrEmpty()) &&
-                                selectedPatches.any { it == patch.patchName }
-                    }
-                } else {
-                    TODO("VERSION.SDK_INT < CUPCAKE")
-                }
 
-                if(cancel) {
+                val res = patcher.get()
-                    handler.post { stopResult!!.success(null) }
+                patcher.close()
-                    return@Thread
-                }
 
-                patcher.addPatches(patches)
-                patcher.executePatches().forEach { (patch, res) ->
-                    if (res.isSuccess) {
-                        val msg = "Applied $patch"
-                        handler.post {
-                            installerChannel.invokeMethod(
-                                "update",
-                                mapOf(
-                                    "progress" to 0.5,
-                                    "header" to "",
-                                    "log" to msg
-                                )
-                            )
-                        }
-                        if(cancel) {
-                            handler.post { stopResult!!.success(null) }
-                            return@Thread
-                        }
-                        return@forEach
-                    }
-                    val msg =
-                        "Failed to apply $patch: " + "${res.exceptionOrNull()!!.message ?: res.exceptionOrNull()!!.cause!!::class.simpleName}"
-                    handler.post {
-                        installerChannel.invokeMethod(
-                            "update",
-                            mapOf("progress" to 0.5, "header" to "", "log" to msg)
-                        )
-                    }
-                    if(cancel) {
-                        handler.post { stopResult!!.success(null) }
-                        return@Thread
-                    }
-                }
-
-                handler.post {
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf(
-                            "progress" to 0.7,
-                            "header" to "Repacking apk...",
-                            "log" to "Repacking patched apk"
-                        )
-                    )
-                }
-                if(cancel) {
-                    handler.post { stopResult!!.success(null) }
-                    return@Thread
-                }
-                val res = patcher.save()
                 ZipFile(patchedFile).use { file ->
                     res.dexFiles.forEach {
                         if (cancel) {
-                            handler.post { stopResult!!.success(null) }
+                            postStop()
                             return@Thread
                         }
                         file.addEntryCompressData(
@@ -296,90 +292,35 @@ class MainActivity : FlutterActivity() {
                         ZipAligner::getEntryAlignment
                     )
                 }
+
                 if (cancel) {
-                    handler.post { stopResult!!.success(null) }
+                    postStop()
                     return@Thread
                 }
-                handler.post {
+
-                    installerChannel.invokeMethod(
+                updateProgress(0.9, "Signing...", "Signing APK")
-                        "update",
-                        mapOf(
-                            "progress" to 0.9,
-                            "header" to "Signing apk...",
-                            "log" to ""
-                        )
-                    )
-                }
 
                 try {
-                    Signer("ReVanced", keystorePassword).signApk(
+                    Signer("ReVanced", keystorePassword)
-                        patchedFile,
+                        .signApk(patchedFile, outFile, keyStoreFile)
-                        outFile,
-                        keyStoreFile
-                    )
                 } catch (e: Exception) {
-                    //log to console
+                    print("Error signing APK: ${e.message}")
-                    print("Error signing apk: ${e.message}")
                     e.printStackTrace()
                 }
 
-                handler.post {
+                updateProgress(1.0, "Patched", "Patched")
-                    installerChannel.invokeMethod(
-                        "update",
-                        mapOf(
-                            "progress" to 1.0,
-                            "header" to "Finished!",
-                            "log" to "Finished!"
-                        )
-                    )
-                }
             } catch (ex: Throwable) {
+                if (!cancel) {
                     val stack = ex.stackTraceToString()
-                handler.post {
+                    updateProgress(
-                    installerChannel.invokeMethod(
+                        -100.0,
-                        "update",
+                        "Aborted",
-                        mapOf(
+                        "An error occurred:\n$stack"
-                            "progress" to -100.0,
-                            "header" to "Aborted...",
-                            "log" to "An error occurred! Aborted\nError:\n$stack"
-                        )
                     )
                 }
             }
+
             handler.post { result.success(null) }
         }.start()
     }
-
-    inner class ManagerLogger : Logger {
-        override fun error(msg: String) {
-            handler.post {
-                installerChannel
-                    .invokeMethod(
-                        "update",
-                        mapOf("progress" to -1.0, "header" to "", "log" to msg)
-                    )
-            }
-        }
-
-        override fun warn(msg: String) {
-            handler.post {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf("progress" to -1.0, "header" to "", "log" to msg)
-                )
-            }
-        }
-
-        override fun info(msg: String) {
-            handler.post {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf("progress" to -1.0, "header" to "", "log" to msg)
-                )
-            }
-        }
-
-        override fun trace(_msg: String) { /* unused */
-        }
-    }
 }

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()

assets/i18n/en_US.json

@@ -178,8 +178,10 @@
         "exportSectionTitle": "Import & export",
         "logsSectionTitle": "Logs",
 
-        "darkThemeLabel": "Dark mode",
+        "themeModeLabel": "App theme",
-        "darkThemeHint": "Welcome to the dark side",
+        "systemThemeLabel": "System",
+        "lightThemeLabel": "Light",
+        "darkThemeLabel": "Dark",
 
         "dynamicThemeLabel": "Material You",
         "dynamicThemeHint": "Enjoy an experience closer to your device",

lib/services/github_api.dart

@@ -222,10 +222,8 @@ class GithubAPI {
           final String downloadUrl = asset['browser_download_url'];
           if (extension == '.apk') {
             _managerAPI.setIntegrationsDownloadURL(downloadUrl);
-          } else if (extension == '.json') {
-            _managerAPI.setPatchesDownloadURL(downloadUrl, false);
           } else {
-            _managerAPI.setPatchesDownloadURL(downloadUrl, true);
+            _managerAPI.setPatchesDownloadURL(downloadUrl);
           }
           return await DefaultCacheManager().getSingleFile(
             downloadUrl,

lib/services/manager_api.dart

@@ -11,6 +11,7 @@ import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/github_api.dart';
+import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/revanced_api.dart';
 import 'package:revanced_manager/services/root_api.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
@@ -26,6 +27,7 @@ class ManagerAPI {
   final String patcherRepo = 'revanced-patcher';
   final String cliRepo = 'revanced-cli';
   late SharedPreferences _prefs;
+  List<Patch> patches = [];
   bool isRooted = false;
   String storedPatchesFile = '/selected-patches.json';
   String keystoreFile =
@@ -41,11 +43,11 @@ class ManagerAPI {
   String? patchesVersion = '';
   String? integrationsVersion = '';
   bool isDefaultPatchesRepo() {
-    return getPatchesRepo() == 'revanced/revanced-patches';
+    return getPatchesRepo().toLowerCase() == 'revanced/revanced-patches';
   }
 
   bool isDefaultIntegrationsRepo() {
-    return getIntegrationsRepo() == 'revanced/revanced-integrations';
+    return getIntegrationsRepo().toLowerCase() == 'revanced/revanced-integrations';
   }
 
   Future<void> initialize() async {
@@ -79,12 +81,12 @@ class ManagerAPI {
     await _prefs.setString('repoUrl', url);
   }
 
-  String getPatchesDownloadURL(bool bundle) {
+  String getPatchesDownloadURL() {
-    return _prefs.getString('patchesDownloadURL-$bundle') ?? '';
+    return _prefs.getString('patchesDownloadURL') ?? '';
   }
 
-  Future<void> setPatchesDownloadURL(String value, bool bundle) async {
+  Future<void> setPatchesDownloadURL(String value) async {
-    await _prefs.setString('patchesDownloadURL-$bundle', value);
+    await _prefs.setString('patchesDownloadURL', value);
   }
 
   String getPatchesRepo() {
@@ -111,17 +113,6 @@ class ManagerAPI {
   }
 
   bool isPatchesChangeEnabled() {
-    if (getPatchedApps().isNotEmpty && !isChangingToggleModified()) {
-      for (final apps in getPatchedApps()) {
-        if (getSavedPatches(apps.originalPackageName)
-                .indexWhere((patch) => patch.excluded) !=
-            -1) {
-          setPatchesChangeWarning(false);
-          setPatchesChangeEnabled(true);
-          break;
-        }
-      }
-    }
     return _prefs.getBool('patchesChangeEnabled') ?? false;
   }
 
@@ -208,12 +199,12 @@ class ManagerAPI {
     await _prefs.setBool('useDynamicTheme', value);
   }
 
-  bool getUseDarkTheme() {
+  int getThemeMode() {
-    return _prefs.getBool('useDarkTheme') ?? false;
+    return _prefs.getInt('themeMode') ?? 2;
   }
 
-  Future<void> setUseDarkTheme(bool value) async {
+  Future<void> setThemeMode(int value) async {
-    await _prefs.setBool('useDarkTheme', value);
+    await _prefs.setInt('themeMode', value);
   }
 
   bool areUniversalPatchesEnabled() {
@@ -311,28 +302,38 @@ class ManagerAPI {
   }
 
   Future<List<Patch>> getPatches() async {
+    if (patches.isNotEmpty) {
+      return patches;
+    }
+    final File? patchBundleFile = await downloadPatches();
+    if (patchBundleFile != null) {
       try {
-      final String repoName = getPatchesRepo();
+        final patchesObject = await PatcherAPI.patcherChannel.invokeMethod(
-      final String currentVersion = await getCurrentPatchesVersion();
+          'getPatches',
-      final String url = getPatchesDownloadURL(false);
+          {
-      return await _githubAPI.getPatches(
+            'patchBundleFilePath': patchBundleFile.path,
-        repoName,
+          },
-        currentVersion,
-        url,
         );
+        final List<Map<String, dynamic>> patchesMap = [];
+        patchesObject.forEach((patch) {
+          patchesMap.add(jsonDecode('$patch'));
+        });
+        patches = patchesMap.map((patch) => Patch.fromJson(patch)).toList();
+        return patches;
       } on Exception catch (e) {
         if (kDebugMode) {
           print(e);
         }
-      return [];
       }
     }
+    return List.empty();
+  }
 
   Future<File?> downloadPatches() async {
     try {
       final String repoName = getPatchesRepo();
       final String currentVersion = await getCurrentPatchesVersion();
-      final String url = getPatchesDownloadURL(true);
+      final String url = getPatchesDownloadURL();
       return await _githubAPI.getPatchesReleaseFile(
         '.jar',
         repoName,
@@ -458,8 +459,7 @@ class ManagerAPI {
 
   Future<void> setCurrentPatchesVersion(String version) async {
     await _prefs.setString('patchesVersion', version);
-    await setPatchesDownloadURL('', false);
+    await setPatchesDownloadURL('');
-    await setPatchesDownloadURL('', true);
     await downloadPatches();
   }
 

lib/services/patcher_api.dart

@@ -25,12 +25,13 @@ class PatcherAPI {
   late Directory _tmpDir;
   late File _keyStoreFile;
   List<Patch> _patches = [];
+  List<Patch> _universalPatches = [];
+  List<String> _compatiblePackages = [];
   Map filteredPatches = <String, List<Patch>>{};
   File? _outFile;
 
   Future<void> initialize() async {
     await _loadPatches();
-    await _managerAPI.downloadPatches();
     await _managerAPI.downloadIntegrations();
     final Directory appCache = await getTemporaryDirectory();
     _dataDir = await getExternalStorageDirectory() ?? appCache;
@@ -45,6 +46,24 @@ class PatcherAPI {
     }
   }
 
+  List<String> getCompatiblePackages() {
+    final List<String> compatiblePackages = [];
+    for (final Patch patch in _patches) {
+      for (final Package package in patch.compatiblePackages) {
+        if (!compatiblePackages.contains(package.name)) {
+          compatiblePackages.add(package.name);
+        }
+      }
+    }
+    return compatiblePackages;
+  }
+
+  List<Patch> getUniversalPatches() {
+    return _patches
+        .where((patch) => patch.compatiblePackages.isEmpty)
+        .toList();
+  }
+
   Future<void> _loadPatches() async {
     try {
       if (_patches.isEmpty) {
@@ -56,6 +75,9 @@ class PatcherAPI {
       }
       _patches = List.empty();
     }
+
+    _compatiblePackages = getCompatiblePackages();
+    _universalPatches = getUniversalPatches();
   }
 
   Future<List<ApplicationWithIcon>> getFilteredInstalledApps(
@@ -63,31 +85,23 @@ class PatcherAPI {
   ) async {
     final List<ApplicationWithIcon> filteredApps = [];
     final bool allAppsIncluded =
-        _patches.any((patch) => patch.compatiblePackages.isEmpty) &&
+        _universalPatches.isNotEmpty &&
             showUniversalPatches;
     if (allAppsIncluded) {
-      final allPackages = await DeviceApps.getInstalledApplications(
+      final appList = await DeviceApps.getInstalledApplications(
         includeAppIcons: true,
         onlyAppsWithLaunchIntent: true,
       );
-      for (final pkg in allPackages) {
+
-        if (!filteredApps.any((app) => app.packageName == pkg.packageName)) {
+      for(final app in appList) {
-          final appInfo = await DeviceApps.getApp(
+        filteredApps.add(app as ApplicationWithIcon);
-            pkg.packageName,
-            true,
-          ) as ApplicationWithIcon?;
-          if (appInfo != null) {
-            filteredApps.add(appInfo);
       }
     }
-      }
+    for (final packageName in _compatiblePackages) {
-    }
-    for (final Patch patch in _patches) {
-      for (final Package package in patch.compatiblePackages) {
       try {
-          if (!filteredApps.any((app) => app.packageName == package.name)) {
+        if (!filteredApps.any((app) => app.packageName == packageName)) {
           final ApplicationWithIcon? app = await DeviceApps.getApp(
-              package.name,
+            packageName,
             true,
           ) as ApplicationWithIcon?;
           if (app != null) {
@@ -100,11 +114,14 @@ class PatcherAPI {
         }
       }
     }
-    }
     return filteredApps;
   }
 
   List<Patch> getFilteredPatches(String packageName) {
+    if (!_compatiblePackages.contains(packageName)) {
+      return _universalPatches;
+    }
+
     final List<Patch> patches = _patches
         .where(
           (patch) =>

lib/ui/theme/dynamic_theme_builder.dart

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

lib/ui/views/app_selector/app_selector_viewmodel.dart

@@ -90,13 +90,17 @@ class AppSelectorViewModel extends BaseViewModel {
         await DeviceApps.getApp(packageName, true) as ApplicationWithIcon?;
     if (app != null) {
       if (await checkSplitApk(packageName) && !isRooted) {
+        if (context.mounted) {
           return showSelectFromStorageDialog(context);
+        }
       } else if (!await checkSplitApk(packageName) || isRooted) {
         selectApp(app);
+        if (context.mounted) {
           Navigator.pop(context);
         }
       }
     }
+  }
 
   Future showSelectFromStorageDialog(BuildContext context) async {
     return showDialog(

lib/ui/views/installer/installer_view.dart

@@ -21,11 +21,23 @@ class InstallerView extends StatelessWidget {
           bottom: false,
           child: Scaffold(
             floatingActionButton: Visibility(
-              visible: !model.isPatching,
+              visible: !model.isPatching && !model.hasErrors,
               child: FloatingActionButton.extended(
-                label: I18nText('installerView.installButton'),
+                label: I18nText(
-                icon: const Icon(Icons.file_download_outlined),
+                  model.isInstalled
-                onPressed: () => model.installTypeDialog(context),
+                      ? 'installerView.openButton'
+                      : 'installerView.installButton',
+                ),
+                icon: model.isInstalled
+                    ? const Icon(Icons.open_in_new)
+                    : const Icon(Icons.file_download_outlined),
+                onPressed: model.isInstalled
+                    ? () => {
+                          model.openApp(),
+                          model.cleanPatcher(),
+                          Navigator.of(context).pop(),
+                        }
+                    : () => model.installTypeDialog(context),
                 elevation: 0,
               ),
             ),

lib/ui/views/installer/installer_viewmodel.dart

@@ -182,7 +182,8 @@ class InstallerViewModel extends BaseViewModel {
           backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
           icon: const Icon(Icons.file_download_outlined),
           contentPadding: const EdgeInsets.symmetric(vertical: 16),
-          content: ValueListenableBuilder(
+          content: SingleChildScrollView(
+            child: ValueListenableBuilder(
               valueListenable: installType,
               builder: (context, value, child) {
                 return Column(
@@ -209,7 +210,7 @@ class InstallerViewModel extends BaseViewModel {
                     RadioListTile(
                       title: I18nText('installerView.installNonRootType'),
                       subtitle: I18nText('installerView.installRecommendedType'),
-                    contentPadding: const EdgeInsets.symmetric(horizontal: 10),
+                      contentPadding: const EdgeInsets.symmetric(horizontal: 16),
                       value: 0,
                       groupValue: value,
                       onChanged: (selected) {
@@ -218,7 +219,7 @@ class InstallerViewModel extends BaseViewModel {
                     ),
                     RadioListTile(
                       title: I18nText('installerView.installRootType'),
-                    contentPadding: const EdgeInsets.symmetric(horizontal: 10),
+                      contentPadding: const EdgeInsets.symmetric(horizontal: 16),
                       value: 1,
                       groupValue: value,
                       onChanged: (selected) {
@@ -229,6 +230,7 @@ class InstallerViewModel extends BaseViewModel {
                 );
               },
             ),
+          ),
           actions: [
             CustomMaterialButton(
               label: I18nText('cancelButton'),

lib/ui/views/navigation/navigation_viewmodel.dart

@@ -18,24 +18,20 @@ class NavigationViewModel extends IndexTrackingViewModel {
   Future<void> initialize(BuildContext context) async {
     locator<Toast>().initialize(context);
     final SharedPreferences prefs = await SharedPreferences.getInstance();
-    requestManageExternalStorage();
+    await requestManageExternalStorage();
 
     if (prefs.getBool('permissionsRequested') == null) {
       await Permission.storage.request();
-      await Permission.manageExternalStorage.request();
       await prefs.setBool('permissionsRequested', true);
-      RootAPI().hasRootPermissions().then(
+      await RootAPI().hasRootPermissions().then(
             (value) => Permission.requestInstallPackages.request().then(
                   (value) => Permission.ignoreBatteryOptimizations.request(),
                 ),
           );
     }
 
-    if (prefs.getBool('useDarkTheme') == null) {
+    if (prefs.getInt('themeMode') == null) {
-      final bool isDark =
+      await prefs.setInt('themeMode', 0);
-          MediaQuery.platformBrightnessOf(context) != Brightness.light;
-      await prefs.setBool('useDarkTheme', isDark);
-      await DynamicTheme.of(context)!.setTheme(isDark ? 1 : 0);
     }
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
     SystemChrome.setSystemUIOverlayStyle(

lib/ui/views/patches_selector/patches_selector_view.dart

@@ -199,7 +199,8 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                                   supportedPackageVersions:
                                       model.getSupportedVersions(patch),
                                   isUnsupported: !isPatchSupported(patch),
-                                  isChangeEnabled: _managerAPI.isPatchesChangeEnabled(),
+                                  isChangeEnabled:
+                                      _managerAPI.isPatchesChangeEnabled(),
                                   isNew: model.isPatchNew(
                                     patch,
                                     model.getAppInfo().packageName,
@@ -221,8 +222,23 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                                   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) {
@@ -236,7 +252,8 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                                       supportedPackageVersions:
                                           model.getSupportedVersions(patch),
                                       isUnsupported: !isPatchSupported(patch),
-                                      isChangeEnabled: _managerAPI.isPatchesChangeEnabled(),
+                                      isChangeEnabled:
+                                          _managerAPI.isPatchesChangeEnabled(),
                                       isNew: false,
                                       isSelected: model.isSelected(patch),
                                       onChanged: (value) => model.selectPatch(

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

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

lib/ui/widgets/settingsView/social_media_widget.dart

@@ -75,8 +75,8 @@ class SocialMediaWidget extends StatelessWidget {
               SocialMediaItem(
                 icon: FaIcon(FontAwesomeIcons.youtube),
                 title: Text('YouTube'),
-                subtitle: Text('youtube.com/revanced'),
+                subtitle: Text('youtube.com/@revanced'),
-                url: 'https://youtube.com/revanced',
+                url: 'https://youtube.com/@revanced',
               ),
             ],
           ),

pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 1.8.0+100800000
+version: 1.10.1+101000001
 
 environment:
   sdk: '>=3.0.0 <4.0.0'