fix: install dialog getting stuck

.github/workflows/pull_strings.yml

@@ -1,43 +0,0 @@
-name: Pull strings
-
-on:
-  schedule:
-    - cron: "0 0 * * 0"
-  workflow_dispatch:
-
-jobs:
-  pull:
-    name: Pull strings
-    permissions:
-      contents: write
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          ref: dev
-          clean: true
-
-      - name: Pull strings
-        uses: crowdin/github-action@v2
-        with:
-          config: crowdin.yml
-          upload_sources: false
-          download_translations: true
-          skip_ref_checkout: true
-          localization_branch_name: feat/translations
-          create_pull_request: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-
-      - name: Open pull request
-        if: github.event_name == 'workflow_dispatch'
-        uses: repo-sync/pull-request@v2
-        with:
-          source_branch: feat/translations
-          destination_branch: dev
-          pr_title: "chore: Sync translations"
-          pr_body: "Sync translations from [crowdin.com/project/revanced](https://crowdin.com/project/revanced)"

.github/workflows/push_strings.yml

@@ -1,26 +0,0 @@
-name: Push strings
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - dev
-    paths:
-      - app/src/main/res/values/strings.xml
-
-jobs:
-  push:
-    name: Push strings
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Push strings
-        uses: crowdin/github-action@v2
-        with:
-          config: crowdin.yml
-          upload_sources: true
-        env:
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

README.md

@@ -73,7 +73,7 @@ ReVanced Manager is an application that uses [ReVanced Patcher](https://github.c
 
 Some of the features ReVanced Manager provides are:
 
-- ⬇️ **Download**: Automatically download apps using the ReVanced Manager downloader system
+- ⬇️ **Download**: Automatically download apps using the ReVanced Manager downloader plugin system
 - 💉 **Patch**: Select and apply patches to any Android app
 - 🛠️ **Customize**: Manage patches, apps, signing, themes, updates, and many more settings
 

api/CHANGELOG.md

@@ -1,6 +0,0 @@
-# api 1.0.0-dev.1 (2026-02-19)
-
-
-### Features
-
-* Allow multiple downloaders per APK ([#2916](https://github.com/ReVanced/revanced-manager/issues/2916)) ([0f56377](https://github.com/ReVanced/revanced-manager/commit/0f56377214fae05693a21177daf7534c103df74e))

api/api/api.api

@@ -1,19 +1,19 @@
-public abstract interface class app/revanced/manager/downloader/BaseDownloadScope : app/revanced/manager/downloader/Scope {
+public abstract interface class app/revanced/manager/plugin/downloader/BaseDownloadScope : app/revanced/manager/plugin/downloader/Scope {
 }
 
-public final class app/revanced/manager/downloader/ConstantsKt {
-	public static final field DOWNLOADER_HOST_PERMISSION Ljava/lang/String;
+public final class app/revanced/manager/plugin/downloader/ConstantsKt {
+	public static final field PLUGIN_HOST_PERMISSION Ljava/lang/String;
 }
 
-public final class app/revanced/manager/downloader/DownloadUrl : android/os/Parcelable {
+public final class app/revanced/manager/plugin/downloader/DownloadUrl : android/os/Parcelable {
 	public static final field $stable I
 	public static final field CREATOR Landroid/os/Parcelable$Creator;
 	public fun <init> (Ljava/lang/String;Ljava/util/Map;)V
 	public synthetic fun <init> (Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
 	public final fun component2 ()Ljava/util/Map;
-	public final fun copy (Ljava/lang/String;Ljava/util/Map;)Lapp/revanced/manager/downloader/DownloadUrl;
-	public static synthetic fun copy$default (Lapp/revanced/manager/downloader/DownloadUrl;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lapp/revanced/manager/downloader/DownloadUrl;
+	public final fun copy (Ljava/lang/String;Ljava/util/Map;)Lapp/revanced/manager/plugin/downloader/DownloadUrl;
+	public static synthetic fun copy$default (Lapp/revanced/manager/plugin/downloader/DownloadUrl;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lapp/revanced/manager/plugin/downloader/DownloadUrl;
 	public final fun describeContents ()I
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getHeaders ()Ljava/util/Map;
@@ -24,53 +24,58 @@ public final class app/revanced/manager/downloader/DownloadUrl : android/os/Parc
 	public final fun writeToParcel (Landroid/os/Parcel;I)V
 }
 
-public final class app/revanced/manager/downloader/Downloader {
+public final class app/revanced/manager/plugin/downloader/DownloadUrl$Creator : android/os/Parcelable$Creator {
+	public fun <init> ()V
+	public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/plugin/downloader/DownloadUrl;
+	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
+	public final fun newArray (I)[Lapp/revanced/manager/plugin/downloader/DownloadUrl;
+	public synthetic fun newArray (I)[Ljava/lang/Object;
+}
+
+public final class app/revanced/manager/plugin/downloader/Downloader {
 	public static final field $stable I
 }
 
-public final class app/revanced/manager/downloader/DownloaderBuilder {
+public final class app/revanced/manager/plugin/downloader/DownloaderBuilder {
 	public static final field $stable I
 }
 
-public abstract interface annotation class app/revanced/manager/downloader/DownloaderHostApi : java/lang/annotation/Annotation {
+public final class app/revanced/manager/plugin/downloader/DownloaderKt {
+	public static final fun Downloader (Lkotlin/jvm/functions/Function1;)Lapp/revanced/manager/plugin/downloader/DownloaderBuilder;
 }
 
-public final class app/revanced/manager/downloader/DownloaderKt {
-	public static final fun Downloader (ILkotlin/jvm/functions/Function1;)Lapp/revanced/manager/downloader/DownloaderBuilder;
-}
-
-public final class app/revanced/manager/downloader/DownloaderScope : app/revanced/manager/downloader/Scope {
+public final class app/revanced/manager/plugin/downloader/DownloaderScope : app/revanced/manager/plugin/downloader/Scope {
 	public static final field $stable I
 	public final fun download (Lkotlin/jvm/functions/Function3;)V
 	public final fun get (Lkotlin/jvm/functions/Function4;)V
-	public fun getDownloaderPackageName ()Ljava/lang/String;
 	public fun getHostPackageName ()Ljava/lang/String;
+	public fun getPluginPackageName ()Ljava/lang/String;
 	public final fun useService (Landroid/content/Intent;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class app/revanced/manager/downloader/ExtensionsKt {
-	public static final fun download (Lapp/revanced/manager/downloader/DownloaderScope;Lkotlin/jvm/functions/Function4;)V
+public final class app/revanced/manager/plugin/downloader/ExtensionsKt {
+	public static final fun download (Lapp/revanced/manager/plugin/downloader/DownloaderScope;Lkotlin/jvm/functions/Function4;)V
 }
 
-public abstract interface class app/revanced/manager/downloader/GetScope : app/revanced/manager/downloader/Scope {
+public abstract interface class app/revanced/manager/plugin/downloader/GetScope : app/revanced/manager/plugin/downloader/Scope {
 	public abstract fun requestStartActivity (Landroid/content/Intent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public abstract interface class app/revanced/manager/downloader/InputDownloadScope : app/revanced/manager/downloader/BaseDownloadScope {
+public abstract interface class app/revanced/manager/plugin/downloader/InputDownloadScope : app/revanced/manager/plugin/downloader/BaseDownloadScope {
 }
 
-public abstract interface class app/revanced/manager/downloader/OutputDownloadScope : app/revanced/manager/downloader/BaseDownloadScope {
+public abstract interface class app/revanced/manager/plugin/downloader/OutputDownloadScope : app/revanced/manager/plugin/downloader/BaseDownloadScope {
 	public abstract fun reportSize (JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class app/revanced/manager/downloader/Package : android/os/Parcelable {
+public final class app/revanced/manager/plugin/downloader/Package : android/os/Parcelable {
 	public static final field $stable I
 	public static final field CREATOR Landroid/os/Parcelable$Creator;
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
 	public final fun component1 ()Ljava/lang/String;
 	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/manager/downloader/Package;
-	public static synthetic fun copy$default (Lapp/revanced/manager/downloader/Package;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lapp/revanced/manager/downloader/Package;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/manager/plugin/downloader/Package;
+	public static synthetic fun copy$default (Lapp/revanced/manager/plugin/downloader/Package;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lapp/revanced/manager/plugin/downloader/Package;
 	public final fun describeContents ()I
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getName ()Ljava/lang/String;
@@ -80,79 +85,98 @@ public final class app/revanced/manager/downloader/Package : android/os/Parcelab
 	public final fun writeToParcel (Landroid/os/Parcel;I)V
 }
 
-public abstract interface class app/revanced/manager/downloader/Scope {
-	public abstract fun getDownloaderPackageName ()Ljava/lang/String;
+public final class app/revanced/manager/plugin/downloader/Package$Creator : android/os/Parcelable$Creator {
+	public fun <init> ()V
+	public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/plugin/downloader/Package;
+	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
+	public final fun newArray (I)[Lapp/revanced/manager/plugin/downloader/Package;
+	public synthetic fun newArray (I)[Ljava/lang/Object;
+}
+
+public abstract interface annotation class app/revanced/manager/plugin/downloader/PluginHostApi : java/lang/annotation/Annotation {
+}
+
+public abstract interface class app/revanced/manager/plugin/downloader/Scope {
 	public abstract fun getHostPackageName ()Ljava/lang/String;
+	public abstract fun getPluginPackageName ()Ljava/lang/String;
 }
 
-public abstract class app/revanced/manager/downloader/UserInteractionException : java/lang/Exception {
+public abstract class app/revanced/manager/plugin/downloader/UserInteractionException : java/lang/Exception {
 	public static final field $stable I
 	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
-public abstract class app/revanced/manager/downloader/UserInteractionException$Activity : app/revanced/manager/downloader/UserInteractionException {
+public abstract class app/revanced/manager/plugin/downloader/UserInteractionException$Activity : app/revanced/manager/plugin/downloader/UserInteractionException {
 	public static final field $stable I
 	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
-public final class app/revanced/manager/downloader/UserInteractionException$Activity$Cancelled : app/revanced/manager/downloader/UserInteractionException$Activity {
+public final class app/revanced/manager/plugin/downloader/UserInteractionException$Activity$Cancelled : app/revanced/manager/plugin/downloader/UserInteractionException$Activity {
 	public static final field $stable I
 }
 
-public final class app/revanced/manager/downloader/UserInteractionException$Activity$NotCompleted : app/revanced/manager/downloader/UserInteractionException$Activity {
+public final class app/revanced/manager/plugin/downloader/UserInteractionException$Activity$NotCompleted : app/revanced/manager/plugin/downloader/UserInteractionException$Activity {
 	public static final field $stable I
 	public final fun getIntent ()Landroid/content/Intent;
 	public final fun getResultCode ()I
 }
 
-public final class app/revanced/manager/downloader/UserInteractionException$RequestDenied : app/revanced/manager/downloader/UserInteractionException {
+public final class app/revanced/manager/plugin/downloader/UserInteractionException$RequestDenied : app/revanced/manager/plugin/downloader/UserInteractionException {
 	public static final field $stable I
 }
 
-public final class app/revanced/manager/downloader/webview/APIKt {
-	public static final fun WebViewDownloader (ILkotlin/jvm/functions/Function4;)Lapp/revanced/manager/downloader/DownloaderBuilder;
-	public static final fun runWebView (Lapp/revanced/manager/downloader/GetScope;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+public final class app/revanced/manager/plugin/downloader/webview/APIKt {
+	public static final fun WebViewDownloader (Lkotlin/jvm/functions/Function4;)Lapp/revanced/manager/plugin/downloader/DownloaderBuilder;
+	public static final fun runWebView (Lapp/revanced/manager/plugin/downloader/GetScope;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public class app/revanced/manager/downloader/webview/IWebView$Default : app/revanced/manager/downloader/webview/IWebView {
+public class app/revanced/manager/plugin/downloader/webview/IWebView$Default : app/revanced/manager/plugin/downloader/webview/IWebView {
 	public fun <init> ()V
 	public fun asBinder ()Landroid/os/IBinder;
 	public fun finish ()V
 	public fun load (Ljava/lang/String;)V
 }
 
-public abstract class app/revanced/manager/downloader/webview/IWebView$Stub : android/os/Binder, app/revanced/manager/downloader/webview/IWebView {
+public abstract class app/revanced/manager/plugin/downloader/webview/IWebView$Stub : android/os/Binder, app/revanced/manager/plugin/downloader/webview/IWebView {
 	public fun <init> ()V
 	public fun asBinder ()Landroid/os/IBinder;
-	public static fun asInterface (Landroid/os/IBinder;)Lapp/revanced/manager/downloader/webview/IWebView;
+	public static fun asInterface (Landroid/os/IBinder;)Lapp/revanced/manager/plugin/downloader/webview/IWebView;
 	public fun onTransact (ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 }
 
-public class app/revanced/manager/downloader/webview/IWebViewEvents$Default : app/revanced/manager/downloader/webview/IWebViewEvents {
+public class app/revanced/manager/plugin/downloader/webview/IWebViewEvents$Default : app/revanced/manager/plugin/downloader/webview/IWebViewEvents {
 	public fun <init> ()V
 	public fun asBinder ()Landroid/os/IBinder;
 	public fun download (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 	public fun pageLoad (Ljava/lang/String;)V
-	public fun ready (Lapp/revanced/manager/downloader/webview/IWebView;)V
+	public fun ready (Lapp/revanced/manager/plugin/downloader/webview/IWebView;)V
 }
 
-public abstract class app/revanced/manager/downloader/webview/IWebViewEvents$Stub : android/os/Binder, app/revanced/manager/downloader/webview/IWebViewEvents {
+public abstract class app/revanced/manager/plugin/downloader/webview/IWebViewEvents$Stub : android/os/Binder, app/revanced/manager/plugin/downloader/webview/IWebViewEvents {
 	public fun <init> ()V
 	public fun asBinder ()Landroid/os/IBinder;
-	public static fun asInterface (Landroid/os/IBinder;)Lapp/revanced/manager/downloader/webview/IWebViewEvents;
+	public static fun asInterface (Landroid/os/IBinder;)Lapp/revanced/manager/plugin/downloader/webview/IWebViewEvents;
 	public fun onTransact (ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 }
 
-public abstract interface class app/revanced/manager/downloader/webview/WebViewCallbackScope : app/revanced/manager/downloader/Scope {
+public final class app/revanced/manager/plugin/downloader/webview/WebViewActivity$Parameters$Creator : android/os/Parcelable$Creator {
+	public fun <init> ()V
+	public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/plugin/downloader/webview/WebViewActivity$Parameters;
+	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
+	public final fun newArray (I)[Lapp/revanced/manager/plugin/downloader/webview/WebViewActivity$Parameters;
+	public synthetic fun newArray (I)[Ljava/lang/Object;
+}
+
+public abstract interface class app/revanced/manager/plugin/downloader/webview/WebViewCallbackScope : app/revanced/manager/plugin/downloader/Scope {
 	public abstract fun finish (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun load (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class app/revanced/manager/downloader/webview/WebViewScope : app/revanced/manager/downloader/Scope {
+public final class app/revanced/manager/plugin/downloader/webview/WebViewScope : app/revanced/manager/plugin/downloader/Scope {
 	public static final field $stable I
 	public final fun download (Lkotlin/jvm/functions/Function5;)V
-	public fun getDownloaderPackageName ()Ljava/lang/String;
 	public fun getHostPackageName ()Ljava/lang/String;
+	public fun getPluginPackageName ()Ljava/lang/String;
 	public final fun pageLoad (Lkotlin/jvm/functions/Function3;)V
 }
 

api/build.gradle.kts

@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -19,16 +17,9 @@ dependencies {
     implementation(libs.appcompat)
 }
 
-kotlin {
-    jvmToolchain(17)
-    compilerOptions {
-        jvmTarget = JvmTarget.JVM_17
-    }
-}
-
 android {
-    namespace = "app.revanced.manager.downloader"
-    compileSdk = 36
+    namespace = "app.revanced.manager.plugin.downloader"
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 26
@@ -51,13 +42,17 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
     buildFeatures {
         aidl = true
     }
 }
 
 apiValidation {
-    nonPublicMarkers += "app.revanced.manager.downloader.DownloaderHostApi"
+    nonPublicMarkers += "app.revanced.manager.plugin.downloader.PluginHostApi"
 }
 
 publishing {

api/gradle.properties

@@ -1 +0,0 @@
-version = 1.0.0-dev.1

api/src/main/aidl/app/revanced/manager/downloader/webview/IWebView.aidl

@@ -1,8 +0,0 @@
-// IWebView.aidl
-package app.revanced.manager.downloader.webview;
-
-@JavaPassthrough(annotation="@app.revanced.manager.downloader.DownloaderHostApi")
-oneway interface IWebView {
-    void load(String url);
-    void finish();
-}

api/src/main/aidl/app/revanced/manager/downloader/webview/IWebViewEvents.aidl

@@ -1,11 +0,0 @@
-// IWebViewEvents.aidl
-package app.revanced.manager.downloader.webview;
-
-import app.revanced.manager.downloader.webview.IWebView;
-
-@JavaPassthrough(annotation="@app.revanced.manager.downloader.DownloaderHostApi")
-oneway interface IWebViewEvents {
-    void ready(IWebView iface);
-    void pageLoad(String url);
-    void download(String url, String mimetype, String userAgent);
-}

api/src/main/aidl/app/revanced/manager/plugin/downloader/webview/IWebView.aidl

@@ -0,0 +1,8 @@
+// IWebView.aidl
+package app.revanced.manager.plugin.downloader.webview;
+
+@JavaPassthrough(annotation="@app.revanced.manager.plugin.downloader.PluginHostApi")
+oneway interface IWebView {
+    void load(String url);
+    void finish();
+}

api/src/main/aidl/app/revanced/manager/plugin/downloader/webview/IWebViewEvents.aidl

@@ -0,0 +1,11 @@
+// IWebViewEvents.aidl
+package app.revanced.manager.plugin.downloader.webview;
+
+import app.revanced.manager.plugin.downloader.webview.IWebView;
+
+@JavaPassthrough(annotation="@app.revanced.manager.plugin.downloader.PluginHostApi")
+oneway interface IWebViewEvents {
+    void ready(IWebView iface);
+    void pageLoad(String url);
+    void download(String url, String mimetype, String userAgent);
+}

api/src/main/kotlin/app/revanced/manager/downloader/Constants.kt

@@ -1,7 +0,0 @@
-package app.revanced.manager.downloader
-
-/**
- * The permission ID of the special downloader host permission. Only ReVanced Manager will have this permission.
- * Downloader UI activities and internal services can be protected using this permission.
- */
-const val DOWNLOADER_HOST_PERMISSION = "app.revanced.manager.permission.DOWNLOADER_HOST"

api/src/main/kotlin/app/revanced/manager/plugin/downloader/Constants.kt

@@ -0,0 +1,7 @@
+package app.revanced.manager.plugin.downloader
+
+/**
+ * The permission ID of the special plugin host permission. Only ReVanced Manager will have this permission.
+ * Plugin UI activities and internal services can be protected using this permission.
+ */
+const val PLUGIN_HOST_PERMISSION = "app.revanced.manager.permission.PLUGIN_HOST"

api/src/main/kotlin/app/revanced/manager/plugin/downloader/Downloader.kt

@@ -1,4 +1,4 @@
-package app.revanced.manager.downloader
+package app.revanced.manager.plugin.downloader
 
 import android.content.ComponentName
 import android.content.Context
@@ -7,7 +7,6 @@ import android.content.ServiceConnection
 import android.os.IBinder
 import android.app.Activity
 import android.os.Parcelable
-import androidx.annotation.StringRes
 import kotlinx.coroutines.withTimeout
 import java.io.InputStream
 import java.io.OutputStream
@@ -16,10 +15,10 @@ import kotlin.coroutines.suspendCoroutine
 
 @RequiresOptIn(
     level = RequiresOptIn.Level.ERROR,
-    message = "This API is only intended for downloader hosts, don't use it in a downloader.",
+    message = "This API is only intended for plugin hosts, don't use it in a plugin.",
 )
 @Retention(AnnotationRetention.BINARY)
-annotation class DownloaderHostApi
+annotation class PluginHostApi
 
 /**
  * The base interface for all DSL scopes.
@@ -31,9 +30,9 @@ interface Scope {
     val hostPackageName: String
 
     /**
-     * The package name of the downloader.
+     * The package name of the plugin.
      */
-    val downloaderPackageName: String
+    val pluginPackageName: String
 }
 
 /**
@@ -44,7 +43,7 @@ interface GetScope : Scope {
      * Ask the user to perform some required interaction in the activity specified by the provided [Intent].
      * This function returns normally with the resulting [Intent] when the activity finishes with code [Activity.RESULT_OK].
      *
-     * @throws UserInteractionException.RequestDenied User decided to skip this downloader.
+     * @throws UserInteractionException.RequestDenied User decided to skip this plugin.
      * @throws UserInteractionException.Activity.Cancelled The activity was cancelled.
      * @throws UserInteractionException.Activity.NotCompleted The activity finished with an unknown result code.
      */
@@ -68,14 +67,14 @@ class DownloaderScope<T : Parcelable> internal constructor(
     private val scopeImpl: Scope,
     internal val context: Context
 ) : Scope by scopeImpl {
-    // Returning an InputStream is the primary way for a downloader to implement the download function, but we also want to offer an OutputStream API since using InputStream might not be convenient in all cases.
-    // It is much easier to implement the main InputStream API on top of OutputStreams compared to doing it the other way around, which is why we are using OutputStream here.
+    // Returning an InputStream is the primary way for plugins to implement the download function, but we also want to offer an OutputStream API since using InputStream might not be convenient in all cases.
+    // It is much easier to implement the main InputStream API on top of OutputStreams compared to doing it the other way around, which is why we are using OutputStream here. This detail is not visible to plugins.
     internal var download: (suspend OutputDownloadScope.(T, OutputStream) -> Unit)? = null
     internal var get: (suspend GetScope.(String, String?) -> GetResult<T>?)? = null
     private val inputDownloadScopeImpl = object : InputDownloadScope, Scope by scopeImpl {}
 
     /**
-     * Define the download block of the downloader.
+     * Define the download block of the plugin.
      */
     fun download(block: suspend InputDownloadScope.(data: T) -> DownloadResult) {
         download = { app, outputStream ->
@@ -89,7 +88,7 @@ class DownloaderScope<T : Parcelable> internal constructor(
     }
 
     /**
-     * Define the get block of the downloader.
+     * Define the get block of the plugin.
      * The block should return null if the app cannot be found. The version in the result must match the version argument unless it is null.
      */
     fun get(block: suspend GetScope.(packageName: String, version: String?) -> GetResult<T>?) {
@@ -123,53 +122,44 @@ class DownloaderScope<T : Parcelable> internal constructor(
     }
 }
 
-class DownloaderBuilder<T : Parcelable> internal constructor(
-    @param:StringRes private val name: Int,
-    private val block: DownloaderScope<T>.() -> Unit
-) {
-    @DownloaderHostApi
+class DownloaderBuilder<T : Parcelable> internal constructor(private val block: DownloaderScope<T>.() -> Unit) {
+    @PluginHostApi
     fun build(scopeImpl: Scope, context: Context) =
         with(DownloaderScope<T>(scopeImpl, context)) {
             block()
 
             Downloader(
                 download = download!!,
-                get = get!!,
-                name = name,
+                get = get!!
             )
         }
 }
 
 class Downloader<T : Parcelable> internal constructor(
-    @property:DownloaderHostApi val get: suspend GetScope.(packageName: String, version: String?) -> GetResult<T>?,
-    @property:DownloaderHostApi val download: suspend OutputDownloadScope.(data: T, outputStream: OutputStream) -> Unit,
-    @property:DownloaderHostApi @param:StringRes val name: Int,
+    @property:PluginHostApi val get: suspend GetScope.(packageName: String, version: String?) -> GetResult<T>?,
+    @property:PluginHostApi val download: suspend OutputDownloadScope.(data: T, outputStream: OutputStream) -> Unit
 )
 
 /**
- * Define a downloader.
+ * Define a downloader plugin.
  */
-fun <T : Parcelable> Downloader(@StringRes name: Int, block: DownloaderScope<T>.() -> Unit) =
-    DownloaderBuilder(name, block)
+fun <T : Parcelable> Downloader(block: DownloaderScope<T>.() -> Unit) = DownloaderBuilder(block)
 
 /**
  * @see GetScope.requestStartActivity
  */
 sealed class UserInteractionException(message: String) : Exception(message) {
-    class RequestDenied @DownloaderHostApi constructor() :
+    class RequestDenied @PluginHostApi constructor() :
         UserInteractionException("Request denied by user")
 
     sealed class Activity(message: String) : UserInteractionException(message) {
-        class Cancelled @DownloaderHostApi constructor() : Activity("Interaction cancelled")
+        class Cancelled @PluginHostApi constructor() : Activity("Interaction cancelled")
 
         /**
          * @param resultCode The result code of the activity.
          * @param intent The [Intent] of the activity.
          */
-        class NotCompleted @DownloaderHostApi constructor(
-            val resultCode: Int,
-            val intent: Intent?
-        ) :
+        class NotCompleted @PluginHostApi constructor(val resultCode: Int, val intent: Intent?) :
             Activity("Unexpected activity result code: $resultCode")
     }
 }

api/src/main/kotlin/app/revanced/manager/plugin/downloader/Extensions.kt

@@ -1,4 +1,4 @@
-package app.revanced.manager.downloader
+package app.revanced.manager.plugin.downloader
 
 import android.app.Activity
 import android.app.Service
@@ -28,7 +28,7 @@ fun <T : Parcelable> DownloaderScope<T>.download(block: suspend OutputDownloadSc
  */
 suspend inline fun <reified ACTIVITY : Activity> GetScope.requestStartActivity() =
     requestStartActivity(
-        Intent().apply { setClassName(downloaderPackageName, ACTIVITY::class.qualifiedName!!) }
+        Intent().apply { setClassName(pluginPackageName, ACTIVITY::class.qualifiedName!!) }
     )
 
 /**
@@ -38,5 +38,5 @@ suspend inline fun <reified ACTIVITY : Activity> GetScope.requestStartActivity()
 suspend inline fun <reified SERVICE : Service, R : Any?> DownloaderScope<*>.useService(
     noinline block: suspend (IBinder) -> R
 ) = useService(
-    Intent().apply { setClassName(downloaderPackageName, SERVICE::class.qualifiedName!!) }, block
+    Intent().apply { setClassName(pluginPackageName, SERVICE::class.qualifiedName!!) }, block
 )

api/src/main/kotlin/app/revanced/manager/plugin/downloader/Parcelables.kt

@@ -1,4 +1,4 @@
-package app.revanced.manager.downloader
+package app.revanced.manager.plugin.downloader
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
@@ -7,7 +7,7 @@ import java.net.URI
 
 /**
  * A simple parcelable data class for storing a package name and version.
- * This can be used as the data type for downloaders that only need a name and version to implement their [DownloaderScope.download] function.
+ * This can be used as the data type for plugins that only need a name and version to implement their [DownloaderScope.download] function.
  *
  * @param name The package name.
  * @param version The version.

api/src/main/kotlin/app/revanced/manager/plugin/downloader/webview/API.kt

@@ -1,13 +1,12 @@
-package app.revanced.manager.downloader.webview
+package app.revanced.manager.plugin.downloader.webview
 
 import android.content.Intent
-import androidx.annotation.StringRes
-import app.revanced.manager.downloader.DownloadUrl
-import app.revanced.manager.downloader.DownloaderScope
-import app.revanced.manager.downloader.GetScope
-import app.revanced.manager.downloader.Scope
-import app.revanced.manager.downloader.Downloader
-import app.revanced.manager.downloader.DownloaderHostApi
+import app.revanced.manager.plugin.downloader.DownloadUrl
+import app.revanced.manager.plugin.downloader.DownloaderScope
+import app.revanced.manager.plugin.downloader.GetScope
+import app.revanced.manager.plugin.downloader.Scope
+import app.revanced.manager.plugin.downloader.Downloader
+import app.revanced.manager.plugin.downloader.PluginHostApi
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -33,7 +32,7 @@ interface WebViewCallbackScope<T> : Scope {
     suspend fun load(url: String)
 }
 
-@OptIn(DownloaderHostApi::class)
+@OptIn(PluginHostApi::class)
 class WebViewScope<T> internal constructor(
     coroutineScope: CoroutineScope,
     private val scopeImpl: Scope,
@@ -111,7 +110,7 @@ private value class Container<U>(val value: U)
  * @param title The string displayed in the action bar.
  * @param block The control block.
  */
-@OptIn(DownloaderHostApi::class)
+@OptIn(PluginHostApi::class)
 suspend fun <T> GetScope.runWebView(
     title: String,
     block: suspend WebViewScope<T>.() -> InitialUrl
@@ -144,9 +143,11 @@ suspend fun <T> GetScope.runWebView(
  *
  * @see runWebView
  */
-fun WebViewDownloader(@StringRes name: Int, block: suspend WebViewScope<DownloadUrl>.(packageName: String, version: String?) -> InitialUrl?) =
-    Downloader(name) {
-        val label = context.getString(name)
+fun WebViewDownloader(block: suspend WebViewScope<DownloadUrl>.(packageName: String, version: String?) -> InitialUrl?) =
+    Downloader<DownloadUrl> {
+        val label = context.applicationInfo.loadLabel(
+            context.packageManager
+        ).toString()
 
         get { packageName, version ->
             class ReturnNull : Exception()

api/src/main/kotlin/app/revanced/manager/plugin/downloader/webview/WebViewActivity.kt

@@ -1,4 +1,4 @@
-package app.revanced.manager.downloader.webview
+package app.revanced.manager.plugin.downloader.webview
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -20,15 +20,15 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.lifecycle.viewModelScope
-import app.revanced.manager.downloader.DownloaderHostApi
-import app.revanced.manager.downloader.R
+import app.revanced.manager.plugin.downloader.PluginHostApi
+import app.revanced.manager.plugin.downloader.R
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
 
-@OptIn(DownloaderHostApi::class)
-@DownloaderHostApi
+@OptIn(PluginHostApi::class)
+@PluginHostApi
 class WebViewActivity : ComponentActivity() {
     @SuppressLint("SetJavaScriptEnabled")
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -110,7 +110,7 @@ class WebViewActivity : ComponentActivity() {
     }
 }
 
-@OptIn(DownloaderHostApi::class)
+@OptIn(PluginHostApi::class)
 internal class WebViewModel : ViewModel() {
     init {
         CookieManager.getInstance().apply {

app/CHANGELOG.md

@@ -1,57 +1,3 @@
-# app [1.26.0-dev.20](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.19...v1.26.0-dev.20) (2026-01-09)
-
-
-### Bug Fixes
-
-* Save FAB freaking out in select patches screen ([4c0b6b0](https://github.com/ReVanced/revanced-manager/commit/4c0b6b02e95a8d6f655bcf5c25493b1f9a4a4dcd))
-
-# app [1.26.0-dev.19](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.18...v1.26.0-dev.19) (2026-01-08)
-
-
-### Bug Fixes
-
-* **locales:** use buildconfig instead of generating kt file ([72b1db9](https://github.com/ReVanced/revanced-manager/commit/72b1db9a2f33ab5d5fffd8ba83c05901eff19bea))
-
-# app [1.26.0-dev.18](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.17...v1.26.0-dev.18) (2026-01-08)
-
-
-### Bug Fixes
-
-* Prevent trailing comma when no locales are generated ([b16931c](https://github.com/ReVanced/revanced-manager/commit/b16931ca79d5ce4d17c75f6dd3bf6f976b8ff7be))
-
-
-### Features
-
-* Add language settings ([#2913](https://github.com/ReVanced/revanced-manager/issues/2913)) ([df31b39](https://github.com/ReVanced/revanced-manager/commit/df31b39cc8c1fbf00bc3301468e8e7e4b283caf2))
-
-# app [1.26.0-dev.17](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.16...v1.26.0-dev.17) (2026-01-06)
-
-
-### Bug Fixes
-
-* allow updating patches on metered networks ([9d9a0e8](https://github.com/ReVanced/revanced-manager/commit/9d9a0e81dbc9e73e6e3181f6bea9cabb69e49ea8))
-
-# app [1.26.0-dev.16](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.15...v1.26.0-dev.16) (2025-12-30)
-
-
-### Features
-
-* Show patches as individual steps in patcher screen ([#2889](https://github.com/ReVanced/revanced-manager/issues/2889)) ([11dd6e4](https://github.com/ReVanced/revanced-manager/commit/11dd6e4064099427a8c9bc6f225a19412e5c70e2))
-
-# app [1.26.0-dev.15](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.14...v1.26.0-dev.15) (2025-12-29)
-
-
-### Bug Fixes
-
-* install dialog getting stuck ([#2900](https://github.com/ReVanced/revanced-manager/issues/2900)) ([18a4df9](https://github.com/ReVanced/revanced-manager/commit/18a4df9af9cac120fdb8e4ff7aadd2e2a8d5c1a6))
-
-# app [1.26.0-dev.14](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.13...v1.26.0-dev.14) (2025-12-28)
-
-
-### Bug Fixes
-
-* Update selected patch count when SelectionState changes ([#2896](https://github.com/ReVanced/revanced-manager/issues/2896)) ([0d26df0](https://github.com/ReVanced/revanced-manager/commit/0d26df03f463195dae550240c7f652680763079c))
-
 # app [1.26.0-dev.13](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.12...v1.26.0-dev.13) (2025-12-17)
 
 

app/build.gradle.kts

@@ -1,7 +1,4 @@
-import com.mikepenz.aboutlibraries.plugin.DuplicateMode
-import com.mikepenz.aboutlibraries.plugin.DuplicateRule
 import io.github.z4kn4fein.semver.toVersion
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import kotlin.random.Random
 
 plugins {
@@ -12,7 +9,6 @@ plugins {
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.devtools)
     alias(libs.plugins.about.libraries)
-    alias(libs.plugins.about.libraries.android)
     signing
 }
 
@@ -85,8 +81,7 @@ dependencies {
     implementation(libs.koin.workmanager)
 
     // Licenses
-    implementation(libs.about.libraries.core)
-    implementation(libs.about.libraries.m3)
+    implementation(libs.about.libraries)
 
     // Ktor
     implementation(libs.ktor.core)
@@ -131,7 +126,7 @@ buildscript {
 
 android {
     namespace = "app.revanced.manager"
-    compileSdk = 36
+    compileSdk = 35
     buildToolsVersion = "35.0.1"
 
     defaultConfig {
@@ -148,25 +143,13 @@ android {
                     (preRelease?.substringAfterLast('.')?.toInt() ?: 99)
         }
         vectorDrawables.useSupportLibrary = true
-
-        val resDir = file("src/main/res")
-        val locales = resDir.listFiles()
-            .orEmpty()
-            //noinspection WrongGradleMethod
-            .filter { it.isDirectory && it.name.matches(Regex("values-[a-z]{2}(-r[A-Z]{2})?")) }
-            //noinspection WrongGradleMethod
-            .map { it.name.removePrefix("values-").replace("-r", "-") }
-            .sorted()
-            //noinspection WrongGradleMethod
-            .joinToString(prefix = "{", separator = ",", postfix = "}") { "\"$it\"" }
-
-        buildConfigField("String[]", "SUPPORTED_LOCALES", locales)
     }
 
     buildTypes {
         debug {
             applicationIdSuffix = ".debug"
             resValue("string", "app_name", "ReVanced Manager (Debug)")
+            isPseudoLocalesEnabled = true
 
             buildConfigField("long", "BUILD_ID", "${Random.nextLong()}L")
         }
@@ -238,14 +221,20 @@ android {
         arg("room.schemaLocation", "$projectDir/schemas")
     }
 
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
     buildFeatures {
         compose = true
         aidl = true
         buildConfig = true
     }
 
-    androidResources {
-        generateLocaleConfig = true
+    android {
+        androidResources {
+            generateLocaleConfig = true
+        }
     }
 
     externalNativeBuild {
@@ -258,18 +247,6 @@ android {
 
 kotlin {
     jvmToolchain(17)
-    compilerOptions {
-        jvmTarget = JvmTarget.JVM_17
-    }
-}
-
-aboutLibraries {
-    library {
-        // Enable the duplication mode, allows to merge, or link dependencies which relate
-        duplicationMode = DuplicateMode.MERGE
-        // Configure the duplication rule, to match "duplicates" with
-        duplicationRule = DuplicateRule.EXACT
-    }
 }
 
 tasks {

app/gradle.properties

@@ -1 +1 @@
-version = 1.26.0-dev.20
+version = 1.26.0-dev.13

app/proguard-rules.pro

@@ -1,7 +1,7 @@
 -dontobfuscate
 
 -keep class app.revanced.manager.patcher.runtime.process.* { *; }
--keep class app.revanced.manager.downloader.** { *; }
+-keep class app.revanced.manager.plugin.** { *; }
 -keep class app.revanced.patcher.** { *; }
 -keep class com.android.tools.smali.** { *; }
 -keep class kotlin.** { *; }

app/schemas/app.revanced.manager.data.room.AppDatabase/1.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "c0060d66d8afa086f2632c4eb145ffc4",
+    "identityHash": "d0119047505da435972c5247181de675",
     "entities": [
       {
         "tableName": "patch_bundles",
@@ -21,9 +21,10 @@
             "notNull": true
           },
           {
-            "fieldPath": "versionHash",
+            "fieldPath": "version",
             "columnName": "version",
-            "affinity": "TEXT"
+            "affinity": "TEXT",
+            "notNull": false
           },
           {
             "fieldPath": "source",
@@ -43,7 +44,9 @@
           "columnNames": [
             "uid"
           ]
-        }
+        },
+        "indices": [],
+        "foreignKeys": []
       },
       {
         "tableName": "patch_selections",
@@ -124,6 +127,7 @@
             "patch_name"
           ]
         },
+        "indices": [],
         "foreignKeys": [
           {
             "table": "patch_selections",
@@ -173,7 +177,9 @@
             "package_name",
             "version"
           ]
-        }
+        },
+        "indices": [],
+        "foreignKeys": []
       },
       {
         "tableName": "installed_app",
@@ -209,7 +215,9 @@
           "columnNames": [
             "current_package_name"
           ]
-        }
+        },
+        "indices": [],
+        "foreignKeys": []
       },
       {
         "tableName": "applied_patch",
@@ -370,6 +378,7 @@
             "key"
           ]
         },
+        "indices": [],
         "foreignKeys": [
           {
             "table": "option_groups",
@@ -385,7 +394,7 @@
         ]
       },
       {
-        "tableName": "trusted_downloaders",
+        "tableName": "trusted_downloader_plugins",
         "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`package_name` TEXT NOT NULL, `signature` BLOB NOT NULL, PRIMARY KEY(`package_name`))",
         "fields": [
           {
@@ -406,12 +415,15 @@
           "columnNames": [
             "package_name"
           ]
-        }
+        },
+        "indices": [],
+        "foreignKeys": []
       }
     ],
+    "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c0060d66d8afa086f2632c4eb145ffc4')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd0119047505da435972c5247181de675')"
     ]
   }
 }

app/src/main/AndroidManifest.xml

@@ -3,13 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <permission
-        android:name="app.revanced.manager.permission.DOWNLOADER_HOST"
+        android:name="app.revanced.manager.permission.PLUGIN_HOST"
         android:protectionLevel="signature"
-        android:label="@string/downloader_host_permission_label"
-        android:description="@string/downloader_host_permission_description"
+        android:label="@string/plugin_host_permission_label"
+        android:description="@string/plugin_host_permission_description"
         />
 
-    <uses-permission android:name="app.revanced.manager.permission.DOWNLOADER_HOST" />
+    <uses-permission android:name="app.revanced.manager.permission.PLUGIN_HOST" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -49,7 +49,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".downloader.webview.WebViewActivity" android:exported="false" android:theme="@style/Theme.WebViewActivity" />
+        <activity android:name=".plugin.downloader.webview.WebViewActivity" android:exported="false" android:theme="@style/Theme.WebViewActivity" />
 
         <service
             android:name="androidx.work.impl.foreground.SystemForegroundService"

app/src/main/aidl/app/revanced/manager/patcher/ProgressEventParcel.aidl

@@ -1,4 +0,0 @@
-// ProgressEventParcel.aidl
-package app.revanced.manager.patcher;
-
-parcelable ProgressEventParcel;

app/src/main/aidl/app/revanced/manager/patcher/runtime/process/IPatcherEvents.aidl

@@ -1,12 +1,11 @@
 // IPatcherEvents.aidl
 package app.revanced.manager.patcher.runtime.process;
 
-import app.revanced.manager.patcher.ProgressEventParcel;
-
 // Interface for sending events back to the main app process.
 oneway interface IPatcherEvents {
     void log(String level, String msg);
-    void event(in ProgressEventParcel event);
+    void patchSucceeded();
+    void progress(String name, String state, String msg);
     // The patching process has ended. The exceptionStackTrace is null if it finished successfully.
     void finished(String exceptionStackTrace);
 }

app/src/main/java/app/revanced/manager/MainActivity.kt

@@ -3,11 +3,11 @@ package app.revanced.manager
 import android.content.ActivityNotFoundException
 import android.os.Bundle
 import android.os.Parcelable
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.slideInHorizontally
 import androidx.compose.animation.slideOutHorizontally
@@ -59,10 +59,11 @@ import app.revanced.manager.ui.viewmodel.SelectedAppInfoViewModel
 import app.revanced.manager.util.EventEffect
 import kotlinx.coroutines.launch
 import org.koin.androidx.compose.koinViewModel
+import org.koin.androidx.compose.navigation.koinNavViewModel
 import org.koin.core.parameter.parametersOf
 import org.koin.androidx.viewmodel.ext.android.getViewModel as getActivityViewModel
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : ComponentActivity() {
     @ExperimentalAnimationApi
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -128,7 +129,7 @@ private fun ReVancedManager(vm: MainViewModel) {
                 onUpdateClick = {
                     navController.navigate(Update())
                 },
-                onDownloaderClick = {
+                onDownloaderPluginClick = {
                     navController.navigate(Settings.Downloads)
                 },
                 onAppClick = { packageName ->
@@ -184,7 +185,7 @@ private fun ReVancedManager(vm: MainViewModel) {
                 val data =
                     parentBackStackEntry.getComplexArg<SelectedApplicationInfo.ViewModelParams>()
                 val viewModel =
-                    koinViewModel<SelectedAppInfoViewModel>(viewModelStoreOwner = parentBackStackEntry) {
+                    koinNavViewModel<SelectedAppInfoViewModel>(viewModelStoreOwner = parentBackStackEntry) {
                         parametersOf(data)
                     }
 
@@ -225,7 +226,7 @@ private fun ReVancedManager(vm: MainViewModel) {
             composable<SelectedApplicationInfo.PatchesSelector> {
                 val data =
                     it.getComplexArg<SelectedApplicationInfo.PatchesSelector.ViewModelParams>()
-                val selectedAppInfoVm = koinViewModel<SelectedAppInfoViewModel>(
+                val selectedAppInfoVm = koinNavViewModel<SelectedAppInfoViewModel>(
                     viewModelStoreOwner = navController.navGraphEntry(it)
                 )
 
@@ -242,7 +243,7 @@ private fun ReVancedManager(vm: MainViewModel) {
             composable<SelectedApplicationInfo.RequiredOptions> {
                 val data =
                     it.getComplexArg<SelectedApplicationInfo.PatchesSelector.ViewModelParams>()
-                val selectedAppInfoVm = koinViewModel<SelectedAppInfoViewModel>(
+                val selectedAppInfoVm = koinNavViewModel<SelectedAppInfoViewModel>(
                     viewModelStoreOwner = navController.navGraphEntry(it)
                 )
 

app/src/main/java/app/revanced/manager/ManagerApplication.kt

@@ -7,7 +7,7 @@ import android.util.Log
 import app.revanced.manager.data.platform.Filesystem
 import app.revanced.manager.di.*
 import app.revanced.manager.domain.manager.PreferencesManager
-import app.revanced.manager.domain.repository.DownloaderRepository
+import app.revanced.manager.domain.repository.DownloaderPluginRepository
 import app.revanced.manager.domain.repository.PatchBundleRepository
 import app.revanced.manager.util.tag
 import kotlinx.coroutines.Dispatchers
@@ -29,7 +29,7 @@ class ManagerApplication : Application() {
     private val scope = MainScope()
     private val prefs: PreferencesManager by inject()
     private val patchBundleRepository: PatchBundleRepository by inject()
-    private val downloaderRepository: DownloaderRepository by inject()
+    private val downloaderPluginRepository: DownloaderPluginRepository by inject()
     private val fs: Filesystem by inject()
 
     override fun onCreate() {
@@ -70,7 +70,7 @@ class ManagerApplication : Application() {
             prefs.preload()
         }
         scope.launch(Dispatchers.Default) {
-            downloaderRepository.reload()
+            downloaderPluginRepository.reload()
         }
         scope.launch(Dispatchers.Default) {
             with(patchBundleRepository) {

app/src/main/java/app/revanced/manager/data/platform/NetworkInfo.kt

@@ -15,5 +15,5 @@ class NetworkInfo(app: Application) {
     /**
      * Returns true if it is safe to download large files.
      */
-    fun isSafe(ignoreMetered: Boolean) = isConnected() && (ignoreMetered || isUnmetered())
+    fun isSafe() = isConnected() && isUnmetered()
 }

app/src/main/java/app/revanced/manager/data/room/AppDatabase.kt

@@ -16,12 +16,12 @@ import app.revanced.manager.data.room.bundles.PatchBundleEntity
 import app.revanced.manager.data.room.options.Option
 import app.revanced.manager.data.room.options.OptionDao
 import app.revanced.manager.data.room.options.OptionGroup
-import app.revanced.manager.data.room.downloader.TrustedDownloader
-import app.revanced.manager.data.room.downloader.TrustedDownloaderDao
+import app.revanced.manager.data.room.plugins.TrustedDownloaderPlugin
+import app.revanced.manager.data.room.plugins.TrustedDownloaderPluginDao
 import kotlin.random.Random
 
 @Database(
-    entities = [PatchBundleEntity::class, PatchSelection::class, SelectedPatch::class, DownloadedApp::class, InstalledApp::class, AppliedPatch::class, OptionGroup::class, Option::class, TrustedDownloader::class],
+    entities = [PatchBundleEntity::class, PatchSelection::class, SelectedPatch::class, DownloadedApp::class, InstalledApp::class, AppliedPatch::class, OptionGroup::class, Option::class, TrustedDownloaderPlugin::class],
     version = 1
 )
 @TypeConverters(Converters::class)
@@ -31,7 +31,7 @@ abstract class AppDatabase : RoomDatabase() {
     abstract fun downloadedAppDao(): DownloadedAppDao
     abstract fun installedAppDao(): InstalledAppDao
     abstract fun optionDao(): OptionDao
-    abstract fun trustedDownloaderDao(): TrustedDownloaderDao
+    abstract fun trustedDownloaderPluginDao(): TrustedDownloaderPluginDao
 
     companion object {
         fun generateUid() = Random.Default.nextInt()

app/src/main/java/app/revanced/manager/data/room/downloader/TrustedDownloaderDao.kt

@@ -1,22 +0,0 @@
-package app.revanced.manager.data.room.downloader
-
-import androidx.room.Dao
-import androidx.room.Query
-import androidx.room.Transaction
-import androidx.room.Upsert
-
-@Dao
-interface TrustedDownloaderDao {
-    @Query("SELECT signature FROM trusted_downloaders WHERE package_name = :packageName")
-    suspend fun getTrustedSignature(packageName: String): ByteArray?
-
-    @Upsert
-    suspend fun upsertTrust(downloader: TrustedDownloader)
-
-    @Query("DELETE FROM trusted_downloaders WHERE package_name = :packageName")
-    suspend fun remove(packageName: String)
-
-    @Transaction
-    @Query("DELETE FROM trusted_downloaders WHERE package_name IN (:packageNames)")
-    suspend fun removeAll(packageNames: Set<String>)
-}

app/src/main/java/app/revanced/manager/data/room/plugins/TrustedDownloaderPlugin.kt

@@ -1,11 +1,11 @@
-package app.revanced.manager.data.room.downloader
+package app.revanced.manager.data.room.plugins
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 
-@Entity(tableName = "trusted_downloaders")
-class TrustedDownloader(
+@Entity(tableName = "trusted_downloader_plugins")
+class TrustedDownloaderPlugin(
     @PrimaryKey @ColumnInfo(name = "package_name") val packageName: String,
     @ColumnInfo(name = "signature") val signature: ByteArray
 )

app/src/main/java/app/revanced/manager/data/room/plugins/TrustedDownloaderPluginDao.kt

@@ -0,0 +1,22 @@
+package app.revanced.manager.data.room.plugins
+
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.room.Transaction
+import androidx.room.Upsert
+
+@Dao
+interface TrustedDownloaderPluginDao {
+    @Query("SELECT signature FROM trusted_downloader_plugins WHERE package_name = :packageName")
+    suspend fun getTrustedSignature(packageName: String): ByteArray?
+
+    @Upsert
+    suspend fun upsertTrust(plugin: TrustedDownloaderPlugin)
+
+    @Query("DELETE FROM trusted_downloader_plugins WHERE package_name = :packageName")
+    suspend fun remove(packageName: String)
+
+    @Transaction
+    @Query("DELETE FROM trusted_downloader_plugins WHERE package_name IN (:packageNames)")
+    suspend fun removeAll(packageNames: Set<String>)
+}

app/src/main/java/app/revanced/manager/di/RepositoryModule.kt

@@ -21,7 +21,7 @@ val repositoryModule = module {
         // It is best to load patch bundles ASAP
         createdAtStart()
     }
-    singleOf(::DownloaderRepository)
+    singleOf(::DownloaderPluginRepository)
     singleOf(::WorkerRepository)
     singleOf(::DownloadedAppRepository)
     singleOf(::InstalledAppRepository)

app/src/main/java/app/revanced/manager/di/ViewModelModule.kt

@@ -1,7 +1,7 @@
 package app.revanced.manager.di
 
 import app.revanced.manager.ui.viewmodel.*
-import org.koin.core.module.dsl.*
+import org.koin.androidx.viewmodel.dsl.viewModelOf
 import org.koin.dsl.module
 
 val viewModelModule = module {

app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt

@@ -31,9 +31,7 @@ class PreferencesManager(
     val disableUniversalPatchCheck = booleanPreference("disable_patch_universal_check", false)
     val suggestedVersionSafeguard = booleanPreference("suggested_version_safeguard", true)
 
-    val acknowledgedDownloaders = stringSetPreference("acknowledged_downloaders", emptySet())
+    val acknowledgedDownloaderPlugins = stringSetPreference("acknowledged_downloader_plugins", emptySet())
 
     val showDeveloperSettings = booleanPreference("show_developer_settings", context.isDebuggable)
-
-    val allowMeteredNetworks = booleanPreference("allow_metered_networks", false)
 }

app/src/main/java/app/revanced/manager/domain/repository/DownloadedAppRepository.kt

@@ -6,8 +6,8 @@ import android.os.Parcelable
 import app.revanced.manager.data.room.AppDatabase
 import app.revanced.manager.data.room.AppDatabase.Companion.generateUid
 import app.revanced.manager.data.room.apps.downloaded.DownloadedApp
-import app.revanced.manager.network.downloader.LoadedDownloader
-import app.revanced.manager.downloader.OutputDownloadScope
+import app.revanced.manager.network.downloader.LoadedDownloaderPlugin
+import app.revanced.manager.plugin.downloader.OutputDownloadScope
 import app.revanced.manager.util.PM
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.channelFlow
@@ -36,7 +36,7 @@ class DownloadedAppRepository(
     private fun getApkFileForDir(directory: File) = directory.listFiles()!!.first()
 
     suspend fun download(
-        downloader: LoadedDownloader,
+        plugin: LoadedDownloaderPlugin,
         data: Parcelable,
         expectedPackageName: String,
         expectedVersion: String?,
@@ -55,7 +55,7 @@ class DownloadedAppRepository(
 
             channelFlow {
                 val scope = object : OutputDownloadScope {
-                    override val downloaderPackageName = downloader.packageName
+                    override val pluginPackageName = plugin.packageName
                     override val hostPackageName = app.packageName
                     override suspend fun reportSize(size: Long) {
                         require(size > 0) { "Size must be greater than zero" }
@@ -87,7 +87,7 @@ class DownloadedAppRepository(
                                 )
                             }
                     }
-                    downloader.download(scope, data, stream)
+                    plugin.download(scope, data, stream)
                 }
             }
                 .conflate()

app/src/main/java/app/revanced/manager/domain/repository/DownloaderPluginRepository.kt

@@ -0,0 +1,168 @@
+package app.revanced.manager.domain.repository
+
+import android.app.Application
+import android.content.pm.PackageManager
+import android.os.Parcelable
+import android.util.Log
+import app.revanced.manager.data.room.AppDatabase
+import app.revanced.manager.data.room.plugins.TrustedDownloaderPlugin
+import app.revanced.manager.domain.manager.PreferencesManager
+import app.revanced.manager.network.downloader.DownloaderPluginState
+import app.revanced.manager.network.downloader.LoadedDownloaderPlugin
+import app.revanced.manager.network.downloader.ParceledDownloaderData
+import app.revanced.manager.plugin.downloader.DownloaderBuilder
+import app.revanced.manager.plugin.downloader.PluginHostApi
+import app.revanced.manager.plugin.downloader.Scope
+import app.revanced.manager.util.PM
+import app.revanced.manager.util.tag
+import dalvik.system.PathClassLoader
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
+import java.lang.reflect.Modifier
+
+@OptIn(PluginHostApi::class)
+class DownloaderPluginRepository(
+    private val pm: PM,
+    private val prefs: PreferencesManager,
+    private val app: Application,
+    db: AppDatabase
+) {
+    private val trustDao = db.trustedDownloaderPluginDao()
+    private val _pluginStates = MutableStateFlow(emptyMap<String, DownloaderPluginState>())
+    val pluginStates = _pluginStates.asStateFlow()
+    val loadedPluginsFlow = pluginStates.map { states ->
+        states.values.filterIsInstance<DownloaderPluginState.Loaded>().map { it.plugin }
+    }
+
+    private val acknowledgedDownloaderPlugins = prefs.acknowledgedDownloaderPlugins
+    private val installedPluginPackageNames = MutableStateFlow(emptySet<String>())
+    val newPluginPackageNames = combine(
+        installedPluginPackageNames,
+        acknowledgedDownloaderPlugins.flow
+    ) { installed, acknowledged ->
+        installed subtract acknowledged
+    }
+
+    suspend fun reload() {
+        val plugins =
+            withContext(Dispatchers.IO) {
+                pm.getPackagesWithFeature(PLUGIN_FEATURE)
+                    .associate { it.packageName to loadPlugin(it.packageName) }
+            }
+
+        _pluginStates.value = plugins
+        installedPluginPackageNames.value = plugins.keys
+
+        val acknowledgedPlugins = acknowledgedDownloaderPlugins.get()
+        val uninstalledPlugins = acknowledgedPlugins subtract installedPluginPackageNames.value
+        if (uninstalledPlugins.isNotEmpty()) {
+            Log.d(tag, "Uninstalled plugins: ${uninstalledPlugins.joinToString(", ")}")
+            acknowledgedDownloaderPlugins.update(acknowledgedPlugins subtract uninstalledPlugins)
+            trustDao.removeAll(uninstalledPlugins)
+        }
+    }
+
+    fun unwrapParceledData(data: ParceledDownloaderData): Pair<LoadedDownloaderPlugin, Parcelable> {
+        val plugin =
+            (_pluginStates.value[data.pluginPackageName] as? DownloaderPluginState.Loaded)?.plugin
+                ?: throw Exception("Downloader plugin with name ${data.pluginPackageName} is not available")
+
+        return plugin to data.unwrapWith(plugin)
+    }
+
+    private suspend fun loadPlugin(packageName: String): DownloaderPluginState {
+        try {
+            if (!verify(packageName)) return DownloaderPluginState.Untrusted
+        } catch (e: CancellationException) {
+            throw e
+        } catch (e: Exception) {
+            Log.e(tag, "Got exception while verifying plugin $packageName", e)
+            return DownloaderPluginState.Failed(e)
+        }
+
+        return try {
+            val packageInfo = pm.getPackageInfo(packageName, flags = PackageManager.GET_META_DATA)!!
+            val className = packageInfo.applicationInfo!!.metaData.getString(METADATA_PLUGIN_CLASS)
+                ?: throw Exception("Missing metadata attribute $METADATA_PLUGIN_CLASS")
+
+            val classLoader =
+                PathClassLoader(packageInfo.applicationInfo!!.sourceDir, app.classLoader)
+            val pluginContext = app.createPackageContext(packageName, 0)
+
+            val downloader = classLoader
+                .loadClass(className)
+                .getDownloaderBuilder()
+                .build(
+                    scopeImpl = object : Scope {
+                        override val hostPackageName = app.packageName
+                        override val pluginPackageName = pluginContext.packageName
+                    },
+                    context = pluginContext
+                )
+
+            DownloaderPluginState.Loaded(
+                LoadedDownloaderPlugin(
+                    packageName,
+                    with(pm) { packageInfo.label() },
+                    packageInfo.versionName!!,
+                    downloader.get,
+                    downloader.download,
+                    classLoader
+                )
+            )
+        } catch (e: CancellationException) {
+            throw e
+        } catch (t: Throwable) {
+            Log.e(tag, "Failed to load plugin $packageName", t)
+            DownloaderPluginState.Failed(t)
+        }
+    }
+
+    suspend fun trustPackage(packageName: String) {
+        trustDao.upsertTrust(
+            TrustedDownloaderPlugin(
+                packageName,
+                pm.getSignature(packageName).toByteArray()
+            )
+        )
+
+        reload()
+        prefs.edit {
+            acknowledgedDownloaderPlugins += packageName
+        }
+    }
+
+    suspend fun revokeTrustForPackage(packageName: String) =
+        trustDao.remove(packageName).also { reload() }
+
+    suspend fun acknowledgeAllNewPlugins() =
+        acknowledgedDownloaderPlugins.update(installedPluginPackageNames.value)
+
+    private suspend fun verify(packageName: String): Boolean {
+        val expectedSignature =
+            trustDao.getTrustedSignature(packageName) ?: return false
+
+        return pm.hasSignature(packageName, expectedSignature)
+    }
+
+    private companion object {
+        const val PLUGIN_FEATURE = "app.revanced.manager.plugin.downloader"
+        const val METADATA_PLUGIN_CLASS = "app.revanced.manager.plugin.downloader.class"
+
+        const val PUBLIC_STATIC = Modifier.PUBLIC or Modifier.STATIC
+        val Int.isPublicStatic get() = (this and PUBLIC_STATIC) == PUBLIC_STATIC
+        val Class<*>.isDownloaderBuilder get() = DownloaderBuilder::class.java.isAssignableFrom(this)
+
+        @Suppress("UNCHECKED_CAST")
+        fun Class<*>.getDownloaderBuilder() =
+            declaredMethods
+                .firstOrNull { it.modifiers.isPublicStatic && it.returnType.isDownloaderBuilder && it.parameterTypes.isEmpty() }
+                ?.let { it(null) as DownloaderBuilder<Parcelable> }
+                ?: throw Exception("Could not find a valid downloader implementation in class $canonicalName")
+    }
+}

app/src/main/java/app/revanced/manager/domain/repository/DownloaderRepository.kt

@@ -1,186 +0,0 @@
-package app.revanced.manager.domain.repository
-
-import android.annotation.SuppressLint
-import android.app.Application
-import android.content.pm.PackageInfo
-import android.os.Parcelable
-import android.util.Log
-import app.revanced.manager.data.room.AppDatabase
-import app.revanced.manager.data.room.downloader.TrustedDownloader
-import app.revanced.manager.domain.manager.PreferencesManager
-import app.revanced.manager.network.downloader.DownloaderPackageState
-import app.revanced.manager.network.downloader.LoadedDownloader
-import app.revanced.manager.network.downloader.ParceledDownloaderData
-import app.revanced.manager.downloader.DownloaderBuilder
-import app.revanced.manager.downloader.DownloaderHostApi
-import app.revanced.manager.downloader.Scope
-import app.revanced.manager.util.PM
-import app.revanced.manager.util.tag
-import dalvik.system.PathClassLoader
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.withContext
-import java.lang.reflect.Modifier
-
-@OptIn(DownloaderHostApi::class)
-class DownloaderRepository(
-    private val pm: PM,
-    private val prefs: PreferencesManager,
-    private val app: Application,
-    db: AppDatabase
-) {
-    private val trustDao = db.trustedDownloaderDao()
-    private val _downloaderPackageStates =
-        MutableStateFlow(emptyMap<String, DownloaderPackageState>())
-    val downloaderPackageStates = _downloaderPackageStates.asStateFlow()
-    val loadedDownloadersFlow = downloaderPackageStates.map { states ->
-        states.values.filterIsInstance<DownloaderPackageState.Loaded>().flatMap { it.downloaders }
-    }
-
-    private val acknowledgedPackageNames = prefs.acknowledgedDownloaders
-    private val installedDownloaderPackageNames = MutableStateFlow(emptySet<String>())
-    val newDownloaderPackageNames = combine(
-        installedDownloaderPackageNames,
-        acknowledgedPackageNames.flow
-    ) { installed, acknowledged ->
-        installed subtract acknowledged
-    }
-
-    suspend fun reload() {
-        val downloaderPackages =
-            withContext(Dispatchers.IO) {
-                pm.getPackagesWithFeature(DOWNLOADER_FEATURE)
-                    .associate { it.packageName to loadPackage(it) }
-            }
-
-        _downloaderPackageStates.value = downloaderPackages
-        installedDownloaderPackageNames.value = downloaderPackages.keys
-
-        val acknowledgedDownloader = this@DownloaderRepository.acknowledgedPackageNames.get()
-        val uninstalledDownloader =
-            acknowledgedDownloader subtract installedDownloaderPackageNames.value
-        if (uninstalledDownloader.isNotEmpty()) {
-            Log.d(tag, "Uninstalled downloader: ${uninstalledDownloader.joinToString(", ")}")
-            this@DownloaderRepository.acknowledgedPackageNames.update(acknowledgedDownloader subtract uninstalledDownloader)
-            trustDao.removeAll(uninstalledDownloader)
-        }
-    }
-
-    fun unwrapParceledData(data: ParceledDownloaderData): Pair<LoadedDownloader, Parcelable> {
-        val state =
-            (_downloaderPackageStates.value[data.downloaderPackageName] as? DownloaderPackageState.Loaded)
-                ?: throw Exception("Downloader package name ${data.downloaderPackageName} is not available")
-        val downloader = state.downloaders.firstOrNull { it.className == data.downloaderClassName }
-            ?: throw Exception("No downloader with name ${data.downloaderClassName} found in ${data.downloaderPackageName}")
-
-        return downloader to data.unwrapWith(state.classLoader)
-    }
-
-    private suspend fun loadPackage(packageInfo: PackageInfo): DownloaderPackageState {
-        val packageName = packageInfo.packageName
-        try {
-            if (!verify(packageName)) return DownloaderPackageState.Untrusted
-        } catch (e: CancellationException) {
-            throw e
-        } catch (e: Exception) {
-            Log.e(tag, "Got exception while verifying downloader $packageName", e)
-            return DownloaderPackageState.Failed(e)
-        }
-
-        return try {
-            val downloaderContext = app.createPackageContext(packageName, 0)
-
-            val classNamesResId =
-                @SuppressLint("DiscouragedApi") downloaderContext.resources.getIdentifier(
-                    CLASSES_RESOURCE_NAME,
-                    "array",
-                    downloaderContext.packageName
-                )
-            if (classNamesResId == 0) throw Exception("Class names resource not found (array/$CLASSES_RESOURCE_NAME)")
-            val classNames = downloaderContext.resources.getStringArray(classNamesResId)
-
-            val classLoader =
-                PathClassLoader(packageInfo.applicationInfo!!.sourceDir, app.classLoader)
-
-            val scopeImpl = object : Scope {
-                override val hostPackageName = app.packageName
-                override val downloaderPackageName = downloaderContext.packageName
-            }
-
-            DownloaderPackageState.Loaded(
-                classNames.map { className ->
-                    val downloader = classLoader
-                        .loadClass(className)
-                        .getDownloaderBuilder()
-                        .build(
-                            scopeImpl = scopeImpl,
-                            context = downloaderContext
-                        )
-
-                    LoadedDownloader(
-                        packageName,
-                        className,
-                        downloaderContext.getString(downloader.name),
-                        packageInfo.versionName!!,
-                        downloader.get,
-                        downloader.download
-                    )
-                },
-                classLoader,
-                with(pm) { packageInfo.label() }
-            )
-        } catch (e: CancellationException) {
-            throw e
-        } catch (t: Throwable) {
-            Log.e(tag, "Failed to load downloader $packageName", t)
-            DownloaderPackageState.Failed(t)
-        }
-    }
-
-    suspend fun trustPackage(packageName: String) {
-        trustDao.upsertTrust(
-            TrustedDownloader(
-                packageName,
-                pm.getSignature(packageName).toByteArray()
-            )
-        )
-
-        reload()
-        prefs.edit {
-            acknowledgedPackageNames += packageName
-        }
-    }
-
-    suspend fun revokeTrustForPackage(packageName: String) =
-        trustDao.remove(packageName).also { reload() }
-
-    suspend fun acknowledgeAll() =
-        acknowledgedPackageNames.update(installedDownloaderPackageNames.value)
-
-    private suspend fun verify(packageName: String): Boolean {
-        val expectedSignature =
-            trustDao.getTrustedSignature(packageName) ?: return false
-
-        return pm.hasSignature(packageName, expectedSignature)
-    }
-
-    private companion object {
-        const val DOWNLOADER_FEATURE = "app.revanced.manager.downloader"
-        const val CLASSES_RESOURCE_NAME = "app.revanced.manager.downloader.classes"
-
-        const val PUBLIC_STATIC = Modifier.PUBLIC or Modifier.STATIC
-        val Int.isPublicStatic get() = (this and PUBLIC_STATIC) == PUBLIC_STATIC
-        val Class<*>.isDownloaderBuilder get() = DownloaderBuilder::class.java.isAssignableFrom(this)
-
-        @Suppress("UNCHECKED_CAST")
-        fun Class<*>.getDownloaderBuilder() =
-            declaredMethods
-                .firstOrNull { it.modifiers.isPublicStatic && it.returnType.isDownloaderBuilder && it.parameterTypes.isEmpty() }
-                ?.let { it(null) as DownloaderBuilder<Parcelable> }
-                ?: throw Exception("Could not find a valid downloader implementation in class $canonicalName")
-    }
-}

app/src/main/java/app/revanced/manager/domain/repository/PatchBundleRepository.kt

@@ -286,29 +286,28 @@ class PatchBundleRepository(
             State(sources.toPersistentMap(), info.toPersistentMap())
         }
 
-    suspend fun createLocal(createStream: suspend () -> InputStream) =
-        dispatchAction("Add bundle") {
-            with(createEntity("", SourceInfo.Local).load() as LocalPatchBundle) {
-                try {
-                    createStream().use { patches -> replace(patches) }
-                } catch (e: Exception) {
-                    if (e is CancellationException) throw e
-                    Log.e(tag, "Got exception while importing bundle", e)
-                    withContext(Dispatchers.Main) {
-                        app.toast(app.getString(R.string.patches_replace_fail, e.simpleMessage()))
-                    }
-
-                    deleteLocalFile()
+    suspend fun createLocal(createStream: suspend () -> InputStream) = dispatchAction("Add bundle") {
+        with(createEntity("", SourceInfo.Local).load() as LocalPatchBundle) {
+            try {
+                createStream().use { patches -> replace(patches) }
+            } catch (e: Exception) {
+                if (e is CancellationException) throw e
+                Log.e(tag, "Got exception while importing bundle", e)
+                withContext(Dispatchers.Main) {
+                    app.toast(app.getString(R.string.patches_replace_fail, e.simpleMessage()))
                 }
-            }
 
-            doReload()
+                deleteLocalFile()
+            }
         }
 
+        doReload()
+    }
+
     suspend fun createRemote(url: String, autoUpdate: Boolean) =
         dispatchAction("Add bundle ($url)") { state ->
             val src = createEntity("", SourceInfo.from(url), autoUpdate).load() as RemotePatchBundle
-            update(src, force = true)
+            update(src)
             state.copy(sources = state.sources.put(src.uid, src))
         }
 
@@ -330,38 +329,32 @@ class PatchBundleRepository(
             state.copy(sources = state.sources.put(uid, newSrc))
         }
 
-    suspend fun update(
-        vararg sources: RemotePatchBundle,
-        showToast: Boolean = false,
-        force: Boolean = false
-    ) {
+    suspend fun update(vararg sources: RemotePatchBundle, showToast: Boolean = false) {
         val uids = sources.map { it.uid }.toSet()
-        store.dispatch(Update(showToast = showToast, force = force) { it.uid in uids })
+        store.dispatch(Update(showToast = showToast) { it.uid in uids })
     }
 
-    suspend fun redownloadRemoteBundles() = store.dispatch(Update(force = true, redownload = true))
+    suspend fun redownloadRemoteBundles() = store.dispatch(Update(force = true))
 
     /**
      * Updates all bundles that should be automatically updated.
      */
-    suspend fun updateCheck() =
-        store.dispatch(Update(force = prefs.allowMeteredNetworks.get()) { it.autoUpdate })
+    suspend fun updateCheck() = store.dispatch(Update { it.autoUpdate })
 
     private inner class Update(
         private val force: Boolean = false,
-        private val redownload: Boolean = false,
         private val showToast: Boolean = false,
         private val predicate: (bundle: RemotePatchBundle) -> Boolean = { true },
     ) : Action<State> {
         private suspend fun toast(@StringRes id: Int, vararg args: Any?) =
             withContext(Dispatchers.Main) { app.toast(app.getString(id, *args)) }
 
-        override fun toString() = if (redownload) "Redownload remote bundles" else "Update check"
+        override fun toString() = if (force) "Redownload remote bundles" else "Update check"
 
         override suspend fun ActionContext.execute(
             current: State
         ) = coroutineScope {
-            if (!networkInfo.isSafe(force)) {
+            if (!networkInfo.isSafe()) {
                 Log.d(tag, "Skipping update check because the network is down or metered.")
                 return@coroutineScope current
             }
@@ -374,7 +367,7 @@ class PatchBundleRepository(
                         Log.d(tag, "Updating patch bundle: ${it.name}")
 
                         val newVersion = with(it) {
-                            if (redownload) downloadLatest() else update()
+                            if (force) downloadLatest() else update()
                         } ?: return@async null
 
                         it to newVersion

app/src/main/java/app/revanced/manager/network/downloader/DownloaderPackageState.kt

@@ -1,13 +0,0 @@
-package app.revanced.manager.network.downloader
-
-sealed interface DownloaderPackageState {
-    data object Untrusted : DownloaderPackageState
-
-    data class Loaded(
-        val downloaders: List<LoadedDownloader>,
-        val classLoader: ClassLoader,
-        val name: String
-    ) : DownloaderPackageState
-
-    data class Failed(val throwable: Throwable) : DownloaderPackageState
-}

app/src/main/java/app/revanced/manager/network/downloader/DownloaderPluginState.kt

@@ -0,0 +1,9 @@
+package app.revanced.manager.network.downloader
+
+sealed interface DownloaderPluginState {
+    data object Untrusted : DownloaderPluginState
+
+    data class Loaded(val plugin: LoadedDownloaderPlugin) : DownloaderPluginState
+
+    data class Failed(val throwable: Throwable) : DownloaderPluginState
+}

app/src/main/java/app/revanced/manager/network/downloader/LoadedDownloaderPlugin.kt

@@ -1,15 +1,15 @@
 package app.revanced.manager.network.downloader
 
 import android.os.Parcelable
-import app.revanced.manager.downloader.OutputDownloadScope
-import app.revanced.manager.downloader.GetScope
+import app.revanced.manager.plugin.downloader.OutputDownloadScope
+import app.revanced.manager.plugin.downloader.GetScope
 import java.io.OutputStream
 
-class LoadedDownloader(
+class LoadedDownloaderPlugin(
     val packageName: String,
-    val className: String,
     val name: String,
     val version: String,
     val get: suspend GetScope.(packageName: String, version: String?) -> Pair<Parcelable, String?>?,
-    val download: suspend OutputDownloadScope.(data: Parcelable, outputStream: OutputStream) -> Unit
+    val download: suspend OutputDownloadScope.(data: Parcelable, outputStream: OutputStream) -> Unit,
+    val classLoader: ClassLoader
 )

app/src/main/java/app/revanced/manager/network/downloader/ParceledDownloaderData.kt

@@ -10,22 +10,20 @@ import kotlinx.parcelize.Parcelize
  * A container for [Parcelable] data returned from downloader. Instances of this class can be safely stored in a bundle without needing to set the [ClassLoader].
  */
 class ParceledDownloaderData private constructor(
-    val downloaderPackageName: String,
-    val downloaderClassName: String,
+    val pluginPackageName: String,
     private val bundle: Bundle
 ) : Parcelable {
-    constructor(downloader: LoadedDownloader, data: Parcelable) : this(
-        downloader.packageName,
-        downloader.className,
+    constructor(plugin: LoadedDownloaderPlugin, data: Parcelable) : this(
+        plugin.packageName,
         createBundle(data)
     )
 
-    fun unwrapWith(classLoader: ClassLoader): Parcelable {
-        bundle.classLoader = classLoader
+    fun unwrapWith(plugin: LoadedDownloaderPlugin): Parcelable {
+        bundle.classLoader = plugin.classLoader
 
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             val className = bundle.getString(CLASS_NAME_KEY)!!
-            val clazz = classLoader.loadClass(className)
+            val clazz = plugin.classLoader.loadClass(className)
 
             bundle.getParcelable(DATA_KEY, clazz)!! as Parcelable
         } else @Suppress("Deprecation") bundle.getParcelable(DATA_KEY)!!

app/src/main/java/app/revanced/manager/network/service/HttpService.kt

@@ -16,11 +16,8 @@ import io.ktor.http.isSuccess
 import io.ktor.utils.io.ByteReadChannel
 import io.ktor.utils.io.core.isNotEmpty
 import io.ktor.utils.io.core.readBytes
-import io.ktor.utils.io.exhausted
-import io.ktor.utils.io.readRemaining
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import kotlinx.io.asSink
 import kotlinx.serialization.json.Json
 import java.io.File
 import java.io.OutputStream
@@ -72,12 +69,14 @@ class HttpService(
     ) {
         http.prepareGet(builder).execute { httpResponse ->
             if (httpResponse.status.isSuccess()) {
+                val channel: ByteReadChannel = httpResponse.body()
                 withContext(Dispatchers.IO) {
-                    val channel: ByteReadChannel = httpResponse.body()
-                    val sink = outputStream.asSink()
-                    while (!channel.exhausted()) {
+                    while (!channel.isClosedForRead) {
                         val packet = channel.readRemaining(DEFAULT_BUFFER_SIZE.toLong())
-                        packet.transferTo(sink)
+                        while (packet.isNotEmpty) {
+                            val bytes = packet.readBytes()
+                            outputStream.write(bytes)
+                        }
                     }
                 }
 

app/src/main/java/app/revanced/manager/patcher/PatcherProgress.kt

@@ -1,78 +0,0 @@
-package app.revanced.manager.patcher
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-
-@Parcelize
-sealed class ProgressEvent : Parcelable {
-    abstract val stepId: StepId?
-
-    data class Started(override val stepId: StepId) : ProgressEvent()
-
-    data class Progress(
-        override val stepId: StepId,
-        val current: Long? = null,
-        val total: Long? = null,
-        val message: String? = null,
-    ) : ProgressEvent()
-
-    data class Completed(
-        override val stepId: StepId,
-    ) : ProgressEvent()
-
-    data class Failed(
-        override val stepId: StepId?,
-        val error: RemoteError,
-    ) : ProgressEvent()
-}
-
-/**
- * Parcelable wrapper for [ProgressEvent].
- *
- * Required because AIDL does not support sealed classes.
- */
-@Parcelize
-data class ProgressEventParcel(val event: ProgressEvent) : Parcelable
-
-fun ProgressEventParcel.toEvent(): ProgressEvent = event
-fun ProgressEvent.toParcel(): ProgressEventParcel = ProgressEventParcel(this)
-
-@Parcelize
-sealed class StepId : Parcelable {
-    data object DownloadAPK : StepId()
-    data object LoadPatches : StepId()
-    data object ReadAPK : StepId()
-    data object ExecutePatches : StepId()
-    data class ExecutePatch(val index: Int) : StepId()
-    data object WriteAPK : StepId()
-    data object SignAPK : StepId()
-}
-
-@Parcelize
-data class RemoteError(
-    val type: String,
-    val message: String?,
-    val stackTrace: String,
-) : Parcelable
-
-fun Exception.toRemoteError() = RemoteError(
-    type = this::class.java.name,
-    message = this.message,
-    stackTrace = this.stackTraceToString(),
-)
-
-
-inline fun <T> runStep(
-    stepId: StepId,
-    onEvent: (ProgressEvent) -> Unit,
-    block: () -> T,
-): T = try {
-    onEvent(ProgressEvent.Started(stepId))
-    val value = block()
-    onEvent(ProgressEvent.Completed(stepId))
-    value
-} catch (error: Exception) {
-    onEvent(ProgressEvent.Failed(stepId, error.toRemoteError()))
-    throw error
-}

app/src/main/java/app/revanced/manager/patcher/Session.kt

@@ -1,9 +1,10 @@
 package app.revanced.manager.patcher
 
+import android.content.Context
 import app.revanced.library.ApkUtils.applyTo
-import app.revanced.manager.patcher.Session.Companion.component1
-import app.revanced.manager.patcher.Session.Companion.component2
+import app.revanced.manager.R
 import app.revanced.manager.patcher.logger.Logger
+import app.revanced.manager.ui.model.State
 import app.revanced.patcher.Patcher
 import app.revanced.patcher.PatcherConfig
 import app.revanced.patcher.patch.Patch
@@ -21,10 +22,15 @@ class Session(
     cacheDir: String,
     frameworkDir: String,
     aaptPath: String,
+    private val androidContext: Context,
     private val logger: Logger,
     private val input: File,
-    private val onEvent: (ProgressEvent) -> Unit,
+    private val onPatchCompleted: suspend () -> Unit,
+    private val onProgress: (name: String?, state: State?, message: String?) -> Unit
 ) : Closeable {
+    private fun updateProgress(name: String? = null, state: State? = null, message: String? = null) =
+        onProgress(name, state, message)
+
     private val tempDir = File(cacheDir).resolve("patcher").also { it.mkdirs() }
     private val patcher = Patcher(
         PatcherConfig(
@@ -36,68 +42,86 @@ class Session(
     )
 
     private suspend fun Patcher.applyPatchesVerbose(selectedPatches: PatchList) {
+        var nextPatchIndex = 0
+
+        updateProgress(
+            name = androidContext.getString(R.string.executing_patch, selectedPatches[nextPatchIndex]),
+            state = State.RUNNING
+        )
+
         this().collect { (patch, exception) ->
-            val index = selectedPatches.indexOf(patch)
-            if (index == -1) return@collect
+            if (patch !in selectedPatches) return@collect
 
             if (exception != null) {
-                onEvent(
-                    ProgressEvent.Failed(
-                        StepId.ExecutePatch(index),
-                        exception.toRemoteError(),
-                    )
+                updateProgress(
+                    name = androidContext.getString(R.string.failed_to_execute_patch, patch.name),
+                    state = State.FAILED,
+                    message = exception.stackTraceToString()
                 )
+
                 logger.error("${patch.name} failed:")
                 logger.error(exception.stackTraceToString())
                 throw exception
             }
 
-            onEvent(
-                ProgressEvent.Completed(
-                    StepId.ExecutePatch(index),
+            nextPatchIndex++
+
+            onPatchCompleted()
+
+            selectedPatches.getOrNull(nextPatchIndex)?.let { nextPatch ->
+                updateProgress(
+                    name = androidContext.getString(R.string.executing_patch, nextPatch.name)
                 )
-            )
+            }
 
             logger.info("${patch.name} succeeded")
         }
+
+        updateProgress(
+            state = State.COMPLETED,
+            name = androidContext.resources.getQuantityString(
+                R.plurals.patches_executed,
+                selectedPatches.size,
+                selectedPatches.size
+            )
+        )
     }
 
     suspend fun run(output: File, selectedPatches: PatchList) {
-        runStep(StepId.ExecutePatches, onEvent) {
-            java.util.logging.Logger.getLogger("").apply {
-                handlers.forEach {
-                    it.close()
-                    removeHandler(it)
-                }
+        updateProgress(state = State.COMPLETED) // Unpacking
 
-                addHandler(logger.handler)
+        java.util.logging.Logger.getLogger("").apply {
+            handlers.forEach {
+                it.close()
+                removeHandler(it)
             }
 
-            with(patcher) {
-                logger.info("Merging integrations")
-                this += selectedPatches.toSet()
-
-                logger.info("Applying patches...")
-                applyPatchesVerbose(selectedPatches.sortedBy { it.name })
-            }
+            addHandler(logger.handler)
         }
 
-        runStep(StepId.WriteAPK, onEvent) {
-            logger.info("Writing patched files...")
-            val result = patcher.get()
+        with(patcher) {
+            logger.info("Merging integrations")
+            this += selectedPatches.toSet()
 
-            val patched = tempDir.resolve("result.apk")
-            withContext(Dispatchers.IO) {
-                Files.copy(input.toPath(), patched.toPath(), StandardCopyOption.REPLACE_EXISTING)
-            }
-            result.applyTo(patched)
-
-            logger.info("Patched apk saved to $patched")
-
-            withContext(Dispatchers.IO) {
-                Files.move(patched.toPath(), output.toPath(), StandardCopyOption.REPLACE_EXISTING)
-            }
+            logger.info("Applying patches...")
+            applyPatchesVerbose(selectedPatches.sortedBy { it.name })
         }
+
+        logger.info("Writing patched files...")
+        val result = patcher.get()
+
+        val patched = tempDir.resolve("result.apk")
+        withContext(Dispatchers.IO) {
+            Files.copy(input.toPath(), patched.toPath(), StandardCopyOption.REPLACE_EXISTING)
+        }
+        result.applyTo(patched)
+
+        logger.info("Patched apk saved to $patched")
+
+        withContext(Dispatchers.IO) {
+            Files.move(patched.toPath(), output.toPath(), StandardCopyOption.REPLACE_EXISTING)
+        }
+        updateProgress(state = State.COMPLETED) // Saving
     }
 
     override fun close() {

app/src/main/java/app/revanced/manager/patcher/runtime/CoroutineRuntime.kt

@@ -1,12 +1,11 @@
 package app.revanced.manager.patcher.runtime
 
 import android.content.Context
-import app.revanced.manager.patcher.ProgressEvent
 import app.revanced.manager.patcher.Session
-import app.revanced.manager.patcher.StepId
 import app.revanced.manager.patcher.logger.Logger
 import app.revanced.manager.patcher.patch.PatchBundle
-import app.revanced.manager.patcher.runStep
+import app.revanced.manager.patcher.worker.ProgressEventHandler
+import app.revanced.manager.ui.model.State
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
 import java.io.File
@@ -14,7 +13,7 @@ import java.io.File
 /**
  * Simple [Runtime] implementation that runs the patcher using coroutines.
  */
-class CoroutineRuntime(context: Context) : Runtime(context) {
+class CoroutineRuntime(private val context: Context) : Runtime(context) {
     override suspend fun execute(
         inputFile: String,
         outputFile: String,
@@ -22,50 +21,47 @@ class CoroutineRuntime(context: Context) : Runtime(context) {
         selectedPatches: PatchSelection,
         options: Options,
         logger: Logger,
-        onEvent: (ProgressEvent) -> Unit,
+        onPatchCompleted: suspend () -> Unit,
+        onProgress: ProgressEventHandler,
     ) {
-        val patchList = runStep(StepId.LoadPatches, onEvent) {
-            val selectedBundles = selectedPatches.keys
-            val bundles = bundles()
-            val uids = bundles.entries.associate { (key, value) -> value to key }
+        val selectedBundles = selectedPatches.keys
+        val bundles = bundles()
+        val uids = bundles.entries.associate { (key, value) -> value to key }
 
-            val allPatches =
-                PatchBundle.Loader.patches(bundles.values, packageName)
-                    .mapKeys { (b, _) -> uids[b]!! }
-                    .filterKeys { it in selectedBundles }
+        val allPatches =
+            PatchBundle.Loader.patches(bundles.values, packageName)
+                .mapKeys { (b, _) -> uids[b]!! }
+                .filterKeys { it in selectedBundles }
 
-            val patchList = selectedPatches.flatMap { (bundle, selected) ->
-                allPatches[bundle]?.filter { it.name in selected }
-                    ?: throw IllegalArgumentException("Patch bundle $bundle does not exist")
-            }
+        val patchList = selectedPatches.flatMap { (bundle, selected) ->
+            allPatches[bundle]?.filter { it.name in selected }
+                ?: throw IllegalArgumentException("Patch bundle $bundle does not exist")
+        }
 
-            // Set all patch options.
-            options.forEach { (bundle, bundlePatchOptions) ->
-                val patches = allPatches[bundle] ?: return@forEach
-                bundlePatchOptions.forEach { (patchName, configuredPatchOptions) ->
-                    val patchOptions = patches.single { it.name == patchName }.options
-                    configuredPatchOptions.forEach { (key, value) ->
-                        patchOptions[key] = value
-                    }
+        // Set all patch options.
+        options.forEach { (bundle, bundlePatchOptions) ->
+            val patches = allPatches[bundle] ?: return@forEach
+            bundlePatchOptions.forEach { (patchName, configuredPatchOptions) ->
+                val patchOptions = patches.single { it.name == patchName }.options
+                configuredPatchOptions.forEach { (key, value) ->
+                    patchOptions[key] = value
                 }
             }
-
-            patchList
         }
 
-        val session = runStep(StepId.ReadAPK, onEvent) {
-            Session(
-                cacheDir,
-                frameworkPath,
-                aaptPath,
-                logger,
-                File(inputFile),
-                onEvent,
-            )
-        }
+        onProgress(null, State.COMPLETED, null) // Loading patches
 
-        session.use { s ->
-            s.run(
+        Session(
+            cacheDir,
+            frameworkPath,
+            aaptPath,
+            context,
+            logger,
+            File(inputFile),
+            onPatchCompleted = onPatchCompleted,
+            onProgress
+        ).use { session ->
+            session.run(
                 File(outputFile),
                 patchList
             )

app/src/main/java/app/revanced/manager/patcher/runtime/ProcessRuntime.kt

@@ -10,13 +10,12 @@ import app.revanced.manager.BuildConfig
 import app.revanced.manager.patcher.runtime.process.IPatcherEvents
 import app.revanced.manager.patcher.runtime.process.IPatcherProcess
 import app.revanced.manager.patcher.LibraryResolver
-import app.revanced.manager.patcher.ProgressEvent
-import app.revanced.manager.patcher.ProgressEventParcel
 import app.revanced.manager.patcher.logger.Logger
 import app.revanced.manager.patcher.runtime.process.Parameters
 import app.revanced.manager.patcher.runtime.process.PatchConfiguration
 import app.revanced.manager.patcher.runtime.process.PatcherProcess
-import app.revanced.manager.patcher.toEvent
+import app.revanced.manager.patcher.worker.ProgressEventHandler
+import app.revanced.manager.ui.model.State
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PM
 import app.revanced.manager.util.PatchSelection
@@ -67,7 +66,8 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
         selectedPatches: PatchSelection,
         options: Options,
         logger: Logger,
-        onEvent: (ProgressEvent) -> Unit,
+        onPatchCompleted: suspend () -> Unit,
+        onProgress: ProgressEventHandler,
     ) = coroutineScope {
         // Get the location of our own Apk.
         val managerBaseApk = pm.getPackageInfo(context.packageName)!!.applicationInfo!!.sourceDir
@@ -111,6 +111,7 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
         }
 
         val patching = CompletableDeferred<Unit>()
+        val scope = this
 
         launch(Dispatchers.IO) {
             val binder = awaitBinderConnection()
@@ -123,10 +124,13 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
             val eventHandler = object : IPatcherEvents.Stub() {
                 override fun log(level: String, msg: String) = logger.log(enumValueOf(level), msg)
 
-                override fun event(event: ProgressEventParcel?) {
-                    event?.let { onEvent(it.toEvent()) }
+                override fun patchSucceeded() {
+                    scope.launch { onPatchCompleted() }
                 }
 
+                override fun progress(name: String?, state: String?, msg: String?) =
+                    onProgress(name, state?.let { enumValueOf<State>(it) }, msg)
+
                 override fun finished(exceptionStackTrace: String?) {
                     binder.exit()
 

app/src/main/java/app/revanced/manager/patcher/runtime/Runtime.kt

@@ -4,9 +4,9 @@ import android.content.Context
 import app.revanced.manager.data.platform.Filesystem
 import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.domain.repository.PatchBundleRepository
-import app.revanced.manager.patcher.ProgressEvent
 import app.revanced.manager.patcher.aapt.Aapt
 import app.revanced.manager.patcher.logger.Logger
+import app.revanced.manager.patcher.worker.ProgressEventHandler
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
 import kotlinx.coroutines.flow.first
@@ -34,6 +34,7 @@ sealed class Runtime(context: Context) : KoinComponent {
         selectedPatches: PatchSelection,
         options: Options,
         logger: Logger,
-        onEvent: (ProgressEvent) -> Unit,
+        onPatchCompleted: suspend () -> Unit,
+        onProgress: ProgressEventHandler,
     )
 }

app/src/main/java/app/revanced/manager/patcher/runtime/process/PatcherProcess.kt

@@ -8,15 +8,12 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Looper
 import app.revanced.manager.BuildConfig
-import app.revanced.manager.patcher.ProgressEvent
 import app.revanced.manager.patcher.Session
-import app.revanced.manager.patcher.StepId
 import app.revanced.manager.patcher.logger.LogLevel
 import app.revanced.manager.patcher.logger.Logger
 import app.revanced.manager.patcher.patch.PatchBundle
-import app.revanced.manager.patcher.runStep
 import app.revanced.manager.patcher.runtime.ProcessRuntime
-import app.revanced.manager.patcher.toParcel
+import app.revanced.manager.ui.model.State
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -27,7 +24,7 @@ import kotlin.system.exitProcess
 /**
  * The main class that runs inside the runner process launched by [ProcessRuntime].
  */
-class PatcherProcess() : IPatcherProcess.Stub() {
+class PatcherProcess(private val context: Context) : IPatcherProcess.Stub() {
     private var eventBinder: IPatcherEvents? = null
 
     private val scope =
@@ -49,8 +46,6 @@ class PatcherProcess() : IPatcherProcess.Stub() {
     override fun exit() = exitProcess(0)
 
     override fun start(parameters: Parameters, events: IPatcherEvents) {
-        fun onEvent(event: ProgressEvent) = events.event(event.toParcel())
-
         eventBinder = events
 
         scope.launch {
@@ -61,42 +56,38 @@ class PatcherProcess() : IPatcherProcess.Stub() {
 
             logger.info("Memory limit: ${Runtime.getRuntime().maxMemory() / (1024 * 1024)}MB")
 
-            val patchList = runStep(StepId.LoadPatches, ::onEvent) {
-                val allPatches = PatchBundle.Loader.patches(
-                    parameters.configurations.map { it.bundle },
-                    parameters.packageName
-                )
-
-                parameters.configurations.flatMap { config ->
-                    val patches = (allPatches[config.bundle] ?: return@flatMap emptyList())
+            val allPatches = PatchBundle.Loader.patches(parameters.configurations.map { it.bundle }, parameters.packageName)
+            val patchList = parameters.configurations.flatMap { config ->
+                val patches = (allPatches[config.bundle] ?: return@flatMap emptyList())
                         .filter { it.name in config.patches }
                         .associateBy { it.name }
 
-                    config.options.forEach { (patchName, opts) ->
-                        val patchOptions = patches[patchName]?.options
-                            ?: throw Exception("Patch with name $patchName does not exist.")
+                config.options.forEach { (patchName, opts) ->
+                    val patchOptions = patches[patchName]?.options
+                        ?: throw Exception("Patch with name $patchName does not exist.")
 
-                        opts.forEach { (key, value) ->
-                            patchOptions[key] = value
-                        }
+                    opts.forEach { (key, value) ->
+                        patchOptions[key] = value
                     }
-
-                    patches.values
                 }
+
+                patches.values
             }
 
-            val session = runStep(StepId.ReadAPK, ::onEvent) {
-                Session(
-                    cacheDir = parameters.cacheDir,
-                    aaptPath = parameters.aaptPath,
-                    frameworkDir = parameters.frameworkDir,
-                    logger = logger,
-                    input = File(parameters.inputFile),
-                    onEvent = ::onEvent,
-                )
-            }
+            events.progress(null, State.COMPLETED.name, null) // Loading patches
 
-            session.use {
+            Session(
+                cacheDir = parameters.cacheDir,
+                aaptPath = parameters.aaptPath,
+                frameworkDir = parameters.frameworkDir,
+                androidContext = context,
+                logger = logger,
+                input = File(parameters.inputFile),
+                onPatchCompleted = { events.patchSucceeded() },
+                onProgress = { name, state, message ->
+                    events.progress(name, state?.name, message)
+                }
+            ).use {
                 it.run(File(parameters.outputFile), patchList)
             }
 
@@ -128,7 +119,7 @@ class PatcherProcess() : IPatcherProcess.Stub() {
                 }
             }
 
-            val ipcInterface = PatcherProcess()
+            val ipcInterface = PatcherProcess(appContext)
 
             appContext.sendBroadcast(Intent().apply {
                 action = ProcessRuntime.CONNECT_TO_APP_ACTION

app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt

@@ -24,22 +24,19 @@ import app.revanced.manager.domain.installer.RootInstaller
 import app.revanced.manager.domain.manager.KeystoreManager
 import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.domain.repository.DownloadedAppRepository
-import app.revanced.manager.domain.repository.DownloaderRepository
+import app.revanced.manager.domain.repository.DownloaderPluginRepository
 import app.revanced.manager.domain.repository.InstalledAppRepository
 import app.revanced.manager.domain.worker.Worker
 import app.revanced.manager.domain.worker.WorkerRepository
-import app.revanced.manager.network.downloader.LoadedDownloader
-import app.revanced.manager.patcher.ProgressEvent
-import app.revanced.manager.patcher.StepId
+import app.revanced.manager.network.downloader.LoadedDownloaderPlugin
 import app.revanced.manager.patcher.logger.Logger
-import app.revanced.manager.patcher.runStep
 import app.revanced.manager.patcher.runtime.CoroutineRuntime
 import app.revanced.manager.patcher.runtime.ProcessRuntime
-import app.revanced.manager.patcher.toRemoteError
-import app.revanced.manager.downloader.GetScope
-import app.revanced.manager.downloader.DownloaderHostApi
-import app.revanced.manager.downloader.UserInteractionException
+import app.revanced.manager.plugin.downloader.GetScope
+import app.revanced.manager.plugin.downloader.PluginHostApi
+import app.revanced.manager.plugin.downloader.UserInteractionException
 import app.revanced.manager.ui.model.SelectedApp
+import app.revanced.manager.ui.model.State
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PM
 import app.revanced.manager.util.PatchSelection
@@ -51,7 +48,9 @@ import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import java.io.File
 
-@OptIn(DownloaderHostApi::class)
+typealias ProgressEventHandler = (name: String?, state: State?, message: String?) -> Unit
+
+@OptIn(PluginHostApi::class)
 class PatcherWorker(
     context: Context,
     parameters: WorkerParameters
@@ -59,7 +58,7 @@ class PatcherWorker(
     private val workerRepository: WorkerRepository by inject()
     private val prefs: PreferencesManager by inject()
     private val keystoreManager: KeystoreManager by inject()
-    private val downloaderRepository: DownloaderRepository by inject()
+    private val downloaderPluginRepository: DownloaderPluginRepository by inject()
     private val downloadedAppRepository: DownloadedAppRepository by inject()
     private val pm: PM by inject()
     private val fs: Filesystem by inject()
@@ -72,9 +71,11 @@ class PatcherWorker(
         val selectedPatches: PatchSelection,
         val options: Options,
         val logger: Logger,
-        val handleStartActivityRequest: suspend (LoadedDownloader, Intent) -> ActivityResult,
+        val onDownloadProgress: suspend (Pair<Long, Long?>?) -> Unit,
+        val onPatchCompleted: suspend () -> Unit,
+        val handleStartActivityRequest: suspend (LoadedDownloaderPlugin, Intent) -> ActivityResult,
         val setInputFile: suspend (File) -> Unit,
-        val onEvent: (ProgressEvent) -> Unit,
+        val onProgress: ProgressEventHandler
     ) {
         val packageName get() = input.packageName
     }
@@ -139,6 +140,10 @@ class PatcherWorker(
     }
 
     private suspend fun runPatcher(args: Args): Result {
+
+        fun updateProgress(name: String? = null, state: State? = null, message: String? = null) =
+            args.onProgress(name, state, message)
+
         val patchedApk = fs.tempDir.resolve("patched.apk")
 
         return try {
@@ -150,73 +155,59 @@ class PatcherWorker(
                 }
             }
 
-            suspend fun download(downloader: LoadedDownloader, data: Parcelable) =
+            suspend fun download(plugin: LoadedDownloaderPlugin, data: Parcelable) =
                 downloadedAppRepository.download(
-                    downloader,
+                    plugin,
                     data,
                     args.packageName,
                     args.input.version,
                     prefs.suggestedVersionSafeguard.get(),
                     !prefs.disablePatchVersionCompatCheck.get(),
-                    onDownload = { progress ->
-                        args.onEvent(
-                            ProgressEvent.Progress(
-                                stepId = StepId.DownloadAPK,
-                                current = progress.first,
-                                total = progress.second
-                            )
-                        )
-                    }
-                ).also { args.setInputFile(it) }
+                    onDownload = args.onDownloadProgress
+                ).also {
+                    args.setInputFile(it)
+                    updateProgress(state = State.COMPLETED) // Download APK
+                }
 
             val inputFile = when (val selectedApp = args.input) {
                 is SelectedApp.Download -> {
-                    runStep(StepId.DownloadAPK, args.onEvent) {
-                        val (downloader, data) = downloaderRepository.unwrapParceledData(
-                            selectedApp.data
-                        )
+                    val (plugin, data) = downloaderPluginRepository.unwrapParceledData(selectedApp.data)
 
-                        download(downloader, data)
-                    }
+                    download(plugin, data)
                 }
 
                 is SelectedApp.Search -> {
-                    runStep(StepId.DownloadAPK, args.onEvent) {
-                        downloaderRepository.loadedDownloadersFlow.first()
-                            .firstNotNullOfOrNull { downloader ->
-                                try {
-                                    val getScope = object : GetScope {
-                                        override val downloaderPackageName = downloader.packageName
-                                        override val hostPackageName =
-                                            applicationContext.packageName
-
-                                        override suspend fun requestStartActivity(intent: Intent): Intent? {
-                                            val result =
-                                                args.handleStartActivityRequest(downloader, intent)
-                                            return when (result.resultCode) {
-                                                Activity.RESULT_OK -> result.data
-                                                Activity.RESULT_CANCELED -> throw UserInteractionException.Activity.Cancelled()
-                                                else -> throw UserInteractionException.Activity.NotCompleted(
-                                                    result.resultCode,
-                                                    result.data
-                                                )
-                                            }
+                    downloaderPluginRepository.loadedPluginsFlow.first()
+                        .firstNotNullOfOrNull { plugin ->
+                            try {
+                                val getScope = object : GetScope {
+                                    override val pluginPackageName = plugin.packageName
+                                    override val hostPackageName = applicationContext.packageName
+                                    override suspend fun requestStartActivity(intent: Intent): Intent? {
+                                        val result = args.handleStartActivityRequest(plugin, intent)
+                                        return when (result.resultCode) {
+                                            Activity.RESULT_OK -> result.data
+                                            Activity.RESULT_CANCELED -> throw UserInteractionException.Activity.Cancelled()
+                                            else -> throw UserInteractionException.Activity.NotCompleted(
+                                                result.resultCode,
+                                                result.data
+                                            )
                                         }
                                     }
-                                    withContext(Dispatchers.IO) {
-                                        downloader.get(
-                                            getScope,
-                                            selectedApp.packageName,
-                                            selectedApp.version
-                                        )
-                                    }?.takeIf { (_, version) -> selectedApp.version == null || version == selectedApp.version }
-                                } catch (e: UserInteractionException.Activity.NotCompleted) {
-                                    throw e
-                                } catch (_: UserInteractionException) {
-                                    null
-                                }?.let { (data, _) -> download(downloader, data) }
-                            } ?: throw Exception("App is not available.")
-                    }
+                                }
+                                withContext(Dispatchers.IO) {
+                                    plugin.get(
+                                        getScope,
+                                        selectedApp.packageName,
+                                        selectedApp.version
+                                    )
+                                }?.takeIf { (_, version) -> selectedApp.version == null || version == selectedApp.version }
+                            } catch (e: UserInteractionException.Activity.NotCompleted) {
+                                throw e
+                            } catch (_: UserInteractionException) {
+                                null
+                            }?.let { (data, _) -> download(plugin, data) }
+                        } ?: throw Exception("App is not available.")
                 }
 
                 is SelectedApp.Local -> selectedApp.file.also { args.setInputFile(it) }
@@ -236,12 +227,12 @@ class PatcherWorker(
                 args.selectedPatches,
                 args.options,
                 args.logger,
-                args.onEvent,
+                args.onPatchCompleted,
+                args.onProgress
             )
 
-            runStep(StepId.SignAPK, args.onEvent) {
-                keystoreManager.sign(patchedApk, File(args.output))
-            }
+            keystoreManager.sign(patchedApk, File(args.output))
+            updateProgress(state = State.COMPLETED) // Signing
 
             Log.i(tag, "Patching succeeded".logFmt())
             Result.success()
@@ -250,21 +241,11 @@ class PatcherWorker(
                 tag,
                 "An exception occurred in the remote process while patching. ${e.originalStackTrace}".logFmt()
             )
-            args.onEvent(
-                ProgressEvent.Failed(
-                    null,
-                    e.toRemoteError()
-                )
-            ) // Fallback if exception doesn't occur within step
+            updateProgress(state = State.FAILED, message = e.originalStackTrace)
             Result.failure()
         } catch (e: Exception) {
             Log.e(tag, "An exception occurred while patching".logFmt(), e)
-            args.onEvent(
-                ProgressEvent.Failed(
-                    null,
-                    e.toRemoteError()
-                )
-            ) // Fallback if exception doesn't occur within step
+            updateProgress(state = State.FAILED, message = e.stackTraceToString())
             Result.failure()
         } finally {
             patchedApk.delete()

app/src/main/java/app/revanced/manager/ui/component/AppIcon.kt

@@ -16,7 +16,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import coil.compose.AsyncImage
-import com.eygraber.compose.placeholder.material3.placeholder
+import io.github.fornewid.placeholder.material3.placeholder
 
 @Composable
 fun AppIcon(

app/src/main/java/app/revanced/manager/ui/component/AppLabel.kt

@@ -16,7 +16,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import app.revanced.manager.R
-import com.eygraber.compose.placeholder.material3.placeholder
+import io.github.fornewid.placeholder.material3.placeholder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 

app/src/main/java/app/revanced/manager/ui/component/LoadingIndicator.kt

@@ -14,7 +14,7 @@ fun LoadingIndicator(
     progress: () -> Float? = { null },
     color: Color = ProgressIndicatorDefaults.circularColor,
     strokeWidth: Dp = ProgressIndicatorDefaults.CircularStrokeWidth,
-    trackColor: Color = ProgressIndicatorDefaults.circularIndeterminateTrackColor,
+    trackColor: Color = ProgressIndicatorDefaults.circularTrackColor,
     strokeCap: StrokeCap = ProgressIndicatorDefaults.CircularDeterminateStrokeCap
 ) {
     progress()?.let {

app/src/main/java/app/revanced/manager/ui/component/Markdown.kt

@@ -18,6 +18,8 @@ fun Markdown(
         colors = markdownColor(
             text = MaterialTheme.colorScheme.onSurfaceVariant,
             codeBackground = MaterialTheme.colorScheme.secondaryContainer,
+            codeText = MaterialTheme.colorScheme.onSecondaryContainer,
+            linkText = MaterialTheme.colorScheme.primary
         ),
         typography = markdownTypography(
             h1 = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),

app/src/main/java/app/revanced/manager/ui/component/SearchBar.kt

@@ -29,8 +29,7 @@ fun SearchBar(
 ) {
     val colors = SearchBarColors(
         containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
-        dividerColor = MaterialTheme.colorScheme.outline,
-        inputFieldColors = SearchBarDefaults.inputFieldColors()
+        dividerColor = MaterialTheme.colorScheme.outline
     )
     val keyboardController = LocalSoftwareKeyboardController.current
 

app/src/main/java/app/revanced/manager/ui/component/SearchView.kt

@@ -31,8 +31,7 @@ fun SearchView(
 ) {
     val colors = SearchBarColors(
         containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
-        dividerColor = MaterialTheme.colorScheme.outline,
-        inputFieldColors = SearchBarDefaults.inputFieldColors()
+        dividerColor = MaterialTheme.colorScheme.outline
     )
     val focusRequester = remember { FocusRequester() }
     val keyboardController = LocalSoftwareKeyboardController.current

app/src/main/java/app/revanced/manager/ui/component/patcher/Steps.kt

@@ -39,9 +39,11 @@ import androidx.compose.ui.unit.dp
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.ArrowButton
 import app.revanced.manager.ui.component.LoadingIndicator
+import app.revanced.manager.ui.model.ProgressKey
 import app.revanced.manager.ui.model.State
-import app.revanced.manager.ui.model.StepCategory
 import app.revanced.manager.ui.model.Step
+import app.revanced.manager.ui.model.StepCategory
+import app.revanced.manager.ui.model.StepProgressProvider
 import java.util.Locale
 import kotlin.math.floor
 
@@ -50,6 +52,8 @@ import kotlin.math.floor
 fun Steps(
     category: StepCategory,
     steps: List<Step>,
+    stepCount: Pair<Int, Int>? = null,
+    stepProgressProvider: StepProgressProvider,
     isExpanded: Boolean = false,
     onExpand: () -> Unit,
     onClick: () -> Unit
@@ -63,17 +67,8 @@ fun Steps(
         }
     }
 
-    val filteredSteps = remember(steps) {
-        val failedCount = steps.count { it.state == State.FAILED }
-
-        steps.filter { step ->
-            // Show hidden steps if it's the only failed step.
-            !step.hide || (step.state == State.FAILED && failedCount == 1)
-        }
-    }
-
     LaunchedEffect(state) {
-        if (state == State.RUNNING || state == State.FAILED)
+        if (state == State.RUNNING)
             onExpand()
     }
 
@@ -97,8 +92,13 @@ fun Steps(
 
             Spacer(modifier = Modifier.weight(1f))
 
+            val stepProgress = remember(stepCount, steps) {
+                stepCount?.let { (current, total) -> "$current/$total" }
+                    ?: "${steps.count { it.state == State.COMPLETED }}/${steps.size}"
+            }
+
             Text(
-                text = "${filteredSteps.count { it.state == State.COMPLETED }}/${filteredSteps.size}",
+                text = stepProgress,
                 style = MaterialTheme.typography.labelSmall
             )
 
@@ -112,20 +112,23 @@ fun Steps(
                     .fillMaxWidth()
                     .padding(top = 10.dp)
             ) {
-                filteredSteps.forEachIndexed { index, step ->
-                    val (progress, progressText) = step.progress?.let { (current, total) ->
-                        if (total != null) current.toFloat() / total.toFloat() to "${current.megaBytes}/${total.megaBytes} MB"
-                        else null to "${current.megaBytes} MB"
+                steps.forEachIndexed { index, step ->
+                    val (progress, progressText) = when (step.progressKey) {
+                        null -> null
+                        ProgressKey.DOWNLOAD -> stepProgressProvider.downloadProgress?.let { (downloaded, total) ->
+                            if (total != null) downloaded.toFloat() / total.toFloat() to "${downloaded.megaBytes}/${total.megaBytes} MB"
+                            else null to "${downloaded.megaBytes} MB"
+                        }
                     } ?: (null to null)
 
                     SubStep(
-                        name = step.title,
+                        name = step.name,
                         state = step.state,
                         message = step.message,
                         progress = progress,
                         progressText = progressText,
                         isFirst = index == 0,
-                        isLast = index == filteredSteps.lastIndex,
+                        isLast = index == steps.lastIndex,
                     )
                 }
             }

app/src/main/java/app/revanced/manager/ui/model/PatcherStep.kt

@@ -3,10 +3,9 @@ package app.revanced.manager.ui.model
 import android.os.Parcelable
 import androidx.annotation.StringRes
 import app.revanced.manager.R
-import app.revanced.manager.patcher.StepId
 import kotlinx.parcelize.Parcelize
 
-enum class StepCategory(@param:StringRes val displayName: Int) {
+enum class StepCategory(@StringRes val displayName: Int) {
     PREPARING(R.string.patcher_step_group_preparing),
     PATCHING(R.string.patcher_step_group_patching),
     SAVING(R.string.patcher_step_group_saving)
@@ -16,20 +15,19 @@ enum class State {
     WAITING, RUNNING, FAILED, COMPLETED
 }
 
+enum class ProgressKey {
+    DOWNLOAD
+}
+
+interface StepProgressProvider {
+    val downloadProgress: Pair<Long, Long?>?
+}
+
 @Parcelize
 data class Step(
-    val id: StepId,
-    val title: String,
+    val name: String,
     val category: StepCategory,
     val state: State = State.WAITING,
     val message: String? = null,
-    val progress: Pair<Long, Long?>? = null,
-    val hide: Boolean = false,
-) : Parcelable
-
-
-fun Step.withState(
-    state: State = this.state,
-    message: String? = this.message,
-    progress: Pair<Long, Long?>? = this.progress
-) = copy(state = state, message = message, progress = progress)
+    val progressKey: ProgressKey? = null
+) : Parcelable

app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt

@@ -36,7 +36,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SecondaryTabRow
+import androidx.compose.material3.TabRow
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.surfaceColorAtElevation
@@ -53,7 +53,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -91,17 +90,16 @@ fun DashboardScreen(
     onAppSelectorClick: () -> Unit,
     onSettingsClick: () -> Unit,
     onUpdateClick: () -> Unit,
-    onDownloaderClick: () -> Unit,
+    onDownloaderPluginClick: () -> Unit,
     onAppClick: (String) -> Unit
 ) {
     var selectedSourceCount by rememberSaveable { mutableIntStateOf(0) }
     val bundlesSelectable by remember { derivedStateOf { selectedSourceCount > 0 } }
     val availablePatches by vm.availablePatches.collectAsStateWithLifecycle(0)
-    val showNewDownloaderNotification by vm.newDownloadersAvailable.collectAsStateWithLifecycle(
+    val showNewDownloaderPluginsNotification by vm.newDownloaderPluginsAvailable.collectAsStateWithLifecycle(
         false
     )
     val androidContext = LocalContext.current
-    val resources = LocalResources.current
     val composableScope = rememberCoroutineScope()
     val pagerState = rememberPagerState(
         initialPage = DashboardPage.DASHBOARD.ordinal,
@@ -236,7 +234,7 @@ fun DashboardScreen(
                     when (pagerState.currentPage) {
                         DashboardPage.DASHBOARD.ordinal -> {
                             if (availablePatches < 1) {
-                                androidContext.toast(resources.getString(R.string.no_patch_found))
+                                androidContext.toast(androidContext.getString(R.string.no_patch_found))
                                 composableScope.launch {
                                     pagerState.animateScrollToPage(
                                         DashboardPage.BUNDLES.ordinal
@@ -261,7 +259,7 @@ fun DashboardScreen(
         }
     ) { paddingValues ->
         Column(Modifier.padding(paddingValues)) {
-            SecondaryTabRow(
+            TabRow(
                 selectedTabIndex = pagerState.currentPage,
                 containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(3.0.dp)
             ) {
@@ -309,14 +307,14 @@ fun DashboardScreen(
                         )
                     }
                 } else null,
-                if (showNewDownloaderNotification) {
+                if (showNewDownloaderPluginsNotification) {
                     {
                         NotificationCard(
-                            text = stringResource(R.string.new_downloader_notification),
+                            text = stringResource(R.string.new_downloader_plugins_notification),
                             icon = Icons.Outlined.Download,
-                            modifier = Modifier.clickable(onClick = onDownloaderClick),
+                            modifier = Modifier.clickable(onClick = onDownloaderPluginClick),
                             actions = {
-                                TextButton(onClick = vm::ignoreNewDownloaders) {
+                                TextButton(onClick = vm::ignoreNewDownloaderPlugins) {
                                     Text(stringResource(R.string.dismiss))
                                 }
                             }

app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt

@@ -40,7 +40,6 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import app.revanced.manager.R
@@ -70,7 +69,6 @@ fun PatcherScreen(
     }
 
     val context = LocalContext.current
-    val resources = LocalResources.current
     val exportApkLauncher =
         rememberLauncherForActivityResult(CreateDocument(APK_MIMETYPE), viewModel::export)
 
@@ -81,7 +79,7 @@ fun PatcherScreen(
 
     fun onPageBack() = when {
         patcherSucceeded == null -> showDismissConfirmationDialog = true
-        viewModel.isInstalling -> context.toast(resources.getString(R.string.patcher_install_in_progress))
+        viewModel.isInstalling -> context.toast(context.getString(R.string.patcher_install_in_progress))
         else -> onLeave()
     }
 
@@ -89,7 +87,7 @@ fun PatcherScreen(
 
     val steps by remember {
         derivedStateOf {
-            viewModel.steps.groupBy { it.category }.toList()
+            viewModel.steps.groupBy { it.category }
         }
     }
 
@@ -150,7 +148,7 @@ fun PatcherScreen(
             },
             title = { Text(title) },
             text = {
-                Text(stringResource(R.string.downloader_activity_dialog_body))
+                Text(stringResource(R.string.plugin_activity_dialog_body))
             }
         )
     }
@@ -232,12 +230,14 @@ fun PatcherScreen(
                 contentPadding = PaddingValues(16.dp)
             ) {
                 items(
-                    items = steps,
+                    items = steps.toList(),
                     key = { it.first }
                 ) { (category, steps) ->
                     Steps(
                         category = category,
                         steps = steps,
+                        stepCount = if (category == StepCategory.PATCHING) viewModel.patchesProgress else null,
+                        stepProgressProvider = viewModel,
                         isExpanded = expandedCategory == category,
                         onExpand = { expandCategory(category) },
                         onClick = {

app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt

@@ -40,7 +40,7 @@ import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SecondaryScrollableTabRow
+import androidx.compose.material3.ScrollableTabRow
 import androidx.compose.material3.SmallFloatingActionButton
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -49,12 +49,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -83,11 +81,9 @@ import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
 import app.revanced.manager.util.isScrollingUp
 import app.revanced.manager.util.transparentListItemColors
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class, FlowPreview::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
 @Composable
 fun PatchesSelectorScreen(
     onSave: (PatchSelection?, Options) -> Unit,
@@ -235,8 +231,7 @@ fun PatchesSelectorScreen(
                             viewModel.selectionWarningEnabled -> showSelectionWarning = true
 
                             // Show universal warning if universal patch is selected and the toggle is off
-                            patch.compatiblePackages == null && viewModel.universalPatchWarningEnabled -> showUniversalWarning =
-                                true
+                            patch.compatiblePackages == null && viewModel.universalPatchWarningEnabled -> showUniversalWarning = true
 
                             // Toggle the patch otherwise
                             else -> viewModel.togglePatch(uid, patch)
@@ -365,21 +360,6 @@ fun PatchesSelectorScreen(
                     ) {
                         Icon(Icons.Outlined.Restore, stringResource(R.string.reset))
                     }
-
-                    val isScrollingUp =
-                        patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp()
-                    val expanded by produceState(true, isScrollingUp) {
-                        val state = isScrollingUp ?: return@produceState
-                        value = state.value
-
-                        // Use snapshotFlow and sample to prevent the value from changing too often.
-                        snapshotFlow { state.value }
-                            .sample(333L)
-                            .collect {
-                                value = it
-                            }
-                    }
-
                     HapticExtendedFloatingActionButton(
                         text = {
                             Text(
@@ -395,7 +375,8 @@ fun PatchesSelectorScreen(
                                 contentDescription = stringResource(R.string.save)
                             )
                         },
-                        expanded = expanded,
+                        expanded = patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp
+                            ?: true,
                         onClick = {
                             onSave(viewModel.getCustomSelection(), viewModel.getOptions())
                         }
@@ -411,7 +392,7 @@ fun PatchesSelectorScreen(
                 .padding(top = 16.dp)
         ) {
             if (bundles.size > 1) {
-                SecondaryScrollableTabRow(
+                ScrollableTabRow(
                     selectedTabIndex = pagerState.currentPage,
                     containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(3.0.dp)
                 ) {

app/src/main/java/app/revanced/manager/ui/screen/RequiredOptionsScreen.kt

@@ -13,7 +13,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SecondaryScrollableTabRow
+import androidx.compose.material3.ScrollableTabRow
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
@@ -106,7 +106,7 @@ fun RequiredOptionsScreen(
                 .padding(paddingValues)
         ) {
             if (list.isEmpty()) return@Column
-            else if (list.size > 1) SecondaryScrollableTabRow(
+            else if (list.size > 1) ScrollableTabRow(
                 selectedTabIndex = pagerState.currentPage,
                 containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(3.0.dp)
             ) {

app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt

@@ -32,7 +32,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -40,7 +39,7 @@ import app.revanced.manager.R
 import app.revanced.manager.data.platform.NetworkInfo
 import app.revanced.manager.data.room.apps.installed.InstallType
 import app.revanced.manager.data.room.apps.installed.InstalledApp
-import app.revanced.manager.network.downloader.LoadedDownloader
+import app.revanced.manager.network.downloader.LoadedDownloaderPlugin
 import app.revanced.manager.ui.component.AlertDialogExtended
 import app.revanced.manager.ui.component.AppInfo
 import app.revanced.manager.ui.component.AppTopBar
@@ -69,7 +68,6 @@ fun SelectedAppInfoScreen(
     vm: SelectedAppInfoViewModel
 ) {
     val context = LocalContext.current
-    val resources = LocalResources.current
     val networkInfo = koinInject<NetworkInfo>()
     val networkConnected = remember { networkInfo.isConnected() }
     val networkMetered = remember { !networkInfo.isUnmetered() }
@@ -88,7 +86,7 @@ fun SelectedAppInfoScreen(
 
     val launcher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.StartActivityForResult(),
-        onResult = vm::handleDownloaderActivityResult
+        onResult = vm::handlePluginActivityResult
     )
     EventEffect(flow = vm.launchActivityFlow) { intent ->
         launcher.launch(intent)
@@ -120,7 +118,7 @@ fun SelectedAppInfoScreen(
                 },
                 onClick = patchClick@{
                     if (selectedPatchCount == 0) {
-                        context.toast(resources.getString(R.string.no_patches_selected))
+                        context.toast(context.getString(R.string.no_patches_selected))
 
                         return@patchClick
                     }
@@ -142,22 +140,22 @@ fun SelectedAppInfoScreen(
         },
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
-        val downloaders by vm.downloaders.collectAsStateWithLifecycle(emptyList())
+        val plugins by vm.plugins.collectAsStateWithLifecycle(emptyList())
 
         if (vm.showSourceSelector) {
             val requiredVersion by vm.requiredVersion.collectAsStateWithLifecycle(null)
 
             AppSourceSelectorDialog(
-                downloaders = downloaders,
+                plugins = plugins,
                 installedApp = vm.installedAppData,
                 searchApp = SelectedApp.Search(
                     vm.packageName,
                     vm.desiredVersion
                 ),
-                activeSearchJob = vm.activeDownloader,
+                activeSearchJob = vm.activePluginAction,
                 hasRoot = vm.hasRoot,
                 onDismissRequest = vm::dismissSourceSelector,
-                onSelectDownloader = vm::searchUsingDownloader,
+                onSelectPlugin = vm::searchUsingPlugin,
                 requiredVersion = requiredVersion,
                 onSelect = {
                     vm.selectedApp = it
@@ -203,8 +201,8 @@ fun SelectedAppInfoScreen(
                     is SelectedApp.Installed -> stringResource(R.string.apk_source_installed)
                     is SelectedApp.Download -> stringResource(
                         R.string.apk_source_downloader,
-                        downloaders.find { it.packageName == app.data.downloaderPackageName && it.name == app.data.downloaderClassName }?.name
-                            ?: app.data.downloaderPackageName
+                        plugins.find { it.packageName == app.data.pluginPackageName }?.name
+                            ?: app.data.pluginPackageName
                     )
 
                     is SelectedApp.Local -> stringResource(R.string.apk_source_local)
@@ -281,14 +279,14 @@ private fun PageItem(@StringRes title: Int, description: String, onClick: () ->
 
 @Composable
 private fun AppSourceSelectorDialog(
-    downloaders: List<LoadedDownloader>,
+    plugins: List<LoadedDownloaderPlugin>,
     installedApp: Pair<SelectedApp.Installed, InstalledApp?>?,
     searchApp: SelectedApp.Search,
-    activeSearchJob: LoadedDownloader?,
+    activeSearchJob: String?,
     hasRoot: Boolean,
     requiredVersion: String?,
     onDismissRequest: () -> Unit,
-    onSelectDownloader: (LoadedDownloader) -> Unit,
+    onSelectPlugin: (LoadedDownloaderPlugin) -> Unit,
     onSelect: (SelectedApp) -> Unit,
 ) {
     val canSelect = activeSearchJob == null
@@ -305,15 +303,15 @@ private fun AppSourceSelectorDialog(
         text = {
             LazyColumn {
                 item(key = "auto") {
-                    val hasDownloader = downloaders.isNotEmpty()
+                    val hasPlugins = plugins.isNotEmpty()
                     ListItem(
                         modifier = Modifier
-                            .clickable(enabled = canSelect && hasDownloader) { onSelect(searchApp) }
-                            .enabled(hasDownloader),
+                            .clickable(enabled = canSelect && hasPlugins) { onSelect(searchApp) }
+                            .enabled(hasPlugins),
                         headlineContent = { Text(stringResource(R.string.app_source_dialog_option_auto)) },
                         supportingContent = {
                             Text(
-                                if (hasDownloader)
+                                if (hasPlugins)
                                     stringResource(R.string.app_source_dialog_option_auto_description)
                                 else
                                     stringResource(R.string.app_source_dialog_option_auto_unavailable)
@@ -351,17 +349,11 @@ private fun AppSourceSelectorDialog(
                     }
                 }
 
-                items(
-                    downloaders,
-                    key = { "downloader_${it.packageName}_${it.className}" }) { downloader ->
+                items(plugins, key = { "plugin_${it.packageName}" }) { plugin ->
                     ListItem(
-                        modifier = Modifier.clickable(enabled = canSelect) {
-                            onSelectDownloader(
-                                downloader
-                            )
-                        },
-                        headlineContent = { Text(downloader.name) },
-                        trailingContent = (@Composable { LoadingIndicator() }).takeIf { activeSearchJob == downloader },
+                        modifier = Modifier.clickable(enabled = canSelect) { onSelectPlugin(plugin) },
+                        headlineContent = { Text(plugin.name) },
+                        trailingContent = (@Composable { LoadingIndicator() }).takeIf { activeSearchJob == plugin.packageName },
                         colors = transparentListItemColors
                     )
                 }

app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt

@@ -22,8 +22,8 @@ import app.revanced.manager.ui.model.navigation.Settings
 import org.koin.compose.koinInject
 
 private data class Section(
-    @param:StringRes val name: Int,
-    @param:StringRes val description: Int,
+    @StringRes val name: Int,
+    @StringRes val description: Int,
     val image: ImageVector,
     val destination: Settings.Destination,
 )

app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt

@@ -1,6 +1,5 @@
 package app.revanced.manager.ui.screen.settings
 
-import android.annotation.SuppressLint
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
@@ -41,7 +40,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.semantics
@@ -69,9 +67,8 @@ fun AboutSettingsScreen(
     viewModel: AboutViewModel = koinViewModel()
 ) {
     val context = LocalContext.current
-    val resources = LocalResources.current
     // painterResource() is broken on release builds for some reason.
-    val icon = rememberDrawablePainter(drawable = remember(resources) {
+    val icon = rememberDrawablePainter(drawable = remember {
         AppCompatResources.getDrawable(context, R.drawable.ic_logo_ring)
     })
 
@@ -79,7 +76,7 @@ fun AboutSettingsScreen(
         viewModel.socials.partition(ReVancedSocial::preferred)
     }
 
-    val preferredSocialButtons = remember(resources, preferredSocials, viewModel.donate, viewModel.contact) {
+    val preferredSocialButtons = remember(preferredSocials, viewModel.donate, viewModel.contact) {
         preferredSocials.map {
             Triple(
                 getSocialIcon(it.name),
@@ -92,7 +89,7 @@ fun AboutSettingsScreen(
             viewModel.donate?.let {
                 Triple(
                     Icons.Outlined.FavoriteBorder,
-                    resources.getString(R.string.donate),
+                    context.getString(R.string.donate),
                     third = {
                         context.openUrl(it)
                     }
@@ -101,7 +98,7 @@ fun AboutSettingsScreen(
             viewModel.contact?.let {
                 Triple(
                     Icons.Outlined.MailOutline,
-                    resources.getString(R.string.contact),
+                    context.getString(R.string.contact),
                     third = {
                         context.openUrl("mailto:$it")
                     }
@@ -134,7 +131,7 @@ fun AboutSettingsScreen(
             stringResource(R.string.contributors_description),
             third = nav@{
                 if (!viewModel.isConnected) {
-                    context.toast(resources.getString(R.string.no_network_toast))
+                    context.toast(context.getString(R.string.no_network_toast))
                     return@nav
                 }
 
@@ -156,7 +153,7 @@ fun AboutSettingsScreen(
     LaunchedEffect(developerTaps) {
         if (developerTaps == 0) return@LaunchedEffect
         if (showDeveloperSettings) {
-            snackbarHostState.showSnackbar(resources.getString(R.string.developer_options_already_enabled))
+            snackbarHostState.showSnackbar(context.getString(R.string.developer_options_already_enabled))
             developerTaps = 0
             return@LaunchedEffect
         }
@@ -164,7 +161,7 @@ fun AboutSettingsScreen(
         val remaining = DEVELOPER_OPTIONS_TAPS - developerTaps
         if (remaining > 0) {
             snackbarHostState.showSnackbar(
-                resources.getString(
+                context.getString(
                     R.string.developer_options_taps,
                     remaining
                 ),
@@ -172,7 +169,7 @@ fun AboutSettingsScreen(
             )
         } else if (remaining == 0) {
             viewModel.showDeveloperSettings.update(true)
-            snackbarHostState.showSnackbar(resources.getString(R.string.developer_options_enabled))
+            snackbarHostState.showSnackbar(context.getString(R.string.developer_options_enabled))
         }
 
         // Reset the counter

app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt

@@ -38,7 +38,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -65,10 +64,9 @@ fun AdvancedSettingsScreen(
     viewModel: AdvancedSettingsViewModel = koinViewModel()
 ) {
     val context = LocalContext.current
-    val resources = LocalResources.current
-    val memoryLimit = remember(resources) {
+    val memoryLimit = remember {
         val activityManager = context.getSystemService<ActivityManager>()!!
-        resources.getString(
+        context.getString(
             R.string.device_memory_limit_format,
             activityManager.memoryClass,
             activityManager.largeMemoryClass
@@ -185,7 +183,7 @@ fun AdvancedSettingsScreen(
                             ClipData.newPlainText("Device Information", deviceContent)
                         )
 
-                        context.toast(resources.getString(R.string.toast_copied_to_clipboard))
+                        context.toast(context.getString(R.string.toast_copied_to_clipboard))
                     }.withHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
                 ),
                 headlineContent = stringResource(R.string.about_device),

app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt

@@ -39,7 +39,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
-import app.revanced.manager.network.downloader.DownloaderPackageState
+import app.revanced.manager.network.downloader.DownloaderPluginState
 import app.revanced.manager.ui.component.AppLabel
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ConfirmDialog
@@ -60,7 +60,7 @@ fun DownloadsSettingsScreen(
 ) {
     val context = LocalContext.current
     val downloadedApps by viewModel.downloadedApps.collectAsStateWithLifecycle(emptyList())
-    val downloaderStates by viewModel.downloaderStates.collectAsStateWithLifecycle()
+    val pluginStates by viewModel.downloaderPluginStates.collectAsStateWithLifecycle()
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
     var showDeleteConfirmationDialog by rememberSaveable { mutableStateOf(false) }
 
@@ -68,8 +68,8 @@ fun DownloadsSettingsScreen(
         ConfirmDialog(
             onDismiss = { showDeleteConfirmationDialog = false },
             onConfirm = { viewModel.deleteApps() },
-            title = stringResource(R.string.downloader_delete_apps_title),
-            description = stringResource(R.string.downloader_delete_apps_description),
+            title = stringResource(R.string.downloader_plugin_delete_apps_title),
+            description = stringResource(R.string.downloader_plugin_delete_apps_description),
             icon = Icons.Outlined.Delete
         )
     }
@@ -92,18 +92,17 @@ fun DownloadsSettingsScreen(
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
         PullToRefreshBox(
-            onRefresh = viewModel::refreshDownloaders,
-            isRefreshing = viewModel.isRefreshingDownloaders,
+            onRefresh = viewModel::refreshPlugins,
+            isRefreshing = viewModel.isRefreshingPlugins,
             modifier = Modifier.padding(paddingValues)
         ) {
             LazyColumnWithScrollbar(
                 modifier = Modifier.fillMaxSize()
             ) {
                 item {
-                    GroupHeader(stringResource(R.string.downloaders))
+                    GroupHeader(stringResource(R.string.downloader_plugins))
                 }
-
-                downloaderStates.forEach { (packageName, state) ->
+                pluginStates.forEach { (packageName, state) ->
                     item(key = packageName) {
                         var showDialog by rememberSaveable {
                             mutableStateOf(false)
@@ -136,39 +135,39 @@ fun DownloadsSettingsScreen(
                             }
 
                             when (state) {
-                                is DownloaderPackageState.Loaded -> TrustDialog(
-                                    title = R.string.downloader_revoke_trust_dialog_title,
+                                is DownloaderPluginState.Loaded -> TrustDialog(
+                                    title = R.string.downloader_plugin_revoke_trust_dialog_title,
                                     body = stringResource(
-                                        R.string.downloader_trust_dialog_body,
+                                        R.string.downloader_plugin_trust_dialog_body,
                                         packageName,
                                         signature
                                     ),
-                                    downloaderName = appName,
+                                    pluginName = appName,
                                     signature = signature,
                                     onDismiss = ::dismiss,
                                     onConfirm = {
-                                        viewModel.revokeDownloaderTrust(packageName)
+                                        viewModel.revokePluginTrust(packageName)
                                         dismiss()
                                     }
                                 )
 
-                                is DownloaderPackageState.Failed -> ExceptionViewerDialog(
+                                is DownloaderPluginState.Failed -> ExceptionViewerDialog(
                                     text = remember(state.throwable) {
                                         state.throwable.stackTraceToString()
                                     },
                                     onDismiss = ::dismiss
                                 )
 
-                                is DownloaderPackageState.Untrusted -> TrustDialog(
-                                    title = R.string.downloader_trust_dialog_title,
+                                is DownloaderPluginState.Untrusted -> TrustDialog(
+                                    title = R.string.downloader_plugin_trust_dialog_title,
                                     body = stringResource(
-                                        R.string.downloader_trust_dialog_body
+                                        R.string.downloader_plugin_trust_dialog_body
                                     ),
-                                    downloaderName = appName,
+                                    pluginName = appName,
                                     signature = signature,
                                     onDismiss = ::dismiss,
                                     onConfirm = {
-                                        viewModel.trustDownloader(packageName)
+                                        viewModel.trustPlugin(packageName)
                                         dismiss()
                                     }
                                 )
@@ -183,24 +182,21 @@ fun DownloadsSettingsScreen(
                                     style = MaterialTheme.typography.titleLarge
                                 )
                             },
-                            supportingContent = when (state) {
-                                is DownloaderPackageState.Loaded -> StringBuilder(stringResource(R.string.downloader_state_trusted)).apply {
-                                    val names = state.downloaders.joinToString("\n") { it.name }
-                                    if (names.isNotEmpty()) append("\n\n$names")
-                                }.toString()
-
-                                is DownloaderPackageState.Failed -> stringResource(R.string.downloader_state_failed)
-                                is DownloaderPackageState.Untrusted -> stringResource(R.string.downloader_state_untrusted)
-                            },
+                            supportingContent = stringResource(
+                                when (state) {
+                                    is DownloaderPluginState.Loaded -> R.string.downloader_plugin_state_trusted
+                                    is DownloaderPluginState.Failed -> R.string.downloader_plugin_state_failed
+                                    is DownloaderPluginState.Untrusted -> R.string.downloader_plugin_state_untrusted
+                                }
+                            ),
                             trailingContent = { Text(packageInfo.versionName!!) }
                         )
                     }
                 }
-
-                if (downloaderStates.isEmpty()) {
+                if (pluginStates.isEmpty()) {
                     item {
                         Text(
-                            stringResource(R.string.no_downloader_installed),
+                            stringResource(R.string.downloader_no_plugins_installed),
                             modifier = Modifier.fillMaxWidth(),
                             textAlign = TextAlign.Center
                         )
@@ -244,7 +240,7 @@ fun DownloadsSettingsScreen(
 private fun TrustDialog(
     @StringRes title: Int,
     body: String,
-    downloaderName: String,
+    pluginName: String,
     signature: String,
     onDismiss: () -> Unit,
     onConfirm: () -> Unit
@@ -272,8 +268,8 @@ private fun TrustDialog(
                     ) {
                         Text(
                             stringResource(
-                                R.string.downloader_trust_dialog_name,
-                                downloaderName
+                                R.string.downloader_plugin_trust_dialog_plugin,
+                                pluginName
                             ),
                         )
                         OutlinedCard(
@@ -283,7 +279,7 @@ private fun TrustDialog(
                         ) {
                             Text(
                                 stringResource(
-                                    R.string.downloader_trust_dialog_signature,
+                                    R.string.downloader_plugin_trust_dialog_signature,
                                     signature.chunked(2).joinToString(" ")
                                 ), modifier = Modifier.padding(12.dp)
                             )

app/src/main/java/app/revanced/manager/ui/screen/settings/GeneralSettingsScreen.kt

@@ -8,8 +8,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilledTonalButton
@@ -21,7 +19,6 @@ import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -41,7 +38,6 @@ import app.revanced.manager.ui.theme.Theme
 import app.revanced.manager.ui.viewmodel.GeneralSettingsViewModel
 import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.koinInject
-import java.util.Locale
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -52,7 +48,6 @@ fun GeneralSettingsScreen(
     val prefs = viewModel.prefs
     val coroutineScope = viewModel.viewModelScope
     var showThemePicker by rememberSaveable { mutableStateOf(false) }
-    var showLanguagePicker by rememberSaveable { mutableStateOf(false) }
 
     if (showThemePicker) {
         ThemePicker(
@@ -60,17 +55,6 @@ fun GeneralSettingsScreen(
             onConfirm = { viewModel.setTheme(it) }
         )
     }
-
-    if (showLanguagePicker) {
-        LanguagePicker(
-            supportedLocales = viewModel.getSupportedLocales(),
-            currentLocale = viewModel.getCurrentLocale(),
-            onDismiss = { showLanguagePicker = false },
-            onConfirm = { viewModel.setLocale(it) },
-            getDisplayName = { viewModel.getLocaleDisplayName(it) }
-        )
-    }
-
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
 
     Scaffold(
@@ -90,24 +74,6 @@ fun GeneralSettingsScreen(
         ) {
             GroupHeader(stringResource(R.string.appearance))
 
-            val currentLocale = viewModel.getCurrentLocale()
-            val currentLanguageDisplay = remember(currentLocale) {
-                currentLocale?.let { viewModel.getLocaleDisplayName(it) }
-            }
-            SettingsListItem(
-                modifier = Modifier.clickable { showLanguagePicker = true },
-                headlineContent = stringResource(R.string.language),
-                supportingContent = stringResource(R.string.language_description),
-                trailingContent = {
-                    FilledTonalButton(onClick = { showLanguagePicker = true }) {
-                        Text(
-                            currentLanguageDisplay
-                                ?: stringResource(R.string.language_system_default)
-                        )
-                    }
-                }
-            )
-
             val theme by prefs.theme.getAsState()
             SettingsListItem(
                 modifier = Modifier.clickable { showThemePicker = true },
@@ -139,14 +105,6 @@ fun GeneralSettingsScreen(
                     description = R.string.pure_black_theme_description
                 )
             }
-
-            GroupHeader(stringResource(R.string.networking))
-            BooleanItem(
-                preference = prefs.allowMeteredNetworks,
-                coroutineScope = coroutineScope,
-                headline = R.string.allow_metered_networks,
-                description = R.string.allow_metered_networks_description
-            )
         }
     }
 }
@@ -190,64 +148,4 @@ private fun ThemePicker(
             }
         }
     )
-}
-
-@Composable
-private fun LanguagePicker(
-    supportedLocales: List<Locale>,
-    currentLocale: Locale?,
-    onDismiss: () -> Unit,
-    onConfirm: (Locale?) -> Unit,
-    getDisplayName: (Locale) -> String
-) {
-    var selectedLocale by remember { mutableStateOf(currentLocale) }
-    val systemDefaultString = stringResource(R.string.language_system_default)
-
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(stringResource(R.string.language)) },
-        text = {
-            Column(
-                modifier = Modifier.verticalScroll(rememberScrollState())
-            ) {
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .clickable { selectedLocale = null },
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    HapticRadioButton(
-                        selected = selectedLocale == null,
-                        onClick = { selectedLocale = null }
-                    )
-                    Text(systemDefaultString)
-                }
-
-                supportedLocales.forEach { locale ->
-                    Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .clickable { selectedLocale = locale },
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        HapticRadioButton(
-                            selected = selectedLocale == locale,
-                            onClick = { selectedLocale = locale }
-                        )
-                        Text(getDisplayName(locale))
-                    }
-                }
-            }
-        },
-        confirmButton = {
-            TextButton(
-                onClick = {
-                    onConfirm(selectedLocale)
-                    onDismiss()
-                }
-            ) {
-                Text(stringResource(R.string.apply))
-            }
-        }
-    )
 }

app/src/main/java/app/revanced/manager/ui/screen/settings/ImportExportSettingsScreen.kt

@@ -36,7 +36,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -65,7 +64,6 @@ fun ImportExportSettingsScreen(
     vm: ImportExportViewModel = koinViewModel()
 ) {
     val context = LocalContext.current
-    val resources = LocalResources.current
     val coroutineScope = rememberCoroutineScope()
     var selectorDialog by rememberSaveable { mutableStateOf<(@Composable () -> Unit)?>(null) }
 
@@ -110,7 +108,7 @@ fun ImportExportSettingsScreen(
                 vm.viewModelScope.launch {
                     uiSafe(context, R.string.failed_to_import_keystore, "Failed to import keystore") {
                         val result = vm.tryKeystoreImport(alias, pass)
-                        if (!result) context.toast(resources.getString(R.string.import_keystore_wrong_credentials))
+                        if (!result) context.toast(context.getString(R.string.import_keystore_wrong_credentials))
                     }
                 }
             }
@@ -168,7 +166,7 @@ fun ImportExportSettingsScreen(
             GroupItem(
                 onClick = {
                     if (!vm.canExport()) {
-                        context.toast(resources.getString(R.string.export_keystore_unavailable))
+                        context.toast(context.getString(R.string.export_keystore_unavailable))
                         return@GroupItem
                     }
                     exportKeystoreLauncher.launch("Manager.keystore")

app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesSettingsScreen.kt

@@ -7,18 +7,15 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AppScaffold
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.Scrollbar
+import com.mikepenz.aboutlibraries.ui.compose.LibrariesContainer
 import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults
-import com.mikepenz.aboutlibraries.ui.compose.android.produceLibraries
-import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
-import com.mikepenz.aboutlibraries.ui.compose.m3.chipColors
-import com.mikepenz.aboutlibraries.ui.compose.m3.libraryColors
+import com.mikepenz.aboutlibraries.ui.compose.libraryColors
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -36,23 +33,16 @@ fun LicensesSettingsScreen(
     ) { paddingValues ->
         Column(modifier = Modifier.padding(paddingValues)) {
             val lazyListState = rememberLazyListState()
-            val libraries by produceLibraries(R.raw.aboutlibraries)
-            val chipColors = LibraryDefaults.chipColors(
-                containerColor = MaterialTheme.colorScheme.primary,
-                contentColor = MaterialTheme.colorScheme.onPrimary,
-            )
 
             LibrariesContainer(
                 modifier = Modifier
                     .fillMaxSize(),
-                libraries = libraries,
                 lazyListState = lazyListState,
                 colors = LibraryDefaults.libraryColors(
-                    libraryBackgroundColor = MaterialTheme.colorScheme.background,
-                    libraryContentColor = MaterialTheme.colorScheme.onBackground,
-                    versionChipColors = chipColors,
-                    licenseChipColors = chipColors,
-                    fundingChipColors = chipColors,
+                    backgroundColor = MaterialTheme.colorScheme.background,
+                    contentColor = MaterialTheme.colorScheme.onBackground,
+                    badgeBackgroundColor = MaterialTheme.colorScheme.primary,
+                    badgeContentColor = MaterialTheme.colorScheme.onPrimary,
                 )
             )
             Scrollbar(lazyListState = lazyListState, modifier = Modifier.padding(paddingValues))

app/src/main/java/app/revanced/manager/ui/screen/settings/update/UpdatesSettingsScreen.kt

@@ -12,7 +12,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AppTopBar
@@ -34,7 +33,6 @@ fun UpdatesSettingsScreen(
     vm: UpdatesSettingsViewModel = koinViewModel(),
 ) {
     val context = LocalContext.current
-    val resources = LocalResources.current
     val coroutineScope = rememberCoroutineScope()
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
 
@@ -59,7 +57,7 @@ fun UpdatesSettingsScreen(
                 modifier = Modifier.clickable {
                     coroutineScope.launch {
                         if (!vm.isConnected) {
-                            context.toast(resources.getString(R.string.no_network_toast))
+                            context.toast(context.getString(R.string.no_network_toast))
                             return@launch
                         }
                         if (vm.checkForUpdates()) onUpdateClick()
@@ -72,7 +70,7 @@ fun UpdatesSettingsScreen(
             SettingsListItem(
                 modifier = Modifier.clickable {
                     if (!vm.isConnected) {
-                        context.toast(resources.getString(R.string.no_network_toast))
+                        context.toast(context.getString(R.string.no_network_toast))
                         return@clickable
                     }
                     onChangelogClick()

app/src/main/java/app/revanced/manager/ui/viewmodel/BundleListViewModel.kt

@@ -54,7 +54,6 @@ class BundleListViewModel : ViewModel(), KoinComponent {
                 patchBundleRepository.update(
                     *getSelectedSources().filterIsInstance<RemotePatchBundle>().toTypedArray(),
                     showToast = true,
-                    force = true
                 )
             }
         }
@@ -66,7 +65,7 @@ class BundleListViewModel : ViewModel(), KoinComponent {
     fun update(src: PatchBundleSource) = viewModelScope.launch {
         if (src !is RemotePatchBundle) return@launch
 
-        patchBundleRepository.update(src, showToast = true, force = true)
+        patchBundleRepository.update(src, showToast = true)
     }
 
     enum class Event {

app/src/main/java/app/revanced/manager/ui/viewmodel/DashboardViewModel.kt

@@ -7,6 +7,7 @@ import android.net.Uri
 import android.os.Build
 import android.os.PowerManager
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.core.content.getSystemService
@@ -14,12 +15,15 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.revanced.manager.R
 import app.revanced.manager.data.platform.NetworkInfo
+import app.revanced.manager.domain.bundles.PatchBundleSource
 import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.asRemoteOrNull
+import app.revanced.manager.domain.bundles.RemotePatchBundle
 import app.revanced.manager.domain.manager.PreferencesManager
-import app.revanced.manager.domain.repository.DownloaderRepository
+import app.revanced.manager.domain.repository.DownloaderPluginRepository
 import app.revanced.manager.domain.repository.PatchBundleRepository
 import app.revanced.manager.network.api.ReVancedAPI
 import app.revanced.manager.util.PM
+import app.revanced.manager.util.toast
 import app.revanced.manager.util.uiSafe
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.first
@@ -30,7 +34,7 @@ import kotlinx.coroutines.launch
 class DashboardViewModel(
     private val app: Application,
     private val patchBundleRepository: PatchBundleRepository,
-    private val downloaderRepository: DownloaderRepository,
+    private val downloaderPluginRepository: DownloaderPluginRepository,
     private val reVancedAPI: ReVancedAPI,
     private val networkInfo: NetworkInfo,
     val prefs: PreferencesManager,
@@ -41,8 +45,8 @@ class DashboardViewModel(
     private val contentResolver: ContentResolver = app.contentResolver
     private val powerManager = app.getSystemService<PowerManager>()!!
 
-    val newDownloadersAvailable =
-        downloaderRepository.newDownloaderPackageNames.map { it.isNotEmpty() }
+    val newDownloaderPluginsAvailable =
+        downloaderPluginRepository.newPluginPackageNames.map { it.isNotEmpty() }
 
     /**
      * Android 11 kills the app process after granting the "install apps" permission, which is a problem for the patcher screen.
@@ -67,8 +71,8 @@ class DashboardViewModel(
         }
     }
 
-    fun ignoreNewDownloaders() = viewModelScope.launch {
-        downloaderRepository.acknowledgeAll()
+    fun ignoreNewDownloaderPlugins() = viewModelScope.launch {
+        downloaderPluginRepository.acknowledgeAllNewPlugins()
     }
 
     private suspend fun checkForManagerUpdates() {

app/src/main/java/app/revanced/manager/ui/viewmodel/DownloadsViewModel.kt

@@ -1,5 +1,6 @@
 package app.revanced.manager.ui.viewmodel
 
+import android.content.pm.PackageInfo
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -7,7 +8,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.revanced.manager.data.room.apps.downloaded.DownloadedApp
 import app.revanced.manager.domain.repository.DownloadedAppRepository
-import app.revanced.manager.domain.repository.DownloaderRepository
+import app.revanced.manager.domain.repository.DownloaderPluginRepository
 import app.revanced.manager.util.PM
 import app.revanced.manager.util.mutableStateSetOf
 import kotlinx.coroutines.Dispatchers
@@ -18,10 +19,10 @@ import kotlinx.coroutines.withContext
 
 class DownloadsViewModel(
     private val downloadedAppRepository: DownloadedAppRepository,
-    private val downloaderRepository: DownloaderRepository,
+    private val downloaderPluginRepository: DownloaderPluginRepository,
     val pm: PM
 ) : ViewModel() {
-    val downloaderStates = downloaderRepository.downloaderPackageStates
+    val downloaderPluginStates = downloaderPluginRepository.pluginStates
     val downloadedApps = downloadedAppRepository.getAll().map { downloadedApps ->
         downloadedApps.sortedWith(
             compareBy<DownloadedApp> {
@@ -31,7 +32,7 @@ class DownloadsViewModel(
     }
     val appSelection = mutableStateSetOf<DownloadedApp>()
 
-    var isRefreshingDownloaders by mutableStateOf(false)
+    var isRefreshingPlugins by mutableStateOf(false)
         private set
 
     fun toggleApp(downloadedApp: DownloadedApp) {
@@ -51,17 +52,17 @@ class DownloadsViewModel(
         }
     }
 
-    fun refreshDownloaders() = viewModelScope.launch {
-        isRefreshingDownloaders = true
-        downloaderRepository.reload()
-        isRefreshingDownloaders = false
+    fun refreshPlugins() = viewModelScope.launch {
+        isRefreshingPlugins = true
+        downloaderPluginRepository.reload()
+        isRefreshingPlugins = false
     }
 
-    fun trustDownloader(packageName: String) = viewModelScope.launch {
-        downloaderRepository.trustPackage(packageName)
+    fun trustPlugin(packageName: String) = viewModelScope.launch {
+        downloaderPluginRepository.trustPackage(packageName)
     }
 
-    fun revokeDownloaderTrust(packageName: String) = viewModelScope.launch {
-        downloaderRepository.revokeTrustForPackage(packageName)
+    fun revokePluginTrust(packageName: String) = viewModelScope.launch {
+        downloaderPluginRepository.revokeTrustForPackage(packageName)
     }
 }

app/src/main/java/app/revanced/manager/ui/viewmodel/GeneralSettingsViewModel.kt

@@ -1,26 +1,17 @@
 package app.revanced.manager.ui.viewmodel
 
-import android.app.Application
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.ui.theme.Theme
-import app.revanced.manager.util.SupportedLocales
 import app.revanced.manager.util.resetListItemColorsCached
 import kotlinx.coroutines.launch
-import java.util.Locale
 
 class GeneralSettingsViewModel(
-    private val app: Application,
     val prefs: PreferencesManager
 ) : ViewModel() {
     fun setTheme(theme: Theme) = viewModelScope.launch {
         prefs.theme.update(theme)
         resetListItemColorsCached()
     }
-
-    fun getSupportedLocales() = SupportedLocales.getSupportedLocales(app)
-    fun getCurrentLocale() = SupportedLocales.getCurrentLocale()
-    fun setLocale(locale: Locale?) = SupportedLocales.setLocale(locale)
-    fun getLocaleDisplayName(locale: Locale) = SupportedLocales.getDisplayName(locale)
 }

app/src/main/java/app/revanced/manager/ui/viewmodel/ImportExportViewModel.kt

@@ -36,8 +36,8 @@ import kotlin.io.path.deleteExisting
 import kotlin.io.path.inputStream
 
 sealed class ResetDialogState(
-    @param:StringRes val titleResId: Int,
-    @param:StringRes val descriptionResId: Int,
+    @StringRes val titleResId: Int,
+    @StringRes val descriptionResId: Int,
     val onConfirm: () -> Unit,
     val dialogOptionName: String? = null
 ) {

app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt

@@ -29,22 +29,20 @@ import app.revanced.manager.data.room.apps.installed.InstalledApp
 import app.revanced.manager.domain.installer.RootInstaller
 import app.revanced.manager.domain.repository.InstalledAppRepository
 import app.revanced.manager.domain.worker.WorkerRepository
-import app.revanced.manager.patcher.ProgressEvent
-import app.revanced.manager.patcher.StepId
 import app.revanced.manager.patcher.logger.LogLevel
 import app.revanced.manager.patcher.logger.Logger
 import app.revanced.manager.patcher.worker.PatcherWorker
-import app.revanced.manager.downloader.DownloaderHostApi
-import app.revanced.manager.downloader.UserInteractionException
+import app.revanced.manager.plugin.downloader.PluginHostApi
+import app.revanced.manager.plugin.downloader.UserInteractionException
 import app.revanced.manager.ui.model.InstallerModel
+import app.revanced.manager.ui.model.ProgressKey
 import app.revanced.manager.ui.model.SelectedApp
 import app.revanced.manager.ui.model.State
-import app.revanced.manager.ui.model.StepCategory
 import app.revanced.manager.ui.model.Step
+import app.revanced.manager.ui.model.StepCategory
+import app.revanced.manager.ui.model.StepProgressProvider
 import app.revanced.manager.ui.model.navigation.Patcher
-import app.revanced.manager.ui.model.withState
 import app.revanced.manager.util.PM
-import app.revanced.manager.util.PatchSelection
 import app.revanced.manager.util.asCode
 import app.revanced.manager.util.saveableVar
 import app.revanced.manager.util.saver.snapshotStateListSaver
@@ -79,10 +77,10 @@ import java.io.File
 import java.nio.file.Files
 import java.time.Duration
 
-@OptIn(SavedStateHandleSaveableApi::class, DownloaderHostApi::class)
+@OptIn(SavedStateHandleSaveableApi::class, PluginHostApi::class)
 class PatcherViewModel(
     private val input: Patcher.ViewModelParams
-) : ViewModel(), KoinComponent, InstallerModel {
+) : ViewModel(), KoinComponent, StepProgressProvider, InstallerModel {
     private val app: Application by inject()
     private val fs: Filesystem by inject()
     private val pm: PM by inject()
@@ -159,15 +157,35 @@ class PatcherViewModel(
         }
     }
 
-    val steps by savedStateHandle.saveable(saver = snapshotStateListSaver()) {
-        generateSteps(app, input.selectedApp, input.selectedPatches).toMutableStateList()
+    private val patchCount = input.selectedPatches.values.sumOf { it.size }
+    private var completedPatchCount by savedStateHandle.saveable {
+        // SavedStateHandle.saveable only supports the boxed version.
+        @Suppress("AutoboxingStateCreation") mutableStateOf(
+            0
+        )
     }
+    val patchesProgress get() = completedPatchCount to patchCount
+    override var downloadProgress by savedStateHandle.saveable(
+        key = "downloadProgress",
+        stateSaver = autoSaver()
+    ) {
+        mutableStateOf<Pair<Long, Long?>?>(null)
+    }
+        private set
+    val steps by savedStateHandle.saveable(saver = snapshotStateListSaver()) {
+        generateSteps(
+            app,
+            input.selectedApp
+        ).toMutableStateList()
+    }
+    private var currentStepIndex = 0
 
     val progress by derivedStateOf {
-        val steps = steps.filter { it.id != StepId.ExecutePatches }
+        val current = steps.count {
+            it.state == State.COMPLETED && it.category != StepCategory.PATCHING
+        } + completedPatchCount
 
-        val current = steps.count { it.state == State.COMPLETED }
-        val total = steps.size
+        val total = steps.size - 1 + patchCount
 
         current.toFloat() / total.toFloat()
     }
@@ -183,14 +201,20 @@ class PatcherViewModel(
                     input.selectedPatches,
                     input.options,
                     logger,
+                    onDownloadProgress = {
+                        withContext(Dispatchers.Main) {
+                            downloadProgress = it
+                        }
+                    },
+                    onPatchCompleted = { withContext(Dispatchers.Main) { completedPatchCount += 1 } },
                     setInputFile = { withContext(Dispatchers.Main) { inputFile = it } },
-                    handleStartActivityRequest = { downloader, intent ->
+                    handleStartActivityRequest = { plugin, intent ->
                         withContext(Dispatchers.Main) {
                             if (currentActivityRequest != null) throw Exception("Another request is already pending.")
                             try {
                                 // Wait for the dialog interaction.
                                 val accepted = with(CompletableDeferred<Boolean>()) {
-                                    currentActivityRequest = this to downloader.name
+                                    currentActivityRequest = this to plugin.name
 
                                     await()
                                 }
@@ -211,10 +235,26 @@ class PatcherViewModel(
                             }
                         }
                     },
-                    onEvent = ::handleProgressEvent,
+                    onProgress = { name, state, message ->
+                        viewModelScope.launch {
+                            steps[currentStepIndex] = steps[currentStepIndex].run {
+                                copy(
+                                    name = name ?: this.name,
+                                    state = state ?: this.state,
+                                    message = message ?: this.message
+                                )
+                            }
+
+                            if (state == State.COMPLETED && currentStepIndex != steps.lastIndex) {
+                                currentStepIndex++
+
+                                steps[currentStepIndex] =
+                                    steps[currentStepIndex].copy(state = State.RUNNING)
+                            }
+                        }
+                    }
                 )
-            )
-        )
+            ))
     }
 
     val patcherSucceeded =
@@ -268,35 +308,6 @@ class PatcherViewModel(
         }
     }
 
-    private fun handleProgressEvent(event: ProgressEvent) = viewModelScope.launch {
-        val stepIndex = steps.indexOfFirst {
-            event.stepId?.let { id -> id == it.id }
-                ?: (it.state == State.RUNNING || it.state == State.WAITING)
-        }
-
-        if (stepIndex != -1) steps[stepIndex] = steps[stepIndex].run {
-            when (event) {
-                is ProgressEvent.Started -> withState(State.RUNNING)
-
-                is ProgressEvent.Progress -> withState(
-                    message = event.message ?: message,
-                    progress = event.current?.let { event.current to event.total } ?: progress
-                )
-
-                is ProgressEvent.Completed -> withState(State.COMPLETED, progress = null)
-
-                is ProgressEvent.Failed -> {
-                    if (event.stepId == null && steps.any { it.state == State.FAILED }) return@launch
-                    withState(
-                        State.FAILED,
-                        message = event.error.stackTrace,
-                        progress = null
-                    )
-                }
-            }
-        }
-    }
-
     fun onBack() {
         installerCoroutineScope.cancel()
         // tempDir cannot be deleted inside onCleared because it gets called on system-initiated process death.
@@ -533,66 +544,34 @@ class PatcherViewModel(
             LogLevel.ERROR -> Log.e(TAG, msg)
         }
 
-        fun generateSteps(
-            context: Context,
-            selectedApp: SelectedApp,
-            selectedPatches: PatchSelection
-        ): List<Step> = buildList {
-            if (selectedApp is SelectedApp.Download || selectedApp is SelectedApp.Search)
-                add(
-                    Step(
-                        StepId.DownloadAPK,
-                        context.getString(R.string.download_apk),
-                        StepCategory.PREPARING
-                    )
-                )
+        fun generateSteps(context: Context, selectedApp: SelectedApp): List<Step> {
+            val needsDownload =
+                selectedApp is SelectedApp.Download || selectedApp is SelectedApp.Search
 
-            add(
+            return listOfNotNull(
+                Step(
+                    context.getString(R.string.download_apk),
+                    StepCategory.PREPARING,
+                    state = State.RUNNING,
+                    progressKey = ProgressKey.DOWNLOAD,
+                ).takeIf { needsDownload },
                 Step(
-                    StepId.LoadPatches,
                     context.getString(R.string.patcher_step_load_patches),
-                    StepCategory.PREPARING
-                )
-            )
-            add(
+                    StepCategory.PREPARING,
+                    state = if (needsDownload) State.WAITING else State.RUNNING,
+                ),
                 Step(
-                    StepId.ReadAPK,
                     context.getString(R.string.patcher_step_unpack),
                     StepCategory.PREPARING
-                )
-            )
-            add(
+                ),
+
                 Step(
-                    StepId.ExecutePatches,
                     context.getString(R.string.execute_patches),
-                    StepCategory.PATCHING,
-                    hide = true
-                )
-            )
+                    StepCategory.PATCHING
+                ),
 
-            selectedPatches.values.asSequence().flatten().sorted().forEachIndexed { index, name ->
-                add(
-                    Step(
-                        StepId.ExecutePatch(index),
-                        name,
-                        StepCategory.PATCHING
-                    )
-                )
-            }
-
-            add(
-                Step(
-                    StepId.WriteAPK,
-                    context.getString(R.string.patcher_step_write_patched),
-                    StepCategory.SAVING
-                )
-            )
-            add(
-                Step(
-                    StepId.SignAPK,
-                    context.getString(R.string.patcher_step_sign_apk),
-                    StepCategory.SAVING
-                )
+                Step(context.getString(R.string.patcher_step_write_patched), StepCategory.SAVING),
+                Step(context.getString(R.string.patcher_step_sign_apk), StepCategory.SAVING)
             )
         }
     }

app/src/main/java/app/revanced/manager/ui/viewmodel/SelectedAppInfoViewModel.kt

@@ -22,19 +22,19 @@ import app.revanced.manager.R
 import app.revanced.manager.data.room.apps.installed.InstalledApp
 import app.revanced.manager.domain.installer.RootInstaller
 import app.revanced.manager.domain.manager.PreferencesManager
-import app.revanced.manager.domain.repository.DownloaderRepository
+import app.revanced.manager.domain.repository.DownloaderPluginRepository
 import app.revanced.manager.domain.repository.InstalledAppRepository
 import app.revanced.manager.domain.repository.PatchBundleRepository
 import app.revanced.manager.domain.repository.PatchOptionsRepository
 import app.revanced.manager.domain.repository.PatchSelectionRepository
 import app.revanced.manager.patcher.patch.PatchBundleInfo
 import app.revanced.manager.patcher.patch.PatchBundleInfo.Extensions.toPatchSelection
-import app.revanced.manager.network.downloader.LoadedDownloader
+import app.revanced.manager.network.downloader.LoadedDownloaderPlugin
 import app.revanced.manager.network.downloader.ParceledDownloaderData
 import app.revanced.manager.patcher.patch.PatchBundleInfo.Extensions.requiredOptionsSet
-import app.revanced.manager.downloader.GetScope
-import app.revanced.manager.downloader.DownloaderHostApi
-import app.revanced.manager.downloader.UserInteractionException
+import app.revanced.manager.plugin.downloader.GetScope
+import app.revanced.manager.plugin.downloader.PluginHostApi
+import app.revanced.manager.plugin.downloader.UserInteractionException
 import app.revanced.manager.ui.model.SelectedApp
 import app.revanced.manager.ui.model.navigation.Patcher
 import app.revanced.manager.ui.model.navigation.SelectedApplicationInfo
@@ -59,7 +59,7 @@ import kotlinx.parcelize.Parcelize
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 
-@OptIn(SavedStateHandleSaveableApi::class, DownloaderHostApi::class)
+@OptIn(SavedStateHandleSaveableApi::class, PluginHostApi::class)
 class SelectedAppInfoViewModel(
     input: SelectedApplicationInfo.ViewModelParams
 ) : ViewModel(), KoinComponent {
@@ -67,13 +67,13 @@ class SelectedAppInfoViewModel(
     private val bundleRepository: PatchBundleRepository = get()
     private val selectionRepository: PatchSelectionRepository = get()
     private val optionsRepository: PatchOptionsRepository = get()
-    private val downloaderRepository: DownloaderRepository = get()
+    private val pluginsRepository: DownloaderPluginRepository = get()
     private val installedAppRepository: InstalledAppRepository = get()
     private val rootInstaller: RootInstaller = get()
     private val pm: PM = get()
     private val savedStateHandle: SavedStateHandle = get()
     val prefs: PreferencesManager = get()
-    val downloaders = downloaderRepository.loadedDownloadersFlow
+    val plugins = pluginsRepository.loadedPluginsFlow
     val desiredVersion = input.app.version
     val packageName = input.app.packageName
 
@@ -160,15 +160,15 @@ class SelectedAppInfoViewModel(
 
     var showSourceSelector by mutableStateOf(false)
         private set
-    private var downloaderAction: Pair<LoadedDownloader, Job>? by mutableStateOf(null)
-    val activeDownloader get() = downloaderAction?.first
+    private var pluginAction: Pair<LoadedDownloaderPlugin, Job>? by mutableStateOf(null)
+    val activePluginAction get() = pluginAction?.first?.packageName
     private var launchedActivity by mutableStateOf<CompletableDeferred<ActivityResult>?>(null)
     private val launchActivityChannel = Channel<Intent>()
     val launchActivityFlow = launchActivityChannel.receiveAsFlow()
 
-    val errorFlow = combine(downloaders, snapshotFlow { selectedApp }) { downloaderList, app ->
+    val errorFlow = combine(plugins, snapshotFlow { selectedApp }) { pluginsList, app ->
         when {
-            app is SelectedApp.Search && downloaderList.isEmpty() -> Error.NoDownloaders
+            app is SelectedApp.Search && pluginsList.isEmpty() -> Error.NoPlugins
             else -> null
         }
     }
@@ -178,23 +178,23 @@ class SelectedAppInfoViewModel(
         showSourceSelector = true
     }
 
-    private fun cancelDownloaderAction() {
-        downloaderAction?.second?.cancel()
-        downloaderAction = null
+    private fun cancelPluginAction() {
+        pluginAction?.second?.cancel()
+        pluginAction = null
     }
 
     fun dismissSourceSelector() {
-        cancelDownloaderAction()
+        cancelPluginAction()
         showSourceSelector = false
     }
 
-    fun searchUsingDownloader(downloader: LoadedDownloader) {
-        cancelDownloaderAction()
-        downloaderAction = downloader to viewModelScope.launch {
+    fun searchUsingPlugin(plugin: LoadedDownloaderPlugin) {
+        cancelPluginAction()
+        pluginAction = plugin to viewModelScope.launch {
             try {
                 val scope = object : GetScope {
                     override val hostPackageName = app.packageName
-                    override val downloaderPackageName = downloader.packageName
+                    override val pluginPackageName = plugin.packageName
                     override suspend fun requestStartActivity(intent: Intent) =
                         withContext(Dispatchers.Main) {
                             if (launchedActivity != null) error("Previous activity has not finished")
@@ -219,7 +219,7 @@ class SelectedAppInfoViewModel(
                 }
 
                 withContext(Dispatchers.IO) {
-                    downloader.get(scope, packageName, desiredVersion)
+                    plugin.get(scope, packageName, desiredVersion)
                 }?.let { (data, version) ->
                     if (desiredVersion != null && version != desiredVersion) {
                         app.toast(app.getString(R.string.downloader_invalid_version))
@@ -228,7 +228,7 @@ class SelectedAppInfoViewModel(
                     selectedApp = SelectedApp.Download(
                         packageName,
                         version,
-                        ParceledDownloaderData(downloader, data)
+                        ParceledDownloaderData(plugin, data)
                     )
                 } ?: app.toast(app.getString(R.string.downloader_app_not_found))
             } catch (e: UserInteractionException.Activity) {
@@ -239,13 +239,13 @@ class SelectedAppInfoViewModel(
                 app.toast(app.getString(R.string.downloader_error, e.simpleMessage()))
                 Log.e(tag, "Downloader.get threw an exception", e)
             } finally {
-                downloaderAction = null
+                pluginAction = null
                 dismissSourceSelector()
             }
         }
     }
 
-    fun handleDownloaderActivityResult(result: ActivityResult) {
+    fun handlePluginActivityResult(result: ActivityResult) {
         launchedActivity?.complete(result)
     }
 
@@ -307,7 +307,7 @@ class SelectedAppInfoViewModel(
     }
 
     enum class Error(@param:StringRes val resourceId: Int) {
-        NoDownloaders(R.string.no_downloader_available)
+        NoPlugins(R.string.downloader_no_plugins_available)
     }
 
     private companion object {

app/src/main/java/app/revanced/manager/ui/viewmodel/UpdateViewModel.kt

@@ -82,7 +82,7 @@ class UpdateViewModel(
         uiSafe(app, R.string.failed_to_download_update, "Failed to download update") {
             val release = releaseInfo!!
             withContext(Dispatchers.IO) {
-                if (!networkInfo.isSafe(false) && !ignoreInternetCheck) {
+                if (!networkInfo.isSafe() && !ignoreInternetCheck) {
                     showInternetCheckDialog = true
                 } else {
                     state = State.DOWNLOADING
@@ -90,10 +90,8 @@ class UpdateViewModel(
                     http.download(location) {
                         url(release.downloadUrl)
                         onDownload { bytesSentTotal, contentLength ->
-                            withContext(Dispatchers.Main) {
-                                downloadedSize = bytesSentTotal
-                                contentLength?.let { totalSize = it }
-                            }
+                            downloadedSize = bytesSentTotal
+                            totalSize = contentLength
                         }
                     }
                     installUpdate()

app/src/main/java/app/revanced/manager/util/SupportedLocales.kt

@@ -1,40 +0,0 @@
-package app.revanced.manager.util
-
-import android.app.LocaleConfig
-import android.content.Context
-import android.os.Build
-import android.os.LocaleList
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.os.LocaleListCompat
-import app.revanced.manager.BuildConfig
-import java.util.Locale
-
-object SupportedLocales {
-    fun getSupportedLocales(context: Context): List<Locale> {
-        var result: List<Locale>? = null
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) result = runCatching {
-            LocaleConfig(context).supportedLocales?.toList()
-        }.getOrNull()
-
-        return result ?: generated
-    }
-
-    fun getCurrentLocale(): Locale? =
-        AppCompatDelegate.getApplicationLocales().takeIf { !it.isEmpty }?.get(0)
-
-    fun setLocale(locale: Locale?) = AppCompatDelegate.setApplicationLocales(
-        locale?.let { LocaleListCompat.create(it) } ?: LocaleListCompat.getEmptyLocaleList()
-    )
-
-    fun getDisplayName(locale: Locale) =
-        locale.getDisplayName(locale).replaceFirstChar { it.uppercase(locale) }
-
-    private fun LocaleList.toList() = (0 until size()).map { get(it) }
-
-    private val generated by lazy {
-        listOf(
-            Locale.ENGLISH,
-            *BuildConfig.SUPPORTED_LOCALES.map(Locale::forLanguageTag).toTypedArray()
-        )
-    }
-}

app/src/main/java/app/revanced/manager/util/Util.kt

@@ -15,10 +15,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.produceState
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
@@ -41,6 +43,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.launch
+import kotlinx.datetime.Clock
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.format.MonthNames
@@ -48,11 +51,9 @@ import kotlinx.datetime.format.char
 import kotlinx.datetime.toInstant
 import kotlinx.datetime.toLocalDateTime
 import java.util.Locale
-import kotlin.math.abs
 import kotlin.properties.PropertyDelegateProvider
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
-import kotlin.time.Clock
 
 typealias PatchSelection = Map<Int, Set<String>>
 typealias Options = Map<Int, Map<String, Map<String, Any?>>>
@@ -168,7 +169,7 @@ fun LocalDateTime.relativeTime(context: Context): String {
             else -> LocalDateTime.Format {
                 monthName(MonthNames.ENGLISH_ABBREVIATED)
                 char(' ')
-                day()
+                dayOfMonth()
                 if (now.toLocalDateTime(TimeZone.UTC).year != this@relativeTime.year) {
                     chars(", ")
                     year()
@@ -195,12 +196,7 @@ val transparentListItemColors
             .also { transparentListItemColorsCached = it }
 
 @Composable
-fun <T> EventEffect(
-    flow: Flow<T>,
-    vararg keys: Any?,
-    state: Lifecycle.State = Lifecycle.State.STARTED,
-    block: suspend (T) -> Unit
-) {
+fun <T> EventEffect(flow: Flow<T>, vararg keys: Any?, state: Lifecycle.State = Lifecycle.State.STARTED, block: suspend (T) -> Unit) {
     val lifecycleOwner = LocalLifecycleOwner.current
     val currentBlock by rememberUpdatedState(block)
 
@@ -216,36 +212,40 @@ fun <T> EventEffect(
 const val isScrollingUpSensitivity = 10
 
 @Composable
-fun LazyListState.isScrollingUp() = produceState(true, this) {
-    var previousIndex = firstVisibleItemIndex
-    var previousScrollOffset = firstVisibleItemScrollOffset
+fun LazyListState.isScrollingUp(): State<Boolean> {
+    return remember(this) {
+        var previousIndex by mutableIntStateOf(firstVisibleItemIndex)
+        var previousScrollOffset by mutableIntStateOf(firstVisibleItemScrollOffset)
 
-    snapshotFlow {
-        firstVisibleItemIndex to firstVisibleItemScrollOffset
-    }.collect { (index, scrollOffset) ->
-        val indexChanged = previousIndex != index
-        val offsetChanged = abs(previousScrollOffset - scrollOffset) > isScrollingUpSensitivity
+        derivedStateOf {
+            val indexChanged = previousIndex != firstVisibleItemIndex
+            val offsetChanged =
+                kotlin.math.abs(previousScrollOffset - firstVisibleItemScrollOffset) > isScrollingUpSensitivity
 
-        value = when {
-            indexChanged -> previousIndex > index
-            offsetChanged -> previousScrollOffset > scrollOffset
-            else -> value
+            if (indexChanged) {
+                previousIndex > firstVisibleItemIndex
+            } else if (offsetChanged) {
+                previousScrollOffset > firstVisibleItemScrollOffset
+            } else {
+                true
+            }.also {
+                previousIndex = firstVisibleItemIndex
+                previousScrollOffset = firstVisibleItemScrollOffset
+            }
         }
-        previousIndex = index
-        previousScrollOffset = scrollOffset
     }
 }
 
+// TODO: support sensitivity
 @Composable
-fun ScrollState.isScrollingUp() = produceState(true, this) {
-    var previousScrollOffset = this@isScrollingUp.value
-
-    snapshotFlow { this@isScrollingUp.value }.collect { scrollOffset ->
-        if (abs(previousScrollOffset - scrollOffset) > isScrollingUpSensitivity) {
-            value = previousScrollOffset >= scrollOffset
+fun ScrollState.isScrollingUp(): State<Boolean> {
+    return remember(this) {
+        var previousScrollOffset by mutableIntStateOf(value)
+        derivedStateOf {
+            (previousScrollOffset >= value).also {
+                previousScrollOffset = value
+            }
         }
-
-        previousScrollOffset = scrollOffset
     }
 }
 

app/src/main/res/values/strings.xml

@@ -14,13 +14,13 @@ Second \"item\" text"</string>
 -->
 <resources>
     <string name="app_name">ReVanced Manager</string>
-    <string name="patcher">Patcher test</string>
+    <string name="patcher">Patcher</string>
     <string name="patches">Patches</string>
     <string name="cli">CLI</string>
     <string name="manager">Manager</string>
 
-    <string name="downloader_host_permission_label">ReVanced Manager downloader host</string>
-    <string name="downloader_host_permission_description">Used to control access to ReVanced Manager downloaders. Only ReVanced Manager has this.</string>
+    <string name="plugin_host_permission_label">ReVanced Manager plugin host</string>
+    <string name="plugin_host_permission_description">Used to control access to ReVanced Manager plugins. Only ReVanced Manager has this.</string>
 
     <string name="toast_copied_to_clipboard">Copied!</string>
     <string name="copy_to_clipboard">Copy to clipboard</string>
@@ -30,7 +30,7 @@ Second \"item\" text"</string>
     <string name="select_app">Select an app</string>
     <string name="patches_count_selected">%1$d/%2$d selected</string>
 
-    <string name="new_downloader_notification">New downloader(s) available. Click here to configure them.</string>
+    <string name="new_downloader_plugins_notification">New downloader plugins available. Click here to configure them.</string>
     <string name="unsupported_architecture_warning">Patching on this device architecture is unsupported and will most likely fail.</string>
 
     <string name="import_">Import</string>
@@ -56,7 +56,7 @@ Second \"item\" text"</string>
     <string name="app_source_dialog_title">Select source</string>
     <string name="app_source_dialog_option_auto">Auto</string>
     <string name="app_source_dialog_option_auto_description">Use all available downloader to download the app</string>
-    <string name="app_source_dialog_option_auto_unavailable">No downloader available</string>
+    <string name="app_source_dialog_option_auto_unavailable">No plugins available</string>
     <string name="app_source_dialog_option_installed_no_root">Mounted apps cannot be patched again without root access</string>
     <string name="app_source_dialog_option_installed_version_not_suggested">Version %s does not match the suggested version</string>
 
@@ -83,11 +83,11 @@ Second \"item\" text"</string>
     <string name="auto_updates_dialog_note">These settings can be changed later.</string>
 
     <string name="general">General</string>
-    <string name="general_description">Language, theme, dynamic color</string>
+    <string name="general_description">Theme, dynamic color</string>
     <string name="updates">Updates</string>
     <string name="updates_description">Check for updates and view changelogs</string>
     <string name="downloads">Downloads</string>
-    <string name="downloads_description">Downloaders and downloaded apps</string>
+    <string name="downloads_description">Downloader plugins and downloaded apps</string>
     <string name="import_export">Import &amp; export</string>
     <string name="import_export_description">Keystore, patch options and selection</string>
     <string name="advanced">Advanced</string>
@@ -104,9 +104,6 @@ Second \"item\" text"</string>
     <string name="pure_black_theme_description">Use pure black backgrounds for dark theme</string>
     <string name="theme">Theme</string>
     <string name="theme_description">Choose between light or dark theme</string>
-    <string name="language">Language</string>
-    <string name="language_description">Choose the app display language</string>
-    <string name="language_system_default">System default</string>
     <string name="safeguards">Safeguards</string>
     <string name="patch_compat_check">Disable version compatibility check</string>
     <string name="patch_compat_check_description">Do not restrict patches to compatible app versions</string>
@@ -178,17 +175,17 @@ You will not be able to update the previously installed apps from this source."<
     <string name="patch_options_reset_all">Reset patch options globally</string>
     <string name="patch_options_reset_all_dialog_description">You are about to reset all patch options. You will have to reapply each option again.</string>
     <string name="patch_options_reset_all_description">Resets all patch options</string>
-    <string name="downloaders">Downloaders</string>
-    <string name="downloader_state_trusted">Trusted</string>
-    <string name="downloader_state_failed">Failed to load. Click for more details</string>
-    <string name="downloader_state_untrusted">Untrusted</string>
-    <string name="downloader_trust_dialog_title">Trust downloader?</string>
-    <string name="downloader_revoke_trust_dialog_title">Revoke trust?</string>
-    <string name="downloader_trust_dialog_body">Continuing will allow this downloader to run.\n\nOnly enable this downloader if you trust it. Downloaders can make Manager execute arbitrary code.</string>
-    <string name="downloader_trust_dialog_signature">Signature:\n\n%s</string>
-    <string name="downloader_trust_dialog_name">Downloader:\n%s</string>
-    <string name="downloader_delete_apps_title">Delete selected apps</string>
-    <string name="downloader_delete_apps_description">Are you sure you want to delete the selected apps?</string>
+    <string name="downloader_plugins">Plugins</string>
+    <string name="downloader_plugin_state_trusted">Trusted</string>
+    <string name="downloader_plugin_state_failed">Failed to load. Click for more details</string>
+    <string name="downloader_plugin_state_untrusted">Untrusted</string>
+    <string name="downloader_plugin_trust_dialog_title">Trust plugin?</string>
+    <string name="downloader_plugin_revoke_trust_dialog_title">Revoke trust?</string>
+    <string name="downloader_plugin_trust_dialog_body">Continuing will allow this plugin to run on your system.\n\nOnly enable this plugin if you trust it. Plugins can execute arbitrary code and may compromise your device.</string>
+    <string name="downloader_plugin_trust_dialog_signature">Signature:\n\n%s</string>
+    <string name="downloader_plugin_trust_dialog_plugin">Plugin:\n%s</string>
+    <string name="downloader_plugin_delete_apps_title">Delete selected apps</string>
+    <string name="downloader_plugin_delete_apps_description">Are you sure you want to delete the selected apps?</string>
     <string name="downloader_settings_no_apps">No downloaded apps found.</string>
 
     <string name="search_apps">Search apps…</string>
@@ -220,10 +217,6 @@ You will not be able to update the previously installed apps from this source."<
     <string name="light">Light</string>
     <string name="dark">Dark</string>
     <string name="appearance">Appearance</string>
-    <string name="networking">Networking</string>
-    <string name="allow_metered_networks">Allow metered networks</string>
-    <string name="allow_metered_networks_description">Permits automatic updates on metered networks.
-    The application might still warn about metered networks for manual operations.</string>
     <string name="downloaded_apps">Downloaded apps</string>
     <string name="process_runtime">Run Patcher in another process (experimental)</string>
     <string name="process_runtime_description">This is faster and allows Patcher to use more memory</string>
@@ -319,8 +312,8 @@ It is only compatible with the following version(s): %2$s"</string>
     <string name="downloader_invalid_version">Downloader did not fetch the correct version</string>
     <string name="downloader_app_not_found">Downloader did not find the app</string>
     <string name="downloader_error">Downloader error: %s</string>
-    <string name="no_downloader_installed">No downloaders installed.</string>
-    <string name="no_downloader_available">There are downloaders installed but none are trusted. Check your settings.</string>
+    <string name="downloader_no_plugins_installed">No downloader installed.</string>
+    <string name="downloader_no_plugins_available">There are downloaders installed but none are trusted. Check your settings.</string>
     <string name="already_patched">Already patched</string>
 
     <string name="patch_selector_sheet_filter_title">Filter</string>
@@ -348,7 +341,7 @@ It is only compatible with the following version(s): %2$s"</string>
     <string name="save_apk_success">APK Saved</string>
     <string name="sign_fail">Failed to sign APK: %s</string>
     <string name="save_logs">Save logs</string>
-    <string name="downloader_activity_dialog_body">User interaction is required in order to proceed with this downloader.</string>
+    <string name="plugin_activity_dialog_body">User interaction is required in order to proceed with this plugin.</string>
     <string name="select_install_type">Select installation type</string>
 
     <string name="patcher_step_group_preparing">Preparing</string>

build.gradle.kts

@@ -6,6 +6,5 @@ plugins {
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.about.libraries) apply false
-    alias(libs.plugins.about.libraries.android) apply false
     alias(libs.plugins.compose.compiler) apply false
 }

crowdin.yml

@@ -1,9 +0,0 @@
-project_id_env: "CROWDIN_PROJECT_ID"
-api_token_env: "CROWDIN_PERSONAL_TOKEN"
-
-preserve_hierarchy: true
-files:
-    - source: app/src/main/res/values/strings.xml
-      dest: manager.xml
-      translation: app/src/main/res/values-%android_code%/strings.xml
-      skip_untranslated_strings: true

gradle.properties

@@ -3,4 +3,4 @@ android.useAndroidX=true
 kotlin.code.style=official
 android.nonTransitiveRClass=true
 android.nonFinalResIds=false
-org.gradle.caching=true
+org.gradle.caching=true

gradle/libs.versions.toml

@@ -1,32 +1,32 @@
 [versions]
-ktx = "1.17.0"
-material3 = "1.4.0"
-ui-tooling = "1.10.0"
-viewmodel-lifecycle = "2.10.0"
-splash-screen = "1.2.0"
-activity = "1.12.2"
-appcompat = "1.7.1"
-preferences-datastore = "1.2.0"
-work-runtime = "2.11.0"
-compose-bom = "2025.12.01"
-navigation = "2.9.6"
-accompanist = "0.37.3"
-placeholder = "1.0.12"
-reorderable = "3.0.0"
-serialization = "1.9.0"
-collection = "0.4.0"
-datetime = "0.7.1"
-room-version = "2.8.4"
+ktx = "1.16.0"
+material3 = "1.3.2"
+ui-tooling = "1.8.1"
+viewmodel-lifecycle = "2.9.0"
+splash-screen = "1.0.1"
+activity = "1.10.1"
+appcompat = "1.7.0"
+preferences-datastore = "1.1.2"
+work-runtime = "2.10.1"
+compose-bom = "2025.05.00"
+navigation = "2.8.6"
+accompanist = "0.37.0"
+placeholder = "1.1.2"
+reorderable = "2.4.3"
+serialization = "1.8.0"
+collection = "0.3.8"
+datetime = "0.6.1"
+room-version = "2.7.1"
 revanced-patcher = "21.0.0"
 revanced-library = "3.0.2"
-koin = "4.1.1"
-ktor = "3.3.3"
-markdown-renderer = "0.39.0"
+koin = "3.5.3"
+ktor = "2.3.9"
+markdown-renderer = "0.30.0"
 fading-edges = "1.0.4"
-kotlin = "2.3.0"
-android-gradle-plugin = "8.13.2"
-dev-tools-gradle-plugin = "2.3.4"
-about-libraries = "13.2.1"
+kotlin = "2.1.10"
+android-gradle-plugin = "8.9.1"
+dev-tools-gradle-plugin = "2.1.10-1.0.29"
+about-libraries-gradle-plugin = "12.1.2"
 coil = "2.7.0"
 app-icon-loader-coil = "1.5.0"
 libsu = "6.0.0"
@@ -34,10 +34,10 @@ scrollbars = "1.0.4"
 enumutil = "1.1.1"
 compose-icons = "1.2.4"
 kotlin-process = "1.5.1"
-hidden-api-stub = "4.4.0"
-binary-compatibility-validator = "0.18.1"
+hidden-api-stub = "4.3.3"
+binary-compatibility-validator = "0.17.0"
 semver-parser = "3.0.0"
-ackpine = "0.19.1"
+ackpine = "0.18.5"
 
 [libraries]
 # AndroidX Core
@@ -68,7 +68,7 @@ coil-appiconloader = { group = "me.zhanghai.android.appiconloader", name = "appi
 accompanist-drawablepainter = { group = "com.google.accompanist", name = "accompanist-drawablepainter", version.ref = "accompanist" }
 
 # Placeholder
-placeholder-material3 = { group = "com.eygraber", name = "compose-placeholder-material3", version.ref = "placeholder" }
+placeholder-material3 = { group = "io.github.fornewid", name = "placeholder-material3", version.ref = "placeholder"}
 
 # Kotlinx
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "serialization" }
@@ -91,8 +91,7 @@ koin-compose-navigation = { group = "io.insert-koin", name = "koin-androidx-comp
 koin-workmanager = { group = "io.insert-koin", name = "koin-androidx-workmanager", version.ref = "koin" }
 
 # About Libraries
-about-libraries-core = { group = "com.mikepenz", name = "aboutlibraries-compose-core", version.ref = "about-libraries" }
-about-libraries-m3 = { group = "com.mikepenz", name = "aboutlibraries-compose-m3", version.ref = "about-libraries" }
+about-libraries = { group = "com.mikepenz", name = "aboutlibraries-compose", version.ref = "about-libraries-gradle-plugin" }
 
 # Ktor
 ktor-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
@@ -147,6 +146,5 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 devtools = { id = "com.google.devtools.ksp", version.ref = "dev-tools-gradle-plugin" }
-about-libraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "about-libraries" }
-about-libraries-android = { id = "com.mikepenz.aboutlibraries.plugin.android", version.ref = "about-libraries" }
+about-libraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "about-libraries-gradle-plugin" }
 binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" }